]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge remote-tracking branch 'sv-nafmo/master'
[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"
a7409dfb
JX
15"POT-Creation-Date: 2013-03-05 12:36+0800\n"
16"PO-Revision-Date: 2013-03-05 13:07+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
a77c07d9 25#: advice.c:49
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#.
a77c07d9 34#: advice.c:79
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
07432cef 71#: archive.c:324 builtin/log.c:1115
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
a77c07d9
JX
79#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366
80#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653
07432cef 81#: builtin/fast-export.c:655 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
07432cef 87#: archive.c:327 builtin/archive.c:92
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
07432cef 115#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85
ef317cd5 116msgid "repo"
07432cef 117msgstr "版本库"
ef317cd5 118
07432cef 119#: archive.c:346 builtin/archive.c:94
ef317cd5 120msgid "retrieve the archive from remote repository <repo>"
07432cef 121msgstr "从远程版本库(<版本库>)提取归档文件"
ef317cd5 122
a77c07d9 123#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615
ef317cd5 124msgid "command"
07432cef 125msgstr "命令"
ef317cd5 126
07432cef 127#: archive.c:348 builtin/archive.c:96
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
8ada9598
JX
139#: bundle.c:36
140#, c-format
141msgid "'%s' does not look like a v2 bundle file"
81809b99 142msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598
JX
143
144#: bundle.c:63
81809b99 145#, c-format
8ada9598 146msgid "unrecognized header: %s%s (%d)"
81809b99 147msgstr "未能识别的包头:%s%s (%d)"
8ada9598 148
07432cef 149#: bundle.c:89 builtin/commit.c:674
8ada9598
JX
150#, c-format
151msgid "could not open '%s'"
152msgstr "不能打开 '%s'"
153
154#: bundle.c:140
155msgid "Repository lacks these prerequisite commits:"
81809b99 156msgstr "版本库缺少这些必备的提交:"
8ada9598 157
07432cef
WS
158#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299
159#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
160#: builtin/shortlog.c:157
8ada9598
JX
161msgid "revision walk setup failed"
162msgstr "版本遍历设置失败"
163
164#: bundle.c:186
165#, c-format
166msgid "The bundle contains %d ref"
167msgid_plural "The bundle contains %d refs"
81809b99 168msgstr[0] "这个包中含有 %d 个引用"
5ae481e0 169msgstr[1] "这个包中含有 %d 个引用"
8ada9598
JX
170
171#: bundle.c:192
6792b93b
JX
172msgid "The bundle records a complete history."
173msgstr "这个包记录一个完整历史。"
174
175#: bundle.c:195
8ada9598
JX
176#, c-format
177msgid "The bundle requires this ref"
178msgid_plural "The bundle requires these %d refs"
81809b99
JX
179msgstr[0] "这个包需要这个引用"
180msgstr[1] "这个包需要 %d 个这些引用"
8ada9598 181
6792b93b 182#: bundle.c:294
8ada9598 183msgid "rev-list died"
81809b99 184msgstr "rev-list 终止"
8ada9598 185
07432cef 186#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260
8ada9598
JX
187#, c-format
188msgid "unrecognized argument: %s"
81809b99 189msgstr "未能识别的参数:%s"
8ada9598 190
6792b93b 191#: bundle.c:335
8ada9598
JX
192#, c-format
193msgid "ref '%s' is excluded by the rev-list options"
81809b99 194msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 195
6792b93b 196#: bundle.c:380
8ada9598 197msgid "Refusing to create empty bundle."
81809b99 198msgstr "不能创建空包。"
8ada9598 199
6792b93b 200#: bundle.c:398
8ada9598 201msgid "Could not spawn pack-objects"
81809b99 202msgstr "不能生成 pack-objects 进程"
8ada9598 203
6792b93b 204#: bundle.c:416
8ada9598 205msgid "pack-objects died"
81809b99 206msgstr "pack-objects 终止"
8ada9598 207
6792b93b 208#: bundle.c:419
81809b99 209#, c-format
8ada9598 210msgid "cannot create '%s'"
81809b99 211msgstr "不能创建 '%s'"
8ada9598 212
6792b93b 213#: bundle.c:441
8ada9598 214msgid "index-pack died"
81809b99 215msgstr "index-pack 终止"
8ada9598 216
07432cef 217#: commit.c:50
c04f5ac3
JX
218#, c-format
219msgid "could not parse %s"
220msgstr "不能解析 %s"
221
07432cef 222#: commit.c:52
c04f5ac3
JX
223#, c-format
224msgid "%s %s is not a commit!"
225msgstr "%s %s 不是一个提交!"
226
227#: compat/obstack.c:406 compat/obstack.c:408
228msgid "memory exhausted"
229msgstr "内存耗尽"
230
231#: connected.c:39
232msgid "Could not run 'git rev-list'"
233msgstr "不能执行 'git rev-list'"
234
235#: connected.c:48
236#, c-format
237msgid "failed write to rev-list: %s"
238msgstr "无法写入 rev-list:%s"
239
240#: connected.c:56
241#, c-format
242msgid "failed to close rev-list's stdin: %s"
243msgstr "无法关闭 rev-list 的标准输入:%s"
244
8ada9598
JX
245#: date.c:95
246msgid "in the future"
81809b99 247msgstr "在将来"
8ada9598
JX
248
249#: date.c:101
250#, c-format
251msgid "%lu second ago"
252msgid_plural "%lu seconds ago"
81809b99 253msgstr[0] "%lu 秒钟之前"
5ae481e0 254msgstr[1] "%lu 秒钟之前"
8ada9598
JX
255
256#: date.c:108
257#, c-format
258msgid "%lu minute ago"
259msgid_plural "%lu minutes ago"
81809b99 260msgstr[0] "%lu 分钟之前"
5ae481e0 261msgstr[1] "%lu 分钟之前"
8ada9598
JX
262
263#: date.c:115
264#, c-format
265msgid "%lu hour ago"
266msgid_plural "%lu hours ago"
81809b99 267msgstr[0] "%lu 小时之前"
5ae481e0 268msgstr[1] "%lu 小时之前"
8ada9598
JX
269
270#: date.c:122
271#, c-format
272msgid "%lu day ago"
273msgid_plural "%lu days ago"
81809b99 274msgstr[0] "%lu 天之前"
5ae481e0 275msgstr[1] "%lu 天之前"
8ada9598
JX
276
277#: date.c:128
278#, c-format
279msgid "%lu week ago"
280msgid_plural "%lu weeks ago"
81809b99 281msgstr[0] "%lu 周之前"
5ae481e0 282msgstr[1] "%lu 周之前"
8ada9598
JX
283
284#: date.c:135
285#, c-format
286msgid "%lu month ago"
287msgid_plural "%lu months ago"
81809b99 288msgstr[0] "%lu 个月之前"
5ae481e0 289msgstr[1] "%lu 个月之前"
8ada9598
JX
290
291#: date.c:146
292#, c-format
293msgid "%lu year"
294msgid_plural "%lu years"
81809b99 295msgstr[0] "%lu 年"
5ae481e0 296msgstr[1] "%lu 年"
8ada9598
JX
297
298#: date.c:149
299#, c-format
300msgid "%s, %lu month ago"
301msgid_plural "%s, %lu months ago"
81809b99 302msgstr[0] "%s,%lu 个月之前"
5ae481e0 303msgstr[1] "%s,%lu 个月之前"
8ada9598
JX
304
305#: date.c:154 date.c:159
306#, c-format
307msgid "%lu year ago"
308msgid_plural "%lu years ago"
81809b99 309msgstr[0] "%lu 年前"
5ae481e0 310msgstr[1] "%lu 年前"
8ada9598 311
90e6ef53 312# 译者:注意保持前导空格
63af42fe 313#: diff.c:112
c04f5ac3 314#, c-format
07432cef
WS
315msgid " Failed to parse dirstat cut-off percentage '%s'\n"
316msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 317
90e6ef53 318# 译者:注意保持前导空格
63af42fe 319#: diff.c:117
c04f5ac3 320#, c-format
07432cef
WS
321msgid " Unknown dirstat parameter '%s'\n"
322msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 323
63af42fe 324#: diff.c:210
07432cef
WS
325#, c-format
326msgid "Unknown value for 'diff.submodule' config variable: '%s'"
327msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
328
63af42fe 329#: diff.c:260
c04f5ac3
JX
330#, c-format
331msgid ""
332"Found errors in 'diff.dirstat' config variable:\n"
333"%s"
334msgstr ""
90e6ef53 335"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
336"%s"
337
63af42fe 338#: diff.c:3468
c04f5ac3
JX
339#, c-format
340msgid ""
341"Failed to parse --dirstat/-X option parameter:\n"
342"%s"
343msgstr ""
344"无法解析 --dirstat/-X 选项的参数:\n"
345"%s"
346
63af42fe 347#: diff.c:3482
07432cef
WS
348#, c-format
349msgid "Failed to parse --submodule option parameter: '%s'"
350msgstr "无法解析 --submodule 选项的参数:'%s'"
351
a77c07d9 352#: gpg-interface.c:59 gpg-interface.c:127
c04f5ac3
JX
353msgid "could not run gpg."
354msgstr "不能执行 gpg。"
355
356#: gpg-interface.c:71
357msgid "gpg did not accept the data"
358msgstr "gpg 没有接受数据"
359
360#: gpg-interface.c:82
361msgid "gpg failed to sign the data"
362msgstr "gpg 无法为数据签名"
363
a77c07d9
JX
364#: gpg-interface.c:112
365#, c-format
366msgid "could not create temporary file '%s': %s"
367msgstr "不能创建临时文件 '%s':%s"
368
369#: gpg-interface.c:115
370#, c-format
371msgid "failed writing detached signature to '%s': %s"
372msgstr "无法将分离式签名写入 '%s':%s"
373
07432cef 374#: grep.c:1622
7ac1c0ad
JX
375#, c-format
376msgid "'%s': unable to read %s"
377msgstr "'%s':无法读取 %s"
378
07432cef 379#: grep.c:1639
7ac1c0ad
JX
380#, c-format
381msgid "'%s': %s"
382msgstr "'%s':%s"
383
07432cef 384#: grep.c:1650
7ac1c0ad
JX
385#, c-format
386msgid "'%s': short read %s"
387msgstr "'%s':读取不完整 %s"
388
23ff3338 389#: help.c:212
81809b99 390#, c-format
8ada9598 391msgid "available git commands in '%s'"
81809b99 392msgstr "在 '%s' 下可用的 git 命令"
8ada9598 393
23ff3338 394#: help.c:219
8ada9598 395msgid "git commands available from elsewhere on your $PATH"
81809b99 396msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 397
a77c07d9
JX
398#: help.c:235
399msgid "The most commonly used git commands are:"
400msgstr "最常用的 git 命令有:"
401
402#: help.c:292
c04f5ac3
JX
403#, c-format
404msgid ""
405"'%s' appears to be a git command, but we were not\n"
406"able to execute it. Maybe git-%s is broken?"
407msgstr ""
408"'%s' 像是一个 git 命令,但却无法运行。\n"
409"可能是 git-%s 受损?"
410
a77c07d9 411#: help.c:349
8ada9598 412msgid "Uh oh. Your system reports no Git commands at all."
81809b99 413msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 414
a77c07d9 415#: help.c:371
8ada9598
JX
416#, c-format
417msgid ""
418"WARNING: You called a Git command named '%s', which does not exist.\n"
419"Continuing under the assumption that you meant '%s'"
420msgstr ""
81809b99
JX
421"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
422"是 '%s'"
8ada9598 423
a77c07d9 424#: help.c:376
8ada9598
JX
425#, c-format
426msgid "in %0.1f seconds automatically..."
81809b99 427msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 428
a77c07d9 429#: help.c:383
8ada9598
JX
430#, c-format
431msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 432msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 433
a77c07d9 434#: help.c:387
8ada9598
JX
435msgid ""
436"\n"
437"Did you mean this?"
438msgid_plural ""
439"\n"
440"Did you mean one of these?"
441msgstr[0] ""
81809b99
JX
442"\n"
443"您指的是这个么?"
444msgstr[1] ""
445"\n"
195febda 446"您指的是这其中的某一个么?"
8ada9598 447
07432cef
WS
448#: merge.c:56
449msgid "failed to read the cache"
450msgstr "无法读取缓存"
451
452#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
453#: builtin/clone.c:586
454msgid "unable to write new index file"
455msgstr "无法写新的索引文件"
456
649900bc
JX
457#: merge-recursive.c:190
458#, c-format
459msgid "(bad commit)\n"
460msgstr "(坏提交)\n"
461
462#: merge-recursive.c:206
463#, c-format
464msgid "addinfo_cache failed for path '%s'"
465msgstr "为路径 '%s' addinfo_cache 失败"
466
467#: merge-recursive.c:268
468msgid "error building trees"
469msgstr "无法创建树"
470
c160d03f 471#: merge-recursive.c:672
649900bc
JX
472#, c-format
473msgid "failed to create path '%s'%s"
474msgstr "无法创建路径 '%s'%s"
475
c160d03f 476#: merge-recursive.c:683
649900bc
JX
477#, c-format
478msgid "Removing %s to make room for subdirectory\n"
479msgstr "删除 %s 以便为子目录留出空间\n"
480
481#. something else exists
482#. .. but not some other error (who really cares what?)
c160d03f 483#: merge-recursive.c:697 merge-recursive.c:718
649900bc
JX
484msgid ": perhaps a D/F conflict?"
485msgstr ":可能是一个目录/文件冲突?"
486
c160d03f 487#: merge-recursive.c:708
649900bc
JX
488#, c-format
489msgid "refusing to lose untracked file at '%s'"
490msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
491
c160d03f 492#: merge-recursive.c:748
649900bc
JX
493#, c-format
494msgid "cannot read object %s '%s'"
495msgstr "不能读取对象 %s '%s'"
496
c160d03f 497#: merge-recursive.c:750
649900bc
JX
498#, c-format
499msgid "blob expected for %s '%s'"
07432cef 500msgstr "%s '%s' 应为数据(blob)对象"
649900bc 501
c160d03f 502#: merge-recursive.c:773 builtin/clone.c:302
649900bc
JX
503#, c-format
504msgid "failed to open '%s'"
505msgstr "无法打开 '%s'"
506
c160d03f 507#: merge-recursive.c:781
649900bc
JX
508#, c-format
509msgid "failed to symlink '%s'"
510msgstr "无法创建符号链接 '%s'"
511
c160d03f 512#: merge-recursive.c:784
649900bc
JX
513#, c-format
514msgid "do not know what to do with %06o %s '%s'"
515msgstr "不知道如何处理 %06o %s '%s'"
516
ef317cd5 517#: merge-recursive.c:922
649900bc
JX
518msgid "Failed to execute internal merge"
519msgstr "无法执行内部合并"
520
ef317cd5 521#: merge-recursive.c:926
649900bc
JX
522#, c-format
523msgid "Unable to add %s to database"
524msgstr "不能添加 %s 至对象库"
525
ef317cd5 526#: merge-recursive.c:942
649900bc
JX
527msgid "unsupported object type in the tree"
528msgstr "在树中有不支持的对象类型"
529
ef317cd5 530#: merge-recursive.c:1021 merge-recursive.c:1035
649900bc
JX
531#, c-format
532msgid ""
533"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
534"in tree."
535msgstr ""
536"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
537"的版本被保留。"
538
ef317cd5 539#: merge-recursive.c:1027 merge-recursive.c:1040
649900bc
JX
540#, c-format
541msgid ""
542"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
543"in tree at %s."
544msgstr ""
545"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
546"的版本保留于 %8$s 中。"
547
ef317cd5 548#: merge-recursive.c:1081
649900bc
JX
549msgid "rename"
550msgstr "重命名"
551
ef317cd5 552#: merge-recursive.c:1081
649900bc
JX
553msgid "renamed"
554msgstr "重命名"
555
ef317cd5 556#: merge-recursive.c:1137
649900bc
JX
557#, c-format
558msgid "%s is a directory in %s adding as %s instead"
559msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
560
ef317cd5 561#: merge-recursive.c:1159
649900bc
JX
562#, c-format
563msgid ""
564"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
565"\"->\"%s\" in \"%s\"%s"
566msgstr ""
567"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
568"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
569
ef317cd5 570#: merge-recursive.c:1164
649900bc
JX
571msgid " (left unresolved)"
572msgstr "(留下未解决)"
573
ef317cd5 574#: merge-recursive.c:1218
649900bc
JX
575#, c-format
576msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
577msgstr ""
578"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
579"%5$s"
580
ef317cd5 581#: merge-recursive.c:1248
649900bc
JX
582#, c-format
583msgid "Renaming %s to %s and %s to %s instead"
07432cef 584msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 585
ef317cd5 586#: merge-recursive.c:1447
649900bc
JX
587#, c-format
588msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
589msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
590
ef317cd5 591#: merge-recursive.c:1457
649900bc
JX
592#, c-format
593msgid "Adding merged %s"
594msgstr "添加合并后的 %s"
595
ef317cd5 596#: merge-recursive.c:1462 merge-recursive.c:1660
649900bc
JX
597#, c-format
598msgid "Adding as %s instead"
599msgstr "而是以 %s 为名添加"
600
ef317cd5 601#: merge-recursive.c:1513
649900bc
JX
602#, c-format
603msgid "cannot read object %s"
604msgstr "不能读取对象 %s"
605
ef317cd5 606#: merge-recursive.c:1516
649900bc
JX
607#, c-format
608msgid "object %s is not a blob"
07432cef 609msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 610
ef317cd5 611#: merge-recursive.c:1564
649900bc
JX
612msgid "modify"
613msgstr "修改"
614
ef317cd5 615#: merge-recursive.c:1564
649900bc
JX
616msgid "modified"
617msgstr "修改"
618
ef317cd5 619#: merge-recursive.c:1574
649900bc
JX
620msgid "content"
621msgstr "内容"
622
ef317cd5 623#: merge-recursive.c:1581
649900bc
JX
624msgid "add/add"
625msgstr "添加/添加"
626
ef317cd5 627#: merge-recursive.c:1615
649900bc
JX
628#, c-format
629msgid "Skipped %s (merged same as existing)"
630msgstr "略过 %s(已经做过相同合并)"
631
ef317cd5 632#: merge-recursive.c:1629
649900bc
JX
633#, c-format
634msgid "Auto-merging %s"
635msgstr "自动合并 %s"
636
07432cef 637#: merge-recursive.c:1633 git-submodule.sh:942
649900bc
JX
638msgid "submodule"
639msgstr "子模组"
640
ef317cd5 641#: merge-recursive.c:1634
649900bc
JX
642#, c-format
643msgid "CONFLICT (%s): Merge conflict in %s"
644msgstr "冲突(%s):合并冲突于 %s"
645
ef317cd5 646#: merge-recursive.c:1724
649900bc
JX
647#, c-format
648msgid "Removing %s"
649msgstr "删除 %s"
650
ef317cd5 651#: merge-recursive.c:1749
649900bc
JX
652msgid "file/directory"
653msgstr "文件/目录"
654
ef317cd5 655#: merge-recursive.c:1755
649900bc
JX
656msgid "directory/file"
657msgstr "目录/文件"
658
ef317cd5 659#: merge-recursive.c:1760
649900bc
JX
660#, c-format
661msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
662msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
663
ef317cd5 664#: merge-recursive.c:1770
649900bc
JX
665#, c-format
666msgid "Adding %s"
667msgstr "添加 %s"
668
ef317cd5 669#: merge-recursive.c:1787
649900bc
JX
670msgid "Fatal merge failure, shouldn't happen."
671msgstr "严重的合并错误,不应发生。"
672
ef317cd5 673#: merge-recursive.c:1806
649900bc
JX
674msgid "Already up-to-date!"
675msgstr "已经是最新的!"
676
ef317cd5 677#: merge-recursive.c:1815
649900bc
JX
678#, c-format
679msgid "merging of trees %s and %s failed"
680msgstr "无法合并树 %s 和 %s"
681
ef317cd5 682#: merge-recursive.c:1845
649900bc
JX
683#, c-format
684msgid "Unprocessed path??? %s"
685msgstr "未处理的路径??? %s"
686
ef317cd5 687#: merge-recursive.c:1890
649900bc
JX
688msgid "Merging:"
689msgstr "合并:"
690
ef317cd5 691#: merge-recursive.c:1903
649900bc 692#, c-format
e5e38ce4
JX
693msgid "found %u common ancestor:"
694msgid_plural "found %u common ancestors:"
695msgstr[0] "发现 %u 个共同祖先:"
696msgstr[1] "发现 %u 个共同祖先:"
649900bc 697
ef317cd5 698#: merge-recursive.c:1940
649900bc
JX
699msgid "merge returned no commit"
700msgstr "合并未返回提交"
701
ef317cd5 702#: merge-recursive.c:1997
649900bc
JX
703#, c-format
704msgid "Could not parse object '%s'"
705msgstr "不能解析对象 '%s'"
706
07432cef 707#: merge-recursive.c:2009 builtin/merge.c:643
649900bc
JX
708msgid "Unable to write index."
709msgstr "不能写入索引。"
710
63af42fe 711#: parse-options.c:489
8ada9598 712msgid "..."
81809b99 713msgstr "..."
8ada9598 714
63af42fe 715#: parse-options.c:507
81809b99 716#, c-format
8ada9598 717msgid "usage: %s"
81809b99 718msgstr "用法:%s"
8ada9598
JX
719
720#. TRANSLATORS: the colon here should align with the
721#. one in "usage: %s" translation
63af42fe 722#: parse-options.c:511
81809b99 723#, c-format
8ada9598 724msgid " or: %s"
81809b99 725msgstr " 或:%s"
8ada9598
JX
726
727# 译者:为保证在输出中对齐,注意调整句中空格!
63af42fe 728#: parse-options.c:514
81809b99 729#, c-format
8ada9598 730msgid " %s"
81809b99 731msgstr " %s"
8ada9598 732
63af42fe
JX
733#: parse-options.c:548
734msgid "-NUM"
735msgstr "-数字"
736
a77c07d9
JX
737#: pathspec.c:83
738#, c-format
739msgid "Path '%s' is in submodule '%.*s'"
740msgstr "路径 '%s' 属于模组 '%.*s'"
741
742#: pathspec.c:99
743#, c-format
744msgid "'%s' is beyond a symbolic link"
745msgstr "'%s' 位于符号链接中"
746
747#: remote.c:1653
c04f5ac3
JX
748#, c-format
749msgid "Your branch is ahead of '%s' by %d commit.\n"
750msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
751msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 752msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 753
a77c07d9 754#: remote.c:1659
07432cef
WS
755msgid " (use \"git push\" to publish your local commits)\n"
756msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
757
a77c07d9 758#: remote.c:1662
c04f5ac3
JX
759#, c-format
760msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
761msgid_plural ""
762"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 763msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 764msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 765
07432cef 766# 译者:注意保持前导空格
a77c07d9 767#: remote.c:1670
07432cef
WS
768msgid " (use \"git pull\" to update your local branch)\n"
769msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
770
a77c07d9 771#: remote.c:1673
c04f5ac3
JX
772#, c-format
773msgid ""
774"Your branch and '%s' have diverged,\n"
775"and have %d and %d different commit each, respectively.\n"
776msgid_plural ""
777"Your branch and '%s' have diverged,\n"
778"and have %d and %d different commits each, respectively.\n"
779msgstr[0] ""
780"您的分支和 '%s' 出现了偏离,\n"
195febda 781"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
782msgstr[1] ""
783"您的分支和 '%s' 出现了偏离,\n"
195febda 784"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 785
07432cef 786# 译者:注意保持前导空格
a77c07d9 787#: remote.c:1683
07432cef
WS
788msgid " (use \"git pull\" to merge the remote branch into yours)\n"
789msgstr " (使用 \"git pull\" 来合并远程分支)\n"
790
a77c07d9
JX
791#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
792#: builtin/merge.c:994
c04f5ac3
JX
793#, c-format
794msgid "Could not open '%s' for writing"
90e6ef53 795msgstr "不能为写入打开 '%s'"
c04f5ac3 796
a77c07d9
JX
797#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
798#: builtin/merge.c:999
c04f5ac3
JX
799#, c-format
800msgid "Could not write to '%s'"
90e6ef53 801msgstr "不能写入 '%s'"
c04f5ac3 802
07432cef 803#: sequencer.c:146
14c8bced
JX
804msgid ""
805"after resolving the conflicts, mark the corrected paths\n"
806"with 'git add <paths>' or 'git rm <paths>'"
807msgstr ""
808"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
809"命令标记修正后的文件"
810
07432cef 811#: sequencer.c:149
c04f5ac3
JX
812msgid ""
813"after resolving the conflicts, mark the corrected paths\n"
814"with 'git add <paths>' or 'git rm <paths>'\n"
815"and commit the result with 'git commit'"
816msgstr ""
817"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
818"对修正后的文件做标记,然后用 'git commit' 提交"
819
07432cef 820#: sequencer.c:162 sequencer.c:774 sequencer.c:857
c04f5ac3
JX
821#, c-format
822msgid "Could not write to %s"
823msgstr "不能写入 %s"
824
07432cef 825#: sequencer.c:165
c04f5ac3
JX
826#, c-format
827msgid "Error wrapping up %s"
828msgstr "错误收尾 %s"
829
07432cef 830#: sequencer.c:180
c04f5ac3
JX
831msgid "Your local changes would be overwritten by cherry-pick."
832msgstr "您的本地修改将被拣选操作覆盖。"
833
07432cef 834#: sequencer.c:182
c04f5ac3
JX
835msgid "Your local changes would be overwritten by revert."
836msgstr "您的本地修改将被还原操作覆盖。"
837
07432cef 838#: sequencer.c:185
c04f5ac3
JX
839msgid "Commit your changes or stash them to proceed."
840msgstr "提交您的修改或保存进度后再继续。"
841
842#. TRANSLATORS: %s will be "revert" or "cherry-pick"
07432cef 843#: sequencer.c:236
c04f5ac3
JX
844#, c-format
845msgid "%s: Unable to write new index file"
90e6ef53 846msgstr "%s:无法写入新索引文件"
c04f5ac3 847
07432cef 848#: sequencer.c:267
8ada9598 849msgid "Could not resolve HEAD commit\n"
81809b99 850msgstr "不能解析 HEAD 提交\n"
8ada9598 851
07432cef 852#: sequencer.c:288
8ada9598 853msgid "Unable to update cache tree\n"
81809b99 854msgstr "不能更新缓存\n"
8ada9598 855
07432cef 856#: sequencer.c:333
81809b99 857#, c-format
8ada9598 858msgid "Could not parse commit %s\n"
81809b99 859msgstr "不能解析提交 %s\n"
8ada9598 860
07432cef 861#: sequencer.c:338
81809b99 862#, c-format
8ada9598 863msgid "Could not parse parent commit %s\n"
81809b99 864msgstr "不能解析父提交 %s\n"
8ada9598 865
07432cef 866#: sequencer.c:404
c04f5ac3 867msgid "Your index file is unmerged."
90e6ef53 868msgstr "您的索引文件未完成合并。"
c04f5ac3 869
07432cef 870#: sequencer.c:423
c04f5ac3
JX
871#, c-format
872msgid "Commit %s is a merge but no -m option was given."
873msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
874
07432cef 875#: sequencer.c:431
c04f5ac3
JX
876#, c-format
877msgid "Commit %s does not have parent %d"
878msgstr "提交 %s 没有父提交 %d"
879
07432cef 880#: sequencer.c:435
c04f5ac3
JX
881#, c-format
882msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 883msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
884
885#. TRANSLATORS: The first %s will be "revert" or
886#. "cherry-pick", the second %s a SHA1
07432cef 887#: sequencer.c:448
c04f5ac3
JX
888#, c-format
889msgid "%s: cannot parse parent commit %s"
890msgstr "%s:不能解析父提交 %s"
891
07432cef 892#: sequencer.c:452
c04f5ac3
JX
893#, c-format
894msgid "Cannot get commit message for %s"
895msgstr "不能得到 %s 的提交说明"
896
07432cef 897#: sequencer.c:536
c04f5ac3
JX
898#, c-format
899msgid "could not revert %s... %s"
900msgstr "不能还原 %s... %s"
901
07432cef 902#: sequencer.c:537
c04f5ac3
JX
903#, c-format
904msgid "could not apply %s... %s"
905msgstr "不能应用 %s... %s"
906
07432cef 907#: sequencer.c:569
c04f5ac3
JX
908msgid "empty commit set passed"
909msgstr "提供了空的提交集"
910
07432cef 911#: sequencer.c:577
c04f5ac3
JX
912#, c-format
913msgid "git %s: failed to read the index"
90e6ef53 914msgstr "git %s:无法读取索引"
c04f5ac3 915
07432cef 916#: sequencer.c:582
c04f5ac3
JX
917#, c-format
918msgid "git %s: failed to refresh the index"
90e6ef53 919msgstr "git %s:无法刷新索引"
c04f5ac3 920
07432cef 921#: sequencer.c:640
c04f5ac3
JX
922#, c-format
923msgid "Cannot %s during a %s"
90e6ef53 924msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 925
07432cef 926#: sequencer.c:662
c04f5ac3
JX
927#, c-format
928msgid "Could not parse line %d."
90e6ef53 929msgstr "不能解析第 %d 行。"
c04f5ac3 930
07432cef 931#: sequencer.c:667
c04f5ac3 932msgid "No commits parsed."
7e238ab7 933msgstr "没有提交被解析。"
c04f5ac3 934
07432cef 935#: sequencer.c:680
c04f5ac3
JX
936#, c-format
937msgid "Could not open %s"
938msgstr "不能打开 %s"
939
07432cef 940#: sequencer.c:684
c04f5ac3
JX
941#, c-format
942msgid "Could not read %s."
943msgstr "不能读取 %s。"
944
07432cef 945#: sequencer.c:691
c04f5ac3
JX
946#, c-format
947msgid "Unusable instruction sheet: %s"
948msgstr "无用的指令表单:%s"
949
07432cef 950#: sequencer.c:719
c04f5ac3
JX
951#, c-format
952msgid "Invalid key: %s"
953msgstr "无效键名:%s"
954
07432cef 955#: sequencer.c:722
c04f5ac3
JX
956#, c-format
957msgid "Invalid value for %s: %s"
81809b99 958msgstr "%s 的值无效:%s"
c04f5ac3 959
07432cef 960#: sequencer.c:734
c04f5ac3
JX
961#, c-format
962msgid "Malformed options sheet: %s"
963msgstr "非法的选项表单:%s"
964
07432cef 965#: sequencer.c:755
c04f5ac3
JX
966msgid "a cherry-pick or revert is already in progress"
967msgstr "一个拣选或还原操作已在进行"
968
07432cef 969#: sequencer.c:756
c04f5ac3
JX
970msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
971msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
972
07432cef 973#: sequencer.c:760
c04f5ac3
JX
974#, c-format
975msgid "Could not create sequencer directory %s"
90e6ef53 976msgstr "不能创建序列目录 %s"
c04f5ac3 977
07432cef 978#: sequencer.c:776 sequencer.c:861
c04f5ac3
JX
979#, c-format
980msgid "Error wrapping up %s."
981msgstr "错误收尾 %s。"
982
07432cef 983#: sequencer.c:795 sequencer.c:929
c04f5ac3 984msgid "no cherry-pick or revert in progress"
195febda 985msgstr "拣选或还原操作并未进行"
c04f5ac3 986
07432cef 987#: sequencer.c:797
c04f5ac3
JX
988msgid "cannot resolve HEAD"
989msgstr "不能解析 HEAD"
990
07432cef 991#: sequencer.c:799
c04f5ac3 992msgid "cannot abort from a branch yet to be born"
90e6ef53 993msgstr "不能从尚未建立的分支终止"
c04f5ac3 994
63af42fe 995#: sequencer.c:821 builtin/apply.c:4056
c04f5ac3
JX
996#, c-format
997msgid "cannot open %s: %s"
998msgstr "不能打开 %s:%s"
999
07432cef 1000#: sequencer.c:824
c04f5ac3
JX
1001#, c-format
1002msgid "cannot read %s: %s"
1003msgstr "不能读取 %s:%s"
1004
07432cef 1005#: sequencer.c:825
c04f5ac3 1006msgid "unexpected end of file"
9aafc933 1007msgstr "意外的文件结束"
c04f5ac3 1008
07432cef 1009#: sequencer.c:831
c04f5ac3
JX
1010#, c-format
1011msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1012msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1013
07432cef 1014#: sequencer.c:854
c04f5ac3
JX
1015#, c-format
1016msgid "Could not format %s."
1017msgstr "不能格式化 %s。"
1018
07432cef 1019#: sequencer.c:1016
c04f5ac3
JX
1020msgid "Can't revert as initial commit"
1021msgstr "不能作为初始提交还原"
1022
07432cef 1023#: sequencer.c:1017
c04f5ac3
JX
1024msgid "Can't cherry-pick into empty head"
1025msgstr "不能拣选到空分支"
1026
23ff3338 1027#: sha1_name.c:1044
170e9899
JX
1028msgid "HEAD does not point to a branch"
1029msgstr "HEAD 没有指向一个分支"
1030
23ff3338 1031#: sha1_name.c:1047
170e9899
JX
1032#, c-format
1033msgid "No such branch: '%s'"
1034msgstr "没有此分支:'%s'"
1035
23ff3338 1036#: sha1_name.c:1049
170e9899
JX
1037#, c-format
1038msgid "No upstream configured for branch '%s'"
1039msgstr "尚未给分支 '%s' 设置上游"
1040
23ff3338 1041#: sha1_name.c:1052
170e9899
JX
1042#, c-format
1043msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1044msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1045
ef317cd5 1046#: wrapper.c:408
07432cef 1047#, c-format
ef317cd5 1048msgid "unable to access '%s': %s"
07432cef
WS
1049msgstr "不能访问 '%s':%s"
1050
1051#: wrapper.c:423
1052#, c-format
1053msgid "unable to access '%s'"
1054msgstr "不能访问 '%s'"
ef317cd5 1055
07432cef 1056#: wrapper.c:434
d691f479
JX
1057#, c-format
1058msgid "unable to look up current user in the passwd file: %s"
07432cef 1059msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1060
07432cef 1061#: wrapper.c:435
d691f479
JX
1062msgid "no such user"
1063msgstr "无此用户"
1064
23ff3338 1065#: wt-status.c:140
c04f5ac3
JX
1066msgid "Unmerged paths:"
1067msgstr "未合并的路径:"
1068
90e6ef53 1069# 译者:注意保持前导空格
23ff3338 1070#: wt-status.c:167 wt-status.c:194
c04f5ac3
JX
1071#, c-format
1072msgid " (use \"git reset %s <file>...\" to unstage)"
1073msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1074
90e6ef53 1075# 译者:注意保持前导空格
23ff3338 1076#: wt-status.c:169 wt-status.c:196
c04f5ac3
JX
1077msgid " (use \"git rm --cached <file>...\" to unstage)"
1078msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1079
90e6ef53 1080# 译者:注意保持前导空格
23ff3338 1081#: wt-status.c:173
6792b93b
JX
1082msgid " (use \"git add <file>...\" to mark resolution)"
1083msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1084
1085# 译者:注意保持前导空格
23ff3338 1086#: wt-status.c:175 wt-status.c:179
c04f5ac3
JX
1087msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1088msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1089
6792b93b 1090# 译者:注意保持前导空格
23ff3338 1091#: wt-status.c:177
6792b93b
JX
1092msgid " (use \"git rm <file>...\" to mark resolution)"
1093msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1094
23ff3338 1095#: wt-status.c:188
c04f5ac3
JX
1096msgid "Changes to be committed:"
1097msgstr "要提交的变更:"
1098
23ff3338 1099#: wt-status.c:206
c04f5ac3 1100msgid "Changes not staged for commit:"
7e238ab7 1101msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1102
90e6ef53 1103# 译者:注意保持前导空格
23ff3338 1104#: wt-status.c:210
c04f5ac3
JX
1105msgid " (use \"git add <file>...\" to update what will be committed)"
1106msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1107
90e6ef53 1108# 译者:注意保持前导空格
23ff3338 1109#: wt-status.c:212
c04f5ac3
JX
1110msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1111msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1112
90e6ef53 1113# 译者:注意保持前导空格
23ff3338 1114#: wt-status.c:213
c04f5ac3
JX
1115msgid ""
1116" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1117msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1118
90e6ef53 1119# 译者:注意保持前导空格
23ff3338 1120#: wt-status.c:215
c04f5ac3
JX
1121msgid " (commit or discard the untracked or modified content in submodules)"
1122msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1123
90e6ef53 1124# 译者:注意保持前导空格
23ff3338 1125#: wt-status.c:227
c04f5ac3
JX
1126#, c-format
1127msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1128msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1129
23ff3338 1130#: wt-status.c:244
c04f5ac3
JX
1131msgid "bug"
1132msgstr "bug"
1133
23ff3338 1134#: wt-status.c:249
c04f5ac3
JX
1135msgid "both deleted:"
1136msgstr "双方删除:"
1137
23ff3338 1138#: wt-status.c:250
c04f5ac3
JX
1139msgid "added by us:"
1140msgstr "由我们添加:"
1141
23ff3338 1142#: wt-status.c:251
c04f5ac3
JX
1143msgid "deleted by them:"
1144msgstr "由他们删除:"
1145
23ff3338 1146#: wt-status.c:252
c04f5ac3
JX
1147msgid "added by them:"
1148msgstr "由他们添加:"
1149
23ff3338 1150#: wt-status.c:253
c04f5ac3
JX
1151msgid "deleted by us:"
1152msgstr "由我们删除:"
1153
23ff3338 1154#: wt-status.c:254
c04f5ac3
JX
1155msgid "both added:"
1156msgstr "双方添加:"
1157
23ff3338 1158#: wt-status.c:255
c04f5ac3
JX
1159msgid "both modified:"
1160msgstr "双方修改:"
1161
90e6ef53 1162# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1163#: wt-status.c:285
c04f5ac3 1164msgid "new commits, "
aa9565f7 1165msgstr "新提交, "
c04f5ac3 1166
90e6ef53 1167# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1168#: wt-status.c:287
c04f5ac3 1169msgid "modified content, "
aa9565f7 1170msgstr "修改的内容, "
c04f5ac3 1171
90e6ef53 1172# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1173#: wt-status.c:289
c04f5ac3 1174msgid "untracked content, "
aa9565f7 1175msgstr "未跟踪的内容, "
c04f5ac3 1176
90e6ef53 1177# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1178#: wt-status.c:303
c04f5ac3
JX
1179#, c-format
1180msgid "new file: %s"
1181msgstr "新文件: %s"
1182
90e6ef53 1183# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1184#: wt-status.c:306
c04f5ac3
JX
1185#, c-format
1186msgid "copied: %s -> %s"
1187msgstr "拷贝: %s -> %s"
1188
90e6ef53 1189# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1190#: wt-status.c:309
c04f5ac3
JX
1191#, c-format
1192msgid "deleted: %s"
1193msgstr "删除: %s"
1194
90e6ef53 1195# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1196#: wt-status.c:312
c04f5ac3
JX
1197#, c-format
1198msgid "modified: %s"
1199msgstr "修改: %s"
1200
90e6ef53 1201# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1202#: wt-status.c:315
c04f5ac3
JX
1203#, c-format
1204msgid "renamed: %s -> %s"
1205msgstr "重命名: %s -> %s"
1206
90e6ef53 1207# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1208#: wt-status.c:318
c04f5ac3
JX
1209#, c-format
1210msgid "typechange: %s"
1211msgstr "类型变更: %s"
1212
90e6ef53 1213# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1214#: wt-status.c:321
c04f5ac3
JX
1215#, c-format
1216msgid "unknown: %s"
1217msgstr "未知: %s"
1218
90e6ef53 1219# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1220#: wt-status.c:324
c04f5ac3
JX
1221#, c-format
1222msgid "unmerged: %s"
1223msgstr "未合并: %s"
1224
23ff3338 1225#: wt-status.c:327
c04f5ac3
JX
1226#, c-format
1227msgid "bug: unhandled diff status %c"
90e6ef53 1228msgstr "bug:未处理的差异状态 %c"
c04f5ac3 1229
a77c07d9 1230#: wt-status.c:789
6792b93b 1231msgid "You have unmerged paths."
195febda 1232msgstr "您有尚未合并的路径。"
6792b93b
JX
1233
1234# 译者:注意保持前导空格
63af42fe 1235#: wt-status.c:792 wt-status.c:944
6792b93b
JX
1236msgid " (fix conflicts and run \"git commit\")"
1237msgstr " (解决冲突并运行 \"git commit\")"
1238
a77c07d9 1239#: wt-status.c:795
6792b93b
JX
1240msgid "All conflicts fixed but you are still merging."
1241msgstr "所有冲突已解决但您仍处于合并中。"
1242
1243# 译者:注意保持前导空格
a77c07d9 1244#: wt-status.c:798
6792b93b
JX
1245msgid " (use \"git commit\" to conclude merge)"
1246msgstr " (使用 \"git commit\" 结束合并)"
1247
a77c07d9 1248#: wt-status.c:808
6792b93b
JX
1249msgid "You are in the middle of an am session."
1250msgstr "您正处于一个 am 过程中。"
1251
a77c07d9 1252#: wt-status.c:811
6792b93b
JX
1253msgid "The current patch is empty."
1254msgstr "当前的补丁为空。"
1255
1256# 译者:注意保持前导空格
a77c07d9 1257#: wt-status.c:815
6792b93b
JX
1258msgid " (fix conflicts and then run \"git am --resolved\")"
1259msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1260
1261# 译者:注意保持前导空格
a77c07d9 1262#: wt-status.c:817
6792b93b
JX
1263msgid " (use \"git am --skip\" to skip this patch)"
1264msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1265
1266# 译者:注意保持前导空格
a77c07d9 1267#: wt-status.c:819
6792b93b
JX
1268msgid " (use \"git am --abort\" to restore the original branch)"
1269msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1270
63af42fe
JX
1271#: wt-status.c:879 wt-status.c:896
1272#, c-format
1273msgid "You are currently rebasing branch '%s' on '%s'."
1274msgstr "您正在将分支 '%s' 变基到 '%s'。"
1275
1276#: wt-status.c:884 wt-status.c:901
6792b93b
JX
1277msgid "You are currently rebasing."
1278msgstr "您正在变基。"
1279
1280# 译者:注意保持前导空格
63af42fe 1281#: wt-status.c:887
6792b93b
JX
1282msgid " (fix conflicts and then run \"git rebase --continue\")"
1283msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1284
1285# 译者:注意保持前导空格
63af42fe 1286#: wt-status.c:889
6792b93b
JX
1287msgid " (use \"git rebase --skip\" to skip this patch)"
1288msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1289
1290# 译者:注意保持前导空格
63af42fe 1291#: wt-status.c:891
6792b93b
JX
1292msgid " (use \"git rebase --abort\" to check out the original branch)"
1293msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1294
1295# 译者:注意保持前导空格
63af42fe 1296#: wt-status.c:904
6792b93b
JX
1297msgid " (all conflicts fixed: run \"git rebase --continue\")"
1298msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1299
63af42fe
JX
1300#: wt-status.c:908
1301#, c-format
1302msgid ""
1303"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1304msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1305
1306#: wt-status.c:913
6792b93b
JX
1307msgid "You are currently splitting a commit during a rebase."
1308msgstr "您正在变基过程中拆分一个提交。"
1309
1310# 译者:注意保持前导空格
63af42fe 1311#: wt-status.c:916
6792b93b
JX
1312msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1313msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1314
63af42fe
JX
1315#: wt-status.c:920
1316#, c-format
1317msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1318msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1319
1320#: wt-status.c:925
6792b93b
JX
1321msgid "You are currently editing a commit during a rebase."
1322msgstr "您正在变基过程中编辑一个提交。"
1323
1324# 译者:注意保持前导空格
63af42fe 1325#: wt-status.c:928
6792b93b
JX
1326msgid " (use \"git commit --amend\" to amend the current commit)"
1327msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1328
1329# 译者:注意保持前导空格
63af42fe 1330#: wt-status.c:930
6792b93b
JX
1331msgid ""
1332" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1333msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1334
63af42fe 1335#: wt-status.c:940
6792b93b
JX
1336msgid "You are currently cherry-picking."
1337msgstr "您正在做拣选操作。"
1338
1339# 译者:注意保持前导空格
63af42fe 1340#: wt-status.c:947
6792b93b
JX
1341msgid " (all conflicts fixed: run \"git commit\")"
1342msgstr " (解决所有冲突后,执行 \"git commit\")"
1343
63af42fe
JX
1344#: wt-status.c:958
1345#, c-format
1346msgid "You are currently bisecting branch '%s'."
1347msgstr "您正在分支 '%s' 中做二分查找。"
1348
1349#: wt-status.c:962
6792b93b
JX
1350msgid "You are currently bisecting."
1351msgstr "您正在做二分查找。"
1352
1353# 译者:注意保持前导空格
63af42fe 1354#: wt-status.c:965
6792b93b
JX
1355msgid " (use \"git bisect reset\" to get back to the original branch)"
1356msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1357
63af42fe 1358#: wt-status.c:1064
c04f5ac3
JX
1359msgid "On branch "
1360msgstr "位于分支 "
1361
63af42fe 1362#: wt-status.c:1071
c04f5ac3
JX
1363msgid "Not currently on any branch."
1364msgstr "当前不在任何分支上。"
1365
63af42fe 1366#: wt-status.c:1083
c04f5ac3
JX
1367msgid "Initial commit"
1368msgstr "初始提交"
1369
63af42fe 1370#: wt-status.c:1097
ef317cd5 1371msgid "Untracked files"
07432cef 1372msgstr "未跟踪的文件"
c04f5ac3 1373
63af42fe 1374#: wt-status.c:1099
ef317cd5 1375msgid "Ignored files"
07432cef 1376msgstr "忽略的文件"
c04f5ac3 1377
63af42fe 1378#: wt-status.c:1101
c04f5ac3
JX
1379#, c-format
1380msgid "Untracked files not listed%s"
1381msgstr "未跟踪的文件没有列出%s"
1382
7e238ab7 1383# 译者:中文字符串拼接,可删除前导空格
63af42fe 1384#: wt-status.c:1103
c04f5ac3 1385msgid " (use -u option to show untracked files)"
7e238ab7 1386msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1387
63af42fe 1388#: wt-status.c:1109
c04f5ac3
JX
1389msgid "No changes"
1390msgstr "没有修改"
1391
7e238ab7 1392# 译者:中文字符串拼接,可删除前导空格
63af42fe 1393#: wt-status.c:1114
07432cef 1394#, c-format
ef317cd5 1395msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1396msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1397
63af42fe 1398#: wt-status.c:1117
07432cef 1399#, c-format
ef317cd5 1400msgid "no changes added to commit\n"
07432cef 1401msgstr "修改尚未加入提交\n"
c04f5ac3 1402
63af42fe 1403#: wt-status.c:1120
07432cef 1404#, c-format
ef317cd5
JX
1405msgid ""
1406"nothing added to commit but untracked files present (use \"git add\" to "
1407"track)\n"
07432cef 1408msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1409
63af42fe 1410#: wt-status.c:1123
07432cef 1411#, c-format
ef317cd5 1412msgid "nothing added to commit but untracked files present\n"
07432cef 1413msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1414
7e238ab7 1415# 译者:中文字符串拼接,可删除前导空格
63af42fe 1416#: wt-status.c:1126
07432cef 1417#, c-format
ef317cd5 1418msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1419msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1420
63af42fe 1421#: wt-status.c:1129 wt-status.c:1134
07432cef 1422#, c-format
ef317cd5 1423msgid "nothing to commit\n"
07432cef 1424msgstr "无文件要提交\n"
ef317cd5 1425
7e238ab7 1426# 译者:中文字符串拼接,可删除前导空格
63af42fe 1427#: wt-status.c:1132
07432cef 1428#, c-format
ef317cd5 1429msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1430msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1431
7e238ab7 1432# 译者:中文字符串拼接,可删除前导空格
63af42fe 1433#: wt-status.c:1136
07432cef 1434#, c-format
ef317cd5 1435msgid "nothing to commit, working directory clean\n"
07432cef 1436msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1437
63af42fe 1438#: wt-status.c:1244
c04f5ac3 1439msgid "HEAD (no branch)"
61bc0753 1440msgstr "HEAD(非分支)"
c04f5ac3 1441
90e6ef53 1442# 译者:注意保持句尾空格
63af42fe 1443#: wt-status.c:1250
c04f5ac3
JX
1444msgid "Initial commit on "
1445msgstr "初始提交于 "
1446
90e6ef53 1447# 译者:注意保持句尾空格
63af42fe 1448#: wt-status.c:1265
c04f5ac3
JX
1449msgid "behind "
1450msgstr "落后 "
1451
90e6ef53 1452# 译者:注意保持句尾空格
63af42fe 1453#: wt-status.c:1268 wt-status.c:1271
c04f5ac3
JX
1454msgid "ahead "
1455msgstr "领先 "
1456
90e6ef53 1457# 译者:注意保持句尾空格
63af42fe 1458#: wt-status.c:1273
c04f5ac3
JX
1459msgid ", behind "
1460msgstr ",落后 "
1461
a77c07d9
JX
1462#: compat/precompose_utf8.c:58 builtin/clone.c:341
1463#, c-format
1464msgid "failed to unlink '%s'"
1465msgstr "无法删除 '%s'"
1466
1467#: builtin/add.c:20
1468msgid "git add [options] [--] <pathspec>..."
1469msgstr "git add [选项] [--] <路径匹配>..."
ef317cd5 1470
a77c07d9 1471#: builtin/add.c:63
c04f5ac3
JX
1472#, c-format
1473msgid "unexpected diff status %c"
1474msgstr "意外的差异状态 %c"
1475
a77c07d9 1476#: builtin/add.c:68 builtin/commit.c:231
c04f5ac3
JX
1477msgid "updating files failed"
1478msgstr "更新文件失败"
1479
a77c07d9 1480#: builtin/add.c:78
c04f5ac3
JX
1481#, c-format
1482msgid "remove '%s'\n"
1483msgstr "删除 '%s'\n"
1484
a77c07d9 1485#: builtin/add.c:148
c04f5ac3 1486msgid "Unstaged changes after refreshing the index:"
90e6ef53 1487msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1488
a77c07d9 1489#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
c04f5ac3
JX
1490#, c-format
1491msgid "pathspec '%s' did not match any files"
1492msgstr "路径 '%s' 未匹配任何文件"
1493
a77c07d9 1494#: builtin/add.c:234
c04f5ac3 1495msgid "Could not read the index"
90e6ef53 1496msgstr "不能读取索引"
c04f5ac3 1497
a77c07d9 1498#: builtin/add.c:244
c04f5ac3
JX
1499#, c-format
1500msgid "Could not open '%s' for writing."
195febda 1501msgstr "不能打开 '%s' 以写入。"
c04f5ac3 1502
a77c07d9 1503#: builtin/add.c:248
c04f5ac3 1504msgid "Could not write patch"
195febda 1505msgstr "不能生成补丁"
c04f5ac3 1506
a77c07d9 1507#: builtin/add.c:253
c04f5ac3
JX
1508#, c-format
1509msgid "Could not stat '%s'"
90e6ef53 1510msgstr "不能查看文件状态 '%s'"
c04f5ac3 1511
a77c07d9 1512#: builtin/add.c:255
c04f5ac3
JX
1513msgid "Empty patch. Aborted."
1514msgstr "空补丁。异常终止。"
1515
a77c07d9 1516#: builtin/add.c:261
8ada9598
JX
1517#, c-format
1518msgid "Could not apply '%s'"
1519msgstr "不能应用 '%s'"
1520
a77c07d9 1521#: builtin/add.c:271
8ada9598 1522msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 1523msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 1524
a77c07d9
JX
1525#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1526#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
07432cef 1527#: builtin/rm.c:206
ef317cd5 1528msgid "dry run"
07432cef 1529msgstr "演习"
ef317cd5 1530
63af42fe 1531#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19
a77c07d9
JX
1532#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
1533#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
ef317cd5
JX
1534msgid "be verbose"
1535msgstr "冗长输出"
1536
a77c07d9 1537#: builtin/add.c:280
ef317cd5 1538msgid "interactive picking"
07432cef 1539msgstr "交互式拣选"
ef317cd5 1540
a77c07d9 1541#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
ef317cd5 1542msgid "select hunks interactively"
07432cef 1543msgstr "交互式挑选数据块"
ef317cd5 1544
a77c07d9 1545#: builtin/add.c:282
ef317cd5 1546msgid "edit current diff and apply"
07432cef 1547msgstr "编辑当前差异并应用"
ef317cd5 1548
a77c07d9 1549#: builtin/add.c:283
ef317cd5 1550msgid "allow adding otherwise ignored files"
07432cef 1551msgstr "允许添加忽略的文件"
ef317cd5 1552
a77c07d9 1553#: builtin/add.c:284
ef317cd5 1554msgid "update tracked files"
07432cef 1555msgstr "更新已跟踪的文件"
ef317cd5 1556
a77c07d9 1557#: builtin/add.c:285
ef317cd5 1558msgid "record only the fact that the path will be added later"
07432cef 1559msgstr "只记录,该路径稍后再添加"
ef317cd5 1560
a77c07d9 1561#: builtin/add.c:286
ef317cd5 1562msgid "add changes from all tracked and untracked files"
07432cef 1563msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 1564
a77c07d9 1565#: builtin/add.c:287
ef317cd5 1566msgid "don't add, only refresh the index"
07432cef 1567msgstr "不添加,只刷新索引"
ef317cd5 1568
a77c07d9 1569#: builtin/add.c:288
ef317cd5 1570msgid "just skip files which cannot be added because of errors"
07432cef 1571msgstr "跳过因出错不能添加的文件"
ef317cd5 1572
a77c07d9 1573#: builtin/add.c:289
ef317cd5 1574msgid "check if - even missing - files are ignored in dry run"
07432cef 1575msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 1576
a77c07d9 1577#: builtin/add.c:311
8ada9598
JX
1578#, c-format
1579msgid "Use -f if you really want to add them.\n"
1580msgstr "使用 -f 参数如果您确实要添加它们。\n"
1581
a77c07d9 1582#: builtin/add.c:312
8ada9598
JX
1583msgid "no files added"
1584msgstr "没有文件被添加"
1585
a77c07d9 1586#: builtin/add.c:318
8ada9598
JX
1587msgid "adding files failed"
1588msgstr "添加文件失败"
1589
a77c07d9
JX
1590# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1591#.
1592#. * To be consistent with "git add -p" and most Git
1593#. * commands, we should default to being tree-wide, but
1594#. * this is not the original behavior and can't be
1595#. * changed until users trained themselves not to type
1596#. * "git add -u" or "git add -A". For now, we warn and
1597#. * keep the old behavior. Later, this warning can be
1598#. * turned into a die(...), and eventually we may
1599#. * reallow the command with a new behavior.
1600#.
1601#: builtin/add.c:335
1602#, c-format
1603msgid ""
1604"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1605"subdirectory of the tree will change in Git 2.0 and should not be used "
1606"anymore.\n"
1607"To add content for the whole tree, run:\n"
1608"\n"
1609" git add %s :/\n"
1610" (or git add %s :/)\n"
1611"\n"
1612"To restrict the command to the current directory, run:\n"
1613"\n"
1614" git add %s .\n"
1615" (or git add %s .)\n"
1616"\n"
1617"With the current Git version, the command is restricted to the current "
1618"directory."
1619msgstr ""
1620"在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1621"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1622"如果要添加整个目录树的内容,执行:\n"
1623"\n"
1624" git add %s :/\n"
1625" (或 git add %s :/)\n"
1626"\n"
1627"如果要限制该命令只作用于当前目录,执行:\n"
1628"\n"
1629" git add %s .\n"
1630" (或 git add %s .)\n"
1631"\n"
1632"对于当前版本的 Git,这条命令只作用于当前目录。"
1633
1634#: builtin/add.c:381
8ada9598
JX
1635msgid "-A and -u are mutually incompatible"
1636msgstr "-A 和 -u 选项互斥"
1637
a77c07d9 1638#: builtin/add.c:383
8ada9598 1639msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 1640msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 1641
ef317cd5 1642#: builtin/add.c:414
8ada9598
JX
1643#, c-format
1644msgid "Nothing specified, nothing added.\n"
1645msgstr "没有指定文件,也没有文件被添加。\n"
1646
ef317cd5 1647#: builtin/add.c:415
8ada9598
JX
1648#, c-format
1649msgid "Maybe you wanted to say 'git add .'?\n"
1650msgstr "也许您想要执行 'git add .'?\n"
1651
a77c07d9
JX
1652#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1653#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
8ada9598
JX
1654msgid "index file corrupt"
1655msgstr "索引文件损坏"
1656
63af42fe 1657#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370
8ada9598
JX
1658msgid "Unable to write new index file"
1659msgstr "无法写入新索引文件"
1660
23ff3338 1661#: builtin/apply.c:57
8ada9598 1662msgid "git apply [options] [<patch>...]"
81809b99 1663msgstr "git apply [选项] [<补丁>...]"
8ada9598 1664
23ff3338 1665#: builtin/apply.c:110
81809b99 1666#, c-format
8ada9598 1667msgid "unrecognized whitespace option '%s'"
81809b99 1668msgstr "未能识别的空白字符选项 '%s'"
8ada9598 1669
23ff3338 1670#: builtin/apply.c:125
81809b99 1671#, c-format
8ada9598 1672msgid "unrecognized whitespace ignore option '%s'"
81809b99 1673msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 1674
c160d03f 1675#: builtin/apply.c:823
8ada9598
JX
1676#, c-format
1677msgid "Cannot prepare timestamp regexp %s"
81809b99 1678msgstr "无法准备时间戳正则表达式 %s"
8ada9598 1679
c160d03f 1680#: builtin/apply.c:832
8ada9598
JX
1681#, c-format
1682msgid "regexec returned %d for input: %s"
81809b99 1683msgstr "regexec 返回 %d,输入为:%s"
8ada9598 1684
c160d03f 1685#: builtin/apply.c:913
81809b99 1686#, c-format
8ada9598 1687msgid "unable to find filename in patch at line %d"
81809b99 1688msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 1689
c160d03f 1690#: builtin/apply.c:945
8ada9598
JX
1691#, c-format
1692msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 1693msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 1694
c160d03f 1695#: builtin/apply.c:949
8ada9598
JX
1696#, c-format
1697msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 1698msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 1699
c160d03f 1700#: builtin/apply.c:950
8ada9598
JX
1701#, c-format
1702msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 1703msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 1704
c160d03f 1705#: builtin/apply.c:957
8ada9598
JX
1706#, c-format
1707msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 1708msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 1709
a77c07d9 1710#: builtin/apply.c:1422
8ada9598
JX
1711#, c-format
1712msgid "recount: unexpected line: %.*s"
81809b99 1713msgstr "recount:意外的行:%.*s"
8ada9598 1714
a77c07d9 1715#: builtin/apply.c:1479
8ada9598
JX
1716#, c-format
1717msgid "patch fragment without header at line %d: %.*s"
81809b99 1718msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 1719
a77c07d9 1720#: builtin/apply.c:1496
8ada9598
JX
1721#, c-format
1722msgid ""
1723"git diff header lacks filename information when removing %d leading pathname "
1724"component (line %d)"
1725msgid_plural ""
1726"git diff header lacks filename information when removing %d leading pathname "
1727"components (line %d)"
5ae481e0
JX
1728msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1729msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 1730
a77c07d9 1731#: builtin/apply.c:1656
8ada9598 1732msgid "new file depends on old contents"
81809b99 1733msgstr "新文件依赖旧内容"
8ada9598 1734
a77c07d9 1735#: builtin/apply.c:1658
8ada9598 1736msgid "deleted file still has contents"
81809b99 1737msgstr "删除的文件仍有内容"
8ada9598 1738
a77c07d9 1739#: builtin/apply.c:1684
8ada9598
JX
1740#, c-format
1741msgid "corrupt patch at line %d"
195febda 1742msgstr "补丁在第 %d 行损坏"
8ada9598 1743
a77c07d9 1744#: builtin/apply.c:1720
8ada9598
JX
1745#, c-format
1746msgid "new file %s depends on old contents"
81809b99 1747msgstr "新文件 %s 依赖旧内容"
8ada9598 1748
a77c07d9 1749#: builtin/apply.c:1722
8ada9598
JX
1750#, c-format
1751msgid "deleted file %s still has contents"
81809b99 1752msgstr "删除的文件 %s 仍有内容"
8ada9598 1753
a77c07d9 1754#: builtin/apply.c:1725
8ada9598
JX
1755#, c-format
1756msgid "** warning: file %s becomes empty but is not deleted"
81809b99 1757msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 1758
a77c07d9 1759#: builtin/apply.c:1871
8ada9598
JX
1760#, c-format
1761msgid "corrupt binary patch at line %d: %.*s"
81809b99 1762msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598
JX
1763
1764#. there has to be one hunk (forward hunk)
a77c07d9 1765#: builtin/apply.c:1900
8ada9598
JX
1766#, c-format
1767msgid "unrecognized binary patch at line %d"
81809b99 1768msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 1769
a77c07d9 1770#: builtin/apply.c:1986
8ada9598
JX
1771#, c-format
1772msgid "patch with only garbage at line %d"
81809b99 1773msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 1774
a77c07d9 1775#: builtin/apply.c:2076
81809b99 1776#, c-format
8ada9598 1777msgid "unable to read symlink %s"
81809b99 1778msgstr "无法读取符号链接 %s"
8ada9598 1779
a77c07d9 1780#: builtin/apply.c:2080
81809b99 1781#, c-format
8ada9598 1782msgid "unable to open or read %s"
81809b99 1783msgstr "不能打开或读取 %s"
8ada9598 1784
a77c07d9 1785#: builtin/apply.c:2684
81809b99 1786#, c-format
8ada9598 1787msgid "invalid start of line: '%c'"
81809b99 1788msgstr "无效的行首字符:'%c'"
8ada9598 1789
a77c07d9 1790#: builtin/apply.c:2802
8ada9598
JX
1791#, c-format
1792msgid "Hunk #%d succeeded at %d (offset %d line)."
1793msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
1794msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1795msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 1796
a77c07d9 1797#: builtin/apply.c:2814
8ada9598
JX
1798#, c-format
1799msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 1800msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 1801
a77c07d9 1802#: builtin/apply.c:2820
8ada9598
JX
1803#, c-format
1804msgid ""
1805"while searching for:\n"
1806"%.*s"
1807msgstr ""
81809b99
JX
1808"当查询:\n"
1809"%.*s"
8ada9598 1810
a77c07d9 1811#: builtin/apply.c:2839
8ada9598
JX
1812#, c-format
1813msgid "missing binary patch data for '%s'"
81809b99 1814msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 1815
a77c07d9 1816#: builtin/apply.c:2942
8ada9598
JX
1817#, c-format
1818msgid "binary patch does not apply to '%s'"
81809b99 1819msgstr "二进制补丁未应用到 '%s'"
8ada9598 1820
a77c07d9 1821#: builtin/apply.c:2948
8ada9598
JX
1822#, c-format
1823msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 1824msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 1825
a77c07d9 1826#: builtin/apply.c:2969
8ada9598
JX
1827#, c-format
1828msgid "patch failed: %s:%ld"
81809b99 1829msgstr "打补丁失败:%s:%ld"
8ada9598 1830
a77c07d9 1831#: builtin/apply.c:3091
8ada9598 1832#, c-format
23ff3338
JX
1833msgid "cannot checkout %s"
1834msgstr "不能检出 %s"
8ada9598 1835
a77c07d9 1836#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
81809b99 1837#, c-format
8ada9598 1838msgid "read of %s failed"
81809b99 1839msgstr "读取 %s 失败"
8ada9598 1840
a77c07d9 1841#: builtin/apply.c:3169 builtin/apply.c:3391
81809b99 1842#, c-format
23ff3338
JX
1843msgid "path %s has been renamed/deleted"
1844msgstr "路径 %s 已经被重命名/删除"
8ada9598 1845
a77c07d9 1846#: builtin/apply.c:3250 builtin/apply.c:3405
8ada9598 1847#, c-format
23ff3338
JX
1848msgid "%s: does not exist in index"
1849msgstr "%s:不存在于索引中"
8ada9598 1850
a77c07d9 1851#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
81809b99 1852#, c-format
8ada9598 1853msgid "%s: %s"
81809b99 1854msgstr "%s:%s"
8ada9598 1855
a77c07d9 1856#: builtin/apply.c:3259 builtin/apply.c:3413
81809b99 1857#, c-format
8ada9598 1858msgid "%s: does not match index"
81809b99 1859msgstr "%s:和索引不匹配"
8ada9598 1860
a77c07d9 1861#: builtin/apply.c:3361
23ff3338
JX
1862msgid "removal patch leaves file contents"
1863msgstr "移除补丁仍留下了文件内容"
1864
a77c07d9 1865#: builtin/apply.c:3430
8ada9598
JX
1866#, c-format
1867msgid "%s: wrong type"
81809b99 1868msgstr "%s:错误类型"
8ada9598 1869
a77c07d9 1870#: builtin/apply.c:3432
8ada9598
JX
1871#, c-format
1872msgid "%s has type %o, expected %o"
9aafc933 1873msgstr "%s 的类型是 %o,应为 %o"
8ada9598 1874
a77c07d9 1875#: builtin/apply.c:3533
81809b99 1876#, c-format
8ada9598 1877msgid "%s: already exists in index"
81809b99 1878msgstr "%s:已经存在于索引中"
8ada9598 1879
a77c07d9 1880#: builtin/apply.c:3536
23ff3338
JX
1881#, c-format
1882msgid "%s: already exists in working directory"
1883msgstr "%s:已经存在于工作区中"
1884
a77c07d9 1885#: builtin/apply.c:3556
d691f479
JX
1886#, c-format
1887msgid "new mode (%o) of %s does not match old mode (%o)"
1888msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 1889
a77c07d9 1890#: builtin/apply.c:3561
8ada9598 1891#, c-format
d691f479
JX
1892msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1893msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1894
a77c07d9 1895#: builtin/apply.c:3569
d691f479 1896#, c-format
8ada9598 1897msgid "%s: patch does not apply"
81809b99 1898msgstr "%s:补丁未应用"
8ada9598 1899
a77c07d9 1900#: builtin/apply.c:3582
8ada9598
JX
1901#, c-format
1902msgid "Checking patch %s..."
81809b99 1903msgstr "检查补丁 %s..."
8ada9598 1904
63af42fe 1905#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124
8ada9598
JX
1906#, c-format
1907msgid "make_cache_entry failed for path '%s'"
1908msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1909
63af42fe 1910#: builtin/apply.c:3818
81809b99 1911#, c-format
8ada9598 1912msgid "unable to remove %s from index"
81809b99 1913msgstr "不能从索引中移除 %s"
8ada9598 1914
63af42fe 1915#: builtin/apply.c:3846
8ada9598
JX
1916#, c-format
1917msgid "corrupt patch for subproject %s"
81809b99 1918msgstr "子项目 %s 损坏的补丁"
8ada9598 1919
63af42fe 1920#: builtin/apply.c:3850
81809b99 1921#, c-format
8ada9598 1922msgid "unable to stat newly created file '%s'"
81809b99 1923msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 1924
63af42fe 1925#: builtin/apply.c:3855
8ada9598
JX
1926#, c-format
1927msgid "unable to create backing store for newly created file %s"
81809b99 1928msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1929
63af42fe 1930#: builtin/apply.c:3858 builtin/apply.c:3966
81809b99 1931#, c-format
8ada9598 1932msgid "unable to add cache entry for %s"
81809b99 1933msgstr "无法为 %s 添加缓存条目"
8ada9598 1934
63af42fe 1935#: builtin/apply.c:3891
81809b99 1936#, c-format
8ada9598 1937msgid "closing file '%s'"
81809b99 1938msgstr "关闭文件 '%s'"
8ada9598 1939
63af42fe 1940#: builtin/apply.c:3940
81809b99 1941#, c-format
8ada9598 1942msgid "unable to write file '%s' mode %o"
81809b99 1943msgstr "不能写文件 '%s' 权限 %o"
8ada9598 1944
63af42fe 1945#: builtin/apply.c:4027
8ada9598
JX
1946#, c-format
1947msgid "Applied patch %s cleanly."
81809b99 1948msgstr "成功应用补丁 %s。"
8ada9598 1949
63af42fe 1950#: builtin/apply.c:4035
8ada9598 1951msgid "internal error"
81809b99 1952msgstr "内部错误"
8ada9598
JX
1953
1954#. Say this even without --verbose
63af42fe 1955#: builtin/apply.c:4038
8ada9598
JX
1956#, c-format
1957msgid "Applying patch %%s with %d reject..."
1958msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
1959msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1960msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 1961
63af42fe 1962#: builtin/apply.c:4048
8ada9598
JX
1963#, c-format
1964msgid "truncating .rej filename to %.*s.rej"
81809b99 1965msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 1966
63af42fe 1967#: builtin/apply.c:4069
8ada9598
JX
1968#, c-format
1969msgid "Hunk #%d applied cleanly."
81809b99 1970msgstr "第 #%d 个片段成功应用。"
8ada9598 1971
63af42fe 1972#: builtin/apply.c:4072
8ada9598
JX
1973#, c-format
1974msgid "Rejected hunk #%d."
81809b99 1975msgstr "拒绝第 #%d 个片段。"
8ada9598 1976
63af42fe 1977#: builtin/apply.c:4222
8ada9598 1978msgid "unrecognized input"
81809b99 1979msgstr "未能识别的输入"
8ada9598 1980
63af42fe 1981#: builtin/apply.c:4233
8ada9598 1982msgid "unable to read index file"
81809b99 1983msgstr "无法读取索引文件"
8ada9598 1984
63af42fe 1985#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91
ef317cd5 1986#: builtin/fetch.c:63
8ada9598 1987msgid "path"
81809b99 1988msgstr "路径"
8ada9598 1989
63af42fe 1990#: builtin/apply.c:4353
8ada9598 1991msgid "don't apply changes matching the given path"
81809b99 1992msgstr "不要应用与给出路径向匹配的变更"
8ada9598 1993
63af42fe 1994#: builtin/apply.c:4356
8ada9598 1995msgid "apply changes matching the given path"
81809b99 1996msgstr "应用与给出路径向匹配的变更"
8ada9598 1997
63af42fe 1998#: builtin/apply.c:4358
8ada9598 1999msgid "num"
81809b99 2000msgstr "数字"
8ada9598 2001
63af42fe 2002#: builtin/apply.c:4359
8ada9598 2003msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2004msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2005
63af42fe 2006#: builtin/apply.c:4362
8ada9598 2007msgid "ignore additions made by the patch"
81809b99 2008msgstr "忽略补丁中的添加的文件"
8ada9598 2009
63af42fe 2010#: builtin/apply.c:4364
8ada9598 2011msgid "instead of applying the patch, output diffstat for the input"
81809b99 2012msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2013
63af42fe 2014#: builtin/apply.c:4368
ef317cd5 2015msgid "show number of added and deleted lines in decimal notation"
07432cef 2016msgstr "以十进制数显示添加和删除的行数"
8ada9598 2017
63af42fe 2018#: builtin/apply.c:4370
8ada9598 2019msgid "instead of applying the patch, output a summary for the input"
81809b99 2020msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2021
63af42fe 2022#: builtin/apply.c:4372
8ada9598 2023msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2024msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2025
63af42fe 2026#: builtin/apply.c:4374
8ada9598 2027msgid "make sure the patch is applicable to the current index"
81809b99 2028msgstr "确认补丁可以应用到当前索引"
8ada9598 2029
63af42fe 2030#: builtin/apply.c:4376
8ada9598 2031msgid "apply a patch without touching the working tree"
81809b99 2032msgstr "应用补丁而不修改工作区"
8ada9598 2033
63af42fe 2034#: builtin/apply.c:4378
8ada9598 2035msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2036msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2037
63af42fe 2038#: builtin/apply.c:4380
23ff3338
JX
2039msgid "attempt three-way merge if a patch does not apply"
2040msgstr "如果一个补丁不能应用则尝试三路合并"
2041
63af42fe 2042#: builtin/apply.c:4382
8ada9598 2043msgid "build a temporary index based on embedded index information"
81809b99 2044msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2045
63af42fe 2046#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463
8ada9598 2047msgid "paths are separated with NUL character"
81809b99 2048msgstr "路径以 NUL 字符分隔"
8ada9598 2049
63af42fe 2050#: builtin/apply.c:4387
8ada9598 2051msgid "ensure at least <n> lines of context match"
81809b99 2052msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2053
63af42fe 2054#: builtin/apply.c:4388
8ada9598 2055msgid "action"
81809b99 2056msgstr "动作"
8ada9598 2057
63af42fe 2058#: builtin/apply.c:4389
8ada9598 2059msgid "detect new or modified lines that have whitespace errors"
81809b99 2060msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2061
63af42fe 2062#: builtin/apply.c:4392 builtin/apply.c:4395
8ada9598 2063msgid "ignore changes in whitespace when finding context"
81809b99 2064msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2065
63af42fe 2066#: builtin/apply.c:4398
8ada9598 2067msgid "apply the patch in reverse"
81809b99 2068msgstr "反向应用补丁"
8ada9598 2069
63af42fe 2070#: builtin/apply.c:4400
8ada9598 2071msgid "don't expect at least one line of context"
81809b99 2072msgstr "无需至少一行上下文"
8ada9598 2073
63af42fe 2074#: builtin/apply.c:4402
8ada9598 2075msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2076msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2077
63af42fe 2078#: builtin/apply.c:4404
8ada9598 2079msgid "allow overlapping hunks"
81809b99 2080msgstr "允许重叠的补丁片段"
8ada9598 2081
63af42fe 2082#: builtin/apply.c:4407
8ada9598 2083msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2084msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2085
63af42fe 2086#: builtin/apply.c:4410
8ada9598 2087msgid "do not trust the line counts in the hunk headers"
81809b99 2088msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2089
63af42fe 2090#: builtin/apply.c:4412
8ada9598 2091msgid "root"
81809b99 2092msgstr "根目录"
c04f5ac3 2093
63af42fe 2094#: builtin/apply.c:4413
8ada9598 2095msgid "prepend <root> to all filenames"
81809b99 2096msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2097
63af42fe 2098#: builtin/apply.c:4435
23ff3338
JX
2099msgid "--3way outside a repository"
2100msgstr "--3way 在一个版本库之外"
2101
63af42fe 2102#: builtin/apply.c:4443
8ada9598 2103msgid "--index outside a repository"
81809b99 2104msgstr "--index 在一个版本库之外"
c04f5ac3 2105
63af42fe 2106#: builtin/apply.c:4446
8ada9598 2107msgid "--cached outside a repository"
81809b99 2108msgstr "--cached 在一个版本库之外"
c04f5ac3 2109
63af42fe 2110#: builtin/apply.c:4462
81809b99 2111#, c-format
8ada9598 2112msgid "can't open patch '%s'"
81809b99 2113msgstr "不能打开补丁 '%s'"
c04f5ac3 2114
63af42fe 2115#: builtin/apply.c:4476
c04f5ac3 2116#, c-format
8ada9598
JX
2117msgid "squelched %d whitespace error"
2118msgid_plural "squelched %d whitespace errors"
81809b99 2119msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2120msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2121
63af42fe 2122#: builtin/apply.c:4482 builtin/apply.c:4492
8ada9598
JX
2123#, c-format
2124msgid "%d line adds whitespace errors."
2125msgid_plural "%d lines add whitespace errors."
81809b99 2126msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2127msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2128
2129#: builtin/archive.c:17
2130#, c-format
2131msgid "could not create archive file '%s'"
90e6ef53 2132msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2133
2134#: builtin/archive.c:20
2135msgid "could not redirect output"
195febda 2136msgstr "不能重定向输出"
c04f5ac3
JX
2137
2138#: builtin/archive.c:37
2139msgid "git archive: Remote with no URL"
90e6ef53 2140msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2141
2142#: builtin/archive.c:58
2143msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2144msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3
JX
2145
2146#: builtin/archive.c:63
2147#, c-format
2148msgid "git archive: NACK %s"
90e6ef53 2149msgstr "git archive:NACK %s"
c04f5ac3
JX
2150
2151#: builtin/archive.c:65
2152#, c-format
2153msgid "remote error: %s"
2154msgstr "远程错误:%s"
2155
2156#: builtin/archive.c:66
2157msgid "git archive: protocol error"
90e6ef53 2158msgstr "git archive:协议错误"
c04f5ac3
JX
2159
2160#: builtin/archive.c:71
2161msgid "git archive: expected a flush"
195febda 2162msgstr "git archive:应为刷新"
c04f5ac3 2163
ef317cd5
JX
2164#: builtin/bisect--helper.c:7
2165msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2166msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2167
2168#: builtin/bisect--helper.c:17
2169msgid "perform 'git bisect next'"
07432cef 2170msgstr "执行 'git bisect next'"
ef317cd5
JX
2171
2172#: builtin/bisect--helper.c:19
2173msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2174msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5
JX
2175
2176#: builtin/blame.c:25
2177msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2178msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5
JX
2179
2180#: builtin/blame.c:30 builtin/shortlog.c:15
2181msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2182msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2183
a77c07d9 2184#: builtin/blame.c:2350
ef317cd5 2185msgid "Show blame entries as we find them, incrementally"
07432cef 2186msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2187
a77c07d9 2188#: builtin/blame.c:2351
ef317cd5 2189msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2190msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2191
a77c07d9 2192#: builtin/blame.c:2352
ef317cd5 2193msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2194msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2195
a77c07d9 2196#: builtin/blame.c:2353
ef317cd5 2197msgid "Show work cost statistics"
07432cef 2198msgstr "显示命令消耗统计"
ef317cd5 2199
a77c07d9 2200#: builtin/blame.c:2354
ef317cd5 2201msgid "Show output score for blame entries"
07432cef 2202msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2203
a77c07d9 2204#: builtin/blame.c:2355
ef317cd5 2205msgid "Show original filename (Default: auto)"
07432cef 2206msgstr "显示原始文件名(默认:自动)"
ef317cd5 2207
a77c07d9 2208#: builtin/blame.c:2356
ef317cd5 2209msgid "Show original linenumber (Default: off)"
07432cef 2210msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2211
a77c07d9 2212#: builtin/blame.c:2357
ef317cd5 2213msgid "Show in a format designed for machine consumption"
07432cef 2214msgstr "显示为一个适合机器读取的格式"
ef317cd5 2215
a77c07d9 2216#: builtin/blame.c:2358
ef317cd5 2217msgid "Show porcelain format with per-line commit information"
07432cef 2218msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2219
a77c07d9 2220#: builtin/blame.c:2359
ef317cd5 2221msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2222msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2223
a77c07d9 2224#: builtin/blame.c:2360
ef317cd5 2225msgid "Show raw timestamp (Default: off)"
07432cef 2226msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2227
a77c07d9 2228#: builtin/blame.c:2361
ef317cd5 2229msgid "Show long commit SHA1 (Default: off)"
07432cef 2230msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2231
a77c07d9 2232#: builtin/blame.c:2362
ef317cd5 2233msgid "Suppress author name and timestamp (Default: off)"
07432cef 2234msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2235
a77c07d9 2236#: builtin/blame.c:2363
ef317cd5 2237msgid "Show author email instead of name (Default: off)"
07432cef 2238msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2239
a77c07d9 2240#: builtin/blame.c:2364
ef317cd5 2241msgid "Ignore whitespace differences"
07432cef 2242msgstr "忽略空白差异"
ef317cd5 2243
a77c07d9 2244#: builtin/blame.c:2365
ef317cd5 2245msgid "Spend extra cycles to find better match"
07432cef 2246msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2247
a77c07d9 2248#: builtin/blame.c:2366
ef317cd5 2249msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2250msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2251
a77c07d9 2252#: builtin/blame.c:2367
ef317cd5 2253msgid "Use <file>'s contents as the final image"
07432cef 2254msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2255
a77c07d9 2256#: builtin/blame.c:2368 builtin/blame.c:2369
ef317cd5 2257msgid "score"
07432cef 2258msgstr "得分"
ef317cd5 2259
a77c07d9 2260#: builtin/blame.c:2368
ef317cd5 2261msgid "Find line copies within and across files"
07432cef 2262msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2263
a77c07d9 2264#: builtin/blame.c:2369
ef317cd5 2265msgid "Find line movements within and across files"
07432cef 2266msgstr "找到文件内及跨文件的行移动"
ef317cd5 2267
a77c07d9 2268#: builtin/blame.c:2370
ef317cd5 2269msgid "n,m"
07432cef 2270msgstr "n,m"
ef317cd5 2271
a77c07d9 2272#: builtin/blame.c:2370
ef317cd5 2273msgid "Process only line range n,m, counting from 1"
07432cef 2274msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5
JX
2275
2276#: builtin/branch.c:23
2277msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2278msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5
JX
2279
2280#: builtin/branch.c:24
2281msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2282msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5
JX
2283
2284#: builtin/branch.c:25
ef317cd5 2285msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2286msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5
JX
2287
2288#: builtin/branch.c:26
2289msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2290msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2291
90e6ef53 2292# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
ef317cd5 2293#: builtin/branch.c:145
c04f5ac3
JX
2294#, c-format
2295msgid ""
2296"deleting branch '%s' that has been merged to\n"
2297" '%s', but not yet merged to HEAD."
2298msgstr ""
70fc47bf 2299"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2300" '%s',但未合并到 HEAD。"
2301
90e6ef53 2302# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
ef317cd5 2303#: builtin/branch.c:149
c04f5ac3
JX
2304#, c-format
2305msgid ""
2306"not deleting branch '%s' that is not yet merged to\n"
2307" '%s', even though it is merged to HEAD."
2308msgstr ""
70fc47bf
T
2309"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2310" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2311
07432cef
WS
2312#: builtin/branch.c:163
2313#, c-format
2314msgid "Couldn't look up commit object for '%s'"
2315msgstr "无法查询 '%s' 指向的提交对象"
2316
2317#: builtin/branch.c:167
2318#, c-format
2319msgid ""
2320"The branch '%s' is not fully merged.\n"
2321"If you are sure you want to delete it, run 'git branch -D %s'."
2322msgstr ""
2323"分支 '%s' 没有完全合并。\n"
2324"如果您确认要删除它,执行 'git branch -D %s'。"
2325
2326#: builtin/branch.c:180
2327msgid "Update of config-file failed"
2328msgstr "无法更新 config 文件"
2329
2330#: builtin/branch.c:208
c04f5ac3 2331msgid "cannot use -a with -d"
649900bc 2332msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2333
07432cef 2334#: builtin/branch.c:214
c04f5ac3
JX
2335msgid "Couldn't look up commit object for HEAD"
2336msgstr "无法查询 HEAD 指向的提交对象"
2337
07432cef 2338#: builtin/branch.c:222
c04f5ac3
JX
2339#, c-format
2340msgid "Cannot delete the branch '%s' which you are currently on."
2341msgstr "无法删除您当前所在的分支 '%s'。"
2342
07432cef 2343#: builtin/branch.c:235
5ae481e0 2344#, c-format
8ada9598 2345msgid "remote branch '%s' not found."
81809b99 2346msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2347
07432cef 2348#: builtin/branch.c:236
81809b99 2349#, c-format
8ada9598 2350msgid "branch '%s' not found."
81809b99 2351msgstr "分支 '%s' 未发现。"
8ada9598 2352
07432cef 2353#: builtin/branch.c:250
81809b99 2354#, c-format
8ada9598 2355msgid "Error deleting remote branch '%s'"
81809b99 2356msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2357
07432cef 2358#: builtin/branch.c:251
81809b99 2359#, c-format
8ada9598 2360msgid "Error deleting branch '%s'"
81809b99 2361msgstr "删除分支 '%s' 时出错"
8ada9598 2362
07432cef 2363#: builtin/branch.c:258
81809b99 2364#, c-format
8ada9598 2365msgid "Deleted remote branch %s (was %s).\n"
81809b99 2366msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2367
07432cef 2368#: builtin/branch.c:259
81809b99 2369#, c-format
8ada9598 2370msgid "Deleted branch %s (was %s).\n"
81809b99 2371msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2372
07432cef 2373#: builtin/branch.c:361
c04f5ac3
JX
2374#, c-format
2375msgid "branch '%s' does not point at a commit"
2376msgstr "分支 '%s' 未指向一个提交"
2377
07432cef 2378#: builtin/branch.c:433
81809b99 2379#, c-format
8ada9598 2380msgid "[%s: behind %d]"
81809b99 2381msgstr "[%s:落后 %d]"
c04f5ac3 2382
07432cef 2383#: builtin/branch.c:435
81809b99 2384#, c-format
8ada9598 2385msgid "[behind %d]"
81809b99 2386msgstr "[落后 %d]"
8ada9598 2387
07432cef 2388#: builtin/branch.c:439
81809b99 2389#, c-format
8ada9598 2390msgid "[%s: ahead %d]"
81809b99 2391msgstr "[%s:领先 %d]"
c04f5ac3 2392
07432cef 2393#: builtin/branch.c:441
81809b99 2394#, c-format
8ada9598 2395msgid "[ahead %d]"
81809b99 2396msgstr "[领先 %d]"
8ada9598 2397
07432cef 2398#: builtin/branch.c:444
81809b99 2399#, c-format
8ada9598 2400msgid "[%s: ahead %d, behind %d]"
81809b99 2401msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2402
07432cef 2403#: builtin/branch.c:447
81809b99 2404#, c-format
8ada9598 2405msgid "[ahead %d, behind %d]"
81809b99 2406msgstr "[领先 %d,落后 %d]"
c04f5ac3 2407
a77c07d9
JX
2408#: builtin/branch.c:469
2409msgid " **** invalid ref ****"
2410msgstr " **** 无效引用 ****"
2411
07432cef 2412#: builtin/branch.c:560
c04f5ac3
JX
2413msgid "(no branch)"
2414msgstr "(非分支)"
2415
a77c07d9
JX
2416#: builtin/branch.c:593
2417#, c-format
2418msgid "object '%s' does not point to a commit"
2419msgstr "对象 '%s' 没有指向一个提交"
2420
07432cef 2421#: builtin/branch.c:625
c04f5ac3 2422msgid "some refs could not be read"
90e6ef53 2423msgstr "一些引用不能读取"
c04f5ac3 2424
07432cef 2425#: builtin/branch.c:638
c04f5ac3 2426msgid "cannot rename the current branch while not on any."
90e6ef53 2427msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2428
07432cef 2429#: builtin/branch.c:648
c04f5ac3
JX
2430#, c-format
2431msgid "Invalid branch name: '%s'"
2432msgstr "无效的分支名:'%s'"
2433
07432cef 2434#: builtin/branch.c:663
c04f5ac3
JX
2435msgid "Branch rename failed"
2436msgstr "分支重命名失败"
2437
07432cef 2438#: builtin/branch.c:667
c04f5ac3
JX
2439#, c-format
2440msgid "Renamed a misnamed branch '%s' away"
2441msgstr "重命名掉一个错误命名的旧分支 '%s'"
2442
07432cef 2443#: builtin/branch.c:671
c04f5ac3
JX
2444#, c-format
2445msgid "Branch renamed to %s, but HEAD is not updated!"
2446msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2447
07432cef 2448#: builtin/branch.c:678
c04f5ac3
JX
2449msgid "Branch is renamed, but update of config-file failed"
2450msgstr "分支被重命名,但更新 config 文件失败"
2451
07432cef 2452#: builtin/branch.c:693
c04f5ac3
JX
2453#, c-format
2454msgid "malformed object name %s"
2455msgstr "非法的对象名 %s"
2456
07432cef 2457#: builtin/branch.c:717
81809b99 2458#, c-format
8ada9598 2459msgid "could not write branch description template: %s"
81809b99 2460msgstr "不能写分支描述模版:%s"
c04f5ac3 2461
07432cef 2462#: builtin/branch.c:747
ef317cd5 2463msgid "Generic options"
07432cef 2464msgstr "通用选项"
c04f5ac3 2465
07432cef 2466#: builtin/branch.c:749
ef317cd5 2467msgid "show hash and subject, give twice for upstream branch"
07432cef 2468msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2469
07432cef 2470#: builtin/branch.c:750
ef317cd5 2471msgid "suppress informational messages"
07432cef 2472msgstr "不显示信息"
8ada9598 2473
07432cef 2474#: builtin/branch.c:751
ef317cd5 2475msgid "set up tracking mode (see git-pull(1))"
07432cef 2476msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2477
07432cef 2478#: builtin/branch.c:753
ef317cd5 2479msgid "change upstream info"
07432cef 2480msgstr "改变上游信息"
c04f5ac3 2481
07432cef 2482#: builtin/branch.c:757
ef317cd5 2483msgid "use colored output"
07432cef 2484msgstr "使用彩色输出"
c04f5ac3 2485
07432cef 2486#: builtin/branch.c:758
ef317cd5 2487msgid "act on remote-tracking branches"
07432cef 2488msgstr "作用于远程跟踪分支"
c04f5ac3 2489
07432cef 2490#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
a77c07d9
JX
2491#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
2492#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
ef317cd5 2493msgid "commit"
07432cef 2494msgstr "提交"
c04f5ac3 2495
07432cef 2496#: builtin/branch.c:762 builtin/branch.c:768
ef317cd5 2497msgid "print only branches that contain the commit"
07432cef 2498msgstr "只打印包含该提交的分支"
c04f5ac3 2499
07432cef 2500#: builtin/branch.c:774
ef317cd5 2501msgid "Specific git-branch actions:"
07432cef 2502msgstr "具体的 git-branch 动作:"
c04f5ac3 2503
07432cef 2504#: builtin/branch.c:775
ef317cd5 2505msgid "list both remote-tracking and local branches"
07432cef 2506msgstr "列出远程跟踪及本地分支"
c04f5ac3 2507
07432cef 2508#: builtin/branch.c:777
ef317cd5 2509msgid "delete fully merged branch"
07432cef 2510msgstr "删除完全合并的分支"
c04f5ac3 2511
07432cef 2512#: builtin/branch.c:778
ef317cd5 2513msgid "delete branch (even if not merged)"
07432cef 2514msgstr "删除分支(即使没有合并)"
c04f5ac3 2515
07432cef 2516#: builtin/branch.c:779
ef317cd5 2517msgid "move/rename a branch and its reflog"
07432cef 2518msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 2519
07432cef 2520#: builtin/branch.c:780
ef317cd5 2521msgid "move/rename a branch, even if target exists"
07432cef 2522msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 2523
07432cef 2524#: builtin/branch.c:781
ef317cd5 2525msgid "list branch names"
07432cef 2526msgstr "列出分支名"
c04f5ac3 2527
07432cef 2528#: builtin/branch.c:782
ef317cd5 2529msgid "create the branch's reflog"
07432cef 2530msgstr "创建分支的引用日志"
ef317cd5 2531
07432cef 2532#: builtin/branch.c:784
ef317cd5 2533msgid "edit the description for the branch"
07432cef 2534msgstr "标记分支的描述"
ef317cd5 2535
07432cef 2536#: builtin/branch.c:785
ef317cd5 2537msgid "force creation (when already exists)"
07432cef 2538msgstr "强制创建(当已经存在)"
ef317cd5 2539
07432cef 2540#: builtin/branch.c:788
ef317cd5 2541msgid "print only not merged branches"
07432cef 2542msgstr "只打印没有合并的分支"
ef317cd5 2543
07432cef 2544#: builtin/branch.c:794
ef317cd5 2545msgid "print only merged branches"
07432cef 2546msgstr "只打印合并的分支"
ef317cd5 2547
07432cef 2548#: builtin/branch.c:798
ef317cd5 2549msgid "list branches in columns"
07432cef 2550msgstr "以列的方式显示分支"
ef317cd5 2551
07432cef 2552#: builtin/branch.c:811
c04f5ac3
JX
2553msgid "Failed to resolve HEAD as a valid ref."
2554msgstr "无法将 HEAD 解析为有效引用。"
2555
07432cef 2556#: builtin/branch.c:816 builtin/clone.c:561
c04f5ac3 2557msgid "HEAD not found below refs/heads!"
90e6ef53 2558msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 2559
a77c07d9 2560#: builtin/branch.c:839
8ada9598 2561msgid "--column and --verbose are incompatible"
81809b99 2562msgstr "--column 和 --verbose 不兼容"
8ada9598 2563
a77c07d9
JX
2564#: builtin/branch.c:845
2565msgid "branch name required"
2566msgstr "必须提供分支名"
2567
2568#: builtin/branch.c:860
2569msgid "Cannot give description to detached HEAD"
2570msgstr "不能向分离头指针提供描述"
2571
2572#: builtin/branch.c:865
2573msgid "cannot edit description of more than one branch"
2574msgstr "不能为一个以上的分支编辑描述"
2575
2576#: builtin/branch.c:872
2577#, c-format
2578msgid "No commit on branch '%s' yet."
2579msgstr "分支 '%s' 尚无提交。"
2580
2581#: builtin/branch.c:875
2582#, c-format
2583msgid "No branch named '%s'."
2584msgstr "没有分支 '%s'。"
2585
2586#: builtin/branch.c:888
2587msgid "too many branches for a rename operation"
2588msgstr "为重命名操作提供了太多的分支名"
2589
2590#: builtin/branch.c:893
07432cef 2591#, c-format
ef317cd5 2592msgid "branch '%s' does not exist"
07432cef 2593msgstr "分支 '%s' 不存在"
ef317cd5 2594
a77c07d9 2595#: builtin/branch.c:905
ef317cd5
JX
2596#, c-format
2597msgid "Branch '%s' has no upstream information"
07432cef 2598msgstr "分支 '%s' 没有上游信息"
ef317cd5 2599
a77c07d9 2600#: builtin/branch.c:920
c04f5ac3
JX
2601msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2602msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2603
a77c07d9 2604#: builtin/branch.c:923
ef317cd5
JX
2605#, c-format
2606msgid ""
2607"The --set-upstream flag is deprecated and will be removed. Consider using --"
2608"track or --set-upstream-to\n"
2609msgstr ""
07432cef 2610"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 2611
a77c07d9 2612#: builtin/branch.c:940
ef317cd5
JX
2613#, c-format
2614msgid ""
2615"\n"
2616"If you wanted to make '%s' track '%s', do this:\n"
2617"\n"
2618msgstr ""
07432cef
WS
2619"\n"
2620"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2621"\n"
ef317cd5 2622
a77c07d9 2623#: builtin/branch.c:941
07432cef 2624#, c-format
ef317cd5 2625msgid " git branch -d %s\n"
07432cef 2626msgstr " git branch -d %s\n"
ef317cd5 2627
a77c07d9 2628#: builtin/branch.c:942
ef317cd5
JX
2629#, c-format
2630msgid " git branch --set-upstream-to %s\n"
07432cef 2631msgstr " git branch --set-upstream-to %s\n"
ef317cd5 2632
c04f5ac3
JX
2633#: builtin/bundle.c:47
2634#, c-format
2635msgid "%s is okay\n"
2636msgstr "%s 可以\n"
2637
2638#: builtin/bundle.c:56
2639msgid "Need a repository to create a bundle."
90e6ef53 2640msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
2641
2642#: builtin/bundle.c:60
2643msgid "Need a repository to unbundle."
90e6ef53 2644msgstr "需要一个版本库来解包。"
c04f5ac3 2645
ef317cd5
JX
2646#: builtin/cat-file.c:247
2647msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 2648msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5
JX
2649
2650#: builtin/cat-file.c:248
2651msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 2652msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5
JX
2653
2654#: builtin/cat-file.c:266
2655msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 2656msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5
JX
2657
2658#: builtin/cat-file.c:267
ef317cd5 2659msgid "show object type"
07432cef 2660msgstr "显示对象类型"
ef317cd5
JX
2661
2662#: builtin/cat-file.c:268
ef317cd5 2663msgid "show object size"
07432cef 2664msgstr "显示对象大小"
ef317cd5
JX
2665
2666#: builtin/cat-file.c:270
2667msgid "exit with zero when there's no error"
07432cef 2668msgstr "当没有错误时退出并返回零"
ef317cd5
JX
2669
2670#: builtin/cat-file.c:271
2671msgid "pretty-print object's content"
07432cef 2672msgstr "美观地打印对象的内容"
ef317cd5
JX
2673
2674#: builtin/cat-file.c:273
2675msgid "for blob objects, run textconv on object's content"
07432cef 2676msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5
JX
2677
2678#: builtin/cat-file.c:275
2679msgid "show info and content of objects fed from the standard input"
07432cef 2680msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5
JX
2681
2682#: builtin/cat-file.c:278
ef317cd5 2683msgid "show info about objects fed from the standard input"
07432cef 2684msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
2685
2686#: builtin/check-attr.c:11
2687msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 2688msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
2689
2690#: builtin/check-attr.c:12
07432cef
WS
2691msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2692msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
2693
2694#: builtin/check-attr.c:19
2695msgid "report all attributes set on file"
07432cef 2696msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
2697
2698#: builtin/check-attr.c:20
2699msgid "use .gitattributes only from the index"
07432cef 2700msgstr "只使用索引中的 .gitattributes"
ef317cd5 2701
a77c07d9 2702#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
ef317cd5 2703msgid "read file names from stdin"
07432cef 2704msgstr "从标准输入读出文件名"
ef317cd5 2705
a77c07d9 2706#: builtin/check-attr.c:23 builtin/check-ignore.c:24
ef317cd5 2707msgid "input paths are terminated by a null character"
07432cef 2708msgstr "输入路径以null字符终止"
ef317cd5 2709
a77c07d9
JX
2710#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
2711msgid "suppress progress reporting"
2712msgstr "不显示进度报告"
2713
2714#: builtin/check-ignore.c:151
2715msgid "cannot specify pathnames with --stdin"
2716msgstr "不能同时提供路径及 --stdin 参数"
2717
2718#: builtin/check-ignore.c:154
2719msgid "-z only makes sense with --stdin"
2720msgstr "-z 需要和 --stdin 参数共用才有意义"
2721
2722#: builtin/check-ignore.c:156
2723msgid "no path specified"
2724msgstr "未指定路径"
2725
2726#: builtin/check-ignore.c:160
2727msgid "--quiet is only valid with a single pathname"
2728msgstr "参数 --quiet 只在提供一个路径名时有效"
2729
2730#: builtin/check-ignore.c:162
2731msgid "cannot have both --quiet and --verbose"
2732msgstr "不能同时提供 --quiet 和 --verbose 参数"
2733
ef317cd5
JX
2734#: builtin/checkout-index.c:126
2735msgid "git checkout-index [options] [--] [<file>...]"
07432cef 2736msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5
JX
2737
2738#: builtin/checkout-index.c:187
2739msgid "check out all files in the index"
07432cef 2740msgstr "检出索引区的所有文件"
ef317cd5
JX
2741
2742#: builtin/checkout-index.c:188
2743msgid "force overwrite of existing files"
07432cef 2744msgstr "强制覆盖现有的文件"
ef317cd5
JX
2745
2746#: builtin/checkout-index.c:190
2747msgid "no warning for existing files and files not in index"
07432cef 2748msgstr "存在或不在索引中的文件都没有警告"
ef317cd5
JX
2749
2750#: builtin/checkout-index.c:192
ef317cd5 2751msgid "don't checkout new files"
07432cef 2752msgstr "不检出新文件"
ef317cd5
JX
2753
2754#: builtin/checkout-index.c:194
ef317cd5 2755msgid "update stat information in the index file"
07432cef 2756msgstr "更新索引中文件的状态信息"
ef317cd5
JX
2757
2758#: builtin/checkout-index.c:200
ef317cd5 2759msgid "read list of paths from the standard input"
07432cef 2760msgstr "从标准输入读取路径列表"
ef317cd5
JX
2761
2762#: builtin/checkout-index.c:202
2763msgid "write the content to temporary files"
07432cef 2764msgstr "将内容写入临时文件"
ef317cd5
JX
2765
2766#: builtin/checkout-index.c:203 builtin/column.c:30
2767msgid "string"
07432cef 2768msgstr "字符串"
ef317cd5
JX
2769
2770#: builtin/checkout-index.c:204
2771msgid "when creating files, prepend <string>"
07432cef 2772msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5
JX
2773
2774#: builtin/checkout-index.c:207
2775msgid "copy out the files from named stage"
07432cef 2776msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
2777
2778#: builtin/checkout.c:25
ef317cd5 2779msgid "git checkout [options] <branch>"
07432cef 2780msgstr "git checkout [选项] <分支>"
ef317cd5
JX
2781
2782#: builtin/checkout.c:26
ef317cd5 2783msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 2784msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5
JX
2785
2786#: builtin/checkout.c:116 builtin/checkout.c:149
c04f5ac3
JX
2787#, c-format
2788msgid "path '%s' does not have our version"
2789msgstr "路径 '%s' 没有我们的版本"
2790
ef317cd5 2791#: builtin/checkout.c:118 builtin/checkout.c:151
c04f5ac3
JX
2792#, c-format
2793msgid "path '%s' does not have their version"
2794msgstr "路径 '%s' 没有他们的版本"
2795
ef317cd5 2796#: builtin/checkout.c:134
c04f5ac3
JX
2797#, c-format
2798msgid "path '%s' does not have all necessary versions"
2799msgstr "路径 '%s' 没有全部必须的版本"
2800
ef317cd5 2801#: builtin/checkout.c:178
c04f5ac3
JX
2802#, c-format
2803msgid "path '%s' does not have necessary versions"
2804msgstr "路径 '%s' 没有必须的版本"
2805
ef317cd5 2806#: builtin/checkout.c:195
c04f5ac3
JX
2807#, c-format
2808msgid "path '%s': cannot merge"
90e6ef53 2809msgstr "path '%s':无法合并"
c04f5ac3 2810
ef317cd5 2811#: builtin/checkout.c:212
c04f5ac3
JX
2812#, c-format
2813msgid "Unable to add merge result for '%s'"
2814msgstr "无法为 '%s' 添加合并结果"
2815
ef317cd5
JX
2816#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2817#: builtin/checkout.c:245
07432cef 2818#, c-format
ef317cd5 2819msgid "'%s' cannot be used with updating paths"
07432cef 2820msgstr "'%s' 不能在更新路径时使用"
ef317cd5
JX
2821
2822#: builtin/checkout.c:248 builtin/checkout.c:251
07432cef 2823#, c-format
ef317cd5 2824msgid "'%s' cannot be used with %s"
07432cef 2825msgstr "'%s' 不能和 %s 同时使用"
ef317cd5
JX
2826
2827#: builtin/checkout.c:254
2828#, c-format
2829msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 2830msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5
JX
2831
2832#: builtin/checkout.c:265 builtin/checkout.c:426
c04f5ac3 2833msgid "corrupt index file"
90e6ef53 2834msgstr "损坏的索引文件"
c04f5ac3 2835
ef317cd5 2836#: builtin/checkout.c:295 builtin/checkout.c:302
c04f5ac3
JX
2837#, c-format
2838msgid "path '%s' is unmerged"
2839msgstr "路径 '%s' 未合并"
2840
ef317cd5 2841#: builtin/checkout.c:448
c04f5ac3 2842msgid "you need to resolve your current index first"
90e6ef53 2843msgstr "您需要先解决当前索引的冲突"
c04f5ac3 2844
ef317cd5 2845#: builtin/checkout.c:569
c04f5ac3
JX
2846#, c-format
2847msgid "Can not do reflog for '%s'\n"
90e6ef53 2848msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 2849
ef317cd5 2850#: builtin/checkout.c:602
c04f5ac3
JX
2851msgid "HEAD is now at"
2852msgstr "HEAD 目前位于"
2853
ef317cd5 2854#: builtin/checkout.c:609
c04f5ac3
JX
2855#, c-format
2856msgid "Reset branch '%s'\n"
2857msgstr "重置分支 '%s'\n"
2858
ef317cd5 2859#: builtin/checkout.c:612
c04f5ac3
JX
2860#, c-format
2861msgid "Already on '%s'\n"
2862msgstr "已经位于 '%s'\n"
2863
ef317cd5 2864#: builtin/checkout.c:616
c04f5ac3
JX
2865#, c-format
2866msgid "Switched to and reset branch '%s'\n"
2867msgstr "切换并重置分支 '%s'\n"
2868
07432cef 2869#: builtin/checkout.c:618 builtin/checkout.c:955
c04f5ac3
JX
2870#, c-format
2871msgid "Switched to a new branch '%s'\n"
2872msgstr "切换到一个新分支 '%s'\n"
2873
ef317cd5 2874#: builtin/checkout.c:620
c04f5ac3
JX
2875#, c-format
2876msgid "Switched to branch '%s'\n"
2877msgstr "切换到分支 '%s'\n"
2878
90e6ef53 2879# 译者:注意保持前导空格
ef317cd5 2880#: builtin/checkout.c:676
c04f5ac3
JX
2881#, c-format
2882msgid " ... and %d more.\n"
90e6ef53 2883msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
2884
2885#. The singular version
ef317cd5 2886#: builtin/checkout.c:682
c04f5ac3
JX
2887#, c-format
2888msgid ""
2889"Warning: you are leaving %d commit behind, not connected to\n"
2890"any of your branches:\n"
2891"\n"
2892"%s\n"
2893msgid_plural ""
2894"Warning: you are leaving %d commits behind, not connected to\n"
2895"any of your branches:\n"
2896"\n"
2897"%s\n"
2898msgstr[0] ""
2899"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2900"\n"
2901"%s\n"
5ae481e0
JX
2902msgstr[1] ""
2903"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2904"\n"
2905"%s\n"
c04f5ac3 2906
ef317cd5 2907#: builtin/checkout.c:700
c04f5ac3
JX
2908#, c-format
2909msgid ""
2910"If you want to keep them by creating a new branch, this may be a good time\n"
2911"to do so with:\n"
2912"\n"
2913" git branch new_branch_name %s\n"
2914"\n"
2915msgstr ""
2916"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2917"如下操作:\n"
2918"\n"
2919" git branch new_branch_name %s\n"
2920"\n"
2921
ef317cd5 2922#: builtin/checkout.c:730
c04f5ac3
JX
2923msgid "internal error in revision walk"
2924msgstr "在版本遍历时遇到内部错误"
2925
ef317cd5 2926#: builtin/checkout.c:734
c04f5ac3
JX
2927msgid "Previous HEAD position was"
2928msgstr "之前的 HEAD 位置是"
2929
ef317cd5 2930#: builtin/checkout.c:761 builtin/checkout.c:950
c04f5ac3 2931msgid "You are on a branch yet to be born"
90e6ef53 2932msgstr "您位于一个尚未初始化的分支"
c04f5ac3
JX
2933
2934#. case (1)
ef317cd5 2935#: builtin/checkout.c:886
c04f5ac3
JX
2936#, c-format
2937msgid "invalid reference: %s"
2938msgstr "无效引用:%s"
2939
2940#. case (1): want a tree
ef317cd5 2941#: builtin/checkout.c:925
c04f5ac3
JX
2942#, c-format
2943msgid "reference is not a tree: %s"
2944msgstr "引用不是一个树:%s"
2945
07432cef 2946#: builtin/checkout.c:964
ef317cd5 2947msgid "paths cannot be used with switching branches"
07432cef 2948msgstr "路径不能和切换分支同时使用"
c04f5ac3 2949
07432cef
WS
2950#: builtin/checkout.c:967 builtin/checkout.c:971
2951#, c-format
ef317cd5 2952msgid "'%s' cannot be used with switching branches"
07432cef 2953msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 2954
07432cef
WS
2955#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2956#: builtin/checkout.c:986
2957#, c-format
ef317cd5 2958msgid "'%s' cannot be used with '%s'"
07432cef 2959msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 2960
07432cef
WS
2961#: builtin/checkout.c:991
2962#, c-format
ef317cd5 2963msgid "Cannot switch branch to a non-commit '%s'"
07432cef 2964msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 2965
07432cef 2966#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
ef317cd5 2967#: builtin/remote.c:169 builtin/remote.c:171
ef317cd5 2968msgid "branch"
07432cef 2969msgstr "分支"
c04f5ac3 2970
07432cef 2971#: builtin/checkout.c:1014
ef317cd5 2972msgid "create and checkout a new branch"
07432cef 2973msgstr "创建并检出一个新的分支"
c04f5ac3 2974
07432cef 2975#: builtin/checkout.c:1016
ef317cd5 2976msgid "create/reset and checkout a branch"
07432cef 2977msgstr "创建/重置并检出一个分支"
c04f5ac3 2978
07432cef 2979#: builtin/checkout.c:1017
ef317cd5 2980msgid "create reflog for new branch"
07432cef 2981msgstr "为新的分支创建引用日志"
ef317cd5 2982
07432cef 2983#: builtin/checkout.c:1018
ef317cd5 2984msgid "detach the HEAD at named commit"
07432cef 2985msgstr "成为指向该提交的分离头指针"
ef317cd5 2986
07432cef 2987#: builtin/checkout.c:1019
ef317cd5 2988msgid "set upstream info for new branch"
07432cef 2989msgstr "为新的分支设置上游信息"
ef317cd5 2990
07432cef 2991#: builtin/checkout.c:1021
ef317cd5 2992msgid "new branch"
07432cef 2993msgstr "新分支"
ef317cd5 2994
07432cef 2995#: builtin/checkout.c:1021
ef317cd5 2996msgid "new unparented branch"
07432cef 2997msgstr "新的没有父提交的分支"
ef317cd5 2998
07432cef 2999#: builtin/checkout.c:1022
ef317cd5 3000msgid "checkout our version for unmerged files"
07432cef 3001msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3002
07432cef 3003#: builtin/checkout.c:1024
ef317cd5 3004msgid "checkout their version for unmerged files"
07432cef 3005msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3006
07432cef 3007#: builtin/checkout.c:1026
ef317cd5 3008msgid "force checkout (throw away local modifications)"
07432cef 3009msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3010
07432cef 3011#: builtin/checkout.c:1027
ef317cd5 3012msgid "perform a 3-way merge with the new branch"
07432cef 3013msgstr "和新的分支执行三路合并"
ef317cd5 3014
07432cef 3015#: builtin/checkout.c:1028 builtin/merge.c:215
ef317cd5 3016msgid "update ignored files (default)"
07432cef 3017msgstr "更新忽略的文件(默认)"
c04f5ac3 3018
07432cef 3019#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
ef317cd5 3020msgid "style"
07432cef 3021msgstr "风格"
ef317cd5 3022
07432cef 3023#: builtin/checkout.c:1030
ef317cd5 3024msgid "conflict style (merge or diff3)"
07432cef 3025msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3026
07432cef 3027#: builtin/checkout.c:1033
ef317cd5 3028msgid "second guess 'git checkout no-such-branch'"
07432cef 3029msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 3030
07432cef 3031#: builtin/checkout.c:1057
ef317cd5 3032msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3033msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3034
07432cef 3035#: builtin/checkout.c:1074
ef317cd5
JX
3036msgid "--track needs a branch name"
3037msgstr "--track 需要一个分支名"
3038
07432cef 3039#: builtin/checkout.c:1081
ef317cd5
JX
3040msgid "Missing branch name; try -b"
3041msgstr "缺少分支名;尝试 -b"
3042
07432cef 3043#: builtin/checkout.c:1116
c04f5ac3 3044msgid "invalid path specification"
90e6ef53 3045msgstr "无效的路径规格"
c04f5ac3 3046
07432cef
WS
3047#: builtin/checkout.c:1123
3048#, c-format
c04f5ac3 3049msgid ""
ef317cd5 3050"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3051"Did you intend to checkout '%s' which can not be resolved as commit?"
3052msgstr ""
07432cef
WS
3053"不能同时更新路径并切换到分支'%s'。\n"
3054"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3055
07432cef
WS
3056#: builtin/checkout.c:1128
3057#, c-format
ef317cd5 3058msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3059msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3060
07432cef 3061#: builtin/checkout.c:1132
c04f5ac3
JX
3062msgid ""
3063"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3064"checking out of the index."
3065msgstr ""
90e6ef53 3066"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3067
07432cef 3068#: builtin/clean.c:20
ef317cd5 3069msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
07432cef 3070msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3071
07432cef
WS
3072#: builtin/clean.c:24
3073#, c-format
3074msgid "Removing %s\n"
3075msgstr "正删除 %s\n"
3076
3077#: builtin/clean.c:25
3078#, c-format
3079msgid "Would remove %s\n"
3080msgstr "将删除 %s\n"
3081
3082#: builtin/clean.c:26
3083#, c-format
3084msgid "Skipping repository %s\n"
3085msgstr "忽略版本库 %s\n"
3086
3087#: builtin/clean.c:27
3088#, c-format
3089msgid "Would skip repository %s\n"
3090msgstr "将忽略版本库 %s\n"
3091
3092#: builtin/clean.c:28
3093#, c-format
3094msgid "failed to remove %s"
3095msgstr "无法删除 %s"
3096
a77c07d9 3097#: builtin/clean.c:160
ef317cd5 3098msgid "do not print names of files removed"
07432cef 3099msgstr "不打印删除文件的名称"
ef317cd5 3100
a77c07d9 3101#: builtin/clean.c:162
ef317cd5 3102msgid "force"
07432cef 3103msgstr "强制"
ef317cd5 3104
a77c07d9 3105#: builtin/clean.c:164
ef317cd5 3106msgid "remove whole directories"
07432cef 3107msgstr "删除整个目录"
ef317cd5 3108
a77c07d9
JX
3109#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
3110#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
ef317cd5 3111msgid "pattern"
07432cef 3112msgstr "模式"
ef317cd5 3113
a77c07d9 3114#: builtin/clean.c:166
ef317cd5 3115msgid "add <pattern> to ignore rules"
07432cef 3116msgstr "添加<模式>到忽略规则"
ef317cd5 3117
a77c07d9 3118#: builtin/clean.c:167
ef317cd5 3119msgid "remove ignored files, too"
07432cef 3120msgstr "也删除忽略的文件"
ef317cd5 3121
a77c07d9 3122#: builtin/clean.c:169
ef317cd5 3123msgid "remove only ignored files"
07432cef 3124msgstr "只删除忽略的文件"
c04f5ac3 3125
a77c07d9 3126#: builtin/clean.c:187
c04f5ac3 3127msgid "-x and -X cannot be used together"
649900bc 3128msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3129
a77c07d9 3130#: builtin/clean.c:191
c04f5ac3
JX
3131msgid ""
3132"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3133msgstr ""
90e6ef53 3134"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3135
a77c07d9 3136#: builtin/clean.c:194
c04f5ac3
JX
3137msgid ""
3138"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3139"clean"
3140msgstr ""
90e6ef53 3141"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3142
ef317cd5
JX
3143#: builtin/clone.c:36
3144msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3145msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5
JX
3146
3147#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
a77c07d9 3148#: builtin/push.c:436
ef317cd5 3149msgid "force progress reporting"
07432cef 3150msgstr "强制显示进度报告"
ef317cd5
JX
3151
3152#: builtin/clone.c:66
3153msgid "don't create a checkout"
07432cef 3154msgstr "不创建一个检出"
ef317cd5
JX
3155
3156#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
ef317cd5 3157msgid "create a bare repository"
07432cef 3158msgstr "创建一个裸版本库"
ef317cd5
JX
3159
3160#: builtin/clone.c:72
3161msgid "create a mirror repository (implies bare)"
07432cef 3162msgstr "创建一个镜像版本库(也是裸版本库)"
ef317cd5
JX
3163
3164#: builtin/clone.c:74
3165msgid "to clone from a local repository"
07432cef 3166msgstr "从本地版本库克隆"
ef317cd5
JX
3167
3168#: builtin/clone.c:76
3169msgid "don't use local hardlinks, always copy"
07432cef 3170msgstr "不使用本地硬链接,始终复制"
ef317cd5
JX
3171
3172#: builtin/clone.c:78
ef317cd5 3173msgid "setup as shared repository"
07432cef 3174msgstr "设置为共享版本库"
ef317cd5
JX
3175
3176#: builtin/clone.c:80 builtin/clone.c:82
3177msgid "initialize submodules in the clone"
07432cef 3178msgstr "在克隆时初始化子模组"
ef317cd5
JX
3179
3180#: builtin/clone.c:83 builtin/init-db.c:485
ef317cd5 3181msgid "template-directory"
07432cef 3182msgstr "模板目录"
ef317cd5
JX
3183
3184#: builtin/clone.c:84 builtin/init-db.c:486
3185msgid "directory from which templates will be used"
07432cef 3186msgstr "模板目录将被使用"
ef317cd5
JX
3187
3188#: builtin/clone.c:86
3189msgid "reference repository"
07432cef 3190msgstr "引用版本库"
ef317cd5
JX
3191
3192#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3193msgid "name"
07432cef 3194msgstr "名称"
ef317cd5
JX
3195
3196#: builtin/clone.c:88
3197msgid "use <name> instead of 'origin' to track upstream"
07432cef 3198msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5
JX
3199
3200#: builtin/clone.c:90
3201msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3202msgstr "检出<分支>而不是远程HEAD"
ef317cd5
JX
3203
3204#: builtin/clone.c:92
3205msgid "path to git-upload-pack on the remote"
07432cef 3206msgstr "远程 git-upload-pack 路径"
ef317cd5 3207
07432cef 3208#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
ef317cd5 3209msgid "depth"
07432cef 3210msgstr "深度"
ef317cd5
JX
3211
3212#: builtin/clone.c:94
3213msgid "create a shallow clone of that depth"
07432cef 3214msgstr "创建一个指定深度的浅克隆"
ef317cd5
JX
3215
3216#: builtin/clone.c:96
3217msgid "clone only one branch, HEAD or --branch"
07432cef 3218msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5
JX
3219
3220#: builtin/clone.c:97 builtin/init-db.c:494
3221msgid "gitdir"
07432cef 3222msgstr "git目录"
ef317cd5
JX
3223
3224#: builtin/clone.c:98 builtin/init-db.c:495
3225msgid "separate git dir from working tree"
07432cef 3226msgstr "git目录和工作区分离"
ef317cd5
JX
3227
3228#: builtin/clone.c:99
3229msgid "key=value"
07432cef 3230msgstr "key=value"
ef317cd5
JX
3231
3232#: builtin/clone.c:100
ef317cd5 3233msgid "set config inside the new repository"
07432cef 3234msgstr "在新版本库中设置配置信息"
ef317cd5 3235
7ac1c0ad 3236#: builtin/clone.c:243
c04f5ac3
JX
3237#, c-format
3238msgid "reference repository '%s' is not a local directory."
3239msgstr "引用版本库 '%s' 不是一个本地目录。"
3240
7ac1c0ad 3241#: builtin/clone.c:306
c04f5ac3
JX
3242#, c-format
3243msgid "failed to create directory '%s'"
90e6ef53 3244msgstr "无法创建目录 '%s'"
c04f5ac3 3245
c160d03f 3246#: builtin/clone.c:308 builtin/diff.c:77
c04f5ac3
JX
3247#, c-format
3248msgid "failed to stat '%s'"
90e6ef53 3249msgstr "无法枚举 '%s' 状态"
c04f5ac3 3250
7ac1c0ad 3251#: builtin/clone.c:310
c04f5ac3
JX
3252#, c-format
3253msgid "%s exists and is not a directory"
3254msgstr "%s 存在且不是一个目录"
3255
7ac1c0ad 3256#: builtin/clone.c:324
c04f5ac3
JX
3257#, c-format
3258msgid "failed to stat %s\n"
90e6ef53 3259msgstr "无法枚举 %s 状态\n"
c04f5ac3 3260
7ac1c0ad 3261#: builtin/clone.c:346
c04f5ac3
JX
3262#, c-format
3263msgid "failed to create link '%s'"
90e6ef53 3264msgstr "无法创建链接 '%s'"
c04f5ac3 3265
7ac1c0ad 3266#: builtin/clone.c:350
c04f5ac3
JX
3267#, c-format
3268msgid "failed to copy file to '%s'"
90e6ef53 3269msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3270
7ac1c0ad 3271#: builtin/clone.c:373
c04f5ac3
JX
3272#, c-format
3273msgid "done.\n"
3274msgstr "完成。\n"
3275
23ff3338 3276#: builtin/clone.c:443
c04f5ac3
JX
3277#, c-format
3278msgid "Could not find remote branch %s to clone."
90e6ef53 3279msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3280
23ff3338 3281#: builtin/clone.c:552
c04f5ac3
JX
3282msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3283msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3284
07432cef 3285#: builtin/clone.c:690
c04f5ac3
JX
3286msgid "Too many arguments."
3287msgstr "太多参数。"
3288
07432cef 3289#: builtin/clone.c:694
c04f5ac3 3290msgid "You must specify a repository to clone."
90e6ef53 3291msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 3292
07432cef 3293#: builtin/clone.c:705
c04f5ac3
JX
3294#, c-format
3295msgid "--bare and --origin %s options are incompatible."
3296msgstr "--bare 和 --origin %s 选项不兼容。"
3297
07432cef
WS
3298#: builtin/clone.c:708
3299msgid "--bare and --separate-git-dir are incompatible."
3300msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3301
3302#: builtin/clone.c:721
c04f5ac3
JX
3303#, c-format
3304msgid "repository '%s' does not exist"
3305msgstr "版本库 '%s' 不存在"
3306
07432cef 3307#: builtin/clone.c:726
c04f5ac3
JX
3308msgid "--depth is ignored in local clones; use file:// instead."
3309msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3310
07432cef 3311#: builtin/clone.c:736
c04f5ac3
JX
3312#, c-format
3313msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 3314msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 3315
07432cef 3316#: builtin/clone.c:746
c04f5ac3
JX
3317#, c-format
3318msgid "working tree '%s' already exists."
3319msgstr "工作区 '%s' 已经存在。"
3320
a77c07d9 3321#: builtin/clone.c:759 builtin/clone.c:771
c04f5ac3
JX
3322#, c-format
3323msgid "could not create leading directories of '%s'"
90e6ef53 3324msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 3325
07432cef 3326#: builtin/clone.c:762
c04f5ac3
JX
3327#, c-format
3328msgid "could not create work tree dir '%s'."
90e6ef53 3329msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 3330
a77c07d9 3331#: builtin/clone.c:781
c04f5ac3
JX
3332#, c-format
3333msgid "Cloning into bare repository '%s'...\n"
3334msgstr "克隆到裸版本库 '%s'...\n"
3335
a77c07d9 3336#: builtin/clone.c:783
c04f5ac3
JX
3337#, c-format
3338msgid "Cloning into '%s'...\n"
3339msgstr "正克隆到 '%s'...\n"
3340
a77c07d9 3341#: builtin/clone.c:818
c04f5ac3
JX
3342#, c-format
3343msgid "Don't know how to clone %s"
3344msgstr "不知道如何克隆 %s"
3345
a77c07d9 3346#: builtin/clone.c:867
c04f5ac3
JX
3347#, c-format
3348msgid "Remote branch %s not found in upstream %s"
3349msgstr "远程分支 %s 在上游 %s 未发现"
3350
a77c07d9 3351#: builtin/clone.c:874
c04f5ac3
JX
3352msgid "You appear to have cloned an empty repository."
3353msgstr "您似乎克隆了一个空版本库。"
3354
ef317cd5
JX
3355#: builtin/column.c:9
3356msgid "git column [options]"
07432cef 3357msgstr "git column [选项]"
ef317cd5
JX
3358
3359#: builtin/column.c:26
3360msgid "lookup config vars"
07432cef 3361msgstr "查找配置变量"
ef317cd5
JX
3362
3363#: builtin/column.c:27 builtin/column.c:28
ef317cd5 3364msgid "layout to use"
07432cef 3365msgstr "要使用的布局"
ef317cd5
JX
3366
3367#: builtin/column.c:29
3368msgid "Maximum width"
07432cef 3369msgstr "最大宽度"
ef317cd5
JX
3370
3371#: builtin/column.c:30
3372msgid "Padding space on left border"
07432cef 3373msgstr "左边框的填充空间"
ef317cd5
JX
3374
3375#: builtin/column.c:31
3376msgid "Padding space on right border"
07432cef 3377msgstr "右边框的填充空间"
ef317cd5
JX
3378
3379#: builtin/column.c:32
3380msgid "Padding space between columns"
07432cef 3381msgstr "两列之间的填充空间"
ef317cd5 3382
8ada9598
JX
3383#: builtin/column.c:51
3384msgid "--command must be the first argument"
81809b99 3385msgstr "--command 必须是第一个参数"
8ada9598 3386
07432cef 3387#: builtin/commit.c:34
a77c07d9
JX
3388msgid "git commit [options] [--] <pathspec>..."
3389msgstr "git commit [选项] [--] <路径匹配>..."
ef317cd5 3390
07432cef 3391#: builtin/commit.c:39
a77c07d9
JX
3392msgid "git status [options] [--] <pathspec>..."
3393msgstr "git status [选项] [--] <路径匹配>..."
ef317cd5 3394
07432cef 3395#: builtin/commit.c:44
c04f5ac3
JX
3396msgid ""
3397"Your name and email address were configured automatically based\n"
3398"on your username and hostname. Please check that they are accurate.\n"
3399"You can suppress this message by setting them explicitly:\n"
3400"\n"
3401" git config --global user.name \"Your Name\"\n"
3402" git config --global user.email you@example.com\n"
3403"\n"
3404"After doing this, you may fix the identity used for this commit with:\n"
3405"\n"
3406" git commit --amend --reset-author\n"
3407msgstr ""
90e6ef53
JX
3408"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3409"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
3410"\n"
3411" git config --global user.name \"Your Name\"\n"
3412" git config --global user.email you@example.com\n"
3413"\n"
90e6ef53 3414"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
3415"\n"
3416" git commit --amend --reset-author\n"
3417
07432cef 3418#: builtin/commit.c:56
c04f5ac3
JX
3419msgid ""
3420"You asked to amend the most recent commit, but doing so would make\n"
3421"it empty. You can repeat your command with --allow-empty, or you can\n"
3422"remove the commit entirely with \"git reset HEAD^\".\n"
3423msgstr ""
1b150dc9
T
3424"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3425"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 3426
07432cef 3427#: builtin/commit.c:61
c04f5ac3
JX
3428msgid ""
3429"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3430"If you wish to commit it anyway, use:\n"
3431"\n"
3432" git commit --allow-empty\n"
3433"\n"
3434"Otherwise, please use 'git reset'\n"
3435msgstr ""
a9ce4543
T
3436"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3437"也要提交,使用命令:\n"
c04f5ac3
JX
3438"\n"
3439" git commit --allow-empty\n"
3440"\n"
a9ce4543 3441"否则,请使用命令 'git reset'\n"
c04f5ac3 3442
07432cef 3443#: builtin/commit.c:258
c04f5ac3 3444msgid "failed to unpack HEAD tree object"
90e6ef53 3445msgstr "无法解包 HEAD 树对象"
c04f5ac3 3446
07432cef 3447#: builtin/commit.c:300
c04f5ac3 3448msgid "unable to create temporary index"
90e6ef53 3449msgstr "不能创建临时索引"
c04f5ac3 3450
07432cef 3451#: builtin/commit.c:306
c04f5ac3
JX
3452msgid "interactive add failed"
3453msgstr "交互式添加失败"
3454
07432cef 3455#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
c04f5ac3 3456msgid "unable to write new_index file"
90e6ef53 3457msgstr "无法写 new_index 文件"
c04f5ac3 3458
07432cef 3459#: builtin/commit.c:391
8ada9598 3460msgid "cannot do a partial commit during a merge."
81809b99 3461msgstr "在合并过程中不能做部分提交。"
c04f5ac3 3462
07432cef 3463#: builtin/commit.c:393
8ada9598 3464msgid "cannot do a partial commit during a cherry-pick."
81809b99 3465msgstr "在拣选过程中不能做部分提交。"
8ada9598 3466
07432cef 3467#: builtin/commit.c:403
c04f5ac3 3468msgid "cannot read the index"
90e6ef53 3469msgstr "无法读取索引"
c04f5ac3 3470
07432cef 3471#: builtin/commit.c:423
c04f5ac3 3472msgid "unable to write temporary index file"
90e6ef53 3473msgstr "无法写临时索引文件"
c04f5ac3 3474
07432cef 3475#: builtin/commit.c:511 builtin/commit.c:517
c04f5ac3
JX
3476#, c-format
3477msgid "invalid commit: %s"
3478msgstr "无效的提交:%s"
3479
07432cef 3480#: builtin/commit.c:540
c04f5ac3
JX
3481msgid "malformed --author parameter"
3482msgstr "非法的 --author 参数"
3483
07432cef 3484#: builtin/commit.c:560
c04f5ac3
JX
3485#, c-format
3486msgid "Malformed ident string: '%s'"
90e6ef53 3487msgstr "非法的身份字符串:'%s'"
c04f5ac3 3488
07432cef 3489#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
c04f5ac3
JX
3490#, c-format
3491msgid "could not lookup commit %s"
3492msgstr "不能查询提交 %s"
3493
07432cef 3494#: builtin/commit.c:610 builtin/shortlog.c:272
c04f5ac3
JX
3495#, c-format
3496msgid "(reading log message from standard input)\n"
90e6ef53 3497msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 3498
07432cef 3499#: builtin/commit.c:612
c04f5ac3 3500msgid "could not read log from standard input"
90e6ef53 3501msgstr "不能从标准输入中读取日志信息"
c04f5ac3 3502
07432cef 3503#: builtin/commit.c:616
c04f5ac3
JX
3504#, c-format
3505msgid "could not read log file '%s'"
90e6ef53 3506msgstr "不能读取日志文件 '%s'"
c04f5ac3 3507
07432cef 3508#: builtin/commit.c:622
c04f5ac3
JX
3509msgid "commit has empty message"
3510msgstr "提交说明为空"
3511
07432cef 3512#: builtin/commit.c:638
c04f5ac3 3513msgid "could not read MERGE_MSG"
90e6ef53 3514msgstr "不能读取 MERGE_MSG"
c04f5ac3 3515
07432cef 3516#: builtin/commit.c:642
c04f5ac3 3517msgid "could not read SQUASH_MSG"
90e6ef53 3518msgstr "不能读取 SQUASH_MSG"
c04f5ac3 3519
07432cef 3520#: builtin/commit.c:646
c04f5ac3
JX
3521#, c-format
3522msgid "could not read '%s'"
90e6ef53 3523msgstr "不能读取 '%s'"
c04f5ac3 3524
07432cef 3525#: builtin/commit.c:707
c04f5ac3 3526msgid "could not write commit template"
90e6ef53 3527msgstr "不能写提交模版"
c04f5ac3 3528
07432cef 3529#: builtin/commit.c:718
81809b99 3530#, c-format
c04f5ac3
JX
3531msgid ""
3532"\n"
8ada9598 3533"It looks like you may be committing a merge.\n"
c04f5ac3
JX
3534"If this is not correct, please remove the file\n"
3535"\t%s\n"
3536"and try again.\n"
3537msgstr ""
3538"\n"
649900bc 3539"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
3540"\t%s\n"
3541"然后重试。\n"
3542
07432cef 3543#: builtin/commit.c:723
81809b99 3544#, c-format
8ada9598
JX
3545msgid ""
3546"\n"
3547"It looks like you may be committing a cherry-pick.\n"
3548"If this is not correct, please remove the file\n"
3549"\t%s\n"
3550"and try again.\n"
3551msgstr ""
3552"\n"
649900bc 3553"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
3554"\t%s\n"
3555"然后重试。\n"
c04f5ac3 3556
07432cef 3557#: builtin/commit.c:735
a77c07d9 3558#, c-format
c04f5ac3 3559msgid ""
8ada9598 3560"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 3561"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 3562msgstr ""
a77c07d9 3563"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 3564"说明将会终止提交。\n"
c04f5ac3 3565
07432cef 3566#: builtin/commit.c:740
a77c07d9 3567#, c-format
c04f5ac3 3568msgid ""
8ada9598 3569"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 3570"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
3571"An empty message aborts the commit.\n"
3572msgstr ""
a77c07d9
JX
3573"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3574"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 3575
90e6ef53 3576# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 3577#: builtin/commit.c:753
c04f5ac3
JX
3578#, c-format
3579msgid "%sAuthor: %s"
3580msgstr "%s作者: %s"
3581
90e6ef53 3582# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 3583#: builtin/commit.c:760
c04f5ac3
JX
3584#, c-format
3585msgid "%sCommitter: %s"
3586msgstr "%s提交者: %s"
3587
07432cef 3588#: builtin/commit.c:780
c04f5ac3 3589msgid "Cannot read index"
90e6ef53 3590msgstr "无法读取索引"
c04f5ac3 3591
07432cef 3592#: builtin/commit.c:817
c04f5ac3
JX
3593msgid "Error building trees"
3594msgstr "无法创建树对象"
3595
a77c07d9 3596#: builtin/commit.c:832 builtin/tag.c:359
c04f5ac3
JX
3597#, c-format
3598msgid "Please supply the message using either -m or -F option.\n"
07432cef 3599msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 3600
07432cef 3601#: builtin/commit.c:929
c04f5ac3
JX
3602#, c-format
3603msgid "No existing author found with '%s'"
3604msgstr "没有找到匹配 '%s' 的作者"
3605
a77c07d9 3606#: builtin/commit.c:944 builtin/commit.c:1138
c04f5ac3
JX
3607#, c-format
3608msgid "Invalid untracked files mode '%s'"
90e6ef53 3609msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 3610
a77c07d9 3611#: builtin/commit.c:974
c04f5ac3
JX
3612msgid "Using both --reset-author and --author does not make sense"
3613msgstr "同时使用 --reset-author 和 --author 没有意义"
3614
a77c07d9 3615#: builtin/commit.c:985
c04f5ac3 3616msgid "You have nothing to amend."
90e6ef53 3617msgstr "您没有可修补的提交。"
c04f5ac3 3618
a77c07d9 3619#: builtin/commit.c:988
8ada9598 3620msgid "You are in the middle of a merge -- cannot amend."
81809b99 3621msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 3622
a77c07d9 3623#: builtin/commit.c:990
8ada9598 3624msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 3625msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 3626
a77c07d9 3627#: builtin/commit.c:993
c04f5ac3 3628msgid "Options --squash and --fixup cannot be used together"
649900bc 3629msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 3630
a77c07d9 3631#: builtin/commit.c:1003
c04f5ac3
JX
3632msgid "Only one of -c/-C/-F/--fixup can be used."
3633msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3634
a77c07d9 3635#: builtin/commit.c:1005
c04f5ac3 3636msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 3637msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 3638
a77c07d9 3639#: builtin/commit.c:1013
c04f5ac3 3640msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 3641msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 3642
a77c07d9 3643#: builtin/commit.c:1030
c04f5ac3
JX
3644msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3645msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3646
a77c07d9 3647#: builtin/commit.c:1032
c04f5ac3
JX
3648msgid "No paths with --include/--only does not make sense."
3649msgstr "参数 --include/--only 不跟路径没有意义。"
3650
a77c07d9 3651#: builtin/commit.c:1034
c04f5ac3 3652msgid "Clever... amending the last one with dirty index."
90e6ef53 3653msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 3654
a77c07d9 3655#: builtin/commit.c:1036
c04f5ac3 3656msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 3657msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 3658
a77c07d9 3659#: builtin/commit.c:1046 builtin/tag.c:575
c04f5ac3
JX
3660#, c-format
3661msgid "Invalid cleanup mode %s"
3662msgstr "无效的清理模式 %s"
3663
a77c07d9 3664#: builtin/commit.c:1051
c04f5ac3 3665msgid "Paths with -a does not make sense."
649900bc 3666msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 3667
a77c07d9 3668#: builtin/commit.c:1057 builtin/commit.c:1192
07432cef
WS
3669msgid "--long and -z are incompatible"
3670msgstr "--long 和 -z 选项不兼容"
3671
a77c07d9 3672#: builtin/commit.c:1152 builtin/commit.c:1388
ef317cd5 3673msgid "show status concisely"
07432cef 3674msgstr "以简洁的格式显示状态"
ef317cd5 3675
a77c07d9 3676#: builtin/commit.c:1154 builtin/commit.c:1390
ef317cd5 3677msgid "show branch information"
07432cef 3678msgstr "显示分支信息"
ef317cd5 3679
a77c07d9 3680#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
ef317cd5 3681msgid "machine-readable output"
07432cef
WS
3682msgstr "机器可读的输出"
3683
a77c07d9 3684#: builtin/commit.c:1159 builtin/commit.c:1394
07432cef
WS
3685msgid "show status in long format (default)"
3686msgstr "以长格式显示状态(默认)"
ef317cd5 3687
a77c07d9 3688#: builtin/commit.c:1162 builtin/commit.c:1397
ef317cd5 3689msgid "terminate entries with NUL"
07432cef 3690msgstr "条目以NUL字符结尾"
ef317cd5 3691
a77c07d9
JX
3692#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
3693#: builtin/fast-export.c:650 builtin/tag.c:459
ef317cd5 3694msgid "mode"
07432cef 3695msgstr "模式"
ef317cd5 3696
a77c07d9 3697#: builtin/commit.c:1165 builtin/commit.c:1400
ef317cd5 3698msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 3699msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 3700
a77c07d9 3701#: builtin/commit.c:1168
ef317cd5 3702msgid "show ignored files"
07432cef 3703msgstr "显示忽略的文件"
ef317cd5 3704
a77c07d9 3705#: builtin/commit.c:1169 parse-options.h:151
ef317cd5
JX
3706msgid "when"
3707msgstr "何时"
3708
a77c07d9 3709#: builtin/commit.c:1170
ef317cd5
JX
3710msgid ""
3711"ignore changes to submodules, optional when: all, dirty, untracked. "
3712"(Default: all)"
3713msgstr ""
07432cef 3714"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 3715
a77c07d9 3716#: builtin/commit.c:1172
ef317cd5 3717msgid "list untracked files in columns"
07432cef 3718msgstr "以列的方式显示未跟踪的文件"
ef317cd5 3719
a77c07d9 3720#: builtin/commit.c:1246
c04f5ac3
JX
3721msgid "couldn't look up newly created commit"
3722msgstr "无法找到新创建的提交"
3723
a77c07d9 3724#: builtin/commit.c:1248
c04f5ac3 3725msgid "could not parse newly created commit"
90e6ef53 3726msgstr "不能解析新创建的提交"
c04f5ac3 3727
a77c07d9 3728#: builtin/commit.c:1289
c04f5ac3
JX
3729msgid "detached HEAD"
3730msgstr "分离头指针"
3731
7e238ab7 3732# 译者:中文字符串拼接,可删除前导空格
a77c07d9 3733#: builtin/commit.c:1291
c04f5ac3 3734msgid " (root-commit)"
7e238ab7 3735msgstr "(根提交)"
c04f5ac3 3736
a77c07d9 3737#: builtin/commit.c:1358
ef317cd5 3738msgid "suppress summary after successful commit"
07432cef 3739msgstr "提交成功后不显示概述信息"
c04f5ac3 3740
a77c07d9 3741#: builtin/commit.c:1359
ef317cd5 3742msgid "show diff in commit message template"
07432cef 3743msgstr "在提交说明模板里显示差异"
c04f5ac3 3744
a77c07d9 3745#: builtin/commit.c:1361
ef317cd5 3746msgid "Commit message options"
07432cef 3747msgstr "提交说明选项"
c04f5ac3 3748
a77c07d9 3749#: builtin/commit.c:1362 builtin/tag.c:457
ef317cd5 3750msgid "read message from file"
07432cef 3751msgstr "从文件中读取提交说明"
c04f5ac3 3752
a77c07d9 3753#: builtin/commit.c:1363
ef317cd5 3754msgid "author"
07432cef 3755msgstr "作者"
c04f5ac3 3756
a77c07d9 3757#: builtin/commit.c:1363
ef317cd5 3758msgid "override author for commit"
07432cef 3759msgstr "提交时覆盖作者"
73a60cd2 3760
a77c07d9 3761#: builtin/commit.c:1364 builtin/gc.c:178
ef317cd5 3762msgid "date"
07432cef 3763msgstr "日期"
c04f5ac3 3764
a77c07d9 3765#: builtin/commit.c:1364
ef317cd5 3766msgid "override date for commit"
07432cef 3767msgstr "提交时覆盖日期"
c04f5ac3 3768
a77c07d9
JX
3769#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
3770#: builtin/notes.c:690 builtin/tag.c:455
ef317cd5 3771msgid "message"
07432cef 3772msgstr "说明"
c04f5ac3 3773
a77c07d9 3774#: builtin/commit.c:1365
ef317cd5 3775msgid "commit message"
07432cef 3776msgstr "提交说明"
ef317cd5 3777
a77c07d9 3778#: builtin/commit.c:1366
ef317cd5 3779msgid "reuse and edit message from specified commit"
07432cef 3780msgstr "重用并编辑指定提交的提交说明"
ef317cd5 3781
a77c07d9 3782#: builtin/commit.c:1367
ef317cd5 3783msgid "reuse message from specified commit"
07432cef 3784msgstr "重用指定提交的提交说明"
ef317cd5 3785
a77c07d9 3786#: builtin/commit.c:1368
ef317cd5 3787msgid "use autosquash formatted message to fixup specified commit"
07432cef 3788msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 3789
a77c07d9 3790#: builtin/commit.c:1369
ef317cd5 3791msgid "use autosquash formatted message to squash specified commit"
07432cef 3792msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 3793
a77c07d9 3794#: builtin/commit.c:1370
ef317cd5 3795msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 3796msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 3797
a77c07d9 3798#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
ef317cd5 3799msgid "add Signed-off-by:"
07432cef 3800msgstr "添加 Signed-off-by: 签名"
ef317cd5 3801
a77c07d9 3802#: builtin/commit.c:1372
ef317cd5 3803msgid "use specified template file"
07432cef 3804msgstr "使用指定的模板文件"
ef317cd5 3805
a77c07d9 3806#: builtin/commit.c:1373
ef317cd5 3807msgid "force edit of commit"
07432cef 3808msgstr "强制编辑提交"
ef317cd5 3809
07432cef 3810# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
a77c07d9 3811#: builtin/commit.c:1374
ef317cd5 3812msgid "default"
07432cef 3813msgstr "default"
ef317cd5 3814
a77c07d9 3815#: builtin/commit.c:1374 builtin/tag.c:460
ef317cd5 3816msgid "how to strip spaces and #comments from message"
07432cef 3817msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 3818
a77c07d9 3819#: builtin/commit.c:1375
ef317cd5 3820msgid "include status in commit message template"
07432cef 3821msgstr "在提交说明模板里包含状态信息"
ef317cd5 3822
a77c07d9 3823#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
ef317cd5 3824msgid "key id"
07432cef 3825msgstr "key id"
ef317cd5 3826
a77c07d9 3827#: builtin/commit.c:1377 builtin/merge.c:214
ef317cd5 3828msgid "GPG sign commit"
07432cef 3829msgstr "GPG 提交签名"
ef317cd5
JX
3830
3831#. end commit message options
a77c07d9 3832#: builtin/commit.c:1380
ef317cd5 3833msgid "Commit contents options"
07432cef 3834msgstr "提交内容选项"
ef317cd5 3835
a77c07d9 3836#: builtin/commit.c:1381
ef317cd5 3837msgid "commit all changed files"
07432cef 3838msgstr "提交所有改动的文件"
ef317cd5 3839
a77c07d9 3840#: builtin/commit.c:1382
ef317cd5 3841msgid "add specified files to index for commit"
07432cef 3842msgstr "添加指定的文件到索引区等待提交"
ef317cd5 3843
a77c07d9 3844#: builtin/commit.c:1383
ef317cd5 3845msgid "interactively add files"
07432cef 3846msgstr "交互式添加文件"
ef317cd5 3847
a77c07d9 3848#: builtin/commit.c:1384
ef317cd5 3849msgid "interactively add changes"
07432cef 3850msgstr "交互式添加变更"
ef317cd5 3851
a77c07d9 3852#: builtin/commit.c:1385
ef317cd5 3853msgid "commit only specified files"
07432cef 3854msgstr "只提交指定的文件"
ef317cd5 3855
a77c07d9 3856#: builtin/commit.c:1386
ef317cd5 3857msgid "bypass pre-commit hook"
07432cef 3858msgstr "绕过 pre-commit 钩子"
ef317cd5 3859
a77c07d9 3860#: builtin/commit.c:1387
ef317cd5 3861msgid "show what would be committed"
07432cef 3862msgstr "显示将要提交的内容"
ef317cd5 3863
a77c07d9 3864#: builtin/commit.c:1398
ef317cd5 3865msgid "amend previous commit"
07432cef 3866msgstr "修改先前的提交"
ef317cd5 3867
a77c07d9 3868#: builtin/commit.c:1399
ef317cd5 3869msgid "bypass post-rewrite hook"
07432cef 3870msgstr "绕过 post-rewrite 钩子"
ef317cd5 3871
a77c07d9 3872#: builtin/commit.c:1404
ef317cd5 3873msgid "ok to record an empty change"
07432cef 3874msgstr "允许一个空提交"
ef317cd5 3875
a77c07d9 3876#: builtin/commit.c:1407
ef317cd5 3877msgid "ok to record a change with an empty message"
07432cef 3878msgstr "允许空的提交说明"
ef317cd5 3879
a77c07d9 3880#: builtin/commit.c:1439
c04f5ac3 3881msgid "could not parse HEAD commit"
90e6ef53 3882msgstr "不能解析 HEAD 提交"
c04f5ac3 3883
a77c07d9 3884#: builtin/commit.c:1477 builtin/merge.c:508
c04f5ac3
JX
3885#, c-format
3886msgid "could not open '%s' for reading"
90e6ef53 3887msgstr "不能为读入打开 '%s'"
c04f5ac3 3888
a77c07d9 3889#: builtin/commit.c:1484
c04f5ac3
JX
3890#, c-format
3891msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 3892msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 3893
a77c07d9 3894#: builtin/commit.c:1491
c04f5ac3 3895msgid "could not read MERGE_MODE"
90e6ef53 3896msgstr "不能读取 MERGE_MODE"
c04f5ac3 3897
a77c07d9 3898#: builtin/commit.c:1510
c04f5ac3
JX
3899#, c-format
3900msgid "could not read commit message: %s"
90e6ef53 3901msgstr "不能读取提交说明:%s"
c04f5ac3 3902
a77c07d9 3903#: builtin/commit.c:1524
73a60cd2
JX
3904#, c-format
3905msgid "Aborting commit; you did not edit the message.\n"
3906msgstr "终止提交;您未更改来自模版的提交说明。\n"
3907
a77c07d9 3908#: builtin/commit.c:1529
c04f5ac3
JX
3909#, c-format
3910msgid "Aborting commit due to empty commit message.\n"
3911msgstr "终止提交因为提交说明为空。\n"
3912
a77c07d9 3913#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
c04f5ac3 3914msgid "failed to write commit object"
90e6ef53 3915msgstr "无法写提交对象"
c04f5ac3 3916
a77c07d9 3917#: builtin/commit.c:1565
c04f5ac3
JX
3918msgid "cannot lock HEAD ref"
3919msgstr "无法锁定 HEAD 引用"
3920
a77c07d9 3921#: builtin/commit.c:1569
c04f5ac3
JX
3922msgid "cannot update HEAD ref"
3923msgstr "无法更新 HEAD 引用"
3924
a77c07d9 3925#: builtin/commit.c:1580
c04f5ac3
JX
3926msgid ""
3927"Repository has been updated, but unable to write\n"
3928"new_index file. Check that disk is not full or quota is\n"
3929"not exceeded, and then \"git reset HEAD\" to recover."
3930msgstr ""
90e6ef53
JX
3931"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
3932"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 3933
ef317cd5
JX
3934#: builtin/config.c:7
3935msgid "git config [options]"
07432cef 3936msgstr "git config [选项]"
ef317cd5 3937
07432cef 3938#: builtin/config.c:51
ef317cd5 3939msgid "Config file location"
07432cef 3940msgstr "配置文件位置"
ef317cd5 3941
07432cef 3942#: builtin/config.c:52
ef317cd5 3943msgid "use global config file"
07432cef 3944msgstr "使用全局配置文件"
ef317cd5 3945
07432cef 3946#: builtin/config.c:53
ef317cd5 3947msgid "use system config file"
07432cef 3948msgstr "使用系统级配置文件"
ef317cd5 3949
07432cef 3950#: builtin/config.c:54
ef317cd5 3951msgid "use repository config file"
07432cef 3952msgstr "使用版本库级配置文件"
ef317cd5 3953
07432cef 3954#: builtin/config.c:55
ef317cd5 3955msgid "use given config file"
07432cef 3956msgstr "使用指定的配置文件"
ef317cd5 3957
07432cef 3958#: builtin/config.c:56
ef317cd5 3959msgid "Action"
07432cef 3960msgstr "操作"
ef317cd5 3961
07432cef 3962#: builtin/config.c:57
ef317cd5 3963msgid "get value: name [value-regex]"
07432cef 3964msgstr "获取值:name [value-regex]"
ef317cd5 3965
07432cef 3966#: builtin/config.c:58
ef317cd5 3967msgid "get all values: key [value-regex]"
07432cef 3968msgstr "获得所有的值:key [value-regex]"
ef317cd5 3969
07432cef 3970#: builtin/config.c:59
ef317cd5 3971msgid "get values for regexp: name-regex [value-regex]"
07432cef 3972msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 3973
07432cef 3974#: builtin/config.c:60
ef317cd5 3975msgid "replace all matching variables: name value [value_regex]"
07432cef 3976msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 3977
07432cef 3978#: builtin/config.c:61
ef317cd5 3979msgid "add a new variable: name value"
07432cef 3980msgstr "添加一个新的变量:name value"
ef317cd5 3981
07432cef 3982#: builtin/config.c:62
ef317cd5 3983msgid "remove a variable: name [value-regex]"
07432cef 3984msgstr "删除一个变量:name [value-regex]"
ef317cd5 3985
07432cef 3986#: builtin/config.c:63
ef317cd5 3987msgid "remove all matches: name [value-regex]"
07432cef 3988msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 3989
07432cef 3990#: builtin/config.c:64
ef317cd5 3991msgid "rename section: old-name new-name"
07432cef 3992msgstr "重命名小节:old-name new-name"
ef317cd5 3993
07432cef 3994#: builtin/config.c:65
ef317cd5 3995msgid "remove a section: name"
07432cef 3996msgstr "删除一个小节:name"
ef317cd5 3997
07432cef 3998#: builtin/config.c:66
ef317cd5 3999msgid "list all"
07432cef 4000msgstr "列出所有"
ef317cd5 4001
07432cef 4002#: builtin/config.c:67
ef317cd5 4003msgid "open an editor"
07432cef 4004msgstr "打开一个编辑器"
ef317cd5 4005
07432cef 4006#: builtin/config.c:68 builtin/config.c:69
ef317cd5 4007msgid "slot"
07432cef 4008msgstr "slot"
ef317cd5 4009
07432cef 4010#: builtin/config.c:68
ef317cd5 4011msgid "find the color configured: [default]"
07432cef 4012msgstr "找到配置的颜色:[默认]"
ef317cd5 4013
07432cef 4014#: builtin/config.c:69
ef317cd5 4015msgid "find the color setting: [stdout-is-tty]"
07432cef 4016msgstr "找到颜色设置:[stdout-is-tty]"
ef317cd5 4017
07432cef 4018#: builtin/config.c:70
ef317cd5 4019msgid "Type"
07432cef 4020msgstr "类型"
ef317cd5 4021
07432cef 4022#: builtin/config.c:71
ef317cd5 4023msgid "value is \"true\" or \"false\""
07432cef 4024msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4025
07432cef 4026#: builtin/config.c:72
ef317cd5 4027msgid "value is decimal number"
07432cef 4028msgstr "值是十进制数"
ef317cd5 4029
07432cef 4030#: builtin/config.c:73
ef317cd5 4031msgid "value is --bool or --int"
07432cef 4032msgstr "值是 --bool or --int"
ef317cd5 4033
07432cef 4034#: builtin/config.c:74
ef317cd5 4035msgid "value is a path (file or directory name)"
07432cef 4036msgstr "值是一个路径(文件或目录名)"
ef317cd5 4037
07432cef 4038#: builtin/config.c:75
ef317cd5 4039msgid "Other"
07432cef 4040msgstr "其它"
ef317cd5 4041
07432cef 4042#: builtin/config.c:76
ef317cd5 4043msgid "terminate values with NUL byte"
07432cef 4044msgstr "终止值是NUL字节"
ef317cd5 4045
07432cef 4046#: builtin/config.c:77
ef317cd5 4047msgid "respect include directives on lookup"
07432cef 4048msgstr "查询时参照 include 指令递归查找"
ef317cd5
JX
4049
4050#: builtin/count-objects.c:69
4051msgid "git count-objects [-v]"
07432cef 4052msgstr "git count-objects [-v]"
ef317cd5
JX
4053
4054#: builtin/describe.c:15
4055msgid "git describe [options] <committish>*"
07432cef 4056msgstr "git describe [选项] <提交号>*"
ef317cd5
JX
4057
4058#: builtin/describe.c:16
4059msgid "git describe [options] --dirty"
07432cef 4060msgstr "git describe [选项] --dirty"
ef317cd5 4061
c04f5ac3
JX
4062#: builtin/describe.c:234
4063#, c-format
4064msgid "annotated tag %s not available"
4065msgstr "注释 tag %s 无效"
4066
4067#: builtin/describe.c:238
4068#, c-format
4069msgid "annotated tag %s has no embedded name"
4070msgstr "注释 tag %s 没有嵌入名称"
4071
4072#: builtin/describe.c:240
4073#, c-format
4074msgid "tag '%s' is really '%s' here"
90e6ef53 4075msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3
JX
4076
4077#: builtin/describe.c:267
4078#, c-format
4079msgid "Not a valid object name %s"
4080msgstr "不是一个有效的对象名 %s"
4081
4082#: builtin/describe.c:270
4083#, c-format
4084msgid "%s is not a valid '%s' object"
4085msgstr "%s 不是一个有效的 '%s' 对象"
4086
4087#: builtin/describe.c:287
4088#, c-format
4089msgid "no tag exactly matches '%s'"
4090msgstr "没有 tag 准确匹配 '%s'"
4091
4092#: builtin/describe.c:289
4093#, c-format
4094msgid "searching to describe %s\n"
4095msgstr "搜索描述 %s\n"
4096
4097#: builtin/describe.c:329
4098#, c-format
4099msgid "finished search at %s\n"
4100msgstr "完成搜索 %s\n"
4101
4102#: builtin/describe.c:353
4103#, c-format
4104msgid ""
4105"No annotated tags can describe '%s'.\n"
4106"However, there were unannotated tags: try --tags."
4107msgstr ""
4108"没有注释 tag 能描述 '%s'。\n"
4109"然而,有非注释 tag:尝试 --tags。"
4110
4111#: builtin/describe.c:357
4112#, c-format
4113msgid ""
4114"No tags can describe '%s'.\n"
4115"Try --always, or create some tags."
4116msgstr ""
4117"没有注释 tag 能描述 '%s'。\n"
90e6ef53 4118"尝试 --always,或者创建一些 tag。"
c04f5ac3
JX
4119
4120#: builtin/describe.c:378
4121#, c-format
4122msgid "traversed %lu commits\n"
4123msgstr "已遍历 %lu 个提交\n"
4124
4125#: builtin/describe.c:381
4126#, c-format
4127msgid ""
4128"more than %i tags found; listed %i most recent\n"
4129"gave up search at %s\n"
4130msgstr ""
90e6ef53
JX
4131"发现多于 %i 个 tag,列出最近的 %i 个\n"
4132"在 %s 放弃搜索\n"
c04f5ac3 4133
ef317cd5
JX
4134#: builtin/describe.c:403
4135msgid "find the tag that comes after the commit"
07432cef 4136msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5
JX
4137
4138#: builtin/describe.c:404
4139msgid "debug search strategy on stderr"
07432cef 4140msgstr "在标准错误上调试搜索策略"
ef317cd5
JX
4141
4142#: builtin/describe.c:405
4143msgid "use any ref in .git/refs"
07432cef 4144msgstr "使用 .git/refs 里的任意引用"
ef317cd5
JX
4145
4146#: builtin/describe.c:406
4147msgid "use any tag in .git/refs/tags"
07432cef 4148msgstr "使用 .git/refs/tags 里的任意 tag"
ef317cd5
JX
4149
4150#: builtin/describe.c:407
4151msgid "always use long format"
07432cef 4152msgstr "始终使用长提交号格式"
ef317cd5
JX
4153
4154#: builtin/describe.c:410
ef317cd5 4155msgid "only output exact matches"
07432cef 4156msgstr "只输出精确匹配"
ef317cd5
JX
4157
4158#: builtin/describe.c:412
4159msgid "consider <n> most recent tags (default: 10)"
07432cef 4160msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5
JX
4161
4162#: builtin/describe.c:414
ef317cd5 4163msgid "only consider tags matching <pattern>"
07432cef 4164msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5
JX
4165
4166#: builtin/describe.c:416 builtin/name-rev.c:238
4167msgid "show abbreviated commit object as fallback"
07432cef 4168msgstr "显示简写的提交号作为后备"
ef317cd5
JX
4169
4170#: builtin/describe.c:417
4171msgid "mark"
07432cef 4172msgstr "标记"
ef317cd5
JX
4173
4174#: builtin/describe.c:418
4175msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 4176msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 4177
c04f5ac3
JX
4178#: builtin/describe.c:436
4179msgid "--long is incompatible with --abbrev=0"
4180msgstr "--long 与 --abbrev=0 不兼容"
4181
4182#: builtin/describe.c:462
4183msgid "No names found, cannot describe anything."
90e6ef53 4184msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3
JX
4185
4186#: builtin/describe.c:482
4187msgid "--dirty is incompatible with committishes"
649900bc 4188msgstr "--dirty 不能与提交同时使用"
c04f5ac3 4189
c160d03f 4190#: builtin/diff.c:79
c04f5ac3
JX
4191#, c-format
4192msgid "'%s': not a regular file or symlink"
4193msgstr "'%s':不是一个正规文件或符号链接"
4194
07432cef 4195#: builtin/diff.c:228
c04f5ac3
JX
4196#, c-format
4197msgid "invalid option: %s"
4198msgstr "无效选项:%s"
4199
07432cef 4200#: builtin/diff.c:305
c04f5ac3
JX
4201msgid "Not a git repository"
4202msgstr "不是一个 git 版本库"
4203
07432cef 4204#: builtin/diff.c:348
c04f5ac3
JX
4205#, c-format
4206msgid "invalid object '%s' given."
4207msgstr "提供了无效对象 '%s'。"
4208
07432cef 4209#: builtin/diff.c:353
c04f5ac3
JX
4210#, c-format
4211msgid "more than %d trees given: '%s'"
4212msgstr "提供了超过 %d 个树对象:'%s'"
4213
07432cef 4214#: builtin/diff.c:363
c04f5ac3
JX
4215#, c-format
4216msgid "more than two blobs given: '%s'"
07432cef 4217msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 4218
07432cef 4219#: builtin/diff.c:371
c04f5ac3
JX
4220#, c-format
4221msgid "unhandled object '%s' given."
4222msgstr "提供了无法处理的对象 '%s'。"
4223
ef317cd5
JX
4224#: builtin/fast-export.c:22
4225msgid "git fast-export [rev-list-opts]"
07432cef 4226msgstr "git fast-export [rev-list-opts]"
ef317cd5 4227
07432cef 4228#: builtin/fast-export.c:646
ef317cd5 4229msgid "show progress after <n> objects"
07432cef 4230msgstr "在 <n> 个对象之后显示进度"
ef317cd5 4231
07432cef 4232#: builtin/fast-export.c:648
ef317cd5 4233msgid "select handling of signed tags"
07432cef 4234msgstr "选择如何处理签名 tags"
ef317cd5 4235
07432cef 4236#: builtin/fast-export.c:651
ef317cd5 4237msgid "select handling of tags that tag filtered objects"
07432cef 4238msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 4239
07432cef 4240#: builtin/fast-export.c:654
ef317cd5 4241msgid "Dump marks to this file"
07432cef 4242msgstr "把标记存储到这个文件"
ef317cd5 4243
07432cef 4244#: builtin/fast-export.c:656
ef317cd5 4245msgid "Import marks from this file"
07432cef 4246msgstr "从这个文件导入标记"
ef317cd5 4247
07432cef 4248#: builtin/fast-export.c:658
ef317cd5 4249msgid "Fake a tagger when tags lack one"
07432cef 4250msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 4251
07432cef 4252#: builtin/fast-export.c:660
ef317cd5 4253msgid "Output full tree for each commit"
07432cef 4254msgstr "每次提交都输出整个树"
ef317cd5 4255
07432cef 4256#: builtin/fast-export.c:662
ef317cd5 4257msgid "Use the done feature to terminate the stream"
07432cef 4258msgstr "使用 done 功能来终止流"
ef317cd5 4259
07432cef 4260#: builtin/fast-export.c:663
ef317cd5 4261msgid "Skip output of blob data"
07432cef 4262msgstr "跳过数据对象的输出"
ef317cd5
JX
4263
4264#: builtin/fetch.c:20
ef317cd5 4265msgid "git fetch [<options>] [<repository> [<refspec>...]]"
07432cef 4266msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
ef317cd5
JX
4267
4268#: builtin/fetch.c:21
4269msgid "git fetch [<options>] <group>"
07432cef 4270msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
4271
4272#: builtin/fetch.c:22
4273msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 4274msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
4275
4276#: builtin/fetch.c:23
4277msgid "git fetch --all [<options>]"
07432cef 4278msgstr "git fetch --all [<选项>]"
ef317cd5
JX
4279
4280#: builtin/fetch.c:60
4281msgid "fetch from all remotes"
07432cef 4282msgstr "从所有的远程抓取"
ef317cd5
JX
4283
4284#: builtin/fetch.c:62
4285msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 4286msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5
JX
4287
4288#: builtin/fetch.c:64
4289msgid "path to upload pack on remote end"
07432cef 4290msgstr "上传包到远程的路径"
ef317cd5
JX
4291
4292#: builtin/fetch.c:65
4293msgid "force overwrite of local branch"
07432cef 4294msgstr "强制覆盖本地分支"
ef317cd5
JX
4295
4296#: builtin/fetch.c:67
4297msgid "fetch from multiple remotes"
07432cef 4298msgstr "从多个远程抓取"
ef317cd5
JX
4299
4300#: builtin/fetch.c:69
ef317cd5 4301msgid "fetch all tags and associated objects"
07432cef 4302msgstr "抓取所有的 tags 和关联对象"
ef317cd5
JX
4303
4304#: builtin/fetch.c:71
4305msgid "do not fetch all tags (--no-tags)"
07432cef 4306msgstr "不抓取任何 tags (--no-tags)"
ef317cd5
JX
4307
4308#: builtin/fetch.c:73
ef317cd5 4309msgid "prune remote-tracking branches no longer on remote"
07432cef 4310msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 4311
07432cef 4312# 译者:可选值,不能翻译
ef317cd5
JX
4313#: builtin/fetch.c:74
4314msgid "on-demand"
07432cef 4315msgstr "on-demand"
ef317cd5
JX
4316
4317#: builtin/fetch.c:75
4318msgid "control recursive fetching of submodules"
07432cef 4319msgstr "控制子模组的递归抓取"
ef317cd5
JX
4320
4321#: builtin/fetch.c:79
4322msgid "keep downloaded pack"
07432cef 4323msgstr "保持下载包"
ef317cd5
JX
4324
4325#: builtin/fetch.c:81
ef317cd5 4326msgid "allow updating of HEAD ref"
07432cef 4327msgstr "允许更新 HEAD 引用"
ef317cd5
JX
4328
4329#: builtin/fetch.c:84
4330msgid "deepen history of shallow clone"
07432cef 4331msgstr "深化浅克隆的历史"
ef317cd5 4332
a77c07d9
JX
4333#: builtin/fetch.c:86
4334msgid "convert to a complete repository"
4335msgstr "转换为一个完整的版本库"
4336
4337#: builtin/fetch.c:88 builtin/log.c:1119
ef317cd5 4338msgid "dir"
07432cef 4339msgstr "目录"
ef317cd5 4340
a77c07d9 4341#: builtin/fetch.c:89
ef317cd5 4342msgid "prepend this to submodule path output"
07432cef 4343msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 4344
a77c07d9 4345#: builtin/fetch.c:92
ef317cd5 4346msgid "default mode for recursion"
07432cef 4347msgstr "递归的默认模式"
ef317cd5 4348
a77c07d9 4349#: builtin/fetch.c:204
c04f5ac3
JX
4350msgid "Couldn't find remote ref HEAD"
4351msgstr "无法发现远程 HEAD 引用"
4352
a77c07d9 4353#: builtin/fetch.c:257
c04f5ac3
JX
4354#, c-format
4355msgid "object %s not found"
4356msgstr "对象 %s 未发现"
4357
a77c07d9 4358#: builtin/fetch.c:262
c04f5ac3
JX
4359msgid "[up to date]"
4360msgstr "[最新]"
4361
a77c07d9 4362#: builtin/fetch.c:276
c04f5ac3
JX
4363#, c-format
4364msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4365msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4366
a77c07d9 4367#: builtin/fetch.c:277 builtin/fetch.c:363
c04f5ac3
JX
4368msgid "[rejected]"
4369msgstr "[已拒绝]"
4370
a77c07d9 4371#: builtin/fetch.c:288
c04f5ac3
JX
4372msgid "[tag update]"
4373msgstr "[tag更新]"
4374
90e6ef53 4375# 译者:注意保持前导空格
a77c07d9 4376#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
c04f5ac3
JX
4377msgid " (unable to update local ref)"
4378msgstr " (不能更新本地引用)"
4379
a77c07d9 4380#: builtin/fetch.c:308
c04f5ac3
JX
4381msgid "[new tag]"
4382msgstr "[新tag]"
4383
a77c07d9 4384#: builtin/fetch.c:311
c04f5ac3
JX
4385msgid "[new branch]"
4386msgstr "[新分支]"
4387
a77c07d9 4388#: builtin/fetch.c:314
170e9899
JX
4389msgid "[new ref]"
4390msgstr "[新引用]"
4391
a77c07d9 4392#: builtin/fetch.c:359
c04f5ac3
JX
4393msgid "unable to update local ref"
4394msgstr "不能更新本地引用"
4395
a77c07d9 4396#: builtin/fetch.c:359
c04f5ac3
JX
4397msgid "forced update"
4398msgstr "强制更新"
4399
a77c07d9 4400#: builtin/fetch.c:365
c04f5ac3 4401msgid "(non-fast-forward)"
90e6ef53 4402msgstr "(非快进式)"
c04f5ac3 4403
a77c07d9 4404#: builtin/fetch.c:396 builtin/fetch.c:688
c04f5ac3
JX
4405#, c-format
4406msgid "cannot open %s: %s\n"
4407msgstr "无法打开 %s:%s\n"
4408
a77c07d9 4409#: builtin/fetch.c:405
c04f5ac3
JX
4410#, c-format
4411msgid "%s did not send all necessary objects\n"
4412msgstr "%s 未发送所有必须的对象\n"
4413
a77c07d9 4414#: builtin/fetch.c:491
c04f5ac3
JX
4415#, c-format
4416msgid "From %.*s\n"
4417msgstr "来自 %.*s\n"
4418
a77c07d9 4419#: builtin/fetch.c:502
c04f5ac3
JX
4420#, c-format
4421msgid ""
4422"some local refs could not be updated; try running\n"
4423" 'git remote prune %s' to remove any old, conflicting branches"
4424msgstr ""
4425"一些本地引用不能被更新;尝试运行\n"
4426" 'git remote prune %s' 来删除旧的、有冲突的分支"
4427
90e6ef53 4428# 译者:注意保持前导空格
a77c07d9 4429#: builtin/fetch.c:552
81809b99 4430#, c-format
8ada9598 4431msgid " (%s will become dangling)"
07432cef 4432msgstr " (%s 将成为摇摆状态)"
c04f5ac3 4433
90e6ef53 4434# 译者:注意保持前导空格
a77c07d9 4435#: builtin/fetch.c:553
81809b99 4436#, c-format
8ada9598 4437msgid " (%s has become dangling)"
07432cef 4438msgstr " (%s 已成为摇摆状态)"
c04f5ac3 4439
a77c07d9 4440#: builtin/fetch.c:560
c04f5ac3
JX
4441msgid "[deleted]"
4442msgstr "[已删除]"
4443
a77c07d9 4444#: builtin/fetch.c:561 builtin/remote.c:1055
c04f5ac3
JX
4445msgid "(none)"
4446msgstr "(无)"
4447
a77c07d9 4448#: builtin/fetch.c:678
c04f5ac3
JX
4449#, c-format
4450msgid "Refusing to fetch into current branch %s of non-bare repository"
4451msgstr "拒绝获取到非裸版本库的当前分支 %s"
4452
a77c07d9 4453#: builtin/fetch.c:712
c04f5ac3
JX
4454#, c-format
4455msgid "Don't know how to fetch from %s"
4456msgstr "不知道如何从 %s 获取"
4457
a77c07d9 4458#: builtin/fetch.c:789
c04f5ac3
JX
4459#, c-format
4460msgid "Option \"%s\" value \"%s\" is not valid for %s"
4461msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4462
a77c07d9 4463#: builtin/fetch.c:792
c04f5ac3
JX
4464#, c-format
4465msgid "Option \"%s\" is ignored for %s\n"
81809b99 4466msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 4467
a77c07d9 4468#: builtin/fetch.c:894
c04f5ac3
JX
4469#, c-format
4470msgid "Fetching %s\n"
d4a8e00b 4471msgstr "正在获取 %s\n"
c04f5ac3 4472
a77c07d9 4473#: builtin/fetch.c:896 builtin/remote.c:100
c04f5ac3
JX
4474#, c-format
4475msgid "Could not fetch %s"
4476msgstr "不能获取 %s"
4477
a77c07d9 4478#: builtin/fetch.c:915
c04f5ac3
JX
4479msgid ""
4480"No remote repository specified. Please, specify either a URL or a\n"
4481"remote name from which new revisions should be fetched."
90e6ef53 4482msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 4483
a77c07d9 4484#: builtin/fetch.c:935
c04f5ac3 4485msgid "You need to specify a tag name."
90e6ef53 4486msgstr "您需要指定一个 tag 名称。"
c04f5ac3 4487
a77c07d9
JX
4488#: builtin/fetch.c:981
4489msgid "--depth and --unshallow cannot be used together"
4490msgstr "--depth 和 --unshallow 不能同时使用"
4491
4492#: builtin/fetch.c:983
4493msgid "--unshallow on a complete repository does not make sense"
4494msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4495
4496#: builtin/fetch.c:1002
c04f5ac3
JX
4497msgid "fetch --all does not take a repository argument"
4498msgstr "fetch --all 不能带一个版本库参数"
4499
a77c07d9 4500#: builtin/fetch.c:1004
c04f5ac3
JX
4501msgid "fetch --all does not make sense with refspecs"
4502msgstr "fetch --all 带引用表达式没有任何意义"
4503
a77c07d9 4504#: builtin/fetch.c:1015
c04f5ac3
JX
4505#, c-format
4506msgid "No such remote or remote group: %s"
4507msgstr "没有这样的远程或远程组:%s"
4508
a77c07d9 4509#: builtin/fetch.c:1023
c04f5ac3 4510msgid "Fetching a group and specifying refspecs does not make sense"
90e6ef53 4511msgstr "获取组并指定引用表达式没有意义"
c04f5ac3 4512
ef317cd5
JX
4513#: builtin/fmt-merge-msg.c:13
4514msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4515msgstr ""
07432cef 4516"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 4517
07432cef
WS
4518#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4519#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
a77c07d9 4520#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
ef317cd5 4521msgid "n"
07432cef 4522msgstr "n"
c04f5ac3 4523
07432cef 4524#: builtin/fmt-merge-msg.c:660
ef317cd5 4525msgid "populate log with at most <n> entries from shortlog"
07432cef 4526msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 4527
07432cef 4528#: builtin/fmt-merge-msg.c:663
ef317cd5 4529msgid "alias for --log (deprecated)"
07432cef 4530msgstr "参数 --log 的别名(已弃用)"
ef317cd5 4531
07432cef 4532#: builtin/fmt-merge-msg.c:666
ef317cd5 4533msgid "text"
07432cef 4534msgstr "文本"
ef317cd5 4535
07432cef 4536#: builtin/fmt-merge-msg.c:667
ef317cd5 4537msgid "use <text> as start of message"
07432cef 4538msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 4539
07432cef 4540#: builtin/fmt-merge-msg.c:668
ef317cd5 4541msgid "file to read from"
07432cef 4542msgstr "从文件中读取"
ef317cd5
JX
4543
4544#: builtin/for-each-ref.c:979
ef317cd5 4545msgid "git for-each-ref [options] [<pattern>]"
07432cef 4546msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5
JX
4547
4548#: builtin/for-each-ref.c:994
4549msgid "quote placeholders suitably for shells"
07432cef 4550msgstr "引用占位符适用于 shells"
ef317cd5
JX
4551
4552#: builtin/for-each-ref.c:996
4553msgid "quote placeholders suitably for perl"
07432cef 4554msgstr "引用占位符适用于 perl"
ef317cd5
JX
4555
4556#: builtin/for-each-ref.c:998
4557msgid "quote placeholders suitably for python"
07432cef 4558msgstr "引用占位符适用于 python"
ef317cd5
JX
4559
4560#: builtin/for-each-ref.c:1000
4561msgid "quote placeholders suitably for tcl"
07432cef 4562msgstr "引用占位符适用于 tcl"
ef317cd5
JX
4563
4564#: builtin/for-each-ref.c:1003
4565msgid "show only <n> matched refs"
07432cef 4566msgstr "只显示 <n> 个匹配的引用"
ef317cd5
JX
4567
4568#: builtin/for-each-ref.c:1004
4569msgid "format"
07432cef 4570msgstr "格式"
ef317cd5
JX
4571
4572#: builtin/for-each-ref.c:1004
4573msgid "format to use for the output"
07432cef 4574msgstr "输出格式"
ef317cd5
JX
4575
4576#: builtin/for-each-ref.c:1005
4577msgid "key"
07432cef 4578msgstr "key"
ef317cd5
JX
4579
4580#: builtin/for-each-ref.c:1006
4581msgid "field name to sort on"
07432cef 4582msgstr "排序的字段名"
ef317cd5
JX
4583
4584#: builtin/fsck.c:608
ef317cd5 4585msgid "git fsck [options] [<object>...]"
07432cef 4586msgstr "git fsck [选项] [<对象>...]"
ef317cd5
JX
4587
4588#: builtin/fsck.c:614
4589msgid "show unreachable objects"
07432cef 4590msgstr "显示不可达的对象"
ef317cd5
JX
4591
4592#: builtin/fsck.c:615
ef317cd5 4593msgid "show dangling objects"
07432cef 4594msgstr "显示摇摆的对象"
ef317cd5
JX
4595
4596#: builtin/fsck.c:616
4597msgid "report tags"
07432cef 4598msgstr "报告 tags"
ef317cd5
JX
4599
4600#: builtin/fsck.c:617
4601msgid "report root nodes"
07432cef 4602msgstr "报告根节点"
ef317cd5
JX
4603
4604#: builtin/fsck.c:618
4605msgid "make index objects head nodes"
07432cef 4606msgstr "将索引亦作为检查的头节点"
ef317cd5
JX
4607
4608#: builtin/fsck.c:619
4609msgid "make reflogs head nodes (default)"
07432cef 4610msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5
JX
4611
4612#: builtin/fsck.c:620
4613msgid "also consider packs and alternate objects"
07432cef 4614msgstr "也考虑包和备用对象"
ef317cd5
JX
4615
4616#: builtin/fsck.c:621
4617msgid "enable more strict checking"
07432cef 4618msgstr "启用更严格的检查"
ef317cd5
JX
4619
4620#: builtin/fsck.c:623
4621msgid "write dangling objects in .git/lost-found"
07432cef 4622msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5
JX
4623
4624#: builtin/fsck.c:624 builtin/prune.c:134
4625msgid "show progress"
07432cef 4626msgstr "显示进度"
ef317cd5
JX
4627
4628#: builtin/gc.c:22
4629msgid "git gc [options]"
07432cef 4630msgstr "git gc [选项]"
ef317cd5 4631
c04f5ac3
JX
4632#: builtin/gc.c:63
4633#, c-format
4634msgid "Invalid %s: '%s'"
4635msgstr "无效的 %s:'%s'"
4636
eff6d3a9 4637#: builtin/gc.c:90
c04f5ac3
JX
4638#, c-format
4639msgid "insanely long object directory %.*s"
4640msgstr "不正常的长对象目录 %.*s"
4641
ef317cd5
JX
4642#: builtin/gc.c:179
4643msgid "prune unreferenced objects"
07432cef 4644msgstr "清除未引用的对象"
ef317cd5
JX
4645
4646#: builtin/gc.c:181
4647msgid "be more thorough (increased runtime)"
07432cef 4648msgstr "更彻底(增加运行时间)"
ef317cd5
JX
4649
4650#: builtin/gc.c:182
4651msgid "enable auto-gc mode"
07432cef 4652msgstr "启用自动垃圾回收模式"
ef317cd5 4653
07432cef 4654#: builtin/gc.c:222
c04f5ac3
JX
4655#, c-format
4656msgid ""
4657"Auto packing the repository for optimum performance. You may also\n"
4658"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4659msgstr ""
90e6ef53
JX
4660"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4661"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 4662
07432cef 4663#: builtin/gc.c:249
c04f5ac3
JX
4664msgid ""
4665"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 4666msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 4667
ef317cd5
JX
4668#: builtin/grep.c:22
4669msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 4670msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 4671
07432cef 4672#: builtin/grep.c:217
c04f5ac3
JX
4673#, c-format
4674msgid "grep: failed to create thread: %s"
90e6ef53 4675msgstr "grep:无法创建线程:%s"
c04f5ac3 4676
07432cef 4677#: builtin/grep.c:365
c04f5ac3
JX
4678#, c-format
4679msgid "Failed to chdir: %s"
4680msgstr "无法切换目录:%s"
4681
07432cef 4682#: builtin/grep.c:443 builtin/grep.c:478
c04f5ac3
JX
4683#, c-format
4684msgid "unable to read tree (%s)"
90e6ef53 4685msgstr "无法读取树(%s)"
c04f5ac3 4686
07432cef 4687#: builtin/grep.c:493
c04f5ac3
JX
4688#, c-format
4689msgid "unable to grep from object of type %s"
4690msgstr "无法抓取来自于 %s 类型的对象"
4691
07432cef 4692#: builtin/grep.c:551
c04f5ac3
JX
4693#, c-format
4694msgid "switch `%c' expects a numerical value"
4695msgstr "开关 `%c' 期望一个数字值"
4696
07432cef 4697#: builtin/grep.c:568
c04f5ac3
JX
4698#, c-format
4699msgid "cannot open '%s'"
4700msgstr "不能打开 '%s'"
4701
07432cef 4702#: builtin/grep.c:643
ef317cd5 4703msgid "search in index instead of in the work tree"
07432cef 4704msgstr "在索引区搜索而不是在工作区"
ef317cd5 4705
07432cef 4706#: builtin/grep.c:645
ef317cd5 4707msgid "find in contents not managed by git"
07432cef 4708msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
4709
4710# 译者:中文字符串拼接,可删除前导空格
07432cef 4711#: builtin/grep.c:647
ef317cd5 4712msgid "search in both tracked and untracked files"
07432cef 4713msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 4714
07432cef 4715#: builtin/grep.c:649
ef317cd5 4716msgid "search also in ignored files"
07432cef 4717msgstr "也在忽略的文件中搜索"
ef317cd5 4718
07432cef 4719#: builtin/grep.c:652
ef317cd5 4720msgid "show non-matching lines"
07432cef 4721msgstr "显示未匹配的行"
ef317cd5 4722
07432cef 4723#: builtin/grep.c:654
ef317cd5 4724msgid "case insensitive matching"
07432cef 4725msgstr "不区分大小写匹配"
ef317cd5 4726
07432cef 4727#: builtin/grep.c:656
ef317cd5 4728msgid "match patterns only at word boundaries"
07432cef 4729msgstr "只在单词边界匹配模式"
ef317cd5 4730
07432cef 4731#: builtin/grep.c:658
ef317cd5 4732msgid "process binary files as text"
07432cef 4733msgstr "把二进制文件当做文本处理"
ef317cd5 4734
07432cef 4735#: builtin/grep.c:660
ef317cd5 4736msgid "don't match patterns in binary files"
07432cef 4737msgstr "不在二进制文件中匹配模式"
ef317cd5 4738
07432cef 4739#: builtin/grep.c:663
ef317cd5 4740msgid "descend at most <depth> levels"
07432cef 4741msgstr "最多以指定的深度向下寻找"
ef317cd5 4742
07432cef 4743#: builtin/grep.c:667
ef317cd5 4744msgid "use extended POSIX regular expressions"
07432cef 4745msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 4746
07432cef 4747#: builtin/grep.c:670
ef317cd5 4748msgid "use basic POSIX regular expressions (default)"
07432cef 4749msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 4750
07432cef 4751#: builtin/grep.c:673
ef317cd5 4752msgid "interpret patterns as fixed strings"
07432cef 4753msgstr "把模式解析为固定的字符串"
ef317cd5 4754
07432cef 4755#: builtin/grep.c:676
ef317cd5 4756msgid "use Perl-compatible regular expressions"
07432cef 4757msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 4758
07432cef 4759#: builtin/grep.c:679
ef317cd5 4760msgid "show line numbers"
07432cef 4761msgstr "显示行号"
ef317cd5 4762
07432cef 4763#: builtin/grep.c:680
ef317cd5 4764msgid "don't show filenames"
07432cef 4765msgstr "不显示文件名"
ef317cd5 4766
07432cef 4767#: builtin/grep.c:681
ef317cd5 4768msgid "show filenames"
07432cef 4769msgstr "显示文件名"
ef317cd5 4770
07432cef 4771#: builtin/grep.c:683
ef317cd5 4772msgid "show filenames relative to top directory"
07432cef 4773msgstr "显示相对于顶级目录的文件名"
ef317cd5 4774
07432cef 4775#: builtin/grep.c:685
ef317cd5 4776msgid "show only filenames instead of matching lines"
07432cef 4777msgstr "只显示文件名而不显示匹配的行"
ef317cd5 4778
07432cef 4779#: builtin/grep.c:687
ef317cd5 4780msgid "synonym for --files-with-matches"
07432cef 4781msgstr "和 --files-with-matches 同义"
ef317cd5 4782
07432cef 4783#: builtin/grep.c:690
ef317cd5 4784msgid "show only the names of files without match"
07432cef 4785msgstr "只显示未匹配的文件名"
ef317cd5 4786
07432cef 4787#: builtin/grep.c:692
ef317cd5 4788msgid "print NUL after filenames"
07432cef 4789msgstr "在文件名后输出 NUL 字符"
ef317cd5 4790
07432cef 4791#: builtin/grep.c:694
ef317cd5 4792msgid "show the number of matches instead of matching lines"
07432cef 4793msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 4794
07432cef 4795#: builtin/grep.c:695
ef317cd5 4796msgid "highlight matches"
07432cef 4797msgstr "高亮显示匹配项"
ef317cd5 4798
07432cef 4799#: builtin/grep.c:697
ef317cd5 4800msgid "print empty line between matches from different files"
07432cef 4801msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 4802
07432cef 4803#: builtin/grep.c:699
ef317cd5 4804msgid "show filename only once above matches from same file"
07432cef 4805msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 4806
07432cef 4807#: builtin/grep.c:702
ef317cd5 4808msgid "show <n> context lines before and after matches"
07432cef 4809msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 4810
07432cef 4811#: builtin/grep.c:705
ef317cd5 4812msgid "show <n> context lines before matches"
07432cef 4813msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 4814
07432cef 4815#: builtin/grep.c:707
ef317cd5 4816msgid "show <n> context lines after matches"
07432cef 4817msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 4818
07432cef 4819#: builtin/grep.c:708
ef317cd5 4820msgid "shortcut for -C NUM"
07432cef 4821msgstr "快捷键 -C 数字"
ef317cd5 4822
07432cef 4823#: builtin/grep.c:711
ef317cd5 4824msgid "show a line with the function name before matches"
07432cef 4825msgstr "在匹配的前面显示一行函数名"
ef317cd5 4826
07432cef 4827#: builtin/grep.c:713
ef317cd5 4828msgid "show the surrounding function"
07432cef 4829msgstr "显示所在函数的前后内容"
ef317cd5 4830
07432cef 4831#: builtin/grep.c:716
ef317cd5 4832msgid "read patterns from file"
07432cef 4833msgstr "从文件读取模式"
ef317cd5 4834
07432cef 4835#: builtin/grep.c:718
ef317cd5 4836msgid "match <pattern>"
07432cef 4837msgstr "匹配 <模式>"
ef317cd5 4838
07432cef 4839#: builtin/grep.c:720
ef317cd5 4840msgid "combine patterns specified with -e"
07432cef 4841msgstr "组合用 -e 参数设定的模式"
ef317cd5 4842
07432cef 4843#: builtin/grep.c:732
ef317cd5 4844msgid "indicate hit with exit status without output"
07432cef 4845msgstr "不输出,而用退出码标识命中状态"
ef317cd5 4846
07432cef 4847#: builtin/grep.c:734
ef317cd5 4848msgid "show only matches from files that match all patterns"
07432cef 4849msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 4850
07432cef
WS
4851#: builtin/grep.c:736
4852msgid "show parse tree for grep expression"
4853msgstr "显示 grep 表达式的解析树"
4854
4855#: builtin/grep.c:740
ef317cd5 4856msgid "pager"
07432cef 4857msgstr "分页"
ef317cd5 4858
07432cef 4859#: builtin/grep.c:740
ef317cd5 4860msgid "show matching files in the pager"
07432cef 4861msgstr "分页显示匹配的文件"
ef317cd5 4862
07432cef 4863#: builtin/grep.c:743
ef317cd5 4864msgid "allow calling of grep(1) (ignored by this build)"
07432cef 4865msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 4866
07432cef 4867#: builtin/grep.c:744 builtin/show-ref.c:184
ef317cd5 4868msgid "show usage"
07432cef 4869msgstr "显示用法"
ef317cd5 4870
07432cef 4871#: builtin/grep.c:811
c04f5ac3
JX
4872msgid "no pattern given."
4873msgstr "未提供模式匹配。"
4874
07432cef 4875#: builtin/grep.c:825
c04f5ac3
JX
4876#, c-format
4877msgid "bad object %s"
4878msgstr "坏对象 %s"
4879
a77c07d9 4880#: builtin/grep.c:868
c04f5ac3
JX
4881msgid "--open-files-in-pager only works on the worktree"
4882msgstr "--open-files-in-pager 仅用于工作区"
4883
a77c07d9 4884#: builtin/grep.c:891
c04f5ac3 4885msgid "--cached or --untracked cannot be used with --no-index."
649900bc 4886msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 4887
a77c07d9 4888#: builtin/grep.c:896
c04f5ac3 4889msgid "--no-index or --untracked cannot be used with revs."
649900bc 4890msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 4891
a77c07d9 4892#: builtin/grep.c:899
c04f5ac3 4893msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 4894msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 4895
a77c07d9 4896#: builtin/grep.c:907
c04f5ac3
JX
4897msgid "both --cached and trees are given."
4898msgstr "同时给出了 --cached 和树对象。"
4899
ef317cd5
JX
4900#: builtin/hash-object.c:60
4901msgid ""
4902"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4903"<file>..."
4904msgstr ""
07432cef
WS
4905"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
4906"<文件>..."
ef317cd5
JX
4907
4908#: builtin/hash-object.c:61
4909msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 4910msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5
JX
4911
4912#: builtin/hash-object.c:72
4913msgid "type"
07432cef 4914msgstr "类型"
ef317cd5
JX
4915
4916#: builtin/hash-object.c:72
ef317cd5 4917msgid "object type"
07432cef 4918msgstr "对象类型"
ef317cd5
JX
4919
4920#: builtin/hash-object.c:73
4921msgid "write the object into the object database"
07432cef 4922msgstr "将对象写入对象数据库"
ef317cd5
JX
4923
4924#: builtin/hash-object.c:74
4925msgid "read the object from stdin"
07432cef 4926msgstr "从标准输入读取对象"
ef317cd5
JX
4927
4928#: builtin/hash-object.c:76
4929msgid "store file as is without filters"
07432cef 4930msgstr "原样存储文件不使用过滤器"
ef317cd5
JX
4931
4932#: builtin/hash-object.c:77
4933msgid "process file as it were from this path"
07432cef 4934msgstr "处理文件并假设其来自于此路径"
ef317cd5 4935
a77c07d9 4936#: builtin/help.c:42
ef317cd5 4937msgid "print all available commands"
07432cef 4938msgstr "打印所有可用的命令"
ef317cd5 4939
a77c07d9 4940#: builtin/help.c:43
ef317cd5 4941msgid "show man page"
07432cef 4942msgstr "显示 man 手册"
ef317cd5 4943
a77c07d9 4944#: builtin/help.c:44
ef317cd5 4945msgid "show manual in web browser"
07432cef 4946msgstr "在 web 浏览器中显示手册"
ef317cd5 4947
a77c07d9 4948#: builtin/help.c:46
ef317cd5 4949msgid "show info page"
07432cef 4950msgstr "显示 info 手册"
ef317cd5 4951
a77c07d9 4952#: builtin/help.c:52
ef317cd5 4953msgid "git help [--all] [--man|--web|--info] [command]"
07432cef 4954msgstr "git help [--all] [--man|--web|--info] [命令]"
ef317cd5 4955
a77c07d9 4956#: builtin/help.c:64
81809b99 4957#, c-format
8ada9598 4958msgid "unrecognized help format '%s'"
81809b99 4959msgstr "未能识别的帮助格式 '%s'"
8ada9598 4960
a77c07d9 4961#: builtin/help.c:92
8ada9598 4962msgid "Failed to start emacsclient."
81809b99 4963msgstr "无法启动 emacsclient。"
8ada9598 4964
a77c07d9 4965#: builtin/help.c:105
8ada9598 4966msgid "Failed to parse emacsclient version."
81809b99 4967msgstr "无法解析 emacsclient 版本。"
8ada9598 4968
a77c07d9 4969#: builtin/help.c:113
8ada9598
JX
4970#, c-format
4971msgid "emacsclient version '%d' too old (< 22)."
07432cef 4972msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 4973
a77c07d9 4974#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
81809b99 4975#, c-format
8ada9598 4976msgid "failed to exec '%s': %s"
81809b99 4977msgstr "无法执行 '%s':%s"
8ada9598 4978
a77c07d9 4979#: builtin/help.c:216
8ada9598
JX
4980#, c-format
4981msgid ""
4982"'%s': path for unsupported man viewer.\n"
4983"Please consider using 'man.<tool>.cmd' instead."
4984msgstr ""
81809b99
JX
4985"'%s':不支持的 man 手册查看器的路径。\n"
4986"请使用 'man.<tool>.cmd'。"
8ada9598 4987
a77c07d9 4988#: builtin/help.c:228
8ada9598
JX
4989#, c-format
4990msgid ""
4991"'%s': cmd for supported man viewer.\n"
4992"Please consider using 'man.<tool>.path' instead."
4993msgstr ""
81809b99
JX
4994"'%s': 支持的 man 手册查看器命令。\n"
4995"请使用 'man.<tool>.path'。"
8ada9598 4996
a77c07d9 4997#: builtin/help.c:349
8ada9598
JX
4998#, c-format
4999msgid "'%s': unknown man viewer."
81809b99 5000msgstr "'%s':未知的 man 查看器。"
8ada9598 5001
a77c07d9 5002#: builtin/help.c:366
8ada9598 5003msgid "no man viewer handled the request"
81809b99 5004msgstr "没有 man 查看器处理此请求"
8ada9598 5005
a77c07d9 5006#: builtin/help.c:374
8ada9598 5007msgid "no info viewer handled the request"
81809b99 5008msgstr "没有 info 查看器处理此请求"
8ada9598 5009
a77c07d9 5010#: builtin/help.c:429 builtin/help.c:436
8ada9598
JX
5011#, c-format
5012msgid "usage: %s%s"
81809b99 5013msgstr "用法:%s%s"
8ada9598 5014
a77c07d9 5015#: builtin/help.c:452
8ada9598
JX
5016#, c-format
5017msgid "`git %s' is aliased to `%s'"
81809b99 5018msgstr "`git %s' 是 `%s' 的别名"
8ada9598 5019
6792b93b 5020#: builtin/index-pack.c:170
8ada9598
JX
5021#, c-format
5022msgid "object type mismatch at %s"
81809b99 5023msgstr "%s 的对象类型不匹配"
8ada9598 5024
6792b93b 5025#: builtin/index-pack.c:190
8ada9598 5026msgid "object of unexpected type"
81809b99 5027msgstr "意外的类型的对象"
8ada9598 5028
6792b93b 5029#: builtin/index-pack.c:227
81809b99 5030#, c-format
8ada9598
JX
5031msgid "cannot fill %d byte"
5032msgid_plural "cannot fill %d bytes"
81809b99 5033msgstr[0] "无法填充 %d 字节"
5ae481e0 5034msgstr[1] "无法填充 %d 字节"
8ada9598 5035
6792b93b 5036#: builtin/index-pack.c:237
8ada9598 5037msgid "early EOF"
81809b99 5038msgstr "过早的文件结束符(EOF)"
8ada9598 5039
6792b93b 5040#: builtin/index-pack.c:238
8ada9598 5041msgid "read error on input"
81809b99 5042msgstr "输入上的读错误"
8ada9598 5043
6792b93b 5044#: builtin/index-pack.c:250
8ada9598 5045msgid "used more bytes than were available"
81809b99 5046msgstr "用掉了超过可用的字节"
8ada9598 5047
6792b93b 5048#: builtin/index-pack.c:257
8ada9598 5049msgid "pack too large for current definition of off_t"
81809b99 5050msgstr "包太大超过了当前 off_t 的定义"
8ada9598 5051
6792b93b 5052#: builtin/index-pack.c:273
81809b99 5053#, c-format
8ada9598 5054msgid "unable to create '%s'"
81809b99 5055msgstr "不能创建 '%s'"
8ada9598 5056
6792b93b 5057#: builtin/index-pack.c:278
81809b99 5058#, c-format
8ada9598 5059msgid "cannot open packfile '%s'"
81809b99 5060msgstr "无法打开包文件 '%s'"
8ada9598 5061
6792b93b 5062#: builtin/index-pack.c:292
8ada9598 5063msgid "pack signature mismatch"
81809b99 5064msgstr "包签名不匹配"
8ada9598 5065
ef317cd5
JX
5066#: builtin/index-pack.c:294
5067#, c-format
5068msgid "pack version %<PRIu32> unsupported"
07432cef 5069msgstr "不支持包版本 %<PRIu32>"
ef317cd5 5070
6792b93b 5071#: builtin/index-pack.c:312
8ada9598
JX
5072#, c-format
5073msgid "pack has bad object at offset %lu: %s"
81809b99 5074msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 5075
6792b93b 5076#: builtin/index-pack.c:434
8ada9598
JX
5077#, c-format
5078msgid "inflate returned %d"
81809b99 5079msgstr "解压缩返回 %d"
8ada9598 5080
6792b93b 5081#: builtin/index-pack.c:483
8ada9598 5082msgid "offset value overflow for delta base object"
81809b99 5083msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 5084
6792b93b 5085#: builtin/index-pack.c:491
8ada9598 5086msgid "delta base offset is out of bound"
81809b99 5087msgstr "delta 基准偏移越界"
8ada9598 5088
6792b93b 5089#: builtin/index-pack.c:499
81809b99 5090#, c-format
8ada9598 5091msgid "unknown object type %d"
81809b99 5092msgstr "未知对象类型 %d"
8ada9598 5093
23ff3338 5094#: builtin/index-pack.c:530
8ada9598 5095msgid "cannot pread pack file"
81809b99 5096msgstr "无法读取包文件"
8ada9598 5097
23ff3338 5098#: builtin/index-pack.c:532
8ada9598
JX
5099#, c-format
5100msgid "premature end of pack file, %lu byte missing"
5101msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 5102msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 5103msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 5104
23ff3338 5105#: builtin/index-pack.c:558
8ada9598 5106msgid "serious inflate inconsistency"
81809b99 5107msgstr "解压缩严重的不一致"
8ada9598 5108
23ff3338
JX
5109#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
5110#: builtin/index-pack.c:712 builtin/index-pack.c:721
8ada9598
JX
5111#, c-format
5112msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 5113msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 5114
23ff3338 5115#: builtin/index-pack.c:652 builtin/pack-objects.c:170
6792b93b
JX
5116#: builtin/pack-objects.c:262
5117#, c-format
5118msgid "unable to read %s"
5119msgstr "不能读 %s"
5120
23ff3338 5121#: builtin/index-pack.c:718
6792b93b
JX
5122#, c-format
5123msgid "cannot read existing object %s"
5124msgstr "不能读取现存对象 %s"
5125
23ff3338 5126#: builtin/index-pack.c:732
81809b99 5127#, c-format
8ada9598 5128msgid "invalid blob object %s"
07432cef 5129msgstr "无效的数据(blob)对象 %s"
8ada9598 5130
23ff3338 5131#: builtin/index-pack.c:747
81809b99 5132#, c-format
8ada9598 5133msgid "invalid %s"
81809b99 5134msgstr "无效的 %s"
8ada9598 5135
23ff3338 5136#: builtin/index-pack.c:749
8ada9598 5137msgid "Error in object"
81809b99 5138msgstr "对象中出错"
8ada9598 5139
23ff3338 5140#: builtin/index-pack.c:751
8ada9598
JX
5141#, c-format
5142msgid "Not all child objects of %s are reachable"
81809b99 5143msgstr "%s 的所有子对象并非都可达"
8ada9598 5144
23ff3338 5145#: builtin/index-pack.c:821 builtin/index-pack.c:847
8ada9598 5146msgid "failed to apply delta"
81809b99 5147msgstr "无法应用 delta"
8ada9598 5148
23ff3338 5149#: builtin/index-pack.c:986
8ada9598 5150msgid "Receiving objects"
81809b99 5151msgstr "接收对象中"
8ada9598 5152
23ff3338 5153#: builtin/index-pack.c:986
8ada9598 5154msgid "Indexing objects"
81809b99 5155msgstr "索引对象中"
8ada9598 5156
23ff3338 5157#: builtin/index-pack.c:1012
8ada9598 5158msgid "pack is corrupted (SHA1 mismatch)"
81809b99 5159msgstr "包冲突(SHA1 不匹配)"
8ada9598 5160
23ff3338 5161#: builtin/index-pack.c:1017
8ada9598 5162msgid "cannot fstat packfile"
81809b99 5163msgstr "不能枚举包文件状态"
8ada9598 5164
23ff3338 5165#: builtin/index-pack.c:1020
8ada9598 5166msgid "pack has junk at the end"
81809b99 5167msgstr "包的结尾有垃圾数据"
8ada9598 5168
23ff3338 5169#: builtin/index-pack.c:1031
6792b93b
JX
5170msgid "confusion beyond insanity in parse_pack_objects()"
5171msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5172
23ff3338 5173#: builtin/index-pack.c:1054
8ada9598 5174msgid "Resolving deltas"
81809b99 5175msgstr "处理 delta 中"
8ada9598 5176
ef317cd5 5177#: builtin/index-pack.c:1064
07432cef 5178#, c-format
ef317cd5 5179msgid "unable to create thread: %s"
07432cef 5180msgstr "不能创建线程:%s"
ef317cd5
JX
5181
5182#: builtin/index-pack.c:1106
8ada9598 5183msgid "confusion beyond insanity"
81809b99 5184msgstr "不可理喻"
8ada9598 5185
ef317cd5
JX
5186#: builtin/index-pack.c:1112
5187#, c-format
5188msgid "completed with %d local objects"
07432cef 5189msgstr "完成 %d 个本地对象"
ef317cd5
JX
5190
5191#: builtin/index-pack.c:1121
5192#, c-format
5193msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 5194msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5
JX
5195
5196#: builtin/index-pack.c:1125
8ada9598
JX
5197#, c-format
5198msgid "pack has %d unresolved delta"
5199msgid_plural "pack has %d unresolved deltas"
81809b99 5200msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 5201msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 5202
ef317cd5 5203#: builtin/index-pack.c:1150
81809b99 5204#, c-format
8ada9598 5205msgid "unable to deflate appended object (%d)"
07432cef 5206msgstr "不能压缩附加对象(%d)"
8ada9598 5207
ef317cd5 5208#: builtin/index-pack.c:1229
8ada9598
JX
5209#, c-format
5210msgid "local object %s is corrupt"
81809b99 5211msgstr "本地对象 %s 已损坏"
8ada9598 5212
ef317cd5 5213#: builtin/index-pack.c:1253
8ada9598 5214msgid "error while closing pack file"
81809b99 5215msgstr "关闭包文件时出错"
8ada9598 5216
ef317cd5 5217#: builtin/index-pack.c:1266
81809b99 5218#, c-format
8ada9598 5219msgid "cannot write keep file '%s'"
81809b99 5220msgstr "无法写保留文件 '%s'"
8ada9598 5221
ef317cd5 5222#: builtin/index-pack.c:1274
81809b99 5223#, c-format
8ada9598 5224msgid "cannot close written keep file '%s'"
81809b99 5225msgstr "无法关闭保留文件 '%s'"
8ada9598 5226
ef317cd5 5227#: builtin/index-pack.c:1287
8ada9598 5228msgid "cannot store pack file"
81809b99 5229msgstr "无法存储包文件"
8ada9598 5230
ef317cd5 5231#: builtin/index-pack.c:1298
8ada9598 5232msgid "cannot store index file"
81809b99 5233msgstr "无法存储索引文件"
8ada9598 5234
ef317cd5 5235#: builtin/index-pack.c:1331
07432cef 5236#, c-format
ef317cd5 5237msgid "bad pack.indexversion=%<PRIu32>"
07432cef 5238msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5
JX
5239
5240#: builtin/index-pack.c:1337
5241#, c-format
5242msgid "invalid number of threads specified (%d)"
07432cef 5243msgstr "指定的线程数无效(%d)"
ef317cd5
JX
5244
5245#: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5246#, c-format
5247msgid "no threads support, ignoring %s"
07432cef 5248msgstr "没有线程支持,忽略 %s"
ef317cd5
JX
5249
5250#: builtin/index-pack.c:1399
81809b99 5251#, c-format
8ada9598 5252msgid "Cannot open existing pack file '%s'"
81809b99 5253msgstr "无法打开现存包文件 '%s'"
8ada9598 5254
ef317cd5 5255#: builtin/index-pack.c:1401
81809b99 5256#, c-format
8ada9598 5257msgid "Cannot open existing pack idx file for '%s'"
81809b99 5258msgstr "无法为 %s 打开包索引文件"
8ada9598 5259
ef317cd5 5260#: builtin/index-pack.c:1448
81809b99 5261#, c-format
8ada9598
JX
5262msgid "non delta: %d object"
5263msgid_plural "non delta: %d objects"
81809b99 5264msgstr[0] "非 delta:%d 个对象"
5ae481e0 5265msgstr[1] "非 delta:%d 个对象"
8ada9598 5266
ef317cd5 5267#: builtin/index-pack.c:1455
8ada9598
JX
5268#, c-format
5269msgid "chain length = %d: %lu object"
5270msgid_plural "chain length = %d: %lu objects"
81809b99 5271msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 5272msgstr[1] "链长 = %d: %lu 对象"
8ada9598 5273
ef317cd5 5274#: builtin/index-pack.c:1482
8ada9598 5275msgid "Cannot come back to cwd"
81809b99 5276msgstr "无法返回当前工作目录"
8ada9598 5277
ef317cd5
JX
5278#: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5279#: builtin/index-pack.c:1541 builtin/index-pack.c:1545
81809b99 5280#, c-format
8ada9598 5281msgid "bad %s"
81809b99 5282msgstr "错误选项 %s"
8ada9598 5283
ef317cd5 5284#: builtin/index-pack.c:1559
8ada9598 5285msgid "--fix-thin cannot be used without --stdin"
649900bc 5286msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 5287
ef317cd5 5288#: builtin/index-pack.c:1563 builtin/index-pack.c:1573
8ada9598
JX
5289#, c-format
5290msgid "packfile name '%s' does not end with '.pack'"
81809b99 5291msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 5292
ef317cd5 5293#: builtin/index-pack.c:1582
8ada9598 5294msgid "--verify with no packfile name given"
81809b99 5295msgstr "--verify 没有提供包名参数"
8ada9598 5296
c04f5ac3
JX
5297#: builtin/init-db.c:35
5298#, c-format
5299msgid "Could not make %s writable by group"
5300msgstr "不能设置 %s 为组可写"
5301
5302#: builtin/init-db.c:62
5303#, c-format
5304msgid "insanely long template name %s"
5305msgstr "太长的模版名 %s"
5306
5307#: builtin/init-db.c:67
5308#, c-format
5309msgid "cannot stat '%s'"
5310msgstr "不能枚举 '%s' 状态"
5311
5312#: builtin/init-db.c:73
5313#, c-format
5314msgid "cannot stat template '%s'"
5315msgstr "不能枚举模版 '%s' 状态"
5316
5317#: builtin/init-db.c:80
5318#, c-format
5319msgid "cannot opendir '%s'"
5320msgstr "不能打开目录 '%s'"
5321
5322#: builtin/init-db.c:97
5323#, c-format
5324msgid "cannot readlink '%s'"
5325msgstr "不能读取链接 '%s'"
5326
5327#: builtin/init-db.c:99
5328#, c-format
5329msgid "insanely long symlink %s"
5330msgstr "太长的符号链接 %s"
5331
5332#: builtin/init-db.c:102
5333#, c-format
5334msgid "cannot symlink '%s' '%s'"
90e6ef53 5335msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
5336
5337#: builtin/init-db.c:106
5338#, c-format
5339msgid "cannot copy '%s' to '%s'"
5340msgstr "不能拷贝 '%s' 至 '%s'"
5341
5342#: builtin/init-db.c:110
5343#, c-format
5344msgid "ignoring template %s"
5345msgstr "忽略模版 %s"
5346
5347#: builtin/init-db.c:133
5348#, c-format
5349msgid "insanely long template path %s"
5350msgstr "太长的模版路径 %s"
5351
5352#: builtin/init-db.c:141
5353#, c-format
5354msgid "templates not found %s"
5355msgstr "模版未找到 %s"
5356
5357#: builtin/init-db.c:154
5358#, c-format
5359msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 5360msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
5361
5362#: builtin/init-db.c:192
5363#, c-format
5364msgid "insane git directory %s"
5365msgstr "不正常的 git 目录 %s"
5366
23ff3338 5367#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
5368#, c-format
5369msgid "%s already exists"
5370msgstr "%s 已经存在"
5371
23ff3338 5372#: builtin/init-db.c:355
c04f5ac3
JX
5373#, c-format
5374msgid "unable to handle file type %d"
5375msgstr "不能处理 %d 类型的文件"
5376
23ff3338 5377#: builtin/init-db.c:358
c04f5ac3
JX
5378#, c-format
5379msgid "unable to move %s to %s"
5380msgstr "不能移动 %s 至 %s"
5381
23ff3338 5382#: builtin/init-db.c:363
c04f5ac3
JX
5383#, c-format
5384msgid "Could not create git link %s"
5385msgstr "不能创建 git link %s"
5386
5387#.
5388#. * TRANSLATORS: The first '%s' is either "Reinitialized
5389#. * existing" or "Initialized empty", the second " shared" or
5390#. * "", and the last '%s%s' is the verbatim directory name.
5391#.
23ff3338 5392#: builtin/init-db.c:420
c04f5ac3
JX
5393#, c-format
5394msgid "%s%s Git repository in %s%s\n"
5395msgstr "%s%s Git 版本库于 %s%s\n"
5396
23ff3338 5397#: builtin/init-db.c:421
c04f5ac3
JX
5398msgid "Reinitialized existing"
5399msgstr "重新初始化现存的"
5400
23ff3338 5401#: builtin/init-db.c:421
c04f5ac3
JX
5402msgid "Initialized empty"
5403msgstr "初始化空的"
5404
7e238ab7 5405# 译者:中文字符串拼接,可删除前导空格
23ff3338 5406#: builtin/init-db.c:422
c04f5ac3 5407msgid " shared"
90e6ef53 5408msgstr "共享"
c04f5ac3 5409
23ff3338 5410#: builtin/init-db.c:441
c04f5ac3
JX
5411msgid "cannot tell cwd"
5412msgstr "无法获知当前路径"
5413
ef317cd5
JX
5414#: builtin/init-db.c:467
5415msgid ""
a77c07d9
JX
5416"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5417"shared[=<permissions>]] [directory]"
ef317cd5 5418msgstr ""
07432cef
WS
5419"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5420"[目录]"
ef317cd5
JX
5421
5422#: builtin/init-db.c:490
5423msgid "permissions"
07432cef 5424msgstr "权限"
ef317cd5
JX
5425
5426#: builtin/init-db.c:491
5427msgid "specify that the git repository is to be shared amongst several users"
07432cef 5428msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5
JX
5429
5430#: builtin/init-db.c:493 builtin/prune-packed.c:77
ef317cd5 5431msgid "be quiet"
07432cef 5432msgstr "保持安静"
ef317cd5 5433
23ff3338 5434#: builtin/init-db.c:522 builtin/init-db.c:529
c04f5ac3
JX
5435#, c-format
5436msgid "cannot mkdir %s"
5437msgstr "不能创建目录 %s"
5438
23ff3338 5439#: builtin/init-db.c:533
c04f5ac3
JX
5440#, c-format
5441msgid "cannot chdir to %s"
5442msgstr "不能切换目录到 %s"
5443
23ff3338 5444#: builtin/init-db.c:555
c04f5ac3
JX
5445#, c-format
5446msgid ""
5447"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5448"dir=<directory>)"
5449msgstr ""
73a60cd2
JX
5450"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5451"dir=<directory>)"
c04f5ac3 5452
23ff3338 5453#: builtin/init-db.c:579
c04f5ac3
JX
5454msgid "Cannot access current working directory"
5455msgstr "不能访问当前工作目录"
5456
23ff3338 5457#: builtin/init-db.c:586
c04f5ac3
JX
5458#, c-format
5459msgid "Cannot access work tree '%s'"
5460msgstr "不能访问工作区 '%s'"
5461
07432cef 5462#: builtin/log.c:39
ef317cd5 5463msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
07432cef 5464msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
ef317cd5 5465
07432cef 5466#: builtin/log.c:40
ef317cd5 5467msgid " or: git show [options] <object>..."
07432cef 5468msgstr " 或者:git show [选项] <对象>..."
ef317cd5 5469
07432cef 5470#: builtin/log.c:102
ef317cd5 5471msgid "suppress diff output"
07432cef 5472msgstr "不显示差异输出"
ef317cd5 5473
07432cef 5474#: builtin/log.c:103
ef317cd5 5475msgid "show source"
07432cef 5476msgstr "显示源"
ef317cd5 5477
07432cef
WS
5478#: builtin/log.c:104
5479msgid "Use mail map file"
5480msgstr "使用邮件映射文件"
5481
5482#: builtin/log.c:105
ef317cd5 5483msgid "decorate options"
07432cef 5484msgstr "修饰选项"
ef317cd5 5485
07432cef 5486#: builtin/log.c:198
c04f5ac3
JX
5487#, c-format
5488msgid "Final output: %d %s\n"
5489msgstr "最终输出:%d %s\n"
5490
07432cef 5491#: builtin/log.c:419 builtin/log.c:511
c04f5ac3
JX
5492#, c-format
5493msgid "Could not read object %s"
90e6ef53 5494msgstr "不能读取对象 %s"
c04f5ac3 5495
07432cef 5496#: builtin/log.c:535
c04f5ac3
JX
5497#, c-format
5498msgid "Unknown type: %d"
5499msgstr "未知类型:%d"
5500
07432cef 5501#: builtin/log.c:627
c04f5ac3
JX
5502msgid "format.headers without value"
5503msgstr "format.headers 没有值"
5504
07432cef 5505#: builtin/log.c:701
c04f5ac3
JX
5506msgid "name of output directory is too long"
5507msgstr "输出目录名太长"
5508
07432cef 5509#: builtin/log.c:717
c04f5ac3
JX
5510#, c-format
5511msgid "Cannot open patch file %s"
5512msgstr "无法打开补丁文件 %s"
5513
07432cef 5514#: builtin/log.c:731
c04f5ac3
JX
5515msgid "Need exactly one range."
5516msgstr "只需要一个范围。"
5517
07432cef 5518#: builtin/log.c:739
c04f5ac3
JX
5519msgid "Not a range."
5520msgstr "不是一个范围。"
5521
07432cef 5522#: builtin/log.c:812
c04f5ac3
JX
5523msgid "Cover letter needs email format"
5524msgstr "信封需要邮件地址格式"
5525
07432cef 5526#: builtin/log.c:885
c04f5ac3
JX
5527#, c-format
5528msgid "insane in-reply-to: %s"
5529msgstr "不正常的 in-reply-to:%s"
5530
07432cef 5531#: builtin/log.c:913
ef317cd5 5532msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 5533msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 5534
07432cef 5535#: builtin/log.c:958
c04f5ac3
JX
5536msgid "Two output directories?"
5537msgstr "两个输出目录?"
5538
07432cef 5539#: builtin/log.c:1097
ef317cd5 5540msgid "use [PATCH n/m] even with a single patch"
07432cef 5541msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 5542
07432cef 5543#: builtin/log.c:1100
ef317cd5 5544msgid "use [PATCH] even with multiple patches"
07432cef 5545msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 5546
07432cef 5547#: builtin/log.c:1104
ef317cd5 5548msgid "print patches to standard out"
07432cef 5549msgstr "打印补丁到标准输出"
c04f5ac3 5550
07432cef 5551#: builtin/log.c:1106
ef317cd5 5552msgid "generate a cover letter"
07432cef 5553msgstr "生成一封附信"
c04f5ac3 5554
07432cef 5555#: builtin/log.c:1108
ef317cd5 5556msgid "use simple number sequence for output file names"
07432cef 5557msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 5558
07432cef 5559#: builtin/log.c:1109
ef317cd5 5560msgid "sfx"
07432cef 5561msgstr "后缀"
ef317cd5 5562
07432cef 5563#: builtin/log.c:1110
ef317cd5 5564msgid "use <sfx> instead of '.patch'"
07432cef 5565msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 5566
07432cef 5567#: builtin/log.c:1112
ef317cd5 5568msgid "start numbering patches at <n> instead of 1"
07432cef
WS
5569msgstr "补丁以 <n> 开始编号,而不是1"
5570
5571#: builtin/log.c:1114
5572msgid "mark the series as Nth re-roll"
5573msgstr "标记补丁系列是第几次重制"
ef317cd5 5574
07432cef 5575#: builtin/log.c:1116
ef317cd5 5576msgid "Use [<prefix>] instead of [PATCH]"
07432cef 5577msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 5578
07432cef 5579#: builtin/log.c:1119
ef317cd5 5580msgid "store resulting files in <dir>"
07432cef 5581msgstr "把结果文件存储在 <dir>"
ef317cd5 5582
07432cef 5583#: builtin/log.c:1122
ef317cd5 5584msgid "don't strip/add [PATCH]"
07432cef 5585msgstr "不删除/添加 [PATCH]"
ef317cd5 5586
07432cef 5587#: builtin/log.c:1125
ef317cd5 5588msgid "don't output binary diffs"
07432cef 5589msgstr "不输出二进制差异"
ef317cd5 5590
07432cef 5591#: builtin/log.c:1127
ef317cd5 5592msgid "don't include a patch matching a commit upstream"
07432cef 5593msgstr "不包含已在上游提交中的补丁"
ef317cd5 5594
07432cef 5595#: builtin/log.c:1129
ef317cd5 5596msgid "show patch format instead of default (patch + stat)"
07432cef 5597msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 5598
07432cef 5599#: builtin/log.c:1131
ef317cd5 5600msgid "Messaging"
07432cef 5601msgstr "邮件发送"
ef317cd5 5602
07432cef 5603#: builtin/log.c:1132
ef317cd5 5604msgid "header"
07432cef 5605msgstr "header"
ef317cd5 5606
07432cef 5607#: builtin/log.c:1133
ef317cd5 5608msgid "add email header"
07432cef 5609msgstr "添加邮件头"
ef317cd5 5610
07432cef 5611#: builtin/log.c:1134 builtin/log.c:1136
ef317cd5 5612msgid "email"
07432cef 5613msgstr "邮件地址"
ef317cd5 5614
07432cef 5615#: builtin/log.c:1134
ef317cd5 5616msgid "add To: header"
07432cef 5617msgstr "添加收件人"
ef317cd5 5618
07432cef 5619#: builtin/log.c:1136
ef317cd5 5620msgid "add Cc: header"
07432cef 5621msgstr "添加抄送"
ef317cd5 5622
07432cef 5623#: builtin/log.c:1138
ef317cd5 5624msgid "message-id"
07432cef 5625msgstr "message-id"
ef317cd5 5626
07432cef 5627#: builtin/log.c:1139
ef317cd5 5628msgid "make first mail a reply to <message-id>"
07432cef 5629msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 5630
07432cef 5631#: builtin/log.c:1140 builtin/log.c:1143
ef317cd5 5632msgid "boundary"
07432cef 5633msgstr "边界"
ef317cd5 5634
07432cef 5635#: builtin/log.c:1141
ef317cd5 5636msgid "attach the patch"
07432cef 5637msgstr "附件方式添加补丁"
ef317cd5 5638
07432cef 5639#: builtin/log.c:1144
ef317cd5 5640msgid "inline the patch"
07432cef 5641msgstr "内联显示补丁"
ef317cd5 5642
07432cef 5643#: builtin/log.c:1148
ef317cd5 5644msgid "enable message threading, styles: shallow, deep"
07432cef 5645msgstr "启用邮件线索,风格:浅,深"
ef317cd5 5646
07432cef 5647#: builtin/log.c:1150
ef317cd5 5648msgid "signature"
07432cef 5649msgstr "签名"
ef317cd5 5650
07432cef 5651#: builtin/log.c:1151
ef317cd5 5652msgid "add a signature"
07432cef 5653msgstr "添加一个签名"
ef317cd5 5654
07432cef 5655#: builtin/log.c:1153
ef317cd5 5656msgid "don't print the patch filenames"
07432cef 5657msgstr "不要打印补丁文件名"
ef317cd5 5658
07432cef 5659#: builtin/log.c:1202
c04f5ac3
JX
5660#, c-format
5661msgid "bogus committer info %s"
5662msgstr "虚假的提交者信息 %s"
5663
07432cef 5664#: builtin/log.c:1247
c04f5ac3
JX
5665msgid "-n and -k are mutually exclusive."
5666msgstr "-n 和 -k 互斥。"
5667
07432cef 5668#: builtin/log.c:1249
c04f5ac3
JX
5669msgid "--subject-prefix and -k are mutually exclusive."
5670msgstr "--subject-prefix 和 -k 互斥。"
5671
07432cef 5672#: builtin/log.c:1257
c04f5ac3
JX
5673msgid "--name-only does not make sense"
5674msgstr "--name-only 无意义"
5675
07432cef 5676#: builtin/log.c:1259
c04f5ac3
JX
5677msgid "--name-status does not make sense"
5678msgstr "--name-status 无意义"
5679
07432cef 5680#: builtin/log.c:1261
c04f5ac3
JX
5681msgid "--check does not make sense"
5682msgstr "--check 无意义"
5683
07432cef 5684#: builtin/log.c:1284
c04f5ac3
JX
5685msgid "standard output, or directory, which one?"
5686msgstr "标准输出或目录,哪一个?"
5687
07432cef 5688#: builtin/log.c:1286
c04f5ac3
JX
5689#, c-format
5690msgid "Could not create directory '%s'"
90e6ef53 5691msgstr "不能创建目录 '%s'"
c04f5ac3 5692
07432cef 5693#: builtin/log.c:1439
c04f5ac3
JX
5694msgid "Failed to create output files"
5695msgstr "无法创建输出文件"
5696
07432cef 5697#: builtin/log.c:1488
ef317cd5 5698msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 5699msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 5700
07432cef 5701#: builtin/log.c:1543
c04f5ac3
JX
5702#, c-format
5703msgid ""
5704"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 5705msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 5706
07432cef 5707#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
c04f5ac3
JX
5708#, c-format
5709msgid "Unknown commit %s"
5710msgstr "未知提交 %s"
5711
a77c07d9 5712#: builtin/ls-files.c:409
ef317cd5 5713msgid "git ls-files [options] [<file>...]"
07432cef 5714msgstr "git ls-files [选项] [<文件>...]"
ef317cd5 5715
a77c07d9 5716#: builtin/ls-files.c:466
ef317cd5 5717msgid "identify the file status with tags"
07432cef 5718msgstr "用标签标识文件的状态"
ef317cd5 5719
a77c07d9 5720#: builtin/ls-files.c:468
ef317cd5 5721msgid "use lowercase letters for 'assume unchanged' files"
07432cef 5722msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 5723
a77c07d9 5724#: builtin/ls-files.c:470
ef317cd5 5725msgid "show cached files in the output (default)"
07432cef 5726msgstr "显示缓存的文件(默认)"
ef317cd5 5727
a77c07d9 5728#: builtin/ls-files.c:472
ef317cd5 5729msgid "show deleted files in the output"
07432cef 5730msgstr "显示已删除的文件"
ef317cd5 5731
a77c07d9 5732#: builtin/ls-files.c:474
ef317cd5 5733msgid "show modified files in the output"
07432cef 5734msgstr "显示已修改的文件"
ef317cd5 5735
a77c07d9 5736#: builtin/ls-files.c:476
ef317cd5 5737msgid "show other files in the output"
07432cef 5738msgstr "显示其它文件"
ef317cd5 5739
a77c07d9 5740#: builtin/ls-files.c:478
ef317cd5 5741msgid "show ignored files in the output"
07432cef 5742msgstr "显示忽略的文件"
ef317cd5 5743
a77c07d9 5744#: builtin/ls-files.c:481
ef317cd5 5745msgid "show staged contents' object name in the output"
07432cef 5746msgstr "显示暂存区内容的对象名称"
ef317cd5 5747
a77c07d9 5748#: builtin/ls-files.c:483
ef317cd5 5749msgid "show files on the filesystem that need to be removed"
07432cef 5750msgstr "显示文件系统需要删除的文件"
ef317cd5 5751
a77c07d9 5752#: builtin/ls-files.c:485
ef317cd5 5753msgid "show 'other' directories' name only"
07432cef 5754msgstr "只显示“其他”目录的名称"
ef317cd5 5755
a77c07d9 5756#: builtin/ls-files.c:488
ef317cd5 5757msgid "don't show empty directories"
07432cef 5758msgstr "不显示空目录"
ef317cd5 5759
a77c07d9 5760#: builtin/ls-files.c:491
ef317cd5 5761msgid "show unmerged files in the output"
07432cef 5762msgstr "显示未合并的文件"
ef317cd5 5763
a77c07d9 5764#: builtin/ls-files.c:493
ef317cd5 5765msgid "show resolve-undo information"
07432cef 5766msgstr "显示 resolve-undo 信息"
ef317cd5 5767
a77c07d9 5768#: builtin/ls-files.c:495
ef317cd5 5769msgid "skip files matching pattern"
07432cef 5770msgstr "匹配排除文件的模式"
ef317cd5 5771
a77c07d9 5772#: builtin/ls-files.c:498
ef317cd5 5773msgid "exclude patterns are read from <file>"
07432cef 5774msgstr "从 <文件> 中读取排除模式"
ef317cd5 5775
a77c07d9 5776#: builtin/ls-files.c:501
ef317cd5 5777msgid "read additional per-directory exclude patterns in <file>"
07432cef 5778msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 5779
a77c07d9 5780#: builtin/ls-files.c:503
ef317cd5 5781msgid "add the standard git exclusions"
07432cef 5782msgstr "添加标准的 git 排除"
ef317cd5 5783
a77c07d9 5784#: builtin/ls-files.c:506
ef317cd5 5785msgid "make the output relative to the project top directory"
07432cef 5786msgstr "显示相对于顶级目录的文件名"
ef317cd5 5787
a77c07d9 5788#: builtin/ls-files.c:509
ef317cd5 5789msgid "if any <file> is not in the index, treat this as an error"
07432cef 5790msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 5791
a77c07d9 5792#: builtin/ls-files.c:510
ef317cd5 5793msgid "tree-ish"
07432cef 5794msgstr "树或提交"
ef317cd5 5795
a77c07d9 5796#: builtin/ls-files.c:511
ef317cd5 5797msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 5798msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 5799
a77c07d9 5800#: builtin/ls-files.c:513
ef317cd5 5801msgid "show debugging data"
07432cef 5802msgstr "显示调试数据"
ef317cd5
JX
5803
5804#: builtin/ls-tree.c:27
ef317cd5 5805msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 5806msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5
JX
5807
5808#: builtin/ls-tree.c:125
5809msgid "only show trees"
07432cef 5810msgstr "只显示树"
ef317cd5
JX
5811
5812#: builtin/ls-tree.c:127
ef317cd5 5813msgid "recurse into subtrees"
07432cef 5814msgstr "递归到子树"
ef317cd5
JX
5815
5816#: builtin/ls-tree.c:129
5817msgid "show trees when recursing"
07432cef 5818msgstr "当递归时显示树"
ef317cd5
JX
5819
5820#: builtin/ls-tree.c:132
5821msgid "terminate entries with NUL byte"
07432cef 5822msgstr "条目以NUL字符终止"
ef317cd5
JX
5823
5824#: builtin/ls-tree.c:133
ef317cd5 5825msgid "include object size"
07432cef 5826msgstr "包括对象大小"
ef317cd5
JX
5827
5828#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5829msgid "list only filenames"
07432cef 5830msgstr "只列出文件名"
ef317cd5
JX
5831
5832#: builtin/ls-tree.c:140
5833msgid "use full path names"
07432cef 5834msgstr "使用文件的全路径"
ef317cd5
JX
5835
5836#: builtin/ls-tree.c:142
5837msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 5838msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5
JX
5839
5840#: builtin/merge.c:43
ef317cd5 5841msgid "git merge [options] [<commit>...]"
07432cef 5842msgstr "git merge [选项] [<提交>...]"
ef317cd5
JX
5843
5844#: builtin/merge.c:44
5845msgid "git merge [options] <msg> HEAD <commit>"
07432cef 5846msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5
JX
5847
5848#: builtin/merge.c:45
5849msgid "git merge --abort"
07432cef 5850msgstr "git merge --abort"
ef317cd5 5851
170e9899 5852#: builtin/merge.c:90
c04f5ac3
JX
5853msgid "switch `m' requires a value"
5854msgstr "开关 `m' 需要一个值"
5855
170e9899 5856#: builtin/merge.c:127
c04f5ac3
JX
5857#, c-format
5858msgid "Could not find merge strategy '%s'.\n"
90e6ef53 5859msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 5860
170e9899 5861#: builtin/merge.c:128
c04f5ac3
JX
5862#, c-format
5863msgid "Available strategies are:"
5864msgstr "可用的策略有:"
5865
170e9899 5866#: builtin/merge.c:133
c04f5ac3
JX
5867#, c-format
5868msgid "Available custom strategies are:"
5869msgstr "可用的自定义策略有:"
5870
ef317cd5
JX
5871#: builtin/merge.c:183
5872msgid "do not show a diffstat at the end of the merge"
07432cef 5873msgstr "在合并的最后不显示差异统计"
ef317cd5
JX
5874
5875#: builtin/merge.c:186
5876msgid "show a diffstat at the end of the merge"
07432cef 5877msgstr "在合并的最后显示差异统计"
ef317cd5
JX
5878
5879#: builtin/merge.c:187
5880msgid "(synonym to --stat)"
07432cef 5881msgstr "(和 --stat 同义)"
ef317cd5
JX
5882
5883#: builtin/merge.c:189
5884msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 5885msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5
JX
5886
5887#: builtin/merge.c:192
ef317cd5 5888msgid "create a single commit instead of doing a merge"
07432cef 5889msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5
JX
5890
5891#: builtin/merge.c:194
5892msgid "perform a commit if the merge succeeds (default)"
07432cef 5893msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5
JX
5894
5895#: builtin/merge.c:196
ef317cd5 5896msgid "edit message before committing"
07432cef 5897msgstr "在提交前编辑提交说明"
ef317cd5
JX
5898
5899#: builtin/merge.c:198
ef317cd5 5900msgid "allow fast-forward (default)"
07432cef 5901msgstr "允许快进(默认)"
ef317cd5
JX
5902
5903#: builtin/merge.c:200
5904msgid "abort if fast-forward is not possible"
07432cef 5905msgstr "如果不能快进就放弃合并"
ef317cd5 5906
a77c07d9 5907#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112
ef317cd5 5908msgid "strategy"
07432cef 5909msgstr "策略"
ef317cd5
JX
5910
5911#: builtin/merge.c:203
ef317cd5 5912msgid "merge strategy to use"
07432cef 5913msgstr "要使用的合并策略"
ef317cd5
JX
5914
5915#: builtin/merge.c:204
5916msgid "option=value"
07432cef 5917msgstr "option=value"
ef317cd5
JX
5918
5919#: builtin/merge.c:205
5920msgid "option for selected merge strategy"
07432cef 5921msgstr "所选的合并策略的选项"
ef317cd5
JX
5922
5923#: builtin/merge.c:207
5924msgid "merge commit message (for a non-fast-forward merge)"
07432cef 5925msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5
JX
5926
5927#: builtin/merge.c:211
ef317cd5 5928msgid "abort the current in-progress merge"
07432cef 5929msgstr "放弃当前正在进行的合并"
ef317cd5 5930
170e9899 5931#: builtin/merge.c:240
c04f5ac3
JX
5932msgid "could not run stash."
5933msgstr "不能进行进度保存。"
5934
170e9899 5935#: builtin/merge.c:245
c04f5ac3
JX
5936msgid "stash failed"
5937msgstr "进度保存失败"
5938
170e9899 5939#: builtin/merge.c:250
c04f5ac3
JX
5940#, c-format
5941msgid "not a valid object: %s"
5942msgstr "不是一个有效对象:%s"
5943
170e9899 5944#: builtin/merge.c:269 builtin/merge.c:286
c04f5ac3
JX
5945msgid "read-tree failed"
5946msgstr "读取树失败"
5947
90e6ef53 5948# 译者:注意保持前导空格
170e9899 5949#: builtin/merge.c:316
c04f5ac3
JX
5950msgid " (nothing to squash)"
5951msgstr " (无可压缩)"
5952
170e9899 5953#: builtin/merge.c:329
c04f5ac3
JX
5954#, c-format
5955msgid "Squash commit -- not updating HEAD\n"
5956msgstr "压缩提交 -- 未更新 HEAD\n"
5957
170e9899 5958#: builtin/merge.c:361
c04f5ac3
JX
5959msgid "Writing SQUASH_MSG"
5960msgstr "写入 SQUASH_MSG"
5961
170e9899 5962#: builtin/merge.c:363
c04f5ac3
JX
5963msgid "Finishing SQUASH_MSG"
5964msgstr "完成 SQUASH_MSG"
5965
5966#: builtin/merge.c:386
5967#, c-format
5968msgid "No merge message -- not updating HEAD\n"
5969msgstr "无合并信息 -- 未更新 HEAD\n"
5970
c160d03f 5971#: builtin/merge.c:436
c04f5ac3
JX
5972#, c-format
5973msgid "'%s' does not point to a commit"
5974msgstr "'%s' 没有指向一个提交"
5975
c160d03f 5976#: builtin/merge.c:535
c04f5ac3
JX
5977#, c-format
5978msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 5979msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 5980
c160d03f 5981#: builtin/merge.c:628
c04f5ac3
JX
5982msgid "git write-tree failed to write a tree"
5983msgstr "git write-tree 无法写入一树对象"
5984
07432cef 5985#: builtin/merge.c:656
c04f5ac3
JX
5986msgid "Not handling anything other than two heads merge."
5987msgstr "不能处理两个头合并之外的任何操作。"
5988
07432cef 5989#: builtin/merge.c:670
c04f5ac3
JX
5990#, c-format
5991msgid "Unknown option for merge-recursive: -X%s"
5992msgstr "merge-recursive 的未知选项:-X%s"
5993
07432cef 5994#: builtin/merge.c:684
c04f5ac3
JX
5995#, c-format
5996msgid "unable to write %s"
5997msgstr "不能写 %s"
5998
07432cef 5999#: builtin/merge.c:773
c04f5ac3
JX
6000#, c-format
6001msgid "Could not read from '%s'"
6002msgstr "不能从 '%s' 读取"
6003
07432cef 6004#: builtin/merge.c:782
c04f5ac3
JX
6005#, c-format
6006msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6007msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6008
07432cef 6009#: builtin/merge.c:788
a77c07d9 6010#, c-format
c04f5ac3
JX
6011msgid ""
6012"Please enter a commit message to explain why this merge is necessary,\n"
6013"especially if it merges an updated upstream into a topic branch.\n"
6014"\n"
a77c07d9 6015"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
6016"the commit.\n"
6017msgstr ""
6018"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6019"合并到主题分支。\n"
6020"\n"
a77c07d9 6021"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 6022
a77c07d9 6023#: builtin/merge.c:812
c04f5ac3
JX
6024msgid "Empty commit message."
6025msgstr "空提交信息。"
6026
a77c07d9 6027#: builtin/merge.c:824
c04f5ac3
JX
6028#, c-format
6029msgid "Wonderful.\n"
6030msgstr "太棒了。\n"
6031
a77c07d9 6032#: builtin/merge.c:889
c04f5ac3
JX
6033#, c-format
6034msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6035msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6036
a77c07d9 6037#: builtin/merge.c:905
c04f5ac3
JX
6038#, c-format
6039msgid "'%s' is not a commit"
6040msgstr "'%s' 不是一个提交"
6041
a77c07d9 6042#: builtin/merge.c:946
c04f5ac3 6043msgid "No current branch."
90e6ef53 6044msgstr "没有当前分支。"
c04f5ac3 6045
a77c07d9 6046#: builtin/merge.c:948
c04f5ac3 6047msgid "No remote for the current branch."
90e6ef53 6048msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 6049
a77c07d9 6050#: builtin/merge.c:950
c04f5ac3 6051msgid "No default upstream defined for the current branch."
90e6ef53 6052msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 6053
a77c07d9 6054#: builtin/merge.c:955
c04f5ac3
JX
6055#, c-format
6056msgid "No remote tracking branch for %s from %s"
6057msgstr "%s 没有来自 %s 的远程跟踪分支"
6058
a77c07d9 6059#: builtin/merge.c:1042 builtin/merge.c:1199
170e9899
JX
6060#, c-format
6061msgid "%s - not something we can merge"
6062msgstr "%s - 不能被合并"
6063
a77c07d9 6064#: builtin/merge.c:1110
c04f5ac3 6065msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 6066msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 6067
a77c07d9 6068#: builtin/merge.c:1126 git-pull.sh:31
c04f5ac3
JX
6069msgid ""
6070"You have not concluded your merge (MERGE_HEAD exists).\n"
6071"Please, commit your changes before you can merge."
6072msgstr ""
6073"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 6074"请在合并前先提交您的修改。"
c04f5ac3 6075
a77c07d9 6076#: builtin/merge.c:1129 git-pull.sh:34
c04f5ac3
JX
6077msgid "You have not concluded your merge (MERGE_HEAD exists)."
6078msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6079
a77c07d9 6080#: builtin/merge.c:1133
c04f5ac3
JX
6081msgid ""
6082"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6083"Please, commit your changes before you can merge."
6084msgstr ""
6085"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 6086"请在合并前先提交您的修改。"
c04f5ac3 6087
a77c07d9 6088#: builtin/merge.c:1136
c04f5ac3
JX
6089msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6090msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6091
a77c07d9 6092#: builtin/merge.c:1145
c04f5ac3 6093msgid "You cannot combine --squash with --no-ff."
649900bc 6094msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 6095
a77c07d9 6096#: builtin/merge.c:1150
c04f5ac3 6097msgid "You cannot combine --no-ff with --ff-only."
649900bc 6098msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
c04f5ac3 6099
a77c07d9 6100#: builtin/merge.c:1157
c04f5ac3 6101msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 6102msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 6103
a77c07d9 6104#: builtin/merge.c:1189
c04f5ac3 6105msgid "Can merge only exactly one commit into empty head"
90e6ef53 6106msgstr "只能将一个提交合并到空分支上"
c04f5ac3 6107
a77c07d9 6108#: builtin/merge.c:1192
c04f5ac3
JX
6109msgid "Squash commit into empty head not supported yet"
6110msgstr "尚不支持到空分支的压缩提交"
6111
a77c07d9 6112#: builtin/merge.c:1194
c04f5ac3
JX
6113msgid "Non-fast-forward commit does not make sense into an empty head"
6114msgstr "到空分支的非快进式提交没有意义"
6115
a77c07d9 6116#: builtin/merge.c:1310
c04f5ac3
JX
6117#, c-format
6118msgid "Updating %s..%s\n"
6119msgstr "更新 %s..%s\n"
6120
a77c07d9 6121#: builtin/merge.c:1349
c04f5ac3
JX
6122#, c-format
6123msgid "Trying really trivial in-index merge...\n"
90e6ef53 6124msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 6125
a77c07d9 6126#: builtin/merge.c:1356
c04f5ac3
JX
6127#, c-format
6128msgid "Nope.\n"
6129msgstr "无。\n"
6130
a77c07d9 6131#: builtin/merge.c:1388
c04f5ac3 6132msgid "Not possible to fast-forward, aborting."
1aabac65 6133msgstr "无法快进,终止。"
c04f5ac3 6134
a77c07d9 6135#: builtin/merge.c:1411 builtin/merge.c:1490
c04f5ac3
JX
6136#, c-format
6137msgid "Rewinding the tree to pristine...\n"
6138msgstr "将树回滚至原始状态...\n"
6139
a77c07d9 6140#: builtin/merge.c:1415
c04f5ac3
JX
6141#, c-format
6142msgid "Trying merge strategy %s...\n"
6143msgstr "尝试合并策略 %s...\n"
6144
a77c07d9 6145#: builtin/merge.c:1481
c04f5ac3
JX
6146#, c-format
6147msgid "No merge strategy handled the merge.\n"
6148msgstr "没有合并策略处理此合并。\n"
6149
a77c07d9 6150#: builtin/merge.c:1483
c04f5ac3
JX
6151#, c-format
6152msgid "Merge with strategy %s failed.\n"
6153msgstr "使用策略 %s 合并失败。\n"
6154
a77c07d9 6155#: builtin/merge.c:1492
c04f5ac3
JX
6156#, c-format
6157msgid "Using the %s to prepare resolving by hand.\n"
6158msgstr "使用 %s 以准备手工解决。\n"
6159
a77c07d9 6160#: builtin/merge.c:1504
c04f5ac3
JX
6161#, c-format
6162msgid "Automatic merge went well; stopped before committing as requested\n"
6163msgstr "自动合并进展顺利,按要求在提交前停止\n"
6164
ef317cd5
JX
6165#: builtin/merge-base.c:26
6166msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 6167msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5
JX
6168
6169#: builtin/merge-base.c:27
6170msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 6171msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5
JX
6172
6173#: builtin/merge-base.c:28
6174msgid "git merge-base --independent <commit>..."
07432cef 6175msgstr "git merge-base --independent <提交>..."
ef317cd5
JX
6176
6177#: builtin/merge-base.c:29
6178msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 6179msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5
JX
6180
6181#: builtin/merge-base.c:98
ef317cd5 6182msgid "output all common ancestors"
07432cef 6183msgstr "输出所有共同的祖先"
ef317cd5
JX
6184
6185#: builtin/merge-base.c:99
6186msgid "find ancestors for a single n-way merge"
07432cef 6187msgstr "查找一个多路合并的祖先提交"
ef317cd5
JX
6188
6189#: builtin/merge-base.c:100
6190msgid "list revs not reachable from others"
07432cef 6191msgstr "显示不能被其他访问到的版本"
ef317cd5
JX
6192
6193#: builtin/merge-base.c:102
6194msgid "is the first one ancestor of the other?"
07432cef 6195msgstr "第一个是其他的祖先提交么?"
ef317cd5
JX
6196
6197#: builtin/merge-file.c:8
6198msgid ""
6199"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6200"file2"
6201msgstr ""
07432cef 6202"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
6203
6204#: builtin/merge-file.c:33
6205msgid "send results to standard output"
07432cef 6206msgstr "将结果发送到标准输出"
ef317cd5
JX
6207
6208#: builtin/merge-file.c:34
6209msgid "use a diff3 based merge"
07432cef 6210msgstr "使用基于 diff3 的合并"
ef317cd5
JX
6211
6212#: builtin/merge-file.c:35
6213msgid "for conflicts, use our version"
07432cef 6214msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
6215
6216#: builtin/merge-file.c:37
6217msgid "for conflicts, use their version"
07432cef 6218msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
6219
6220#: builtin/merge-file.c:39
6221msgid "for conflicts, use a union version"
07432cef 6222msgstr "如果冲突,使用联合版本"
ef317cd5
JX
6223
6224#: builtin/merge-file.c:42
6225msgid "for conflicts, use this marker size"
07432cef 6226msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
6227
6228#: builtin/merge-file.c:43
6229msgid "do not warn about conflicts"
07432cef 6230msgstr "不要警告冲突"
ef317cd5
JX
6231
6232#: builtin/merge-file.c:45
6233msgid "set labels for file1/orig_file/file2"
07432cef 6234msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 6235
ef317cd5
JX
6236#: builtin/mktree.c:67
6237msgid "git mktree [-z] [--missing] [--batch]"
07432cef 6238msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 6239
ef317cd5
JX
6240#: builtin/mktree.c:153
6241msgid "input is NUL terminated"
07432cef 6242msgstr "输入以 NUL 字符终止"
c04f5ac3 6243
ef317cd5 6244#: builtin/mktree.c:154 builtin/write-tree.c:24
ef317cd5 6245msgid "allow missing objects"
07432cef 6246msgstr "允许丢失的对象"
c04f5ac3 6247
ef317cd5
JX
6248#: builtin/mktree.c:155
6249msgid "allow creation of more than one tree"
07432cef 6250msgstr "允许创建一个以上的树"
c04f5ac3 6251
ef317cd5
JX
6252#: builtin/mv.c:14
6253msgid "git mv [options] <source>... <destination>"
07432cef 6254msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 6255
ef317cd5
JX
6256#: builtin/mv.c:64
6257msgid "force move/rename even if target exists"
07432cef 6258msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 6259
ef317cd5 6260#: builtin/mv.c:65
ef317cd5 6261msgid "skip move/rename errors"
07432cef 6262msgstr "跳过移动/重命名错误"
c04f5ac3
JX
6263
6264#: builtin/mv.c:108
6265#, c-format
6266msgid "Checking rename of '%s' to '%s'\n"
6267msgstr "检查 '%s' 到 '%s' 的重命名\n"
6268
6269#: builtin/mv.c:112
6270msgid "bad source"
6271msgstr "坏的源"
6272
6273#: builtin/mv.c:115
6274msgid "can not move directory into itself"
6275msgstr "不能将目录移动到自身"
6276
6277#: builtin/mv.c:118
6278msgid "cannot move directory over file"
6279msgstr "不能将目录移动到文件"
6280
6281#: builtin/mv.c:128
6282#, c-format
6283msgid "Huh? %.*s is in index?"
90e6ef53 6284msgstr "嗯?%.*s 在索引中?"
c04f5ac3
JX
6285
6286#: builtin/mv.c:140
6287msgid "source directory is empty"
6288msgstr "源目录为空"
6289
6290#: builtin/mv.c:171
6291msgid "not under version control"
6292msgstr "不在版本控制之下"
6293
6294#: builtin/mv.c:173
6295msgid "destination exists"
6296msgstr "目标已存在"
6297
6298#: builtin/mv.c:181
6299#, c-format
6300msgid "overwriting '%s'"
6301msgstr "覆盖 '%s'"
6302
6303#: builtin/mv.c:184
6304msgid "Cannot overwrite"
6305msgstr "不能覆盖"
6306
6307#: builtin/mv.c:187
6308msgid "multiple sources for the same target"
6309msgstr "同一目标具有多个源"
6310
6311#: builtin/mv.c:202
6312#, c-format
6313msgid "%s, source=%s, destination=%s"
6314msgstr "%s,源=%s,目标=%s"
6315
6316#: builtin/mv.c:212
6317#, c-format
6318msgid "Renaming %s to %s\n"
6319msgstr "重命名 %s 至 %s\n"
6320
8ada9598 6321#: builtin/mv.c:215 builtin/remote.c:731
c04f5ac3
JX
6322#, c-format
6323msgid "renaming '%s' failed"
6324msgstr "重命名 '%s' 失败"
6325
ef317cd5 6326#: builtin/name-rev.c:175
ef317cd5 6327msgid "git name-rev [options] <commit>..."
07432cef 6328msgstr "git name-rev [选项] <提交>..."
ef317cd5
JX
6329
6330#: builtin/name-rev.c:176
6331msgid "git name-rev [options] --all"
07432cef 6332msgstr "git name-rev [选项] --all"
ef317cd5
JX
6333
6334#: builtin/name-rev.c:177
6335msgid "git name-rev [options] --stdin"
07432cef 6336msgstr "git name-rev [选项] --stdin"
ef317cd5
JX
6337
6338#: builtin/name-rev.c:229
6339msgid "print only names (no SHA-1)"
07432cef 6340msgstr "只打印名称(无 SHA-1)"
ef317cd5
JX
6341
6342#: builtin/name-rev.c:230
6343msgid "only use tags to name the commits"
07432cef 6344msgstr "只使用 tags 来命名提交"
ef317cd5
JX
6345
6346#: builtin/name-rev.c:232
ef317cd5 6347msgid "only use refs matching <pattern>"
07432cef 6348msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5
JX
6349
6350#: builtin/name-rev.c:234
6351msgid "list all commits reachable from all refs"
07432cef 6352msgstr "列出可以从所有引用访问的提交"
ef317cd5
JX
6353
6354#: builtin/name-rev.c:235
6355msgid "read from stdin"
07432cef 6356msgstr "从标准输入读取"
ef317cd5
JX
6357
6358#: builtin/name-rev.c:236
6359msgid "allow to print `undefined` names"
07432cef 6360msgstr "允许打印 `未定义` 的名称"
ef317cd5 6361
07432cef 6362#: builtin/notes.c:26
ef317cd5 6363msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 6364msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 6365
07432cef 6366#: builtin/notes.c:27
ef317cd5
JX
6367msgid ""
6368"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6369"<object>] [<object>]"
6370msgstr ""
07432cef
WS
6371"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6372"象>] [<对象>]"
ef317cd5 6373
07432cef 6374#: builtin/notes.c:28
ef317cd5 6375msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 6376msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 6377
07432cef 6378#: builtin/notes.c:29
ef317cd5
JX
6379msgid ""
6380"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6381"<object>] [<object>]"
6382msgstr ""
07432cef
WS
6383"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6384">] [<对象>]"
ef317cd5 6385
07432cef 6386#: builtin/notes.c:30
ef317cd5 6387msgid "git notes [--ref <notes_ref>] edit [<object>]"
07432cef 6388msgstr "git notes [--ref <注解引用>] edit [<对象>]"
ef317cd5 6389
07432cef 6390#: builtin/notes.c:31
ef317cd5 6391msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 6392msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 6393
07432cef 6394#: builtin/notes.c:32
ef317cd5
JX
6395msgid ""
6396"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 6397msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 6398
07432cef 6399#: builtin/notes.c:33
ef317cd5 6400msgid "git notes merge --commit [-v | -q]"
07432cef 6401msgstr "git notes merge --commit [-v | -q]"
ef317cd5 6402
07432cef 6403#: builtin/notes.c:34
ef317cd5 6404msgid "git notes merge --abort [-v | -q]"
07432cef 6405msgstr "git notes merge --abort [-v | -q]"
ef317cd5 6406
07432cef 6407#: builtin/notes.c:35
ef317cd5 6408msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 6409msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 6410
07432cef 6411#: builtin/notes.c:36
ef317cd5 6412msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 6413msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 6414
07432cef 6415#: builtin/notes.c:37
ef317cd5 6416msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 6417msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 6418
07432cef 6419#: builtin/notes.c:42
ef317cd5 6420msgid "git notes [list [<object>]]"
07432cef 6421msgstr "git notes [list [<对象>]]"
ef317cd5 6422
07432cef 6423#: builtin/notes.c:47
ef317cd5 6424msgid "git notes add [<options>] [<object>]"
07432cef 6425msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 6426
07432cef 6427#: builtin/notes.c:52
ef317cd5 6428msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 6429msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 6430
07432cef 6431#: builtin/notes.c:53
ef317cd5 6432msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 6433msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 6434
07432cef 6435#: builtin/notes.c:58
ef317cd5 6436msgid "git notes append [<options>] [<object>]"
07432cef 6437msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 6438
07432cef 6439#: builtin/notes.c:63
ef317cd5 6440msgid "git notes edit [<object>]"
07432cef 6441msgstr "git notes edit [<对象>]"
ef317cd5 6442
07432cef 6443#: builtin/notes.c:68
ef317cd5 6444msgid "git notes show [<object>]"
07432cef 6445msgstr "git notes show [<对象>]"
ef317cd5 6446
07432cef 6447#: builtin/notes.c:73
ef317cd5 6448msgid "git notes merge [<options>] <notes_ref>"
07432cef 6449msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 6450
07432cef 6451#: builtin/notes.c:74
ef317cd5 6452msgid "git notes merge --commit [<options>]"
07432cef 6453msgstr "git notes merge --commit [<选项>]"
ef317cd5 6454
07432cef 6455#: builtin/notes.c:75
ef317cd5 6456msgid "git notes merge --abort [<options>]"
07432cef 6457msgstr "git notes merge --abort [<选项>]"
ef317cd5 6458
07432cef 6459#: builtin/notes.c:80
ef317cd5 6460msgid "git notes remove [<object>]"
07432cef 6461msgstr "git notes remove [<对象>]"
ef317cd5 6462
07432cef 6463#: builtin/notes.c:85
ef317cd5 6464msgid "git notes prune [<options>]"
07432cef 6465msgstr "git notes prune [<选项>]"
ef317cd5 6466
07432cef 6467#: builtin/notes.c:90
ef317cd5 6468msgid "git notes get-ref"
07432cef 6469msgstr "git notes get-ref"
ef317cd5 6470
a77c07d9 6471#: builtin/notes.c:139
c04f5ac3
JX
6472#, c-format
6473msgid "unable to start 'show' for object '%s'"
6474msgstr "不能为对象 '%s' 开始 'show'"
6475
a77c07d9
JX
6476#: builtin/notes.c:143
6477msgid "could not read 'show' output"
6478msgstr "不能读取 'show' 的输出"
c04f5ac3 6479
a77c07d9 6480#: builtin/notes.c:151
c04f5ac3
JX
6481#, c-format
6482msgid "failed to finish 'show' for object '%s'"
6483msgstr "无法为对象 '%s' 完成 'show'"
6484
a77c07d9 6485#: builtin/notes.c:169 builtin/tag.c:341
c04f5ac3
JX
6486#, c-format
6487msgid "could not create file '%s'"
6488msgstr "不能创建文件 '%s'"
6489
a77c07d9 6490#: builtin/notes.c:188
c04f5ac3
JX
6491msgid "Please supply the note contents using either -m or -F option"
6492msgstr "请通过 -m 或 -F 选项为注解提供内容"
6493
a77c07d9 6494#: builtin/notes.c:209 builtin/notes.c:972
c04f5ac3
JX
6495#, c-format
6496msgid "Removing note for object %s\n"
6497msgstr "删除对象 %s 的注解\n"
6498
a77c07d9 6499#: builtin/notes.c:214
c04f5ac3
JX
6500msgid "unable to write note object"
6501msgstr "不能写注解对象"
6502
a77c07d9 6503#: builtin/notes.c:216
c04f5ac3
JX
6504#, c-format
6505msgid "The note contents has been left in %s"
6506msgstr "注解内容被留在文件 %s 中"
6507
a77c07d9 6508#: builtin/notes.c:250 builtin/tag.c:540
c04f5ac3
JX
6509#, c-format
6510msgid "cannot read '%s'"
6511msgstr "不能读取 '%s'"
6512
a77c07d9 6513#: builtin/notes.c:252 builtin/tag.c:543
c04f5ac3
JX
6514#, c-format
6515msgid "could not open or read '%s'"
6516msgstr "不能打开或读取 '%s'"
6517
a77c07d9
JX
6518#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6519#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6520#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6521#: builtin/notes.c:967 builtin/tag.c:556
c04f5ac3
JX
6522#, c-format
6523msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 6524msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 6525
a77c07d9 6526#: builtin/notes.c:274
c04f5ac3
JX
6527#, c-format
6528msgid "Failed to read object '%s'."
6529msgstr "无法读取对象 '%s'。"
6530
a77c07d9 6531#: builtin/notes.c:298
c04f5ac3
JX
6532msgid "Cannot commit uninitialized/unreferenced notes tree"
6533msgstr "不能提交未初始化/未引用的注解树"
6534
a77c07d9 6535#: builtin/notes.c:339
c04f5ac3
JX
6536#, c-format
6537msgid "Bad notes.rewriteMode value: '%s'"
90e6ef53 6538msgstr "坏的 notes.rewriteMode 值:'%s'"
c04f5ac3 6539
a77c07d9 6540#: builtin/notes.c:349
c04f5ac3
JX
6541#, c-format
6542msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6543msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6544
6545#. TRANSLATORS: The first %s is the name of the
6546#. environment variable, the second %s is its value
a77c07d9 6547#: builtin/notes.c:376
c04f5ac3
JX
6548#, c-format
6549msgid "Bad %s value: '%s'"
90e6ef53 6550msgstr "坏的 %s 值:'%s'"
c04f5ac3 6551
a77c07d9 6552#: builtin/notes.c:440
c04f5ac3
JX
6553#, c-format
6554msgid "Malformed input line: '%s'."
6555msgstr "非法的输入行:'%s'。"
6556
a77c07d9 6557#: builtin/notes.c:455
c04f5ac3
JX
6558#, c-format
6559msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 6560msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 6561
a77c07d9
JX
6562#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6563#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6564#: builtin/notes.c:1032
c04f5ac3
JX
6565msgid "too many parameters"
6566msgstr "参数太多"
6567
a77c07d9 6568#: builtin/notes.c:512 builtin/notes.c:771
c04f5ac3
JX
6569#, c-format
6570msgid "No note found for object %s."
6571msgstr "未发现对象 %s 的注解。"
6572
a77c07d9 6573#: builtin/notes.c:534 builtin/notes.c:691
ef317cd5 6574msgid "note contents as a string"
07432cef 6575msgstr "注解内容作为一个字符串"
ef317cd5 6576
a77c07d9 6577#: builtin/notes.c:537 builtin/notes.c:694
ef317cd5 6578msgid "note contents in a file"
07432cef 6579msgstr "注解内容到一个文件中"
ef317cd5 6580
a77c07d9
JX
6581#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6582#: builtin/notes.c:699 builtin/tag.c:474
ef317cd5 6583msgid "object"
07432cef 6584msgstr "对象"
ef317cd5 6585
a77c07d9 6586#: builtin/notes.c:540 builtin/notes.c:697
ef317cd5 6587msgid "reuse and edit specified note object"
07432cef 6588msgstr "重用和编辑指定的注解对象"
ef317cd5 6589
a77c07d9 6590#: builtin/notes.c:543 builtin/notes.c:700
ef317cd5 6591msgid "reuse specified note object"
07432cef 6592msgstr "重用指定的注解对象"
ef317cd5 6593
a77c07d9 6594#: builtin/notes.c:545 builtin/notes.c:613
ef317cd5 6595msgid "replace existing notes"
07432cef 6596msgstr "替换已存在的注解"
ef317cd5 6597
a77c07d9 6598#: builtin/notes.c:579
c04f5ac3
JX
6599#, c-format
6600msgid ""
6601"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6602"existing notes"
6603msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6604
a77c07d9 6605#: builtin/notes.c:584 builtin/notes.c:661
c04f5ac3
JX
6606#, c-format
6607msgid "Overwriting existing notes for object %s\n"
6608msgstr "覆盖对象 %s 现存注解\n"
6609
a77c07d9 6610#: builtin/notes.c:614
ef317cd5 6611msgid "read objects from stdin"
07432cef 6612msgstr "从标准输入读取对象"
ef317cd5 6613
a77c07d9 6614#: builtin/notes.c:616
ef317cd5 6615msgid "load rewriting config for <command> (implies --stdin)"
07432cef 6616msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 6617
a77c07d9 6618#: builtin/notes.c:634
c04f5ac3
JX
6619msgid "too few parameters"
6620msgstr "参数太少"
6621
a77c07d9 6622#: builtin/notes.c:655
c04f5ac3
JX
6623#, c-format
6624msgid ""
6625"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6626"existing notes"
6627msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6628
a77c07d9 6629#: builtin/notes.c:667
c04f5ac3
JX
6630#, c-format
6631msgid "Missing notes on source object %s. Cannot copy."
6632msgstr "源对象 %s 缺少注解。不能拷贝。"
6633
a77c07d9 6634#: builtin/notes.c:716
ef317cd5
JX
6635#, c-format
6636msgid ""
6637"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6638"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6639msgstr ""
6640"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6641"请换用 'git notes add -f -m/-F/-c/-C'。\n"
6642
a77c07d9 6643#: builtin/notes.c:863
ef317cd5 6644msgid "General options"
07432cef 6645msgstr "通用选项"
ef317cd5 6646
a77c07d9 6647#: builtin/notes.c:865
ef317cd5 6648msgid "Merge options"
07432cef 6649msgstr "合并选项"
ef317cd5 6650
a77c07d9 6651#: builtin/notes.c:867
ef317cd5
JX
6652msgid ""
6653"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6654"cat_sort_uniq)"
07432cef 6655msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 6656
a77c07d9 6657#: builtin/notes.c:869
ef317cd5 6658msgid "Committing unmerged notes"
07432cef 6659msgstr "提交未合并的注解"
ef317cd5 6660
a77c07d9 6661#: builtin/notes.c:871
ef317cd5 6662msgid "finalize notes merge by committing unmerged notes"
07432cef 6663msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 6664
a77c07d9 6665#: builtin/notes.c:873
ef317cd5 6666msgid "Aborting notes merge resolution"
07432cef 6667msgstr "中止注解合并的方案"
ef317cd5 6668
a77c07d9 6669#: builtin/notes.c:875
ef317cd5 6670msgid "abort notes merge"
07432cef 6671msgstr "中止注解合并"
ef317cd5 6672
a77c07d9 6673#: builtin/notes.c:970
ef317cd5
JX
6674#, c-format
6675msgid "Object %s has no note\n"
6676msgstr "对象 %s 没有注解\n"
6677
a77c07d9 6678#: builtin/notes.c:982
ef317cd5 6679msgid "attempt to remove non-existent note is not an error"
07432cef 6680msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 6681
a77c07d9 6682#: builtin/notes.c:985
ef317cd5 6683msgid "read object names from the standard input"
07432cef 6684msgstr "从标准输入读取对象名称"
ef317cd5 6685
a77c07d9 6686#: builtin/notes.c:1066
ef317cd5 6687msgid "notes_ref"
07432cef 6688msgstr "注解引用"
ef317cd5 6689
a77c07d9 6690#: builtin/notes.c:1067
ef317cd5 6691msgid "use notes from <notes_ref>"
07432cef 6692msgstr "从 <注解引用> 使用注解"
ef317cd5 6693
a77c07d9 6694#: builtin/notes.c:1102 builtin/remote.c:1598
ef317cd5
JX
6695#, c-format
6696msgid "Unknown subcommand: %s"
6697msgstr "未知子命令:%s"
6698
6699#: builtin/pack-objects.c:23
6700msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 6701msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5
JX
6702
6703#: builtin/pack-objects.c:24
6704msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 6705msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5
JX
6706
6707#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6708#, c-format
6709msgid "deflate error (%d)"
6710msgstr "压缩错误 (%d)"
6711
07432cef 6712#: builtin/pack-objects.c:2397
ef317cd5
JX
6713#, c-format
6714msgid "unsupported index version %s"
6715msgstr "不支持的索引版本 %s"
6716
07432cef 6717#: builtin/pack-objects.c:2401
ef317cd5
JX
6718#, c-format
6719msgid "bad index version '%s'"
6720msgstr "坏的索引版本 '%s'"
6721
07432cef 6722#: builtin/pack-objects.c:2424
ef317cd5
JX
6723#, c-format
6724msgid "option %s does not accept negative form"
6725msgstr "选项 %s 不接受否定格式"
6726
07432cef 6727#: builtin/pack-objects.c:2428
ef317cd5
JX
6728#, c-format
6729msgid "unable to parse value '%s' for option %s"
6730msgstr "不能解析选项 %1$s 的值 '%2$s'"
6731
07432cef 6732#: builtin/pack-objects.c:2447
ef317cd5 6733msgid "do not show progress meter"
07432cef 6734msgstr "不显示进度表"
ef317cd5 6735
07432cef 6736#: builtin/pack-objects.c:2449
ef317cd5 6737msgid "show progress meter"
07432cef 6738msgstr "显示进度表"
ef317cd5 6739
07432cef 6740#: builtin/pack-objects.c:2451
ef317cd5 6741msgid "show progress meter during object writing phase"
07432cef 6742msgstr "在对象写入阶段显示进度表"
ef317cd5 6743
07432cef 6744#: builtin/pack-objects.c:2454
ef317cd5 6745msgid "similar to --all-progress when progress meter is shown"
07432cef 6746msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 6747
07432cef 6748#: builtin/pack-objects.c:2455
ef317cd5 6749msgid "version[,offset]"
07432cef 6750msgstr "版本[,偏移]"
ef317cd5 6751
07432cef 6752#: builtin/pack-objects.c:2456
ef317cd5 6753msgid "write the pack index file in the specified idx format version"
07432cef 6754msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 6755
07432cef 6756#: builtin/pack-objects.c:2459
ef317cd5 6757msgid "maximum size of each output pack file"
07432cef 6758msgstr "每个输出包的最大尺寸"
ef317cd5 6759
07432cef 6760#: builtin/pack-objects.c:2461
ef317cd5 6761msgid "ignore borrowed objects from alternate object store"
07432cef 6762msgstr "忽略从替代对象存储里借用对象"
ef317cd5 6763
07432cef 6764#: builtin/pack-objects.c:2463
ef317cd5 6765msgid "ignore packed objects"
07432cef 6766msgstr "忽略包对象"
ef317cd5 6767
07432cef 6768#: builtin/pack-objects.c:2465
ef317cd5 6769msgid "limit pack window by objects"
07432cef 6770msgstr "限制打包窗口的对象数"
ef317cd5 6771
07432cef 6772#: builtin/pack-objects.c:2467
ef317cd5 6773msgid "limit pack window by memory in addition to object limit"
07432cef 6774msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 6775
07432cef 6776#: builtin/pack-objects.c:2469
ef317cd5 6777msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 6778msgstr "打包允许的 delta 链的最大长度"
ef317cd5 6779
07432cef 6780#: builtin/pack-objects.c:2471
ef317cd5 6781msgid "reuse existing deltas"
07432cef 6782msgstr "重用已存在的 deltas"
ef317cd5 6783
07432cef 6784#: builtin/pack-objects.c:2473
ef317cd5 6785msgid "reuse existing objects"
07432cef 6786msgstr "重用已存在的对象"
ef317cd5 6787
07432cef 6788#: builtin/pack-objects.c:2475
ef317cd5 6789msgid "use OFS_DELTA objects"
07432cef 6790msgstr "使用 OFS_DELTA 对象"
ef317cd5 6791
07432cef 6792#: builtin/pack-objects.c:2477
ef317cd5 6793msgid "use threads when searching for best delta matches"
07432cef 6794msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 6795
07432cef 6796#: builtin/pack-objects.c:2479
ef317cd5 6797msgid "do not create an empty pack output"
07432cef 6798msgstr "不创建空的包输出"
ef317cd5 6799
07432cef 6800#: builtin/pack-objects.c:2481
ef317cd5 6801msgid "read revision arguments from standard input"
07432cef 6802msgstr "从标准输入读取修订号参数"
ef317cd5 6803
07432cef 6804#: builtin/pack-objects.c:2483
ef317cd5 6805msgid "limit the objects to those that are not yet packed"
07432cef 6806msgstr "限制那些尚未打包的对象"
ef317cd5 6807
07432cef 6808#: builtin/pack-objects.c:2486
ef317cd5 6809msgid "include objects reachable from any reference"
07432cef 6810msgstr "包括可以从任何引用访问到的对象"
ef317cd5 6811
07432cef 6812#: builtin/pack-objects.c:2489
ef317cd5 6813msgid "include objects referred by reflog entries"
07432cef 6814msgstr "包括被引用日志引用到的对象"
ef317cd5 6815
07432cef 6816#: builtin/pack-objects.c:2492
ef317cd5 6817msgid "output pack to stdout"
07432cef 6818msgstr "输出包到标准输出"
ef317cd5 6819
07432cef 6820#: builtin/pack-objects.c:2494
ef317cd5 6821msgid "include tag objects that refer to objects to be packed"
07432cef 6822msgstr "包括引用了打包对象的 tag"
ef317cd5 6823
07432cef 6824#: builtin/pack-objects.c:2496
ef317cd5 6825msgid "keep unreachable objects"
07432cef 6826msgstr "维持不可达的对象"
ef317cd5 6827
07432cef 6828#: builtin/pack-objects.c:2497 parse-options.h:141
ef317cd5
JX
6829msgid "time"
6830msgstr "时间"
6831
07432cef 6832#: builtin/pack-objects.c:2498
ef317cd5 6833msgid "unpack unreachable objects newer than <time>"
07432cef 6834msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 6835
07432cef 6836#: builtin/pack-objects.c:2501
ef317cd5 6837msgid "create thin packs"
07432cef 6838msgstr "创建精简包"
ef317cd5 6839
07432cef 6840#: builtin/pack-objects.c:2503
ef317cd5 6841msgid "ignore packs that have companion .keep file"
07432cef 6842msgstr "忽略配有 .keep 文件的包"
ef317cd5 6843
07432cef 6844#: builtin/pack-objects.c:2505
ef317cd5 6845msgid "pack compression level"
07432cef 6846msgstr "打包压缩级别"
ef317cd5 6847
07432cef 6848#: builtin/pack-objects.c:2507
ef317cd5 6849msgid "do not hide commits by grafts"
07432cef 6850msgstr "不隐藏移植覆盖的提交"
ef317cd5
JX
6851
6852#: builtin/pack-refs.c:6
6853msgid "git pack-refs [options]"
07432cef 6854msgstr "git pack-refs [选项]"
c04f5ac3 6855
ef317cd5
JX
6856#: builtin/pack-refs.c:14
6857msgid "pack everything"
07432cef 6858msgstr "打包一切"
c04f5ac3 6859
ef317cd5
JX
6860#: builtin/pack-refs.c:15
6861msgid "prune loose refs (default)"
07432cef 6862msgstr "清除松散的引用(默认)"
c04f5ac3 6863
ef317cd5
JX
6864#: builtin/prune-packed.c:7
6865msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 6866msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 6867
ef317cd5
JX
6868#: builtin/prune.c:12
6869msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 6870msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 6871
ef317cd5 6872#: builtin/prune.c:132
ef317cd5 6873msgid "do not remove, show only"
07432cef 6874msgstr "不删除,只显示"
7ac1c0ad 6875
ef317cd5 6876#: builtin/prune.c:133
ef317cd5 6877msgid "report pruned objects"
07432cef 6878msgstr "报告清除的对象"
7ac1c0ad 6879
ef317cd5
JX
6880#: builtin/prune.c:136
6881msgid "expire objects older than <time>"
07432cef 6882msgstr "使早于给定时间的对象过期"
ef317cd5
JX
6883
6884#: builtin/push.c:14
ef317cd5 6885msgid "git push [<options>] [<repository> [<refspec>...]]"
07432cef 6886msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7ac1c0ad 6887
170e9899 6888#: builtin/push.c:45
c04f5ac3
JX
6889msgid "tag shorthand without <tag>"
6890msgstr "tag 简写没有跟 <tag> 参数"
6891
170e9899 6892#: builtin/push.c:64
c04f5ac3 6893msgid "--delete only accepts plain target ref names"
90e6ef53 6894msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 6895
8ada9598
JX
6896#: builtin/push.c:99
6897msgid ""
6898"\n"
6899"To choose either option permanently, see push.default in 'git help config'."
6900msgstr ""
81809b99
JX
6901"\n"
6902"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598
JX
6903
6904#: builtin/push.c:102
6905#, c-format
6906msgid ""
6907"The upstream branch of your current branch does not match\n"
6908"the name of your current branch. To push to the upstream branch\n"
6909"on the remote, use\n"
6910"\n"
6911" git push %s HEAD:%s\n"
6912"\n"
6913"To push to the branch of the same name on the remote, use\n"
6914"\n"
6915" git push %s %s\n"
6916"%s"
6917msgstr ""
81809b99
JX
6918"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
6919"上游分支,使用\n"
6920"\n"
6921" git push %s HEAD:%s\n"
6922"\n"
6923"为推送至远程同名分支,使用\n"
6924"\n"
6925" git push %s %s\n"
6926"%s"
8ada9598
JX
6927
6928#: builtin/push.c:121
c04f5ac3
JX
6929#, c-format
6930msgid ""
6931"You are not currently on a branch.\n"
6932"To push the history leading to the current (detached HEAD)\n"
6933"state now, use\n"
6934"\n"
6935" git push %s HEAD:<name-of-remote-branch>\n"
6936msgstr ""
6937"您当前不在一个分支上。\n"
90e6ef53 6938"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
6939"\n"
6940" git push %s HEAD:<name-of-remote-branch>\n"
6941
8ada9598 6942#: builtin/push.c:128
c04f5ac3
JX
6943#, c-format
6944msgid ""
6945"The current branch %s has no upstream branch.\n"
6946"To push the current branch and set the remote as upstream, use\n"
6947"\n"
6948" git push --set-upstream %s %s\n"
6949msgstr ""
6950"当前分支 %s 没有对应的上游分支。\n"
6951"为推送当前分支并建立与远程上游的跟踪,使用\n"
6952"\n"
6953" git push --set-upstream %s %s\n"
6954
8ada9598 6955#: builtin/push.c:136
c04f5ac3
JX
6956#, c-format
6957msgid "The current branch %s has multiple upstream branches, refusing to push."
6958msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
6959
8ada9598 6960#: builtin/push.c:139
73a60cd2
JX
6961#, c-format
6962msgid ""
6963"You are pushing to remote '%s', which is not the upstream of\n"
6964"your current branch '%s', without telling me what to push\n"
6965"to update which remote branch."
6966msgstr ""
6967"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
6968"而没有告诉我要推送什么、更新哪个远程分支。"
6969
c160d03f
JX
6970# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6971#: builtin/push.c:151
6972msgid ""
6973"push.default is unset; its implicit value is changing in\n"
6974"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6975"and maintain the current behavior after the default changes, use:\n"
6976"\n"
6977" git config --global push.default matching\n"
6978"\n"
6979"To squelch this message and adopt the new behavior now, use:\n"
6980"\n"
6981" git config --global push.default simple\n"
6982"\n"
6983"See 'git help config' and search for 'push.default' for further "
6984"information.\n"
6985"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6986"'current' instead of 'simple' if you sometimes use older versions of Git)"
6987msgstr ""
6988"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
6989"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
6990"进行如下设置:\n"
6991"\n"
6992" git config --global push.default matching\n"
6993"\n"
6994"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
6995"\n"
6996" git config --global push.default simple\n"
6997"\n"
6998"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
6999"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7000"为保持兼容,请用 'current' 代替 'simple' 模式)"
7001
7002#: builtin/push.c:199
c04f5ac3
JX
7003msgid ""
7004"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90e6ef53 7005msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
c04f5ac3 7006
c160d03f 7007#: builtin/push.c:206
170e9899
JX
7008msgid ""
7009"Updates were rejected because the tip of your current branch is behind\n"
7010"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7011"before pushing again.\n"
7012"See the 'Note about fast-forwards' in 'git push --help' for details."
7013msgstr ""
eff6d3a9
JX
7014"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7015"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
7016"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7017
c160d03f 7018#: builtin/push.c:212
170e9899
JX
7019msgid ""
7020"Updates were rejected because a pushed branch tip is behind its remote\n"
7021"counterpart. If you did not intend to push that branch, you may want to\n"
c160d03f
JX
7022"specify branches to push or set the 'push.default' configuration variable\n"
7023"to 'simple', 'current' or 'upstream' to push only the current branch."
170e9899 7024msgstr ""
eff6d3a9
JX
7025"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7026"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
c160d03f
JX
7027"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7028"以便只推送当前分支。"
170e9899 7029
c160d03f 7030#: builtin/push.c:218
170e9899
JX
7031msgid ""
7032"Updates were rejected because a pushed branch tip is behind its remote\n"
7033"counterpart. Check out this branch and merge the remote changes\n"
7034"(e.g. 'git pull') before pushing again.\n"
7035"See the 'Note about fast-forwards' in 'git push --help' for details."
7036msgstr ""
eff6d3a9
JX
7037"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7038"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7039"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7040
07432cef
WS
7041#: builtin/push.c:224
7042msgid ""
a77c07d9
JX
7043"Updates were rejected because the remote contains work that you do\n"
7044"not have locally. This is usually caused by another repository pushing\n"
7045"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7046"'git pull') before pushing again.\n"
7047"See the 'Note about fast-forwards' in 'git push --help' for details."
7048msgstr ""
7049"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7050"一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7051"(如 'git pull')。\n"
7052"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7053
7054#: builtin/push.c:231
7055msgid "Updates were rejected because the tag already exists in the remote."
7056msgstr "更新被拒绝因为 tag 在远程已经存在。"
7057
7058#: builtin/push.c:234
7059msgid ""
7060"You cannot update a remote ref that points at a non-commit object,\n"
7061"or update a remote ref to make it point at a non-commit object,\n"
7062"without using the '--force' option.\n"
7063msgstr ""
7064"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7065"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 7066
a77c07d9 7067#: builtin/push.c:294
c04f5ac3
JX
7068#, c-format
7069msgid "Pushing to %s\n"
7070msgstr "推送到 %s\n"
7071
a77c07d9 7072#: builtin/push.c:298
c04f5ac3
JX
7073#, c-format
7074msgid "failed to push some refs to '%s'"
7075msgstr "无法推送一些引用到 '%s'"
7076
a77c07d9 7077#: builtin/push.c:331
c04f5ac3
JX
7078#, c-format
7079msgid "bad repository '%s'"
90e6ef53 7080msgstr "坏的版本库 '%s'"
c04f5ac3 7081
a77c07d9 7082#: builtin/push.c:332
c04f5ac3
JX
7083msgid ""
7084"No configured push destination.\n"
7085"Either specify the URL from the command-line or configure a remote "
7086"repository using\n"
7087"\n"
7088" git remote add <name> <url>\n"
7089"\n"
7090"and then push using the remote name\n"
7091"\n"
7092" git push <name>\n"
7093msgstr ""
90e6ef53 7094"没有配置推送目标。\n"
07432cef 7095"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
7096"\n"
7097" git remote add <name> <url>\n"
7098"\n"
7099"然后使用该远程版本库名执行推送\n"
7100"\n"
7101" git push <name>\n"
7102
a77c07d9 7103#: builtin/push.c:347
c04f5ac3
JX
7104msgid "--all and --tags are incompatible"
7105msgstr "--all 和 --tags 不兼容"
7106
a77c07d9 7107#: builtin/push.c:348
c04f5ac3 7108msgid "--all can't be combined with refspecs"
649900bc 7109msgstr "--all 不能和引用表达式同时使用"
c04f5ac3 7110
a77c07d9 7111#: builtin/push.c:353
c04f5ac3
JX
7112msgid "--mirror and --tags are incompatible"
7113msgstr "--mirror 和 --tags 不兼容"
7114
a77c07d9 7115#: builtin/push.c:354
c04f5ac3 7116msgid "--mirror can't be combined with refspecs"
649900bc 7117msgstr "--mirror 不能和引用表达式同时使用"
c04f5ac3 7118
a77c07d9 7119#: builtin/push.c:359
c04f5ac3
JX
7120msgid "--all and --mirror are incompatible"
7121msgstr "--all 和 --mirror 不兼容"
7122
a77c07d9 7123#: builtin/push.c:419
ef317cd5 7124msgid "repository"
07432cef 7125msgstr "版本库"
ef317cd5 7126
a77c07d9 7127#: builtin/push.c:420
ef317cd5 7128msgid "push all refs"
07432cef 7129msgstr "推送所有引用"
ef317cd5 7130
a77c07d9 7131#: builtin/push.c:421
ef317cd5 7132msgid "mirror all refs"
07432cef 7133msgstr "镜像所有引用"
ef317cd5 7134
a77c07d9 7135#: builtin/push.c:423
ef317cd5 7136msgid "delete refs"
07432cef 7137msgstr "删除引用"
ef317cd5 7138
a77c07d9 7139#: builtin/push.c:424
ef317cd5 7140msgid "push tags (can't be used with --all or --mirror)"
07432cef 7141msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 7142
a77c07d9 7143#: builtin/push.c:427
ef317cd5
JX
7144msgid "force updates"
7145msgstr "强制更新"
7146
a77c07d9 7147#: builtin/push.c:428
ef317cd5 7148msgid "check"
07432cef 7149msgstr "检查"
ef317cd5 7150
a77c07d9 7151#: builtin/push.c:429
ef317cd5 7152msgid "control recursive pushing of submodules"
07432cef 7153msgstr "控制子模组的递归推送"
ef317cd5 7154
a77c07d9 7155#: builtin/push.c:431
ef317cd5 7156msgid "use thin pack"
07432cef 7157msgstr "使用精简打包"
ef317cd5 7158
a77c07d9 7159#: builtin/push.c:432 builtin/push.c:433
ef317cd5 7160msgid "receive pack program"
07432cef 7161msgstr "接收包程序"
ef317cd5 7162
a77c07d9 7163#: builtin/push.c:434
ef317cd5 7164msgid "set upstream for git pull/status"
07432cef 7165msgstr "设置 git pull/status 的上游"
ef317cd5 7166
a77c07d9 7167#: builtin/push.c:437
ef317cd5 7168msgid "prune locally removed refs"
07432cef 7169msgstr "清除本地删除的引用"
ef317cd5 7170
a77c07d9
JX
7171#: builtin/push.c:439
7172msgid "bypass pre-push hook"
7173msgstr "绕过 pre-push 钩子"
7174
7175#: builtin/push.c:448
c04f5ac3
JX
7176msgid "--delete is incompatible with --all, --mirror and --tags"
7177msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7178
a77c07d9 7179#: builtin/push.c:450
c04f5ac3
JX
7180msgid "--delete doesn't make sense without any refs"
7181msgstr "--delete 未接任何引用没有意义"
7182
ef317cd5
JX
7183#: builtin/read-tree.c:36
7184msgid ""
7185"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7186"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7187"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7188msgstr ""
07432cef
WS
7189"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7190"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7191"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5
JX
7192
7193#: builtin/read-tree.c:108
ef317cd5 7194msgid "write resulting index to <file>"
07432cef 7195msgstr "将索引结果写入 <file>"
ef317cd5
JX
7196
7197#: builtin/read-tree.c:111
ef317cd5 7198msgid "only empty the index"
07432cef 7199msgstr "只是清空索引"
ef317cd5
JX
7200
7201#: builtin/read-tree.c:113
ef317cd5 7202msgid "Merging"
07432cef 7203msgstr "合并"
ef317cd5
JX
7204
7205#: builtin/read-tree.c:115
7206msgid "perform a merge in addition to a read"
07432cef 7207msgstr "读取之余再执行一个合并"
ef317cd5
JX
7208
7209#: builtin/read-tree.c:117
7210msgid "3-way merge if no file level merging required"
07432cef 7211msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5
JX
7212
7213#: builtin/read-tree.c:119
7214msgid "3-way merge in presence of adds and removes"
07432cef 7215msgstr "存在添加和删除时,也执行三路合并"
ef317cd5
JX
7216
7217#: builtin/read-tree.c:121
7218msgid "same as -m, but discard unmerged entries"
07432cef 7219msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5
JX
7220
7221#: builtin/read-tree.c:122
ef317cd5 7222msgid "<subdirectory>/"
07432cef 7223msgstr "<子目录>/"
ef317cd5
JX
7224
7225#: builtin/read-tree.c:123
7226msgid "read the tree into the index under <subdirectory>/"
07432cef 7227msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5
JX
7228
7229#: builtin/read-tree.c:126
7230msgid "update working tree with merge result"
07432cef 7231msgstr "用合并的结果更新工作区"
ef317cd5
JX
7232
7233#: builtin/read-tree.c:128
ef317cd5 7234msgid "gitignore"
07432cef 7235msgstr "gitignore"
ef317cd5
JX
7236
7237#: builtin/read-tree.c:129
7238msgid "allow explicitly ignored files to be overwritten"
07432cef 7239msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5
JX
7240
7241#: builtin/read-tree.c:132
ef317cd5 7242msgid "don't check the working tree after merging"
07432cef 7243msgstr "合并后不检查工作区"
ef317cd5
JX
7244
7245#: builtin/read-tree.c:133
7246msgid "don't update the index or the work tree"
07432cef 7247msgstr "不更新索引区和工作区"
ef317cd5
JX
7248
7249#: builtin/read-tree.c:135
7250msgid "skip applying sparse checkout filter"
07432cef 7251msgstr "跳过应用稀疏检出过滤器"
ef317cd5
JX
7252
7253#: builtin/read-tree.c:137
7254msgid "debug unpack-trees"
07432cef 7255msgstr "调试 unpack-trees"
ef317cd5
JX
7256
7257#: builtin/remote.c:11
7258msgid "git remote [-v | --verbose]"
07432cef 7259msgstr "git remote [-v | --verbose]"
ef317cd5
JX
7260
7261#: builtin/remote.c:12
7262msgid ""
7263"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7264"mirror=<fetch|push>] <name> <url>"
7265msgstr ""
07432cef
WS
7266"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7267"mirror=<fetch|push>] <名称> <url>"
ef317cd5
JX
7268
7269#: builtin/remote.c:13 builtin/remote.c:32
7270msgid "git remote rename <old> <new>"
07432cef 7271msgstr "git remote rename <旧名称> <新名称>"
ef317cd5
JX
7272
7273#: builtin/remote.c:14 builtin/remote.c:37
7274msgid "git remote remove <name>"
07432cef 7275msgstr "git remote remove <名称>"
ef317cd5 7276
07432cef 7277#: builtin/remote.c:15 builtin/remote.c:42
ef317cd5 7278msgid "git remote set-head <name> (-a | -d | <branch>)"
07432cef 7279msgstr "git remote set-head <名称> (-a | -d | <分支>)"
ef317cd5
JX
7280
7281#: builtin/remote.c:16
7282msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 7283msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5
JX
7284
7285#: builtin/remote.c:17
7286msgid "git remote prune [-n | --dry-run] <name>"
07432cef 7287msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5
JX
7288
7289#: builtin/remote.c:18
7290msgid ""
7291"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 7292msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5
JX
7293
7294#: builtin/remote.c:19
7295msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 7296msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5
JX
7297
7298#: builtin/remote.c:20 builtin/remote.c:68
7299msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 7300msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5
JX
7301
7302#: builtin/remote.c:21 builtin/remote.c:69
7303msgid "git remote set-url --add <name> <newurl>"
07432cef 7304msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5
JX
7305
7306#: builtin/remote.c:22 builtin/remote.c:70
7307msgid "git remote set-url --delete <name> <url>"
07432cef 7308msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5
JX
7309
7310#: builtin/remote.c:27
7311msgid "git remote add [<options>] <name> <url>"
07432cef 7312msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5
JX
7313
7314#: builtin/remote.c:47
7315msgid "git remote set-branches <name> <branch>..."
07432cef 7316msgstr "git remote set-branches <名称> <分支>..."
ef317cd5
JX
7317
7318#: builtin/remote.c:48
7319msgid "git remote set-branches --add <name> <branch>..."
07432cef 7320msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5
JX
7321
7322#: builtin/remote.c:53
7323msgid "git remote show [<options>] <name>"
07432cef 7324msgstr "git remote show [<选项>] <名称>"
ef317cd5
JX
7325
7326#: builtin/remote.c:58
7327msgid "git remote prune [<options>] <name>"
07432cef 7328msgstr "git remote prune [<选项>] <名称>"
ef317cd5
JX
7329
7330#: builtin/remote.c:63
7331msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 7332msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 7333
8ada9598 7334#: builtin/remote.c:98
81809b99 7335#, c-format
8ada9598 7336msgid "Updating %s"
81809b99 7337msgstr "更新 %s 中"
8ada9598
JX
7338
7339#: builtin/remote.c:130
7340msgid ""
7341"--mirror is dangerous and deprecated; please\n"
7342"\t use --mirror=fetch or --mirror=push instead"
7343msgstr ""
81809b99
JX
7344"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7345"\t 或 --mirror=push"
8ada9598
JX
7346
7347#: builtin/remote.c:147
81809b99 7348#, c-format
8ada9598 7349msgid "unknown mirror argument: %s"
81809b99 7350msgstr "未知的镜像参数:%s"
8ada9598 7351
ef317cd5 7352#: builtin/remote.c:163
ef317cd5 7353msgid "fetch the remote branches"
07432cef 7354msgstr "抓取远程的分支"
ef317cd5
JX
7355
7356#: builtin/remote.c:165
7357msgid "import all tags and associated objects when fetching"
07432cef 7358msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5
JX
7359
7360#: builtin/remote.c:168
7361msgid "or do not fetch any tag at all (--no-tags)"
07432cef 7362msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5
JX
7363
7364#: builtin/remote.c:170
7365msgid "branch(es) to track"
07432cef 7366msgstr "跟踪的分支"
ef317cd5
JX
7367
7368#: builtin/remote.c:171
ef317cd5 7369msgid "master branch"
07432cef 7370msgstr "主线分支"
ef317cd5
JX
7371
7372#: builtin/remote.c:172
7373msgid "push|fetch"
07432cef 7374msgstr "push|fetch"
ef317cd5
JX
7375
7376#: builtin/remote.c:173
7377msgid "set up remote as a mirror to push to or fetch from"
07432cef 7378msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 7379
8ada9598
JX
7380#: builtin/remote.c:185
7381msgid "specifying a master branch makes no sense with --mirror"
81809b99 7382msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598
JX
7383
7384#: builtin/remote.c:187
7385msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 7386msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598
JX
7387
7388#: builtin/remote.c:195 builtin/remote.c:646
81809b99 7389#, c-format
8ada9598 7390msgid "remote %s already exists."
81809b99 7391msgstr "远程 %s 已经存在。"
8ada9598
JX
7392
7393#: builtin/remote.c:199 builtin/remote.c:650
81809b99 7394#, c-format
8ada9598 7395msgid "'%s' is not a valid remote name"
81809b99 7396msgstr "'%s' 不是一个有效的远程名称"
8ada9598
JX
7397
7398#: builtin/remote.c:243
81809b99 7399#, c-format
8ada9598 7400msgid "Could not setup master '%s'"
81809b99 7401msgstr "无法设置 master '%s'"
8ada9598
JX
7402
7403#: builtin/remote.c:299
81809b99 7404#, c-format
8ada9598 7405msgid "more than one %s"
81809b99 7406msgstr "多于一个 %s"
8ada9598
JX
7407
7408#: builtin/remote.c:339
81809b99 7409#, c-format
8ada9598 7410msgid "Could not get fetch map for refspec %s"
81809b99 7411msgstr "无法得到引用表达式 %s 的获取列表"
8ada9598
JX
7412
7413#: builtin/remote.c:440 builtin/remote.c:448
7414msgid "(matching)"
81809b99 7415msgstr "(匹配)"
8ada9598
JX
7416
7417#: builtin/remote.c:452
8ada9598 7418msgid "(delete)"
81809b99 7419msgstr "(删除)"
8ada9598
JX
7420
7421#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
81809b99 7422#, c-format
8ada9598 7423msgid "Could not append '%s' to '%s'"
81809b99 7424msgstr "不能添加 '%s' 至 '%s'"
8ada9598
JX
7425
7426#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
81809b99 7427#, c-format
8ada9598 7428msgid "No such remote: %s"
81809b99 7429msgstr "没有这样的远程:%s"
8ada9598
JX
7430
7431#: builtin/remote.c:656
81809b99 7432#, c-format
8ada9598 7433msgid "Could not rename config section '%s' to '%s'"
81809b99 7434msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598
JX
7435
7436#: builtin/remote.c:662 builtin/remote.c:799
81809b99 7437#, c-format
8ada9598 7438msgid "Could not remove config section '%s'"
81809b99 7439msgstr "不能移除配置小节 '%s'"
8ada9598
JX
7440
7441#: builtin/remote.c:677
7442#, c-format
7443msgid ""
d691f479 7444"Not updating non-default fetch refspec\n"
8ada9598
JX
7445"\t%s\n"
7446"\tPlease update the configuration manually if necessary."
7447msgstr ""
81809b99
JX
7448"没有更新非默认的获取引用表达式\n"
7449"\t%s\n"
7450"\t如果必要请手动更新配置。"
8ada9598
JX
7451
7452#: builtin/remote.c:683
81809b99 7453#, c-format
8ada9598 7454msgid "Could not append '%s'"
81809b99 7455msgstr "不能追加 '%s'"
8ada9598
JX
7456
7457#: builtin/remote.c:694
81809b99 7458#, c-format
8ada9598 7459msgid "Could not set '%s'"
81809b99 7460msgstr "不能设置 '%s'"
8ada9598
JX
7461
7462#: builtin/remote.c:716
81809b99 7463#, c-format
8ada9598 7464msgid "deleting '%s' failed"
81809b99 7465msgstr "删除 '%s' 失败"
8ada9598
JX
7466
7467#: builtin/remote.c:750
81809b99 7468#, c-format
8ada9598 7469msgid "creating '%s' failed"
81809b99 7470msgstr "创建 '%s' 失败"
8ada9598
JX
7471
7472#: builtin/remote.c:764
81809b99 7473#, c-format
8ada9598 7474msgid "Could not remove branch %s"
81809b99 7475msgstr "无法移除分支 %s"
8ada9598
JX
7476
7477#: builtin/remote.c:834
7478msgid ""
7479"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7480"to delete it, use:"
7481msgid_plural ""
7482"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7483"to delete them, use:"
5ae481e0
JX
7484msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7485msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598
JX
7486
7487#: builtin/remote.c:943
7488#, c-format
7489msgid " new (next fetch will store in remotes/%s)"
81809b99 7490msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598
JX
7491
7492#: builtin/remote.c:946
8ada9598 7493msgid " tracked"
81809b99 7494msgstr " 已跟踪"
8ada9598
JX
7495
7496#: builtin/remote.c:948
7497msgid " stale (use 'git remote prune' to remove)"
81809b99 7498msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598
JX
7499
7500#: builtin/remote.c:950
7501msgid " ???"
81809b99 7502msgstr " ???"
8ada9598
JX
7503
7504#: builtin/remote.c:991
7505#, c-format
7506msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 7507msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598
JX
7508
7509#: builtin/remote.c:998
81809b99 7510#, c-format
8ada9598 7511msgid "rebases onto remote %s"
81809b99 7512msgstr "变基到远程 %s"
8ada9598
JX
7513
7514#: builtin/remote.c:1001
81809b99 7515#, c-format
8ada9598 7516msgid " merges with remote %s"
81809b99 7517msgstr " 与远程 %s 合并"
8ada9598
JX
7518
7519#: builtin/remote.c:1002
7520msgid " and with remote"
81809b99 7521msgstr " 且有远程"
8ada9598
JX
7522
7523#: builtin/remote.c:1004
81809b99 7524#, c-format
8ada9598 7525msgid "merges with remote %s"
81809b99 7526msgstr "与远程 %s 合并"
8ada9598
JX
7527
7528#: builtin/remote.c:1005
7529msgid " and with remote"
81809b99 7530msgstr " 且有远程"
8ada9598
JX
7531
7532#: builtin/remote.c:1051
7533msgid "create"
81809b99 7534msgstr "创建"
8ada9598
JX
7535
7536#: builtin/remote.c:1054
8ada9598 7537msgid "delete"
81809b99 7538msgstr "删除"
8ada9598
JX
7539
7540#: builtin/remote.c:1058
8ada9598 7541msgid "up to date"
81809b99 7542msgstr "最新"
8ada9598
JX
7543
7544#: builtin/remote.c:1061
8ada9598 7545msgid "fast-forwardable"
81809b99 7546msgstr "可快进"
8ada9598
JX
7547
7548#: builtin/remote.c:1064
7549msgid "local out of date"
81809b99 7550msgstr "本地已过时"
8ada9598
JX
7551
7552#: builtin/remote.c:1071
7553#, c-format
7554msgid " %-*s forces to %-*s (%s)"
81809b99 7555msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598
JX
7556
7557#: builtin/remote.c:1074
7558#, c-format
7559msgid " %-*s pushes to %-*s (%s)"
81809b99 7560msgstr " %-*s 推送至 %-*s (%s)"
8ada9598
JX
7561
7562#: builtin/remote.c:1078
7563#, c-format
7564msgid " %-*s forces to %s"
81809b99 7565msgstr " %-*s 强制推送至 %s"
8ada9598
JX
7566
7567#: builtin/remote.c:1081
7568#, c-format
7569msgid " %-*s pushes to %s"
81809b99 7570msgstr " %-*s 推送至 %s"
8ada9598 7571
ef317cd5 7572#: builtin/remote.c:1091
ef317cd5 7573msgid "do not query remotes"
07432cef 7574msgstr "不查询远程"
ef317cd5 7575
8ada9598 7576#: builtin/remote.c:1118
81809b99 7577#, c-format
8ada9598 7578msgid "* remote %s"
81809b99 7579msgstr "* 远程 %s"
8ada9598
JX
7580
7581#: builtin/remote.c:1119
7582#, c-format
7583msgid " Fetch URL: %s"
81809b99 7584msgstr " 获取地址:%s"
8ada9598
JX
7585
7586#: builtin/remote.c:1120 builtin/remote.c:1285
7587msgid "(no URL)"
81809b99 7588msgstr "(无 URL)"
8ada9598
JX
7589
7590#: builtin/remote.c:1129 builtin/remote.c:1131
7591#, c-format
7592msgid " Push URL: %s"
81809b99 7593msgstr " 推送地址:%s"
8ada9598
JX
7594
7595#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
81809b99 7596#, c-format
8ada9598 7597msgid " HEAD branch: %s"
81809b99 7598msgstr " HEAD分支:%s"
8ada9598
JX
7599
7600#: builtin/remote.c:1139
7601#, c-format
7602msgid ""
7603" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 7604msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598
JX
7605
7606#: builtin/remote.c:1151
81809b99 7607#, c-format
8ada9598
JX
7608msgid " Remote branch:%s"
7609msgid_plural " Remote branches:%s"
81809b99 7610msgstr[0] " 远程分支:%s"
5ae481e0 7611msgstr[1] " 远程分支:%s"
8ada9598 7612
81809b99 7613# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
7614#: builtin/remote.c:1154 builtin/remote.c:1181
7615msgid " (status not queried)"
81809b99 7616msgstr "(状态未查询)"
8ada9598
JX
7617
7618#: builtin/remote.c:1163
7619msgid " Local branch configured for 'git pull':"
7620msgid_plural " Local branches configured for 'git pull':"
81809b99 7621msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 7622msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598
JX
7623
7624#: builtin/remote.c:1171
7625msgid " Local refs will be mirrored by 'git push'"
81809b99 7626msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598
JX
7627
7628#: builtin/remote.c:1178
81809b99 7629#, c-format
8ada9598
JX
7630msgid " Local ref configured for 'git push'%s:"
7631msgid_plural " Local refs configured for 'git push'%s:"
81809b99 7632msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 7633msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 7634
ef317cd5
JX
7635#: builtin/remote.c:1199
7636msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 7637msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5
JX
7638
7639#: builtin/remote.c:1201
7640msgid "delete refs/remotes/<name>/HEAD"
07432cef 7641msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 7642
8ada9598 7643#: builtin/remote.c:1216
8ada9598 7644msgid "Cannot determine remote HEAD"
81809b99 7645msgstr "无法确定远程 HEAD"
8ada9598
JX
7646
7647#: builtin/remote.c:1218
7648msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 7649msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598
JX
7650
7651#: builtin/remote.c:1228
81809b99 7652#, c-format
8ada9598 7653msgid "Could not delete %s"
81809b99 7654msgstr "无法删除 %s"
8ada9598
JX
7655
7656#: builtin/remote.c:1236
81809b99 7657#, c-format
8ada9598 7658msgid "Not a valid ref: %s"
81809b99 7659msgstr "不是一个有效引用:%s"
8ada9598
JX
7660
7661#: builtin/remote.c:1238
81809b99 7662#, c-format
8ada9598 7663msgid "Could not setup %s"
81809b99 7664msgstr "不能设置 %s"
8ada9598
JX
7665
7666# 译者:注意保持前导空格
7667#: builtin/remote.c:1274
81809b99 7668#, c-format
8ada9598 7669msgid " %s will become dangling!"
07432cef 7670msgstr " %s 将成为摇摆状态!"
8ada9598
JX
7671
7672# 译者:注意保持前导空格
7673#: builtin/remote.c:1275
81809b99 7674#, c-format
8ada9598 7675msgid " %s has become dangling!"
07432cef 7676msgstr " %s 已成为摇摆状态!"
8ada9598
JX
7677
7678#: builtin/remote.c:1281
81809b99 7679#, c-format
8ada9598 7680msgid "Pruning %s"
81809b99 7681msgstr "修剪 %s"
8ada9598
JX
7682
7683#: builtin/remote.c:1282
7684#, c-format
7685msgid "URL: %s"
81809b99 7686msgstr "URL:%s"
8ada9598
JX
7687
7688#: builtin/remote.c:1295
7689#, c-format
7690msgid " * [would prune] %s"
81809b99 7691msgstr " * [将删除] %s"
8ada9598
JX
7692
7693#: builtin/remote.c:1298
7694#, c-format
7695msgid " * [pruned] %s"
81809b99 7696msgstr " * [已删除] %s"
8ada9598 7697
ef317cd5
JX
7698#: builtin/remote.c:1321
7699msgid "prune remotes after fetching"
07432cef 7700msgstr "抓取后清除远程"
ef317cd5 7701
8ada9598 7702#: builtin/remote.c:1387 builtin/remote.c:1461
81809b99 7703#, c-format
8ada9598 7704msgid "No such remote '%s'"
81809b99 7705msgstr "没有此远程 '%s'"
8ada9598 7706
ef317cd5 7707#: builtin/remote.c:1407
ef317cd5 7708msgid "add branch"
07432cef 7709msgstr "添加分支"
ef317cd5 7710
8ada9598 7711#: builtin/remote.c:1414
8ada9598 7712msgid "no remote specified"
81809b99 7713msgstr "未指定远程"
8ada9598 7714
ef317cd5
JX
7715#: builtin/remote.c:1436
7716msgid "manipulate push URLs"
07432cef 7717msgstr "操作推送 URLS"
ef317cd5
JX
7718
7719#: builtin/remote.c:1438
7720msgid "add URL"
07432cef 7721msgstr "添加 URL"
ef317cd5
JX
7722
7723#: builtin/remote.c:1440
ef317cd5 7724msgid "delete URLs"
07432cef 7725msgstr "删除 URLS"
ef317cd5 7726
8ada9598 7727#: builtin/remote.c:1447
8ada9598 7728msgid "--add --delete doesn't make sense"
81809b99 7729msgstr "--add --delete 无意义"
8ada9598
JX
7730
7731#: builtin/remote.c:1487
81809b99 7732#, c-format
8ada9598 7733msgid "Invalid old URL pattern: %s"
81809b99 7734msgstr "无效的旧URL匹配模版:%s"
8ada9598
JX
7735
7736#: builtin/remote.c:1495
81809b99 7737#, c-format
8ada9598 7738msgid "No such URL found: %s"
81809b99 7739msgstr "未找到此URL:%s"
8ada9598
JX
7740
7741#: builtin/remote.c:1497
7742msgid "Will not delete all non-push URLs"
81809b99 7743msgstr "将不会删除所有非推送URL地址"
8ada9598 7744
ef317cd5
JX
7745#: builtin/remote.c:1569
7746msgid "be verbose; must be placed before a subcommand"
07432cef 7747msgstr "冗长输出;必须置于子命令之前"
ef317cd5
JX
7748
7749#: builtin/replace.c:17
7750msgid "git replace [-f] <object> <replacement>"
07432cef 7751msgstr "git replace [-f] <对象> <替换物>"
ef317cd5
JX
7752
7753#: builtin/replace.c:18
7754msgid "git replace -d <object>..."
07432cef 7755msgstr "git replace -d <对象>..."
ef317cd5
JX
7756
7757#: builtin/replace.c:19
7758msgid "git replace -l [<pattern>]"
07432cef 7759msgstr "git replace -l [<模式>]"
ef317cd5 7760
07432cef 7761#: builtin/replace.c:121
ef317cd5 7762msgid "list replace refs"
07432cef 7763msgstr "列出替换的引用"
ef317cd5 7764
07432cef 7765#: builtin/replace.c:122
ef317cd5 7766msgid "delete replace refs"
07432cef 7767msgstr "删除替换的引用"
ef317cd5 7768
07432cef 7769#: builtin/replace.c:123
ef317cd5 7770msgid "replace the ref if it exists"
07432cef 7771msgstr "如果存在则替换引用"
ef317cd5
JX
7772
7773#: builtin/rerere.c:11
7774msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 7775msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5
JX
7776
7777#: builtin/rerere.c:56
ef317cd5 7778msgid "register clean resolutions in index"
07432cef 7779msgstr "在索引中注册干净的解决方案"
ef317cd5
JX
7780
7781#: builtin/reset.c:25
7782msgid ""
7783"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 7784msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5
JX
7785
7786#: builtin/reset.c:26
07432cef
WS
7787msgid "git reset [-q] <tree-ish> [--] <paths>..."
7788msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5
JX
7789
7790#: builtin/reset.c:27
07432cef
WS
7791msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7792msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 7793
c04f5ac3
JX
7794#: builtin/reset.c:33
7795msgid "mixed"
7796msgstr "混杂"
7797
7798#: builtin/reset.c:33
7799msgid "soft"
7800msgstr "软性"
7801
7802#: builtin/reset.c:33
7803msgid "hard"
7804msgstr "硬性"
7805
8ada9598
JX
7806#: builtin/reset.c:33
7807msgid "merge"
7808msgstr "合并"
7809
c04f5ac3
JX
7810#: builtin/reset.c:33
7811msgid "keep"
7812msgstr "保持"
7813
07432cef 7814#: builtin/reset.c:73
c04f5ac3
JX
7815msgid "You do not have a valid HEAD."
7816msgstr "您没有一个有效的 HEAD。"
7817
07432cef 7818#: builtin/reset.c:75
c04f5ac3
JX
7819msgid "Failed to find tree of HEAD."
7820msgstr "无法找到 HEAD 指向的树。"
7821
07432cef 7822#: builtin/reset.c:81
c04f5ac3
JX
7823#, c-format
7824msgid "Failed to find tree of %s."
7825msgstr "无法找到 %s 指向的树。"
7826
07432cef 7827#: builtin/reset.c:98
c04f5ac3
JX
7828#, c-format
7829msgid "HEAD is now at %s"
7830msgstr "HEAD 现在位于 %s"
7831
90e6ef53 7832# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7833#: builtin/reset.c:169
c04f5ac3
JX
7834#, c-format
7835msgid "Cannot do a %s reset in the middle of a merge."
7836msgstr "在合并过程中不能做%s重置操作。"
7837
07432cef 7838#: builtin/reset.c:248
ef317cd5 7839msgid "be quiet, only report errors"
07432cef 7840msgstr "安静模式,只报告错误"
ef317cd5 7841
07432cef 7842#: builtin/reset.c:250
ef317cd5 7843msgid "reset HEAD and index"
07432cef 7844msgstr "重置 HEAD 和索引"
ef317cd5 7845
07432cef 7846#: builtin/reset.c:251
ef317cd5 7847msgid "reset only HEAD"
07432cef 7848msgstr "只重置 HEAD"
ef317cd5 7849
07432cef 7850#: builtin/reset.c:253 builtin/reset.c:255
ef317cd5 7851msgid "reset HEAD, index and working tree"
07432cef 7852msgstr "重置 HEAD、索引和工作区"
ef317cd5 7853
07432cef 7854#: builtin/reset.c:257
ef317cd5 7855msgid "reset HEAD but keep local changes"
07432cef 7856msgstr "重置 HEAD 但保存本地变更"
ef317cd5 7857
07432cef
WS
7858#: builtin/reset.c:275
7859#, c-format
7860msgid "Failed to resolve '%s' as a valid revision."
7861msgstr "无法将 '%s' 解析为一个有效的版本。"
7862
7863#: builtin/reset.c:278 builtin/reset.c:286
c04f5ac3
JX
7864#, c-format
7865msgid "Could not parse object '%s'."
7866msgstr "不能解析对象 '%s'。"
7867
07432cef
WS
7868#: builtin/reset.c:283
7869#, c-format
7870msgid "Failed to resolve '%s' as a valid tree."
7871msgstr "无法将 '%s' 解析为一个有效的树对象。"
7872
7873#: builtin/reset.c:292
c04f5ac3 7874msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 7875msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 7876
07432cef 7877#: builtin/reset.c:301
c04f5ac3 7878msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 7879msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 7880
90e6ef53 7881# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7882#: builtin/reset.c:303
c04f5ac3
JX
7883#, c-format
7884msgid "Cannot do %s reset with paths."
7885msgstr "不能带路径进行%s重置。"
7886
90e6ef53 7887# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7888#: builtin/reset.c:313
c04f5ac3
JX
7889#, c-format
7890msgid "%s reset is not allowed in a bare repository"
7891msgstr "不能对裸版本库进行%s重置"
7892
07432cef 7893#: builtin/reset.c:333
ef317cd5
JX
7894#, c-format
7895msgid "Could not reset index file to revision '%s'."
7896msgstr "不能重置索引文件至版本 '%s'。"
7897
07432cef
WS
7898#: builtin/reset.c:339
7899msgid "Unstaged changes after reset:"
7900msgstr "重置后撤出暂存区的变更:"
7901
7902#: builtin/reset.c:344
7903msgid "Could not write new index file."
7904msgstr "不能写入新的索引文件。"
7905
ef317cd5 7906#: builtin/rev-parse.c:339
ef317cd5 7907msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 7908msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5
JX
7909
7910#: builtin/rev-parse.c:344
7911msgid "keep the `--` passed as an arg"
07432cef 7912msgstr "保持 `--` 作为一个参数传递"
ef317cd5
JX
7913
7914#: builtin/rev-parse.c:346
7915msgid "stop parsing after the first non-option argument"
07432cef 7916msgstr "遇到第一个非选项参数后停止解析"
ef317cd5
JX
7917
7918#: builtin/rev-parse.c:464
7919msgid ""
7920"git rev-parse --parseopt [options] -- [<args>...]\n"
7921" or: git rev-parse --sq-quote [<arg>...]\n"
7922" or: git rev-parse [options] [<arg>...]\n"
7923"\n"
7924"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7925msgstr ""
07432cef
WS
7926"git rev-parse --parseopt [选项] -- [<参数>...]\n"
7927" 或者:git rev-parse --sq-quote [<选项>...]\n"
7928" 或者:git rev-parse [options] [<选项>...]\n"
7929"\n"
7930"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
7931
7932#: builtin/revert.c:22
7933msgid "git revert [options] <commit-ish>"
07432cef 7934msgstr "git revert [选项] <提交号>"
ef317cd5
JX
7935
7936#: builtin/revert.c:23
7937msgid "git revert <subcommand>"
07432cef 7938msgstr "git revert <子命令>"
ef317cd5
JX
7939
7940#: builtin/revert.c:28
7941msgid "git cherry-pick [options] <commit-ish>"
07432cef 7942msgstr "git cherry-pick [选项] <提交号>"
ef317cd5
JX
7943
7944#: builtin/revert.c:29
ef317cd5 7945msgid "git cherry-pick <subcommand>"
07432cef 7946msgstr "git cherry-pick <子命令>"
ef317cd5
JX
7947
7948#: builtin/revert.c:70 builtin/revert.c:92
7949#, c-format
7950msgid "%s: %s cannot be used with %s"
7951msgstr "%s:%s 不能和 %s 同时使用"
7952
7953#: builtin/revert.c:103
7954msgid "end revert or cherry-pick sequence"
07432cef 7955msgstr "终止反转或拣选操作"
ef317cd5
JX
7956
7957#: builtin/revert.c:104
7958msgid "resume revert or cherry-pick sequence"
07432cef 7959msgstr "继续反转或拣选操作"
ef317cd5
JX
7960
7961#: builtin/revert.c:105
7962msgid "cancel revert or cherry-pick sequence"
07432cef 7963msgstr "取消反转或拣选操作"
ef317cd5
JX
7964
7965#: builtin/revert.c:106
ef317cd5 7966msgid "don't automatically commit"
07432cef 7967msgstr "不要自动提交"
ef317cd5
JX
7968
7969#: builtin/revert.c:107
ef317cd5 7970msgid "edit the commit message"
07432cef 7971msgstr "编辑提交说明"
ef317cd5
JX
7972
7973#: builtin/revert.c:110
7974msgid "parent number"
07432cef 7975msgstr "父编号"
ef317cd5
JX
7976
7977#: builtin/revert.c:112
ef317cd5 7978msgid "merge strategy"
07432cef 7979msgstr "合并策略"
ef317cd5
JX
7980
7981#: builtin/revert.c:113
ef317cd5 7982msgid "option"
07432cef 7983msgstr "选项"
ef317cd5
JX
7984
7985#: builtin/revert.c:114
ef317cd5 7986msgid "option for merge strategy"
07432cef 7987msgstr "合并策略的选项"
ef317cd5
JX
7988
7989#: builtin/revert.c:125
7990msgid "append commit name"
07432cef 7991msgstr "追加提交名称"
ef317cd5
JX
7992
7993#: builtin/revert.c:126
ef317cd5 7994msgid "allow fast-forward"
07432cef 7995msgstr "允许快进式"
c04f5ac3 7996
ef317cd5 7997#: builtin/revert.c:127
ef317cd5 7998msgid "preserve initially empty commits"
07432cef 7999msgstr "保留初始化的空提交"
ef317cd5
JX
8000
8001#: builtin/revert.c:128
ef317cd5 8002msgid "allow commits with empty messages"
07432cef 8003msgstr "允许提交说明为空"
c04f5ac3 8004
ef317cd5 8005#: builtin/revert.c:129
ef317cd5 8006msgid "keep redundant, empty commits"
07432cef 8007msgstr "保持多余的、空的提交"
ef317cd5
JX
8008
8009#: builtin/revert.c:133
c04f5ac3
JX
8010msgid "program error"
8011msgstr "程序错误"
8012
ef317cd5 8013#: builtin/revert.c:223
c04f5ac3
JX
8014msgid "revert failed"
8015msgstr "还原失败"
8016
ef317cd5 8017#: builtin/revert.c:238
c04f5ac3
JX
8018msgid "cherry-pick failed"
8019msgstr "拣选失败"
8020
07432cef 8021#: builtin/rm.c:15
ef317cd5 8022msgid "git rm [options] [--] <file>..."
07432cef
WS
8023msgstr "git rm [选项] [--] <文件>..."
8024
8025#: builtin/rm.c:64 builtin/rm.c:186
8026#, c-format
8027msgid ""
8028"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8029"(use 'rm -rf' if you really want to remove it including all of its history)"
8030msgstr ""
8031"子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8032"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 8033
07432cef 8034#: builtin/rm.c:174
c04f5ac3
JX
8035#, c-format
8036msgid ""
8037"'%s' has staged content different from both the file and the HEAD\n"
8038"(use -f to force removal)"
8039msgstr ""
90e6ef53 8040"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
c04f5ac3
JX
8041"(使用 -f 强制删除)"
8042
07432cef 8043#: builtin/rm.c:180
c04f5ac3
JX
8044#, c-format
8045msgid ""
8046"'%s' has changes staged in the index\n"
8047"(use --cached to keep the file, or -f to force removal)"
8048msgstr ""
90e6ef53 8049"'%s' 有变更已暂存至索引中\n"
c04f5ac3
JX
8050"(使用 --cached 保存文件,或用 -f 强制删除)"
8051
07432cef 8052#: builtin/rm.c:191
c04f5ac3
JX
8053#, c-format
8054msgid ""
8055"'%s' has local modifications\n"
8056"(use --cached to keep the file, or -f to force removal)"
8057msgstr ""
8058"'%s' 有本地修改\n"
8059"(使用 --cached 保存文件,或用 -f 强制删除)"
8060
07432cef 8061#: builtin/rm.c:207
ef317cd5 8062msgid "do not list removed files"
07432cef 8063msgstr "不列出删除的文件"
ef317cd5 8064
07432cef 8065#: builtin/rm.c:208
ef317cd5 8066msgid "only remove from the index"
07432cef 8067msgstr "只从索引区删除"
ef317cd5 8068
07432cef 8069#: builtin/rm.c:209
ef317cd5 8070msgid "override the up-to-date check"
07432cef 8071msgstr "忽略文件更新状态检查"
ef317cd5 8072
07432cef 8073#: builtin/rm.c:210
ef317cd5 8074msgid "allow recursive removal"
07432cef 8075msgstr "允许递归删除"
ef317cd5 8076
07432cef 8077#: builtin/rm.c:212
ef317cd5 8078msgid "exit with a zero status even if nothing matched"
07432cef 8079msgstr "即使没有匹配,也以零状态退出"
ef317cd5 8080
07432cef 8081#: builtin/rm.c:283
c04f5ac3
JX
8082#, c-format
8083msgid "not removing '%s' recursively without -r"
8084msgstr "未提供 -r 选项不会递归删除 '%s'"
8085
07432cef 8086#: builtin/rm.c:322
c04f5ac3
JX
8087#, c-format
8088msgid "git rm: unable to remove %s"
8089msgstr "git rm:不能删除 %s"
8090
ef317cd5
JX
8091#: builtin/shortlog.c:13
8092msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
07432cef 8093msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
ef317cd5 8094
07432cef 8095#: builtin/shortlog.c:133
c04f5ac3
JX
8096#, c-format
8097msgid "Missing author: %s"
8098msgstr "缺少作者:%s"
8099
07432cef 8100#: builtin/shortlog.c:229
ef317cd5 8101msgid "sort output according to the number of commits per author"
07432cef 8102msgstr "根据每个作者的提交数量排序"
ef317cd5 8103
07432cef 8104#: builtin/shortlog.c:231
ef317cd5 8105msgid "Suppress commit descriptions, only provides commit count"
07432cef 8106msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 8107
07432cef 8108#: builtin/shortlog.c:233
ef317cd5 8109msgid "Show the email address of each author"
07432cef 8110msgstr "显示每个作者的电子邮件地址"
ef317cd5 8111
07432cef 8112#: builtin/shortlog.c:234
ef317cd5 8113msgid "w[,i1[,i2]]"
07432cef 8114msgstr "w[,i1[,i2]]"
ef317cd5 8115
07432cef 8116#: builtin/shortlog.c:235
ef317cd5 8117msgid "Linewrap output"
07432cef 8118msgstr "折行输出"
ef317cd5
JX
8119
8120#: builtin/show-branch.c:9
8121msgid ""
8122"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8123"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8124"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8125"<glob>)...]"
8126msgstr ""
07432cef
WS
8127"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8128"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8129"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8130"<glob>)...]"
ef317cd5
JX
8131
8132#: builtin/show-branch.c:10
8133msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 8134msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5
JX
8135
8136#: builtin/show-branch.c:651
ef317cd5 8137msgid "show remote-tracking and local branches"
07432cef 8138msgstr "显示远程跟踪的和本地的分支"
ef317cd5
JX
8139
8140#: builtin/show-branch.c:653
ef317cd5 8141msgid "show remote-tracking branches"
07432cef 8142msgstr "显示远程跟踪的分支"
ef317cd5
JX
8143
8144#: builtin/show-branch.c:655
8145msgid "color '*!+-' corresponding to the branch"
07432cef 8146msgstr "着色 '*!+-' 到相应的分支"
ef317cd5
JX
8147
8148#: builtin/show-branch.c:657
8149msgid "show <n> more commits after the common ancestor"
07432cef 8150msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5
JX
8151
8152#: builtin/show-branch.c:659
8153msgid "synonym to more=-1"
07432cef 8154msgstr "和 more=-1 同义"
ef317cd5
JX
8155
8156#: builtin/show-branch.c:660
8157msgid "suppress naming strings"
07432cef 8158msgstr "不显示字符串命名"
ef317cd5
JX
8159
8160#: builtin/show-branch.c:662
ef317cd5 8161msgid "include the current branch"
07432cef 8162msgstr "包括当前分支"
ef317cd5
JX
8163
8164#: builtin/show-branch.c:664
ef317cd5 8165msgid "name commits with their object names"
07432cef 8166msgstr "以对象名字命名提交"
ef317cd5
JX
8167
8168#: builtin/show-branch.c:666
8169msgid "show possible merge bases"
07432cef 8170msgstr "显示可能合并的基线"
ef317cd5
JX
8171
8172#: builtin/show-branch.c:668
8173msgid "show refs unreachable from any other ref"
07432cef 8174msgstr "显示没有任何引用的的引用"
ef317cd5
JX
8175
8176#: builtin/show-branch.c:670
8177msgid "show commits in topological order"
07432cef 8178msgstr "以拓扑顺序显示提交"
ef317cd5
JX
8179
8180#: builtin/show-branch.c:672
8181msgid "show only commits not on the first branch"
07432cef 8182msgstr "只显示不在第一个分支上的提交"
ef317cd5
JX
8183
8184#: builtin/show-branch.c:674
8185msgid "show merges reachable from only one tip"
07432cef 8186msgstr "显示仅一个分支可访问的合并提交"
ef317cd5
JX
8187
8188#: builtin/show-branch.c:676
8189msgid "show commits where no parent comes before its children"
07432cef 8190msgstr "显示提交时以时间为序且父提交不能领先子提交"
ef317cd5
JX
8191
8192#: builtin/show-branch.c:678
8193msgid "<n>[,<base>]"
07432cef 8194msgstr "<n>[,<base>]"
ef317cd5
JX
8195
8196#: builtin/show-branch.c:679
8197msgid "show <n> most recent ref-log entries starting at base"
07432cef 8198msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
8199
8200#: builtin/show-ref.c:10
8201msgid ""
a77c07d9
JX
8202"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8203"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5 8204msgstr ""
a77c07d9
JX
8205"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8206"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
8207
8208#: builtin/show-ref.c:11
8209msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 8210msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 8211
07432cef 8212#: builtin/show-ref.c:165
ef317cd5 8213msgid "only show tags (can be combined with heads)"
07432cef 8214msgstr "只显示 tags(可以和头共用)"
ef317cd5 8215
07432cef 8216#: builtin/show-ref.c:166
ef317cd5 8217msgid "only show heads (can be combined with tags)"
07432cef 8218msgstr "只显示头(可以和 tags 共用)"
ef317cd5 8219
07432cef 8220#: builtin/show-ref.c:167
ef317cd5 8221msgid "stricter reference checking, requires exact ref path"
07432cef 8222msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 8223
07432cef 8224#: builtin/show-ref.c:170 builtin/show-ref.c:172
ef317cd5 8225msgid "show the HEAD reference"
07432cef 8226msgstr "显示 HEAD 引用"
ef317cd5 8227
07432cef 8228#: builtin/show-ref.c:174
ef317cd5 8229msgid "dereference tags into object IDs"
07432cef 8230msgstr "转换 tags 到对象ID"
ef317cd5 8231
07432cef 8232#: builtin/show-ref.c:176
ef317cd5 8233msgid "only show SHA1 hash using <n> digits"
07432cef 8234msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 8235
07432cef 8236#: builtin/show-ref.c:180
ef317cd5 8237msgid "do not print results to stdout (useful with --verify)"
07432cef 8238msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 8239
07432cef 8240#: builtin/show-ref.c:182
ef317cd5 8241msgid "show refs from stdin that aren't in local repository"
07432cef 8242msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
8243
8244#: builtin/symbolic-ref.c:7
8245msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
8246msgstr "git symbolic-ref [选项] 名称 [引用]"
8247
8248#: builtin/symbolic-ref.c:8
8249msgid "git symbolic-ref -d [-q] name"
8250msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 8251
07432cef 8252#: builtin/symbolic-ref.c:40
ef317cd5 8253msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
8254msgstr "不显示非符号(分离的)引用的错误信息"
8255
8256#: builtin/symbolic-ref.c:41
8257msgid "delete symbolic ref"
8258msgstr "删除符号引用"
ef317cd5 8259
07432cef 8260#: builtin/symbolic-ref.c:42
ef317cd5 8261msgid "shorten ref output"
07432cef 8262msgstr "简短的引用输出"
ef317cd5 8263
07432cef 8264#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8265msgid "reason"
07432cef 8266msgstr "原因"
ef317cd5 8267
07432cef 8268#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8269msgid "reason of the update"
07432cef 8270msgstr "更新的原因"
ef317cd5
JX
8271
8272#: builtin/tag.c:22
8273msgid ""
8274"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
a77c07d9 8275msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
8276
8277#: builtin/tag.c:23
8278msgid "git tag -d <tagname>..."
07432cef 8279msgstr "git tag -d <标签名>..."
ef317cd5
JX
8280
8281#: builtin/tag.c:24
8282msgid ""
8283"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8284"\t\t[<pattern>...]"
8285msgstr ""
07432cef
WS
8286"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8287"\t\t[<模式>...]"
ef317cd5
JX
8288
8289#: builtin/tag.c:26
8290msgid "git tag -v <tagname>..."
07432cef 8291msgstr "git tag -v <标签名>..."
ef317cd5 8292
8ada9598 8293#: builtin/tag.c:60
7ac1c0ad
JX
8294#, c-format
8295msgid "malformed object at '%s'"
8296msgstr "非法的对象于 '%s'"
8297
8ada9598 8298#: builtin/tag.c:207
c04f5ac3
JX
8299#, c-format
8300msgid "tag name too long: %.*s..."
8301msgstr "tag 名字太长:%.*s..."
8302
8ada9598 8303#: builtin/tag.c:212
c04f5ac3
JX
8304#, c-format
8305msgid "tag '%s' not found."
8306msgstr "tag '%s' 未发现。"
8307
8ada9598 8308#: builtin/tag.c:227
c04f5ac3
JX
8309#, c-format
8310msgid "Deleted tag '%s' (was %s)\n"
8311msgstr "已删除 tag '%s'(曾为 %s)\n"
8312
8ada9598 8313#: builtin/tag.c:239
c04f5ac3
JX
8314#, c-format
8315msgid "could not verify the tag '%s'"
8316msgstr "不能校验 tag '%s'"
8317
8ada9598 8318#: builtin/tag.c:249
a77c07d9 8319#, c-format
c04f5ac3
JX
8320msgid ""
8321"\n"
a77c07d9
JX
8322"Write a tag message\n"
8323"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
8324msgstr ""
8325"\n"
a77c07d9
JX
8326"输入一个 tag 说明\n"
8327"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 8328
a77c07d9
JX
8329#: builtin/tag.c:253
8330#, c-format
c04f5ac3
JX
8331msgid ""
8332"\n"
a77c07d9
JX
8333"Write a tag message\n"
8334"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 8335"want to.\n"
c04f5ac3
JX
8336msgstr ""
8337"\n"
a77c07d9
JX
8338"输入一个 tag 说明\n"
8339"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 8340
a77c07d9 8341#: builtin/tag.c:292
c04f5ac3
JX
8342msgid "unable to sign the tag"
8343msgstr "无法签署 tag"
8344
a77c07d9 8345#: builtin/tag.c:294
c04f5ac3
JX
8346msgid "unable to write tag file"
8347msgstr "无法写 tag 文件"
8348
a77c07d9 8349#: builtin/tag.c:319
c04f5ac3 8350msgid "bad object type."
90e6ef53 8351msgstr "坏的对象类型。"
c04f5ac3 8352
a77c07d9 8353#: builtin/tag.c:332
c04f5ac3 8354msgid "tag header too big."
90e6ef53 8355msgstr "tag 头信息太大。"
c04f5ac3 8356
a77c07d9 8357#: builtin/tag.c:368
c04f5ac3
JX
8358msgid "no tag message?"
8359msgstr "无 tag 说明?"
8360
a77c07d9 8361#: builtin/tag.c:374
c04f5ac3
JX
8362#, c-format
8363msgid "The tag message has been left in %s\n"
8364msgstr "tag 说明被保留在 %s\n"
8365
a77c07d9 8366#: builtin/tag.c:423
7ac1c0ad
JX
8367msgid "switch 'points-at' requires an object"
8368msgstr "开关 'points-at' 需要一个对象"
8369
a77c07d9 8370#: builtin/tag.c:425
7ac1c0ad
JX
8371#, c-format
8372msgid "malformed object name '%s'"
8373msgstr "非法的对象名 '%s'"
8374
a77c07d9 8375#: builtin/tag.c:445
ef317cd5 8376msgid "list tag names"
07432cef 8377msgstr "列出tag名称"
ef317cd5 8378
a77c07d9 8379#: builtin/tag.c:447
ef317cd5 8380msgid "print <n> lines of each tag message"
07432cef 8381msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 8382
a77c07d9 8383#: builtin/tag.c:449
ef317cd5 8384msgid "delete tags"
07432cef 8385msgstr "删除 tags"
ef317cd5 8386
a77c07d9 8387#: builtin/tag.c:450
ef317cd5 8388msgid "verify tags"
07432cef 8389msgstr "验证 tags"
ef317cd5 8390
a77c07d9 8391#: builtin/tag.c:452
ef317cd5 8392msgid "Tag creation options"
07432cef 8393msgstr "Tag 创建选项"
ef317cd5 8394
a77c07d9 8395#: builtin/tag.c:454
ef317cd5 8396msgid "annotated tag, needs a message"
07432cef 8397msgstr "注解 tag,需要一个说明"
ef317cd5 8398
a77c07d9 8399#: builtin/tag.c:456
ef317cd5 8400msgid "tag message"
07432cef 8401msgstr "tag 说明"
ef317cd5 8402
a77c07d9 8403#: builtin/tag.c:458
ef317cd5 8404msgid "annotated and GPG-signed tag"
07432cef 8405msgstr "注解并 GPG 签名的 tag"
ef317cd5 8406
a77c07d9 8407#: builtin/tag.c:462
ef317cd5 8408msgid "use another key to sign the tag"
07432cef 8409msgstr "使用另外的私钥签名 tag"
ef317cd5 8410
a77c07d9 8411#: builtin/tag.c:463
ef317cd5 8412msgid "replace the tag if exists"
07432cef 8413msgstr "如果存在,替换现有的 tag"
ef317cd5 8414
a77c07d9 8415#: builtin/tag.c:464
ef317cd5 8416msgid "show tag list in columns"
07432cef 8417msgstr "以列的方式显示 tag"
ef317cd5 8418
a77c07d9 8419#: builtin/tag.c:466
ef317cd5 8420msgid "Tag listing options"
07432cef 8421msgstr "Tag 列表选项"
ef317cd5 8422
a77c07d9 8423#: builtin/tag.c:469
ef317cd5 8424msgid "print only tags that contain the commit"
07432cef 8425msgstr "只打印包含提交的tags"
ef317cd5 8426
a77c07d9 8427#: builtin/tag.c:475
ef317cd5 8428msgid "print only tags of the object"
07432cef 8429msgstr "只打印tags对象"
ef317cd5 8430
a77c07d9 8431#: builtin/tag.c:504
8ada9598 8432msgid "--column and -n are incompatible"
81809b99 8433msgstr "--column 和 -n 不兼容"
8ada9598 8434
a77c07d9 8435#: builtin/tag.c:521
c04f5ac3 8436msgid "-n option is only allowed with -l."
649900bc 8437msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 8438
a77c07d9 8439#: builtin/tag.c:523
c04f5ac3 8440msgid "--contains option is only allowed with -l."
649900bc 8441msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 8442
a77c07d9 8443#: builtin/tag.c:525
7ac1c0ad 8444msgid "--points-at option is only allowed with -l."
649900bc 8445msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 8446
a77c07d9 8447#: builtin/tag.c:533
c04f5ac3
JX
8448msgid "only one -F or -m option is allowed."
8449msgstr "只允许一个 -F 或 -m 选项。"
8450
a77c07d9 8451#: builtin/tag.c:553
c04f5ac3
JX
8452msgid "too many params"
8453msgstr "太多参数"
8454
a77c07d9 8455#: builtin/tag.c:559
c04f5ac3
JX
8456#, c-format
8457msgid "'%s' is not a valid tag name."
90e6ef53 8458msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 8459
a77c07d9 8460#: builtin/tag.c:564
c04f5ac3
JX
8461#, c-format
8462msgid "tag '%s' already exists"
8463msgstr "tag '%s' 已存在"
8464
a77c07d9 8465#: builtin/tag.c:582
c04f5ac3
JX
8466#, c-format
8467msgid "%s: cannot lock the ref"
8468msgstr "%s:不能锁定引用"
8469
a77c07d9 8470#: builtin/tag.c:584
c04f5ac3
JX
8471#, c-format
8472msgid "%s: cannot update the ref"
8473msgstr "%s:不能更新引用"
8474
a77c07d9 8475#: builtin/tag.c:586
c04f5ac3
JX
8476#, c-format
8477msgid "Updated tag '%s' (was %s)\n"
8478msgstr "已更新tag '%s'(曾为 %s)\n"
8479
ef317cd5 8480#: builtin/update-index.c:401
ef317cd5 8481msgid "git update-index [options] [--] [<file>...]"
07432cef 8482msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 8483
07432cef 8484#: builtin/update-index.c:718
ef317cd5 8485msgid "continue refresh even when index needs update"
07432cef 8486msgstr "当索引需要更新时继续刷新"
8ada9598 8487
07432cef 8488#: builtin/update-index.c:721
ef317cd5 8489msgid "refresh: ignore submodules"
07432cef 8490msgstr "刷新:忽略子模组"
8ada9598 8491
07432cef 8492#: builtin/update-index.c:724
ef317cd5 8493msgid "do not ignore new files"
07432cef 8494msgstr "不忽略新的文件"
8ada9598 8495
07432cef 8496#: builtin/update-index.c:726
ef317cd5 8497msgid "let files replace directories and vice-versa"
07432cef 8498msgstr "让文件替换目录(反之亦然)"
ef317cd5 8499
07432cef 8500#: builtin/update-index.c:728
ef317cd5 8501msgid "notice files missing from worktree"
07432cef 8502msgstr "通知文件从工作区丢失"
ef317cd5 8503
07432cef 8504#: builtin/update-index.c:730
ef317cd5 8505msgid "refresh even if index contains unmerged entries"
07432cef 8506msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 8507
07432cef 8508#: builtin/update-index.c:733
ef317cd5 8509msgid "refresh stat information"
07432cef 8510msgstr "刷新统计信息"
ef317cd5 8511
07432cef 8512#: builtin/update-index.c:737
ef317cd5 8513msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 8514msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 8515
07432cef 8516#: builtin/update-index.c:741
ef317cd5 8517msgid "<mode> <object> <path>"
07432cef 8518msgstr "<mode> <object> <path>"
ef317cd5 8519
07432cef 8520#: builtin/update-index.c:742
ef317cd5 8521msgid "add the specified entry to the index"
07432cef 8522msgstr "添加指定的条目到索引区"
ef317cd5 8523
07432cef 8524#: builtin/update-index.c:746
ef317cd5 8525msgid "(+/-)x"
07432cef 8526msgstr "(+/-)x"
ef317cd5 8527
07432cef 8528#: builtin/update-index.c:747
ef317cd5 8529msgid "override the executable bit of the listed files"
07432cef 8530msgstr "覆盖列表里文件的可执行位"
ef317cd5 8531
07432cef 8532#: builtin/update-index.c:751
ef317cd5 8533msgid "mark files as \"not changing\""
07432cef 8534msgstr "把文件标记为 \"没有变更\""
ef317cd5 8535
07432cef 8536#: builtin/update-index.c:754
ef317cd5 8537msgid "clear assumed-unchanged bit"
07432cef 8538msgstr "清除 assumed-unchanged 位"
ef317cd5 8539
07432cef 8540#: builtin/update-index.c:757
ef317cd5 8541msgid "mark files as \"index-only\""
07432cef 8542msgstr "把文件标记为 \"仅索引\""
ef317cd5 8543
07432cef 8544#: builtin/update-index.c:760
ef317cd5 8545msgid "clear skip-worktree bit"
07432cef 8546msgstr "清除 skip-worktree 位"
ef317cd5 8547
07432cef 8548#: builtin/update-index.c:763
ef317cd5 8549msgid "add to index only; do not add content to object database"
07432cef 8550msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 8551
07432cef 8552#: builtin/update-index.c:765
ef317cd5 8553msgid "remove named paths even if present in worktree"
07432cef 8554msgstr "即使存在工作区里,也删除路径"
ef317cd5 8555
07432cef 8556#: builtin/update-index.c:767
ef317cd5 8557msgid "with --stdin: input lines are terminated by null bytes"
07432cef 8558msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 8559
07432cef 8560#: builtin/update-index.c:769
ef317cd5 8561msgid "read list of paths to be updated from standard input"
07432cef 8562msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 8563
07432cef 8564#: builtin/update-index.c:773
ef317cd5 8565msgid "add entries from standard input to the index"
07432cef 8566msgstr "从标准输入添加条目到索引区"
ef317cd5 8567
07432cef 8568#: builtin/update-index.c:777
ef317cd5 8569msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 8570msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 8571
07432cef 8572#: builtin/update-index.c:781
ef317cd5 8573msgid "only update entries that differ from HEAD"
07432cef 8574msgstr "只更新与 HEAD 不同的条目"
ef317cd5 8575
07432cef 8576#: builtin/update-index.c:785
ef317cd5 8577msgid "ignore files missing from worktree"
07432cef 8578msgstr "忽略工作区丢失的文件"
ef317cd5 8579
07432cef 8580#: builtin/update-index.c:788
ef317cd5 8581msgid "report actions to standard output"
07432cef 8582msgstr "在标准输出显示操作"
ef317cd5 8583
07432cef 8584#: builtin/update-index.c:790
ef317cd5 8585msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 8586msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 8587
07432cef 8588#: builtin/update-index.c:794
ef317cd5 8589msgid "write index in this format"
07432cef 8590msgstr "以这种格式写入索引区"
ef317cd5
JX
8591
8592#: builtin/update-ref.c:7
8593msgid "git update-ref [options] -d <refname> [<oldval>]"
07432cef 8594msgstr "git update-ref [options] -d <引用名> [<旧值>]"
ef317cd5
JX
8595
8596#: builtin/update-ref.c:8
8597msgid "git update-ref [options] <refname> <newval> [<oldval>]"
07432cef 8598msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
ef317cd5
JX
8599
8600#: builtin/update-ref.c:19
8601msgid "delete the reference"
07432cef 8602msgstr "删除引用"
ef317cd5
JX
8603
8604#: builtin/update-ref.c:21
8605msgid "update <refname> not the one it points to"
07432cef 8606msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5
JX
8607
8608#: builtin/update-server-info.c:6
8609msgid "git update-server-info [--force]"
07432cef 8610msgstr "git update-server-info [--force]"
ef317cd5
JX
8611
8612#: builtin/update-server-info.c:14
8613msgid "update the info files from scratch"
07432cef 8614msgstr "从头开始更新文件信息"
ef317cd5
JX
8615
8616#: builtin/verify-pack.c:56
8617msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 8618msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5
JX
8619
8620#: builtin/verify-pack.c:66
ef317cd5
JX
8621msgid "verbose"
8622msgstr "冗长输出"
8623
8624#: builtin/verify-pack.c:68
8625msgid "show statistics only"
07432cef 8626msgstr "只显示统计"
ef317cd5
JX
8627
8628#: builtin/verify-tag.c:17
8629msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 8630msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
8631
8632#: builtin/verify-tag.c:73
8633msgid "print tag contents"
07432cef 8634msgstr "打印 tag 内容"
ef317cd5
JX
8635
8636#: builtin/write-tree.c:13
8637msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 8638msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
8639
8640#: builtin/write-tree.c:26
8641msgid "<prefix>/"
07432cef 8642msgstr "<前缀>/"
ef317cd5
JX
8643
8644#: builtin/write-tree.c:27
8645msgid "write tree object for a subdirectory <prefix>"
07432cef 8646msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
8647
8648#: builtin/write-tree.c:30
8649msgid "only useful for debugging"
07432cef 8650msgstr "只对调试有用"
ef317cd5
JX
8651
8652#: git.c:16
8653msgid "See 'git help <command>' for more information on a specific command."
8654msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8ada9598
JX
8655
8656#: parse-options.h:156
8657msgid "no-op (backward compatibility)"
81809b99 8658msgstr "空操作(向后兼容)"
8ada9598 8659
07432cef 8660#: parse-options.h:232
8ada9598 8661msgid "be more verbose"
81809b99 8662msgstr "更加详细"
8ada9598 8663
07432cef 8664#: parse-options.h:234
8ada9598 8665msgid "be more quiet"
81809b99 8666msgstr "更加安静"
8ada9598 8667
07432cef 8668#: parse-options.h:240
8ada9598 8669msgid "use <n> digits to display SHA-1s"
81809b99 8670msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
8671
8672#: common-cmds.h:8
8673msgid "Add file contents to the index"
81809b99 8674msgstr "添加文件内容至索引"
8ada9598
JX
8675
8676#: common-cmds.h:9
8677msgid "Find by binary search the change that introduced a bug"
81809b99 8678msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
8679
8680#: common-cmds.h:10
8ada9598 8681msgid "List, create, or delete branches"
81809b99 8682msgstr "列出、创建或删除分支"
8ada9598
JX
8683
8684#: common-cmds.h:11
8685msgid "Checkout a branch or paths to the working tree"
81809b99 8686msgstr "检出一个分支或路径到工作区"
8ada9598
JX
8687
8688#: common-cmds.h:12
8ada9598 8689msgid "Clone a repository into a new directory"
81809b99 8690msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
8691
8692#: common-cmds.h:13
8ada9598 8693msgid "Record changes to the repository"
81809b99 8694msgstr "记录变更到版本库"
8ada9598
JX
8695
8696#: common-cmds.h:14
8697msgid "Show changes between commits, commit and working tree, etc"
81809b99 8698msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
8699
8700#: common-cmds.h:15
8701msgid "Download objects and refs from another repository"
81809b99 8702msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
8703
8704#: common-cmds.h:16
8705msgid "Print lines matching a pattern"
81809b99 8706msgstr "输出和模式匹配的行"
8ada9598
JX
8707
8708#: common-cmds.h:17
a77c07d9
JX
8709msgid "Create an empty Git repository or reinitialize an existing one"
8710msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598
JX
8711
8712#: common-cmds.h:18
8ada9598 8713msgid "Show commit logs"
81809b99 8714msgstr "显示提交日志"
8ada9598
JX
8715
8716#: common-cmds.h:19
8717msgid "Join two or more development histories together"
81809b99 8718msgstr "合并两个或更多开发历史"
8ada9598
JX
8719
8720#: common-cmds.h:20
8721msgid "Move or rename a file, a directory, or a symlink"
81809b99 8722msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
8723
8724#: common-cmds.h:21
8725msgid "Fetch from and merge with another repository or a local branch"
81809b99 8726msgstr "获取并合并另外的版本库或一个本地分支"
8ada9598
JX
8727
8728#: common-cmds.h:22
8729msgid "Update remote refs along with associated objects"
81809b99 8730msgstr "更新远程引用和相关的对象"
8ada9598
JX
8731
8732#: common-cmds.h:23
8733msgid "Forward-port local commits to the updated upstream head"
81809b99 8734msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
8735
8736#: common-cmds.h:24
8737msgid "Reset current HEAD to the specified state"
81809b99 8738msgstr "重置当前HEAD到指定状态"
8ada9598
JX
8739
8740#: common-cmds.h:25
8741msgid "Remove files from the working tree and from the index"
81809b99 8742msgstr "从工作区和索引中删除文件"
8ada9598
JX
8743
8744#: common-cmds.h:26
8745msgid "Show various types of objects"
81809b99 8746msgstr "显示各种类型的对象"
8ada9598
JX
8747
8748#: common-cmds.h:27
8ada9598 8749msgid "Show the working tree status"
81809b99 8750msgstr "显示工作区状态"
8ada9598
JX
8751
8752#: common-cmds.h:28
8753msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 8754msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 8755
170e9899 8756#: git-am.sh:50
c04f5ac3
JX
8757msgid "You need to set your committer info first"
8758msgstr "您需要先设置你的提交者信息"
8759
b694fbb1
JX
8760#: git-am.sh:95
8761msgid ""
8762"You seem to have moved HEAD since the last 'am' failure.\n"
8763"Not rewinding to ORIG_HEAD"
6792b93b 8764msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1
JX
8765
8766#: git-am.sh:105
8767#, sh-format
8768msgid ""
649900bc
JX
8769"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8770"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8771"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1
JX
8772msgstr ""
8773"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8774"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8775"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8776
8777#: git-am.sh:121
8778msgid "Cannot fall back to three-way merge."
8779msgstr "无法求助于三路合并。"
8780
170e9899 8781#: git-am.sh:137
c04f5ac3 8782msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 8783msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc
JX
8784
8785#: git-am.sh:139
8786msgid "Using index info to reconstruct a base tree..."
63af42fe 8787msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 8788
170e9899 8789#: git-am.sh:154
c04f5ac3
JX
8790msgid ""
8791"Did you hand edit your patch?\n"
8792"It does not apply to blobs recorded in its index."
8793msgstr ""
8794"您是否曾手动编辑过您的补丁?\n"
07432cef 8795"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 8796
170e9899 8797#: git-am.sh:163
c04f5ac3 8798msgid "Falling back to patching base and 3-way merge..."
b694fbb1 8799msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 8800
649900bc
JX
8801#: git-am.sh:179
8802msgid "Failed to merge in the changes."
8803msgstr "无法合并变更。"
8804
8805#: git-am.sh:274
c04f5ac3
JX
8806msgid "Only one StGIT patch series can be applied at once"
8807msgstr "一次只能有一个 StGIT 补丁队列被应用"
8808
649900bc 8809#: git-am.sh:361
c04f5ac3
JX
8810#, sh-format
8811msgid "Patch format $patch_format is not supported."
8812msgstr "不支持 $patch_format 补丁格式。"
8813
649900bc 8814#: git-am.sh:363
c04f5ac3
JX
8815msgid "Patch format detection failed."
8816msgstr "补丁格式检测失败。"
8817
649900bc
JX
8818#: git-am.sh:389
8819msgid ""
8820"The -b/--binary option has been a no-op for long time, and\n"
8821"it will be removed. Please do not use it anymore."
8822msgstr ""
8823"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8824"请不要再使用它了。"
c04f5ac3 8825
649900bc 8826#: git-am.sh:477
c04f5ac3
JX
8827#, sh-format
8828msgid "previous rebase directory $dotest still exists but mbox given."
8829msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8830
649900bc 8831#: git-am.sh:482
c04f5ac3
JX
8832msgid "Please make up your mind. --skip or --abort?"
8833msgstr "请下决心。--skip 或是 --abort ?"
8834
649900bc 8835#: git-am.sh:509
c04f5ac3
JX
8836msgid "Resolve operation not in progress, we are not resuming."
8837msgstr "解决操作未进行,我们不会继续。"
8838
649900bc 8839#: git-am.sh:575
c04f5ac3
JX
8840#, sh-format
8841msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 8842msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 8843
649900bc 8844#: git-am.sh:679
b694fbb1
JX
8845#, sh-format
8846msgid ""
8847"Patch is empty. Was it split wrong?\n"
8848"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8849"To restore the original branch and stop patching run \"$cmdline --abort\"."
8850msgstr ""
8851"补丁为空。是不是切分错误?\n"
8852"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
8853"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8854
649900bc 8855#: git-am.sh:706
b694fbb1
JX
8856msgid "Patch does not have a valid e-mail address."
8857msgstr "补丁中没有一个有效的邮件地址。"
8858
649900bc 8859#: git-am.sh:753
c04f5ac3 8860msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 8861msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 8862
649900bc 8863#: git-am.sh:757
b694fbb1
JX
8864msgid "Commit Body is:"
8865msgstr "提交内容为:"
8866
90e6ef53 8867# 译者:注意保持句尾空格
c04f5ac3
JX
8868#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8869#. in your translation. The program will only accept English
8870#. input at this point.
649900bc 8871#: git-am.sh:764
c04f5ac3
JX
8872msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8873msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8874
649900bc 8875#: git-am.sh:800
c04f5ac3
JX
8876#, sh-format
8877msgid "Applying: $FIRSTLINE"
8878msgstr "正应用:$FIRSTLINE"
8879
649900bc 8880#: git-am.sh:821
b694fbb1
JX
8881msgid ""
8882"No changes - did you forget to use 'git add'?\n"
8883"If there is nothing left to stage, chances are that something else\n"
8884"already introduced the same changes; you might want to skip this patch."
8885msgstr ""
8886"没有变更 —— 您是不是忘了执行 'git add'?\n"
8887"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8888"您也许想要跳过这个补丁。"
8889
649900bc 8890#: git-am.sh:829
b694fbb1
JX
8891msgid ""
8892"You still have unmerged paths in your index\n"
8893"did you forget to use 'git add'?"
6792b93b 8894msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 8895
649900bc 8896#: git-am.sh:845
c04f5ac3 8897msgid "No changes -- Patch already applied."
63af42fe 8898msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 8899
649900bc 8900#: git-am.sh:855
b694fbb1
JX
8901#, sh-format
8902msgid "Patch failed at $msgnum $FIRSTLINE"
8903msgstr "补丁失败于 $msgnum $FIRSTLINE"
8904
ef317cd5
JX
8905#: git-am.sh:858
8906#, sh-format
8907msgid ""
8908"The copy of the patch that failed is found in:\n"
8909" $dotest/patch"
8910msgstr ""
07432cef
WS
8911"失败的补丁文件副本位于:\n"
8912" $dotest/patch"
ef317cd5 8913
649900bc 8914#: git-am.sh:876
c04f5ac3
JX
8915msgid "applying to an empty history"
8916msgstr "正应用到一个空历史上"
8917
b694fbb1
JX
8918#: git-bisect.sh:48
8919msgid "You need to start by \"git bisect start\""
8920msgstr "您需要执行 \"git bisect start\" 来开始"
8921
90e6ef53 8922# 译者:注意保持句尾空格
c04f5ac3
JX
8923#. TRANSLATORS: Make sure to include [Y] and [n] in your
8924#. translation. The program will only accept English input
8925#. at this point.
8926#: git-bisect.sh:54
8927msgid "Do you want me to do it for you [Y/n]? "
8928msgstr "您想让我为您这样做么[Y/n]? "
8929
8930#: git-bisect.sh:95
8931#, sh-format
8932msgid "unrecognised option: '$arg'"
81809b99 8933msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
8934
8935#: git-bisect.sh:99
8936#, sh-format
8937msgid "'$arg' does not appear to be a valid revision"
8938msgstr "'$arg' 看起来不像是一个有效的版本"
8939
8940#: git-bisect.sh:117
8941msgid "Bad HEAD - I need a HEAD"
8942msgstr "坏的 HEAD - 我需要一个 HEAD"
8943
8944#: git-bisect.sh:130
8945#, sh-format
8946msgid ""
8947"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8948msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
8949
8950#: git-bisect.sh:140
8951msgid "won't bisect on seeked tree"
8952msgstr "不会在已查找过的树上二分查找"
8953
8954#: git-bisect.sh:144
8955msgid "Bad HEAD - strange symbolic ref"
90e6ef53 8956msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
8957
8958#: git-bisect.sh:189
8959#, sh-format
8960msgid "Bad bisect_write argument: $state"
90e6ef53 8961msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
8962
8963#: git-bisect.sh:218
8964#, sh-format
8965msgid "Bad rev input: $arg"
90e6ef53 8966msgstr "输入坏的版本:$arg"
c04f5ac3
JX
8967
8968#: git-bisect.sh:232
8969msgid "Please call 'bisect_state' with at least one argument."
8970msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
8971
8972#: git-bisect.sh:244
8973#, sh-format
8974msgid "Bad rev input: $rev"
8975msgstr "输入坏的版本:$rev"
8976
8977#: git-bisect.sh:250
8978msgid "'git bisect bad' can take only one argument."
8979msgstr "'git bisect bad' 只能带一个参数。"
8980
b694fbb1
JX
8981#. have bad but not good. we could bisect although
8982#. this is less optimum.
8983#: git-bisect.sh:273
8984msgid "Warning: bisecting only with a bad commit."
8985msgstr "警告:在仅有一个坏提交下进行二分查找。"
8986
90e6ef53 8987# 译者:注意保持句尾空格
c04f5ac3
JX
8988#. TRANSLATORS: Make sure to include [Y] and [n] in your
8989#. translation. The program will only accept English input
8990#. at this point.
8991#: git-bisect.sh:279
8992msgid "Are you sure [Y/n]? "
8993msgstr "您确认么[Y/n]? "
8994
b694fbb1
JX
8995#: git-bisect.sh:289
8996msgid ""
8997"You need to give me at least one good and one bad revisions.\n"
8998"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8999msgstr ""
9000"您需要给我至少一个好版本和一个坏版本。\n"
9001"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9002
9003#: git-bisect.sh:292
9004msgid ""
9005"You need to start by \"git bisect start\".\n"
9006"You then need to give me at least one good and one bad revisions.\n"
9007"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9008msgstr ""
9009"您需要执行 \"git bisect start\" 来开始。\n"
9010"然后需要提供我至少一个好版本和一个坏版本。\n"
9011"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9012
9013#: git-bisect.sh:347 git-bisect.sh:474
9014msgid "We are not bisecting."
9015msgstr "我们没有在二分查找。"
9016
c04f5ac3
JX
9017#: git-bisect.sh:354
9018#, sh-format
9019msgid "'$invalid' is not a valid commit"
9020msgstr "'$invalid' 不是一个有效的提交"
9021
9022#: git-bisect.sh:363
9023#, sh-format
9024msgid ""
9025"Could not check out original HEAD '$branch'.\n"
9026"Try 'git bisect reset <commit>'."
9027msgstr ""
9028"不能检出原始 HEAD '$branch'。\n"
07432cef 9029"尝试 'git bisect reset <提交>'。"
c04f5ac3
JX
9030
9031#: git-bisect.sh:390
9032msgid "No logfile given"
9033msgstr "未提供日志文件"
9034
9035#: git-bisect.sh:391
9036#, sh-format
9037msgid "cannot read $file for replaying"
9038msgstr "不能读取 $file 来重放"
9039
9040#: git-bisect.sh:408
9041msgid "?? what are you talking about?"
9042msgstr "?? 您在说什么?"
9043
b694fbb1
JX
9044#: git-bisect.sh:420
9045#, sh-format
9046msgid "running $command"
9047msgstr "运行 $command"
9048
9049#: git-bisect.sh:427
9050#, sh-format
9051msgid ""
9052"bisect run failed:\n"
9053"exit code $res from '$command' is < 0 or >= 128"
9054msgstr ""
9055"二分查找运行失败:\n"
07432cef 9056"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1
JX
9057
9058#: git-bisect.sh:453
9059msgid "bisect run cannot continue any more"
9060msgstr "二分查找不能继续运行"
9061
9062#: git-bisect.sh:459
9063#, sh-format
9064msgid ""
9065"bisect run failed:\n"
9066"'bisect_state $state' exited with error code $res"
9067msgstr ""
9068"二分查找运行失败:\n"
9069"'bisect_state $state' 退出码为 $res"
9070
9071#: git-bisect.sh:466
9072msgid "bisect run success"
9073msgstr "二分查找运行成功"
c04f5ac3
JX
9074
9075#: git-pull.sh:21
9076msgid ""
9077"Pull is not possible because you have unmerged files.\n"
9078"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9079"as appropriate to mark resolution, or use 'git commit -a'."
9080msgstr ""
90e6ef53 9081"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 9082"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 9083"或者使用 'git commit -a'。"
c04f5ac3
JX
9084
9085#: git-pull.sh:25
9086msgid "Pull is not possible because you have unmerged files."
90e6ef53 9087msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 9088
7ac1c0ad 9089#: git-pull.sh:197
c04f5ac3 9090msgid "updating an unborn branch with changes added to the index"
90e6ef53 9091msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 9092
b694fbb1
JX
9093#. The fetch involved updating the current branch.
9094#. The working tree and the index file is still based on the
9095#. $orig_head commit, but we are merging into $curr_head.
9096#. First update the working tree to match $curr_head.
07432cef 9097#: git-pull.sh:229
b694fbb1
JX
9098#, sh-format
9099msgid ""
9100"Warning: fetch updated the current branch head.\n"
9101"Warning: fast-forwarding your working tree from\n"
9102"Warning: commit $orig_head."
9103msgstr ""
9104"警告:fetch 更新了当前的分支。您的工作区\n"
9105"警告:从原提交 $orig_head 快进。"
9106
07432cef 9107#: git-pull.sh:254
c04f5ac3
JX
9108msgid "Cannot merge multiple branches into empty head"
9109msgstr "无法将多个分支合并到空分支"
9110
07432cef 9111#: git-pull.sh:258
c04f5ac3
JX
9112msgid "Cannot rebase onto multiple branches"
9113msgstr "无法变基到多个分支"
9114
07432cef 9115#: git-rebase.sh:53
649900bc
JX
9116msgid ""
9117"When you have resolved this problem, run \"git rebase --continue\".\n"
9118"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9119"To check out the original branch and stop rebasing, run \"git rebase --abort"
9120"\"."
9121msgstr ""
9122"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9123"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9124"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9125
07432cef 9126#: git-rebase.sh:160
649900bc
JX
9127msgid "The pre-rebase hook refused to rebase."
9128msgstr "钩子 pre-rebase 拒绝变基。"
9129
07432cef 9130#: git-rebase.sh:165
649900bc
JX
9131msgid "It looks like git-am is in progress. Cannot rebase."
9132msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9133
07432cef 9134#: git-rebase.sh:296
649900bc
JX
9135msgid "The --exec option must be used with the --interactive option"
9136msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9137
07432cef 9138#: git-rebase.sh:301
649900bc
JX
9139msgid "No rebase in progress?"
9140msgstr "没有正在进行的变基?"
9141
07432cef
WS
9142#: git-rebase.sh:312
9143msgid "The --edit-todo action can only be used during interactive rebase."
9144msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9145
9146#: git-rebase.sh:319
649900bc
JX
9147msgid "Cannot read HEAD"
9148msgstr "不能读取 HEAD"
9149
07432cef 9150#: git-rebase.sh:322
649900bc
JX
9151msgid ""
9152"You must edit all merge conflicts and then\n"
9153"mark them as resolved using git add"
9154msgstr ""
9155"您必须编辑所有的合并冲突,然后通过 git add\n"
9156"命令将它们标记为已解决"
9157
07432cef 9158#: git-rebase.sh:340
649900bc
JX
9159#, sh-format
9160msgid "Could not move back to $head_name"
9161msgstr "无法移回 $head_name"
9162
07432cef 9163#: git-rebase.sh:359
649900bc
JX
9164#, sh-format
9165msgid ""
9166"It seems that there is already a $state_dir_base directory, and\n"
9167"I wonder if you are in the middle of another rebase. If that is the\n"
9168"case, please try\n"
9169"\t$cmd_live_rebase\n"
9170"If that is not the case, please\n"
9171"\t$cmd_clear_stale_rebase\n"
9172"and run me again. I am stopping in case you still have something\n"
9173"valuable there."
9174msgstr ""
9175"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9176"如果是这样,请尝试执行\n"
9177"\t$cmd_live_rebase\n"
9178"如果不是这样,请执行\n"
9179"\t$cmd_clear_stale_rebase\n"
9180"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9181
07432cef 9182#: git-rebase.sh:404
649900bc
JX
9183#, sh-format
9184msgid "invalid upstream $upstream_name"
9185msgstr "无效的上游 $upstream_name"
9186
07432cef 9187#: git-rebase.sh:428
649900bc
JX
9188#, sh-format
9189msgid "$onto_name: there are more than one merge bases"
9190msgstr "$onto_name: 有一个以上的合并基准"
9191
07432cef 9192#: git-rebase.sh:431 git-rebase.sh:435
649900bc
JX
9193#, sh-format
9194msgid "$onto_name: there is no merge base"
9195msgstr "$onto_name: 没有合并基准"
9196
07432cef 9197#: git-rebase.sh:440
649900bc
JX
9198#, sh-format
9199msgid "Does not point to a valid commit: $onto_name"
9200msgstr "没有指向一个有效的提交:$onto_name"
9201
07432cef 9202#: git-rebase.sh:463
649900bc
JX
9203#, sh-format
9204msgid "fatal: no such branch: $branch_name"
9205msgstr "严重错误:无此分支:$branch_name"
9206
07432cef 9207#: git-rebase.sh:483
649900bc
JX
9208msgid "Please commit or stash them."
9209msgstr "请提交或为它们保存进度。"
9210
07432cef 9211#: git-rebase.sh:501
649900bc
JX
9212#, sh-format
9213msgid "Current branch $branch_name is up to date."
9214msgstr "当前分支 $branch_name 是最新的。"
9215
07432cef 9216#: git-rebase.sh:504
649900bc
JX
9217#, sh-format
9218msgid "Current branch $branch_name is up to date, rebase forced."
9219msgstr "当前分支 $branch_name 是最新的,强制变基。"
9220
07432cef 9221#: git-rebase.sh:515
649900bc
JX
9222#, sh-format
9223msgid "Changes from $mb to $onto:"
9224msgstr "变更从 $mb 到 $onto:"
9225
9226#. Detach HEAD and reset the tree
07432cef 9227#: git-rebase.sh:524
649900bc
JX
9228msgid "First, rewinding head to replay your work on top of it..."
9229msgstr "首先,重置头指针以便在上面重放您的工作..."
9230
07432cef 9231#: git-rebase.sh:532
649900bc
JX
9232#, sh-format
9233msgid "Fast-forwarded $branch_name to $onto_name."
9234msgstr "快进 $branch_name 至 $onto_name。"
9235
c04f5ac3
JX
9236#: git-stash.sh:51
9237msgid "git stash clear with parameters is unimplemented"
9238msgstr "git stash clear 不支持参数"
9239
9240#: git-stash.sh:74
9241msgid "You do not have the initial commit yet"
9242msgstr "您尚未建立初始提交"
9243
9244#: git-stash.sh:89
9245msgid "Cannot save the current index state"
90e6ef53 9246msgstr "无法保存当前索引状态"
c04f5ac3
JX
9247
9248#: git-stash.sh:123 git-stash.sh:136
9249msgid "Cannot save the current worktree state"
9250msgstr "无法保存当前工作区状态"
9251
9252#: git-stash.sh:140
9253msgid "No changes selected"
90e6ef53 9254msgstr "没有选择变更"
c04f5ac3
JX
9255
9256#: git-stash.sh:143
9257msgid "Cannot remove temporary index (can't happen)"
90e6ef53 9258msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
9259
9260#: git-stash.sh:156
9261msgid "Cannot record working tree state"
9262msgstr "不能记录工作区状态"
9263
b694fbb1
JX
9264#. TRANSLATORS: $option is an invalid option, like
9265#. `--blah-blah'. The 7 spaces at the beginning of the
9266#. second line correspond to "error: ". So you should line
9267#. up the second line with however many characters the
9268#. translation of "error: " takes in your language. E.g. in
9269#. English this is:
9270#.
9271#. $ git stash save --blah-blah 2>&1 | head -n 2
9272#. error: unknown option for 'stash save': --blah-blah
9273#. To provide a message, use git stash save -- '--blah-blah'
9274#: git-stash.sh:202
9275#, sh-format
9276msgid ""
9277"error: unknown option for 'stash save': $option\n"
9278" To provide a message, use git stash save -- '$option'"
9279msgstr ""
9280"错误:'stash save' 的未知选项:$option\n"
9281" 要提供一个描述信息,使用 git stash save -- '$option'"
9282
c04f5ac3
JX
9283#: git-stash.sh:223
9284msgid "No local changes to save"
9285msgstr "没有要保存的本地修改"
9286
9287#: git-stash.sh:227
9288msgid "Cannot initialize stash"
90e6ef53 9289msgstr "无法初始化 stash"
c04f5ac3
JX
9290
9291#: git-stash.sh:235
9292msgid "Cannot save the current status"
9293msgstr "无法保存当前状态"
9294
9295#: git-stash.sh:253
9296msgid "Cannot remove worktree changes"
9297msgstr "无法删除工作区变更"
9298
9299#: git-stash.sh:352
9300msgid "No stash found."
90e6ef53 9301msgstr "未发现 stash。"
c04f5ac3
JX
9302
9303#: git-stash.sh:359
9304#, sh-format
9305msgid "Too many revisions specified: $REV"
90e6ef53 9306msgstr "指定了太多的版本:$REV"
c04f5ac3
JX
9307
9308#: git-stash.sh:365
9309#, sh-format
9310msgid "$reference is not valid reference"
9311msgstr "$reference 不是有效的引用"
9312
9313#: git-stash.sh:393
9314#, sh-format
9315msgid "'$args' is not a stash-like commit"
90e6ef53 9316msgstr "'$args' 不是 stash 样提交"
c04f5ac3
JX
9317
9318#: git-stash.sh:404
9319#, sh-format
9320msgid "'$args' is not a stash reference"
90e6ef53 9321msgstr "'$args' 不是一个 stash 引用"
c04f5ac3
JX
9322
9323#: git-stash.sh:412
9324msgid "unable to refresh index"
90e6ef53 9325msgstr "无法刷新索引"
c04f5ac3
JX
9326
9327#: git-stash.sh:416
9328msgid "Cannot apply a stash in the middle of a merge"
9329msgstr "无法在合并过程中恢复进度"
9330
9331#: git-stash.sh:424
9332msgid "Conflicts in index. Try without --index."
90e6ef53 9333msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3
JX
9334
9335#: git-stash.sh:426
9336msgid "Could not save index tree"
90e6ef53 9337msgstr "不能保存索引树"
c04f5ac3
JX
9338
9339#: git-stash.sh:460
9340msgid "Cannot unstage modified files"
9341msgstr "无法还原修改的文件"
9342
ef317cd5 9343#: git-stash.sh:475
b694fbb1
JX
9344msgid "Index was not unstashed."
9345msgstr "索引的进度没有被恢复。"
9346
ef317cd5 9347#: git-stash.sh:492
c04f5ac3
JX
9348#, sh-format
9349msgid "Dropped ${REV} ($s)"
9350msgstr "丢弃了 ${REV} ($s)"
9351
ef317cd5 9352#: git-stash.sh:493
c04f5ac3
JX
9353#, sh-format
9354msgid "${REV}: Could not drop stash entry"
90e6ef53 9355msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 9356
ef317cd5 9357#: git-stash.sh:500
c04f5ac3
JX
9358msgid "No branch name specified"
9359msgstr "未指定分支名"
9360
ef317cd5 9361#: git-stash.sh:571
c04f5ac3
JX
9362msgid "(To restore them type \"git stash apply\")"
9363msgstr "(为恢复数据输入 \"git stash apply\")"
9364
07432cef 9365#: git-submodule.sh:90
c04f5ac3
JX
9366#, sh-format
9367msgid "cannot strip one component off url '$remoteurl'"
9368msgstr "无法从 url '$remoteurl' 剥离一个组件"
9369
07432cef 9370#: git-submodule.sh:195
c04f5ac3 9371#, sh-format
170e9899
JX
9372msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9373msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 9374
07432cef 9375#: git-submodule.sh:238
c04f5ac3 9376#, sh-format
170e9899
JX
9377msgid "Clone of '$url' into submodule path '$sm_path' failed"
9378msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 9379
07432cef 9380#: git-submodule.sh:250
dac1de7d
JX
9381#, sh-format
9382msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 9383msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 9384
07432cef 9385#: git-submodule.sh:343
c04f5ac3
JX
9386#, sh-format
9387msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9388msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9389
07432cef 9390#: git-submodule.sh:360
c04f5ac3 9391#, sh-format
170e9899
JX
9392msgid "'$sm_path' already exists in the index"
9393msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 9394
07432cef 9395#: git-submodule.sh:364
b694fbb1
JX
9396#, sh-format
9397msgid ""
9398"The following path is ignored by one of your .gitignore files:\n"
9399"$sm_path\n"
9400"Use -f if you really want to add it."
9401msgstr ""
9402"以下路径被您的一个 .gitignore 文件所忽略:\n"
9403"$sm_path\n"
9404"如果您确实想添加它,使用 -f 参数。"
9405
07432cef 9406#: git-submodule.sh:382
b694fbb1
JX
9407#, sh-format
9408msgid "Adding existing repo at '$sm_path' to the index"
9409msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9410
07432cef 9411#: git-submodule.sh:384
c04f5ac3 9412#, sh-format
170e9899
JX
9413msgid "'$sm_path' already exists and is not a valid git repo"
9414msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 9415
07432cef
WS
9416#: git-submodule.sh:392
9417#, sh-format
9418msgid "A git directory for '$sm_name' is found locally with remote(s):"
9419msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9420
9421#: git-submodule.sh:394
9422#, sh-format
9423msgid ""
9424"If you want to reuse this local git directory instead of cloning again from"
9425msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9426
9427#: git-submodule.sh:396
9428#, sh-format
9429msgid ""
9430"use the '--force' option. If the local git directory is not the correct repo"
9431msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9432
9433#: git-submodule.sh:397
9434#, sh-format
9435msgid ""
9436"or you are unsure what this means choose another name with the '--name' "
9437"option."
9438msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9439
9440#: git-submodule.sh:399
9441#, sh-format
9442msgid "Reactivating local git directory for submodule '$sm_name'."
9443msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9444
9445#: git-submodule.sh:411
c04f5ac3 9446#, sh-format
170e9899
JX
9447msgid "Unable to checkout submodule '$sm_path'"
9448msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 9449
07432cef 9450#: git-submodule.sh:416
c04f5ac3 9451#, sh-format
170e9899
JX
9452msgid "Failed to add submodule '$sm_path'"
9453msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 9454
07432cef 9455#: git-submodule.sh:425
c04f5ac3 9456#, sh-format
170e9899
JX
9457msgid "Failed to register submodule '$sm_path'"
9458msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 9459
07432cef 9460#: git-submodule.sh:468
c04f5ac3 9461#, sh-format
170e9899
JX
9462msgid "Entering '$prefix$sm_path'"
9463msgstr "正在进入 '$prefix$sm_path'"
c04f5ac3 9464
07432cef 9465#: git-submodule.sh:482
c04f5ac3 9466#, sh-format
170e9899
JX
9467msgid "Stopping at '$sm_path'; script returned non-zero status."
9468msgstr "停止于 '$sm_path',脚本返回非零值。"
c04f5ac3 9469
07432cef 9470#: git-submodule.sh:526
c04f5ac3 9471#, sh-format
170e9899
JX
9472msgid "No url found for submodule path '$sm_path' in .gitmodules"
9473msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
c04f5ac3 9474
07432cef 9475#: git-submodule.sh:535
c04f5ac3 9476#, sh-format
170e9899
JX
9477msgid "Failed to register url for submodule path '$sm_path'"
9478msgstr "无法为子模组路径 '$sm_path' 注册 url"
c04f5ac3 9479
07432cef 9480#: git-submodule.sh:537
c04f5ac3 9481#, sh-format
170e9899
JX
9482msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9483msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
c04f5ac3 9484
07432cef 9485#: git-submodule.sh:545
d691f479
JX
9486#, sh-format
9487msgid "Failed to register update mode for submodule path '$sm_path'"
9488msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9489
07432cef 9490#: git-submodule.sh:649
c04f5ac3
JX
9491#, sh-format
9492msgid ""
170e9899 9493"Submodule path '$sm_path' not initialized\n"
c04f5ac3
JX
9494"Maybe you want to use 'update --init'?"
9495msgstr ""
170e9899 9496"子模组路径 '$sm_path' 没有初始化\n"
90e6ef53 9497"也许您想用 'update --init'?"
c04f5ac3 9498
07432cef 9499#: git-submodule.sh:662
c04f5ac3 9500#, sh-format
170e9899
JX
9501msgid "Unable to find current revision in submodule path '$sm_path'"
9502msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
c04f5ac3 9503
07432cef 9504#: git-submodule.sh:671 git-submodule.sh:695
c04f5ac3 9505#, sh-format
170e9899
JX
9506msgid "Unable to fetch in submodule path '$sm_path'"
9507msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 9508
07432cef 9509#: git-submodule.sh:709
c04f5ac3 9510#, sh-format
170e9899
JX
9511msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9512msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
c04f5ac3 9513
07432cef 9514#: git-submodule.sh:710
c04f5ac3 9515#, sh-format
170e9899
JX
9516msgid "Submodule path '$sm_path': rebased into '$sha1'"
9517msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
c04f5ac3 9518
07432cef 9519#: git-submodule.sh:715
c04f5ac3 9520#, sh-format
170e9899
JX
9521msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9522msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
c04f5ac3 9523
07432cef 9524#: git-submodule.sh:716
c04f5ac3 9525#, sh-format
170e9899
JX
9526msgid "Submodule path '$sm_path': merged in '$sha1'"
9527msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
c04f5ac3 9528
07432cef 9529#: git-submodule.sh:721
c04f5ac3 9530#, sh-format
170e9899
JX
9531msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9532msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
c04f5ac3 9533
07432cef 9534#: git-submodule.sh:722
c04f5ac3 9535#, sh-format
170e9899
JX
9536msgid "Submodule path '$sm_path': checked out '$sha1'"
9537msgstr "子模组路径 '$sm_path':检出 '$sha1'"
c04f5ac3 9538
07432cef 9539#: git-submodule.sh:744 git-submodule.sh:1066
c04f5ac3 9540#, sh-format
170e9899
JX
9541msgid "Failed to recurse into submodule path '$sm_path'"
9542msgstr "无法递归进子模组路径 '$sm_path'"
c04f5ac3 9543
07432cef 9544#: git-submodule.sh:852
649900bc
JX
9545msgid "The --cached option cannot be used with the --files option"
9546msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1
JX
9547
9548#. unexpected type
07432cef 9549#: git-submodule.sh:892
b694fbb1
JX
9550#, sh-format
9551msgid "unexpected mode $mod_dst"
9552msgstr "意外的模式 $mod_dst"
c04f5ac3 9553
90e6ef53 9554# 译者:注意保持前导空格
07432cef 9555#: git-submodule.sh:910
c04f5ac3
JX
9556#, sh-format
9557msgid " Warn: $name doesn't contain commit $sha1_src"
9558msgstr " 警告:$name 未包含提交 $sha1_src"
9559
90e6ef53 9560# 译者:注意保持前导空格
07432cef 9561#: git-submodule.sh:913
c04f5ac3
JX
9562#, sh-format
9563msgid " Warn: $name doesn't contain commit $sha1_dst"
9564msgstr " 警告:$name 未包含提交 $sha1_dst"
9565
90e6ef53 9566# 译者:注意保持前导空格
07432cef 9567#: git-submodule.sh:916
c04f5ac3
JX
9568#, sh-format
9569msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9570msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9571
07432cef 9572#: git-submodule.sh:941
c04f5ac3 9573msgid "blob"
07432cef 9574msgstr "数据对象"
c04f5ac3 9575
07432cef 9576#: git-submodule.sh:979
a77c07d9
JX
9577msgid "Submodules changed but not updated:"
9578msgstr "子模组已修改但尚未更新:"
b694fbb1 9579
07432cef 9580#: git-submodule.sh:981
a77c07d9 9581msgid "Submodule changes to be committed:"
b694fbb1
JX
9582msgstr "要提交的子模组变更:"
9583
07432cef 9584#: git-submodule.sh:1129
c04f5ac3 9585#, sh-format
07432cef
WS
9586msgid "Synchronizing submodule url for '$prefix$sm_path'"
9587msgstr "为 '$prefix$sm_path' 同步子模组 url"
9588
a77c07d9
JX
9589#~ msgid "can't fdopen 'show' output fd"
9590#~ msgstr "不能打开 'show' 输出文件句柄"
9591
9592#~ msgid "failed to close pipe to 'show' for object '%s'"
9593#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9594
07432cef
WS
9595#~ msgid " 0 files changed"
9596#~ msgstr " 0 个文件被修改"
9597
9598#~ msgid " %d file changed"
9599#~ msgid_plural " %d files changed"
9600#~ msgstr[0] " %d 个文件被修改"
9601#~ msgstr[1] " %d 个文件被修改"
9602
9603#~ msgid ", %d insertion(+)"
9604#~ msgid_plural ", %d insertions(+)"
9605#~ msgstr[0] ",插入 %d 行(+)"
9606#~ msgstr[1] ",插入 %d 行(+)"
9607
9608#~ msgid ", %d deletion(-)"
9609#~ msgid_plural ", %d deletions(-)"
9610#~ msgstr[0] ",删除 %d 行(-)"
9611#~ msgstr[1] ",删除 %d 行(-)"
9612
9613#~ msgid "You do not have a valid HEAD"
9614#~ msgstr "您没有一个有效的 HEAD"
9615
9616#~ msgid "oops"
9617#~ msgstr "哎哟"
9618
9619#~ msgid "Would not remove %s\n"
9620#~ msgstr "不会删除 %s\n"
9621
9622#~ msgid "Not removing %s\n"
9623#~ msgstr "未删除 %s\n"
9624
9625#~ msgid "Auto packing the repository for optimum performance.\n"
9626#~ msgstr "自动打包版本库以求最佳性能。\n"
9627
9628#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9629#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9630
9631#~ msgid "Could not read index"
9632#~ msgstr "不能读取索引"
c160d03f 9633
ef317cd5
JX
9634# 译者:中文字符串拼接,可删除前导空格
9635#~ msgid " (use \"git add\" to track)"
9636#~ msgstr "(使用 \"git add\" 建立跟踪)"
9637
9638#~ msgid "-B cannot be used with -b"
9639#~ msgstr "-B 不能和 -b 同时使用"
9640
9641#~ msgid "--patch is incompatible with all other options"
9642#~ msgstr "--patch 选项和其他选项不兼容"
9643
9644#~ msgid "--detach cannot be used with -b/-B/--orphan"
9645#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9646
9647#~ msgid "--detach cannot be used with -t"
9648#~ msgstr "--detach 不能和 -t 同时使用"
9649
9650#~ msgid "--orphan and -b|-B are mutually exclusive"
9651#~ msgstr "--orphan 和 -b|-B 互斥"
9652
9653#~ msgid "--orphan cannot be used with -t"
9654#~ msgstr "--orphan 不能和 -t 同时使用"
9655
9656#~ msgid "git checkout: -f and -m are incompatible"
9657#~ msgstr "git checkout:-f 和 -m 不兼容"
9658
9659#~ msgid ""
9660#~ "git checkout: updating paths is incompatible with switching branches."
9661#~ msgstr "git checkout:更新路径和切换分支不兼容。"
9662
c160d03f
JX
9663#~ msgid "diff setup failed"
9664#~ msgstr "diff 设置失败"
9665
9666#~ msgid "merge-recursive: disk full?"
9667#~ msgstr "merge-recursive:磁盘已满?"
9668
9669#~ msgid "diff_setup_done failed"
9670#~ msgstr "diff_setup_done 失败"