]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: git.pot: v1.8.2 round 3 (5 new)
[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"
a77c07d9
JX
15"POT-Creation-Date: 2013-02-14 14:46+0800\n"
16"PO-Revision-Date: 2013-02-14 17:43+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 ""
133"Negative patterns are forbidden in git attributes\n"
134"Use '\\!' for literal leading exclamation."
ef317cd5 135msgstr ""
07432cef
WS
136"在 git attributes 中不允许使用负值模版\n"
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# 译者:注意保持前导空格
07432cef 313#: diff.c:111
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# 译者:注意保持前导空格
07432cef 319#: diff.c:116
c04f5ac3 320#, c-format
07432cef
WS
321msgid " Unknown dirstat parameter '%s'\n"
322msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 323
07432cef
WS
324#: diff.c:194
325#, c-format
326msgid "Unknown value for 'diff.submodule' config variable: '%s'"
327msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
328
329#: diff.c:237
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
07432cef 338#: diff.c:3494
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
07432cef
WS
347#: diff.c:3508
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
07432cef 711#: parse-options.c:485
8ada9598 712msgid "..."
81809b99 713msgstr "..."
8ada9598 714
07432cef 715#: parse-options.c:503
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
07432cef 722#: parse-options.c:507
81809b99 723#, c-format
8ada9598 724msgid " or: %s"
81809b99 725msgstr " 或:%s"
8ada9598
JX
726
727# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 728#: parse-options.c:510
81809b99 729#, c-format
8ada9598 730msgid " %s"
81809b99 731msgstr " %s"
8ada9598 732
a77c07d9
JX
733#: pathspec.c:83
734#, c-format
735msgid "Path '%s' is in submodule '%.*s'"
736msgstr "路径 '%s' 属于模组 '%.*s'"
737
738#: pathspec.c:99
739#, c-format
740msgid "'%s' is beyond a symbolic link"
741msgstr "'%s' 位于符号链接中"
742
743#: remote.c:1653
c04f5ac3
JX
744#, c-format
745msgid "Your branch is ahead of '%s' by %d commit.\n"
746msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
747msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 748msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 749
a77c07d9 750#: remote.c:1659
07432cef
WS
751msgid " (use \"git push\" to publish your local commits)\n"
752msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
753
a77c07d9 754#: remote.c:1662
c04f5ac3
JX
755#, c-format
756msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
757msgid_plural ""
758"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 759msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 760msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 761
07432cef 762# 译者:注意保持前导空格
a77c07d9 763#: remote.c:1670
07432cef
WS
764msgid " (use \"git pull\" to update your local branch)\n"
765msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
766
a77c07d9 767#: remote.c:1673
c04f5ac3
JX
768#, c-format
769msgid ""
770"Your branch and '%s' have diverged,\n"
771"and have %d and %d different commit each, respectively.\n"
772msgid_plural ""
773"Your branch and '%s' have diverged,\n"
774"and have %d and %d different commits each, respectively.\n"
775msgstr[0] ""
776"您的分支和 '%s' 出现了偏离,\n"
195febda 777"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
778msgstr[1] ""
779"您的分支和 '%s' 出现了偏离,\n"
195febda 780"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 781
07432cef 782# 译者:注意保持前导空格
a77c07d9 783#: remote.c:1683
07432cef
WS
784msgid " (use \"git pull\" to merge the remote branch into yours)\n"
785msgstr " (使用 \"git pull\" 来合并远程分支)\n"
786
a77c07d9
JX
787#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
788#: builtin/merge.c:994
c04f5ac3
JX
789#, c-format
790msgid "Could not open '%s' for writing"
90e6ef53 791msgstr "不能为写入打开 '%s'"
c04f5ac3 792
a77c07d9
JX
793#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
794#: builtin/merge.c:999
c04f5ac3
JX
795#, c-format
796msgid "Could not write to '%s'"
90e6ef53 797msgstr "不能写入 '%s'"
c04f5ac3 798
07432cef 799#: sequencer.c:146
14c8bced
JX
800msgid ""
801"after resolving the conflicts, mark the corrected paths\n"
802"with 'git add <paths>' or 'git rm <paths>'"
803msgstr ""
804"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
805"命令标记修正后的文件"
806
07432cef 807#: sequencer.c:149
c04f5ac3
JX
808msgid ""
809"after resolving the conflicts, mark the corrected paths\n"
810"with 'git add <paths>' or 'git rm <paths>'\n"
811"and commit the result with 'git commit'"
812msgstr ""
813"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
814"对修正后的文件做标记,然后用 'git commit' 提交"
815
07432cef 816#: sequencer.c:162 sequencer.c:774 sequencer.c:857
c04f5ac3
JX
817#, c-format
818msgid "Could not write to %s"
819msgstr "不能写入 %s"
820
07432cef 821#: sequencer.c:165
c04f5ac3
JX
822#, c-format
823msgid "Error wrapping up %s"
824msgstr "错误收尾 %s"
825
07432cef 826#: sequencer.c:180
c04f5ac3
JX
827msgid "Your local changes would be overwritten by cherry-pick."
828msgstr "您的本地修改将被拣选操作覆盖。"
829
07432cef 830#: sequencer.c:182
c04f5ac3
JX
831msgid "Your local changes would be overwritten by revert."
832msgstr "您的本地修改将被还原操作覆盖。"
833
07432cef 834#: sequencer.c:185
c04f5ac3
JX
835msgid "Commit your changes or stash them to proceed."
836msgstr "提交您的修改或保存进度后再继续。"
837
838#. TRANSLATORS: %s will be "revert" or "cherry-pick"
07432cef 839#: sequencer.c:236
c04f5ac3
JX
840#, c-format
841msgid "%s: Unable to write new index file"
90e6ef53 842msgstr "%s:无法写入新索引文件"
c04f5ac3 843
07432cef 844#: sequencer.c:267
8ada9598 845msgid "Could not resolve HEAD commit\n"
81809b99 846msgstr "不能解析 HEAD 提交\n"
8ada9598 847
07432cef 848#: sequencer.c:288
8ada9598 849msgid "Unable to update cache tree\n"
81809b99 850msgstr "不能更新缓存\n"
8ada9598 851
07432cef 852#: sequencer.c:333
81809b99 853#, c-format
8ada9598 854msgid "Could not parse commit %s\n"
81809b99 855msgstr "不能解析提交 %s\n"
8ada9598 856
07432cef 857#: sequencer.c:338
81809b99 858#, c-format
8ada9598 859msgid "Could not parse parent commit %s\n"
81809b99 860msgstr "不能解析父提交 %s\n"
8ada9598 861
07432cef 862#: sequencer.c:404
c04f5ac3 863msgid "Your index file is unmerged."
90e6ef53 864msgstr "您的索引文件未完成合并。"
c04f5ac3 865
07432cef 866#: sequencer.c:423
c04f5ac3
JX
867#, c-format
868msgid "Commit %s is a merge but no -m option was given."
869msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
870
07432cef 871#: sequencer.c:431
c04f5ac3
JX
872#, c-format
873msgid "Commit %s does not have parent %d"
874msgstr "提交 %s 没有父提交 %d"
875
07432cef 876#: sequencer.c:435
c04f5ac3
JX
877#, c-format
878msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 879msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
880
881#. TRANSLATORS: The first %s will be "revert" or
882#. "cherry-pick", the second %s a SHA1
07432cef 883#: sequencer.c:448
c04f5ac3
JX
884#, c-format
885msgid "%s: cannot parse parent commit %s"
886msgstr "%s:不能解析父提交 %s"
887
07432cef 888#: sequencer.c:452
c04f5ac3
JX
889#, c-format
890msgid "Cannot get commit message for %s"
891msgstr "不能得到 %s 的提交说明"
892
07432cef 893#: sequencer.c:536
c04f5ac3
JX
894#, c-format
895msgid "could not revert %s... %s"
896msgstr "不能还原 %s... %s"
897
07432cef 898#: sequencer.c:537
c04f5ac3
JX
899#, c-format
900msgid "could not apply %s... %s"
901msgstr "不能应用 %s... %s"
902
07432cef 903#: sequencer.c:569
c04f5ac3
JX
904msgid "empty commit set passed"
905msgstr "提供了空的提交集"
906
07432cef 907#: sequencer.c:577
c04f5ac3
JX
908#, c-format
909msgid "git %s: failed to read the index"
90e6ef53 910msgstr "git %s:无法读取索引"
c04f5ac3 911
07432cef 912#: sequencer.c:582
c04f5ac3
JX
913#, c-format
914msgid "git %s: failed to refresh the index"
90e6ef53 915msgstr "git %s:无法刷新索引"
c04f5ac3 916
07432cef 917#: sequencer.c:640
c04f5ac3
JX
918#, c-format
919msgid "Cannot %s during a %s"
90e6ef53 920msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 921
07432cef 922#: sequencer.c:662
c04f5ac3
JX
923#, c-format
924msgid "Could not parse line %d."
90e6ef53 925msgstr "不能解析第 %d 行。"
c04f5ac3 926
07432cef 927#: sequencer.c:667
c04f5ac3 928msgid "No commits parsed."
7e238ab7 929msgstr "没有提交被解析。"
c04f5ac3 930
07432cef 931#: sequencer.c:680
c04f5ac3
JX
932#, c-format
933msgid "Could not open %s"
934msgstr "不能打开 %s"
935
07432cef 936#: sequencer.c:684
c04f5ac3
JX
937#, c-format
938msgid "Could not read %s."
939msgstr "不能读取 %s。"
940
07432cef 941#: sequencer.c:691
c04f5ac3
JX
942#, c-format
943msgid "Unusable instruction sheet: %s"
944msgstr "无用的指令表单:%s"
945
07432cef 946#: sequencer.c:719
c04f5ac3
JX
947#, c-format
948msgid "Invalid key: %s"
949msgstr "无效键名:%s"
950
07432cef 951#: sequencer.c:722
c04f5ac3
JX
952#, c-format
953msgid "Invalid value for %s: %s"
81809b99 954msgstr "%s 的值无效:%s"
c04f5ac3 955
07432cef 956#: sequencer.c:734
c04f5ac3
JX
957#, c-format
958msgid "Malformed options sheet: %s"
959msgstr "非法的选项表单:%s"
960
07432cef 961#: sequencer.c:755
c04f5ac3
JX
962msgid "a cherry-pick or revert is already in progress"
963msgstr "一个拣选或还原操作已在进行"
964
07432cef 965#: sequencer.c:756
c04f5ac3
JX
966msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
967msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
968
07432cef 969#: sequencer.c:760
c04f5ac3
JX
970#, c-format
971msgid "Could not create sequencer directory %s"
90e6ef53 972msgstr "不能创建序列目录 %s"
c04f5ac3 973
07432cef 974#: sequencer.c:776 sequencer.c:861
c04f5ac3
JX
975#, c-format
976msgid "Error wrapping up %s."
977msgstr "错误收尾 %s。"
978
07432cef 979#: sequencer.c:795 sequencer.c:929
c04f5ac3 980msgid "no cherry-pick or revert in progress"
195febda 981msgstr "拣选或还原操作并未进行"
c04f5ac3 982
07432cef 983#: sequencer.c:797
c04f5ac3
JX
984msgid "cannot resolve HEAD"
985msgstr "不能解析 HEAD"
986
07432cef 987#: sequencer.c:799
c04f5ac3 988msgid "cannot abort from a branch yet to be born"
90e6ef53 989msgstr "不能从尚未建立的分支终止"
c04f5ac3 990
a77c07d9 991#: sequencer.c:821 builtin/apply.c:4020
c04f5ac3
JX
992#, c-format
993msgid "cannot open %s: %s"
994msgstr "不能打开 %s:%s"
995
07432cef 996#: sequencer.c:824
c04f5ac3
JX
997#, c-format
998msgid "cannot read %s: %s"
999msgstr "不能读取 %s:%s"
1000
07432cef 1001#: sequencer.c:825
c04f5ac3 1002msgid "unexpected end of file"
9aafc933 1003msgstr "意外的文件结束"
c04f5ac3 1004
07432cef 1005#: sequencer.c:831
c04f5ac3
JX
1006#, c-format
1007msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1008msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1009
07432cef 1010#: sequencer.c:854
c04f5ac3
JX
1011#, c-format
1012msgid "Could not format %s."
1013msgstr "不能格式化 %s。"
1014
07432cef 1015#: sequencer.c:1016
c04f5ac3
JX
1016msgid "Can't revert as initial commit"
1017msgstr "不能作为初始提交还原"
1018
07432cef 1019#: sequencer.c:1017
c04f5ac3
JX
1020msgid "Can't cherry-pick into empty head"
1021msgstr "不能拣选到空分支"
1022
23ff3338 1023#: sha1_name.c:1044
170e9899
JX
1024msgid "HEAD does not point to a branch"
1025msgstr "HEAD 没有指向一个分支"
1026
23ff3338 1027#: sha1_name.c:1047
170e9899
JX
1028#, c-format
1029msgid "No such branch: '%s'"
1030msgstr "没有此分支:'%s'"
1031
23ff3338 1032#: sha1_name.c:1049
170e9899
JX
1033#, c-format
1034msgid "No upstream configured for branch '%s'"
1035msgstr "尚未给分支 '%s' 设置上游"
1036
23ff3338 1037#: sha1_name.c:1052
170e9899
JX
1038#, c-format
1039msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1040msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1041
ef317cd5 1042#: wrapper.c:408
07432cef 1043#, c-format
ef317cd5 1044msgid "unable to access '%s': %s"
07432cef
WS
1045msgstr "不能访问 '%s':%s"
1046
1047#: wrapper.c:423
1048#, c-format
1049msgid "unable to access '%s'"
1050msgstr "不能访问 '%s'"
ef317cd5 1051
07432cef 1052#: wrapper.c:434
d691f479
JX
1053#, c-format
1054msgid "unable to look up current user in the passwd file: %s"
07432cef 1055msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1056
07432cef 1057#: wrapper.c:435
d691f479
JX
1058msgid "no such user"
1059msgstr "无此用户"
1060
23ff3338 1061#: wt-status.c:140
c04f5ac3
JX
1062msgid "Unmerged paths:"
1063msgstr "未合并的路径:"
1064
90e6ef53 1065# 译者:注意保持前导空格
23ff3338 1066#: wt-status.c:167 wt-status.c:194
c04f5ac3
JX
1067#, c-format
1068msgid " (use \"git reset %s <file>...\" to unstage)"
1069msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1070
90e6ef53 1071# 译者:注意保持前导空格
23ff3338 1072#: wt-status.c:169 wt-status.c:196
c04f5ac3
JX
1073msgid " (use \"git rm --cached <file>...\" to unstage)"
1074msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1075
90e6ef53 1076# 译者:注意保持前导空格
23ff3338 1077#: wt-status.c:173
6792b93b
JX
1078msgid " (use \"git add <file>...\" to mark resolution)"
1079msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1080
1081# 译者:注意保持前导空格
23ff3338 1082#: wt-status.c:175 wt-status.c:179
c04f5ac3
JX
1083msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1084msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1085
6792b93b 1086# 译者:注意保持前导空格
23ff3338 1087#: wt-status.c:177
6792b93b
JX
1088msgid " (use \"git rm <file>...\" to mark resolution)"
1089msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1090
23ff3338 1091#: wt-status.c:188
c04f5ac3
JX
1092msgid "Changes to be committed:"
1093msgstr "要提交的变更:"
1094
23ff3338 1095#: wt-status.c:206
c04f5ac3 1096msgid "Changes not staged for commit:"
7e238ab7 1097msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1098
90e6ef53 1099# 译者:注意保持前导空格
23ff3338 1100#: wt-status.c:210
c04f5ac3
JX
1101msgid " (use \"git add <file>...\" to update what will be committed)"
1102msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1103
90e6ef53 1104# 译者:注意保持前导空格
23ff3338 1105#: wt-status.c:212
c04f5ac3
JX
1106msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1107msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1108
90e6ef53 1109# 译者:注意保持前导空格
23ff3338 1110#: wt-status.c:213
c04f5ac3
JX
1111msgid ""
1112" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1113msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1114
90e6ef53 1115# 译者:注意保持前导空格
23ff3338 1116#: wt-status.c:215
c04f5ac3
JX
1117msgid " (commit or discard the untracked or modified content in submodules)"
1118msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1119
90e6ef53 1120# 译者:注意保持前导空格
23ff3338 1121#: wt-status.c:227
c04f5ac3
JX
1122#, c-format
1123msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1124msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1125
23ff3338 1126#: wt-status.c:244
c04f5ac3
JX
1127msgid "bug"
1128msgstr "bug"
1129
23ff3338 1130#: wt-status.c:249
c04f5ac3
JX
1131msgid "both deleted:"
1132msgstr "双方删除:"
1133
23ff3338 1134#: wt-status.c:250
c04f5ac3
JX
1135msgid "added by us:"
1136msgstr "由我们添加:"
1137
23ff3338 1138#: wt-status.c:251
c04f5ac3
JX
1139msgid "deleted by them:"
1140msgstr "由他们删除:"
1141
23ff3338 1142#: wt-status.c:252
c04f5ac3
JX
1143msgid "added by them:"
1144msgstr "由他们添加:"
1145
23ff3338 1146#: wt-status.c:253
c04f5ac3
JX
1147msgid "deleted by us:"
1148msgstr "由我们删除:"
1149
23ff3338 1150#: wt-status.c:254
c04f5ac3
JX
1151msgid "both added:"
1152msgstr "双方添加:"
1153
23ff3338 1154#: wt-status.c:255
c04f5ac3
JX
1155msgid "both modified:"
1156msgstr "双方修改:"
1157
90e6ef53 1158# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1159#: wt-status.c:285
c04f5ac3 1160msgid "new commits, "
aa9565f7 1161msgstr "新提交, "
c04f5ac3 1162
90e6ef53 1163# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1164#: wt-status.c:287
c04f5ac3 1165msgid "modified content, "
aa9565f7 1166msgstr "修改的内容, "
c04f5ac3 1167
90e6ef53 1168# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1169#: wt-status.c:289
c04f5ac3 1170msgid "untracked content, "
aa9565f7 1171msgstr "未跟踪的内容, "
c04f5ac3 1172
90e6ef53 1173# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1174#: wt-status.c:303
c04f5ac3
JX
1175#, c-format
1176msgid "new file: %s"
1177msgstr "新文件: %s"
1178
90e6ef53 1179# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1180#: wt-status.c:306
c04f5ac3
JX
1181#, c-format
1182msgid "copied: %s -> %s"
1183msgstr "拷贝: %s -> %s"
1184
90e6ef53 1185# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1186#: wt-status.c:309
c04f5ac3
JX
1187#, c-format
1188msgid "deleted: %s"
1189msgstr "删除: %s"
1190
90e6ef53 1191# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1192#: wt-status.c:312
c04f5ac3
JX
1193#, c-format
1194msgid "modified: %s"
1195msgstr "修改: %s"
1196
90e6ef53 1197# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1198#: wt-status.c:315
c04f5ac3
JX
1199#, c-format
1200msgid "renamed: %s -> %s"
1201msgstr "重命名: %s -> %s"
1202
90e6ef53 1203# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1204#: wt-status.c:318
c04f5ac3
JX
1205#, c-format
1206msgid "typechange: %s"
1207msgstr "类型变更: %s"
1208
90e6ef53 1209# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1210#: wt-status.c:321
c04f5ac3
JX
1211#, c-format
1212msgid "unknown: %s"
1213msgstr "未知: %s"
1214
90e6ef53 1215# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1216#: wt-status.c:324
c04f5ac3
JX
1217#, c-format
1218msgid "unmerged: %s"
1219msgstr "未合并: %s"
1220
23ff3338 1221#: wt-status.c:327
c04f5ac3
JX
1222#, c-format
1223msgid "bug: unhandled diff status %c"
90e6ef53 1224msgstr "bug:未处理的差异状态 %c"
c04f5ac3 1225
a77c07d9 1226#: wt-status.c:789
6792b93b 1227msgid "You have unmerged paths."
195febda 1228msgstr "您有尚未合并的路径。"
6792b93b
JX
1229
1230# 译者:注意保持前导空格
a77c07d9 1231#: wt-status.c:792 wt-status.c:916
6792b93b
JX
1232msgid " (fix conflicts and run \"git commit\")"
1233msgstr " (解决冲突并运行 \"git commit\")"
1234
a77c07d9 1235#: wt-status.c:795
6792b93b
JX
1236msgid "All conflicts fixed but you are still merging."
1237msgstr "所有冲突已解决但您仍处于合并中。"
1238
1239# 译者:注意保持前导空格
a77c07d9 1240#: wt-status.c:798
6792b93b
JX
1241msgid " (use \"git commit\" to conclude merge)"
1242msgstr " (使用 \"git commit\" 结束合并)"
1243
a77c07d9 1244#: wt-status.c:808
6792b93b
JX
1245msgid "You are in the middle of an am session."
1246msgstr "您正处于一个 am 过程中。"
1247
a77c07d9 1248#: wt-status.c:811
6792b93b
JX
1249msgid "The current patch is empty."
1250msgstr "当前的补丁为空。"
1251
1252# 译者:注意保持前导空格
a77c07d9 1253#: wt-status.c:815
6792b93b
JX
1254msgid " (fix conflicts and then run \"git am --resolved\")"
1255msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1256
1257# 译者:注意保持前导空格
a77c07d9 1258#: wt-status.c:817
6792b93b
JX
1259msgid " (use \"git am --skip\" to skip this patch)"
1260msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1261
1262# 译者:注意保持前导空格
a77c07d9 1263#: wt-status.c:819
6792b93b
JX
1264msgid " (use \"git am --abort\" to restore the original branch)"
1265msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1266
a77c07d9 1267#: wt-status.c:877 wt-status.c:887
6792b93b
JX
1268msgid "You are currently rebasing."
1269msgstr "您正在变基。"
1270
1271# 译者:注意保持前导空格
a77c07d9 1272#: wt-status.c:880
6792b93b
JX
1273msgid " (fix conflicts and then run \"git rebase --continue\")"
1274msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1275
1276# 译者:注意保持前导空格
a77c07d9 1277#: wt-status.c:882
6792b93b
JX
1278msgid " (use \"git rebase --skip\" to skip this patch)"
1279msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1280
1281# 译者:注意保持前导空格
a77c07d9 1282#: wt-status.c:884
6792b93b
JX
1283msgid " (use \"git rebase --abort\" to check out the original branch)"
1284msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1285
1286# 译者:注意保持前导空格
a77c07d9 1287#: wt-status.c:890
6792b93b
JX
1288msgid " (all conflicts fixed: run \"git rebase --continue\")"
1289msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1290
a77c07d9 1291#: wt-status.c:892
6792b93b
JX
1292msgid "You are currently splitting a commit during a rebase."
1293msgstr "您正在变基过程中拆分一个提交。"
1294
1295# 译者:注意保持前导空格
a77c07d9 1296#: wt-status.c:895
6792b93b
JX
1297msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1298msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1299
a77c07d9 1300#: wt-status.c:897
6792b93b
JX
1301msgid "You are currently editing a commit during a rebase."
1302msgstr "您正在变基过程中编辑一个提交。"
1303
1304# 译者:注意保持前导空格
a77c07d9 1305#: wt-status.c:900
6792b93b
JX
1306msgid " (use \"git commit --amend\" to amend the current commit)"
1307msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1308
1309# 译者:注意保持前导空格
a77c07d9 1310#: wt-status.c:902
6792b93b
JX
1311msgid ""
1312" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1313msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1314
a77c07d9 1315#: wt-status.c:912
6792b93b
JX
1316msgid "You are currently cherry-picking."
1317msgstr "您正在做拣选操作。"
1318
1319# 译者:注意保持前导空格
a77c07d9 1320#: wt-status.c:919
6792b93b
JX
1321msgid " (all conflicts fixed: run \"git commit\")"
1322msgstr " (解决所有冲突后,执行 \"git commit\")"
1323
a77c07d9 1324#: wt-status.c:928
6792b93b
JX
1325msgid "You are currently bisecting."
1326msgstr "您正在做二分查找。"
1327
1328# 译者:注意保持前导空格
a77c07d9 1329#: wt-status.c:931
6792b93b
JX
1330msgid " (use \"git bisect reset\" to get back to the original branch)"
1331msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1332
a77c07d9 1333#: wt-status.c:982
c04f5ac3
JX
1334msgid "On branch "
1335msgstr "位于分支 "
1336
a77c07d9 1337#: wt-status.c:989
c04f5ac3
JX
1338msgid "Not currently on any branch."
1339msgstr "当前不在任何分支上。"
1340
a77c07d9 1341#: wt-status.c:1001
c04f5ac3
JX
1342msgid "Initial commit"
1343msgstr "初始提交"
1344
a77c07d9 1345#: wt-status.c:1015
ef317cd5 1346msgid "Untracked files"
07432cef 1347msgstr "未跟踪的文件"
c04f5ac3 1348
a77c07d9 1349#: wt-status.c:1017
ef317cd5 1350msgid "Ignored files"
07432cef 1351msgstr "忽略的文件"
c04f5ac3 1352
a77c07d9 1353#: wt-status.c:1019
c04f5ac3
JX
1354#, c-format
1355msgid "Untracked files not listed%s"
1356msgstr "未跟踪的文件没有列出%s"
1357
7e238ab7 1358# 译者:中文字符串拼接,可删除前导空格
a77c07d9 1359#: wt-status.c:1021
c04f5ac3 1360msgid " (use -u option to show untracked files)"
7e238ab7 1361msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1362
a77c07d9 1363#: wt-status.c:1027
c04f5ac3
JX
1364msgid "No changes"
1365msgstr "没有修改"
1366
7e238ab7 1367# 译者:中文字符串拼接,可删除前导空格
a77c07d9 1368#: wt-status.c:1032
07432cef 1369#, c-format
ef317cd5 1370msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1371msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1372
a77c07d9 1373#: wt-status.c:1035
07432cef 1374#, c-format
ef317cd5 1375msgid "no changes added to commit\n"
07432cef 1376msgstr "修改尚未加入提交\n"
c04f5ac3 1377
a77c07d9 1378#: wt-status.c:1038
07432cef 1379#, c-format
ef317cd5
JX
1380msgid ""
1381"nothing added to commit but untracked files present (use \"git add\" to "
1382"track)\n"
07432cef 1383msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1384
a77c07d9 1385#: wt-status.c:1041
07432cef 1386#, c-format
ef317cd5 1387msgid "nothing added to commit but untracked files present\n"
07432cef 1388msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1389
7e238ab7 1390# 译者:中文字符串拼接,可删除前导空格
a77c07d9 1391#: wt-status.c:1044
07432cef 1392#, c-format
ef317cd5 1393msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1394msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1395
a77c07d9 1396#: wt-status.c:1047 wt-status.c:1052
07432cef 1397#, c-format
ef317cd5 1398msgid "nothing to commit\n"
07432cef 1399msgstr "无文件要提交\n"
ef317cd5 1400
7e238ab7 1401# 译者:中文字符串拼接,可删除前导空格
a77c07d9 1402#: wt-status.c:1050
07432cef 1403#, c-format
ef317cd5 1404msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1405msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1406
7e238ab7 1407# 译者:中文字符串拼接,可删除前导空格
a77c07d9 1408#: wt-status.c:1054
07432cef 1409#, c-format
ef317cd5 1410msgid "nothing to commit, working directory clean\n"
07432cef 1411msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1412
a77c07d9 1413#: wt-status.c:1162
c04f5ac3 1414msgid "HEAD (no branch)"
61bc0753 1415msgstr "HEAD(非分支)"
c04f5ac3 1416
90e6ef53 1417# 译者:注意保持句尾空格
a77c07d9 1418#: wt-status.c:1168
c04f5ac3
JX
1419msgid "Initial commit on "
1420msgstr "初始提交于 "
1421
90e6ef53 1422# 译者:注意保持句尾空格
a77c07d9 1423#: wt-status.c:1183
c04f5ac3
JX
1424msgid "behind "
1425msgstr "落后 "
1426
90e6ef53 1427# 译者:注意保持句尾空格
a77c07d9 1428#: wt-status.c:1186 wt-status.c:1189
c04f5ac3
JX
1429msgid "ahead "
1430msgstr "领先 "
1431
90e6ef53 1432# 译者:注意保持句尾空格
a77c07d9 1433#: wt-status.c:1191
c04f5ac3
JX
1434msgid ", behind "
1435msgstr ",落后 "
1436
a77c07d9
JX
1437#: compat/precompose_utf8.c:58 builtin/clone.c:341
1438#, c-format
1439msgid "failed to unlink '%s'"
1440msgstr "无法删除 '%s'"
1441
1442#: builtin/add.c:20
1443msgid "git add [options] [--] <pathspec>..."
1444msgstr "git add [选项] [--] <路径匹配>..."
ef317cd5 1445
a77c07d9 1446#: builtin/add.c:63
c04f5ac3
JX
1447#, c-format
1448msgid "unexpected diff status %c"
1449msgstr "意外的差异状态 %c"
1450
a77c07d9 1451#: builtin/add.c:68 builtin/commit.c:231
c04f5ac3
JX
1452msgid "updating files failed"
1453msgstr "更新文件失败"
1454
a77c07d9 1455#: builtin/add.c:78
c04f5ac3
JX
1456#, c-format
1457msgid "remove '%s'\n"
1458msgstr "删除 '%s'\n"
1459
a77c07d9 1460#: builtin/add.c:148
c04f5ac3 1461msgid "Unstaged changes after refreshing the index:"
90e6ef53 1462msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1463
a77c07d9 1464#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
c04f5ac3
JX
1465#, c-format
1466msgid "pathspec '%s' did not match any files"
1467msgstr "路径 '%s' 未匹配任何文件"
1468
a77c07d9 1469#: builtin/add.c:234
c04f5ac3 1470msgid "Could not read the index"
90e6ef53 1471msgstr "不能读取索引"
c04f5ac3 1472
a77c07d9 1473#: builtin/add.c:244
c04f5ac3
JX
1474#, c-format
1475msgid "Could not open '%s' for writing."
195febda 1476msgstr "不能打开 '%s' 以写入。"
c04f5ac3 1477
a77c07d9 1478#: builtin/add.c:248
c04f5ac3 1479msgid "Could not write patch"
195febda 1480msgstr "不能生成补丁"
c04f5ac3 1481
a77c07d9 1482#: builtin/add.c:253
c04f5ac3
JX
1483#, c-format
1484msgid "Could not stat '%s'"
90e6ef53 1485msgstr "不能查看文件状态 '%s'"
c04f5ac3 1486
a77c07d9 1487#: builtin/add.c:255
c04f5ac3
JX
1488msgid "Empty patch. Aborted."
1489msgstr "空补丁。异常终止。"
1490
a77c07d9 1491#: builtin/add.c:261
8ada9598
JX
1492#, c-format
1493msgid "Could not apply '%s'"
1494msgstr "不能应用 '%s'"
1495
a77c07d9 1496#: builtin/add.c:271
8ada9598 1497msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 1498msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 1499
a77c07d9
JX
1500#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1501#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
07432cef 1502#: builtin/rm.c:206
ef317cd5 1503msgid "dry run"
07432cef 1504msgstr "演习"
ef317cd5 1505
a77c07d9
JX
1506#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19
1507#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
1508#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
ef317cd5
JX
1509msgid "be verbose"
1510msgstr "冗长输出"
1511
a77c07d9 1512#: builtin/add.c:280
ef317cd5 1513msgid "interactive picking"
07432cef 1514msgstr "交互式拣选"
ef317cd5 1515
a77c07d9 1516#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
ef317cd5 1517msgid "select hunks interactively"
07432cef 1518msgstr "交互式挑选数据块"
ef317cd5 1519
a77c07d9 1520#: builtin/add.c:282
ef317cd5 1521msgid "edit current diff and apply"
07432cef 1522msgstr "编辑当前差异并应用"
ef317cd5 1523
a77c07d9 1524#: builtin/add.c:283
ef317cd5 1525msgid "allow adding otherwise ignored files"
07432cef 1526msgstr "允许添加忽略的文件"
ef317cd5 1527
a77c07d9 1528#: builtin/add.c:284
ef317cd5 1529msgid "update tracked files"
07432cef 1530msgstr "更新已跟踪的文件"
ef317cd5 1531
a77c07d9 1532#: builtin/add.c:285
ef317cd5 1533msgid "record only the fact that the path will be added later"
07432cef 1534msgstr "只记录,该路径稍后再添加"
ef317cd5 1535
a77c07d9 1536#: builtin/add.c:286
ef317cd5 1537msgid "add changes from all tracked and untracked files"
07432cef 1538msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 1539
a77c07d9 1540#: builtin/add.c:287
ef317cd5 1541msgid "don't add, only refresh the index"
07432cef 1542msgstr "不添加,只刷新索引"
ef317cd5 1543
a77c07d9 1544#: builtin/add.c:288
ef317cd5 1545msgid "just skip files which cannot be added because of errors"
07432cef 1546msgstr "跳过因出错不能添加的文件"
ef317cd5 1547
a77c07d9 1548#: builtin/add.c:289
ef317cd5 1549msgid "check if - even missing - files are ignored in dry run"
07432cef 1550msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 1551
a77c07d9 1552#: builtin/add.c:311
8ada9598
JX
1553#, c-format
1554msgid "Use -f if you really want to add them.\n"
1555msgstr "使用 -f 参数如果您确实要添加它们。\n"
1556
a77c07d9 1557#: builtin/add.c:312
8ada9598
JX
1558msgid "no files added"
1559msgstr "没有文件被添加"
1560
a77c07d9 1561#: builtin/add.c:318
8ada9598
JX
1562msgid "adding files failed"
1563msgstr "添加文件失败"
1564
a77c07d9
JX
1565# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1566#.
1567#. * To be consistent with "git add -p" and most Git
1568#. * commands, we should default to being tree-wide, but
1569#. * this is not the original behavior and can't be
1570#. * changed until users trained themselves not to type
1571#. * "git add -u" or "git add -A". For now, we warn and
1572#. * keep the old behavior. Later, this warning can be
1573#. * turned into a die(...), and eventually we may
1574#. * reallow the command with a new behavior.
1575#.
1576#: builtin/add.c:335
1577#, c-format
1578msgid ""
1579"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1580"subdirectory of the tree will change in Git 2.0 and should not be used "
1581"anymore.\n"
1582"To add content for the whole tree, run:\n"
1583"\n"
1584" git add %s :/\n"
1585" (or git add %s :/)\n"
1586"\n"
1587"To restrict the command to the current directory, run:\n"
1588"\n"
1589" git add %s .\n"
1590" (or git add %s .)\n"
1591"\n"
1592"With the current Git version, the command is restricted to the current "
1593"directory."
1594msgstr ""
1595"在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1596"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1597"如果要添加整个目录树的内容,执行:\n"
1598"\n"
1599" git add %s :/\n"
1600" (或 git add %s :/)\n"
1601"\n"
1602"如果要限制该命令只作用于当前目录,执行:\n"
1603"\n"
1604" git add %s .\n"
1605" (或 git add %s .)\n"
1606"\n"
1607"对于当前版本的 Git,这条命令只作用于当前目录。"
1608
1609#: builtin/add.c:381
8ada9598
JX
1610msgid "-A and -u are mutually incompatible"
1611msgstr "-A 和 -u 选项互斥"
1612
a77c07d9 1613#: builtin/add.c:383
8ada9598 1614msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 1615msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 1616
ef317cd5 1617#: builtin/add.c:414
8ada9598
JX
1618#, c-format
1619msgid "Nothing specified, nothing added.\n"
1620msgstr "没有指定文件,也没有文件被添加。\n"
1621
ef317cd5 1622#: builtin/add.c:415
8ada9598
JX
1623#, c-format
1624msgid "Maybe you wanted to say 'git add .'?\n"
1625msgstr "也许您想要执行 'git add .'?\n"
1626
a77c07d9
JX
1627#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1628#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
8ada9598
JX
1629msgid "index file corrupt"
1630msgstr "索引文件损坏"
1631
a77c07d9 1632#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370
8ada9598
JX
1633msgid "Unable to write new index file"
1634msgstr "无法写入新索引文件"
1635
23ff3338 1636#: builtin/apply.c:57
8ada9598 1637msgid "git apply [options] [<patch>...]"
81809b99 1638msgstr "git apply [选项] [<补丁>...]"
8ada9598 1639
23ff3338 1640#: builtin/apply.c:110
81809b99 1641#, c-format
8ada9598 1642msgid "unrecognized whitespace option '%s'"
81809b99 1643msgstr "未能识别的空白字符选项 '%s'"
8ada9598 1644
23ff3338 1645#: builtin/apply.c:125
81809b99 1646#, c-format
8ada9598 1647msgid "unrecognized whitespace ignore option '%s'"
81809b99 1648msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 1649
c160d03f 1650#: builtin/apply.c:823
8ada9598
JX
1651#, c-format
1652msgid "Cannot prepare timestamp regexp %s"
81809b99 1653msgstr "无法准备时间戳正则表达式 %s"
8ada9598 1654
c160d03f 1655#: builtin/apply.c:832
8ada9598
JX
1656#, c-format
1657msgid "regexec returned %d for input: %s"
81809b99 1658msgstr "regexec 返回 %d,输入为:%s"
8ada9598 1659
c160d03f 1660#: builtin/apply.c:913
81809b99 1661#, c-format
8ada9598 1662msgid "unable to find filename in patch at line %d"
81809b99 1663msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 1664
c160d03f 1665#: builtin/apply.c:945
8ada9598
JX
1666#, c-format
1667msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 1668msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 1669
c160d03f 1670#: builtin/apply.c:949
8ada9598
JX
1671#, c-format
1672msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 1673msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 1674
c160d03f 1675#: builtin/apply.c:950
8ada9598
JX
1676#, c-format
1677msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 1678msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 1679
c160d03f 1680#: builtin/apply.c:957
8ada9598
JX
1681#, c-format
1682msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 1683msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 1684
a77c07d9 1685#: builtin/apply.c:1422
8ada9598
JX
1686#, c-format
1687msgid "recount: unexpected line: %.*s"
81809b99 1688msgstr "recount:意外的行:%.*s"
8ada9598 1689
a77c07d9 1690#: builtin/apply.c:1479
8ada9598
JX
1691#, c-format
1692msgid "patch fragment without header at line %d: %.*s"
81809b99 1693msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 1694
a77c07d9 1695#: builtin/apply.c:1496
8ada9598
JX
1696#, c-format
1697msgid ""
1698"git diff header lacks filename information when removing %d leading pathname "
1699"component (line %d)"
1700msgid_plural ""
1701"git diff header lacks filename information when removing %d leading pathname "
1702"components (line %d)"
5ae481e0
JX
1703msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1704msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 1705
a77c07d9 1706#: builtin/apply.c:1656
8ada9598 1707msgid "new file depends on old contents"
81809b99 1708msgstr "新文件依赖旧内容"
8ada9598 1709
a77c07d9 1710#: builtin/apply.c:1658
8ada9598 1711msgid "deleted file still has contents"
81809b99 1712msgstr "删除的文件仍有内容"
8ada9598 1713
a77c07d9 1714#: builtin/apply.c:1684
8ada9598
JX
1715#, c-format
1716msgid "corrupt patch at line %d"
195febda 1717msgstr "补丁在第 %d 行损坏"
8ada9598 1718
a77c07d9 1719#: builtin/apply.c:1720
8ada9598
JX
1720#, c-format
1721msgid "new file %s depends on old contents"
81809b99 1722msgstr "新文件 %s 依赖旧内容"
8ada9598 1723
a77c07d9 1724#: builtin/apply.c:1722
8ada9598
JX
1725#, c-format
1726msgid "deleted file %s still has contents"
81809b99 1727msgstr "删除的文件 %s 仍有内容"
8ada9598 1728
a77c07d9 1729#: builtin/apply.c:1725
8ada9598
JX
1730#, c-format
1731msgid "** warning: file %s becomes empty but is not deleted"
81809b99 1732msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 1733
a77c07d9 1734#: builtin/apply.c:1871
8ada9598
JX
1735#, c-format
1736msgid "corrupt binary patch at line %d: %.*s"
81809b99 1737msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598
JX
1738
1739#. there has to be one hunk (forward hunk)
a77c07d9 1740#: builtin/apply.c:1900
8ada9598
JX
1741#, c-format
1742msgid "unrecognized binary patch at line %d"
81809b99 1743msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 1744
a77c07d9 1745#: builtin/apply.c:1986
8ada9598
JX
1746#, c-format
1747msgid "patch with only garbage at line %d"
81809b99 1748msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 1749
a77c07d9 1750#: builtin/apply.c:2076
81809b99 1751#, c-format
8ada9598 1752msgid "unable to read symlink %s"
81809b99 1753msgstr "无法读取符号链接 %s"
8ada9598 1754
a77c07d9 1755#: builtin/apply.c:2080
81809b99 1756#, c-format
8ada9598 1757msgid "unable to open or read %s"
81809b99 1758msgstr "不能打开或读取 %s"
8ada9598 1759
a77c07d9 1760#: builtin/apply.c:2684
81809b99 1761#, c-format
8ada9598 1762msgid "invalid start of line: '%c'"
81809b99 1763msgstr "无效的行首字符:'%c'"
8ada9598 1764
a77c07d9 1765#: builtin/apply.c:2802
8ada9598
JX
1766#, c-format
1767msgid "Hunk #%d succeeded at %d (offset %d line)."
1768msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
1769msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1770msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 1771
a77c07d9 1772#: builtin/apply.c:2814
8ada9598
JX
1773#, c-format
1774msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 1775msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 1776
a77c07d9 1777#: builtin/apply.c:2820
8ada9598
JX
1778#, c-format
1779msgid ""
1780"while searching for:\n"
1781"%.*s"
1782msgstr ""
81809b99
JX
1783"当查询:\n"
1784"%.*s"
8ada9598 1785
a77c07d9 1786#: builtin/apply.c:2839
8ada9598
JX
1787#, c-format
1788msgid "missing binary patch data for '%s'"
81809b99 1789msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 1790
a77c07d9 1791#: builtin/apply.c:2942
8ada9598
JX
1792#, c-format
1793msgid "binary patch does not apply to '%s'"
81809b99 1794msgstr "二进制补丁未应用到 '%s'"
8ada9598 1795
a77c07d9 1796#: builtin/apply.c:2948
8ada9598
JX
1797#, c-format
1798msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 1799msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 1800
a77c07d9 1801#: builtin/apply.c:2969
8ada9598
JX
1802#, c-format
1803msgid "patch failed: %s:%ld"
81809b99 1804msgstr "打补丁失败:%s:%ld"
8ada9598 1805
a77c07d9 1806#: builtin/apply.c:3091
8ada9598 1807#, c-format
23ff3338
JX
1808msgid "cannot checkout %s"
1809msgstr "不能检出 %s"
8ada9598 1810
a77c07d9 1811#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
81809b99 1812#, c-format
8ada9598 1813msgid "read of %s failed"
81809b99 1814msgstr "读取 %s 失败"
8ada9598 1815
a77c07d9 1816#: builtin/apply.c:3169 builtin/apply.c:3391
81809b99 1817#, c-format
23ff3338
JX
1818msgid "path %s has been renamed/deleted"
1819msgstr "路径 %s 已经被重命名/删除"
8ada9598 1820
a77c07d9 1821#: builtin/apply.c:3250 builtin/apply.c:3405
8ada9598 1822#, c-format
23ff3338
JX
1823msgid "%s: does not exist in index"
1824msgstr "%s:不存在于索引中"
8ada9598 1825
a77c07d9 1826#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
81809b99 1827#, c-format
8ada9598 1828msgid "%s: %s"
81809b99 1829msgstr "%s:%s"
8ada9598 1830
a77c07d9 1831#: builtin/apply.c:3259 builtin/apply.c:3413
81809b99 1832#, c-format
8ada9598 1833msgid "%s: does not match index"
81809b99 1834msgstr "%s:和索引不匹配"
8ada9598 1835
a77c07d9 1836#: builtin/apply.c:3361
23ff3338
JX
1837msgid "removal patch leaves file contents"
1838msgstr "移除补丁仍留下了文件内容"
1839
a77c07d9 1840#: builtin/apply.c:3430
8ada9598
JX
1841#, c-format
1842msgid "%s: wrong type"
81809b99 1843msgstr "%s:错误类型"
8ada9598 1844
a77c07d9 1845#: builtin/apply.c:3432
8ada9598
JX
1846#, c-format
1847msgid "%s has type %o, expected %o"
9aafc933 1848msgstr "%s 的类型是 %o,应为 %o"
8ada9598 1849
a77c07d9 1850#: builtin/apply.c:3533
81809b99 1851#, c-format
8ada9598 1852msgid "%s: already exists in index"
81809b99 1853msgstr "%s:已经存在于索引中"
8ada9598 1854
a77c07d9 1855#: builtin/apply.c:3536
23ff3338
JX
1856#, c-format
1857msgid "%s: already exists in working directory"
1858msgstr "%s:已经存在于工作区中"
1859
a77c07d9 1860#: builtin/apply.c:3556
d691f479
JX
1861#, c-format
1862msgid "new mode (%o) of %s does not match old mode (%o)"
1863msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 1864
a77c07d9 1865#: builtin/apply.c:3561
8ada9598 1866#, c-format
d691f479
JX
1867msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1868msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1869
a77c07d9 1870#: builtin/apply.c:3569
d691f479 1871#, c-format
8ada9598 1872msgid "%s: patch does not apply"
81809b99 1873msgstr "%s:补丁未应用"
8ada9598 1874
a77c07d9 1875#: builtin/apply.c:3582
8ada9598
JX
1876#, c-format
1877msgid "Checking patch %s..."
81809b99 1878msgstr "检查补丁 %s..."
8ada9598 1879
a77c07d9 1880#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124
8ada9598
JX
1881#, c-format
1882msgid "make_cache_entry failed for path '%s'"
1883msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1884
a77c07d9 1885#: builtin/apply.c:3782
81809b99 1886#, c-format
8ada9598 1887msgid "unable to remove %s from index"
81809b99 1888msgstr "不能从索引中移除 %s"
8ada9598 1889
a77c07d9 1890#: builtin/apply.c:3810
8ada9598
JX
1891#, c-format
1892msgid "corrupt patch for subproject %s"
81809b99 1893msgstr "子项目 %s 损坏的补丁"
8ada9598 1894
a77c07d9 1895#: builtin/apply.c:3814
81809b99 1896#, c-format
8ada9598 1897msgid "unable to stat newly created file '%s'"
81809b99 1898msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 1899
a77c07d9 1900#: builtin/apply.c:3819
8ada9598
JX
1901#, c-format
1902msgid "unable to create backing store for newly created file %s"
81809b99 1903msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1904
a77c07d9 1905#: builtin/apply.c:3822 builtin/apply.c:3930
81809b99 1906#, c-format
8ada9598 1907msgid "unable to add cache entry for %s"
81809b99 1908msgstr "无法为 %s 添加缓存条目"
8ada9598 1909
a77c07d9 1910#: builtin/apply.c:3855
81809b99 1911#, c-format
8ada9598 1912msgid "closing file '%s'"
81809b99 1913msgstr "关闭文件 '%s'"
8ada9598 1914
a77c07d9 1915#: builtin/apply.c:3904
81809b99 1916#, c-format
8ada9598 1917msgid "unable to write file '%s' mode %o"
81809b99 1918msgstr "不能写文件 '%s' 权限 %o"
8ada9598 1919
a77c07d9 1920#: builtin/apply.c:3991
8ada9598
JX
1921#, c-format
1922msgid "Applied patch %s cleanly."
81809b99 1923msgstr "成功应用补丁 %s。"
8ada9598 1924
a77c07d9 1925#: builtin/apply.c:3999
8ada9598 1926msgid "internal error"
81809b99 1927msgstr "内部错误"
8ada9598
JX
1928
1929#. Say this even without --verbose
a77c07d9 1930#: builtin/apply.c:4002
8ada9598
JX
1931#, c-format
1932msgid "Applying patch %%s with %d reject..."
1933msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
1934msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1935msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 1936
a77c07d9 1937#: builtin/apply.c:4012
8ada9598
JX
1938#, c-format
1939msgid "truncating .rej filename to %.*s.rej"
81809b99 1940msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 1941
a77c07d9 1942#: builtin/apply.c:4033
8ada9598
JX
1943#, c-format
1944msgid "Hunk #%d applied cleanly."
81809b99 1945msgstr "第 #%d 个片段成功应用。"
8ada9598 1946
a77c07d9 1947#: builtin/apply.c:4036
8ada9598
JX
1948#, c-format
1949msgid "Rejected hunk #%d."
81809b99 1950msgstr "拒绝第 #%d 个片段。"
8ada9598 1951
a77c07d9 1952#: builtin/apply.c:4186
8ada9598 1953msgid "unrecognized input"
81809b99 1954msgstr "未能识别的输入"
8ada9598 1955
a77c07d9 1956#: builtin/apply.c:4197
8ada9598 1957msgid "unable to read index file"
81809b99 1958msgstr "无法读取索引文件"
8ada9598 1959
a77c07d9 1960#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91
ef317cd5 1961#: builtin/fetch.c:63
8ada9598 1962msgid "path"
81809b99 1963msgstr "路径"
8ada9598 1964
a77c07d9 1965#: builtin/apply.c:4317
8ada9598 1966msgid "don't apply changes matching the given path"
81809b99 1967msgstr "不要应用与给出路径向匹配的变更"
8ada9598 1968
a77c07d9 1969#: builtin/apply.c:4320
8ada9598 1970msgid "apply changes matching the given path"
81809b99 1971msgstr "应用与给出路径向匹配的变更"
8ada9598 1972
a77c07d9 1973#: builtin/apply.c:4322
8ada9598 1974msgid "num"
81809b99 1975msgstr "数字"
8ada9598 1976
a77c07d9 1977#: builtin/apply.c:4323
8ada9598 1978msgid "remove <num> leading slashes from traditional diff paths"
07432cef 1979msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 1980
a77c07d9 1981#: builtin/apply.c:4326
8ada9598 1982msgid "ignore additions made by the patch"
81809b99 1983msgstr "忽略补丁中的添加的文件"
8ada9598 1984
a77c07d9 1985#: builtin/apply.c:4328
8ada9598 1986msgid "instead of applying the patch, output diffstat for the input"
81809b99 1987msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 1988
a77c07d9 1989#: builtin/apply.c:4332
ef317cd5 1990msgid "show number of added and deleted lines in decimal notation"
07432cef 1991msgstr "以十进制数显示添加和删除的行数"
8ada9598 1992
a77c07d9 1993#: builtin/apply.c:4334
8ada9598 1994msgid "instead of applying the patch, output a summary for the input"
81809b99 1995msgstr "不应用补丁,而是显示输入的概要"
8ada9598 1996
a77c07d9 1997#: builtin/apply.c:4336
8ada9598 1998msgid "instead of applying the patch, see if the patch is applicable"
81809b99 1999msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2000
a77c07d9 2001#: builtin/apply.c:4338
8ada9598 2002msgid "make sure the patch is applicable to the current index"
81809b99 2003msgstr "确认补丁可以应用到当前索引"
8ada9598 2004
a77c07d9 2005#: builtin/apply.c:4340
8ada9598 2006msgid "apply a patch without touching the working tree"
81809b99 2007msgstr "应用补丁而不修改工作区"
8ada9598 2008
a77c07d9 2009#: builtin/apply.c:4342
8ada9598 2010msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2011msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2012
a77c07d9 2013#: builtin/apply.c:4344
23ff3338
JX
2014msgid "attempt three-way merge if a patch does not apply"
2015msgstr "如果一个补丁不能应用则尝试三路合并"
2016
a77c07d9 2017#: builtin/apply.c:4346
8ada9598 2018msgid "build a temporary index based on embedded index information"
81809b99 2019msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2020
a77c07d9 2021#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463
8ada9598 2022msgid "paths are separated with NUL character"
81809b99 2023msgstr "路径以 NUL 字符分隔"
8ada9598 2024
a77c07d9 2025#: builtin/apply.c:4351
8ada9598 2026msgid "ensure at least <n> lines of context match"
81809b99 2027msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2028
a77c07d9 2029#: builtin/apply.c:4352
8ada9598 2030msgid "action"
81809b99 2031msgstr "动作"
8ada9598 2032
a77c07d9 2033#: builtin/apply.c:4353
8ada9598 2034msgid "detect new or modified lines that have whitespace errors"
81809b99 2035msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2036
a77c07d9 2037#: builtin/apply.c:4356 builtin/apply.c:4359
8ada9598 2038msgid "ignore changes in whitespace when finding context"
81809b99 2039msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2040
a77c07d9 2041#: builtin/apply.c:4362
8ada9598 2042msgid "apply the patch in reverse"
81809b99 2043msgstr "反向应用补丁"
8ada9598 2044
a77c07d9 2045#: builtin/apply.c:4364
8ada9598 2046msgid "don't expect at least one line of context"
81809b99 2047msgstr "无需至少一行上下文"
8ada9598 2048
a77c07d9 2049#: builtin/apply.c:4366
8ada9598 2050msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2051msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2052
a77c07d9 2053#: builtin/apply.c:4368
8ada9598 2054msgid "allow overlapping hunks"
81809b99 2055msgstr "允许重叠的补丁片段"
8ada9598 2056
a77c07d9 2057#: builtin/apply.c:4371
8ada9598 2058msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2059msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2060
a77c07d9 2061#: builtin/apply.c:4374
8ada9598 2062msgid "do not trust the line counts in the hunk headers"
81809b99 2063msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2064
a77c07d9 2065#: builtin/apply.c:4376
8ada9598 2066msgid "root"
81809b99 2067msgstr "根目录"
c04f5ac3 2068
a77c07d9 2069#: builtin/apply.c:4377
8ada9598 2070msgid "prepend <root> to all filenames"
81809b99 2071msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2072
a77c07d9 2073#: builtin/apply.c:4399
23ff3338
JX
2074msgid "--3way outside a repository"
2075msgstr "--3way 在一个版本库之外"
2076
a77c07d9 2077#: builtin/apply.c:4407
8ada9598 2078msgid "--index outside a repository"
81809b99 2079msgstr "--index 在一个版本库之外"
c04f5ac3 2080
a77c07d9 2081#: builtin/apply.c:4410
8ada9598 2082msgid "--cached outside a repository"
81809b99 2083msgstr "--cached 在一个版本库之外"
c04f5ac3 2084
a77c07d9 2085#: builtin/apply.c:4426
81809b99 2086#, c-format
8ada9598 2087msgid "can't open patch '%s'"
81809b99 2088msgstr "不能打开补丁 '%s'"
c04f5ac3 2089
a77c07d9 2090#: builtin/apply.c:4440
c04f5ac3 2091#, c-format
8ada9598
JX
2092msgid "squelched %d whitespace error"
2093msgid_plural "squelched %d whitespace errors"
81809b99 2094msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2095msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2096
a77c07d9 2097#: builtin/apply.c:4446 builtin/apply.c:4456
8ada9598
JX
2098#, c-format
2099msgid "%d line adds whitespace errors."
2100msgid_plural "%d lines add whitespace errors."
81809b99 2101msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2102msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2103
2104#: builtin/archive.c:17
2105#, c-format
2106msgid "could not create archive file '%s'"
90e6ef53 2107msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2108
2109#: builtin/archive.c:20
2110msgid "could not redirect output"
195febda 2111msgstr "不能重定向输出"
c04f5ac3
JX
2112
2113#: builtin/archive.c:37
2114msgid "git archive: Remote with no URL"
90e6ef53 2115msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2116
2117#: builtin/archive.c:58
2118msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2119msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3
JX
2120
2121#: builtin/archive.c:63
2122#, c-format
2123msgid "git archive: NACK %s"
90e6ef53 2124msgstr "git archive:NACK %s"
c04f5ac3
JX
2125
2126#: builtin/archive.c:65
2127#, c-format
2128msgid "remote error: %s"
2129msgstr "远程错误:%s"
2130
2131#: builtin/archive.c:66
2132msgid "git archive: protocol error"
90e6ef53 2133msgstr "git archive:协议错误"
c04f5ac3
JX
2134
2135#: builtin/archive.c:71
2136msgid "git archive: expected a flush"
195febda 2137msgstr "git archive:应为刷新"
c04f5ac3 2138
ef317cd5
JX
2139#: builtin/bisect--helper.c:7
2140msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2141msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2142
2143#: builtin/bisect--helper.c:17
2144msgid "perform 'git bisect next'"
07432cef 2145msgstr "执行 'git bisect next'"
ef317cd5
JX
2146
2147#: builtin/bisect--helper.c:19
2148msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2149msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5
JX
2150
2151#: builtin/blame.c:25
2152msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2153msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5
JX
2154
2155#: builtin/blame.c:30 builtin/shortlog.c:15
2156msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2157msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2158
a77c07d9 2159#: builtin/blame.c:2350
ef317cd5 2160msgid "Show blame entries as we find them, incrementally"
07432cef 2161msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2162
a77c07d9 2163#: builtin/blame.c:2351
ef317cd5 2164msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2165msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2166
a77c07d9 2167#: builtin/blame.c:2352
ef317cd5 2168msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2169msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2170
a77c07d9 2171#: builtin/blame.c:2353
ef317cd5 2172msgid "Show work cost statistics"
07432cef 2173msgstr "显示命令消耗统计"
ef317cd5 2174
a77c07d9 2175#: builtin/blame.c:2354
ef317cd5 2176msgid "Show output score for blame entries"
07432cef 2177msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2178
a77c07d9 2179#: builtin/blame.c:2355
ef317cd5 2180msgid "Show original filename (Default: auto)"
07432cef 2181msgstr "显示原始文件名(默认:自动)"
ef317cd5 2182
a77c07d9 2183#: builtin/blame.c:2356
ef317cd5 2184msgid "Show original linenumber (Default: off)"
07432cef 2185msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2186
a77c07d9 2187#: builtin/blame.c:2357
ef317cd5 2188msgid "Show in a format designed for machine consumption"
07432cef 2189msgstr "显示为一个适合机器读取的格式"
ef317cd5 2190
a77c07d9 2191#: builtin/blame.c:2358
ef317cd5 2192msgid "Show porcelain format with per-line commit information"
07432cef 2193msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2194
a77c07d9 2195#: builtin/blame.c:2359
ef317cd5 2196msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2197msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2198
a77c07d9 2199#: builtin/blame.c:2360
ef317cd5 2200msgid "Show raw timestamp (Default: off)"
07432cef 2201msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2202
a77c07d9 2203#: builtin/blame.c:2361
ef317cd5 2204msgid "Show long commit SHA1 (Default: off)"
07432cef 2205msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2206
a77c07d9 2207#: builtin/blame.c:2362
ef317cd5 2208msgid "Suppress author name and timestamp (Default: off)"
07432cef 2209msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2210
a77c07d9 2211#: builtin/blame.c:2363
ef317cd5 2212msgid "Show author email instead of name (Default: off)"
07432cef 2213msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2214
a77c07d9 2215#: builtin/blame.c:2364
ef317cd5 2216msgid "Ignore whitespace differences"
07432cef 2217msgstr "忽略空白差异"
ef317cd5 2218
a77c07d9 2219#: builtin/blame.c:2365
ef317cd5 2220msgid "Spend extra cycles to find better match"
07432cef 2221msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2222
a77c07d9 2223#: builtin/blame.c:2366
ef317cd5 2224msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2225msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2226
a77c07d9 2227#: builtin/blame.c:2367
ef317cd5 2228msgid "Use <file>'s contents as the final image"
07432cef 2229msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2230
a77c07d9 2231#: builtin/blame.c:2368 builtin/blame.c:2369
ef317cd5 2232msgid "score"
07432cef 2233msgstr "得分"
ef317cd5 2234
a77c07d9 2235#: builtin/blame.c:2368
ef317cd5 2236msgid "Find line copies within and across files"
07432cef 2237msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2238
a77c07d9 2239#: builtin/blame.c:2369
ef317cd5 2240msgid "Find line movements within and across files"
07432cef 2241msgstr "找到文件内及跨文件的行移动"
ef317cd5 2242
a77c07d9 2243#: builtin/blame.c:2370
ef317cd5 2244msgid "n,m"
07432cef 2245msgstr "n,m"
ef317cd5 2246
a77c07d9 2247#: builtin/blame.c:2370
ef317cd5 2248msgid "Process only line range n,m, counting from 1"
07432cef 2249msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5
JX
2250
2251#: builtin/branch.c:23
2252msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2253msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5
JX
2254
2255#: builtin/branch.c:24
2256msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2257msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5
JX
2258
2259#: builtin/branch.c:25
ef317cd5 2260msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2261msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5
JX
2262
2263#: builtin/branch.c:26
2264msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2265msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2266
90e6ef53 2267# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
ef317cd5 2268#: builtin/branch.c:145
c04f5ac3
JX
2269#, c-format
2270msgid ""
2271"deleting branch '%s' that has been merged to\n"
2272" '%s', but not yet merged to HEAD."
2273msgstr ""
70fc47bf 2274"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2275" '%s',但未合并到 HEAD。"
2276
90e6ef53 2277# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
ef317cd5 2278#: builtin/branch.c:149
c04f5ac3
JX
2279#, c-format
2280msgid ""
2281"not deleting branch '%s' that is not yet merged to\n"
2282" '%s', even though it is merged to HEAD."
2283msgstr ""
70fc47bf
T
2284"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2285" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2286
07432cef
WS
2287#: builtin/branch.c:163
2288#, c-format
2289msgid "Couldn't look up commit object for '%s'"
2290msgstr "无法查询 '%s' 指向的提交对象"
2291
2292#: builtin/branch.c:167
2293#, c-format
2294msgid ""
2295"The branch '%s' is not fully merged.\n"
2296"If you are sure you want to delete it, run 'git branch -D %s'."
2297msgstr ""
2298"分支 '%s' 没有完全合并。\n"
2299"如果您确认要删除它,执行 'git branch -D %s'。"
2300
2301#: builtin/branch.c:180
2302msgid "Update of config-file failed"
2303msgstr "无法更新 config 文件"
2304
2305#: builtin/branch.c:208
c04f5ac3 2306msgid "cannot use -a with -d"
649900bc 2307msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2308
07432cef 2309#: builtin/branch.c:214
c04f5ac3
JX
2310msgid "Couldn't look up commit object for HEAD"
2311msgstr "无法查询 HEAD 指向的提交对象"
2312
07432cef 2313#: builtin/branch.c:222
c04f5ac3
JX
2314#, c-format
2315msgid "Cannot delete the branch '%s' which you are currently on."
2316msgstr "无法删除您当前所在的分支 '%s'。"
2317
07432cef 2318#: builtin/branch.c:235
5ae481e0 2319#, c-format
8ada9598 2320msgid "remote branch '%s' not found."
81809b99 2321msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2322
07432cef 2323#: builtin/branch.c:236
81809b99 2324#, c-format
8ada9598 2325msgid "branch '%s' not found."
81809b99 2326msgstr "分支 '%s' 未发现。"
8ada9598 2327
07432cef 2328#: builtin/branch.c:250
81809b99 2329#, c-format
8ada9598 2330msgid "Error deleting remote branch '%s'"
81809b99 2331msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2332
07432cef 2333#: builtin/branch.c:251
81809b99 2334#, c-format
8ada9598 2335msgid "Error deleting branch '%s'"
81809b99 2336msgstr "删除分支 '%s' 时出错"
8ada9598 2337
07432cef 2338#: builtin/branch.c:258
81809b99 2339#, c-format
8ada9598 2340msgid "Deleted remote branch %s (was %s).\n"
81809b99 2341msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2342
07432cef 2343#: builtin/branch.c:259
81809b99 2344#, c-format
8ada9598 2345msgid "Deleted branch %s (was %s).\n"
81809b99 2346msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2347
07432cef 2348#: builtin/branch.c:361
c04f5ac3
JX
2349#, c-format
2350msgid "branch '%s' does not point at a commit"
2351msgstr "分支 '%s' 未指向一个提交"
2352
07432cef 2353#: builtin/branch.c:433
81809b99 2354#, c-format
8ada9598 2355msgid "[%s: behind %d]"
81809b99 2356msgstr "[%s:落后 %d]"
c04f5ac3 2357
07432cef 2358#: builtin/branch.c:435
81809b99 2359#, c-format
8ada9598 2360msgid "[behind %d]"
81809b99 2361msgstr "[落后 %d]"
8ada9598 2362
07432cef 2363#: builtin/branch.c:439
81809b99 2364#, c-format
8ada9598 2365msgid "[%s: ahead %d]"
81809b99 2366msgstr "[%s:领先 %d]"
c04f5ac3 2367
07432cef 2368#: builtin/branch.c:441
81809b99 2369#, c-format
8ada9598 2370msgid "[ahead %d]"
81809b99 2371msgstr "[领先 %d]"
8ada9598 2372
07432cef 2373#: builtin/branch.c:444
81809b99 2374#, c-format
8ada9598 2375msgid "[%s: ahead %d, behind %d]"
81809b99 2376msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2377
07432cef 2378#: builtin/branch.c:447
81809b99 2379#, c-format
8ada9598 2380msgid "[ahead %d, behind %d]"
81809b99 2381msgstr "[领先 %d,落后 %d]"
c04f5ac3 2382
a77c07d9
JX
2383#: builtin/branch.c:469
2384msgid " **** invalid ref ****"
2385msgstr " **** 无效引用 ****"
2386
07432cef 2387#: builtin/branch.c:560
c04f5ac3
JX
2388msgid "(no branch)"
2389msgstr "(非分支)"
2390
a77c07d9
JX
2391#: builtin/branch.c:593
2392#, c-format
2393msgid "object '%s' does not point to a commit"
2394msgstr "对象 '%s' 没有指向一个提交"
2395
07432cef 2396#: builtin/branch.c:625
c04f5ac3 2397msgid "some refs could not be read"
90e6ef53 2398msgstr "一些引用不能读取"
c04f5ac3 2399
07432cef 2400#: builtin/branch.c:638
c04f5ac3 2401msgid "cannot rename the current branch while not on any."
90e6ef53 2402msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2403
07432cef 2404#: builtin/branch.c:648
c04f5ac3
JX
2405#, c-format
2406msgid "Invalid branch name: '%s'"
2407msgstr "无效的分支名:'%s'"
2408
07432cef 2409#: builtin/branch.c:663
c04f5ac3
JX
2410msgid "Branch rename failed"
2411msgstr "分支重命名失败"
2412
07432cef 2413#: builtin/branch.c:667
c04f5ac3
JX
2414#, c-format
2415msgid "Renamed a misnamed branch '%s' away"
2416msgstr "重命名掉一个错误命名的旧分支 '%s'"
2417
07432cef 2418#: builtin/branch.c:671
c04f5ac3
JX
2419#, c-format
2420msgid "Branch renamed to %s, but HEAD is not updated!"
2421msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2422
07432cef 2423#: builtin/branch.c:678
c04f5ac3
JX
2424msgid "Branch is renamed, but update of config-file failed"
2425msgstr "分支被重命名,但更新 config 文件失败"
2426
07432cef 2427#: builtin/branch.c:693
c04f5ac3
JX
2428#, c-format
2429msgid "malformed object name %s"
2430msgstr "非法的对象名 %s"
2431
07432cef 2432#: builtin/branch.c:717
81809b99 2433#, c-format
8ada9598 2434msgid "could not write branch description template: %s"
81809b99 2435msgstr "不能写分支描述模版:%s"
c04f5ac3 2436
07432cef 2437#: builtin/branch.c:747
ef317cd5 2438msgid "Generic options"
07432cef 2439msgstr "通用选项"
c04f5ac3 2440
07432cef 2441#: builtin/branch.c:749
ef317cd5 2442msgid "show hash and subject, give twice for upstream branch"
07432cef 2443msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2444
07432cef 2445#: builtin/branch.c:750
ef317cd5 2446msgid "suppress informational messages"
07432cef 2447msgstr "不显示信息"
8ada9598 2448
07432cef 2449#: builtin/branch.c:751
ef317cd5 2450msgid "set up tracking mode (see git-pull(1))"
07432cef 2451msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2452
07432cef 2453#: builtin/branch.c:753
ef317cd5 2454msgid "change upstream info"
07432cef 2455msgstr "改变上游信息"
c04f5ac3 2456
07432cef 2457#: builtin/branch.c:757
ef317cd5 2458msgid "use colored output"
07432cef 2459msgstr "使用彩色输出"
c04f5ac3 2460
07432cef 2461#: builtin/branch.c:758
ef317cd5 2462msgid "act on remote-tracking branches"
07432cef 2463msgstr "作用于远程跟踪分支"
c04f5ac3 2464
07432cef 2465#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
a77c07d9
JX
2466#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
2467#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
ef317cd5 2468msgid "commit"
07432cef 2469msgstr "提交"
c04f5ac3 2470
07432cef 2471#: builtin/branch.c:762 builtin/branch.c:768
ef317cd5 2472msgid "print only branches that contain the commit"
07432cef 2473msgstr "只打印包含该提交的分支"
c04f5ac3 2474
07432cef 2475#: builtin/branch.c:774
ef317cd5 2476msgid "Specific git-branch actions:"
07432cef 2477msgstr "具体的 git-branch 动作:"
c04f5ac3 2478
07432cef 2479#: builtin/branch.c:775
ef317cd5 2480msgid "list both remote-tracking and local branches"
07432cef 2481msgstr "列出远程跟踪及本地分支"
c04f5ac3 2482
07432cef 2483#: builtin/branch.c:777
ef317cd5 2484msgid "delete fully merged branch"
07432cef 2485msgstr "删除完全合并的分支"
c04f5ac3 2486
07432cef 2487#: builtin/branch.c:778
ef317cd5 2488msgid "delete branch (even if not merged)"
07432cef 2489msgstr "删除分支(即使没有合并)"
c04f5ac3 2490
07432cef 2491#: builtin/branch.c:779
ef317cd5 2492msgid "move/rename a branch and its reflog"
07432cef 2493msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 2494
07432cef 2495#: builtin/branch.c:780
ef317cd5 2496msgid "move/rename a branch, even if target exists"
07432cef 2497msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 2498
07432cef 2499#: builtin/branch.c:781
ef317cd5 2500msgid "list branch names"
07432cef 2501msgstr "列出分支名"
c04f5ac3 2502
07432cef 2503#: builtin/branch.c:782
ef317cd5 2504msgid "create the branch's reflog"
07432cef 2505msgstr "创建分支的引用日志"
ef317cd5 2506
07432cef 2507#: builtin/branch.c:784
ef317cd5 2508msgid "edit the description for the branch"
07432cef 2509msgstr "标记分支的描述"
ef317cd5 2510
07432cef 2511#: builtin/branch.c:785
ef317cd5 2512msgid "force creation (when already exists)"
07432cef 2513msgstr "强制创建(当已经存在)"
ef317cd5 2514
07432cef 2515#: builtin/branch.c:788
ef317cd5 2516msgid "print only not merged branches"
07432cef 2517msgstr "只打印没有合并的分支"
ef317cd5 2518
07432cef 2519#: builtin/branch.c:794
ef317cd5 2520msgid "print only merged branches"
07432cef 2521msgstr "只打印合并的分支"
ef317cd5 2522
07432cef 2523#: builtin/branch.c:798
ef317cd5 2524msgid "list branches in columns"
07432cef 2525msgstr "以列的方式显示分支"
ef317cd5 2526
07432cef 2527#: builtin/branch.c:811
c04f5ac3
JX
2528msgid "Failed to resolve HEAD as a valid ref."
2529msgstr "无法将 HEAD 解析为有效引用。"
2530
07432cef 2531#: builtin/branch.c:816 builtin/clone.c:561
c04f5ac3 2532msgid "HEAD not found below refs/heads!"
90e6ef53 2533msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 2534
a77c07d9 2535#: builtin/branch.c:839
8ada9598 2536msgid "--column and --verbose are incompatible"
81809b99 2537msgstr "--column 和 --verbose 不兼容"
8ada9598 2538
a77c07d9
JX
2539#: builtin/branch.c:845
2540msgid "branch name required"
2541msgstr "必须提供分支名"
2542
2543#: builtin/branch.c:860
2544msgid "Cannot give description to detached HEAD"
2545msgstr "不能向分离头指针提供描述"
2546
2547#: builtin/branch.c:865
2548msgid "cannot edit description of more than one branch"
2549msgstr "不能为一个以上的分支编辑描述"
2550
2551#: builtin/branch.c:872
2552#, c-format
2553msgid "No commit on branch '%s' yet."
2554msgstr "分支 '%s' 尚无提交。"
2555
2556#: builtin/branch.c:875
2557#, c-format
2558msgid "No branch named '%s'."
2559msgstr "没有分支 '%s'。"
2560
2561#: builtin/branch.c:888
2562msgid "too many branches for a rename operation"
2563msgstr "为重命名操作提供了太多的分支名"
2564
2565#: builtin/branch.c:893
07432cef 2566#, c-format
ef317cd5 2567msgid "branch '%s' does not exist"
07432cef 2568msgstr "分支 '%s' 不存在"
ef317cd5 2569
a77c07d9 2570#: builtin/branch.c:905
ef317cd5
JX
2571#, c-format
2572msgid "Branch '%s' has no upstream information"
07432cef 2573msgstr "分支 '%s' 没有上游信息"
ef317cd5 2574
a77c07d9 2575#: builtin/branch.c:920
c04f5ac3
JX
2576msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2577msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2578
a77c07d9 2579#: builtin/branch.c:923
ef317cd5
JX
2580#, c-format
2581msgid ""
2582"The --set-upstream flag is deprecated and will be removed. Consider using --"
2583"track or --set-upstream-to\n"
2584msgstr ""
07432cef 2585"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 2586
a77c07d9 2587#: builtin/branch.c:940
ef317cd5
JX
2588#, c-format
2589msgid ""
2590"\n"
2591"If you wanted to make '%s' track '%s', do this:\n"
2592"\n"
2593msgstr ""
07432cef
WS
2594"\n"
2595"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2596"\n"
ef317cd5 2597
a77c07d9 2598#: builtin/branch.c:941
07432cef 2599#, c-format
ef317cd5 2600msgid " git branch -d %s\n"
07432cef 2601msgstr " git branch -d %s\n"
ef317cd5 2602
a77c07d9 2603#: builtin/branch.c:942
ef317cd5
JX
2604#, c-format
2605msgid " git branch --set-upstream-to %s\n"
07432cef 2606msgstr " git branch --set-upstream-to %s\n"
ef317cd5 2607
c04f5ac3
JX
2608#: builtin/bundle.c:47
2609#, c-format
2610msgid "%s is okay\n"
2611msgstr "%s 可以\n"
2612
2613#: builtin/bundle.c:56
2614msgid "Need a repository to create a bundle."
90e6ef53 2615msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
2616
2617#: builtin/bundle.c:60
2618msgid "Need a repository to unbundle."
90e6ef53 2619msgstr "需要一个版本库来解包。"
c04f5ac3 2620
ef317cd5
JX
2621#: builtin/cat-file.c:247
2622msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 2623msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5
JX
2624
2625#: builtin/cat-file.c:248
2626msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 2627msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5
JX
2628
2629#: builtin/cat-file.c:266
2630msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 2631msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5
JX
2632
2633#: builtin/cat-file.c:267
ef317cd5 2634msgid "show object type"
07432cef 2635msgstr "显示对象类型"
ef317cd5
JX
2636
2637#: builtin/cat-file.c:268
ef317cd5 2638msgid "show object size"
07432cef 2639msgstr "显示对象大小"
ef317cd5
JX
2640
2641#: builtin/cat-file.c:270
2642msgid "exit with zero when there's no error"
07432cef 2643msgstr "当没有错误时退出并返回零"
ef317cd5
JX
2644
2645#: builtin/cat-file.c:271
2646msgid "pretty-print object's content"
07432cef 2647msgstr "美观地打印对象的内容"
ef317cd5
JX
2648
2649#: builtin/cat-file.c:273
2650msgid "for blob objects, run textconv on object's content"
07432cef 2651msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5
JX
2652
2653#: builtin/cat-file.c:275
2654msgid "show info and content of objects fed from the standard input"
07432cef 2655msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5
JX
2656
2657#: builtin/cat-file.c:278
ef317cd5 2658msgid "show info about objects fed from the standard input"
07432cef 2659msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
2660
2661#: builtin/check-attr.c:11
2662msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 2663msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
2664
2665#: builtin/check-attr.c:12
07432cef
WS
2666msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2667msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
2668
2669#: builtin/check-attr.c:19
2670msgid "report all attributes set on file"
07432cef 2671msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
2672
2673#: builtin/check-attr.c:20
2674msgid "use .gitattributes only from the index"
07432cef 2675msgstr "只使用索引中的 .gitattributes"
ef317cd5 2676
a77c07d9 2677#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
ef317cd5 2678msgid "read file names from stdin"
07432cef 2679msgstr "从标准输入读出文件名"
ef317cd5 2680
a77c07d9 2681#: builtin/check-attr.c:23 builtin/check-ignore.c:24
ef317cd5 2682msgid "input paths are terminated by a null character"
07432cef 2683msgstr "输入路径以null字符终止"
ef317cd5 2684
a77c07d9
JX
2685#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
2686msgid "suppress progress reporting"
2687msgstr "不显示进度报告"
2688
2689#: builtin/check-ignore.c:151
2690msgid "cannot specify pathnames with --stdin"
2691msgstr "不能同时提供路径及 --stdin 参数"
2692
2693#: builtin/check-ignore.c:154
2694msgid "-z only makes sense with --stdin"
2695msgstr "-z 需要和 --stdin 参数共用才有意义"
2696
2697#: builtin/check-ignore.c:156
2698msgid "no path specified"
2699msgstr "未指定路径"
2700
2701#: builtin/check-ignore.c:160
2702msgid "--quiet is only valid with a single pathname"
2703msgstr "参数 --quiet 只在提供一个路径名时有效"
2704
2705#: builtin/check-ignore.c:162
2706msgid "cannot have both --quiet and --verbose"
2707msgstr "不能同时提供 --quiet 和 --verbose 参数"
2708
ef317cd5
JX
2709#: builtin/checkout-index.c:126
2710msgid "git checkout-index [options] [--] [<file>...]"
07432cef 2711msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5
JX
2712
2713#: builtin/checkout-index.c:187
2714msgid "check out all files in the index"
07432cef 2715msgstr "检出索引区的所有文件"
ef317cd5
JX
2716
2717#: builtin/checkout-index.c:188
2718msgid "force overwrite of existing files"
07432cef 2719msgstr "强制覆盖现有的文件"
ef317cd5
JX
2720
2721#: builtin/checkout-index.c:190
2722msgid "no warning for existing files and files not in index"
07432cef 2723msgstr "存在或不在索引中的文件都没有警告"
ef317cd5
JX
2724
2725#: builtin/checkout-index.c:192
ef317cd5 2726msgid "don't checkout new files"
07432cef 2727msgstr "不检出新文件"
ef317cd5
JX
2728
2729#: builtin/checkout-index.c:194
ef317cd5 2730msgid "update stat information in the index file"
07432cef 2731msgstr "更新索引中文件的状态信息"
ef317cd5
JX
2732
2733#: builtin/checkout-index.c:200
ef317cd5 2734msgid "read list of paths from the standard input"
07432cef 2735msgstr "从标准输入读取路径列表"
ef317cd5
JX
2736
2737#: builtin/checkout-index.c:202
2738msgid "write the content to temporary files"
07432cef 2739msgstr "将内容写入临时文件"
ef317cd5
JX
2740
2741#: builtin/checkout-index.c:203 builtin/column.c:30
2742msgid "string"
07432cef 2743msgstr "字符串"
ef317cd5
JX
2744
2745#: builtin/checkout-index.c:204
2746msgid "when creating files, prepend <string>"
07432cef 2747msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5
JX
2748
2749#: builtin/checkout-index.c:207
2750msgid "copy out the files from named stage"
07432cef 2751msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
2752
2753#: builtin/checkout.c:25
ef317cd5 2754msgid "git checkout [options] <branch>"
07432cef 2755msgstr "git checkout [选项] <分支>"
ef317cd5
JX
2756
2757#: builtin/checkout.c:26
ef317cd5 2758msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 2759msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5
JX
2760
2761#: builtin/checkout.c:116 builtin/checkout.c:149
c04f5ac3
JX
2762#, c-format
2763msgid "path '%s' does not have our version"
2764msgstr "路径 '%s' 没有我们的版本"
2765
ef317cd5 2766#: builtin/checkout.c:118 builtin/checkout.c:151
c04f5ac3
JX
2767#, c-format
2768msgid "path '%s' does not have their version"
2769msgstr "路径 '%s' 没有他们的版本"
2770
ef317cd5 2771#: builtin/checkout.c:134
c04f5ac3
JX
2772#, c-format
2773msgid "path '%s' does not have all necessary versions"
2774msgstr "路径 '%s' 没有全部必须的版本"
2775
ef317cd5 2776#: builtin/checkout.c:178
c04f5ac3
JX
2777#, c-format
2778msgid "path '%s' does not have necessary versions"
2779msgstr "路径 '%s' 没有必须的版本"
2780
ef317cd5 2781#: builtin/checkout.c:195
c04f5ac3
JX
2782#, c-format
2783msgid "path '%s': cannot merge"
90e6ef53 2784msgstr "path '%s':无法合并"
c04f5ac3 2785
ef317cd5 2786#: builtin/checkout.c:212
c04f5ac3
JX
2787#, c-format
2788msgid "Unable to add merge result for '%s'"
2789msgstr "无法为 '%s' 添加合并结果"
2790
ef317cd5
JX
2791#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2792#: builtin/checkout.c:245
07432cef 2793#, c-format
ef317cd5 2794msgid "'%s' cannot be used with updating paths"
07432cef 2795msgstr "'%s' 不能在更新路径时使用"
ef317cd5
JX
2796
2797#: builtin/checkout.c:248 builtin/checkout.c:251
07432cef 2798#, c-format
ef317cd5 2799msgid "'%s' cannot be used with %s"
07432cef 2800msgstr "'%s' 不能和 %s 同时使用"
ef317cd5
JX
2801
2802#: builtin/checkout.c:254
2803#, c-format
2804msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 2805msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5
JX
2806
2807#: builtin/checkout.c:265 builtin/checkout.c:426
c04f5ac3 2808msgid "corrupt index file"
90e6ef53 2809msgstr "损坏的索引文件"
c04f5ac3 2810
ef317cd5 2811#: builtin/checkout.c:295 builtin/checkout.c:302
c04f5ac3
JX
2812#, c-format
2813msgid "path '%s' is unmerged"
2814msgstr "路径 '%s' 未合并"
2815
ef317cd5 2816#: builtin/checkout.c:448
c04f5ac3 2817msgid "you need to resolve your current index first"
90e6ef53 2818msgstr "您需要先解决当前索引的冲突"
c04f5ac3 2819
ef317cd5 2820#: builtin/checkout.c:569
c04f5ac3
JX
2821#, c-format
2822msgid "Can not do reflog for '%s'\n"
90e6ef53 2823msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 2824
ef317cd5 2825#: builtin/checkout.c:602
c04f5ac3
JX
2826msgid "HEAD is now at"
2827msgstr "HEAD 目前位于"
2828
ef317cd5 2829#: builtin/checkout.c:609
c04f5ac3
JX
2830#, c-format
2831msgid "Reset branch '%s'\n"
2832msgstr "重置分支 '%s'\n"
2833
ef317cd5 2834#: builtin/checkout.c:612
c04f5ac3
JX
2835#, c-format
2836msgid "Already on '%s'\n"
2837msgstr "已经位于 '%s'\n"
2838
ef317cd5 2839#: builtin/checkout.c:616
c04f5ac3
JX
2840#, c-format
2841msgid "Switched to and reset branch '%s'\n"
2842msgstr "切换并重置分支 '%s'\n"
2843
07432cef 2844#: builtin/checkout.c:618 builtin/checkout.c:955
c04f5ac3
JX
2845#, c-format
2846msgid "Switched to a new branch '%s'\n"
2847msgstr "切换到一个新分支 '%s'\n"
2848
ef317cd5 2849#: builtin/checkout.c:620
c04f5ac3
JX
2850#, c-format
2851msgid "Switched to branch '%s'\n"
2852msgstr "切换到分支 '%s'\n"
2853
90e6ef53 2854# 译者:注意保持前导空格
ef317cd5 2855#: builtin/checkout.c:676
c04f5ac3
JX
2856#, c-format
2857msgid " ... and %d more.\n"
90e6ef53 2858msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
2859
2860#. The singular version
ef317cd5 2861#: builtin/checkout.c:682
c04f5ac3
JX
2862#, c-format
2863msgid ""
2864"Warning: you are leaving %d commit behind, not connected to\n"
2865"any of your branches:\n"
2866"\n"
2867"%s\n"
2868msgid_plural ""
2869"Warning: you are leaving %d commits behind, not connected to\n"
2870"any of your branches:\n"
2871"\n"
2872"%s\n"
2873msgstr[0] ""
2874"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2875"\n"
2876"%s\n"
5ae481e0
JX
2877msgstr[1] ""
2878"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2879"\n"
2880"%s\n"
c04f5ac3 2881
ef317cd5 2882#: builtin/checkout.c:700
c04f5ac3
JX
2883#, c-format
2884msgid ""
2885"If you want to keep them by creating a new branch, this may be a good time\n"
2886"to do so with:\n"
2887"\n"
2888" git branch new_branch_name %s\n"
2889"\n"
2890msgstr ""
2891"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2892"如下操作:\n"
2893"\n"
2894" git branch new_branch_name %s\n"
2895"\n"
2896
ef317cd5 2897#: builtin/checkout.c:730
c04f5ac3
JX
2898msgid "internal error in revision walk"
2899msgstr "在版本遍历时遇到内部错误"
2900
ef317cd5 2901#: builtin/checkout.c:734
c04f5ac3
JX
2902msgid "Previous HEAD position was"
2903msgstr "之前的 HEAD 位置是"
2904
ef317cd5 2905#: builtin/checkout.c:761 builtin/checkout.c:950
c04f5ac3 2906msgid "You are on a branch yet to be born"
90e6ef53 2907msgstr "您位于一个尚未初始化的分支"
c04f5ac3
JX
2908
2909#. case (1)
ef317cd5 2910#: builtin/checkout.c:886
c04f5ac3
JX
2911#, c-format
2912msgid "invalid reference: %s"
2913msgstr "无效引用:%s"
2914
2915#. case (1): want a tree
ef317cd5 2916#: builtin/checkout.c:925
c04f5ac3
JX
2917#, c-format
2918msgid "reference is not a tree: %s"
2919msgstr "引用不是一个树:%s"
2920
07432cef 2921#: builtin/checkout.c:964
ef317cd5 2922msgid "paths cannot be used with switching branches"
07432cef 2923msgstr "路径不能和切换分支同时使用"
c04f5ac3 2924
07432cef
WS
2925#: builtin/checkout.c:967 builtin/checkout.c:971
2926#, c-format
ef317cd5 2927msgid "'%s' cannot be used with switching branches"
07432cef 2928msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 2929
07432cef
WS
2930#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2931#: builtin/checkout.c:986
2932#, c-format
ef317cd5 2933msgid "'%s' cannot be used with '%s'"
07432cef 2934msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 2935
07432cef
WS
2936#: builtin/checkout.c:991
2937#, c-format
ef317cd5 2938msgid "Cannot switch branch to a non-commit '%s'"
07432cef 2939msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 2940
07432cef 2941#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
ef317cd5 2942#: builtin/remote.c:169 builtin/remote.c:171
ef317cd5 2943msgid "branch"
07432cef 2944msgstr "分支"
c04f5ac3 2945
07432cef 2946#: builtin/checkout.c:1014
ef317cd5 2947msgid "create and checkout a new branch"
07432cef 2948msgstr "创建并检出一个新的分支"
c04f5ac3 2949
07432cef 2950#: builtin/checkout.c:1016
ef317cd5 2951msgid "create/reset and checkout a branch"
07432cef 2952msgstr "创建/重置并检出一个分支"
c04f5ac3 2953
07432cef 2954#: builtin/checkout.c:1017
ef317cd5 2955msgid "create reflog for new branch"
07432cef 2956msgstr "为新的分支创建引用日志"
ef317cd5 2957
07432cef 2958#: builtin/checkout.c:1018
ef317cd5 2959msgid "detach the HEAD at named commit"
07432cef 2960msgstr "成为指向该提交的分离头指针"
ef317cd5 2961
07432cef 2962#: builtin/checkout.c:1019
ef317cd5 2963msgid "set upstream info for new branch"
07432cef 2964msgstr "为新的分支设置上游信息"
ef317cd5 2965
07432cef 2966#: builtin/checkout.c:1021
ef317cd5 2967msgid "new branch"
07432cef 2968msgstr "新分支"
ef317cd5 2969
07432cef 2970#: builtin/checkout.c:1021
ef317cd5 2971msgid "new unparented branch"
07432cef 2972msgstr "新的没有父提交的分支"
ef317cd5 2973
07432cef 2974#: builtin/checkout.c:1022
ef317cd5 2975msgid "checkout our version for unmerged files"
07432cef 2976msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 2977
07432cef 2978#: builtin/checkout.c:1024
ef317cd5 2979msgid "checkout their version for unmerged files"
07432cef 2980msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 2981
07432cef 2982#: builtin/checkout.c:1026
ef317cd5 2983msgid "force checkout (throw away local modifications)"
07432cef 2984msgstr "强制检出(丢弃本地修改)"
c04f5ac3 2985
07432cef 2986#: builtin/checkout.c:1027
ef317cd5 2987msgid "perform a 3-way merge with the new branch"
07432cef 2988msgstr "和新的分支执行三路合并"
ef317cd5 2989
07432cef 2990#: builtin/checkout.c:1028 builtin/merge.c:215
ef317cd5 2991msgid "update ignored files (default)"
07432cef 2992msgstr "更新忽略的文件(默认)"
c04f5ac3 2993
07432cef 2994#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
ef317cd5 2995msgid "style"
07432cef 2996msgstr "风格"
ef317cd5 2997
07432cef 2998#: builtin/checkout.c:1030
ef317cd5 2999msgid "conflict style (merge or diff3)"
07432cef 3000msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3001
07432cef 3002#: builtin/checkout.c:1033
ef317cd5 3003msgid "second guess 'git checkout no-such-branch'"
07432cef 3004msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 3005
07432cef 3006#: builtin/checkout.c:1057
ef317cd5 3007msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3008msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3009
07432cef 3010#: builtin/checkout.c:1074
ef317cd5
JX
3011msgid "--track needs a branch name"
3012msgstr "--track 需要一个分支名"
3013
07432cef 3014#: builtin/checkout.c:1081
ef317cd5
JX
3015msgid "Missing branch name; try -b"
3016msgstr "缺少分支名;尝试 -b"
3017
07432cef 3018#: builtin/checkout.c:1116
c04f5ac3 3019msgid "invalid path specification"
90e6ef53 3020msgstr "无效的路径规格"
c04f5ac3 3021
07432cef
WS
3022#: builtin/checkout.c:1123
3023#, c-format
c04f5ac3 3024msgid ""
ef317cd5 3025"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3026"Did you intend to checkout '%s' which can not be resolved as commit?"
3027msgstr ""
07432cef
WS
3028"不能同时更新路径并切换到分支'%s'。\n"
3029"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3030
07432cef
WS
3031#: builtin/checkout.c:1128
3032#, c-format
ef317cd5 3033msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3034msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3035
07432cef 3036#: builtin/checkout.c:1132
c04f5ac3
JX
3037msgid ""
3038"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3039"checking out of the index."
3040msgstr ""
90e6ef53 3041"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3042
07432cef 3043#: builtin/clean.c:20
ef317cd5 3044msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
07432cef 3045msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3046
07432cef
WS
3047#: builtin/clean.c:24
3048#, c-format
3049msgid "Removing %s\n"
3050msgstr "正删除 %s\n"
3051
3052#: builtin/clean.c:25
3053#, c-format
3054msgid "Would remove %s\n"
3055msgstr "将删除 %s\n"
3056
3057#: builtin/clean.c:26
3058#, c-format
3059msgid "Skipping repository %s\n"
3060msgstr "忽略版本库 %s\n"
3061
3062#: builtin/clean.c:27
3063#, c-format
3064msgid "Would skip repository %s\n"
3065msgstr "将忽略版本库 %s\n"
3066
3067#: builtin/clean.c:28
3068#, c-format
3069msgid "failed to remove %s"
3070msgstr "无法删除 %s"
3071
a77c07d9 3072#: builtin/clean.c:160
ef317cd5 3073msgid "do not print names of files removed"
07432cef 3074msgstr "不打印删除文件的名称"
ef317cd5 3075
a77c07d9 3076#: builtin/clean.c:162
ef317cd5 3077msgid "force"
07432cef 3078msgstr "强制"
ef317cd5 3079
a77c07d9 3080#: builtin/clean.c:164
ef317cd5 3081msgid "remove whole directories"
07432cef 3082msgstr "删除整个目录"
ef317cd5 3083
a77c07d9
JX
3084#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
3085#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
ef317cd5 3086msgid "pattern"
07432cef 3087msgstr "模式"
ef317cd5 3088
a77c07d9 3089#: builtin/clean.c:166
ef317cd5 3090msgid "add <pattern> to ignore rules"
07432cef 3091msgstr "添加<模式>到忽略规则"
ef317cd5 3092
a77c07d9 3093#: builtin/clean.c:167
ef317cd5 3094msgid "remove ignored files, too"
07432cef 3095msgstr "也删除忽略的文件"
ef317cd5 3096
a77c07d9 3097#: builtin/clean.c:169
ef317cd5 3098msgid "remove only ignored files"
07432cef 3099msgstr "只删除忽略的文件"
c04f5ac3 3100
a77c07d9 3101#: builtin/clean.c:187
c04f5ac3 3102msgid "-x and -X cannot be used together"
649900bc 3103msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3104
a77c07d9 3105#: builtin/clean.c:191
c04f5ac3
JX
3106msgid ""
3107"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3108msgstr ""
90e6ef53 3109"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3110
a77c07d9 3111#: builtin/clean.c:194
c04f5ac3
JX
3112msgid ""
3113"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3114"clean"
3115msgstr ""
90e6ef53 3116"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3117
ef317cd5
JX
3118#: builtin/clone.c:36
3119msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3120msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5
JX
3121
3122#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
a77c07d9 3123#: builtin/push.c:436
ef317cd5 3124msgid "force progress reporting"
07432cef 3125msgstr "强制显示进度报告"
ef317cd5
JX
3126
3127#: builtin/clone.c:66
3128msgid "don't create a checkout"
07432cef 3129msgstr "不创建一个检出"
ef317cd5
JX
3130
3131#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
ef317cd5 3132msgid "create a bare repository"
07432cef 3133msgstr "创建一个裸版本库"
ef317cd5
JX
3134
3135#: builtin/clone.c:72
3136msgid "create a mirror repository (implies bare)"
07432cef 3137msgstr "创建一个镜像版本库(也是裸版本库)"
ef317cd5
JX
3138
3139#: builtin/clone.c:74
3140msgid "to clone from a local repository"
07432cef 3141msgstr "从本地版本库克隆"
ef317cd5
JX
3142
3143#: builtin/clone.c:76
3144msgid "don't use local hardlinks, always copy"
07432cef 3145msgstr "不使用本地硬链接,始终复制"
ef317cd5
JX
3146
3147#: builtin/clone.c:78
ef317cd5 3148msgid "setup as shared repository"
07432cef 3149msgstr "设置为共享版本库"
ef317cd5
JX
3150
3151#: builtin/clone.c:80 builtin/clone.c:82
3152msgid "initialize submodules in the clone"
07432cef 3153msgstr "在克隆时初始化子模组"
ef317cd5
JX
3154
3155#: builtin/clone.c:83 builtin/init-db.c:485
ef317cd5 3156msgid "template-directory"
07432cef 3157msgstr "模板目录"
ef317cd5
JX
3158
3159#: builtin/clone.c:84 builtin/init-db.c:486
3160msgid "directory from which templates will be used"
07432cef 3161msgstr "模板目录将被使用"
ef317cd5
JX
3162
3163#: builtin/clone.c:86
3164msgid "reference repository"
07432cef 3165msgstr "引用版本库"
ef317cd5
JX
3166
3167#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3168msgid "name"
07432cef 3169msgstr "名称"
ef317cd5
JX
3170
3171#: builtin/clone.c:88
3172msgid "use <name> instead of 'origin' to track upstream"
07432cef 3173msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5
JX
3174
3175#: builtin/clone.c:90
3176msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3177msgstr "检出<分支>而不是远程HEAD"
ef317cd5
JX
3178
3179#: builtin/clone.c:92
3180msgid "path to git-upload-pack on the remote"
07432cef 3181msgstr "远程 git-upload-pack 路径"
ef317cd5 3182
07432cef 3183#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
ef317cd5 3184msgid "depth"
07432cef 3185msgstr "深度"
ef317cd5
JX
3186
3187#: builtin/clone.c:94
3188msgid "create a shallow clone of that depth"
07432cef 3189msgstr "创建一个指定深度的浅克隆"
ef317cd5
JX
3190
3191#: builtin/clone.c:96
3192msgid "clone only one branch, HEAD or --branch"
07432cef 3193msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5
JX
3194
3195#: builtin/clone.c:97 builtin/init-db.c:494
3196msgid "gitdir"
07432cef 3197msgstr "git目录"
ef317cd5
JX
3198
3199#: builtin/clone.c:98 builtin/init-db.c:495
3200msgid "separate git dir from working tree"
07432cef 3201msgstr "git目录和工作区分离"
ef317cd5
JX
3202
3203#: builtin/clone.c:99
3204msgid "key=value"
07432cef 3205msgstr "key=value"
ef317cd5
JX
3206
3207#: builtin/clone.c:100
ef317cd5 3208msgid "set config inside the new repository"
07432cef 3209msgstr "在新版本库中设置配置信息"
ef317cd5 3210
7ac1c0ad 3211#: builtin/clone.c:243
c04f5ac3
JX
3212#, c-format
3213msgid "reference repository '%s' is not a local directory."
3214msgstr "引用版本库 '%s' 不是一个本地目录。"
3215
7ac1c0ad 3216#: builtin/clone.c:306
c04f5ac3
JX
3217#, c-format
3218msgid "failed to create directory '%s'"
90e6ef53 3219msgstr "无法创建目录 '%s'"
c04f5ac3 3220
c160d03f 3221#: builtin/clone.c:308 builtin/diff.c:77
c04f5ac3
JX
3222#, c-format
3223msgid "failed to stat '%s'"
90e6ef53 3224msgstr "无法枚举 '%s' 状态"
c04f5ac3 3225
7ac1c0ad 3226#: builtin/clone.c:310
c04f5ac3
JX
3227#, c-format
3228msgid "%s exists and is not a directory"
3229msgstr "%s 存在且不是一个目录"
3230
7ac1c0ad 3231#: builtin/clone.c:324
c04f5ac3
JX
3232#, c-format
3233msgid "failed to stat %s\n"
90e6ef53 3234msgstr "无法枚举 %s 状态\n"
c04f5ac3 3235
7ac1c0ad 3236#: builtin/clone.c:346
c04f5ac3
JX
3237#, c-format
3238msgid "failed to create link '%s'"
90e6ef53 3239msgstr "无法创建链接 '%s'"
c04f5ac3 3240
7ac1c0ad 3241#: builtin/clone.c:350
c04f5ac3
JX
3242#, c-format
3243msgid "failed to copy file to '%s'"
90e6ef53 3244msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3245
7ac1c0ad 3246#: builtin/clone.c:373
c04f5ac3
JX
3247#, c-format
3248msgid "done.\n"
3249msgstr "完成。\n"
3250
23ff3338 3251#: builtin/clone.c:443
c04f5ac3
JX
3252#, c-format
3253msgid "Could not find remote branch %s to clone."
90e6ef53 3254msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3255
23ff3338 3256#: builtin/clone.c:552
c04f5ac3
JX
3257msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3258msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3259
07432cef 3260#: builtin/clone.c:690
c04f5ac3
JX
3261msgid "Too many arguments."
3262msgstr "太多参数。"
3263
07432cef 3264#: builtin/clone.c:694
c04f5ac3 3265msgid "You must specify a repository to clone."
90e6ef53 3266msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 3267
07432cef 3268#: builtin/clone.c:705
c04f5ac3
JX
3269#, c-format
3270msgid "--bare and --origin %s options are incompatible."
3271msgstr "--bare 和 --origin %s 选项不兼容。"
3272
07432cef
WS
3273#: builtin/clone.c:708
3274msgid "--bare and --separate-git-dir are incompatible."
3275msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3276
3277#: builtin/clone.c:721
c04f5ac3
JX
3278#, c-format
3279msgid "repository '%s' does not exist"
3280msgstr "版本库 '%s' 不存在"
3281
07432cef 3282#: builtin/clone.c:726
c04f5ac3
JX
3283msgid "--depth is ignored in local clones; use file:// instead."
3284msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3285
07432cef 3286#: builtin/clone.c:736
c04f5ac3
JX
3287#, c-format
3288msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 3289msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 3290
07432cef 3291#: builtin/clone.c:746
c04f5ac3
JX
3292#, c-format
3293msgid "working tree '%s' already exists."
3294msgstr "工作区 '%s' 已经存在。"
3295
a77c07d9 3296#: builtin/clone.c:759 builtin/clone.c:771
c04f5ac3
JX
3297#, c-format
3298msgid "could not create leading directories of '%s'"
90e6ef53 3299msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 3300
07432cef 3301#: builtin/clone.c:762
c04f5ac3
JX
3302#, c-format
3303msgid "could not create work tree dir '%s'."
90e6ef53 3304msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 3305
a77c07d9 3306#: builtin/clone.c:781
c04f5ac3
JX
3307#, c-format
3308msgid "Cloning into bare repository '%s'...\n"
3309msgstr "克隆到裸版本库 '%s'...\n"
3310
a77c07d9 3311#: builtin/clone.c:783
c04f5ac3
JX
3312#, c-format
3313msgid "Cloning into '%s'...\n"
3314msgstr "正克隆到 '%s'...\n"
3315
a77c07d9 3316#: builtin/clone.c:818
c04f5ac3
JX
3317#, c-format
3318msgid "Don't know how to clone %s"
3319msgstr "不知道如何克隆 %s"
3320
a77c07d9 3321#: builtin/clone.c:867
c04f5ac3
JX
3322#, c-format
3323msgid "Remote branch %s not found in upstream %s"
3324msgstr "远程分支 %s 在上游 %s 未发现"
3325
a77c07d9 3326#: builtin/clone.c:874
c04f5ac3
JX
3327msgid "You appear to have cloned an empty repository."
3328msgstr "您似乎克隆了一个空版本库。"
3329
ef317cd5
JX
3330#: builtin/column.c:9
3331msgid "git column [options]"
07432cef 3332msgstr "git column [选项]"
ef317cd5
JX
3333
3334#: builtin/column.c:26
3335msgid "lookup config vars"
07432cef 3336msgstr "查找配置变量"
ef317cd5
JX
3337
3338#: builtin/column.c:27 builtin/column.c:28
ef317cd5 3339msgid "layout to use"
07432cef 3340msgstr "要使用的布局"
ef317cd5
JX
3341
3342#: builtin/column.c:29
3343msgid "Maximum width"
07432cef 3344msgstr "最大宽度"
ef317cd5
JX
3345
3346#: builtin/column.c:30
3347msgid "Padding space on left border"
07432cef 3348msgstr "左边框的填充空间"
ef317cd5
JX
3349
3350#: builtin/column.c:31
3351msgid "Padding space on right border"
07432cef 3352msgstr "右边框的填充空间"
ef317cd5
JX
3353
3354#: builtin/column.c:32
3355msgid "Padding space between columns"
07432cef 3356msgstr "两列之间的填充空间"
ef317cd5 3357
8ada9598
JX
3358#: builtin/column.c:51
3359msgid "--command must be the first argument"
81809b99 3360msgstr "--command 必须是第一个参数"
8ada9598 3361
07432cef 3362#: builtin/commit.c:34
a77c07d9
JX
3363msgid "git commit [options] [--] <pathspec>..."
3364msgstr "git commit [选项] [--] <路径匹配>..."
ef317cd5 3365
07432cef 3366#: builtin/commit.c:39
a77c07d9
JX
3367msgid "git status [options] [--] <pathspec>..."
3368msgstr "git status [选项] [--] <路径匹配>..."
ef317cd5 3369
07432cef 3370#: builtin/commit.c:44
c04f5ac3
JX
3371msgid ""
3372"Your name and email address were configured automatically based\n"
3373"on your username and hostname. Please check that they are accurate.\n"
3374"You can suppress this message by setting them explicitly:\n"
3375"\n"
3376" git config --global user.name \"Your Name\"\n"
3377" git config --global user.email you@example.com\n"
3378"\n"
3379"After doing this, you may fix the identity used for this commit with:\n"
3380"\n"
3381" git commit --amend --reset-author\n"
3382msgstr ""
90e6ef53
JX
3383"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3384"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
3385"\n"
3386" git config --global user.name \"Your Name\"\n"
3387" git config --global user.email you@example.com\n"
3388"\n"
90e6ef53 3389"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
3390"\n"
3391" git commit --amend --reset-author\n"
3392
07432cef 3393#: builtin/commit.c:56
c04f5ac3
JX
3394msgid ""
3395"You asked to amend the most recent commit, but doing so would make\n"
3396"it empty. You can repeat your command with --allow-empty, or you can\n"
3397"remove the commit entirely with \"git reset HEAD^\".\n"
3398msgstr ""
1b150dc9
T
3399"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3400"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 3401
07432cef 3402#: builtin/commit.c:61
c04f5ac3
JX
3403msgid ""
3404"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3405"If you wish to commit it anyway, use:\n"
3406"\n"
3407" git commit --allow-empty\n"
3408"\n"
3409"Otherwise, please use 'git reset'\n"
3410msgstr ""
a9ce4543
T
3411"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3412"也要提交,使用命令:\n"
c04f5ac3
JX
3413"\n"
3414" git commit --allow-empty\n"
3415"\n"
a9ce4543 3416"否则,请使用命令 'git reset'\n"
c04f5ac3 3417
07432cef 3418#: builtin/commit.c:258
c04f5ac3 3419msgid "failed to unpack HEAD tree object"
90e6ef53 3420msgstr "无法解包 HEAD 树对象"
c04f5ac3 3421
07432cef 3422#: builtin/commit.c:300
c04f5ac3 3423msgid "unable to create temporary index"
90e6ef53 3424msgstr "不能创建临时索引"
c04f5ac3 3425
07432cef 3426#: builtin/commit.c:306
c04f5ac3
JX
3427msgid "interactive add failed"
3428msgstr "交互式添加失败"
3429
07432cef 3430#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
c04f5ac3 3431msgid "unable to write new_index file"
90e6ef53 3432msgstr "无法写 new_index 文件"
c04f5ac3 3433
07432cef 3434#: builtin/commit.c:391
8ada9598 3435msgid "cannot do a partial commit during a merge."
81809b99 3436msgstr "在合并过程中不能做部分提交。"
c04f5ac3 3437
07432cef 3438#: builtin/commit.c:393
8ada9598 3439msgid "cannot do a partial commit during a cherry-pick."
81809b99 3440msgstr "在拣选过程中不能做部分提交。"
8ada9598 3441
07432cef 3442#: builtin/commit.c:403
c04f5ac3 3443msgid "cannot read the index"
90e6ef53 3444msgstr "无法读取索引"
c04f5ac3 3445
07432cef 3446#: builtin/commit.c:423
c04f5ac3 3447msgid "unable to write temporary index file"
90e6ef53 3448msgstr "无法写临时索引文件"
c04f5ac3 3449
07432cef 3450#: builtin/commit.c:511 builtin/commit.c:517
c04f5ac3
JX
3451#, c-format
3452msgid "invalid commit: %s"
3453msgstr "无效的提交:%s"
3454
07432cef 3455#: builtin/commit.c:540
c04f5ac3
JX
3456msgid "malformed --author parameter"
3457msgstr "非法的 --author 参数"
3458
07432cef 3459#: builtin/commit.c:560
c04f5ac3
JX
3460#, c-format
3461msgid "Malformed ident string: '%s'"
90e6ef53 3462msgstr "非法的身份字符串:'%s'"
c04f5ac3 3463
07432cef 3464#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
c04f5ac3
JX
3465#, c-format
3466msgid "could not lookup commit %s"
3467msgstr "不能查询提交 %s"
3468
07432cef 3469#: builtin/commit.c:610 builtin/shortlog.c:272
c04f5ac3
JX
3470#, c-format
3471msgid "(reading log message from standard input)\n"
90e6ef53 3472msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 3473
07432cef 3474#: builtin/commit.c:612
c04f5ac3 3475msgid "could not read log from standard input"
90e6ef53 3476msgstr "不能从标准输入中读取日志信息"
c04f5ac3 3477
07432cef 3478#: builtin/commit.c:616
c04f5ac3
JX
3479#, c-format
3480msgid "could not read log file '%s'"
90e6ef53 3481msgstr "不能读取日志文件 '%s'"
c04f5ac3 3482
07432cef 3483#: builtin/commit.c:622
c04f5ac3
JX
3484msgid "commit has empty message"
3485msgstr "提交说明为空"
3486
07432cef 3487#: builtin/commit.c:638
c04f5ac3 3488msgid "could not read MERGE_MSG"
90e6ef53 3489msgstr "不能读取 MERGE_MSG"
c04f5ac3 3490
07432cef 3491#: builtin/commit.c:642
c04f5ac3 3492msgid "could not read SQUASH_MSG"
90e6ef53 3493msgstr "不能读取 SQUASH_MSG"
c04f5ac3 3494
07432cef 3495#: builtin/commit.c:646
c04f5ac3
JX
3496#, c-format
3497msgid "could not read '%s'"
90e6ef53 3498msgstr "不能读取 '%s'"
c04f5ac3 3499
07432cef 3500#: builtin/commit.c:707
c04f5ac3 3501msgid "could not write commit template"
90e6ef53 3502msgstr "不能写提交模版"
c04f5ac3 3503
07432cef 3504#: builtin/commit.c:718
81809b99 3505#, c-format
c04f5ac3
JX
3506msgid ""
3507"\n"
8ada9598 3508"It looks like you may be committing a merge.\n"
c04f5ac3
JX
3509"If this is not correct, please remove the file\n"
3510"\t%s\n"
3511"and try again.\n"
3512msgstr ""
3513"\n"
649900bc 3514"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
3515"\t%s\n"
3516"然后重试。\n"
3517
07432cef 3518#: builtin/commit.c:723
81809b99 3519#, c-format
8ada9598
JX
3520msgid ""
3521"\n"
3522"It looks like you may be committing a cherry-pick.\n"
3523"If this is not correct, please remove the file\n"
3524"\t%s\n"
3525"and try again.\n"
3526msgstr ""
3527"\n"
649900bc 3528"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
3529"\t%s\n"
3530"然后重试。\n"
c04f5ac3 3531
07432cef 3532#: builtin/commit.c:735
a77c07d9 3533#, c-format
c04f5ac3 3534msgid ""
8ada9598 3535"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 3536"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 3537msgstr ""
a77c07d9 3538"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 3539"说明将会终止提交。\n"
c04f5ac3 3540
07432cef 3541#: builtin/commit.c:740
a77c07d9 3542#, c-format
c04f5ac3 3543msgid ""
8ada9598 3544"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 3545"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
3546"An empty message aborts the commit.\n"
3547msgstr ""
a77c07d9
JX
3548"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3549"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 3550
90e6ef53 3551# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 3552#: builtin/commit.c:753
c04f5ac3
JX
3553#, c-format
3554msgid "%sAuthor: %s"
3555msgstr "%s作者: %s"
3556
90e6ef53 3557# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 3558#: builtin/commit.c:760
c04f5ac3
JX
3559#, c-format
3560msgid "%sCommitter: %s"
3561msgstr "%s提交者: %s"
3562
07432cef 3563#: builtin/commit.c:780
c04f5ac3 3564msgid "Cannot read index"
90e6ef53 3565msgstr "无法读取索引"
c04f5ac3 3566
07432cef 3567#: builtin/commit.c:817
c04f5ac3
JX
3568msgid "Error building trees"
3569msgstr "无法创建树对象"
3570
a77c07d9 3571#: builtin/commit.c:832 builtin/tag.c:359
c04f5ac3
JX
3572#, c-format
3573msgid "Please supply the message using either -m or -F option.\n"
07432cef 3574msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 3575
07432cef 3576#: builtin/commit.c:929
c04f5ac3
JX
3577#, c-format
3578msgid "No existing author found with '%s'"
3579msgstr "没有找到匹配 '%s' 的作者"
3580
a77c07d9 3581#: builtin/commit.c:944 builtin/commit.c:1138
c04f5ac3
JX
3582#, c-format
3583msgid "Invalid untracked files mode '%s'"
90e6ef53 3584msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 3585
a77c07d9 3586#: builtin/commit.c:974
c04f5ac3
JX
3587msgid "Using both --reset-author and --author does not make sense"
3588msgstr "同时使用 --reset-author 和 --author 没有意义"
3589
a77c07d9 3590#: builtin/commit.c:985
c04f5ac3 3591msgid "You have nothing to amend."
90e6ef53 3592msgstr "您没有可修补的提交。"
c04f5ac3 3593
a77c07d9 3594#: builtin/commit.c:988
8ada9598 3595msgid "You are in the middle of a merge -- cannot amend."
81809b99 3596msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 3597
a77c07d9 3598#: builtin/commit.c:990
8ada9598 3599msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 3600msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 3601
a77c07d9 3602#: builtin/commit.c:993
c04f5ac3 3603msgid "Options --squash and --fixup cannot be used together"
649900bc 3604msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 3605
a77c07d9 3606#: builtin/commit.c:1003
c04f5ac3
JX
3607msgid "Only one of -c/-C/-F/--fixup can be used."
3608msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3609
a77c07d9 3610#: builtin/commit.c:1005
c04f5ac3 3611msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 3612msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 3613
a77c07d9 3614#: builtin/commit.c:1013
c04f5ac3 3615msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 3616msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 3617
a77c07d9 3618#: builtin/commit.c:1030
c04f5ac3
JX
3619msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3620msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3621
a77c07d9 3622#: builtin/commit.c:1032
c04f5ac3
JX
3623msgid "No paths with --include/--only does not make sense."
3624msgstr "参数 --include/--only 不跟路径没有意义。"
3625
a77c07d9 3626#: builtin/commit.c:1034
c04f5ac3 3627msgid "Clever... amending the last one with dirty index."
90e6ef53 3628msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 3629
a77c07d9 3630#: builtin/commit.c:1036
c04f5ac3 3631msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 3632msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 3633
a77c07d9 3634#: builtin/commit.c:1046 builtin/tag.c:575
c04f5ac3
JX
3635#, c-format
3636msgid "Invalid cleanup mode %s"
3637msgstr "无效的清理模式 %s"
3638
a77c07d9 3639#: builtin/commit.c:1051
c04f5ac3 3640msgid "Paths with -a does not make sense."
649900bc 3641msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 3642
a77c07d9 3643#: builtin/commit.c:1057 builtin/commit.c:1192
07432cef
WS
3644msgid "--long and -z are incompatible"
3645msgstr "--long 和 -z 选项不兼容"
3646
a77c07d9 3647#: builtin/commit.c:1152 builtin/commit.c:1388
ef317cd5 3648msgid "show status concisely"
07432cef 3649msgstr "以简洁的格式显示状态"
ef317cd5 3650
a77c07d9 3651#: builtin/commit.c:1154 builtin/commit.c:1390
ef317cd5 3652msgid "show branch information"
07432cef 3653msgstr "显示分支信息"
ef317cd5 3654
a77c07d9 3655#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
ef317cd5 3656msgid "machine-readable output"
07432cef
WS
3657msgstr "机器可读的输出"
3658
a77c07d9 3659#: builtin/commit.c:1159 builtin/commit.c:1394
07432cef
WS
3660msgid "show status in long format (default)"
3661msgstr "以长格式显示状态(默认)"
ef317cd5 3662
a77c07d9 3663#: builtin/commit.c:1162 builtin/commit.c:1397
ef317cd5 3664msgid "terminate entries with NUL"
07432cef 3665msgstr "条目以NUL字符结尾"
ef317cd5 3666
a77c07d9
JX
3667#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
3668#: builtin/fast-export.c:650 builtin/tag.c:459
ef317cd5 3669msgid "mode"
07432cef 3670msgstr "模式"
ef317cd5 3671
a77c07d9 3672#: builtin/commit.c:1165 builtin/commit.c:1400
ef317cd5 3673msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 3674msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 3675
a77c07d9 3676#: builtin/commit.c:1168
ef317cd5 3677msgid "show ignored files"
07432cef 3678msgstr "显示忽略的文件"
ef317cd5 3679
a77c07d9 3680#: builtin/commit.c:1169 parse-options.h:151
ef317cd5
JX
3681msgid "when"
3682msgstr "何时"
3683
a77c07d9 3684#: builtin/commit.c:1170
ef317cd5
JX
3685msgid ""
3686"ignore changes to submodules, optional when: all, dirty, untracked. "
3687"(Default: all)"
3688msgstr ""
07432cef 3689"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 3690
a77c07d9 3691#: builtin/commit.c:1172
ef317cd5 3692msgid "list untracked files in columns"
07432cef 3693msgstr "以列的方式显示未跟踪的文件"
ef317cd5 3694
a77c07d9 3695#: builtin/commit.c:1246
c04f5ac3
JX
3696msgid "couldn't look up newly created commit"
3697msgstr "无法找到新创建的提交"
3698
a77c07d9 3699#: builtin/commit.c:1248
c04f5ac3 3700msgid "could not parse newly created commit"
90e6ef53 3701msgstr "不能解析新创建的提交"
c04f5ac3 3702
a77c07d9 3703#: builtin/commit.c:1289
c04f5ac3
JX
3704msgid "detached HEAD"
3705msgstr "分离头指针"
3706
7e238ab7 3707# 译者:中文字符串拼接,可删除前导空格
a77c07d9 3708#: builtin/commit.c:1291
c04f5ac3 3709msgid " (root-commit)"
7e238ab7 3710msgstr "(根提交)"
c04f5ac3 3711
a77c07d9 3712#: builtin/commit.c:1358
ef317cd5 3713msgid "suppress summary after successful commit"
07432cef 3714msgstr "提交成功后不显示概述信息"
c04f5ac3 3715
a77c07d9 3716#: builtin/commit.c:1359
ef317cd5 3717msgid "show diff in commit message template"
07432cef 3718msgstr "在提交说明模板里显示差异"
c04f5ac3 3719
a77c07d9 3720#: builtin/commit.c:1361
ef317cd5 3721msgid "Commit message options"
07432cef 3722msgstr "提交说明选项"
c04f5ac3 3723
a77c07d9 3724#: builtin/commit.c:1362 builtin/tag.c:457
ef317cd5 3725msgid "read message from file"
07432cef 3726msgstr "从文件中读取提交说明"
c04f5ac3 3727
a77c07d9 3728#: builtin/commit.c:1363
ef317cd5 3729msgid "author"
07432cef 3730msgstr "作者"
c04f5ac3 3731
a77c07d9 3732#: builtin/commit.c:1363
ef317cd5 3733msgid "override author for commit"
07432cef 3734msgstr "提交时覆盖作者"
73a60cd2 3735
a77c07d9 3736#: builtin/commit.c:1364 builtin/gc.c:178
ef317cd5 3737msgid "date"
07432cef 3738msgstr "日期"
c04f5ac3 3739
a77c07d9 3740#: builtin/commit.c:1364
ef317cd5 3741msgid "override date for commit"
07432cef 3742msgstr "提交时覆盖日期"
c04f5ac3 3743
a77c07d9
JX
3744#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
3745#: builtin/notes.c:690 builtin/tag.c:455
ef317cd5 3746msgid "message"
07432cef 3747msgstr "说明"
c04f5ac3 3748
a77c07d9 3749#: builtin/commit.c:1365
ef317cd5 3750msgid "commit message"
07432cef 3751msgstr "提交说明"
ef317cd5 3752
a77c07d9 3753#: builtin/commit.c:1366
ef317cd5 3754msgid "reuse and edit message from specified commit"
07432cef 3755msgstr "重用并编辑指定提交的提交说明"
ef317cd5 3756
a77c07d9 3757#: builtin/commit.c:1367
ef317cd5 3758msgid "reuse message from specified commit"
07432cef 3759msgstr "重用指定提交的提交说明"
ef317cd5 3760
a77c07d9 3761#: builtin/commit.c:1368
ef317cd5 3762msgid "use autosquash formatted message to fixup specified commit"
07432cef 3763msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 3764
a77c07d9 3765#: builtin/commit.c:1369
ef317cd5 3766msgid "use autosquash formatted message to squash specified commit"
07432cef 3767msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 3768
a77c07d9 3769#: builtin/commit.c:1370
ef317cd5 3770msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 3771msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 3772
a77c07d9 3773#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
ef317cd5 3774msgid "add Signed-off-by:"
07432cef 3775msgstr "添加 Signed-off-by: 签名"
ef317cd5 3776
a77c07d9 3777#: builtin/commit.c:1372
ef317cd5 3778msgid "use specified template file"
07432cef 3779msgstr "使用指定的模板文件"
ef317cd5 3780
a77c07d9 3781#: builtin/commit.c:1373
ef317cd5 3782msgid "force edit of commit"
07432cef 3783msgstr "强制编辑提交"
ef317cd5 3784
07432cef 3785# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
a77c07d9 3786#: builtin/commit.c:1374
ef317cd5 3787msgid "default"
07432cef 3788msgstr "default"
ef317cd5 3789
a77c07d9 3790#: builtin/commit.c:1374 builtin/tag.c:460
ef317cd5 3791msgid "how to strip spaces and #comments from message"
07432cef 3792msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 3793
a77c07d9 3794#: builtin/commit.c:1375
ef317cd5 3795msgid "include status in commit message template"
07432cef 3796msgstr "在提交说明模板里包含状态信息"
ef317cd5 3797
a77c07d9 3798#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
ef317cd5 3799msgid "key id"
07432cef 3800msgstr "key id"
ef317cd5 3801
a77c07d9 3802#: builtin/commit.c:1377 builtin/merge.c:214
ef317cd5 3803msgid "GPG sign commit"
07432cef 3804msgstr "GPG 提交签名"
ef317cd5
JX
3805
3806#. end commit message options
a77c07d9 3807#: builtin/commit.c:1380
ef317cd5 3808msgid "Commit contents options"
07432cef 3809msgstr "提交内容选项"
ef317cd5 3810
a77c07d9 3811#: builtin/commit.c:1381
ef317cd5 3812msgid "commit all changed files"
07432cef 3813msgstr "提交所有改动的文件"
ef317cd5 3814
a77c07d9 3815#: builtin/commit.c:1382
ef317cd5 3816msgid "add specified files to index for commit"
07432cef 3817msgstr "添加指定的文件到索引区等待提交"
ef317cd5 3818
a77c07d9 3819#: builtin/commit.c:1383
ef317cd5 3820msgid "interactively add files"
07432cef 3821msgstr "交互式添加文件"
ef317cd5 3822
a77c07d9 3823#: builtin/commit.c:1384
ef317cd5 3824msgid "interactively add changes"
07432cef 3825msgstr "交互式添加变更"
ef317cd5 3826
a77c07d9 3827#: builtin/commit.c:1385
ef317cd5 3828msgid "commit only specified files"
07432cef 3829msgstr "只提交指定的文件"
ef317cd5 3830
a77c07d9 3831#: builtin/commit.c:1386
ef317cd5 3832msgid "bypass pre-commit hook"
07432cef 3833msgstr "绕过 pre-commit 钩子"
ef317cd5 3834
a77c07d9 3835#: builtin/commit.c:1387
ef317cd5 3836msgid "show what would be committed"
07432cef 3837msgstr "显示将要提交的内容"
ef317cd5 3838
a77c07d9 3839#: builtin/commit.c:1398
ef317cd5 3840msgid "amend previous commit"
07432cef 3841msgstr "修改先前的提交"
ef317cd5 3842
a77c07d9 3843#: builtin/commit.c:1399
ef317cd5 3844msgid "bypass post-rewrite hook"
07432cef 3845msgstr "绕过 post-rewrite 钩子"
ef317cd5 3846
a77c07d9 3847#: builtin/commit.c:1404
ef317cd5 3848msgid "ok to record an empty change"
07432cef 3849msgstr "允许一个空提交"
ef317cd5 3850
a77c07d9 3851#: builtin/commit.c:1407
ef317cd5 3852msgid "ok to record a change with an empty message"
07432cef 3853msgstr "允许空的提交说明"
ef317cd5 3854
a77c07d9 3855#: builtin/commit.c:1439
c04f5ac3 3856msgid "could not parse HEAD commit"
90e6ef53 3857msgstr "不能解析 HEAD 提交"
c04f5ac3 3858
a77c07d9 3859#: builtin/commit.c:1477 builtin/merge.c:508
c04f5ac3
JX
3860#, c-format
3861msgid "could not open '%s' for reading"
90e6ef53 3862msgstr "不能为读入打开 '%s'"
c04f5ac3 3863
a77c07d9 3864#: builtin/commit.c:1484
c04f5ac3
JX
3865#, c-format
3866msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 3867msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 3868
a77c07d9 3869#: builtin/commit.c:1491
c04f5ac3 3870msgid "could not read MERGE_MODE"
90e6ef53 3871msgstr "不能读取 MERGE_MODE"
c04f5ac3 3872
a77c07d9 3873#: builtin/commit.c:1510
c04f5ac3
JX
3874#, c-format
3875msgid "could not read commit message: %s"
90e6ef53 3876msgstr "不能读取提交说明:%s"
c04f5ac3 3877
a77c07d9 3878#: builtin/commit.c:1524
73a60cd2
JX
3879#, c-format
3880msgid "Aborting commit; you did not edit the message.\n"
3881msgstr "终止提交;您未更改来自模版的提交说明。\n"
3882
a77c07d9 3883#: builtin/commit.c:1529
c04f5ac3
JX
3884#, c-format
3885msgid "Aborting commit due to empty commit message.\n"
3886msgstr "终止提交因为提交说明为空。\n"
3887
a77c07d9 3888#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
c04f5ac3 3889msgid "failed to write commit object"
90e6ef53 3890msgstr "无法写提交对象"
c04f5ac3 3891
a77c07d9 3892#: builtin/commit.c:1565
c04f5ac3
JX
3893msgid "cannot lock HEAD ref"
3894msgstr "无法锁定 HEAD 引用"
3895
a77c07d9 3896#: builtin/commit.c:1569
c04f5ac3
JX
3897msgid "cannot update HEAD ref"
3898msgstr "无法更新 HEAD 引用"
3899
a77c07d9 3900#: builtin/commit.c:1580
c04f5ac3
JX
3901msgid ""
3902"Repository has been updated, but unable to write\n"
3903"new_index file. Check that disk is not full or quota is\n"
3904"not exceeded, and then \"git reset HEAD\" to recover."
3905msgstr ""
90e6ef53
JX
3906"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
3907"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 3908
ef317cd5
JX
3909#: builtin/config.c:7
3910msgid "git config [options]"
07432cef 3911msgstr "git config [选项]"
ef317cd5 3912
07432cef 3913#: builtin/config.c:51
ef317cd5 3914msgid "Config file location"
07432cef 3915msgstr "配置文件位置"
ef317cd5 3916
07432cef 3917#: builtin/config.c:52
ef317cd5 3918msgid "use global config file"
07432cef 3919msgstr "使用全局配置文件"
ef317cd5 3920
07432cef 3921#: builtin/config.c:53
ef317cd5 3922msgid "use system config file"
07432cef 3923msgstr "使用系统级配置文件"
ef317cd5 3924
07432cef 3925#: builtin/config.c:54
ef317cd5 3926msgid "use repository config file"
07432cef 3927msgstr "使用版本库级配置文件"
ef317cd5 3928
07432cef 3929#: builtin/config.c:55
ef317cd5 3930msgid "use given config file"
07432cef 3931msgstr "使用指定的配置文件"
ef317cd5 3932
07432cef 3933#: builtin/config.c:56
ef317cd5 3934msgid "Action"
07432cef 3935msgstr "操作"
ef317cd5 3936
07432cef 3937#: builtin/config.c:57
ef317cd5 3938msgid "get value: name [value-regex]"
07432cef 3939msgstr "获取值:name [value-regex]"
ef317cd5 3940
07432cef 3941#: builtin/config.c:58
ef317cd5 3942msgid "get all values: key [value-regex]"
07432cef 3943msgstr "获得所有的值:key [value-regex]"
ef317cd5 3944
07432cef 3945#: builtin/config.c:59
ef317cd5 3946msgid "get values for regexp: name-regex [value-regex]"
07432cef 3947msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 3948
07432cef 3949#: builtin/config.c:60
ef317cd5 3950msgid "replace all matching variables: name value [value_regex]"
07432cef 3951msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 3952
07432cef 3953#: builtin/config.c:61
ef317cd5 3954msgid "add a new variable: name value"
07432cef 3955msgstr "添加一个新的变量:name value"
ef317cd5 3956
07432cef 3957#: builtin/config.c:62
ef317cd5 3958msgid "remove a variable: name [value-regex]"
07432cef 3959msgstr "删除一个变量:name [value-regex]"
ef317cd5 3960
07432cef 3961#: builtin/config.c:63
ef317cd5 3962msgid "remove all matches: name [value-regex]"
07432cef 3963msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 3964
07432cef 3965#: builtin/config.c:64
ef317cd5 3966msgid "rename section: old-name new-name"
07432cef 3967msgstr "重命名小节:old-name new-name"
ef317cd5 3968
07432cef 3969#: builtin/config.c:65
ef317cd5 3970msgid "remove a section: name"
07432cef 3971msgstr "删除一个小节:name"
ef317cd5 3972
07432cef 3973#: builtin/config.c:66
ef317cd5 3974msgid "list all"
07432cef 3975msgstr "列出所有"
ef317cd5 3976
07432cef 3977#: builtin/config.c:67
ef317cd5 3978msgid "open an editor"
07432cef 3979msgstr "打开一个编辑器"
ef317cd5 3980
07432cef 3981#: builtin/config.c:68 builtin/config.c:69
ef317cd5 3982msgid "slot"
07432cef 3983msgstr "slot"
ef317cd5 3984
07432cef 3985#: builtin/config.c:68
ef317cd5 3986msgid "find the color configured: [default]"
07432cef 3987msgstr "找到配置的颜色:[默认]"
ef317cd5 3988
07432cef 3989#: builtin/config.c:69
ef317cd5 3990msgid "find the color setting: [stdout-is-tty]"
07432cef 3991msgstr "找到颜色设置:[stdout-is-tty]"
ef317cd5 3992
07432cef 3993#: builtin/config.c:70
ef317cd5 3994msgid "Type"
07432cef 3995msgstr "类型"
ef317cd5 3996
07432cef 3997#: builtin/config.c:71
ef317cd5 3998msgid "value is \"true\" or \"false\""
07432cef 3999msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4000
07432cef 4001#: builtin/config.c:72
ef317cd5 4002msgid "value is decimal number"
07432cef 4003msgstr "值是十进制数"
ef317cd5 4004
07432cef 4005#: builtin/config.c:73
ef317cd5 4006msgid "value is --bool or --int"
07432cef 4007msgstr "值是 --bool or --int"
ef317cd5 4008
07432cef 4009#: builtin/config.c:74
ef317cd5 4010msgid "value is a path (file or directory name)"
07432cef 4011msgstr "值是一个路径(文件或目录名)"
ef317cd5 4012
07432cef 4013#: builtin/config.c:75
ef317cd5 4014msgid "Other"
07432cef 4015msgstr "其它"
ef317cd5 4016
07432cef 4017#: builtin/config.c:76
ef317cd5 4018msgid "terminate values with NUL byte"
07432cef 4019msgstr "终止值是NUL字节"
ef317cd5 4020
07432cef 4021#: builtin/config.c:77
ef317cd5 4022msgid "respect include directives on lookup"
07432cef 4023msgstr "查询时参照 include 指令递归查找"
ef317cd5
JX
4024
4025#: builtin/count-objects.c:69
4026msgid "git count-objects [-v]"
07432cef 4027msgstr "git count-objects [-v]"
ef317cd5
JX
4028
4029#: builtin/describe.c:15
4030msgid "git describe [options] <committish>*"
07432cef 4031msgstr "git describe [选项] <提交号>*"
ef317cd5
JX
4032
4033#: builtin/describe.c:16
4034msgid "git describe [options] --dirty"
07432cef 4035msgstr "git describe [选项] --dirty"
ef317cd5 4036
c04f5ac3
JX
4037#: builtin/describe.c:234
4038#, c-format
4039msgid "annotated tag %s not available"
4040msgstr "注释 tag %s 无效"
4041
4042#: builtin/describe.c:238
4043#, c-format
4044msgid "annotated tag %s has no embedded name"
4045msgstr "注释 tag %s 没有嵌入名称"
4046
4047#: builtin/describe.c:240
4048#, c-format
4049msgid "tag '%s' is really '%s' here"
90e6ef53 4050msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3
JX
4051
4052#: builtin/describe.c:267
4053#, c-format
4054msgid "Not a valid object name %s"
4055msgstr "不是一个有效的对象名 %s"
4056
4057#: builtin/describe.c:270
4058#, c-format
4059msgid "%s is not a valid '%s' object"
4060msgstr "%s 不是一个有效的 '%s' 对象"
4061
4062#: builtin/describe.c:287
4063#, c-format
4064msgid "no tag exactly matches '%s'"
4065msgstr "没有 tag 准确匹配 '%s'"
4066
4067#: builtin/describe.c:289
4068#, c-format
4069msgid "searching to describe %s\n"
4070msgstr "搜索描述 %s\n"
4071
4072#: builtin/describe.c:329
4073#, c-format
4074msgid "finished search at %s\n"
4075msgstr "完成搜索 %s\n"
4076
4077#: builtin/describe.c:353
4078#, c-format
4079msgid ""
4080"No annotated tags can describe '%s'.\n"
4081"However, there were unannotated tags: try --tags."
4082msgstr ""
4083"没有注释 tag 能描述 '%s'。\n"
4084"然而,有非注释 tag:尝试 --tags。"
4085
4086#: builtin/describe.c:357
4087#, c-format
4088msgid ""
4089"No tags can describe '%s'.\n"
4090"Try --always, or create some tags."
4091msgstr ""
4092"没有注释 tag 能描述 '%s'。\n"
90e6ef53 4093"尝试 --always,或者创建一些 tag。"
c04f5ac3
JX
4094
4095#: builtin/describe.c:378
4096#, c-format
4097msgid "traversed %lu commits\n"
4098msgstr "已遍历 %lu 个提交\n"
4099
4100#: builtin/describe.c:381
4101#, c-format
4102msgid ""
4103"more than %i tags found; listed %i most recent\n"
4104"gave up search at %s\n"
4105msgstr ""
90e6ef53
JX
4106"发现多于 %i 个 tag,列出最近的 %i 个\n"
4107"在 %s 放弃搜索\n"
c04f5ac3 4108
ef317cd5
JX
4109#: builtin/describe.c:403
4110msgid "find the tag that comes after the commit"
07432cef 4111msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5
JX
4112
4113#: builtin/describe.c:404
4114msgid "debug search strategy on stderr"
07432cef 4115msgstr "在标准错误上调试搜索策略"
ef317cd5
JX
4116
4117#: builtin/describe.c:405
4118msgid "use any ref in .git/refs"
07432cef 4119msgstr "使用 .git/refs 里的任意引用"
ef317cd5
JX
4120
4121#: builtin/describe.c:406
4122msgid "use any tag in .git/refs/tags"
07432cef 4123msgstr "使用 .git/refs/tags 里的任意 tag"
ef317cd5
JX
4124
4125#: builtin/describe.c:407
4126msgid "always use long format"
07432cef 4127msgstr "始终使用长提交号格式"
ef317cd5
JX
4128
4129#: builtin/describe.c:410
ef317cd5 4130msgid "only output exact matches"
07432cef 4131msgstr "只输出精确匹配"
ef317cd5
JX
4132
4133#: builtin/describe.c:412
4134msgid "consider <n> most recent tags (default: 10)"
07432cef 4135msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5
JX
4136
4137#: builtin/describe.c:414
ef317cd5 4138msgid "only consider tags matching <pattern>"
07432cef 4139msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5
JX
4140
4141#: builtin/describe.c:416 builtin/name-rev.c:238
4142msgid "show abbreviated commit object as fallback"
07432cef 4143msgstr "显示简写的提交号作为后备"
ef317cd5
JX
4144
4145#: builtin/describe.c:417
4146msgid "mark"
07432cef 4147msgstr "标记"
ef317cd5
JX
4148
4149#: builtin/describe.c:418
4150msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 4151msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 4152
c04f5ac3
JX
4153#: builtin/describe.c:436
4154msgid "--long is incompatible with --abbrev=0"
4155msgstr "--long 与 --abbrev=0 不兼容"
4156
4157#: builtin/describe.c:462
4158msgid "No names found, cannot describe anything."
90e6ef53 4159msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3
JX
4160
4161#: builtin/describe.c:482
4162msgid "--dirty is incompatible with committishes"
649900bc 4163msgstr "--dirty 不能与提交同时使用"
c04f5ac3 4164
c160d03f 4165#: builtin/diff.c:79
c04f5ac3
JX
4166#, c-format
4167msgid "'%s': not a regular file or symlink"
4168msgstr "'%s':不是一个正规文件或符号链接"
4169
07432cef 4170#: builtin/diff.c:228
c04f5ac3
JX
4171#, c-format
4172msgid "invalid option: %s"
4173msgstr "无效选项:%s"
4174
07432cef 4175#: builtin/diff.c:305
c04f5ac3
JX
4176msgid "Not a git repository"
4177msgstr "不是一个 git 版本库"
4178
07432cef 4179#: builtin/diff.c:348
c04f5ac3
JX
4180#, c-format
4181msgid "invalid object '%s' given."
4182msgstr "提供了无效对象 '%s'。"
4183
07432cef 4184#: builtin/diff.c:353
c04f5ac3
JX
4185#, c-format
4186msgid "more than %d trees given: '%s'"
4187msgstr "提供了超过 %d 个树对象:'%s'"
4188
07432cef 4189#: builtin/diff.c:363
c04f5ac3
JX
4190#, c-format
4191msgid "more than two blobs given: '%s'"
07432cef 4192msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 4193
07432cef 4194#: builtin/diff.c:371
c04f5ac3
JX
4195#, c-format
4196msgid "unhandled object '%s' given."
4197msgstr "提供了无法处理的对象 '%s'。"
4198
ef317cd5
JX
4199#: builtin/fast-export.c:22
4200msgid "git fast-export [rev-list-opts]"
07432cef 4201msgstr "git fast-export [rev-list-opts]"
ef317cd5 4202
07432cef 4203#: builtin/fast-export.c:646
ef317cd5 4204msgid "show progress after <n> objects"
07432cef 4205msgstr "在 <n> 个对象之后显示进度"
ef317cd5 4206
07432cef 4207#: builtin/fast-export.c:648
ef317cd5 4208msgid "select handling of signed tags"
07432cef 4209msgstr "选择如何处理签名 tags"
ef317cd5 4210
07432cef 4211#: builtin/fast-export.c:651
ef317cd5 4212msgid "select handling of tags that tag filtered objects"
07432cef 4213msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 4214
07432cef 4215#: builtin/fast-export.c:654
ef317cd5 4216msgid "Dump marks to this file"
07432cef 4217msgstr "把标记存储到这个文件"
ef317cd5 4218
07432cef 4219#: builtin/fast-export.c:656
ef317cd5 4220msgid "Import marks from this file"
07432cef 4221msgstr "从这个文件导入标记"
ef317cd5 4222
07432cef 4223#: builtin/fast-export.c:658
ef317cd5 4224msgid "Fake a tagger when tags lack one"
07432cef 4225msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 4226
07432cef 4227#: builtin/fast-export.c:660
ef317cd5 4228msgid "Output full tree for each commit"
07432cef 4229msgstr "每次提交都输出整个树"
ef317cd5 4230
07432cef 4231#: builtin/fast-export.c:662
ef317cd5 4232msgid "Use the done feature to terminate the stream"
07432cef 4233msgstr "使用 done 功能来终止流"
ef317cd5 4234
07432cef 4235#: builtin/fast-export.c:663
ef317cd5 4236msgid "Skip output of blob data"
07432cef 4237msgstr "跳过数据对象的输出"
ef317cd5
JX
4238
4239#: builtin/fetch.c:20
ef317cd5 4240msgid "git fetch [<options>] [<repository> [<refspec>...]]"
07432cef 4241msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
ef317cd5
JX
4242
4243#: builtin/fetch.c:21
4244msgid "git fetch [<options>] <group>"
07432cef 4245msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
4246
4247#: builtin/fetch.c:22
4248msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 4249msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
4250
4251#: builtin/fetch.c:23
4252msgid "git fetch --all [<options>]"
07432cef 4253msgstr "git fetch --all [<选项>]"
ef317cd5
JX
4254
4255#: builtin/fetch.c:60
4256msgid "fetch from all remotes"
07432cef 4257msgstr "从所有的远程抓取"
ef317cd5
JX
4258
4259#: builtin/fetch.c:62
4260msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 4261msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5
JX
4262
4263#: builtin/fetch.c:64
4264msgid "path to upload pack on remote end"
07432cef 4265msgstr "上传包到远程的路径"
ef317cd5
JX
4266
4267#: builtin/fetch.c:65
4268msgid "force overwrite of local branch"
07432cef 4269msgstr "强制覆盖本地分支"
ef317cd5
JX
4270
4271#: builtin/fetch.c:67
4272msgid "fetch from multiple remotes"
07432cef 4273msgstr "从多个远程抓取"
ef317cd5
JX
4274
4275#: builtin/fetch.c:69
ef317cd5 4276msgid "fetch all tags and associated objects"
07432cef 4277msgstr "抓取所有的 tags 和关联对象"
ef317cd5
JX
4278
4279#: builtin/fetch.c:71
4280msgid "do not fetch all tags (--no-tags)"
07432cef 4281msgstr "不抓取任何 tags (--no-tags)"
ef317cd5
JX
4282
4283#: builtin/fetch.c:73
ef317cd5 4284msgid "prune remote-tracking branches no longer on remote"
07432cef 4285msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 4286
07432cef 4287# 译者:可选值,不能翻译
ef317cd5
JX
4288#: builtin/fetch.c:74
4289msgid "on-demand"
07432cef 4290msgstr "on-demand"
ef317cd5
JX
4291
4292#: builtin/fetch.c:75
4293msgid "control recursive fetching of submodules"
07432cef 4294msgstr "控制子模组的递归抓取"
ef317cd5
JX
4295
4296#: builtin/fetch.c:79
4297msgid "keep downloaded pack"
07432cef 4298msgstr "保持下载包"
ef317cd5
JX
4299
4300#: builtin/fetch.c:81
ef317cd5 4301msgid "allow updating of HEAD ref"
07432cef 4302msgstr "允许更新 HEAD 引用"
ef317cd5
JX
4303
4304#: builtin/fetch.c:84
4305msgid "deepen history of shallow clone"
07432cef 4306msgstr "深化浅克隆的历史"
ef317cd5 4307
a77c07d9
JX
4308#: builtin/fetch.c:86
4309msgid "convert to a complete repository"
4310msgstr "转换为一个完整的版本库"
4311
4312#: builtin/fetch.c:88 builtin/log.c:1119
ef317cd5 4313msgid "dir"
07432cef 4314msgstr "目录"
ef317cd5 4315
a77c07d9 4316#: builtin/fetch.c:89
ef317cd5 4317msgid "prepend this to submodule path output"
07432cef 4318msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 4319
a77c07d9 4320#: builtin/fetch.c:92
ef317cd5 4321msgid "default mode for recursion"
07432cef 4322msgstr "递归的默认模式"
ef317cd5 4323
a77c07d9 4324#: builtin/fetch.c:204
c04f5ac3
JX
4325msgid "Couldn't find remote ref HEAD"
4326msgstr "无法发现远程 HEAD 引用"
4327
a77c07d9 4328#: builtin/fetch.c:257
c04f5ac3
JX
4329#, c-format
4330msgid "object %s not found"
4331msgstr "对象 %s 未发现"
4332
a77c07d9 4333#: builtin/fetch.c:262
c04f5ac3
JX
4334msgid "[up to date]"
4335msgstr "[最新]"
4336
a77c07d9 4337#: builtin/fetch.c:276
c04f5ac3
JX
4338#, c-format
4339msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4340msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4341
a77c07d9 4342#: builtin/fetch.c:277 builtin/fetch.c:363
c04f5ac3
JX
4343msgid "[rejected]"
4344msgstr "[已拒绝]"
4345
a77c07d9 4346#: builtin/fetch.c:288
c04f5ac3
JX
4347msgid "[tag update]"
4348msgstr "[tag更新]"
4349
90e6ef53 4350# 译者:注意保持前导空格
a77c07d9 4351#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
c04f5ac3
JX
4352msgid " (unable to update local ref)"
4353msgstr " (不能更新本地引用)"
4354
a77c07d9 4355#: builtin/fetch.c:308
c04f5ac3
JX
4356msgid "[new tag]"
4357msgstr "[新tag]"
4358
a77c07d9 4359#: builtin/fetch.c:311
c04f5ac3
JX
4360msgid "[new branch]"
4361msgstr "[新分支]"
4362
a77c07d9 4363#: builtin/fetch.c:314
170e9899
JX
4364msgid "[new ref]"
4365msgstr "[新引用]"
4366
a77c07d9 4367#: builtin/fetch.c:359
c04f5ac3
JX
4368msgid "unable to update local ref"
4369msgstr "不能更新本地引用"
4370
a77c07d9 4371#: builtin/fetch.c:359
c04f5ac3
JX
4372msgid "forced update"
4373msgstr "强制更新"
4374
a77c07d9 4375#: builtin/fetch.c:365
c04f5ac3 4376msgid "(non-fast-forward)"
90e6ef53 4377msgstr "(非快进式)"
c04f5ac3 4378
a77c07d9 4379#: builtin/fetch.c:396 builtin/fetch.c:688
c04f5ac3
JX
4380#, c-format
4381msgid "cannot open %s: %s\n"
4382msgstr "无法打开 %s:%s\n"
4383
a77c07d9 4384#: builtin/fetch.c:405
c04f5ac3
JX
4385#, c-format
4386msgid "%s did not send all necessary objects\n"
4387msgstr "%s 未发送所有必须的对象\n"
4388
a77c07d9 4389#: builtin/fetch.c:491
c04f5ac3
JX
4390#, c-format
4391msgid "From %.*s\n"
4392msgstr "来自 %.*s\n"
4393
a77c07d9 4394#: builtin/fetch.c:502
c04f5ac3
JX
4395#, c-format
4396msgid ""
4397"some local refs could not be updated; try running\n"
4398" 'git remote prune %s' to remove any old, conflicting branches"
4399msgstr ""
4400"一些本地引用不能被更新;尝试运行\n"
4401" 'git remote prune %s' 来删除旧的、有冲突的分支"
4402
90e6ef53 4403# 译者:注意保持前导空格
a77c07d9 4404#: builtin/fetch.c:552
81809b99 4405#, c-format
8ada9598 4406msgid " (%s will become dangling)"
07432cef 4407msgstr " (%s 将成为摇摆状态)"
c04f5ac3 4408
90e6ef53 4409# 译者:注意保持前导空格
a77c07d9 4410#: builtin/fetch.c:553
81809b99 4411#, c-format
8ada9598 4412msgid " (%s has become dangling)"
07432cef 4413msgstr " (%s 已成为摇摆状态)"
c04f5ac3 4414
a77c07d9 4415#: builtin/fetch.c:560
c04f5ac3
JX
4416msgid "[deleted]"
4417msgstr "[已删除]"
4418
a77c07d9 4419#: builtin/fetch.c:561 builtin/remote.c:1055
c04f5ac3
JX
4420msgid "(none)"
4421msgstr "(无)"
4422
a77c07d9 4423#: builtin/fetch.c:678
c04f5ac3
JX
4424#, c-format
4425msgid "Refusing to fetch into current branch %s of non-bare repository"
4426msgstr "拒绝获取到非裸版本库的当前分支 %s"
4427
a77c07d9 4428#: builtin/fetch.c:712
c04f5ac3
JX
4429#, c-format
4430msgid "Don't know how to fetch from %s"
4431msgstr "不知道如何从 %s 获取"
4432
a77c07d9 4433#: builtin/fetch.c:789
c04f5ac3
JX
4434#, c-format
4435msgid "Option \"%s\" value \"%s\" is not valid for %s"
4436msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4437
a77c07d9 4438#: builtin/fetch.c:792
c04f5ac3
JX
4439#, c-format
4440msgid "Option \"%s\" is ignored for %s\n"
81809b99 4441msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 4442
a77c07d9 4443#: builtin/fetch.c:894
c04f5ac3
JX
4444#, c-format
4445msgid "Fetching %s\n"
d4a8e00b 4446msgstr "正在获取 %s\n"
c04f5ac3 4447
a77c07d9 4448#: builtin/fetch.c:896 builtin/remote.c:100
c04f5ac3
JX
4449#, c-format
4450msgid "Could not fetch %s"
4451msgstr "不能获取 %s"
4452
a77c07d9 4453#: builtin/fetch.c:915
c04f5ac3
JX
4454msgid ""
4455"No remote repository specified. Please, specify either a URL or a\n"
4456"remote name from which new revisions should be fetched."
90e6ef53 4457msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 4458
a77c07d9 4459#: builtin/fetch.c:935
c04f5ac3 4460msgid "You need to specify a tag name."
90e6ef53 4461msgstr "您需要指定一个 tag 名称。"
c04f5ac3 4462
a77c07d9
JX
4463#: builtin/fetch.c:981
4464msgid "--depth and --unshallow cannot be used together"
4465msgstr "--depth 和 --unshallow 不能同时使用"
4466
4467#: builtin/fetch.c:983
4468msgid "--unshallow on a complete repository does not make sense"
4469msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4470
4471#: builtin/fetch.c:1002
c04f5ac3
JX
4472msgid "fetch --all does not take a repository argument"
4473msgstr "fetch --all 不能带一个版本库参数"
4474
a77c07d9 4475#: builtin/fetch.c:1004
c04f5ac3
JX
4476msgid "fetch --all does not make sense with refspecs"
4477msgstr "fetch --all 带引用表达式没有任何意义"
4478
a77c07d9 4479#: builtin/fetch.c:1015
c04f5ac3
JX
4480#, c-format
4481msgid "No such remote or remote group: %s"
4482msgstr "没有这样的远程或远程组:%s"
4483
a77c07d9 4484#: builtin/fetch.c:1023
c04f5ac3 4485msgid "Fetching a group and specifying refspecs does not make sense"
90e6ef53 4486msgstr "获取组并指定引用表达式没有意义"
c04f5ac3 4487
ef317cd5
JX
4488#: builtin/fmt-merge-msg.c:13
4489msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4490msgstr ""
07432cef 4491"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 4492
07432cef
WS
4493#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4494#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
a77c07d9 4495#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
ef317cd5 4496msgid "n"
07432cef 4497msgstr "n"
c04f5ac3 4498
07432cef 4499#: builtin/fmt-merge-msg.c:660
ef317cd5 4500msgid "populate log with at most <n> entries from shortlog"
07432cef 4501msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 4502
07432cef 4503#: builtin/fmt-merge-msg.c:663
ef317cd5 4504msgid "alias for --log (deprecated)"
07432cef 4505msgstr "参数 --log 的别名(已弃用)"
ef317cd5 4506
07432cef 4507#: builtin/fmt-merge-msg.c:666
ef317cd5 4508msgid "text"
07432cef 4509msgstr "文本"
ef317cd5 4510
07432cef 4511#: builtin/fmt-merge-msg.c:667
ef317cd5 4512msgid "use <text> as start of message"
07432cef 4513msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 4514
07432cef 4515#: builtin/fmt-merge-msg.c:668
ef317cd5 4516msgid "file to read from"
07432cef 4517msgstr "从文件中读取"
ef317cd5
JX
4518
4519#: builtin/for-each-ref.c:979
ef317cd5 4520msgid "git for-each-ref [options] [<pattern>]"
07432cef 4521msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5
JX
4522
4523#: builtin/for-each-ref.c:994
4524msgid "quote placeholders suitably for shells"
07432cef 4525msgstr "引用占位符适用于 shells"
ef317cd5
JX
4526
4527#: builtin/for-each-ref.c:996
4528msgid "quote placeholders suitably for perl"
07432cef 4529msgstr "引用占位符适用于 perl"
ef317cd5
JX
4530
4531#: builtin/for-each-ref.c:998
4532msgid "quote placeholders suitably for python"
07432cef 4533msgstr "引用占位符适用于 python"
ef317cd5
JX
4534
4535#: builtin/for-each-ref.c:1000
4536msgid "quote placeholders suitably for tcl"
07432cef 4537msgstr "引用占位符适用于 tcl"
ef317cd5
JX
4538
4539#: builtin/for-each-ref.c:1003
4540msgid "show only <n> matched refs"
07432cef 4541msgstr "只显示 <n> 个匹配的引用"
ef317cd5
JX
4542
4543#: builtin/for-each-ref.c:1004
4544msgid "format"
07432cef 4545msgstr "格式"
ef317cd5
JX
4546
4547#: builtin/for-each-ref.c:1004
4548msgid "format to use for the output"
07432cef 4549msgstr "输出格式"
ef317cd5
JX
4550
4551#: builtin/for-each-ref.c:1005
4552msgid "key"
07432cef 4553msgstr "key"
ef317cd5
JX
4554
4555#: builtin/for-each-ref.c:1006
4556msgid "field name to sort on"
07432cef 4557msgstr "排序的字段名"
ef317cd5
JX
4558
4559#: builtin/fsck.c:608
ef317cd5 4560msgid "git fsck [options] [<object>...]"
07432cef 4561msgstr "git fsck [选项] [<对象>...]"
ef317cd5
JX
4562
4563#: builtin/fsck.c:614
4564msgid "show unreachable objects"
07432cef 4565msgstr "显示不可达的对象"
ef317cd5
JX
4566
4567#: builtin/fsck.c:615
ef317cd5 4568msgid "show dangling objects"
07432cef 4569msgstr "显示摇摆的对象"
ef317cd5
JX
4570
4571#: builtin/fsck.c:616
4572msgid "report tags"
07432cef 4573msgstr "报告 tags"
ef317cd5
JX
4574
4575#: builtin/fsck.c:617
4576msgid "report root nodes"
07432cef 4577msgstr "报告根节点"
ef317cd5
JX
4578
4579#: builtin/fsck.c:618
4580msgid "make index objects head nodes"
07432cef 4581msgstr "将索引亦作为检查的头节点"
ef317cd5
JX
4582
4583#: builtin/fsck.c:619
4584msgid "make reflogs head nodes (default)"
07432cef 4585msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5
JX
4586
4587#: builtin/fsck.c:620
4588msgid "also consider packs and alternate objects"
07432cef 4589msgstr "也考虑包和备用对象"
ef317cd5
JX
4590
4591#: builtin/fsck.c:621
4592msgid "enable more strict checking"
07432cef 4593msgstr "启用更严格的检查"
ef317cd5
JX
4594
4595#: builtin/fsck.c:623
4596msgid "write dangling objects in .git/lost-found"
07432cef 4597msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5
JX
4598
4599#: builtin/fsck.c:624 builtin/prune.c:134
4600msgid "show progress"
07432cef 4601msgstr "显示进度"
ef317cd5
JX
4602
4603#: builtin/gc.c:22
4604msgid "git gc [options]"
07432cef 4605msgstr "git gc [选项]"
ef317cd5 4606
c04f5ac3
JX
4607#: builtin/gc.c:63
4608#, c-format
4609msgid "Invalid %s: '%s'"
4610msgstr "无效的 %s:'%s'"
4611
eff6d3a9 4612#: builtin/gc.c:90
c04f5ac3
JX
4613#, c-format
4614msgid "insanely long object directory %.*s"
4615msgstr "不正常的长对象目录 %.*s"
4616
ef317cd5
JX
4617#: builtin/gc.c:179
4618msgid "prune unreferenced objects"
07432cef 4619msgstr "清除未引用的对象"
ef317cd5
JX
4620
4621#: builtin/gc.c:181
4622msgid "be more thorough (increased runtime)"
07432cef 4623msgstr "更彻底(增加运行时间)"
ef317cd5
JX
4624
4625#: builtin/gc.c:182
4626msgid "enable auto-gc mode"
07432cef 4627msgstr "启用自动垃圾回收模式"
ef317cd5 4628
07432cef 4629#: builtin/gc.c:222
c04f5ac3
JX
4630#, c-format
4631msgid ""
4632"Auto packing the repository for optimum performance. You may also\n"
4633"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4634msgstr ""
90e6ef53
JX
4635"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4636"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 4637
07432cef 4638#: builtin/gc.c:249
c04f5ac3
JX
4639msgid ""
4640"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 4641msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 4642
ef317cd5
JX
4643#: builtin/grep.c:22
4644msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 4645msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 4646
07432cef 4647#: builtin/grep.c:217
c04f5ac3
JX
4648#, c-format
4649msgid "grep: failed to create thread: %s"
90e6ef53 4650msgstr "grep:无法创建线程:%s"
c04f5ac3 4651
07432cef 4652#: builtin/grep.c:365
c04f5ac3
JX
4653#, c-format
4654msgid "Failed to chdir: %s"
4655msgstr "无法切换目录:%s"
4656
07432cef 4657#: builtin/grep.c:443 builtin/grep.c:478
c04f5ac3
JX
4658#, c-format
4659msgid "unable to read tree (%s)"
90e6ef53 4660msgstr "无法读取树(%s)"
c04f5ac3 4661
07432cef 4662#: builtin/grep.c:493
c04f5ac3
JX
4663#, c-format
4664msgid "unable to grep from object of type %s"
4665msgstr "无法抓取来自于 %s 类型的对象"
4666
07432cef 4667#: builtin/grep.c:551
c04f5ac3
JX
4668#, c-format
4669msgid "switch `%c' expects a numerical value"
4670msgstr "开关 `%c' 期望一个数字值"
4671
07432cef 4672#: builtin/grep.c:568
c04f5ac3
JX
4673#, c-format
4674msgid "cannot open '%s'"
4675msgstr "不能打开 '%s'"
4676
07432cef 4677#: builtin/grep.c:643
ef317cd5 4678msgid "search in index instead of in the work tree"
07432cef 4679msgstr "在索引区搜索而不是在工作区"
ef317cd5 4680
07432cef 4681#: builtin/grep.c:645
ef317cd5 4682msgid "find in contents not managed by git"
07432cef 4683msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
4684
4685# 译者:中文字符串拼接,可删除前导空格
07432cef 4686#: builtin/grep.c:647
ef317cd5 4687msgid "search in both tracked and untracked files"
07432cef 4688msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 4689
07432cef 4690#: builtin/grep.c:649
ef317cd5 4691msgid "search also in ignored files"
07432cef 4692msgstr "也在忽略的文件中搜索"
ef317cd5 4693
07432cef 4694#: builtin/grep.c:652
ef317cd5 4695msgid "show non-matching lines"
07432cef 4696msgstr "显示未匹配的行"
ef317cd5 4697
07432cef 4698#: builtin/grep.c:654
ef317cd5 4699msgid "case insensitive matching"
07432cef 4700msgstr "不区分大小写匹配"
ef317cd5 4701
07432cef 4702#: builtin/grep.c:656
ef317cd5 4703msgid "match patterns only at word boundaries"
07432cef 4704msgstr "只在单词边界匹配模式"
ef317cd5 4705
07432cef 4706#: builtin/grep.c:658
ef317cd5 4707msgid "process binary files as text"
07432cef 4708msgstr "把二进制文件当做文本处理"
ef317cd5 4709
07432cef 4710#: builtin/grep.c:660
ef317cd5 4711msgid "don't match patterns in binary files"
07432cef 4712msgstr "不在二进制文件中匹配模式"
ef317cd5 4713
07432cef 4714#: builtin/grep.c:663
ef317cd5 4715msgid "descend at most <depth> levels"
07432cef 4716msgstr "最多以指定的深度向下寻找"
ef317cd5 4717
07432cef 4718#: builtin/grep.c:667
ef317cd5 4719msgid "use extended POSIX regular expressions"
07432cef 4720msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 4721
07432cef 4722#: builtin/grep.c:670
ef317cd5 4723msgid "use basic POSIX regular expressions (default)"
07432cef 4724msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 4725
07432cef 4726#: builtin/grep.c:673
ef317cd5 4727msgid "interpret patterns as fixed strings"
07432cef 4728msgstr "把模式解析为固定的字符串"
ef317cd5 4729
07432cef 4730#: builtin/grep.c:676
ef317cd5 4731msgid "use Perl-compatible regular expressions"
07432cef 4732msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 4733
07432cef 4734#: builtin/grep.c:679
ef317cd5 4735msgid "show line numbers"
07432cef 4736msgstr "显示行号"
ef317cd5 4737
07432cef 4738#: builtin/grep.c:680
ef317cd5 4739msgid "don't show filenames"
07432cef 4740msgstr "不显示文件名"
ef317cd5 4741
07432cef 4742#: builtin/grep.c:681
ef317cd5 4743msgid "show filenames"
07432cef 4744msgstr "显示文件名"
ef317cd5 4745
07432cef 4746#: builtin/grep.c:683
ef317cd5 4747msgid "show filenames relative to top directory"
07432cef 4748msgstr "显示相对于顶级目录的文件名"
ef317cd5 4749
07432cef 4750#: builtin/grep.c:685
ef317cd5 4751msgid "show only filenames instead of matching lines"
07432cef 4752msgstr "只显示文件名而不显示匹配的行"
ef317cd5 4753
07432cef 4754#: builtin/grep.c:687
ef317cd5 4755msgid "synonym for --files-with-matches"
07432cef 4756msgstr "和 --files-with-matches 同义"
ef317cd5 4757
07432cef 4758#: builtin/grep.c:690
ef317cd5 4759msgid "show only the names of files without match"
07432cef 4760msgstr "只显示未匹配的文件名"
ef317cd5 4761
07432cef 4762#: builtin/grep.c:692
ef317cd5 4763msgid "print NUL after filenames"
07432cef 4764msgstr "在文件名后输出 NUL 字符"
ef317cd5 4765
07432cef 4766#: builtin/grep.c:694
ef317cd5 4767msgid "show the number of matches instead of matching lines"
07432cef 4768msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 4769
07432cef 4770#: builtin/grep.c:695
ef317cd5 4771msgid "highlight matches"
07432cef 4772msgstr "高亮显示匹配项"
ef317cd5 4773
07432cef 4774#: builtin/grep.c:697
ef317cd5 4775msgid "print empty line between matches from different files"
07432cef 4776msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 4777
07432cef 4778#: builtin/grep.c:699
ef317cd5 4779msgid "show filename only once above matches from same file"
07432cef 4780msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 4781
07432cef 4782#: builtin/grep.c:702
ef317cd5 4783msgid "show <n> context lines before and after matches"
07432cef 4784msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 4785
07432cef 4786#: builtin/grep.c:705
ef317cd5 4787msgid "show <n> context lines before matches"
07432cef 4788msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 4789
07432cef 4790#: builtin/grep.c:707
ef317cd5 4791msgid "show <n> context lines after matches"
07432cef 4792msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 4793
07432cef 4794#: builtin/grep.c:708
ef317cd5 4795msgid "shortcut for -C NUM"
07432cef 4796msgstr "快捷键 -C 数字"
ef317cd5 4797
07432cef 4798#: builtin/grep.c:711
ef317cd5 4799msgid "show a line with the function name before matches"
07432cef 4800msgstr "在匹配的前面显示一行函数名"
ef317cd5 4801
07432cef 4802#: builtin/grep.c:713
ef317cd5 4803msgid "show the surrounding function"
07432cef 4804msgstr "显示所在函数的前后内容"
ef317cd5 4805
07432cef 4806#: builtin/grep.c:716
ef317cd5 4807msgid "read patterns from file"
07432cef 4808msgstr "从文件读取模式"
ef317cd5 4809
07432cef 4810#: builtin/grep.c:718
ef317cd5 4811msgid "match <pattern>"
07432cef 4812msgstr "匹配 <模式>"
ef317cd5 4813
07432cef 4814#: builtin/grep.c:720
ef317cd5 4815msgid "combine patterns specified with -e"
07432cef 4816msgstr "组合用 -e 参数设定的模式"
ef317cd5 4817
07432cef 4818#: builtin/grep.c:732
ef317cd5 4819msgid "indicate hit with exit status without output"
07432cef 4820msgstr "不输出,而用退出码标识命中状态"
ef317cd5 4821
07432cef 4822#: builtin/grep.c:734
ef317cd5 4823msgid "show only matches from files that match all patterns"
07432cef 4824msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 4825
07432cef
WS
4826#: builtin/grep.c:736
4827msgid "show parse tree for grep expression"
4828msgstr "显示 grep 表达式的解析树"
4829
4830#: builtin/grep.c:740
ef317cd5 4831msgid "pager"
07432cef 4832msgstr "分页"
ef317cd5 4833
07432cef 4834#: builtin/grep.c:740
ef317cd5 4835msgid "show matching files in the pager"
07432cef 4836msgstr "分页显示匹配的文件"
ef317cd5 4837
07432cef 4838#: builtin/grep.c:743
ef317cd5 4839msgid "allow calling of grep(1) (ignored by this build)"
07432cef 4840msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 4841
07432cef 4842#: builtin/grep.c:744 builtin/show-ref.c:184
ef317cd5 4843msgid "show usage"
07432cef 4844msgstr "显示用法"
ef317cd5 4845
07432cef 4846#: builtin/grep.c:811
c04f5ac3
JX
4847msgid "no pattern given."
4848msgstr "未提供模式匹配。"
4849
07432cef 4850#: builtin/grep.c:825
c04f5ac3
JX
4851#, c-format
4852msgid "bad object %s"
4853msgstr "坏对象 %s"
4854
a77c07d9 4855#: builtin/grep.c:868
c04f5ac3
JX
4856msgid "--open-files-in-pager only works on the worktree"
4857msgstr "--open-files-in-pager 仅用于工作区"
4858
a77c07d9 4859#: builtin/grep.c:891
c04f5ac3 4860msgid "--cached or --untracked cannot be used with --no-index."
649900bc 4861msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 4862
a77c07d9 4863#: builtin/grep.c:896
c04f5ac3 4864msgid "--no-index or --untracked cannot be used with revs."
649900bc 4865msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 4866
a77c07d9 4867#: builtin/grep.c:899
c04f5ac3 4868msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 4869msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 4870
a77c07d9 4871#: builtin/grep.c:907
c04f5ac3
JX
4872msgid "both --cached and trees are given."
4873msgstr "同时给出了 --cached 和树对象。"
4874
ef317cd5
JX
4875#: builtin/hash-object.c:60
4876msgid ""
4877"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4878"<file>..."
4879msgstr ""
07432cef
WS
4880"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
4881"<文件>..."
ef317cd5
JX
4882
4883#: builtin/hash-object.c:61
4884msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 4885msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5
JX
4886
4887#: builtin/hash-object.c:72
4888msgid "type"
07432cef 4889msgstr "类型"
ef317cd5
JX
4890
4891#: builtin/hash-object.c:72
ef317cd5 4892msgid "object type"
07432cef 4893msgstr "对象类型"
ef317cd5
JX
4894
4895#: builtin/hash-object.c:73
4896msgid "write the object into the object database"
07432cef 4897msgstr "将对象写入对象数据库"
ef317cd5
JX
4898
4899#: builtin/hash-object.c:74
4900msgid "read the object from stdin"
07432cef 4901msgstr "从标准输入读取对象"
ef317cd5
JX
4902
4903#: builtin/hash-object.c:76
4904msgid "store file as is without filters"
07432cef 4905msgstr "原样存储文件不使用过滤器"
ef317cd5
JX
4906
4907#: builtin/hash-object.c:77
4908msgid "process file as it were from this path"
07432cef 4909msgstr "处理文件并假设其来自于此路径"
ef317cd5 4910
a77c07d9 4911#: builtin/help.c:42
ef317cd5 4912msgid "print all available commands"
07432cef 4913msgstr "打印所有可用的命令"
ef317cd5 4914
a77c07d9 4915#: builtin/help.c:43
ef317cd5 4916msgid "show man page"
07432cef 4917msgstr "显示 man 手册"
ef317cd5 4918
a77c07d9 4919#: builtin/help.c:44
ef317cd5 4920msgid "show manual in web browser"
07432cef 4921msgstr "在 web 浏览器中显示手册"
ef317cd5 4922
a77c07d9 4923#: builtin/help.c:46
ef317cd5 4924msgid "show info page"
07432cef 4925msgstr "显示 info 手册"
ef317cd5 4926
a77c07d9 4927#: builtin/help.c:52
ef317cd5 4928msgid "git help [--all] [--man|--web|--info] [command]"
07432cef 4929msgstr "git help [--all] [--man|--web|--info] [命令]"
ef317cd5 4930
a77c07d9 4931#: builtin/help.c:64
81809b99 4932#, c-format
8ada9598 4933msgid "unrecognized help format '%s'"
81809b99 4934msgstr "未能识别的帮助格式 '%s'"
8ada9598 4935
a77c07d9 4936#: builtin/help.c:92
8ada9598 4937msgid "Failed to start emacsclient."
81809b99 4938msgstr "无法启动 emacsclient。"
8ada9598 4939
a77c07d9 4940#: builtin/help.c:105
8ada9598 4941msgid "Failed to parse emacsclient version."
81809b99 4942msgstr "无法解析 emacsclient 版本。"
8ada9598 4943
a77c07d9 4944#: builtin/help.c:113
8ada9598
JX
4945#, c-format
4946msgid "emacsclient version '%d' too old (< 22)."
07432cef 4947msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 4948
a77c07d9 4949#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
81809b99 4950#, c-format
8ada9598 4951msgid "failed to exec '%s': %s"
81809b99 4952msgstr "无法执行 '%s':%s"
8ada9598 4953
a77c07d9 4954#: builtin/help.c:216
8ada9598
JX
4955#, c-format
4956msgid ""
4957"'%s': path for unsupported man viewer.\n"
4958"Please consider using 'man.<tool>.cmd' instead."
4959msgstr ""
81809b99
JX
4960"'%s':不支持的 man 手册查看器的路径。\n"
4961"请使用 'man.<tool>.cmd'。"
8ada9598 4962
a77c07d9 4963#: builtin/help.c:228
8ada9598
JX
4964#, c-format
4965msgid ""
4966"'%s': cmd for supported man viewer.\n"
4967"Please consider using 'man.<tool>.path' instead."
4968msgstr ""
81809b99
JX
4969"'%s': 支持的 man 手册查看器命令。\n"
4970"请使用 'man.<tool>.path'。"
8ada9598 4971
a77c07d9 4972#: builtin/help.c:349
8ada9598
JX
4973#, c-format
4974msgid "'%s': unknown man viewer."
81809b99 4975msgstr "'%s':未知的 man 查看器。"
8ada9598 4976
a77c07d9 4977#: builtin/help.c:366
8ada9598 4978msgid "no man viewer handled the request"
81809b99 4979msgstr "没有 man 查看器处理此请求"
8ada9598 4980
a77c07d9 4981#: builtin/help.c:374
8ada9598 4982msgid "no info viewer handled the request"
81809b99 4983msgstr "没有 info 查看器处理此请求"
8ada9598 4984
a77c07d9 4985#: builtin/help.c:429 builtin/help.c:436
8ada9598
JX
4986#, c-format
4987msgid "usage: %s%s"
81809b99 4988msgstr "用法:%s%s"
8ada9598 4989
a77c07d9 4990#: builtin/help.c:452
8ada9598
JX
4991#, c-format
4992msgid "`git %s' is aliased to `%s'"
81809b99 4993msgstr "`git %s' 是 `%s' 的别名"
8ada9598 4994
6792b93b 4995#: builtin/index-pack.c:170
8ada9598
JX
4996#, c-format
4997msgid "object type mismatch at %s"
81809b99 4998msgstr "%s 的对象类型不匹配"
8ada9598 4999
6792b93b 5000#: builtin/index-pack.c:190
8ada9598 5001msgid "object of unexpected type"
81809b99 5002msgstr "意外的类型的对象"
8ada9598 5003
6792b93b 5004#: builtin/index-pack.c:227
81809b99 5005#, c-format
8ada9598
JX
5006msgid "cannot fill %d byte"
5007msgid_plural "cannot fill %d bytes"
81809b99 5008msgstr[0] "无法填充 %d 字节"
5ae481e0 5009msgstr[1] "无法填充 %d 字节"
8ada9598 5010
6792b93b 5011#: builtin/index-pack.c:237
8ada9598 5012msgid "early EOF"
81809b99 5013msgstr "过早的文件结束符(EOF)"
8ada9598 5014
6792b93b 5015#: builtin/index-pack.c:238
8ada9598 5016msgid "read error on input"
81809b99 5017msgstr "输入上的读错误"
8ada9598 5018
6792b93b 5019#: builtin/index-pack.c:250
8ada9598 5020msgid "used more bytes than were available"
81809b99 5021msgstr "用掉了超过可用的字节"
8ada9598 5022
6792b93b 5023#: builtin/index-pack.c:257
8ada9598 5024msgid "pack too large for current definition of off_t"
81809b99 5025msgstr "包太大超过了当前 off_t 的定义"
8ada9598 5026
6792b93b 5027#: builtin/index-pack.c:273
81809b99 5028#, c-format
8ada9598 5029msgid "unable to create '%s'"
81809b99 5030msgstr "不能创建 '%s'"
8ada9598 5031
6792b93b 5032#: builtin/index-pack.c:278
81809b99 5033#, c-format
8ada9598 5034msgid "cannot open packfile '%s'"
81809b99 5035msgstr "无法打开包文件 '%s'"
8ada9598 5036
6792b93b 5037#: builtin/index-pack.c:292
8ada9598 5038msgid "pack signature mismatch"
81809b99 5039msgstr "包签名不匹配"
8ada9598 5040
ef317cd5
JX
5041#: builtin/index-pack.c:294
5042#, c-format
5043msgid "pack version %<PRIu32> unsupported"
07432cef 5044msgstr "不支持包版本 %<PRIu32>"
ef317cd5 5045
6792b93b 5046#: builtin/index-pack.c:312
8ada9598
JX
5047#, c-format
5048msgid "pack has bad object at offset %lu: %s"
81809b99 5049msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 5050
6792b93b 5051#: builtin/index-pack.c:434
8ada9598
JX
5052#, c-format
5053msgid "inflate returned %d"
81809b99 5054msgstr "解压缩返回 %d"
8ada9598 5055
6792b93b 5056#: builtin/index-pack.c:483
8ada9598 5057msgid "offset value overflow for delta base object"
81809b99 5058msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 5059
6792b93b 5060#: builtin/index-pack.c:491
8ada9598 5061msgid "delta base offset is out of bound"
81809b99 5062msgstr "delta 基准偏移越界"
8ada9598 5063
6792b93b 5064#: builtin/index-pack.c:499
81809b99 5065#, c-format
8ada9598 5066msgid "unknown object type %d"
81809b99 5067msgstr "未知对象类型 %d"
8ada9598 5068
23ff3338 5069#: builtin/index-pack.c:530
8ada9598 5070msgid "cannot pread pack file"
81809b99 5071msgstr "无法读取包文件"
8ada9598 5072
23ff3338 5073#: builtin/index-pack.c:532
8ada9598
JX
5074#, c-format
5075msgid "premature end of pack file, %lu byte missing"
5076msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 5077msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 5078msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 5079
23ff3338 5080#: builtin/index-pack.c:558
8ada9598 5081msgid "serious inflate inconsistency"
81809b99 5082msgstr "解压缩严重的不一致"
8ada9598 5083
23ff3338
JX
5084#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
5085#: builtin/index-pack.c:712 builtin/index-pack.c:721
8ada9598
JX
5086#, c-format
5087msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 5088msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 5089
23ff3338 5090#: builtin/index-pack.c:652 builtin/pack-objects.c:170
6792b93b
JX
5091#: builtin/pack-objects.c:262
5092#, c-format
5093msgid "unable to read %s"
5094msgstr "不能读 %s"
5095
23ff3338 5096#: builtin/index-pack.c:718
6792b93b
JX
5097#, c-format
5098msgid "cannot read existing object %s"
5099msgstr "不能读取现存对象 %s"
5100
23ff3338 5101#: builtin/index-pack.c:732
81809b99 5102#, c-format
8ada9598 5103msgid "invalid blob object %s"
07432cef 5104msgstr "无效的数据(blob)对象 %s"
8ada9598 5105
23ff3338 5106#: builtin/index-pack.c:747
81809b99 5107#, c-format
8ada9598 5108msgid "invalid %s"
81809b99 5109msgstr "无效的 %s"
8ada9598 5110
23ff3338 5111#: builtin/index-pack.c:749
8ada9598 5112msgid "Error in object"
81809b99 5113msgstr "对象中出错"
8ada9598 5114
23ff3338 5115#: builtin/index-pack.c:751
8ada9598
JX
5116#, c-format
5117msgid "Not all child objects of %s are reachable"
81809b99 5118msgstr "%s 的所有子对象并非都可达"
8ada9598 5119
23ff3338 5120#: builtin/index-pack.c:821 builtin/index-pack.c:847
8ada9598 5121msgid "failed to apply delta"
81809b99 5122msgstr "无法应用 delta"
8ada9598 5123
23ff3338 5124#: builtin/index-pack.c:986
8ada9598 5125msgid "Receiving objects"
81809b99 5126msgstr "接收对象中"
8ada9598 5127
23ff3338 5128#: builtin/index-pack.c:986
8ada9598 5129msgid "Indexing objects"
81809b99 5130msgstr "索引对象中"
8ada9598 5131
23ff3338 5132#: builtin/index-pack.c:1012
8ada9598 5133msgid "pack is corrupted (SHA1 mismatch)"
81809b99 5134msgstr "包冲突(SHA1 不匹配)"
8ada9598 5135
23ff3338 5136#: builtin/index-pack.c:1017
8ada9598 5137msgid "cannot fstat packfile"
81809b99 5138msgstr "不能枚举包文件状态"
8ada9598 5139
23ff3338 5140#: builtin/index-pack.c:1020
8ada9598 5141msgid "pack has junk at the end"
81809b99 5142msgstr "包的结尾有垃圾数据"
8ada9598 5143
23ff3338 5144#: builtin/index-pack.c:1031
6792b93b
JX
5145msgid "confusion beyond insanity in parse_pack_objects()"
5146msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5147
23ff3338 5148#: builtin/index-pack.c:1054
8ada9598 5149msgid "Resolving deltas"
81809b99 5150msgstr "处理 delta 中"
8ada9598 5151
ef317cd5 5152#: builtin/index-pack.c:1064
07432cef 5153#, c-format
ef317cd5 5154msgid "unable to create thread: %s"
07432cef 5155msgstr "不能创建线程:%s"
ef317cd5
JX
5156
5157#: builtin/index-pack.c:1106
8ada9598 5158msgid "confusion beyond insanity"
81809b99 5159msgstr "不可理喻"
8ada9598 5160
ef317cd5
JX
5161#: builtin/index-pack.c:1112
5162#, c-format
5163msgid "completed with %d local objects"
07432cef 5164msgstr "完成 %d 个本地对象"
ef317cd5
JX
5165
5166#: builtin/index-pack.c:1121
5167#, c-format
5168msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 5169msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5
JX
5170
5171#: builtin/index-pack.c:1125
8ada9598
JX
5172#, c-format
5173msgid "pack has %d unresolved delta"
5174msgid_plural "pack has %d unresolved deltas"
81809b99 5175msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 5176msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 5177
ef317cd5 5178#: builtin/index-pack.c:1150
81809b99 5179#, c-format
8ada9598 5180msgid "unable to deflate appended object (%d)"
07432cef 5181msgstr "不能压缩附加对象(%d)"
8ada9598 5182
ef317cd5 5183#: builtin/index-pack.c:1229
8ada9598
JX
5184#, c-format
5185msgid "local object %s is corrupt"
81809b99 5186msgstr "本地对象 %s 已损坏"
8ada9598 5187
ef317cd5 5188#: builtin/index-pack.c:1253
8ada9598 5189msgid "error while closing pack file"
81809b99 5190msgstr "关闭包文件时出错"
8ada9598 5191
ef317cd5 5192#: builtin/index-pack.c:1266
81809b99 5193#, c-format
8ada9598 5194msgid "cannot write keep file '%s'"
81809b99 5195msgstr "无法写保留文件 '%s'"
8ada9598 5196
ef317cd5 5197#: builtin/index-pack.c:1274
81809b99 5198#, c-format
8ada9598 5199msgid "cannot close written keep file '%s'"
81809b99 5200msgstr "无法关闭保留文件 '%s'"
8ada9598 5201
ef317cd5 5202#: builtin/index-pack.c:1287
8ada9598 5203msgid "cannot store pack file"
81809b99 5204msgstr "无法存储包文件"
8ada9598 5205
ef317cd5 5206#: builtin/index-pack.c:1298
8ada9598 5207msgid "cannot store index file"
81809b99 5208msgstr "无法存储索引文件"
8ada9598 5209
ef317cd5 5210#: builtin/index-pack.c:1331
07432cef 5211#, c-format
ef317cd5 5212msgid "bad pack.indexversion=%<PRIu32>"
07432cef 5213msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5
JX
5214
5215#: builtin/index-pack.c:1337
5216#, c-format
5217msgid "invalid number of threads specified (%d)"
07432cef 5218msgstr "指定的线程数无效(%d)"
ef317cd5
JX
5219
5220#: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5221#, c-format
5222msgid "no threads support, ignoring %s"
07432cef 5223msgstr "没有线程支持,忽略 %s"
ef317cd5
JX
5224
5225#: builtin/index-pack.c:1399
81809b99 5226#, c-format
8ada9598 5227msgid "Cannot open existing pack file '%s'"
81809b99 5228msgstr "无法打开现存包文件 '%s'"
8ada9598 5229
ef317cd5 5230#: builtin/index-pack.c:1401
81809b99 5231#, c-format
8ada9598 5232msgid "Cannot open existing pack idx file for '%s'"
81809b99 5233msgstr "无法为 %s 打开包索引文件"
8ada9598 5234
ef317cd5 5235#: builtin/index-pack.c:1448
81809b99 5236#, c-format
8ada9598
JX
5237msgid "non delta: %d object"
5238msgid_plural "non delta: %d objects"
81809b99 5239msgstr[0] "非 delta:%d 个对象"
5ae481e0 5240msgstr[1] "非 delta:%d 个对象"
8ada9598 5241
ef317cd5 5242#: builtin/index-pack.c:1455
8ada9598
JX
5243#, c-format
5244msgid "chain length = %d: %lu object"
5245msgid_plural "chain length = %d: %lu objects"
81809b99 5246msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 5247msgstr[1] "链长 = %d: %lu 对象"
8ada9598 5248
ef317cd5 5249#: builtin/index-pack.c:1482
8ada9598 5250msgid "Cannot come back to cwd"
81809b99 5251msgstr "无法返回当前工作目录"
8ada9598 5252
ef317cd5
JX
5253#: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5254#: builtin/index-pack.c:1541 builtin/index-pack.c:1545
81809b99 5255#, c-format
8ada9598 5256msgid "bad %s"
81809b99 5257msgstr "错误选项 %s"
8ada9598 5258
ef317cd5 5259#: builtin/index-pack.c:1559
8ada9598 5260msgid "--fix-thin cannot be used without --stdin"
649900bc 5261msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 5262
ef317cd5 5263#: builtin/index-pack.c:1563 builtin/index-pack.c:1573
8ada9598
JX
5264#, c-format
5265msgid "packfile name '%s' does not end with '.pack'"
81809b99 5266msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 5267
ef317cd5 5268#: builtin/index-pack.c:1582
8ada9598 5269msgid "--verify with no packfile name given"
81809b99 5270msgstr "--verify 没有提供包名参数"
8ada9598 5271
c04f5ac3
JX
5272#: builtin/init-db.c:35
5273#, c-format
5274msgid "Could not make %s writable by group"
5275msgstr "不能设置 %s 为组可写"
5276
5277#: builtin/init-db.c:62
5278#, c-format
5279msgid "insanely long template name %s"
5280msgstr "太长的模版名 %s"
5281
5282#: builtin/init-db.c:67
5283#, c-format
5284msgid "cannot stat '%s'"
5285msgstr "不能枚举 '%s' 状态"
5286
5287#: builtin/init-db.c:73
5288#, c-format
5289msgid "cannot stat template '%s'"
5290msgstr "不能枚举模版 '%s' 状态"
5291
5292#: builtin/init-db.c:80
5293#, c-format
5294msgid "cannot opendir '%s'"
5295msgstr "不能打开目录 '%s'"
5296
5297#: builtin/init-db.c:97
5298#, c-format
5299msgid "cannot readlink '%s'"
5300msgstr "不能读取链接 '%s'"
5301
5302#: builtin/init-db.c:99
5303#, c-format
5304msgid "insanely long symlink %s"
5305msgstr "太长的符号链接 %s"
5306
5307#: builtin/init-db.c:102
5308#, c-format
5309msgid "cannot symlink '%s' '%s'"
90e6ef53 5310msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
5311
5312#: builtin/init-db.c:106
5313#, c-format
5314msgid "cannot copy '%s' to '%s'"
5315msgstr "不能拷贝 '%s' 至 '%s'"
5316
5317#: builtin/init-db.c:110
5318#, c-format
5319msgid "ignoring template %s"
5320msgstr "忽略模版 %s"
5321
5322#: builtin/init-db.c:133
5323#, c-format
5324msgid "insanely long template path %s"
5325msgstr "太长的模版路径 %s"
5326
5327#: builtin/init-db.c:141
5328#, c-format
5329msgid "templates not found %s"
5330msgstr "模版未找到 %s"
5331
5332#: builtin/init-db.c:154
5333#, c-format
5334msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 5335msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
5336
5337#: builtin/init-db.c:192
5338#, c-format
5339msgid "insane git directory %s"
5340msgstr "不正常的 git 目录 %s"
5341
23ff3338 5342#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
5343#, c-format
5344msgid "%s already exists"
5345msgstr "%s 已经存在"
5346
23ff3338 5347#: builtin/init-db.c:355
c04f5ac3
JX
5348#, c-format
5349msgid "unable to handle file type %d"
5350msgstr "不能处理 %d 类型的文件"
5351
23ff3338 5352#: builtin/init-db.c:358
c04f5ac3
JX
5353#, c-format
5354msgid "unable to move %s to %s"
5355msgstr "不能移动 %s 至 %s"
5356
23ff3338 5357#: builtin/init-db.c:363
c04f5ac3
JX
5358#, c-format
5359msgid "Could not create git link %s"
5360msgstr "不能创建 git link %s"
5361
5362#.
5363#. * TRANSLATORS: The first '%s' is either "Reinitialized
5364#. * existing" or "Initialized empty", the second " shared" or
5365#. * "", and the last '%s%s' is the verbatim directory name.
5366#.
23ff3338 5367#: builtin/init-db.c:420
c04f5ac3
JX
5368#, c-format
5369msgid "%s%s Git repository in %s%s\n"
5370msgstr "%s%s Git 版本库于 %s%s\n"
5371
23ff3338 5372#: builtin/init-db.c:421
c04f5ac3
JX
5373msgid "Reinitialized existing"
5374msgstr "重新初始化现存的"
5375
23ff3338 5376#: builtin/init-db.c:421
c04f5ac3
JX
5377msgid "Initialized empty"
5378msgstr "初始化空的"
5379
7e238ab7 5380# 译者:中文字符串拼接,可删除前导空格
23ff3338 5381#: builtin/init-db.c:422
c04f5ac3 5382msgid " shared"
90e6ef53 5383msgstr "共享"
c04f5ac3 5384
23ff3338 5385#: builtin/init-db.c:441
c04f5ac3
JX
5386msgid "cannot tell cwd"
5387msgstr "无法获知当前路径"
5388
ef317cd5
JX
5389#: builtin/init-db.c:467
5390msgid ""
a77c07d9
JX
5391"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5392"shared[=<permissions>]] [directory]"
ef317cd5 5393msgstr ""
07432cef
WS
5394"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5395"[目录]"
ef317cd5
JX
5396
5397#: builtin/init-db.c:490
5398msgid "permissions"
07432cef 5399msgstr "权限"
ef317cd5
JX
5400
5401#: builtin/init-db.c:491
5402msgid "specify that the git repository is to be shared amongst several users"
07432cef 5403msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5
JX
5404
5405#: builtin/init-db.c:493 builtin/prune-packed.c:77
ef317cd5 5406msgid "be quiet"
07432cef 5407msgstr "保持安静"
ef317cd5 5408
23ff3338 5409#: builtin/init-db.c:522 builtin/init-db.c:529
c04f5ac3
JX
5410#, c-format
5411msgid "cannot mkdir %s"
5412msgstr "不能创建目录 %s"
5413
23ff3338 5414#: builtin/init-db.c:533
c04f5ac3
JX
5415#, c-format
5416msgid "cannot chdir to %s"
5417msgstr "不能切换目录到 %s"
5418
23ff3338 5419#: builtin/init-db.c:555
c04f5ac3
JX
5420#, c-format
5421msgid ""
5422"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5423"dir=<directory>)"
5424msgstr ""
73a60cd2
JX
5425"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5426"dir=<directory>)"
c04f5ac3 5427
23ff3338 5428#: builtin/init-db.c:579
c04f5ac3
JX
5429msgid "Cannot access current working directory"
5430msgstr "不能访问当前工作目录"
5431
23ff3338 5432#: builtin/init-db.c:586
c04f5ac3
JX
5433#, c-format
5434msgid "Cannot access work tree '%s'"
5435msgstr "不能访问工作区 '%s'"
5436
07432cef 5437#: builtin/log.c:39
ef317cd5 5438msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
07432cef 5439msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
ef317cd5 5440
07432cef 5441#: builtin/log.c:40
ef317cd5 5442msgid " or: git show [options] <object>..."
07432cef 5443msgstr " 或者:git show [选项] <对象>..."
ef317cd5 5444
07432cef 5445#: builtin/log.c:102
ef317cd5 5446msgid "suppress diff output"
07432cef 5447msgstr "不显示差异输出"
ef317cd5 5448
07432cef 5449#: builtin/log.c:103
ef317cd5 5450msgid "show source"
07432cef 5451msgstr "显示源"
ef317cd5 5452
07432cef
WS
5453#: builtin/log.c:104
5454msgid "Use mail map file"
5455msgstr "使用邮件映射文件"
5456
5457#: builtin/log.c:105
ef317cd5 5458msgid "decorate options"
07432cef 5459msgstr "修饰选项"
ef317cd5 5460
07432cef 5461#: builtin/log.c:198
c04f5ac3
JX
5462#, c-format
5463msgid "Final output: %d %s\n"
5464msgstr "最终输出:%d %s\n"
5465
07432cef 5466#: builtin/log.c:419 builtin/log.c:511
c04f5ac3
JX
5467#, c-format
5468msgid "Could not read object %s"
90e6ef53 5469msgstr "不能读取对象 %s"
c04f5ac3 5470
07432cef 5471#: builtin/log.c:535
c04f5ac3
JX
5472#, c-format
5473msgid "Unknown type: %d"
5474msgstr "未知类型:%d"
5475
07432cef 5476#: builtin/log.c:627
c04f5ac3
JX
5477msgid "format.headers without value"
5478msgstr "format.headers 没有值"
5479
07432cef 5480#: builtin/log.c:701
c04f5ac3
JX
5481msgid "name of output directory is too long"
5482msgstr "输出目录名太长"
5483
07432cef 5484#: builtin/log.c:717
c04f5ac3
JX
5485#, c-format
5486msgid "Cannot open patch file %s"
5487msgstr "无法打开补丁文件 %s"
5488
07432cef 5489#: builtin/log.c:731
c04f5ac3
JX
5490msgid "Need exactly one range."
5491msgstr "只需要一个范围。"
5492
07432cef 5493#: builtin/log.c:739
c04f5ac3
JX
5494msgid "Not a range."
5495msgstr "不是一个范围。"
5496
07432cef 5497#: builtin/log.c:812
c04f5ac3
JX
5498msgid "Cover letter needs email format"
5499msgstr "信封需要邮件地址格式"
5500
07432cef 5501#: builtin/log.c:885
c04f5ac3
JX
5502#, c-format
5503msgid "insane in-reply-to: %s"
5504msgstr "不正常的 in-reply-to:%s"
5505
07432cef 5506#: builtin/log.c:913
ef317cd5 5507msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 5508msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 5509
07432cef 5510#: builtin/log.c:958
c04f5ac3
JX
5511msgid "Two output directories?"
5512msgstr "两个输出目录?"
5513
07432cef 5514#: builtin/log.c:1097
ef317cd5 5515msgid "use [PATCH n/m] even with a single patch"
07432cef 5516msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 5517
07432cef 5518#: builtin/log.c:1100
ef317cd5 5519msgid "use [PATCH] even with multiple patches"
07432cef 5520msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 5521
07432cef 5522#: builtin/log.c:1104
ef317cd5 5523msgid "print patches to standard out"
07432cef 5524msgstr "打印补丁到标准输出"
c04f5ac3 5525
07432cef 5526#: builtin/log.c:1106
ef317cd5 5527msgid "generate a cover letter"
07432cef 5528msgstr "生成一封附信"
c04f5ac3 5529
07432cef 5530#: builtin/log.c:1108
ef317cd5 5531msgid "use simple number sequence for output file names"
07432cef 5532msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 5533
07432cef 5534#: builtin/log.c:1109
ef317cd5 5535msgid "sfx"
07432cef 5536msgstr "后缀"
ef317cd5 5537
07432cef 5538#: builtin/log.c:1110
ef317cd5 5539msgid "use <sfx> instead of '.patch'"
07432cef 5540msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 5541
07432cef 5542#: builtin/log.c:1112
ef317cd5 5543msgid "start numbering patches at <n> instead of 1"
07432cef
WS
5544msgstr "补丁以 <n> 开始编号,而不是1"
5545
5546#: builtin/log.c:1114
5547msgid "mark the series as Nth re-roll"
5548msgstr "标记补丁系列是第几次重制"
ef317cd5 5549
07432cef 5550#: builtin/log.c:1116
ef317cd5 5551msgid "Use [<prefix>] instead of [PATCH]"
07432cef 5552msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 5553
07432cef 5554#: builtin/log.c:1119
ef317cd5 5555msgid "store resulting files in <dir>"
07432cef 5556msgstr "把结果文件存储在 <dir>"
ef317cd5 5557
07432cef 5558#: builtin/log.c:1122
ef317cd5 5559msgid "don't strip/add [PATCH]"
07432cef 5560msgstr "不删除/添加 [PATCH]"
ef317cd5 5561
07432cef 5562#: builtin/log.c:1125
ef317cd5 5563msgid "don't output binary diffs"
07432cef 5564msgstr "不输出二进制差异"
ef317cd5 5565
07432cef 5566#: builtin/log.c:1127
ef317cd5 5567msgid "don't include a patch matching a commit upstream"
07432cef 5568msgstr "不包含已在上游提交中的补丁"
ef317cd5 5569
07432cef 5570#: builtin/log.c:1129
ef317cd5 5571msgid "show patch format instead of default (patch + stat)"
07432cef 5572msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 5573
07432cef 5574#: builtin/log.c:1131
ef317cd5 5575msgid "Messaging"
07432cef 5576msgstr "邮件发送"
ef317cd5 5577
07432cef 5578#: builtin/log.c:1132
ef317cd5 5579msgid "header"
07432cef 5580msgstr "header"
ef317cd5 5581
07432cef 5582#: builtin/log.c:1133
ef317cd5 5583msgid "add email header"
07432cef 5584msgstr "添加邮件头"
ef317cd5 5585
07432cef 5586#: builtin/log.c:1134 builtin/log.c:1136
ef317cd5 5587msgid "email"
07432cef 5588msgstr "邮件地址"
ef317cd5 5589
07432cef 5590#: builtin/log.c:1134
ef317cd5 5591msgid "add To: header"
07432cef 5592msgstr "添加收件人"
ef317cd5 5593
07432cef 5594#: builtin/log.c:1136
ef317cd5 5595msgid "add Cc: header"
07432cef 5596msgstr "添加抄送"
ef317cd5 5597
07432cef 5598#: builtin/log.c:1138
ef317cd5 5599msgid "message-id"
07432cef 5600msgstr "message-id"
ef317cd5 5601
07432cef 5602#: builtin/log.c:1139
ef317cd5 5603msgid "make first mail a reply to <message-id>"
07432cef 5604msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 5605
07432cef 5606#: builtin/log.c:1140 builtin/log.c:1143
ef317cd5 5607msgid "boundary"
07432cef 5608msgstr "边界"
ef317cd5 5609
07432cef 5610#: builtin/log.c:1141
ef317cd5 5611msgid "attach the patch"
07432cef 5612msgstr "附件方式添加补丁"
ef317cd5 5613
07432cef 5614#: builtin/log.c:1144
ef317cd5 5615msgid "inline the patch"
07432cef 5616msgstr "内联显示补丁"
ef317cd5 5617
07432cef 5618#: builtin/log.c:1148
ef317cd5 5619msgid "enable message threading, styles: shallow, deep"
07432cef 5620msgstr "启用邮件线索,风格:浅,深"
ef317cd5 5621
07432cef 5622#: builtin/log.c:1150
ef317cd5 5623msgid "signature"
07432cef 5624msgstr "签名"
ef317cd5 5625
07432cef 5626#: builtin/log.c:1151
ef317cd5 5627msgid "add a signature"
07432cef 5628msgstr "添加一个签名"
ef317cd5 5629
07432cef 5630#: builtin/log.c:1153
ef317cd5 5631msgid "don't print the patch filenames"
07432cef 5632msgstr "不要打印补丁文件名"
ef317cd5 5633
07432cef 5634#: builtin/log.c:1202
c04f5ac3
JX
5635#, c-format
5636msgid "bogus committer info %s"
5637msgstr "虚假的提交者信息 %s"
5638
07432cef 5639#: builtin/log.c:1247
c04f5ac3
JX
5640msgid "-n and -k are mutually exclusive."
5641msgstr "-n 和 -k 互斥。"
5642
07432cef 5643#: builtin/log.c:1249
c04f5ac3
JX
5644msgid "--subject-prefix and -k are mutually exclusive."
5645msgstr "--subject-prefix 和 -k 互斥。"
5646
07432cef 5647#: builtin/log.c:1257
c04f5ac3
JX
5648msgid "--name-only does not make sense"
5649msgstr "--name-only 无意义"
5650
07432cef 5651#: builtin/log.c:1259
c04f5ac3
JX
5652msgid "--name-status does not make sense"
5653msgstr "--name-status 无意义"
5654
07432cef 5655#: builtin/log.c:1261
c04f5ac3
JX
5656msgid "--check does not make sense"
5657msgstr "--check 无意义"
5658
07432cef 5659#: builtin/log.c:1284
c04f5ac3
JX
5660msgid "standard output, or directory, which one?"
5661msgstr "标准输出或目录,哪一个?"
5662
07432cef 5663#: builtin/log.c:1286
c04f5ac3
JX
5664#, c-format
5665msgid "Could not create directory '%s'"
90e6ef53 5666msgstr "不能创建目录 '%s'"
c04f5ac3 5667
07432cef 5668#: builtin/log.c:1439
c04f5ac3
JX
5669msgid "Failed to create output files"
5670msgstr "无法创建输出文件"
5671
07432cef 5672#: builtin/log.c:1488
ef317cd5 5673msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 5674msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 5675
07432cef 5676#: builtin/log.c:1543
c04f5ac3
JX
5677#, c-format
5678msgid ""
5679"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 5680msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 5681
07432cef 5682#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
c04f5ac3
JX
5683#, c-format
5684msgid "Unknown commit %s"
5685msgstr "未知提交 %s"
5686
a77c07d9 5687#: builtin/ls-files.c:409
ef317cd5 5688msgid "git ls-files [options] [<file>...]"
07432cef 5689msgstr "git ls-files [选项] [<文件>...]"
ef317cd5 5690
a77c07d9 5691#: builtin/ls-files.c:466
ef317cd5 5692msgid "identify the file status with tags"
07432cef 5693msgstr "用标签标识文件的状态"
ef317cd5 5694
a77c07d9 5695#: builtin/ls-files.c:468
ef317cd5 5696msgid "use lowercase letters for 'assume unchanged' files"
07432cef 5697msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 5698
a77c07d9 5699#: builtin/ls-files.c:470
ef317cd5 5700msgid "show cached files in the output (default)"
07432cef 5701msgstr "显示缓存的文件(默认)"
ef317cd5 5702
a77c07d9 5703#: builtin/ls-files.c:472
ef317cd5 5704msgid "show deleted files in the output"
07432cef 5705msgstr "显示已删除的文件"
ef317cd5 5706
a77c07d9 5707#: builtin/ls-files.c:474
ef317cd5 5708msgid "show modified files in the output"
07432cef 5709msgstr "显示已修改的文件"
ef317cd5 5710
a77c07d9 5711#: builtin/ls-files.c:476
ef317cd5 5712msgid "show other files in the output"
07432cef 5713msgstr "显示其它文件"
ef317cd5 5714
a77c07d9 5715#: builtin/ls-files.c:478
ef317cd5 5716msgid "show ignored files in the output"
07432cef 5717msgstr "显示忽略的文件"
ef317cd5 5718
a77c07d9 5719#: builtin/ls-files.c:481
ef317cd5 5720msgid "show staged contents' object name in the output"
07432cef 5721msgstr "显示暂存区内容的对象名称"
ef317cd5 5722
a77c07d9 5723#: builtin/ls-files.c:483
ef317cd5 5724msgid "show files on the filesystem that need to be removed"
07432cef 5725msgstr "显示文件系统需要删除的文件"
ef317cd5 5726
a77c07d9 5727#: builtin/ls-files.c:485
ef317cd5 5728msgid "show 'other' directories' name only"
07432cef 5729msgstr "只显示“其他”目录的名称"
ef317cd5 5730
a77c07d9 5731#: builtin/ls-files.c:488
ef317cd5 5732msgid "don't show empty directories"
07432cef 5733msgstr "不显示空目录"
ef317cd5 5734
a77c07d9 5735#: builtin/ls-files.c:491
ef317cd5 5736msgid "show unmerged files in the output"
07432cef 5737msgstr "显示未合并的文件"
ef317cd5 5738
a77c07d9 5739#: builtin/ls-files.c:493
ef317cd5 5740msgid "show resolve-undo information"
07432cef 5741msgstr "显示 resolve-undo 信息"
ef317cd5 5742
a77c07d9 5743#: builtin/ls-files.c:495
ef317cd5 5744msgid "skip files matching pattern"
07432cef 5745msgstr "匹配排除文件的模式"
ef317cd5 5746
a77c07d9 5747#: builtin/ls-files.c:498
ef317cd5 5748msgid "exclude patterns are read from <file>"
07432cef 5749msgstr "从 <文件> 中读取排除模式"
ef317cd5 5750
a77c07d9 5751#: builtin/ls-files.c:501
ef317cd5 5752msgid "read additional per-directory exclude patterns in <file>"
07432cef 5753msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 5754
a77c07d9 5755#: builtin/ls-files.c:503
ef317cd5 5756msgid "add the standard git exclusions"
07432cef 5757msgstr "添加标准的 git 排除"
ef317cd5 5758
a77c07d9 5759#: builtin/ls-files.c:506
ef317cd5 5760msgid "make the output relative to the project top directory"
07432cef 5761msgstr "显示相对于顶级目录的文件名"
ef317cd5 5762
a77c07d9 5763#: builtin/ls-files.c:509
ef317cd5 5764msgid "if any <file> is not in the index, treat this as an error"
07432cef 5765msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 5766
a77c07d9 5767#: builtin/ls-files.c:510
ef317cd5 5768msgid "tree-ish"
07432cef 5769msgstr "树或提交"
ef317cd5 5770
a77c07d9 5771#: builtin/ls-files.c:511
ef317cd5 5772msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 5773msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 5774
a77c07d9 5775#: builtin/ls-files.c:513
ef317cd5 5776msgid "show debugging data"
07432cef 5777msgstr "显示调试数据"
ef317cd5
JX
5778
5779#: builtin/ls-tree.c:27
ef317cd5 5780msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 5781msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5
JX
5782
5783#: builtin/ls-tree.c:125
5784msgid "only show trees"
07432cef 5785msgstr "只显示树"
ef317cd5
JX
5786
5787#: builtin/ls-tree.c:127
ef317cd5 5788msgid "recurse into subtrees"
07432cef 5789msgstr "递归到子树"
ef317cd5
JX
5790
5791#: builtin/ls-tree.c:129
5792msgid "show trees when recursing"
07432cef 5793msgstr "当递归时显示树"
ef317cd5
JX
5794
5795#: builtin/ls-tree.c:132
5796msgid "terminate entries with NUL byte"
07432cef 5797msgstr "条目以NUL字符终止"
ef317cd5
JX
5798
5799#: builtin/ls-tree.c:133
ef317cd5 5800msgid "include object size"
07432cef 5801msgstr "包括对象大小"
ef317cd5
JX
5802
5803#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5804msgid "list only filenames"
07432cef 5805msgstr "只列出文件名"
ef317cd5
JX
5806
5807#: builtin/ls-tree.c:140
5808msgid "use full path names"
07432cef 5809msgstr "使用文件的全路径"
ef317cd5
JX
5810
5811#: builtin/ls-tree.c:142
5812msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 5813msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5
JX
5814
5815#: builtin/merge.c:43
ef317cd5 5816msgid "git merge [options] [<commit>...]"
07432cef 5817msgstr "git merge [选项] [<提交>...]"
ef317cd5
JX
5818
5819#: builtin/merge.c:44
5820msgid "git merge [options] <msg> HEAD <commit>"
07432cef 5821msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5
JX
5822
5823#: builtin/merge.c:45
5824msgid "git merge --abort"
07432cef 5825msgstr "git merge --abort"
ef317cd5 5826
170e9899 5827#: builtin/merge.c:90
c04f5ac3
JX
5828msgid "switch `m' requires a value"
5829msgstr "开关 `m' 需要一个值"
5830
170e9899 5831#: builtin/merge.c:127
c04f5ac3
JX
5832#, c-format
5833msgid "Could not find merge strategy '%s'.\n"
90e6ef53 5834msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 5835
170e9899 5836#: builtin/merge.c:128
c04f5ac3
JX
5837#, c-format
5838msgid "Available strategies are:"
5839msgstr "可用的策略有:"
5840
170e9899 5841#: builtin/merge.c:133
c04f5ac3
JX
5842#, c-format
5843msgid "Available custom strategies are:"
5844msgstr "可用的自定义策略有:"
5845
ef317cd5
JX
5846#: builtin/merge.c:183
5847msgid "do not show a diffstat at the end of the merge"
07432cef 5848msgstr "在合并的最后不显示差异统计"
ef317cd5
JX
5849
5850#: builtin/merge.c:186
5851msgid "show a diffstat at the end of the merge"
07432cef 5852msgstr "在合并的最后显示差异统计"
ef317cd5
JX
5853
5854#: builtin/merge.c:187
5855msgid "(synonym to --stat)"
07432cef 5856msgstr "(和 --stat 同义)"
ef317cd5
JX
5857
5858#: builtin/merge.c:189
5859msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 5860msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5
JX
5861
5862#: builtin/merge.c:192
ef317cd5 5863msgid "create a single commit instead of doing a merge"
07432cef 5864msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5
JX
5865
5866#: builtin/merge.c:194
5867msgid "perform a commit if the merge succeeds (default)"
07432cef 5868msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5
JX
5869
5870#: builtin/merge.c:196
ef317cd5 5871msgid "edit message before committing"
07432cef 5872msgstr "在提交前编辑提交说明"
ef317cd5
JX
5873
5874#: builtin/merge.c:198
ef317cd5 5875msgid "allow fast-forward (default)"
07432cef 5876msgstr "允许快进(默认)"
ef317cd5
JX
5877
5878#: builtin/merge.c:200
5879msgid "abort if fast-forward is not possible"
07432cef 5880msgstr "如果不能快进就放弃合并"
ef317cd5 5881
a77c07d9 5882#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112
ef317cd5 5883msgid "strategy"
07432cef 5884msgstr "策略"
ef317cd5
JX
5885
5886#: builtin/merge.c:203
ef317cd5 5887msgid "merge strategy to use"
07432cef 5888msgstr "要使用的合并策略"
ef317cd5
JX
5889
5890#: builtin/merge.c:204
5891msgid "option=value"
07432cef 5892msgstr "option=value"
ef317cd5
JX
5893
5894#: builtin/merge.c:205
5895msgid "option for selected merge strategy"
07432cef 5896msgstr "所选的合并策略的选项"
ef317cd5
JX
5897
5898#: builtin/merge.c:207
5899msgid "merge commit message (for a non-fast-forward merge)"
07432cef 5900msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5
JX
5901
5902#: builtin/merge.c:211
ef317cd5 5903msgid "abort the current in-progress merge"
07432cef 5904msgstr "放弃当前正在进行的合并"
ef317cd5 5905
170e9899 5906#: builtin/merge.c:240
c04f5ac3
JX
5907msgid "could not run stash."
5908msgstr "不能进行进度保存。"
5909
170e9899 5910#: builtin/merge.c:245
c04f5ac3
JX
5911msgid "stash failed"
5912msgstr "进度保存失败"
5913
170e9899 5914#: builtin/merge.c:250
c04f5ac3
JX
5915#, c-format
5916msgid "not a valid object: %s"
5917msgstr "不是一个有效对象:%s"
5918
170e9899 5919#: builtin/merge.c:269 builtin/merge.c:286
c04f5ac3
JX
5920msgid "read-tree failed"
5921msgstr "读取树失败"
5922
90e6ef53 5923# 译者:注意保持前导空格
170e9899 5924#: builtin/merge.c:316
c04f5ac3
JX
5925msgid " (nothing to squash)"
5926msgstr " (无可压缩)"
5927
170e9899 5928#: builtin/merge.c:329
c04f5ac3
JX
5929#, c-format
5930msgid "Squash commit -- not updating HEAD\n"
5931msgstr "压缩提交 -- 未更新 HEAD\n"
5932
170e9899 5933#: builtin/merge.c:361
c04f5ac3
JX
5934msgid "Writing SQUASH_MSG"
5935msgstr "写入 SQUASH_MSG"
5936
170e9899 5937#: builtin/merge.c:363
c04f5ac3
JX
5938msgid "Finishing SQUASH_MSG"
5939msgstr "完成 SQUASH_MSG"
5940
5941#: builtin/merge.c:386
5942#, c-format
5943msgid "No merge message -- not updating HEAD\n"
5944msgstr "无合并信息 -- 未更新 HEAD\n"
5945
c160d03f 5946#: builtin/merge.c:436
c04f5ac3
JX
5947#, c-format
5948msgid "'%s' does not point to a commit"
5949msgstr "'%s' 没有指向一个提交"
5950
c160d03f 5951#: builtin/merge.c:535
c04f5ac3
JX
5952#, c-format
5953msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 5954msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 5955
c160d03f 5956#: builtin/merge.c:628
c04f5ac3
JX
5957msgid "git write-tree failed to write a tree"
5958msgstr "git write-tree 无法写入一树对象"
5959
07432cef 5960#: builtin/merge.c:656
c04f5ac3
JX
5961msgid "Not handling anything other than two heads merge."
5962msgstr "不能处理两个头合并之外的任何操作。"
5963
07432cef 5964#: builtin/merge.c:670
c04f5ac3
JX
5965#, c-format
5966msgid "Unknown option for merge-recursive: -X%s"
5967msgstr "merge-recursive 的未知选项:-X%s"
5968
07432cef 5969#: builtin/merge.c:684
c04f5ac3
JX
5970#, c-format
5971msgid "unable to write %s"
5972msgstr "不能写 %s"
5973
07432cef 5974#: builtin/merge.c:773
c04f5ac3
JX
5975#, c-format
5976msgid "Could not read from '%s'"
5977msgstr "不能从 '%s' 读取"
5978
07432cef 5979#: builtin/merge.c:782
c04f5ac3
JX
5980#, c-format
5981msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5982msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
5983
07432cef 5984#: builtin/merge.c:788
a77c07d9 5985#, c-format
c04f5ac3
JX
5986msgid ""
5987"Please enter a commit message to explain why this merge is necessary,\n"
5988"especially if it merges an updated upstream into a topic branch.\n"
5989"\n"
a77c07d9 5990"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
5991"the commit.\n"
5992msgstr ""
5993"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
5994"合并到主题分支。\n"
5995"\n"
a77c07d9 5996"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 5997
a77c07d9 5998#: builtin/merge.c:812
c04f5ac3
JX
5999msgid "Empty commit message."
6000msgstr "空提交信息。"
6001
a77c07d9 6002#: builtin/merge.c:824
c04f5ac3
JX
6003#, c-format
6004msgid "Wonderful.\n"
6005msgstr "太棒了。\n"
6006
a77c07d9 6007#: builtin/merge.c:889
c04f5ac3
JX
6008#, c-format
6009msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6010msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6011
a77c07d9 6012#: builtin/merge.c:905
c04f5ac3
JX
6013#, c-format
6014msgid "'%s' is not a commit"
6015msgstr "'%s' 不是一个提交"
6016
a77c07d9 6017#: builtin/merge.c:946
c04f5ac3 6018msgid "No current branch."
90e6ef53 6019msgstr "没有当前分支。"
c04f5ac3 6020
a77c07d9 6021#: builtin/merge.c:948
c04f5ac3 6022msgid "No remote for the current branch."
90e6ef53 6023msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 6024
a77c07d9 6025#: builtin/merge.c:950
c04f5ac3 6026msgid "No default upstream defined for the current branch."
90e6ef53 6027msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 6028
a77c07d9 6029#: builtin/merge.c:955
c04f5ac3
JX
6030#, c-format
6031msgid "No remote tracking branch for %s from %s"
6032msgstr "%s 没有来自 %s 的远程跟踪分支"
6033
a77c07d9 6034#: builtin/merge.c:1042 builtin/merge.c:1199
170e9899
JX
6035#, c-format
6036msgid "%s - not something we can merge"
6037msgstr "%s - 不能被合并"
6038
a77c07d9 6039#: builtin/merge.c:1110
c04f5ac3 6040msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 6041msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 6042
a77c07d9 6043#: builtin/merge.c:1126 git-pull.sh:31
c04f5ac3
JX
6044msgid ""
6045"You have not concluded your merge (MERGE_HEAD exists).\n"
6046"Please, commit your changes before you can merge."
6047msgstr ""
6048"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 6049"请在合并前先提交您的修改。"
c04f5ac3 6050
a77c07d9 6051#: builtin/merge.c:1129 git-pull.sh:34
c04f5ac3
JX
6052msgid "You have not concluded your merge (MERGE_HEAD exists)."
6053msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6054
a77c07d9 6055#: builtin/merge.c:1133
c04f5ac3
JX
6056msgid ""
6057"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6058"Please, commit your changes before you can merge."
6059msgstr ""
6060"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 6061"请在合并前先提交您的修改。"
c04f5ac3 6062
a77c07d9 6063#: builtin/merge.c:1136
c04f5ac3
JX
6064msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6065msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6066
a77c07d9 6067#: builtin/merge.c:1145
c04f5ac3 6068msgid "You cannot combine --squash with --no-ff."
649900bc 6069msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 6070
a77c07d9 6071#: builtin/merge.c:1150
c04f5ac3 6072msgid "You cannot combine --no-ff with --ff-only."
649900bc 6073msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
c04f5ac3 6074
a77c07d9 6075#: builtin/merge.c:1157
c04f5ac3 6076msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 6077msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 6078
a77c07d9 6079#: builtin/merge.c:1189
c04f5ac3 6080msgid "Can merge only exactly one commit into empty head"
90e6ef53 6081msgstr "只能将一个提交合并到空分支上"
c04f5ac3 6082
a77c07d9 6083#: builtin/merge.c:1192
c04f5ac3
JX
6084msgid "Squash commit into empty head not supported yet"
6085msgstr "尚不支持到空分支的压缩提交"
6086
a77c07d9 6087#: builtin/merge.c:1194
c04f5ac3
JX
6088msgid "Non-fast-forward commit does not make sense into an empty head"
6089msgstr "到空分支的非快进式提交没有意义"
6090
a77c07d9 6091#: builtin/merge.c:1310
c04f5ac3
JX
6092#, c-format
6093msgid "Updating %s..%s\n"
6094msgstr "更新 %s..%s\n"
6095
a77c07d9 6096#: builtin/merge.c:1349
c04f5ac3
JX
6097#, c-format
6098msgid "Trying really trivial in-index merge...\n"
90e6ef53 6099msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 6100
a77c07d9 6101#: builtin/merge.c:1356
c04f5ac3
JX
6102#, c-format
6103msgid "Nope.\n"
6104msgstr "无。\n"
6105
a77c07d9 6106#: builtin/merge.c:1388
c04f5ac3 6107msgid "Not possible to fast-forward, aborting."
1aabac65 6108msgstr "无法快进,终止。"
c04f5ac3 6109
a77c07d9 6110#: builtin/merge.c:1411 builtin/merge.c:1490
c04f5ac3
JX
6111#, c-format
6112msgid "Rewinding the tree to pristine...\n"
6113msgstr "将树回滚至原始状态...\n"
6114
a77c07d9 6115#: builtin/merge.c:1415
c04f5ac3
JX
6116#, c-format
6117msgid "Trying merge strategy %s...\n"
6118msgstr "尝试合并策略 %s...\n"
6119
a77c07d9 6120#: builtin/merge.c:1481
c04f5ac3
JX
6121#, c-format
6122msgid "No merge strategy handled the merge.\n"
6123msgstr "没有合并策略处理此合并。\n"
6124
a77c07d9 6125#: builtin/merge.c:1483
c04f5ac3
JX
6126#, c-format
6127msgid "Merge with strategy %s failed.\n"
6128msgstr "使用策略 %s 合并失败。\n"
6129
a77c07d9 6130#: builtin/merge.c:1492
c04f5ac3
JX
6131#, c-format
6132msgid "Using the %s to prepare resolving by hand.\n"
6133msgstr "使用 %s 以准备手工解决。\n"
6134
a77c07d9 6135#: builtin/merge.c:1504
c04f5ac3
JX
6136#, c-format
6137msgid "Automatic merge went well; stopped before committing as requested\n"
6138msgstr "自动合并进展顺利,按要求在提交前停止\n"
6139
ef317cd5
JX
6140#: builtin/merge-base.c:26
6141msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 6142msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5
JX
6143
6144#: builtin/merge-base.c:27
6145msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 6146msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5
JX
6147
6148#: builtin/merge-base.c:28
6149msgid "git merge-base --independent <commit>..."
07432cef 6150msgstr "git merge-base --independent <提交>..."
ef317cd5
JX
6151
6152#: builtin/merge-base.c:29
6153msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 6154msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5
JX
6155
6156#: builtin/merge-base.c:98
ef317cd5 6157msgid "output all common ancestors"
07432cef 6158msgstr "输出所有共同的祖先"
ef317cd5
JX
6159
6160#: builtin/merge-base.c:99
6161msgid "find ancestors for a single n-way merge"
07432cef 6162msgstr "查找一个多路合并的祖先提交"
ef317cd5
JX
6163
6164#: builtin/merge-base.c:100
6165msgid "list revs not reachable from others"
07432cef 6166msgstr "显示不能被其他访问到的版本"
ef317cd5
JX
6167
6168#: builtin/merge-base.c:102
6169msgid "is the first one ancestor of the other?"
07432cef 6170msgstr "第一个是其他的祖先提交么?"
ef317cd5
JX
6171
6172#: builtin/merge-file.c:8
6173msgid ""
6174"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6175"file2"
6176msgstr ""
07432cef 6177"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
6178
6179#: builtin/merge-file.c:33
6180msgid "send results to standard output"
07432cef 6181msgstr "将结果发送到标准输出"
ef317cd5
JX
6182
6183#: builtin/merge-file.c:34
6184msgid "use a diff3 based merge"
07432cef 6185msgstr "使用基于 diff3 的合并"
ef317cd5
JX
6186
6187#: builtin/merge-file.c:35
6188msgid "for conflicts, use our version"
07432cef 6189msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
6190
6191#: builtin/merge-file.c:37
6192msgid "for conflicts, use their version"
07432cef 6193msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
6194
6195#: builtin/merge-file.c:39
6196msgid "for conflicts, use a union version"
07432cef 6197msgstr "如果冲突,使用联合版本"
ef317cd5
JX
6198
6199#: builtin/merge-file.c:42
6200msgid "for conflicts, use this marker size"
07432cef 6201msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
6202
6203#: builtin/merge-file.c:43
6204msgid "do not warn about conflicts"
07432cef 6205msgstr "不要警告冲突"
ef317cd5
JX
6206
6207#: builtin/merge-file.c:45
6208msgid "set labels for file1/orig_file/file2"
07432cef 6209msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 6210
ef317cd5
JX
6211#: builtin/mktree.c:67
6212msgid "git mktree [-z] [--missing] [--batch]"
07432cef 6213msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 6214
ef317cd5
JX
6215#: builtin/mktree.c:153
6216msgid "input is NUL terminated"
07432cef 6217msgstr "输入以 NUL 字符终止"
c04f5ac3 6218
ef317cd5 6219#: builtin/mktree.c:154 builtin/write-tree.c:24
ef317cd5 6220msgid "allow missing objects"
07432cef 6221msgstr "允许丢失的对象"
c04f5ac3 6222
ef317cd5
JX
6223#: builtin/mktree.c:155
6224msgid "allow creation of more than one tree"
07432cef 6225msgstr "允许创建一个以上的树"
c04f5ac3 6226
ef317cd5
JX
6227#: builtin/mv.c:14
6228msgid "git mv [options] <source>... <destination>"
07432cef 6229msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 6230
ef317cd5
JX
6231#: builtin/mv.c:64
6232msgid "force move/rename even if target exists"
07432cef 6233msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 6234
ef317cd5 6235#: builtin/mv.c:65
ef317cd5 6236msgid "skip move/rename errors"
07432cef 6237msgstr "跳过移动/重命名错误"
c04f5ac3
JX
6238
6239#: builtin/mv.c:108
6240#, c-format
6241msgid "Checking rename of '%s' to '%s'\n"
6242msgstr "检查 '%s' 到 '%s' 的重命名\n"
6243
6244#: builtin/mv.c:112
6245msgid "bad source"
6246msgstr "坏的源"
6247
6248#: builtin/mv.c:115
6249msgid "can not move directory into itself"
6250msgstr "不能将目录移动到自身"
6251
6252#: builtin/mv.c:118
6253msgid "cannot move directory over file"
6254msgstr "不能将目录移动到文件"
6255
6256#: builtin/mv.c:128
6257#, c-format
6258msgid "Huh? %.*s is in index?"
90e6ef53 6259msgstr "嗯?%.*s 在索引中?"
c04f5ac3
JX
6260
6261#: builtin/mv.c:140
6262msgid "source directory is empty"
6263msgstr "源目录为空"
6264
6265#: builtin/mv.c:171
6266msgid "not under version control"
6267msgstr "不在版本控制之下"
6268
6269#: builtin/mv.c:173
6270msgid "destination exists"
6271msgstr "目标已存在"
6272
6273#: builtin/mv.c:181
6274#, c-format
6275msgid "overwriting '%s'"
6276msgstr "覆盖 '%s'"
6277
6278#: builtin/mv.c:184
6279msgid "Cannot overwrite"
6280msgstr "不能覆盖"
6281
6282#: builtin/mv.c:187
6283msgid "multiple sources for the same target"
6284msgstr "同一目标具有多个源"
6285
6286#: builtin/mv.c:202
6287#, c-format
6288msgid "%s, source=%s, destination=%s"
6289msgstr "%s,源=%s,目标=%s"
6290
6291#: builtin/mv.c:212
6292#, c-format
6293msgid "Renaming %s to %s\n"
6294msgstr "重命名 %s 至 %s\n"
6295
8ada9598 6296#: builtin/mv.c:215 builtin/remote.c:731
c04f5ac3
JX
6297#, c-format
6298msgid "renaming '%s' failed"
6299msgstr "重命名 '%s' 失败"
6300
ef317cd5 6301#: builtin/name-rev.c:175
ef317cd5 6302msgid "git name-rev [options] <commit>..."
07432cef 6303msgstr "git name-rev [选项] <提交>..."
ef317cd5
JX
6304
6305#: builtin/name-rev.c:176
6306msgid "git name-rev [options] --all"
07432cef 6307msgstr "git name-rev [选项] --all"
ef317cd5
JX
6308
6309#: builtin/name-rev.c:177
6310msgid "git name-rev [options] --stdin"
07432cef 6311msgstr "git name-rev [选项] --stdin"
ef317cd5
JX
6312
6313#: builtin/name-rev.c:229
6314msgid "print only names (no SHA-1)"
07432cef 6315msgstr "只打印名称(无 SHA-1)"
ef317cd5
JX
6316
6317#: builtin/name-rev.c:230
6318msgid "only use tags to name the commits"
07432cef 6319msgstr "只使用 tags 来命名提交"
ef317cd5
JX
6320
6321#: builtin/name-rev.c:232
ef317cd5 6322msgid "only use refs matching <pattern>"
07432cef 6323msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5
JX
6324
6325#: builtin/name-rev.c:234
6326msgid "list all commits reachable from all refs"
07432cef 6327msgstr "列出可以从所有引用访问的提交"
ef317cd5
JX
6328
6329#: builtin/name-rev.c:235
6330msgid "read from stdin"
07432cef 6331msgstr "从标准输入读取"
ef317cd5
JX
6332
6333#: builtin/name-rev.c:236
6334msgid "allow to print `undefined` names"
07432cef 6335msgstr "允许打印 `未定义` 的名称"
ef317cd5 6336
07432cef 6337#: builtin/notes.c:26
ef317cd5 6338msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 6339msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 6340
07432cef 6341#: builtin/notes.c:27
ef317cd5
JX
6342msgid ""
6343"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6344"<object>] [<object>]"
6345msgstr ""
07432cef
WS
6346"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6347"象>] [<对象>]"
ef317cd5 6348
07432cef 6349#: builtin/notes.c:28
ef317cd5 6350msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 6351msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 6352
07432cef 6353#: builtin/notes.c:29
ef317cd5
JX
6354msgid ""
6355"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6356"<object>] [<object>]"
6357msgstr ""
07432cef
WS
6358"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6359">] [<对象>]"
ef317cd5 6360
07432cef 6361#: builtin/notes.c:30
ef317cd5 6362msgid "git notes [--ref <notes_ref>] edit [<object>]"
07432cef 6363msgstr "git notes [--ref <注解引用>] edit [<对象>]"
ef317cd5 6364
07432cef 6365#: builtin/notes.c:31
ef317cd5 6366msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 6367msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 6368
07432cef 6369#: builtin/notes.c:32
ef317cd5
JX
6370msgid ""
6371"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 6372msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 6373
07432cef 6374#: builtin/notes.c:33
ef317cd5 6375msgid "git notes merge --commit [-v | -q]"
07432cef 6376msgstr "git notes merge --commit [-v | -q]"
ef317cd5 6377
07432cef 6378#: builtin/notes.c:34
ef317cd5 6379msgid "git notes merge --abort [-v | -q]"
07432cef 6380msgstr "git notes merge --abort [-v | -q]"
ef317cd5 6381
07432cef 6382#: builtin/notes.c:35
ef317cd5 6383msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 6384msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 6385
07432cef 6386#: builtin/notes.c:36
ef317cd5 6387msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 6388msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 6389
07432cef 6390#: builtin/notes.c:37
ef317cd5 6391msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 6392msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 6393
07432cef 6394#: builtin/notes.c:42
ef317cd5 6395msgid "git notes [list [<object>]]"
07432cef 6396msgstr "git notes [list [<对象>]]"
ef317cd5 6397
07432cef 6398#: builtin/notes.c:47
ef317cd5 6399msgid "git notes add [<options>] [<object>]"
07432cef 6400msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 6401
07432cef 6402#: builtin/notes.c:52
ef317cd5 6403msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 6404msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 6405
07432cef 6406#: builtin/notes.c:53
ef317cd5 6407msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 6408msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 6409
07432cef 6410#: builtin/notes.c:58
ef317cd5 6411msgid "git notes append [<options>] [<object>]"
07432cef 6412msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 6413
07432cef 6414#: builtin/notes.c:63
ef317cd5 6415msgid "git notes edit [<object>]"
07432cef 6416msgstr "git notes edit [<对象>]"
ef317cd5 6417
07432cef 6418#: builtin/notes.c:68
ef317cd5 6419msgid "git notes show [<object>]"
07432cef 6420msgstr "git notes show [<对象>]"
ef317cd5 6421
07432cef 6422#: builtin/notes.c:73
ef317cd5 6423msgid "git notes merge [<options>] <notes_ref>"
07432cef 6424msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 6425
07432cef 6426#: builtin/notes.c:74
ef317cd5 6427msgid "git notes merge --commit [<options>]"
07432cef 6428msgstr "git notes merge --commit [<选项>]"
ef317cd5 6429
07432cef 6430#: builtin/notes.c:75
ef317cd5 6431msgid "git notes merge --abort [<options>]"
07432cef 6432msgstr "git notes merge --abort [<选项>]"
ef317cd5 6433
07432cef 6434#: builtin/notes.c:80
ef317cd5 6435msgid "git notes remove [<object>]"
07432cef 6436msgstr "git notes remove [<对象>]"
ef317cd5 6437
07432cef 6438#: builtin/notes.c:85
ef317cd5 6439msgid "git notes prune [<options>]"
07432cef 6440msgstr "git notes prune [<选项>]"
ef317cd5 6441
07432cef 6442#: builtin/notes.c:90
ef317cd5 6443msgid "git notes get-ref"
07432cef 6444msgstr "git notes get-ref"
ef317cd5 6445
a77c07d9 6446#: builtin/notes.c:139
c04f5ac3
JX
6447#, c-format
6448msgid "unable to start 'show' for object '%s'"
6449msgstr "不能为对象 '%s' 开始 'show'"
6450
a77c07d9
JX
6451#: builtin/notes.c:143
6452msgid "could not read 'show' output"
6453msgstr "不能读取 'show' 的输出"
c04f5ac3 6454
a77c07d9 6455#: builtin/notes.c:151
c04f5ac3
JX
6456#, c-format
6457msgid "failed to finish 'show' for object '%s'"
6458msgstr "无法为对象 '%s' 完成 'show'"
6459
a77c07d9 6460#: builtin/notes.c:169 builtin/tag.c:341
c04f5ac3
JX
6461#, c-format
6462msgid "could not create file '%s'"
6463msgstr "不能创建文件 '%s'"
6464
a77c07d9 6465#: builtin/notes.c:188
c04f5ac3
JX
6466msgid "Please supply the note contents using either -m or -F option"
6467msgstr "请通过 -m 或 -F 选项为注解提供内容"
6468
a77c07d9 6469#: builtin/notes.c:209 builtin/notes.c:972
c04f5ac3
JX
6470#, c-format
6471msgid "Removing note for object %s\n"
6472msgstr "删除对象 %s 的注解\n"
6473
a77c07d9 6474#: builtin/notes.c:214
c04f5ac3
JX
6475msgid "unable to write note object"
6476msgstr "不能写注解对象"
6477
a77c07d9 6478#: builtin/notes.c:216
c04f5ac3
JX
6479#, c-format
6480msgid "The note contents has been left in %s"
6481msgstr "注解内容被留在文件 %s 中"
6482
a77c07d9 6483#: builtin/notes.c:250 builtin/tag.c:540
c04f5ac3
JX
6484#, c-format
6485msgid "cannot read '%s'"
6486msgstr "不能读取 '%s'"
6487
a77c07d9 6488#: builtin/notes.c:252 builtin/tag.c:543
c04f5ac3
JX
6489#, c-format
6490msgid "could not open or read '%s'"
6491msgstr "不能打开或读取 '%s'"
6492
a77c07d9
JX
6493#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6494#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6495#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6496#: builtin/notes.c:967 builtin/tag.c:556
c04f5ac3
JX
6497#, c-format
6498msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 6499msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 6500
a77c07d9 6501#: builtin/notes.c:274
c04f5ac3
JX
6502#, c-format
6503msgid "Failed to read object '%s'."
6504msgstr "无法读取对象 '%s'。"
6505
a77c07d9 6506#: builtin/notes.c:298
c04f5ac3
JX
6507msgid "Cannot commit uninitialized/unreferenced notes tree"
6508msgstr "不能提交未初始化/未引用的注解树"
6509
a77c07d9 6510#: builtin/notes.c:339
c04f5ac3
JX
6511#, c-format
6512msgid "Bad notes.rewriteMode value: '%s'"
90e6ef53 6513msgstr "坏的 notes.rewriteMode 值:'%s'"
c04f5ac3 6514
a77c07d9 6515#: builtin/notes.c:349
c04f5ac3
JX
6516#, c-format
6517msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6518msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6519
6520#. TRANSLATORS: The first %s is the name of the
6521#. environment variable, the second %s is its value
a77c07d9 6522#: builtin/notes.c:376
c04f5ac3
JX
6523#, c-format
6524msgid "Bad %s value: '%s'"
90e6ef53 6525msgstr "坏的 %s 值:'%s'"
c04f5ac3 6526
a77c07d9 6527#: builtin/notes.c:440
c04f5ac3
JX
6528#, c-format
6529msgid "Malformed input line: '%s'."
6530msgstr "非法的输入行:'%s'。"
6531
a77c07d9 6532#: builtin/notes.c:455
c04f5ac3
JX
6533#, c-format
6534msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 6535msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 6536
a77c07d9
JX
6537#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6538#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6539#: builtin/notes.c:1032
c04f5ac3
JX
6540msgid "too many parameters"
6541msgstr "参数太多"
6542
a77c07d9 6543#: builtin/notes.c:512 builtin/notes.c:771
c04f5ac3
JX
6544#, c-format
6545msgid "No note found for object %s."
6546msgstr "未发现对象 %s 的注解。"
6547
a77c07d9 6548#: builtin/notes.c:534 builtin/notes.c:691
ef317cd5 6549msgid "note contents as a string"
07432cef 6550msgstr "注解内容作为一个字符串"
ef317cd5 6551
a77c07d9 6552#: builtin/notes.c:537 builtin/notes.c:694
ef317cd5 6553msgid "note contents in a file"
07432cef 6554msgstr "注解内容到一个文件中"
ef317cd5 6555
a77c07d9
JX
6556#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6557#: builtin/notes.c:699 builtin/tag.c:474
ef317cd5 6558msgid "object"
07432cef 6559msgstr "对象"
ef317cd5 6560
a77c07d9 6561#: builtin/notes.c:540 builtin/notes.c:697
ef317cd5 6562msgid "reuse and edit specified note object"
07432cef 6563msgstr "重用和编辑指定的注解对象"
ef317cd5 6564
a77c07d9 6565#: builtin/notes.c:543 builtin/notes.c:700
ef317cd5 6566msgid "reuse specified note object"
07432cef 6567msgstr "重用指定的注解对象"
ef317cd5 6568
a77c07d9 6569#: builtin/notes.c:545 builtin/notes.c:613
ef317cd5 6570msgid "replace existing notes"
07432cef 6571msgstr "替换已存在的注解"
ef317cd5 6572
a77c07d9 6573#: builtin/notes.c:579
c04f5ac3
JX
6574#, c-format
6575msgid ""
6576"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6577"existing notes"
6578msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6579
a77c07d9 6580#: builtin/notes.c:584 builtin/notes.c:661
c04f5ac3
JX
6581#, c-format
6582msgid "Overwriting existing notes for object %s\n"
6583msgstr "覆盖对象 %s 现存注解\n"
6584
a77c07d9 6585#: builtin/notes.c:614
ef317cd5 6586msgid "read objects from stdin"
07432cef 6587msgstr "从标准输入读取对象"
ef317cd5 6588
a77c07d9 6589#: builtin/notes.c:616
ef317cd5 6590msgid "load rewriting config for <command> (implies --stdin)"
07432cef 6591msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 6592
a77c07d9 6593#: builtin/notes.c:634
c04f5ac3
JX
6594msgid "too few parameters"
6595msgstr "参数太少"
6596
a77c07d9 6597#: builtin/notes.c:655
c04f5ac3
JX
6598#, c-format
6599msgid ""
6600"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6601"existing notes"
6602msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6603
a77c07d9 6604#: builtin/notes.c:667
c04f5ac3
JX
6605#, c-format
6606msgid "Missing notes on source object %s. Cannot copy."
6607msgstr "源对象 %s 缺少注解。不能拷贝。"
6608
a77c07d9 6609#: builtin/notes.c:716
ef317cd5
JX
6610#, c-format
6611msgid ""
6612"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6613"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6614msgstr ""
6615"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6616"请换用 'git notes add -f -m/-F/-c/-C'。\n"
6617
a77c07d9 6618#: builtin/notes.c:863
ef317cd5 6619msgid "General options"
07432cef 6620msgstr "通用选项"
ef317cd5 6621
a77c07d9 6622#: builtin/notes.c:865
ef317cd5 6623msgid "Merge options"
07432cef 6624msgstr "合并选项"
ef317cd5 6625
a77c07d9 6626#: builtin/notes.c:867
ef317cd5
JX
6627msgid ""
6628"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6629"cat_sort_uniq)"
07432cef 6630msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 6631
a77c07d9 6632#: builtin/notes.c:869
ef317cd5 6633msgid "Committing unmerged notes"
07432cef 6634msgstr "提交未合并的注解"
ef317cd5 6635
a77c07d9 6636#: builtin/notes.c:871
ef317cd5 6637msgid "finalize notes merge by committing unmerged notes"
07432cef 6638msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 6639
a77c07d9 6640#: builtin/notes.c:873
ef317cd5 6641msgid "Aborting notes merge resolution"
07432cef 6642msgstr "中止注解合并的方案"
ef317cd5 6643
a77c07d9 6644#: builtin/notes.c:875
ef317cd5 6645msgid "abort notes merge"
07432cef 6646msgstr "中止注解合并"
ef317cd5 6647
a77c07d9 6648#: builtin/notes.c:970
ef317cd5
JX
6649#, c-format
6650msgid "Object %s has no note\n"
6651msgstr "对象 %s 没有注解\n"
6652
a77c07d9 6653#: builtin/notes.c:982
ef317cd5 6654msgid "attempt to remove non-existent note is not an error"
07432cef 6655msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 6656
a77c07d9 6657#: builtin/notes.c:985
ef317cd5 6658msgid "read object names from the standard input"
07432cef 6659msgstr "从标准输入读取对象名称"
ef317cd5 6660
a77c07d9 6661#: builtin/notes.c:1066
ef317cd5 6662msgid "notes_ref"
07432cef 6663msgstr "注解引用"
ef317cd5 6664
a77c07d9 6665#: builtin/notes.c:1067
ef317cd5 6666msgid "use notes from <notes_ref>"
07432cef 6667msgstr "从 <注解引用> 使用注解"
ef317cd5 6668
a77c07d9 6669#: builtin/notes.c:1102 builtin/remote.c:1598
ef317cd5
JX
6670#, c-format
6671msgid "Unknown subcommand: %s"
6672msgstr "未知子命令:%s"
6673
6674#: builtin/pack-objects.c:23
6675msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 6676msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5
JX
6677
6678#: builtin/pack-objects.c:24
6679msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 6680msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5
JX
6681
6682#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6683#, c-format
6684msgid "deflate error (%d)"
6685msgstr "压缩错误 (%d)"
6686
07432cef 6687#: builtin/pack-objects.c:2397
ef317cd5
JX
6688#, c-format
6689msgid "unsupported index version %s"
6690msgstr "不支持的索引版本 %s"
6691
07432cef 6692#: builtin/pack-objects.c:2401
ef317cd5
JX
6693#, c-format
6694msgid "bad index version '%s'"
6695msgstr "坏的索引版本 '%s'"
6696
07432cef 6697#: builtin/pack-objects.c:2424
ef317cd5
JX
6698#, c-format
6699msgid "option %s does not accept negative form"
6700msgstr "选项 %s 不接受否定格式"
6701
07432cef 6702#: builtin/pack-objects.c:2428
ef317cd5
JX
6703#, c-format
6704msgid "unable to parse value '%s' for option %s"
6705msgstr "不能解析选项 %1$s 的值 '%2$s'"
6706
07432cef 6707#: builtin/pack-objects.c:2447
ef317cd5 6708msgid "do not show progress meter"
07432cef 6709msgstr "不显示进度表"
ef317cd5 6710
07432cef 6711#: builtin/pack-objects.c:2449
ef317cd5 6712msgid "show progress meter"
07432cef 6713msgstr "显示进度表"
ef317cd5 6714
07432cef 6715#: builtin/pack-objects.c:2451
ef317cd5 6716msgid "show progress meter during object writing phase"
07432cef 6717msgstr "在对象写入阶段显示进度表"
ef317cd5 6718
07432cef 6719#: builtin/pack-objects.c:2454
ef317cd5 6720msgid "similar to --all-progress when progress meter is shown"
07432cef 6721msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 6722
07432cef 6723#: builtin/pack-objects.c:2455
ef317cd5 6724msgid "version[,offset]"
07432cef 6725msgstr "版本[,偏移]"
ef317cd5 6726
07432cef 6727#: builtin/pack-objects.c:2456
ef317cd5 6728msgid "write the pack index file in the specified idx format version"
07432cef 6729msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 6730
07432cef 6731#: builtin/pack-objects.c:2459
ef317cd5 6732msgid "maximum size of each output pack file"
07432cef 6733msgstr "每个输出包的最大尺寸"
ef317cd5 6734
07432cef 6735#: builtin/pack-objects.c:2461
ef317cd5 6736msgid "ignore borrowed objects from alternate object store"
07432cef 6737msgstr "忽略从替代对象存储里借用对象"
ef317cd5 6738
07432cef 6739#: builtin/pack-objects.c:2463
ef317cd5 6740msgid "ignore packed objects"
07432cef 6741msgstr "忽略包对象"
ef317cd5 6742
07432cef 6743#: builtin/pack-objects.c:2465
ef317cd5 6744msgid "limit pack window by objects"
07432cef 6745msgstr "限制打包窗口的对象数"
ef317cd5 6746
07432cef 6747#: builtin/pack-objects.c:2467
ef317cd5 6748msgid "limit pack window by memory in addition to object limit"
07432cef 6749msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 6750
07432cef 6751#: builtin/pack-objects.c:2469
ef317cd5 6752msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 6753msgstr "打包允许的 delta 链的最大长度"
ef317cd5 6754
07432cef 6755#: builtin/pack-objects.c:2471
ef317cd5 6756msgid "reuse existing deltas"
07432cef 6757msgstr "重用已存在的 deltas"
ef317cd5 6758
07432cef 6759#: builtin/pack-objects.c:2473
ef317cd5 6760msgid "reuse existing objects"
07432cef 6761msgstr "重用已存在的对象"
ef317cd5 6762
07432cef 6763#: builtin/pack-objects.c:2475
ef317cd5 6764msgid "use OFS_DELTA objects"
07432cef 6765msgstr "使用 OFS_DELTA 对象"
ef317cd5 6766
07432cef 6767#: builtin/pack-objects.c:2477
ef317cd5 6768msgid "use threads when searching for best delta matches"
07432cef 6769msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 6770
07432cef 6771#: builtin/pack-objects.c:2479
ef317cd5 6772msgid "do not create an empty pack output"
07432cef 6773msgstr "不创建空的包输出"
ef317cd5 6774
07432cef 6775#: builtin/pack-objects.c:2481
ef317cd5 6776msgid "read revision arguments from standard input"
07432cef 6777msgstr "从标准输入读取修订号参数"
ef317cd5 6778
07432cef 6779#: builtin/pack-objects.c:2483
ef317cd5 6780msgid "limit the objects to those that are not yet packed"
07432cef 6781msgstr "限制那些尚未打包的对象"
ef317cd5 6782
07432cef 6783#: builtin/pack-objects.c:2486
ef317cd5 6784msgid "include objects reachable from any reference"
07432cef 6785msgstr "包括可以从任何引用访问到的对象"
ef317cd5 6786
07432cef 6787#: builtin/pack-objects.c:2489
ef317cd5 6788msgid "include objects referred by reflog entries"
07432cef 6789msgstr "包括被引用日志引用到的对象"
ef317cd5 6790
07432cef 6791#: builtin/pack-objects.c:2492
ef317cd5 6792msgid "output pack to stdout"
07432cef 6793msgstr "输出包到标准输出"
ef317cd5 6794
07432cef 6795#: builtin/pack-objects.c:2494
ef317cd5 6796msgid "include tag objects that refer to objects to be packed"
07432cef 6797msgstr "包括引用了打包对象的 tag"
ef317cd5 6798
07432cef 6799#: builtin/pack-objects.c:2496
ef317cd5 6800msgid "keep unreachable objects"
07432cef 6801msgstr "维持不可达的对象"
ef317cd5 6802
07432cef 6803#: builtin/pack-objects.c:2497 parse-options.h:141
ef317cd5
JX
6804msgid "time"
6805msgstr "时间"
6806
07432cef 6807#: builtin/pack-objects.c:2498
ef317cd5 6808msgid "unpack unreachable objects newer than <time>"
07432cef 6809msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 6810
07432cef 6811#: builtin/pack-objects.c:2501
ef317cd5 6812msgid "create thin packs"
07432cef 6813msgstr "创建精简包"
ef317cd5 6814
07432cef 6815#: builtin/pack-objects.c:2503
ef317cd5 6816msgid "ignore packs that have companion .keep file"
07432cef 6817msgstr "忽略配有 .keep 文件的包"
ef317cd5 6818
07432cef 6819#: builtin/pack-objects.c:2505
ef317cd5 6820msgid "pack compression level"
07432cef 6821msgstr "打包压缩级别"
ef317cd5 6822
07432cef 6823#: builtin/pack-objects.c:2507
ef317cd5 6824msgid "do not hide commits by grafts"
07432cef 6825msgstr "不隐藏移植覆盖的提交"
ef317cd5
JX
6826
6827#: builtin/pack-refs.c:6
6828msgid "git pack-refs [options]"
07432cef 6829msgstr "git pack-refs [选项]"
c04f5ac3 6830
ef317cd5
JX
6831#: builtin/pack-refs.c:14
6832msgid "pack everything"
07432cef 6833msgstr "打包一切"
c04f5ac3 6834
ef317cd5
JX
6835#: builtin/pack-refs.c:15
6836msgid "prune loose refs (default)"
07432cef 6837msgstr "清除松散的引用(默认)"
c04f5ac3 6838
ef317cd5
JX
6839#: builtin/prune-packed.c:7
6840msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 6841msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 6842
ef317cd5
JX
6843#: builtin/prune.c:12
6844msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 6845msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 6846
ef317cd5 6847#: builtin/prune.c:132
ef317cd5 6848msgid "do not remove, show only"
07432cef 6849msgstr "不删除,只显示"
7ac1c0ad 6850
ef317cd5 6851#: builtin/prune.c:133
ef317cd5 6852msgid "report pruned objects"
07432cef 6853msgstr "报告清除的对象"
7ac1c0ad 6854
ef317cd5
JX
6855#: builtin/prune.c:136
6856msgid "expire objects older than <time>"
07432cef 6857msgstr "使早于给定时间的对象过期"
ef317cd5
JX
6858
6859#: builtin/push.c:14
ef317cd5 6860msgid "git push [<options>] [<repository> [<refspec>...]]"
07432cef 6861msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7ac1c0ad 6862
170e9899 6863#: builtin/push.c:45
c04f5ac3
JX
6864msgid "tag shorthand without <tag>"
6865msgstr "tag 简写没有跟 <tag> 参数"
6866
170e9899 6867#: builtin/push.c:64
c04f5ac3 6868msgid "--delete only accepts plain target ref names"
90e6ef53 6869msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 6870
8ada9598
JX
6871#: builtin/push.c:99
6872msgid ""
6873"\n"
6874"To choose either option permanently, see push.default in 'git help config'."
6875msgstr ""
81809b99
JX
6876"\n"
6877"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598
JX
6878
6879#: builtin/push.c:102
6880#, c-format
6881msgid ""
6882"The upstream branch of your current branch does not match\n"
6883"the name of your current branch. To push to the upstream branch\n"
6884"on the remote, use\n"
6885"\n"
6886" git push %s HEAD:%s\n"
6887"\n"
6888"To push to the branch of the same name on the remote, use\n"
6889"\n"
6890" git push %s %s\n"
6891"%s"
6892msgstr ""
81809b99
JX
6893"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
6894"上游分支,使用\n"
6895"\n"
6896" git push %s HEAD:%s\n"
6897"\n"
6898"为推送至远程同名分支,使用\n"
6899"\n"
6900" git push %s %s\n"
6901"%s"
8ada9598
JX
6902
6903#: builtin/push.c:121
c04f5ac3
JX
6904#, c-format
6905msgid ""
6906"You are not currently on a branch.\n"
6907"To push the history leading to the current (detached HEAD)\n"
6908"state now, use\n"
6909"\n"
6910" git push %s HEAD:<name-of-remote-branch>\n"
6911msgstr ""
6912"您当前不在一个分支上。\n"
90e6ef53 6913"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
6914"\n"
6915" git push %s HEAD:<name-of-remote-branch>\n"
6916
8ada9598 6917#: builtin/push.c:128
c04f5ac3
JX
6918#, c-format
6919msgid ""
6920"The current branch %s has no upstream branch.\n"
6921"To push the current branch and set the remote as upstream, use\n"
6922"\n"
6923" git push --set-upstream %s %s\n"
6924msgstr ""
6925"当前分支 %s 没有对应的上游分支。\n"
6926"为推送当前分支并建立与远程上游的跟踪,使用\n"
6927"\n"
6928" git push --set-upstream %s %s\n"
6929
8ada9598 6930#: builtin/push.c:136
c04f5ac3
JX
6931#, c-format
6932msgid "The current branch %s has multiple upstream branches, refusing to push."
6933msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
6934
8ada9598 6935#: builtin/push.c:139
73a60cd2
JX
6936#, c-format
6937msgid ""
6938"You are pushing to remote '%s', which is not the upstream of\n"
6939"your current branch '%s', without telling me what to push\n"
6940"to update which remote branch."
6941msgstr ""
6942"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
6943"而没有告诉我要推送什么、更新哪个远程分支。"
6944
c160d03f
JX
6945# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6946#: builtin/push.c:151
6947msgid ""
6948"push.default is unset; its implicit value is changing in\n"
6949"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6950"and maintain the current behavior after the default changes, use:\n"
6951"\n"
6952" git config --global push.default matching\n"
6953"\n"
6954"To squelch this message and adopt the new behavior now, use:\n"
6955"\n"
6956" git config --global push.default simple\n"
6957"\n"
6958"See 'git help config' and search for 'push.default' for further "
6959"information.\n"
6960"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6961"'current' instead of 'simple' if you sometimes use older versions of Git)"
6962msgstr ""
6963"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
6964"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
6965"进行如下设置:\n"
6966"\n"
6967" git config --global push.default matching\n"
6968"\n"
6969"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
6970"\n"
6971" git config --global push.default simple\n"
6972"\n"
6973"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
6974"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
6975"为保持兼容,请用 'current' 代替 'simple' 模式)"
6976
6977#: builtin/push.c:199
c04f5ac3
JX
6978msgid ""
6979"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90e6ef53 6980msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
c04f5ac3 6981
c160d03f 6982#: builtin/push.c:206
170e9899
JX
6983msgid ""
6984"Updates were rejected because the tip of your current branch is behind\n"
6985"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6986"before pushing again.\n"
6987"See the 'Note about fast-forwards' in 'git push --help' for details."
6988msgstr ""
eff6d3a9
JX
6989"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
6990"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
6991"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 6992
c160d03f 6993#: builtin/push.c:212
170e9899
JX
6994msgid ""
6995"Updates were rejected because a pushed branch tip is behind its remote\n"
6996"counterpart. If you did not intend to push that branch, you may want to\n"
c160d03f
JX
6997"specify branches to push or set the 'push.default' configuration variable\n"
6998"to 'simple', 'current' or 'upstream' to push only the current branch."
170e9899 6999msgstr ""
eff6d3a9
JX
7000"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7001"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
c160d03f
JX
7002"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7003"以便只推送当前分支。"
170e9899 7004
c160d03f 7005#: builtin/push.c:218
170e9899
JX
7006msgid ""
7007"Updates were rejected because a pushed branch tip is behind its remote\n"
7008"counterpart. Check out this branch and merge the remote changes\n"
7009"(e.g. 'git pull') before pushing again.\n"
7010"See the 'Note about fast-forwards' in 'git push --help' for details."
7011msgstr ""
eff6d3a9
JX
7012"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7013"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7014"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7015
07432cef
WS
7016#: builtin/push.c:224
7017msgid ""
a77c07d9
JX
7018"Updates were rejected because the remote contains work that you do\n"
7019"not have locally. This is usually caused by another repository pushing\n"
7020"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7021"'git pull') before pushing again.\n"
7022"See the 'Note about fast-forwards' in 'git push --help' for details."
7023msgstr ""
7024"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7025"一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7026"(如 'git pull')。\n"
7027"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7028
7029#: builtin/push.c:231
7030msgid "Updates were rejected because the tag already exists in the remote."
7031msgstr "更新被拒绝因为 tag 在远程已经存在。"
7032
7033#: builtin/push.c:234
7034msgid ""
7035"You cannot update a remote ref that points at a non-commit object,\n"
7036"or update a remote ref to make it point at a non-commit object,\n"
7037"without using the '--force' option.\n"
7038msgstr ""
7039"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7040"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 7041
a77c07d9 7042#: builtin/push.c:294
c04f5ac3
JX
7043#, c-format
7044msgid "Pushing to %s\n"
7045msgstr "推送到 %s\n"
7046
a77c07d9 7047#: builtin/push.c:298
c04f5ac3
JX
7048#, c-format
7049msgid "failed to push some refs to '%s'"
7050msgstr "无法推送一些引用到 '%s'"
7051
a77c07d9 7052#: builtin/push.c:331
c04f5ac3
JX
7053#, c-format
7054msgid "bad repository '%s'"
90e6ef53 7055msgstr "坏的版本库 '%s'"
c04f5ac3 7056
a77c07d9 7057#: builtin/push.c:332
c04f5ac3
JX
7058msgid ""
7059"No configured push destination.\n"
7060"Either specify the URL from the command-line or configure a remote "
7061"repository using\n"
7062"\n"
7063" git remote add <name> <url>\n"
7064"\n"
7065"and then push using the remote name\n"
7066"\n"
7067" git push <name>\n"
7068msgstr ""
90e6ef53 7069"没有配置推送目标。\n"
07432cef 7070"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
7071"\n"
7072" git remote add <name> <url>\n"
7073"\n"
7074"然后使用该远程版本库名执行推送\n"
7075"\n"
7076" git push <name>\n"
7077
a77c07d9 7078#: builtin/push.c:347
c04f5ac3
JX
7079msgid "--all and --tags are incompatible"
7080msgstr "--all 和 --tags 不兼容"
7081
a77c07d9 7082#: builtin/push.c:348
c04f5ac3 7083msgid "--all can't be combined with refspecs"
649900bc 7084msgstr "--all 不能和引用表达式同时使用"
c04f5ac3 7085
a77c07d9 7086#: builtin/push.c:353
c04f5ac3
JX
7087msgid "--mirror and --tags are incompatible"
7088msgstr "--mirror 和 --tags 不兼容"
7089
a77c07d9 7090#: builtin/push.c:354
c04f5ac3 7091msgid "--mirror can't be combined with refspecs"
649900bc 7092msgstr "--mirror 不能和引用表达式同时使用"
c04f5ac3 7093
a77c07d9 7094#: builtin/push.c:359
c04f5ac3
JX
7095msgid "--all and --mirror are incompatible"
7096msgstr "--all 和 --mirror 不兼容"
7097
a77c07d9 7098#: builtin/push.c:419
ef317cd5 7099msgid "repository"
07432cef 7100msgstr "版本库"
ef317cd5 7101
a77c07d9 7102#: builtin/push.c:420
ef317cd5 7103msgid "push all refs"
07432cef 7104msgstr "推送所有引用"
ef317cd5 7105
a77c07d9 7106#: builtin/push.c:421
ef317cd5 7107msgid "mirror all refs"
07432cef 7108msgstr "镜像所有引用"
ef317cd5 7109
a77c07d9 7110#: builtin/push.c:423
ef317cd5 7111msgid "delete refs"
07432cef 7112msgstr "删除引用"
ef317cd5 7113
a77c07d9 7114#: builtin/push.c:424
ef317cd5 7115msgid "push tags (can't be used with --all or --mirror)"
07432cef 7116msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 7117
a77c07d9 7118#: builtin/push.c:427
ef317cd5
JX
7119msgid "force updates"
7120msgstr "强制更新"
7121
a77c07d9 7122#: builtin/push.c:428
ef317cd5 7123msgid "check"
07432cef 7124msgstr "检查"
ef317cd5 7125
a77c07d9 7126#: builtin/push.c:429
ef317cd5 7127msgid "control recursive pushing of submodules"
07432cef 7128msgstr "控制子模组的递归推送"
ef317cd5 7129
a77c07d9 7130#: builtin/push.c:431
ef317cd5 7131msgid "use thin pack"
07432cef 7132msgstr "使用精简打包"
ef317cd5 7133
a77c07d9 7134#: builtin/push.c:432 builtin/push.c:433
ef317cd5 7135msgid "receive pack program"
07432cef 7136msgstr "接收包程序"
ef317cd5 7137
a77c07d9 7138#: builtin/push.c:434
ef317cd5 7139msgid "set upstream for git pull/status"
07432cef 7140msgstr "设置 git pull/status 的上游"
ef317cd5 7141
a77c07d9 7142#: builtin/push.c:437
ef317cd5 7143msgid "prune locally removed refs"
07432cef 7144msgstr "清除本地删除的引用"
ef317cd5 7145
a77c07d9
JX
7146#: builtin/push.c:439
7147msgid "bypass pre-push hook"
7148msgstr "绕过 pre-push 钩子"
7149
7150#: builtin/push.c:448
c04f5ac3
JX
7151msgid "--delete is incompatible with --all, --mirror and --tags"
7152msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7153
a77c07d9 7154#: builtin/push.c:450
c04f5ac3
JX
7155msgid "--delete doesn't make sense without any refs"
7156msgstr "--delete 未接任何引用没有意义"
7157
ef317cd5
JX
7158#: builtin/read-tree.c:36
7159msgid ""
7160"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7161"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7162"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7163msgstr ""
07432cef
WS
7164"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7165"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7166"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5
JX
7167
7168#: builtin/read-tree.c:108
ef317cd5 7169msgid "write resulting index to <file>"
07432cef 7170msgstr "将索引结果写入 <file>"
ef317cd5
JX
7171
7172#: builtin/read-tree.c:111
ef317cd5 7173msgid "only empty the index"
07432cef 7174msgstr "只是清空索引"
ef317cd5
JX
7175
7176#: builtin/read-tree.c:113
ef317cd5 7177msgid "Merging"
07432cef 7178msgstr "合并"
ef317cd5
JX
7179
7180#: builtin/read-tree.c:115
7181msgid "perform a merge in addition to a read"
07432cef 7182msgstr "读取之余再执行一个合并"
ef317cd5
JX
7183
7184#: builtin/read-tree.c:117
7185msgid "3-way merge if no file level merging required"
07432cef 7186msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5
JX
7187
7188#: builtin/read-tree.c:119
7189msgid "3-way merge in presence of adds and removes"
07432cef 7190msgstr "存在添加和删除时,也执行三路合并"
ef317cd5
JX
7191
7192#: builtin/read-tree.c:121
7193msgid "same as -m, but discard unmerged entries"
07432cef 7194msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5
JX
7195
7196#: builtin/read-tree.c:122
ef317cd5 7197msgid "<subdirectory>/"
07432cef 7198msgstr "<子目录>/"
ef317cd5
JX
7199
7200#: builtin/read-tree.c:123
7201msgid "read the tree into the index under <subdirectory>/"
07432cef 7202msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5
JX
7203
7204#: builtin/read-tree.c:126
7205msgid "update working tree with merge result"
07432cef 7206msgstr "用合并的结果更新工作区"
ef317cd5
JX
7207
7208#: builtin/read-tree.c:128
ef317cd5 7209msgid "gitignore"
07432cef 7210msgstr "gitignore"
ef317cd5
JX
7211
7212#: builtin/read-tree.c:129
7213msgid "allow explicitly ignored files to be overwritten"
07432cef 7214msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5
JX
7215
7216#: builtin/read-tree.c:132
ef317cd5 7217msgid "don't check the working tree after merging"
07432cef 7218msgstr "合并后不检查工作区"
ef317cd5
JX
7219
7220#: builtin/read-tree.c:133
7221msgid "don't update the index or the work tree"
07432cef 7222msgstr "不更新索引区和工作区"
ef317cd5
JX
7223
7224#: builtin/read-tree.c:135
7225msgid "skip applying sparse checkout filter"
07432cef 7226msgstr "跳过应用稀疏检出过滤器"
ef317cd5
JX
7227
7228#: builtin/read-tree.c:137
7229msgid "debug unpack-trees"
07432cef 7230msgstr "调试 unpack-trees"
ef317cd5
JX
7231
7232#: builtin/remote.c:11
7233msgid "git remote [-v | --verbose]"
07432cef 7234msgstr "git remote [-v | --verbose]"
ef317cd5
JX
7235
7236#: builtin/remote.c:12
7237msgid ""
7238"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7239"mirror=<fetch|push>] <name> <url>"
7240msgstr ""
07432cef
WS
7241"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7242"mirror=<fetch|push>] <名称> <url>"
ef317cd5
JX
7243
7244#: builtin/remote.c:13 builtin/remote.c:32
7245msgid "git remote rename <old> <new>"
07432cef 7246msgstr "git remote rename <旧名称> <新名称>"
ef317cd5
JX
7247
7248#: builtin/remote.c:14 builtin/remote.c:37
7249msgid "git remote remove <name>"
07432cef 7250msgstr "git remote remove <名称>"
ef317cd5 7251
07432cef 7252#: builtin/remote.c:15 builtin/remote.c:42
ef317cd5 7253msgid "git remote set-head <name> (-a | -d | <branch>)"
07432cef 7254msgstr "git remote set-head <名称> (-a | -d | <分支>)"
ef317cd5
JX
7255
7256#: builtin/remote.c:16
7257msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 7258msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5
JX
7259
7260#: builtin/remote.c:17
7261msgid "git remote prune [-n | --dry-run] <name>"
07432cef 7262msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5
JX
7263
7264#: builtin/remote.c:18
7265msgid ""
7266"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 7267msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5
JX
7268
7269#: builtin/remote.c:19
7270msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 7271msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5
JX
7272
7273#: builtin/remote.c:20 builtin/remote.c:68
7274msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 7275msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5
JX
7276
7277#: builtin/remote.c:21 builtin/remote.c:69
7278msgid "git remote set-url --add <name> <newurl>"
07432cef 7279msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5
JX
7280
7281#: builtin/remote.c:22 builtin/remote.c:70
7282msgid "git remote set-url --delete <name> <url>"
07432cef 7283msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5
JX
7284
7285#: builtin/remote.c:27
7286msgid "git remote add [<options>] <name> <url>"
07432cef 7287msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5
JX
7288
7289#: builtin/remote.c:47
7290msgid "git remote set-branches <name> <branch>..."
07432cef 7291msgstr "git remote set-branches <名称> <分支>..."
ef317cd5
JX
7292
7293#: builtin/remote.c:48
7294msgid "git remote set-branches --add <name> <branch>..."
07432cef 7295msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5
JX
7296
7297#: builtin/remote.c:53
7298msgid "git remote show [<options>] <name>"
07432cef 7299msgstr "git remote show [<选项>] <名称>"
ef317cd5
JX
7300
7301#: builtin/remote.c:58
7302msgid "git remote prune [<options>] <name>"
07432cef 7303msgstr "git remote prune [<选项>] <名称>"
ef317cd5
JX
7304
7305#: builtin/remote.c:63
7306msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 7307msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 7308
8ada9598 7309#: builtin/remote.c:98
81809b99 7310#, c-format
8ada9598 7311msgid "Updating %s"
81809b99 7312msgstr "更新 %s 中"
8ada9598
JX
7313
7314#: builtin/remote.c:130
7315msgid ""
7316"--mirror is dangerous and deprecated; please\n"
7317"\t use --mirror=fetch or --mirror=push instead"
7318msgstr ""
81809b99
JX
7319"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7320"\t 或 --mirror=push"
8ada9598
JX
7321
7322#: builtin/remote.c:147
81809b99 7323#, c-format
8ada9598 7324msgid "unknown mirror argument: %s"
81809b99 7325msgstr "未知的镜像参数:%s"
8ada9598 7326
ef317cd5 7327#: builtin/remote.c:163
ef317cd5 7328msgid "fetch the remote branches"
07432cef 7329msgstr "抓取远程的分支"
ef317cd5
JX
7330
7331#: builtin/remote.c:165
7332msgid "import all tags and associated objects when fetching"
07432cef 7333msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5
JX
7334
7335#: builtin/remote.c:168
7336msgid "or do not fetch any tag at all (--no-tags)"
07432cef 7337msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5
JX
7338
7339#: builtin/remote.c:170
7340msgid "branch(es) to track"
07432cef 7341msgstr "跟踪的分支"
ef317cd5
JX
7342
7343#: builtin/remote.c:171
ef317cd5 7344msgid "master branch"
07432cef 7345msgstr "主线分支"
ef317cd5
JX
7346
7347#: builtin/remote.c:172
7348msgid "push|fetch"
07432cef 7349msgstr "push|fetch"
ef317cd5
JX
7350
7351#: builtin/remote.c:173
7352msgid "set up remote as a mirror to push to or fetch from"
07432cef 7353msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 7354
8ada9598
JX
7355#: builtin/remote.c:185
7356msgid "specifying a master branch makes no sense with --mirror"
81809b99 7357msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598
JX
7358
7359#: builtin/remote.c:187
7360msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 7361msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598
JX
7362
7363#: builtin/remote.c:195 builtin/remote.c:646
81809b99 7364#, c-format
8ada9598 7365msgid "remote %s already exists."
81809b99 7366msgstr "远程 %s 已经存在。"
8ada9598
JX
7367
7368#: builtin/remote.c:199 builtin/remote.c:650
81809b99 7369#, c-format
8ada9598 7370msgid "'%s' is not a valid remote name"
81809b99 7371msgstr "'%s' 不是一个有效的远程名称"
8ada9598
JX
7372
7373#: builtin/remote.c:243
81809b99 7374#, c-format
8ada9598 7375msgid "Could not setup master '%s'"
81809b99 7376msgstr "无法设置 master '%s'"
8ada9598
JX
7377
7378#: builtin/remote.c:299
81809b99 7379#, c-format
8ada9598 7380msgid "more than one %s"
81809b99 7381msgstr "多于一个 %s"
8ada9598
JX
7382
7383#: builtin/remote.c:339
81809b99 7384#, c-format
8ada9598 7385msgid "Could not get fetch map for refspec %s"
81809b99 7386msgstr "无法得到引用表达式 %s 的获取列表"
8ada9598
JX
7387
7388#: builtin/remote.c:440 builtin/remote.c:448
7389msgid "(matching)"
81809b99 7390msgstr "(匹配)"
8ada9598
JX
7391
7392#: builtin/remote.c:452
8ada9598 7393msgid "(delete)"
81809b99 7394msgstr "(删除)"
8ada9598
JX
7395
7396#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
81809b99 7397#, c-format
8ada9598 7398msgid "Could not append '%s' to '%s'"
81809b99 7399msgstr "不能添加 '%s' 至 '%s'"
8ada9598
JX
7400
7401#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
81809b99 7402#, c-format
8ada9598 7403msgid "No such remote: %s"
81809b99 7404msgstr "没有这样的远程:%s"
8ada9598
JX
7405
7406#: builtin/remote.c:656
81809b99 7407#, c-format
8ada9598 7408msgid "Could not rename config section '%s' to '%s'"
81809b99 7409msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598
JX
7410
7411#: builtin/remote.c:662 builtin/remote.c:799
81809b99 7412#, c-format
8ada9598 7413msgid "Could not remove config section '%s'"
81809b99 7414msgstr "不能移除配置小节 '%s'"
8ada9598
JX
7415
7416#: builtin/remote.c:677
7417#, c-format
7418msgid ""
d691f479 7419"Not updating non-default fetch refspec\n"
8ada9598
JX
7420"\t%s\n"
7421"\tPlease update the configuration manually if necessary."
7422msgstr ""
81809b99
JX
7423"没有更新非默认的获取引用表达式\n"
7424"\t%s\n"
7425"\t如果必要请手动更新配置。"
8ada9598
JX
7426
7427#: builtin/remote.c:683
81809b99 7428#, c-format
8ada9598 7429msgid "Could not append '%s'"
81809b99 7430msgstr "不能追加 '%s'"
8ada9598
JX
7431
7432#: builtin/remote.c:694
81809b99 7433#, c-format
8ada9598 7434msgid "Could not set '%s'"
81809b99 7435msgstr "不能设置 '%s'"
8ada9598
JX
7436
7437#: builtin/remote.c:716
81809b99 7438#, c-format
8ada9598 7439msgid "deleting '%s' failed"
81809b99 7440msgstr "删除 '%s' 失败"
8ada9598
JX
7441
7442#: builtin/remote.c:750
81809b99 7443#, c-format
8ada9598 7444msgid "creating '%s' failed"
81809b99 7445msgstr "创建 '%s' 失败"
8ada9598
JX
7446
7447#: builtin/remote.c:764
81809b99 7448#, c-format
8ada9598 7449msgid "Could not remove branch %s"
81809b99 7450msgstr "无法移除分支 %s"
8ada9598
JX
7451
7452#: builtin/remote.c:834
7453msgid ""
7454"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7455"to delete it, use:"
7456msgid_plural ""
7457"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7458"to delete them, use:"
5ae481e0
JX
7459msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7460msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598
JX
7461
7462#: builtin/remote.c:943
7463#, c-format
7464msgid " new (next fetch will store in remotes/%s)"
81809b99 7465msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598
JX
7466
7467#: builtin/remote.c:946
8ada9598 7468msgid " tracked"
81809b99 7469msgstr " 已跟踪"
8ada9598
JX
7470
7471#: builtin/remote.c:948
7472msgid " stale (use 'git remote prune' to remove)"
81809b99 7473msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598
JX
7474
7475#: builtin/remote.c:950
7476msgid " ???"
81809b99 7477msgstr " ???"
8ada9598
JX
7478
7479#: builtin/remote.c:991
7480#, c-format
7481msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 7482msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598
JX
7483
7484#: builtin/remote.c:998
81809b99 7485#, c-format
8ada9598 7486msgid "rebases onto remote %s"
81809b99 7487msgstr "变基到远程 %s"
8ada9598
JX
7488
7489#: builtin/remote.c:1001
81809b99 7490#, c-format
8ada9598 7491msgid " merges with remote %s"
81809b99 7492msgstr " 与远程 %s 合并"
8ada9598
JX
7493
7494#: builtin/remote.c:1002
7495msgid " and with remote"
81809b99 7496msgstr " 且有远程"
8ada9598
JX
7497
7498#: builtin/remote.c:1004
81809b99 7499#, c-format
8ada9598 7500msgid "merges with remote %s"
81809b99 7501msgstr "与远程 %s 合并"
8ada9598
JX
7502
7503#: builtin/remote.c:1005
7504msgid " and with remote"
81809b99 7505msgstr " 且有远程"
8ada9598
JX
7506
7507#: builtin/remote.c:1051
7508msgid "create"
81809b99 7509msgstr "创建"
8ada9598
JX
7510
7511#: builtin/remote.c:1054
8ada9598 7512msgid "delete"
81809b99 7513msgstr "删除"
8ada9598
JX
7514
7515#: builtin/remote.c:1058
8ada9598 7516msgid "up to date"
81809b99 7517msgstr "最新"
8ada9598
JX
7518
7519#: builtin/remote.c:1061
8ada9598 7520msgid "fast-forwardable"
81809b99 7521msgstr "可快进"
8ada9598
JX
7522
7523#: builtin/remote.c:1064
7524msgid "local out of date"
81809b99 7525msgstr "本地已过时"
8ada9598
JX
7526
7527#: builtin/remote.c:1071
7528#, c-format
7529msgid " %-*s forces to %-*s (%s)"
81809b99 7530msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598
JX
7531
7532#: builtin/remote.c:1074
7533#, c-format
7534msgid " %-*s pushes to %-*s (%s)"
81809b99 7535msgstr " %-*s 推送至 %-*s (%s)"
8ada9598
JX
7536
7537#: builtin/remote.c:1078
7538#, c-format
7539msgid " %-*s forces to %s"
81809b99 7540msgstr " %-*s 强制推送至 %s"
8ada9598
JX
7541
7542#: builtin/remote.c:1081
7543#, c-format
7544msgid " %-*s pushes to %s"
81809b99 7545msgstr " %-*s 推送至 %s"
8ada9598 7546
ef317cd5 7547#: builtin/remote.c:1091
ef317cd5 7548msgid "do not query remotes"
07432cef 7549msgstr "不查询远程"
ef317cd5 7550
8ada9598 7551#: builtin/remote.c:1118
81809b99 7552#, c-format
8ada9598 7553msgid "* remote %s"
81809b99 7554msgstr "* 远程 %s"
8ada9598
JX
7555
7556#: builtin/remote.c:1119
7557#, c-format
7558msgid " Fetch URL: %s"
81809b99 7559msgstr " 获取地址:%s"
8ada9598
JX
7560
7561#: builtin/remote.c:1120 builtin/remote.c:1285
7562msgid "(no URL)"
81809b99 7563msgstr "(无 URL)"
8ada9598
JX
7564
7565#: builtin/remote.c:1129 builtin/remote.c:1131
7566#, c-format
7567msgid " Push URL: %s"
81809b99 7568msgstr " 推送地址:%s"
8ada9598
JX
7569
7570#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
81809b99 7571#, c-format
8ada9598 7572msgid " HEAD branch: %s"
81809b99 7573msgstr " HEAD分支:%s"
8ada9598
JX
7574
7575#: builtin/remote.c:1139
7576#, c-format
7577msgid ""
7578" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 7579msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598
JX
7580
7581#: builtin/remote.c:1151
81809b99 7582#, c-format
8ada9598
JX
7583msgid " Remote branch:%s"
7584msgid_plural " Remote branches:%s"
81809b99 7585msgstr[0] " 远程分支:%s"
5ae481e0 7586msgstr[1] " 远程分支:%s"
8ada9598 7587
81809b99 7588# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
7589#: builtin/remote.c:1154 builtin/remote.c:1181
7590msgid " (status not queried)"
81809b99 7591msgstr "(状态未查询)"
8ada9598
JX
7592
7593#: builtin/remote.c:1163
7594msgid " Local branch configured for 'git pull':"
7595msgid_plural " Local branches configured for 'git pull':"
81809b99 7596msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 7597msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598
JX
7598
7599#: builtin/remote.c:1171
7600msgid " Local refs will be mirrored by 'git push'"
81809b99 7601msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598
JX
7602
7603#: builtin/remote.c:1178
81809b99 7604#, c-format
8ada9598
JX
7605msgid " Local ref configured for 'git push'%s:"
7606msgid_plural " Local refs configured for 'git push'%s:"
81809b99 7607msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 7608msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 7609
ef317cd5
JX
7610#: builtin/remote.c:1199
7611msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 7612msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5
JX
7613
7614#: builtin/remote.c:1201
7615msgid "delete refs/remotes/<name>/HEAD"
07432cef 7616msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 7617
8ada9598 7618#: builtin/remote.c:1216
8ada9598 7619msgid "Cannot determine remote HEAD"
81809b99 7620msgstr "无法确定远程 HEAD"
8ada9598
JX
7621
7622#: builtin/remote.c:1218
7623msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 7624msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598
JX
7625
7626#: builtin/remote.c:1228
81809b99 7627#, c-format
8ada9598 7628msgid "Could not delete %s"
81809b99 7629msgstr "无法删除 %s"
8ada9598
JX
7630
7631#: builtin/remote.c:1236
81809b99 7632#, c-format
8ada9598 7633msgid "Not a valid ref: %s"
81809b99 7634msgstr "不是一个有效引用:%s"
8ada9598
JX
7635
7636#: builtin/remote.c:1238
81809b99 7637#, c-format
8ada9598 7638msgid "Could not setup %s"
81809b99 7639msgstr "不能设置 %s"
8ada9598
JX
7640
7641# 译者:注意保持前导空格
7642#: builtin/remote.c:1274
81809b99 7643#, c-format
8ada9598 7644msgid " %s will become dangling!"
07432cef 7645msgstr " %s 将成为摇摆状态!"
8ada9598
JX
7646
7647# 译者:注意保持前导空格
7648#: builtin/remote.c:1275
81809b99 7649#, c-format
8ada9598 7650msgid " %s has become dangling!"
07432cef 7651msgstr " %s 已成为摇摆状态!"
8ada9598
JX
7652
7653#: builtin/remote.c:1281
81809b99 7654#, c-format
8ada9598 7655msgid "Pruning %s"
81809b99 7656msgstr "修剪 %s"
8ada9598
JX
7657
7658#: builtin/remote.c:1282
7659#, c-format
7660msgid "URL: %s"
81809b99 7661msgstr "URL:%s"
8ada9598
JX
7662
7663#: builtin/remote.c:1295
7664#, c-format
7665msgid " * [would prune] %s"
81809b99 7666msgstr " * [将删除] %s"
8ada9598
JX
7667
7668#: builtin/remote.c:1298
7669#, c-format
7670msgid " * [pruned] %s"
81809b99 7671msgstr " * [已删除] %s"
8ada9598 7672
ef317cd5
JX
7673#: builtin/remote.c:1321
7674msgid "prune remotes after fetching"
07432cef 7675msgstr "抓取后清除远程"
ef317cd5 7676
8ada9598 7677#: builtin/remote.c:1387 builtin/remote.c:1461
81809b99 7678#, c-format
8ada9598 7679msgid "No such remote '%s'"
81809b99 7680msgstr "没有此远程 '%s'"
8ada9598 7681
ef317cd5 7682#: builtin/remote.c:1407
ef317cd5 7683msgid "add branch"
07432cef 7684msgstr "添加分支"
ef317cd5 7685
8ada9598 7686#: builtin/remote.c:1414
8ada9598 7687msgid "no remote specified"
81809b99 7688msgstr "未指定远程"
8ada9598 7689
ef317cd5
JX
7690#: builtin/remote.c:1436
7691msgid "manipulate push URLs"
07432cef 7692msgstr "操作推送 URLS"
ef317cd5
JX
7693
7694#: builtin/remote.c:1438
7695msgid "add URL"
07432cef 7696msgstr "添加 URL"
ef317cd5
JX
7697
7698#: builtin/remote.c:1440
ef317cd5 7699msgid "delete URLs"
07432cef 7700msgstr "删除 URLS"
ef317cd5 7701
8ada9598 7702#: builtin/remote.c:1447
8ada9598 7703msgid "--add --delete doesn't make sense"
81809b99 7704msgstr "--add --delete 无意义"
8ada9598
JX
7705
7706#: builtin/remote.c:1487
81809b99 7707#, c-format
8ada9598 7708msgid "Invalid old URL pattern: %s"
81809b99 7709msgstr "无效的旧URL匹配模版:%s"
8ada9598
JX
7710
7711#: builtin/remote.c:1495
81809b99 7712#, c-format
8ada9598 7713msgid "No such URL found: %s"
81809b99 7714msgstr "未找到此URL:%s"
8ada9598
JX
7715
7716#: builtin/remote.c:1497
7717msgid "Will not delete all non-push URLs"
81809b99 7718msgstr "将不会删除所有非推送URL地址"
8ada9598 7719
ef317cd5
JX
7720#: builtin/remote.c:1569
7721msgid "be verbose; must be placed before a subcommand"
07432cef 7722msgstr "冗长输出;必须置于子命令之前"
ef317cd5
JX
7723
7724#: builtin/replace.c:17
7725msgid "git replace [-f] <object> <replacement>"
07432cef 7726msgstr "git replace [-f] <对象> <替换物>"
ef317cd5
JX
7727
7728#: builtin/replace.c:18
7729msgid "git replace -d <object>..."
07432cef 7730msgstr "git replace -d <对象>..."
ef317cd5
JX
7731
7732#: builtin/replace.c:19
7733msgid "git replace -l [<pattern>]"
07432cef 7734msgstr "git replace -l [<模式>]"
ef317cd5 7735
07432cef 7736#: builtin/replace.c:121
ef317cd5 7737msgid "list replace refs"
07432cef 7738msgstr "列出替换的引用"
ef317cd5 7739
07432cef 7740#: builtin/replace.c:122
ef317cd5 7741msgid "delete replace refs"
07432cef 7742msgstr "删除替换的引用"
ef317cd5 7743
07432cef 7744#: builtin/replace.c:123
ef317cd5 7745msgid "replace the ref if it exists"
07432cef 7746msgstr "如果存在则替换引用"
ef317cd5
JX
7747
7748#: builtin/rerere.c:11
7749msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 7750msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5
JX
7751
7752#: builtin/rerere.c:56
ef317cd5 7753msgid "register clean resolutions in index"
07432cef 7754msgstr "在索引中注册干净的解决方案"
ef317cd5
JX
7755
7756#: builtin/reset.c:25
7757msgid ""
7758"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 7759msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5
JX
7760
7761#: builtin/reset.c:26
07432cef
WS
7762msgid "git reset [-q] <tree-ish> [--] <paths>..."
7763msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5
JX
7764
7765#: builtin/reset.c:27
07432cef
WS
7766msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7767msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 7768
c04f5ac3
JX
7769#: builtin/reset.c:33
7770msgid "mixed"
7771msgstr "混杂"
7772
7773#: builtin/reset.c:33
7774msgid "soft"
7775msgstr "软性"
7776
7777#: builtin/reset.c:33
7778msgid "hard"
7779msgstr "硬性"
7780
8ada9598
JX
7781#: builtin/reset.c:33
7782msgid "merge"
7783msgstr "合并"
7784
c04f5ac3
JX
7785#: builtin/reset.c:33
7786msgid "keep"
7787msgstr "保持"
7788
07432cef 7789#: builtin/reset.c:73
c04f5ac3
JX
7790msgid "You do not have a valid HEAD."
7791msgstr "您没有一个有效的 HEAD。"
7792
07432cef 7793#: builtin/reset.c:75
c04f5ac3
JX
7794msgid "Failed to find tree of HEAD."
7795msgstr "无法找到 HEAD 指向的树。"
7796
07432cef 7797#: builtin/reset.c:81
c04f5ac3
JX
7798#, c-format
7799msgid "Failed to find tree of %s."
7800msgstr "无法找到 %s 指向的树。"
7801
07432cef 7802#: builtin/reset.c:98
c04f5ac3
JX
7803#, c-format
7804msgid "HEAD is now at %s"
7805msgstr "HEAD 现在位于 %s"
7806
90e6ef53 7807# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7808#: builtin/reset.c:169
c04f5ac3
JX
7809#, c-format
7810msgid "Cannot do a %s reset in the middle of a merge."
7811msgstr "在合并过程中不能做%s重置操作。"
7812
07432cef 7813#: builtin/reset.c:248
ef317cd5 7814msgid "be quiet, only report errors"
07432cef 7815msgstr "安静模式,只报告错误"
ef317cd5 7816
07432cef 7817#: builtin/reset.c:250
ef317cd5 7818msgid "reset HEAD and index"
07432cef 7819msgstr "重置 HEAD 和索引"
ef317cd5 7820
07432cef 7821#: builtin/reset.c:251
ef317cd5 7822msgid "reset only HEAD"
07432cef 7823msgstr "只重置 HEAD"
ef317cd5 7824
07432cef 7825#: builtin/reset.c:253 builtin/reset.c:255
ef317cd5 7826msgid "reset HEAD, index and working tree"
07432cef 7827msgstr "重置 HEAD、索引和工作区"
ef317cd5 7828
07432cef 7829#: builtin/reset.c:257
ef317cd5 7830msgid "reset HEAD but keep local changes"
07432cef 7831msgstr "重置 HEAD 但保存本地变更"
ef317cd5 7832
07432cef
WS
7833#: builtin/reset.c:275
7834#, c-format
7835msgid "Failed to resolve '%s' as a valid revision."
7836msgstr "无法将 '%s' 解析为一个有效的版本。"
7837
7838#: builtin/reset.c:278 builtin/reset.c:286
c04f5ac3
JX
7839#, c-format
7840msgid "Could not parse object '%s'."
7841msgstr "不能解析对象 '%s'。"
7842
07432cef
WS
7843#: builtin/reset.c:283
7844#, c-format
7845msgid "Failed to resolve '%s' as a valid tree."
7846msgstr "无法将 '%s' 解析为一个有效的树对象。"
7847
7848#: builtin/reset.c:292
c04f5ac3 7849msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 7850msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 7851
07432cef 7852#: builtin/reset.c:301
c04f5ac3 7853msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 7854msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 7855
90e6ef53 7856# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7857#: builtin/reset.c:303
c04f5ac3
JX
7858#, c-format
7859msgid "Cannot do %s reset with paths."
7860msgstr "不能带路径进行%s重置。"
7861
90e6ef53 7862# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7863#: builtin/reset.c:313
c04f5ac3
JX
7864#, c-format
7865msgid "%s reset is not allowed in a bare repository"
7866msgstr "不能对裸版本库进行%s重置"
7867
07432cef 7868#: builtin/reset.c:333
ef317cd5
JX
7869#, c-format
7870msgid "Could not reset index file to revision '%s'."
7871msgstr "不能重置索引文件至版本 '%s'。"
7872
07432cef
WS
7873#: builtin/reset.c:339
7874msgid "Unstaged changes after reset:"
7875msgstr "重置后撤出暂存区的变更:"
7876
7877#: builtin/reset.c:344
7878msgid "Could not write new index file."
7879msgstr "不能写入新的索引文件。"
7880
ef317cd5 7881#: builtin/rev-parse.c:339
ef317cd5 7882msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 7883msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5
JX
7884
7885#: builtin/rev-parse.c:344
7886msgid "keep the `--` passed as an arg"
07432cef 7887msgstr "保持 `--` 作为一个参数传递"
ef317cd5
JX
7888
7889#: builtin/rev-parse.c:346
7890msgid "stop parsing after the first non-option argument"
07432cef 7891msgstr "遇到第一个非选项参数后停止解析"
ef317cd5
JX
7892
7893#: builtin/rev-parse.c:464
7894msgid ""
7895"git rev-parse --parseopt [options] -- [<args>...]\n"
7896" or: git rev-parse --sq-quote [<arg>...]\n"
7897" or: git rev-parse [options] [<arg>...]\n"
7898"\n"
7899"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7900msgstr ""
07432cef
WS
7901"git rev-parse --parseopt [选项] -- [<参数>...]\n"
7902" 或者:git rev-parse --sq-quote [<选项>...]\n"
7903" 或者:git rev-parse [options] [<选项>...]\n"
7904"\n"
7905"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
7906
7907#: builtin/revert.c:22
7908msgid "git revert [options] <commit-ish>"
07432cef 7909msgstr "git revert [选项] <提交号>"
ef317cd5
JX
7910
7911#: builtin/revert.c:23
7912msgid "git revert <subcommand>"
07432cef 7913msgstr "git revert <子命令>"
ef317cd5
JX
7914
7915#: builtin/revert.c:28
7916msgid "git cherry-pick [options] <commit-ish>"
07432cef 7917msgstr "git cherry-pick [选项] <提交号>"
ef317cd5
JX
7918
7919#: builtin/revert.c:29
ef317cd5 7920msgid "git cherry-pick <subcommand>"
07432cef 7921msgstr "git cherry-pick <子命令>"
ef317cd5
JX
7922
7923#: builtin/revert.c:70 builtin/revert.c:92
7924#, c-format
7925msgid "%s: %s cannot be used with %s"
7926msgstr "%s:%s 不能和 %s 同时使用"
7927
7928#: builtin/revert.c:103
7929msgid "end revert or cherry-pick sequence"
07432cef 7930msgstr "终止反转或拣选操作"
ef317cd5
JX
7931
7932#: builtin/revert.c:104
7933msgid "resume revert or cherry-pick sequence"
07432cef 7934msgstr "继续反转或拣选操作"
ef317cd5
JX
7935
7936#: builtin/revert.c:105
7937msgid "cancel revert or cherry-pick sequence"
07432cef 7938msgstr "取消反转或拣选操作"
ef317cd5
JX
7939
7940#: builtin/revert.c:106
ef317cd5 7941msgid "don't automatically commit"
07432cef 7942msgstr "不要自动提交"
ef317cd5
JX
7943
7944#: builtin/revert.c:107
ef317cd5 7945msgid "edit the commit message"
07432cef 7946msgstr "编辑提交说明"
ef317cd5
JX
7947
7948#: builtin/revert.c:110
7949msgid "parent number"
07432cef 7950msgstr "父编号"
ef317cd5
JX
7951
7952#: builtin/revert.c:112
ef317cd5 7953msgid "merge strategy"
07432cef 7954msgstr "合并策略"
ef317cd5
JX
7955
7956#: builtin/revert.c:113
ef317cd5 7957msgid "option"
07432cef 7958msgstr "选项"
ef317cd5
JX
7959
7960#: builtin/revert.c:114
ef317cd5 7961msgid "option for merge strategy"
07432cef 7962msgstr "合并策略的选项"
ef317cd5
JX
7963
7964#: builtin/revert.c:125
7965msgid "append commit name"
07432cef 7966msgstr "追加提交名称"
ef317cd5
JX
7967
7968#: builtin/revert.c:126
ef317cd5 7969msgid "allow fast-forward"
07432cef 7970msgstr "允许快进式"
c04f5ac3 7971
ef317cd5 7972#: builtin/revert.c:127
ef317cd5 7973msgid "preserve initially empty commits"
07432cef 7974msgstr "保留初始化的空提交"
ef317cd5
JX
7975
7976#: builtin/revert.c:128
ef317cd5 7977msgid "allow commits with empty messages"
07432cef 7978msgstr "允许提交说明为空"
c04f5ac3 7979
ef317cd5 7980#: builtin/revert.c:129
ef317cd5 7981msgid "keep redundant, empty commits"
07432cef 7982msgstr "保持多余的、空的提交"
ef317cd5
JX
7983
7984#: builtin/revert.c:133
c04f5ac3
JX
7985msgid "program error"
7986msgstr "程序错误"
7987
ef317cd5 7988#: builtin/revert.c:223
c04f5ac3
JX
7989msgid "revert failed"
7990msgstr "还原失败"
7991
ef317cd5 7992#: builtin/revert.c:238
c04f5ac3
JX
7993msgid "cherry-pick failed"
7994msgstr "拣选失败"
7995
07432cef 7996#: builtin/rm.c:15
ef317cd5 7997msgid "git rm [options] [--] <file>..."
07432cef
WS
7998msgstr "git rm [选项] [--] <文件>..."
7999
8000#: builtin/rm.c:64 builtin/rm.c:186
8001#, c-format
8002msgid ""
8003"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8004"(use 'rm -rf' if you really want to remove it including all of its history)"
8005msgstr ""
8006"子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8007"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 8008
07432cef 8009#: builtin/rm.c:174
c04f5ac3
JX
8010#, c-format
8011msgid ""
8012"'%s' has staged content different from both the file and the HEAD\n"
8013"(use -f to force removal)"
8014msgstr ""
90e6ef53 8015"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
c04f5ac3
JX
8016"(使用 -f 强制删除)"
8017
07432cef 8018#: builtin/rm.c:180
c04f5ac3
JX
8019#, c-format
8020msgid ""
8021"'%s' has changes staged in the index\n"
8022"(use --cached to keep the file, or -f to force removal)"
8023msgstr ""
90e6ef53 8024"'%s' 有变更已暂存至索引中\n"
c04f5ac3
JX
8025"(使用 --cached 保存文件,或用 -f 强制删除)"
8026
07432cef 8027#: builtin/rm.c:191
c04f5ac3
JX
8028#, c-format
8029msgid ""
8030"'%s' has local modifications\n"
8031"(use --cached to keep the file, or -f to force removal)"
8032msgstr ""
8033"'%s' 有本地修改\n"
8034"(使用 --cached 保存文件,或用 -f 强制删除)"
8035
07432cef 8036#: builtin/rm.c:207
ef317cd5 8037msgid "do not list removed files"
07432cef 8038msgstr "不列出删除的文件"
ef317cd5 8039
07432cef 8040#: builtin/rm.c:208
ef317cd5 8041msgid "only remove from the index"
07432cef 8042msgstr "只从索引区删除"
ef317cd5 8043
07432cef 8044#: builtin/rm.c:209
ef317cd5 8045msgid "override the up-to-date check"
07432cef 8046msgstr "忽略文件更新状态检查"
ef317cd5 8047
07432cef 8048#: builtin/rm.c:210
ef317cd5 8049msgid "allow recursive removal"
07432cef 8050msgstr "允许递归删除"
ef317cd5 8051
07432cef 8052#: builtin/rm.c:212
ef317cd5 8053msgid "exit with a zero status even if nothing matched"
07432cef 8054msgstr "即使没有匹配,也以零状态退出"
ef317cd5 8055
07432cef 8056#: builtin/rm.c:283
c04f5ac3
JX
8057#, c-format
8058msgid "not removing '%s' recursively without -r"
8059msgstr "未提供 -r 选项不会递归删除 '%s'"
8060
07432cef 8061#: builtin/rm.c:322
c04f5ac3
JX
8062#, c-format
8063msgid "git rm: unable to remove %s"
8064msgstr "git rm:不能删除 %s"
8065
ef317cd5
JX
8066#: builtin/shortlog.c:13
8067msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
07432cef 8068msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
ef317cd5 8069
07432cef 8070#: builtin/shortlog.c:133
c04f5ac3
JX
8071#, c-format
8072msgid "Missing author: %s"
8073msgstr "缺少作者:%s"
8074
07432cef 8075#: builtin/shortlog.c:229
ef317cd5 8076msgid "sort output according to the number of commits per author"
07432cef 8077msgstr "根据每个作者的提交数量排序"
ef317cd5 8078
07432cef 8079#: builtin/shortlog.c:231
ef317cd5 8080msgid "Suppress commit descriptions, only provides commit count"
07432cef 8081msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 8082
07432cef 8083#: builtin/shortlog.c:233
ef317cd5 8084msgid "Show the email address of each author"
07432cef 8085msgstr "显示每个作者的电子邮件地址"
ef317cd5 8086
07432cef 8087#: builtin/shortlog.c:234
ef317cd5 8088msgid "w[,i1[,i2]]"
07432cef 8089msgstr "w[,i1[,i2]]"
ef317cd5 8090
07432cef 8091#: builtin/shortlog.c:235
ef317cd5 8092msgid "Linewrap output"
07432cef 8093msgstr "折行输出"
ef317cd5
JX
8094
8095#: builtin/show-branch.c:9
8096msgid ""
8097"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8098"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8099"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8100"<glob>)...]"
8101msgstr ""
07432cef
WS
8102"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8103"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8104"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8105"<glob>)...]"
ef317cd5
JX
8106
8107#: builtin/show-branch.c:10
8108msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 8109msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5
JX
8110
8111#: builtin/show-branch.c:651
ef317cd5 8112msgid "show remote-tracking and local branches"
07432cef 8113msgstr "显示远程跟踪的和本地的分支"
ef317cd5
JX
8114
8115#: builtin/show-branch.c:653
ef317cd5 8116msgid "show remote-tracking branches"
07432cef 8117msgstr "显示远程跟踪的分支"
ef317cd5
JX
8118
8119#: builtin/show-branch.c:655
8120msgid "color '*!+-' corresponding to the branch"
07432cef 8121msgstr "着色 '*!+-' 到相应的分支"
ef317cd5
JX
8122
8123#: builtin/show-branch.c:657
8124msgid "show <n> more commits after the common ancestor"
07432cef 8125msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5
JX
8126
8127#: builtin/show-branch.c:659
8128msgid "synonym to more=-1"
07432cef 8129msgstr "和 more=-1 同义"
ef317cd5
JX
8130
8131#: builtin/show-branch.c:660
8132msgid "suppress naming strings"
07432cef 8133msgstr "不显示字符串命名"
ef317cd5
JX
8134
8135#: builtin/show-branch.c:662
ef317cd5 8136msgid "include the current branch"
07432cef 8137msgstr "包括当前分支"
ef317cd5
JX
8138
8139#: builtin/show-branch.c:664
ef317cd5 8140msgid "name commits with their object names"
07432cef 8141msgstr "以对象名字命名提交"
ef317cd5
JX
8142
8143#: builtin/show-branch.c:666
8144msgid "show possible merge bases"
07432cef 8145msgstr "显示可能合并的基线"
ef317cd5
JX
8146
8147#: builtin/show-branch.c:668
8148msgid "show refs unreachable from any other ref"
07432cef 8149msgstr "显示没有任何引用的的引用"
ef317cd5
JX
8150
8151#: builtin/show-branch.c:670
8152msgid "show commits in topological order"
07432cef 8153msgstr "以拓扑顺序显示提交"
ef317cd5
JX
8154
8155#: builtin/show-branch.c:672
8156msgid "show only commits not on the first branch"
07432cef 8157msgstr "只显示不在第一个分支上的提交"
ef317cd5
JX
8158
8159#: builtin/show-branch.c:674
8160msgid "show merges reachable from only one tip"
07432cef 8161msgstr "显示仅一个分支可访问的合并提交"
ef317cd5
JX
8162
8163#: builtin/show-branch.c:676
8164msgid "show commits where no parent comes before its children"
07432cef 8165msgstr "显示提交时以时间为序且父提交不能领先子提交"
ef317cd5
JX
8166
8167#: builtin/show-branch.c:678
8168msgid "<n>[,<base>]"
07432cef 8169msgstr "<n>[,<base>]"
ef317cd5
JX
8170
8171#: builtin/show-branch.c:679
8172msgid "show <n> most recent ref-log entries starting at base"
07432cef 8173msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
8174
8175#: builtin/show-ref.c:10
8176msgid ""
a77c07d9
JX
8177"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8178"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5 8179msgstr ""
a77c07d9
JX
8180"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8181"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
8182
8183#: builtin/show-ref.c:11
8184msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 8185msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 8186
07432cef 8187#: builtin/show-ref.c:165
ef317cd5 8188msgid "only show tags (can be combined with heads)"
07432cef 8189msgstr "只显示 tags(可以和头共用)"
ef317cd5 8190
07432cef 8191#: builtin/show-ref.c:166
ef317cd5 8192msgid "only show heads (can be combined with tags)"
07432cef 8193msgstr "只显示头(可以和 tags 共用)"
ef317cd5 8194
07432cef 8195#: builtin/show-ref.c:167
ef317cd5 8196msgid "stricter reference checking, requires exact ref path"
07432cef 8197msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 8198
07432cef 8199#: builtin/show-ref.c:170 builtin/show-ref.c:172
ef317cd5 8200msgid "show the HEAD reference"
07432cef 8201msgstr "显示 HEAD 引用"
ef317cd5 8202
07432cef 8203#: builtin/show-ref.c:174
ef317cd5 8204msgid "dereference tags into object IDs"
07432cef 8205msgstr "转换 tags 到对象ID"
ef317cd5 8206
07432cef 8207#: builtin/show-ref.c:176
ef317cd5 8208msgid "only show SHA1 hash using <n> digits"
07432cef 8209msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 8210
07432cef 8211#: builtin/show-ref.c:180
ef317cd5 8212msgid "do not print results to stdout (useful with --verify)"
07432cef 8213msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 8214
07432cef 8215#: builtin/show-ref.c:182
ef317cd5 8216msgid "show refs from stdin that aren't in local repository"
07432cef 8217msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
8218
8219#: builtin/symbolic-ref.c:7
8220msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
8221msgstr "git symbolic-ref [选项] 名称 [引用]"
8222
8223#: builtin/symbolic-ref.c:8
8224msgid "git symbolic-ref -d [-q] name"
8225msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 8226
07432cef 8227#: builtin/symbolic-ref.c:40
ef317cd5 8228msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
8229msgstr "不显示非符号(分离的)引用的错误信息"
8230
8231#: builtin/symbolic-ref.c:41
8232msgid "delete symbolic ref"
8233msgstr "删除符号引用"
ef317cd5 8234
07432cef 8235#: builtin/symbolic-ref.c:42
ef317cd5 8236msgid "shorten ref output"
07432cef 8237msgstr "简短的引用输出"
ef317cd5 8238
07432cef 8239#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8240msgid "reason"
07432cef 8241msgstr "原因"
ef317cd5 8242
07432cef 8243#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8244msgid "reason of the update"
07432cef 8245msgstr "更新的原因"
ef317cd5
JX
8246
8247#: builtin/tag.c:22
8248msgid ""
8249"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
a77c07d9 8250msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
8251
8252#: builtin/tag.c:23
8253msgid "git tag -d <tagname>..."
07432cef 8254msgstr "git tag -d <标签名>..."
ef317cd5
JX
8255
8256#: builtin/tag.c:24
8257msgid ""
8258"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8259"\t\t[<pattern>...]"
8260msgstr ""
07432cef
WS
8261"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8262"\t\t[<模式>...]"
ef317cd5
JX
8263
8264#: builtin/tag.c:26
8265msgid "git tag -v <tagname>..."
07432cef 8266msgstr "git tag -v <标签名>..."
ef317cd5 8267
8ada9598 8268#: builtin/tag.c:60
7ac1c0ad
JX
8269#, c-format
8270msgid "malformed object at '%s'"
8271msgstr "非法的对象于 '%s'"
8272
8ada9598 8273#: builtin/tag.c:207
c04f5ac3
JX
8274#, c-format
8275msgid "tag name too long: %.*s..."
8276msgstr "tag 名字太长:%.*s..."
8277
8ada9598 8278#: builtin/tag.c:212
c04f5ac3
JX
8279#, c-format
8280msgid "tag '%s' not found."
8281msgstr "tag '%s' 未发现。"
8282
8ada9598 8283#: builtin/tag.c:227
c04f5ac3
JX
8284#, c-format
8285msgid "Deleted tag '%s' (was %s)\n"
8286msgstr "已删除 tag '%s'(曾为 %s)\n"
8287
8ada9598 8288#: builtin/tag.c:239
c04f5ac3
JX
8289#, c-format
8290msgid "could not verify the tag '%s'"
8291msgstr "不能校验 tag '%s'"
8292
8ada9598 8293#: builtin/tag.c:249
a77c07d9 8294#, c-format
c04f5ac3
JX
8295msgid ""
8296"\n"
a77c07d9
JX
8297"Write a tag message\n"
8298"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
8299msgstr ""
8300"\n"
a77c07d9
JX
8301"输入一个 tag 说明\n"
8302"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 8303
a77c07d9
JX
8304#: builtin/tag.c:253
8305#, c-format
c04f5ac3
JX
8306msgid ""
8307"\n"
a77c07d9
JX
8308"Write a tag message\n"
8309"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 8310"want to.\n"
c04f5ac3
JX
8311msgstr ""
8312"\n"
a77c07d9
JX
8313"输入一个 tag 说明\n"
8314"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 8315
a77c07d9 8316#: builtin/tag.c:292
c04f5ac3
JX
8317msgid "unable to sign the tag"
8318msgstr "无法签署 tag"
8319
a77c07d9 8320#: builtin/tag.c:294
c04f5ac3
JX
8321msgid "unable to write tag file"
8322msgstr "无法写 tag 文件"
8323
a77c07d9 8324#: builtin/tag.c:319
c04f5ac3 8325msgid "bad object type."
90e6ef53 8326msgstr "坏的对象类型。"
c04f5ac3 8327
a77c07d9 8328#: builtin/tag.c:332
c04f5ac3 8329msgid "tag header too big."
90e6ef53 8330msgstr "tag 头信息太大。"
c04f5ac3 8331
a77c07d9 8332#: builtin/tag.c:368
c04f5ac3
JX
8333msgid "no tag message?"
8334msgstr "无 tag 说明?"
8335
a77c07d9 8336#: builtin/tag.c:374
c04f5ac3
JX
8337#, c-format
8338msgid "The tag message has been left in %s\n"
8339msgstr "tag 说明被保留在 %s\n"
8340
a77c07d9 8341#: builtin/tag.c:423
7ac1c0ad
JX
8342msgid "switch 'points-at' requires an object"
8343msgstr "开关 'points-at' 需要一个对象"
8344
a77c07d9 8345#: builtin/tag.c:425
7ac1c0ad
JX
8346#, c-format
8347msgid "malformed object name '%s'"
8348msgstr "非法的对象名 '%s'"
8349
a77c07d9 8350#: builtin/tag.c:445
ef317cd5 8351msgid "list tag names"
07432cef 8352msgstr "列出tag名称"
ef317cd5 8353
a77c07d9 8354#: builtin/tag.c:447
ef317cd5 8355msgid "print <n> lines of each tag message"
07432cef 8356msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 8357
a77c07d9 8358#: builtin/tag.c:449
ef317cd5 8359msgid "delete tags"
07432cef 8360msgstr "删除 tags"
ef317cd5 8361
a77c07d9 8362#: builtin/tag.c:450
ef317cd5 8363msgid "verify tags"
07432cef 8364msgstr "验证 tags"
ef317cd5 8365
a77c07d9 8366#: builtin/tag.c:452
ef317cd5 8367msgid "Tag creation options"
07432cef 8368msgstr "Tag 创建选项"
ef317cd5 8369
a77c07d9 8370#: builtin/tag.c:454
ef317cd5 8371msgid "annotated tag, needs a message"
07432cef 8372msgstr "注解 tag,需要一个说明"
ef317cd5 8373
a77c07d9 8374#: builtin/tag.c:456
ef317cd5 8375msgid "tag message"
07432cef 8376msgstr "tag 说明"
ef317cd5 8377
a77c07d9 8378#: builtin/tag.c:458
ef317cd5 8379msgid "annotated and GPG-signed tag"
07432cef 8380msgstr "注解并 GPG 签名的 tag"
ef317cd5 8381
a77c07d9 8382#: builtin/tag.c:462
ef317cd5 8383msgid "use another key to sign the tag"
07432cef 8384msgstr "使用另外的私钥签名 tag"
ef317cd5 8385
a77c07d9 8386#: builtin/tag.c:463
ef317cd5 8387msgid "replace the tag if exists"
07432cef 8388msgstr "如果存在,替换现有的 tag"
ef317cd5 8389
a77c07d9 8390#: builtin/tag.c:464
ef317cd5 8391msgid "show tag list in columns"
07432cef 8392msgstr "以列的方式显示 tag"
ef317cd5 8393
a77c07d9 8394#: builtin/tag.c:466
ef317cd5 8395msgid "Tag listing options"
07432cef 8396msgstr "Tag 列表选项"
ef317cd5 8397
a77c07d9 8398#: builtin/tag.c:469
ef317cd5 8399msgid "print only tags that contain the commit"
07432cef 8400msgstr "只打印包含提交的tags"
ef317cd5 8401
a77c07d9 8402#: builtin/tag.c:475
ef317cd5 8403msgid "print only tags of the object"
07432cef 8404msgstr "只打印tags对象"
ef317cd5 8405
a77c07d9 8406#: builtin/tag.c:504
8ada9598 8407msgid "--column and -n are incompatible"
81809b99 8408msgstr "--column 和 -n 不兼容"
8ada9598 8409
a77c07d9 8410#: builtin/tag.c:521
c04f5ac3 8411msgid "-n option is only allowed with -l."
649900bc 8412msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 8413
a77c07d9 8414#: builtin/tag.c:523
c04f5ac3 8415msgid "--contains option is only allowed with -l."
649900bc 8416msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 8417
a77c07d9 8418#: builtin/tag.c:525
7ac1c0ad 8419msgid "--points-at option is only allowed with -l."
649900bc 8420msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 8421
a77c07d9 8422#: builtin/tag.c:533
c04f5ac3
JX
8423msgid "only one -F or -m option is allowed."
8424msgstr "只允许一个 -F 或 -m 选项。"
8425
a77c07d9 8426#: builtin/tag.c:553
c04f5ac3
JX
8427msgid "too many params"
8428msgstr "太多参数"
8429
a77c07d9 8430#: builtin/tag.c:559
c04f5ac3
JX
8431#, c-format
8432msgid "'%s' is not a valid tag name."
90e6ef53 8433msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 8434
a77c07d9 8435#: builtin/tag.c:564
c04f5ac3
JX
8436#, c-format
8437msgid "tag '%s' already exists"
8438msgstr "tag '%s' 已存在"
8439
a77c07d9 8440#: builtin/tag.c:582
c04f5ac3
JX
8441#, c-format
8442msgid "%s: cannot lock the ref"
8443msgstr "%s:不能锁定引用"
8444
a77c07d9 8445#: builtin/tag.c:584
c04f5ac3
JX
8446#, c-format
8447msgid "%s: cannot update the ref"
8448msgstr "%s:不能更新引用"
8449
a77c07d9 8450#: builtin/tag.c:586
c04f5ac3
JX
8451#, c-format
8452msgid "Updated tag '%s' (was %s)\n"
8453msgstr "已更新tag '%s'(曾为 %s)\n"
8454
ef317cd5 8455#: builtin/update-index.c:401
ef317cd5 8456msgid "git update-index [options] [--] [<file>...]"
07432cef 8457msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 8458
07432cef 8459#: builtin/update-index.c:718
ef317cd5 8460msgid "continue refresh even when index needs update"
07432cef 8461msgstr "当索引需要更新时继续刷新"
8ada9598 8462
07432cef 8463#: builtin/update-index.c:721
ef317cd5 8464msgid "refresh: ignore submodules"
07432cef 8465msgstr "刷新:忽略子模组"
8ada9598 8466
07432cef 8467#: builtin/update-index.c:724
ef317cd5 8468msgid "do not ignore new files"
07432cef 8469msgstr "不忽略新的文件"
8ada9598 8470
07432cef 8471#: builtin/update-index.c:726
ef317cd5 8472msgid "let files replace directories and vice-versa"
07432cef 8473msgstr "让文件替换目录(反之亦然)"
ef317cd5 8474
07432cef 8475#: builtin/update-index.c:728
ef317cd5 8476msgid "notice files missing from worktree"
07432cef 8477msgstr "通知文件从工作区丢失"
ef317cd5 8478
07432cef 8479#: builtin/update-index.c:730
ef317cd5 8480msgid "refresh even if index contains unmerged entries"
07432cef 8481msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 8482
07432cef 8483#: builtin/update-index.c:733
ef317cd5 8484msgid "refresh stat information"
07432cef 8485msgstr "刷新统计信息"
ef317cd5 8486
07432cef 8487#: builtin/update-index.c:737
ef317cd5 8488msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 8489msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 8490
07432cef 8491#: builtin/update-index.c:741
ef317cd5 8492msgid "<mode> <object> <path>"
07432cef 8493msgstr "<mode> <object> <path>"
ef317cd5 8494
07432cef 8495#: builtin/update-index.c:742
ef317cd5 8496msgid "add the specified entry to the index"
07432cef 8497msgstr "添加指定的条目到索引区"
ef317cd5 8498
07432cef 8499#: builtin/update-index.c:746
ef317cd5 8500msgid "(+/-)x"
07432cef 8501msgstr "(+/-)x"
ef317cd5 8502
07432cef 8503#: builtin/update-index.c:747
ef317cd5 8504msgid "override the executable bit of the listed files"
07432cef 8505msgstr "覆盖列表里文件的可执行位"
ef317cd5 8506
07432cef 8507#: builtin/update-index.c:751
ef317cd5 8508msgid "mark files as \"not changing\""
07432cef 8509msgstr "把文件标记为 \"没有变更\""
ef317cd5 8510
07432cef 8511#: builtin/update-index.c:754
ef317cd5 8512msgid "clear assumed-unchanged bit"
07432cef 8513msgstr "清除 assumed-unchanged 位"
ef317cd5 8514
07432cef 8515#: builtin/update-index.c:757
ef317cd5 8516msgid "mark files as \"index-only\""
07432cef 8517msgstr "把文件标记为 \"仅索引\""
ef317cd5 8518
07432cef 8519#: builtin/update-index.c:760
ef317cd5 8520msgid "clear skip-worktree bit"
07432cef 8521msgstr "清除 skip-worktree 位"
ef317cd5 8522
07432cef 8523#: builtin/update-index.c:763
ef317cd5 8524msgid "add to index only; do not add content to object database"
07432cef 8525msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 8526
07432cef 8527#: builtin/update-index.c:765
ef317cd5 8528msgid "remove named paths even if present in worktree"
07432cef 8529msgstr "即使存在工作区里,也删除路径"
ef317cd5 8530
07432cef 8531#: builtin/update-index.c:767
ef317cd5 8532msgid "with --stdin: input lines are terminated by null bytes"
07432cef 8533msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 8534
07432cef 8535#: builtin/update-index.c:769
ef317cd5 8536msgid "read list of paths to be updated from standard input"
07432cef 8537msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 8538
07432cef 8539#: builtin/update-index.c:773
ef317cd5 8540msgid "add entries from standard input to the index"
07432cef 8541msgstr "从标准输入添加条目到索引区"
ef317cd5 8542
07432cef 8543#: builtin/update-index.c:777
ef317cd5 8544msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 8545msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 8546
07432cef 8547#: builtin/update-index.c:781
ef317cd5 8548msgid "only update entries that differ from HEAD"
07432cef 8549msgstr "只更新与 HEAD 不同的条目"
ef317cd5 8550
07432cef 8551#: builtin/update-index.c:785
ef317cd5 8552msgid "ignore files missing from worktree"
07432cef 8553msgstr "忽略工作区丢失的文件"
ef317cd5 8554
07432cef 8555#: builtin/update-index.c:788
ef317cd5 8556msgid "report actions to standard output"
07432cef 8557msgstr "在标准输出显示操作"
ef317cd5 8558
07432cef 8559#: builtin/update-index.c:790
ef317cd5 8560msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 8561msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 8562
07432cef 8563#: builtin/update-index.c:794
ef317cd5 8564msgid "write index in this format"
07432cef 8565msgstr "以这种格式写入索引区"
ef317cd5
JX
8566
8567#: builtin/update-ref.c:7
8568msgid "git update-ref [options] -d <refname> [<oldval>]"
07432cef 8569msgstr "git update-ref [options] -d <引用名> [<旧值>]"
ef317cd5
JX
8570
8571#: builtin/update-ref.c:8
8572msgid "git update-ref [options] <refname> <newval> [<oldval>]"
07432cef 8573msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
ef317cd5
JX
8574
8575#: builtin/update-ref.c:19
8576msgid "delete the reference"
07432cef 8577msgstr "删除引用"
ef317cd5
JX
8578
8579#: builtin/update-ref.c:21
8580msgid "update <refname> not the one it points to"
07432cef 8581msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5
JX
8582
8583#: builtin/update-server-info.c:6
8584msgid "git update-server-info [--force]"
07432cef 8585msgstr "git update-server-info [--force]"
ef317cd5
JX
8586
8587#: builtin/update-server-info.c:14
8588msgid "update the info files from scratch"
07432cef 8589msgstr "从头开始更新文件信息"
ef317cd5
JX
8590
8591#: builtin/verify-pack.c:56
8592msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 8593msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5
JX
8594
8595#: builtin/verify-pack.c:66
ef317cd5
JX
8596msgid "verbose"
8597msgstr "冗长输出"
8598
8599#: builtin/verify-pack.c:68
8600msgid "show statistics only"
07432cef 8601msgstr "只显示统计"
ef317cd5
JX
8602
8603#: builtin/verify-tag.c:17
8604msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 8605msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
8606
8607#: builtin/verify-tag.c:73
8608msgid "print tag contents"
07432cef 8609msgstr "打印 tag 内容"
ef317cd5
JX
8610
8611#: builtin/write-tree.c:13
8612msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 8613msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
8614
8615#: builtin/write-tree.c:26
8616msgid "<prefix>/"
07432cef 8617msgstr "<前缀>/"
ef317cd5
JX
8618
8619#: builtin/write-tree.c:27
8620msgid "write tree object for a subdirectory <prefix>"
07432cef 8621msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
8622
8623#: builtin/write-tree.c:30
8624msgid "only useful for debugging"
07432cef 8625msgstr "只对调试有用"
ef317cd5
JX
8626
8627#: git.c:16
8628msgid "See 'git help <command>' for more information on a specific command."
8629msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8ada9598
JX
8630
8631#: parse-options.h:156
8632msgid "no-op (backward compatibility)"
81809b99 8633msgstr "空操作(向后兼容)"
8ada9598 8634
07432cef 8635#: parse-options.h:232
8ada9598 8636msgid "be more verbose"
81809b99 8637msgstr "更加详细"
8ada9598 8638
07432cef 8639#: parse-options.h:234
8ada9598 8640msgid "be more quiet"
81809b99 8641msgstr "更加安静"
8ada9598 8642
07432cef 8643#: parse-options.h:240
8ada9598 8644msgid "use <n> digits to display SHA-1s"
81809b99 8645msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
8646
8647#: common-cmds.h:8
8648msgid "Add file contents to the index"
81809b99 8649msgstr "添加文件内容至索引"
8ada9598
JX
8650
8651#: common-cmds.h:9
8652msgid "Find by binary search the change that introduced a bug"
81809b99 8653msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
8654
8655#: common-cmds.h:10
8ada9598 8656msgid "List, create, or delete branches"
81809b99 8657msgstr "列出、创建或删除分支"
8ada9598
JX
8658
8659#: common-cmds.h:11
8660msgid "Checkout a branch or paths to the working tree"
81809b99 8661msgstr "检出一个分支或路径到工作区"
8ada9598
JX
8662
8663#: common-cmds.h:12
8ada9598 8664msgid "Clone a repository into a new directory"
81809b99 8665msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
8666
8667#: common-cmds.h:13
8ada9598 8668msgid "Record changes to the repository"
81809b99 8669msgstr "记录变更到版本库"
8ada9598
JX
8670
8671#: common-cmds.h:14
8672msgid "Show changes between commits, commit and working tree, etc"
81809b99 8673msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
8674
8675#: common-cmds.h:15
8676msgid "Download objects and refs from another repository"
81809b99 8677msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
8678
8679#: common-cmds.h:16
8680msgid "Print lines matching a pattern"
81809b99 8681msgstr "输出和模式匹配的行"
8ada9598
JX
8682
8683#: common-cmds.h:17
a77c07d9
JX
8684msgid "Create an empty Git repository or reinitialize an existing one"
8685msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598
JX
8686
8687#: common-cmds.h:18
8ada9598 8688msgid "Show commit logs"
81809b99 8689msgstr "显示提交日志"
8ada9598
JX
8690
8691#: common-cmds.h:19
8692msgid "Join two or more development histories together"
81809b99 8693msgstr "合并两个或更多开发历史"
8ada9598
JX
8694
8695#: common-cmds.h:20
8696msgid "Move or rename a file, a directory, or a symlink"
81809b99 8697msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
8698
8699#: common-cmds.h:21
8700msgid "Fetch from and merge with another repository or a local branch"
81809b99 8701msgstr "获取并合并另外的版本库或一个本地分支"
8ada9598
JX
8702
8703#: common-cmds.h:22
8704msgid "Update remote refs along with associated objects"
81809b99 8705msgstr "更新远程引用和相关的对象"
8ada9598
JX
8706
8707#: common-cmds.h:23
8708msgid "Forward-port local commits to the updated upstream head"
81809b99 8709msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
8710
8711#: common-cmds.h:24
8712msgid "Reset current HEAD to the specified state"
81809b99 8713msgstr "重置当前HEAD到指定状态"
8ada9598
JX
8714
8715#: common-cmds.h:25
8716msgid "Remove files from the working tree and from the index"
81809b99 8717msgstr "从工作区和索引中删除文件"
8ada9598
JX
8718
8719#: common-cmds.h:26
8720msgid "Show various types of objects"
81809b99 8721msgstr "显示各种类型的对象"
8ada9598
JX
8722
8723#: common-cmds.h:27
8ada9598 8724msgid "Show the working tree status"
81809b99 8725msgstr "显示工作区状态"
8ada9598
JX
8726
8727#: common-cmds.h:28
8728msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 8729msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 8730
170e9899 8731#: git-am.sh:50
c04f5ac3
JX
8732msgid "You need to set your committer info first"
8733msgstr "您需要先设置你的提交者信息"
8734
b694fbb1
JX
8735#: git-am.sh:95
8736msgid ""
8737"You seem to have moved HEAD since the last 'am' failure.\n"
8738"Not rewinding to ORIG_HEAD"
6792b93b 8739msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1
JX
8740
8741#: git-am.sh:105
8742#, sh-format
8743msgid ""
649900bc
JX
8744"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8745"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8746"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1
JX
8747msgstr ""
8748"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8749"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8750"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8751
8752#: git-am.sh:121
8753msgid "Cannot fall back to three-way merge."
8754msgstr "无法求助于三路合并。"
8755
170e9899 8756#: git-am.sh:137
c04f5ac3 8757msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 8758msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc
JX
8759
8760#: git-am.sh:139
8761msgid "Using index info to reconstruct a base tree..."
8762msgstr "更新索引信息以重建基树..."
c04f5ac3 8763
170e9899 8764#: git-am.sh:154
c04f5ac3
JX
8765msgid ""
8766"Did you hand edit your patch?\n"
8767"It does not apply to blobs recorded in its index."
8768msgstr ""
8769"您是否曾手动编辑过您的补丁?\n"
07432cef 8770"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 8771
170e9899 8772#: git-am.sh:163
c04f5ac3 8773msgid "Falling back to patching base and 3-way merge..."
b694fbb1 8774msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 8775
649900bc
JX
8776#: git-am.sh:179
8777msgid "Failed to merge in the changes."
8778msgstr "无法合并变更。"
8779
8780#: git-am.sh:274
c04f5ac3
JX
8781msgid "Only one StGIT patch series can be applied at once"
8782msgstr "一次只能有一个 StGIT 补丁队列被应用"
8783
649900bc 8784#: git-am.sh:361
c04f5ac3
JX
8785#, sh-format
8786msgid "Patch format $patch_format is not supported."
8787msgstr "不支持 $patch_format 补丁格式。"
8788
649900bc 8789#: git-am.sh:363
c04f5ac3
JX
8790msgid "Patch format detection failed."
8791msgstr "补丁格式检测失败。"
8792
649900bc
JX
8793#: git-am.sh:389
8794msgid ""
8795"The -b/--binary option has been a no-op for long time, and\n"
8796"it will be removed. Please do not use it anymore."
8797msgstr ""
8798"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8799"请不要再使用它了。"
c04f5ac3 8800
649900bc 8801#: git-am.sh:477
c04f5ac3
JX
8802#, sh-format
8803msgid "previous rebase directory $dotest still exists but mbox given."
8804msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8805
649900bc 8806#: git-am.sh:482
c04f5ac3
JX
8807msgid "Please make up your mind. --skip or --abort?"
8808msgstr "请下决心。--skip 或是 --abort ?"
8809
649900bc 8810#: git-am.sh:509
c04f5ac3
JX
8811msgid "Resolve operation not in progress, we are not resuming."
8812msgstr "解决操作未进行,我们不会继续。"
8813
649900bc 8814#: git-am.sh:575
c04f5ac3
JX
8815#, sh-format
8816msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 8817msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 8818
649900bc 8819#: git-am.sh:679
b694fbb1
JX
8820#, sh-format
8821msgid ""
8822"Patch is empty. Was it split wrong?\n"
8823"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8824"To restore the original branch and stop patching run \"$cmdline --abort\"."
8825msgstr ""
8826"补丁为空。是不是切分错误?\n"
8827"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
8828"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8829
649900bc 8830#: git-am.sh:706
b694fbb1
JX
8831msgid "Patch does not have a valid e-mail address."
8832msgstr "补丁中没有一个有效的邮件地址。"
8833
649900bc 8834#: git-am.sh:753
c04f5ac3 8835msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 8836msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 8837
649900bc 8838#: git-am.sh:757
b694fbb1
JX
8839msgid "Commit Body is:"
8840msgstr "提交内容为:"
8841
90e6ef53 8842# 译者:注意保持句尾空格
c04f5ac3
JX
8843#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8844#. in your translation. The program will only accept English
8845#. input at this point.
649900bc 8846#: git-am.sh:764
c04f5ac3
JX
8847msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8848msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8849
649900bc 8850#: git-am.sh:800
c04f5ac3
JX
8851#, sh-format
8852msgid "Applying: $FIRSTLINE"
8853msgstr "正应用:$FIRSTLINE"
8854
649900bc 8855#: git-am.sh:821
b694fbb1
JX
8856msgid ""
8857"No changes - did you forget to use 'git add'?\n"
8858"If there is nothing left to stage, chances are that something else\n"
8859"already introduced the same changes; you might want to skip this patch."
8860msgstr ""
8861"没有变更 —— 您是不是忘了执行 'git add'?\n"
8862"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8863"您也许想要跳过这个补丁。"
8864
649900bc 8865#: git-am.sh:829
b694fbb1
JX
8866msgid ""
8867"You still have unmerged paths in your index\n"
8868"did you forget to use 'git add'?"
6792b93b 8869msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 8870
649900bc 8871#: git-am.sh:845
c04f5ac3
JX
8872msgid "No changes -- Patch already applied."
8873msgstr "没有变更 -- 补丁已经应用过。"
8874
649900bc 8875#: git-am.sh:855
b694fbb1
JX
8876#, sh-format
8877msgid "Patch failed at $msgnum $FIRSTLINE"
8878msgstr "补丁失败于 $msgnum $FIRSTLINE"
8879
ef317cd5
JX
8880#: git-am.sh:858
8881#, sh-format
8882msgid ""
8883"The copy of the patch that failed is found in:\n"
8884" $dotest/patch"
8885msgstr ""
07432cef
WS
8886"失败的补丁文件副本位于:\n"
8887" $dotest/patch"
ef317cd5 8888
649900bc 8889#: git-am.sh:876
c04f5ac3
JX
8890msgid "applying to an empty history"
8891msgstr "正应用到一个空历史上"
8892
b694fbb1
JX
8893#: git-bisect.sh:48
8894msgid "You need to start by \"git bisect start\""
8895msgstr "您需要执行 \"git bisect start\" 来开始"
8896
90e6ef53 8897# 译者:注意保持句尾空格
c04f5ac3
JX
8898#. TRANSLATORS: Make sure to include [Y] and [n] in your
8899#. translation. The program will only accept English input
8900#. at this point.
8901#: git-bisect.sh:54
8902msgid "Do you want me to do it for you [Y/n]? "
8903msgstr "您想让我为您这样做么[Y/n]? "
8904
8905#: git-bisect.sh:95
8906#, sh-format
8907msgid "unrecognised option: '$arg'"
81809b99 8908msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
8909
8910#: git-bisect.sh:99
8911#, sh-format
8912msgid "'$arg' does not appear to be a valid revision"
8913msgstr "'$arg' 看起来不像是一个有效的版本"
8914
8915#: git-bisect.sh:117
8916msgid "Bad HEAD - I need a HEAD"
8917msgstr "坏的 HEAD - 我需要一个 HEAD"
8918
8919#: git-bisect.sh:130
8920#, sh-format
8921msgid ""
8922"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8923msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
8924
8925#: git-bisect.sh:140
8926msgid "won't bisect on seeked tree"
8927msgstr "不会在已查找过的树上二分查找"
8928
8929#: git-bisect.sh:144
8930msgid "Bad HEAD - strange symbolic ref"
90e6ef53 8931msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
8932
8933#: git-bisect.sh:189
8934#, sh-format
8935msgid "Bad bisect_write argument: $state"
90e6ef53 8936msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
8937
8938#: git-bisect.sh:218
8939#, sh-format
8940msgid "Bad rev input: $arg"
90e6ef53 8941msgstr "输入坏的版本:$arg"
c04f5ac3
JX
8942
8943#: git-bisect.sh:232
8944msgid "Please call 'bisect_state' with at least one argument."
8945msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
8946
8947#: git-bisect.sh:244
8948#, sh-format
8949msgid "Bad rev input: $rev"
8950msgstr "输入坏的版本:$rev"
8951
8952#: git-bisect.sh:250
8953msgid "'git bisect bad' can take only one argument."
8954msgstr "'git bisect bad' 只能带一个参数。"
8955
b694fbb1
JX
8956#. have bad but not good. we could bisect although
8957#. this is less optimum.
8958#: git-bisect.sh:273
8959msgid "Warning: bisecting only with a bad commit."
8960msgstr "警告:在仅有一个坏提交下进行二分查找。"
8961
90e6ef53 8962# 译者:注意保持句尾空格
c04f5ac3
JX
8963#. TRANSLATORS: Make sure to include [Y] and [n] in your
8964#. translation. The program will only accept English input
8965#. at this point.
8966#: git-bisect.sh:279
8967msgid "Are you sure [Y/n]? "
8968msgstr "您确认么[Y/n]? "
8969
b694fbb1
JX
8970#: git-bisect.sh:289
8971msgid ""
8972"You need to give me at least one good and one bad revisions.\n"
8973"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8974msgstr ""
8975"您需要给我至少一个好版本和一个坏版本。\n"
8976"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8977
8978#: git-bisect.sh:292
8979msgid ""
8980"You need to start by \"git bisect start\".\n"
8981"You then need to give me at least one good and one bad revisions.\n"
8982"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8983msgstr ""
8984"您需要执行 \"git bisect start\" 来开始。\n"
8985"然后需要提供我至少一个好版本和一个坏版本。\n"
8986"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8987
8988#: git-bisect.sh:347 git-bisect.sh:474
8989msgid "We are not bisecting."
8990msgstr "我们没有在二分查找。"
8991
c04f5ac3
JX
8992#: git-bisect.sh:354
8993#, sh-format
8994msgid "'$invalid' is not a valid commit"
8995msgstr "'$invalid' 不是一个有效的提交"
8996
8997#: git-bisect.sh:363
8998#, sh-format
8999msgid ""
9000"Could not check out original HEAD '$branch'.\n"
9001"Try 'git bisect reset <commit>'."
9002msgstr ""
9003"不能检出原始 HEAD '$branch'。\n"
07432cef 9004"尝试 'git bisect reset <提交>'。"
c04f5ac3
JX
9005
9006#: git-bisect.sh:390
9007msgid "No logfile given"
9008msgstr "未提供日志文件"
9009
9010#: git-bisect.sh:391
9011#, sh-format
9012msgid "cannot read $file for replaying"
9013msgstr "不能读取 $file 来重放"
9014
9015#: git-bisect.sh:408
9016msgid "?? what are you talking about?"
9017msgstr "?? 您在说什么?"
9018
b694fbb1
JX
9019#: git-bisect.sh:420
9020#, sh-format
9021msgid "running $command"
9022msgstr "运行 $command"
9023
9024#: git-bisect.sh:427
9025#, sh-format
9026msgid ""
9027"bisect run failed:\n"
9028"exit code $res from '$command' is < 0 or >= 128"
9029msgstr ""
9030"二分查找运行失败:\n"
07432cef 9031"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1
JX
9032
9033#: git-bisect.sh:453
9034msgid "bisect run cannot continue any more"
9035msgstr "二分查找不能继续运行"
9036
9037#: git-bisect.sh:459
9038#, sh-format
9039msgid ""
9040"bisect run failed:\n"
9041"'bisect_state $state' exited with error code $res"
9042msgstr ""
9043"二分查找运行失败:\n"
9044"'bisect_state $state' 退出码为 $res"
9045
9046#: git-bisect.sh:466
9047msgid "bisect run success"
9048msgstr "二分查找运行成功"
c04f5ac3
JX
9049
9050#: git-pull.sh:21
9051msgid ""
9052"Pull is not possible because you have unmerged files.\n"
9053"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9054"as appropriate to mark resolution, or use 'git commit -a'."
9055msgstr ""
90e6ef53 9056"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 9057"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 9058"或者使用 'git commit -a'。"
c04f5ac3
JX
9059
9060#: git-pull.sh:25
9061msgid "Pull is not possible because you have unmerged files."
90e6ef53 9062msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 9063
7ac1c0ad 9064#: git-pull.sh:197
c04f5ac3 9065msgid "updating an unborn branch with changes added to the index"
90e6ef53 9066msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 9067
b694fbb1
JX
9068#. The fetch involved updating the current branch.
9069#. The working tree and the index file is still based on the
9070#. $orig_head commit, but we are merging into $curr_head.
9071#. First update the working tree to match $curr_head.
07432cef 9072#: git-pull.sh:229
b694fbb1
JX
9073#, sh-format
9074msgid ""
9075"Warning: fetch updated the current branch head.\n"
9076"Warning: fast-forwarding your working tree from\n"
9077"Warning: commit $orig_head."
9078msgstr ""
9079"警告:fetch 更新了当前的分支。您的工作区\n"
9080"警告:从原提交 $orig_head 快进。"
9081
07432cef 9082#: git-pull.sh:254
c04f5ac3
JX
9083msgid "Cannot merge multiple branches into empty head"
9084msgstr "无法将多个分支合并到空分支"
9085
07432cef 9086#: git-pull.sh:258
c04f5ac3
JX
9087msgid "Cannot rebase onto multiple branches"
9088msgstr "无法变基到多个分支"
9089
07432cef 9090#: git-rebase.sh:53
649900bc
JX
9091msgid ""
9092"When you have resolved this problem, run \"git rebase --continue\".\n"
9093"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9094"To check out the original branch and stop rebasing, run \"git rebase --abort"
9095"\"."
9096msgstr ""
9097"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9098"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9099"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9100
07432cef 9101#: git-rebase.sh:160
649900bc
JX
9102msgid "The pre-rebase hook refused to rebase."
9103msgstr "钩子 pre-rebase 拒绝变基。"
9104
07432cef 9105#: git-rebase.sh:165
649900bc
JX
9106msgid "It looks like git-am is in progress. Cannot rebase."
9107msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9108
07432cef 9109#: git-rebase.sh:296
649900bc
JX
9110msgid "The --exec option must be used with the --interactive option"
9111msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9112
07432cef 9113#: git-rebase.sh:301
649900bc
JX
9114msgid "No rebase in progress?"
9115msgstr "没有正在进行的变基?"
9116
07432cef
WS
9117#: git-rebase.sh:312
9118msgid "The --edit-todo action can only be used during interactive rebase."
9119msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9120
9121#: git-rebase.sh:319
649900bc
JX
9122msgid "Cannot read HEAD"
9123msgstr "不能读取 HEAD"
9124
07432cef 9125#: git-rebase.sh:322
649900bc
JX
9126msgid ""
9127"You must edit all merge conflicts and then\n"
9128"mark them as resolved using git add"
9129msgstr ""
9130"您必须编辑所有的合并冲突,然后通过 git add\n"
9131"命令将它们标记为已解决"
9132
07432cef 9133#: git-rebase.sh:340
649900bc
JX
9134#, sh-format
9135msgid "Could not move back to $head_name"
9136msgstr "无法移回 $head_name"
9137
07432cef 9138#: git-rebase.sh:359
649900bc
JX
9139#, sh-format
9140msgid ""
9141"It seems that there is already a $state_dir_base directory, and\n"
9142"I wonder if you are in the middle of another rebase. If that is the\n"
9143"case, please try\n"
9144"\t$cmd_live_rebase\n"
9145"If that is not the case, please\n"
9146"\t$cmd_clear_stale_rebase\n"
9147"and run me again. I am stopping in case you still have something\n"
9148"valuable there."
9149msgstr ""
9150"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9151"如果是这样,请尝试执行\n"
9152"\t$cmd_live_rebase\n"
9153"如果不是这样,请执行\n"
9154"\t$cmd_clear_stale_rebase\n"
9155"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9156
07432cef 9157#: git-rebase.sh:404
649900bc
JX
9158#, sh-format
9159msgid "invalid upstream $upstream_name"
9160msgstr "无效的上游 $upstream_name"
9161
07432cef 9162#: git-rebase.sh:428
649900bc
JX
9163#, sh-format
9164msgid "$onto_name: there are more than one merge bases"
9165msgstr "$onto_name: 有一个以上的合并基准"
9166
07432cef 9167#: git-rebase.sh:431 git-rebase.sh:435
649900bc
JX
9168#, sh-format
9169msgid "$onto_name: there is no merge base"
9170msgstr "$onto_name: 没有合并基准"
9171
07432cef 9172#: git-rebase.sh:440
649900bc
JX
9173#, sh-format
9174msgid "Does not point to a valid commit: $onto_name"
9175msgstr "没有指向一个有效的提交:$onto_name"
9176
07432cef 9177#: git-rebase.sh:463
649900bc
JX
9178#, sh-format
9179msgid "fatal: no such branch: $branch_name"
9180msgstr "严重错误:无此分支:$branch_name"
9181
07432cef 9182#: git-rebase.sh:483
649900bc
JX
9183msgid "Please commit or stash them."
9184msgstr "请提交或为它们保存进度。"
9185
07432cef 9186#: git-rebase.sh:501
649900bc
JX
9187#, sh-format
9188msgid "Current branch $branch_name is up to date."
9189msgstr "当前分支 $branch_name 是最新的。"
9190
07432cef 9191#: git-rebase.sh:504
649900bc
JX
9192#, sh-format
9193msgid "Current branch $branch_name is up to date, rebase forced."
9194msgstr "当前分支 $branch_name 是最新的,强制变基。"
9195
07432cef 9196#: git-rebase.sh:515
649900bc
JX
9197#, sh-format
9198msgid "Changes from $mb to $onto:"
9199msgstr "变更从 $mb 到 $onto:"
9200
9201#. Detach HEAD and reset the tree
07432cef 9202#: git-rebase.sh:524
649900bc
JX
9203msgid "First, rewinding head to replay your work on top of it..."
9204msgstr "首先,重置头指针以便在上面重放您的工作..."
9205
07432cef 9206#: git-rebase.sh:532
649900bc
JX
9207#, sh-format
9208msgid "Fast-forwarded $branch_name to $onto_name."
9209msgstr "快进 $branch_name 至 $onto_name。"
9210
c04f5ac3
JX
9211#: git-stash.sh:51
9212msgid "git stash clear with parameters is unimplemented"
9213msgstr "git stash clear 不支持参数"
9214
9215#: git-stash.sh:74
9216msgid "You do not have the initial commit yet"
9217msgstr "您尚未建立初始提交"
9218
9219#: git-stash.sh:89
9220msgid "Cannot save the current index state"
90e6ef53 9221msgstr "无法保存当前索引状态"
c04f5ac3
JX
9222
9223#: git-stash.sh:123 git-stash.sh:136
9224msgid "Cannot save the current worktree state"
9225msgstr "无法保存当前工作区状态"
9226
9227#: git-stash.sh:140
9228msgid "No changes selected"
90e6ef53 9229msgstr "没有选择变更"
c04f5ac3
JX
9230
9231#: git-stash.sh:143
9232msgid "Cannot remove temporary index (can't happen)"
90e6ef53 9233msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
9234
9235#: git-stash.sh:156
9236msgid "Cannot record working tree state"
9237msgstr "不能记录工作区状态"
9238
b694fbb1
JX
9239#. TRANSLATORS: $option is an invalid option, like
9240#. `--blah-blah'. The 7 spaces at the beginning of the
9241#. second line correspond to "error: ". So you should line
9242#. up the second line with however many characters the
9243#. translation of "error: " takes in your language. E.g. in
9244#. English this is:
9245#.
9246#. $ git stash save --blah-blah 2>&1 | head -n 2
9247#. error: unknown option for 'stash save': --blah-blah
9248#. To provide a message, use git stash save -- '--blah-blah'
9249#: git-stash.sh:202
9250#, sh-format
9251msgid ""
9252"error: unknown option for 'stash save': $option\n"
9253" To provide a message, use git stash save -- '$option'"
9254msgstr ""
9255"错误:'stash save' 的未知选项:$option\n"
9256" 要提供一个描述信息,使用 git stash save -- '$option'"
9257
c04f5ac3
JX
9258#: git-stash.sh:223
9259msgid "No local changes to save"
9260msgstr "没有要保存的本地修改"
9261
9262#: git-stash.sh:227
9263msgid "Cannot initialize stash"
90e6ef53 9264msgstr "无法初始化 stash"
c04f5ac3
JX
9265
9266#: git-stash.sh:235
9267msgid "Cannot save the current status"
9268msgstr "无法保存当前状态"
9269
9270#: git-stash.sh:253
9271msgid "Cannot remove worktree changes"
9272msgstr "无法删除工作区变更"
9273
9274#: git-stash.sh:352
9275msgid "No stash found."
90e6ef53 9276msgstr "未发现 stash。"
c04f5ac3
JX
9277
9278#: git-stash.sh:359
9279#, sh-format
9280msgid "Too many revisions specified: $REV"
90e6ef53 9281msgstr "指定了太多的版本:$REV"
c04f5ac3
JX
9282
9283#: git-stash.sh:365
9284#, sh-format
9285msgid "$reference is not valid reference"
9286msgstr "$reference 不是有效的引用"
9287
9288#: git-stash.sh:393
9289#, sh-format
9290msgid "'$args' is not a stash-like commit"
90e6ef53 9291msgstr "'$args' 不是 stash 样提交"
c04f5ac3
JX
9292
9293#: git-stash.sh:404
9294#, sh-format
9295msgid "'$args' is not a stash reference"
90e6ef53 9296msgstr "'$args' 不是一个 stash 引用"
c04f5ac3
JX
9297
9298#: git-stash.sh:412
9299msgid "unable to refresh index"
90e6ef53 9300msgstr "无法刷新索引"
c04f5ac3
JX
9301
9302#: git-stash.sh:416
9303msgid "Cannot apply a stash in the middle of a merge"
9304msgstr "无法在合并过程中恢复进度"
9305
9306#: git-stash.sh:424
9307msgid "Conflicts in index. Try without --index."
90e6ef53 9308msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3
JX
9309
9310#: git-stash.sh:426
9311msgid "Could not save index tree"
90e6ef53 9312msgstr "不能保存索引树"
c04f5ac3
JX
9313
9314#: git-stash.sh:460
9315msgid "Cannot unstage modified files"
9316msgstr "无法还原修改的文件"
9317
ef317cd5 9318#: git-stash.sh:475
b694fbb1
JX
9319msgid "Index was not unstashed."
9320msgstr "索引的进度没有被恢复。"
9321
ef317cd5 9322#: git-stash.sh:492
c04f5ac3
JX
9323#, sh-format
9324msgid "Dropped ${REV} ($s)"
9325msgstr "丢弃了 ${REV} ($s)"
9326
ef317cd5 9327#: git-stash.sh:493
c04f5ac3
JX
9328#, sh-format
9329msgid "${REV}: Could not drop stash entry"
90e6ef53 9330msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 9331
ef317cd5 9332#: git-stash.sh:500
c04f5ac3
JX
9333msgid "No branch name specified"
9334msgstr "未指定分支名"
9335
ef317cd5 9336#: git-stash.sh:571
c04f5ac3
JX
9337msgid "(To restore them type \"git stash apply\")"
9338msgstr "(为恢复数据输入 \"git stash apply\")"
9339
07432cef 9340#: git-submodule.sh:90
c04f5ac3
JX
9341#, sh-format
9342msgid "cannot strip one component off url '$remoteurl'"
9343msgstr "无法从 url '$remoteurl' 剥离一个组件"
9344
07432cef 9345#: git-submodule.sh:195
c04f5ac3 9346#, sh-format
170e9899
JX
9347msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9348msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 9349
07432cef 9350#: git-submodule.sh:238
c04f5ac3 9351#, sh-format
170e9899
JX
9352msgid "Clone of '$url' into submodule path '$sm_path' failed"
9353msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 9354
07432cef 9355#: git-submodule.sh:250
dac1de7d
JX
9356#, sh-format
9357msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 9358msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 9359
07432cef 9360#: git-submodule.sh:343
c04f5ac3
JX
9361#, sh-format
9362msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9363msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9364
07432cef 9365#: git-submodule.sh:360
c04f5ac3 9366#, sh-format
170e9899
JX
9367msgid "'$sm_path' already exists in the index"
9368msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 9369
07432cef 9370#: git-submodule.sh:364
b694fbb1
JX
9371#, sh-format
9372msgid ""
9373"The following path is ignored by one of your .gitignore files:\n"
9374"$sm_path\n"
9375"Use -f if you really want to add it."
9376msgstr ""
9377"以下路径被您的一个 .gitignore 文件所忽略:\n"
9378"$sm_path\n"
9379"如果您确实想添加它,使用 -f 参数。"
9380
07432cef 9381#: git-submodule.sh:382
b694fbb1
JX
9382#, sh-format
9383msgid "Adding existing repo at '$sm_path' to the index"
9384msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9385
07432cef 9386#: git-submodule.sh:384
c04f5ac3 9387#, sh-format
170e9899
JX
9388msgid "'$sm_path' already exists and is not a valid git repo"
9389msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 9390
07432cef
WS
9391#: git-submodule.sh:392
9392#, sh-format
9393msgid "A git directory for '$sm_name' is found locally with remote(s):"
9394msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9395
9396#: git-submodule.sh:394
9397#, sh-format
9398msgid ""
9399"If you want to reuse this local git directory instead of cloning again from"
9400msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9401
9402#: git-submodule.sh:396
9403#, sh-format
9404msgid ""
9405"use the '--force' option. If the local git directory is not the correct repo"
9406msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9407
9408#: git-submodule.sh:397
9409#, sh-format
9410msgid ""
9411"or you are unsure what this means choose another name with the '--name' "
9412"option."
9413msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9414
9415#: git-submodule.sh:399
9416#, sh-format
9417msgid "Reactivating local git directory for submodule '$sm_name'."
9418msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9419
9420#: git-submodule.sh:411
c04f5ac3 9421#, sh-format
170e9899
JX
9422msgid "Unable to checkout submodule '$sm_path'"
9423msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 9424
07432cef 9425#: git-submodule.sh:416
c04f5ac3 9426#, sh-format
170e9899
JX
9427msgid "Failed to add submodule '$sm_path'"
9428msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 9429
07432cef 9430#: git-submodule.sh:425
c04f5ac3 9431#, sh-format
170e9899
JX
9432msgid "Failed to register submodule '$sm_path'"
9433msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 9434
07432cef 9435#: git-submodule.sh:468
c04f5ac3 9436#, sh-format
170e9899
JX
9437msgid "Entering '$prefix$sm_path'"
9438msgstr "正在进入 '$prefix$sm_path'"
c04f5ac3 9439
07432cef 9440#: git-submodule.sh:482
c04f5ac3 9441#, sh-format
170e9899
JX
9442msgid "Stopping at '$sm_path'; script returned non-zero status."
9443msgstr "停止于 '$sm_path',脚本返回非零值。"
c04f5ac3 9444
07432cef 9445#: git-submodule.sh:526
c04f5ac3 9446#, sh-format
170e9899
JX
9447msgid "No url found for submodule path '$sm_path' in .gitmodules"
9448msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
c04f5ac3 9449
07432cef 9450#: git-submodule.sh:535
c04f5ac3 9451#, sh-format
170e9899
JX
9452msgid "Failed to register url for submodule path '$sm_path'"
9453msgstr "无法为子模组路径 '$sm_path' 注册 url"
c04f5ac3 9454
07432cef 9455#: git-submodule.sh:537
c04f5ac3 9456#, sh-format
170e9899
JX
9457msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9458msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
c04f5ac3 9459
07432cef 9460#: git-submodule.sh:545
d691f479
JX
9461#, sh-format
9462msgid "Failed to register update mode for submodule path '$sm_path'"
9463msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9464
07432cef 9465#: git-submodule.sh:649
c04f5ac3
JX
9466#, sh-format
9467msgid ""
170e9899 9468"Submodule path '$sm_path' not initialized\n"
c04f5ac3
JX
9469"Maybe you want to use 'update --init'?"
9470msgstr ""
170e9899 9471"子模组路径 '$sm_path' 没有初始化\n"
90e6ef53 9472"也许您想用 'update --init'?"
c04f5ac3 9473
07432cef 9474#: git-submodule.sh:662
c04f5ac3 9475#, sh-format
170e9899
JX
9476msgid "Unable to find current revision in submodule path '$sm_path'"
9477msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
c04f5ac3 9478
07432cef 9479#: git-submodule.sh:671 git-submodule.sh:695
c04f5ac3 9480#, sh-format
170e9899
JX
9481msgid "Unable to fetch in submodule path '$sm_path'"
9482msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 9483
07432cef 9484#: git-submodule.sh:709
c04f5ac3 9485#, sh-format
170e9899
JX
9486msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9487msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
c04f5ac3 9488
07432cef 9489#: git-submodule.sh:710
c04f5ac3 9490#, sh-format
170e9899
JX
9491msgid "Submodule path '$sm_path': rebased into '$sha1'"
9492msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
c04f5ac3 9493
07432cef 9494#: git-submodule.sh:715
c04f5ac3 9495#, sh-format
170e9899
JX
9496msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9497msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
c04f5ac3 9498
07432cef 9499#: git-submodule.sh:716
c04f5ac3 9500#, sh-format
170e9899
JX
9501msgid "Submodule path '$sm_path': merged in '$sha1'"
9502msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
c04f5ac3 9503
07432cef 9504#: git-submodule.sh:721
c04f5ac3 9505#, sh-format
170e9899
JX
9506msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9507msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
c04f5ac3 9508
07432cef 9509#: git-submodule.sh:722
c04f5ac3 9510#, sh-format
170e9899
JX
9511msgid "Submodule path '$sm_path': checked out '$sha1'"
9512msgstr "子模组路径 '$sm_path':检出 '$sha1'"
c04f5ac3 9513
07432cef 9514#: git-submodule.sh:744 git-submodule.sh:1066
c04f5ac3 9515#, sh-format
170e9899
JX
9516msgid "Failed to recurse into submodule path '$sm_path'"
9517msgstr "无法递归进子模组路径 '$sm_path'"
c04f5ac3 9518
07432cef 9519#: git-submodule.sh:852
649900bc
JX
9520msgid "The --cached option cannot be used with the --files option"
9521msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1
JX
9522
9523#. unexpected type
07432cef 9524#: git-submodule.sh:892
b694fbb1
JX
9525#, sh-format
9526msgid "unexpected mode $mod_dst"
9527msgstr "意外的模式 $mod_dst"
c04f5ac3 9528
90e6ef53 9529# 译者:注意保持前导空格
07432cef 9530#: git-submodule.sh:910
c04f5ac3
JX
9531#, sh-format
9532msgid " Warn: $name doesn't contain commit $sha1_src"
9533msgstr " 警告:$name 未包含提交 $sha1_src"
9534
90e6ef53 9535# 译者:注意保持前导空格
07432cef 9536#: git-submodule.sh:913
c04f5ac3
JX
9537#, sh-format
9538msgid " Warn: $name doesn't contain commit $sha1_dst"
9539msgstr " 警告:$name 未包含提交 $sha1_dst"
9540
90e6ef53 9541# 译者:注意保持前导空格
07432cef 9542#: git-submodule.sh:916
c04f5ac3
JX
9543#, sh-format
9544msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9545msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9546
07432cef 9547#: git-submodule.sh:941
c04f5ac3 9548msgid "blob"
07432cef 9549msgstr "数据对象"
c04f5ac3 9550
07432cef 9551#: git-submodule.sh:979
a77c07d9
JX
9552msgid "Submodules changed but not updated:"
9553msgstr "子模组已修改但尚未更新:"
b694fbb1 9554
07432cef 9555#: git-submodule.sh:981
a77c07d9 9556msgid "Submodule changes to be committed:"
b694fbb1
JX
9557msgstr "要提交的子模组变更:"
9558
07432cef 9559#: git-submodule.sh:1129
c04f5ac3 9560#, sh-format
07432cef
WS
9561msgid "Synchronizing submodule url for '$prefix$sm_path'"
9562msgstr "为 '$prefix$sm_path' 同步子模组 url"
9563
a77c07d9
JX
9564#~ msgid "can't fdopen 'show' output fd"
9565#~ msgstr "不能打开 'show' 输出文件句柄"
9566
9567#~ msgid "failed to close pipe to 'show' for object '%s'"
9568#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9569
07432cef
WS
9570#~ msgid "-NUM"
9571#~ msgstr "-数字"
9572
9573#~ msgid " 0 files changed"
9574#~ msgstr " 0 个文件被修改"
9575
9576#~ msgid " %d file changed"
9577#~ msgid_plural " %d files changed"
9578#~ msgstr[0] " %d 个文件被修改"
9579#~ msgstr[1] " %d 个文件被修改"
9580
9581#~ msgid ", %d insertion(+)"
9582#~ msgid_plural ", %d insertions(+)"
9583#~ msgstr[0] ",插入 %d 行(+)"
9584#~ msgstr[1] ",插入 %d 行(+)"
9585
9586#~ msgid ", %d deletion(-)"
9587#~ msgid_plural ", %d deletions(-)"
9588#~ msgstr[0] ",删除 %d 行(-)"
9589#~ msgstr[1] ",删除 %d 行(-)"
9590
9591#~ msgid "You do not have a valid HEAD"
9592#~ msgstr "您没有一个有效的 HEAD"
9593
9594#~ msgid "oops"
9595#~ msgstr "哎哟"
9596
9597#~ msgid "Would not remove %s\n"
9598#~ msgstr "不会删除 %s\n"
9599
9600#~ msgid "Not removing %s\n"
9601#~ msgstr "未删除 %s\n"
9602
9603#~ msgid "Auto packing the repository for optimum performance.\n"
9604#~ msgstr "自动打包版本库以求最佳性能。\n"
9605
9606#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9607#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9608
9609#~ msgid "Could not read index"
9610#~ msgstr "不能读取索引"
c160d03f 9611
ef317cd5
JX
9612# 译者:中文字符串拼接,可删除前导空格
9613#~ msgid " (use \"git add\" to track)"
9614#~ msgstr "(使用 \"git add\" 建立跟踪)"
9615
9616#~ msgid "-B cannot be used with -b"
9617#~ msgstr "-B 不能和 -b 同时使用"
9618
9619#~ msgid "--patch is incompatible with all other options"
9620#~ msgstr "--patch 选项和其他选项不兼容"
9621
9622#~ msgid "--detach cannot be used with -b/-B/--orphan"
9623#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9624
9625#~ msgid "--detach cannot be used with -t"
9626#~ msgstr "--detach 不能和 -t 同时使用"
9627
9628#~ msgid "--orphan and -b|-B are mutually exclusive"
9629#~ msgstr "--orphan 和 -b|-B 互斥"
9630
9631#~ msgid "--orphan cannot be used with -t"
9632#~ msgstr "--orphan 不能和 -t 同时使用"
9633
9634#~ msgid "git checkout: -f and -m are incompatible"
9635#~ msgstr "git checkout:-f 和 -m 不兼容"
9636
9637#~ msgid ""
9638#~ "git checkout: updating paths is incompatible with switching branches."
9639#~ msgstr "git checkout:更新路径和切换分支不兼容。"
9640
c160d03f
JX
9641#~ msgid "diff setup failed"
9642#~ msgstr "diff 设置失败"
9643
9644#~ msgid "merge-recursive: disk full?"
9645#~ msgstr "merge-recursive:磁盘已满?"
9646
9647#~ msgid "diff_setup_done failed"
9648#~ msgstr "diff_setup_done 失败"