]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: de.po: translate 44 new messages
[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"
1003b3a5
JX
15"POT-Creation-Date: 2013-04-10 15:16+0800\n"
16"PO-Revision-Date: 2013-04-12 09:23+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
1003b3a5 25#: advice.c:53
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#.
1003b3a5 34#: advice.c:83
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
1003b3a5 71#: archive.c:324 builtin/log.c:1117
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
1003b3a5
JX
79#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366
80#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659
81#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77
a77c07d9
JX
82#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
83#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
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
1003b3a5 115#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86
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
1003b3a5 123#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615
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
1003b3a5
JX
139#: branch.c:201
140#, c-format
141msgid "Cannot setup tracking information; starting point '%s' is not a branch."
142msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
143
144#: branch.c:203
145#, c-format
146msgid "the requested upstream branch '%s' does not exist"
147msgstr "请求的上游分支 '%s' 不存在"
148
149#: branch.c:205
150msgid ""
151"\n"
152"If you are planning on basing your work on an upstream\n"
153"branch that already exists at the remote, you may need to\n"
154"run \"git fetch\" to retrieve it.\n"
155"\n"
156"If you are planning to push out a new local branch that\n"
157"will track its remote counterpart, you may want to use\n"
158"\"git push -u\" to set the upstream config as you push."
159msgstr ""
160"\n"
161"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
162"您可能需要执行 \"git fetch\" 来获取分支。\n"
163"\n"
164"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
165"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
166
8ada9598
JX
167#: bundle.c:36
168#, c-format
169msgid "'%s' does not look like a v2 bundle file"
81809b99 170msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598
JX
171
172#: bundle.c:63
81809b99 173#, c-format
8ada9598 174msgid "unrecognized header: %s%s (%d)"
81809b99 175msgstr "未能识别的包头:%s%s (%d)"
8ada9598 176
1003b3a5 177#: bundle.c:89 builtin/commit.c:676
8ada9598
JX
178#, c-format
179msgid "could not open '%s'"
180msgstr "不能打开 '%s'"
181
182#: bundle.c:140
183msgid "Repository lacks these prerequisite commits:"
81809b99 184msgstr "版本库缺少这些必备的提交:"
8ada9598 185
1003b3a5
JX
186#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300
187#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349
07432cef 188#: builtin/shortlog.c:157
8ada9598
JX
189msgid "revision walk setup failed"
190msgstr "版本遍历设置失败"
191
192#: bundle.c:186
193#, c-format
1003b3a5
JX
194msgid "The bundle contains this ref:"
195msgid_plural "The bundle contains these %d refs:"
196msgstr[0] "这个包中含有这个引用:"
197msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 198
1003b3a5 199#: bundle.c:193
6792b93b
JX
200msgid "The bundle records a complete history."
201msgstr "这个包记录一个完整历史。"
202
203#: bundle.c:195
8ada9598 204#, c-format
1003b3a5
JX
205msgid "The bundle requires this ref:"
206msgid_plural "The bundle requires these %d refs:"
207msgstr[0] "这个包需要这个引用:"
208msgstr[1] "这个包需要 %d 个引用:"
8ada9598 209
6792b93b 210#: bundle.c:294
8ada9598 211msgid "rev-list died"
81809b99 212msgstr "rev-list 终止"
8ada9598 213
1003b3a5 214#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260
8ada9598
JX
215#, c-format
216msgid "unrecognized argument: %s"
81809b99 217msgstr "未能识别的参数:%s"
8ada9598 218
6792b93b 219#: bundle.c:335
8ada9598
JX
220#, c-format
221msgid "ref '%s' is excluded by the rev-list options"
81809b99 222msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 223
6792b93b 224#: bundle.c:380
8ada9598 225msgid "Refusing to create empty bundle."
81809b99 226msgstr "不能创建空包。"
8ada9598 227
6792b93b 228#: bundle.c:398
8ada9598 229msgid "Could not spawn pack-objects"
81809b99 230msgstr "不能生成 pack-objects 进程"
8ada9598 231
6792b93b 232#: bundle.c:416
8ada9598 233msgid "pack-objects died"
81809b99 234msgstr "pack-objects 终止"
8ada9598 235
6792b93b 236#: bundle.c:419
81809b99 237#, c-format
8ada9598 238msgid "cannot create '%s'"
81809b99 239msgstr "不能创建 '%s'"
8ada9598 240
6792b93b 241#: bundle.c:441
8ada9598 242msgid "index-pack died"
81809b99 243msgstr "index-pack 终止"
8ada9598 244
07432cef 245#: commit.c:50
c04f5ac3
JX
246#, c-format
247msgid "could not parse %s"
248msgstr "不能解析 %s"
249
07432cef 250#: commit.c:52
c04f5ac3
JX
251#, c-format
252msgid "%s %s is not a commit!"
253msgstr "%s %s 不是一个提交!"
254
255#: compat/obstack.c:406 compat/obstack.c:408
256msgid "memory exhausted"
257msgstr "内存耗尽"
258
259#: connected.c:39
260msgid "Could not run 'git rev-list'"
261msgstr "不能执行 'git rev-list'"
262
263#: connected.c:48
264#, c-format
265msgid "failed write to rev-list: %s"
266msgstr "无法写入 rev-list:%s"
267
268#: connected.c:56
269#, c-format
270msgid "failed to close rev-list's stdin: %s"
271msgstr "无法关闭 rev-list 的标准输入:%s"
272
8ada9598
JX
273#: date.c:95
274msgid "in the future"
81809b99 275msgstr "在将来"
8ada9598
JX
276
277#: date.c:101
278#, c-format
279msgid "%lu second ago"
280msgid_plural "%lu seconds ago"
81809b99 281msgstr[0] "%lu 秒钟之前"
5ae481e0 282msgstr[1] "%lu 秒钟之前"
8ada9598
JX
283
284#: date.c:108
285#, c-format
286msgid "%lu minute ago"
287msgid_plural "%lu minutes ago"
81809b99 288msgstr[0] "%lu 分钟之前"
5ae481e0 289msgstr[1] "%lu 分钟之前"
8ada9598
JX
290
291#: date.c:115
292#, c-format
293msgid "%lu hour ago"
294msgid_plural "%lu hours ago"
81809b99 295msgstr[0] "%lu 小时之前"
5ae481e0 296msgstr[1] "%lu 小时之前"
8ada9598
JX
297
298#: date.c:122
299#, c-format
300msgid "%lu day ago"
301msgid_plural "%lu days ago"
81809b99 302msgstr[0] "%lu 天之前"
5ae481e0 303msgstr[1] "%lu 天之前"
8ada9598
JX
304
305#: date.c:128
306#, c-format
307msgid "%lu week ago"
308msgid_plural "%lu weeks ago"
81809b99 309msgstr[0] "%lu 周之前"
5ae481e0 310msgstr[1] "%lu 周之前"
8ada9598
JX
311
312#: date.c:135
313#, c-format
314msgid "%lu month ago"
315msgid_plural "%lu months ago"
81809b99 316msgstr[0] "%lu 个月之前"
5ae481e0 317msgstr[1] "%lu 个月之前"
8ada9598
JX
318
319#: date.c:146
320#, c-format
321msgid "%lu year"
322msgid_plural "%lu years"
81809b99 323msgstr[0] "%lu 年"
5ae481e0 324msgstr[1] "%lu 年"
8ada9598
JX
325
326#: date.c:149
327#, c-format
328msgid "%s, %lu month ago"
329msgid_plural "%s, %lu months ago"
81809b99 330msgstr[0] "%s,%lu 个月之前"
5ae481e0 331msgstr[1] "%s,%lu 个月之前"
8ada9598
JX
332
333#: date.c:154 date.c:159
334#, c-format
335msgid "%lu year ago"
336msgid_plural "%lu years ago"
81809b99 337msgstr[0] "%lu 年前"
5ae481e0 338msgstr[1] "%lu 年前"
8ada9598 339
90e6ef53 340# 译者:注意保持前导空格
63af42fe 341#: diff.c:112
c04f5ac3 342#, c-format
07432cef
WS
343msgid " Failed to parse dirstat cut-off percentage '%s'\n"
344msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 345
90e6ef53 346# 译者:注意保持前导空格
63af42fe 347#: diff.c:117
c04f5ac3 348#, c-format
07432cef
WS
349msgid " Unknown dirstat parameter '%s'\n"
350msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 351
63af42fe 352#: diff.c:210
07432cef
WS
353#, c-format
354msgid "Unknown value for 'diff.submodule' config variable: '%s'"
355msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
356
63af42fe 357#: diff.c:260
c04f5ac3
JX
358#, c-format
359msgid ""
360"Found errors in 'diff.dirstat' config variable:\n"
361"%s"
362msgstr ""
90e6ef53 363"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
364"%s"
365
1003b3a5 366#: diff.c:3480
c04f5ac3
JX
367#, c-format
368msgid ""
369"Failed to parse --dirstat/-X option parameter:\n"
370"%s"
371msgstr ""
372"无法解析 --dirstat/-X 选项的参数:\n"
373"%s"
374
1003b3a5 375#: diff.c:3494
07432cef
WS
376#, c-format
377msgid "Failed to parse --submodule option parameter: '%s'"
378msgstr "无法解析 --submodule 选项的参数:'%s'"
379
1003b3a5 380#: gpg-interface.c:59 gpg-interface.c:131
c04f5ac3
JX
381msgid "could not run gpg."
382msgstr "不能执行 gpg。"
383
384#: gpg-interface.c:71
385msgid "gpg did not accept the data"
386msgstr "gpg 没有接受数据"
387
388#: gpg-interface.c:82
389msgid "gpg failed to sign the data"
390msgstr "gpg 无法为数据签名"
391
1003b3a5 392#: gpg-interface.c:115
a77c07d9
JX
393#, c-format
394msgid "could not create temporary file '%s': %s"
395msgstr "不能创建临时文件 '%s':%s"
396
1003b3a5 397#: gpg-interface.c:118
a77c07d9
JX
398#, c-format
399msgid "failed writing detached signature to '%s': %s"
400msgstr "无法将分离式签名写入 '%s':%s"
401
1003b3a5 402#: grep.c:1623
7ac1c0ad
JX
403#, c-format
404msgid "'%s': unable to read %s"
405msgstr "'%s':无法读取 %s"
406
1003b3a5 407#: grep.c:1640
7ac1c0ad
JX
408#, c-format
409msgid "'%s': %s"
410msgstr "'%s':%s"
411
1003b3a5 412#: grep.c:1651
7ac1c0ad
JX
413#, c-format
414msgid "'%s': short read %s"
415msgstr "'%s':读取不完整 %s"
416
23ff3338 417#: help.c:212
81809b99 418#, c-format
8ada9598 419msgid "available git commands in '%s'"
81809b99 420msgstr "在 '%s' 下可用的 git 命令"
8ada9598 421
23ff3338 422#: help.c:219
8ada9598 423msgid "git commands available from elsewhere on your $PATH"
81809b99 424msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 425
a77c07d9
JX
426#: help.c:235
427msgid "The most commonly used git commands are:"
428msgstr "最常用的 git 命令有:"
429
430#: help.c:292
c04f5ac3
JX
431#, c-format
432msgid ""
433"'%s' appears to be a git command, but we were not\n"
434"able to execute it. Maybe git-%s is broken?"
435msgstr ""
436"'%s' 像是一个 git 命令,但却无法运行。\n"
437"可能是 git-%s 受损?"
438
a77c07d9 439#: help.c:349
8ada9598 440msgid "Uh oh. Your system reports no Git commands at all."
81809b99 441msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 442
a77c07d9 443#: help.c:371
8ada9598
JX
444#, c-format
445msgid ""
446"WARNING: You called a Git command named '%s', which does not exist.\n"
447"Continuing under the assumption that you meant '%s'"
448msgstr ""
81809b99
JX
449"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
450"是 '%s'"
8ada9598 451
a77c07d9 452#: help.c:376
8ada9598
JX
453#, c-format
454msgid "in %0.1f seconds automatically..."
81809b99 455msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 456
a77c07d9 457#: help.c:383
8ada9598
JX
458#, c-format
459msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 460msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 461
a77c07d9 462#: help.c:387
8ada9598
JX
463msgid ""
464"\n"
465"Did you mean this?"
466msgid_plural ""
467"\n"
468"Did you mean one of these?"
469msgstr[0] ""
81809b99
JX
470"\n"
471"您指的是这个么?"
472msgstr[1] ""
473"\n"
195febda 474"您指的是这其中的某一个么?"
8ada9598 475
07432cef
WS
476#: merge.c:56
477msgid "failed to read the cache"
478msgstr "无法读取缓存"
479
1003b3a5
JX
480#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563
481#: builtin/clone.c:635
07432cef
WS
482msgid "unable to write new index file"
483msgstr "无法写新的索引文件"
484
649900bc
JX
485#: merge-recursive.c:190
486#, c-format
487msgid "(bad commit)\n"
488msgstr "(坏提交)\n"
489
490#: merge-recursive.c:206
491#, c-format
492msgid "addinfo_cache failed for path '%s'"
493msgstr "为路径 '%s' addinfo_cache 失败"
494
495#: merge-recursive.c:268
496msgid "error building trees"
497msgstr "无法创建树"
498
c160d03f 499#: merge-recursive.c:672
649900bc
JX
500#, c-format
501msgid "failed to create path '%s'%s"
502msgstr "无法创建路径 '%s'%s"
503
c160d03f 504#: merge-recursive.c:683
649900bc
JX
505#, c-format
506msgid "Removing %s to make room for subdirectory\n"
507msgstr "删除 %s 以便为子目录留出空间\n"
508
509#. something else exists
510#. .. but not some other error (who really cares what?)
c160d03f 511#: merge-recursive.c:697 merge-recursive.c:718
649900bc
JX
512msgid ": perhaps a D/F conflict?"
513msgstr ":可能是一个目录/文件冲突?"
514
c160d03f 515#: merge-recursive.c:708
649900bc
JX
516#, c-format
517msgid "refusing to lose untracked file at '%s'"
518msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
519
c160d03f 520#: merge-recursive.c:748
649900bc
JX
521#, c-format
522msgid "cannot read object %s '%s'"
523msgstr "不能读取对象 %s '%s'"
524
c160d03f 525#: merge-recursive.c:750
649900bc
JX
526#, c-format
527msgid "blob expected for %s '%s'"
07432cef 528msgstr "%s '%s' 应为数据(blob)对象"
649900bc 529
1003b3a5 530#: merge-recursive.c:773 builtin/clone.c:303
649900bc
JX
531#, c-format
532msgid "failed to open '%s'"
533msgstr "无法打开 '%s'"
534
c160d03f 535#: merge-recursive.c:781
649900bc
JX
536#, c-format
537msgid "failed to symlink '%s'"
538msgstr "无法创建符号链接 '%s'"
539
c160d03f 540#: merge-recursive.c:784
649900bc
JX
541#, c-format
542msgid "do not know what to do with %06o %s '%s'"
543msgstr "不知道如何处理 %06o %s '%s'"
544
ef317cd5 545#: merge-recursive.c:922
649900bc
JX
546msgid "Failed to execute internal merge"
547msgstr "无法执行内部合并"
548
ef317cd5 549#: merge-recursive.c:926
649900bc
JX
550#, c-format
551msgid "Unable to add %s to database"
552msgstr "不能添加 %s 至对象库"
553
ef317cd5 554#: merge-recursive.c:942
649900bc
JX
555msgid "unsupported object type in the tree"
556msgstr "在树中有不支持的对象类型"
557
ef317cd5 558#: merge-recursive.c:1021 merge-recursive.c:1035
649900bc
JX
559#, c-format
560msgid ""
561"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
562"in tree."
563msgstr ""
564"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
565"的版本被保留。"
566
ef317cd5 567#: merge-recursive.c:1027 merge-recursive.c:1040
649900bc
JX
568#, c-format
569msgid ""
570"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
571"in tree at %s."
572msgstr ""
573"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
574"的版本保留于 %8$s 中。"
575
ef317cd5 576#: merge-recursive.c:1081
649900bc
JX
577msgid "rename"
578msgstr "重命名"
579
ef317cd5 580#: merge-recursive.c:1081
649900bc
JX
581msgid "renamed"
582msgstr "重命名"
583
ef317cd5 584#: merge-recursive.c:1137
649900bc
JX
585#, c-format
586msgid "%s is a directory in %s adding as %s instead"
587msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
588
ef317cd5 589#: merge-recursive.c:1159
649900bc
JX
590#, c-format
591msgid ""
592"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
593"\"->\"%s\" in \"%s\"%s"
594msgstr ""
595"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
596"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
597
ef317cd5 598#: merge-recursive.c:1164
649900bc
JX
599msgid " (left unresolved)"
600msgstr "(留下未解决)"
601
ef317cd5 602#: merge-recursive.c:1218
649900bc
JX
603#, c-format
604msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
605msgstr ""
606"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
607"%5$s"
608
ef317cd5 609#: merge-recursive.c:1248
649900bc
JX
610#, c-format
611msgid "Renaming %s to %s and %s to %s instead"
07432cef 612msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 613
ef317cd5 614#: merge-recursive.c:1447
649900bc
JX
615#, c-format
616msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
617msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
618
ef317cd5 619#: merge-recursive.c:1457
649900bc
JX
620#, c-format
621msgid "Adding merged %s"
622msgstr "添加合并后的 %s"
623
ef317cd5 624#: merge-recursive.c:1462 merge-recursive.c:1660
649900bc
JX
625#, c-format
626msgid "Adding as %s instead"
627msgstr "而是以 %s 为名添加"
628
ef317cd5 629#: merge-recursive.c:1513
649900bc
JX
630#, c-format
631msgid "cannot read object %s"
632msgstr "不能读取对象 %s"
633
ef317cd5 634#: merge-recursive.c:1516
649900bc
JX
635#, c-format
636msgid "object %s is not a blob"
07432cef 637msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 638
ef317cd5 639#: merge-recursive.c:1564
649900bc
JX
640msgid "modify"
641msgstr "修改"
642
ef317cd5 643#: merge-recursive.c:1564
649900bc
JX
644msgid "modified"
645msgstr "修改"
646
ef317cd5 647#: merge-recursive.c:1574
649900bc
JX
648msgid "content"
649msgstr "内容"
650
ef317cd5 651#: merge-recursive.c:1581
649900bc
JX
652msgid "add/add"
653msgstr "添加/添加"
654
ef317cd5 655#: merge-recursive.c:1615
649900bc
JX
656#, c-format
657msgid "Skipped %s (merged same as existing)"
658msgstr "略过 %s(已经做过相同合并)"
659
ef317cd5 660#: merge-recursive.c:1629
649900bc
JX
661#, c-format
662msgid "Auto-merging %s"
663msgstr "自动合并 %s"
664
1003b3a5 665#: merge-recursive.c:1633 git-submodule.sh:1029
649900bc
JX
666msgid "submodule"
667msgstr "子模组"
668
ef317cd5 669#: merge-recursive.c:1634
649900bc
JX
670#, c-format
671msgid "CONFLICT (%s): Merge conflict in %s"
672msgstr "冲突(%s):合并冲突于 %s"
673
ef317cd5 674#: merge-recursive.c:1724
649900bc
JX
675#, c-format
676msgid "Removing %s"
677msgstr "删除 %s"
678
ef317cd5 679#: merge-recursive.c:1749
649900bc
JX
680msgid "file/directory"
681msgstr "文件/目录"
682
ef317cd5 683#: merge-recursive.c:1755
649900bc
JX
684msgid "directory/file"
685msgstr "目录/文件"
686
ef317cd5 687#: merge-recursive.c:1760
649900bc
JX
688#, c-format
689msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
690msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
691
ef317cd5 692#: merge-recursive.c:1770
649900bc
JX
693#, c-format
694msgid "Adding %s"
695msgstr "添加 %s"
696
ef317cd5 697#: merge-recursive.c:1787
649900bc
JX
698msgid "Fatal merge failure, shouldn't happen."
699msgstr "严重的合并错误,不应发生。"
700
ef317cd5 701#: merge-recursive.c:1806
649900bc
JX
702msgid "Already up-to-date!"
703msgstr "已经是最新的!"
704
ef317cd5 705#: merge-recursive.c:1815
649900bc
JX
706#, c-format
707msgid "merging of trees %s and %s failed"
708msgstr "无法合并树 %s 和 %s"
709
ef317cd5 710#: merge-recursive.c:1845
649900bc
JX
711#, c-format
712msgid "Unprocessed path??? %s"
713msgstr "未处理的路径??? %s"
714
ef317cd5 715#: merge-recursive.c:1890
649900bc
JX
716msgid "Merging:"
717msgstr "合并:"
718
ef317cd5 719#: merge-recursive.c:1903
649900bc 720#, c-format
e5e38ce4
JX
721msgid "found %u common ancestor:"
722msgid_plural "found %u common ancestors:"
723msgstr[0] "发现 %u 个共同祖先:"
724msgstr[1] "发现 %u 个共同祖先:"
649900bc 725
ef317cd5 726#: merge-recursive.c:1940
649900bc
JX
727msgid "merge returned no commit"
728msgstr "合并未返回提交"
729
ef317cd5 730#: merge-recursive.c:1997
649900bc
JX
731#, c-format
732msgid "Could not parse object '%s'"
733msgstr "不能解析对象 '%s'"
734
1003b3a5 735#: merge-recursive.c:2009 builtin/merge.c:658
649900bc
JX
736msgid "Unable to write index."
737msgstr "不能写入索引。"
738
1003b3a5
JX
739#: object.c:195
740#, c-format
741msgid "unable to parse object: %s"
742msgstr "不能解析对象:%s"
743
63af42fe 744#: parse-options.c:489
8ada9598 745msgid "..."
81809b99 746msgstr "..."
8ada9598 747
63af42fe 748#: parse-options.c:507
81809b99 749#, c-format
8ada9598 750msgid "usage: %s"
81809b99 751msgstr "用法:%s"
8ada9598
JX
752
753#. TRANSLATORS: the colon here should align with the
754#. one in "usage: %s" translation
63af42fe 755#: parse-options.c:511
81809b99 756#, c-format
8ada9598 757msgid " or: %s"
81809b99 758msgstr " 或:%s"
8ada9598
JX
759
760# 译者:为保证在输出中对齐,注意调整句中空格!
63af42fe 761#: parse-options.c:514
81809b99 762#, c-format
8ada9598 763msgid " %s"
81809b99 764msgstr " %s"
8ada9598 765
63af42fe
JX
766#: parse-options.c:548
767msgid "-NUM"
768msgstr "-数字"
769
a77c07d9
JX
770#: pathspec.c:83
771#, c-format
772msgid "Path '%s' is in submodule '%.*s'"
773msgstr "路径 '%s' 属于模组 '%.*s'"
774
775#: pathspec.c:99
776#, c-format
777msgid "'%s' is beyond a symbolic link"
778msgstr "'%s' 位于符号链接中"
779
1003b3a5 780#: remote.c:1781
c04f5ac3
JX
781#, c-format
782msgid "Your branch is ahead of '%s' by %d commit.\n"
783msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
784msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 785msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 786
1003b3a5 787#: remote.c:1787
07432cef
WS
788msgid " (use \"git push\" to publish your local commits)\n"
789msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
790
1003b3a5 791#: remote.c:1790
c04f5ac3
JX
792#, c-format
793msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
794msgid_plural ""
795"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 796msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 797msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 798
07432cef 799# 译者:注意保持前导空格
1003b3a5 800#: remote.c:1798
07432cef
WS
801msgid " (use \"git pull\" to update your local branch)\n"
802msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
803
1003b3a5 804#: remote.c:1801
c04f5ac3
JX
805#, c-format
806msgid ""
807"Your branch and '%s' have diverged,\n"
808"and have %d and %d different commit each, respectively.\n"
809msgid_plural ""
810"Your branch and '%s' have diverged,\n"
811"and have %d and %d different commits each, respectively.\n"
812msgstr[0] ""
813"您的分支和 '%s' 出现了偏离,\n"
195febda 814"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
815msgstr[1] ""
816"您的分支和 '%s' 出现了偏离,\n"
195febda 817"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 818
07432cef 819# 译者:注意保持前导空格
1003b3a5 820#: remote.c:1811
07432cef
WS
821msgid " (use \"git pull\" to merge the remote branch into yours)\n"
822msgstr " (使用 \"git pull\" 来合并远程分支)\n"
823
1003b3a5
JX
824#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999
825#: builtin/merge.c:1009
c04f5ac3
JX
826#, c-format
827msgid "Could not open '%s' for writing"
90e6ef53 828msgstr "不能为写入打开 '%s'"
c04f5ac3 829
1003b3a5
JX
830#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779
831#: builtin/merge.c:1001 builtin/merge.c:1014
c04f5ac3
JX
832#, c-format
833msgid "Could not write to '%s'"
90e6ef53 834msgstr "不能写入 '%s'"
c04f5ac3 835
1003b3a5 836#: sequencer.c:229
14c8bced
JX
837msgid ""
838"after resolving the conflicts, mark the corrected paths\n"
839"with 'git add <paths>' or 'git rm <paths>'"
840msgstr ""
841"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
842"命令标记修正后的文件"
843
1003b3a5 844#: sequencer.c:232
c04f5ac3
JX
845msgid ""
846"after resolving the conflicts, mark the corrected paths\n"
847"with 'git add <paths>' or 'git rm <paths>'\n"
848"and commit the result with 'git commit'"
849msgstr ""
850"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
851"对修正后的文件做标记,然后用 'git commit' 提交"
852
1003b3a5 853#: sequencer.c:245 sequencer.c:859 sequencer.c:942
c04f5ac3
JX
854#, c-format
855msgid "Could not write to %s"
856msgstr "不能写入 %s"
857
1003b3a5 858#: sequencer.c:248
c04f5ac3
JX
859#, c-format
860msgid "Error wrapping up %s"
861msgstr "错误收尾 %s"
862
1003b3a5 863#: sequencer.c:263
c04f5ac3
JX
864msgid "Your local changes would be overwritten by cherry-pick."
865msgstr "您的本地修改将被拣选操作覆盖。"
866
1003b3a5 867#: sequencer.c:265
c04f5ac3
JX
868msgid "Your local changes would be overwritten by revert."
869msgstr "您的本地修改将被还原操作覆盖。"
870
1003b3a5 871#: sequencer.c:268
c04f5ac3
JX
872msgid "Commit your changes or stash them to proceed."
873msgstr "提交您的修改或保存进度后再继续。"
874
875#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1003b3a5 876#: sequencer.c:319
c04f5ac3
JX
877#, c-format
878msgid "%s: Unable to write new index file"
90e6ef53 879msgstr "%s:无法写入新索引文件"
c04f5ac3 880
1003b3a5 881#: sequencer.c:350
8ada9598 882msgid "Could not resolve HEAD commit\n"
81809b99 883msgstr "不能解析 HEAD 提交\n"
8ada9598 884
1003b3a5 885#: sequencer.c:371
8ada9598 886msgid "Unable to update cache tree\n"
81809b99 887msgstr "不能更新缓存\n"
8ada9598 888
1003b3a5 889#: sequencer.c:416
81809b99 890#, c-format
8ada9598 891msgid "Could not parse commit %s\n"
81809b99 892msgstr "不能解析提交 %s\n"
8ada9598 893
1003b3a5 894#: sequencer.c:421
81809b99 895#, c-format
8ada9598 896msgid "Could not parse parent commit %s\n"
81809b99 897msgstr "不能解析父提交 %s\n"
8ada9598 898
1003b3a5 899#: sequencer.c:487
c04f5ac3 900msgid "Your index file is unmerged."
90e6ef53 901msgstr "您的索引文件未完成合并。"
c04f5ac3 902
1003b3a5 903#: sequencer.c:506
c04f5ac3
JX
904#, c-format
905msgid "Commit %s is a merge but no -m option was given."
906msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
907
1003b3a5 908#: sequencer.c:514
c04f5ac3
JX
909#, c-format
910msgid "Commit %s does not have parent %d"
911msgstr "提交 %s 没有父提交 %d"
912
1003b3a5 913#: sequencer.c:518
c04f5ac3
JX
914#, c-format
915msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 916msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
917
918#. TRANSLATORS: The first %s will be "revert" or
919#. "cherry-pick", the second %s a SHA1
1003b3a5 920#: sequencer.c:531
c04f5ac3
JX
921#, c-format
922msgid "%s: cannot parse parent commit %s"
923msgstr "%s:不能解析父提交 %s"
924
1003b3a5 925#: sequencer.c:535
c04f5ac3
JX
926#, c-format
927msgid "Cannot get commit message for %s"
928msgstr "不能得到 %s 的提交说明"
929
1003b3a5 930#: sequencer.c:621
c04f5ac3
JX
931#, c-format
932msgid "could not revert %s... %s"
933msgstr "不能还原 %s... %s"
934
1003b3a5 935#: sequencer.c:622
c04f5ac3
JX
936#, c-format
937msgid "could not apply %s... %s"
938msgstr "不能应用 %s... %s"
939
1003b3a5 940#: sequencer.c:654
c04f5ac3
JX
941msgid "empty commit set passed"
942msgstr "提供了空的提交集"
943
1003b3a5 944#: sequencer.c:662
c04f5ac3
JX
945#, c-format
946msgid "git %s: failed to read the index"
90e6ef53 947msgstr "git %s:无法读取索引"
c04f5ac3 948
1003b3a5 949#: sequencer.c:667
c04f5ac3
JX
950#, c-format
951msgid "git %s: failed to refresh the index"
90e6ef53 952msgstr "git %s:无法刷新索引"
c04f5ac3 953
1003b3a5 954#: sequencer.c:725
c04f5ac3
JX
955#, c-format
956msgid "Cannot %s during a %s"
90e6ef53 957msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 958
1003b3a5 959#: sequencer.c:747
c04f5ac3
JX
960#, c-format
961msgid "Could not parse line %d."
90e6ef53 962msgstr "不能解析第 %d 行。"
c04f5ac3 963
1003b3a5 964#: sequencer.c:752
c04f5ac3 965msgid "No commits parsed."
7e238ab7 966msgstr "没有提交被解析。"
c04f5ac3 967
1003b3a5 968#: sequencer.c:765
c04f5ac3
JX
969#, c-format
970msgid "Could not open %s"
971msgstr "不能打开 %s"
972
1003b3a5 973#: sequencer.c:769
c04f5ac3
JX
974#, c-format
975msgid "Could not read %s."
976msgstr "不能读取 %s。"
977
1003b3a5 978#: sequencer.c:776
c04f5ac3
JX
979#, c-format
980msgid "Unusable instruction sheet: %s"
981msgstr "无用的指令表单:%s"
982
1003b3a5 983#: sequencer.c:804
c04f5ac3
JX
984#, c-format
985msgid "Invalid key: %s"
986msgstr "无效键名:%s"
987
1003b3a5 988#: sequencer.c:807
c04f5ac3
JX
989#, c-format
990msgid "Invalid value for %s: %s"
81809b99 991msgstr "%s 的值无效:%s"
c04f5ac3 992
1003b3a5 993#: sequencer.c:819
c04f5ac3
JX
994#, c-format
995msgid "Malformed options sheet: %s"
996msgstr "非法的选项表单:%s"
997
1003b3a5 998#: sequencer.c:840
c04f5ac3
JX
999msgid "a cherry-pick or revert is already in progress"
1000msgstr "一个拣选或还原操作已在进行"
1001
1003b3a5 1002#: sequencer.c:841
c04f5ac3
JX
1003msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1004msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1005
1003b3a5 1006#: sequencer.c:845
c04f5ac3
JX
1007#, c-format
1008msgid "Could not create sequencer directory %s"
90e6ef53 1009msgstr "不能创建序列目录 %s"
c04f5ac3 1010
1003b3a5 1011#: sequencer.c:861 sequencer.c:946
c04f5ac3
JX
1012#, c-format
1013msgid "Error wrapping up %s."
1014msgstr "错误收尾 %s。"
1015
1003b3a5 1016#: sequencer.c:880 sequencer.c:1014
c04f5ac3 1017msgid "no cherry-pick or revert in progress"
195febda 1018msgstr "拣选或还原操作并未进行"
c04f5ac3 1019
1003b3a5 1020#: sequencer.c:882
c04f5ac3
JX
1021msgid "cannot resolve HEAD"
1022msgstr "不能解析 HEAD"
1023
1003b3a5 1024#: sequencer.c:884
c04f5ac3 1025msgid "cannot abort from a branch yet to be born"
90e6ef53 1026msgstr "不能从尚未建立的分支终止"
c04f5ac3 1027
1003b3a5 1028#: sequencer.c:906 builtin/apply.c:4060
c04f5ac3
JX
1029#, c-format
1030msgid "cannot open %s: %s"
1031msgstr "不能打开 %s:%s"
1032
1003b3a5 1033#: sequencer.c:909
c04f5ac3
JX
1034#, c-format
1035msgid "cannot read %s: %s"
1036msgstr "不能读取 %s:%s"
1037
1003b3a5 1038#: sequencer.c:910
c04f5ac3 1039msgid "unexpected end of file"
9aafc933 1040msgstr "意外的文件结束"
c04f5ac3 1041
1003b3a5 1042#: sequencer.c:916
c04f5ac3
JX
1043#, c-format
1044msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1045msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1046
1003b3a5 1047#: sequencer.c:939
c04f5ac3
JX
1048#, c-format
1049msgid "Could not format %s."
1050msgstr "不能格式化 %s。"
1051
1003b3a5 1052#: sequencer.c:1101
c04f5ac3
JX
1053msgid "Can't revert as initial commit"
1054msgstr "不能作为初始提交还原"
1055
1003b3a5 1056#: sequencer.c:1102
c04f5ac3
JX
1057msgid "Can't cherry-pick into empty head"
1058msgstr "不能拣选到空分支"
1059
1003b3a5 1060#: sha1_name.c:1036
170e9899
JX
1061msgid "HEAD does not point to a branch"
1062msgstr "HEAD 没有指向一个分支"
1063
1003b3a5 1064#: sha1_name.c:1039
170e9899
JX
1065#, c-format
1066msgid "No such branch: '%s'"
1067msgstr "没有此分支:'%s'"
1068
1003b3a5 1069#: sha1_name.c:1041
170e9899
JX
1070#, c-format
1071msgid "No upstream configured for branch '%s'"
1072msgstr "尚未给分支 '%s' 设置上游"
1073
1003b3a5 1074#: sha1_name.c:1044
170e9899
JX
1075#, c-format
1076msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1077msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1078
ef317cd5 1079#: wrapper.c:408
07432cef 1080#, c-format
ef317cd5 1081msgid "unable to access '%s': %s"
07432cef
WS
1082msgstr "不能访问 '%s':%s"
1083
1084#: wrapper.c:423
1085#, c-format
1086msgid "unable to access '%s'"
1087msgstr "不能访问 '%s'"
ef317cd5 1088
07432cef 1089#: wrapper.c:434
d691f479
JX
1090#, c-format
1091msgid "unable to look up current user in the passwd file: %s"
07432cef 1092msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1093
07432cef 1094#: wrapper.c:435
d691f479
JX
1095msgid "no such user"
1096msgstr "无此用户"
1097
23ff3338 1098#: wt-status.c:140
c04f5ac3
JX
1099msgid "Unmerged paths:"
1100msgstr "未合并的路径:"
1101
90e6ef53 1102# 译者:注意保持前导空格
23ff3338 1103#: wt-status.c:167 wt-status.c:194
c04f5ac3
JX
1104#, c-format
1105msgid " (use \"git reset %s <file>...\" to unstage)"
1106msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1107
90e6ef53 1108# 译者:注意保持前导空格
23ff3338 1109#: wt-status.c:169 wt-status.c:196
c04f5ac3
JX
1110msgid " (use \"git rm --cached <file>...\" to unstage)"
1111msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1112
90e6ef53 1113# 译者:注意保持前导空格
23ff3338 1114#: wt-status.c:173
6792b93b
JX
1115msgid " (use \"git add <file>...\" to mark resolution)"
1116msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1117
1118# 译者:注意保持前导空格
23ff3338 1119#: wt-status.c:175 wt-status.c:179
c04f5ac3
JX
1120msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1121msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1122
6792b93b 1123# 译者:注意保持前导空格
23ff3338 1124#: wt-status.c:177
6792b93b
JX
1125msgid " (use \"git rm <file>...\" to mark resolution)"
1126msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1127
23ff3338 1128#: wt-status.c:188
c04f5ac3
JX
1129msgid "Changes to be committed:"
1130msgstr "要提交的变更:"
1131
23ff3338 1132#: wt-status.c:206
c04f5ac3 1133msgid "Changes not staged for commit:"
7e238ab7 1134msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1135
90e6ef53 1136# 译者:注意保持前导空格
23ff3338 1137#: wt-status.c:210
c04f5ac3
JX
1138msgid " (use \"git add <file>...\" to update what will be committed)"
1139msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1140
90e6ef53 1141# 译者:注意保持前导空格
23ff3338 1142#: wt-status.c:212
c04f5ac3
JX
1143msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1144msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1145
90e6ef53 1146# 译者:注意保持前导空格
23ff3338 1147#: wt-status.c:213
c04f5ac3
JX
1148msgid ""
1149" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1150msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1151
90e6ef53 1152# 译者:注意保持前导空格
23ff3338 1153#: wt-status.c:215
c04f5ac3
JX
1154msgid " (commit or discard the untracked or modified content in submodules)"
1155msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1156
90e6ef53 1157# 译者:注意保持前导空格
23ff3338 1158#: wt-status.c:227
c04f5ac3
JX
1159#, c-format
1160msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1161msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1162
23ff3338 1163#: wt-status.c:244
c04f5ac3
JX
1164msgid "bug"
1165msgstr "bug"
1166
23ff3338 1167#: wt-status.c:249
c04f5ac3
JX
1168msgid "both deleted:"
1169msgstr "双方删除:"
1170
23ff3338 1171#: wt-status.c:250
c04f5ac3
JX
1172msgid "added by us:"
1173msgstr "由我们添加:"
1174
23ff3338 1175#: wt-status.c:251
c04f5ac3
JX
1176msgid "deleted by them:"
1177msgstr "由他们删除:"
1178
23ff3338 1179#: wt-status.c:252
c04f5ac3
JX
1180msgid "added by them:"
1181msgstr "由他们添加:"
1182
23ff3338 1183#: wt-status.c:253
c04f5ac3
JX
1184msgid "deleted by us:"
1185msgstr "由我们删除:"
1186
23ff3338 1187#: wt-status.c:254
c04f5ac3
JX
1188msgid "both added:"
1189msgstr "双方添加:"
1190
23ff3338 1191#: wt-status.c:255
c04f5ac3
JX
1192msgid "both modified:"
1193msgstr "双方修改:"
1194
90e6ef53 1195# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1196#: wt-status.c:285
c04f5ac3 1197msgid "new commits, "
aa9565f7 1198msgstr "新提交, "
c04f5ac3 1199
90e6ef53 1200# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1201#: wt-status.c:287
c04f5ac3 1202msgid "modified content, "
aa9565f7 1203msgstr "修改的内容, "
c04f5ac3 1204
90e6ef53 1205# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1206#: wt-status.c:289
c04f5ac3 1207msgid "untracked content, "
aa9565f7 1208msgstr "未跟踪的内容, "
c04f5ac3 1209
90e6ef53 1210# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1211#: wt-status.c:306
c04f5ac3
JX
1212#, c-format
1213msgid "new file: %s"
1214msgstr "新文件: %s"
1215
90e6ef53 1216# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1217#: wt-status.c:309
c04f5ac3
JX
1218#, c-format
1219msgid "copied: %s -> %s"
1220msgstr "拷贝: %s -> %s"
1221
90e6ef53 1222# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1223#: wt-status.c:312
c04f5ac3
JX
1224#, c-format
1225msgid "deleted: %s"
1226msgstr "删除: %s"
1227
90e6ef53 1228# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1229#: wt-status.c:315
c04f5ac3
JX
1230#, c-format
1231msgid "modified: %s"
1232msgstr "修改: %s"
1233
90e6ef53 1234# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1235#: wt-status.c:318
c04f5ac3
JX
1236#, c-format
1237msgid "renamed: %s -> %s"
1238msgstr "重命名: %s -> %s"
1239
90e6ef53 1240# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1241#: wt-status.c:321
c04f5ac3
JX
1242#, c-format
1243msgid "typechange: %s"
1244msgstr "类型变更: %s"
1245
90e6ef53 1246# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1247#: wt-status.c:324
c04f5ac3
JX
1248#, c-format
1249msgid "unknown: %s"
1250msgstr "未知: %s"
1251
90e6ef53 1252# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 1253#: wt-status.c:327
c04f5ac3
JX
1254#, c-format
1255msgid "unmerged: %s"
1256msgstr "未合并: %s"
1257
1003b3a5 1258#: wt-status.c:330
c04f5ac3
JX
1259#, c-format
1260msgid "bug: unhandled diff status %c"
90e6ef53 1261msgstr "bug:未处理的差异状态 %c"
c04f5ac3 1262
1003b3a5 1263#: wt-status.c:805
6792b93b 1264msgid "You have unmerged paths."
195febda 1265msgstr "您有尚未合并的路径。"
6792b93b
JX
1266
1267# 译者:注意保持前导空格
1003b3a5 1268#: wt-status.c:808 wt-status.c:960
6792b93b
JX
1269msgid " (fix conflicts and run \"git commit\")"
1270msgstr " (解决冲突并运行 \"git commit\")"
1271
1003b3a5 1272#: wt-status.c:811
6792b93b
JX
1273msgid "All conflicts fixed but you are still merging."
1274msgstr "所有冲突已解决但您仍处于合并中。"
1275
1276# 译者:注意保持前导空格
1003b3a5 1277#: wt-status.c:814
6792b93b
JX
1278msgid " (use \"git commit\" to conclude merge)"
1279msgstr " (使用 \"git commit\" 结束合并)"
1280
1003b3a5 1281#: wt-status.c:824
6792b93b
JX
1282msgid "You are in the middle of an am session."
1283msgstr "您正处于一个 am 过程中。"
1284
1003b3a5 1285#: wt-status.c:827
6792b93b
JX
1286msgid "The current patch is empty."
1287msgstr "当前的补丁为空。"
1288
1289# 译者:注意保持前导空格
1003b3a5 1290#: wt-status.c:831
6792b93b
JX
1291msgid " (fix conflicts and then run \"git am --resolved\")"
1292msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1293
1294# 译者:注意保持前导空格
1003b3a5 1295#: wt-status.c:833
6792b93b
JX
1296msgid " (use \"git am --skip\" to skip this patch)"
1297msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1298
1299# 译者:注意保持前导空格
1003b3a5 1300#: wt-status.c:835
6792b93b
JX
1301msgid " (use \"git am --abort\" to restore the original branch)"
1302msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1303
1003b3a5 1304#: wt-status.c:895 wt-status.c:912
63af42fe
JX
1305#, c-format
1306msgid "You are currently rebasing branch '%s' on '%s'."
1307msgstr "您正在将分支 '%s' 变基到 '%s'。"
1308
1003b3a5 1309#: wt-status.c:900 wt-status.c:917
6792b93b
JX
1310msgid "You are currently rebasing."
1311msgstr "您正在变基。"
1312
1313# 译者:注意保持前导空格
1003b3a5 1314#: wt-status.c:903
6792b93b
JX
1315msgid " (fix conflicts and then run \"git rebase --continue\")"
1316msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1317
1318# 译者:注意保持前导空格
1003b3a5 1319#: wt-status.c:905
6792b93b
JX
1320msgid " (use \"git rebase --skip\" to skip this patch)"
1321msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1322
1323# 译者:注意保持前导空格
1003b3a5 1324#: wt-status.c:907
6792b93b
JX
1325msgid " (use \"git rebase --abort\" to check out the original branch)"
1326msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1327
1328# 译者:注意保持前导空格
1003b3a5 1329#: wt-status.c:920
6792b93b
JX
1330msgid " (all conflicts fixed: run \"git rebase --continue\")"
1331msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1332
1003b3a5 1333#: wt-status.c:924
63af42fe
JX
1334#, c-format
1335msgid ""
1336"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1337msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1338
1003b3a5 1339#: wt-status.c:929
6792b93b
JX
1340msgid "You are currently splitting a commit during a rebase."
1341msgstr "您正在变基过程中拆分一个提交。"
1342
1343# 译者:注意保持前导空格
1003b3a5 1344#: wt-status.c:932
6792b93b
JX
1345msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1346msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1347
1003b3a5 1348#: wt-status.c:936
63af42fe
JX
1349#, c-format
1350msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1351msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1352
1003b3a5 1353#: wt-status.c:941
6792b93b
JX
1354msgid "You are currently editing a commit during a rebase."
1355msgstr "您正在变基过程中编辑一个提交。"
1356
1357# 译者:注意保持前导空格
1003b3a5 1358#: wt-status.c:944
6792b93b
JX
1359msgid " (use \"git commit --amend\" to amend the current commit)"
1360msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1361
1362# 译者:注意保持前导空格
1003b3a5 1363#: wt-status.c:946
6792b93b
JX
1364msgid ""
1365" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1366msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1367
1003b3a5 1368#: wt-status.c:956
6792b93b
JX
1369msgid "You are currently cherry-picking."
1370msgstr "您正在做拣选操作。"
1371
1372# 译者:注意保持前导空格
1003b3a5 1373#: wt-status.c:963
6792b93b
JX
1374msgid " (all conflicts fixed: run \"git commit\")"
1375msgstr " (解决所有冲突后,执行 \"git commit\")"
1376
1003b3a5
JX
1377#: wt-status.c:972
1378#, c-format
1379msgid "You are currently reverting commit %s."
1380msgstr "您正在反转提交 %s 。"
1381
1382# 译者:注意保持前导空格
1383#: wt-status.c:977
1384msgid " (fix conflicts and run \"git revert --continue\")"
1385msgstr " (解决冲突并运行 \"git revert --continue\")"
1386
1387# 译者:注意保持前导空格
1388#: wt-status.c:980
1389msgid " (all conflicts fixed: run \"git revert --continue\")"
1390msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1391
1392# 译者:注意保持前导空格
1393#: wt-status.c:982
1394msgid " (use \"git revert --abort\" to cancel the revert operation)"
1395msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1396
1397#: wt-status.c:993
63af42fe 1398#, c-format
1003b3a5
JX
1399msgid "You are currently bisecting, started from branch '%s'."
1400msgstr "您正在从分支 '%s' 开始做二分查找。"
63af42fe 1401
1003b3a5 1402#: wt-status.c:997
6792b93b
JX
1403msgid "You are currently bisecting."
1404msgstr "您正在做二分查找。"
1405
1406# 译者:注意保持前导空格
1003b3a5 1407#: wt-status.c:1000
6792b93b
JX
1408msgid " (use \"git bisect reset\" to get back to the original branch)"
1409msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1410
1003b3a5 1411#: wt-status.c:1175
c04f5ac3
JX
1412msgid "On branch "
1413msgstr "位于分支 "
1414
1003b3a5
JX
1415#: wt-status.c:1186
1416msgid "HEAD detached at "
1417msgstr "头指针分离于 "
1418
1419#: wt-status.c:1188
1420msgid "HEAD detached from "
1421msgstr "头指针分离自 "
1422
1423#: wt-status.c:1191
c04f5ac3
JX
1424msgid "Not currently on any branch."
1425msgstr "当前不在任何分支上。"
1426
1003b3a5 1427#: wt-status.c:1208
c04f5ac3
JX
1428msgid "Initial commit"
1429msgstr "初始提交"
1430
1003b3a5 1431#: wt-status.c:1222
ef317cd5 1432msgid "Untracked files"
07432cef 1433msgstr "未跟踪的文件"
c04f5ac3 1434
1003b3a5 1435#: wt-status.c:1224
ef317cd5 1436msgid "Ignored files"
07432cef 1437msgstr "忽略的文件"
c04f5ac3 1438
1003b3a5
JX
1439# 译者:以下三条实际为一个段落
1440#: wt-status.c:1228
1441#, c-format
1442msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
1443msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
1444
1445# 译者:为对齐,下面两句内容有调整
1446#: wt-status.c:1232
1447msgid "may speed it up, but you have to be careful not to forget to add"
1448msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
1449
1450#: wt-status.c:1235
1451msgid "new files yourself (see 'git help status')."
1452msgstr "(参见 'git help status')。"
1453
1454#: wt-status.c:1238
c04f5ac3
JX
1455#, c-format
1456msgid "Untracked files not listed%s"
1457msgstr "未跟踪的文件没有列出%s"
1458
7e238ab7 1459# 译者:中文字符串拼接,可删除前导空格
1003b3a5 1460#: wt-status.c:1240
c04f5ac3 1461msgid " (use -u option to show untracked files)"
7e238ab7 1462msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1463
1003b3a5 1464#: wt-status.c:1246
c04f5ac3
JX
1465msgid "No changes"
1466msgstr "没有修改"
1467
1003b3a5 1468#: wt-status.c:1251
07432cef 1469#, c-format
ef317cd5 1470msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1471msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1472
1003b3a5 1473#: wt-status.c:1254
07432cef 1474#, c-format
ef317cd5 1475msgid "no changes added to commit\n"
07432cef 1476msgstr "修改尚未加入提交\n"
c04f5ac3 1477
1003b3a5 1478#: wt-status.c:1257
07432cef 1479#, c-format
ef317cd5
JX
1480msgid ""
1481"nothing added to commit but untracked files present (use \"git add\" to "
1482"track)\n"
07432cef 1483msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1484
1003b3a5 1485#: wt-status.c:1260
07432cef 1486#, c-format
ef317cd5 1487msgid "nothing added to commit but untracked files present\n"
07432cef 1488msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1489
7e238ab7 1490# 译者:中文字符串拼接,可删除前导空格
1003b3a5 1491#: wt-status.c:1263
07432cef 1492#, c-format
ef317cd5 1493msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1494msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1495
1003b3a5 1496#: wt-status.c:1266 wt-status.c:1271
07432cef 1497#, c-format
ef317cd5 1498msgid "nothing to commit\n"
07432cef 1499msgstr "无文件要提交\n"
ef317cd5 1500
7e238ab7 1501# 译者:中文字符串拼接,可删除前导空格
1003b3a5 1502#: wt-status.c:1269
07432cef 1503#, c-format
ef317cd5 1504msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1505msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1506
7e238ab7 1507# 译者:中文字符串拼接,可删除前导空格
1003b3a5 1508#: wt-status.c:1273
07432cef 1509#, c-format
ef317cd5 1510msgid "nothing to commit, working directory clean\n"
07432cef 1511msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1512
1003b3a5 1513#: wt-status.c:1381
c04f5ac3 1514msgid "HEAD (no branch)"
61bc0753 1515msgstr "HEAD(非分支)"
c04f5ac3 1516
90e6ef53 1517# 译者:注意保持句尾空格
1003b3a5 1518#: wt-status.c:1387
c04f5ac3
JX
1519msgid "Initial commit on "
1520msgstr "初始提交于 "
1521
90e6ef53 1522# 译者:注意保持句尾空格
1003b3a5 1523#: wt-status.c:1402
c04f5ac3
JX
1524msgid "behind "
1525msgstr "落后 "
1526
90e6ef53 1527# 译者:注意保持句尾空格
1003b3a5 1528#: wt-status.c:1405 wt-status.c:1408
c04f5ac3
JX
1529msgid "ahead "
1530msgstr "领先 "
1531
90e6ef53 1532# 译者:注意保持句尾空格
1003b3a5 1533#: wt-status.c:1410
c04f5ac3
JX
1534msgid ", behind "
1535msgstr ",落后 "
1536
1003b3a5 1537#: compat/precompose_utf8.c:58 builtin/clone.c:342
a77c07d9
JX
1538#, c-format
1539msgid "failed to unlink '%s'"
1540msgstr "无法删除 '%s'"
1541
1542#: builtin/add.c:20
1543msgid "git add [options] [--] <pathspec>..."
1544msgstr "git add [选项] [--] <路径匹配>..."
ef317cd5 1545
a77c07d9 1546#: builtin/add.c:63
c04f5ac3
JX
1547#, c-format
1548msgid "unexpected diff status %c"
1549msgstr "意外的差异状态 %c"
1550
1003b3a5 1551#: builtin/add.c:68 builtin/commit.c:233
c04f5ac3
JX
1552msgid "updating files failed"
1553msgstr "更新文件失败"
1554
a77c07d9 1555#: builtin/add.c:78
c04f5ac3
JX
1556#, c-format
1557msgid "remove '%s'\n"
1558msgstr "删除 '%s'\n"
1559
a77c07d9 1560#: builtin/add.c:148
c04f5ac3 1561msgid "Unstaged changes after refreshing the index:"
90e6ef53 1562msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1563
a77c07d9 1564#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
c04f5ac3
JX
1565#, c-format
1566msgid "pathspec '%s' did not match any files"
1567msgstr "路径 '%s' 未匹配任何文件"
1568
a77c07d9 1569#: builtin/add.c:234
c04f5ac3 1570msgid "Could not read the index"
90e6ef53 1571msgstr "不能读取索引"
c04f5ac3 1572
a77c07d9 1573#: builtin/add.c:244
c04f5ac3
JX
1574#, c-format
1575msgid "Could not open '%s' for writing."
195febda 1576msgstr "不能打开 '%s' 以写入。"
c04f5ac3 1577
a77c07d9 1578#: builtin/add.c:248
c04f5ac3 1579msgid "Could not write patch"
195febda 1580msgstr "不能生成补丁"
c04f5ac3 1581
a77c07d9 1582#: builtin/add.c:253
c04f5ac3
JX
1583#, c-format
1584msgid "Could not stat '%s'"
90e6ef53 1585msgstr "不能查看文件状态 '%s'"
c04f5ac3 1586
a77c07d9 1587#: builtin/add.c:255
c04f5ac3
JX
1588msgid "Empty patch. Aborted."
1589msgstr "空补丁。异常终止。"
1590
a77c07d9 1591#: builtin/add.c:261
8ada9598
JX
1592#, c-format
1593msgid "Could not apply '%s'"
1594msgstr "不能应用 '%s'"
1595
a77c07d9 1596#: builtin/add.c:271
8ada9598 1597msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 1598msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 1599
a77c07d9
JX
1600#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1601#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
07432cef 1602#: builtin/rm.c:206
ef317cd5 1603msgid "dry run"
07432cef 1604msgstr "演习"
ef317cd5 1605
1003b3a5
JX
1606#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19
1607#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
1608#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112
ef317cd5
JX
1609msgid "be verbose"
1610msgstr "冗长输出"
1611
a77c07d9 1612#: builtin/add.c:280
ef317cd5 1613msgid "interactive picking"
07432cef 1614msgstr "交互式拣选"
ef317cd5 1615
1003b3a5 1616#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258
ef317cd5 1617msgid "select hunks interactively"
07432cef 1618msgstr "交互式挑选数据块"
ef317cd5 1619
a77c07d9 1620#: builtin/add.c:282
ef317cd5 1621msgid "edit current diff and apply"
07432cef 1622msgstr "编辑当前差异并应用"
ef317cd5 1623
a77c07d9 1624#: builtin/add.c:283
ef317cd5 1625msgid "allow adding otherwise ignored files"
07432cef 1626msgstr "允许添加忽略的文件"
ef317cd5 1627
a77c07d9 1628#: builtin/add.c:284
ef317cd5 1629msgid "update tracked files"
07432cef 1630msgstr "更新已跟踪的文件"
ef317cd5 1631
a77c07d9 1632#: builtin/add.c:285
ef317cd5 1633msgid "record only the fact that the path will be added later"
07432cef 1634msgstr "只记录,该路径稍后再添加"
ef317cd5 1635
a77c07d9 1636#: builtin/add.c:286
ef317cd5 1637msgid "add changes from all tracked and untracked files"
07432cef 1638msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 1639
a77c07d9 1640#: builtin/add.c:287
ef317cd5 1641msgid "don't add, only refresh the index"
07432cef 1642msgstr "不添加,只刷新索引"
ef317cd5 1643
a77c07d9 1644#: builtin/add.c:288
ef317cd5 1645msgid "just skip files which cannot be added because of errors"
07432cef 1646msgstr "跳过因出错不能添加的文件"
ef317cd5 1647
a77c07d9 1648#: builtin/add.c:289
ef317cd5 1649msgid "check if - even missing - files are ignored in dry run"
07432cef 1650msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 1651
a77c07d9 1652#: builtin/add.c:311
8ada9598
JX
1653#, c-format
1654msgid "Use -f if you really want to add them.\n"
1655msgstr "使用 -f 参数如果您确实要添加它们。\n"
1656
a77c07d9 1657#: builtin/add.c:312
8ada9598
JX
1658msgid "no files added"
1659msgstr "没有文件被添加"
1660
a77c07d9 1661#: builtin/add.c:318
8ada9598
JX
1662msgid "adding files failed"
1663msgstr "添加文件失败"
1664
a77c07d9
JX
1665# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1666#.
1667#. * To be consistent with "git add -p" and most Git
1668#. * commands, we should default to being tree-wide, but
1669#. * this is not the original behavior and can't be
1670#. * changed until users trained themselves not to type
1671#. * "git add -u" or "git add -A". For now, we warn and
1003b3a5
JX
1672#. * keep the old behavior. Later, the behavior can be changed
1673#. * to tree-wide, keeping the warning for a while, and
1674#. * eventually we can drop the warning.
a77c07d9
JX
1675#.
1676#: builtin/add.c:335
1677#, c-format
1678msgid ""
1679"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1680"subdirectory of the tree will change in Git 2.0 and should not be used "
1681"anymore.\n"
1682"To add content for the whole tree, run:\n"
1683"\n"
1684" git add %s :/\n"
1685" (or git add %s :/)\n"
1686"\n"
1687"To restrict the command to the current directory, run:\n"
1688"\n"
1689" git add %s .\n"
1690" (or git add %s .)\n"
1691"\n"
1692"With the current Git version, the command is restricted to the current "
1693"directory."
1694msgstr ""
1695"在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1696"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1697"如果要添加整个目录树的内容,执行:\n"
1698"\n"
1699" git add %s :/\n"
1700" (或 git add %s :/)\n"
1701"\n"
1702"如果要限制该命令只作用于当前目录,执行:\n"
1703"\n"
1704" git add %s .\n"
1705" (或 git add %s .)\n"
1706"\n"
1707"对于当前版本的 Git,这条命令只作用于当前目录。"
1708
1709#: builtin/add.c:381
8ada9598
JX
1710msgid "-A and -u are mutually incompatible"
1711msgstr "-A 和 -u 选项互斥"
1712
a77c07d9 1713#: builtin/add.c:383
8ada9598 1714msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 1715msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 1716
ef317cd5 1717#: builtin/add.c:414
8ada9598
JX
1718#, c-format
1719msgid "Nothing specified, nothing added.\n"
1720msgstr "没有指定文件,也没有文件被添加。\n"
1721
ef317cd5 1722#: builtin/add.c:415
8ada9598
JX
1723#, c-format
1724msgid "Maybe you wanted to say 'git add .'?\n"
1725msgstr "也许您想要执行 'git add .'?\n"
1726
a77c07d9 1727#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1003b3a5 1728#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
8ada9598
JX
1729msgid "index file corrupt"
1730msgstr "索引文件损坏"
1731
1003b3a5 1732#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
8ada9598
JX
1733msgid "Unable to write new index file"
1734msgstr "无法写入新索引文件"
1735
23ff3338 1736#: builtin/apply.c:57
8ada9598 1737msgid "git apply [options] [<patch>...]"
81809b99 1738msgstr "git apply [选项] [<补丁>...]"
8ada9598 1739
23ff3338 1740#: builtin/apply.c:110
81809b99 1741#, c-format
8ada9598 1742msgid "unrecognized whitespace option '%s'"
81809b99 1743msgstr "未能识别的空白字符选项 '%s'"
8ada9598 1744
23ff3338 1745#: builtin/apply.c:125
81809b99 1746#, c-format
8ada9598 1747msgid "unrecognized whitespace ignore option '%s'"
81809b99 1748msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 1749
c160d03f 1750#: builtin/apply.c:823
8ada9598
JX
1751#, c-format
1752msgid "Cannot prepare timestamp regexp %s"
81809b99 1753msgstr "无法准备时间戳正则表达式 %s"
8ada9598 1754
c160d03f 1755#: builtin/apply.c:832
8ada9598
JX
1756#, c-format
1757msgid "regexec returned %d for input: %s"
81809b99 1758msgstr "regexec 返回 %d,输入为:%s"
8ada9598 1759
c160d03f 1760#: builtin/apply.c:913
81809b99 1761#, c-format
8ada9598 1762msgid "unable to find filename in patch at line %d"
81809b99 1763msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 1764
c160d03f 1765#: builtin/apply.c:945
8ada9598
JX
1766#, c-format
1767msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 1768msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 1769
c160d03f 1770#: builtin/apply.c:949
8ada9598
JX
1771#, c-format
1772msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 1773msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 1774
c160d03f 1775#: builtin/apply.c:950
8ada9598
JX
1776#, c-format
1777msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 1778msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 1779
c160d03f 1780#: builtin/apply.c:957
8ada9598
JX
1781#, c-format
1782msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 1783msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 1784
a77c07d9 1785#: builtin/apply.c:1422
8ada9598
JX
1786#, c-format
1787msgid "recount: unexpected line: %.*s"
81809b99 1788msgstr "recount:意外的行:%.*s"
8ada9598 1789
a77c07d9 1790#: builtin/apply.c:1479
8ada9598
JX
1791#, c-format
1792msgid "patch fragment without header at line %d: %.*s"
81809b99 1793msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 1794
a77c07d9 1795#: builtin/apply.c:1496
8ada9598
JX
1796#, c-format
1797msgid ""
1798"git diff header lacks filename information when removing %d leading pathname "
1799"component (line %d)"
1800msgid_plural ""
1801"git diff header lacks filename information when removing %d leading pathname "
1802"components (line %d)"
5ae481e0
JX
1803msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1804msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 1805
a77c07d9 1806#: builtin/apply.c:1656
8ada9598 1807msgid "new file depends on old contents"
81809b99 1808msgstr "新文件依赖旧内容"
8ada9598 1809
a77c07d9 1810#: builtin/apply.c:1658
8ada9598 1811msgid "deleted file still has contents"
81809b99 1812msgstr "删除的文件仍有内容"
8ada9598 1813
a77c07d9 1814#: builtin/apply.c:1684
8ada9598
JX
1815#, c-format
1816msgid "corrupt patch at line %d"
195febda 1817msgstr "补丁在第 %d 行损坏"
8ada9598 1818
a77c07d9 1819#: builtin/apply.c:1720
8ada9598
JX
1820#, c-format
1821msgid "new file %s depends on old contents"
81809b99 1822msgstr "新文件 %s 依赖旧内容"
8ada9598 1823
a77c07d9 1824#: builtin/apply.c:1722
8ada9598
JX
1825#, c-format
1826msgid "deleted file %s still has contents"
81809b99 1827msgstr "删除的文件 %s 仍有内容"
8ada9598 1828
a77c07d9 1829#: builtin/apply.c:1725
8ada9598
JX
1830#, c-format
1831msgid "** warning: file %s becomes empty but is not deleted"
81809b99 1832msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 1833
a77c07d9 1834#: builtin/apply.c:1871
8ada9598
JX
1835#, c-format
1836msgid "corrupt binary patch at line %d: %.*s"
81809b99 1837msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598
JX
1838
1839#. there has to be one hunk (forward hunk)
a77c07d9 1840#: builtin/apply.c:1900
8ada9598
JX
1841#, c-format
1842msgid "unrecognized binary patch at line %d"
81809b99 1843msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 1844
a77c07d9 1845#: builtin/apply.c:1986
8ada9598
JX
1846#, c-format
1847msgid "patch with only garbage at line %d"
81809b99 1848msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 1849
a77c07d9 1850#: builtin/apply.c:2076
81809b99 1851#, c-format
8ada9598 1852msgid "unable to read symlink %s"
81809b99 1853msgstr "无法读取符号链接 %s"
8ada9598 1854
a77c07d9 1855#: builtin/apply.c:2080
81809b99 1856#, c-format
8ada9598 1857msgid "unable to open or read %s"
81809b99 1858msgstr "不能打开或读取 %s"
8ada9598 1859
1003b3a5 1860#: builtin/apply.c:2688
81809b99 1861#, c-format
8ada9598 1862msgid "invalid start of line: '%c'"
81809b99 1863msgstr "无效的行首字符:'%c'"
8ada9598 1864
1003b3a5 1865#: builtin/apply.c:2806
8ada9598
JX
1866#, c-format
1867msgid "Hunk #%d succeeded at %d (offset %d line)."
1868msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
1869msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1870msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 1871
1003b3a5 1872#: builtin/apply.c:2818
8ada9598
JX
1873#, c-format
1874msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 1875msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 1876
1003b3a5 1877#: builtin/apply.c:2824
8ada9598
JX
1878#, c-format
1879msgid ""
1880"while searching for:\n"
1881"%.*s"
1882msgstr ""
81809b99
JX
1883"当查询:\n"
1884"%.*s"
8ada9598 1885
1003b3a5 1886#: builtin/apply.c:2843
8ada9598
JX
1887#, c-format
1888msgid "missing binary patch data for '%s'"
81809b99 1889msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 1890
1003b3a5 1891#: builtin/apply.c:2946
8ada9598
JX
1892#, c-format
1893msgid "binary patch does not apply to '%s'"
81809b99 1894msgstr "二进制补丁未应用到 '%s'"
8ada9598 1895
1003b3a5 1896#: builtin/apply.c:2952
8ada9598
JX
1897#, c-format
1898msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 1899msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 1900
1003b3a5 1901#: builtin/apply.c:2973
8ada9598
JX
1902#, c-format
1903msgid "patch failed: %s:%ld"
81809b99 1904msgstr "打补丁失败:%s:%ld"
8ada9598 1905
1003b3a5 1906#: builtin/apply.c:3095
8ada9598 1907#, c-format
23ff3338
JX
1908msgid "cannot checkout %s"
1909msgstr "不能检出 %s"
8ada9598 1910
1003b3a5 1911#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193
81809b99 1912#, c-format
8ada9598 1913msgid "read of %s failed"
81809b99 1914msgstr "读取 %s 失败"
8ada9598 1915
1003b3a5 1916#: builtin/apply.c:3173 builtin/apply.c:3395
81809b99 1917#, c-format
23ff3338
JX
1918msgid "path %s has been renamed/deleted"
1919msgstr "路径 %s 已经被重命名/删除"
8ada9598 1920
1003b3a5 1921#: builtin/apply.c:3254 builtin/apply.c:3409
8ada9598 1922#, c-format
23ff3338
JX
1923msgid "%s: does not exist in index"
1924msgstr "%s:不存在于索引中"
8ada9598 1925
1003b3a5 1926#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423
81809b99 1927#, c-format
8ada9598 1928msgid "%s: %s"
81809b99 1929msgstr "%s:%s"
8ada9598 1930
1003b3a5 1931#: builtin/apply.c:3263 builtin/apply.c:3417
81809b99 1932#, c-format
8ada9598 1933msgid "%s: does not match index"
81809b99 1934msgstr "%s:和索引不匹配"
8ada9598 1935
1003b3a5 1936#: builtin/apply.c:3365
23ff3338
JX
1937msgid "removal patch leaves file contents"
1938msgstr "移除补丁仍留下了文件内容"
1939
1003b3a5 1940#: builtin/apply.c:3434
8ada9598
JX
1941#, c-format
1942msgid "%s: wrong type"
81809b99 1943msgstr "%s:错误类型"
8ada9598 1944
1003b3a5 1945#: builtin/apply.c:3436
8ada9598
JX
1946#, c-format
1947msgid "%s has type %o, expected %o"
9aafc933 1948msgstr "%s 的类型是 %o,应为 %o"
8ada9598 1949
1003b3a5 1950#: builtin/apply.c:3537
81809b99 1951#, c-format
8ada9598 1952msgid "%s: already exists in index"
81809b99 1953msgstr "%s:已经存在于索引中"
8ada9598 1954
1003b3a5 1955#: builtin/apply.c:3540
23ff3338
JX
1956#, c-format
1957msgid "%s: already exists in working directory"
1958msgstr "%s:已经存在于工作区中"
1959
1003b3a5 1960#: builtin/apply.c:3560
d691f479
JX
1961#, c-format
1962msgid "new mode (%o) of %s does not match old mode (%o)"
1963msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 1964
1003b3a5 1965#: builtin/apply.c:3565
8ada9598 1966#, c-format
d691f479
JX
1967msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1968msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1969
1003b3a5 1970#: builtin/apply.c:3573
d691f479 1971#, c-format
8ada9598 1972msgid "%s: patch does not apply"
81809b99 1973msgstr "%s:补丁未应用"
8ada9598 1974
1003b3a5 1975#: builtin/apply.c:3586
8ada9598
JX
1976#, c-format
1977msgid "Checking patch %s..."
81809b99 1978msgstr "检查补丁 %s..."
8ada9598 1979
1003b3a5 1980#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124
8ada9598
JX
1981#, c-format
1982msgid "make_cache_entry failed for path '%s'"
1983msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1984
1003b3a5 1985#: builtin/apply.c:3822
81809b99 1986#, c-format
8ada9598 1987msgid "unable to remove %s from index"
81809b99 1988msgstr "不能从索引中移除 %s"
8ada9598 1989
1003b3a5 1990#: builtin/apply.c:3850
8ada9598
JX
1991#, c-format
1992msgid "corrupt patch for subproject %s"
81809b99 1993msgstr "子项目 %s 损坏的补丁"
8ada9598 1994
1003b3a5 1995#: builtin/apply.c:3854
81809b99 1996#, c-format
8ada9598 1997msgid "unable to stat newly created file '%s'"
81809b99 1998msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 1999
1003b3a5 2000#: builtin/apply.c:3859
8ada9598
JX
2001#, c-format
2002msgid "unable to create backing store for newly created file %s"
81809b99 2003msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2004
1003b3a5 2005#: builtin/apply.c:3862 builtin/apply.c:3970
81809b99 2006#, c-format
8ada9598 2007msgid "unable to add cache entry for %s"
81809b99 2008msgstr "无法为 %s 添加缓存条目"
8ada9598 2009
1003b3a5 2010#: builtin/apply.c:3895
81809b99 2011#, c-format
8ada9598 2012msgid "closing file '%s'"
81809b99 2013msgstr "关闭文件 '%s'"
8ada9598 2014
1003b3a5 2015#: builtin/apply.c:3944
81809b99 2016#, c-format
8ada9598 2017msgid "unable to write file '%s' mode %o"
81809b99 2018msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2019
1003b3a5 2020#: builtin/apply.c:4031
8ada9598
JX
2021#, c-format
2022msgid "Applied patch %s cleanly."
81809b99 2023msgstr "成功应用补丁 %s。"
8ada9598 2024
1003b3a5 2025#: builtin/apply.c:4039
8ada9598 2026msgid "internal error"
81809b99 2027msgstr "内部错误"
8ada9598
JX
2028
2029#. Say this even without --verbose
1003b3a5 2030#: builtin/apply.c:4042
8ada9598
JX
2031#, c-format
2032msgid "Applying patch %%s with %d reject..."
2033msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2034msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2035msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2036
1003b3a5 2037#: builtin/apply.c:4052
8ada9598
JX
2038#, c-format
2039msgid "truncating .rej filename to %.*s.rej"
81809b99 2040msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2041
1003b3a5 2042#: builtin/apply.c:4073
8ada9598
JX
2043#, c-format
2044msgid "Hunk #%d applied cleanly."
81809b99 2045msgstr "第 #%d 个片段成功应用。"
8ada9598 2046
1003b3a5 2047#: builtin/apply.c:4076
8ada9598
JX
2048#, c-format
2049msgid "Rejected hunk #%d."
81809b99 2050msgstr "拒绝第 #%d 个片段。"
8ada9598 2051
1003b3a5 2052#: builtin/apply.c:4226
8ada9598 2053msgid "unrecognized input"
81809b99 2054msgstr "未能识别的输入"
8ada9598 2055
1003b3a5 2056#: builtin/apply.c:4237
8ada9598 2057msgid "unable to read index file"
81809b99 2058msgstr "无法读取索引文件"
8ada9598 2059
1003b3a5 2060#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92
ef317cd5 2061#: builtin/fetch.c:63
8ada9598 2062msgid "path"
81809b99 2063msgstr "路径"
8ada9598 2064
1003b3a5 2065#: builtin/apply.c:4357
8ada9598 2066msgid "don't apply changes matching the given path"
81809b99 2067msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2068
1003b3a5 2069#: builtin/apply.c:4360
8ada9598 2070msgid "apply changes matching the given path"
81809b99 2071msgstr "应用与给出路径向匹配的变更"
8ada9598 2072
1003b3a5 2073#: builtin/apply.c:4362
8ada9598 2074msgid "num"
81809b99 2075msgstr "数字"
8ada9598 2076
1003b3a5 2077#: builtin/apply.c:4363
8ada9598 2078msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2079msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2080
1003b3a5 2081#: builtin/apply.c:4366
8ada9598 2082msgid "ignore additions made by the patch"
81809b99 2083msgstr "忽略补丁中的添加的文件"
8ada9598 2084
1003b3a5 2085#: builtin/apply.c:4368
8ada9598 2086msgid "instead of applying the patch, output diffstat for the input"
81809b99 2087msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2088
1003b3a5 2089#: builtin/apply.c:4372
ef317cd5 2090msgid "show number of added and deleted lines in decimal notation"
07432cef 2091msgstr "以十进制数显示添加和删除的行数"
8ada9598 2092
1003b3a5 2093#: builtin/apply.c:4374
8ada9598 2094msgid "instead of applying the patch, output a summary for the input"
81809b99 2095msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2096
1003b3a5 2097#: builtin/apply.c:4376
8ada9598 2098msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2099msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2100
1003b3a5 2101#: builtin/apply.c:4378
8ada9598 2102msgid "make sure the patch is applicable to the current index"
81809b99 2103msgstr "确认补丁可以应用到当前索引"
8ada9598 2104
1003b3a5 2105#: builtin/apply.c:4380
8ada9598 2106msgid "apply a patch without touching the working tree"
81809b99 2107msgstr "应用补丁而不修改工作区"
8ada9598 2108
1003b3a5 2109#: builtin/apply.c:4382
8ada9598 2110msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2111msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2112
1003b3a5 2113#: builtin/apply.c:4384
23ff3338
JX
2114msgid "attempt three-way merge if a patch does not apply"
2115msgstr "如果一个补丁不能应用则尝试三路合并"
2116
1003b3a5 2117#: builtin/apply.c:4386
8ada9598 2118msgid "build a temporary index based on embedded index information"
81809b99 2119msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2120
1003b3a5 2121#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463
8ada9598 2122msgid "paths are separated with NUL character"
81809b99 2123msgstr "路径以 NUL 字符分隔"
8ada9598 2124
1003b3a5 2125#: builtin/apply.c:4391
8ada9598 2126msgid "ensure at least <n> lines of context match"
81809b99 2127msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2128
1003b3a5 2129#: builtin/apply.c:4392
8ada9598 2130msgid "action"
81809b99 2131msgstr "动作"
8ada9598 2132
1003b3a5 2133#: builtin/apply.c:4393
8ada9598 2134msgid "detect new or modified lines that have whitespace errors"
81809b99 2135msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2136
1003b3a5 2137#: builtin/apply.c:4396 builtin/apply.c:4399
8ada9598 2138msgid "ignore changes in whitespace when finding context"
81809b99 2139msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2140
1003b3a5 2141#: builtin/apply.c:4402
8ada9598 2142msgid "apply the patch in reverse"
81809b99 2143msgstr "反向应用补丁"
8ada9598 2144
1003b3a5 2145#: builtin/apply.c:4404
8ada9598 2146msgid "don't expect at least one line of context"
81809b99 2147msgstr "无需至少一行上下文"
8ada9598 2148
1003b3a5 2149#: builtin/apply.c:4406
8ada9598 2150msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2151msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2152
1003b3a5 2153#: builtin/apply.c:4408
8ada9598 2154msgid "allow overlapping hunks"
81809b99 2155msgstr "允许重叠的补丁片段"
8ada9598 2156
1003b3a5 2157#: builtin/apply.c:4411
8ada9598 2158msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2159msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2160
1003b3a5 2161#: builtin/apply.c:4414
8ada9598 2162msgid "do not trust the line counts in the hunk headers"
81809b99 2163msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2164
1003b3a5 2165#: builtin/apply.c:4416
8ada9598 2166msgid "root"
81809b99 2167msgstr "根目录"
c04f5ac3 2168
1003b3a5 2169#: builtin/apply.c:4417
8ada9598 2170msgid "prepend <root> to all filenames"
81809b99 2171msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2172
1003b3a5 2173#: builtin/apply.c:4439
23ff3338
JX
2174msgid "--3way outside a repository"
2175msgstr "--3way 在一个版本库之外"
2176
1003b3a5 2177#: builtin/apply.c:4447
8ada9598 2178msgid "--index outside a repository"
81809b99 2179msgstr "--index 在一个版本库之外"
c04f5ac3 2180
1003b3a5 2181#: builtin/apply.c:4450
8ada9598 2182msgid "--cached outside a repository"
81809b99 2183msgstr "--cached 在一个版本库之外"
c04f5ac3 2184
1003b3a5 2185#: builtin/apply.c:4466
81809b99 2186#, c-format
8ada9598 2187msgid "can't open patch '%s'"
81809b99 2188msgstr "不能打开补丁 '%s'"
c04f5ac3 2189
1003b3a5 2190#: builtin/apply.c:4480
c04f5ac3 2191#, c-format
8ada9598
JX
2192msgid "squelched %d whitespace error"
2193msgid_plural "squelched %d whitespace errors"
81809b99 2194msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2195msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2196
1003b3a5 2197#: builtin/apply.c:4486 builtin/apply.c:4496
8ada9598
JX
2198#, c-format
2199msgid "%d line adds whitespace errors."
2200msgid_plural "%d lines add whitespace errors."
81809b99 2201msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2202msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2203
2204#: builtin/archive.c:17
2205#, c-format
2206msgid "could not create archive file '%s'"
90e6ef53 2207msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2208
2209#: builtin/archive.c:20
2210msgid "could not redirect output"
195febda 2211msgstr "不能重定向输出"
c04f5ac3
JX
2212
2213#: builtin/archive.c:37
2214msgid "git archive: Remote with no URL"
90e6ef53 2215msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2216
2217#: builtin/archive.c:58
2218msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2219msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3 2220
1003b3a5 2221#: builtin/archive.c:61
c04f5ac3
JX
2222#, c-format
2223msgid "git archive: NACK %s"
90e6ef53 2224msgstr "git archive:NACK %s"
c04f5ac3 2225
1003b3a5 2226#: builtin/archive.c:63
c04f5ac3
JX
2227#, c-format
2228msgid "remote error: %s"
2229msgstr "远程错误:%s"
2230
1003b3a5 2231#: builtin/archive.c:64
c04f5ac3 2232msgid "git archive: protocol error"
90e6ef53 2233msgstr "git archive:协议错误"
c04f5ac3 2234
1003b3a5 2235#: builtin/archive.c:68
c04f5ac3 2236msgid "git archive: expected a flush"
195febda 2237msgstr "git archive:应为刷新"
c04f5ac3 2238
ef317cd5
JX
2239#: builtin/bisect--helper.c:7
2240msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2241msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2242
2243#: builtin/bisect--helper.c:17
2244msgid "perform 'git bisect next'"
07432cef 2245msgstr "执行 'git bisect next'"
ef317cd5
JX
2246
2247#: builtin/bisect--helper.c:19
2248msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2249msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5
JX
2250
2251#: builtin/blame.c:25
2252msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2253msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5
JX
2254
2255#: builtin/blame.c:30 builtin/shortlog.c:15
2256msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2257msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2258
a77c07d9 2259#: builtin/blame.c:2350
ef317cd5 2260msgid "Show blame entries as we find them, incrementally"
07432cef 2261msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2262
a77c07d9 2263#: builtin/blame.c:2351
ef317cd5 2264msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2265msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2266
a77c07d9 2267#: builtin/blame.c:2352
ef317cd5 2268msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2269msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2270
a77c07d9 2271#: builtin/blame.c:2353
ef317cd5 2272msgid "Show work cost statistics"
07432cef 2273msgstr "显示命令消耗统计"
ef317cd5 2274
a77c07d9 2275#: builtin/blame.c:2354
ef317cd5 2276msgid "Show output score for blame entries"
07432cef 2277msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2278
a77c07d9 2279#: builtin/blame.c:2355
ef317cd5 2280msgid "Show original filename (Default: auto)"
07432cef 2281msgstr "显示原始文件名(默认:自动)"
ef317cd5 2282
a77c07d9 2283#: builtin/blame.c:2356
ef317cd5 2284msgid "Show original linenumber (Default: off)"
07432cef 2285msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2286
a77c07d9 2287#: builtin/blame.c:2357
ef317cd5 2288msgid "Show in a format designed for machine consumption"
07432cef 2289msgstr "显示为一个适合机器读取的格式"
ef317cd5 2290
a77c07d9 2291#: builtin/blame.c:2358
ef317cd5 2292msgid "Show porcelain format with per-line commit information"
07432cef 2293msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2294
a77c07d9 2295#: builtin/blame.c:2359
ef317cd5 2296msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2297msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2298
a77c07d9 2299#: builtin/blame.c:2360
ef317cd5 2300msgid "Show raw timestamp (Default: off)"
07432cef 2301msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2302
a77c07d9 2303#: builtin/blame.c:2361
ef317cd5 2304msgid "Show long commit SHA1 (Default: off)"
07432cef 2305msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2306
a77c07d9 2307#: builtin/blame.c:2362
ef317cd5 2308msgid "Suppress author name and timestamp (Default: off)"
07432cef 2309msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2310
a77c07d9 2311#: builtin/blame.c:2363
ef317cd5 2312msgid "Show author email instead of name (Default: off)"
07432cef 2313msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2314
a77c07d9 2315#: builtin/blame.c:2364
ef317cd5 2316msgid "Ignore whitespace differences"
07432cef 2317msgstr "忽略空白差异"
ef317cd5 2318
a77c07d9 2319#: builtin/blame.c:2365
ef317cd5 2320msgid "Spend extra cycles to find better match"
07432cef 2321msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2322
a77c07d9 2323#: builtin/blame.c:2366
ef317cd5 2324msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2325msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2326
a77c07d9 2327#: builtin/blame.c:2367
ef317cd5 2328msgid "Use <file>'s contents as the final image"
07432cef 2329msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2330
a77c07d9 2331#: builtin/blame.c:2368 builtin/blame.c:2369
ef317cd5 2332msgid "score"
07432cef 2333msgstr "得分"
ef317cd5 2334
a77c07d9 2335#: builtin/blame.c:2368
ef317cd5 2336msgid "Find line copies within and across files"
07432cef 2337msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2338
a77c07d9 2339#: builtin/blame.c:2369
ef317cd5 2340msgid "Find line movements within and across files"
07432cef 2341msgstr "找到文件内及跨文件的行移动"
ef317cd5 2342
a77c07d9 2343#: builtin/blame.c:2370
ef317cd5 2344msgid "n,m"
07432cef 2345msgstr "n,m"
ef317cd5 2346
a77c07d9 2347#: builtin/blame.c:2370
ef317cd5 2348msgid "Process only line range n,m, counting from 1"
07432cef 2349msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2350
1003b3a5 2351#: builtin/branch.c:24
ef317cd5 2352msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2353msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5 2354
1003b3a5 2355#: builtin/branch.c:25
ef317cd5 2356msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2357msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2358
1003b3a5 2359#: builtin/branch.c:26
ef317cd5 2360msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2361msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5 2362
1003b3a5 2363#: builtin/branch.c:27
ef317cd5 2364msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2365msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2366
90e6ef53 2367# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1003b3a5 2368#: builtin/branch.c:146
c04f5ac3
JX
2369#, c-format
2370msgid ""
2371"deleting branch '%s' that has been merged to\n"
2372" '%s', but not yet merged to HEAD."
2373msgstr ""
70fc47bf 2374"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2375" '%s',但未合并到 HEAD。"
2376
90e6ef53 2377# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1003b3a5 2378#: builtin/branch.c:150
c04f5ac3
JX
2379#, c-format
2380msgid ""
2381"not deleting branch '%s' that is not yet merged to\n"
2382" '%s', even though it is merged to HEAD."
2383msgstr ""
70fc47bf
T
2384"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2385" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2386
1003b3a5 2387#: builtin/branch.c:164
07432cef
WS
2388#, c-format
2389msgid "Couldn't look up commit object for '%s'"
2390msgstr "无法查询 '%s' 指向的提交对象"
2391
1003b3a5 2392#: builtin/branch.c:168
07432cef
WS
2393#, c-format
2394msgid ""
2395"The branch '%s' is not fully merged.\n"
2396"If you are sure you want to delete it, run 'git branch -D %s'."
2397msgstr ""
2398"分支 '%s' 没有完全合并。\n"
2399"如果您确认要删除它,执行 'git branch -D %s'。"
2400
1003b3a5 2401#: builtin/branch.c:181
07432cef
WS
2402msgid "Update of config-file failed"
2403msgstr "无法更新 config 文件"
2404
1003b3a5 2405#: builtin/branch.c:209
c04f5ac3 2406msgid "cannot use -a with -d"
649900bc 2407msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2408
1003b3a5 2409#: builtin/branch.c:215
c04f5ac3
JX
2410msgid "Couldn't look up commit object for HEAD"
2411msgstr "无法查询 HEAD 指向的提交对象"
2412
1003b3a5 2413#: builtin/branch.c:223
c04f5ac3
JX
2414#, c-format
2415msgid "Cannot delete the branch '%s' which you are currently on."
2416msgstr "无法删除您当前所在的分支 '%s'。"
2417
1003b3a5 2418#: builtin/branch.c:236
5ae481e0 2419#, c-format
8ada9598 2420msgid "remote branch '%s' not found."
81809b99 2421msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2422
1003b3a5 2423#: builtin/branch.c:237
81809b99 2424#, c-format
8ada9598 2425msgid "branch '%s' not found."
81809b99 2426msgstr "分支 '%s' 未发现。"
8ada9598 2427
1003b3a5 2428#: builtin/branch.c:251
81809b99 2429#, c-format
8ada9598 2430msgid "Error deleting remote branch '%s'"
81809b99 2431msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2432
1003b3a5 2433#: builtin/branch.c:252
81809b99 2434#, c-format
8ada9598 2435msgid "Error deleting branch '%s'"
81809b99 2436msgstr "删除分支 '%s' 时出错"
8ada9598 2437
1003b3a5 2438#: builtin/branch.c:259
81809b99 2439#, c-format
8ada9598 2440msgid "Deleted remote branch %s (was %s).\n"
81809b99 2441msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2442
1003b3a5 2443#: builtin/branch.c:260
81809b99 2444#, c-format
8ada9598 2445msgid "Deleted branch %s (was %s).\n"
81809b99 2446msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2447
1003b3a5 2448#: builtin/branch.c:362
c04f5ac3
JX
2449#, c-format
2450msgid "branch '%s' does not point at a commit"
2451msgstr "分支 '%s' 未指向一个提交"
2452
1003b3a5 2453#: builtin/branch.c:434
81809b99 2454#, c-format
8ada9598 2455msgid "[%s: behind %d]"
81809b99 2456msgstr "[%s:落后 %d]"
c04f5ac3 2457
1003b3a5 2458#: builtin/branch.c:436
81809b99 2459#, c-format
8ada9598 2460msgid "[behind %d]"
81809b99 2461msgstr "[落后 %d]"
8ada9598 2462
1003b3a5 2463#: builtin/branch.c:440
81809b99 2464#, c-format
8ada9598 2465msgid "[%s: ahead %d]"
81809b99 2466msgstr "[%s:领先 %d]"
c04f5ac3 2467
1003b3a5 2468#: builtin/branch.c:442
81809b99 2469#, c-format
8ada9598 2470msgid "[ahead %d]"
81809b99 2471msgstr "[领先 %d]"
8ada9598 2472
1003b3a5 2473#: builtin/branch.c:445
81809b99 2474#, c-format
8ada9598 2475msgid "[%s: ahead %d, behind %d]"
81809b99 2476msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2477
1003b3a5 2478#: builtin/branch.c:448
81809b99 2479#, c-format
8ada9598 2480msgid "[ahead %d, behind %d]"
81809b99 2481msgstr "[领先 %d,落后 %d]"
c04f5ac3 2482
1003b3a5 2483#: builtin/branch.c:470
a77c07d9
JX
2484msgid " **** invalid ref ****"
2485msgstr " **** 无效引用 ****"
2486
1003b3a5
JX
2487#: builtin/branch.c:562
2488#, c-format
2489msgid "(no branch, rebasing %s)"
2490msgstr "(非分支,正变基 %s)"
2491
2492#: builtin/branch.c:565
2493#, c-format
2494msgid "(no branch, bisect started on %s)"
2495msgstr "(非分支,二分查找开始于 %s)"
2496
2497#: builtin/branch.c:568
2498#, c-format
2499msgid "(detached from %s)"
2500msgstr "(分离自 %s)"
2501
2502#: builtin/branch.c:571
c04f5ac3
JX
2503msgid "(no branch)"
2504msgstr "(非分支)"
2505
1003b3a5 2506#: builtin/branch.c:617
a77c07d9
JX
2507#, c-format
2508msgid "object '%s' does not point to a commit"
2509msgstr "对象 '%s' 没有指向一个提交"
2510
1003b3a5 2511#: builtin/branch.c:649
c04f5ac3 2512msgid "some refs could not be read"
90e6ef53 2513msgstr "一些引用不能读取"
c04f5ac3 2514
1003b3a5 2515#: builtin/branch.c:662
c04f5ac3 2516msgid "cannot rename the current branch while not on any."
90e6ef53 2517msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2518
1003b3a5 2519#: builtin/branch.c:672
c04f5ac3
JX
2520#, c-format
2521msgid "Invalid branch name: '%s'"
2522msgstr "无效的分支名:'%s'"
2523
1003b3a5 2524#: builtin/branch.c:687
c04f5ac3
JX
2525msgid "Branch rename failed"
2526msgstr "分支重命名失败"
2527
1003b3a5 2528#: builtin/branch.c:691
c04f5ac3
JX
2529#, c-format
2530msgid "Renamed a misnamed branch '%s' away"
2531msgstr "重命名掉一个错误命名的旧分支 '%s'"
2532
1003b3a5 2533#: builtin/branch.c:695
c04f5ac3
JX
2534#, c-format
2535msgid "Branch renamed to %s, but HEAD is not updated!"
2536msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2537
1003b3a5 2538#: builtin/branch.c:702
c04f5ac3
JX
2539msgid "Branch is renamed, but update of config-file failed"
2540msgstr "分支被重命名,但更新 config 文件失败"
2541
1003b3a5 2542#: builtin/branch.c:717
c04f5ac3
JX
2543#, c-format
2544msgid "malformed object name %s"
2545msgstr "非法的对象名 %s"
2546
1003b3a5 2547#: builtin/branch.c:741
81809b99 2548#, c-format
8ada9598 2549msgid "could not write branch description template: %s"
81809b99 2550msgstr "不能写分支描述模版:%s"
c04f5ac3 2551
1003b3a5 2552#: builtin/branch.c:771
ef317cd5 2553msgid "Generic options"
07432cef 2554msgstr "通用选项"
c04f5ac3 2555
1003b3a5 2556#: builtin/branch.c:773
ef317cd5 2557msgid "show hash and subject, give twice for upstream branch"
07432cef 2558msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2559
1003b3a5 2560#: builtin/branch.c:774
ef317cd5 2561msgid "suppress informational messages"
07432cef 2562msgstr "不显示信息"
8ada9598 2563
1003b3a5 2564#: builtin/branch.c:775
ef317cd5 2565msgid "set up tracking mode (see git-pull(1))"
07432cef 2566msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2567
1003b3a5 2568#: builtin/branch.c:777
ef317cd5 2569msgid "change upstream info"
07432cef 2570msgstr "改变上游信息"
c04f5ac3 2571
1003b3a5 2572#: builtin/branch.c:781
ef317cd5 2573msgid "use colored output"
07432cef 2574msgstr "使用彩色输出"
c04f5ac3 2575
1003b3a5 2576#: builtin/branch.c:782
ef317cd5 2577msgid "act on remote-tracking branches"
07432cef 2578msgstr "作用于远程跟踪分支"
c04f5ac3 2579
1003b3a5
JX
2580#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812
2581#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369
2582#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
ef317cd5 2583msgid "commit"
07432cef 2584msgstr "提交"
c04f5ac3 2585
1003b3a5 2586#: builtin/branch.c:786 builtin/branch.c:792
ef317cd5 2587msgid "print only branches that contain the commit"
07432cef 2588msgstr "只打印包含该提交的分支"
c04f5ac3 2589
1003b3a5 2590#: builtin/branch.c:798
ef317cd5 2591msgid "Specific git-branch actions:"
07432cef 2592msgstr "具体的 git-branch 动作:"
c04f5ac3 2593
1003b3a5 2594#: builtin/branch.c:799
ef317cd5 2595msgid "list both remote-tracking and local branches"
07432cef 2596msgstr "列出远程跟踪及本地分支"
c04f5ac3 2597
1003b3a5 2598#: builtin/branch.c:801
ef317cd5 2599msgid "delete fully merged branch"
07432cef 2600msgstr "删除完全合并的分支"
c04f5ac3 2601
1003b3a5 2602#: builtin/branch.c:802
ef317cd5 2603msgid "delete branch (even if not merged)"
07432cef 2604msgstr "删除分支(即使没有合并)"
c04f5ac3 2605
1003b3a5 2606#: builtin/branch.c:803
ef317cd5 2607msgid "move/rename a branch and its reflog"
07432cef 2608msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 2609
1003b3a5 2610#: builtin/branch.c:804
ef317cd5 2611msgid "move/rename a branch, even if target exists"
07432cef 2612msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 2613
1003b3a5 2614#: builtin/branch.c:805
ef317cd5 2615msgid "list branch names"
07432cef 2616msgstr "列出分支名"
c04f5ac3 2617
1003b3a5 2618#: builtin/branch.c:806
ef317cd5 2619msgid "create the branch's reflog"
07432cef 2620msgstr "创建分支的引用日志"
ef317cd5 2621
1003b3a5 2622#: builtin/branch.c:808
ef317cd5 2623msgid "edit the description for the branch"
07432cef 2624msgstr "标记分支的描述"
ef317cd5 2625
1003b3a5 2626#: builtin/branch.c:809
ef317cd5 2627msgid "force creation (when already exists)"
07432cef 2628msgstr "强制创建(当已经存在)"
ef317cd5 2629
1003b3a5 2630#: builtin/branch.c:812
ef317cd5 2631msgid "print only not merged branches"
07432cef 2632msgstr "只打印没有合并的分支"
ef317cd5 2633
1003b3a5 2634#: builtin/branch.c:818
ef317cd5 2635msgid "print only merged branches"
07432cef 2636msgstr "只打印合并的分支"
ef317cd5 2637
1003b3a5 2638#: builtin/branch.c:822
ef317cd5 2639msgid "list branches in columns"
07432cef 2640msgstr "以列的方式显示分支"
ef317cd5 2641
1003b3a5 2642#: builtin/branch.c:835
c04f5ac3
JX
2643msgid "Failed to resolve HEAD as a valid ref."
2644msgstr "无法将 HEAD 解析为有效引用。"
2645
1003b3a5 2646#: builtin/branch.c:840 builtin/clone.c:609
c04f5ac3 2647msgid "HEAD not found below refs/heads!"
90e6ef53 2648msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 2649
1003b3a5 2650#: builtin/branch.c:863
8ada9598 2651msgid "--column and --verbose are incompatible"
81809b99 2652msgstr "--column 和 --verbose 不兼容"
8ada9598 2653
1003b3a5 2654#: builtin/branch.c:869 builtin/branch.c:908
a77c07d9
JX
2655msgid "branch name required"
2656msgstr "必须提供分支名"
2657
1003b3a5 2658#: builtin/branch.c:884
a77c07d9
JX
2659msgid "Cannot give description to detached HEAD"
2660msgstr "不能向分离头指针提供描述"
2661
1003b3a5 2662#: builtin/branch.c:889
a77c07d9
JX
2663msgid "cannot edit description of more than one branch"
2664msgstr "不能为一个以上的分支编辑描述"
2665
1003b3a5 2666#: builtin/branch.c:896
a77c07d9
JX
2667#, c-format
2668msgid "No commit on branch '%s' yet."
2669msgstr "分支 '%s' 尚无提交。"
2670
1003b3a5 2671#: builtin/branch.c:899
a77c07d9
JX
2672#, c-format
2673msgid "No branch named '%s'."
2674msgstr "没有分支 '%s'。"
2675
1003b3a5 2676#: builtin/branch.c:914
a77c07d9
JX
2677msgid "too many branches for a rename operation"
2678msgstr "为重命名操作提供了太多的分支名"
2679
1003b3a5
JX
2680#: builtin/branch.c:919
2681msgid "too many branches to set new upstream"
2682msgstr "为设置新上游提供了太多的分支名"
2683
2684#: builtin/branch.c:923
2685#, c-format
2686msgid ""
2687"could not set upstream of HEAD to %s when it does not point to any branch."
2688msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
2689
2690#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970
2691#, c-format
2692msgid "no such branch '%s'"
2693msgstr "没有此分支 '%s'"
2694
2695#: builtin/branch.c:930
07432cef 2696#, c-format
ef317cd5 2697msgid "branch '%s' does not exist"
07432cef 2698msgstr "分支 '%s' 不存在"
ef317cd5 2699
1003b3a5
JX
2700#: builtin/branch.c:942
2701msgid "too many branches to unset upstream"
2702msgstr "为取消上游设置操作提供了太多的分支名"
2703
2704#: builtin/branch.c:946
2705msgid "could not unset upstream of HEAD when it does not point to any branch."
2706msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
2707
2708#: builtin/branch.c:952
ef317cd5
JX
2709#, c-format
2710msgid "Branch '%s' has no upstream information"
07432cef 2711msgstr "分支 '%s' 没有上游信息"
ef317cd5 2712
1003b3a5
JX
2713#: builtin/branch.c:967
2714msgid "it does not make sense to create 'HEAD' manually"
2715msgstr "手工创建 'HEAD' 没有意义"
2716
2717#: builtin/branch.c:973
c04f5ac3
JX
2718msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2719msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2720
1003b3a5 2721#: builtin/branch.c:976
ef317cd5
JX
2722#, c-format
2723msgid ""
2724"The --set-upstream flag is deprecated and will be removed. Consider using --"
2725"track or --set-upstream-to\n"
2726msgstr ""
07432cef 2727"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 2728
1003b3a5 2729#: builtin/branch.c:993
ef317cd5
JX
2730#, c-format
2731msgid ""
2732"\n"
2733"If you wanted to make '%s' track '%s', do this:\n"
2734"\n"
2735msgstr ""
07432cef
WS
2736"\n"
2737"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2738"\n"
ef317cd5 2739
1003b3a5 2740#: builtin/branch.c:994
07432cef 2741#, c-format
ef317cd5 2742msgid " git branch -d %s\n"
07432cef 2743msgstr " git branch -d %s\n"
ef317cd5 2744
1003b3a5 2745#: builtin/branch.c:995
ef317cd5
JX
2746#, c-format
2747msgid " git branch --set-upstream-to %s\n"
07432cef 2748msgstr " git branch --set-upstream-to %s\n"
ef317cd5 2749
c04f5ac3
JX
2750#: builtin/bundle.c:47
2751#, c-format
2752msgid "%s is okay\n"
2753msgstr "%s 可以\n"
2754
2755#: builtin/bundle.c:56
2756msgid "Need a repository to create a bundle."
90e6ef53 2757msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
2758
2759#: builtin/bundle.c:60
2760msgid "Need a repository to unbundle."
90e6ef53 2761msgstr "需要一个版本库来解包。"
c04f5ac3 2762
ef317cd5
JX
2763#: builtin/cat-file.c:247
2764msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 2765msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5
JX
2766
2767#: builtin/cat-file.c:248
2768msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 2769msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5
JX
2770
2771#: builtin/cat-file.c:266
2772msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 2773msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5
JX
2774
2775#: builtin/cat-file.c:267
ef317cd5 2776msgid "show object type"
07432cef 2777msgstr "显示对象类型"
ef317cd5
JX
2778
2779#: builtin/cat-file.c:268
ef317cd5 2780msgid "show object size"
07432cef 2781msgstr "显示对象大小"
ef317cd5
JX
2782
2783#: builtin/cat-file.c:270
2784msgid "exit with zero when there's no error"
07432cef 2785msgstr "当没有错误时退出并返回零"
ef317cd5
JX
2786
2787#: builtin/cat-file.c:271
2788msgid "pretty-print object's content"
07432cef 2789msgstr "美观地打印对象的内容"
ef317cd5
JX
2790
2791#: builtin/cat-file.c:273
2792msgid "for blob objects, run textconv on object's content"
07432cef 2793msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5
JX
2794
2795#: builtin/cat-file.c:275
2796msgid "show info and content of objects fed from the standard input"
07432cef 2797msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5
JX
2798
2799#: builtin/cat-file.c:278
ef317cd5 2800msgid "show info about objects fed from the standard input"
07432cef 2801msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
2802
2803#: builtin/check-attr.c:11
2804msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 2805msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
2806
2807#: builtin/check-attr.c:12
07432cef
WS
2808msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2809msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
2810
2811#: builtin/check-attr.c:19
2812msgid "report all attributes set on file"
07432cef 2813msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
2814
2815#: builtin/check-attr.c:20
2816msgid "use .gitattributes only from the index"
07432cef 2817msgstr "只使用索引中的 .gitattributes"
ef317cd5 2818
a77c07d9 2819#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
ef317cd5 2820msgid "read file names from stdin"
07432cef 2821msgstr "从标准输入读出文件名"
ef317cd5 2822
a77c07d9 2823#: builtin/check-attr.c:23 builtin/check-ignore.c:24
ef317cd5 2824msgid "input paths are terminated by a null character"
07432cef 2825msgstr "输入路径以null字符终止"
ef317cd5 2826
1003b3a5 2827#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177
a77c07d9
JX
2828msgid "suppress progress reporting"
2829msgstr "不显示进度报告"
2830
2831#: builtin/check-ignore.c:151
2832msgid "cannot specify pathnames with --stdin"
2833msgstr "不能同时提供路径及 --stdin 参数"
2834
2835#: builtin/check-ignore.c:154
2836msgid "-z only makes sense with --stdin"
2837msgstr "-z 需要和 --stdin 参数共用才有意义"
2838
2839#: builtin/check-ignore.c:156
2840msgid "no path specified"
2841msgstr "未指定路径"
2842
2843#: builtin/check-ignore.c:160
2844msgid "--quiet is only valid with a single pathname"
2845msgstr "参数 --quiet 只在提供一个路径名时有效"
2846
2847#: builtin/check-ignore.c:162
2848msgid "cannot have both --quiet and --verbose"
2849msgstr "不能同时提供 --quiet 和 --verbose 参数"
2850
ef317cd5
JX
2851#: builtin/checkout-index.c:126
2852msgid "git checkout-index [options] [--] [<file>...]"
07432cef 2853msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5
JX
2854
2855#: builtin/checkout-index.c:187
2856msgid "check out all files in the index"
07432cef 2857msgstr "检出索引区的所有文件"
ef317cd5
JX
2858
2859#: builtin/checkout-index.c:188
2860msgid "force overwrite of existing files"
07432cef 2861msgstr "强制覆盖现有的文件"
ef317cd5
JX
2862
2863#: builtin/checkout-index.c:190
2864msgid "no warning for existing files and files not in index"
07432cef 2865msgstr "存在或不在索引中的文件都没有警告"
ef317cd5
JX
2866
2867#: builtin/checkout-index.c:192
ef317cd5 2868msgid "don't checkout new files"
07432cef 2869msgstr "不检出新文件"
ef317cd5
JX
2870
2871#: builtin/checkout-index.c:194
ef317cd5 2872msgid "update stat information in the index file"
07432cef 2873msgstr "更新索引中文件的状态信息"
ef317cd5
JX
2874
2875#: builtin/checkout-index.c:200
ef317cd5 2876msgid "read list of paths from the standard input"
07432cef 2877msgstr "从标准输入读取路径列表"
ef317cd5
JX
2878
2879#: builtin/checkout-index.c:202
2880msgid "write the content to temporary files"
07432cef 2881msgstr "将内容写入临时文件"
ef317cd5
JX
2882
2883#: builtin/checkout-index.c:203 builtin/column.c:30
2884msgid "string"
07432cef 2885msgstr "字符串"
ef317cd5
JX
2886
2887#: builtin/checkout-index.c:204
2888msgid "when creating files, prepend <string>"
07432cef 2889msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5
JX
2890
2891#: builtin/checkout-index.c:207
2892msgid "copy out the files from named stage"
07432cef 2893msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
2894
2895#: builtin/checkout.c:25
ef317cd5 2896msgid "git checkout [options] <branch>"
07432cef 2897msgstr "git checkout [选项] <分支>"
ef317cd5
JX
2898
2899#: builtin/checkout.c:26
ef317cd5 2900msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 2901msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5
JX
2902
2903#: builtin/checkout.c:116 builtin/checkout.c:149
c04f5ac3
JX
2904#, c-format
2905msgid "path '%s' does not have our version"
2906msgstr "路径 '%s' 没有我们的版本"
2907
ef317cd5 2908#: builtin/checkout.c:118 builtin/checkout.c:151
c04f5ac3
JX
2909#, c-format
2910msgid "path '%s' does not have their version"
2911msgstr "路径 '%s' 没有他们的版本"
2912
ef317cd5 2913#: builtin/checkout.c:134
c04f5ac3
JX
2914#, c-format
2915msgid "path '%s' does not have all necessary versions"
2916msgstr "路径 '%s' 没有全部必须的版本"
2917
ef317cd5 2918#: builtin/checkout.c:178
c04f5ac3
JX
2919#, c-format
2920msgid "path '%s' does not have necessary versions"
2921msgstr "路径 '%s' 没有必须的版本"
2922
ef317cd5 2923#: builtin/checkout.c:195
c04f5ac3
JX
2924#, c-format
2925msgid "path '%s': cannot merge"
90e6ef53 2926msgstr "path '%s':无法合并"
c04f5ac3 2927
ef317cd5 2928#: builtin/checkout.c:212
c04f5ac3
JX
2929#, c-format
2930msgid "Unable to add merge result for '%s'"
2931msgstr "无法为 '%s' 添加合并结果"
2932
ef317cd5
JX
2933#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2934#: builtin/checkout.c:245
07432cef 2935#, c-format
ef317cd5 2936msgid "'%s' cannot be used with updating paths"
07432cef 2937msgstr "'%s' 不能在更新路径时使用"
ef317cd5
JX
2938
2939#: builtin/checkout.c:248 builtin/checkout.c:251
07432cef 2940#, c-format
ef317cd5 2941msgid "'%s' cannot be used with %s"
07432cef 2942msgstr "'%s' 不能和 %s 同时使用"
ef317cd5
JX
2943
2944#: builtin/checkout.c:254
2945#, c-format
2946msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 2947msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 2948
1003b3a5 2949#: builtin/checkout.c:265 builtin/checkout.c:455
c04f5ac3 2950msgid "corrupt index file"
90e6ef53 2951msgstr "损坏的索引文件"
c04f5ac3 2952
1003b3a5 2953#: builtin/checkout.c:326 builtin/checkout.c:333
c04f5ac3
JX
2954#, c-format
2955msgid "path '%s' is unmerged"
2956msgstr "路径 '%s' 未合并"
2957
1003b3a5 2958#: builtin/checkout.c:477
c04f5ac3 2959msgid "you need to resolve your current index first"
90e6ef53 2960msgstr "您需要先解决当前索引的冲突"
c04f5ac3 2961
1003b3a5 2962#: builtin/checkout.c:598
c04f5ac3
JX
2963#, c-format
2964msgid "Can not do reflog for '%s'\n"
90e6ef53 2965msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 2966
1003b3a5 2967#: builtin/checkout.c:631
c04f5ac3
JX
2968msgid "HEAD is now at"
2969msgstr "HEAD 目前位于"
2970
1003b3a5 2971#: builtin/checkout.c:638
c04f5ac3
JX
2972#, c-format
2973msgid "Reset branch '%s'\n"
2974msgstr "重置分支 '%s'\n"
2975
1003b3a5 2976#: builtin/checkout.c:641
c04f5ac3
JX
2977#, c-format
2978msgid "Already on '%s'\n"
2979msgstr "已经位于 '%s'\n"
2980
1003b3a5 2981#: builtin/checkout.c:645
c04f5ac3
JX
2982#, c-format
2983msgid "Switched to and reset branch '%s'\n"
2984msgstr "切换并重置分支 '%s'\n"
2985
1003b3a5 2986#: builtin/checkout.c:647 builtin/checkout.c:984
c04f5ac3
JX
2987#, c-format
2988msgid "Switched to a new branch '%s'\n"
2989msgstr "切换到一个新分支 '%s'\n"
2990
1003b3a5 2991#: builtin/checkout.c:649
c04f5ac3
JX
2992#, c-format
2993msgid "Switched to branch '%s'\n"
2994msgstr "切换到分支 '%s'\n"
2995
90e6ef53 2996# 译者:注意保持前导空格
1003b3a5 2997#: builtin/checkout.c:705
c04f5ac3
JX
2998#, c-format
2999msgid " ... and %d more.\n"
90e6ef53 3000msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
3001
3002#. The singular version
1003b3a5 3003#: builtin/checkout.c:711
c04f5ac3
JX
3004#, c-format
3005msgid ""
3006"Warning: you are leaving %d commit behind, not connected to\n"
3007"any of your branches:\n"
3008"\n"
3009"%s\n"
3010msgid_plural ""
3011"Warning: you are leaving %d commits behind, not connected to\n"
3012"any of your branches:\n"
3013"\n"
3014"%s\n"
3015msgstr[0] ""
3016"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3017"\n"
3018"%s\n"
5ae481e0
JX
3019msgstr[1] ""
3020"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3021"\n"
3022"%s\n"
c04f5ac3 3023
1003b3a5 3024#: builtin/checkout.c:729
c04f5ac3
JX
3025#, c-format
3026msgid ""
3027"If you want to keep them by creating a new branch, this may be a good time\n"
3028"to do so with:\n"
3029"\n"
3030" git branch new_branch_name %s\n"
3031"\n"
3032msgstr ""
3033"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3034"如下操作:\n"
3035"\n"
3036" git branch new_branch_name %s\n"
3037"\n"
3038
1003b3a5 3039#: builtin/checkout.c:759
c04f5ac3
JX
3040msgid "internal error in revision walk"
3041msgstr "在版本遍历时遇到内部错误"
3042
1003b3a5 3043#: builtin/checkout.c:763
c04f5ac3
JX
3044msgid "Previous HEAD position was"
3045msgstr "之前的 HEAD 位置是"
3046
1003b3a5 3047#: builtin/checkout.c:790 builtin/checkout.c:979
c04f5ac3 3048msgid "You are on a branch yet to be born"
90e6ef53 3049msgstr "您位于一个尚未初始化的分支"
c04f5ac3
JX
3050
3051#. case (1)
1003b3a5 3052#: builtin/checkout.c:915
c04f5ac3
JX
3053#, c-format
3054msgid "invalid reference: %s"
3055msgstr "无效引用:%s"
3056
3057#. case (1): want a tree
1003b3a5 3058#: builtin/checkout.c:954
c04f5ac3
JX
3059#, c-format
3060msgid "reference is not a tree: %s"
3061msgstr "引用不是一个树:%s"
3062
1003b3a5 3063#: builtin/checkout.c:993
ef317cd5 3064msgid "paths cannot be used with switching branches"
07432cef 3065msgstr "路径不能和切换分支同时使用"
c04f5ac3 3066
1003b3a5 3067#: builtin/checkout.c:996 builtin/checkout.c:1000
07432cef 3068#, c-format
ef317cd5 3069msgid "'%s' cannot be used with switching branches"
07432cef 3070msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3071
1003b3a5
JX
3072#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012
3073#: builtin/checkout.c:1015
07432cef 3074#, c-format
ef317cd5 3075msgid "'%s' cannot be used with '%s'"
07432cef 3076msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3077
1003b3a5 3078#: builtin/checkout.c:1020
07432cef 3079#, c-format
ef317cd5 3080msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3081msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3082
1003b3a5 3083#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90
ef317cd5 3084#: builtin/remote.c:169 builtin/remote.c:171
ef317cd5 3085msgid "branch"
07432cef 3086msgstr "分支"
c04f5ac3 3087
1003b3a5 3088#: builtin/checkout.c:1043
ef317cd5 3089msgid "create and checkout a new branch"
07432cef 3090msgstr "创建并检出一个新的分支"
c04f5ac3 3091
1003b3a5 3092#: builtin/checkout.c:1045
ef317cd5 3093msgid "create/reset and checkout a branch"
07432cef 3094msgstr "创建/重置并检出一个分支"
c04f5ac3 3095
1003b3a5 3096#: builtin/checkout.c:1046
ef317cd5 3097msgid "create reflog for new branch"
07432cef 3098msgstr "为新的分支创建引用日志"
ef317cd5 3099
1003b3a5 3100#: builtin/checkout.c:1047
ef317cd5 3101msgid "detach the HEAD at named commit"
07432cef 3102msgstr "成为指向该提交的分离头指针"
ef317cd5 3103
1003b3a5 3104#: builtin/checkout.c:1048
ef317cd5 3105msgid "set upstream info for new branch"
07432cef 3106msgstr "为新的分支设置上游信息"
ef317cd5 3107
1003b3a5 3108#: builtin/checkout.c:1050
ef317cd5 3109msgid "new branch"
07432cef 3110msgstr "新分支"
ef317cd5 3111
1003b3a5 3112#: builtin/checkout.c:1050
ef317cd5 3113msgid "new unparented branch"
07432cef 3114msgstr "新的没有父提交的分支"
ef317cd5 3115
1003b3a5 3116#: builtin/checkout.c:1051
ef317cd5 3117msgid "checkout our version for unmerged files"
07432cef 3118msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3119
1003b3a5 3120#: builtin/checkout.c:1053
ef317cd5 3121msgid "checkout their version for unmerged files"
07432cef 3122msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3123
1003b3a5 3124#: builtin/checkout.c:1055
ef317cd5 3125msgid "force checkout (throw away local modifications)"
07432cef 3126msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3127
1003b3a5 3128#: builtin/checkout.c:1056
ef317cd5 3129msgid "perform a 3-way merge with the new branch"
07432cef 3130msgstr "和新的分支执行三路合并"
ef317cd5 3131
1003b3a5 3132#: builtin/checkout.c:1057 builtin/merge.c:217
ef317cd5 3133msgid "update ignored files (default)"
07432cef 3134msgstr "更新忽略的文件(默认)"
c04f5ac3 3135
1003b3a5 3136#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245
ef317cd5 3137msgid "style"
07432cef 3138msgstr "风格"
ef317cd5 3139
1003b3a5 3140#: builtin/checkout.c:1059
ef317cd5 3141msgid "conflict style (merge or diff3)"
07432cef 3142msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3143
1003b3a5 3144#: builtin/checkout.c:1062
ef317cd5 3145msgid "second guess 'git checkout no-such-branch'"
07432cef 3146msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 3147
1003b3a5 3148#: builtin/checkout.c:1086
ef317cd5 3149msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3150msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3151
1003b3a5 3152#: builtin/checkout.c:1103
ef317cd5
JX
3153msgid "--track needs a branch name"
3154msgstr "--track 需要一个分支名"
3155
1003b3a5 3156#: builtin/checkout.c:1110
ef317cd5
JX
3157msgid "Missing branch name; try -b"
3158msgstr "缺少分支名;尝试 -b"
3159
1003b3a5 3160#: builtin/checkout.c:1145
c04f5ac3 3161msgid "invalid path specification"
90e6ef53 3162msgstr "无效的路径规格"
c04f5ac3 3163
1003b3a5 3164#: builtin/checkout.c:1152
07432cef 3165#, c-format
c04f5ac3 3166msgid ""
ef317cd5 3167"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3168"Did you intend to checkout '%s' which can not be resolved as commit?"
3169msgstr ""
07432cef
WS
3170"不能同时更新路径并切换到分支'%s'。\n"
3171"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3172
1003b3a5 3173#: builtin/checkout.c:1157
07432cef 3174#, c-format
ef317cd5 3175msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3176msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3177
1003b3a5 3178#: builtin/checkout.c:1161
c04f5ac3
JX
3179msgid ""
3180"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3181"checking out of the index."
3182msgstr ""
90e6ef53 3183"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3184
07432cef 3185#: builtin/clean.c:20
ef317cd5 3186msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
07432cef 3187msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3188
07432cef
WS
3189#: builtin/clean.c:24
3190#, c-format
3191msgid "Removing %s\n"
3192msgstr "正删除 %s\n"
3193
3194#: builtin/clean.c:25
3195#, c-format
3196msgid "Would remove %s\n"
3197msgstr "将删除 %s\n"
3198
3199#: builtin/clean.c:26
3200#, c-format
3201msgid "Skipping repository %s\n"
3202msgstr "忽略版本库 %s\n"
3203
3204#: builtin/clean.c:27
3205#, c-format
3206msgid "Would skip repository %s\n"
3207msgstr "将忽略版本库 %s\n"
3208
3209#: builtin/clean.c:28
3210#, c-format
3211msgid "failed to remove %s"
3212msgstr "无法删除 %s"
3213
a77c07d9 3214#: builtin/clean.c:160
ef317cd5 3215msgid "do not print names of files removed"
07432cef 3216msgstr "不打印删除文件的名称"
ef317cd5 3217
a77c07d9 3218#: builtin/clean.c:162
ef317cd5 3219msgid "force"
07432cef 3220msgstr "强制"
ef317cd5 3221
a77c07d9 3222#: builtin/clean.c:164
ef317cd5 3223msgid "remove whole directories"
07432cef 3224msgstr "删除整个目录"
ef317cd5 3225
1003b3a5 3226#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
a77c07d9 3227#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
ef317cd5 3228msgid "pattern"
07432cef 3229msgstr "模式"
ef317cd5 3230
a77c07d9 3231#: builtin/clean.c:166
ef317cd5 3232msgid "add <pattern> to ignore rules"
07432cef 3233msgstr "添加<模式>到忽略规则"
ef317cd5 3234
a77c07d9 3235#: builtin/clean.c:167
ef317cd5 3236msgid "remove ignored files, too"
07432cef 3237msgstr "也删除忽略的文件"
ef317cd5 3238
a77c07d9 3239#: builtin/clean.c:169
ef317cd5 3240msgid "remove only ignored files"
07432cef 3241msgstr "只删除忽略的文件"
c04f5ac3 3242
a77c07d9 3243#: builtin/clean.c:187
c04f5ac3 3244msgid "-x and -X cannot be used together"
649900bc 3245msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3246
a77c07d9 3247#: builtin/clean.c:191
c04f5ac3
JX
3248msgid ""
3249"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3250msgstr ""
90e6ef53 3251"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3252
a77c07d9 3253#: builtin/clean.c:194
c04f5ac3
JX
3254msgid ""
3255"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3256"clean"
3257msgstr ""
90e6ef53 3258"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3259
1003b3a5 3260#: builtin/clone.c:37
ef317cd5 3261msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3262msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5 3263
1003b3a5 3264#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214
a77c07d9 3265#: builtin/push.c:436
ef317cd5 3266msgid "force progress reporting"
07432cef 3267msgstr "强制显示进度报告"
ef317cd5 3268
1003b3a5 3269#: builtin/clone.c:67
ef317cd5 3270msgid "don't create a checkout"
07432cef 3271msgstr "不创建一个检出"
ef317cd5 3272
1003b3a5 3273#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
ef317cd5 3274msgid "create a bare repository"
07432cef 3275msgstr "创建一个裸版本库"
ef317cd5 3276
1003b3a5 3277#: builtin/clone.c:73
ef317cd5 3278msgid "create a mirror repository (implies bare)"
07432cef 3279msgstr "创建一个镜像版本库(也是裸版本库)"
ef317cd5 3280
1003b3a5 3281#: builtin/clone.c:75
ef317cd5 3282msgid "to clone from a local repository"
07432cef 3283msgstr "从本地版本库克隆"
ef317cd5 3284
1003b3a5 3285#: builtin/clone.c:77
ef317cd5 3286msgid "don't use local hardlinks, always copy"
07432cef 3287msgstr "不使用本地硬链接,始终复制"
ef317cd5 3288
1003b3a5 3289#: builtin/clone.c:79
ef317cd5 3290msgid "setup as shared repository"
07432cef 3291msgstr "设置为共享版本库"
ef317cd5 3292
1003b3a5 3293#: builtin/clone.c:81 builtin/clone.c:83
ef317cd5 3294msgid "initialize submodules in the clone"
07432cef 3295msgstr "在克隆时初始化子模组"
ef317cd5 3296
1003b3a5 3297#: builtin/clone.c:84 builtin/init-db.c:485
ef317cd5 3298msgid "template-directory"
07432cef 3299msgstr "模板目录"
ef317cd5 3300
1003b3a5 3301#: builtin/clone.c:85 builtin/init-db.c:486
ef317cd5 3302msgid "directory from which templates will be used"
07432cef 3303msgstr "模板目录将被使用"
ef317cd5 3304
1003b3a5 3305#: builtin/clone.c:87
ef317cd5 3306msgid "reference repository"
07432cef 3307msgstr "引用版本库"
ef317cd5 3308
1003b3a5 3309#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3310msgid "name"
07432cef 3311msgstr "名称"
ef317cd5 3312
1003b3a5 3313#: builtin/clone.c:89
ef317cd5 3314msgid "use <name> instead of 'origin' to track upstream"
07432cef 3315msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5 3316
1003b3a5 3317#: builtin/clone.c:91
ef317cd5 3318msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3319msgstr "检出<分支>而不是远程HEAD"
ef317cd5 3320
1003b3a5 3321#: builtin/clone.c:93
ef317cd5 3322msgid "path to git-upload-pack on the remote"
07432cef 3323msgstr "远程 git-upload-pack 路径"
ef317cd5 3324
1003b3a5 3325#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662
ef317cd5 3326msgid "depth"
07432cef 3327msgstr "深度"
ef317cd5 3328
1003b3a5 3329#: builtin/clone.c:95
ef317cd5 3330msgid "create a shallow clone of that depth"
07432cef 3331msgstr "创建一个指定深度的浅克隆"
ef317cd5 3332
1003b3a5 3333#: builtin/clone.c:97
ef317cd5 3334msgid "clone only one branch, HEAD or --branch"
07432cef 3335msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 3336
1003b3a5 3337#: builtin/clone.c:98 builtin/init-db.c:494
ef317cd5 3338msgid "gitdir"
07432cef 3339msgstr "git目录"
ef317cd5 3340
1003b3a5 3341#: builtin/clone.c:99 builtin/init-db.c:495
ef317cd5 3342msgid "separate git dir from working tree"
07432cef 3343msgstr "git目录和工作区分离"
ef317cd5 3344
1003b3a5 3345#: builtin/clone.c:100
ef317cd5 3346msgid "key=value"
07432cef 3347msgstr "key=value"
ef317cd5 3348
1003b3a5 3349#: builtin/clone.c:101
ef317cd5 3350msgid "set config inside the new repository"
07432cef 3351msgstr "在新版本库中设置配置信息"
ef317cd5 3352
1003b3a5 3353#: builtin/clone.c:244
c04f5ac3
JX
3354#, c-format
3355msgid "reference repository '%s' is not a local directory."
3356msgstr "引用版本库 '%s' 不是一个本地目录。"
3357
1003b3a5 3358#: builtin/clone.c:307
c04f5ac3
JX
3359#, c-format
3360msgid "failed to create directory '%s'"
90e6ef53 3361msgstr "无法创建目录 '%s'"
c04f5ac3 3362
1003b3a5 3363#: builtin/clone.c:309 builtin/diff.c:77
c04f5ac3
JX
3364#, c-format
3365msgid "failed to stat '%s'"
90e6ef53 3366msgstr "无法枚举 '%s' 状态"
c04f5ac3 3367
1003b3a5 3368#: builtin/clone.c:311
c04f5ac3
JX
3369#, c-format
3370msgid "%s exists and is not a directory"
3371msgstr "%s 存在且不是一个目录"
3372
1003b3a5 3373#: builtin/clone.c:325
c04f5ac3
JX
3374#, c-format
3375msgid "failed to stat %s\n"
90e6ef53 3376msgstr "无法枚举 %s 状态\n"
c04f5ac3 3377
1003b3a5 3378#: builtin/clone.c:347
c04f5ac3
JX
3379#, c-format
3380msgid "failed to create link '%s'"
90e6ef53 3381msgstr "无法创建链接 '%s'"
c04f5ac3 3382
1003b3a5 3383#: builtin/clone.c:351
c04f5ac3
JX
3384#, c-format
3385msgid "failed to copy file to '%s'"
90e6ef53 3386msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3387
1003b3a5 3388#: builtin/clone.c:374
c04f5ac3
JX
3389#, c-format
3390msgid "done.\n"
3391msgstr "完成。\n"
3392
1003b3a5
JX
3393#: builtin/clone.c:387
3394msgid ""
3395"Clone succeeded, but checkout failed.\n"
3396"You can inspect what was checked out with 'git status'\n"
3397"and retry the checkout with 'git checkout -f HEAD'\n"
3398msgstr ""
3399"克隆成功,但是检出失败。\n"
3400"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3401"'git checkout -f HEAD' 重试\n"
3402
3403#: builtin/clone.c:466
c04f5ac3
JX
3404#, c-format
3405msgid "Could not find remote branch %s to clone."
90e6ef53 3406msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3407
1003b3a5
JX
3408#: builtin/clone.c:540
3409msgid "remote did not send all necessary objects"
3410msgstr "远程没有发送所有必须的对象"
3411
3412#: builtin/clone.c:600
c04f5ac3
JX
3413msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3414msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3415
1003b3a5
JX
3416#: builtin/clone.c:631
3417msgid "unable to checkout working tree"
3418msgstr "不能检出工作区"
3419
3420#: builtin/clone.c:739
c04f5ac3
JX
3421msgid "Too many arguments."
3422msgstr "太多参数。"
3423
1003b3a5 3424#: builtin/clone.c:743
c04f5ac3 3425msgid "You must specify a repository to clone."
90e6ef53 3426msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 3427
1003b3a5 3428#: builtin/clone.c:754
c04f5ac3
JX
3429#, c-format
3430msgid "--bare and --origin %s options are incompatible."
3431msgstr "--bare 和 --origin %s 选项不兼容。"
3432
1003b3a5 3433#: builtin/clone.c:757
07432cef
WS
3434msgid "--bare and --separate-git-dir are incompatible."
3435msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3436
1003b3a5 3437#: builtin/clone.c:770
c04f5ac3
JX
3438#, c-format
3439msgid "repository '%s' does not exist"
3440msgstr "版本库 '%s' 不存在"
3441
1003b3a5 3442#: builtin/clone.c:775
c04f5ac3
JX
3443msgid "--depth is ignored in local clones; use file:// instead."
3444msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3445
1003b3a5 3446#: builtin/clone.c:785
c04f5ac3
JX
3447#, c-format
3448msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 3449msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 3450
1003b3a5 3451#: builtin/clone.c:795
c04f5ac3
JX
3452#, c-format
3453msgid "working tree '%s' already exists."
3454msgstr "工作区 '%s' 已经存在。"
3455
1003b3a5 3456#: builtin/clone.c:808 builtin/clone.c:820
c04f5ac3
JX
3457#, c-format
3458msgid "could not create leading directories of '%s'"
90e6ef53 3459msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 3460
1003b3a5 3461#: builtin/clone.c:811
c04f5ac3
JX
3462#, c-format
3463msgid "could not create work tree dir '%s'."
90e6ef53 3464msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 3465
1003b3a5 3466#: builtin/clone.c:830
c04f5ac3
JX
3467#, c-format
3468msgid "Cloning into bare repository '%s'...\n"
3469msgstr "克隆到裸版本库 '%s'...\n"
3470
1003b3a5 3471#: builtin/clone.c:832
c04f5ac3
JX
3472#, c-format
3473msgid "Cloning into '%s'...\n"
3474msgstr "正克隆到 '%s'...\n"
3475
1003b3a5 3476#: builtin/clone.c:867
c04f5ac3
JX
3477#, c-format
3478msgid "Don't know how to clone %s"
3479msgstr "不知道如何克隆 %s"
3480
1003b3a5 3481#: builtin/clone.c:916
c04f5ac3
JX
3482#, c-format
3483msgid "Remote branch %s not found in upstream %s"
3484msgstr "远程分支 %s 在上游 %s 未发现"
3485
1003b3a5 3486#: builtin/clone.c:923
c04f5ac3
JX
3487msgid "You appear to have cloned an empty repository."
3488msgstr "您似乎克隆了一个空版本库。"
3489
ef317cd5
JX
3490#: builtin/column.c:9
3491msgid "git column [options]"
07432cef 3492msgstr "git column [选项]"
ef317cd5
JX
3493
3494#: builtin/column.c:26
3495msgid "lookup config vars"
07432cef 3496msgstr "查找配置变量"
ef317cd5
JX
3497
3498#: builtin/column.c:27 builtin/column.c:28
ef317cd5 3499msgid "layout to use"
07432cef 3500msgstr "要使用的布局"
ef317cd5
JX
3501
3502#: builtin/column.c:29
3503msgid "Maximum width"
07432cef 3504msgstr "最大宽度"
ef317cd5
JX
3505
3506#: builtin/column.c:30
3507msgid "Padding space on left border"
07432cef 3508msgstr "左边框的填充空间"
ef317cd5
JX
3509
3510#: builtin/column.c:31
3511msgid "Padding space on right border"
07432cef 3512msgstr "右边框的填充空间"
ef317cd5
JX
3513
3514#: builtin/column.c:32
3515msgid "Padding space between columns"
07432cef 3516msgstr "两列之间的填充空间"
ef317cd5 3517
8ada9598
JX
3518#: builtin/column.c:51
3519msgid "--command must be the first argument"
81809b99 3520msgstr "--command 必须是第一个参数"
8ada9598 3521
07432cef 3522#: builtin/commit.c:34
a77c07d9
JX
3523msgid "git commit [options] [--] <pathspec>..."
3524msgstr "git commit [选项] [--] <路径匹配>..."
ef317cd5 3525
07432cef 3526#: builtin/commit.c:39
a77c07d9
JX
3527msgid "git status [options] [--] <pathspec>..."
3528msgstr "git status [选项] [--] <路径匹配>..."
ef317cd5 3529
07432cef 3530#: builtin/commit.c:44
c04f5ac3
JX
3531msgid ""
3532"Your name and email address were configured automatically based\n"
3533"on your username and hostname. Please check that they are accurate.\n"
3534"You can suppress this message by setting them explicitly:\n"
3535"\n"
3536" git config --global user.name \"Your Name\"\n"
3537" git config --global user.email you@example.com\n"
3538"\n"
3539"After doing this, you may fix the identity used for this commit with:\n"
3540"\n"
3541" git commit --amend --reset-author\n"
3542msgstr ""
90e6ef53
JX
3543"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3544"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
3545"\n"
3546" git config --global user.name \"Your Name\"\n"
3547" git config --global user.email you@example.com\n"
3548"\n"
90e6ef53 3549"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
3550"\n"
3551" git commit --amend --reset-author\n"
3552
07432cef 3553#: builtin/commit.c:56
c04f5ac3
JX
3554msgid ""
3555"You asked to amend the most recent commit, but doing so would make\n"
3556"it empty. You can repeat your command with --allow-empty, or you can\n"
3557"remove the commit entirely with \"git reset HEAD^\".\n"
3558msgstr ""
1b150dc9
T
3559"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3560"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 3561
07432cef 3562#: builtin/commit.c:61
c04f5ac3
JX
3563msgid ""
3564"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3565"If you wish to commit it anyway, use:\n"
3566"\n"
3567" git commit --allow-empty\n"
3568"\n"
3569"Otherwise, please use 'git reset'\n"
3570msgstr ""
a9ce4543
T
3571"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3572"也要提交,使用命令:\n"
c04f5ac3
JX
3573"\n"
3574" git commit --allow-empty\n"
3575"\n"
a9ce4543 3576"否则,请使用命令 'git reset'\n"
c04f5ac3 3577
1003b3a5 3578#: builtin/commit.c:260
c04f5ac3 3579msgid "failed to unpack HEAD tree object"
90e6ef53 3580msgstr "无法解包 HEAD 树对象"
c04f5ac3 3581
1003b3a5 3582#: builtin/commit.c:302
c04f5ac3 3583msgid "unable to create temporary index"
90e6ef53 3584msgstr "不能创建临时索引"
c04f5ac3 3585
1003b3a5 3586#: builtin/commit.c:308
c04f5ac3
JX
3587msgid "interactive add failed"
3588msgstr "交互式添加失败"
3589
1003b3a5 3590#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412
c04f5ac3 3591msgid "unable to write new_index file"
90e6ef53 3592msgstr "无法写 new_index 文件"
c04f5ac3 3593
1003b3a5 3594#: builtin/commit.c:393
8ada9598 3595msgid "cannot do a partial commit during a merge."
81809b99 3596msgstr "在合并过程中不能做部分提交。"
c04f5ac3 3597
1003b3a5 3598#: builtin/commit.c:395
8ada9598 3599msgid "cannot do a partial commit during a cherry-pick."
81809b99 3600msgstr "在拣选过程中不能做部分提交。"
8ada9598 3601
1003b3a5 3602#: builtin/commit.c:405
c04f5ac3 3603msgid "cannot read the index"
90e6ef53 3604msgstr "无法读取索引"
c04f5ac3 3605
1003b3a5 3606#: builtin/commit.c:425
c04f5ac3 3607msgid "unable to write temporary index file"
90e6ef53 3608msgstr "无法写临时索引文件"
c04f5ac3 3609
1003b3a5 3610#: builtin/commit.c:513 builtin/commit.c:519
c04f5ac3
JX
3611#, c-format
3612msgid "invalid commit: %s"
3613msgstr "无效的提交:%s"
3614
1003b3a5 3615#: builtin/commit.c:542
c04f5ac3
JX
3616msgid "malformed --author parameter"
3617msgstr "非法的 --author 参数"
3618
1003b3a5 3619#: builtin/commit.c:562
c04f5ac3
JX
3620#, c-format
3621msgid "Malformed ident string: '%s'"
90e6ef53 3622msgstr "非法的身份字符串:'%s'"
c04f5ac3 3623
1003b3a5 3624#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956
c04f5ac3
JX
3625#, c-format
3626msgid "could not lookup commit %s"
3627msgstr "不能查询提交 %s"
3628
1003b3a5 3629#: builtin/commit.c:612 builtin/shortlog.c:272
c04f5ac3
JX
3630#, c-format
3631msgid "(reading log message from standard input)\n"
90e6ef53 3632msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 3633
1003b3a5 3634#: builtin/commit.c:614
c04f5ac3 3635msgid "could not read log from standard input"
90e6ef53 3636msgstr "不能从标准输入中读取日志信息"
c04f5ac3 3637
1003b3a5 3638#: builtin/commit.c:618
c04f5ac3
JX
3639#, c-format
3640msgid "could not read log file '%s'"
90e6ef53 3641msgstr "不能读取日志文件 '%s'"
c04f5ac3 3642
1003b3a5 3643#: builtin/commit.c:624
c04f5ac3
JX
3644msgid "commit has empty message"
3645msgstr "提交说明为空"
3646
1003b3a5 3647#: builtin/commit.c:640
c04f5ac3 3648msgid "could not read MERGE_MSG"
90e6ef53 3649msgstr "不能读取 MERGE_MSG"
c04f5ac3 3650
1003b3a5 3651#: builtin/commit.c:644
c04f5ac3 3652msgid "could not read SQUASH_MSG"
90e6ef53 3653msgstr "不能读取 SQUASH_MSG"
c04f5ac3 3654
1003b3a5 3655#: builtin/commit.c:648
c04f5ac3
JX
3656#, c-format
3657msgid "could not read '%s'"
90e6ef53 3658msgstr "不能读取 '%s'"
c04f5ac3 3659
1003b3a5 3660#: builtin/commit.c:709
c04f5ac3 3661msgid "could not write commit template"
90e6ef53 3662msgstr "不能写提交模版"
c04f5ac3 3663
1003b3a5 3664#: builtin/commit.c:720
81809b99 3665#, c-format
c04f5ac3
JX
3666msgid ""
3667"\n"
8ada9598 3668"It looks like you may be committing a merge.\n"
c04f5ac3
JX
3669"If this is not correct, please remove the file\n"
3670"\t%s\n"
3671"and try again.\n"
3672msgstr ""
3673"\n"
649900bc 3674"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
3675"\t%s\n"
3676"然后重试。\n"
3677
1003b3a5 3678#: builtin/commit.c:725
81809b99 3679#, c-format
8ada9598
JX
3680msgid ""
3681"\n"
3682"It looks like you may be committing a cherry-pick.\n"
3683"If this is not correct, please remove the file\n"
3684"\t%s\n"
3685"and try again.\n"
3686msgstr ""
3687"\n"
649900bc 3688"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
3689"\t%s\n"
3690"然后重试。\n"
c04f5ac3 3691
1003b3a5 3692#: builtin/commit.c:737
a77c07d9 3693#, c-format
c04f5ac3 3694msgid ""
8ada9598 3695"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 3696"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 3697msgstr ""
a77c07d9 3698"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 3699"说明将会终止提交。\n"
c04f5ac3 3700
1003b3a5 3701#: builtin/commit.c:742
a77c07d9 3702#, c-format
c04f5ac3 3703msgid ""
8ada9598 3704"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 3705"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
3706"An empty message aborts the commit.\n"
3707msgstr ""
a77c07d9
JX
3708"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3709"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 3710
90e6ef53 3711# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 3712#: builtin/commit.c:755
c04f5ac3
JX
3713#, c-format
3714msgid "%sAuthor: %s"
3715msgstr "%s作者: %s"
3716
90e6ef53 3717# 译者:为保证在输出中对齐,注意调整句中空格!
1003b3a5 3718#: builtin/commit.c:762
c04f5ac3
JX
3719#, c-format
3720msgid "%sCommitter: %s"
3721msgstr "%s提交者: %s"
3722
1003b3a5 3723#: builtin/commit.c:782
c04f5ac3 3724msgid "Cannot read index"
90e6ef53 3725msgstr "无法读取索引"
c04f5ac3 3726
1003b3a5 3727#: builtin/commit.c:819
c04f5ac3
JX
3728msgid "Error building trees"
3729msgstr "无法创建树对象"
3730
1003b3a5 3731#: builtin/commit.c:834 builtin/tag.c:359
c04f5ac3
JX
3732#, c-format
3733msgid "Please supply the message using either -m or -F option.\n"
07432cef 3734msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 3735
1003b3a5 3736#: builtin/commit.c:931
c04f5ac3
JX
3737#, c-format
3738msgid "No existing author found with '%s'"
3739msgstr "没有找到匹配 '%s' 的作者"
3740
1003b3a5 3741#: builtin/commit.c:946 builtin/commit.c:1140
c04f5ac3
JX
3742#, c-format
3743msgid "Invalid untracked files mode '%s'"
90e6ef53 3744msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 3745
1003b3a5 3746#: builtin/commit.c:976
c04f5ac3
JX
3747msgid "Using both --reset-author and --author does not make sense"
3748msgstr "同时使用 --reset-author 和 --author 没有意义"
3749
1003b3a5 3750#: builtin/commit.c:987
c04f5ac3 3751msgid "You have nothing to amend."
90e6ef53 3752msgstr "您没有可修补的提交。"
c04f5ac3 3753
1003b3a5 3754#: builtin/commit.c:990
8ada9598 3755msgid "You are in the middle of a merge -- cannot amend."
81809b99 3756msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 3757
1003b3a5 3758#: builtin/commit.c:992
8ada9598 3759msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 3760msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 3761
1003b3a5 3762#: builtin/commit.c:995
c04f5ac3 3763msgid "Options --squash and --fixup cannot be used together"
649900bc 3764msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 3765
1003b3a5 3766#: builtin/commit.c:1005
c04f5ac3
JX
3767msgid "Only one of -c/-C/-F/--fixup can be used."
3768msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3769
1003b3a5 3770#: builtin/commit.c:1007
c04f5ac3 3771msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 3772msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 3773
1003b3a5 3774#: builtin/commit.c:1015
c04f5ac3 3775msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 3776msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 3777
1003b3a5 3778#: builtin/commit.c:1032
c04f5ac3
JX
3779msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3780msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3781
1003b3a5 3782#: builtin/commit.c:1034
c04f5ac3
JX
3783msgid "No paths with --include/--only does not make sense."
3784msgstr "参数 --include/--only 不跟路径没有意义。"
3785
1003b3a5 3786#: builtin/commit.c:1036
c04f5ac3 3787msgid "Clever... amending the last one with dirty index."
90e6ef53 3788msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 3789
1003b3a5 3790#: builtin/commit.c:1038
c04f5ac3 3791msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 3792msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 3793
1003b3a5 3794#: builtin/commit.c:1048 builtin/tag.c:575
c04f5ac3
JX
3795#, c-format
3796msgid "Invalid cleanup mode %s"
3797msgstr "无效的清理模式 %s"
3798
1003b3a5 3799#: builtin/commit.c:1053
c04f5ac3 3800msgid "Paths with -a does not make sense."
649900bc 3801msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 3802
1003b3a5 3803#: builtin/commit.c:1059 builtin/commit.c:1194
07432cef
WS
3804msgid "--long and -z are incompatible"
3805msgstr "--long 和 -z 选项不兼容"
3806
1003b3a5 3807#: builtin/commit.c:1154 builtin/commit.c:1390
ef317cd5 3808msgid "show status concisely"
07432cef 3809msgstr "以简洁的格式显示状态"
ef317cd5 3810
1003b3a5 3811#: builtin/commit.c:1156 builtin/commit.c:1392
ef317cd5 3812msgid "show branch information"
07432cef 3813msgstr "显示分支信息"
ef317cd5 3814
1003b3a5 3815#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426
ef317cd5 3816msgid "machine-readable output"
07432cef
WS
3817msgstr "机器可读的输出"
3818
1003b3a5 3819#: builtin/commit.c:1161 builtin/commit.c:1396
07432cef
WS
3820msgid "show status in long format (default)"
3821msgstr "以长格式显示状态(默认)"
ef317cd5 3822
1003b3a5 3823#: builtin/commit.c:1164 builtin/commit.c:1399
ef317cd5 3824msgid "terminate entries with NUL"
07432cef 3825msgstr "条目以NUL字符结尾"
ef317cd5 3826
1003b3a5
JX
3827#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653
3828#: builtin/fast-export.c:656 builtin/tag.c:459
ef317cd5 3829msgid "mode"
07432cef 3830msgstr "模式"
ef317cd5 3831
1003b3a5 3832#: builtin/commit.c:1167 builtin/commit.c:1402
ef317cd5 3833msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 3834msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 3835
1003b3a5 3836#: builtin/commit.c:1170
ef317cd5 3837msgid "show ignored files"
07432cef 3838msgstr "显示忽略的文件"
ef317cd5 3839
1003b3a5 3840#: builtin/commit.c:1171 parse-options.h:151
ef317cd5
JX
3841msgid "when"
3842msgstr "何时"
3843
1003b3a5 3844#: builtin/commit.c:1172
ef317cd5
JX
3845msgid ""
3846"ignore changes to submodules, optional when: all, dirty, untracked. "
3847"(Default: all)"
3848msgstr ""
07432cef 3849"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 3850
1003b3a5 3851#: builtin/commit.c:1174
ef317cd5 3852msgid "list untracked files in columns"
07432cef 3853msgstr "以列的方式显示未跟踪的文件"
ef317cd5 3854
1003b3a5 3855#: builtin/commit.c:1248
c04f5ac3
JX
3856msgid "couldn't look up newly created commit"
3857msgstr "无法找到新创建的提交"
3858
1003b3a5 3859#: builtin/commit.c:1250
c04f5ac3 3860msgid "could not parse newly created commit"
90e6ef53 3861msgstr "不能解析新创建的提交"
c04f5ac3 3862
1003b3a5 3863#: builtin/commit.c:1291
c04f5ac3
JX
3864msgid "detached HEAD"
3865msgstr "分离头指针"
3866
7e238ab7 3867# 译者:中文字符串拼接,可删除前导空格
1003b3a5 3868#: builtin/commit.c:1293
c04f5ac3 3869msgid " (root-commit)"
7e238ab7 3870msgstr "(根提交)"
c04f5ac3 3871
1003b3a5 3872#: builtin/commit.c:1360
ef317cd5 3873msgid "suppress summary after successful commit"
07432cef 3874msgstr "提交成功后不显示概述信息"
c04f5ac3 3875
1003b3a5 3876#: builtin/commit.c:1361
ef317cd5 3877msgid "show diff in commit message template"
07432cef 3878msgstr "在提交说明模板里显示差异"
c04f5ac3 3879
1003b3a5 3880#: builtin/commit.c:1363
ef317cd5 3881msgid "Commit message options"
07432cef 3882msgstr "提交说明选项"
c04f5ac3 3883
1003b3a5 3884#: builtin/commit.c:1364 builtin/tag.c:457
ef317cd5 3885msgid "read message from file"
07432cef 3886msgstr "从文件中读取提交说明"
c04f5ac3 3887
1003b3a5 3888#: builtin/commit.c:1365
ef317cd5 3889msgid "author"
07432cef 3890msgstr "作者"
c04f5ac3 3891
1003b3a5 3892#: builtin/commit.c:1365
ef317cd5 3893msgid "override author for commit"
07432cef 3894msgstr "提交时覆盖作者"
73a60cd2 3895
1003b3a5 3896#: builtin/commit.c:1366 builtin/gc.c:178
ef317cd5 3897msgid "date"
07432cef 3898msgstr "日期"
c04f5ac3 3899
1003b3a5 3900#: builtin/commit.c:1366
ef317cd5 3901msgid "override date for commit"
07432cef 3902msgstr "提交时覆盖日期"
c04f5ac3 3903
1003b3a5 3904#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533
a77c07d9 3905#: builtin/notes.c:690 builtin/tag.c:455
ef317cd5 3906msgid "message"
07432cef 3907msgstr "说明"
c04f5ac3 3908
1003b3a5 3909#: builtin/commit.c:1367
ef317cd5 3910msgid "commit message"
07432cef 3911msgstr "提交说明"
ef317cd5 3912
1003b3a5 3913#: builtin/commit.c:1368
ef317cd5 3914msgid "reuse and edit message from specified commit"
07432cef 3915msgstr "重用并编辑指定提交的提交说明"
ef317cd5 3916
1003b3a5 3917#: builtin/commit.c:1369
ef317cd5 3918msgid "reuse message from specified commit"
07432cef 3919msgstr "重用指定提交的提交说明"
ef317cd5 3920
1003b3a5 3921#: builtin/commit.c:1370
ef317cd5 3922msgid "use autosquash formatted message to fixup specified commit"
07432cef 3923msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 3924
1003b3a5 3925#: builtin/commit.c:1371
ef317cd5 3926msgid "use autosquash formatted message to squash specified commit"
07432cef 3927msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 3928
1003b3a5 3929#: builtin/commit.c:1372
ef317cd5 3930msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 3931msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 3932
1003b3a5 3933#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109
ef317cd5 3934msgid "add Signed-off-by:"
07432cef 3935msgstr "添加 Signed-off-by: 签名"
ef317cd5 3936
1003b3a5 3937#: builtin/commit.c:1374
ef317cd5 3938msgid "use specified template file"
07432cef 3939msgstr "使用指定的模板文件"
ef317cd5 3940
1003b3a5 3941#: builtin/commit.c:1375
ef317cd5 3942msgid "force edit of commit"
07432cef 3943msgstr "强制编辑提交"
ef317cd5 3944
07432cef 3945# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
1003b3a5 3946#: builtin/commit.c:1376
ef317cd5 3947msgid "default"
07432cef 3948msgstr "default"
ef317cd5 3949
1003b3a5 3950#: builtin/commit.c:1376 builtin/tag.c:460
ef317cd5 3951msgid "how to strip spaces and #comments from message"
07432cef 3952msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 3953
1003b3a5 3954#: builtin/commit.c:1377
ef317cd5 3955msgid "include status in commit message template"
07432cef 3956msgstr "在提交说明模板里包含状态信息"
ef317cd5 3957
1003b3a5 3958#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461
ef317cd5 3959msgid "key id"
07432cef 3960msgstr "key id"
ef317cd5 3961
1003b3a5 3962#: builtin/commit.c:1379 builtin/merge.c:216
ef317cd5 3963msgid "GPG sign commit"
07432cef 3964msgstr "GPG 提交签名"
ef317cd5
JX
3965
3966#. end commit message options
1003b3a5 3967#: builtin/commit.c:1382
ef317cd5 3968msgid "Commit contents options"
07432cef 3969msgstr "提交内容选项"
ef317cd5 3970
1003b3a5 3971#: builtin/commit.c:1383
ef317cd5 3972msgid "commit all changed files"
07432cef 3973msgstr "提交所有改动的文件"
ef317cd5 3974
1003b3a5 3975#: builtin/commit.c:1384
ef317cd5 3976msgid "add specified files to index for commit"
07432cef 3977msgstr "添加指定的文件到索引区等待提交"
ef317cd5 3978
1003b3a5 3979#: builtin/commit.c:1385
ef317cd5 3980msgid "interactively add files"
07432cef 3981msgstr "交互式添加文件"
ef317cd5 3982
1003b3a5 3983#: builtin/commit.c:1386
ef317cd5 3984msgid "interactively add changes"
07432cef 3985msgstr "交互式添加变更"
ef317cd5 3986
1003b3a5 3987#: builtin/commit.c:1387
ef317cd5 3988msgid "commit only specified files"
07432cef 3989msgstr "只提交指定的文件"
ef317cd5 3990
1003b3a5 3991#: builtin/commit.c:1388
ef317cd5 3992msgid "bypass pre-commit hook"
07432cef 3993msgstr "绕过 pre-commit 钩子"
ef317cd5 3994
1003b3a5 3995#: builtin/commit.c:1389
ef317cd5 3996msgid "show what would be committed"
07432cef 3997msgstr "显示将要提交的内容"
ef317cd5 3998
1003b3a5 3999#: builtin/commit.c:1400
ef317cd5 4000msgid "amend previous commit"
07432cef 4001msgstr "修改先前的提交"
ef317cd5 4002
1003b3a5 4003#: builtin/commit.c:1401
ef317cd5 4004msgid "bypass post-rewrite hook"
07432cef 4005msgstr "绕过 post-rewrite 钩子"
ef317cd5 4006
1003b3a5 4007#: builtin/commit.c:1406
ef317cd5 4008msgid "ok to record an empty change"
07432cef 4009msgstr "允许一个空提交"
ef317cd5 4010
1003b3a5 4011#: builtin/commit.c:1409
ef317cd5 4012msgid "ok to record a change with an empty message"
07432cef 4013msgstr "允许空的提交说明"
ef317cd5 4014
1003b3a5 4015#: builtin/commit.c:1441
c04f5ac3 4016msgid "could not parse HEAD commit"
90e6ef53 4017msgstr "不能解析 HEAD 提交"
c04f5ac3 4018
1003b3a5 4019#: builtin/commit.c:1479 builtin/merge.c:510
c04f5ac3
JX
4020#, c-format
4021msgid "could not open '%s' for reading"
90e6ef53 4022msgstr "不能为读入打开 '%s'"
c04f5ac3 4023
1003b3a5 4024#: builtin/commit.c:1486
c04f5ac3
JX
4025#, c-format
4026msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4027msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4028
1003b3a5 4029#: builtin/commit.c:1493
c04f5ac3 4030msgid "could not read MERGE_MODE"
90e6ef53 4031msgstr "不能读取 MERGE_MODE"
c04f5ac3 4032
1003b3a5 4033#: builtin/commit.c:1512
c04f5ac3
JX
4034#, c-format
4035msgid "could not read commit message: %s"
90e6ef53 4036msgstr "不能读取提交说明:%s"
c04f5ac3 4037
1003b3a5 4038#: builtin/commit.c:1526
73a60cd2
JX
4039#, c-format
4040msgid "Aborting commit; you did not edit the message.\n"
4041msgstr "终止提交;您未更改来自模版的提交说明。\n"
4042
1003b3a5 4043#: builtin/commit.c:1531
c04f5ac3
JX
4044#, c-format
4045msgid "Aborting commit due to empty commit message.\n"
4046msgstr "终止提交因为提交说明为空。\n"
4047
1003b3a5 4048#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872
c04f5ac3 4049msgid "failed to write commit object"
90e6ef53 4050msgstr "无法写提交对象"
c04f5ac3 4051
1003b3a5 4052#: builtin/commit.c:1567
c04f5ac3
JX
4053msgid "cannot lock HEAD ref"
4054msgstr "无法锁定 HEAD 引用"
4055
1003b3a5 4056#: builtin/commit.c:1571
c04f5ac3
JX
4057msgid "cannot update HEAD ref"
4058msgstr "无法更新 HEAD 引用"
4059
1003b3a5 4060#: builtin/commit.c:1582
c04f5ac3
JX
4061msgid ""
4062"Repository has been updated, but unable to write\n"
4063"new_index file. Check that disk is not full or quota is\n"
4064"not exceeded, and then \"git reset HEAD\" to recover."
4065msgstr ""
90e6ef53
JX
4066"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4067"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4068
ef317cd5
JX
4069#: builtin/config.c:7
4070msgid "git config [options]"
07432cef 4071msgstr "git config [选项]"
ef317cd5 4072
07432cef 4073#: builtin/config.c:51
ef317cd5 4074msgid "Config file location"
07432cef 4075msgstr "配置文件位置"
ef317cd5 4076
07432cef 4077#: builtin/config.c:52
ef317cd5 4078msgid "use global config file"
07432cef 4079msgstr "使用全局配置文件"
ef317cd5 4080
07432cef 4081#: builtin/config.c:53
ef317cd5 4082msgid "use system config file"
07432cef 4083msgstr "使用系统级配置文件"
ef317cd5 4084
07432cef 4085#: builtin/config.c:54
ef317cd5 4086msgid "use repository config file"
07432cef 4087msgstr "使用版本库级配置文件"
ef317cd5 4088
07432cef 4089#: builtin/config.c:55
ef317cd5 4090msgid "use given config file"
07432cef 4091msgstr "使用指定的配置文件"
ef317cd5 4092
07432cef 4093#: builtin/config.c:56
ef317cd5 4094msgid "Action"
07432cef 4095msgstr "操作"
ef317cd5 4096
07432cef 4097#: builtin/config.c:57
ef317cd5 4098msgid "get value: name [value-regex]"
07432cef 4099msgstr "获取值:name [value-regex]"
ef317cd5 4100
07432cef 4101#: builtin/config.c:58
ef317cd5 4102msgid "get all values: key [value-regex]"
07432cef 4103msgstr "获得所有的值:key [value-regex]"
ef317cd5 4104
07432cef 4105#: builtin/config.c:59
ef317cd5 4106msgid "get values for regexp: name-regex [value-regex]"
07432cef 4107msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 4108
07432cef 4109#: builtin/config.c:60
ef317cd5 4110msgid "replace all matching variables: name value [value_regex]"
07432cef 4111msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 4112
07432cef 4113#: builtin/config.c:61
ef317cd5 4114msgid "add a new variable: name value"
07432cef 4115msgstr "添加一个新的变量:name value"
ef317cd5 4116
07432cef 4117#: builtin/config.c:62
ef317cd5 4118msgid "remove a variable: name [value-regex]"
07432cef 4119msgstr "删除一个变量:name [value-regex]"
ef317cd5 4120
07432cef 4121#: builtin/config.c:63
ef317cd5 4122msgid "remove all matches: name [value-regex]"
07432cef 4123msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 4124
07432cef 4125#: builtin/config.c:64
ef317cd5 4126msgid "rename section: old-name new-name"
07432cef 4127msgstr "重命名小节:old-name new-name"
ef317cd5 4128
07432cef 4129#: builtin/config.c:65
ef317cd5 4130msgid "remove a section: name"
07432cef 4131msgstr "删除一个小节:name"
ef317cd5 4132
07432cef 4133#: builtin/config.c:66
ef317cd5 4134msgid "list all"
07432cef 4135msgstr "列出所有"
ef317cd5 4136
07432cef 4137#: builtin/config.c:67
ef317cd5 4138msgid "open an editor"
07432cef 4139msgstr "打开一个编辑器"
ef317cd5 4140
07432cef 4141#: builtin/config.c:68 builtin/config.c:69
ef317cd5 4142msgid "slot"
07432cef 4143msgstr "slot"
ef317cd5 4144
07432cef 4145#: builtin/config.c:68
ef317cd5 4146msgid "find the color configured: [default]"
07432cef 4147msgstr "找到配置的颜色:[默认]"
ef317cd5 4148
07432cef 4149#: builtin/config.c:69
ef317cd5 4150msgid "find the color setting: [stdout-is-tty]"
07432cef 4151msgstr "找到颜色设置:[stdout-is-tty]"
ef317cd5 4152
07432cef 4153#: builtin/config.c:70
ef317cd5 4154msgid "Type"
07432cef 4155msgstr "类型"
ef317cd5 4156
07432cef 4157#: builtin/config.c:71
ef317cd5 4158msgid "value is \"true\" or \"false\""
07432cef 4159msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4160
07432cef 4161#: builtin/config.c:72
ef317cd5 4162msgid "value is decimal number"
07432cef 4163msgstr "值是十进制数"
ef317cd5 4164
07432cef 4165#: builtin/config.c:73
ef317cd5 4166msgid "value is --bool or --int"
07432cef 4167msgstr "值是 --bool or --int"
ef317cd5 4168
07432cef 4169#: builtin/config.c:74
ef317cd5 4170msgid "value is a path (file or directory name)"
07432cef 4171msgstr "值是一个路径(文件或目录名)"
ef317cd5 4172
07432cef 4173#: builtin/config.c:75
ef317cd5 4174msgid "Other"
07432cef 4175msgstr "其它"
ef317cd5 4176
07432cef 4177#: builtin/config.c:76
ef317cd5 4178msgid "terminate values with NUL byte"
07432cef 4179msgstr "终止值是NUL字节"
ef317cd5 4180
07432cef 4181#: builtin/config.c:77
ef317cd5 4182msgid "respect include directives on lookup"
07432cef 4183msgstr "查询时参照 include 指令递归查找"
ef317cd5 4184
1003b3a5 4185#: builtin/count-objects.c:82
ef317cd5 4186msgid "git count-objects [-v]"
07432cef 4187msgstr "git count-objects [-v]"
ef317cd5
JX
4188
4189#: builtin/describe.c:15
4190msgid "git describe [options] <committish>*"
07432cef 4191msgstr "git describe [选项] <提交号>*"
ef317cd5
JX
4192
4193#: builtin/describe.c:16
4194msgid "git describe [options] --dirty"
07432cef 4195msgstr "git describe [选项] --dirty"
ef317cd5 4196
1003b3a5 4197#: builtin/describe.c:233
c04f5ac3
JX
4198#, c-format
4199msgid "annotated tag %s not available"
4200msgstr "注释 tag %s 无效"
4201
1003b3a5 4202#: builtin/describe.c:237
c04f5ac3
JX
4203#, c-format
4204msgid "annotated tag %s has no embedded name"
4205msgstr "注释 tag %s 没有嵌入名称"
4206
1003b3a5 4207#: builtin/describe.c:239
c04f5ac3
JX
4208#, c-format
4209msgid "tag '%s' is really '%s' here"
90e6ef53 4210msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3 4211
1003b3a5 4212#: builtin/describe.c:266
c04f5ac3
JX
4213#, c-format
4214msgid "Not a valid object name %s"
4215msgstr "不是一个有效的对象名 %s"
4216
1003b3a5 4217#: builtin/describe.c:269
c04f5ac3
JX
4218#, c-format
4219msgid "%s is not a valid '%s' object"
4220msgstr "%s 不是一个有效的 '%s' 对象"
4221
1003b3a5 4222#: builtin/describe.c:286
c04f5ac3
JX
4223#, c-format
4224msgid "no tag exactly matches '%s'"
4225msgstr "没有 tag 准确匹配 '%s'"
4226
1003b3a5 4227#: builtin/describe.c:288
c04f5ac3
JX
4228#, c-format
4229msgid "searching to describe %s\n"
4230msgstr "搜索描述 %s\n"
4231
1003b3a5 4232#: builtin/describe.c:328
c04f5ac3
JX
4233#, c-format
4234msgid "finished search at %s\n"
4235msgstr "完成搜索 %s\n"
4236
1003b3a5 4237#: builtin/describe.c:352
c04f5ac3
JX
4238#, c-format
4239msgid ""
4240"No annotated tags can describe '%s'.\n"
4241"However, there were unannotated tags: try --tags."
4242msgstr ""
4243"没有注释 tag 能描述 '%s'。\n"
4244"然而,有非注释 tag:尝试 --tags。"
4245
1003b3a5 4246#: builtin/describe.c:356
c04f5ac3
JX
4247#, c-format
4248msgid ""
4249"No tags can describe '%s'.\n"
4250"Try --always, or create some tags."
4251msgstr ""
4252"没有注释 tag 能描述 '%s'。\n"
90e6ef53 4253"尝试 --always,或者创建一些 tag。"
c04f5ac3 4254
1003b3a5 4255#: builtin/describe.c:377
c04f5ac3
JX
4256#, c-format
4257msgid "traversed %lu commits\n"
4258msgstr "已遍历 %lu 个提交\n"
4259
1003b3a5 4260#: builtin/describe.c:380
c04f5ac3
JX
4261#, c-format
4262msgid ""
4263"more than %i tags found; listed %i most recent\n"
4264"gave up search at %s\n"
4265msgstr ""
90e6ef53
JX
4266"发现多于 %i 个 tag,列出最近的 %i 个\n"
4267"在 %s 放弃搜索\n"
c04f5ac3 4268
1003b3a5 4269#: builtin/describe.c:402
ef317cd5 4270msgid "find the tag that comes after the commit"
07432cef 4271msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5 4272
1003b3a5 4273#: builtin/describe.c:403
ef317cd5 4274msgid "debug search strategy on stderr"
07432cef 4275msgstr "在标准错误上调试搜索策略"
ef317cd5 4276
1003b3a5
JX
4277#: builtin/describe.c:404
4278msgid "use any ref"
4279msgstr "使用任意引用"
4280
ef317cd5 4281#: builtin/describe.c:405
1003b3a5
JX
4282msgid "use any tag, even unannotated"
4283msgstr "使用任意 tag,即使未带注解"
ef317cd5
JX
4284
4285#: builtin/describe.c:406
ef317cd5 4286msgid "always use long format"
07432cef 4287msgstr "始终使用长提交号格式"
ef317cd5 4288
1003b3a5 4289#: builtin/describe.c:409
ef317cd5 4290msgid "only output exact matches"
07432cef 4291msgstr "只输出精确匹配"
ef317cd5 4292
1003b3a5 4293#: builtin/describe.c:411
ef317cd5 4294msgid "consider <n> most recent tags (default: 10)"
07432cef 4295msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5 4296
1003b3a5 4297#: builtin/describe.c:413
ef317cd5 4298msgid "only consider tags matching <pattern>"
07432cef 4299msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5 4300
1003b3a5 4301#: builtin/describe.c:415 builtin/name-rev.c:238
ef317cd5 4302msgid "show abbreviated commit object as fallback"
07432cef 4303msgstr "显示简写的提交号作为后备"
ef317cd5 4304
1003b3a5 4305#: builtin/describe.c:416
ef317cd5 4306msgid "mark"
07432cef 4307msgstr "标记"
ef317cd5 4308
1003b3a5 4309#: builtin/describe.c:417
ef317cd5 4310msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 4311msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 4312
1003b3a5 4313#: builtin/describe.c:435
c04f5ac3
JX
4314msgid "--long is incompatible with --abbrev=0"
4315msgstr "--long 与 --abbrev=0 不兼容"
4316
1003b3a5 4317#: builtin/describe.c:461
c04f5ac3 4318msgid "No names found, cannot describe anything."
90e6ef53 4319msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 4320
1003b3a5 4321#: builtin/describe.c:481
c04f5ac3 4322msgid "--dirty is incompatible with committishes"
649900bc 4323msgstr "--dirty 不能与提交同时使用"
c04f5ac3 4324
c160d03f 4325#: builtin/diff.c:79
c04f5ac3
JX
4326#, c-format
4327msgid "'%s': not a regular file or symlink"
4328msgstr "'%s':不是一个正规文件或符号链接"
4329
07432cef 4330#: builtin/diff.c:228
c04f5ac3
JX
4331#, c-format
4332msgid "invalid option: %s"
4333msgstr "无效选项:%s"
4334
07432cef 4335#: builtin/diff.c:305
c04f5ac3
JX
4336msgid "Not a git repository"
4337msgstr "不是一个 git 版本库"
4338
07432cef 4339#: builtin/diff.c:348
c04f5ac3
JX
4340#, c-format
4341msgid "invalid object '%s' given."
4342msgstr "提供了无效对象 '%s'。"
4343
07432cef 4344#: builtin/diff.c:353
c04f5ac3
JX
4345#, c-format
4346msgid "more than %d trees given: '%s'"
4347msgstr "提供了超过 %d 个树对象:'%s'"
4348
07432cef 4349#: builtin/diff.c:363
c04f5ac3
JX
4350#, c-format
4351msgid "more than two blobs given: '%s'"
07432cef 4352msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 4353
07432cef 4354#: builtin/diff.c:371
c04f5ac3
JX
4355#, c-format
4356msgid "unhandled object '%s' given."
4357msgstr "提供了无法处理的对象 '%s'。"
4358
ef317cd5
JX
4359#: builtin/fast-export.c:22
4360msgid "git fast-export [rev-list-opts]"
07432cef 4361msgstr "git fast-export [rev-list-opts]"
ef317cd5 4362
1003b3a5 4363#: builtin/fast-export.c:652
ef317cd5 4364msgid "show progress after <n> objects"
07432cef 4365msgstr "在 <n> 个对象之后显示进度"
ef317cd5 4366
1003b3a5 4367#: builtin/fast-export.c:654
ef317cd5 4368msgid "select handling of signed tags"
07432cef 4369msgstr "选择如何处理签名 tags"
ef317cd5 4370
1003b3a5 4371#: builtin/fast-export.c:657
ef317cd5 4372msgid "select handling of tags that tag filtered objects"
07432cef 4373msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 4374
1003b3a5 4375#: builtin/fast-export.c:660
ef317cd5 4376msgid "Dump marks to this file"
07432cef 4377msgstr "把标记存储到这个文件"
ef317cd5 4378
1003b3a5 4379#: builtin/fast-export.c:662
ef317cd5 4380msgid "Import marks from this file"
07432cef 4381msgstr "从这个文件导入标记"
ef317cd5 4382
1003b3a5 4383#: builtin/fast-export.c:664
ef317cd5 4384msgid "Fake a tagger when tags lack one"
07432cef 4385msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 4386
1003b3a5 4387#: builtin/fast-export.c:666
ef317cd5 4388msgid "Output full tree for each commit"
07432cef 4389msgstr "每次提交都输出整个树"
ef317cd5 4390
1003b3a5 4391#: builtin/fast-export.c:668
ef317cd5 4392msgid "Use the done feature to terminate the stream"
07432cef 4393msgstr "使用 done 功能来终止流"
ef317cd5 4394
1003b3a5 4395#: builtin/fast-export.c:669
ef317cd5 4396msgid "Skip output of blob data"
07432cef 4397msgstr "跳过数据对象的输出"
ef317cd5
JX
4398
4399#: builtin/fetch.c:20
ef317cd5 4400msgid "git fetch [<options>] [<repository> [<refspec>...]]"
07432cef 4401msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
ef317cd5
JX
4402
4403#: builtin/fetch.c:21
4404msgid "git fetch [<options>] <group>"
07432cef 4405msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
4406
4407#: builtin/fetch.c:22
4408msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 4409msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
4410
4411#: builtin/fetch.c:23
4412msgid "git fetch --all [<options>]"
07432cef 4413msgstr "git fetch --all [<选项>]"
ef317cd5
JX
4414
4415#: builtin/fetch.c:60
4416msgid "fetch from all remotes"
07432cef 4417msgstr "从所有的远程抓取"
ef317cd5
JX
4418
4419#: builtin/fetch.c:62
4420msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 4421msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5
JX
4422
4423#: builtin/fetch.c:64
4424msgid "path to upload pack on remote end"
07432cef 4425msgstr "上传包到远程的路径"
ef317cd5
JX
4426
4427#: builtin/fetch.c:65
4428msgid "force overwrite of local branch"
07432cef 4429msgstr "强制覆盖本地分支"
ef317cd5
JX
4430
4431#: builtin/fetch.c:67
4432msgid "fetch from multiple remotes"
07432cef 4433msgstr "从多个远程抓取"
ef317cd5
JX
4434
4435#: builtin/fetch.c:69
ef317cd5 4436msgid "fetch all tags and associated objects"
07432cef 4437msgstr "抓取所有的 tags 和关联对象"
ef317cd5
JX
4438
4439#: builtin/fetch.c:71
4440msgid "do not fetch all tags (--no-tags)"
07432cef 4441msgstr "不抓取任何 tags (--no-tags)"
ef317cd5
JX
4442
4443#: builtin/fetch.c:73
ef317cd5 4444msgid "prune remote-tracking branches no longer on remote"
07432cef 4445msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 4446
07432cef 4447# 译者:可选值,不能翻译
ef317cd5
JX
4448#: builtin/fetch.c:74
4449msgid "on-demand"
07432cef 4450msgstr "on-demand"
ef317cd5
JX
4451
4452#: builtin/fetch.c:75
4453msgid "control recursive fetching of submodules"
07432cef 4454msgstr "控制子模组的递归抓取"
ef317cd5
JX
4455
4456#: builtin/fetch.c:79
4457msgid "keep downloaded pack"
07432cef 4458msgstr "保持下载包"
ef317cd5
JX
4459
4460#: builtin/fetch.c:81
ef317cd5 4461msgid "allow updating of HEAD ref"
07432cef 4462msgstr "允许更新 HEAD 引用"
ef317cd5
JX
4463
4464#: builtin/fetch.c:84
4465msgid "deepen history of shallow clone"
07432cef 4466msgstr "深化浅克隆的历史"
ef317cd5 4467
a77c07d9
JX
4468#: builtin/fetch.c:86
4469msgid "convert to a complete repository"
4470msgstr "转换为一个完整的版本库"
4471
1003b3a5 4472#: builtin/fetch.c:88 builtin/log.c:1121
ef317cd5 4473msgid "dir"
07432cef 4474msgstr "目录"
ef317cd5 4475
a77c07d9 4476#: builtin/fetch.c:89
ef317cd5 4477msgid "prepend this to submodule path output"
07432cef 4478msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 4479
a77c07d9 4480#: builtin/fetch.c:92
ef317cd5 4481msgid "default mode for recursion"
07432cef 4482msgstr "递归的默认模式"
ef317cd5 4483
a77c07d9 4484#: builtin/fetch.c:204
c04f5ac3
JX
4485msgid "Couldn't find remote ref HEAD"
4486msgstr "无法发现远程 HEAD 引用"
4487
a77c07d9 4488#: builtin/fetch.c:257
c04f5ac3
JX
4489#, c-format
4490msgid "object %s not found"
4491msgstr "对象 %s 未发现"
4492
a77c07d9 4493#: builtin/fetch.c:262
c04f5ac3
JX
4494msgid "[up to date]"
4495msgstr "[最新]"
4496
a77c07d9 4497#: builtin/fetch.c:276
c04f5ac3
JX
4498#, c-format
4499msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4500msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4501
a77c07d9 4502#: builtin/fetch.c:277 builtin/fetch.c:363
c04f5ac3
JX
4503msgid "[rejected]"
4504msgstr "[已拒绝]"
4505
a77c07d9 4506#: builtin/fetch.c:288
c04f5ac3
JX
4507msgid "[tag update]"
4508msgstr "[tag更新]"
4509
90e6ef53 4510# 译者:注意保持前导空格
a77c07d9 4511#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
c04f5ac3
JX
4512msgid " (unable to update local ref)"
4513msgstr " (不能更新本地引用)"
4514
a77c07d9 4515#: builtin/fetch.c:308
c04f5ac3
JX
4516msgid "[new tag]"
4517msgstr "[新tag]"
4518
a77c07d9 4519#: builtin/fetch.c:311
c04f5ac3
JX
4520msgid "[new branch]"
4521msgstr "[新分支]"
4522
a77c07d9 4523#: builtin/fetch.c:314
170e9899
JX
4524msgid "[new ref]"
4525msgstr "[新引用]"
4526
a77c07d9 4527#: builtin/fetch.c:359
c04f5ac3
JX
4528msgid "unable to update local ref"
4529msgstr "不能更新本地引用"
4530
a77c07d9 4531#: builtin/fetch.c:359
c04f5ac3
JX
4532msgid "forced update"
4533msgstr "强制更新"
4534
a77c07d9 4535#: builtin/fetch.c:365
c04f5ac3 4536msgid "(non-fast-forward)"
90e6ef53 4537msgstr "(非快进式)"
c04f5ac3 4538
a77c07d9 4539#: builtin/fetch.c:396 builtin/fetch.c:688
c04f5ac3
JX
4540#, c-format
4541msgid "cannot open %s: %s\n"
4542msgstr "无法打开 %s:%s\n"
4543
a77c07d9 4544#: builtin/fetch.c:405
c04f5ac3
JX
4545#, c-format
4546msgid "%s did not send all necessary objects\n"
4547msgstr "%s 未发送所有必须的对象\n"
4548
a77c07d9 4549#: builtin/fetch.c:491
c04f5ac3
JX
4550#, c-format
4551msgid "From %.*s\n"
4552msgstr "来自 %.*s\n"
4553
a77c07d9 4554#: builtin/fetch.c:502
c04f5ac3
JX
4555#, c-format
4556msgid ""
4557"some local refs could not be updated; try running\n"
4558" 'git remote prune %s' to remove any old, conflicting branches"
4559msgstr ""
4560"一些本地引用不能被更新;尝试运行\n"
4561" 'git remote prune %s' 来删除旧的、有冲突的分支"
4562
90e6ef53 4563# 译者:注意保持前导空格
a77c07d9 4564#: builtin/fetch.c:552
81809b99 4565#, c-format
8ada9598 4566msgid " (%s will become dangling)"
07432cef 4567msgstr " (%s 将成为摇摆状态)"
c04f5ac3 4568
90e6ef53 4569# 译者:注意保持前导空格
a77c07d9 4570#: builtin/fetch.c:553
81809b99 4571#, c-format
8ada9598 4572msgid " (%s has become dangling)"
07432cef 4573msgstr " (%s 已成为摇摆状态)"
c04f5ac3 4574
a77c07d9 4575#: builtin/fetch.c:560
c04f5ac3
JX
4576msgid "[deleted]"
4577msgstr "[已删除]"
4578
a77c07d9 4579#: builtin/fetch.c:561 builtin/remote.c:1055
c04f5ac3
JX
4580msgid "(none)"
4581msgstr "(无)"
4582
a77c07d9 4583#: builtin/fetch.c:678
c04f5ac3
JX
4584#, c-format
4585msgid "Refusing to fetch into current branch %s of non-bare repository"
4586msgstr "拒绝获取到非裸版本库的当前分支 %s"
4587
a77c07d9 4588#: builtin/fetch.c:712
c04f5ac3
JX
4589#, c-format
4590msgid "Don't know how to fetch from %s"
4591msgstr "不知道如何从 %s 获取"
4592
a77c07d9 4593#: builtin/fetch.c:789
c04f5ac3
JX
4594#, c-format
4595msgid "Option \"%s\" value \"%s\" is not valid for %s"
4596msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4597
a77c07d9 4598#: builtin/fetch.c:792
c04f5ac3
JX
4599#, c-format
4600msgid "Option \"%s\" is ignored for %s\n"
81809b99 4601msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 4602
a77c07d9 4603#: builtin/fetch.c:894
c04f5ac3
JX
4604#, c-format
4605msgid "Fetching %s\n"
d4a8e00b 4606msgstr "正在获取 %s\n"
c04f5ac3 4607
a77c07d9 4608#: builtin/fetch.c:896 builtin/remote.c:100
c04f5ac3
JX
4609#, c-format
4610msgid "Could not fetch %s"
4611msgstr "不能获取 %s"
4612
a77c07d9 4613#: builtin/fetch.c:915
c04f5ac3
JX
4614msgid ""
4615"No remote repository specified. Please, specify either a URL or a\n"
4616"remote name from which new revisions should be fetched."
90e6ef53 4617msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 4618
a77c07d9 4619#: builtin/fetch.c:935
c04f5ac3 4620msgid "You need to specify a tag name."
90e6ef53 4621msgstr "您需要指定一个 tag 名称。"
c04f5ac3 4622
a77c07d9
JX
4623#: builtin/fetch.c:981
4624msgid "--depth and --unshallow cannot be used together"
4625msgstr "--depth 和 --unshallow 不能同时使用"
4626
4627#: builtin/fetch.c:983
4628msgid "--unshallow on a complete repository does not make sense"
4629msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4630
4631#: builtin/fetch.c:1002
c04f5ac3
JX
4632msgid "fetch --all does not take a repository argument"
4633msgstr "fetch --all 不能带一个版本库参数"
4634
a77c07d9 4635#: builtin/fetch.c:1004
c04f5ac3
JX
4636msgid "fetch --all does not make sense with refspecs"
4637msgstr "fetch --all 带引用表达式没有任何意义"
4638
a77c07d9 4639#: builtin/fetch.c:1015
c04f5ac3
JX
4640#, c-format
4641msgid "No such remote or remote group: %s"
4642msgstr "没有这样的远程或远程组:%s"
4643
a77c07d9 4644#: builtin/fetch.c:1023
c04f5ac3 4645msgid "Fetching a group and specifying refspecs does not make sense"
90e6ef53 4646msgstr "获取组并指定引用表达式没有意义"
c04f5ac3 4647
ef317cd5
JX
4648#: builtin/fmt-merge-msg.c:13
4649msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4650msgstr ""
07432cef 4651"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 4652
07432cef
WS
4653#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4654#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
a77c07d9 4655#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
ef317cd5 4656msgid "n"
07432cef 4657msgstr "n"
c04f5ac3 4658
07432cef 4659#: builtin/fmt-merge-msg.c:660
ef317cd5 4660msgid "populate log with at most <n> entries from shortlog"
07432cef 4661msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 4662
07432cef 4663#: builtin/fmt-merge-msg.c:663
ef317cd5 4664msgid "alias for --log (deprecated)"
07432cef 4665msgstr "参数 --log 的别名(已弃用)"
ef317cd5 4666
07432cef 4667#: builtin/fmt-merge-msg.c:666
ef317cd5 4668msgid "text"
07432cef 4669msgstr "文本"
ef317cd5 4670
07432cef 4671#: builtin/fmt-merge-msg.c:667
ef317cd5 4672msgid "use <text> as start of message"
07432cef 4673msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 4674
07432cef 4675#: builtin/fmt-merge-msg.c:668
ef317cd5 4676msgid "file to read from"
07432cef 4677msgstr "从文件中读取"
ef317cd5
JX
4678
4679#: builtin/for-each-ref.c:979
ef317cd5 4680msgid "git for-each-ref [options] [<pattern>]"
07432cef 4681msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5
JX
4682
4683#: builtin/for-each-ref.c:994
4684msgid "quote placeholders suitably for shells"
07432cef 4685msgstr "引用占位符适用于 shells"
ef317cd5
JX
4686
4687#: builtin/for-each-ref.c:996
4688msgid "quote placeholders suitably for perl"
07432cef 4689msgstr "引用占位符适用于 perl"
ef317cd5
JX
4690
4691#: builtin/for-each-ref.c:998
4692msgid "quote placeholders suitably for python"
07432cef 4693msgstr "引用占位符适用于 python"
ef317cd5
JX
4694
4695#: builtin/for-each-ref.c:1000
4696msgid "quote placeholders suitably for tcl"
07432cef 4697msgstr "引用占位符适用于 tcl"
ef317cd5
JX
4698
4699#: builtin/for-each-ref.c:1003
4700msgid "show only <n> matched refs"
07432cef 4701msgstr "只显示 <n> 个匹配的引用"
ef317cd5
JX
4702
4703#: builtin/for-each-ref.c:1004
4704msgid "format"
07432cef 4705msgstr "格式"
ef317cd5
JX
4706
4707#: builtin/for-each-ref.c:1004
4708msgid "format to use for the output"
07432cef 4709msgstr "输出格式"
ef317cd5
JX
4710
4711#: builtin/for-each-ref.c:1005
4712msgid "key"
07432cef 4713msgstr "key"
ef317cd5
JX
4714
4715#: builtin/for-each-ref.c:1006
4716msgid "field name to sort on"
07432cef 4717msgstr "排序的字段名"
ef317cd5
JX
4718
4719#: builtin/fsck.c:608
ef317cd5 4720msgid "git fsck [options] [<object>...]"
07432cef 4721msgstr "git fsck [选项] [<对象>...]"
ef317cd5
JX
4722
4723#: builtin/fsck.c:614
4724msgid "show unreachable objects"
07432cef 4725msgstr "显示不可达的对象"
ef317cd5
JX
4726
4727#: builtin/fsck.c:615
ef317cd5 4728msgid "show dangling objects"
07432cef 4729msgstr "显示摇摆的对象"
ef317cd5
JX
4730
4731#: builtin/fsck.c:616
4732msgid "report tags"
07432cef 4733msgstr "报告 tags"
ef317cd5
JX
4734
4735#: builtin/fsck.c:617
4736msgid "report root nodes"
07432cef 4737msgstr "报告根节点"
ef317cd5
JX
4738
4739#: builtin/fsck.c:618
4740msgid "make index objects head nodes"
07432cef 4741msgstr "将索引亦作为检查的头节点"
ef317cd5
JX
4742
4743#: builtin/fsck.c:619
4744msgid "make reflogs head nodes (default)"
07432cef 4745msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5
JX
4746
4747#: builtin/fsck.c:620
4748msgid "also consider packs and alternate objects"
07432cef 4749msgstr "也考虑包和备用对象"
ef317cd5
JX
4750
4751#: builtin/fsck.c:621
4752msgid "enable more strict checking"
07432cef 4753msgstr "启用更严格的检查"
ef317cd5
JX
4754
4755#: builtin/fsck.c:623
4756msgid "write dangling objects in .git/lost-found"
07432cef 4757msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5
JX
4758
4759#: builtin/fsck.c:624 builtin/prune.c:134
4760msgid "show progress"
07432cef 4761msgstr "显示进度"
ef317cd5
JX
4762
4763#: builtin/gc.c:22
4764msgid "git gc [options]"
07432cef 4765msgstr "git gc [选项]"
ef317cd5 4766
c04f5ac3
JX
4767#: builtin/gc.c:63
4768#, c-format
4769msgid "Invalid %s: '%s'"
4770msgstr "无效的 %s:'%s'"
4771
eff6d3a9 4772#: builtin/gc.c:90
c04f5ac3
JX
4773#, c-format
4774msgid "insanely long object directory %.*s"
4775msgstr "不正常的长对象目录 %.*s"
4776
ef317cd5
JX
4777#: builtin/gc.c:179
4778msgid "prune unreferenced objects"
07432cef 4779msgstr "清除未引用的对象"
ef317cd5
JX
4780
4781#: builtin/gc.c:181
4782msgid "be more thorough (increased runtime)"
07432cef 4783msgstr "更彻底(增加运行时间)"
ef317cd5
JX
4784
4785#: builtin/gc.c:182
4786msgid "enable auto-gc mode"
07432cef 4787msgstr "启用自动垃圾回收模式"
ef317cd5 4788
07432cef 4789#: builtin/gc.c:222
c04f5ac3
JX
4790#, c-format
4791msgid ""
4792"Auto packing the repository for optimum performance. You may also\n"
4793"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4794msgstr ""
90e6ef53
JX
4795"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4796"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 4797
07432cef 4798#: builtin/gc.c:249
c04f5ac3
JX
4799msgid ""
4800"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 4801msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 4802
ef317cd5
JX
4803#: builtin/grep.c:22
4804msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 4805msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 4806
07432cef 4807#: builtin/grep.c:217
c04f5ac3
JX
4808#, c-format
4809msgid "grep: failed to create thread: %s"
90e6ef53 4810msgstr "grep:无法创建线程:%s"
c04f5ac3 4811
07432cef 4812#: builtin/grep.c:365
c04f5ac3
JX
4813#, c-format
4814msgid "Failed to chdir: %s"
4815msgstr "无法切换目录:%s"
4816
07432cef 4817#: builtin/grep.c:443 builtin/grep.c:478
c04f5ac3
JX
4818#, c-format
4819msgid "unable to read tree (%s)"
90e6ef53 4820msgstr "无法读取树(%s)"
c04f5ac3 4821
07432cef 4822#: builtin/grep.c:493
c04f5ac3
JX
4823#, c-format
4824msgid "unable to grep from object of type %s"
4825msgstr "无法抓取来自于 %s 类型的对象"
4826
07432cef 4827#: builtin/grep.c:551
c04f5ac3
JX
4828#, c-format
4829msgid "switch `%c' expects a numerical value"
4830msgstr "开关 `%c' 期望一个数字值"
4831
07432cef 4832#: builtin/grep.c:568
c04f5ac3
JX
4833#, c-format
4834msgid "cannot open '%s'"
4835msgstr "不能打开 '%s'"
4836
07432cef 4837#: builtin/grep.c:643
ef317cd5 4838msgid "search in index instead of in the work tree"
07432cef 4839msgstr "在索引区搜索而不是在工作区"
ef317cd5 4840
07432cef 4841#: builtin/grep.c:645
ef317cd5 4842msgid "find in contents not managed by git"
07432cef 4843msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
4844
4845# 译者:中文字符串拼接,可删除前导空格
07432cef 4846#: builtin/grep.c:647
ef317cd5 4847msgid "search in both tracked and untracked files"
07432cef 4848msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 4849
07432cef 4850#: builtin/grep.c:649
ef317cd5 4851msgid "search also in ignored files"
07432cef 4852msgstr "也在忽略的文件中搜索"
ef317cd5 4853
07432cef 4854#: builtin/grep.c:652
ef317cd5 4855msgid "show non-matching lines"
07432cef 4856msgstr "显示未匹配的行"
ef317cd5 4857
07432cef 4858#: builtin/grep.c:654
ef317cd5 4859msgid "case insensitive matching"
07432cef 4860msgstr "不区分大小写匹配"
ef317cd5 4861
07432cef 4862#: builtin/grep.c:656
ef317cd5 4863msgid "match patterns only at word boundaries"
07432cef 4864msgstr "只在单词边界匹配模式"
ef317cd5 4865
07432cef 4866#: builtin/grep.c:658
ef317cd5 4867msgid "process binary files as text"
07432cef 4868msgstr "把二进制文件当做文本处理"
ef317cd5 4869
07432cef 4870#: builtin/grep.c:660
ef317cd5 4871msgid "don't match patterns in binary files"
07432cef 4872msgstr "不在二进制文件中匹配模式"
ef317cd5 4873
07432cef 4874#: builtin/grep.c:663
ef317cd5 4875msgid "descend at most <depth> levels"
07432cef 4876msgstr "最多以指定的深度向下寻找"
ef317cd5 4877
07432cef 4878#: builtin/grep.c:667
ef317cd5 4879msgid "use extended POSIX regular expressions"
07432cef 4880msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 4881
07432cef 4882#: builtin/grep.c:670
ef317cd5 4883msgid "use basic POSIX regular expressions (default)"
07432cef 4884msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 4885
07432cef 4886#: builtin/grep.c:673
ef317cd5 4887msgid "interpret patterns as fixed strings"
07432cef 4888msgstr "把模式解析为固定的字符串"
ef317cd5 4889
07432cef 4890#: builtin/grep.c:676
ef317cd5 4891msgid "use Perl-compatible regular expressions"
07432cef 4892msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 4893
07432cef 4894#: builtin/grep.c:679
ef317cd5 4895msgid "show line numbers"
07432cef 4896msgstr "显示行号"
ef317cd5 4897
07432cef 4898#: builtin/grep.c:680
ef317cd5 4899msgid "don't show filenames"
07432cef 4900msgstr "不显示文件名"
ef317cd5 4901
07432cef 4902#: builtin/grep.c:681
ef317cd5 4903msgid "show filenames"
07432cef 4904msgstr "显示文件名"
ef317cd5 4905
07432cef 4906#: builtin/grep.c:683
ef317cd5 4907msgid "show filenames relative to top directory"
07432cef 4908msgstr "显示相对于顶级目录的文件名"
ef317cd5 4909
07432cef 4910#: builtin/grep.c:685
ef317cd5 4911msgid "show only filenames instead of matching lines"
07432cef 4912msgstr "只显示文件名而不显示匹配的行"
ef317cd5 4913
07432cef 4914#: builtin/grep.c:687
ef317cd5 4915msgid "synonym for --files-with-matches"
07432cef 4916msgstr "和 --files-with-matches 同义"
ef317cd5 4917
07432cef 4918#: builtin/grep.c:690
ef317cd5 4919msgid "show only the names of files without match"
07432cef 4920msgstr "只显示未匹配的文件名"
ef317cd5 4921
07432cef 4922#: builtin/grep.c:692
ef317cd5 4923msgid "print NUL after filenames"
07432cef 4924msgstr "在文件名后输出 NUL 字符"
ef317cd5 4925
07432cef 4926#: builtin/grep.c:694
ef317cd5 4927msgid "show the number of matches instead of matching lines"
07432cef 4928msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 4929
07432cef 4930#: builtin/grep.c:695
ef317cd5 4931msgid "highlight matches"
07432cef 4932msgstr "高亮显示匹配项"
ef317cd5 4933
07432cef 4934#: builtin/grep.c:697
ef317cd5 4935msgid "print empty line between matches from different files"
07432cef 4936msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 4937
07432cef 4938#: builtin/grep.c:699
ef317cd5 4939msgid "show filename only once above matches from same file"
07432cef 4940msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 4941
07432cef 4942#: builtin/grep.c:702
ef317cd5 4943msgid "show <n> context lines before and after matches"
07432cef 4944msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 4945
07432cef 4946#: builtin/grep.c:705
ef317cd5 4947msgid "show <n> context lines before matches"
07432cef 4948msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 4949
07432cef 4950#: builtin/grep.c:707
ef317cd5 4951msgid "show <n> context lines after matches"
07432cef 4952msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 4953
07432cef 4954#: builtin/grep.c:708
ef317cd5 4955msgid "shortcut for -C NUM"
07432cef 4956msgstr "快捷键 -C 数字"
ef317cd5 4957
07432cef 4958#: builtin/grep.c:711
ef317cd5 4959msgid "show a line with the function name before matches"
07432cef 4960msgstr "在匹配的前面显示一行函数名"
ef317cd5 4961
07432cef 4962#: builtin/grep.c:713
ef317cd5 4963msgid "show the surrounding function"
07432cef 4964msgstr "显示所在函数的前后内容"
ef317cd5 4965
07432cef 4966#: builtin/grep.c:716
ef317cd5 4967msgid "read patterns from file"
07432cef 4968msgstr "从文件读取模式"
ef317cd5 4969
07432cef 4970#: builtin/grep.c:718
ef317cd5 4971msgid "match <pattern>"
07432cef 4972msgstr "匹配 <模式>"
ef317cd5 4973
07432cef 4974#: builtin/grep.c:720
ef317cd5 4975msgid "combine patterns specified with -e"
07432cef 4976msgstr "组合用 -e 参数设定的模式"
ef317cd5 4977
07432cef 4978#: builtin/grep.c:732
ef317cd5 4979msgid "indicate hit with exit status without output"
07432cef 4980msgstr "不输出,而用退出码标识命中状态"
ef317cd5 4981
07432cef 4982#: builtin/grep.c:734
ef317cd5 4983msgid "show only matches from files that match all patterns"
07432cef 4984msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 4985
07432cef
WS
4986#: builtin/grep.c:736
4987msgid "show parse tree for grep expression"
4988msgstr "显示 grep 表达式的解析树"
4989
4990#: builtin/grep.c:740
ef317cd5 4991msgid "pager"
07432cef 4992msgstr "分页"
ef317cd5 4993
07432cef 4994#: builtin/grep.c:740
ef317cd5 4995msgid "show matching files in the pager"
07432cef 4996msgstr "分页显示匹配的文件"
ef317cd5 4997
07432cef 4998#: builtin/grep.c:743
ef317cd5 4999msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5000msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5001
07432cef 5002#: builtin/grep.c:744 builtin/show-ref.c:184
ef317cd5 5003msgid "show usage"
07432cef 5004msgstr "显示用法"
ef317cd5 5005
07432cef 5006#: builtin/grep.c:811
c04f5ac3
JX
5007msgid "no pattern given."
5008msgstr "未提供模式匹配。"
5009
1003b3a5 5010#: builtin/grep.c:866
c04f5ac3
JX
5011msgid "--open-files-in-pager only works on the worktree"
5012msgstr "--open-files-in-pager 仅用于工作区"
5013
1003b3a5 5014#: builtin/grep.c:889
c04f5ac3 5015msgid "--cached or --untracked cannot be used with --no-index."
649900bc 5016msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 5017
1003b3a5 5018#: builtin/grep.c:894
c04f5ac3 5019msgid "--no-index or --untracked cannot be used with revs."
649900bc 5020msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 5021
1003b3a5 5022#: builtin/grep.c:897
c04f5ac3 5023msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 5024msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 5025
1003b3a5 5026#: builtin/grep.c:905
c04f5ac3
JX
5027msgid "both --cached and trees are given."
5028msgstr "同时给出了 --cached 和树对象。"
5029
ef317cd5
JX
5030#: builtin/hash-object.c:60
5031msgid ""
5032"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5033"<file>..."
5034msgstr ""
07432cef
WS
5035"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5036"<文件>..."
ef317cd5
JX
5037
5038#: builtin/hash-object.c:61
5039msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 5040msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5
JX
5041
5042#: builtin/hash-object.c:72
5043msgid "type"
07432cef 5044msgstr "类型"
ef317cd5
JX
5045
5046#: builtin/hash-object.c:72
ef317cd5 5047msgid "object type"
07432cef 5048msgstr "对象类型"
ef317cd5
JX
5049
5050#: builtin/hash-object.c:73
5051msgid "write the object into the object database"
07432cef 5052msgstr "将对象写入对象数据库"
ef317cd5
JX
5053
5054#: builtin/hash-object.c:74
5055msgid "read the object from stdin"
07432cef 5056msgstr "从标准输入读取对象"
ef317cd5
JX
5057
5058#: builtin/hash-object.c:76
5059msgid "store file as is without filters"
07432cef 5060msgstr "原样存储文件不使用过滤器"
ef317cd5
JX
5061
5062#: builtin/hash-object.c:77
5063msgid "process file as it were from this path"
07432cef 5064msgstr "处理文件并假设其来自于此路径"
ef317cd5 5065
a77c07d9 5066#: builtin/help.c:42
ef317cd5 5067msgid "print all available commands"
07432cef 5068msgstr "打印所有可用的命令"
ef317cd5 5069
a77c07d9 5070#: builtin/help.c:43
ef317cd5 5071msgid "show man page"
07432cef 5072msgstr "显示 man 手册"
ef317cd5 5073
a77c07d9 5074#: builtin/help.c:44
ef317cd5 5075msgid "show manual in web browser"
07432cef 5076msgstr "在 web 浏览器中显示手册"
ef317cd5 5077
a77c07d9 5078#: builtin/help.c:46
ef317cd5 5079msgid "show info page"
07432cef 5080msgstr "显示 info 手册"
ef317cd5 5081
a77c07d9 5082#: builtin/help.c:52
ef317cd5 5083msgid "git help [--all] [--man|--web|--info] [command]"
07432cef 5084msgstr "git help [--all] [--man|--web|--info] [命令]"
ef317cd5 5085
a77c07d9 5086#: builtin/help.c:64
81809b99 5087#, c-format
8ada9598 5088msgid "unrecognized help format '%s'"
81809b99 5089msgstr "未能识别的帮助格式 '%s'"
8ada9598 5090
a77c07d9 5091#: builtin/help.c:92
8ada9598 5092msgid "Failed to start emacsclient."
81809b99 5093msgstr "无法启动 emacsclient。"
8ada9598 5094
a77c07d9 5095#: builtin/help.c:105
8ada9598 5096msgid "Failed to parse emacsclient version."
81809b99 5097msgstr "无法解析 emacsclient 版本。"
8ada9598 5098
a77c07d9 5099#: builtin/help.c:113
8ada9598
JX
5100#, c-format
5101msgid "emacsclient version '%d' too old (< 22)."
07432cef 5102msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 5103
a77c07d9 5104#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
81809b99 5105#, c-format
8ada9598 5106msgid "failed to exec '%s': %s"
81809b99 5107msgstr "无法执行 '%s':%s"
8ada9598 5108
a77c07d9 5109#: builtin/help.c:216
8ada9598
JX
5110#, c-format
5111msgid ""
5112"'%s': path for unsupported man viewer.\n"
5113"Please consider using 'man.<tool>.cmd' instead."
5114msgstr ""
81809b99
JX
5115"'%s':不支持的 man 手册查看器的路径。\n"
5116"请使用 'man.<tool>.cmd'。"
8ada9598 5117
a77c07d9 5118#: builtin/help.c:228
8ada9598
JX
5119#, c-format
5120msgid ""
5121"'%s': cmd for supported man viewer.\n"
5122"Please consider using 'man.<tool>.path' instead."
5123msgstr ""
81809b99
JX
5124"'%s': 支持的 man 手册查看器命令。\n"
5125"请使用 'man.<tool>.path'。"
8ada9598 5126
a77c07d9 5127#: builtin/help.c:349
8ada9598
JX
5128#, c-format
5129msgid "'%s': unknown man viewer."
81809b99 5130msgstr "'%s':未知的 man 查看器。"
8ada9598 5131
a77c07d9 5132#: builtin/help.c:366
8ada9598 5133msgid "no man viewer handled the request"
81809b99 5134msgstr "没有 man 查看器处理此请求"
8ada9598 5135
a77c07d9 5136#: builtin/help.c:374
8ada9598 5137msgid "no info viewer handled the request"
81809b99 5138msgstr "没有 info 查看器处理此请求"
8ada9598 5139
a77c07d9 5140#: builtin/help.c:429 builtin/help.c:436
8ada9598
JX
5141#, c-format
5142msgid "usage: %s%s"
81809b99 5143msgstr "用法:%s%s"
8ada9598 5144
a77c07d9 5145#: builtin/help.c:452
8ada9598
JX
5146#, c-format
5147msgid "`git %s' is aliased to `%s'"
81809b99 5148msgstr "`git %s' 是 `%s' 的别名"
8ada9598 5149
1003b3a5 5150#: builtin/index-pack.c:182
8ada9598
JX
5151#, c-format
5152msgid "object type mismatch at %s"
81809b99 5153msgstr "%s 的对象类型不匹配"
8ada9598 5154
1003b3a5 5155#: builtin/index-pack.c:202
8ada9598 5156msgid "object of unexpected type"
81809b99 5157msgstr "意外的类型的对象"
8ada9598 5158
1003b3a5 5159#: builtin/index-pack.c:239
81809b99 5160#, c-format
8ada9598
JX
5161msgid "cannot fill %d byte"
5162msgid_plural "cannot fill %d bytes"
81809b99 5163msgstr[0] "无法填充 %d 字节"
5ae481e0 5164msgstr[1] "无法填充 %d 字节"
8ada9598 5165
1003b3a5 5166#: builtin/index-pack.c:249
8ada9598 5167msgid "early EOF"
81809b99 5168msgstr "过早的文件结束符(EOF)"
8ada9598 5169
1003b3a5 5170#: builtin/index-pack.c:250
8ada9598 5171msgid "read error on input"
81809b99 5172msgstr "输入上的读错误"
8ada9598 5173
1003b3a5 5174#: builtin/index-pack.c:262
8ada9598 5175msgid "used more bytes than were available"
81809b99 5176msgstr "用掉了超过可用的字节"
8ada9598 5177
1003b3a5 5178#: builtin/index-pack.c:269
8ada9598 5179msgid "pack too large for current definition of off_t"
81809b99 5180msgstr "包太大超过了当前 off_t 的定义"
8ada9598 5181
1003b3a5 5182#: builtin/index-pack.c:285
81809b99 5183#, c-format
8ada9598 5184msgid "unable to create '%s'"
81809b99 5185msgstr "不能创建 '%s'"
8ada9598 5186
1003b3a5 5187#: builtin/index-pack.c:290
81809b99 5188#, c-format
8ada9598 5189msgid "cannot open packfile '%s'"
81809b99 5190msgstr "无法打开包文件 '%s'"
8ada9598 5191
1003b3a5 5192#: builtin/index-pack.c:304
8ada9598 5193msgid "pack signature mismatch"
81809b99 5194msgstr "包签名不匹配"
8ada9598 5195
1003b3a5 5196#: builtin/index-pack.c:306
ef317cd5
JX
5197#, c-format
5198msgid "pack version %<PRIu32> unsupported"
07432cef 5199msgstr "不支持包版本 %<PRIu32>"
ef317cd5 5200
1003b3a5 5201#: builtin/index-pack.c:324
8ada9598
JX
5202#, c-format
5203msgid "pack has bad object at offset %lu: %s"
81809b99 5204msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 5205
1003b3a5 5206#: builtin/index-pack.c:446
8ada9598
JX
5207#, c-format
5208msgid "inflate returned %d"
81809b99 5209msgstr "解压缩返回 %d"
8ada9598 5210
1003b3a5 5211#: builtin/index-pack.c:495
8ada9598 5212msgid "offset value overflow for delta base object"
81809b99 5213msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 5214
1003b3a5 5215#: builtin/index-pack.c:503
8ada9598 5216msgid "delta base offset is out of bound"
81809b99 5217msgstr "delta 基准偏移越界"
8ada9598 5218
1003b3a5 5219#: builtin/index-pack.c:511
81809b99 5220#, c-format
8ada9598 5221msgid "unknown object type %d"
81809b99 5222msgstr "未知对象类型 %d"
8ada9598 5223
1003b3a5 5224#: builtin/index-pack.c:542
8ada9598 5225msgid "cannot pread pack file"
81809b99 5226msgstr "无法读取包文件"
8ada9598 5227
1003b3a5 5228#: builtin/index-pack.c:544
8ada9598
JX
5229#, c-format
5230msgid "premature end of pack file, %lu byte missing"
5231msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 5232msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 5233msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 5234
1003b3a5 5235#: builtin/index-pack.c:570
8ada9598 5236msgid "serious inflate inconsistency"
81809b99 5237msgstr "解压缩严重的不一致"
8ada9598 5238
1003b3a5
JX
5239#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690
5240#: builtin/index-pack.c:724 builtin/index-pack.c:733
8ada9598
JX
5241#, c-format
5242msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 5243msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 5244
1003b3a5 5245#: builtin/index-pack.c:664 builtin/pack-objects.c:170
6792b93b
JX
5246#: builtin/pack-objects.c:262
5247#, c-format
5248msgid "unable to read %s"
5249msgstr "不能读 %s"
5250
1003b3a5 5251#: builtin/index-pack.c:730
6792b93b
JX
5252#, c-format
5253msgid "cannot read existing object %s"
5254msgstr "不能读取现存对象 %s"
5255
1003b3a5 5256#: builtin/index-pack.c:744
81809b99 5257#, c-format
8ada9598 5258msgid "invalid blob object %s"
07432cef 5259msgstr "无效的数据(blob)对象 %s"
8ada9598 5260
1003b3a5 5261#: builtin/index-pack.c:759
81809b99 5262#, c-format
8ada9598 5263msgid "invalid %s"
81809b99 5264msgstr "无效的 %s"
8ada9598 5265
1003b3a5 5266#: builtin/index-pack.c:761
8ada9598 5267msgid "Error in object"
81809b99 5268msgstr "对象中出错"
8ada9598 5269
1003b3a5 5270#: builtin/index-pack.c:763
8ada9598
JX
5271#, c-format
5272msgid "Not all child objects of %s are reachable"
81809b99 5273msgstr "%s 的所有子对象并非都可达"
8ada9598 5274
1003b3a5 5275#: builtin/index-pack.c:833 builtin/index-pack.c:863
8ada9598 5276msgid "failed to apply delta"
81809b99 5277msgstr "无法应用 delta"
8ada9598 5278
1003b3a5 5279#: builtin/index-pack.c:1004
8ada9598 5280msgid "Receiving objects"
81809b99 5281msgstr "接收对象中"
8ada9598 5282
1003b3a5 5283#: builtin/index-pack.c:1004
8ada9598 5284msgid "Indexing objects"
81809b99 5285msgstr "索引对象中"
8ada9598 5286
1003b3a5 5287#: builtin/index-pack.c:1030
8ada9598 5288msgid "pack is corrupted (SHA1 mismatch)"
81809b99 5289msgstr "包冲突(SHA1 不匹配)"
8ada9598 5290
1003b3a5 5291#: builtin/index-pack.c:1035
8ada9598 5292msgid "cannot fstat packfile"
81809b99 5293msgstr "不能枚举包文件状态"
8ada9598 5294
1003b3a5 5295#: builtin/index-pack.c:1038
8ada9598 5296msgid "pack has junk at the end"
81809b99 5297msgstr "包的结尾有垃圾数据"
8ada9598 5298
1003b3a5 5299#: builtin/index-pack.c:1049
6792b93b
JX
5300msgid "confusion beyond insanity in parse_pack_objects()"
5301msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5302
1003b3a5 5303#: builtin/index-pack.c:1072
8ada9598 5304msgid "Resolving deltas"
81809b99 5305msgstr "处理 delta 中"
8ada9598 5306
1003b3a5 5307#: builtin/index-pack.c:1082
07432cef 5308#, c-format
ef317cd5 5309msgid "unable to create thread: %s"
07432cef 5310msgstr "不能创建线程:%s"
ef317cd5 5311
1003b3a5 5312#: builtin/index-pack.c:1124
8ada9598 5313msgid "confusion beyond insanity"
81809b99 5314msgstr "不可理喻"
8ada9598 5315
1003b3a5 5316#: builtin/index-pack.c:1132
ef317cd5
JX
5317#, c-format
5318msgid "completed with %d local objects"
07432cef 5319msgstr "完成 %d 个本地对象"
ef317cd5 5320
1003b3a5 5321#: builtin/index-pack.c:1142
ef317cd5
JX
5322#, c-format
5323msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 5324msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 5325
1003b3a5 5326#: builtin/index-pack.c:1146
8ada9598
JX
5327#, c-format
5328msgid "pack has %d unresolved delta"
5329msgid_plural "pack has %d unresolved deltas"
81809b99 5330msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 5331msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 5332
1003b3a5 5333#: builtin/index-pack.c:1171
81809b99 5334#, c-format
8ada9598 5335msgid "unable to deflate appended object (%d)"
07432cef 5336msgstr "不能压缩附加对象(%d)"
8ada9598 5337
1003b3a5 5338#: builtin/index-pack.c:1250
8ada9598
JX
5339#, c-format
5340msgid "local object %s is corrupt"
81809b99 5341msgstr "本地对象 %s 已损坏"
8ada9598 5342
1003b3a5 5343#: builtin/index-pack.c:1274
8ada9598 5344msgid "error while closing pack file"
81809b99 5345msgstr "关闭包文件时出错"
8ada9598 5346
1003b3a5 5347#: builtin/index-pack.c:1287
81809b99 5348#, c-format
8ada9598 5349msgid "cannot write keep file '%s'"
81809b99 5350msgstr "无法写保留文件 '%s'"
8ada9598 5351
1003b3a5 5352#: builtin/index-pack.c:1295
81809b99 5353#, c-format
8ada9598 5354msgid "cannot close written keep file '%s'"
81809b99 5355msgstr "无法关闭保留文件 '%s'"
8ada9598 5356
1003b3a5 5357#: builtin/index-pack.c:1308
8ada9598 5358msgid "cannot store pack file"
81809b99 5359msgstr "无法存储包文件"
8ada9598 5360
1003b3a5 5361#: builtin/index-pack.c:1319
8ada9598 5362msgid "cannot store index file"
81809b99 5363msgstr "无法存储索引文件"
8ada9598 5364
1003b3a5 5365#: builtin/index-pack.c:1352
07432cef 5366#, c-format
ef317cd5 5367msgid "bad pack.indexversion=%<PRIu32>"
07432cef 5368msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 5369
1003b3a5 5370#: builtin/index-pack.c:1358
ef317cd5
JX
5371#, c-format
5372msgid "invalid number of threads specified (%d)"
07432cef 5373msgstr "指定的线程数无效(%d)"
ef317cd5 5374
1003b3a5 5375#: builtin/index-pack.c:1362 builtin/index-pack.c:1535
ef317cd5
JX
5376#, c-format
5377msgid "no threads support, ignoring %s"
07432cef 5378msgstr "没有线程支持,忽略 %s"
ef317cd5 5379
1003b3a5 5380#: builtin/index-pack.c:1420
81809b99 5381#, c-format
8ada9598 5382msgid "Cannot open existing pack file '%s'"
81809b99 5383msgstr "无法打开现存包文件 '%s'"
8ada9598 5384
1003b3a5 5385#: builtin/index-pack.c:1422
81809b99 5386#, c-format
8ada9598 5387msgid "Cannot open existing pack idx file for '%s'"
81809b99 5388msgstr "无法为 %s 打开包索引文件"
8ada9598 5389
1003b3a5 5390#: builtin/index-pack.c:1469
81809b99 5391#, c-format
8ada9598
JX
5392msgid "non delta: %d object"
5393msgid_plural "non delta: %d objects"
81809b99 5394msgstr[0] "非 delta:%d 个对象"
5ae481e0 5395msgstr[1] "非 delta:%d 个对象"
8ada9598 5396
1003b3a5 5397#: builtin/index-pack.c:1476
8ada9598
JX
5398#, c-format
5399msgid "chain length = %d: %lu object"
5400msgid_plural "chain length = %d: %lu objects"
81809b99 5401msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 5402msgstr[1] "链长 = %d: %lu 对象"
8ada9598 5403
1003b3a5 5404#: builtin/index-pack.c:1503
8ada9598 5405msgid "Cannot come back to cwd"
81809b99 5406msgstr "无法返回当前工作目录"
8ada9598 5407
1003b3a5
JX
5408#: builtin/index-pack.c:1547 builtin/index-pack.c:1550
5409#: builtin/index-pack.c:1562 builtin/index-pack.c:1566
81809b99 5410#, c-format
8ada9598 5411msgid "bad %s"
81809b99 5412msgstr "错误选项 %s"
8ada9598 5413
1003b3a5 5414#: builtin/index-pack.c:1580
8ada9598 5415msgid "--fix-thin cannot be used without --stdin"
649900bc 5416msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 5417
1003b3a5 5418#: builtin/index-pack.c:1584 builtin/index-pack.c:1594
8ada9598
JX
5419#, c-format
5420msgid "packfile name '%s' does not end with '.pack'"
81809b99 5421msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 5422
1003b3a5 5423#: builtin/index-pack.c:1603
8ada9598 5424msgid "--verify with no packfile name given"
81809b99 5425msgstr "--verify 没有提供包名参数"
8ada9598 5426
c04f5ac3
JX
5427#: builtin/init-db.c:35
5428#, c-format
5429msgid "Could not make %s writable by group"
5430msgstr "不能设置 %s 为组可写"
5431
5432#: builtin/init-db.c:62
5433#, c-format
5434msgid "insanely long template name %s"
5435msgstr "太长的模版名 %s"
5436
5437#: builtin/init-db.c:67
5438#, c-format
5439msgid "cannot stat '%s'"
5440msgstr "不能枚举 '%s' 状态"
5441
5442#: builtin/init-db.c:73
5443#, c-format
5444msgid "cannot stat template '%s'"
5445msgstr "不能枚举模版 '%s' 状态"
5446
5447#: builtin/init-db.c:80
5448#, c-format
5449msgid "cannot opendir '%s'"
5450msgstr "不能打开目录 '%s'"
5451
5452#: builtin/init-db.c:97
5453#, c-format
5454msgid "cannot readlink '%s'"
5455msgstr "不能读取链接 '%s'"
5456
5457#: builtin/init-db.c:99
5458#, c-format
5459msgid "insanely long symlink %s"
5460msgstr "太长的符号链接 %s"
5461
5462#: builtin/init-db.c:102
5463#, c-format
5464msgid "cannot symlink '%s' '%s'"
90e6ef53 5465msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
5466
5467#: builtin/init-db.c:106
5468#, c-format
5469msgid "cannot copy '%s' to '%s'"
5470msgstr "不能拷贝 '%s' 至 '%s'"
5471
5472#: builtin/init-db.c:110
5473#, c-format
5474msgid "ignoring template %s"
5475msgstr "忽略模版 %s"
5476
5477#: builtin/init-db.c:133
5478#, c-format
5479msgid "insanely long template path %s"
5480msgstr "太长的模版路径 %s"
5481
5482#: builtin/init-db.c:141
5483#, c-format
5484msgid "templates not found %s"
5485msgstr "模版未找到 %s"
5486
5487#: builtin/init-db.c:154
5488#, c-format
5489msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 5490msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
5491
5492#: builtin/init-db.c:192
5493#, c-format
5494msgid "insane git directory %s"
5495msgstr "不正常的 git 目录 %s"
5496
23ff3338 5497#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
5498#, c-format
5499msgid "%s already exists"
5500msgstr "%s 已经存在"
5501
23ff3338 5502#: builtin/init-db.c:355
c04f5ac3
JX
5503#, c-format
5504msgid "unable to handle file type %d"
5505msgstr "不能处理 %d 类型的文件"
5506
23ff3338 5507#: builtin/init-db.c:358
c04f5ac3
JX
5508#, c-format
5509msgid "unable to move %s to %s"
5510msgstr "不能移动 %s 至 %s"
5511
23ff3338 5512#: builtin/init-db.c:363
c04f5ac3
JX
5513#, c-format
5514msgid "Could not create git link %s"
5515msgstr "不能创建 git link %s"
5516
5517#.
5518#. * TRANSLATORS: The first '%s' is either "Reinitialized
5519#. * existing" or "Initialized empty", the second " shared" or
5520#. * "", and the last '%s%s' is the verbatim directory name.
5521#.
23ff3338 5522#: builtin/init-db.c:420
c04f5ac3
JX
5523#, c-format
5524msgid "%s%s Git repository in %s%s\n"
5525msgstr "%s%s Git 版本库于 %s%s\n"
5526
23ff3338 5527#: builtin/init-db.c:421
c04f5ac3
JX
5528msgid "Reinitialized existing"
5529msgstr "重新初始化现存的"
5530
23ff3338 5531#: builtin/init-db.c:421
c04f5ac3
JX
5532msgid "Initialized empty"
5533msgstr "初始化空的"
5534
7e238ab7 5535# 译者:中文字符串拼接,可删除前导空格
23ff3338 5536#: builtin/init-db.c:422
c04f5ac3 5537msgid " shared"
90e6ef53 5538msgstr "共享"
c04f5ac3 5539
23ff3338 5540#: builtin/init-db.c:441
c04f5ac3
JX
5541msgid "cannot tell cwd"
5542msgstr "无法获知当前路径"
5543
ef317cd5
JX
5544#: builtin/init-db.c:467
5545msgid ""
a77c07d9
JX
5546"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5547"shared[=<permissions>]] [directory]"
ef317cd5 5548msgstr ""
07432cef
WS
5549"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5550"[目录]"
ef317cd5
JX
5551
5552#: builtin/init-db.c:490
5553msgid "permissions"
07432cef 5554msgstr "权限"
ef317cd5
JX
5555
5556#: builtin/init-db.c:491
5557msgid "specify that the git repository is to be shared amongst several users"
07432cef 5558msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5
JX
5559
5560#: builtin/init-db.c:493 builtin/prune-packed.c:77
ef317cd5 5561msgid "be quiet"
07432cef 5562msgstr "保持安静"
ef317cd5 5563
23ff3338 5564#: builtin/init-db.c:522 builtin/init-db.c:529
c04f5ac3
JX
5565#, c-format
5566msgid "cannot mkdir %s"
5567msgstr "不能创建目录 %s"
5568
23ff3338 5569#: builtin/init-db.c:533
c04f5ac3
JX
5570#, c-format
5571msgid "cannot chdir to %s"
5572msgstr "不能切换目录到 %s"
5573
23ff3338 5574#: builtin/init-db.c:555
c04f5ac3
JX
5575#, c-format
5576msgid ""
5577"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5578"dir=<directory>)"
5579msgstr ""
73a60cd2
JX
5580"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5581"dir=<directory>)"
c04f5ac3 5582
23ff3338 5583#: builtin/init-db.c:579
c04f5ac3
JX
5584msgid "Cannot access current working directory"
5585msgstr "不能访问当前工作目录"
5586
23ff3338 5587#: builtin/init-db.c:586
c04f5ac3
JX
5588#, c-format
5589msgid "Cannot access work tree '%s'"
5590msgstr "不能访问工作区 '%s'"
5591
1003b3a5 5592#: builtin/log.c:40
ef317cd5 5593msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
07432cef 5594msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
ef317cd5 5595
1003b3a5 5596#: builtin/log.c:41
ef317cd5 5597msgid " or: git show [options] <object>..."
07432cef 5598msgstr " 或者:git show [选项] <对象>..."
ef317cd5 5599
1003b3a5 5600#: builtin/log.c:103
ef317cd5 5601msgid "suppress diff output"
07432cef 5602msgstr "不显示差异输出"
ef317cd5 5603
1003b3a5 5604#: builtin/log.c:104
ef317cd5 5605msgid "show source"
07432cef 5606msgstr "显示源"
ef317cd5 5607
1003b3a5 5608#: builtin/log.c:105
07432cef
WS
5609msgid "Use mail map file"
5610msgstr "使用邮件映射文件"
5611
1003b3a5 5612#: builtin/log.c:106
ef317cd5 5613msgid "decorate options"
07432cef 5614msgstr "修饰选项"
ef317cd5 5615
1003b3a5 5616#: builtin/log.c:199
c04f5ac3
JX
5617#, c-format
5618msgid "Final output: %d %s\n"
5619msgstr "最终输出:%d %s\n"
5620
1003b3a5 5621#: builtin/log.c:422 builtin/log.c:514
c04f5ac3
JX
5622#, c-format
5623msgid "Could not read object %s"
90e6ef53 5624msgstr "不能读取对象 %s"
c04f5ac3 5625
1003b3a5 5626#: builtin/log.c:538
c04f5ac3
JX
5627#, c-format
5628msgid "Unknown type: %d"
5629msgstr "未知类型:%d"
5630
1003b3a5 5631#: builtin/log.c:630
c04f5ac3
JX
5632msgid "format.headers without value"
5633msgstr "format.headers 没有值"
5634
1003b3a5 5635#: builtin/log.c:704
c04f5ac3
JX
5636msgid "name of output directory is too long"
5637msgstr "输出目录名太长"
5638
1003b3a5 5639#: builtin/log.c:720
c04f5ac3
JX
5640#, c-format
5641msgid "Cannot open patch file %s"
5642msgstr "无法打开补丁文件 %s"
5643
1003b3a5 5644#: builtin/log.c:734
c04f5ac3
JX
5645msgid "Need exactly one range."
5646msgstr "只需要一个范围。"
5647
1003b3a5 5648#: builtin/log.c:742
c04f5ac3
JX
5649msgid "Not a range."
5650msgstr "不是一个范围。"
5651
1003b3a5 5652#: builtin/log.c:815
c04f5ac3
JX
5653msgid "Cover letter needs email format"
5654msgstr "信封需要邮件地址格式"
5655
1003b3a5 5656#: builtin/log.c:888
c04f5ac3
JX
5657#, c-format
5658msgid "insane in-reply-to: %s"
5659msgstr "不正常的 in-reply-to:%s"
5660
1003b3a5 5661#: builtin/log.c:916
ef317cd5 5662msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 5663msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 5664
1003b3a5 5665#: builtin/log.c:961
c04f5ac3
JX
5666msgid "Two output directories?"
5667msgstr "两个输出目录?"
5668
1003b3a5 5669#: builtin/log.c:1099
ef317cd5 5670msgid "use [PATCH n/m] even with a single patch"
07432cef 5671msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 5672
1003b3a5 5673#: builtin/log.c:1102
ef317cd5 5674msgid "use [PATCH] even with multiple patches"
07432cef 5675msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 5676
1003b3a5 5677#: builtin/log.c:1106
ef317cd5 5678msgid "print patches to standard out"
07432cef 5679msgstr "打印补丁到标准输出"
c04f5ac3 5680
1003b3a5 5681#: builtin/log.c:1108
ef317cd5 5682msgid "generate a cover letter"
07432cef 5683msgstr "生成一封附信"
c04f5ac3 5684
1003b3a5 5685#: builtin/log.c:1110
ef317cd5 5686msgid "use simple number sequence for output file names"
07432cef 5687msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 5688
1003b3a5 5689#: builtin/log.c:1111
ef317cd5 5690msgid "sfx"
07432cef 5691msgstr "后缀"
ef317cd5 5692
1003b3a5 5693#: builtin/log.c:1112
ef317cd5 5694msgid "use <sfx> instead of '.patch'"
07432cef 5695msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 5696
1003b3a5 5697#: builtin/log.c:1114
ef317cd5 5698msgid "start numbering patches at <n> instead of 1"
07432cef
WS
5699msgstr "补丁以 <n> 开始编号,而不是1"
5700
1003b3a5 5701#: builtin/log.c:1116
07432cef
WS
5702msgid "mark the series as Nth re-roll"
5703msgstr "标记补丁系列是第几次重制"
ef317cd5 5704
1003b3a5 5705#: builtin/log.c:1118
ef317cd5 5706msgid "Use [<prefix>] instead of [PATCH]"
07432cef 5707msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 5708
1003b3a5 5709#: builtin/log.c:1121
ef317cd5 5710msgid "store resulting files in <dir>"
07432cef 5711msgstr "把结果文件存储在 <dir>"
ef317cd5 5712
1003b3a5 5713#: builtin/log.c:1124
ef317cd5 5714msgid "don't strip/add [PATCH]"
07432cef 5715msgstr "不删除/添加 [PATCH]"
ef317cd5 5716
1003b3a5 5717#: builtin/log.c:1127
ef317cd5 5718msgid "don't output binary diffs"
07432cef 5719msgstr "不输出二进制差异"
ef317cd5 5720
1003b3a5 5721#: builtin/log.c:1129
ef317cd5 5722msgid "don't include a patch matching a commit upstream"
07432cef 5723msgstr "不包含已在上游提交中的补丁"
ef317cd5 5724
1003b3a5 5725#: builtin/log.c:1131
ef317cd5 5726msgid "show patch format instead of default (patch + stat)"
07432cef 5727msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 5728
1003b3a5 5729#: builtin/log.c:1133
ef317cd5 5730msgid "Messaging"
07432cef 5731msgstr "邮件发送"
ef317cd5 5732
1003b3a5 5733#: builtin/log.c:1134
ef317cd5 5734msgid "header"
07432cef 5735msgstr "header"
ef317cd5 5736
1003b3a5 5737#: builtin/log.c:1135
ef317cd5 5738msgid "add email header"
07432cef 5739msgstr "添加邮件头"
ef317cd5 5740
1003b3a5 5741#: builtin/log.c:1136 builtin/log.c:1138
ef317cd5 5742msgid "email"
07432cef 5743msgstr "邮件地址"
ef317cd5 5744
1003b3a5 5745#: builtin/log.c:1136
ef317cd5 5746msgid "add To: header"
07432cef 5747msgstr "添加收件人"
ef317cd5 5748
1003b3a5 5749#: builtin/log.c:1138
ef317cd5 5750msgid "add Cc: header"
07432cef 5751msgstr "添加抄送"
ef317cd5 5752
1003b3a5 5753#: builtin/log.c:1140
ef317cd5 5754msgid "message-id"
07432cef 5755msgstr "message-id"
ef317cd5 5756
1003b3a5 5757#: builtin/log.c:1141
ef317cd5 5758msgid "make first mail a reply to <message-id>"
07432cef 5759msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 5760
1003b3a5 5761#: builtin/log.c:1142 builtin/log.c:1145
ef317cd5 5762msgid "boundary"
07432cef 5763msgstr "边界"
ef317cd5 5764
1003b3a5 5765#: builtin/log.c:1143
ef317cd5 5766msgid "attach the patch"
07432cef 5767msgstr "附件方式添加补丁"
ef317cd5 5768
1003b3a5 5769#: builtin/log.c:1146
ef317cd5 5770msgid "inline the patch"
07432cef 5771msgstr "内联显示补丁"
ef317cd5 5772
1003b3a5 5773#: builtin/log.c:1150
ef317cd5 5774msgid "enable message threading, styles: shallow, deep"
07432cef 5775msgstr "启用邮件线索,风格:浅,深"
ef317cd5 5776
1003b3a5 5777#: builtin/log.c:1152
ef317cd5 5778msgid "signature"
07432cef 5779msgstr "签名"
ef317cd5 5780
1003b3a5 5781#: builtin/log.c:1153
ef317cd5 5782msgid "add a signature"
07432cef 5783msgstr "添加一个签名"
ef317cd5 5784
1003b3a5 5785#: builtin/log.c:1155
ef317cd5 5786msgid "don't print the patch filenames"
07432cef 5787msgstr "不要打印补丁文件名"
ef317cd5 5788
1003b3a5 5789#: builtin/log.c:1239
c04f5ac3
JX
5790msgid "-n and -k are mutually exclusive."
5791msgstr "-n 和 -k 互斥。"
5792
1003b3a5 5793#: builtin/log.c:1241
c04f5ac3
JX
5794msgid "--subject-prefix and -k are mutually exclusive."
5795msgstr "--subject-prefix 和 -k 互斥。"
5796
1003b3a5 5797#: builtin/log.c:1249
c04f5ac3
JX
5798msgid "--name-only does not make sense"
5799msgstr "--name-only 无意义"
5800
1003b3a5 5801#: builtin/log.c:1251
c04f5ac3
JX
5802msgid "--name-status does not make sense"
5803msgstr "--name-status 无意义"
5804
1003b3a5 5805#: builtin/log.c:1253
c04f5ac3
JX
5806msgid "--check does not make sense"
5807msgstr "--check 无意义"
5808
1003b3a5 5809#: builtin/log.c:1276
c04f5ac3
JX
5810msgid "standard output, or directory, which one?"
5811msgstr "标准输出或目录,哪一个?"
5812
1003b3a5 5813#: builtin/log.c:1278
c04f5ac3
JX
5814#, c-format
5815msgid "Could not create directory '%s'"
90e6ef53 5816msgstr "不能创建目录 '%s'"
c04f5ac3 5817
1003b3a5 5818#: builtin/log.c:1431
c04f5ac3
JX
5819msgid "Failed to create output files"
5820msgstr "无法创建输出文件"
5821
1003b3a5 5822#: builtin/log.c:1480
ef317cd5 5823msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 5824msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 5825
1003b3a5 5826#: builtin/log.c:1535
c04f5ac3
JX
5827#, c-format
5828msgid ""
5829"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 5830msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 5831
1003b3a5 5832#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562
c04f5ac3
JX
5833#, c-format
5834msgid "Unknown commit %s"
5835msgstr "未知提交 %s"
5836
a77c07d9 5837#: builtin/ls-files.c:409
ef317cd5 5838msgid "git ls-files [options] [<file>...]"
07432cef 5839msgstr "git ls-files [选项] [<文件>...]"
ef317cd5 5840
a77c07d9 5841#: builtin/ls-files.c:466
ef317cd5 5842msgid "identify the file status with tags"
07432cef 5843msgstr "用标签标识文件的状态"
ef317cd5 5844
a77c07d9 5845#: builtin/ls-files.c:468
ef317cd5 5846msgid "use lowercase letters for 'assume unchanged' files"
07432cef 5847msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 5848
a77c07d9 5849#: builtin/ls-files.c:470
ef317cd5 5850msgid "show cached files in the output (default)"
07432cef 5851msgstr "显示缓存的文件(默认)"
ef317cd5 5852
a77c07d9 5853#: builtin/ls-files.c:472
ef317cd5 5854msgid "show deleted files in the output"
07432cef 5855msgstr "显示已删除的文件"
ef317cd5 5856
a77c07d9 5857#: builtin/ls-files.c:474
ef317cd5 5858msgid "show modified files in the output"
07432cef 5859msgstr "显示已修改的文件"
ef317cd5 5860
a77c07d9 5861#: builtin/ls-files.c:476
ef317cd5 5862msgid "show other files in the output"
07432cef 5863msgstr "显示其它文件"
ef317cd5 5864
a77c07d9 5865#: builtin/ls-files.c:478
ef317cd5 5866msgid "show ignored files in the output"
07432cef 5867msgstr "显示忽略的文件"
ef317cd5 5868
a77c07d9 5869#: builtin/ls-files.c:481
ef317cd5 5870msgid "show staged contents' object name in the output"
07432cef 5871msgstr "显示暂存区内容的对象名称"
ef317cd5 5872
a77c07d9 5873#: builtin/ls-files.c:483
ef317cd5 5874msgid "show files on the filesystem that need to be removed"
07432cef 5875msgstr "显示文件系统需要删除的文件"
ef317cd5 5876
a77c07d9 5877#: builtin/ls-files.c:485
ef317cd5 5878msgid "show 'other' directories' name only"
07432cef 5879msgstr "只显示“其他”目录的名称"
ef317cd5 5880
a77c07d9 5881#: builtin/ls-files.c:488
ef317cd5 5882msgid "don't show empty directories"
07432cef 5883msgstr "不显示空目录"
ef317cd5 5884
a77c07d9 5885#: builtin/ls-files.c:491
ef317cd5 5886msgid "show unmerged files in the output"
07432cef 5887msgstr "显示未合并的文件"
ef317cd5 5888
a77c07d9 5889#: builtin/ls-files.c:493
ef317cd5 5890msgid "show resolve-undo information"
07432cef 5891msgstr "显示 resolve-undo 信息"
ef317cd5 5892
a77c07d9 5893#: builtin/ls-files.c:495
ef317cd5 5894msgid "skip files matching pattern"
07432cef 5895msgstr "匹配排除文件的模式"
ef317cd5 5896
a77c07d9 5897#: builtin/ls-files.c:498
ef317cd5 5898msgid "exclude patterns are read from <file>"
07432cef 5899msgstr "从 <文件> 中读取排除模式"
ef317cd5 5900
a77c07d9 5901#: builtin/ls-files.c:501
ef317cd5 5902msgid "read additional per-directory exclude patterns in <file>"
07432cef 5903msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 5904
a77c07d9 5905#: builtin/ls-files.c:503
ef317cd5 5906msgid "add the standard git exclusions"
07432cef 5907msgstr "添加标准的 git 排除"
ef317cd5 5908
a77c07d9 5909#: builtin/ls-files.c:506
ef317cd5 5910msgid "make the output relative to the project top directory"
07432cef 5911msgstr "显示相对于顶级目录的文件名"
ef317cd5 5912
a77c07d9 5913#: builtin/ls-files.c:509
ef317cd5 5914msgid "if any <file> is not in the index, treat this as an error"
07432cef 5915msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 5916
a77c07d9 5917#: builtin/ls-files.c:510
ef317cd5 5918msgid "tree-ish"
07432cef 5919msgstr "树或提交"
ef317cd5 5920
a77c07d9 5921#: builtin/ls-files.c:511
ef317cd5 5922msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 5923msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 5924
a77c07d9 5925#: builtin/ls-files.c:513
ef317cd5 5926msgid "show debugging data"
07432cef 5927msgstr "显示调试数据"
ef317cd5
JX
5928
5929#: builtin/ls-tree.c:27
ef317cd5 5930msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 5931msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5
JX
5932
5933#: builtin/ls-tree.c:125
5934msgid "only show trees"
07432cef 5935msgstr "只显示树"
ef317cd5
JX
5936
5937#: builtin/ls-tree.c:127
ef317cd5 5938msgid "recurse into subtrees"
07432cef 5939msgstr "递归到子树"
ef317cd5
JX
5940
5941#: builtin/ls-tree.c:129
5942msgid "show trees when recursing"
07432cef 5943msgstr "当递归时显示树"
ef317cd5
JX
5944
5945#: builtin/ls-tree.c:132
5946msgid "terminate entries with NUL byte"
07432cef 5947msgstr "条目以NUL字符终止"
ef317cd5
JX
5948
5949#: builtin/ls-tree.c:133
ef317cd5 5950msgid "include object size"
07432cef 5951msgstr "包括对象大小"
ef317cd5
JX
5952
5953#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5954msgid "list only filenames"
07432cef 5955msgstr "只列出文件名"
ef317cd5
JX
5956
5957#: builtin/ls-tree.c:140
5958msgid "use full path names"
07432cef 5959msgstr "使用文件的全路径"
ef317cd5
JX
5960
5961#: builtin/ls-tree.c:142
5962msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 5963msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5
JX
5964
5965#: builtin/merge.c:43
ef317cd5 5966msgid "git merge [options] [<commit>...]"
07432cef 5967msgstr "git merge [选项] [<提交>...]"
ef317cd5
JX
5968
5969#: builtin/merge.c:44
5970msgid "git merge [options] <msg> HEAD <commit>"
07432cef 5971msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5
JX
5972
5973#: builtin/merge.c:45
5974msgid "git merge --abort"
07432cef 5975msgstr "git merge --abort"
ef317cd5 5976
170e9899 5977#: builtin/merge.c:90
c04f5ac3
JX
5978msgid "switch `m' requires a value"
5979msgstr "开关 `m' 需要一个值"
5980
170e9899 5981#: builtin/merge.c:127
c04f5ac3
JX
5982#, c-format
5983msgid "Could not find merge strategy '%s'.\n"
90e6ef53 5984msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 5985
170e9899 5986#: builtin/merge.c:128
c04f5ac3
JX
5987#, c-format
5988msgid "Available strategies are:"
5989msgstr "可用的策略有:"
5990
170e9899 5991#: builtin/merge.c:133
c04f5ac3
JX
5992#, c-format
5993msgid "Available custom strategies are:"
5994msgstr "可用的自定义策略有:"
5995
ef317cd5
JX
5996#: builtin/merge.c:183
5997msgid "do not show a diffstat at the end of the merge"
07432cef 5998msgstr "在合并的最后不显示差异统计"
ef317cd5
JX
5999
6000#: builtin/merge.c:186
6001msgid "show a diffstat at the end of the merge"
07432cef 6002msgstr "在合并的最后显示差异统计"
ef317cd5
JX
6003
6004#: builtin/merge.c:187
6005msgid "(synonym to --stat)"
07432cef 6006msgstr "(和 --stat 同义)"
ef317cd5
JX
6007
6008#: builtin/merge.c:189
6009msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 6010msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5
JX
6011
6012#: builtin/merge.c:192
ef317cd5 6013msgid "create a single commit instead of doing a merge"
07432cef 6014msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5
JX
6015
6016#: builtin/merge.c:194
6017msgid "perform a commit if the merge succeeds (default)"
07432cef 6018msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5
JX
6019
6020#: builtin/merge.c:196
ef317cd5 6021msgid "edit message before committing"
07432cef 6022msgstr "在提交前编辑提交说明"
ef317cd5
JX
6023
6024#: builtin/merge.c:198
ef317cd5 6025msgid "allow fast-forward (default)"
07432cef 6026msgstr "允许快进(默认)"
ef317cd5
JX
6027
6028#: builtin/merge.c:200
6029msgid "abort if fast-forward is not possible"
07432cef 6030msgstr "如果不能快进就放弃合并"
ef317cd5 6031
1003b3a5
JX
6032#: builtin/merge.c:203
6033msgid "Verify that the named commit has a valid GPG signature"
6034msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6035
6036#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112
ef317cd5 6037msgid "strategy"
07432cef 6038msgstr "策略"
ef317cd5 6039
1003b3a5 6040#: builtin/merge.c:205
ef317cd5 6041msgid "merge strategy to use"
07432cef 6042msgstr "要使用的合并策略"
ef317cd5 6043
1003b3a5 6044#: builtin/merge.c:206
ef317cd5 6045msgid "option=value"
07432cef 6046msgstr "option=value"
ef317cd5 6047
1003b3a5 6048#: builtin/merge.c:207
ef317cd5 6049msgid "option for selected merge strategy"
07432cef 6050msgstr "所选的合并策略的选项"
ef317cd5 6051
1003b3a5 6052#: builtin/merge.c:209
ef317cd5 6053msgid "merge commit message (for a non-fast-forward merge)"
07432cef 6054msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 6055
1003b3a5 6056#: builtin/merge.c:213
ef317cd5 6057msgid "abort the current in-progress merge"
07432cef 6058msgstr "放弃当前正在进行的合并"
ef317cd5 6059
1003b3a5 6060#: builtin/merge.c:242
c04f5ac3
JX
6061msgid "could not run stash."
6062msgstr "不能进行进度保存。"
6063
1003b3a5 6064#: builtin/merge.c:247
c04f5ac3
JX
6065msgid "stash failed"
6066msgstr "进度保存失败"
6067
1003b3a5 6068#: builtin/merge.c:252
c04f5ac3
JX
6069#, c-format
6070msgid "not a valid object: %s"
6071msgstr "不是一个有效对象:%s"
6072
1003b3a5 6073#: builtin/merge.c:271 builtin/merge.c:288
c04f5ac3
JX
6074msgid "read-tree failed"
6075msgstr "读取树失败"
6076
90e6ef53 6077# 译者:注意保持前导空格
1003b3a5 6078#: builtin/merge.c:318
c04f5ac3
JX
6079msgid " (nothing to squash)"
6080msgstr " (无可压缩)"
6081
1003b3a5 6082#: builtin/merge.c:331
c04f5ac3
JX
6083#, c-format
6084msgid "Squash commit -- not updating HEAD\n"
6085msgstr "压缩提交 -- 未更新 HEAD\n"
6086
1003b3a5 6087#: builtin/merge.c:363
c04f5ac3
JX
6088msgid "Writing SQUASH_MSG"
6089msgstr "写入 SQUASH_MSG"
6090
1003b3a5 6091#: builtin/merge.c:365
c04f5ac3
JX
6092msgid "Finishing SQUASH_MSG"
6093msgstr "完成 SQUASH_MSG"
6094
1003b3a5 6095#: builtin/merge.c:388
c04f5ac3
JX
6096#, c-format
6097msgid "No merge message -- not updating HEAD\n"
6098msgstr "无合并信息 -- 未更新 HEAD\n"
6099
1003b3a5 6100#: builtin/merge.c:438
c04f5ac3
JX
6101#, c-format
6102msgid "'%s' does not point to a commit"
6103msgstr "'%s' 没有指向一个提交"
6104
1003b3a5 6105#: builtin/merge.c:550
c04f5ac3
JX
6106#, c-format
6107msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 6108msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 6109
1003b3a5 6110#: builtin/merge.c:643
c04f5ac3
JX
6111msgid "git write-tree failed to write a tree"
6112msgstr "git write-tree 无法写入一树对象"
6113
1003b3a5 6114#: builtin/merge.c:671
c04f5ac3
JX
6115msgid "Not handling anything other than two heads merge."
6116msgstr "不能处理两个头合并之外的任何操作。"
6117
1003b3a5 6118#: builtin/merge.c:685
c04f5ac3
JX
6119#, c-format
6120msgid "Unknown option for merge-recursive: -X%s"
6121msgstr "merge-recursive 的未知选项:-X%s"
6122
1003b3a5 6123#: builtin/merge.c:699
c04f5ac3
JX
6124#, c-format
6125msgid "unable to write %s"
6126msgstr "不能写 %s"
6127
1003b3a5 6128#: builtin/merge.c:788
c04f5ac3
JX
6129#, c-format
6130msgid "Could not read from '%s'"
6131msgstr "不能从 '%s' 读取"
6132
1003b3a5 6133#: builtin/merge.c:797
c04f5ac3
JX
6134#, c-format
6135msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6136msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6137
1003b3a5 6138#: builtin/merge.c:803
a77c07d9 6139#, c-format
c04f5ac3
JX
6140msgid ""
6141"Please enter a commit message to explain why this merge is necessary,\n"
6142"especially if it merges an updated upstream into a topic branch.\n"
6143"\n"
a77c07d9 6144"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
6145"the commit.\n"
6146msgstr ""
6147"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6148"合并到主题分支。\n"
6149"\n"
a77c07d9 6150"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 6151
1003b3a5 6152#: builtin/merge.c:827
c04f5ac3
JX
6153msgid "Empty commit message."
6154msgstr "空提交信息。"
6155
1003b3a5 6156#: builtin/merge.c:839
c04f5ac3
JX
6157#, c-format
6158msgid "Wonderful.\n"
6159msgstr "太棒了。\n"
6160
1003b3a5 6161#: builtin/merge.c:904
c04f5ac3
JX
6162#, c-format
6163msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6164msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6165
1003b3a5 6166#: builtin/merge.c:920
c04f5ac3
JX
6167#, c-format
6168msgid "'%s' is not a commit"
6169msgstr "'%s' 不是一个提交"
6170
1003b3a5 6171#: builtin/merge.c:961
c04f5ac3 6172msgid "No current branch."
90e6ef53 6173msgstr "没有当前分支。"
c04f5ac3 6174
1003b3a5 6175#: builtin/merge.c:963
c04f5ac3 6176msgid "No remote for the current branch."
90e6ef53 6177msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 6178
1003b3a5 6179#: builtin/merge.c:965
c04f5ac3 6180msgid "No default upstream defined for the current branch."
90e6ef53 6181msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 6182
1003b3a5 6183#: builtin/merge.c:970
c04f5ac3
JX
6184#, c-format
6185msgid "No remote tracking branch for %s from %s"
6186msgstr "%s 没有来自 %s 的远程跟踪分支"
6187
1003b3a5 6188#: builtin/merge.c:1057 builtin/merge.c:1214
170e9899
JX
6189#, c-format
6190msgid "%s - not something we can merge"
6191msgstr "%s - 不能被合并"
6192
1003b3a5 6193#: builtin/merge.c:1125
c04f5ac3 6194msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 6195msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 6196
1003b3a5 6197#: builtin/merge.c:1141 git-pull.sh:31
c04f5ac3
JX
6198msgid ""
6199"You have not concluded your merge (MERGE_HEAD exists).\n"
6200"Please, commit your changes before you can merge."
6201msgstr ""
6202"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 6203"请在合并前先提交您的修改。"
c04f5ac3 6204
1003b3a5 6205#: builtin/merge.c:1144 git-pull.sh:34
c04f5ac3
JX
6206msgid "You have not concluded your merge (MERGE_HEAD exists)."
6207msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6208
1003b3a5 6209#: builtin/merge.c:1148
c04f5ac3
JX
6210msgid ""
6211"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6212"Please, commit your changes before you can merge."
6213msgstr ""
6214"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 6215"请在合并前先提交您的修改。"
c04f5ac3 6216
1003b3a5 6217#: builtin/merge.c:1151
c04f5ac3
JX
6218msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6219msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6220
1003b3a5 6221#: builtin/merge.c:1160
c04f5ac3 6222msgid "You cannot combine --squash with --no-ff."
649900bc 6223msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 6224
1003b3a5 6225#: builtin/merge.c:1165
c04f5ac3 6226msgid "You cannot combine --no-ff with --ff-only."
649900bc 6227msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
c04f5ac3 6228
1003b3a5 6229#: builtin/merge.c:1172
c04f5ac3 6230msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 6231msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 6232
1003b3a5 6233#: builtin/merge.c:1204
c04f5ac3 6234msgid "Can merge only exactly one commit into empty head"
90e6ef53 6235msgstr "只能将一个提交合并到空分支上"
c04f5ac3 6236
1003b3a5 6237#: builtin/merge.c:1207
c04f5ac3
JX
6238msgid "Squash commit into empty head not supported yet"
6239msgstr "尚不支持到空分支的压缩提交"
6240
1003b3a5 6241#: builtin/merge.c:1209
c04f5ac3
JX
6242msgid "Non-fast-forward commit does not make sense into an empty head"
6243msgstr "到空分支的非快进式提交没有意义"
6244
1003b3a5
JX
6245#: builtin/merge.c:1265
6246#, c-format
6247msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6248msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6249
6250#: builtin/merge.c:1268
6251#, c-format
6252msgid "Commit %s has a bad GPG signature allegedly by %s."
6253msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6254
6255#. 'N'
6256#: builtin/merge.c:1271
6257#, c-format
6258msgid "Commit %s does not have a GPG signature."
6259msgstr "提交 %s 没有一个 GPG 签名。"
6260
6261#: builtin/merge.c:1274
6262#, c-format
6263msgid "Commit %s has a good GPG signature by %s\n"
6264msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6265
6266#: builtin/merge.c:1358
c04f5ac3
JX
6267#, c-format
6268msgid "Updating %s..%s\n"
6269msgstr "更新 %s..%s\n"
6270
1003b3a5 6271#: builtin/merge.c:1397
c04f5ac3
JX
6272#, c-format
6273msgid "Trying really trivial in-index merge...\n"
90e6ef53 6274msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 6275
1003b3a5 6276#: builtin/merge.c:1404
c04f5ac3
JX
6277#, c-format
6278msgid "Nope.\n"
6279msgstr "无。\n"
6280
1003b3a5 6281#: builtin/merge.c:1436
c04f5ac3 6282msgid "Not possible to fast-forward, aborting."
1aabac65 6283msgstr "无法快进,终止。"
c04f5ac3 6284
1003b3a5 6285#: builtin/merge.c:1459 builtin/merge.c:1538
c04f5ac3
JX
6286#, c-format
6287msgid "Rewinding the tree to pristine...\n"
6288msgstr "将树回滚至原始状态...\n"
6289
1003b3a5 6290#: builtin/merge.c:1463
c04f5ac3
JX
6291#, c-format
6292msgid "Trying merge strategy %s...\n"
6293msgstr "尝试合并策略 %s...\n"
6294
1003b3a5 6295#: builtin/merge.c:1529
c04f5ac3
JX
6296#, c-format
6297msgid "No merge strategy handled the merge.\n"
6298msgstr "没有合并策略处理此合并。\n"
6299
1003b3a5 6300#: builtin/merge.c:1531
c04f5ac3
JX
6301#, c-format
6302msgid "Merge with strategy %s failed.\n"
6303msgstr "使用策略 %s 合并失败。\n"
6304
1003b3a5 6305#: builtin/merge.c:1540
c04f5ac3
JX
6306#, c-format
6307msgid "Using the %s to prepare resolving by hand.\n"
6308msgstr "使用 %s 以准备手工解决。\n"
6309
1003b3a5 6310#: builtin/merge.c:1552
c04f5ac3
JX
6311#, c-format
6312msgid "Automatic merge went well; stopped before committing as requested\n"
6313msgstr "自动合并进展顺利,按要求在提交前停止\n"
6314
ef317cd5
JX
6315#: builtin/merge-base.c:26
6316msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 6317msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5
JX
6318
6319#: builtin/merge-base.c:27
6320msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 6321msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5
JX
6322
6323#: builtin/merge-base.c:28
6324msgid "git merge-base --independent <commit>..."
07432cef 6325msgstr "git merge-base --independent <提交>..."
ef317cd5
JX
6326
6327#: builtin/merge-base.c:29
6328msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 6329msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5
JX
6330
6331#: builtin/merge-base.c:98
ef317cd5 6332msgid "output all common ancestors"
07432cef 6333msgstr "输出所有共同的祖先"
ef317cd5
JX
6334
6335#: builtin/merge-base.c:99
6336msgid "find ancestors for a single n-way merge"
07432cef 6337msgstr "查找一个多路合并的祖先提交"
ef317cd5
JX
6338
6339#: builtin/merge-base.c:100
6340msgid "list revs not reachable from others"
07432cef 6341msgstr "显示不能被其他访问到的版本"
ef317cd5
JX
6342
6343#: builtin/merge-base.c:102
6344msgid "is the first one ancestor of the other?"
07432cef 6345msgstr "第一个是其他的祖先提交么?"
ef317cd5
JX
6346
6347#: builtin/merge-file.c:8
6348msgid ""
6349"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6350"file2"
6351msgstr ""
07432cef 6352"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
6353
6354#: builtin/merge-file.c:33
6355msgid "send results to standard output"
07432cef 6356msgstr "将结果发送到标准输出"
ef317cd5
JX
6357
6358#: builtin/merge-file.c:34
6359msgid "use a diff3 based merge"
07432cef 6360msgstr "使用基于 diff3 的合并"
ef317cd5
JX
6361
6362#: builtin/merge-file.c:35
6363msgid "for conflicts, use our version"
07432cef 6364msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
6365
6366#: builtin/merge-file.c:37
6367msgid "for conflicts, use their version"
07432cef 6368msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
6369
6370#: builtin/merge-file.c:39
6371msgid "for conflicts, use a union version"
07432cef 6372msgstr "如果冲突,使用联合版本"
ef317cd5
JX
6373
6374#: builtin/merge-file.c:42
6375msgid "for conflicts, use this marker size"
07432cef 6376msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
6377
6378#: builtin/merge-file.c:43
6379msgid "do not warn about conflicts"
07432cef 6380msgstr "不要警告冲突"
ef317cd5
JX
6381
6382#: builtin/merge-file.c:45
6383msgid "set labels for file1/orig_file/file2"
07432cef 6384msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 6385
ef317cd5
JX
6386#: builtin/mktree.c:67
6387msgid "git mktree [-z] [--missing] [--batch]"
07432cef 6388msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 6389
ef317cd5
JX
6390#: builtin/mktree.c:153
6391msgid "input is NUL terminated"
07432cef 6392msgstr "输入以 NUL 字符终止"
c04f5ac3 6393
ef317cd5 6394#: builtin/mktree.c:154 builtin/write-tree.c:24
ef317cd5 6395msgid "allow missing objects"
07432cef 6396msgstr "允许丢失的对象"
c04f5ac3 6397
ef317cd5
JX
6398#: builtin/mktree.c:155
6399msgid "allow creation of more than one tree"
07432cef 6400msgstr "允许创建一个以上的树"
c04f5ac3 6401
ef317cd5
JX
6402#: builtin/mv.c:14
6403msgid "git mv [options] <source>... <destination>"
07432cef 6404msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 6405
ef317cd5
JX
6406#: builtin/mv.c:64
6407msgid "force move/rename even if target exists"
07432cef 6408msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 6409
ef317cd5 6410#: builtin/mv.c:65
ef317cd5 6411msgid "skip move/rename errors"
07432cef 6412msgstr "跳过移动/重命名错误"
c04f5ac3
JX
6413
6414#: builtin/mv.c:108
6415#, c-format
6416msgid "Checking rename of '%s' to '%s'\n"
6417msgstr "检查 '%s' 到 '%s' 的重命名\n"
6418
6419#: builtin/mv.c:112
6420msgid "bad source"
6421msgstr "坏的源"
6422
6423#: builtin/mv.c:115
6424msgid "can not move directory into itself"
6425msgstr "不能将目录移动到自身"
6426
6427#: builtin/mv.c:118
6428msgid "cannot move directory over file"
6429msgstr "不能将目录移动到文件"
6430
6431#: builtin/mv.c:128
6432#, c-format
6433msgid "Huh? %.*s is in index?"
90e6ef53 6434msgstr "嗯?%.*s 在索引中?"
c04f5ac3
JX
6435
6436#: builtin/mv.c:140
6437msgid "source directory is empty"
6438msgstr "源目录为空"
6439
6440#: builtin/mv.c:171
6441msgid "not under version control"
6442msgstr "不在版本控制之下"
6443
6444#: builtin/mv.c:173
6445msgid "destination exists"
6446msgstr "目标已存在"
6447
6448#: builtin/mv.c:181
6449#, c-format
6450msgid "overwriting '%s'"
6451msgstr "覆盖 '%s'"
6452
6453#: builtin/mv.c:184
6454msgid "Cannot overwrite"
6455msgstr "不能覆盖"
6456
6457#: builtin/mv.c:187
6458msgid "multiple sources for the same target"
6459msgstr "同一目标具有多个源"
6460
6461#: builtin/mv.c:202
6462#, c-format
6463msgid "%s, source=%s, destination=%s"
6464msgstr "%s,源=%s,目标=%s"
6465
6466#: builtin/mv.c:212
6467#, c-format
6468msgid "Renaming %s to %s\n"
6469msgstr "重命名 %s 至 %s\n"
6470
8ada9598 6471#: builtin/mv.c:215 builtin/remote.c:731
c04f5ac3
JX
6472#, c-format
6473msgid "renaming '%s' failed"
6474msgstr "重命名 '%s' 失败"
6475
ef317cd5 6476#: builtin/name-rev.c:175
ef317cd5 6477msgid "git name-rev [options] <commit>..."
07432cef 6478msgstr "git name-rev [选项] <提交>..."
ef317cd5
JX
6479
6480#: builtin/name-rev.c:176
6481msgid "git name-rev [options] --all"
07432cef 6482msgstr "git name-rev [选项] --all"
ef317cd5
JX
6483
6484#: builtin/name-rev.c:177
6485msgid "git name-rev [options] --stdin"
07432cef 6486msgstr "git name-rev [选项] --stdin"
ef317cd5
JX
6487
6488#: builtin/name-rev.c:229
6489msgid "print only names (no SHA-1)"
07432cef 6490msgstr "只打印名称(无 SHA-1)"
ef317cd5
JX
6491
6492#: builtin/name-rev.c:230
6493msgid "only use tags to name the commits"
07432cef 6494msgstr "只使用 tags 来命名提交"
ef317cd5
JX
6495
6496#: builtin/name-rev.c:232
ef317cd5 6497msgid "only use refs matching <pattern>"
07432cef 6498msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5
JX
6499
6500#: builtin/name-rev.c:234
6501msgid "list all commits reachable from all refs"
07432cef 6502msgstr "列出可以从所有引用访问的提交"
ef317cd5
JX
6503
6504#: builtin/name-rev.c:235
6505msgid "read from stdin"
07432cef 6506msgstr "从标准输入读取"
ef317cd5
JX
6507
6508#: builtin/name-rev.c:236
6509msgid "allow to print `undefined` names"
07432cef 6510msgstr "允许打印 `未定义` 的名称"
ef317cd5 6511
07432cef 6512#: builtin/notes.c:26
ef317cd5 6513msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 6514msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 6515
07432cef 6516#: builtin/notes.c:27
ef317cd5
JX
6517msgid ""
6518"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6519"<object>] [<object>]"
6520msgstr ""
07432cef
WS
6521"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6522"象>] [<对象>]"
ef317cd5 6523
07432cef 6524#: builtin/notes.c:28
ef317cd5 6525msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 6526msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 6527
07432cef 6528#: builtin/notes.c:29
ef317cd5
JX
6529msgid ""
6530"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6531"<object>] [<object>]"
6532msgstr ""
07432cef
WS
6533"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6534">] [<对象>]"
ef317cd5 6535
07432cef 6536#: builtin/notes.c:30
ef317cd5 6537msgid "git notes [--ref <notes_ref>] edit [<object>]"
07432cef 6538msgstr "git notes [--ref <注解引用>] edit [<对象>]"
ef317cd5 6539
07432cef 6540#: builtin/notes.c:31
ef317cd5 6541msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 6542msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 6543
07432cef 6544#: builtin/notes.c:32
ef317cd5
JX
6545msgid ""
6546"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 6547msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 6548
07432cef 6549#: builtin/notes.c:33
ef317cd5 6550msgid "git notes merge --commit [-v | -q]"
07432cef 6551msgstr "git notes merge --commit [-v | -q]"
ef317cd5 6552
07432cef 6553#: builtin/notes.c:34
ef317cd5 6554msgid "git notes merge --abort [-v | -q]"
07432cef 6555msgstr "git notes merge --abort [-v | -q]"
ef317cd5 6556
07432cef 6557#: builtin/notes.c:35
ef317cd5 6558msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 6559msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 6560
07432cef 6561#: builtin/notes.c:36
ef317cd5 6562msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 6563msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 6564
07432cef 6565#: builtin/notes.c:37
ef317cd5 6566msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 6567msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 6568
07432cef 6569#: builtin/notes.c:42
ef317cd5 6570msgid "git notes [list [<object>]]"
07432cef 6571msgstr "git notes [list [<对象>]]"
ef317cd5 6572
07432cef 6573#: builtin/notes.c:47
ef317cd5 6574msgid "git notes add [<options>] [<object>]"
07432cef 6575msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 6576
07432cef 6577#: builtin/notes.c:52
ef317cd5 6578msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 6579msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 6580
07432cef 6581#: builtin/notes.c:53
ef317cd5 6582msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 6583msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 6584
07432cef 6585#: builtin/notes.c:58
ef317cd5 6586msgid "git notes append [<options>] [<object>]"
07432cef 6587msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 6588
07432cef 6589#: builtin/notes.c:63
ef317cd5 6590msgid "git notes edit [<object>]"
07432cef 6591msgstr "git notes edit [<对象>]"
ef317cd5 6592
07432cef 6593#: builtin/notes.c:68
ef317cd5 6594msgid "git notes show [<object>]"
07432cef 6595msgstr "git notes show [<对象>]"
ef317cd5 6596
07432cef 6597#: builtin/notes.c:73
ef317cd5 6598msgid "git notes merge [<options>] <notes_ref>"
07432cef 6599msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 6600
07432cef 6601#: builtin/notes.c:74
ef317cd5 6602msgid "git notes merge --commit [<options>]"
07432cef 6603msgstr "git notes merge --commit [<选项>]"
ef317cd5 6604
07432cef 6605#: builtin/notes.c:75
ef317cd5 6606msgid "git notes merge --abort [<options>]"
07432cef 6607msgstr "git notes merge --abort [<选项>]"
ef317cd5 6608
07432cef 6609#: builtin/notes.c:80
ef317cd5 6610msgid "git notes remove [<object>]"
07432cef 6611msgstr "git notes remove [<对象>]"
ef317cd5 6612
07432cef 6613#: builtin/notes.c:85
ef317cd5 6614msgid "git notes prune [<options>]"
07432cef 6615msgstr "git notes prune [<选项>]"
ef317cd5 6616
07432cef 6617#: builtin/notes.c:90
ef317cd5 6618msgid "git notes get-ref"
07432cef 6619msgstr "git notes get-ref"
ef317cd5 6620
a77c07d9 6621#: builtin/notes.c:139
c04f5ac3
JX
6622#, c-format
6623msgid "unable to start 'show' for object '%s'"
6624msgstr "不能为对象 '%s' 开始 'show'"
6625
a77c07d9
JX
6626#: builtin/notes.c:143
6627msgid "could not read 'show' output"
6628msgstr "不能读取 'show' 的输出"
c04f5ac3 6629
a77c07d9 6630#: builtin/notes.c:151
c04f5ac3
JX
6631#, c-format
6632msgid "failed to finish 'show' for object '%s'"
6633msgstr "无法为对象 '%s' 完成 'show'"
6634
a77c07d9 6635#: builtin/notes.c:169 builtin/tag.c:341
c04f5ac3
JX
6636#, c-format
6637msgid "could not create file '%s'"
6638msgstr "不能创建文件 '%s'"
6639
a77c07d9 6640#: builtin/notes.c:188
c04f5ac3
JX
6641msgid "Please supply the note contents using either -m or -F option"
6642msgstr "请通过 -m 或 -F 选项为注解提供内容"
6643
a77c07d9 6644#: builtin/notes.c:209 builtin/notes.c:972
c04f5ac3
JX
6645#, c-format
6646msgid "Removing note for object %s\n"
6647msgstr "删除对象 %s 的注解\n"
6648
a77c07d9 6649#: builtin/notes.c:214
c04f5ac3
JX
6650msgid "unable to write note object"
6651msgstr "不能写注解对象"
6652
a77c07d9 6653#: builtin/notes.c:216
c04f5ac3
JX
6654#, c-format
6655msgid "The note contents has been left in %s"
6656msgstr "注解内容被留在文件 %s 中"
6657
a77c07d9 6658#: builtin/notes.c:250 builtin/tag.c:540
c04f5ac3
JX
6659#, c-format
6660msgid "cannot read '%s'"
6661msgstr "不能读取 '%s'"
6662
a77c07d9 6663#: builtin/notes.c:252 builtin/tag.c:543
c04f5ac3
JX
6664#, c-format
6665msgid "could not open or read '%s'"
6666msgstr "不能打开或读取 '%s'"
6667
a77c07d9
JX
6668#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6669#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6670#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6671#: builtin/notes.c:967 builtin/tag.c:556
c04f5ac3
JX
6672#, c-format
6673msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 6674msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 6675
a77c07d9 6676#: builtin/notes.c:274
c04f5ac3
JX
6677#, c-format
6678msgid "Failed to read object '%s'."
6679msgstr "无法读取对象 '%s'。"
6680
a77c07d9 6681#: builtin/notes.c:298
c04f5ac3
JX
6682msgid "Cannot commit uninitialized/unreferenced notes tree"
6683msgstr "不能提交未初始化/未引用的注解树"
6684
a77c07d9 6685#: builtin/notes.c:339
c04f5ac3
JX
6686#, c-format
6687msgid "Bad notes.rewriteMode value: '%s'"
90e6ef53 6688msgstr "坏的 notes.rewriteMode 值:'%s'"
c04f5ac3 6689
a77c07d9 6690#: builtin/notes.c:349
c04f5ac3
JX
6691#, c-format
6692msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6693msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6694
6695#. TRANSLATORS: The first %s is the name of the
6696#. environment variable, the second %s is its value
a77c07d9 6697#: builtin/notes.c:376
c04f5ac3
JX
6698#, c-format
6699msgid "Bad %s value: '%s'"
90e6ef53 6700msgstr "坏的 %s 值:'%s'"
c04f5ac3 6701
a77c07d9 6702#: builtin/notes.c:440
c04f5ac3
JX
6703#, c-format
6704msgid "Malformed input line: '%s'."
6705msgstr "非法的输入行:'%s'。"
6706
a77c07d9 6707#: builtin/notes.c:455
c04f5ac3
JX
6708#, c-format
6709msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 6710msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 6711
a77c07d9
JX
6712#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6713#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6714#: builtin/notes.c:1032
c04f5ac3
JX
6715msgid "too many parameters"
6716msgstr "参数太多"
6717
a77c07d9 6718#: builtin/notes.c:512 builtin/notes.c:771
c04f5ac3
JX
6719#, c-format
6720msgid "No note found for object %s."
6721msgstr "未发现对象 %s 的注解。"
6722
a77c07d9 6723#: builtin/notes.c:534 builtin/notes.c:691
ef317cd5 6724msgid "note contents as a string"
07432cef 6725msgstr "注解内容作为一个字符串"
ef317cd5 6726
a77c07d9 6727#: builtin/notes.c:537 builtin/notes.c:694
ef317cd5 6728msgid "note contents in a file"
07432cef 6729msgstr "注解内容到一个文件中"
ef317cd5 6730
a77c07d9
JX
6731#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6732#: builtin/notes.c:699 builtin/tag.c:474
ef317cd5 6733msgid "object"
07432cef 6734msgstr "对象"
ef317cd5 6735
a77c07d9 6736#: builtin/notes.c:540 builtin/notes.c:697
ef317cd5 6737msgid "reuse and edit specified note object"
07432cef 6738msgstr "重用和编辑指定的注解对象"
ef317cd5 6739
a77c07d9 6740#: builtin/notes.c:543 builtin/notes.c:700
ef317cd5 6741msgid "reuse specified note object"
07432cef 6742msgstr "重用指定的注解对象"
ef317cd5 6743
a77c07d9 6744#: builtin/notes.c:545 builtin/notes.c:613
ef317cd5 6745msgid "replace existing notes"
07432cef 6746msgstr "替换已存在的注解"
ef317cd5 6747
a77c07d9 6748#: builtin/notes.c:579
c04f5ac3
JX
6749#, c-format
6750msgid ""
6751"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6752"existing notes"
6753msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6754
a77c07d9 6755#: builtin/notes.c:584 builtin/notes.c:661
c04f5ac3
JX
6756#, c-format
6757msgid "Overwriting existing notes for object %s\n"
6758msgstr "覆盖对象 %s 现存注解\n"
6759
a77c07d9 6760#: builtin/notes.c:614
ef317cd5 6761msgid "read objects from stdin"
07432cef 6762msgstr "从标准输入读取对象"
ef317cd5 6763
a77c07d9 6764#: builtin/notes.c:616
ef317cd5 6765msgid "load rewriting config for <command> (implies --stdin)"
07432cef 6766msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 6767
a77c07d9 6768#: builtin/notes.c:634
c04f5ac3
JX
6769msgid "too few parameters"
6770msgstr "参数太少"
6771
a77c07d9 6772#: builtin/notes.c:655
c04f5ac3
JX
6773#, c-format
6774msgid ""
6775"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6776"existing notes"
6777msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6778
a77c07d9 6779#: builtin/notes.c:667
c04f5ac3
JX
6780#, c-format
6781msgid "Missing notes on source object %s. Cannot copy."
6782msgstr "源对象 %s 缺少注解。不能拷贝。"
6783
a77c07d9 6784#: builtin/notes.c:716
ef317cd5
JX
6785#, c-format
6786msgid ""
6787"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6788"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6789msgstr ""
6790"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6791"请换用 'git notes add -f -m/-F/-c/-C'。\n"
6792
a77c07d9 6793#: builtin/notes.c:863
ef317cd5 6794msgid "General options"
07432cef 6795msgstr "通用选项"
ef317cd5 6796
a77c07d9 6797#: builtin/notes.c:865
ef317cd5 6798msgid "Merge options"
07432cef 6799msgstr "合并选项"
ef317cd5 6800
a77c07d9 6801#: builtin/notes.c:867
ef317cd5
JX
6802msgid ""
6803"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6804"cat_sort_uniq)"
07432cef 6805msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 6806
a77c07d9 6807#: builtin/notes.c:869
ef317cd5 6808msgid "Committing unmerged notes"
07432cef 6809msgstr "提交未合并的注解"
ef317cd5 6810
a77c07d9 6811#: builtin/notes.c:871
ef317cd5 6812msgid "finalize notes merge by committing unmerged notes"
07432cef 6813msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 6814
a77c07d9 6815#: builtin/notes.c:873
ef317cd5 6816msgid "Aborting notes merge resolution"
07432cef 6817msgstr "中止注解合并的方案"
ef317cd5 6818
a77c07d9 6819#: builtin/notes.c:875
ef317cd5 6820msgid "abort notes merge"
07432cef 6821msgstr "中止注解合并"
ef317cd5 6822
a77c07d9 6823#: builtin/notes.c:970
ef317cd5
JX
6824#, c-format
6825msgid "Object %s has no note\n"
6826msgstr "对象 %s 没有注解\n"
6827
a77c07d9 6828#: builtin/notes.c:982
ef317cd5 6829msgid "attempt to remove non-existent note is not an error"
07432cef 6830msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 6831
a77c07d9 6832#: builtin/notes.c:985
ef317cd5 6833msgid "read object names from the standard input"
07432cef 6834msgstr "从标准输入读取对象名称"
ef317cd5 6835
a77c07d9 6836#: builtin/notes.c:1066
ef317cd5 6837msgid "notes_ref"
07432cef 6838msgstr "注解引用"
ef317cd5 6839
a77c07d9 6840#: builtin/notes.c:1067
ef317cd5 6841msgid "use notes from <notes_ref>"
07432cef 6842msgstr "从 <注解引用> 使用注解"
ef317cd5 6843
a77c07d9 6844#: builtin/notes.c:1102 builtin/remote.c:1598
ef317cd5
JX
6845#, c-format
6846msgid "Unknown subcommand: %s"
6847msgstr "未知子命令:%s"
6848
6849#: builtin/pack-objects.c:23
6850msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 6851msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5
JX
6852
6853#: builtin/pack-objects.c:24
6854msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 6855msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5
JX
6856
6857#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6858#, c-format
6859msgid "deflate error (%d)"
6860msgstr "压缩错误 (%d)"
6861
07432cef 6862#: builtin/pack-objects.c:2397
ef317cd5
JX
6863#, c-format
6864msgid "unsupported index version %s"
6865msgstr "不支持的索引版本 %s"
6866
07432cef 6867#: builtin/pack-objects.c:2401
ef317cd5
JX
6868#, c-format
6869msgid "bad index version '%s'"
6870msgstr "坏的索引版本 '%s'"
6871
07432cef 6872#: builtin/pack-objects.c:2424
ef317cd5
JX
6873#, c-format
6874msgid "option %s does not accept negative form"
6875msgstr "选项 %s 不接受否定格式"
6876
07432cef 6877#: builtin/pack-objects.c:2428
ef317cd5
JX
6878#, c-format
6879msgid "unable to parse value '%s' for option %s"
6880msgstr "不能解析选项 %1$s 的值 '%2$s'"
6881
07432cef 6882#: builtin/pack-objects.c:2447
ef317cd5 6883msgid "do not show progress meter"
07432cef 6884msgstr "不显示进度表"
ef317cd5 6885
07432cef 6886#: builtin/pack-objects.c:2449
ef317cd5 6887msgid "show progress meter"
07432cef 6888msgstr "显示进度表"
ef317cd5 6889
07432cef 6890#: builtin/pack-objects.c:2451
ef317cd5 6891msgid "show progress meter during object writing phase"
07432cef 6892msgstr "在对象写入阶段显示进度表"
ef317cd5 6893
07432cef 6894#: builtin/pack-objects.c:2454
ef317cd5 6895msgid "similar to --all-progress when progress meter is shown"
07432cef 6896msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 6897
07432cef 6898#: builtin/pack-objects.c:2455
ef317cd5 6899msgid "version[,offset]"
07432cef 6900msgstr "版本[,偏移]"
ef317cd5 6901
07432cef 6902#: builtin/pack-objects.c:2456
ef317cd5 6903msgid "write the pack index file in the specified idx format version"
07432cef 6904msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 6905
07432cef 6906#: builtin/pack-objects.c:2459
ef317cd5 6907msgid "maximum size of each output pack file"
07432cef 6908msgstr "每个输出包的最大尺寸"
ef317cd5 6909
07432cef 6910#: builtin/pack-objects.c:2461
ef317cd5 6911msgid "ignore borrowed objects from alternate object store"
07432cef 6912msgstr "忽略从替代对象存储里借用对象"
ef317cd5 6913
07432cef 6914#: builtin/pack-objects.c:2463
ef317cd5 6915msgid "ignore packed objects"
07432cef 6916msgstr "忽略包对象"
ef317cd5 6917
07432cef 6918#: builtin/pack-objects.c:2465
ef317cd5 6919msgid "limit pack window by objects"
07432cef 6920msgstr "限制打包窗口的对象数"
ef317cd5 6921
07432cef 6922#: builtin/pack-objects.c:2467
ef317cd5 6923msgid "limit pack window by memory in addition to object limit"
07432cef 6924msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 6925
07432cef 6926#: builtin/pack-objects.c:2469
ef317cd5 6927msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 6928msgstr "打包允许的 delta 链的最大长度"
ef317cd5 6929
07432cef 6930#: builtin/pack-objects.c:2471
ef317cd5 6931msgid "reuse existing deltas"
07432cef 6932msgstr "重用已存在的 deltas"
ef317cd5 6933
07432cef 6934#: builtin/pack-objects.c:2473
ef317cd5 6935msgid "reuse existing objects"
07432cef 6936msgstr "重用已存在的对象"
ef317cd5 6937
07432cef 6938#: builtin/pack-objects.c:2475
ef317cd5 6939msgid "use OFS_DELTA objects"
07432cef 6940msgstr "使用 OFS_DELTA 对象"
ef317cd5 6941
07432cef 6942#: builtin/pack-objects.c:2477
ef317cd5 6943msgid "use threads when searching for best delta matches"
07432cef 6944msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 6945
07432cef 6946#: builtin/pack-objects.c:2479
ef317cd5 6947msgid "do not create an empty pack output"
07432cef 6948msgstr "不创建空的包输出"
ef317cd5 6949
07432cef 6950#: builtin/pack-objects.c:2481
ef317cd5 6951msgid "read revision arguments from standard input"
07432cef 6952msgstr "从标准输入读取修订号参数"
ef317cd5 6953
07432cef 6954#: builtin/pack-objects.c:2483
ef317cd5 6955msgid "limit the objects to those that are not yet packed"
07432cef 6956msgstr "限制那些尚未打包的对象"
ef317cd5 6957
07432cef 6958#: builtin/pack-objects.c:2486
ef317cd5 6959msgid "include objects reachable from any reference"
07432cef 6960msgstr "包括可以从任何引用访问到的对象"
ef317cd5 6961
07432cef 6962#: builtin/pack-objects.c:2489
ef317cd5 6963msgid "include objects referred by reflog entries"
07432cef 6964msgstr "包括被引用日志引用到的对象"
ef317cd5 6965
07432cef 6966#: builtin/pack-objects.c:2492
ef317cd5 6967msgid "output pack to stdout"
07432cef 6968msgstr "输出包到标准输出"
ef317cd5 6969
07432cef 6970#: builtin/pack-objects.c:2494
ef317cd5 6971msgid "include tag objects that refer to objects to be packed"
07432cef 6972msgstr "包括引用了打包对象的 tag"
ef317cd5 6973
07432cef 6974#: builtin/pack-objects.c:2496
ef317cd5 6975msgid "keep unreachable objects"
07432cef 6976msgstr "维持不可达的对象"
ef317cd5 6977
07432cef 6978#: builtin/pack-objects.c:2497 parse-options.h:141
ef317cd5
JX
6979msgid "time"
6980msgstr "时间"
6981
07432cef 6982#: builtin/pack-objects.c:2498
ef317cd5 6983msgid "unpack unreachable objects newer than <time>"
07432cef 6984msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 6985
07432cef 6986#: builtin/pack-objects.c:2501
ef317cd5 6987msgid "create thin packs"
07432cef 6988msgstr "创建精简包"
ef317cd5 6989
07432cef 6990#: builtin/pack-objects.c:2503
ef317cd5 6991msgid "ignore packs that have companion .keep file"
07432cef 6992msgstr "忽略配有 .keep 文件的包"
ef317cd5 6993
07432cef 6994#: builtin/pack-objects.c:2505
ef317cd5 6995msgid "pack compression level"
07432cef 6996msgstr "打包压缩级别"
ef317cd5 6997
07432cef 6998#: builtin/pack-objects.c:2507
ef317cd5 6999msgid "do not hide commits by grafts"
07432cef 7000msgstr "不隐藏移植覆盖的提交"
ef317cd5
JX
7001
7002#: builtin/pack-refs.c:6
7003msgid "git pack-refs [options]"
07432cef 7004msgstr "git pack-refs [选项]"
c04f5ac3 7005
ef317cd5
JX
7006#: builtin/pack-refs.c:14
7007msgid "pack everything"
07432cef 7008msgstr "打包一切"
c04f5ac3 7009
ef317cd5
JX
7010#: builtin/pack-refs.c:15
7011msgid "prune loose refs (default)"
07432cef 7012msgstr "清除松散的引用(默认)"
c04f5ac3 7013
ef317cd5
JX
7014#: builtin/prune-packed.c:7
7015msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 7016msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 7017
ef317cd5
JX
7018#: builtin/prune.c:12
7019msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 7020msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 7021
ef317cd5 7022#: builtin/prune.c:132
ef317cd5 7023msgid "do not remove, show only"
07432cef 7024msgstr "不删除,只显示"
7ac1c0ad 7025
ef317cd5 7026#: builtin/prune.c:133
ef317cd5 7027msgid "report pruned objects"
07432cef 7028msgstr "报告清除的对象"
7ac1c0ad 7029
ef317cd5
JX
7030#: builtin/prune.c:136
7031msgid "expire objects older than <time>"
07432cef 7032msgstr "使早于给定时间的对象过期"
ef317cd5
JX
7033
7034#: builtin/push.c:14
ef317cd5 7035msgid "git push [<options>] [<repository> [<refspec>...]]"
07432cef 7036msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7ac1c0ad 7037
170e9899 7038#: builtin/push.c:45
c04f5ac3
JX
7039msgid "tag shorthand without <tag>"
7040msgstr "tag 简写没有跟 <tag> 参数"
7041
170e9899 7042#: builtin/push.c:64
c04f5ac3 7043msgid "--delete only accepts plain target ref names"
90e6ef53 7044msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 7045
8ada9598
JX
7046#: builtin/push.c:99
7047msgid ""
7048"\n"
7049"To choose either option permanently, see push.default in 'git help config'."
7050msgstr ""
81809b99
JX
7051"\n"
7052"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598
JX
7053
7054#: builtin/push.c:102
7055#, c-format
7056msgid ""
7057"The upstream branch of your current branch does not match\n"
7058"the name of your current branch. To push to the upstream branch\n"
7059"on the remote, use\n"
7060"\n"
7061" git push %s HEAD:%s\n"
7062"\n"
7063"To push to the branch of the same name on the remote, use\n"
7064"\n"
7065" git push %s %s\n"
7066"%s"
7067msgstr ""
81809b99
JX
7068"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7069"上游分支,使用\n"
7070"\n"
7071" git push %s HEAD:%s\n"
7072"\n"
7073"为推送至远程同名分支,使用\n"
7074"\n"
7075" git push %s %s\n"
7076"%s"
8ada9598
JX
7077
7078#: builtin/push.c:121
c04f5ac3
JX
7079#, c-format
7080msgid ""
7081"You are not currently on a branch.\n"
7082"To push the history leading to the current (detached HEAD)\n"
7083"state now, use\n"
7084"\n"
7085" git push %s HEAD:<name-of-remote-branch>\n"
7086msgstr ""
7087"您当前不在一个分支上。\n"
90e6ef53 7088"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
7089"\n"
7090" git push %s HEAD:<name-of-remote-branch>\n"
7091
8ada9598 7092#: builtin/push.c:128
c04f5ac3
JX
7093#, c-format
7094msgid ""
7095"The current branch %s has no upstream branch.\n"
7096"To push the current branch and set the remote as upstream, use\n"
7097"\n"
7098" git push --set-upstream %s %s\n"
7099msgstr ""
7100"当前分支 %s 没有对应的上游分支。\n"
7101"为推送当前分支并建立与远程上游的跟踪,使用\n"
7102"\n"
7103" git push --set-upstream %s %s\n"
7104
8ada9598 7105#: builtin/push.c:136
c04f5ac3
JX
7106#, c-format
7107msgid "The current branch %s has multiple upstream branches, refusing to push."
7108msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7109
8ada9598 7110#: builtin/push.c:139
73a60cd2
JX
7111#, c-format
7112msgid ""
7113"You are pushing to remote '%s', which is not the upstream of\n"
7114"your current branch '%s', without telling me what to push\n"
7115"to update which remote branch."
7116msgstr ""
7117"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7118"而没有告诉我要推送什么、更新哪个远程分支。"
7119
c160d03f
JX
7120# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7121#: builtin/push.c:151
7122msgid ""
7123"push.default is unset; its implicit value is changing in\n"
7124"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7125"and maintain the current behavior after the default changes, use:\n"
7126"\n"
7127" git config --global push.default matching\n"
7128"\n"
7129"To squelch this message and adopt the new behavior now, use:\n"
7130"\n"
7131" git config --global push.default simple\n"
7132"\n"
7133"See 'git help config' and search for 'push.default' for further "
7134"information.\n"
7135"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7136"'current' instead of 'simple' if you sometimes use older versions of Git)"
7137msgstr ""
7138"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
7139"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
7140"进行如下设置:\n"
7141"\n"
7142" git config --global push.default matching\n"
7143"\n"
7144"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7145"\n"
7146" git config --global push.default simple\n"
7147"\n"
7148"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7149"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7150"为保持兼容,请用 'current' 代替 'simple' 模式)"
7151
7152#: builtin/push.c:199
c04f5ac3
JX
7153msgid ""
7154"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90e6ef53 7155msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
c04f5ac3 7156
c160d03f 7157#: builtin/push.c:206
170e9899
JX
7158msgid ""
7159"Updates were rejected because the tip of your current branch is behind\n"
7160"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7161"before pushing again.\n"
7162"See the 'Note about fast-forwards' in 'git push --help' for details."
7163msgstr ""
eff6d3a9
JX
7164"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7165"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
7166"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7167
c160d03f 7168#: builtin/push.c:212
170e9899
JX
7169msgid ""
7170"Updates were rejected because a pushed branch tip is behind its remote\n"
7171"counterpart. If you did not intend to push that branch, you may want to\n"
c160d03f
JX
7172"specify branches to push or set the 'push.default' configuration variable\n"
7173"to 'simple', 'current' or 'upstream' to push only the current branch."
170e9899 7174msgstr ""
eff6d3a9
JX
7175"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7176"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
c160d03f
JX
7177"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7178"以便只推送当前分支。"
170e9899 7179
c160d03f 7180#: builtin/push.c:218
170e9899
JX
7181msgid ""
7182"Updates were rejected because a pushed branch tip is behind its remote\n"
7183"counterpart. Check out this branch and merge the remote changes\n"
7184"(e.g. 'git pull') before pushing again.\n"
7185"See the 'Note about fast-forwards' in 'git push --help' for details."
7186msgstr ""
eff6d3a9
JX
7187"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7188"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7189"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7190
07432cef
WS
7191#: builtin/push.c:224
7192msgid ""
a77c07d9
JX
7193"Updates were rejected because the remote contains work that you do\n"
7194"not have locally. This is usually caused by another repository pushing\n"
7195"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7196"'git pull') before pushing again.\n"
7197"See the 'Note about fast-forwards' in 'git push --help' for details."
7198msgstr ""
7199"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7200"一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7201"(如 'git pull')。\n"
7202"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7203
7204#: builtin/push.c:231
7205msgid "Updates were rejected because the tag already exists in the remote."
7206msgstr "更新被拒绝因为 tag 在远程已经存在。"
7207
7208#: builtin/push.c:234
7209msgid ""
7210"You cannot update a remote ref that points at a non-commit object,\n"
7211"or update a remote ref to make it point at a non-commit object,\n"
7212"without using the '--force' option.\n"
7213msgstr ""
7214"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7215"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 7216
a77c07d9 7217#: builtin/push.c:294
c04f5ac3
JX
7218#, c-format
7219msgid "Pushing to %s\n"
7220msgstr "推送到 %s\n"
7221
a77c07d9 7222#: builtin/push.c:298
c04f5ac3
JX
7223#, c-format
7224msgid "failed to push some refs to '%s'"
7225msgstr "无法推送一些引用到 '%s'"
7226
a77c07d9 7227#: builtin/push.c:331
c04f5ac3
JX
7228#, c-format
7229msgid "bad repository '%s'"
90e6ef53 7230msgstr "坏的版本库 '%s'"
c04f5ac3 7231
a77c07d9 7232#: builtin/push.c:332
c04f5ac3
JX
7233msgid ""
7234"No configured push destination.\n"
7235"Either specify the URL from the command-line or configure a remote "
7236"repository using\n"
7237"\n"
7238" git remote add <name> <url>\n"
7239"\n"
7240"and then push using the remote name\n"
7241"\n"
7242" git push <name>\n"
7243msgstr ""
90e6ef53 7244"没有配置推送目标。\n"
07432cef 7245"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
7246"\n"
7247" git remote add <name> <url>\n"
7248"\n"
7249"然后使用该远程版本库名执行推送\n"
7250"\n"
7251" git push <name>\n"
7252
a77c07d9 7253#: builtin/push.c:347
c04f5ac3
JX
7254msgid "--all and --tags are incompatible"
7255msgstr "--all 和 --tags 不兼容"
7256
a77c07d9 7257#: builtin/push.c:348
c04f5ac3 7258msgid "--all can't be combined with refspecs"
649900bc 7259msgstr "--all 不能和引用表达式同时使用"
c04f5ac3 7260
a77c07d9 7261#: builtin/push.c:353
c04f5ac3
JX
7262msgid "--mirror and --tags are incompatible"
7263msgstr "--mirror 和 --tags 不兼容"
7264
a77c07d9 7265#: builtin/push.c:354
c04f5ac3 7266msgid "--mirror can't be combined with refspecs"
649900bc 7267msgstr "--mirror 不能和引用表达式同时使用"
c04f5ac3 7268
a77c07d9 7269#: builtin/push.c:359
c04f5ac3
JX
7270msgid "--all and --mirror are incompatible"
7271msgstr "--all 和 --mirror 不兼容"
7272
a77c07d9 7273#: builtin/push.c:419
ef317cd5 7274msgid "repository"
07432cef 7275msgstr "版本库"
ef317cd5 7276
a77c07d9 7277#: builtin/push.c:420
ef317cd5 7278msgid "push all refs"
07432cef 7279msgstr "推送所有引用"
ef317cd5 7280
a77c07d9 7281#: builtin/push.c:421
ef317cd5 7282msgid "mirror all refs"
07432cef 7283msgstr "镜像所有引用"
ef317cd5 7284
a77c07d9 7285#: builtin/push.c:423
ef317cd5 7286msgid "delete refs"
07432cef 7287msgstr "删除引用"
ef317cd5 7288
a77c07d9 7289#: builtin/push.c:424
ef317cd5 7290msgid "push tags (can't be used with --all or --mirror)"
07432cef 7291msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 7292
a77c07d9 7293#: builtin/push.c:427
ef317cd5
JX
7294msgid "force updates"
7295msgstr "强制更新"
7296
a77c07d9 7297#: builtin/push.c:428
ef317cd5 7298msgid "check"
07432cef 7299msgstr "检查"
ef317cd5 7300
a77c07d9 7301#: builtin/push.c:429
ef317cd5 7302msgid "control recursive pushing of submodules"
07432cef 7303msgstr "控制子模组的递归推送"
ef317cd5 7304
a77c07d9 7305#: builtin/push.c:431
ef317cd5 7306msgid "use thin pack"
07432cef 7307msgstr "使用精简打包"
ef317cd5 7308
a77c07d9 7309#: builtin/push.c:432 builtin/push.c:433
ef317cd5 7310msgid "receive pack program"
07432cef 7311msgstr "接收包程序"
ef317cd5 7312
a77c07d9 7313#: builtin/push.c:434
ef317cd5 7314msgid "set upstream for git pull/status"
07432cef 7315msgstr "设置 git pull/status 的上游"
ef317cd5 7316
a77c07d9 7317#: builtin/push.c:437
ef317cd5 7318msgid "prune locally removed refs"
07432cef 7319msgstr "清除本地删除的引用"
ef317cd5 7320
a77c07d9
JX
7321#: builtin/push.c:439
7322msgid "bypass pre-push hook"
7323msgstr "绕过 pre-push 钩子"
7324
1003b3a5
JX
7325#: builtin/push.c:440
7326msgid "push missing but relevant tags"
7327msgstr "推送缺失的有关的 tags"
7328
7329#: builtin/push.c:450
c04f5ac3
JX
7330msgid "--delete is incompatible with --all, --mirror and --tags"
7331msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7332
1003b3a5 7333#: builtin/push.c:452
c04f5ac3
JX
7334msgid "--delete doesn't make sense without any refs"
7335msgstr "--delete 未接任何引用没有意义"
7336
ef317cd5
JX
7337#: builtin/read-tree.c:36
7338msgid ""
7339"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7340"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7341"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7342msgstr ""
07432cef
WS
7343"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7344"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7345"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5
JX
7346
7347#: builtin/read-tree.c:108
ef317cd5 7348msgid "write resulting index to <file>"
07432cef 7349msgstr "将索引结果写入 <file>"
ef317cd5
JX
7350
7351#: builtin/read-tree.c:111
ef317cd5 7352msgid "only empty the index"
07432cef 7353msgstr "只是清空索引"
ef317cd5
JX
7354
7355#: builtin/read-tree.c:113
ef317cd5 7356msgid "Merging"
07432cef 7357msgstr "合并"
ef317cd5
JX
7358
7359#: builtin/read-tree.c:115
7360msgid "perform a merge in addition to a read"
07432cef 7361msgstr "读取之余再执行一个合并"
ef317cd5
JX
7362
7363#: builtin/read-tree.c:117
7364msgid "3-way merge if no file level merging required"
07432cef 7365msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5
JX
7366
7367#: builtin/read-tree.c:119
7368msgid "3-way merge in presence of adds and removes"
07432cef 7369msgstr "存在添加和删除时,也执行三路合并"
ef317cd5
JX
7370
7371#: builtin/read-tree.c:121
7372msgid "same as -m, but discard unmerged entries"
07432cef 7373msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5
JX
7374
7375#: builtin/read-tree.c:122
ef317cd5 7376msgid "<subdirectory>/"
07432cef 7377msgstr "<子目录>/"
ef317cd5
JX
7378
7379#: builtin/read-tree.c:123
7380msgid "read the tree into the index under <subdirectory>/"
07432cef 7381msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5
JX
7382
7383#: builtin/read-tree.c:126
7384msgid "update working tree with merge result"
07432cef 7385msgstr "用合并的结果更新工作区"
ef317cd5
JX
7386
7387#: builtin/read-tree.c:128
ef317cd5 7388msgid "gitignore"
07432cef 7389msgstr "gitignore"
ef317cd5
JX
7390
7391#: builtin/read-tree.c:129
7392msgid "allow explicitly ignored files to be overwritten"
07432cef 7393msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5
JX
7394
7395#: builtin/read-tree.c:132
ef317cd5 7396msgid "don't check the working tree after merging"
07432cef 7397msgstr "合并后不检查工作区"
ef317cd5
JX
7398
7399#: builtin/read-tree.c:133
7400msgid "don't update the index or the work tree"
07432cef 7401msgstr "不更新索引区和工作区"
ef317cd5
JX
7402
7403#: builtin/read-tree.c:135
7404msgid "skip applying sparse checkout filter"
07432cef 7405msgstr "跳过应用稀疏检出过滤器"
ef317cd5
JX
7406
7407#: builtin/read-tree.c:137
7408msgid "debug unpack-trees"
07432cef 7409msgstr "调试 unpack-trees"
ef317cd5
JX
7410
7411#: builtin/remote.c:11
7412msgid "git remote [-v | --verbose]"
07432cef 7413msgstr "git remote [-v | --verbose]"
ef317cd5
JX
7414
7415#: builtin/remote.c:12
7416msgid ""
7417"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7418"mirror=<fetch|push>] <name> <url>"
7419msgstr ""
07432cef
WS
7420"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7421"mirror=<fetch|push>] <名称> <url>"
ef317cd5
JX
7422
7423#: builtin/remote.c:13 builtin/remote.c:32
7424msgid "git remote rename <old> <new>"
07432cef 7425msgstr "git remote rename <旧名称> <新名称>"
ef317cd5
JX
7426
7427#: builtin/remote.c:14 builtin/remote.c:37
7428msgid "git remote remove <name>"
07432cef 7429msgstr "git remote remove <名称>"
ef317cd5 7430
07432cef 7431#: builtin/remote.c:15 builtin/remote.c:42
ef317cd5 7432msgid "git remote set-head <name> (-a | -d | <branch>)"
07432cef 7433msgstr "git remote set-head <名称> (-a | -d | <分支>)"
ef317cd5
JX
7434
7435#: builtin/remote.c:16
7436msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 7437msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5
JX
7438
7439#: builtin/remote.c:17
7440msgid "git remote prune [-n | --dry-run] <name>"
07432cef 7441msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5
JX
7442
7443#: builtin/remote.c:18
7444msgid ""
7445"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 7446msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5
JX
7447
7448#: builtin/remote.c:19
7449msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 7450msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5
JX
7451
7452#: builtin/remote.c:20 builtin/remote.c:68
7453msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 7454msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5
JX
7455
7456#: builtin/remote.c:21 builtin/remote.c:69
7457msgid "git remote set-url --add <name> <newurl>"
07432cef 7458msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5
JX
7459
7460#: builtin/remote.c:22 builtin/remote.c:70
7461msgid "git remote set-url --delete <name> <url>"
07432cef 7462msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5
JX
7463
7464#: builtin/remote.c:27
7465msgid "git remote add [<options>] <name> <url>"
07432cef 7466msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5
JX
7467
7468#: builtin/remote.c:47
7469msgid "git remote set-branches <name> <branch>..."
07432cef 7470msgstr "git remote set-branches <名称> <分支>..."
ef317cd5
JX
7471
7472#: builtin/remote.c:48
7473msgid "git remote set-branches --add <name> <branch>..."
07432cef 7474msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5
JX
7475
7476#: builtin/remote.c:53
7477msgid "git remote show [<options>] <name>"
07432cef 7478msgstr "git remote show [<选项>] <名称>"
ef317cd5
JX
7479
7480#: builtin/remote.c:58
7481msgid "git remote prune [<options>] <name>"
07432cef 7482msgstr "git remote prune [<选项>] <名称>"
ef317cd5
JX
7483
7484#: builtin/remote.c:63
7485msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 7486msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 7487
8ada9598 7488#: builtin/remote.c:98
81809b99 7489#, c-format
8ada9598 7490msgid "Updating %s"
81809b99 7491msgstr "更新 %s 中"
8ada9598
JX
7492
7493#: builtin/remote.c:130
7494msgid ""
7495"--mirror is dangerous and deprecated; please\n"
7496"\t use --mirror=fetch or --mirror=push instead"
7497msgstr ""
81809b99
JX
7498"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7499"\t 或 --mirror=push"
8ada9598
JX
7500
7501#: builtin/remote.c:147
81809b99 7502#, c-format
8ada9598 7503msgid "unknown mirror argument: %s"
81809b99 7504msgstr "未知的镜像参数:%s"
8ada9598 7505
ef317cd5 7506#: builtin/remote.c:163
ef317cd5 7507msgid "fetch the remote branches"
07432cef 7508msgstr "抓取远程的分支"
ef317cd5
JX
7509
7510#: builtin/remote.c:165
7511msgid "import all tags and associated objects when fetching"
07432cef 7512msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5
JX
7513
7514#: builtin/remote.c:168
7515msgid "or do not fetch any tag at all (--no-tags)"
07432cef 7516msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5
JX
7517
7518#: builtin/remote.c:170
7519msgid "branch(es) to track"
07432cef 7520msgstr "跟踪的分支"
ef317cd5
JX
7521
7522#: builtin/remote.c:171
ef317cd5 7523msgid "master branch"
07432cef 7524msgstr "主线分支"
ef317cd5
JX
7525
7526#: builtin/remote.c:172
7527msgid "push|fetch"
07432cef 7528msgstr "push|fetch"
ef317cd5
JX
7529
7530#: builtin/remote.c:173
7531msgid "set up remote as a mirror to push to or fetch from"
07432cef 7532msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 7533
8ada9598
JX
7534#: builtin/remote.c:185
7535msgid "specifying a master branch makes no sense with --mirror"
81809b99 7536msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598
JX
7537
7538#: builtin/remote.c:187
7539msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 7540msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598
JX
7541
7542#: builtin/remote.c:195 builtin/remote.c:646
81809b99 7543#, c-format
8ada9598 7544msgid "remote %s already exists."
81809b99 7545msgstr "远程 %s 已经存在。"
8ada9598
JX
7546
7547#: builtin/remote.c:199 builtin/remote.c:650
81809b99 7548#, c-format
8ada9598 7549msgid "'%s' is not a valid remote name"
81809b99 7550msgstr "'%s' 不是一个有效的远程名称"
8ada9598
JX
7551
7552#: builtin/remote.c:243
81809b99 7553#, c-format
8ada9598 7554msgid "Could not setup master '%s'"
81809b99 7555msgstr "无法设置 master '%s'"
8ada9598
JX
7556
7557#: builtin/remote.c:299
81809b99 7558#, c-format
8ada9598 7559msgid "more than one %s"
81809b99 7560msgstr "多于一个 %s"
8ada9598
JX
7561
7562#: builtin/remote.c:339
81809b99 7563#, c-format
8ada9598 7564msgid "Could not get fetch map for refspec %s"
81809b99 7565msgstr "无法得到引用表达式 %s 的获取列表"
8ada9598
JX
7566
7567#: builtin/remote.c:440 builtin/remote.c:448
7568msgid "(matching)"
81809b99 7569msgstr "(匹配)"
8ada9598
JX
7570
7571#: builtin/remote.c:452
8ada9598 7572msgid "(delete)"
81809b99 7573msgstr "(删除)"
8ada9598
JX
7574
7575#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
81809b99 7576#, c-format
8ada9598 7577msgid "Could not append '%s' to '%s'"
81809b99 7578msgstr "不能添加 '%s' 至 '%s'"
8ada9598
JX
7579
7580#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
81809b99 7581#, c-format
8ada9598 7582msgid "No such remote: %s"
81809b99 7583msgstr "没有这样的远程:%s"
8ada9598
JX
7584
7585#: builtin/remote.c:656
81809b99 7586#, c-format
8ada9598 7587msgid "Could not rename config section '%s' to '%s'"
81809b99 7588msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598
JX
7589
7590#: builtin/remote.c:662 builtin/remote.c:799
81809b99 7591#, c-format
8ada9598 7592msgid "Could not remove config section '%s'"
81809b99 7593msgstr "不能移除配置小节 '%s'"
8ada9598
JX
7594
7595#: builtin/remote.c:677
7596#, c-format
7597msgid ""
d691f479 7598"Not updating non-default fetch refspec\n"
8ada9598
JX
7599"\t%s\n"
7600"\tPlease update the configuration manually if necessary."
7601msgstr ""
81809b99
JX
7602"没有更新非默认的获取引用表达式\n"
7603"\t%s\n"
7604"\t如果必要请手动更新配置。"
8ada9598
JX
7605
7606#: builtin/remote.c:683
81809b99 7607#, c-format
8ada9598 7608msgid "Could not append '%s'"
81809b99 7609msgstr "不能追加 '%s'"
8ada9598
JX
7610
7611#: builtin/remote.c:694
81809b99 7612#, c-format
8ada9598 7613msgid "Could not set '%s'"
81809b99 7614msgstr "不能设置 '%s'"
8ada9598
JX
7615
7616#: builtin/remote.c:716
81809b99 7617#, c-format
8ada9598 7618msgid "deleting '%s' failed"
81809b99 7619msgstr "删除 '%s' 失败"
8ada9598
JX
7620
7621#: builtin/remote.c:750
81809b99 7622#, c-format
8ada9598 7623msgid "creating '%s' failed"
81809b99 7624msgstr "创建 '%s' 失败"
8ada9598
JX
7625
7626#: builtin/remote.c:764
81809b99 7627#, c-format
8ada9598 7628msgid "Could not remove branch %s"
81809b99 7629msgstr "无法移除分支 %s"
8ada9598
JX
7630
7631#: builtin/remote.c:834
7632msgid ""
7633"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7634"to delete it, use:"
7635msgid_plural ""
7636"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7637"to delete them, use:"
5ae481e0
JX
7638msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7639msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598
JX
7640
7641#: builtin/remote.c:943
7642#, c-format
7643msgid " new (next fetch will store in remotes/%s)"
81809b99 7644msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598
JX
7645
7646#: builtin/remote.c:946
8ada9598 7647msgid " tracked"
81809b99 7648msgstr " 已跟踪"
8ada9598
JX
7649
7650#: builtin/remote.c:948
7651msgid " stale (use 'git remote prune' to remove)"
81809b99 7652msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598
JX
7653
7654#: builtin/remote.c:950
7655msgid " ???"
81809b99 7656msgstr " ???"
8ada9598
JX
7657
7658#: builtin/remote.c:991
7659#, c-format
7660msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 7661msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598
JX
7662
7663#: builtin/remote.c:998
81809b99 7664#, c-format
8ada9598 7665msgid "rebases onto remote %s"
81809b99 7666msgstr "变基到远程 %s"
8ada9598
JX
7667
7668#: builtin/remote.c:1001
81809b99 7669#, c-format
8ada9598 7670msgid " merges with remote %s"
81809b99 7671msgstr " 与远程 %s 合并"
8ada9598
JX
7672
7673#: builtin/remote.c:1002
7674msgid " and with remote"
81809b99 7675msgstr " 且有远程"
8ada9598
JX
7676
7677#: builtin/remote.c:1004
81809b99 7678#, c-format
8ada9598 7679msgid "merges with remote %s"
81809b99 7680msgstr "与远程 %s 合并"
8ada9598
JX
7681
7682#: builtin/remote.c:1005
7683msgid " and with remote"
81809b99 7684msgstr " 且有远程"
8ada9598
JX
7685
7686#: builtin/remote.c:1051
7687msgid "create"
81809b99 7688msgstr "创建"
8ada9598
JX
7689
7690#: builtin/remote.c:1054
8ada9598 7691msgid "delete"
81809b99 7692msgstr "删除"
8ada9598
JX
7693
7694#: builtin/remote.c:1058
8ada9598 7695msgid "up to date"
81809b99 7696msgstr "最新"
8ada9598
JX
7697
7698#: builtin/remote.c:1061
8ada9598 7699msgid "fast-forwardable"
81809b99 7700msgstr "可快进"
8ada9598
JX
7701
7702#: builtin/remote.c:1064
7703msgid "local out of date"
81809b99 7704msgstr "本地已过时"
8ada9598
JX
7705
7706#: builtin/remote.c:1071
7707#, c-format
7708msgid " %-*s forces to %-*s (%s)"
81809b99 7709msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598
JX
7710
7711#: builtin/remote.c:1074
7712#, c-format
7713msgid " %-*s pushes to %-*s (%s)"
81809b99 7714msgstr " %-*s 推送至 %-*s (%s)"
8ada9598
JX
7715
7716#: builtin/remote.c:1078
7717#, c-format
7718msgid " %-*s forces to %s"
81809b99 7719msgstr " %-*s 强制推送至 %s"
8ada9598
JX
7720
7721#: builtin/remote.c:1081
7722#, c-format
7723msgid " %-*s pushes to %s"
81809b99 7724msgstr " %-*s 推送至 %s"
8ada9598 7725
ef317cd5 7726#: builtin/remote.c:1091
ef317cd5 7727msgid "do not query remotes"
07432cef 7728msgstr "不查询远程"
ef317cd5 7729
8ada9598 7730#: builtin/remote.c:1118
81809b99 7731#, c-format
8ada9598 7732msgid "* remote %s"
81809b99 7733msgstr "* 远程 %s"
8ada9598
JX
7734
7735#: builtin/remote.c:1119
7736#, c-format
7737msgid " Fetch URL: %s"
81809b99 7738msgstr " 获取地址:%s"
8ada9598
JX
7739
7740#: builtin/remote.c:1120 builtin/remote.c:1285
7741msgid "(no URL)"
81809b99 7742msgstr "(无 URL)"
8ada9598
JX
7743
7744#: builtin/remote.c:1129 builtin/remote.c:1131
7745#, c-format
7746msgid " Push URL: %s"
81809b99 7747msgstr " 推送地址:%s"
8ada9598
JX
7748
7749#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
81809b99 7750#, c-format
8ada9598 7751msgid " HEAD branch: %s"
81809b99 7752msgstr " HEAD分支:%s"
8ada9598
JX
7753
7754#: builtin/remote.c:1139
7755#, c-format
7756msgid ""
7757" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 7758msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598
JX
7759
7760#: builtin/remote.c:1151
81809b99 7761#, c-format
8ada9598
JX
7762msgid " Remote branch:%s"
7763msgid_plural " Remote branches:%s"
81809b99 7764msgstr[0] " 远程分支:%s"
5ae481e0 7765msgstr[1] " 远程分支:%s"
8ada9598 7766
81809b99 7767# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
7768#: builtin/remote.c:1154 builtin/remote.c:1181
7769msgid " (status not queried)"
81809b99 7770msgstr "(状态未查询)"
8ada9598
JX
7771
7772#: builtin/remote.c:1163
7773msgid " Local branch configured for 'git pull':"
7774msgid_plural " Local branches configured for 'git pull':"
81809b99 7775msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 7776msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598
JX
7777
7778#: builtin/remote.c:1171
7779msgid " Local refs will be mirrored by 'git push'"
81809b99 7780msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598
JX
7781
7782#: builtin/remote.c:1178
81809b99 7783#, c-format
8ada9598
JX
7784msgid " Local ref configured for 'git push'%s:"
7785msgid_plural " Local refs configured for 'git push'%s:"
81809b99 7786msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 7787msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 7788
ef317cd5
JX
7789#: builtin/remote.c:1199
7790msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 7791msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5
JX
7792
7793#: builtin/remote.c:1201
7794msgid "delete refs/remotes/<name>/HEAD"
07432cef 7795msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 7796
8ada9598 7797#: builtin/remote.c:1216
8ada9598 7798msgid "Cannot determine remote HEAD"
81809b99 7799msgstr "无法确定远程 HEAD"
8ada9598
JX
7800
7801#: builtin/remote.c:1218
7802msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 7803msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598
JX
7804
7805#: builtin/remote.c:1228
81809b99 7806#, c-format
8ada9598 7807msgid "Could not delete %s"
81809b99 7808msgstr "无法删除 %s"
8ada9598
JX
7809
7810#: builtin/remote.c:1236
81809b99 7811#, c-format
8ada9598 7812msgid "Not a valid ref: %s"
81809b99 7813msgstr "不是一个有效引用:%s"
8ada9598
JX
7814
7815#: builtin/remote.c:1238
81809b99 7816#, c-format
8ada9598 7817msgid "Could not setup %s"
81809b99 7818msgstr "不能设置 %s"
8ada9598
JX
7819
7820# 译者:注意保持前导空格
7821#: builtin/remote.c:1274
81809b99 7822#, c-format
8ada9598 7823msgid " %s will become dangling!"
07432cef 7824msgstr " %s 将成为摇摆状态!"
8ada9598
JX
7825
7826# 译者:注意保持前导空格
7827#: builtin/remote.c:1275
81809b99 7828#, c-format
8ada9598 7829msgid " %s has become dangling!"
07432cef 7830msgstr " %s 已成为摇摆状态!"
8ada9598
JX
7831
7832#: builtin/remote.c:1281
81809b99 7833#, c-format
8ada9598 7834msgid "Pruning %s"
81809b99 7835msgstr "修剪 %s"
8ada9598
JX
7836
7837#: builtin/remote.c:1282
7838#, c-format
7839msgid "URL: %s"
81809b99 7840msgstr "URL:%s"
8ada9598
JX
7841
7842#: builtin/remote.c:1295
7843#, c-format
7844msgid " * [would prune] %s"
81809b99 7845msgstr " * [将删除] %s"
8ada9598
JX
7846
7847#: builtin/remote.c:1298
7848#, c-format
7849msgid " * [pruned] %s"
81809b99 7850msgstr " * [已删除] %s"
8ada9598 7851
ef317cd5
JX
7852#: builtin/remote.c:1321
7853msgid "prune remotes after fetching"
07432cef 7854msgstr "抓取后清除远程"
ef317cd5 7855
8ada9598 7856#: builtin/remote.c:1387 builtin/remote.c:1461
81809b99 7857#, c-format
8ada9598 7858msgid "No such remote '%s'"
81809b99 7859msgstr "没有此远程 '%s'"
8ada9598 7860
ef317cd5 7861#: builtin/remote.c:1407
ef317cd5 7862msgid "add branch"
07432cef 7863msgstr "添加分支"
ef317cd5 7864
8ada9598 7865#: builtin/remote.c:1414
8ada9598 7866msgid "no remote specified"
81809b99 7867msgstr "未指定远程"
8ada9598 7868
ef317cd5
JX
7869#: builtin/remote.c:1436
7870msgid "manipulate push URLs"
07432cef 7871msgstr "操作推送 URLS"
ef317cd5
JX
7872
7873#: builtin/remote.c:1438
7874msgid "add URL"
07432cef 7875msgstr "添加 URL"
ef317cd5
JX
7876
7877#: builtin/remote.c:1440
ef317cd5 7878msgid "delete URLs"
07432cef 7879msgstr "删除 URLS"
ef317cd5 7880
8ada9598 7881#: builtin/remote.c:1447
8ada9598 7882msgid "--add --delete doesn't make sense"
81809b99 7883msgstr "--add --delete 无意义"
8ada9598
JX
7884
7885#: builtin/remote.c:1487
81809b99 7886#, c-format
8ada9598 7887msgid "Invalid old URL pattern: %s"
81809b99 7888msgstr "无效的旧URL匹配模版:%s"
8ada9598
JX
7889
7890#: builtin/remote.c:1495
81809b99 7891#, c-format
8ada9598 7892msgid "No such URL found: %s"
81809b99 7893msgstr "未找到此URL:%s"
8ada9598
JX
7894
7895#: builtin/remote.c:1497
7896msgid "Will not delete all non-push URLs"
81809b99 7897msgstr "将不会删除所有非推送URL地址"
8ada9598 7898
ef317cd5
JX
7899#: builtin/remote.c:1569
7900msgid "be verbose; must be placed before a subcommand"
07432cef 7901msgstr "冗长输出;必须置于子命令之前"
ef317cd5
JX
7902
7903#: builtin/replace.c:17
7904msgid "git replace [-f] <object> <replacement>"
07432cef 7905msgstr "git replace [-f] <对象> <替换物>"
ef317cd5
JX
7906
7907#: builtin/replace.c:18
7908msgid "git replace -d <object>..."
07432cef 7909msgstr "git replace -d <对象>..."
ef317cd5
JX
7910
7911#: builtin/replace.c:19
7912msgid "git replace -l [<pattern>]"
07432cef 7913msgstr "git replace -l [<模式>]"
ef317cd5 7914
07432cef 7915#: builtin/replace.c:121
ef317cd5 7916msgid "list replace refs"
07432cef 7917msgstr "列出替换的引用"
ef317cd5 7918
07432cef 7919#: builtin/replace.c:122
ef317cd5 7920msgid "delete replace refs"
07432cef 7921msgstr "删除替换的引用"
ef317cd5 7922
07432cef 7923#: builtin/replace.c:123
ef317cd5 7924msgid "replace the ref if it exists"
07432cef 7925msgstr "如果存在则替换引用"
ef317cd5
JX
7926
7927#: builtin/rerere.c:11
7928msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 7929msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5
JX
7930
7931#: builtin/rerere.c:56
ef317cd5 7932msgid "register clean resolutions in index"
07432cef 7933msgstr "在索引中注册干净的解决方案"
ef317cd5
JX
7934
7935#: builtin/reset.c:25
7936msgid ""
7937"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 7938msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5
JX
7939
7940#: builtin/reset.c:26
07432cef
WS
7941msgid "git reset [-q] <tree-ish> [--] <paths>..."
7942msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5
JX
7943
7944#: builtin/reset.c:27
07432cef
WS
7945msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7946msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 7947
c04f5ac3
JX
7948#: builtin/reset.c:33
7949msgid "mixed"
7950msgstr "混杂"
7951
7952#: builtin/reset.c:33
7953msgid "soft"
7954msgstr "软性"
7955
7956#: builtin/reset.c:33
7957msgid "hard"
7958msgstr "硬性"
7959
8ada9598
JX
7960#: builtin/reset.c:33
7961msgid "merge"
7962msgstr "合并"
7963
c04f5ac3
JX
7964#: builtin/reset.c:33
7965msgid "keep"
7966msgstr "保持"
7967
07432cef 7968#: builtin/reset.c:73
c04f5ac3
JX
7969msgid "You do not have a valid HEAD."
7970msgstr "您没有一个有效的 HEAD。"
7971
07432cef 7972#: builtin/reset.c:75
c04f5ac3
JX
7973msgid "Failed to find tree of HEAD."
7974msgstr "无法找到 HEAD 指向的树。"
7975
07432cef 7976#: builtin/reset.c:81
c04f5ac3
JX
7977#, c-format
7978msgid "Failed to find tree of %s."
7979msgstr "无法找到 %s 指向的树。"
7980
07432cef 7981#: builtin/reset.c:98
c04f5ac3
JX
7982#, c-format
7983msgid "HEAD is now at %s"
7984msgstr "HEAD 现在位于 %s"
7985
90e6ef53 7986# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7987#: builtin/reset.c:169
c04f5ac3
JX
7988#, c-format
7989msgid "Cannot do a %s reset in the middle of a merge."
7990msgstr "在合并过程中不能做%s重置操作。"
7991
07432cef 7992#: builtin/reset.c:248
ef317cd5 7993msgid "be quiet, only report errors"
07432cef 7994msgstr "安静模式,只报告错误"
ef317cd5 7995
07432cef 7996#: builtin/reset.c:250
ef317cd5 7997msgid "reset HEAD and index"
07432cef 7998msgstr "重置 HEAD 和索引"
ef317cd5 7999
07432cef 8000#: builtin/reset.c:251
ef317cd5 8001msgid "reset only HEAD"
07432cef 8002msgstr "只重置 HEAD"
ef317cd5 8003
07432cef 8004#: builtin/reset.c:253 builtin/reset.c:255
ef317cd5 8005msgid "reset HEAD, index and working tree"
07432cef 8006msgstr "重置 HEAD、索引和工作区"
ef317cd5 8007
07432cef 8008#: builtin/reset.c:257
ef317cd5 8009msgid "reset HEAD but keep local changes"
07432cef 8010msgstr "重置 HEAD 但保存本地变更"
ef317cd5 8011
07432cef
WS
8012#: builtin/reset.c:275
8013#, c-format
8014msgid "Failed to resolve '%s' as a valid revision."
8015msgstr "无法将 '%s' 解析为一个有效的版本。"
8016
8017#: builtin/reset.c:278 builtin/reset.c:286
c04f5ac3
JX
8018#, c-format
8019msgid "Could not parse object '%s'."
8020msgstr "不能解析对象 '%s'。"
8021
07432cef
WS
8022#: builtin/reset.c:283
8023#, c-format
8024msgid "Failed to resolve '%s' as a valid tree."
8025msgstr "无法将 '%s' 解析为一个有效的树对象。"
8026
8027#: builtin/reset.c:292
c04f5ac3 8028msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 8029msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 8030
07432cef 8031#: builtin/reset.c:301
c04f5ac3 8032msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 8033msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 8034
90e6ef53 8035# 译者:汉字之间无空格,故删除%s前后空格
07432cef 8036#: builtin/reset.c:303
c04f5ac3
JX
8037#, c-format
8038msgid "Cannot do %s reset with paths."
8039msgstr "不能带路径进行%s重置。"
8040
90e6ef53 8041# 译者:汉字之间无空格,故删除%s前后空格
07432cef 8042#: builtin/reset.c:313
c04f5ac3
JX
8043#, c-format
8044msgid "%s reset is not allowed in a bare repository"
8045msgstr "不能对裸版本库进行%s重置"
8046
07432cef 8047#: builtin/reset.c:333
ef317cd5
JX
8048#, c-format
8049msgid "Could not reset index file to revision '%s'."
8050msgstr "不能重置索引文件至版本 '%s'。"
8051
07432cef
WS
8052#: builtin/reset.c:339
8053msgid "Unstaged changes after reset:"
8054msgstr "重置后撤出暂存区的变更:"
8055
8056#: builtin/reset.c:344
8057msgid "Could not write new index file."
8058msgstr "不能写入新的索引文件。"
8059
ef317cd5 8060#: builtin/rev-parse.c:339
ef317cd5 8061msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 8062msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5
JX
8063
8064#: builtin/rev-parse.c:344
8065msgid "keep the `--` passed as an arg"
07432cef 8066msgstr "保持 `--` 作为一个参数传递"
ef317cd5
JX
8067
8068#: builtin/rev-parse.c:346
8069msgid "stop parsing after the first non-option argument"
07432cef 8070msgstr "遇到第一个非选项参数后停止解析"
ef317cd5
JX
8071
8072#: builtin/rev-parse.c:464
8073msgid ""
8074"git rev-parse --parseopt [options] -- [<args>...]\n"
8075" or: git rev-parse --sq-quote [<arg>...]\n"
8076" or: git rev-parse [options] [<arg>...]\n"
8077"\n"
8078"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8079msgstr ""
07432cef
WS
8080"git rev-parse --parseopt [选项] -- [<参数>...]\n"
8081" 或者:git rev-parse --sq-quote [<选项>...]\n"
8082" 或者:git rev-parse [options] [<选项>...]\n"
8083"\n"
8084"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
8085
8086#: builtin/revert.c:22
8087msgid "git revert [options] <commit-ish>"
07432cef 8088msgstr "git revert [选项] <提交号>"
ef317cd5
JX
8089
8090#: builtin/revert.c:23
8091msgid "git revert <subcommand>"
07432cef 8092msgstr "git revert <子命令>"
ef317cd5
JX
8093
8094#: builtin/revert.c:28
8095msgid "git cherry-pick [options] <commit-ish>"
07432cef 8096msgstr "git cherry-pick [选项] <提交号>"
ef317cd5
JX
8097
8098#: builtin/revert.c:29
ef317cd5 8099msgid "git cherry-pick <subcommand>"
07432cef 8100msgstr "git cherry-pick <子命令>"
ef317cd5
JX
8101
8102#: builtin/revert.c:70 builtin/revert.c:92
8103#, c-format
8104msgid "%s: %s cannot be used with %s"
8105msgstr "%s:%s 不能和 %s 同时使用"
8106
8107#: builtin/revert.c:103
8108msgid "end revert or cherry-pick sequence"
07432cef 8109msgstr "终止反转或拣选操作"
ef317cd5
JX
8110
8111#: builtin/revert.c:104
8112msgid "resume revert or cherry-pick sequence"
07432cef 8113msgstr "继续反转或拣选操作"
ef317cd5
JX
8114
8115#: builtin/revert.c:105
8116msgid "cancel revert or cherry-pick sequence"
07432cef 8117msgstr "取消反转或拣选操作"
ef317cd5
JX
8118
8119#: builtin/revert.c:106
ef317cd5 8120msgid "don't automatically commit"
07432cef 8121msgstr "不要自动提交"
ef317cd5
JX
8122
8123#: builtin/revert.c:107
ef317cd5 8124msgid "edit the commit message"
07432cef 8125msgstr "编辑提交说明"
ef317cd5
JX
8126
8127#: builtin/revert.c:110
8128msgid "parent number"
07432cef 8129msgstr "父编号"
ef317cd5
JX
8130
8131#: builtin/revert.c:112
ef317cd5 8132msgid "merge strategy"
07432cef 8133msgstr "合并策略"
ef317cd5
JX
8134
8135#: builtin/revert.c:113
ef317cd5 8136msgid "option"
07432cef 8137msgstr "选项"
ef317cd5
JX
8138
8139#: builtin/revert.c:114
ef317cd5 8140msgid "option for merge strategy"
07432cef 8141msgstr "合并策略的选项"
ef317cd5
JX
8142
8143#: builtin/revert.c:125
8144msgid "append commit name"
07432cef 8145msgstr "追加提交名称"
ef317cd5
JX
8146
8147#: builtin/revert.c:126
ef317cd5 8148msgid "allow fast-forward"
07432cef 8149msgstr "允许快进式"
c04f5ac3 8150
ef317cd5 8151#: builtin/revert.c:127
ef317cd5 8152msgid "preserve initially empty commits"
07432cef 8153msgstr "保留初始化的空提交"
ef317cd5
JX
8154
8155#: builtin/revert.c:128
ef317cd5 8156msgid "allow commits with empty messages"
07432cef 8157msgstr "允许提交说明为空"
c04f5ac3 8158
ef317cd5 8159#: builtin/revert.c:129
ef317cd5 8160msgid "keep redundant, empty commits"
07432cef 8161msgstr "保持多余的、空的提交"
ef317cd5
JX
8162
8163#: builtin/revert.c:133
c04f5ac3
JX
8164msgid "program error"
8165msgstr "程序错误"
8166
ef317cd5 8167#: builtin/revert.c:223
c04f5ac3
JX
8168msgid "revert failed"
8169msgstr "还原失败"
8170
ef317cd5 8171#: builtin/revert.c:238
c04f5ac3
JX
8172msgid "cherry-pick failed"
8173msgstr "拣选失败"
8174
07432cef 8175#: builtin/rm.c:15
ef317cd5 8176msgid "git rm [options] [--] <file>..."
07432cef
WS
8177msgstr "git rm [选项] [--] <文件>..."
8178
8179#: builtin/rm.c:64 builtin/rm.c:186
8180#, c-format
8181msgid ""
8182"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8183"(use 'rm -rf' if you really want to remove it including all of its history)"
8184msgstr ""
8185"子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8186"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 8187
07432cef 8188#: builtin/rm.c:174
c04f5ac3
JX
8189#, c-format
8190msgid ""
8191"'%s' has staged content different from both the file and the HEAD\n"
8192"(use -f to force removal)"
8193msgstr ""
90e6ef53 8194"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
c04f5ac3
JX
8195"(使用 -f 强制删除)"
8196
07432cef 8197#: builtin/rm.c:180
c04f5ac3
JX
8198#, c-format
8199msgid ""
8200"'%s' has changes staged in the index\n"
8201"(use --cached to keep the file, or -f to force removal)"
8202msgstr ""
90e6ef53 8203"'%s' 有变更已暂存至索引中\n"
c04f5ac3
JX
8204"(使用 --cached 保存文件,或用 -f 强制删除)"
8205
07432cef 8206#: builtin/rm.c:191
c04f5ac3
JX
8207#, c-format
8208msgid ""
8209"'%s' has local modifications\n"
8210"(use --cached to keep the file, or -f to force removal)"
8211msgstr ""
8212"'%s' 有本地修改\n"
8213"(使用 --cached 保存文件,或用 -f 强制删除)"
8214
07432cef 8215#: builtin/rm.c:207
ef317cd5 8216msgid "do not list removed files"
07432cef 8217msgstr "不列出删除的文件"
ef317cd5 8218
07432cef 8219#: builtin/rm.c:208
ef317cd5 8220msgid "only remove from the index"
07432cef 8221msgstr "只从索引区删除"
ef317cd5 8222
07432cef 8223#: builtin/rm.c:209
ef317cd5 8224msgid "override the up-to-date check"
07432cef 8225msgstr "忽略文件更新状态检查"
ef317cd5 8226
07432cef 8227#: builtin/rm.c:210
ef317cd5 8228msgid "allow recursive removal"
07432cef 8229msgstr "允许递归删除"
ef317cd5 8230
07432cef 8231#: builtin/rm.c:212
ef317cd5 8232msgid "exit with a zero status even if nothing matched"
07432cef 8233msgstr "即使没有匹配,也以零状态退出"
ef317cd5 8234
07432cef 8235#: builtin/rm.c:283
c04f5ac3
JX
8236#, c-format
8237msgid "not removing '%s' recursively without -r"
8238msgstr "未提供 -r 选项不会递归删除 '%s'"
8239
07432cef 8240#: builtin/rm.c:322
c04f5ac3
JX
8241#, c-format
8242msgid "git rm: unable to remove %s"
8243msgstr "git rm:不能删除 %s"
8244
ef317cd5
JX
8245#: builtin/shortlog.c:13
8246msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
07432cef 8247msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
ef317cd5 8248
07432cef 8249#: builtin/shortlog.c:133
c04f5ac3
JX
8250#, c-format
8251msgid "Missing author: %s"
8252msgstr "缺少作者:%s"
8253
07432cef 8254#: builtin/shortlog.c:229
ef317cd5 8255msgid "sort output according to the number of commits per author"
07432cef 8256msgstr "根据每个作者的提交数量排序"
ef317cd5 8257
07432cef 8258#: builtin/shortlog.c:231
ef317cd5 8259msgid "Suppress commit descriptions, only provides commit count"
07432cef 8260msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 8261
07432cef 8262#: builtin/shortlog.c:233
ef317cd5 8263msgid "Show the email address of each author"
07432cef 8264msgstr "显示每个作者的电子邮件地址"
ef317cd5 8265
07432cef 8266#: builtin/shortlog.c:234
ef317cd5 8267msgid "w[,i1[,i2]]"
07432cef 8268msgstr "w[,i1[,i2]]"
ef317cd5 8269
07432cef 8270#: builtin/shortlog.c:235
ef317cd5 8271msgid "Linewrap output"
07432cef 8272msgstr "折行输出"
ef317cd5
JX
8273
8274#: builtin/show-branch.c:9
8275msgid ""
8276"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8277"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8278"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8279"<glob>)...]"
8280msgstr ""
07432cef
WS
8281"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8282"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8283"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8284"<glob>)...]"
ef317cd5
JX
8285
8286#: builtin/show-branch.c:10
8287msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 8288msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5
JX
8289
8290#: builtin/show-branch.c:651
ef317cd5 8291msgid "show remote-tracking and local branches"
07432cef 8292msgstr "显示远程跟踪的和本地的分支"
ef317cd5
JX
8293
8294#: builtin/show-branch.c:653
ef317cd5 8295msgid "show remote-tracking branches"
07432cef 8296msgstr "显示远程跟踪的分支"
ef317cd5
JX
8297
8298#: builtin/show-branch.c:655
8299msgid "color '*!+-' corresponding to the branch"
07432cef 8300msgstr "着色 '*!+-' 到相应的分支"
ef317cd5
JX
8301
8302#: builtin/show-branch.c:657
8303msgid "show <n> more commits after the common ancestor"
07432cef 8304msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5
JX
8305
8306#: builtin/show-branch.c:659
8307msgid "synonym to more=-1"
07432cef 8308msgstr "和 more=-1 同义"
ef317cd5
JX
8309
8310#: builtin/show-branch.c:660
8311msgid "suppress naming strings"
07432cef 8312msgstr "不显示字符串命名"
ef317cd5
JX
8313
8314#: builtin/show-branch.c:662
ef317cd5 8315msgid "include the current branch"
07432cef 8316msgstr "包括当前分支"
ef317cd5
JX
8317
8318#: builtin/show-branch.c:664
ef317cd5 8319msgid "name commits with their object names"
07432cef 8320msgstr "以对象名字命名提交"
ef317cd5
JX
8321
8322#: builtin/show-branch.c:666
8323msgid "show possible merge bases"
07432cef 8324msgstr "显示可能合并的基线"
ef317cd5
JX
8325
8326#: builtin/show-branch.c:668
8327msgid "show refs unreachable from any other ref"
07432cef 8328msgstr "显示没有任何引用的的引用"
ef317cd5
JX
8329
8330#: builtin/show-branch.c:670
8331msgid "show commits in topological order"
07432cef 8332msgstr "以拓扑顺序显示提交"
ef317cd5
JX
8333
8334#: builtin/show-branch.c:672
8335msgid "show only commits not on the first branch"
07432cef 8336msgstr "只显示不在第一个分支上的提交"
ef317cd5
JX
8337
8338#: builtin/show-branch.c:674
8339msgid "show merges reachable from only one tip"
07432cef 8340msgstr "显示仅一个分支可访问的合并提交"
ef317cd5
JX
8341
8342#: builtin/show-branch.c:676
8343msgid "show commits where no parent comes before its children"
07432cef 8344msgstr "显示提交时以时间为序且父提交不能领先子提交"
ef317cd5
JX
8345
8346#: builtin/show-branch.c:678
8347msgid "<n>[,<base>]"
07432cef 8348msgstr "<n>[,<base>]"
ef317cd5
JX
8349
8350#: builtin/show-branch.c:679
8351msgid "show <n> most recent ref-log entries starting at base"
07432cef 8352msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
8353
8354#: builtin/show-ref.c:10
8355msgid ""
a77c07d9
JX
8356"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8357"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5 8358msgstr ""
a77c07d9
JX
8359"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8360"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
8361
8362#: builtin/show-ref.c:11
8363msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 8364msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 8365
07432cef 8366#: builtin/show-ref.c:165
ef317cd5 8367msgid "only show tags (can be combined with heads)"
07432cef 8368msgstr "只显示 tags(可以和头共用)"
ef317cd5 8369
07432cef 8370#: builtin/show-ref.c:166
ef317cd5 8371msgid "only show heads (can be combined with tags)"
07432cef 8372msgstr "只显示头(可以和 tags 共用)"
ef317cd5 8373
07432cef 8374#: builtin/show-ref.c:167
ef317cd5 8375msgid "stricter reference checking, requires exact ref path"
07432cef 8376msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 8377
07432cef 8378#: builtin/show-ref.c:170 builtin/show-ref.c:172
ef317cd5 8379msgid "show the HEAD reference"
07432cef 8380msgstr "显示 HEAD 引用"
ef317cd5 8381
07432cef 8382#: builtin/show-ref.c:174
ef317cd5 8383msgid "dereference tags into object IDs"
07432cef 8384msgstr "转换 tags 到对象ID"
ef317cd5 8385
07432cef 8386#: builtin/show-ref.c:176
ef317cd5 8387msgid "only show SHA1 hash using <n> digits"
07432cef 8388msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 8389
07432cef 8390#: builtin/show-ref.c:180
ef317cd5 8391msgid "do not print results to stdout (useful with --verify)"
07432cef 8392msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 8393
07432cef 8394#: builtin/show-ref.c:182
ef317cd5 8395msgid "show refs from stdin that aren't in local repository"
07432cef 8396msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
8397
8398#: builtin/symbolic-ref.c:7
8399msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
8400msgstr "git symbolic-ref [选项] 名称 [引用]"
8401
8402#: builtin/symbolic-ref.c:8
8403msgid "git symbolic-ref -d [-q] name"
8404msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 8405
07432cef 8406#: builtin/symbolic-ref.c:40
ef317cd5 8407msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
8408msgstr "不显示非符号(分离的)引用的错误信息"
8409
8410#: builtin/symbolic-ref.c:41
8411msgid "delete symbolic ref"
8412msgstr "删除符号引用"
ef317cd5 8413
07432cef 8414#: builtin/symbolic-ref.c:42
ef317cd5 8415msgid "shorten ref output"
07432cef 8416msgstr "简短的引用输出"
ef317cd5 8417
07432cef 8418#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8419msgid "reason"
07432cef 8420msgstr "原因"
ef317cd5 8421
07432cef 8422#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8423msgid "reason of the update"
07432cef 8424msgstr "更新的原因"
ef317cd5
JX
8425
8426#: builtin/tag.c:22
8427msgid ""
8428"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
a77c07d9 8429msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
8430
8431#: builtin/tag.c:23
8432msgid "git tag -d <tagname>..."
07432cef 8433msgstr "git tag -d <标签名>..."
ef317cd5
JX
8434
8435#: builtin/tag.c:24
8436msgid ""
8437"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8438"\t\t[<pattern>...]"
8439msgstr ""
07432cef
WS
8440"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8441"\t\t[<模式>...]"
ef317cd5
JX
8442
8443#: builtin/tag.c:26
8444msgid "git tag -v <tagname>..."
07432cef 8445msgstr "git tag -v <标签名>..."
ef317cd5 8446
8ada9598 8447#: builtin/tag.c:60
7ac1c0ad
JX
8448#, c-format
8449msgid "malformed object at '%s'"
8450msgstr "非法的对象于 '%s'"
8451
8ada9598 8452#: builtin/tag.c:207
c04f5ac3
JX
8453#, c-format
8454msgid "tag name too long: %.*s..."
8455msgstr "tag 名字太长:%.*s..."
8456
8ada9598 8457#: builtin/tag.c:212
c04f5ac3
JX
8458#, c-format
8459msgid "tag '%s' not found."
8460msgstr "tag '%s' 未发现。"
8461
8ada9598 8462#: builtin/tag.c:227
c04f5ac3
JX
8463#, c-format
8464msgid "Deleted tag '%s' (was %s)\n"
8465msgstr "已删除 tag '%s'(曾为 %s)\n"
8466
8ada9598 8467#: builtin/tag.c:239
c04f5ac3
JX
8468#, c-format
8469msgid "could not verify the tag '%s'"
8470msgstr "不能校验 tag '%s'"
8471
8ada9598 8472#: builtin/tag.c:249
a77c07d9 8473#, c-format
c04f5ac3
JX
8474msgid ""
8475"\n"
a77c07d9
JX
8476"Write a tag message\n"
8477"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
8478msgstr ""
8479"\n"
a77c07d9
JX
8480"输入一个 tag 说明\n"
8481"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 8482
a77c07d9
JX
8483#: builtin/tag.c:253
8484#, c-format
c04f5ac3
JX
8485msgid ""
8486"\n"
a77c07d9
JX
8487"Write a tag message\n"
8488"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 8489"want to.\n"
c04f5ac3
JX
8490msgstr ""
8491"\n"
a77c07d9
JX
8492"输入一个 tag 说明\n"
8493"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 8494
a77c07d9 8495#: builtin/tag.c:292
c04f5ac3
JX
8496msgid "unable to sign the tag"
8497msgstr "无法签署 tag"
8498
a77c07d9 8499#: builtin/tag.c:294
c04f5ac3
JX
8500msgid "unable to write tag file"
8501msgstr "无法写 tag 文件"
8502
a77c07d9 8503#: builtin/tag.c:319
c04f5ac3 8504msgid "bad object type."
90e6ef53 8505msgstr "坏的对象类型。"
c04f5ac3 8506
a77c07d9 8507#: builtin/tag.c:332
c04f5ac3 8508msgid "tag header too big."
90e6ef53 8509msgstr "tag 头信息太大。"
c04f5ac3 8510
a77c07d9 8511#: builtin/tag.c:368
c04f5ac3
JX
8512msgid "no tag message?"
8513msgstr "无 tag 说明?"
8514
a77c07d9 8515#: builtin/tag.c:374
c04f5ac3
JX
8516#, c-format
8517msgid "The tag message has been left in %s\n"
8518msgstr "tag 说明被保留在 %s\n"
8519
a77c07d9 8520#: builtin/tag.c:423
7ac1c0ad
JX
8521msgid "switch 'points-at' requires an object"
8522msgstr "开关 'points-at' 需要一个对象"
8523
a77c07d9 8524#: builtin/tag.c:425
7ac1c0ad
JX
8525#, c-format
8526msgid "malformed object name '%s'"
8527msgstr "非法的对象名 '%s'"
8528
a77c07d9 8529#: builtin/tag.c:445
ef317cd5 8530msgid "list tag names"
07432cef 8531msgstr "列出tag名称"
ef317cd5 8532
a77c07d9 8533#: builtin/tag.c:447
ef317cd5 8534msgid "print <n> lines of each tag message"
07432cef 8535msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 8536
a77c07d9 8537#: builtin/tag.c:449
ef317cd5 8538msgid "delete tags"
07432cef 8539msgstr "删除 tags"
ef317cd5 8540
a77c07d9 8541#: builtin/tag.c:450
ef317cd5 8542msgid "verify tags"
07432cef 8543msgstr "验证 tags"
ef317cd5 8544
a77c07d9 8545#: builtin/tag.c:452
ef317cd5 8546msgid "Tag creation options"
07432cef 8547msgstr "Tag 创建选项"
ef317cd5 8548
a77c07d9 8549#: builtin/tag.c:454
ef317cd5 8550msgid "annotated tag, needs a message"
07432cef 8551msgstr "注解 tag,需要一个说明"
ef317cd5 8552
a77c07d9 8553#: builtin/tag.c:456
ef317cd5 8554msgid "tag message"
07432cef 8555msgstr "tag 说明"
ef317cd5 8556
a77c07d9 8557#: builtin/tag.c:458
ef317cd5 8558msgid "annotated and GPG-signed tag"
07432cef 8559msgstr "注解并 GPG 签名的 tag"
ef317cd5 8560
a77c07d9 8561#: builtin/tag.c:462
ef317cd5 8562msgid "use another key to sign the tag"
07432cef 8563msgstr "使用另外的私钥签名 tag"
ef317cd5 8564
a77c07d9 8565#: builtin/tag.c:463
ef317cd5 8566msgid "replace the tag if exists"
07432cef 8567msgstr "如果存在,替换现有的 tag"
ef317cd5 8568
a77c07d9 8569#: builtin/tag.c:464
ef317cd5 8570msgid "show tag list in columns"
07432cef 8571msgstr "以列的方式显示 tag"
ef317cd5 8572
a77c07d9 8573#: builtin/tag.c:466
ef317cd5 8574msgid "Tag listing options"
07432cef 8575msgstr "Tag 列表选项"
ef317cd5 8576
a77c07d9 8577#: builtin/tag.c:469
ef317cd5 8578msgid "print only tags that contain the commit"
07432cef 8579msgstr "只打印包含提交的tags"
ef317cd5 8580
a77c07d9 8581#: builtin/tag.c:475
ef317cd5 8582msgid "print only tags of the object"
07432cef 8583msgstr "只打印tags对象"
ef317cd5 8584
a77c07d9 8585#: builtin/tag.c:504
8ada9598 8586msgid "--column and -n are incompatible"
81809b99 8587msgstr "--column 和 -n 不兼容"
8ada9598 8588
a77c07d9 8589#: builtin/tag.c:521
c04f5ac3 8590msgid "-n option is only allowed with -l."
649900bc 8591msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 8592
a77c07d9 8593#: builtin/tag.c:523
c04f5ac3 8594msgid "--contains option is only allowed with -l."
649900bc 8595msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 8596
a77c07d9 8597#: builtin/tag.c:525
7ac1c0ad 8598msgid "--points-at option is only allowed with -l."
649900bc 8599msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 8600
a77c07d9 8601#: builtin/tag.c:533
c04f5ac3
JX
8602msgid "only one -F or -m option is allowed."
8603msgstr "只允许一个 -F 或 -m 选项。"
8604
a77c07d9 8605#: builtin/tag.c:553
c04f5ac3
JX
8606msgid "too many params"
8607msgstr "太多参数"
8608
a77c07d9 8609#: builtin/tag.c:559
c04f5ac3
JX
8610#, c-format
8611msgid "'%s' is not a valid tag name."
90e6ef53 8612msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 8613
a77c07d9 8614#: builtin/tag.c:564
c04f5ac3
JX
8615#, c-format
8616msgid "tag '%s' already exists"
8617msgstr "tag '%s' 已存在"
8618
a77c07d9 8619#: builtin/tag.c:582
c04f5ac3
JX
8620#, c-format
8621msgid "%s: cannot lock the ref"
8622msgstr "%s:不能锁定引用"
8623
a77c07d9 8624#: builtin/tag.c:584
c04f5ac3
JX
8625#, c-format
8626msgid "%s: cannot update the ref"
8627msgstr "%s:不能更新引用"
8628
a77c07d9 8629#: builtin/tag.c:586
c04f5ac3
JX
8630#, c-format
8631msgid "Updated tag '%s' (was %s)\n"
8632msgstr "已更新tag '%s'(曾为 %s)\n"
8633
ef317cd5 8634#: builtin/update-index.c:401
ef317cd5 8635msgid "git update-index [options] [--] [<file>...]"
07432cef 8636msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 8637
07432cef 8638#: builtin/update-index.c:718
ef317cd5 8639msgid "continue refresh even when index needs update"
07432cef 8640msgstr "当索引需要更新时继续刷新"
8ada9598 8641
07432cef 8642#: builtin/update-index.c:721
ef317cd5 8643msgid "refresh: ignore submodules"
07432cef 8644msgstr "刷新:忽略子模组"
8ada9598 8645
07432cef 8646#: builtin/update-index.c:724
ef317cd5 8647msgid "do not ignore new files"
07432cef 8648msgstr "不忽略新的文件"
8ada9598 8649
07432cef 8650#: builtin/update-index.c:726
ef317cd5 8651msgid "let files replace directories and vice-versa"
07432cef 8652msgstr "让文件替换目录(反之亦然)"
ef317cd5 8653
07432cef 8654#: builtin/update-index.c:728
ef317cd5 8655msgid "notice files missing from worktree"
07432cef 8656msgstr "通知文件从工作区丢失"
ef317cd5 8657
07432cef 8658#: builtin/update-index.c:730
ef317cd5 8659msgid "refresh even if index contains unmerged entries"
07432cef 8660msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 8661
07432cef 8662#: builtin/update-index.c:733
ef317cd5 8663msgid "refresh stat information"
07432cef 8664msgstr "刷新统计信息"
ef317cd5 8665
07432cef 8666#: builtin/update-index.c:737
ef317cd5 8667msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 8668msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 8669
07432cef 8670#: builtin/update-index.c:741
ef317cd5 8671msgid "<mode> <object> <path>"
07432cef 8672msgstr "<mode> <object> <path>"
ef317cd5 8673
07432cef 8674#: builtin/update-index.c:742
ef317cd5 8675msgid "add the specified entry to the index"
07432cef 8676msgstr "添加指定的条目到索引区"
ef317cd5 8677
07432cef 8678#: builtin/update-index.c:746
ef317cd5 8679msgid "(+/-)x"
07432cef 8680msgstr "(+/-)x"
ef317cd5 8681
07432cef 8682#: builtin/update-index.c:747
ef317cd5 8683msgid "override the executable bit of the listed files"
07432cef 8684msgstr "覆盖列表里文件的可执行位"
ef317cd5 8685
07432cef 8686#: builtin/update-index.c:751
ef317cd5 8687msgid "mark files as \"not changing\""
07432cef 8688msgstr "把文件标记为 \"没有变更\""
ef317cd5 8689
07432cef 8690#: builtin/update-index.c:754
ef317cd5 8691msgid "clear assumed-unchanged bit"
07432cef 8692msgstr "清除 assumed-unchanged 位"
ef317cd5 8693
07432cef 8694#: builtin/update-index.c:757
ef317cd5 8695msgid "mark files as \"index-only\""
07432cef 8696msgstr "把文件标记为 \"仅索引\""
ef317cd5 8697
07432cef 8698#: builtin/update-index.c:760
ef317cd5 8699msgid "clear skip-worktree bit"
07432cef 8700msgstr "清除 skip-worktree 位"
ef317cd5 8701
07432cef 8702#: builtin/update-index.c:763
ef317cd5 8703msgid "add to index only; do not add content to object database"
07432cef 8704msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 8705
07432cef 8706#: builtin/update-index.c:765
ef317cd5 8707msgid "remove named paths even if present in worktree"
07432cef 8708msgstr "即使存在工作区里,也删除路径"
ef317cd5 8709
07432cef 8710#: builtin/update-index.c:767
ef317cd5 8711msgid "with --stdin: input lines are terminated by null bytes"
07432cef 8712msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 8713
07432cef 8714#: builtin/update-index.c:769
ef317cd5 8715msgid "read list of paths to be updated from standard input"
07432cef 8716msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 8717
07432cef 8718#: builtin/update-index.c:773
ef317cd5 8719msgid "add entries from standard input to the index"
07432cef 8720msgstr "从标准输入添加条目到索引区"
ef317cd5 8721
07432cef 8722#: builtin/update-index.c:777
ef317cd5 8723msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 8724msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 8725
07432cef 8726#: builtin/update-index.c:781
ef317cd5 8727msgid "only update entries that differ from HEAD"
07432cef 8728msgstr "只更新与 HEAD 不同的条目"
ef317cd5 8729
07432cef 8730#: builtin/update-index.c:785
ef317cd5 8731msgid "ignore files missing from worktree"
07432cef 8732msgstr "忽略工作区丢失的文件"
ef317cd5 8733
07432cef 8734#: builtin/update-index.c:788
ef317cd5 8735msgid "report actions to standard output"
07432cef 8736msgstr "在标准输出显示操作"
ef317cd5 8737
07432cef 8738#: builtin/update-index.c:790
ef317cd5 8739msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 8740msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 8741
07432cef 8742#: builtin/update-index.c:794
ef317cd5 8743msgid "write index in this format"
07432cef 8744msgstr "以这种格式写入索引区"
ef317cd5
JX
8745
8746#: builtin/update-ref.c:7
8747msgid "git update-ref [options] -d <refname> [<oldval>]"
07432cef 8748msgstr "git update-ref [options] -d <引用名> [<旧值>]"
ef317cd5
JX
8749
8750#: builtin/update-ref.c:8
8751msgid "git update-ref [options] <refname> <newval> [<oldval>]"
07432cef 8752msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
ef317cd5
JX
8753
8754#: builtin/update-ref.c:19
8755msgid "delete the reference"
07432cef 8756msgstr "删除引用"
ef317cd5
JX
8757
8758#: builtin/update-ref.c:21
8759msgid "update <refname> not the one it points to"
07432cef 8760msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5
JX
8761
8762#: builtin/update-server-info.c:6
8763msgid "git update-server-info [--force]"
07432cef 8764msgstr "git update-server-info [--force]"
ef317cd5
JX
8765
8766#: builtin/update-server-info.c:14
8767msgid "update the info files from scratch"
07432cef 8768msgstr "从头开始更新文件信息"
ef317cd5
JX
8769
8770#: builtin/verify-pack.c:56
8771msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 8772msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5
JX
8773
8774#: builtin/verify-pack.c:66
ef317cd5
JX
8775msgid "verbose"
8776msgstr "冗长输出"
8777
8778#: builtin/verify-pack.c:68
8779msgid "show statistics only"
07432cef 8780msgstr "只显示统计"
ef317cd5
JX
8781
8782#: builtin/verify-tag.c:17
8783msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 8784msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
8785
8786#: builtin/verify-tag.c:73
8787msgid "print tag contents"
07432cef 8788msgstr "打印 tag 内容"
ef317cd5
JX
8789
8790#: builtin/write-tree.c:13
8791msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 8792msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
8793
8794#: builtin/write-tree.c:26
8795msgid "<prefix>/"
07432cef 8796msgstr "<前缀>/"
ef317cd5
JX
8797
8798#: builtin/write-tree.c:27
8799msgid "write tree object for a subdirectory <prefix>"
07432cef 8800msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
8801
8802#: builtin/write-tree.c:30
8803msgid "only useful for debugging"
07432cef 8804msgstr "只对调试有用"
ef317cd5
JX
8805
8806#: git.c:16
8807msgid "See 'git help <command>' for more information on a specific command."
8808msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8ada9598
JX
8809
8810#: parse-options.h:156
8811msgid "no-op (backward compatibility)"
81809b99 8812msgstr "空操作(向后兼容)"
8ada9598 8813
07432cef 8814#: parse-options.h:232
8ada9598 8815msgid "be more verbose"
81809b99 8816msgstr "更加详细"
8ada9598 8817
07432cef 8818#: parse-options.h:234
8ada9598 8819msgid "be more quiet"
81809b99 8820msgstr "更加安静"
8ada9598 8821
07432cef 8822#: parse-options.h:240
8ada9598 8823msgid "use <n> digits to display SHA-1s"
81809b99 8824msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
8825
8826#: common-cmds.h:8
8827msgid "Add file contents to the index"
81809b99 8828msgstr "添加文件内容至索引"
8ada9598
JX
8829
8830#: common-cmds.h:9
8831msgid "Find by binary search the change that introduced a bug"
81809b99 8832msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
8833
8834#: common-cmds.h:10
8ada9598 8835msgid "List, create, or delete branches"
81809b99 8836msgstr "列出、创建或删除分支"
8ada9598
JX
8837
8838#: common-cmds.h:11
8839msgid "Checkout a branch or paths to the working tree"
81809b99 8840msgstr "检出一个分支或路径到工作区"
8ada9598
JX
8841
8842#: common-cmds.h:12
8ada9598 8843msgid "Clone a repository into a new directory"
81809b99 8844msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
8845
8846#: common-cmds.h:13
8ada9598 8847msgid "Record changes to the repository"
81809b99 8848msgstr "记录变更到版本库"
8ada9598
JX
8849
8850#: common-cmds.h:14
8851msgid "Show changes between commits, commit and working tree, etc"
81809b99 8852msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
8853
8854#: common-cmds.h:15
8855msgid "Download objects and refs from another repository"
81809b99 8856msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
8857
8858#: common-cmds.h:16
8859msgid "Print lines matching a pattern"
81809b99 8860msgstr "输出和模式匹配的行"
8ada9598
JX
8861
8862#: common-cmds.h:17
a77c07d9
JX
8863msgid "Create an empty Git repository or reinitialize an existing one"
8864msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598
JX
8865
8866#: common-cmds.h:18
8ada9598 8867msgid "Show commit logs"
81809b99 8868msgstr "显示提交日志"
8ada9598
JX
8869
8870#: common-cmds.h:19
8871msgid "Join two or more development histories together"
81809b99 8872msgstr "合并两个或更多开发历史"
8ada9598
JX
8873
8874#: common-cmds.h:20
8875msgid "Move or rename a file, a directory, or a symlink"
81809b99 8876msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
8877
8878#: common-cmds.h:21
8879msgid "Fetch from and merge with another repository or a local branch"
81809b99 8880msgstr "获取并合并另外的版本库或一个本地分支"
8ada9598
JX
8881
8882#: common-cmds.h:22
8883msgid "Update remote refs along with associated objects"
81809b99 8884msgstr "更新远程引用和相关的对象"
8ada9598
JX
8885
8886#: common-cmds.h:23
8887msgid "Forward-port local commits to the updated upstream head"
81809b99 8888msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
8889
8890#: common-cmds.h:24
8891msgid "Reset current HEAD to the specified state"
81809b99 8892msgstr "重置当前HEAD到指定状态"
8ada9598
JX
8893
8894#: common-cmds.h:25
8895msgid "Remove files from the working tree and from the index"
81809b99 8896msgstr "从工作区和索引中删除文件"
8ada9598
JX
8897
8898#: common-cmds.h:26
8899msgid "Show various types of objects"
81809b99 8900msgstr "显示各种类型的对象"
8ada9598
JX
8901
8902#: common-cmds.h:27
8ada9598 8903msgid "Show the working tree status"
81809b99 8904msgstr "显示工作区状态"
8ada9598
JX
8905
8906#: common-cmds.h:28
8907msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 8908msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 8909
170e9899 8910#: git-am.sh:50
c04f5ac3
JX
8911msgid "You need to set your committer info first"
8912msgstr "您需要先设置你的提交者信息"
8913
b694fbb1
JX
8914#: git-am.sh:95
8915msgid ""
8916"You seem to have moved HEAD since the last 'am' failure.\n"
8917"Not rewinding to ORIG_HEAD"
6792b93b 8918msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1
JX
8919
8920#: git-am.sh:105
8921#, sh-format
8922msgid ""
649900bc
JX
8923"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8924"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8925"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1
JX
8926msgstr ""
8927"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8928"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8929"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8930
8931#: git-am.sh:121
8932msgid "Cannot fall back to three-way merge."
8933msgstr "无法求助于三路合并。"
8934
170e9899 8935#: git-am.sh:137
c04f5ac3 8936msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 8937msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc
JX
8938
8939#: git-am.sh:139
8940msgid "Using index info to reconstruct a base tree..."
63af42fe 8941msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 8942
170e9899 8943#: git-am.sh:154
c04f5ac3
JX
8944msgid ""
8945"Did you hand edit your patch?\n"
8946"It does not apply to blobs recorded in its index."
8947msgstr ""
8948"您是否曾手动编辑过您的补丁?\n"
07432cef 8949"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 8950
170e9899 8951#: git-am.sh:163
c04f5ac3 8952msgid "Falling back to patching base and 3-way merge..."
b694fbb1 8953msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 8954
649900bc
JX
8955#: git-am.sh:179
8956msgid "Failed to merge in the changes."
8957msgstr "无法合并变更。"
8958
8959#: git-am.sh:274
c04f5ac3
JX
8960msgid "Only one StGIT patch series can be applied at once"
8961msgstr "一次只能有一个 StGIT 补丁队列被应用"
8962
649900bc 8963#: git-am.sh:361
c04f5ac3
JX
8964#, sh-format
8965msgid "Patch format $patch_format is not supported."
8966msgstr "不支持 $patch_format 补丁格式。"
8967
649900bc 8968#: git-am.sh:363
c04f5ac3
JX
8969msgid "Patch format detection failed."
8970msgstr "补丁格式检测失败。"
8971
649900bc
JX
8972#: git-am.sh:389
8973msgid ""
8974"The -b/--binary option has been a no-op for long time, and\n"
8975"it will be removed. Please do not use it anymore."
8976msgstr ""
8977"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8978"请不要再使用它了。"
c04f5ac3 8979
649900bc 8980#: git-am.sh:477
c04f5ac3
JX
8981#, sh-format
8982msgid "previous rebase directory $dotest still exists but mbox given."
8983msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8984
649900bc 8985#: git-am.sh:482
c04f5ac3
JX
8986msgid "Please make up your mind. --skip or --abort?"
8987msgstr "请下决心。--skip 或是 --abort ?"
8988
649900bc 8989#: git-am.sh:509
c04f5ac3
JX
8990msgid "Resolve operation not in progress, we are not resuming."
8991msgstr "解决操作未进行,我们不会继续。"
8992
649900bc 8993#: git-am.sh:575
c04f5ac3
JX
8994#, sh-format
8995msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 8996msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 8997
649900bc 8998#: git-am.sh:679
b694fbb1
JX
8999#, sh-format
9000msgid ""
9001"Patch is empty. Was it split wrong?\n"
9002"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9003"To restore the original branch and stop patching run \"$cmdline --abort\"."
9004msgstr ""
9005"补丁为空。是不是切分错误?\n"
9006"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9007"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9008
649900bc 9009#: git-am.sh:706
b694fbb1
JX
9010msgid "Patch does not have a valid e-mail address."
9011msgstr "补丁中没有一个有效的邮件地址。"
9012
649900bc 9013#: git-am.sh:753
c04f5ac3 9014msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 9015msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 9016
649900bc 9017#: git-am.sh:757
b694fbb1
JX
9018msgid "Commit Body is:"
9019msgstr "提交内容为:"
9020
90e6ef53 9021# 译者:注意保持句尾空格
c04f5ac3
JX
9022#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9023#. in your translation. The program will only accept English
9024#. input at this point.
649900bc 9025#: git-am.sh:764
c04f5ac3
JX
9026msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9027msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9028
649900bc 9029#: git-am.sh:800
c04f5ac3
JX
9030#, sh-format
9031msgid "Applying: $FIRSTLINE"
9032msgstr "正应用:$FIRSTLINE"
9033
649900bc 9034#: git-am.sh:821
b694fbb1
JX
9035msgid ""
9036"No changes - did you forget to use 'git add'?\n"
9037"If there is nothing left to stage, chances are that something else\n"
9038"already introduced the same changes; you might want to skip this patch."
9039msgstr ""
9040"没有变更 —— 您是不是忘了执行 'git add'?\n"
9041"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9042"您也许想要跳过这个补丁。"
9043
649900bc 9044#: git-am.sh:829
b694fbb1
JX
9045msgid ""
9046"You still have unmerged paths in your index\n"
9047"did you forget to use 'git add'?"
6792b93b 9048msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 9049
649900bc 9050#: git-am.sh:845
c04f5ac3 9051msgid "No changes -- Patch already applied."
63af42fe 9052msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 9053
649900bc 9054#: git-am.sh:855
b694fbb1
JX
9055#, sh-format
9056msgid "Patch failed at $msgnum $FIRSTLINE"
9057msgstr "补丁失败于 $msgnum $FIRSTLINE"
9058
ef317cd5
JX
9059#: git-am.sh:858
9060#, sh-format
9061msgid ""
9062"The copy of the patch that failed is found in:\n"
9063" $dotest/patch"
9064msgstr ""
07432cef
WS
9065"失败的补丁文件副本位于:\n"
9066" $dotest/patch"
ef317cd5 9067
649900bc 9068#: git-am.sh:876
c04f5ac3
JX
9069msgid "applying to an empty history"
9070msgstr "正应用到一个空历史上"
9071
b694fbb1
JX
9072#: git-bisect.sh:48
9073msgid "You need to start by \"git bisect start\""
9074msgstr "您需要执行 \"git bisect start\" 来开始"
9075
90e6ef53 9076# 译者:注意保持句尾空格
c04f5ac3
JX
9077#. TRANSLATORS: Make sure to include [Y] and [n] in your
9078#. translation. The program will only accept English input
9079#. at this point.
9080#: git-bisect.sh:54
9081msgid "Do you want me to do it for you [Y/n]? "
9082msgstr "您想让我为您这样做么[Y/n]? "
9083
9084#: git-bisect.sh:95
9085#, sh-format
9086msgid "unrecognised option: '$arg'"
81809b99 9087msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
9088
9089#: git-bisect.sh:99
9090#, sh-format
9091msgid "'$arg' does not appear to be a valid revision"
9092msgstr "'$arg' 看起来不像是一个有效的版本"
9093
9094#: git-bisect.sh:117
9095msgid "Bad HEAD - I need a HEAD"
9096msgstr "坏的 HEAD - 我需要一个 HEAD"
9097
9098#: git-bisect.sh:130
9099#, sh-format
9100msgid ""
9101"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9102msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9103
9104#: git-bisect.sh:140
9105msgid "won't bisect on seeked tree"
9106msgstr "不会在已查找过的树上二分查找"
9107
9108#: git-bisect.sh:144
9109msgid "Bad HEAD - strange symbolic ref"
90e6ef53 9110msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
9111
9112#: git-bisect.sh:189
9113#, sh-format
9114msgid "Bad bisect_write argument: $state"
90e6ef53 9115msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
9116
9117#: git-bisect.sh:218
9118#, sh-format
9119msgid "Bad rev input: $arg"
90e6ef53 9120msgstr "输入坏的版本:$arg"
c04f5ac3
JX
9121
9122#: git-bisect.sh:232
9123msgid "Please call 'bisect_state' with at least one argument."
9124msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9125
9126#: git-bisect.sh:244
9127#, sh-format
9128msgid "Bad rev input: $rev"
9129msgstr "输入坏的版本:$rev"
9130
9131#: git-bisect.sh:250
9132msgid "'git bisect bad' can take only one argument."
9133msgstr "'git bisect bad' 只能带一个参数。"
9134
b694fbb1
JX
9135#. have bad but not good. we could bisect although
9136#. this is less optimum.
9137#: git-bisect.sh:273
9138msgid "Warning: bisecting only with a bad commit."
9139msgstr "警告:在仅有一个坏提交下进行二分查找。"
9140
90e6ef53 9141# 译者:注意保持句尾空格
c04f5ac3
JX
9142#. TRANSLATORS: Make sure to include [Y] and [n] in your
9143#. translation. The program will only accept English input
9144#. at this point.
9145#: git-bisect.sh:279
9146msgid "Are you sure [Y/n]? "
9147msgstr "您确认么[Y/n]? "
9148
b694fbb1
JX
9149#: git-bisect.sh:289
9150msgid ""
9151"You need to give me at least one good and one bad revisions.\n"
9152"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9153msgstr ""
9154"您需要给我至少一个好版本和一个坏版本。\n"
9155"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9156
9157#: git-bisect.sh:292
9158msgid ""
9159"You need to start by \"git bisect start\".\n"
9160"You then need to give me at least one good and one bad revisions.\n"
9161"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9162msgstr ""
9163"您需要执行 \"git bisect start\" 来开始。\n"
9164"然后需要提供我至少一个好版本和一个坏版本。\n"
9165"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9166
9167#: git-bisect.sh:347 git-bisect.sh:474
9168msgid "We are not bisecting."
9169msgstr "我们没有在二分查找。"
9170
c04f5ac3
JX
9171#: git-bisect.sh:354
9172#, sh-format
9173msgid "'$invalid' is not a valid commit"
9174msgstr "'$invalid' 不是一个有效的提交"
9175
9176#: git-bisect.sh:363
9177#, sh-format
9178msgid ""
9179"Could not check out original HEAD '$branch'.\n"
9180"Try 'git bisect reset <commit>'."
9181msgstr ""
9182"不能检出原始 HEAD '$branch'。\n"
07432cef 9183"尝试 'git bisect reset <提交>'。"
c04f5ac3
JX
9184
9185#: git-bisect.sh:390
9186msgid "No logfile given"
9187msgstr "未提供日志文件"
9188
9189#: git-bisect.sh:391
9190#, sh-format
9191msgid "cannot read $file for replaying"
9192msgstr "不能读取 $file 来重放"
9193
9194#: git-bisect.sh:408
9195msgid "?? what are you talking about?"
9196msgstr "?? 您在说什么?"
9197
b694fbb1
JX
9198#: git-bisect.sh:420
9199#, sh-format
9200msgid "running $command"
9201msgstr "运行 $command"
9202
9203#: git-bisect.sh:427
9204#, sh-format
9205msgid ""
9206"bisect run failed:\n"
9207"exit code $res from '$command' is < 0 or >= 128"
9208msgstr ""
9209"二分查找运行失败:\n"
07432cef 9210"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1
JX
9211
9212#: git-bisect.sh:453
9213msgid "bisect run cannot continue any more"
9214msgstr "二分查找不能继续运行"
9215
9216#: git-bisect.sh:459
9217#, sh-format
9218msgid ""
9219"bisect run failed:\n"
9220"'bisect_state $state' exited with error code $res"
9221msgstr ""
9222"二分查找运行失败:\n"
9223"'bisect_state $state' 退出码为 $res"
9224
9225#: git-bisect.sh:466
9226msgid "bisect run success"
9227msgstr "二分查找运行成功"
c04f5ac3
JX
9228
9229#: git-pull.sh:21
9230msgid ""
9231"Pull is not possible because you have unmerged files.\n"
9232"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9233"as appropriate to mark resolution, or use 'git commit -a'."
9234msgstr ""
90e6ef53 9235"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 9236"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 9237"或者使用 'git commit -a'。"
c04f5ac3
JX
9238
9239#: git-pull.sh:25
9240msgid "Pull is not possible because you have unmerged files."
90e6ef53 9241msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 9242
1003b3a5 9243#: git-pull.sh:203
c04f5ac3 9244msgid "updating an unborn branch with changes added to the index"
90e6ef53 9245msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 9246
b694fbb1
JX
9247#. The fetch involved updating the current branch.
9248#. The working tree and the index file is still based on the
9249#. $orig_head commit, but we are merging into $curr_head.
9250#. First update the working tree to match $curr_head.
1003b3a5 9251#: git-pull.sh:235
b694fbb1
JX
9252#, sh-format
9253msgid ""
9254"Warning: fetch updated the current branch head.\n"
9255"Warning: fast-forwarding your working tree from\n"
9256"Warning: commit $orig_head."
9257msgstr ""
9258"警告:fetch 更新了当前的分支。您的工作区\n"
9259"警告:从原提交 $orig_head 快进。"
9260
1003b3a5 9261#: git-pull.sh:260
c04f5ac3
JX
9262msgid "Cannot merge multiple branches into empty head"
9263msgstr "无法将多个分支合并到空分支"
9264
1003b3a5 9265#: git-pull.sh:264
c04f5ac3
JX
9266msgid "Cannot rebase onto multiple branches"
9267msgstr "无法变基到多个分支"
9268
07432cef 9269#: git-rebase.sh:53
649900bc
JX
9270msgid ""
9271"When you have resolved this problem, run \"git rebase --continue\".\n"
9272"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9273"To check out the original branch and stop rebasing, run \"git rebase --abort"
9274"\"."
9275msgstr ""
9276"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9277"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9278"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9279
07432cef 9280#: git-rebase.sh:160
649900bc
JX
9281msgid "The pre-rebase hook refused to rebase."
9282msgstr "钩子 pre-rebase 拒绝变基。"
9283
07432cef 9284#: git-rebase.sh:165
649900bc
JX
9285msgid "It looks like git-am is in progress. Cannot rebase."
9286msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9287
07432cef 9288#: git-rebase.sh:296
649900bc
JX
9289msgid "The --exec option must be used with the --interactive option"
9290msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9291
07432cef 9292#: git-rebase.sh:301
649900bc
JX
9293msgid "No rebase in progress?"
9294msgstr "没有正在进行的变基?"
9295
07432cef
WS
9296#: git-rebase.sh:312
9297msgid "The --edit-todo action can only be used during interactive rebase."
9298msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9299
9300#: git-rebase.sh:319
649900bc
JX
9301msgid "Cannot read HEAD"
9302msgstr "不能读取 HEAD"
9303
07432cef 9304#: git-rebase.sh:322
649900bc
JX
9305msgid ""
9306"You must edit all merge conflicts and then\n"
9307"mark them as resolved using git add"
9308msgstr ""
9309"您必须编辑所有的合并冲突,然后通过 git add\n"
9310"命令将它们标记为已解决"
9311
07432cef 9312#: git-rebase.sh:340
649900bc
JX
9313#, sh-format
9314msgid "Could not move back to $head_name"
9315msgstr "无法移回 $head_name"
9316
07432cef 9317#: git-rebase.sh:359
649900bc
JX
9318#, sh-format
9319msgid ""
9320"It seems that there is already a $state_dir_base directory, and\n"
9321"I wonder if you are in the middle of another rebase. If that is the\n"
9322"case, please try\n"
9323"\t$cmd_live_rebase\n"
9324"If that is not the case, please\n"
9325"\t$cmd_clear_stale_rebase\n"
9326"and run me again. I am stopping in case you still have something\n"
9327"valuable there."
9328msgstr ""
9329"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9330"如果是这样,请尝试执行\n"
9331"\t$cmd_live_rebase\n"
9332"如果不是这样,请执行\n"
9333"\t$cmd_clear_stale_rebase\n"
9334"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9335
07432cef 9336#: git-rebase.sh:404
649900bc
JX
9337#, sh-format
9338msgid "invalid upstream $upstream_name"
9339msgstr "无效的上游 $upstream_name"
9340
07432cef 9341#: git-rebase.sh:428
649900bc
JX
9342#, sh-format
9343msgid "$onto_name: there are more than one merge bases"
9344msgstr "$onto_name: 有一个以上的合并基准"
9345
07432cef 9346#: git-rebase.sh:431 git-rebase.sh:435
649900bc
JX
9347#, sh-format
9348msgid "$onto_name: there is no merge base"
9349msgstr "$onto_name: 没有合并基准"
9350
07432cef 9351#: git-rebase.sh:440
649900bc
JX
9352#, sh-format
9353msgid "Does not point to a valid commit: $onto_name"
9354msgstr "没有指向一个有效的提交:$onto_name"
9355
07432cef 9356#: git-rebase.sh:463
649900bc
JX
9357#, sh-format
9358msgid "fatal: no such branch: $branch_name"
9359msgstr "严重错误:无此分支:$branch_name"
9360
07432cef 9361#: git-rebase.sh:483
649900bc
JX
9362msgid "Please commit or stash them."
9363msgstr "请提交或为它们保存进度。"
9364
07432cef 9365#: git-rebase.sh:501
649900bc
JX
9366#, sh-format
9367msgid "Current branch $branch_name is up to date."
9368msgstr "当前分支 $branch_name 是最新的。"
9369
07432cef 9370#: git-rebase.sh:504
649900bc
JX
9371#, sh-format
9372msgid "Current branch $branch_name is up to date, rebase forced."
9373msgstr "当前分支 $branch_name 是最新的,强制变基。"
9374
07432cef 9375#: git-rebase.sh:515
649900bc
JX
9376#, sh-format
9377msgid "Changes from $mb to $onto:"
9378msgstr "变更从 $mb 到 $onto:"
9379
9380#. Detach HEAD and reset the tree
07432cef 9381#: git-rebase.sh:524
649900bc
JX
9382msgid "First, rewinding head to replay your work on top of it..."
9383msgstr "首先,重置头指针以便在上面重放您的工作..."
9384
07432cef 9385#: git-rebase.sh:532
649900bc
JX
9386#, sh-format
9387msgid "Fast-forwarded $branch_name to $onto_name."
9388msgstr "快进 $branch_name 至 $onto_name。"
9389
c04f5ac3
JX
9390#: git-stash.sh:51
9391msgid "git stash clear with parameters is unimplemented"
9392msgstr "git stash clear 不支持参数"
9393
9394#: git-stash.sh:74
9395msgid "You do not have the initial commit yet"
9396msgstr "您尚未建立初始提交"
9397
9398#: git-stash.sh:89
9399msgid "Cannot save the current index state"
90e6ef53 9400msgstr "无法保存当前索引状态"
c04f5ac3
JX
9401
9402#: git-stash.sh:123 git-stash.sh:136
9403msgid "Cannot save the current worktree state"
9404msgstr "无法保存当前工作区状态"
9405
9406#: git-stash.sh:140
9407msgid "No changes selected"
90e6ef53 9408msgstr "没有选择变更"
c04f5ac3
JX
9409
9410#: git-stash.sh:143
9411msgid "Cannot remove temporary index (can't happen)"
90e6ef53 9412msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
9413
9414#: git-stash.sh:156
9415msgid "Cannot record working tree state"
9416msgstr "不能记录工作区状态"
9417
b694fbb1
JX
9418#. TRANSLATORS: $option is an invalid option, like
9419#. `--blah-blah'. The 7 spaces at the beginning of the
9420#. second line correspond to "error: ". So you should line
9421#. up the second line with however many characters the
9422#. translation of "error: " takes in your language. E.g. in
9423#. English this is:
9424#.
9425#. $ git stash save --blah-blah 2>&1 | head -n 2
9426#. error: unknown option for 'stash save': --blah-blah
9427#. To provide a message, use git stash save -- '--blah-blah'
9428#: git-stash.sh:202
9429#, sh-format
9430msgid ""
9431"error: unknown option for 'stash save': $option\n"
9432" To provide a message, use git stash save -- '$option'"
9433msgstr ""
9434"错误:'stash save' 的未知选项:$option\n"
9435" 要提供一个描述信息,使用 git stash save -- '$option'"
9436
c04f5ac3
JX
9437#: git-stash.sh:223
9438msgid "No local changes to save"
9439msgstr "没有要保存的本地修改"
9440
9441#: git-stash.sh:227
9442msgid "Cannot initialize stash"
90e6ef53 9443msgstr "无法初始化 stash"
c04f5ac3
JX
9444
9445#: git-stash.sh:235
9446msgid "Cannot save the current status"
9447msgstr "无法保存当前状态"
9448
9449#: git-stash.sh:253
9450msgid "Cannot remove worktree changes"
9451msgstr "无法删除工作区变更"
9452
9453#: git-stash.sh:352
9454msgid "No stash found."
90e6ef53 9455msgstr "未发现 stash。"
c04f5ac3
JX
9456
9457#: git-stash.sh:359
9458#, sh-format
9459msgid "Too many revisions specified: $REV"
90e6ef53 9460msgstr "指定了太多的版本:$REV"
c04f5ac3
JX
9461
9462#: git-stash.sh:365
9463#, sh-format
9464msgid "$reference is not valid reference"
9465msgstr "$reference 不是有效的引用"
9466
9467#: git-stash.sh:393
9468#, sh-format
9469msgid "'$args' is not a stash-like commit"
90e6ef53 9470msgstr "'$args' 不是 stash 样提交"
c04f5ac3
JX
9471
9472#: git-stash.sh:404
9473#, sh-format
9474msgid "'$args' is not a stash reference"
90e6ef53 9475msgstr "'$args' 不是一个 stash 引用"
c04f5ac3
JX
9476
9477#: git-stash.sh:412
9478msgid "unable to refresh index"
90e6ef53 9479msgstr "无法刷新索引"
c04f5ac3
JX
9480
9481#: git-stash.sh:416
9482msgid "Cannot apply a stash in the middle of a merge"
9483msgstr "无法在合并过程中恢复进度"
9484
9485#: git-stash.sh:424
9486msgid "Conflicts in index. Try without --index."
90e6ef53 9487msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3
JX
9488
9489#: git-stash.sh:426
9490msgid "Could not save index tree"
90e6ef53 9491msgstr "不能保存索引树"
c04f5ac3
JX
9492
9493#: git-stash.sh:460
9494msgid "Cannot unstage modified files"
9495msgstr "无法还原修改的文件"
9496
ef317cd5 9497#: git-stash.sh:475
b694fbb1
JX
9498msgid "Index was not unstashed."
9499msgstr "索引的进度没有被恢复。"
9500
ef317cd5 9501#: git-stash.sh:492
c04f5ac3
JX
9502#, sh-format
9503msgid "Dropped ${REV} ($s)"
9504msgstr "丢弃了 ${REV} ($s)"
9505
ef317cd5 9506#: git-stash.sh:493
c04f5ac3
JX
9507#, sh-format
9508msgid "${REV}: Could not drop stash entry"
90e6ef53 9509msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 9510
ef317cd5 9511#: git-stash.sh:500
c04f5ac3
JX
9512msgid "No branch name specified"
9513msgstr "未指定分支名"
9514
ef317cd5 9515#: git-stash.sh:571
c04f5ac3
JX
9516msgid "(To restore them type \"git stash apply\")"
9517msgstr "(为恢复数据输入 \"git stash apply\")"
9518
1003b3a5 9519#: git-submodule.sh:91
c04f5ac3
JX
9520#, sh-format
9521msgid "cannot strip one component off url '$remoteurl'"
9522msgstr "无法从 url '$remoteurl' 剥离一个组件"
9523
1003b3a5 9524#: git-submodule.sh:196
c04f5ac3 9525#, sh-format
170e9899
JX
9526msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9527msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 9528
1003b3a5 9529#: git-submodule.sh:239
c04f5ac3 9530#, sh-format
170e9899
JX
9531msgid "Clone of '$url' into submodule path '$sm_path' failed"
9532msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 9533
1003b3a5 9534#: git-submodule.sh:251
dac1de7d
JX
9535#, sh-format
9536msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 9537msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 9538
1003b3a5 9539#: git-submodule.sh:349
c04f5ac3
JX
9540#, sh-format
9541msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9542msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9543
1003b3a5 9544#: git-submodule.sh:366
c04f5ac3 9545#, sh-format
170e9899
JX
9546msgid "'$sm_path' already exists in the index"
9547msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 9548
1003b3a5 9549#: git-submodule.sh:370
b694fbb1
JX
9550#, sh-format
9551msgid ""
9552"The following path is ignored by one of your .gitignore files:\n"
9553"$sm_path\n"
9554"Use -f if you really want to add it."
9555msgstr ""
9556"以下路径被您的一个 .gitignore 文件所忽略:\n"
9557"$sm_path\n"
9558"如果您确实想添加它,使用 -f 参数。"
9559
1003b3a5 9560#: git-submodule.sh:388
b694fbb1
JX
9561#, sh-format
9562msgid "Adding existing repo at '$sm_path' to the index"
9563msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9564
1003b3a5 9565#: git-submodule.sh:390
c04f5ac3 9566#, sh-format
170e9899
JX
9567msgid "'$sm_path' already exists and is not a valid git repo"
9568msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 9569
1003b3a5 9570#: git-submodule.sh:398
07432cef
WS
9571#, sh-format
9572msgid "A git directory for '$sm_name' is found locally with remote(s):"
9573msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9574
1003b3a5 9575#: git-submodule.sh:400
07432cef
WS
9576#, sh-format
9577msgid ""
9578"If you want to reuse this local git directory instead of cloning again from"
9579msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9580
1003b3a5 9581#: git-submodule.sh:402
07432cef
WS
9582#, sh-format
9583msgid ""
9584"use the '--force' option. If the local git directory is not the correct repo"
9585msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9586
1003b3a5 9587#: git-submodule.sh:403
07432cef
WS
9588#, sh-format
9589msgid ""
9590"or you are unsure what this means choose another name with the '--name' "
9591"option."
9592msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9593
1003b3a5 9594#: git-submodule.sh:405
07432cef
WS
9595#, sh-format
9596msgid "Reactivating local git directory for submodule '$sm_name'."
9597msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9598
1003b3a5 9599#: git-submodule.sh:417
c04f5ac3 9600#, sh-format
170e9899
JX
9601msgid "Unable to checkout submodule '$sm_path'"
9602msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 9603
1003b3a5 9604#: git-submodule.sh:422
c04f5ac3 9605#, sh-format
170e9899
JX
9606msgid "Failed to add submodule '$sm_path'"
9607msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 9608
1003b3a5 9609#: git-submodule.sh:431
c04f5ac3 9610#, sh-format
170e9899
JX
9611msgid "Failed to register submodule '$sm_path'"
9612msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 9613
1003b3a5 9614#: git-submodule.sh:474
c04f5ac3 9615#, sh-format
170e9899
JX
9616msgid "Entering '$prefix$sm_path'"
9617msgstr "正在进入 '$prefix$sm_path'"
c04f5ac3 9618
1003b3a5 9619#: git-submodule.sh:488
c04f5ac3 9620#, sh-format
170e9899
JX
9621msgid "Stopping at '$sm_path'; script returned non-zero status."
9622msgstr "停止于 '$sm_path',脚本返回非零值。"
c04f5ac3 9623
1003b3a5 9624#: git-submodule.sh:532
c04f5ac3 9625#, sh-format
170e9899
JX
9626msgid "No url found for submodule path '$sm_path' in .gitmodules"
9627msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
c04f5ac3 9628
1003b3a5 9629#: git-submodule.sh:541
c04f5ac3 9630#, sh-format
170e9899
JX
9631msgid "Failed to register url for submodule path '$sm_path'"
9632msgstr "无法为子模组路径 '$sm_path' 注册 url"
c04f5ac3 9633
1003b3a5 9634#: git-submodule.sh:543
c04f5ac3 9635#, sh-format
170e9899
JX
9636msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9637msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
c04f5ac3 9638
1003b3a5 9639#: git-submodule.sh:551
d691f479
JX
9640#, sh-format
9641msgid "Failed to register update mode for submodule path '$sm_path'"
9642msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9643
1003b3a5
JX
9644#: git-submodule.sh:588
9645#, sh-format
9646msgid "Use '.' if you really want to deinitialize all submodules"
9647msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
9648
9649#: git-submodule.sh:603
9650#, sh-format
9651msgid "Submodule work tree '$sm_path' contains a .git directory"
9652msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录"
9653
9654#: git-submodule.sh:604
9655#, sh-format
9656msgid ""
9657"(use 'rm -rf' if you really want to remove it including all of its history)"
9658msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9659
9660#: git-submodule.sh:610
c04f5ac3
JX
9661#, sh-format
9662msgid ""
1003b3a5
JX
9663"Submodule work tree '$sm_path' contains local modifications; use '-f' to "
9664"discard them"
9665msgstr "子模组工作区 '$sm_path' 包含本地修改;使用 '-f' 丢弃它们"
9666
9667#: git-submodule.sh:613
9668#, sh-format
9669msgid "Cleared directory '$sm_path'"
9670msgstr "已清除目录 '$sm_path'"
9671
9672#: git-submodule.sh:614
9673#, sh-format
9674msgid "Could not remove submodule work tree '$sm_path'"
9675msgstr "无法移除子模组工作区 '$sm_path'"
9676
9677#: git-submodule.sh:617
9678#, sh-format
9679msgid "Could not create empty submodule directory '$sm_path'"
9680msgstr "不能创建空的子模组目录 '$sm_path'"
9681
9682#: git-submodule.sh:626
9683#, sh-format
9684msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
9685msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册"
9686
9687#: git-submodule.sh:731
9688#, sh-format
9689msgid ""
9690"Submodule path '$prefix$sm_path' not initialized\n"
c04f5ac3
JX
9691"Maybe you want to use 'update --init'?"
9692msgstr ""
1003b3a5 9693"子模组路径 '$prefix$sm_path' 没有初始化\n"
90e6ef53 9694"也许您想用 'update --init'?"
c04f5ac3 9695
1003b3a5 9696#: git-submodule.sh:744
c04f5ac3 9697#, sh-format
1003b3a5
JX
9698msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
9699msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本"
c04f5ac3 9700
1003b3a5 9701#: git-submodule.sh:753
c04f5ac3 9702#, sh-format
170e9899
JX
9703msgid "Unable to fetch in submodule path '$sm_path'"
9704msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 9705
1003b3a5 9706#: git-submodule.sh:777
c04f5ac3 9707#, sh-format
1003b3a5
JX
9708msgid "Unable to fetch in submodule path '$prefix$sm_path'"
9709msgstr "无法在子模组路径 '$prefix$sm_path' 中获取"
c04f5ac3 9710
1003b3a5 9711#: git-submodule.sh:791
c04f5ac3 9712#, sh-format
1003b3a5
JX
9713msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
9714msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'"
c04f5ac3 9715
1003b3a5 9716#: git-submodule.sh:792
c04f5ac3 9717#, sh-format
1003b3a5
JX
9718msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
9719msgstr "子模组路径 '$prefix$sm_path':变基至 '$sha1'"
c04f5ac3 9720
1003b3a5 9721#: git-submodule.sh:797
c04f5ac3 9722#, sh-format
1003b3a5
JX
9723msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
9724msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中"
c04f5ac3 9725
1003b3a5 9726#: git-submodule.sh:798
c04f5ac3 9727#, sh-format
1003b3a5
JX
9728msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
9729msgstr "子模组路径 '$prefix$sm_path':已合并入 '$sha1'"
c04f5ac3 9730
1003b3a5 9731#: git-submodule.sh:803
c04f5ac3 9732#, sh-format
1003b3a5
JX
9733msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
9734msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'"
c04f5ac3 9735
1003b3a5 9736#: git-submodule.sh:804
c04f5ac3 9737#, sh-format
1003b3a5
JX
9738msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
9739msgstr "子模组路径 '$prefix$sm_path':检出 '$sha1'"
9740
9741#: git-submodule.sh:831
9742#, sh-format
9743msgid "Failed to recurse into submodule path '$prefix$sm_path'"
9744msgstr "无法递归进子模组路径 '$prefix$sm_path'"
c04f5ac3 9745
1003b3a5 9746#: git-submodule.sh:939
649900bc
JX
9747msgid "The --cached option cannot be used with the --files option"
9748msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1
JX
9749
9750#. unexpected type
1003b3a5 9751#: git-submodule.sh:979
b694fbb1
JX
9752#, sh-format
9753msgid "unexpected mode $mod_dst"
9754msgstr "意外的模式 $mod_dst"
c04f5ac3 9755
90e6ef53 9756# 译者:注意保持前导空格
1003b3a5 9757#: git-submodule.sh:997
c04f5ac3
JX
9758#, sh-format
9759msgid " Warn: $name doesn't contain commit $sha1_src"
9760msgstr " 警告:$name 未包含提交 $sha1_src"
9761
90e6ef53 9762# 译者:注意保持前导空格
1003b3a5 9763#: git-submodule.sh:1000
c04f5ac3
JX
9764#, sh-format
9765msgid " Warn: $name doesn't contain commit $sha1_dst"
9766msgstr " 警告:$name 未包含提交 $sha1_dst"
9767
90e6ef53 9768# 译者:注意保持前导空格
1003b3a5 9769#: git-submodule.sh:1003
c04f5ac3
JX
9770#, sh-format
9771msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9772msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9773
1003b3a5 9774#: git-submodule.sh:1028
c04f5ac3 9775msgid "blob"
07432cef 9776msgstr "数据对象"
c04f5ac3 9777
1003b3a5 9778#: git-submodule.sh:1066
a77c07d9
JX
9779msgid "Submodules changed but not updated:"
9780msgstr "子模组已修改但尚未更新:"
b694fbb1 9781
1003b3a5 9782#: git-submodule.sh:1068
a77c07d9 9783msgid "Submodule changes to be committed:"
b694fbb1
JX
9784msgstr "要提交的子模组变更:"
9785
1003b3a5
JX
9786#: git-submodule.sh:1153
9787#, sh-format
9788msgid "Failed to recurse into submodule path '$sm_path'"
9789msgstr "无法递归进子模组路径 '$sm_path'"
9790
9791#: git-submodule.sh:1216
c04f5ac3 9792#, sh-format
07432cef
WS
9793msgid "Synchronizing submodule url for '$prefix$sm_path'"
9794msgstr "为 '$prefix$sm_path' 同步子模组 url"
9795
1003b3a5
JX
9796#, fuzzy
9797#~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'"
9798#~ msgstr "为 '$prefix$sm_path' 同步子模组 url"
9799
9800#~ msgid "use any ref in .git/refs"
9801#~ msgstr "使用 .git/refs 里的任意引用"
9802
9803#~ msgid "use any tag in .git/refs/tags"
9804#~ msgstr "使用 .git/refs/tags 里的任意 tag"
9805
9806#~ msgid "bad object %s"
9807#~ msgstr "坏对象 %s"
9808
9809#~ msgid "bogus committer info %s"
9810#~ msgstr "虚假的提交者信息 %s"
9811
a77c07d9
JX
9812#~ msgid "can't fdopen 'show' output fd"
9813#~ msgstr "不能打开 'show' 输出文件句柄"
9814
9815#~ msgid "failed to close pipe to 'show' for object '%s'"
9816#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9817
07432cef
WS
9818#~ msgid " 0 files changed"
9819#~ msgstr " 0 个文件被修改"
9820
9821#~ msgid " %d file changed"
9822#~ msgid_plural " %d files changed"
9823#~ msgstr[0] " %d 个文件被修改"
9824#~ msgstr[1] " %d 个文件被修改"
9825
9826#~ msgid ", %d insertion(+)"
9827#~ msgid_plural ", %d insertions(+)"
9828#~ msgstr[0] ",插入 %d 行(+)"
9829#~ msgstr[1] ",插入 %d 行(+)"
9830
9831#~ msgid ", %d deletion(-)"
9832#~ msgid_plural ", %d deletions(-)"
9833#~ msgstr[0] ",删除 %d 行(-)"
9834#~ msgstr[1] ",删除 %d 行(-)"
9835
9836#~ msgid "You do not have a valid HEAD"
9837#~ msgstr "您没有一个有效的 HEAD"
9838
9839#~ msgid "oops"
9840#~ msgstr "哎哟"
9841
9842#~ msgid "Would not remove %s\n"
9843#~ msgstr "不会删除 %s\n"
9844
9845#~ msgid "Not removing %s\n"
9846#~ msgstr "未删除 %s\n"
9847
9848#~ msgid "Auto packing the repository for optimum performance.\n"
9849#~ msgstr "自动打包版本库以求最佳性能。\n"
9850
9851#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9852#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9853
9854#~ msgid "Could not read index"
9855#~ msgstr "不能读取索引"
c160d03f 9856
ef317cd5
JX
9857# 译者:中文字符串拼接,可删除前导空格
9858#~ msgid " (use \"git add\" to track)"
9859#~ msgstr "(使用 \"git add\" 建立跟踪)"
9860
9861#~ msgid "-B cannot be used with -b"
9862#~ msgstr "-B 不能和 -b 同时使用"
9863
9864#~ msgid "--patch is incompatible with all other options"
9865#~ msgstr "--patch 选项和其他选项不兼容"
9866
9867#~ msgid "--detach cannot be used with -b/-B/--orphan"
9868#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9869
9870#~ msgid "--detach cannot be used with -t"
9871#~ msgstr "--detach 不能和 -t 同时使用"
9872
9873#~ msgid "--orphan and -b|-B are mutually exclusive"
9874#~ msgstr "--orphan 和 -b|-B 互斥"
9875
9876#~ msgid "--orphan cannot be used with -t"
9877#~ msgstr "--orphan 不能和 -t 同时使用"
9878
9879#~ msgid "git checkout: -f and -m are incompatible"
9880#~ msgstr "git checkout:-f 和 -m 不兼容"
9881
9882#~ msgid ""
9883#~ "git checkout: updating paths is incompatible with switching branches."
9884#~ msgstr "git checkout:更新路径和切换分支不兼容。"
9885
c160d03f
JX
9886#~ msgid "diff setup failed"
9887#~ msgstr "diff 设置失败"
9888
9889#~ msgid "merge-recursive: disk full?"
9890#~ msgstr "merge-recursive:磁盘已满?"
9891
9892#~ msgid "diff_setup_done failed"
9893#~ msgstr "diff_setup_done 失败"