]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: zh_CN.po: 800+ new translations on command usages
[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"
07432cef
WS
15"POT-Creation-Date: 2013-01-25 12:33+0800\n"
16"PO-Revision-Date: 2013-02-09 00:47+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
07432cef 25#: advice.c:45
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#.
07432cef 34#: advice.c:75
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
07432cef
WS
79#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380
80#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653
81#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77
82#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
83#: builtin/notes.c:697 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
07432cef 123#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619
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
c04f5ac3
JX
352#: gpg-interface.c:59
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
07432cef 364#: grep.c:1622
7ac1c0ad
JX
365#, c-format
366msgid "'%s': unable to read %s"
367msgstr "'%s':无法读取 %s"
368
07432cef 369#: grep.c:1639
7ac1c0ad
JX
370#, c-format
371msgid "'%s': %s"
372msgstr "'%s':%s"
373
07432cef 374#: grep.c:1650
7ac1c0ad
JX
375#, c-format
376msgid "'%s': short read %s"
377msgstr "'%s':读取不完整 %s"
378
23ff3338 379#: help.c:212
81809b99 380#, c-format
8ada9598 381msgid "available git commands in '%s'"
81809b99 382msgstr "在 '%s' 下可用的 git 命令"
8ada9598 383
23ff3338 384#: help.c:219
8ada9598 385msgid "git commands available from elsewhere on your $PATH"
81809b99 386msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 387
23ff3338 388#: help.c:275
c04f5ac3
JX
389#, c-format
390msgid ""
391"'%s' appears to be a git command, but we were not\n"
392"able to execute it. Maybe git-%s is broken?"
393msgstr ""
394"'%s' 像是一个 git 命令,但却无法运行。\n"
395"可能是 git-%s 受损?"
396
23ff3338 397#: help.c:332
8ada9598 398msgid "Uh oh. Your system reports no Git commands at all."
81809b99 399msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 400
23ff3338 401#: help.c:354
8ada9598
JX
402#, c-format
403msgid ""
404"WARNING: You called a Git command named '%s', which does not exist.\n"
405"Continuing under the assumption that you meant '%s'"
406msgstr ""
81809b99
JX
407"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
408"是 '%s'"
8ada9598 409
23ff3338 410#: help.c:359
8ada9598
JX
411#, c-format
412msgid "in %0.1f seconds automatically..."
81809b99 413msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 414
23ff3338 415#: help.c:366
8ada9598
JX
416#, c-format
417msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 418msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 419
23ff3338 420#: help.c:370
8ada9598
JX
421msgid ""
422"\n"
423"Did you mean this?"
424msgid_plural ""
425"\n"
426"Did you mean one of these?"
427msgstr[0] ""
81809b99
JX
428"\n"
429"您指的是这个么?"
430msgstr[1] ""
431"\n"
195febda 432"您指的是这其中的某一个么?"
8ada9598 433
07432cef
WS
434#: merge.c:56
435msgid "failed to read the cache"
436msgstr "无法读取缓存"
437
438#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
439#: builtin/clone.c:586
440msgid "unable to write new index file"
441msgstr "无法写新的索引文件"
442
649900bc
JX
443#: merge-recursive.c:190
444#, c-format
445msgid "(bad commit)\n"
446msgstr "(坏提交)\n"
447
448#: merge-recursive.c:206
449#, c-format
450msgid "addinfo_cache failed for path '%s'"
451msgstr "为路径 '%s' addinfo_cache 失败"
452
453#: merge-recursive.c:268
454msgid "error building trees"
455msgstr "无法创建树"
456
c160d03f 457#: merge-recursive.c:672
649900bc
JX
458#, c-format
459msgid "failed to create path '%s'%s"
460msgstr "无法创建路径 '%s'%s"
461
c160d03f 462#: merge-recursive.c:683
649900bc
JX
463#, c-format
464msgid "Removing %s to make room for subdirectory\n"
465msgstr "删除 %s 以便为子目录留出空间\n"
466
467#. something else exists
468#. .. but not some other error (who really cares what?)
c160d03f 469#: merge-recursive.c:697 merge-recursive.c:718
649900bc
JX
470msgid ": perhaps a D/F conflict?"
471msgstr ":可能是一个目录/文件冲突?"
472
c160d03f 473#: merge-recursive.c:708
649900bc
JX
474#, c-format
475msgid "refusing to lose untracked file at '%s'"
476msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
477
c160d03f 478#: merge-recursive.c:748
649900bc
JX
479#, c-format
480msgid "cannot read object %s '%s'"
481msgstr "不能读取对象 %s '%s'"
482
c160d03f 483#: merge-recursive.c:750
649900bc
JX
484#, c-format
485msgid "blob expected for %s '%s'"
07432cef 486msgstr "%s '%s' 应为数据(blob)对象"
649900bc 487
c160d03f 488#: merge-recursive.c:773 builtin/clone.c:302
649900bc
JX
489#, c-format
490msgid "failed to open '%s'"
491msgstr "无法打开 '%s'"
492
c160d03f 493#: merge-recursive.c:781
649900bc
JX
494#, c-format
495msgid "failed to symlink '%s'"
496msgstr "无法创建符号链接 '%s'"
497
c160d03f 498#: merge-recursive.c:784
649900bc
JX
499#, c-format
500msgid "do not know what to do with %06o %s '%s'"
501msgstr "不知道如何处理 %06o %s '%s'"
502
ef317cd5 503#: merge-recursive.c:922
649900bc
JX
504msgid "Failed to execute internal merge"
505msgstr "无法执行内部合并"
506
ef317cd5 507#: merge-recursive.c:926
649900bc
JX
508#, c-format
509msgid "Unable to add %s to database"
510msgstr "不能添加 %s 至对象库"
511
ef317cd5 512#: merge-recursive.c:942
649900bc
JX
513msgid "unsupported object type in the tree"
514msgstr "在树中有不支持的对象类型"
515
ef317cd5 516#: merge-recursive.c:1021 merge-recursive.c:1035
649900bc
JX
517#, c-format
518msgid ""
519"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
520"in tree."
521msgstr ""
522"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
523"的版本被保留。"
524
ef317cd5 525#: merge-recursive.c:1027 merge-recursive.c:1040
649900bc
JX
526#, c-format
527msgid ""
528"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
529"in tree at %s."
530msgstr ""
531"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
532"的版本保留于 %8$s 中。"
533
ef317cd5 534#: merge-recursive.c:1081
649900bc
JX
535msgid "rename"
536msgstr "重命名"
537
ef317cd5 538#: merge-recursive.c:1081
649900bc
JX
539msgid "renamed"
540msgstr "重命名"
541
ef317cd5 542#: merge-recursive.c:1137
649900bc
JX
543#, c-format
544msgid "%s is a directory in %s adding as %s instead"
545msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
546
ef317cd5 547#: merge-recursive.c:1159
649900bc
JX
548#, c-format
549msgid ""
550"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
551"\"->\"%s\" in \"%s\"%s"
552msgstr ""
553"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
554"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
555
ef317cd5 556#: merge-recursive.c:1164
649900bc
JX
557msgid " (left unresolved)"
558msgstr "(留下未解决)"
559
ef317cd5 560#: merge-recursive.c:1218
649900bc
JX
561#, c-format
562msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
563msgstr ""
564"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
565"%5$s"
566
ef317cd5 567#: merge-recursive.c:1248
649900bc
JX
568#, c-format
569msgid "Renaming %s to %s and %s to %s instead"
07432cef 570msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 571
ef317cd5 572#: merge-recursive.c:1447
649900bc
JX
573#, c-format
574msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
575msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
576
ef317cd5 577#: merge-recursive.c:1457
649900bc
JX
578#, c-format
579msgid "Adding merged %s"
580msgstr "添加合并后的 %s"
581
ef317cd5 582#: merge-recursive.c:1462 merge-recursive.c:1660
649900bc
JX
583#, c-format
584msgid "Adding as %s instead"
585msgstr "而是以 %s 为名添加"
586
ef317cd5 587#: merge-recursive.c:1513
649900bc
JX
588#, c-format
589msgid "cannot read object %s"
590msgstr "不能读取对象 %s"
591
ef317cd5 592#: merge-recursive.c:1516
649900bc
JX
593#, c-format
594msgid "object %s is not a blob"
07432cef 595msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 596
ef317cd5 597#: merge-recursive.c:1564
649900bc
JX
598msgid "modify"
599msgstr "修改"
600
ef317cd5 601#: merge-recursive.c:1564
649900bc
JX
602msgid "modified"
603msgstr "修改"
604
ef317cd5 605#: merge-recursive.c:1574
649900bc
JX
606msgid "content"
607msgstr "内容"
608
ef317cd5 609#: merge-recursive.c:1581
649900bc
JX
610msgid "add/add"
611msgstr "添加/添加"
612
ef317cd5 613#: merge-recursive.c:1615
649900bc
JX
614#, c-format
615msgid "Skipped %s (merged same as existing)"
616msgstr "略过 %s(已经做过相同合并)"
617
ef317cd5 618#: merge-recursive.c:1629
649900bc
JX
619#, c-format
620msgid "Auto-merging %s"
621msgstr "自动合并 %s"
622
07432cef 623#: merge-recursive.c:1633 git-submodule.sh:942
649900bc
JX
624msgid "submodule"
625msgstr "子模组"
626
ef317cd5 627#: merge-recursive.c:1634
649900bc
JX
628#, c-format
629msgid "CONFLICT (%s): Merge conflict in %s"
630msgstr "冲突(%s):合并冲突于 %s"
631
ef317cd5 632#: merge-recursive.c:1724
649900bc
JX
633#, c-format
634msgid "Removing %s"
635msgstr "删除 %s"
636
ef317cd5 637#: merge-recursive.c:1749
649900bc
JX
638msgid "file/directory"
639msgstr "文件/目录"
640
ef317cd5 641#: merge-recursive.c:1755
649900bc
JX
642msgid "directory/file"
643msgstr "目录/文件"
644
ef317cd5 645#: merge-recursive.c:1760
649900bc
JX
646#, c-format
647msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
648msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
649
ef317cd5 650#: merge-recursive.c:1770
649900bc
JX
651#, c-format
652msgid "Adding %s"
653msgstr "添加 %s"
654
ef317cd5 655#: merge-recursive.c:1787
649900bc
JX
656msgid "Fatal merge failure, shouldn't happen."
657msgstr "严重的合并错误,不应发生。"
658
ef317cd5 659#: merge-recursive.c:1806
649900bc
JX
660msgid "Already up-to-date!"
661msgstr "已经是最新的!"
662
ef317cd5 663#: merge-recursive.c:1815
649900bc
JX
664#, c-format
665msgid "merging of trees %s and %s failed"
666msgstr "无法合并树 %s 和 %s"
667
ef317cd5 668#: merge-recursive.c:1845
649900bc
JX
669#, c-format
670msgid "Unprocessed path??? %s"
671msgstr "未处理的路径??? %s"
672
ef317cd5 673#: merge-recursive.c:1890
649900bc
JX
674msgid "Merging:"
675msgstr "合并:"
676
ef317cd5 677#: merge-recursive.c:1903
649900bc 678#, c-format
e5e38ce4
JX
679msgid "found %u common ancestor:"
680msgid_plural "found %u common ancestors:"
681msgstr[0] "发现 %u 个共同祖先:"
682msgstr[1] "发现 %u 个共同祖先:"
649900bc 683
ef317cd5 684#: merge-recursive.c:1940
649900bc
JX
685msgid "merge returned no commit"
686msgstr "合并未返回提交"
687
ef317cd5 688#: merge-recursive.c:1997
649900bc
JX
689#, c-format
690msgid "Could not parse object '%s'"
691msgstr "不能解析对象 '%s'"
692
07432cef 693#: merge-recursive.c:2009 builtin/merge.c:643
649900bc
JX
694msgid "Unable to write index."
695msgstr "不能写入索引。"
696
07432cef 697#: parse-options.c:485
8ada9598 698msgid "..."
81809b99 699msgstr "..."
8ada9598 700
07432cef 701#: parse-options.c:503
81809b99 702#, c-format
8ada9598 703msgid "usage: %s"
81809b99 704msgstr "用法:%s"
8ada9598
JX
705
706#. TRANSLATORS: the colon here should align with the
707#. one in "usage: %s" translation
07432cef 708#: parse-options.c:507
81809b99 709#, c-format
8ada9598 710msgid " or: %s"
81809b99 711msgstr " 或:%s"
8ada9598
JX
712
713# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 714#: parse-options.c:510
81809b99 715#, c-format
8ada9598 716msgid " %s"
81809b99 717msgstr " %s"
8ada9598 718
07432cef 719#: remote.c:1686
c04f5ac3
JX
720#, c-format
721msgid "Your branch is ahead of '%s' by %d commit.\n"
722msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
723msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 724msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 725
07432cef
WS
726#: remote.c:1692
727msgid " (use \"git push\" to publish your local commits)\n"
728msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
729
730#: remote.c:1695
c04f5ac3
JX
731#, c-format
732msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
733msgid_plural ""
734"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 735msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 736msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 737
07432cef
WS
738# 译者:注意保持前导空格
739#: remote.c:1703
740msgid " (use \"git pull\" to update your local branch)\n"
741msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
742
743#: remote.c:1706
c04f5ac3
JX
744#, c-format
745msgid ""
746"Your branch and '%s' have diverged,\n"
747"and have %d and %d different commit each, respectively.\n"
748msgid_plural ""
749"Your branch and '%s' have diverged,\n"
750"and have %d and %d different commits each, respectively.\n"
751msgstr[0] ""
752"您的分支和 '%s' 出现了偏离,\n"
195febda 753"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
754msgstr[1] ""
755"您的分支和 '%s' 出现了偏离,\n"
195febda 756"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 757
07432cef
WS
758# 译者:注意保持前导空格
759#: remote.c:1716
760msgid " (use \"git pull\" to merge the remote branch into yours)\n"
761msgstr " (使用 \"git pull\" 来合并远程分支)\n"
762
763#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985
764#: builtin/merge.c:995
c04f5ac3
JX
765#, c-format
766msgid "Could not open '%s' for writing"
90e6ef53 767msgstr "不能为写入打开 '%s'"
c04f5ac3 768
07432cef
WS
769#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987
770#: builtin/merge.c:1000
c04f5ac3
JX
771#, c-format
772msgid "Could not write to '%s'"
90e6ef53 773msgstr "不能写入 '%s'"
c04f5ac3 774
07432cef 775#: sequencer.c:146
14c8bced
JX
776msgid ""
777"after resolving the conflicts, mark the corrected paths\n"
778"with 'git add <paths>' or 'git rm <paths>'"
779msgstr ""
780"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
781"命令标记修正后的文件"
782
07432cef 783#: sequencer.c:149
c04f5ac3
JX
784msgid ""
785"after resolving the conflicts, mark the corrected paths\n"
786"with 'git add <paths>' or 'git rm <paths>'\n"
787"and commit the result with 'git commit'"
788msgstr ""
789"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
790"对修正后的文件做标记,然后用 'git commit' 提交"
791
07432cef 792#: sequencer.c:162 sequencer.c:774 sequencer.c:857
c04f5ac3
JX
793#, c-format
794msgid "Could not write to %s"
795msgstr "不能写入 %s"
796
07432cef 797#: sequencer.c:165
c04f5ac3
JX
798#, c-format
799msgid "Error wrapping up %s"
800msgstr "错误收尾 %s"
801
07432cef 802#: sequencer.c:180
c04f5ac3
JX
803msgid "Your local changes would be overwritten by cherry-pick."
804msgstr "您的本地修改将被拣选操作覆盖。"
805
07432cef 806#: sequencer.c:182
c04f5ac3
JX
807msgid "Your local changes would be overwritten by revert."
808msgstr "您的本地修改将被还原操作覆盖。"
809
07432cef 810#: sequencer.c:185
c04f5ac3
JX
811msgid "Commit your changes or stash them to proceed."
812msgstr "提交您的修改或保存进度后再继续。"
813
814#. TRANSLATORS: %s will be "revert" or "cherry-pick"
07432cef 815#: sequencer.c:236
c04f5ac3
JX
816#, c-format
817msgid "%s: Unable to write new index file"
90e6ef53 818msgstr "%s:无法写入新索引文件"
c04f5ac3 819
07432cef 820#: sequencer.c:267
8ada9598 821msgid "Could not resolve HEAD commit\n"
81809b99 822msgstr "不能解析 HEAD 提交\n"
8ada9598 823
07432cef 824#: sequencer.c:288
8ada9598 825msgid "Unable to update cache tree\n"
81809b99 826msgstr "不能更新缓存\n"
8ada9598 827
07432cef 828#: sequencer.c:333
81809b99 829#, c-format
8ada9598 830msgid "Could not parse commit %s\n"
81809b99 831msgstr "不能解析提交 %s\n"
8ada9598 832
07432cef 833#: sequencer.c:338
81809b99 834#, c-format
8ada9598 835msgid "Could not parse parent commit %s\n"
81809b99 836msgstr "不能解析父提交 %s\n"
8ada9598 837
07432cef 838#: sequencer.c:404
c04f5ac3 839msgid "Your index file is unmerged."
90e6ef53 840msgstr "您的索引文件未完成合并。"
c04f5ac3 841
07432cef 842#: sequencer.c:423
c04f5ac3
JX
843#, c-format
844msgid "Commit %s is a merge but no -m option was given."
845msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
846
07432cef 847#: sequencer.c:431
c04f5ac3
JX
848#, c-format
849msgid "Commit %s does not have parent %d"
850msgstr "提交 %s 没有父提交 %d"
851
07432cef 852#: sequencer.c:435
c04f5ac3
JX
853#, c-format
854msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 855msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
856
857#. TRANSLATORS: The first %s will be "revert" or
858#. "cherry-pick", the second %s a SHA1
07432cef 859#: sequencer.c:448
c04f5ac3
JX
860#, c-format
861msgid "%s: cannot parse parent commit %s"
862msgstr "%s:不能解析父提交 %s"
863
07432cef 864#: sequencer.c:452
c04f5ac3
JX
865#, c-format
866msgid "Cannot get commit message for %s"
867msgstr "不能得到 %s 的提交说明"
868
07432cef 869#: sequencer.c:536
c04f5ac3
JX
870#, c-format
871msgid "could not revert %s... %s"
872msgstr "不能还原 %s... %s"
873
07432cef 874#: sequencer.c:537
c04f5ac3
JX
875#, c-format
876msgid "could not apply %s... %s"
877msgstr "不能应用 %s... %s"
878
07432cef 879#: sequencer.c:569
c04f5ac3
JX
880msgid "empty commit set passed"
881msgstr "提供了空的提交集"
882
07432cef 883#: sequencer.c:577
c04f5ac3
JX
884#, c-format
885msgid "git %s: failed to read the index"
90e6ef53 886msgstr "git %s:无法读取索引"
c04f5ac3 887
07432cef 888#: sequencer.c:582
c04f5ac3
JX
889#, c-format
890msgid "git %s: failed to refresh the index"
90e6ef53 891msgstr "git %s:无法刷新索引"
c04f5ac3 892
07432cef 893#: sequencer.c:640
c04f5ac3
JX
894#, c-format
895msgid "Cannot %s during a %s"
90e6ef53 896msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 897
07432cef 898#: sequencer.c:662
c04f5ac3
JX
899#, c-format
900msgid "Could not parse line %d."
90e6ef53 901msgstr "不能解析第 %d 行。"
c04f5ac3 902
07432cef 903#: sequencer.c:667
c04f5ac3 904msgid "No commits parsed."
7e238ab7 905msgstr "没有提交被解析。"
c04f5ac3 906
07432cef 907#: sequencer.c:680
c04f5ac3
JX
908#, c-format
909msgid "Could not open %s"
910msgstr "不能打开 %s"
911
07432cef 912#: sequencer.c:684
c04f5ac3
JX
913#, c-format
914msgid "Could not read %s."
915msgstr "不能读取 %s。"
916
07432cef 917#: sequencer.c:691
c04f5ac3
JX
918#, c-format
919msgid "Unusable instruction sheet: %s"
920msgstr "无用的指令表单:%s"
921
07432cef 922#: sequencer.c:719
c04f5ac3
JX
923#, c-format
924msgid "Invalid key: %s"
925msgstr "无效键名:%s"
926
07432cef 927#: sequencer.c:722
c04f5ac3
JX
928#, c-format
929msgid "Invalid value for %s: %s"
81809b99 930msgstr "%s 的值无效:%s"
c04f5ac3 931
07432cef 932#: sequencer.c:734
c04f5ac3
JX
933#, c-format
934msgid "Malformed options sheet: %s"
935msgstr "非法的选项表单:%s"
936
07432cef 937#: sequencer.c:755
c04f5ac3
JX
938msgid "a cherry-pick or revert is already in progress"
939msgstr "一个拣选或还原操作已在进行"
940
07432cef 941#: sequencer.c:756
c04f5ac3
JX
942msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
943msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
944
07432cef 945#: sequencer.c:760
c04f5ac3
JX
946#, c-format
947msgid "Could not create sequencer directory %s"
90e6ef53 948msgstr "不能创建序列目录 %s"
c04f5ac3 949
07432cef 950#: sequencer.c:776 sequencer.c:861
c04f5ac3
JX
951#, c-format
952msgid "Error wrapping up %s."
953msgstr "错误收尾 %s。"
954
07432cef 955#: sequencer.c:795 sequencer.c:929
c04f5ac3 956msgid "no cherry-pick or revert in progress"
195febda 957msgstr "拣选或还原操作并未进行"
c04f5ac3 958
07432cef 959#: sequencer.c:797
c04f5ac3
JX
960msgid "cannot resolve HEAD"
961msgstr "不能解析 HEAD"
962
07432cef 963#: sequencer.c:799
c04f5ac3 964msgid "cannot abort from a branch yet to be born"
90e6ef53 965msgstr "不能从尚未建立的分支终止"
c04f5ac3 966
07432cef 967#: sequencer.c:821 builtin/apply.c:4016
c04f5ac3
JX
968#, c-format
969msgid "cannot open %s: %s"
970msgstr "不能打开 %s:%s"
971
07432cef 972#: sequencer.c:824
c04f5ac3
JX
973#, c-format
974msgid "cannot read %s: %s"
975msgstr "不能读取 %s:%s"
976
07432cef 977#: sequencer.c:825
c04f5ac3 978msgid "unexpected end of file"
9aafc933 979msgstr "意外的文件结束"
c04f5ac3 980
07432cef 981#: sequencer.c:831
c04f5ac3
JX
982#, c-format
983msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 984msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 985
07432cef 986#: sequencer.c:854
c04f5ac3
JX
987#, c-format
988msgid "Could not format %s."
989msgstr "不能格式化 %s。"
990
07432cef 991#: sequencer.c:1016
c04f5ac3
JX
992msgid "Can't revert as initial commit"
993msgstr "不能作为初始提交还原"
994
07432cef 995#: sequencer.c:1017
c04f5ac3
JX
996msgid "Can't cherry-pick into empty head"
997msgstr "不能拣选到空分支"
998
23ff3338 999#: sha1_name.c:1044
170e9899
JX
1000msgid "HEAD does not point to a branch"
1001msgstr "HEAD 没有指向一个分支"
1002
23ff3338 1003#: sha1_name.c:1047
170e9899
JX
1004#, c-format
1005msgid "No such branch: '%s'"
1006msgstr "没有此分支:'%s'"
1007
23ff3338 1008#: sha1_name.c:1049
170e9899
JX
1009#, c-format
1010msgid "No upstream configured for branch '%s'"
1011msgstr "尚未给分支 '%s' 设置上游"
1012
23ff3338 1013#: sha1_name.c:1052
170e9899
JX
1014#, c-format
1015msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1016msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1017
ef317cd5 1018#: wrapper.c:408
07432cef 1019#, c-format
ef317cd5 1020msgid "unable to access '%s': %s"
07432cef
WS
1021msgstr "不能访问 '%s':%s"
1022
1023#: wrapper.c:423
1024#, c-format
1025msgid "unable to access '%s'"
1026msgstr "不能访问 '%s'"
ef317cd5 1027
07432cef 1028#: wrapper.c:434
d691f479
JX
1029#, c-format
1030msgid "unable to look up current user in the passwd file: %s"
07432cef 1031msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1032
07432cef 1033#: wrapper.c:435
d691f479
JX
1034msgid "no such user"
1035msgstr "无此用户"
1036
23ff3338 1037#: wt-status.c:140
c04f5ac3
JX
1038msgid "Unmerged paths:"
1039msgstr "未合并的路径:"
1040
90e6ef53 1041# 译者:注意保持前导空格
23ff3338 1042#: wt-status.c:167 wt-status.c:194
c04f5ac3
JX
1043#, c-format
1044msgid " (use \"git reset %s <file>...\" to unstage)"
1045msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1046
90e6ef53 1047# 译者:注意保持前导空格
23ff3338 1048#: wt-status.c:169 wt-status.c:196
c04f5ac3
JX
1049msgid " (use \"git rm --cached <file>...\" to unstage)"
1050msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1051
90e6ef53 1052# 译者:注意保持前导空格
23ff3338 1053#: wt-status.c:173
6792b93b
JX
1054msgid " (use \"git add <file>...\" to mark resolution)"
1055msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1056
1057# 译者:注意保持前导空格
23ff3338 1058#: wt-status.c:175 wt-status.c:179
c04f5ac3
JX
1059msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1060msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1061
6792b93b 1062# 译者:注意保持前导空格
23ff3338 1063#: wt-status.c:177
6792b93b
JX
1064msgid " (use \"git rm <file>...\" to mark resolution)"
1065msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1066
23ff3338 1067#: wt-status.c:188
c04f5ac3
JX
1068msgid "Changes to be committed:"
1069msgstr "要提交的变更:"
1070
23ff3338 1071#: wt-status.c:206
c04f5ac3 1072msgid "Changes not staged for commit:"
7e238ab7 1073msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1074
90e6ef53 1075# 译者:注意保持前导空格
23ff3338 1076#: wt-status.c:210
c04f5ac3
JX
1077msgid " (use \"git add <file>...\" to update what will be committed)"
1078msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1079
90e6ef53 1080# 译者:注意保持前导空格
23ff3338 1081#: wt-status.c:212
c04f5ac3
JX
1082msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1083msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1084
90e6ef53 1085# 译者:注意保持前导空格
23ff3338 1086#: wt-status.c:213
c04f5ac3
JX
1087msgid ""
1088" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1089msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1090
90e6ef53 1091# 译者:注意保持前导空格
23ff3338 1092#: wt-status.c:215
c04f5ac3
JX
1093msgid " (commit or discard the untracked or modified content in submodules)"
1094msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1095
90e6ef53 1096# 译者:注意保持前导空格
23ff3338 1097#: wt-status.c:227
c04f5ac3
JX
1098#, c-format
1099msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1100msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1101
23ff3338 1102#: wt-status.c:244
c04f5ac3
JX
1103msgid "bug"
1104msgstr "bug"
1105
23ff3338 1106#: wt-status.c:249
c04f5ac3
JX
1107msgid "both deleted:"
1108msgstr "双方删除:"
1109
23ff3338 1110#: wt-status.c:250
c04f5ac3
JX
1111msgid "added by us:"
1112msgstr "由我们添加:"
1113
23ff3338 1114#: wt-status.c:251
c04f5ac3
JX
1115msgid "deleted by them:"
1116msgstr "由他们删除:"
1117
23ff3338 1118#: wt-status.c:252
c04f5ac3
JX
1119msgid "added by them:"
1120msgstr "由他们添加:"
1121
23ff3338 1122#: wt-status.c:253
c04f5ac3
JX
1123msgid "deleted by us:"
1124msgstr "由我们删除:"
1125
23ff3338 1126#: wt-status.c:254
c04f5ac3
JX
1127msgid "both added:"
1128msgstr "双方添加:"
1129
23ff3338 1130#: wt-status.c:255
c04f5ac3
JX
1131msgid "both modified:"
1132msgstr "双方修改:"
1133
90e6ef53 1134# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1135#: wt-status.c:285
c04f5ac3 1136msgid "new commits, "
aa9565f7 1137msgstr "新提交, "
c04f5ac3 1138
90e6ef53 1139# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1140#: wt-status.c:287
c04f5ac3 1141msgid "modified content, "
aa9565f7 1142msgstr "修改的内容, "
c04f5ac3 1143
90e6ef53 1144# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1145#: wt-status.c:289
c04f5ac3 1146msgid "untracked content, "
aa9565f7 1147msgstr "未跟踪的内容, "
c04f5ac3 1148
90e6ef53 1149# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1150#: wt-status.c:303
c04f5ac3
JX
1151#, c-format
1152msgid "new file: %s"
1153msgstr "新文件: %s"
1154
90e6ef53 1155# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1156#: wt-status.c:306
c04f5ac3
JX
1157#, c-format
1158msgid "copied: %s -> %s"
1159msgstr "拷贝: %s -> %s"
1160
90e6ef53 1161# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1162#: wt-status.c:309
c04f5ac3
JX
1163#, c-format
1164msgid "deleted: %s"
1165msgstr "删除: %s"
1166
90e6ef53 1167# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1168#: wt-status.c:312
c04f5ac3
JX
1169#, c-format
1170msgid "modified: %s"
1171msgstr "修改: %s"
1172
90e6ef53 1173# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1174#: wt-status.c:315
c04f5ac3
JX
1175#, c-format
1176msgid "renamed: %s -> %s"
1177msgstr "重命名: %s -> %s"
1178
90e6ef53 1179# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1180#: wt-status.c:318
c04f5ac3
JX
1181#, c-format
1182msgid "typechange: %s"
1183msgstr "类型变更: %s"
1184
90e6ef53 1185# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1186#: wt-status.c:321
c04f5ac3
JX
1187#, c-format
1188msgid "unknown: %s"
1189msgstr "未知: %s"
1190
90e6ef53 1191# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1192#: wt-status.c:324
c04f5ac3
JX
1193#, c-format
1194msgid "unmerged: %s"
1195msgstr "未合并: %s"
1196
23ff3338 1197#: wt-status.c:327
c04f5ac3
JX
1198#, c-format
1199msgid "bug: unhandled diff status %c"
90e6ef53 1200msgstr "bug:未处理的差异状态 %c"
c04f5ac3 1201
07432cef 1202#: wt-status.c:787
6792b93b 1203msgid "You have unmerged paths."
195febda 1204msgstr "您有尚未合并的路径。"
6792b93b
JX
1205
1206# 译者:注意保持前导空格
07432cef 1207#: wt-status.c:790 wt-status.c:914
6792b93b
JX
1208msgid " (fix conflicts and run \"git commit\")"
1209msgstr " (解决冲突并运行 \"git commit\")"
1210
07432cef 1211#: wt-status.c:793
6792b93b
JX
1212msgid "All conflicts fixed but you are still merging."
1213msgstr "所有冲突已解决但您仍处于合并中。"
1214
1215# 译者:注意保持前导空格
07432cef 1216#: wt-status.c:796
6792b93b
JX
1217msgid " (use \"git commit\" to conclude merge)"
1218msgstr " (使用 \"git commit\" 结束合并)"
1219
07432cef 1220#: wt-status.c:806
6792b93b
JX
1221msgid "You are in the middle of an am session."
1222msgstr "您正处于一个 am 过程中。"
1223
07432cef 1224#: wt-status.c:809
6792b93b
JX
1225msgid "The current patch is empty."
1226msgstr "当前的补丁为空。"
1227
1228# 译者:注意保持前导空格
07432cef 1229#: wt-status.c:813
6792b93b
JX
1230msgid " (fix conflicts and then run \"git am --resolved\")"
1231msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1232
1233# 译者:注意保持前导空格
07432cef 1234#: wt-status.c:815
6792b93b
JX
1235msgid " (use \"git am --skip\" to skip this patch)"
1236msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1237
1238# 译者:注意保持前导空格
07432cef 1239#: wt-status.c:817
6792b93b
JX
1240msgid " (use \"git am --abort\" to restore the original branch)"
1241msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1242
07432cef 1243#: wt-status.c:875 wt-status.c:885
6792b93b
JX
1244msgid "You are currently rebasing."
1245msgstr "您正在变基。"
1246
1247# 译者:注意保持前导空格
07432cef 1248#: wt-status.c:878
6792b93b
JX
1249msgid " (fix conflicts and then run \"git rebase --continue\")"
1250msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1251
1252# 译者:注意保持前导空格
07432cef 1253#: wt-status.c:880
6792b93b
JX
1254msgid " (use \"git rebase --skip\" to skip this patch)"
1255msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1256
1257# 译者:注意保持前导空格
07432cef 1258#: wt-status.c:882
6792b93b
JX
1259msgid " (use \"git rebase --abort\" to check out the original branch)"
1260msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1261
1262# 译者:注意保持前导空格
07432cef 1263#: wt-status.c:888
6792b93b
JX
1264msgid " (all conflicts fixed: run \"git rebase --continue\")"
1265msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1266
07432cef 1267#: wt-status.c:890
6792b93b
JX
1268msgid "You are currently splitting a commit during a rebase."
1269msgstr "您正在变基过程中拆分一个提交。"
1270
1271# 译者:注意保持前导空格
07432cef 1272#: wt-status.c:893
6792b93b
JX
1273msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1274msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1275
07432cef 1276#: wt-status.c:895
6792b93b
JX
1277msgid "You are currently editing a commit during a rebase."
1278msgstr "您正在变基过程中编辑一个提交。"
1279
1280# 译者:注意保持前导空格
07432cef 1281#: wt-status.c:898
6792b93b
JX
1282msgid " (use \"git commit --amend\" to amend the current commit)"
1283msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1284
1285# 译者:注意保持前导空格
07432cef 1286#: wt-status.c:900
6792b93b
JX
1287msgid ""
1288" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1289msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1290
07432cef 1291#: wt-status.c:910
6792b93b
JX
1292msgid "You are currently cherry-picking."
1293msgstr "您正在做拣选操作。"
1294
1295# 译者:注意保持前导空格
07432cef 1296#: wt-status.c:917
6792b93b
JX
1297msgid " (all conflicts fixed: run \"git commit\")"
1298msgstr " (解决所有冲突后,执行 \"git commit\")"
1299
07432cef 1300#: wt-status.c:926
6792b93b
JX
1301msgid "You are currently bisecting."
1302msgstr "您正在做二分查找。"
1303
1304# 译者:注意保持前导空格
07432cef 1305#: wt-status.c:929
6792b93b
JX
1306msgid " (use \"git bisect reset\" to get back to the original branch)"
1307msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1308
07432cef 1309#: wt-status.c:980
c04f5ac3
JX
1310msgid "On branch "
1311msgstr "位于分支 "
1312
07432cef 1313#: wt-status.c:987
c04f5ac3
JX
1314msgid "Not currently on any branch."
1315msgstr "当前不在任何分支上。"
1316
07432cef 1317#: wt-status.c:999
c04f5ac3
JX
1318msgid "Initial commit"
1319msgstr "初始提交"
1320
07432cef 1321#: wt-status.c:1013
ef317cd5 1322msgid "Untracked files"
07432cef 1323msgstr "未跟踪的文件"
c04f5ac3 1324
07432cef 1325#: wt-status.c:1015
ef317cd5 1326msgid "Ignored files"
07432cef 1327msgstr "忽略的文件"
c04f5ac3 1328
07432cef 1329#: wt-status.c:1017
c04f5ac3
JX
1330#, c-format
1331msgid "Untracked files not listed%s"
1332msgstr "未跟踪的文件没有列出%s"
1333
7e238ab7 1334# 译者:中文字符串拼接,可删除前导空格
07432cef 1335#: wt-status.c:1019
c04f5ac3 1336msgid " (use -u option to show untracked files)"
7e238ab7 1337msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1338
07432cef 1339#: wt-status.c:1025
c04f5ac3
JX
1340msgid "No changes"
1341msgstr "没有修改"
1342
7e238ab7 1343# 译者:中文字符串拼接,可删除前导空格
07432cef
WS
1344#: wt-status.c:1030
1345#, c-format
ef317cd5 1346msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1347msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1348
07432cef
WS
1349#: wt-status.c:1033
1350#, c-format
ef317cd5 1351msgid "no changes added to commit\n"
07432cef 1352msgstr "修改尚未加入提交\n"
c04f5ac3 1353
07432cef
WS
1354#: wt-status.c:1036
1355#, c-format
ef317cd5
JX
1356msgid ""
1357"nothing added to commit but untracked files present (use \"git add\" to "
1358"track)\n"
07432cef 1359msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1360
07432cef
WS
1361#: wt-status.c:1039
1362#, c-format
ef317cd5 1363msgid "nothing added to commit but untracked files present\n"
07432cef 1364msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1365
7e238ab7 1366# 译者:中文字符串拼接,可删除前导空格
07432cef
WS
1367#: wt-status.c:1042
1368#, c-format
ef317cd5 1369msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1370msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1371
07432cef
WS
1372#: wt-status.c:1045 wt-status.c:1050
1373#, c-format
ef317cd5 1374msgid "nothing to commit\n"
07432cef 1375msgstr "无文件要提交\n"
ef317cd5 1376
7e238ab7 1377# 译者:中文字符串拼接,可删除前导空格
07432cef
WS
1378#: wt-status.c:1048
1379#, c-format
ef317cd5 1380msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1381msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1382
7e238ab7 1383# 译者:中文字符串拼接,可删除前导空格
07432cef
WS
1384#: wt-status.c:1052
1385#, c-format
ef317cd5 1386msgid "nothing to commit, working directory clean\n"
07432cef 1387msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1388
07432cef 1389#: wt-status.c:1160
c04f5ac3 1390msgid "HEAD (no branch)"
61bc0753 1391msgstr "HEAD(非分支)"
c04f5ac3 1392
90e6ef53 1393# 译者:注意保持句尾空格
07432cef 1394#: wt-status.c:1166
c04f5ac3
JX
1395msgid "Initial commit on "
1396msgstr "初始提交于 "
1397
90e6ef53 1398# 译者:注意保持句尾空格
07432cef 1399#: wt-status.c:1181
c04f5ac3
JX
1400msgid "behind "
1401msgstr "落后 "
1402
90e6ef53 1403# 译者:注意保持句尾空格
07432cef 1404#: wt-status.c:1184 wt-status.c:1187
c04f5ac3
JX
1405msgid "ahead "
1406msgstr "领先 "
1407
90e6ef53 1408# 译者:注意保持句尾空格
07432cef 1409#: wt-status.c:1189
c04f5ac3
JX
1410msgid ", behind "
1411msgstr ",落后 "
1412
ef317cd5 1413#: builtin/add.c:19
ef317cd5 1414msgid "git add [options] [--] <filepattern>..."
07432cef 1415msgstr "git add [选项] [--] <filepattern>..."
ef317cd5 1416
c04f5ac3
JX
1417#: builtin/add.c:62
1418#, c-format
1419msgid "unexpected diff status %c"
1420msgstr "意外的差异状态 %c"
1421
07432cef 1422#: builtin/add.c:67 builtin/commit.c:231
c04f5ac3
JX
1423msgid "updating files failed"
1424msgstr "更新文件失败"
1425
1426#: builtin/add.c:77
1427#, c-format
1428msgid "remove '%s'\n"
1429msgstr "删除 '%s'\n"
1430
1431#: builtin/add.c:176
1432#, c-format
1433msgid "Path '%s' is in submodule '%.*s'"
1434msgstr "路径 '%s' 属于模组 '%.*s'"
1435
1436#: builtin/add.c:192
1437msgid "Unstaged changes after refreshing the index:"
90e6ef53 1438msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1439
07432cef 1440#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
c04f5ac3
JX
1441#, c-format
1442msgid "pathspec '%s' did not match any files"
1443msgstr "路径 '%s' 未匹配任何文件"
1444
1445#: builtin/add.c:209
1446#, c-format
1447msgid "'%s' is beyond a symbolic link"
1448msgstr "'%s' 位于符号链接中"
1449
1450#: builtin/add.c:276
1451msgid "Could not read the index"
90e6ef53 1452msgstr "不能读取索引"
c04f5ac3
JX
1453
1454#: builtin/add.c:286
1455#, c-format
1456msgid "Could not open '%s' for writing."
195febda 1457msgstr "不能打开 '%s' 以写入。"
c04f5ac3
JX
1458
1459#: builtin/add.c:290
1460msgid "Could not write patch"
195febda 1461msgstr "不能生成补丁"
c04f5ac3
JX
1462
1463#: builtin/add.c:295
1464#, c-format
1465msgid "Could not stat '%s'"
90e6ef53 1466msgstr "不能查看文件状态 '%s'"
c04f5ac3
JX
1467
1468#: builtin/add.c:297
1469msgid "Empty patch. Aborted."
1470msgstr "空补丁。异常终止。"
1471
8ada9598
JX
1472#: builtin/add.c:303
1473#, c-format
1474msgid "Could not apply '%s'"
1475msgstr "不能应用 '%s'"
1476
ef317cd5 1477#: builtin/add.c:313
8ada9598 1478msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 1479msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 1480
07432cef
WS
1481#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63
1482#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253
1483#: builtin/rm.c:206
ef317cd5 1484msgid "dry run"
07432cef 1485msgstr "演习"
ef317cd5 1486
07432cef
WS
1487#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160
1488#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522
ef317cd5
JX
1489#: builtin/mv.c:62 builtin/read-tree.c:112
1490msgid "be verbose"
1491msgstr "冗长输出"
1492
1493#: builtin/add.c:322
ef317cd5 1494msgid "interactive picking"
07432cef 1495msgstr "交互式拣选"
ef317cd5 1496
07432cef 1497#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258
ef317cd5 1498msgid "select hunks interactively"
07432cef 1499msgstr "交互式挑选数据块"
ef317cd5
JX
1500
1501#: builtin/add.c:324
1502msgid "edit current diff and apply"
07432cef 1503msgstr "编辑当前差异并应用"
ef317cd5
JX
1504
1505#: builtin/add.c:325
1506msgid "allow adding otherwise ignored files"
07432cef 1507msgstr "允许添加忽略的文件"
ef317cd5
JX
1508
1509#: builtin/add.c:326
ef317cd5 1510msgid "update tracked files"
07432cef 1511msgstr "更新已跟踪的文件"
ef317cd5
JX
1512
1513#: builtin/add.c:327
1514msgid "record only the fact that the path will be added later"
07432cef 1515msgstr "只记录,该路径稍后再添加"
ef317cd5
JX
1516
1517#: builtin/add.c:328
1518msgid "add changes from all tracked and untracked files"
07432cef 1519msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5
JX
1520
1521#: builtin/add.c:329
ef317cd5 1522msgid "don't add, only refresh the index"
07432cef 1523msgstr "不添加,只刷新索引"
ef317cd5
JX
1524
1525#: builtin/add.c:330
1526msgid "just skip files which cannot be added because of errors"
07432cef 1527msgstr "跳过因出错不能添加的文件"
ef317cd5
JX
1528
1529#: builtin/add.c:331
1530msgid "check if - even missing - files are ignored in dry run"
07432cef 1531msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5
JX
1532
1533#: builtin/add.c:353
8ada9598
JX
1534#, c-format
1535msgid "Use -f if you really want to add them.\n"
1536msgstr "使用 -f 参数如果您确实要添加它们。\n"
1537
ef317cd5 1538#: builtin/add.c:354
8ada9598
JX
1539msgid "no files added"
1540msgstr "没有文件被添加"
1541
ef317cd5 1542#: builtin/add.c:360
8ada9598
JX
1543msgid "adding files failed"
1544msgstr "添加文件失败"
1545
ef317cd5 1546#: builtin/add.c:392
8ada9598
JX
1547msgid "-A and -u are mutually incompatible"
1548msgstr "-A 和 -u 选项互斥"
1549
ef317cd5 1550#: builtin/add.c:394
8ada9598 1551msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 1552msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 1553
ef317cd5 1554#: builtin/add.c:414
8ada9598
JX
1555#, c-format
1556msgid "Nothing specified, nothing added.\n"
1557msgstr "没有指定文件,也没有文件被添加。\n"
1558
ef317cd5 1559#: builtin/add.c:415
8ada9598
JX
1560#, c-format
1561msgid "Maybe you wanted to say 'git add .'?\n"
1562msgstr "也许您想要执行 'git add .'?\n"
1563
07432cef
WS
1564#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82
1565#: builtin/rm.c:235
8ada9598
JX
1566msgid "index file corrupt"
1567msgstr "索引文件损坏"
1568
07432cef 1569#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370
8ada9598
JX
1570msgid "Unable to write new index file"
1571msgstr "无法写入新索引文件"
1572
23ff3338 1573#: builtin/apply.c:57
8ada9598 1574msgid "git apply [options] [<patch>...]"
81809b99 1575msgstr "git apply [选项] [<补丁>...]"
8ada9598 1576
23ff3338 1577#: builtin/apply.c:110
81809b99 1578#, c-format
8ada9598 1579msgid "unrecognized whitespace option '%s'"
81809b99 1580msgstr "未能识别的空白字符选项 '%s'"
8ada9598 1581
23ff3338 1582#: builtin/apply.c:125
81809b99 1583#, c-format
8ada9598 1584msgid "unrecognized whitespace ignore option '%s'"
81809b99 1585msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 1586
c160d03f 1587#: builtin/apply.c:823
8ada9598
JX
1588#, c-format
1589msgid "Cannot prepare timestamp regexp %s"
81809b99 1590msgstr "无法准备时间戳正则表达式 %s"
8ada9598 1591
c160d03f 1592#: builtin/apply.c:832
8ada9598
JX
1593#, c-format
1594msgid "regexec returned %d for input: %s"
81809b99 1595msgstr "regexec 返回 %d,输入为:%s"
8ada9598 1596
c160d03f 1597#: builtin/apply.c:913
81809b99 1598#, c-format
8ada9598 1599msgid "unable to find filename in patch at line %d"
81809b99 1600msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 1601
c160d03f 1602#: builtin/apply.c:945
8ada9598
JX
1603#, c-format
1604msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 1605msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 1606
c160d03f 1607#: builtin/apply.c:949
8ada9598
JX
1608#, c-format
1609msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 1610msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 1611
c160d03f 1612#: builtin/apply.c:950
8ada9598
JX
1613#, c-format
1614msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 1615msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 1616
c160d03f 1617#: builtin/apply.c:957
8ada9598
JX
1618#, c-format
1619msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 1620msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 1621
ef317cd5 1622#: builtin/apply.c:1420
8ada9598
JX
1623#, c-format
1624msgid "recount: unexpected line: %.*s"
81809b99 1625msgstr "recount:意外的行:%.*s"
8ada9598 1626
ef317cd5 1627#: builtin/apply.c:1477
8ada9598
JX
1628#, c-format
1629msgid "patch fragment without header at line %d: %.*s"
81809b99 1630msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 1631
ef317cd5 1632#: builtin/apply.c:1494
8ada9598
JX
1633#, c-format
1634msgid ""
1635"git diff header lacks filename information when removing %d leading pathname "
1636"component (line %d)"
1637msgid_plural ""
1638"git diff header lacks filename information when removing %d leading pathname "
1639"components (line %d)"
5ae481e0
JX
1640msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1641msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 1642
ef317cd5 1643#: builtin/apply.c:1654
8ada9598 1644msgid "new file depends on old contents"
81809b99 1645msgstr "新文件依赖旧内容"
8ada9598 1646
ef317cd5 1647#: builtin/apply.c:1656
8ada9598 1648msgid "deleted file still has contents"
81809b99 1649msgstr "删除的文件仍有内容"
8ada9598 1650
ef317cd5 1651#: builtin/apply.c:1682
8ada9598
JX
1652#, c-format
1653msgid "corrupt patch at line %d"
195febda 1654msgstr "补丁在第 %d 行损坏"
8ada9598 1655
ef317cd5 1656#: builtin/apply.c:1718
8ada9598
JX
1657#, c-format
1658msgid "new file %s depends on old contents"
81809b99 1659msgstr "新文件 %s 依赖旧内容"
8ada9598 1660
ef317cd5 1661#: builtin/apply.c:1720
8ada9598
JX
1662#, c-format
1663msgid "deleted file %s still has contents"
81809b99 1664msgstr "删除的文件 %s 仍有内容"
8ada9598 1665
ef317cd5 1666#: builtin/apply.c:1723
8ada9598
JX
1667#, c-format
1668msgid "** warning: file %s becomes empty but is not deleted"
81809b99 1669msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 1670
ef317cd5 1671#: builtin/apply.c:1869
8ada9598
JX
1672#, c-format
1673msgid "corrupt binary patch at line %d: %.*s"
81809b99 1674msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598
JX
1675
1676#. there has to be one hunk (forward hunk)
ef317cd5 1677#: builtin/apply.c:1898
8ada9598
JX
1678#, c-format
1679msgid "unrecognized binary patch at line %d"
81809b99 1680msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 1681
ef317cd5 1682#: builtin/apply.c:1984
8ada9598
JX
1683#, c-format
1684msgid "patch with only garbage at line %d"
81809b99 1685msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 1686
ef317cd5 1687#: builtin/apply.c:2074
81809b99 1688#, c-format
8ada9598 1689msgid "unable to read symlink %s"
81809b99 1690msgstr "无法读取符号链接 %s"
8ada9598 1691
ef317cd5 1692#: builtin/apply.c:2078
81809b99 1693#, c-format
8ada9598 1694msgid "unable to open or read %s"
81809b99 1695msgstr "不能打开或读取 %s"
8ada9598 1696
07432cef 1697#: builtin/apply.c:2682
81809b99 1698#, c-format
8ada9598 1699msgid "invalid start of line: '%c'"
81809b99 1700msgstr "无效的行首字符:'%c'"
8ada9598 1701
07432cef 1702#: builtin/apply.c:2800
8ada9598
JX
1703#, c-format
1704msgid "Hunk #%d succeeded at %d (offset %d line)."
1705msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
1706msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1707msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 1708
07432cef 1709#: builtin/apply.c:2812
8ada9598
JX
1710#, c-format
1711msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 1712msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 1713
07432cef 1714#: builtin/apply.c:2818
8ada9598
JX
1715#, c-format
1716msgid ""
1717"while searching for:\n"
1718"%.*s"
1719msgstr ""
81809b99
JX
1720"当查询:\n"
1721"%.*s"
8ada9598 1722
07432cef 1723#: builtin/apply.c:2837
8ada9598
JX
1724#, c-format
1725msgid "missing binary patch data for '%s'"
81809b99 1726msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 1727
07432cef 1728#: builtin/apply.c:2940
8ada9598
JX
1729#, c-format
1730msgid "binary patch does not apply to '%s'"
81809b99 1731msgstr "二进制补丁未应用到 '%s'"
8ada9598 1732
07432cef 1733#: builtin/apply.c:2946
8ada9598
JX
1734#, c-format
1735msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 1736msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 1737
07432cef 1738#: builtin/apply.c:2967
8ada9598
JX
1739#, c-format
1740msgid "patch failed: %s:%ld"
81809b99 1741msgstr "打补丁失败:%s:%ld"
8ada9598 1742
07432cef 1743#: builtin/apply.c:3089
8ada9598 1744#, c-format
23ff3338
JX
1745msgid "cannot checkout %s"
1746msgstr "不能检出 %s"
8ada9598 1747
07432cef 1748#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187
81809b99 1749#, c-format
8ada9598 1750msgid "read of %s failed"
81809b99 1751msgstr "读取 %s 失败"
8ada9598 1752
07432cef 1753#: builtin/apply.c:3167 builtin/apply.c:3389
81809b99 1754#, c-format
23ff3338
JX
1755msgid "path %s has been renamed/deleted"
1756msgstr "路径 %s 已经被重命名/删除"
8ada9598 1757
07432cef 1758#: builtin/apply.c:3248 builtin/apply.c:3403
8ada9598 1759#, c-format
23ff3338
JX
1760msgid "%s: does not exist in index"
1761msgstr "%s:不存在于索引中"
8ada9598 1762
07432cef 1763#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417
81809b99 1764#, c-format
8ada9598 1765msgid "%s: %s"
81809b99 1766msgstr "%s:%s"
8ada9598 1767
07432cef 1768#: builtin/apply.c:3257 builtin/apply.c:3411
81809b99 1769#, c-format
8ada9598 1770msgid "%s: does not match index"
81809b99 1771msgstr "%s:和索引不匹配"
8ada9598 1772
07432cef 1773#: builtin/apply.c:3359
23ff3338
JX
1774msgid "removal patch leaves file contents"
1775msgstr "移除补丁仍留下了文件内容"
1776
07432cef 1777#: builtin/apply.c:3428
8ada9598
JX
1778#, c-format
1779msgid "%s: wrong type"
81809b99 1780msgstr "%s:错误类型"
8ada9598 1781
07432cef 1782#: builtin/apply.c:3430
8ada9598
JX
1783#, c-format
1784msgid "%s has type %o, expected %o"
9aafc933 1785msgstr "%s 的类型是 %o,应为 %o"
8ada9598 1786
07432cef 1787#: builtin/apply.c:3531
81809b99 1788#, c-format
8ada9598 1789msgid "%s: already exists in index"
81809b99 1790msgstr "%s:已经存在于索引中"
8ada9598 1791
07432cef 1792#: builtin/apply.c:3534
23ff3338
JX
1793#, c-format
1794msgid "%s: already exists in working directory"
1795msgstr "%s:已经存在于工作区中"
1796
07432cef 1797#: builtin/apply.c:3554
d691f479
JX
1798#, c-format
1799msgid "new mode (%o) of %s does not match old mode (%o)"
1800msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 1801
07432cef 1802#: builtin/apply.c:3559
8ada9598 1803#, c-format
d691f479
JX
1804msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1805msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1806
07432cef 1807#: builtin/apply.c:3567
d691f479 1808#, c-format
8ada9598 1809msgid "%s: patch does not apply"
81809b99 1810msgstr "%s:补丁未应用"
8ada9598 1811
07432cef 1812#: builtin/apply.c:3580
8ada9598
JX
1813#, c-format
1814msgid "Checking patch %s..."
81809b99 1815msgstr "检查补丁 %s..."
8ada9598 1816
07432cef 1817#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124
8ada9598
JX
1818#, c-format
1819msgid "make_cache_entry failed for path '%s'"
1820msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1821
07432cef 1822#: builtin/apply.c:3778
81809b99 1823#, c-format
8ada9598 1824msgid "unable to remove %s from index"
81809b99 1825msgstr "不能从索引中移除 %s"
8ada9598 1826
07432cef 1827#: builtin/apply.c:3806
8ada9598
JX
1828#, c-format
1829msgid "corrupt patch for subproject %s"
81809b99 1830msgstr "子项目 %s 损坏的补丁"
8ada9598 1831
07432cef 1832#: builtin/apply.c:3810
81809b99 1833#, c-format
8ada9598 1834msgid "unable to stat newly created file '%s'"
81809b99 1835msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 1836
07432cef 1837#: builtin/apply.c:3815
8ada9598
JX
1838#, c-format
1839msgid "unable to create backing store for newly created file %s"
81809b99 1840msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1841
07432cef 1842#: builtin/apply.c:3818 builtin/apply.c:3926
81809b99 1843#, c-format
8ada9598 1844msgid "unable to add cache entry for %s"
81809b99 1845msgstr "无法为 %s 添加缓存条目"
8ada9598 1846
07432cef 1847#: builtin/apply.c:3851
81809b99 1848#, c-format
8ada9598 1849msgid "closing file '%s'"
81809b99 1850msgstr "关闭文件 '%s'"
8ada9598 1851
07432cef 1852#: builtin/apply.c:3900
81809b99 1853#, c-format
8ada9598 1854msgid "unable to write file '%s' mode %o"
81809b99 1855msgstr "不能写文件 '%s' 权限 %o"
8ada9598 1856
07432cef 1857#: builtin/apply.c:3987
8ada9598
JX
1858#, c-format
1859msgid "Applied patch %s cleanly."
81809b99 1860msgstr "成功应用补丁 %s。"
8ada9598 1861
07432cef 1862#: builtin/apply.c:3995
8ada9598 1863msgid "internal error"
81809b99 1864msgstr "内部错误"
8ada9598
JX
1865
1866#. Say this even without --verbose
07432cef 1867#: builtin/apply.c:3998
8ada9598
JX
1868#, c-format
1869msgid "Applying patch %%s with %d reject..."
1870msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
1871msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1872msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 1873
07432cef 1874#: builtin/apply.c:4008
8ada9598
JX
1875#, c-format
1876msgid "truncating .rej filename to %.*s.rej"
81809b99 1877msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 1878
07432cef 1879#: builtin/apply.c:4029
8ada9598
JX
1880#, c-format
1881msgid "Hunk #%d applied cleanly."
81809b99 1882msgstr "第 #%d 个片段成功应用。"
8ada9598 1883
07432cef 1884#: builtin/apply.c:4032
8ada9598
JX
1885#, c-format
1886msgid "Rejected hunk #%d."
81809b99 1887msgstr "拒绝第 #%d 个片段。"
8ada9598 1888
07432cef 1889#: builtin/apply.c:4182
8ada9598 1890msgid "unrecognized input"
81809b99 1891msgstr "未能识别的输入"
8ada9598 1892
07432cef 1893#: builtin/apply.c:4193
8ada9598 1894msgid "unable to read index file"
81809b99 1895msgstr "无法读取索引文件"
8ada9598 1896
07432cef 1897#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91
ef317cd5 1898#: builtin/fetch.c:63
8ada9598 1899msgid "path"
81809b99 1900msgstr "路径"
8ada9598 1901
07432cef 1902#: builtin/apply.c:4313
8ada9598 1903msgid "don't apply changes matching the given path"
81809b99 1904msgstr "不要应用与给出路径向匹配的变更"
8ada9598 1905
07432cef 1906#: builtin/apply.c:4316
8ada9598 1907msgid "apply changes matching the given path"
81809b99 1908msgstr "应用与给出路径向匹配的变更"
8ada9598 1909
07432cef 1910#: builtin/apply.c:4318
8ada9598 1911msgid "num"
81809b99 1912msgstr "数字"
8ada9598 1913
07432cef 1914#: builtin/apply.c:4319
8ada9598 1915msgid "remove <num> leading slashes from traditional diff paths"
07432cef 1916msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 1917
07432cef 1918#: builtin/apply.c:4322
8ada9598 1919msgid "ignore additions made by the patch"
81809b99 1920msgstr "忽略补丁中的添加的文件"
8ada9598 1921
07432cef 1922#: builtin/apply.c:4324
8ada9598 1923msgid "instead of applying the patch, output diffstat for the input"
81809b99 1924msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 1925
07432cef 1926#: builtin/apply.c:4328
ef317cd5 1927msgid "show number of added and deleted lines in decimal notation"
07432cef 1928msgstr "以十进制数显示添加和删除的行数"
8ada9598 1929
07432cef 1930#: builtin/apply.c:4330
8ada9598 1931msgid "instead of applying the patch, output a summary for the input"
81809b99 1932msgstr "不应用补丁,而是显示输入的概要"
8ada9598 1933
07432cef 1934#: builtin/apply.c:4332
8ada9598 1935msgid "instead of applying the patch, see if the patch is applicable"
81809b99 1936msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 1937
07432cef 1938#: builtin/apply.c:4334
8ada9598 1939msgid "make sure the patch is applicable to the current index"
81809b99 1940msgstr "确认补丁可以应用到当前索引"
8ada9598 1941
07432cef 1942#: builtin/apply.c:4336
8ada9598 1943msgid "apply a patch without touching the working tree"
81809b99 1944msgstr "应用补丁而不修改工作区"
8ada9598 1945
07432cef 1946#: builtin/apply.c:4338
8ada9598 1947msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 1948msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 1949
07432cef 1950#: builtin/apply.c:4340
23ff3338
JX
1951msgid "attempt three-way merge if a patch does not apply"
1952msgstr "如果一个补丁不能应用则尝试三路合并"
1953
07432cef 1954#: builtin/apply.c:4342
8ada9598 1955msgid "build a temporary index based on embedded index information"
81809b99 1956msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 1957
07432cef 1958#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460
8ada9598 1959msgid "paths are separated with NUL character"
81809b99 1960msgstr "路径以 NUL 字符分隔"
8ada9598 1961
07432cef 1962#: builtin/apply.c:4347
8ada9598 1963msgid "ensure at least <n> lines of context match"
81809b99 1964msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1965
07432cef 1966#: builtin/apply.c:4348
8ada9598 1967msgid "action"
81809b99 1968msgstr "动作"
8ada9598 1969
07432cef 1970#: builtin/apply.c:4349
8ada9598 1971msgid "detect new or modified lines that have whitespace errors"
81809b99 1972msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1973
07432cef 1974#: builtin/apply.c:4352 builtin/apply.c:4355
8ada9598 1975msgid "ignore changes in whitespace when finding context"
81809b99 1976msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1977
07432cef 1978#: builtin/apply.c:4358
8ada9598 1979msgid "apply the patch in reverse"
81809b99 1980msgstr "反向应用补丁"
8ada9598 1981
07432cef 1982#: builtin/apply.c:4360
8ada9598 1983msgid "don't expect at least one line of context"
81809b99 1984msgstr "无需至少一行上下文"
8ada9598 1985
07432cef 1986#: builtin/apply.c:4362
8ada9598 1987msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 1988msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1989
07432cef 1990#: builtin/apply.c:4364
8ada9598 1991msgid "allow overlapping hunks"
81809b99 1992msgstr "允许重叠的补丁片段"
8ada9598 1993
07432cef 1994#: builtin/apply.c:4367
8ada9598 1995msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 1996msgstr "允许不正确的文件末尾换行符"
c04f5ac3 1997
07432cef 1998#: builtin/apply.c:4370
8ada9598 1999msgid "do not trust the line counts in the hunk headers"
81809b99 2000msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2001
07432cef 2002#: builtin/apply.c:4372
8ada9598 2003msgid "root"
81809b99 2004msgstr "根目录"
c04f5ac3 2005
07432cef 2006#: builtin/apply.c:4373
8ada9598 2007msgid "prepend <root> to all filenames"
81809b99 2008msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2009
07432cef 2010#: builtin/apply.c:4395
23ff3338
JX
2011msgid "--3way outside a repository"
2012msgstr "--3way 在一个版本库之外"
2013
07432cef 2014#: builtin/apply.c:4403
8ada9598 2015msgid "--index outside a repository"
81809b99 2016msgstr "--index 在一个版本库之外"
c04f5ac3 2017
07432cef 2018#: builtin/apply.c:4406
8ada9598 2019msgid "--cached outside a repository"
81809b99 2020msgstr "--cached 在一个版本库之外"
c04f5ac3 2021
07432cef 2022#: builtin/apply.c:4422
81809b99 2023#, c-format
8ada9598 2024msgid "can't open patch '%s'"
81809b99 2025msgstr "不能打开补丁 '%s'"
c04f5ac3 2026
07432cef 2027#: builtin/apply.c:4436
c04f5ac3 2028#, c-format
8ada9598
JX
2029msgid "squelched %d whitespace error"
2030msgid_plural "squelched %d whitespace errors"
81809b99 2031msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2032msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2033
07432cef 2034#: builtin/apply.c:4442 builtin/apply.c:4452
8ada9598
JX
2035#, c-format
2036msgid "%d line adds whitespace errors."
2037msgid_plural "%d lines add whitespace errors."
81809b99 2038msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2039msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2040
2041#: builtin/archive.c:17
2042#, c-format
2043msgid "could not create archive file '%s'"
90e6ef53 2044msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2045
2046#: builtin/archive.c:20
2047msgid "could not redirect output"
195febda 2048msgstr "不能重定向输出"
c04f5ac3
JX
2049
2050#: builtin/archive.c:37
2051msgid "git archive: Remote with no URL"
90e6ef53 2052msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2053
2054#: builtin/archive.c:58
2055msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2056msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3
JX
2057
2058#: builtin/archive.c:63
2059#, c-format
2060msgid "git archive: NACK %s"
90e6ef53 2061msgstr "git archive:NACK %s"
c04f5ac3
JX
2062
2063#: builtin/archive.c:65
2064#, c-format
2065msgid "remote error: %s"
2066msgstr "远程错误:%s"
2067
2068#: builtin/archive.c:66
2069msgid "git archive: protocol error"
90e6ef53 2070msgstr "git archive:协议错误"
c04f5ac3
JX
2071
2072#: builtin/archive.c:71
2073msgid "git archive: expected a flush"
195febda 2074msgstr "git archive:应为刷新"
c04f5ac3 2075
ef317cd5
JX
2076#: builtin/bisect--helper.c:7
2077msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2078msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2079
2080#: builtin/bisect--helper.c:17
2081msgid "perform 'git bisect next'"
07432cef 2082msgstr "执行 'git bisect next'"
ef317cd5
JX
2083
2084#: builtin/bisect--helper.c:19
2085msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2086msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5
JX
2087
2088#: builtin/blame.c:25
2089msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2090msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5
JX
2091
2092#: builtin/blame.c:30 builtin/shortlog.c:15
2093msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2094msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2095
07432cef 2096#: builtin/blame.c:2364
ef317cd5 2097msgid "Show blame entries as we find them, incrementally"
07432cef 2098msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2099
07432cef 2100#: builtin/blame.c:2365
ef317cd5 2101msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2102msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2103
07432cef 2104#: builtin/blame.c:2366
ef317cd5 2105msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2106msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2107
07432cef 2108#: builtin/blame.c:2367
ef317cd5 2109msgid "Show work cost statistics"
07432cef 2110msgstr "显示命令消耗统计"
ef317cd5 2111
07432cef 2112#: builtin/blame.c:2368
ef317cd5 2113msgid "Show output score for blame entries"
07432cef 2114msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2115
07432cef 2116#: builtin/blame.c:2369
ef317cd5 2117msgid "Show original filename (Default: auto)"
07432cef 2118msgstr "显示原始文件名(默认:自动)"
ef317cd5 2119
07432cef 2120#: builtin/blame.c:2370
ef317cd5 2121msgid "Show original linenumber (Default: off)"
07432cef 2122msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2123
07432cef 2124#: builtin/blame.c:2371
ef317cd5 2125msgid "Show in a format designed for machine consumption"
07432cef 2126msgstr "显示为一个适合机器读取的格式"
ef317cd5 2127
07432cef 2128#: builtin/blame.c:2372
ef317cd5 2129msgid "Show porcelain format with per-line commit information"
07432cef 2130msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2131
07432cef 2132#: builtin/blame.c:2373
ef317cd5 2133msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2134msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2135
07432cef 2136#: builtin/blame.c:2374
ef317cd5 2137msgid "Show raw timestamp (Default: off)"
07432cef 2138msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2139
07432cef 2140#: builtin/blame.c:2375
ef317cd5 2141msgid "Show long commit SHA1 (Default: off)"
07432cef 2142msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2143
07432cef 2144#: builtin/blame.c:2376
ef317cd5 2145msgid "Suppress author name and timestamp (Default: off)"
07432cef 2146msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2147
07432cef 2148#: builtin/blame.c:2377
ef317cd5 2149msgid "Show author email instead of name (Default: off)"
07432cef 2150msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2151
07432cef 2152#: builtin/blame.c:2378
ef317cd5 2153msgid "Ignore whitespace differences"
07432cef 2154msgstr "忽略空白差异"
ef317cd5 2155
07432cef 2156#: builtin/blame.c:2379
ef317cd5 2157msgid "Spend extra cycles to find better match"
07432cef 2158msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2159
07432cef 2160#: builtin/blame.c:2380
ef317cd5 2161msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2162msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2163
07432cef 2164#: builtin/blame.c:2381
ef317cd5 2165msgid "Use <file>'s contents as the final image"
07432cef 2166msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2167
07432cef 2168#: builtin/blame.c:2382 builtin/blame.c:2383
ef317cd5 2169msgid "score"
07432cef 2170msgstr "得分"
ef317cd5 2171
07432cef 2172#: builtin/blame.c:2382
ef317cd5 2173msgid "Find line copies within and across files"
07432cef 2174msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2175
07432cef 2176#: builtin/blame.c:2383
ef317cd5 2177msgid "Find line movements within and across files"
07432cef 2178msgstr "找到文件内及跨文件的行移动"
ef317cd5 2179
07432cef 2180#: builtin/blame.c:2384
ef317cd5 2181msgid "n,m"
07432cef 2182msgstr "n,m"
ef317cd5 2183
07432cef 2184#: builtin/blame.c:2384
ef317cd5 2185msgid "Process only line range n,m, counting from 1"
07432cef 2186msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5
JX
2187
2188#: builtin/branch.c:23
2189msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2190msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5
JX
2191
2192#: builtin/branch.c:24
2193msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2194msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5
JX
2195
2196#: builtin/branch.c:25
ef317cd5 2197msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2198msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5
JX
2199
2200#: builtin/branch.c:26
2201msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2202msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2203
90e6ef53 2204# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
ef317cd5 2205#: builtin/branch.c:145
c04f5ac3
JX
2206#, c-format
2207msgid ""
2208"deleting branch '%s' that has been merged to\n"
2209" '%s', but not yet merged to HEAD."
2210msgstr ""
70fc47bf 2211"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2212" '%s',但未合并到 HEAD。"
2213
90e6ef53 2214# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
ef317cd5 2215#: builtin/branch.c:149
c04f5ac3
JX
2216#, c-format
2217msgid ""
2218"not deleting branch '%s' that is not yet merged to\n"
2219" '%s', even though it is merged to HEAD."
2220msgstr ""
70fc47bf
T
2221"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2222" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2223
07432cef
WS
2224#: builtin/branch.c:163
2225#, c-format
2226msgid "Couldn't look up commit object for '%s'"
2227msgstr "无法查询 '%s' 指向的提交对象"
2228
2229#: builtin/branch.c:167
2230#, c-format
2231msgid ""
2232"The branch '%s' is not fully merged.\n"
2233"If you are sure you want to delete it, run 'git branch -D %s'."
2234msgstr ""
2235"分支 '%s' 没有完全合并。\n"
2236"如果您确认要删除它,执行 'git branch -D %s'。"
2237
2238#: builtin/branch.c:180
2239msgid "Update of config-file failed"
2240msgstr "无法更新 config 文件"
2241
2242#: builtin/branch.c:208
c04f5ac3 2243msgid "cannot use -a with -d"
649900bc 2244msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2245
07432cef 2246#: builtin/branch.c:214
c04f5ac3
JX
2247msgid "Couldn't look up commit object for HEAD"
2248msgstr "无法查询 HEAD 指向的提交对象"
2249
07432cef 2250#: builtin/branch.c:222
c04f5ac3
JX
2251#, c-format
2252msgid "Cannot delete the branch '%s' which you are currently on."
2253msgstr "无法删除您当前所在的分支 '%s'。"
2254
07432cef 2255#: builtin/branch.c:235
5ae481e0 2256#, c-format
8ada9598 2257msgid "remote branch '%s' not found."
81809b99 2258msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2259
07432cef 2260#: builtin/branch.c:236
81809b99 2261#, c-format
8ada9598 2262msgid "branch '%s' not found."
81809b99 2263msgstr "分支 '%s' 未发现。"
8ada9598 2264
07432cef 2265#: builtin/branch.c:250
81809b99 2266#, c-format
8ada9598 2267msgid "Error deleting remote branch '%s'"
81809b99 2268msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2269
07432cef 2270#: builtin/branch.c:251
81809b99 2271#, c-format
8ada9598 2272msgid "Error deleting branch '%s'"
81809b99 2273msgstr "删除分支 '%s' 时出错"
8ada9598 2274
07432cef 2275#: builtin/branch.c:258
81809b99 2276#, c-format
8ada9598 2277msgid "Deleted remote branch %s (was %s).\n"
81809b99 2278msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2279
07432cef 2280#: builtin/branch.c:259
81809b99 2281#, c-format
8ada9598 2282msgid "Deleted branch %s (was %s).\n"
81809b99 2283msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2284
07432cef 2285#: builtin/branch.c:361
c04f5ac3
JX
2286#, c-format
2287msgid "branch '%s' does not point at a commit"
2288msgstr "分支 '%s' 未指向一个提交"
2289
07432cef 2290#: builtin/branch.c:433
81809b99 2291#, c-format
8ada9598 2292msgid "[%s: behind %d]"
81809b99 2293msgstr "[%s:落后 %d]"
c04f5ac3 2294
07432cef 2295#: builtin/branch.c:435
81809b99 2296#, c-format
8ada9598 2297msgid "[behind %d]"
81809b99 2298msgstr "[落后 %d]"
8ada9598 2299
07432cef 2300#: builtin/branch.c:439
81809b99 2301#, c-format
8ada9598 2302msgid "[%s: ahead %d]"
81809b99 2303msgstr "[%s:领先 %d]"
c04f5ac3 2304
07432cef 2305#: builtin/branch.c:441
81809b99 2306#, c-format
8ada9598 2307msgid "[ahead %d]"
81809b99 2308msgstr "[领先 %d]"
8ada9598 2309
07432cef 2310#: builtin/branch.c:444
81809b99 2311#, c-format
8ada9598 2312msgid "[%s: ahead %d, behind %d]"
81809b99 2313msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2314
07432cef 2315#: builtin/branch.c:447
81809b99 2316#, c-format
8ada9598 2317msgid "[ahead %d, behind %d]"
81809b99 2318msgstr "[领先 %d,落后 %d]"
c04f5ac3 2319
07432cef 2320#: builtin/branch.c:560
c04f5ac3
JX
2321msgid "(no branch)"
2322msgstr "(非分支)"
2323
07432cef 2324#: builtin/branch.c:625
c04f5ac3 2325msgid "some refs could not be read"
90e6ef53 2326msgstr "一些引用不能读取"
c04f5ac3 2327
07432cef 2328#: builtin/branch.c:638
c04f5ac3 2329msgid "cannot rename the current branch while not on any."
90e6ef53 2330msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2331
07432cef 2332#: builtin/branch.c:648
c04f5ac3
JX
2333#, c-format
2334msgid "Invalid branch name: '%s'"
2335msgstr "无效的分支名:'%s'"
2336
07432cef 2337#: builtin/branch.c:663
c04f5ac3
JX
2338msgid "Branch rename failed"
2339msgstr "分支重命名失败"
2340
07432cef 2341#: builtin/branch.c:667
c04f5ac3
JX
2342#, c-format
2343msgid "Renamed a misnamed branch '%s' away"
2344msgstr "重命名掉一个错误命名的旧分支 '%s'"
2345
07432cef 2346#: builtin/branch.c:671
c04f5ac3
JX
2347#, c-format
2348msgid "Branch renamed to %s, but HEAD is not updated!"
2349msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2350
07432cef 2351#: builtin/branch.c:678
c04f5ac3
JX
2352msgid "Branch is renamed, but update of config-file failed"
2353msgstr "分支被重命名,但更新 config 文件失败"
2354
07432cef 2355#: builtin/branch.c:693
c04f5ac3
JX
2356#, c-format
2357msgid "malformed object name %s"
2358msgstr "非法的对象名 %s"
2359
07432cef 2360#: builtin/branch.c:717
81809b99 2361#, c-format
8ada9598 2362msgid "could not write branch description template: %s"
81809b99 2363msgstr "不能写分支描述模版:%s"
c04f5ac3 2364
07432cef 2365#: builtin/branch.c:747
ef317cd5 2366msgid "Generic options"
07432cef 2367msgstr "通用选项"
c04f5ac3 2368
07432cef 2369#: builtin/branch.c:749
ef317cd5 2370msgid "show hash and subject, give twice for upstream branch"
07432cef 2371msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2372
07432cef 2373#: builtin/branch.c:750
ef317cd5 2374msgid "suppress informational messages"
07432cef 2375msgstr "不显示信息"
8ada9598 2376
07432cef 2377#: builtin/branch.c:751
ef317cd5 2378msgid "set up tracking mode (see git-pull(1))"
07432cef 2379msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2380
07432cef 2381#: builtin/branch.c:753
ef317cd5 2382msgid "change upstream info"
07432cef 2383msgstr "改变上游信息"
c04f5ac3 2384
07432cef 2385#: builtin/branch.c:757
ef317cd5 2386msgid "use colored output"
07432cef 2387msgstr "使用彩色输出"
c04f5ac3 2388
07432cef 2389#: builtin/branch.c:758
ef317cd5 2390msgid "act on remote-tracking branches"
07432cef 2391msgstr "作用于远程跟踪分支"
c04f5ac3 2392
07432cef
WS
2393#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2394#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379
2395#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470
ef317cd5 2396msgid "commit"
07432cef 2397msgstr "提交"
c04f5ac3 2398
07432cef 2399#: builtin/branch.c:762 builtin/branch.c:768
ef317cd5 2400msgid "print only branches that contain the commit"
07432cef 2401msgstr "只打印包含该提交的分支"
c04f5ac3 2402
07432cef 2403#: builtin/branch.c:774
ef317cd5 2404msgid "Specific git-branch actions:"
07432cef 2405msgstr "具体的 git-branch 动作:"
c04f5ac3 2406
07432cef 2407#: builtin/branch.c:775
ef317cd5 2408msgid "list both remote-tracking and local branches"
07432cef 2409msgstr "列出远程跟踪及本地分支"
c04f5ac3 2410
07432cef 2411#: builtin/branch.c:777
ef317cd5 2412msgid "delete fully merged branch"
07432cef 2413msgstr "删除完全合并的分支"
c04f5ac3 2414
07432cef 2415#: builtin/branch.c:778
ef317cd5 2416msgid "delete branch (even if not merged)"
07432cef 2417msgstr "删除分支(即使没有合并)"
c04f5ac3 2418
07432cef 2419#: builtin/branch.c:779
ef317cd5 2420msgid "move/rename a branch and its reflog"
07432cef 2421msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 2422
07432cef 2423#: builtin/branch.c:780
ef317cd5 2424msgid "move/rename a branch, even if target exists"
07432cef 2425msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 2426
07432cef 2427#: builtin/branch.c:781
ef317cd5 2428msgid "list branch names"
07432cef 2429msgstr "列出分支名"
c04f5ac3 2430
07432cef 2431#: builtin/branch.c:782
ef317cd5 2432msgid "create the branch's reflog"
07432cef 2433msgstr "创建分支的引用日志"
ef317cd5 2434
07432cef 2435#: builtin/branch.c:784
ef317cd5 2436msgid "edit the description for the branch"
07432cef 2437msgstr "标记分支的描述"
ef317cd5 2438
07432cef 2439#: builtin/branch.c:785
ef317cd5 2440msgid "force creation (when already exists)"
07432cef 2441msgstr "强制创建(当已经存在)"
ef317cd5 2442
07432cef 2443#: builtin/branch.c:788
ef317cd5 2444msgid "print only not merged branches"
07432cef 2445msgstr "只打印没有合并的分支"
ef317cd5 2446
07432cef 2447#: builtin/branch.c:794
ef317cd5 2448msgid "print only merged branches"
07432cef 2449msgstr "只打印合并的分支"
ef317cd5 2450
07432cef 2451#: builtin/branch.c:798
ef317cd5 2452msgid "list branches in columns"
07432cef 2453msgstr "以列的方式显示分支"
ef317cd5 2454
07432cef 2455#: builtin/branch.c:811
c04f5ac3
JX
2456msgid "Failed to resolve HEAD as a valid ref."
2457msgstr "无法将 HEAD 解析为有效引用。"
2458
07432cef 2459#: builtin/branch.c:816 builtin/clone.c:561
c04f5ac3 2460msgid "HEAD not found below refs/heads!"
90e6ef53 2461msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 2462
07432cef 2463#: builtin/branch.c:836
8ada9598 2464msgid "--column and --verbose are incompatible"
81809b99 2465msgstr "--column 和 --verbose 不兼容"
8ada9598 2466
07432cef
WS
2467#: builtin/branch.c:887
2468#, c-format
ef317cd5 2469msgid "branch '%s' does not exist"
07432cef 2470msgstr "分支 '%s' 不存在"
ef317cd5 2471
07432cef 2472#: builtin/branch.c:899
ef317cd5
JX
2473#, c-format
2474msgid "Branch '%s' has no upstream information"
07432cef 2475msgstr "分支 '%s' 没有上游信息"
ef317cd5 2476
07432cef 2477#: builtin/branch.c:914
c04f5ac3
JX
2478msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2479msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2480
07432cef 2481#: builtin/branch.c:917
ef317cd5
JX
2482#, c-format
2483msgid ""
2484"The --set-upstream flag is deprecated and will be removed. Consider using --"
2485"track or --set-upstream-to\n"
2486msgstr ""
07432cef 2487"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 2488
07432cef 2489#: builtin/branch.c:934
ef317cd5
JX
2490#, c-format
2491msgid ""
2492"\n"
2493"If you wanted to make '%s' track '%s', do this:\n"
2494"\n"
2495msgstr ""
07432cef
WS
2496"\n"
2497"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2498"\n"
ef317cd5 2499
07432cef
WS
2500#: builtin/branch.c:935
2501#, c-format
ef317cd5 2502msgid " git branch -d %s\n"
07432cef 2503msgstr " git branch -d %s\n"
ef317cd5 2504
07432cef 2505#: builtin/branch.c:936
ef317cd5
JX
2506#, c-format
2507msgid " git branch --set-upstream-to %s\n"
07432cef 2508msgstr " git branch --set-upstream-to %s\n"
ef317cd5 2509
c04f5ac3
JX
2510#: builtin/bundle.c:47
2511#, c-format
2512msgid "%s is okay\n"
2513msgstr "%s 可以\n"
2514
2515#: builtin/bundle.c:56
2516msgid "Need a repository to create a bundle."
90e6ef53 2517msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
2518
2519#: builtin/bundle.c:60
2520msgid "Need a repository to unbundle."
90e6ef53 2521msgstr "需要一个版本库来解包。"
c04f5ac3 2522
ef317cd5
JX
2523#: builtin/cat-file.c:247
2524msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 2525msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5
JX
2526
2527#: builtin/cat-file.c:248
2528msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 2529msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5
JX
2530
2531#: builtin/cat-file.c:266
2532msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 2533msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5
JX
2534
2535#: builtin/cat-file.c:267
ef317cd5 2536msgid "show object type"
07432cef 2537msgstr "显示对象类型"
ef317cd5
JX
2538
2539#: builtin/cat-file.c:268
ef317cd5 2540msgid "show object size"
07432cef 2541msgstr "显示对象大小"
ef317cd5
JX
2542
2543#: builtin/cat-file.c:270
2544msgid "exit with zero when there's no error"
07432cef 2545msgstr "当没有错误时退出并返回零"
ef317cd5
JX
2546
2547#: builtin/cat-file.c:271
2548msgid "pretty-print object's content"
07432cef 2549msgstr "美观地打印对象的内容"
ef317cd5
JX
2550
2551#: builtin/cat-file.c:273
2552msgid "for blob objects, run textconv on object's content"
07432cef 2553msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5
JX
2554
2555#: builtin/cat-file.c:275
2556msgid "show info and content of objects fed from the standard input"
07432cef 2557msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5
JX
2558
2559#: builtin/cat-file.c:278
ef317cd5 2560msgid "show info about objects fed from the standard input"
07432cef 2561msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
2562
2563#: builtin/check-attr.c:11
2564msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 2565msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
2566
2567#: builtin/check-attr.c:12
07432cef
WS
2568msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2569msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
2570
2571#: builtin/check-attr.c:19
2572msgid "report all attributes set on file"
07432cef 2573msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
2574
2575#: builtin/check-attr.c:20
2576msgid "use .gitattributes only from the index"
07432cef 2577msgstr "只使用索引中的 .gitattributes"
ef317cd5
JX
2578
2579#: builtin/check-attr.c:21 builtin/hash-object.c:75
ef317cd5 2580msgid "read file names from stdin"
07432cef 2581msgstr "从标准输入读出文件名"
ef317cd5
JX
2582
2583#: builtin/check-attr.c:23
ef317cd5 2584msgid "input paths are terminated by a null character"
07432cef 2585msgstr "输入路径以null字符终止"
ef317cd5
JX
2586
2587#: builtin/checkout-index.c:126
2588msgid "git checkout-index [options] [--] [<file>...]"
07432cef 2589msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5
JX
2590
2591#: builtin/checkout-index.c:187
2592msgid "check out all files in the index"
07432cef 2593msgstr "检出索引区的所有文件"
ef317cd5
JX
2594
2595#: builtin/checkout-index.c:188
2596msgid "force overwrite of existing files"
07432cef 2597msgstr "强制覆盖现有的文件"
ef317cd5
JX
2598
2599#: builtin/checkout-index.c:190
2600msgid "no warning for existing files and files not in index"
07432cef 2601msgstr "存在或不在索引中的文件都没有警告"
ef317cd5
JX
2602
2603#: builtin/checkout-index.c:192
ef317cd5 2604msgid "don't checkout new files"
07432cef 2605msgstr "不检出新文件"
ef317cd5
JX
2606
2607#: builtin/checkout-index.c:194
ef317cd5 2608msgid "update stat information in the index file"
07432cef 2609msgstr "更新索引中文件的状态信息"
ef317cd5
JX
2610
2611#: builtin/checkout-index.c:200
ef317cd5 2612msgid "read list of paths from the standard input"
07432cef 2613msgstr "从标准输入读取路径列表"
ef317cd5
JX
2614
2615#: builtin/checkout-index.c:202
2616msgid "write the content to temporary files"
07432cef 2617msgstr "将内容写入临时文件"
ef317cd5
JX
2618
2619#: builtin/checkout-index.c:203 builtin/column.c:30
2620msgid "string"
07432cef 2621msgstr "字符串"
ef317cd5
JX
2622
2623#: builtin/checkout-index.c:204
2624msgid "when creating files, prepend <string>"
07432cef 2625msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5
JX
2626
2627#: builtin/checkout-index.c:207
2628msgid "copy out the files from named stage"
07432cef 2629msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
2630
2631#: builtin/checkout.c:25
ef317cd5 2632msgid "git checkout [options] <branch>"
07432cef 2633msgstr "git checkout [选项] <分支>"
ef317cd5
JX
2634
2635#: builtin/checkout.c:26
ef317cd5 2636msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 2637msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5
JX
2638
2639#: builtin/checkout.c:116 builtin/checkout.c:149
c04f5ac3
JX
2640#, c-format
2641msgid "path '%s' does not have our version"
2642msgstr "路径 '%s' 没有我们的版本"
2643
ef317cd5 2644#: builtin/checkout.c:118 builtin/checkout.c:151
c04f5ac3
JX
2645#, c-format
2646msgid "path '%s' does not have their version"
2647msgstr "路径 '%s' 没有他们的版本"
2648
ef317cd5 2649#: builtin/checkout.c:134
c04f5ac3
JX
2650#, c-format
2651msgid "path '%s' does not have all necessary versions"
2652msgstr "路径 '%s' 没有全部必须的版本"
2653
ef317cd5 2654#: builtin/checkout.c:178
c04f5ac3
JX
2655#, c-format
2656msgid "path '%s' does not have necessary versions"
2657msgstr "路径 '%s' 没有必须的版本"
2658
ef317cd5 2659#: builtin/checkout.c:195
c04f5ac3
JX
2660#, c-format
2661msgid "path '%s': cannot merge"
90e6ef53 2662msgstr "path '%s':无法合并"
c04f5ac3 2663
ef317cd5 2664#: builtin/checkout.c:212
c04f5ac3
JX
2665#, c-format
2666msgid "Unable to add merge result for '%s'"
2667msgstr "无法为 '%s' 添加合并结果"
2668
ef317cd5
JX
2669#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2670#: builtin/checkout.c:245
07432cef 2671#, c-format
ef317cd5 2672msgid "'%s' cannot be used with updating paths"
07432cef 2673msgstr "'%s' 不能在更新路径时使用"
ef317cd5
JX
2674
2675#: builtin/checkout.c:248 builtin/checkout.c:251
07432cef 2676#, c-format
ef317cd5 2677msgid "'%s' cannot be used with %s"
07432cef 2678msgstr "'%s' 不能和 %s 同时使用"
ef317cd5
JX
2679
2680#: builtin/checkout.c:254
2681#, c-format
2682msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 2683msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5
JX
2684
2685#: builtin/checkout.c:265 builtin/checkout.c:426
c04f5ac3 2686msgid "corrupt index file"
90e6ef53 2687msgstr "损坏的索引文件"
c04f5ac3 2688
ef317cd5 2689#: builtin/checkout.c:295 builtin/checkout.c:302
c04f5ac3
JX
2690#, c-format
2691msgid "path '%s' is unmerged"
2692msgstr "路径 '%s' 未合并"
2693
ef317cd5 2694#: builtin/checkout.c:448
c04f5ac3 2695msgid "you need to resolve your current index first"
90e6ef53 2696msgstr "您需要先解决当前索引的冲突"
c04f5ac3 2697
ef317cd5 2698#: builtin/checkout.c:569
c04f5ac3
JX
2699#, c-format
2700msgid "Can not do reflog for '%s'\n"
90e6ef53 2701msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 2702
ef317cd5 2703#: builtin/checkout.c:602
c04f5ac3
JX
2704msgid "HEAD is now at"
2705msgstr "HEAD 目前位于"
2706
ef317cd5 2707#: builtin/checkout.c:609
c04f5ac3
JX
2708#, c-format
2709msgid "Reset branch '%s'\n"
2710msgstr "重置分支 '%s'\n"
2711
ef317cd5 2712#: builtin/checkout.c:612
c04f5ac3
JX
2713#, c-format
2714msgid "Already on '%s'\n"
2715msgstr "已经位于 '%s'\n"
2716
ef317cd5 2717#: builtin/checkout.c:616
c04f5ac3
JX
2718#, c-format
2719msgid "Switched to and reset branch '%s'\n"
2720msgstr "切换并重置分支 '%s'\n"
2721
07432cef 2722#: builtin/checkout.c:618 builtin/checkout.c:955
c04f5ac3
JX
2723#, c-format
2724msgid "Switched to a new branch '%s'\n"
2725msgstr "切换到一个新分支 '%s'\n"
2726
ef317cd5 2727#: builtin/checkout.c:620
c04f5ac3
JX
2728#, c-format
2729msgid "Switched to branch '%s'\n"
2730msgstr "切换到分支 '%s'\n"
2731
90e6ef53 2732# 译者:注意保持前导空格
ef317cd5 2733#: builtin/checkout.c:676
c04f5ac3
JX
2734#, c-format
2735msgid " ... and %d more.\n"
90e6ef53 2736msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
2737
2738#. The singular version
ef317cd5 2739#: builtin/checkout.c:682
c04f5ac3
JX
2740#, c-format
2741msgid ""
2742"Warning: you are leaving %d commit behind, not connected to\n"
2743"any of your branches:\n"
2744"\n"
2745"%s\n"
2746msgid_plural ""
2747"Warning: you are leaving %d commits behind, not connected to\n"
2748"any of your branches:\n"
2749"\n"
2750"%s\n"
2751msgstr[0] ""
2752"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2753"\n"
2754"%s\n"
5ae481e0
JX
2755msgstr[1] ""
2756"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2757"\n"
2758"%s\n"
c04f5ac3 2759
ef317cd5 2760#: builtin/checkout.c:700
c04f5ac3
JX
2761#, c-format
2762msgid ""
2763"If you want to keep them by creating a new branch, this may be a good time\n"
2764"to do so with:\n"
2765"\n"
2766" git branch new_branch_name %s\n"
2767"\n"
2768msgstr ""
2769"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2770"如下操作:\n"
2771"\n"
2772" git branch new_branch_name %s\n"
2773"\n"
2774
ef317cd5 2775#: builtin/checkout.c:730
c04f5ac3
JX
2776msgid "internal error in revision walk"
2777msgstr "在版本遍历时遇到内部错误"
2778
ef317cd5 2779#: builtin/checkout.c:734
c04f5ac3
JX
2780msgid "Previous HEAD position was"
2781msgstr "之前的 HEAD 位置是"
2782
ef317cd5 2783#: builtin/checkout.c:761 builtin/checkout.c:950
c04f5ac3 2784msgid "You are on a branch yet to be born"
90e6ef53 2785msgstr "您位于一个尚未初始化的分支"
c04f5ac3
JX
2786
2787#. case (1)
ef317cd5 2788#: builtin/checkout.c:886
c04f5ac3
JX
2789#, c-format
2790msgid "invalid reference: %s"
2791msgstr "无效引用:%s"
2792
2793#. case (1): want a tree
ef317cd5 2794#: builtin/checkout.c:925
c04f5ac3
JX
2795#, c-format
2796msgid "reference is not a tree: %s"
2797msgstr "引用不是一个树:%s"
2798
07432cef 2799#: builtin/checkout.c:964
ef317cd5 2800msgid "paths cannot be used with switching branches"
07432cef 2801msgstr "路径不能和切换分支同时使用"
c04f5ac3 2802
07432cef
WS
2803#: builtin/checkout.c:967 builtin/checkout.c:971
2804#, c-format
ef317cd5 2805msgid "'%s' cannot be used with switching branches"
07432cef 2806msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 2807
07432cef
WS
2808#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2809#: builtin/checkout.c:986
2810#, c-format
ef317cd5 2811msgid "'%s' cannot be used with '%s'"
07432cef 2812msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 2813
07432cef
WS
2814#: builtin/checkout.c:991
2815#, c-format
ef317cd5 2816msgid "Cannot switch branch to a non-commit '%s'"
07432cef 2817msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 2818
07432cef 2819#: builtin/checkout.c:1012 builtin/gc.c:177
ef317cd5 2820msgid "suppress progress reporting"
07432cef 2821msgstr "不显示进度报告"
c04f5ac3 2822
07432cef 2823#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
ef317cd5 2824#: builtin/remote.c:169 builtin/remote.c:171
ef317cd5 2825msgid "branch"
07432cef 2826msgstr "分支"
c04f5ac3 2827
07432cef 2828#: builtin/checkout.c:1014
ef317cd5 2829msgid "create and checkout a new branch"
07432cef 2830msgstr "创建并检出一个新的分支"
c04f5ac3 2831
07432cef 2832#: builtin/checkout.c:1016
ef317cd5 2833msgid "create/reset and checkout a branch"
07432cef 2834msgstr "创建/重置并检出一个分支"
c04f5ac3 2835
07432cef 2836#: builtin/checkout.c:1017
ef317cd5 2837msgid "create reflog for new branch"
07432cef 2838msgstr "为新的分支创建引用日志"
ef317cd5 2839
07432cef 2840#: builtin/checkout.c:1018
ef317cd5 2841msgid "detach the HEAD at named commit"
07432cef 2842msgstr "成为指向该提交的分离头指针"
ef317cd5 2843
07432cef 2844#: builtin/checkout.c:1019
ef317cd5 2845msgid "set upstream info for new branch"
07432cef 2846msgstr "为新的分支设置上游信息"
ef317cd5 2847
07432cef 2848#: builtin/checkout.c:1021
ef317cd5 2849msgid "new branch"
07432cef 2850msgstr "新分支"
ef317cd5 2851
07432cef 2852#: builtin/checkout.c:1021
ef317cd5 2853msgid "new unparented branch"
07432cef 2854msgstr "新的没有父提交的分支"
ef317cd5 2855
07432cef 2856#: builtin/checkout.c:1022
ef317cd5 2857msgid "checkout our version for unmerged files"
07432cef 2858msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 2859
07432cef 2860#: builtin/checkout.c:1024
ef317cd5 2861msgid "checkout their version for unmerged files"
07432cef 2862msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 2863
07432cef 2864#: builtin/checkout.c:1026
ef317cd5 2865msgid "force checkout (throw away local modifications)"
07432cef 2866msgstr "强制检出(丢弃本地修改)"
c04f5ac3 2867
07432cef 2868#: builtin/checkout.c:1027
ef317cd5 2869msgid "perform a 3-way merge with the new branch"
07432cef 2870msgstr "和新的分支执行三路合并"
ef317cd5 2871
07432cef 2872#: builtin/checkout.c:1028 builtin/merge.c:215
ef317cd5 2873msgid "update ignored files (default)"
07432cef 2874msgstr "更新忽略的文件(默认)"
c04f5ac3 2875
07432cef 2876#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
ef317cd5 2877msgid "style"
07432cef 2878msgstr "风格"
ef317cd5 2879
07432cef 2880#: builtin/checkout.c:1030
ef317cd5 2881msgid "conflict style (merge or diff3)"
07432cef 2882msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 2883
07432cef 2884#: builtin/checkout.c:1033
ef317cd5 2885msgid "second guess 'git checkout no-such-branch'"
07432cef 2886msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 2887
07432cef 2888#: builtin/checkout.c:1057
ef317cd5 2889msgid "-b, -B and --orphan are mutually exclusive"
07432cef 2890msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 2891
07432cef 2892#: builtin/checkout.c:1074
ef317cd5
JX
2893msgid "--track needs a branch name"
2894msgstr "--track 需要一个分支名"
2895
07432cef 2896#: builtin/checkout.c:1081
ef317cd5
JX
2897msgid "Missing branch name; try -b"
2898msgstr "缺少分支名;尝试 -b"
2899
07432cef 2900#: builtin/checkout.c:1116
c04f5ac3 2901msgid "invalid path specification"
90e6ef53 2902msgstr "无效的路径规格"
c04f5ac3 2903
07432cef
WS
2904#: builtin/checkout.c:1123
2905#, c-format
c04f5ac3 2906msgid ""
ef317cd5 2907"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
2908"Did you intend to checkout '%s' which can not be resolved as commit?"
2909msgstr ""
07432cef
WS
2910"不能同时更新路径并切换到分支'%s'。\n"
2911"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 2912
07432cef
WS
2913#: builtin/checkout.c:1128
2914#, c-format
ef317cd5 2915msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 2916msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 2917
07432cef 2918#: builtin/checkout.c:1132
c04f5ac3
JX
2919msgid ""
2920"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2921"checking out of the index."
2922msgstr ""
90e6ef53 2923"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 2924
07432cef 2925#: builtin/clean.c:20
ef317cd5 2926msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
07432cef 2927msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 2928
07432cef
WS
2929#: builtin/clean.c:24
2930#, c-format
2931msgid "Removing %s\n"
2932msgstr "正删除 %s\n"
2933
2934#: builtin/clean.c:25
2935#, c-format
2936msgid "Would remove %s\n"
2937msgstr "将删除 %s\n"
2938
2939#: builtin/clean.c:26
2940#, c-format
2941msgid "Skipping repository %s\n"
2942msgstr "忽略版本库 %s\n"
2943
2944#: builtin/clean.c:27
2945#, c-format
2946msgid "Would skip repository %s\n"
2947msgstr "将忽略版本库 %s\n"
2948
2949#: builtin/clean.c:28
2950#, c-format
2951msgid "failed to remove %s"
2952msgstr "无法删除 %s"
2953
2954#: builtin/clean.c:159
ef317cd5 2955msgid "do not print names of files removed"
07432cef 2956msgstr "不打印删除文件的名称"
ef317cd5 2957
07432cef 2958#: builtin/clean.c:161
ef317cd5 2959msgid "force"
07432cef 2960msgstr "强制"
ef317cd5 2961
07432cef 2962#: builtin/clean.c:163
ef317cd5 2963msgid "remove whole directories"
07432cef 2964msgstr "删除整个目录"
ef317cd5 2965
07432cef
WS
2966#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717
2967#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
ef317cd5 2968msgid "pattern"
07432cef 2969msgstr "模式"
ef317cd5 2970
07432cef 2971#: builtin/clean.c:165
ef317cd5 2972msgid "add <pattern> to ignore rules"
07432cef 2973msgstr "添加<模式>到忽略规则"
ef317cd5 2974
07432cef 2975#: builtin/clean.c:166
ef317cd5 2976msgid "remove ignored files, too"
07432cef 2977msgstr "也删除忽略的文件"
ef317cd5 2978
07432cef 2979#: builtin/clean.c:168
ef317cd5 2980msgid "remove only ignored files"
07432cef 2981msgstr "只删除忽略的文件"
c04f5ac3 2982
07432cef 2983#: builtin/clean.c:186
c04f5ac3 2984msgid "-x and -X cannot be used together"
649900bc 2985msgstr "-x 和 -X 不能同时使用"
c04f5ac3 2986
07432cef 2987#: builtin/clean.c:190
c04f5ac3
JX
2988msgid ""
2989"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2990msgstr ""
90e6ef53 2991"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 2992
07432cef 2993#: builtin/clean.c:193
c04f5ac3
JX
2994msgid ""
2995"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2996"clean"
2997msgstr ""
90e6ef53 2998"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 2999
ef317cd5
JX
3000#: builtin/clone.c:36
3001msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3002msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5
JX
3003
3004#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
07432cef 3005#: builtin/push.c:407
ef317cd5 3006msgid "force progress reporting"
07432cef 3007msgstr "强制显示进度报告"
ef317cd5
JX
3008
3009#: builtin/clone.c:66
3010msgid "don't create a checkout"
07432cef 3011msgstr "不创建一个检出"
ef317cd5
JX
3012
3013#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
ef317cd5 3014msgid "create a bare repository"
07432cef 3015msgstr "创建一个裸版本库"
ef317cd5
JX
3016
3017#: builtin/clone.c:72
3018msgid "create a mirror repository (implies bare)"
07432cef 3019msgstr "创建一个镜像版本库(也是裸版本库)"
ef317cd5
JX
3020
3021#: builtin/clone.c:74
3022msgid "to clone from a local repository"
07432cef 3023msgstr "从本地版本库克隆"
ef317cd5
JX
3024
3025#: builtin/clone.c:76
3026msgid "don't use local hardlinks, always copy"
07432cef 3027msgstr "不使用本地硬链接,始终复制"
ef317cd5
JX
3028
3029#: builtin/clone.c:78
ef317cd5 3030msgid "setup as shared repository"
07432cef 3031msgstr "设置为共享版本库"
ef317cd5
JX
3032
3033#: builtin/clone.c:80 builtin/clone.c:82
3034msgid "initialize submodules in the clone"
07432cef 3035msgstr "在克隆时初始化子模组"
ef317cd5
JX
3036
3037#: builtin/clone.c:83 builtin/init-db.c:485
ef317cd5 3038msgid "template-directory"
07432cef 3039msgstr "模板目录"
ef317cd5
JX
3040
3041#: builtin/clone.c:84 builtin/init-db.c:486
3042msgid "directory from which templates will be used"
07432cef 3043msgstr "模板目录将被使用"
ef317cd5
JX
3044
3045#: builtin/clone.c:86
3046msgid "reference repository"
07432cef 3047msgstr "引用版本库"
ef317cd5
JX
3048
3049#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3050msgid "name"
07432cef 3051msgstr "名称"
ef317cd5
JX
3052
3053#: builtin/clone.c:88
3054msgid "use <name> instead of 'origin' to track upstream"
07432cef 3055msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5
JX
3056
3057#: builtin/clone.c:90
3058msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3059msgstr "检出<分支>而不是远程HEAD"
ef317cd5
JX
3060
3061#: builtin/clone.c:92
3062msgid "path to git-upload-pack on the remote"
07432cef 3063msgstr "远程 git-upload-pack 路径"
ef317cd5 3064
07432cef 3065#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
ef317cd5 3066msgid "depth"
07432cef 3067msgstr "深度"
ef317cd5
JX
3068
3069#: builtin/clone.c:94
3070msgid "create a shallow clone of that depth"
07432cef 3071msgstr "创建一个指定深度的浅克隆"
ef317cd5
JX
3072
3073#: builtin/clone.c:96
3074msgid "clone only one branch, HEAD or --branch"
07432cef 3075msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5
JX
3076
3077#: builtin/clone.c:97 builtin/init-db.c:494
3078msgid "gitdir"
07432cef 3079msgstr "git目录"
ef317cd5
JX
3080
3081#: builtin/clone.c:98 builtin/init-db.c:495
3082msgid "separate git dir from working tree"
07432cef 3083msgstr "git目录和工作区分离"
ef317cd5
JX
3084
3085#: builtin/clone.c:99
3086msgid "key=value"
07432cef 3087msgstr "key=value"
ef317cd5
JX
3088
3089#: builtin/clone.c:100
ef317cd5 3090msgid "set config inside the new repository"
07432cef 3091msgstr "在新版本库中设置配置信息"
ef317cd5 3092
7ac1c0ad 3093#: builtin/clone.c:243
c04f5ac3
JX
3094#, c-format
3095msgid "reference repository '%s' is not a local directory."
3096msgstr "引用版本库 '%s' 不是一个本地目录。"
3097
7ac1c0ad 3098#: builtin/clone.c:306
c04f5ac3
JX
3099#, c-format
3100msgid "failed to create directory '%s'"
90e6ef53 3101msgstr "无法创建目录 '%s'"
c04f5ac3 3102
c160d03f 3103#: builtin/clone.c:308 builtin/diff.c:77
c04f5ac3
JX
3104#, c-format
3105msgid "failed to stat '%s'"
90e6ef53 3106msgstr "无法枚举 '%s' 状态"
c04f5ac3 3107
7ac1c0ad 3108#: builtin/clone.c:310
c04f5ac3
JX
3109#, c-format
3110msgid "%s exists and is not a directory"
3111msgstr "%s 存在且不是一个目录"
3112
7ac1c0ad 3113#: builtin/clone.c:324
c04f5ac3
JX
3114#, c-format
3115msgid "failed to stat %s\n"
90e6ef53 3116msgstr "无法枚举 %s 状态\n"
c04f5ac3 3117
07432cef
WS
3118#: builtin/clone.c:341
3119#, c-format
3120msgid "failed to unlink '%s'"
3121msgstr "无法删除 '%s'"
3122
7ac1c0ad 3123#: builtin/clone.c:346
c04f5ac3
JX
3124#, c-format
3125msgid "failed to create link '%s'"
90e6ef53 3126msgstr "无法创建链接 '%s'"
c04f5ac3 3127
7ac1c0ad 3128#: builtin/clone.c:350
c04f5ac3
JX
3129#, c-format
3130msgid "failed to copy file to '%s'"
90e6ef53 3131msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3132
7ac1c0ad 3133#: builtin/clone.c:373
c04f5ac3
JX
3134#, c-format
3135msgid "done.\n"
3136msgstr "完成。\n"
3137
23ff3338 3138#: builtin/clone.c:443
c04f5ac3
JX
3139#, c-format
3140msgid "Could not find remote branch %s to clone."
90e6ef53 3141msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3142
23ff3338 3143#: builtin/clone.c:552
c04f5ac3
JX
3144msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3145msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3146
07432cef 3147#: builtin/clone.c:690
c04f5ac3
JX
3148msgid "Too many arguments."
3149msgstr "太多参数。"
3150
07432cef 3151#: builtin/clone.c:694
c04f5ac3 3152msgid "You must specify a repository to clone."
90e6ef53 3153msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 3154
07432cef 3155#: builtin/clone.c:705
c04f5ac3
JX
3156#, c-format
3157msgid "--bare and --origin %s options are incompatible."
3158msgstr "--bare 和 --origin %s 选项不兼容。"
3159
07432cef
WS
3160#: builtin/clone.c:708
3161msgid "--bare and --separate-git-dir are incompatible."
3162msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3163
3164#: builtin/clone.c:721
c04f5ac3
JX
3165#, c-format
3166msgid "repository '%s' does not exist"
3167msgstr "版本库 '%s' 不存在"
3168
07432cef 3169#: builtin/clone.c:726
c04f5ac3
JX
3170msgid "--depth is ignored in local clones; use file:// instead."
3171msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3172
07432cef 3173#: builtin/clone.c:736
c04f5ac3
JX
3174#, c-format
3175msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 3176msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 3177
07432cef 3178#: builtin/clone.c:746
c04f5ac3
JX
3179#, c-format
3180msgid "working tree '%s' already exists."
3181msgstr "工作区 '%s' 已经存在。"
3182
07432cef 3183#: builtin/clone.c:759 builtin/clone.c:773
c04f5ac3
JX
3184#, c-format
3185msgid "could not create leading directories of '%s'"
90e6ef53 3186msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 3187
07432cef 3188#: builtin/clone.c:762
c04f5ac3
JX
3189#, c-format
3190msgid "could not create work tree dir '%s'."
90e6ef53 3191msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 3192
07432cef 3193#: builtin/clone.c:783
c04f5ac3
JX
3194#, c-format
3195msgid "Cloning into bare repository '%s'...\n"
3196msgstr "克隆到裸版本库 '%s'...\n"
3197
07432cef 3198#: builtin/clone.c:785
c04f5ac3
JX
3199#, c-format
3200msgid "Cloning into '%s'...\n"
3201msgstr "正克隆到 '%s'...\n"
3202
07432cef 3203#: builtin/clone.c:827
c04f5ac3
JX
3204#, c-format
3205msgid "Don't know how to clone %s"
3206msgstr "不知道如何克隆 %s"
3207
07432cef 3208#: builtin/clone.c:876
c04f5ac3
JX
3209#, c-format
3210msgid "Remote branch %s not found in upstream %s"
3211msgstr "远程分支 %s 在上游 %s 未发现"
3212
07432cef 3213#: builtin/clone.c:883
c04f5ac3
JX
3214msgid "You appear to have cloned an empty repository."
3215msgstr "您似乎克隆了一个空版本库。"
3216
ef317cd5
JX
3217#: builtin/column.c:9
3218msgid "git column [options]"
07432cef 3219msgstr "git column [选项]"
ef317cd5
JX
3220
3221#: builtin/column.c:26
3222msgid "lookup config vars"
07432cef 3223msgstr "查找配置变量"
ef317cd5
JX
3224
3225#: builtin/column.c:27 builtin/column.c:28
ef317cd5 3226msgid "layout to use"
07432cef 3227msgstr "要使用的布局"
ef317cd5
JX
3228
3229#: builtin/column.c:29
3230msgid "Maximum width"
07432cef 3231msgstr "最大宽度"
ef317cd5
JX
3232
3233#: builtin/column.c:30
3234msgid "Padding space on left border"
07432cef 3235msgstr "左边框的填充空间"
ef317cd5
JX
3236
3237#: builtin/column.c:31
3238msgid "Padding space on right border"
07432cef 3239msgstr "右边框的填充空间"
ef317cd5
JX
3240
3241#: builtin/column.c:32
3242msgid "Padding space between columns"
07432cef 3243msgstr "两列之间的填充空间"
ef317cd5 3244
8ada9598
JX
3245#: builtin/column.c:51
3246msgid "--command must be the first argument"
81809b99 3247msgstr "--command 必须是第一个参数"
8ada9598 3248
07432cef 3249#: builtin/commit.c:34
ef317cd5 3250msgid "git commit [options] [--] <filepattern>..."
07432cef 3251msgstr "git commit [选项] [--] <文件模式>..."
ef317cd5 3252
07432cef 3253#: builtin/commit.c:39
ef317cd5 3254msgid "git status [options] [--] <filepattern>..."
07432cef 3255msgstr "git status [选项] [--] <文件模式>..."
ef317cd5 3256
07432cef 3257#: builtin/commit.c:44
c04f5ac3
JX
3258msgid ""
3259"Your name and email address were configured automatically based\n"
3260"on your username and hostname. Please check that they are accurate.\n"
3261"You can suppress this message by setting them explicitly:\n"
3262"\n"
3263" git config --global user.name \"Your Name\"\n"
3264" git config --global user.email you@example.com\n"
3265"\n"
3266"After doing this, you may fix the identity used for this commit with:\n"
3267"\n"
3268" git commit --amend --reset-author\n"
3269msgstr ""
90e6ef53
JX
3270"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3271"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
3272"\n"
3273" git config --global user.name \"Your Name\"\n"
3274" git config --global user.email you@example.com\n"
3275"\n"
90e6ef53 3276"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
3277"\n"
3278" git commit --amend --reset-author\n"
3279
07432cef 3280#: builtin/commit.c:56
c04f5ac3
JX
3281msgid ""
3282"You asked to amend the most recent commit, but doing so would make\n"
3283"it empty. You can repeat your command with --allow-empty, or you can\n"
3284"remove the commit entirely with \"git reset HEAD^\".\n"
3285msgstr ""
1b150dc9
T
3286"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3287"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 3288
07432cef 3289#: builtin/commit.c:61
c04f5ac3
JX
3290msgid ""
3291"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3292"If you wish to commit it anyway, use:\n"
3293"\n"
3294" git commit --allow-empty\n"
3295"\n"
3296"Otherwise, please use 'git reset'\n"
3297msgstr ""
a9ce4543
T
3298"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3299"也要提交,使用命令:\n"
c04f5ac3
JX
3300"\n"
3301" git commit --allow-empty\n"
3302"\n"
a9ce4543 3303"否则,请使用命令 'git reset'\n"
c04f5ac3 3304
07432cef 3305#: builtin/commit.c:258
c04f5ac3 3306msgid "failed to unpack HEAD tree object"
90e6ef53 3307msgstr "无法解包 HEAD 树对象"
c04f5ac3 3308
07432cef 3309#: builtin/commit.c:300
c04f5ac3 3310msgid "unable to create temporary index"
90e6ef53 3311msgstr "不能创建临时索引"
c04f5ac3 3312
07432cef 3313#: builtin/commit.c:306
c04f5ac3
JX
3314msgid "interactive add failed"
3315msgstr "交互式添加失败"
3316
07432cef 3317#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
c04f5ac3 3318msgid "unable to write new_index file"
90e6ef53 3319msgstr "无法写 new_index 文件"
c04f5ac3 3320
07432cef 3321#: builtin/commit.c:391
8ada9598 3322msgid "cannot do a partial commit during a merge."
81809b99 3323msgstr "在合并过程中不能做部分提交。"
c04f5ac3 3324
07432cef 3325#: builtin/commit.c:393
8ada9598 3326msgid "cannot do a partial commit during a cherry-pick."
81809b99 3327msgstr "在拣选过程中不能做部分提交。"
8ada9598 3328
07432cef 3329#: builtin/commit.c:403
c04f5ac3 3330msgid "cannot read the index"
90e6ef53 3331msgstr "无法读取索引"
c04f5ac3 3332
07432cef 3333#: builtin/commit.c:423
c04f5ac3 3334msgid "unable to write temporary index file"
90e6ef53 3335msgstr "无法写临时索引文件"
c04f5ac3 3336
07432cef 3337#: builtin/commit.c:511 builtin/commit.c:517
c04f5ac3
JX
3338#, c-format
3339msgid "invalid commit: %s"
3340msgstr "无效的提交:%s"
3341
07432cef 3342#: builtin/commit.c:540
c04f5ac3
JX
3343msgid "malformed --author parameter"
3344msgstr "非法的 --author 参数"
3345
07432cef 3346#: builtin/commit.c:560
c04f5ac3
JX
3347#, c-format
3348msgid "Malformed ident string: '%s'"
90e6ef53 3349msgstr "非法的身份字符串:'%s'"
c04f5ac3 3350
07432cef 3351#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
c04f5ac3
JX
3352#, c-format
3353msgid "could not lookup commit %s"
3354msgstr "不能查询提交 %s"
3355
07432cef 3356#: builtin/commit.c:610 builtin/shortlog.c:272
c04f5ac3
JX
3357#, c-format
3358msgid "(reading log message from standard input)\n"
90e6ef53 3359msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 3360
07432cef 3361#: builtin/commit.c:612
c04f5ac3 3362msgid "could not read log from standard input"
90e6ef53 3363msgstr "不能从标准输入中读取日志信息"
c04f5ac3 3364
07432cef 3365#: builtin/commit.c:616
c04f5ac3
JX
3366#, c-format
3367msgid "could not read log file '%s'"
90e6ef53 3368msgstr "不能读取日志文件 '%s'"
c04f5ac3 3369
07432cef 3370#: builtin/commit.c:622
c04f5ac3
JX
3371msgid "commit has empty message"
3372msgstr "提交说明为空"
3373
07432cef 3374#: builtin/commit.c:638
c04f5ac3 3375msgid "could not read MERGE_MSG"
90e6ef53 3376msgstr "不能读取 MERGE_MSG"
c04f5ac3 3377
07432cef 3378#: builtin/commit.c:642
c04f5ac3 3379msgid "could not read SQUASH_MSG"
90e6ef53 3380msgstr "不能读取 SQUASH_MSG"
c04f5ac3 3381
07432cef 3382#: builtin/commit.c:646
c04f5ac3
JX
3383#, c-format
3384msgid "could not read '%s'"
90e6ef53 3385msgstr "不能读取 '%s'"
c04f5ac3 3386
07432cef 3387#: builtin/commit.c:707
c04f5ac3 3388msgid "could not write commit template"
90e6ef53 3389msgstr "不能写提交模版"
c04f5ac3 3390
07432cef 3391#: builtin/commit.c:718
81809b99 3392#, c-format
c04f5ac3
JX
3393msgid ""
3394"\n"
8ada9598 3395"It looks like you may be committing a merge.\n"
c04f5ac3
JX
3396"If this is not correct, please remove the file\n"
3397"\t%s\n"
3398"and try again.\n"
3399msgstr ""
3400"\n"
649900bc 3401"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
3402"\t%s\n"
3403"然后重试。\n"
3404
07432cef 3405#: builtin/commit.c:723
81809b99 3406#, c-format
8ada9598
JX
3407msgid ""
3408"\n"
3409"It looks like you may be committing a cherry-pick.\n"
3410"If this is not correct, please remove the file\n"
3411"\t%s\n"
3412"and try again.\n"
3413msgstr ""
3414"\n"
649900bc 3415"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
3416"\t%s\n"
3417"然后重试。\n"
c04f5ac3 3418
07432cef 3419#: builtin/commit.c:735
c04f5ac3 3420msgid ""
8ada9598 3421"Please enter the commit message for your changes. Lines starting\n"
c04f5ac3
JX
3422"with '#' will be ignored, and an empty message aborts the commit.\n"
3423msgstr ""
81809b99
JX
3424"请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
3425"说明将会终止提交。\n"
c04f5ac3 3426
07432cef 3427#: builtin/commit.c:740
c04f5ac3 3428msgid ""
8ada9598 3429"Please enter the commit message for your changes. Lines starting\n"
c04f5ac3
JX
3430"with '#' will be kept; you may remove them yourself if you want to.\n"
3431"An empty message aborts the commit.\n"
3432msgstr ""
81809b99
JX
3433"请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
3434"如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
c04f5ac3 3435
90e6ef53 3436# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 3437#: builtin/commit.c:753
c04f5ac3
JX
3438#, c-format
3439msgid "%sAuthor: %s"
3440msgstr "%s作者: %s"
3441
90e6ef53 3442# 译者:为保证在输出中对齐,注意调整句中空格!
07432cef 3443#: builtin/commit.c:760
c04f5ac3
JX
3444#, c-format
3445msgid "%sCommitter: %s"
3446msgstr "%s提交者: %s"
3447
07432cef 3448#: builtin/commit.c:780
c04f5ac3 3449msgid "Cannot read index"
90e6ef53 3450msgstr "无法读取索引"
c04f5ac3 3451
07432cef 3452#: builtin/commit.c:817
c04f5ac3
JX
3453msgid "Error building trees"
3454msgstr "无法创建树对象"
3455
07432cef 3456#: builtin/commit.c:832 builtin/tag.c:361
c04f5ac3
JX
3457#, c-format
3458msgid "Please supply the message using either -m or -F option.\n"
07432cef 3459msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 3460
07432cef 3461#: builtin/commit.c:929
c04f5ac3
JX
3462#, c-format
3463msgid "No existing author found with '%s'"
3464msgstr "没有找到匹配 '%s' 的作者"
3465
07432cef 3466#: builtin/commit.c:944 builtin/commit.c:1148
c04f5ac3
JX
3467#, c-format
3468msgid "Invalid untracked files mode '%s'"
90e6ef53 3469msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 3470
07432cef 3471#: builtin/commit.c:984
c04f5ac3
JX
3472msgid "Using both --reset-author and --author does not make sense"
3473msgstr "同时使用 --reset-author 和 --author 没有意义"
3474
07432cef 3475#: builtin/commit.c:995
c04f5ac3 3476msgid "You have nothing to amend."
90e6ef53 3477msgstr "您没有可修补的提交。"
c04f5ac3 3478
07432cef 3479#: builtin/commit.c:998
8ada9598 3480msgid "You are in the middle of a merge -- cannot amend."
81809b99 3481msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 3482
07432cef 3483#: builtin/commit.c:1000
8ada9598 3484msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 3485msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 3486
07432cef 3487#: builtin/commit.c:1003
c04f5ac3 3488msgid "Options --squash and --fixup cannot be used together"
649900bc 3489msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 3490
07432cef 3491#: builtin/commit.c:1013
c04f5ac3
JX
3492msgid "Only one of -c/-C/-F/--fixup can be used."
3493msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3494
07432cef 3495#: builtin/commit.c:1015
c04f5ac3 3496msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 3497msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 3498
07432cef 3499#: builtin/commit.c:1023
c04f5ac3 3500msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 3501msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 3502
07432cef 3503#: builtin/commit.c:1040
c04f5ac3
JX
3504msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3505msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3506
07432cef 3507#: builtin/commit.c:1042
c04f5ac3
JX
3508msgid "No paths with --include/--only does not make sense."
3509msgstr "参数 --include/--only 不跟路径没有意义。"
3510
07432cef 3511#: builtin/commit.c:1044
c04f5ac3 3512msgid "Clever... amending the last one with dirty index."
90e6ef53 3513msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 3514
07432cef 3515#: builtin/commit.c:1046
c04f5ac3 3516msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 3517msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 3518
07432cef 3519#: builtin/commit.c:1056 builtin/tag.c:577
c04f5ac3
JX
3520#, c-format
3521msgid "Invalid cleanup mode %s"
3522msgstr "无效的清理模式 %s"
3523
07432cef 3524#: builtin/commit.c:1061
c04f5ac3 3525msgid "Paths with -a does not make sense."
649900bc 3526msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 3527
07432cef
WS
3528#: builtin/commit.c:1067 builtin/commit.c:1202
3529msgid "--long and -z are incompatible"
3530msgstr "--long 和 -z 选项不兼容"
3531
3532#: builtin/commit.c:1162 builtin/commit.c:1400
ef317cd5 3533msgid "show status concisely"
07432cef 3534msgstr "以简洁的格式显示状态"
ef317cd5 3535
07432cef 3536#: builtin/commit.c:1164 builtin/commit.c:1402
ef317cd5 3537msgid "show branch information"
07432cef 3538msgstr "显示分支信息"
ef317cd5 3539
07432cef 3540#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397
ef317cd5 3541msgid "machine-readable output"
07432cef
WS
3542msgstr "机器可读的输出"
3543
3544#: builtin/commit.c:1169 builtin/commit.c:1406
3545msgid "show status in long format (default)"
3546msgstr "以长格式显示状态(默认)"
ef317cd5 3547
07432cef 3548#: builtin/commit.c:1172 builtin/commit.c:1409
ef317cd5 3549msgid "terminate entries with NUL"
07432cef 3550msgstr "条目以NUL字符结尾"
ef317cd5 3551
07432cef
WS
3552#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647
3553#: builtin/fast-export.c:650 builtin/tag.c:461
ef317cd5 3554msgid "mode"
07432cef 3555msgstr "模式"
ef317cd5 3556
07432cef 3557#: builtin/commit.c:1175 builtin/commit.c:1412
ef317cd5 3558msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 3559msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 3560
07432cef 3561#: builtin/commit.c:1178
ef317cd5 3562msgid "show ignored files"
07432cef 3563msgstr "显示忽略的文件"
ef317cd5 3564
07432cef 3565#: builtin/commit.c:1179 parse-options.h:151
ef317cd5
JX
3566msgid "when"
3567msgstr "何时"
3568
07432cef 3569#: builtin/commit.c:1180
ef317cd5
JX
3570msgid ""
3571"ignore changes to submodules, optional when: all, dirty, untracked. "
3572"(Default: all)"
3573msgstr ""
07432cef 3574"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 3575
07432cef 3576#: builtin/commit.c:1182
ef317cd5 3577msgid "list untracked files in columns"
07432cef 3578msgstr "以列的方式显示未跟踪的文件"
ef317cd5 3579
07432cef 3580#: builtin/commit.c:1256
c04f5ac3
JX
3581msgid "couldn't look up newly created commit"
3582msgstr "无法找到新创建的提交"
3583
07432cef 3584#: builtin/commit.c:1258
c04f5ac3 3585msgid "could not parse newly created commit"
90e6ef53 3586msgstr "不能解析新创建的提交"
c04f5ac3 3587
07432cef 3588#: builtin/commit.c:1299
c04f5ac3
JX
3589msgid "detached HEAD"
3590msgstr "分离头指针"
3591
7e238ab7 3592# 译者:中文字符串拼接,可删除前导空格
07432cef 3593#: builtin/commit.c:1301
c04f5ac3 3594msgid " (root-commit)"
7e238ab7 3595msgstr "(根提交)"
c04f5ac3 3596
07432cef 3597#: builtin/commit.c:1370
ef317cd5 3598msgid "suppress summary after successful commit"
07432cef 3599msgstr "提交成功后不显示概述信息"
c04f5ac3 3600
07432cef 3601#: builtin/commit.c:1371
ef317cd5 3602msgid "show diff in commit message template"
07432cef 3603msgstr "在提交说明模板里显示差异"
c04f5ac3 3604
07432cef 3605#: builtin/commit.c:1373
ef317cd5 3606msgid "Commit message options"
07432cef 3607msgstr "提交说明选项"
c04f5ac3 3608
07432cef 3609#: builtin/commit.c:1374 builtin/tag.c:459
ef317cd5 3610msgid "read message from file"
07432cef 3611msgstr "从文件中读取提交说明"
c04f5ac3 3612
07432cef 3613#: builtin/commit.c:1375
ef317cd5 3614msgid "author"
07432cef 3615msgstr "作者"
c04f5ac3 3616
07432cef 3617#: builtin/commit.c:1375
ef317cd5 3618msgid "override author for commit"
07432cef 3619msgstr "提交时覆盖作者"
73a60cd2 3620
07432cef 3621#: builtin/commit.c:1376 builtin/gc.c:178
ef317cd5 3622msgid "date"
07432cef 3623msgstr "日期"
c04f5ac3 3624
07432cef 3625#: builtin/commit.c:1376
ef317cd5 3626msgid "override date for commit"
07432cef 3627msgstr "提交时覆盖日期"
c04f5ac3 3628
07432cef
WS
3629#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537
3630#: builtin/notes.c:694 builtin/tag.c:457
ef317cd5 3631msgid "message"
07432cef 3632msgstr "说明"
c04f5ac3 3633
07432cef 3634#: builtin/commit.c:1377
ef317cd5 3635msgid "commit message"
07432cef 3636msgstr "提交说明"
ef317cd5 3637
07432cef 3638#: builtin/commit.c:1378
ef317cd5 3639msgid "reuse and edit message from specified commit"
07432cef 3640msgstr "重用并编辑指定提交的提交说明"
ef317cd5 3641
07432cef 3642#: builtin/commit.c:1379
ef317cd5 3643msgid "reuse message from specified commit"
07432cef 3644msgstr "重用指定提交的提交说明"
ef317cd5 3645
07432cef 3646#: builtin/commit.c:1380
ef317cd5 3647msgid "use autosquash formatted message to fixup specified commit"
07432cef 3648msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 3649
07432cef 3650#: builtin/commit.c:1381
ef317cd5 3651msgid "use autosquash formatted message to squash specified commit"
07432cef 3652msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 3653
07432cef 3654#: builtin/commit.c:1382
ef317cd5 3655msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 3656msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 3657
07432cef 3658#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109
ef317cd5 3659msgid "add Signed-off-by:"
07432cef 3660msgstr "添加 Signed-off-by: 签名"
ef317cd5 3661
07432cef 3662#: builtin/commit.c:1384
ef317cd5 3663msgid "use specified template file"
07432cef 3664msgstr "使用指定的模板文件"
ef317cd5 3665
07432cef 3666#: builtin/commit.c:1385
ef317cd5 3667msgid "force edit of commit"
07432cef 3668msgstr "强制编辑提交"
ef317cd5 3669
07432cef
WS
3670# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
3671#: builtin/commit.c:1386
ef317cd5 3672msgid "default"
07432cef 3673msgstr "default"
ef317cd5 3674
07432cef 3675#: builtin/commit.c:1386 builtin/tag.c:462
ef317cd5 3676msgid "how to strip spaces and #comments from message"
07432cef 3677msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 3678
07432cef 3679#: builtin/commit.c:1387
ef317cd5 3680msgid "include status in commit message template"
07432cef 3681msgstr "在提交说明模板里包含状态信息"
ef317cd5 3682
07432cef 3683#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463
ef317cd5 3684msgid "key id"
07432cef 3685msgstr "key id"
ef317cd5 3686
07432cef 3687#: builtin/commit.c:1389 builtin/merge.c:214
ef317cd5 3688msgid "GPG sign commit"
07432cef 3689msgstr "GPG 提交签名"
ef317cd5
JX
3690
3691#. end commit message options
07432cef 3692#: builtin/commit.c:1392
ef317cd5 3693msgid "Commit contents options"
07432cef 3694msgstr "提交内容选项"
ef317cd5 3695
07432cef 3696#: builtin/commit.c:1393
ef317cd5 3697msgid "commit all changed files"
07432cef 3698msgstr "提交所有改动的文件"
ef317cd5 3699
07432cef 3700#: builtin/commit.c:1394
ef317cd5 3701msgid "add specified files to index for commit"
07432cef 3702msgstr "添加指定的文件到索引区等待提交"
ef317cd5 3703
07432cef 3704#: builtin/commit.c:1395
ef317cd5 3705msgid "interactively add files"
07432cef 3706msgstr "交互式添加文件"
ef317cd5 3707
07432cef 3708#: builtin/commit.c:1396
ef317cd5 3709msgid "interactively add changes"
07432cef 3710msgstr "交互式添加变更"
ef317cd5 3711
07432cef 3712#: builtin/commit.c:1397
ef317cd5 3713msgid "commit only specified files"
07432cef 3714msgstr "只提交指定的文件"
ef317cd5 3715
07432cef 3716#: builtin/commit.c:1398
ef317cd5 3717msgid "bypass pre-commit hook"
07432cef 3718msgstr "绕过 pre-commit 钩子"
ef317cd5 3719
07432cef 3720#: builtin/commit.c:1399
ef317cd5 3721msgid "show what would be committed"
07432cef 3722msgstr "显示将要提交的内容"
ef317cd5 3723
07432cef 3724#: builtin/commit.c:1410
ef317cd5 3725msgid "amend previous commit"
07432cef 3726msgstr "修改先前的提交"
ef317cd5 3727
07432cef 3728#: builtin/commit.c:1411
ef317cd5 3729msgid "bypass post-rewrite hook"
07432cef 3730msgstr "绕过 post-rewrite 钩子"
ef317cd5 3731
07432cef 3732#: builtin/commit.c:1416
ef317cd5 3733msgid "ok to record an empty change"
07432cef 3734msgstr "允许一个空提交"
ef317cd5 3735
07432cef 3736#: builtin/commit.c:1419
ef317cd5 3737msgid "ok to record a change with an empty message"
07432cef 3738msgstr "允许空的提交说明"
ef317cd5 3739
07432cef 3740#: builtin/commit.c:1451
c04f5ac3 3741msgid "could not parse HEAD commit"
90e6ef53 3742msgstr "不能解析 HEAD 提交"
c04f5ac3 3743
07432cef 3744#: builtin/commit.c:1489 builtin/merge.c:508
c04f5ac3
JX
3745#, c-format
3746msgid "could not open '%s' for reading"
90e6ef53 3747msgstr "不能为读入打开 '%s'"
c04f5ac3 3748
07432cef 3749#: builtin/commit.c:1496
c04f5ac3
JX
3750#, c-format
3751msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 3752msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 3753
07432cef 3754#: builtin/commit.c:1503
c04f5ac3 3755msgid "could not read MERGE_MODE"
90e6ef53 3756msgstr "不能读取 MERGE_MODE"
c04f5ac3 3757
07432cef 3758#: builtin/commit.c:1522
c04f5ac3
JX
3759#, c-format
3760msgid "could not read commit message: %s"
90e6ef53 3761msgstr "不能读取提交说明:%s"
c04f5ac3 3762
07432cef 3763#: builtin/commit.c:1536
73a60cd2
JX
3764#, c-format
3765msgid "Aborting commit; you did not edit the message.\n"
3766msgstr "终止提交;您未更改来自模版的提交说明。\n"
3767
07432cef 3768#: builtin/commit.c:1541
c04f5ac3
JX
3769#, c-format
3770msgid "Aborting commit due to empty commit message.\n"
3771msgstr "终止提交因为提交说明为空。\n"
3772
07432cef 3773#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858
c04f5ac3 3774msgid "failed to write commit object"
90e6ef53 3775msgstr "无法写提交对象"
c04f5ac3 3776
07432cef 3777#: builtin/commit.c:1577
c04f5ac3
JX
3778msgid "cannot lock HEAD ref"
3779msgstr "无法锁定 HEAD 引用"
3780
07432cef 3781#: builtin/commit.c:1581
c04f5ac3
JX
3782msgid "cannot update HEAD ref"
3783msgstr "无法更新 HEAD 引用"
3784
07432cef 3785#: builtin/commit.c:1592
c04f5ac3
JX
3786msgid ""
3787"Repository has been updated, but unable to write\n"
3788"new_index file. Check that disk is not full or quota is\n"
3789"not exceeded, and then \"git reset HEAD\" to recover."
3790msgstr ""
90e6ef53
JX
3791"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
3792"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 3793
ef317cd5
JX
3794#: builtin/config.c:7
3795msgid "git config [options]"
07432cef 3796msgstr "git config [选项]"
ef317cd5 3797
07432cef 3798#: builtin/config.c:51
ef317cd5 3799msgid "Config file location"
07432cef 3800msgstr "配置文件位置"
ef317cd5 3801
07432cef 3802#: builtin/config.c:52
ef317cd5 3803msgid "use global config file"
07432cef 3804msgstr "使用全局配置文件"
ef317cd5 3805
07432cef 3806#: builtin/config.c:53
ef317cd5 3807msgid "use system config file"
07432cef 3808msgstr "使用系统级配置文件"
ef317cd5 3809
07432cef 3810#: builtin/config.c:54
ef317cd5 3811msgid "use repository config file"
07432cef 3812msgstr "使用版本库级配置文件"
ef317cd5 3813
07432cef 3814#: builtin/config.c:55
ef317cd5 3815msgid "use given config file"
07432cef 3816msgstr "使用指定的配置文件"
ef317cd5 3817
07432cef 3818#: builtin/config.c:56
ef317cd5 3819msgid "Action"
07432cef 3820msgstr "操作"
ef317cd5 3821
07432cef 3822#: builtin/config.c:57
ef317cd5 3823msgid "get value: name [value-regex]"
07432cef 3824msgstr "获取值:name [value-regex]"
ef317cd5 3825
07432cef 3826#: builtin/config.c:58
ef317cd5 3827msgid "get all values: key [value-regex]"
07432cef 3828msgstr "获得所有的值:key [value-regex]"
ef317cd5 3829
07432cef 3830#: builtin/config.c:59
ef317cd5 3831msgid "get values for regexp: name-regex [value-regex]"
07432cef 3832msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 3833
07432cef 3834#: builtin/config.c:60
ef317cd5 3835msgid "replace all matching variables: name value [value_regex]"
07432cef 3836msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 3837
07432cef 3838#: builtin/config.c:61
ef317cd5 3839msgid "add a new variable: name value"
07432cef 3840msgstr "添加一个新的变量:name value"
ef317cd5 3841
07432cef 3842#: builtin/config.c:62
ef317cd5 3843msgid "remove a variable: name [value-regex]"
07432cef 3844msgstr "删除一个变量:name [value-regex]"
ef317cd5 3845
07432cef 3846#: builtin/config.c:63
ef317cd5 3847msgid "remove all matches: name [value-regex]"
07432cef 3848msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 3849
07432cef 3850#: builtin/config.c:64
ef317cd5 3851msgid "rename section: old-name new-name"
07432cef 3852msgstr "重命名小节:old-name new-name"
ef317cd5 3853
07432cef 3854#: builtin/config.c:65
ef317cd5 3855msgid "remove a section: name"
07432cef 3856msgstr "删除一个小节:name"
ef317cd5 3857
07432cef 3858#: builtin/config.c:66
ef317cd5 3859msgid "list all"
07432cef 3860msgstr "列出所有"
ef317cd5 3861
07432cef 3862#: builtin/config.c:67
ef317cd5 3863msgid "open an editor"
07432cef 3864msgstr "打开一个编辑器"
ef317cd5 3865
07432cef 3866#: builtin/config.c:68 builtin/config.c:69
ef317cd5 3867msgid "slot"
07432cef 3868msgstr "slot"
ef317cd5 3869
07432cef 3870#: builtin/config.c:68
ef317cd5 3871msgid "find the color configured: [default]"
07432cef 3872msgstr "找到配置的颜色:[默认]"
ef317cd5 3873
07432cef 3874#: builtin/config.c:69
ef317cd5 3875msgid "find the color setting: [stdout-is-tty]"
07432cef 3876msgstr "找到颜色设置:[stdout-is-tty]"
ef317cd5 3877
07432cef 3878#: builtin/config.c:70
ef317cd5 3879msgid "Type"
07432cef 3880msgstr "类型"
ef317cd5 3881
07432cef 3882#: builtin/config.c:71
ef317cd5 3883msgid "value is \"true\" or \"false\""
07432cef 3884msgstr "值是 \"true\" 或 \"false\""
ef317cd5 3885
07432cef 3886#: builtin/config.c:72
ef317cd5 3887msgid "value is decimal number"
07432cef 3888msgstr "值是十进制数"
ef317cd5 3889
07432cef 3890#: builtin/config.c:73
ef317cd5 3891msgid "value is --bool or --int"
07432cef 3892msgstr "值是 --bool or --int"
ef317cd5 3893
07432cef 3894#: builtin/config.c:74
ef317cd5 3895msgid "value is a path (file or directory name)"
07432cef 3896msgstr "值是一个路径(文件或目录名)"
ef317cd5 3897
07432cef 3898#: builtin/config.c:75
ef317cd5 3899msgid "Other"
07432cef 3900msgstr "其它"
ef317cd5 3901
07432cef 3902#: builtin/config.c:76
ef317cd5 3903msgid "terminate values with NUL byte"
07432cef 3904msgstr "终止值是NUL字节"
ef317cd5 3905
07432cef 3906#: builtin/config.c:77
ef317cd5 3907msgid "respect include directives on lookup"
07432cef 3908msgstr "查询时参照 include 指令递归查找"
ef317cd5
JX
3909
3910#: builtin/count-objects.c:69
3911msgid "git count-objects [-v]"
07432cef 3912msgstr "git count-objects [-v]"
ef317cd5
JX
3913
3914#: builtin/describe.c:15
3915msgid "git describe [options] <committish>*"
07432cef 3916msgstr "git describe [选项] <提交号>*"
ef317cd5
JX
3917
3918#: builtin/describe.c:16
3919msgid "git describe [options] --dirty"
07432cef 3920msgstr "git describe [选项] --dirty"
ef317cd5 3921
c04f5ac3
JX
3922#: builtin/describe.c:234
3923#, c-format
3924msgid "annotated tag %s not available"
3925msgstr "注释 tag %s 无效"
3926
3927#: builtin/describe.c:238
3928#, c-format
3929msgid "annotated tag %s has no embedded name"
3930msgstr "注释 tag %s 没有嵌入名称"
3931
3932#: builtin/describe.c:240
3933#, c-format
3934msgid "tag '%s' is really '%s' here"
90e6ef53 3935msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3
JX
3936
3937#: builtin/describe.c:267
3938#, c-format
3939msgid "Not a valid object name %s"
3940msgstr "不是一个有效的对象名 %s"
3941
3942#: builtin/describe.c:270
3943#, c-format
3944msgid "%s is not a valid '%s' object"
3945msgstr "%s 不是一个有效的 '%s' 对象"
3946
3947#: builtin/describe.c:287
3948#, c-format
3949msgid "no tag exactly matches '%s'"
3950msgstr "没有 tag 准确匹配 '%s'"
3951
3952#: builtin/describe.c:289
3953#, c-format
3954msgid "searching to describe %s\n"
3955msgstr "搜索描述 %s\n"
3956
3957#: builtin/describe.c:329
3958#, c-format
3959msgid "finished search at %s\n"
3960msgstr "完成搜索 %s\n"
3961
3962#: builtin/describe.c:353
3963#, c-format
3964msgid ""
3965"No annotated tags can describe '%s'.\n"
3966"However, there were unannotated tags: try --tags."
3967msgstr ""
3968"没有注释 tag 能描述 '%s'。\n"
3969"然而,有非注释 tag:尝试 --tags。"
3970
3971#: builtin/describe.c:357
3972#, c-format
3973msgid ""
3974"No tags can describe '%s'.\n"
3975"Try --always, or create some tags."
3976msgstr ""
3977"没有注释 tag 能描述 '%s'。\n"
90e6ef53 3978"尝试 --always,或者创建一些 tag。"
c04f5ac3
JX
3979
3980#: builtin/describe.c:378
3981#, c-format
3982msgid "traversed %lu commits\n"
3983msgstr "已遍历 %lu 个提交\n"
3984
3985#: builtin/describe.c:381
3986#, c-format
3987msgid ""
3988"more than %i tags found; listed %i most recent\n"
3989"gave up search at %s\n"
3990msgstr ""
90e6ef53
JX
3991"发现多于 %i 个 tag,列出最近的 %i 个\n"
3992"在 %s 放弃搜索\n"
c04f5ac3 3993
ef317cd5
JX
3994#: builtin/describe.c:403
3995msgid "find the tag that comes after the commit"
07432cef 3996msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5
JX
3997
3998#: builtin/describe.c:404
3999msgid "debug search strategy on stderr"
07432cef 4000msgstr "在标准错误上调试搜索策略"
ef317cd5
JX
4001
4002#: builtin/describe.c:405
4003msgid "use any ref in .git/refs"
07432cef 4004msgstr "使用 .git/refs 里的任意引用"
ef317cd5
JX
4005
4006#: builtin/describe.c:406
4007msgid "use any tag in .git/refs/tags"
07432cef 4008msgstr "使用 .git/refs/tags 里的任意 tag"
ef317cd5
JX
4009
4010#: builtin/describe.c:407
4011msgid "always use long format"
07432cef 4012msgstr "始终使用长提交号格式"
ef317cd5
JX
4013
4014#: builtin/describe.c:410
ef317cd5 4015msgid "only output exact matches"
07432cef 4016msgstr "只输出精确匹配"
ef317cd5
JX
4017
4018#: builtin/describe.c:412
4019msgid "consider <n> most recent tags (default: 10)"
07432cef 4020msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5
JX
4021
4022#: builtin/describe.c:414
ef317cd5 4023msgid "only consider tags matching <pattern>"
07432cef 4024msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5
JX
4025
4026#: builtin/describe.c:416 builtin/name-rev.c:238
4027msgid "show abbreviated commit object as fallback"
07432cef 4028msgstr "显示简写的提交号作为后备"
ef317cd5
JX
4029
4030#: builtin/describe.c:417
4031msgid "mark"
07432cef 4032msgstr "标记"
ef317cd5
JX
4033
4034#: builtin/describe.c:418
4035msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 4036msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 4037
c04f5ac3
JX
4038#: builtin/describe.c:436
4039msgid "--long is incompatible with --abbrev=0"
4040msgstr "--long 与 --abbrev=0 不兼容"
4041
4042#: builtin/describe.c:462
4043msgid "No names found, cannot describe anything."
90e6ef53 4044msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3
JX
4045
4046#: builtin/describe.c:482
4047msgid "--dirty is incompatible with committishes"
649900bc 4048msgstr "--dirty 不能与提交同时使用"
c04f5ac3 4049
c160d03f 4050#: builtin/diff.c:79
c04f5ac3
JX
4051#, c-format
4052msgid "'%s': not a regular file or symlink"
4053msgstr "'%s':不是一个正规文件或符号链接"
4054
07432cef 4055#: builtin/diff.c:228
c04f5ac3
JX
4056#, c-format
4057msgid "invalid option: %s"
4058msgstr "无效选项:%s"
4059
07432cef 4060#: builtin/diff.c:305
c04f5ac3
JX
4061msgid "Not a git repository"
4062msgstr "不是一个 git 版本库"
4063
07432cef 4064#: builtin/diff.c:348
c04f5ac3
JX
4065#, c-format
4066msgid "invalid object '%s' given."
4067msgstr "提供了无效对象 '%s'。"
4068
07432cef 4069#: builtin/diff.c:353
c04f5ac3
JX
4070#, c-format
4071msgid "more than %d trees given: '%s'"
4072msgstr "提供了超过 %d 个树对象:'%s'"
4073
07432cef 4074#: builtin/diff.c:363
c04f5ac3
JX
4075#, c-format
4076msgid "more than two blobs given: '%s'"
07432cef 4077msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 4078
07432cef 4079#: builtin/diff.c:371
c04f5ac3
JX
4080#, c-format
4081msgid "unhandled object '%s' given."
4082msgstr "提供了无法处理的对象 '%s'。"
4083
ef317cd5
JX
4084#: builtin/fast-export.c:22
4085msgid "git fast-export [rev-list-opts]"
07432cef 4086msgstr "git fast-export [rev-list-opts]"
ef317cd5 4087
07432cef 4088#: builtin/fast-export.c:646
ef317cd5 4089msgid "show progress after <n> objects"
07432cef 4090msgstr "在 <n> 个对象之后显示进度"
ef317cd5 4091
07432cef 4092#: builtin/fast-export.c:648
ef317cd5 4093msgid "select handling of signed tags"
07432cef 4094msgstr "选择如何处理签名 tags"
ef317cd5 4095
07432cef 4096#: builtin/fast-export.c:651
ef317cd5 4097msgid "select handling of tags that tag filtered objects"
07432cef 4098msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 4099
07432cef 4100#: builtin/fast-export.c:654
ef317cd5 4101msgid "Dump marks to this file"
07432cef 4102msgstr "把标记存储到这个文件"
ef317cd5 4103
07432cef 4104#: builtin/fast-export.c:656
ef317cd5 4105msgid "Import marks from this file"
07432cef 4106msgstr "从这个文件导入标记"
ef317cd5 4107
07432cef 4108#: builtin/fast-export.c:658
ef317cd5 4109msgid "Fake a tagger when tags lack one"
07432cef 4110msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 4111
07432cef 4112#: builtin/fast-export.c:660
ef317cd5 4113msgid "Output full tree for each commit"
07432cef 4114msgstr "每次提交都输出整个树"
ef317cd5 4115
07432cef 4116#: builtin/fast-export.c:662
ef317cd5 4117msgid "Use the done feature to terminate the stream"
07432cef 4118msgstr "使用 done 功能来终止流"
ef317cd5 4119
07432cef 4120#: builtin/fast-export.c:663
ef317cd5 4121msgid "Skip output of blob data"
07432cef 4122msgstr "跳过数据对象的输出"
ef317cd5
JX
4123
4124#: builtin/fetch.c:20
ef317cd5 4125msgid "git fetch [<options>] [<repository> [<refspec>...]]"
07432cef 4126msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
ef317cd5
JX
4127
4128#: builtin/fetch.c:21
4129msgid "git fetch [<options>] <group>"
07432cef 4130msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
4131
4132#: builtin/fetch.c:22
4133msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 4134msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
4135
4136#: builtin/fetch.c:23
4137msgid "git fetch --all [<options>]"
07432cef 4138msgstr "git fetch --all [<选项>]"
ef317cd5
JX
4139
4140#: builtin/fetch.c:60
4141msgid "fetch from all remotes"
07432cef 4142msgstr "从所有的远程抓取"
ef317cd5
JX
4143
4144#: builtin/fetch.c:62
4145msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 4146msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5
JX
4147
4148#: builtin/fetch.c:64
4149msgid "path to upload pack on remote end"
07432cef 4150msgstr "上传包到远程的路径"
ef317cd5
JX
4151
4152#: builtin/fetch.c:65
4153msgid "force overwrite of local branch"
07432cef 4154msgstr "强制覆盖本地分支"
ef317cd5
JX
4155
4156#: builtin/fetch.c:67
4157msgid "fetch from multiple remotes"
07432cef 4158msgstr "从多个远程抓取"
ef317cd5
JX
4159
4160#: builtin/fetch.c:69
ef317cd5 4161msgid "fetch all tags and associated objects"
07432cef 4162msgstr "抓取所有的 tags 和关联对象"
ef317cd5
JX
4163
4164#: builtin/fetch.c:71
4165msgid "do not fetch all tags (--no-tags)"
07432cef 4166msgstr "不抓取任何 tags (--no-tags)"
ef317cd5
JX
4167
4168#: builtin/fetch.c:73
ef317cd5 4169msgid "prune remote-tracking branches no longer on remote"
07432cef 4170msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 4171
07432cef 4172# 译者:可选值,不能翻译
ef317cd5
JX
4173#: builtin/fetch.c:74
4174msgid "on-demand"
07432cef 4175msgstr "on-demand"
ef317cd5
JX
4176
4177#: builtin/fetch.c:75
4178msgid "control recursive fetching of submodules"
07432cef 4179msgstr "控制子模组的递归抓取"
ef317cd5
JX
4180
4181#: builtin/fetch.c:79
4182msgid "keep downloaded pack"
07432cef 4183msgstr "保持下载包"
ef317cd5
JX
4184
4185#: builtin/fetch.c:81
ef317cd5 4186msgid "allow updating of HEAD ref"
07432cef 4187msgstr "允许更新 HEAD 引用"
ef317cd5
JX
4188
4189#: builtin/fetch.c:84
4190msgid "deepen history of shallow clone"
07432cef 4191msgstr "深化浅克隆的历史"
ef317cd5 4192
07432cef 4193#: builtin/fetch.c:85 builtin/log.c:1119
ef317cd5 4194msgid "dir"
07432cef 4195msgstr "目录"
ef317cd5
JX
4196
4197#: builtin/fetch.c:86
ef317cd5 4198msgid "prepend this to submodule path output"
07432cef 4199msgstr "在子模组路径输出的前面加上此目录"
ef317cd5
JX
4200
4201#: builtin/fetch.c:89
4202msgid "default mode for recursion"
07432cef 4203msgstr "递归的默认模式"
ef317cd5
JX
4204
4205#: builtin/fetch.c:201
c04f5ac3
JX
4206msgid "Couldn't find remote ref HEAD"
4207msgstr "无法发现远程 HEAD 引用"
4208
ef317cd5 4209#: builtin/fetch.c:254
c04f5ac3
JX
4210#, c-format
4211msgid "object %s not found"
4212msgstr "对象 %s 未发现"
4213
07432cef 4214#: builtin/fetch.c:259
c04f5ac3
JX
4215msgid "[up to date]"
4216msgstr "[最新]"
4217
07432cef 4218#: builtin/fetch.c:273
c04f5ac3
JX
4219#, c-format
4220msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4221msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4222
07432cef 4223#: builtin/fetch.c:274 builtin/fetch.c:360
c04f5ac3
JX
4224msgid "[rejected]"
4225msgstr "[已拒绝]"
4226
07432cef 4227#: builtin/fetch.c:285
c04f5ac3
JX
4228msgid "[tag update]"
4229msgstr "[tag更新]"
4230
90e6ef53 4231# 译者:注意保持前导空格
07432cef 4232#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
c04f5ac3
JX
4233msgid " (unable to update local ref)"
4234msgstr " (不能更新本地引用)"
4235
07432cef 4236#: builtin/fetch.c:305
c04f5ac3
JX
4237msgid "[new tag]"
4238msgstr "[新tag]"
4239
07432cef 4240#: builtin/fetch.c:308
c04f5ac3
JX
4241msgid "[new branch]"
4242msgstr "[新分支]"
4243
07432cef 4244#: builtin/fetch.c:311
170e9899
JX
4245msgid "[new ref]"
4246msgstr "[新引用]"
4247
07432cef 4248#: builtin/fetch.c:356
c04f5ac3
JX
4249msgid "unable to update local ref"
4250msgstr "不能更新本地引用"
4251
07432cef 4252#: builtin/fetch.c:356
c04f5ac3
JX
4253msgid "forced update"
4254msgstr "强制更新"
4255
07432cef 4256#: builtin/fetch.c:362
c04f5ac3 4257msgid "(non-fast-forward)"
90e6ef53 4258msgstr "(非快进式)"
c04f5ac3 4259
07432cef 4260#: builtin/fetch.c:393 builtin/fetch.c:685
c04f5ac3
JX
4261#, c-format
4262msgid "cannot open %s: %s\n"
4263msgstr "无法打开 %s:%s\n"
4264
07432cef 4265#: builtin/fetch.c:402
c04f5ac3
JX
4266#, c-format
4267msgid "%s did not send all necessary objects\n"
4268msgstr "%s 未发送所有必须的对象\n"
4269
07432cef 4270#: builtin/fetch.c:488
c04f5ac3
JX
4271#, c-format
4272msgid "From %.*s\n"
4273msgstr "来自 %.*s\n"
4274
07432cef 4275#: builtin/fetch.c:499
c04f5ac3
JX
4276#, c-format
4277msgid ""
4278"some local refs could not be updated; try running\n"
4279" 'git remote prune %s' to remove any old, conflicting branches"
4280msgstr ""
4281"一些本地引用不能被更新;尝试运行\n"
4282" 'git remote prune %s' 来删除旧的、有冲突的分支"
4283
90e6ef53 4284# 译者:注意保持前导空格
07432cef 4285#: builtin/fetch.c:549
81809b99 4286#, c-format
8ada9598 4287msgid " (%s will become dangling)"
07432cef 4288msgstr " (%s 将成为摇摆状态)"
c04f5ac3 4289
90e6ef53 4290# 译者:注意保持前导空格
07432cef 4291#: builtin/fetch.c:550
81809b99 4292#, c-format
8ada9598 4293msgid " (%s has become dangling)"
07432cef 4294msgstr " (%s 已成为摇摆状态)"
c04f5ac3 4295
07432cef 4296#: builtin/fetch.c:557
c04f5ac3
JX
4297msgid "[deleted]"
4298msgstr "[已删除]"
4299
07432cef 4300#: builtin/fetch.c:558 builtin/remote.c:1055
c04f5ac3
JX
4301msgid "(none)"
4302msgstr "(无)"
4303
07432cef 4304#: builtin/fetch.c:675
c04f5ac3
JX
4305#, c-format
4306msgid "Refusing to fetch into current branch %s of non-bare repository"
4307msgstr "拒绝获取到非裸版本库的当前分支 %s"
4308
07432cef 4309#: builtin/fetch.c:709
c04f5ac3
JX
4310#, c-format
4311msgid "Don't know how to fetch from %s"
4312msgstr "不知道如何从 %s 获取"
4313
07432cef 4314#: builtin/fetch.c:786
c04f5ac3
JX
4315#, c-format
4316msgid "Option \"%s\" value \"%s\" is not valid for %s"
4317msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4318
07432cef 4319#: builtin/fetch.c:789
c04f5ac3
JX
4320#, c-format
4321msgid "Option \"%s\" is ignored for %s\n"
81809b99 4322msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 4323
07432cef 4324#: builtin/fetch.c:891
c04f5ac3
JX
4325#, c-format
4326msgid "Fetching %s\n"
d4a8e00b 4327msgstr "正在获取 %s\n"
c04f5ac3 4328
07432cef 4329#: builtin/fetch.c:893 builtin/remote.c:100
c04f5ac3
JX
4330#, c-format
4331msgid "Could not fetch %s"
4332msgstr "不能获取 %s"
4333
07432cef 4334#: builtin/fetch.c:912
c04f5ac3
JX
4335msgid ""
4336"No remote repository specified. Please, specify either a URL or a\n"
4337"remote name from which new revisions should be fetched."
90e6ef53 4338msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 4339
07432cef 4340#: builtin/fetch.c:932
c04f5ac3 4341msgid "You need to specify a tag name."
90e6ef53 4342msgstr "您需要指定一个 tag 名称。"
c04f5ac3 4343
07432cef 4344#: builtin/fetch.c:984
c04f5ac3
JX
4345msgid "fetch --all does not take a repository argument"
4346msgstr "fetch --all 不能带一个版本库参数"
4347
07432cef 4348#: builtin/fetch.c:986
c04f5ac3
JX
4349msgid "fetch --all does not make sense with refspecs"
4350msgstr "fetch --all 带引用表达式没有任何意义"
4351
07432cef 4352#: builtin/fetch.c:997
c04f5ac3
JX
4353#, c-format
4354msgid "No such remote or remote group: %s"
4355msgstr "没有这样的远程或远程组:%s"
4356
07432cef 4357#: builtin/fetch.c:1005
c04f5ac3 4358msgid "Fetching a group and specifying refspecs does not make sense"
90e6ef53 4359msgstr "获取组并指定引用表达式没有意义"
c04f5ac3 4360
ef317cd5
JX
4361#: builtin/fmt-merge-msg.c:13
4362msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4363msgstr ""
07432cef 4364"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 4365
07432cef
WS
4366#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4367#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4368#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239
ef317cd5 4369msgid "n"
07432cef 4370msgstr "n"
c04f5ac3 4371
07432cef 4372#: builtin/fmt-merge-msg.c:660
ef317cd5 4373msgid "populate log with at most <n> entries from shortlog"
07432cef 4374msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 4375
07432cef 4376#: builtin/fmt-merge-msg.c:663
ef317cd5 4377msgid "alias for --log (deprecated)"
07432cef 4378msgstr "参数 --log 的别名(已弃用)"
ef317cd5 4379
07432cef 4380#: builtin/fmt-merge-msg.c:666
ef317cd5 4381msgid "text"
07432cef 4382msgstr "文本"
ef317cd5 4383
07432cef 4384#: builtin/fmt-merge-msg.c:667
ef317cd5 4385msgid "use <text> as start of message"
07432cef 4386msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 4387
07432cef 4388#: builtin/fmt-merge-msg.c:668
ef317cd5 4389msgid "file to read from"
07432cef 4390msgstr "从文件中读取"
ef317cd5
JX
4391
4392#: builtin/for-each-ref.c:979
ef317cd5 4393msgid "git for-each-ref [options] [<pattern>]"
07432cef 4394msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5
JX
4395
4396#: builtin/for-each-ref.c:994
4397msgid "quote placeholders suitably for shells"
07432cef 4398msgstr "引用占位符适用于 shells"
ef317cd5
JX
4399
4400#: builtin/for-each-ref.c:996
4401msgid "quote placeholders suitably for perl"
07432cef 4402msgstr "引用占位符适用于 perl"
ef317cd5
JX
4403
4404#: builtin/for-each-ref.c:998
4405msgid "quote placeholders suitably for python"
07432cef 4406msgstr "引用占位符适用于 python"
ef317cd5
JX
4407
4408#: builtin/for-each-ref.c:1000
4409msgid "quote placeholders suitably for tcl"
07432cef 4410msgstr "引用占位符适用于 tcl"
ef317cd5
JX
4411
4412#: builtin/for-each-ref.c:1003
4413msgid "show only <n> matched refs"
07432cef 4414msgstr "只显示 <n> 个匹配的引用"
ef317cd5
JX
4415
4416#: builtin/for-each-ref.c:1004
4417msgid "format"
07432cef 4418msgstr "格式"
ef317cd5
JX
4419
4420#: builtin/for-each-ref.c:1004
4421msgid "format to use for the output"
07432cef 4422msgstr "输出格式"
ef317cd5
JX
4423
4424#: builtin/for-each-ref.c:1005
4425msgid "key"
07432cef 4426msgstr "key"
ef317cd5
JX
4427
4428#: builtin/for-each-ref.c:1006
4429msgid "field name to sort on"
07432cef 4430msgstr "排序的字段名"
ef317cd5
JX
4431
4432#: builtin/fsck.c:608
ef317cd5 4433msgid "git fsck [options] [<object>...]"
07432cef 4434msgstr "git fsck [选项] [<对象>...]"
ef317cd5
JX
4435
4436#: builtin/fsck.c:614
4437msgid "show unreachable objects"
07432cef 4438msgstr "显示不可达的对象"
ef317cd5
JX
4439
4440#: builtin/fsck.c:615
ef317cd5 4441msgid "show dangling objects"
07432cef 4442msgstr "显示摇摆的对象"
ef317cd5
JX
4443
4444#: builtin/fsck.c:616
4445msgid "report tags"
07432cef 4446msgstr "报告 tags"
ef317cd5
JX
4447
4448#: builtin/fsck.c:617
4449msgid "report root nodes"
07432cef 4450msgstr "报告根节点"
ef317cd5
JX
4451
4452#: builtin/fsck.c:618
4453msgid "make index objects head nodes"
07432cef 4454msgstr "将索引亦作为检查的头节点"
ef317cd5
JX
4455
4456#: builtin/fsck.c:619
4457msgid "make reflogs head nodes (default)"
07432cef 4458msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5
JX
4459
4460#: builtin/fsck.c:620
4461msgid "also consider packs and alternate objects"
07432cef 4462msgstr "也考虑包和备用对象"
ef317cd5
JX
4463
4464#: builtin/fsck.c:621
4465msgid "enable more strict checking"
07432cef 4466msgstr "启用更严格的检查"
ef317cd5
JX
4467
4468#: builtin/fsck.c:623
4469msgid "write dangling objects in .git/lost-found"
07432cef 4470msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5
JX
4471
4472#: builtin/fsck.c:624 builtin/prune.c:134
4473msgid "show progress"
07432cef 4474msgstr "显示进度"
ef317cd5
JX
4475
4476#: builtin/gc.c:22
4477msgid "git gc [options]"
07432cef 4478msgstr "git gc [选项]"
ef317cd5 4479
c04f5ac3
JX
4480#: builtin/gc.c:63
4481#, c-format
4482msgid "Invalid %s: '%s'"
4483msgstr "无效的 %s:'%s'"
4484
eff6d3a9 4485#: builtin/gc.c:90
c04f5ac3
JX
4486#, c-format
4487msgid "insanely long object directory %.*s"
4488msgstr "不正常的长对象目录 %.*s"
4489
ef317cd5
JX
4490#: builtin/gc.c:179
4491msgid "prune unreferenced objects"
07432cef 4492msgstr "清除未引用的对象"
ef317cd5
JX
4493
4494#: builtin/gc.c:181
4495msgid "be more thorough (increased runtime)"
07432cef 4496msgstr "更彻底(增加运行时间)"
ef317cd5
JX
4497
4498#: builtin/gc.c:182
4499msgid "enable auto-gc mode"
07432cef 4500msgstr "启用自动垃圾回收模式"
ef317cd5 4501
07432cef 4502#: builtin/gc.c:222
c04f5ac3
JX
4503#, c-format
4504msgid ""
4505"Auto packing the repository for optimum performance. You may also\n"
4506"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4507msgstr ""
90e6ef53
JX
4508"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4509"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 4510
07432cef 4511#: builtin/gc.c:249
c04f5ac3
JX
4512msgid ""
4513"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 4514msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 4515
ef317cd5
JX
4516#: builtin/grep.c:22
4517msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 4518msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 4519
07432cef 4520#: builtin/grep.c:217
c04f5ac3
JX
4521#, c-format
4522msgid "grep: failed to create thread: %s"
90e6ef53 4523msgstr "grep:无法创建线程:%s"
c04f5ac3 4524
07432cef 4525#: builtin/grep.c:365
c04f5ac3
JX
4526#, c-format
4527msgid "Failed to chdir: %s"
4528msgstr "无法切换目录:%s"
4529
07432cef 4530#: builtin/grep.c:443 builtin/grep.c:478
c04f5ac3
JX
4531#, c-format
4532msgid "unable to read tree (%s)"
90e6ef53 4533msgstr "无法读取树(%s)"
c04f5ac3 4534
07432cef 4535#: builtin/grep.c:493
c04f5ac3
JX
4536#, c-format
4537msgid "unable to grep from object of type %s"
4538msgstr "无法抓取来自于 %s 类型的对象"
4539
07432cef 4540#: builtin/grep.c:551
c04f5ac3
JX
4541#, c-format
4542msgid "switch `%c' expects a numerical value"
4543msgstr "开关 `%c' 期望一个数字值"
4544
07432cef 4545#: builtin/grep.c:568
c04f5ac3
JX
4546#, c-format
4547msgid "cannot open '%s'"
4548msgstr "不能打开 '%s'"
4549
07432cef 4550#: builtin/grep.c:643
ef317cd5 4551msgid "search in index instead of in the work tree"
07432cef 4552msgstr "在索引区搜索而不是在工作区"
ef317cd5 4553
07432cef 4554#: builtin/grep.c:645
ef317cd5 4555msgid "find in contents not managed by git"
07432cef 4556msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
4557
4558# 译者:中文字符串拼接,可删除前导空格
07432cef 4559#: builtin/grep.c:647
ef317cd5 4560msgid "search in both tracked and untracked files"
07432cef 4561msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 4562
07432cef 4563#: builtin/grep.c:649
ef317cd5 4564msgid "search also in ignored files"
07432cef 4565msgstr "也在忽略的文件中搜索"
ef317cd5 4566
07432cef 4567#: builtin/grep.c:652
ef317cd5 4568msgid "show non-matching lines"
07432cef 4569msgstr "显示未匹配的行"
ef317cd5 4570
07432cef 4571#: builtin/grep.c:654
ef317cd5 4572msgid "case insensitive matching"
07432cef 4573msgstr "不区分大小写匹配"
ef317cd5 4574
07432cef 4575#: builtin/grep.c:656
ef317cd5 4576msgid "match patterns only at word boundaries"
07432cef 4577msgstr "只在单词边界匹配模式"
ef317cd5 4578
07432cef 4579#: builtin/grep.c:658
ef317cd5 4580msgid "process binary files as text"
07432cef 4581msgstr "把二进制文件当做文本处理"
ef317cd5 4582
07432cef 4583#: builtin/grep.c:660
ef317cd5 4584msgid "don't match patterns in binary files"
07432cef 4585msgstr "不在二进制文件中匹配模式"
ef317cd5 4586
07432cef 4587#: builtin/grep.c:663
ef317cd5 4588msgid "descend at most <depth> levels"
07432cef 4589msgstr "最多以指定的深度向下寻找"
ef317cd5 4590
07432cef 4591#: builtin/grep.c:667
ef317cd5 4592msgid "use extended POSIX regular expressions"
07432cef 4593msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 4594
07432cef 4595#: builtin/grep.c:670
ef317cd5 4596msgid "use basic POSIX regular expressions (default)"
07432cef 4597msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 4598
07432cef 4599#: builtin/grep.c:673
ef317cd5 4600msgid "interpret patterns as fixed strings"
07432cef 4601msgstr "把模式解析为固定的字符串"
ef317cd5 4602
07432cef 4603#: builtin/grep.c:676
ef317cd5 4604msgid "use Perl-compatible regular expressions"
07432cef 4605msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 4606
07432cef 4607#: builtin/grep.c:679
ef317cd5 4608msgid "show line numbers"
07432cef 4609msgstr "显示行号"
ef317cd5 4610
07432cef 4611#: builtin/grep.c:680
ef317cd5 4612msgid "don't show filenames"
07432cef 4613msgstr "不显示文件名"
ef317cd5 4614
07432cef 4615#: builtin/grep.c:681
ef317cd5 4616msgid "show filenames"
07432cef 4617msgstr "显示文件名"
ef317cd5 4618
07432cef 4619#: builtin/grep.c:683
ef317cd5 4620msgid "show filenames relative to top directory"
07432cef 4621msgstr "显示相对于顶级目录的文件名"
ef317cd5 4622
07432cef 4623#: builtin/grep.c:685
ef317cd5 4624msgid "show only filenames instead of matching lines"
07432cef 4625msgstr "只显示文件名而不显示匹配的行"
ef317cd5 4626
07432cef 4627#: builtin/grep.c:687
ef317cd5 4628msgid "synonym for --files-with-matches"
07432cef 4629msgstr "和 --files-with-matches 同义"
ef317cd5 4630
07432cef 4631#: builtin/grep.c:690
ef317cd5 4632msgid "show only the names of files without match"
07432cef 4633msgstr "只显示未匹配的文件名"
ef317cd5 4634
07432cef 4635#: builtin/grep.c:692
ef317cd5 4636msgid "print NUL after filenames"
07432cef 4637msgstr "在文件名后输出 NUL 字符"
ef317cd5 4638
07432cef 4639#: builtin/grep.c:694
ef317cd5 4640msgid "show the number of matches instead of matching lines"
07432cef 4641msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 4642
07432cef 4643#: builtin/grep.c:695
ef317cd5 4644msgid "highlight matches"
07432cef 4645msgstr "高亮显示匹配项"
ef317cd5 4646
07432cef 4647#: builtin/grep.c:697
ef317cd5 4648msgid "print empty line between matches from different files"
07432cef 4649msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 4650
07432cef 4651#: builtin/grep.c:699
ef317cd5 4652msgid "show filename only once above matches from same file"
07432cef 4653msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 4654
07432cef 4655#: builtin/grep.c:702
ef317cd5 4656msgid "show <n> context lines before and after matches"
07432cef 4657msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 4658
07432cef 4659#: builtin/grep.c:705
ef317cd5 4660msgid "show <n> context lines before matches"
07432cef 4661msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 4662
07432cef 4663#: builtin/grep.c:707
ef317cd5 4664msgid "show <n> context lines after matches"
07432cef 4665msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 4666
07432cef 4667#: builtin/grep.c:708
ef317cd5 4668msgid "shortcut for -C NUM"
07432cef 4669msgstr "快捷键 -C 数字"
ef317cd5 4670
07432cef 4671#: builtin/grep.c:711
ef317cd5 4672msgid "show a line with the function name before matches"
07432cef 4673msgstr "在匹配的前面显示一行函数名"
ef317cd5 4674
07432cef 4675#: builtin/grep.c:713
ef317cd5 4676msgid "show the surrounding function"
07432cef 4677msgstr "显示所在函数的前后内容"
ef317cd5 4678
07432cef 4679#: builtin/grep.c:716
ef317cd5 4680msgid "read patterns from file"
07432cef 4681msgstr "从文件读取模式"
ef317cd5 4682
07432cef 4683#: builtin/grep.c:718
ef317cd5 4684msgid "match <pattern>"
07432cef 4685msgstr "匹配 <模式>"
ef317cd5 4686
07432cef 4687#: builtin/grep.c:720
ef317cd5 4688msgid "combine patterns specified with -e"
07432cef 4689msgstr "组合用 -e 参数设定的模式"
ef317cd5 4690
07432cef 4691#: builtin/grep.c:732
ef317cd5 4692msgid "indicate hit with exit status without output"
07432cef 4693msgstr "不输出,而用退出码标识命中状态"
ef317cd5 4694
07432cef 4695#: builtin/grep.c:734
ef317cd5 4696msgid "show only matches from files that match all patterns"
07432cef 4697msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 4698
07432cef
WS
4699#: builtin/grep.c:736
4700msgid "show parse tree for grep expression"
4701msgstr "显示 grep 表达式的解析树"
4702
4703#: builtin/grep.c:740
ef317cd5 4704msgid "pager"
07432cef 4705msgstr "分页"
ef317cd5 4706
07432cef 4707#: builtin/grep.c:740
ef317cd5 4708msgid "show matching files in the pager"
07432cef 4709msgstr "分页显示匹配的文件"
ef317cd5 4710
07432cef 4711#: builtin/grep.c:743
ef317cd5 4712msgid "allow calling of grep(1) (ignored by this build)"
07432cef 4713msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 4714
07432cef 4715#: builtin/grep.c:744 builtin/show-ref.c:184
ef317cd5 4716msgid "show usage"
07432cef 4717msgstr "显示用法"
ef317cd5 4718
07432cef 4719#: builtin/grep.c:811
c04f5ac3
JX
4720msgid "no pattern given."
4721msgstr "未提供模式匹配。"
4722
07432cef 4723#: builtin/grep.c:825
c04f5ac3
JX
4724#, c-format
4725msgid "bad object %s"
4726msgstr "坏对象 %s"
4727
07432cef 4728#: builtin/grep.c:866
c04f5ac3
JX
4729msgid "--open-files-in-pager only works on the worktree"
4730msgstr "--open-files-in-pager 仅用于工作区"
4731
07432cef 4732#: builtin/grep.c:889
c04f5ac3 4733msgid "--cached or --untracked cannot be used with --no-index."
649900bc 4734msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 4735
07432cef 4736#: builtin/grep.c:894
c04f5ac3 4737msgid "--no-index or --untracked cannot be used with revs."
649900bc 4738msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 4739
07432cef 4740#: builtin/grep.c:897
c04f5ac3 4741msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 4742msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 4743
07432cef 4744#: builtin/grep.c:905
c04f5ac3
JX
4745msgid "both --cached and trees are given."
4746msgstr "同时给出了 --cached 和树对象。"
4747
ef317cd5
JX
4748#: builtin/hash-object.c:60
4749msgid ""
4750"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4751"<file>..."
4752msgstr ""
07432cef
WS
4753"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
4754"<文件>..."
ef317cd5
JX
4755
4756#: builtin/hash-object.c:61
4757msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 4758msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5
JX
4759
4760#: builtin/hash-object.c:72
4761msgid "type"
07432cef 4762msgstr "类型"
ef317cd5
JX
4763
4764#: builtin/hash-object.c:72
ef317cd5 4765msgid "object type"
07432cef 4766msgstr "对象类型"
ef317cd5
JX
4767
4768#: builtin/hash-object.c:73
4769msgid "write the object into the object database"
07432cef 4770msgstr "将对象写入对象数据库"
ef317cd5
JX
4771
4772#: builtin/hash-object.c:74
4773msgid "read the object from stdin"
07432cef 4774msgstr "从标准输入读取对象"
ef317cd5
JX
4775
4776#: builtin/hash-object.c:76
4777msgid "store file as is without filters"
07432cef 4778msgstr "原样存储文件不使用过滤器"
ef317cd5
JX
4779
4780#: builtin/hash-object.c:77
4781msgid "process file as it were from this path"
07432cef 4782msgstr "处理文件并假设其来自于此路径"
ef317cd5
JX
4783
4784#: builtin/help.c:43
ef317cd5 4785msgid "print all available commands"
07432cef 4786msgstr "打印所有可用的命令"
ef317cd5
JX
4787
4788#: builtin/help.c:44
4789msgid "show man page"
07432cef 4790msgstr "显示 man 手册"
ef317cd5
JX
4791
4792#: builtin/help.c:45
4793msgid "show manual in web browser"
07432cef 4794msgstr "在 web 浏览器中显示手册"
ef317cd5
JX
4795
4796#: builtin/help.c:47
4797msgid "show info page"
07432cef 4798msgstr "显示 info 手册"
ef317cd5
JX
4799
4800#: builtin/help.c:53
4801msgid "git help [--all] [--man|--web|--info] [command]"
07432cef 4802msgstr "git help [--all] [--man|--web|--info] [命令]"
ef317cd5 4803
23ff3338 4804#: builtin/help.c:65
81809b99 4805#, c-format
8ada9598 4806msgid "unrecognized help format '%s'"
81809b99 4807msgstr "未能识别的帮助格式 '%s'"
8ada9598 4808
23ff3338 4809#: builtin/help.c:93
8ada9598 4810msgid "Failed to start emacsclient."
81809b99 4811msgstr "无法启动 emacsclient。"
8ada9598 4812
23ff3338 4813#: builtin/help.c:106
8ada9598 4814msgid "Failed to parse emacsclient version."
81809b99 4815msgstr "无法解析 emacsclient 版本。"
8ada9598 4816
23ff3338 4817#: builtin/help.c:114
8ada9598
JX
4818#, c-format
4819msgid "emacsclient version '%d' too old (< 22)."
07432cef 4820msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 4821
23ff3338 4822#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
81809b99 4823#, c-format
8ada9598 4824msgid "failed to exec '%s': %s"
81809b99 4825msgstr "无法执行 '%s':%s"
8ada9598 4826
23ff3338 4827#: builtin/help.c:217
8ada9598
JX
4828#, c-format
4829msgid ""
4830"'%s': path for unsupported man viewer.\n"
4831"Please consider using 'man.<tool>.cmd' instead."
4832msgstr ""
81809b99
JX
4833"'%s':不支持的 man 手册查看器的路径。\n"
4834"请使用 'man.<tool>.cmd'。"
8ada9598 4835
23ff3338 4836#: builtin/help.c:229
8ada9598
JX
4837#, c-format
4838msgid ""
4839"'%s': cmd for supported man viewer.\n"
4840"Please consider using 'man.<tool>.path' instead."
4841msgstr ""
81809b99
JX
4842"'%s': 支持的 man 手册查看器命令。\n"
4843"请使用 'man.<tool>.path'。"
8ada9598 4844
23ff3338 4845#: builtin/help.c:299
8ada9598 4846msgid "The most commonly used git commands are:"
81809b99 4847msgstr "最常用的 git 命令有:"
8ada9598 4848
23ff3338 4849#: builtin/help.c:367
8ada9598
JX
4850#, c-format
4851msgid "'%s': unknown man viewer."
81809b99 4852msgstr "'%s':未知的 man 查看器。"
8ada9598 4853
23ff3338 4854#: builtin/help.c:384
8ada9598 4855msgid "no man viewer handled the request"
81809b99 4856msgstr "没有 man 查看器处理此请求"
8ada9598 4857
23ff3338 4858#: builtin/help.c:392
8ada9598 4859msgid "no info viewer handled the request"
81809b99 4860msgstr "没有 info 查看器处理此请求"
8ada9598 4861
23ff3338 4862#: builtin/help.c:447 builtin/help.c:454
8ada9598
JX
4863#, c-format
4864msgid "usage: %s%s"
81809b99 4865msgstr "用法:%s%s"
8ada9598 4866
23ff3338 4867#: builtin/help.c:470
8ada9598
JX
4868#, c-format
4869msgid "`git %s' is aliased to `%s'"
81809b99 4870msgstr "`git %s' 是 `%s' 的别名"
8ada9598 4871
6792b93b 4872#: builtin/index-pack.c:170
8ada9598
JX
4873#, c-format
4874msgid "object type mismatch at %s"
81809b99 4875msgstr "%s 的对象类型不匹配"
8ada9598 4876
6792b93b 4877#: builtin/index-pack.c:190
8ada9598 4878msgid "object of unexpected type"
81809b99 4879msgstr "意外的类型的对象"
8ada9598 4880
6792b93b 4881#: builtin/index-pack.c:227
81809b99 4882#, c-format
8ada9598
JX
4883msgid "cannot fill %d byte"
4884msgid_plural "cannot fill %d bytes"
81809b99 4885msgstr[0] "无法填充 %d 字节"
5ae481e0 4886msgstr[1] "无法填充 %d 字节"
8ada9598 4887
6792b93b 4888#: builtin/index-pack.c:237
8ada9598 4889msgid "early EOF"
81809b99 4890msgstr "过早的文件结束符(EOF)"
8ada9598 4891
6792b93b 4892#: builtin/index-pack.c:238
8ada9598 4893msgid "read error on input"
81809b99 4894msgstr "输入上的读错误"
8ada9598 4895
6792b93b 4896#: builtin/index-pack.c:250
8ada9598 4897msgid "used more bytes than were available"
81809b99 4898msgstr "用掉了超过可用的字节"
8ada9598 4899
6792b93b 4900#: builtin/index-pack.c:257
8ada9598 4901msgid "pack too large for current definition of off_t"
81809b99 4902msgstr "包太大超过了当前 off_t 的定义"
8ada9598 4903
6792b93b 4904#: builtin/index-pack.c:273
81809b99 4905#, c-format
8ada9598 4906msgid "unable to create '%s'"
81809b99 4907msgstr "不能创建 '%s'"
8ada9598 4908
6792b93b 4909#: builtin/index-pack.c:278
81809b99 4910#, c-format
8ada9598 4911msgid "cannot open packfile '%s'"
81809b99 4912msgstr "无法打开包文件 '%s'"
8ada9598 4913
6792b93b 4914#: builtin/index-pack.c:292
8ada9598 4915msgid "pack signature mismatch"
81809b99 4916msgstr "包签名不匹配"
8ada9598 4917
ef317cd5
JX
4918#: builtin/index-pack.c:294
4919#, c-format
4920msgid "pack version %<PRIu32> unsupported"
07432cef 4921msgstr "不支持包版本 %<PRIu32>"
ef317cd5 4922
6792b93b 4923#: builtin/index-pack.c:312
8ada9598
JX
4924#, c-format
4925msgid "pack has bad object at offset %lu: %s"
81809b99 4926msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 4927
6792b93b 4928#: builtin/index-pack.c:434
8ada9598
JX
4929#, c-format
4930msgid "inflate returned %d"
81809b99 4931msgstr "解压缩返回 %d"
8ada9598 4932
6792b93b 4933#: builtin/index-pack.c:483
8ada9598 4934msgid "offset value overflow for delta base object"
81809b99 4935msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 4936
6792b93b 4937#: builtin/index-pack.c:491
8ada9598 4938msgid "delta base offset is out of bound"
81809b99 4939msgstr "delta 基准偏移越界"
8ada9598 4940
6792b93b 4941#: builtin/index-pack.c:499
81809b99 4942#, c-format
8ada9598 4943msgid "unknown object type %d"
81809b99 4944msgstr "未知对象类型 %d"
8ada9598 4945
23ff3338 4946#: builtin/index-pack.c:530
8ada9598 4947msgid "cannot pread pack file"
81809b99 4948msgstr "无法读取包文件"
8ada9598 4949
23ff3338 4950#: builtin/index-pack.c:532
8ada9598
JX
4951#, c-format
4952msgid "premature end of pack file, %lu byte missing"
4953msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 4954msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 4955msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 4956
23ff3338 4957#: builtin/index-pack.c:558
8ada9598 4958msgid "serious inflate inconsistency"
81809b99 4959msgstr "解压缩严重的不一致"
8ada9598 4960
23ff3338
JX
4961#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
4962#: builtin/index-pack.c:712 builtin/index-pack.c:721
8ada9598
JX
4963#, c-format
4964msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 4965msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 4966
23ff3338 4967#: builtin/index-pack.c:652 builtin/pack-objects.c:170
6792b93b
JX
4968#: builtin/pack-objects.c:262
4969#, c-format
4970msgid "unable to read %s"
4971msgstr "不能读 %s"
4972
23ff3338 4973#: builtin/index-pack.c:718
6792b93b
JX
4974#, c-format
4975msgid "cannot read existing object %s"
4976msgstr "不能读取现存对象 %s"
4977
23ff3338 4978#: builtin/index-pack.c:732
81809b99 4979#, c-format
8ada9598 4980msgid "invalid blob object %s"
07432cef 4981msgstr "无效的数据(blob)对象 %s"
8ada9598 4982
23ff3338 4983#: builtin/index-pack.c:747
81809b99 4984#, c-format
8ada9598 4985msgid "invalid %s"
81809b99 4986msgstr "无效的 %s"
8ada9598 4987
23ff3338 4988#: builtin/index-pack.c:749
8ada9598 4989msgid "Error in object"
81809b99 4990msgstr "对象中出错"
8ada9598 4991
23ff3338 4992#: builtin/index-pack.c:751
8ada9598
JX
4993#, c-format
4994msgid "Not all child objects of %s are reachable"
81809b99 4995msgstr "%s 的所有子对象并非都可达"
8ada9598 4996
23ff3338 4997#: builtin/index-pack.c:821 builtin/index-pack.c:847
8ada9598 4998msgid "failed to apply delta"
81809b99 4999msgstr "无法应用 delta"
8ada9598 5000
23ff3338 5001#: builtin/index-pack.c:986
8ada9598 5002msgid "Receiving objects"
81809b99 5003msgstr "接收对象中"
8ada9598 5004
23ff3338 5005#: builtin/index-pack.c:986
8ada9598 5006msgid "Indexing objects"
81809b99 5007msgstr "索引对象中"
8ada9598 5008
23ff3338 5009#: builtin/index-pack.c:1012
8ada9598 5010msgid "pack is corrupted (SHA1 mismatch)"
81809b99 5011msgstr "包冲突(SHA1 不匹配)"
8ada9598 5012
23ff3338 5013#: builtin/index-pack.c:1017
8ada9598 5014msgid "cannot fstat packfile"
81809b99 5015msgstr "不能枚举包文件状态"
8ada9598 5016
23ff3338 5017#: builtin/index-pack.c:1020
8ada9598 5018msgid "pack has junk at the end"
81809b99 5019msgstr "包的结尾有垃圾数据"
8ada9598 5020
23ff3338 5021#: builtin/index-pack.c:1031
6792b93b
JX
5022msgid "confusion beyond insanity in parse_pack_objects()"
5023msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5024
23ff3338 5025#: builtin/index-pack.c:1054
8ada9598 5026msgid "Resolving deltas"
81809b99 5027msgstr "处理 delta 中"
8ada9598 5028
ef317cd5 5029#: builtin/index-pack.c:1064
07432cef 5030#, c-format
ef317cd5 5031msgid "unable to create thread: %s"
07432cef 5032msgstr "不能创建线程:%s"
ef317cd5
JX
5033
5034#: builtin/index-pack.c:1106
8ada9598 5035msgid "confusion beyond insanity"
81809b99 5036msgstr "不可理喻"
8ada9598 5037
ef317cd5
JX
5038#: builtin/index-pack.c:1112
5039#, c-format
5040msgid "completed with %d local objects"
07432cef 5041msgstr "完成 %d 个本地对象"
ef317cd5
JX
5042
5043#: builtin/index-pack.c:1121
5044#, c-format
5045msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 5046msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5
JX
5047
5048#: builtin/index-pack.c:1125
8ada9598
JX
5049#, c-format
5050msgid "pack has %d unresolved delta"
5051msgid_plural "pack has %d unresolved deltas"
81809b99 5052msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 5053msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 5054
ef317cd5 5055#: builtin/index-pack.c:1150
81809b99 5056#, c-format
8ada9598 5057msgid "unable to deflate appended object (%d)"
07432cef 5058msgstr "不能压缩附加对象(%d)"
8ada9598 5059
ef317cd5 5060#: builtin/index-pack.c:1229
8ada9598
JX
5061#, c-format
5062msgid "local object %s is corrupt"
81809b99 5063msgstr "本地对象 %s 已损坏"
8ada9598 5064
ef317cd5 5065#: builtin/index-pack.c:1253
8ada9598 5066msgid "error while closing pack file"
81809b99 5067msgstr "关闭包文件时出错"
8ada9598 5068
ef317cd5 5069#: builtin/index-pack.c:1266
81809b99 5070#, c-format
8ada9598 5071msgid "cannot write keep file '%s'"
81809b99 5072msgstr "无法写保留文件 '%s'"
8ada9598 5073
ef317cd5 5074#: builtin/index-pack.c:1274
81809b99 5075#, c-format
8ada9598 5076msgid "cannot close written keep file '%s'"
81809b99 5077msgstr "无法关闭保留文件 '%s'"
8ada9598 5078
ef317cd5 5079#: builtin/index-pack.c:1287
8ada9598 5080msgid "cannot store pack file"
81809b99 5081msgstr "无法存储包文件"
8ada9598 5082
ef317cd5 5083#: builtin/index-pack.c:1298
8ada9598 5084msgid "cannot store index file"
81809b99 5085msgstr "无法存储索引文件"
8ada9598 5086
ef317cd5 5087#: builtin/index-pack.c:1331
07432cef 5088#, c-format
ef317cd5 5089msgid "bad pack.indexversion=%<PRIu32>"
07432cef 5090msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5
JX
5091
5092#: builtin/index-pack.c:1337
5093#, c-format
5094msgid "invalid number of threads specified (%d)"
07432cef 5095msgstr "指定的线程数无效(%d)"
ef317cd5
JX
5096
5097#: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5098#, c-format
5099msgid "no threads support, ignoring %s"
07432cef 5100msgstr "没有线程支持,忽略 %s"
ef317cd5
JX
5101
5102#: builtin/index-pack.c:1399
81809b99 5103#, c-format
8ada9598 5104msgid "Cannot open existing pack file '%s'"
81809b99 5105msgstr "无法打开现存包文件 '%s'"
8ada9598 5106
ef317cd5 5107#: builtin/index-pack.c:1401
81809b99 5108#, c-format
8ada9598 5109msgid "Cannot open existing pack idx file for '%s'"
81809b99 5110msgstr "无法为 %s 打开包索引文件"
8ada9598 5111
ef317cd5 5112#: builtin/index-pack.c:1448
81809b99 5113#, c-format
8ada9598
JX
5114msgid "non delta: %d object"
5115msgid_plural "non delta: %d objects"
81809b99 5116msgstr[0] "非 delta:%d 个对象"
5ae481e0 5117msgstr[1] "非 delta:%d 个对象"
8ada9598 5118
ef317cd5 5119#: builtin/index-pack.c:1455
8ada9598
JX
5120#, c-format
5121msgid "chain length = %d: %lu object"
5122msgid_plural "chain length = %d: %lu objects"
81809b99 5123msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 5124msgstr[1] "链长 = %d: %lu 对象"
8ada9598 5125
ef317cd5 5126#: builtin/index-pack.c:1482
8ada9598 5127msgid "Cannot come back to cwd"
81809b99 5128msgstr "无法返回当前工作目录"
8ada9598 5129
ef317cd5
JX
5130#: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5131#: builtin/index-pack.c:1541 builtin/index-pack.c:1545
81809b99 5132#, c-format
8ada9598 5133msgid "bad %s"
81809b99 5134msgstr "错误选项 %s"
8ada9598 5135
ef317cd5 5136#: builtin/index-pack.c:1559
8ada9598 5137msgid "--fix-thin cannot be used without --stdin"
649900bc 5138msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 5139
ef317cd5 5140#: builtin/index-pack.c:1563 builtin/index-pack.c:1573
8ada9598
JX
5141#, c-format
5142msgid "packfile name '%s' does not end with '.pack'"
81809b99 5143msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 5144
ef317cd5 5145#: builtin/index-pack.c:1582
8ada9598 5146msgid "--verify with no packfile name given"
81809b99 5147msgstr "--verify 没有提供包名参数"
8ada9598 5148
c04f5ac3
JX
5149#: builtin/init-db.c:35
5150#, c-format
5151msgid "Could not make %s writable by group"
5152msgstr "不能设置 %s 为组可写"
5153
5154#: builtin/init-db.c:62
5155#, c-format
5156msgid "insanely long template name %s"
5157msgstr "太长的模版名 %s"
5158
5159#: builtin/init-db.c:67
5160#, c-format
5161msgid "cannot stat '%s'"
5162msgstr "不能枚举 '%s' 状态"
5163
5164#: builtin/init-db.c:73
5165#, c-format
5166msgid "cannot stat template '%s'"
5167msgstr "不能枚举模版 '%s' 状态"
5168
5169#: builtin/init-db.c:80
5170#, c-format
5171msgid "cannot opendir '%s'"
5172msgstr "不能打开目录 '%s'"
5173
5174#: builtin/init-db.c:97
5175#, c-format
5176msgid "cannot readlink '%s'"
5177msgstr "不能读取链接 '%s'"
5178
5179#: builtin/init-db.c:99
5180#, c-format
5181msgid "insanely long symlink %s"
5182msgstr "太长的符号链接 %s"
5183
5184#: builtin/init-db.c:102
5185#, c-format
5186msgid "cannot symlink '%s' '%s'"
90e6ef53 5187msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
5188
5189#: builtin/init-db.c:106
5190#, c-format
5191msgid "cannot copy '%s' to '%s'"
5192msgstr "不能拷贝 '%s' 至 '%s'"
5193
5194#: builtin/init-db.c:110
5195#, c-format
5196msgid "ignoring template %s"
5197msgstr "忽略模版 %s"
5198
5199#: builtin/init-db.c:133
5200#, c-format
5201msgid "insanely long template path %s"
5202msgstr "太长的模版路径 %s"
5203
5204#: builtin/init-db.c:141
5205#, c-format
5206msgid "templates not found %s"
5207msgstr "模版未找到 %s"
5208
5209#: builtin/init-db.c:154
5210#, c-format
5211msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 5212msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
5213
5214#: builtin/init-db.c:192
5215#, c-format
5216msgid "insane git directory %s"
5217msgstr "不正常的 git 目录 %s"
5218
23ff3338 5219#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
5220#, c-format
5221msgid "%s already exists"
5222msgstr "%s 已经存在"
5223
23ff3338 5224#: builtin/init-db.c:355
c04f5ac3
JX
5225#, c-format
5226msgid "unable to handle file type %d"
5227msgstr "不能处理 %d 类型的文件"
5228
23ff3338 5229#: builtin/init-db.c:358
c04f5ac3
JX
5230#, c-format
5231msgid "unable to move %s to %s"
5232msgstr "不能移动 %s 至 %s"
5233
23ff3338 5234#: builtin/init-db.c:363
c04f5ac3
JX
5235#, c-format
5236msgid "Could not create git link %s"
5237msgstr "不能创建 git link %s"
5238
5239#.
5240#. * TRANSLATORS: The first '%s' is either "Reinitialized
5241#. * existing" or "Initialized empty", the second " shared" or
5242#. * "", and the last '%s%s' is the verbatim directory name.
5243#.
23ff3338 5244#: builtin/init-db.c:420
c04f5ac3
JX
5245#, c-format
5246msgid "%s%s Git repository in %s%s\n"
5247msgstr "%s%s Git 版本库于 %s%s\n"
5248
23ff3338 5249#: builtin/init-db.c:421
c04f5ac3
JX
5250msgid "Reinitialized existing"
5251msgstr "重新初始化现存的"
5252
23ff3338 5253#: builtin/init-db.c:421
c04f5ac3
JX
5254msgid "Initialized empty"
5255msgstr "初始化空的"
5256
7e238ab7 5257# 译者:中文字符串拼接,可删除前导空格
23ff3338 5258#: builtin/init-db.c:422
c04f5ac3 5259msgid " shared"
90e6ef53 5260msgstr "共享"
c04f5ac3 5261
23ff3338 5262#: builtin/init-db.c:441
c04f5ac3
JX
5263msgid "cannot tell cwd"
5264msgstr "无法获知当前路径"
5265
ef317cd5
JX
5266#: builtin/init-db.c:467
5267msgid ""
5268"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
5269"[=<permissions>]] [directory]"
5270msgstr ""
07432cef
WS
5271"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5272"[目录]"
ef317cd5
JX
5273
5274#: builtin/init-db.c:490
5275msgid "permissions"
07432cef 5276msgstr "权限"
ef317cd5
JX
5277
5278#: builtin/init-db.c:491
5279msgid "specify that the git repository is to be shared amongst several users"
07432cef 5280msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5
JX
5281
5282#: builtin/init-db.c:493 builtin/prune-packed.c:77
ef317cd5 5283msgid "be quiet"
07432cef 5284msgstr "保持安静"
ef317cd5 5285
23ff3338 5286#: builtin/init-db.c:522 builtin/init-db.c:529
c04f5ac3
JX
5287#, c-format
5288msgid "cannot mkdir %s"
5289msgstr "不能创建目录 %s"
5290
23ff3338 5291#: builtin/init-db.c:533
c04f5ac3
JX
5292#, c-format
5293msgid "cannot chdir to %s"
5294msgstr "不能切换目录到 %s"
5295
23ff3338 5296#: builtin/init-db.c:555
c04f5ac3
JX
5297#, c-format
5298msgid ""
5299"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5300"dir=<directory>)"
5301msgstr ""
73a60cd2
JX
5302"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5303"dir=<directory>)"
c04f5ac3 5304
23ff3338 5305#: builtin/init-db.c:579
c04f5ac3
JX
5306msgid "Cannot access current working directory"
5307msgstr "不能访问当前工作目录"
5308
23ff3338 5309#: builtin/init-db.c:586
c04f5ac3
JX
5310#, c-format
5311msgid "Cannot access work tree '%s'"
5312msgstr "不能访问工作区 '%s'"
5313
07432cef 5314#: builtin/log.c:39
ef317cd5 5315msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
07432cef 5316msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
ef317cd5 5317
07432cef 5318#: builtin/log.c:40
ef317cd5 5319msgid " or: git show [options] <object>..."
07432cef 5320msgstr " 或者:git show [选项] <对象>..."
ef317cd5 5321
07432cef 5322#: builtin/log.c:102
ef317cd5 5323msgid "suppress diff output"
07432cef 5324msgstr "不显示差异输出"
ef317cd5 5325
07432cef 5326#: builtin/log.c:103
ef317cd5 5327msgid "show source"
07432cef 5328msgstr "显示源"
ef317cd5 5329
07432cef
WS
5330#: builtin/log.c:104
5331msgid "Use mail map file"
5332msgstr "使用邮件映射文件"
5333
5334#: builtin/log.c:105
ef317cd5 5335msgid "decorate options"
07432cef 5336msgstr "修饰选项"
ef317cd5 5337
07432cef 5338#: builtin/log.c:198
c04f5ac3
JX
5339#, c-format
5340msgid "Final output: %d %s\n"
5341msgstr "最终输出:%d %s\n"
5342
07432cef 5343#: builtin/log.c:419 builtin/log.c:511
c04f5ac3
JX
5344#, c-format
5345msgid "Could not read object %s"
90e6ef53 5346msgstr "不能读取对象 %s"
c04f5ac3 5347
07432cef 5348#: builtin/log.c:535
c04f5ac3
JX
5349#, c-format
5350msgid "Unknown type: %d"
5351msgstr "未知类型:%d"
5352
07432cef 5353#: builtin/log.c:627
c04f5ac3
JX
5354msgid "format.headers without value"
5355msgstr "format.headers 没有值"
5356
07432cef 5357#: builtin/log.c:701
c04f5ac3
JX
5358msgid "name of output directory is too long"
5359msgstr "输出目录名太长"
5360
07432cef 5361#: builtin/log.c:717
c04f5ac3
JX
5362#, c-format
5363msgid "Cannot open patch file %s"
5364msgstr "无法打开补丁文件 %s"
5365
07432cef 5366#: builtin/log.c:731
c04f5ac3
JX
5367msgid "Need exactly one range."
5368msgstr "只需要一个范围。"
5369
07432cef 5370#: builtin/log.c:739
c04f5ac3
JX
5371msgid "Not a range."
5372msgstr "不是一个范围。"
5373
07432cef 5374#: builtin/log.c:812
c04f5ac3
JX
5375msgid "Cover letter needs email format"
5376msgstr "信封需要邮件地址格式"
5377
07432cef 5378#: builtin/log.c:885
c04f5ac3
JX
5379#, c-format
5380msgid "insane in-reply-to: %s"
5381msgstr "不正常的 in-reply-to:%s"
5382
07432cef 5383#: builtin/log.c:913
ef317cd5 5384msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 5385msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 5386
07432cef 5387#: builtin/log.c:958
c04f5ac3
JX
5388msgid "Two output directories?"
5389msgstr "两个输出目录?"
5390
07432cef 5391#: builtin/log.c:1097
ef317cd5 5392msgid "use [PATCH n/m] even with a single patch"
07432cef 5393msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 5394
07432cef 5395#: builtin/log.c:1100
ef317cd5 5396msgid "use [PATCH] even with multiple patches"
07432cef 5397msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 5398
07432cef 5399#: builtin/log.c:1104
ef317cd5 5400msgid "print patches to standard out"
07432cef 5401msgstr "打印补丁到标准输出"
c04f5ac3 5402
07432cef 5403#: builtin/log.c:1106
ef317cd5 5404msgid "generate a cover letter"
07432cef 5405msgstr "生成一封附信"
c04f5ac3 5406
07432cef 5407#: builtin/log.c:1108
ef317cd5 5408msgid "use simple number sequence for output file names"
07432cef 5409msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 5410
07432cef 5411#: builtin/log.c:1109
ef317cd5 5412msgid "sfx"
07432cef 5413msgstr "后缀"
ef317cd5 5414
07432cef 5415#: builtin/log.c:1110
ef317cd5 5416msgid "use <sfx> instead of '.patch'"
07432cef 5417msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 5418
07432cef 5419#: builtin/log.c:1112
ef317cd5 5420msgid "start numbering patches at <n> instead of 1"
07432cef
WS
5421msgstr "补丁以 <n> 开始编号,而不是1"
5422
5423#: builtin/log.c:1114
5424msgid "mark the series as Nth re-roll"
5425msgstr "标记补丁系列是第几次重制"
ef317cd5 5426
07432cef 5427#: builtin/log.c:1116
ef317cd5 5428msgid "Use [<prefix>] instead of [PATCH]"
07432cef 5429msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 5430
07432cef 5431#: builtin/log.c:1119
ef317cd5 5432msgid "store resulting files in <dir>"
07432cef 5433msgstr "把结果文件存储在 <dir>"
ef317cd5 5434
07432cef 5435#: builtin/log.c:1122
ef317cd5 5436msgid "don't strip/add [PATCH]"
07432cef 5437msgstr "不删除/添加 [PATCH]"
ef317cd5 5438
07432cef 5439#: builtin/log.c:1125
ef317cd5 5440msgid "don't output binary diffs"
07432cef 5441msgstr "不输出二进制差异"
ef317cd5 5442
07432cef 5443#: builtin/log.c:1127
ef317cd5 5444msgid "don't include a patch matching a commit upstream"
07432cef 5445msgstr "不包含已在上游提交中的补丁"
ef317cd5 5446
07432cef 5447#: builtin/log.c:1129
ef317cd5 5448msgid "show patch format instead of default (patch + stat)"
07432cef 5449msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 5450
07432cef 5451#: builtin/log.c:1131
ef317cd5 5452msgid "Messaging"
07432cef 5453msgstr "邮件发送"
ef317cd5 5454
07432cef 5455#: builtin/log.c:1132
ef317cd5 5456msgid "header"
07432cef 5457msgstr "header"
ef317cd5 5458
07432cef 5459#: builtin/log.c:1133
ef317cd5 5460msgid "add email header"
07432cef 5461msgstr "添加邮件头"
ef317cd5 5462
07432cef 5463#: builtin/log.c:1134 builtin/log.c:1136
ef317cd5 5464msgid "email"
07432cef 5465msgstr "邮件地址"
ef317cd5 5466
07432cef 5467#: builtin/log.c:1134
ef317cd5 5468msgid "add To: header"
07432cef 5469msgstr "添加收件人"
ef317cd5 5470
07432cef 5471#: builtin/log.c:1136
ef317cd5 5472msgid "add Cc: header"
07432cef 5473msgstr "添加抄送"
ef317cd5 5474
07432cef 5475#: builtin/log.c:1138
ef317cd5 5476msgid "message-id"
07432cef 5477msgstr "message-id"
ef317cd5 5478
07432cef 5479#: builtin/log.c:1139
ef317cd5 5480msgid "make first mail a reply to <message-id>"
07432cef 5481msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 5482
07432cef 5483#: builtin/log.c:1140 builtin/log.c:1143
ef317cd5 5484msgid "boundary"
07432cef 5485msgstr "边界"
ef317cd5 5486
07432cef 5487#: builtin/log.c:1141
ef317cd5 5488msgid "attach the patch"
07432cef 5489msgstr "附件方式添加补丁"
ef317cd5 5490
07432cef 5491#: builtin/log.c:1144
ef317cd5 5492msgid "inline the patch"
07432cef 5493msgstr "内联显示补丁"
ef317cd5 5494
07432cef 5495#: builtin/log.c:1148
ef317cd5 5496msgid "enable message threading, styles: shallow, deep"
07432cef 5497msgstr "启用邮件线索,风格:浅,深"
ef317cd5 5498
07432cef 5499#: builtin/log.c:1150
ef317cd5 5500msgid "signature"
07432cef 5501msgstr "签名"
ef317cd5 5502
07432cef 5503#: builtin/log.c:1151
ef317cd5 5504msgid "add a signature"
07432cef 5505msgstr "添加一个签名"
ef317cd5 5506
07432cef 5507#: builtin/log.c:1153
ef317cd5 5508msgid "don't print the patch filenames"
07432cef 5509msgstr "不要打印补丁文件名"
ef317cd5 5510
07432cef 5511#: builtin/log.c:1202
c04f5ac3
JX
5512#, c-format
5513msgid "bogus committer info %s"
5514msgstr "虚假的提交者信息 %s"
5515
07432cef 5516#: builtin/log.c:1247
c04f5ac3
JX
5517msgid "-n and -k are mutually exclusive."
5518msgstr "-n 和 -k 互斥。"
5519
07432cef 5520#: builtin/log.c:1249
c04f5ac3
JX
5521msgid "--subject-prefix and -k are mutually exclusive."
5522msgstr "--subject-prefix 和 -k 互斥。"
5523
07432cef 5524#: builtin/log.c:1257
c04f5ac3
JX
5525msgid "--name-only does not make sense"
5526msgstr "--name-only 无意义"
5527
07432cef 5528#: builtin/log.c:1259
c04f5ac3
JX
5529msgid "--name-status does not make sense"
5530msgstr "--name-status 无意义"
5531
07432cef 5532#: builtin/log.c:1261
c04f5ac3
JX
5533msgid "--check does not make sense"
5534msgstr "--check 无意义"
5535
07432cef 5536#: builtin/log.c:1284
c04f5ac3
JX
5537msgid "standard output, or directory, which one?"
5538msgstr "标准输出或目录,哪一个?"
5539
07432cef 5540#: builtin/log.c:1286
c04f5ac3
JX
5541#, c-format
5542msgid "Could not create directory '%s'"
90e6ef53 5543msgstr "不能创建目录 '%s'"
c04f5ac3 5544
07432cef 5545#: builtin/log.c:1439
c04f5ac3
JX
5546msgid "Failed to create output files"
5547msgstr "无法创建输出文件"
5548
07432cef 5549#: builtin/log.c:1488
ef317cd5 5550msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 5551msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 5552
07432cef 5553#: builtin/log.c:1543
c04f5ac3
JX
5554#, c-format
5555msgid ""
5556"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 5557msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 5558
07432cef 5559#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
c04f5ac3
JX
5560#, c-format
5561msgid "Unknown commit %s"
5562msgstr "未知提交 %s"
5563
ef317cd5 5564#: builtin/ls-files.c:408
ef317cd5 5565msgid "git ls-files [options] [<file>...]"
07432cef 5566msgstr "git ls-files [选项] [<文件>...]"
ef317cd5
JX
5567
5568#: builtin/ls-files.c:463
5569msgid "identify the file status with tags"
07432cef 5570msgstr "用标签标识文件的状态"
ef317cd5
JX
5571
5572#: builtin/ls-files.c:465
5573msgid "use lowercase letters for 'assume unchanged' files"
07432cef 5574msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5
JX
5575
5576#: builtin/ls-files.c:467
5577msgid "show cached files in the output (default)"
07432cef 5578msgstr "显示缓存的文件(默认)"
ef317cd5
JX
5579
5580#: builtin/ls-files.c:469
ef317cd5 5581msgid "show deleted files in the output"
07432cef 5582msgstr "显示已删除的文件"
ef317cd5
JX
5583
5584#: builtin/ls-files.c:471
5585msgid "show modified files in the output"
07432cef 5586msgstr "显示已修改的文件"
ef317cd5
JX
5587
5588#: builtin/ls-files.c:473
5589msgid "show other files in the output"
07432cef 5590msgstr "显示其它文件"
ef317cd5
JX
5591
5592#: builtin/ls-files.c:475
5593msgid "show ignored files in the output"
07432cef 5594msgstr "显示忽略的文件"
ef317cd5
JX
5595
5596#: builtin/ls-files.c:478
5597msgid "show staged contents' object name in the output"
07432cef 5598msgstr "显示暂存区内容的对象名称"
ef317cd5
JX
5599
5600#: builtin/ls-files.c:480
5601msgid "show files on the filesystem that need to be removed"
07432cef 5602msgstr "显示文件系统需要删除的文件"
ef317cd5
JX
5603
5604#: builtin/ls-files.c:482
5605msgid "show 'other' directories' name only"
07432cef 5606msgstr "只显示“其他”目录的名称"
ef317cd5
JX
5607
5608#: builtin/ls-files.c:485
ef317cd5 5609msgid "don't show empty directories"
07432cef 5610msgstr "不显示空目录"
ef317cd5
JX
5611
5612#: builtin/ls-files.c:488
5613msgid "show unmerged files in the output"
07432cef 5614msgstr "显示未合并的文件"
ef317cd5
JX
5615
5616#: builtin/ls-files.c:490
5617msgid "show resolve-undo information"
07432cef 5618msgstr "显示 resolve-undo 信息"
ef317cd5
JX
5619
5620#: builtin/ls-files.c:492
ef317cd5 5621msgid "skip files matching pattern"
07432cef 5622msgstr "匹配排除文件的模式"
ef317cd5
JX
5623
5624#: builtin/ls-files.c:495
5625msgid "exclude patterns are read from <file>"
07432cef 5626msgstr "从 <文件> 中读取排除模式"
ef317cd5
JX
5627
5628#: builtin/ls-files.c:498
5629msgid "read additional per-directory exclude patterns in <file>"
07432cef 5630msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5
JX
5631
5632#: builtin/ls-files.c:500
5633msgid "add the standard git exclusions"
07432cef 5634msgstr "添加标准的 git 排除"
ef317cd5
JX
5635
5636#: builtin/ls-files.c:503
5637msgid "make the output relative to the project top directory"
07432cef 5638msgstr "显示相对于顶级目录的文件名"
ef317cd5
JX
5639
5640#: builtin/ls-files.c:506
5641msgid "if any <file> is not in the index, treat this as an error"
07432cef 5642msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5
JX
5643
5644#: builtin/ls-files.c:507
5645msgid "tree-ish"
07432cef 5646msgstr "树或提交"
ef317cd5
JX
5647
5648#: builtin/ls-files.c:508
5649msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 5650msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5
JX
5651
5652#: builtin/ls-files.c:510
5653msgid "show debugging data"
07432cef 5654msgstr "显示调试数据"
ef317cd5
JX
5655
5656#: builtin/ls-tree.c:27
ef317cd5 5657msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 5658msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5
JX
5659
5660#: builtin/ls-tree.c:125
5661msgid "only show trees"
07432cef 5662msgstr "只显示树"
ef317cd5
JX
5663
5664#: builtin/ls-tree.c:127
ef317cd5 5665msgid "recurse into subtrees"
07432cef 5666msgstr "递归到子树"
ef317cd5
JX
5667
5668#: builtin/ls-tree.c:129
5669msgid "show trees when recursing"
07432cef 5670msgstr "当递归时显示树"
ef317cd5
JX
5671
5672#: builtin/ls-tree.c:132
5673msgid "terminate entries with NUL byte"
07432cef 5674msgstr "条目以NUL字符终止"
ef317cd5
JX
5675
5676#: builtin/ls-tree.c:133
ef317cd5 5677msgid "include object size"
07432cef 5678msgstr "包括对象大小"
ef317cd5
JX
5679
5680#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5681msgid "list only filenames"
07432cef 5682msgstr "只列出文件名"
ef317cd5
JX
5683
5684#: builtin/ls-tree.c:140
5685msgid "use full path names"
07432cef 5686msgstr "使用文件的全路径"
ef317cd5
JX
5687
5688#: builtin/ls-tree.c:142
5689msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 5690msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5
JX
5691
5692#: builtin/merge.c:43
ef317cd5 5693msgid "git merge [options] [<commit>...]"
07432cef 5694msgstr "git merge [选项] [<提交>...]"
ef317cd5
JX
5695
5696#: builtin/merge.c:44
5697msgid "git merge [options] <msg> HEAD <commit>"
07432cef 5698msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5
JX
5699
5700#: builtin/merge.c:45
5701msgid "git merge --abort"
07432cef 5702msgstr "git merge --abort"
ef317cd5 5703
170e9899 5704#: builtin/merge.c:90
c04f5ac3
JX
5705msgid "switch `m' requires a value"
5706msgstr "开关 `m' 需要一个值"
5707
170e9899 5708#: builtin/merge.c:127
c04f5ac3
JX
5709#, c-format
5710msgid "Could not find merge strategy '%s'.\n"
90e6ef53 5711msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 5712
170e9899 5713#: builtin/merge.c:128
c04f5ac3
JX
5714#, c-format
5715msgid "Available strategies are:"
5716msgstr "可用的策略有:"
5717
170e9899 5718#: builtin/merge.c:133
c04f5ac3
JX
5719#, c-format
5720msgid "Available custom strategies are:"
5721msgstr "可用的自定义策略有:"
5722
ef317cd5
JX
5723#: builtin/merge.c:183
5724msgid "do not show a diffstat at the end of the merge"
07432cef 5725msgstr "在合并的最后不显示差异统计"
ef317cd5
JX
5726
5727#: builtin/merge.c:186
5728msgid "show a diffstat at the end of the merge"
07432cef 5729msgstr "在合并的最后显示差异统计"
ef317cd5
JX
5730
5731#: builtin/merge.c:187
5732msgid "(synonym to --stat)"
07432cef 5733msgstr "(和 --stat 同义)"
ef317cd5
JX
5734
5735#: builtin/merge.c:189
5736msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 5737msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5
JX
5738
5739#: builtin/merge.c:192
ef317cd5 5740msgid "create a single commit instead of doing a merge"
07432cef 5741msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5
JX
5742
5743#: builtin/merge.c:194
5744msgid "perform a commit if the merge succeeds (default)"
07432cef 5745msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5
JX
5746
5747#: builtin/merge.c:196
ef317cd5 5748msgid "edit message before committing"
07432cef 5749msgstr "在提交前编辑提交说明"
ef317cd5
JX
5750
5751#: builtin/merge.c:198
ef317cd5 5752msgid "allow fast-forward (default)"
07432cef 5753msgstr "允许快进(默认)"
ef317cd5
JX
5754
5755#: builtin/merge.c:200
5756msgid "abort if fast-forward is not possible"
07432cef 5757msgstr "如果不能快进就放弃合并"
ef317cd5 5758
07432cef 5759#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
ef317cd5 5760msgid "strategy"
07432cef 5761msgstr "策略"
ef317cd5
JX
5762
5763#: builtin/merge.c:203
ef317cd5 5764msgid "merge strategy to use"
07432cef 5765msgstr "要使用的合并策略"
ef317cd5
JX
5766
5767#: builtin/merge.c:204
5768msgid "option=value"
07432cef 5769msgstr "option=value"
ef317cd5
JX
5770
5771#: builtin/merge.c:205
5772msgid "option for selected merge strategy"
07432cef 5773msgstr "所选的合并策略的选项"
ef317cd5
JX
5774
5775#: builtin/merge.c:207
5776msgid "merge commit message (for a non-fast-forward merge)"
07432cef 5777msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5
JX
5778
5779#: builtin/merge.c:211
ef317cd5 5780msgid "abort the current in-progress merge"
07432cef 5781msgstr "放弃当前正在进行的合并"
ef317cd5 5782
170e9899 5783#: builtin/merge.c:240
c04f5ac3
JX
5784msgid "could not run stash."
5785msgstr "不能进行进度保存。"
5786
170e9899 5787#: builtin/merge.c:245
c04f5ac3
JX
5788msgid "stash failed"
5789msgstr "进度保存失败"
5790
170e9899 5791#: builtin/merge.c:250
c04f5ac3
JX
5792#, c-format
5793msgid "not a valid object: %s"
5794msgstr "不是一个有效对象:%s"
5795
170e9899 5796#: builtin/merge.c:269 builtin/merge.c:286
c04f5ac3
JX
5797msgid "read-tree failed"
5798msgstr "读取树失败"
5799
90e6ef53 5800# 译者:注意保持前导空格
170e9899 5801#: builtin/merge.c:316
c04f5ac3
JX
5802msgid " (nothing to squash)"
5803msgstr " (无可压缩)"
5804
170e9899 5805#: builtin/merge.c:329
c04f5ac3
JX
5806#, c-format
5807msgid "Squash commit -- not updating HEAD\n"
5808msgstr "压缩提交 -- 未更新 HEAD\n"
5809
170e9899 5810#: builtin/merge.c:361
c04f5ac3
JX
5811msgid "Writing SQUASH_MSG"
5812msgstr "写入 SQUASH_MSG"
5813
170e9899 5814#: builtin/merge.c:363
c04f5ac3
JX
5815msgid "Finishing SQUASH_MSG"
5816msgstr "完成 SQUASH_MSG"
5817
5818#: builtin/merge.c:386
5819#, c-format
5820msgid "No merge message -- not updating HEAD\n"
5821msgstr "无合并信息 -- 未更新 HEAD\n"
5822
c160d03f 5823#: builtin/merge.c:436
c04f5ac3
JX
5824#, c-format
5825msgid "'%s' does not point to a commit"
5826msgstr "'%s' 没有指向一个提交"
5827
c160d03f 5828#: builtin/merge.c:535
c04f5ac3
JX
5829#, c-format
5830msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 5831msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 5832
c160d03f 5833#: builtin/merge.c:628
c04f5ac3
JX
5834msgid "git write-tree failed to write a tree"
5835msgstr "git write-tree 无法写入一树对象"
5836
07432cef 5837#: builtin/merge.c:656
c04f5ac3
JX
5838msgid "Not handling anything other than two heads merge."
5839msgstr "不能处理两个头合并之外的任何操作。"
5840
07432cef 5841#: builtin/merge.c:670
c04f5ac3
JX
5842#, c-format
5843msgid "Unknown option for merge-recursive: -X%s"
5844msgstr "merge-recursive 的未知选项:-X%s"
5845
07432cef 5846#: builtin/merge.c:684
c04f5ac3
JX
5847#, c-format
5848msgid "unable to write %s"
5849msgstr "不能写 %s"
5850
07432cef 5851#: builtin/merge.c:773
c04f5ac3
JX
5852#, c-format
5853msgid "Could not read from '%s'"
5854msgstr "不能从 '%s' 读取"
5855
07432cef 5856#: builtin/merge.c:782
c04f5ac3
JX
5857#, c-format
5858msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5859msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
5860
07432cef 5861#: builtin/merge.c:788
c04f5ac3
JX
5862msgid ""
5863"Please enter a commit message to explain why this merge is necessary,\n"
5864"especially if it merges an updated upstream into a topic branch.\n"
5865"\n"
5866"Lines starting with '#' will be ignored, and an empty message aborts\n"
5867"the commit.\n"
5868msgstr ""
5869"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
5870"合并到主题分支。\n"
5871"\n"
5872"以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
5873
07432cef 5874#: builtin/merge.c:813
c04f5ac3
JX
5875msgid "Empty commit message."
5876msgstr "空提交信息。"
5877
07432cef 5878#: builtin/merge.c:825
c04f5ac3
JX
5879#, c-format
5880msgid "Wonderful.\n"
5881msgstr "太棒了。\n"
5882
07432cef 5883#: builtin/merge.c:890
c04f5ac3
JX
5884#, c-format
5885msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5886msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
5887
07432cef 5888#: builtin/merge.c:906
c04f5ac3
JX
5889#, c-format
5890msgid "'%s' is not a commit"
5891msgstr "'%s' 不是一个提交"
5892
07432cef 5893#: builtin/merge.c:947
c04f5ac3 5894msgid "No current branch."
90e6ef53 5895msgstr "没有当前分支。"
c04f5ac3 5896
07432cef 5897#: builtin/merge.c:949
c04f5ac3 5898msgid "No remote for the current branch."
90e6ef53 5899msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 5900
07432cef 5901#: builtin/merge.c:951
c04f5ac3 5902msgid "No default upstream defined for the current branch."
90e6ef53 5903msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 5904
07432cef 5905#: builtin/merge.c:956
c04f5ac3
JX
5906#, c-format
5907msgid "No remote tracking branch for %s from %s"
5908msgstr "%s 没有来自 %s 的远程跟踪分支"
5909
07432cef 5910#: builtin/merge.c:1043 builtin/merge.c:1200
170e9899
JX
5911#, c-format
5912msgid "%s - not something we can merge"
5913msgstr "%s - 不能被合并"
5914
07432cef 5915#: builtin/merge.c:1111
c04f5ac3 5916msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 5917msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 5918
07432cef 5919#: builtin/merge.c:1127 git-pull.sh:31
c04f5ac3
JX
5920msgid ""
5921"You have not concluded your merge (MERGE_HEAD exists).\n"
5922"Please, commit your changes before you can merge."
5923msgstr ""
5924"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 5925"请在合并前先提交您的修改。"
c04f5ac3 5926
07432cef 5927#: builtin/merge.c:1130 git-pull.sh:34
c04f5ac3
JX
5928msgid "You have not concluded your merge (MERGE_HEAD exists)."
5929msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
5930
07432cef 5931#: builtin/merge.c:1134
c04f5ac3
JX
5932msgid ""
5933"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5934"Please, commit your changes before you can merge."
5935msgstr ""
5936"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 5937"请在合并前先提交您的修改。"
c04f5ac3 5938
07432cef 5939#: builtin/merge.c:1137
c04f5ac3
JX
5940msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5941msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
5942
07432cef 5943#: builtin/merge.c:1146
c04f5ac3 5944msgid "You cannot combine --squash with --no-ff."
649900bc 5945msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 5946
07432cef 5947#: builtin/merge.c:1151
c04f5ac3 5948msgid "You cannot combine --no-ff with --ff-only."
649900bc 5949msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
c04f5ac3 5950
07432cef 5951#: builtin/merge.c:1158
c04f5ac3 5952msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 5953msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 5954
07432cef 5955#: builtin/merge.c:1190
c04f5ac3 5956msgid "Can merge only exactly one commit into empty head"
90e6ef53 5957msgstr "只能将一个提交合并到空分支上"
c04f5ac3 5958
07432cef 5959#: builtin/merge.c:1193
c04f5ac3
JX
5960msgid "Squash commit into empty head not supported yet"
5961msgstr "尚不支持到空分支的压缩提交"
5962
07432cef 5963#: builtin/merge.c:1195
c04f5ac3
JX
5964msgid "Non-fast-forward commit does not make sense into an empty head"
5965msgstr "到空分支的非快进式提交没有意义"
5966
07432cef 5967#: builtin/merge.c:1311
c04f5ac3
JX
5968#, c-format
5969msgid "Updating %s..%s\n"
5970msgstr "更新 %s..%s\n"
5971
07432cef 5972#: builtin/merge.c:1350
c04f5ac3
JX
5973#, c-format
5974msgid "Trying really trivial in-index merge...\n"
90e6ef53 5975msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 5976
07432cef 5977#: builtin/merge.c:1357
c04f5ac3
JX
5978#, c-format
5979msgid "Nope.\n"
5980msgstr "无。\n"
5981
07432cef 5982#: builtin/merge.c:1389
c04f5ac3 5983msgid "Not possible to fast-forward, aborting."
1aabac65 5984msgstr "无法快进,终止。"
c04f5ac3 5985
07432cef 5986#: builtin/merge.c:1412 builtin/merge.c:1491
c04f5ac3
JX
5987#, c-format
5988msgid "Rewinding the tree to pristine...\n"
5989msgstr "将树回滚至原始状态...\n"
5990
07432cef 5991#: builtin/merge.c:1416
c04f5ac3
JX
5992#, c-format
5993msgid "Trying merge strategy %s...\n"
5994msgstr "尝试合并策略 %s...\n"
5995
07432cef 5996#: builtin/merge.c:1482
c04f5ac3
JX
5997#, c-format
5998msgid "No merge strategy handled the merge.\n"
5999msgstr "没有合并策略处理此合并。\n"
6000
07432cef 6001#: builtin/merge.c:1484
c04f5ac3
JX
6002#, c-format
6003msgid "Merge with strategy %s failed.\n"
6004msgstr "使用策略 %s 合并失败。\n"
6005
07432cef 6006#: builtin/merge.c:1493
c04f5ac3
JX
6007#, c-format
6008msgid "Using the %s to prepare resolving by hand.\n"
6009msgstr "使用 %s 以准备手工解决。\n"
6010
07432cef 6011#: builtin/merge.c:1505
c04f5ac3
JX
6012#, c-format
6013msgid "Automatic merge went well; stopped before committing as requested\n"
6014msgstr "自动合并进展顺利,按要求在提交前停止\n"
6015
ef317cd5
JX
6016#: builtin/merge-base.c:26
6017msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 6018msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5
JX
6019
6020#: builtin/merge-base.c:27
6021msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 6022msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5
JX
6023
6024#: builtin/merge-base.c:28
6025msgid "git merge-base --independent <commit>..."
07432cef 6026msgstr "git merge-base --independent <提交>..."
ef317cd5
JX
6027
6028#: builtin/merge-base.c:29
6029msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 6030msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5
JX
6031
6032#: builtin/merge-base.c:98
ef317cd5 6033msgid "output all common ancestors"
07432cef 6034msgstr "输出所有共同的祖先"
ef317cd5
JX
6035
6036#: builtin/merge-base.c:99
6037msgid "find ancestors for a single n-way merge"
07432cef 6038msgstr "查找一个多路合并的祖先提交"
ef317cd5
JX
6039
6040#: builtin/merge-base.c:100
6041msgid "list revs not reachable from others"
07432cef 6042msgstr "显示不能被其他访问到的版本"
ef317cd5
JX
6043
6044#: builtin/merge-base.c:102
6045msgid "is the first one ancestor of the other?"
07432cef 6046msgstr "第一个是其他的祖先提交么?"
ef317cd5
JX
6047
6048#: builtin/merge-file.c:8
6049msgid ""
6050"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6051"file2"
6052msgstr ""
07432cef 6053"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
6054
6055#: builtin/merge-file.c:33
6056msgid "send results to standard output"
07432cef 6057msgstr "将结果发送到标准输出"
ef317cd5
JX
6058
6059#: builtin/merge-file.c:34
6060msgid "use a diff3 based merge"
07432cef 6061msgstr "使用基于 diff3 的合并"
ef317cd5
JX
6062
6063#: builtin/merge-file.c:35
6064msgid "for conflicts, use our version"
07432cef 6065msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
6066
6067#: builtin/merge-file.c:37
6068msgid "for conflicts, use their version"
07432cef 6069msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
6070
6071#: builtin/merge-file.c:39
6072msgid "for conflicts, use a union version"
07432cef 6073msgstr "如果冲突,使用联合版本"
ef317cd5
JX
6074
6075#: builtin/merge-file.c:42
6076msgid "for conflicts, use this marker size"
07432cef 6077msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
6078
6079#: builtin/merge-file.c:43
6080msgid "do not warn about conflicts"
07432cef 6081msgstr "不要警告冲突"
ef317cd5
JX
6082
6083#: builtin/merge-file.c:45
6084msgid "set labels for file1/orig_file/file2"
07432cef 6085msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 6086
ef317cd5
JX
6087#: builtin/mktree.c:67
6088msgid "git mktree [-z] [--missing] [--batch]"
07432cef 6089msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 6090
ef317cd5
JX
6091#: builtin/mktree.c:153
6092msgid "input is NUL terminated"
07432cef 6093msgstr "输入以 NUL 字符终止"
c04f5ac3 6094
ef317cd5 6095#: builtin/mktree.c:154 builtin/write-tree.c:24
ef317cd5 6096msgid "allow missing objects"
07432cef 6097msgstr "允许丢失的对象"
c04f5ac3 6098
ef317cd5
JX
6099#: builtin/mktree.c:155
6100msgid "allow creation of more than one tree"
07432cef 6101msgstr "允许创建一个以上的树"
c04f5ac3 6102
ef317cd5
JX
6103#: builtin/mv.c:14
6104msgid "git mv [options] <source>... <destination>"
07432cef 6105msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 6106
ef317cd5
JX
6107#: builtin/mv.c:64
6108msgid "force move/rename even if target exists"
07432cef 6109msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 6110
ef317cd5 6111#: builtin/mv.c:65
ef317cd5 6112msgid "skip move/rename errors"
07432cef 6113msgstr "跳过移动/重命名错误"
c04f5ac3
JX
6114
6115#: builtin/mv.c:108
6116#, c-format
6117msgid "Checking rename of '%s' to '%s'\n"
6118msgstr "检查 '%s' 到 '%s' 的重命名\n"
6119
6120#: builtin/mv.c:112
6121msgid "bad source"
6122msgstr "坏的源"
6123
6124#: builtin/mv.c:115
6125msgid "can not move directory into itself"
6126msgstr "不能将目录移动到自身"
6127
6128#: builtin/mv.c:118
6129msgid "cannot move directory over file"
6130msgstr "不能将目录移动到文件"
6131
6132#: builtin/mv.c:128
6133#, c-format
6134msgid "Huh? %.*s is in index?"
90e6ef53 6135msgstr "嗯?%.*s 在索引中?"
c04f5ac3
JX
6136
6137#: builtin/mv.c:140
6138msgid "source directory is empty"
6139msgstr "源目录为空"
6140
6141#: builtin/mv.c:171
6142msgid "not under version control"
6143msgstr "不在版本控制之下"
6144
6145#: builtin/mv.c:173
6146msgid "destination exists"
6147msgstr "目标已存在"
6148
6149#: builtin/mv.c:181
6150#, c-format
6151msgid "overwriting '%s'"
6152msgstr "覆盖 '%s'"
6153
6154#: builtin/mv.c:184
6155msgid "Cannot overwrite"
6156msgstr "不能覆盖"
6157
6158#: builtin/mv.c:187
6159msgid "multiple sources for the same target"
6160msgstr "同一目标具有多个源"
6161
6162#: builtin/mv.c:202
6163#, c-format
6164msgid "%s, source=%s, destination=%s"
6165msgstr "%s,源=%s,目标=%s"
6166
6167#: builtin/mv.c:212
6168#, c-format
6169msgid "Renaming %s to %s\n"
6170msgstr "重命名 %s 至 %s\n"
6171
8ada9598 6172#: builtin/mv.c:215 builtin/remote.c:731
c04f5ac3
JX
6173#, c-format
6174msgid "renaming '%s' failed"
6175msgstr "重命名 '%s' 失败"
6176
ef317cd5 6177#: builtin/name-rev.c:175
ef317cd5 6178msgid "git name-rev [options] <commit>..."
07432cef 6179msgstr "git name-rev [选项] <提交>..."
ef317cd5
JX
6180
6181#: builtin/name-rev.c:176
6182msgid "git name-rev [options] --all"
07432cef 6183msgstr "git name-rev [选项] --all"
ef317cd5
JX
6184
6185#: builtin/name-rev.c:177
6186msgid "git name-rev [options] --stdin"
07432cef 6187msgstr "git name-rev [选项] --stdin"
ef317cd5
JX
6188
6189#: builtin/name-rev.c:229
6190msgid "print only names (no SHA-1)"
07432cef 6191msgstr "只打印名称(无 SHA-1)"
ef317cd5
JX
6192
6193#: builtin/name-rev.c:230
6194msgid "only use tags to name the commits"
07432cef 6195msgstr "只使用 tags 来命名提交"
ef317cd5
JX
6196
6197#: builtin/name-rev.c:232
ef317cd5 6198msgid "only use refs matching <pattern>"
07432cef 6199msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5
JX
6200
6201#: builtin/name-rev.c:234
6202msgid "list all commits reachable from all refs"
07432cef 6203msgstr "列出可以从所有引用访问的提交"
ef317cd5
JX
6204
6205#: builtin/name-rev.c:235
6206msgid "read from stdin"
07432cef 6207msgstr "从标准输入读取"
ef317cd5
JX
6208
6209#: builtin/name-rev.c:236
6210msgid "allow to print `undefined` names"
07432cef 6211msgstr "允许打印 `未定义` 的名称"
ef317cd5 6212
07432cef 6213#: builtin/notes.c:26
ef317cd5 6214msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 6215msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 6216
07432cef 6217#: builtin/notes.c:27
ef317cd5
JX
6218msgid ""
6219"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6220"<object>] [<object>]"
6221msgstr ""
07432cef
WS
6222"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6223"象>] [<对象>]"
ef317cd5 6224
07432cef 6225#: builtin/notes.c:28
ef317cd5 6226msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 6227msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 6228
07432cef 6229#: builtin/notes.c:29
ef317cd5
JX
6230msgid ""
6231"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6232"<object>] [<object>]"
6233msgstr ""
07432cef
WS
6234"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6235">] [<对象>]"
ef317cd5 6236
07432cef 6237#: builtin/notes.c:30
ef317cd5 6238msgid "git notes [--ref <notes_ref>] edit [<object>]"
07432cef 6239msgstr "git notes [--ref <注解引用>] edit [<对象>]"
ef317cd5 6240
07432cef 6241#: builtin/notes.c:31
ef317cd5 6242msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 6243msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 6244
07432cef 6245#: builtin/notes.c:32
ef317cd5
JX
6246msgid ""
6247"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 6248msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 6249
07432cef 6250#: builtin/notes.c:33
ef317cd5 6251msgid "git notes merge --commit [-v | -q]"
07432cef 6252msgstr "git notes merge --commit [-v | -q]"
ef317cd5 6253
07432cef 6254#: builtin/notes.c:34
ef317cd5 6255msgid "git notes merge --abort [-v | -q]"
07432cef 6256msgstr "git notes merge --abort [-v | -q]"
ef317cd5 6257
07432cef 6258#: builtin/notes.c:35
ef317cd5 6259msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 6260msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 6261
07432cef 6262#: builtin/notes.c:36
ef317cd5 6263msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 6264msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 6265
07432cef 6266#: builtin/notes.c:37
ef317cd5 6267msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 6268msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 6269
07432cef 6270#: builtin/notes.c:42
ef317cd5 6271msgid "git notes [list [<object>]]"
07432cef 6272msgstr "git notes [list [<对象>]]"
ef317cd5 6273
07432cef 6274#: builtin/notes.c:47
ef317cd5 6275msgid "git notes add [<options>] [<object>]"
07432cef 6276msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 6277
07432cef 6278#: builtin/notes.c:52
ef317cd5 6279msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 6280msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 6281
07432cef 6282#: builtin/notes.c:53
ef317cd5 6283msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 6284msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 6285
07432cef 6286#: builtin/notes.c:58
ef317cd5 6287msgid "git notes append [<options>] [<object>]"
07432cef 6288msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 6289
07432cef 6290#: builtin/notes.c:63
ef317cd5 6291msgid "git notes edit [<object>]"
07432cef 6292msgstr "git notes edit [<对象>]"
ef317cd5 6293
07432cef 6294#: builtin/notes.c:68
ef317cd5 6295msgid "git notes show [<object>]"
07432cef 6296msgstr "git notes show [<对象>]"
ef317cd5 6297
07432cef 6298#: builtin/notes.c:73
ef317cd5 6299msgid "git notes merge [<options>] <notes_ref>"
07432cef 6300msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 6301
07432cef 6302#: builtin/notes.c:74
ef317cd5 6303msgid "git notes merge --commit [<options>]"
07432cef 6304msgstr "git notes merge --commit [<选项>]"
ef317cd5 6305
07432cef 6306#: builtin/notes.c:75
ef317cd5 6307msgid "git notes merge --abort [<options>]"
07432cef 6308msgstr "git notes merge --abort [<选项>]"
ef317cd5 6309
07432cef 6310#: builtin/notes.c:80
ef317cd5 6311msgid "git notes remove [<object>]"
07432cef 6312msgstr "git notes remove [<对象>]"
ef317cd5 6313
07432cef 6314#: builtin/notes.c:85
ef317cd5 6315msgid "git notes prune [<options>]"
07432cef 6316msgstr "git notes prune [<选项>]"
ef317cd5 6317
07432cef 6318#: builtin/notes.c:90
ef317cd5 6319msgid "git notes get-ref"
07432cef 6320msgstr "git notes get-ref"
ef317cd5 6321
07432cef 6322#: builtin/notes.c:142
c04f5ac3
JX
6323#, c-format
6324msgid "unable to start 'show' for object '%s'"
6325msgstr "不能为对象 '%s' 开始 'show'"
6326
07432cef 6327#: builtin/notes.c:148
c04f5ac3
JX
6328msgid "can't fdopen 'show' output fd"
6329msgstr "不能打开 'show' 输出文件句柄"
6330
07432cef 6331#: builtin/notes.c:158
c04f5ac3
JX
6332#, c-format
6333msgid "failed to close pipe to 'show' for object '%s'"
6334msgstr "无法为对象 '%s' 的 'show' 关闭管道"
6335
07432cef 6336#: builtin/notes.c:161
c04f5ac3
JX
6337#, c-format
6338msgid "failed to finish 'show' for object '%s'"
6339msgstr "无法为对象 '%s' 完成 'show'"
6340
07432cef 6341#: builtin/notes.c:178 builtin/tag.c:347
c04f5ac3
JX
6342#, c-format
6343msgid "could not create file '%s'"
6344msgstr "不能创建文件 '%s'"
6345
07432cef 6346#: builtin/notes.c:192
c04f5ac3
JX
6347msgid "Please supply the note contents using either -m or -F option"
6348msgstr "请通过 -m 或 -F 选项为注解提供内容"
6349
07432cef 6350#: builtin/notes.c:213 builtin/notes.c:976
c04f5ac3
JX
6351#, c-format
6352msgid "Removing note for object %s\n"
6353msgstr "删除对象 %s 的注解\n"
6354
07432cef 6355#: builtin/notes.c:218
c04f5ac3
JX
6356msgid "unable to write note object"
6357msgstr "不能写注解对象"
6358
07432cef 6359#: builtin/notes.c:220
c04f5ac3
JX
6360#, c-format
6361msgid "The note contents has been left in %s"
6362msgstr "注解内容被留在文件 %s 中"
6363
07432cef 6364#: builtin/notes.c:254 builtin/tag.c:542
c04f5ac3
JX
6365#, c-format
6366msgid "cannot read '%s'"
6367msgstr "不能读取 '%s'"
6368
07432cef 6369#: builtin/notes.c:256 builtin/tag.c:545
c04f5ac3
JX
6370#, c-format
6371msgid "could not open or read '%s'"
6372msgstr "不能打开或读取 '%s'"
6373
07432cef
WS
6374#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6375#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6376#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6377#: builtin/notes.c:971 builtin/tag.c:558
c04f5ac3
JX
6378#, c-format
6379msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 6380msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 6381
07432cef 6382#: builtin/notes.c:278
c04f5ac3
JX
6383#, c-format
6384msgid "Failed to read object '%s'."
6385msgstr "无法读取对象 '%s'。"
6386
07432cef 6387#: builtin/notes.c:302
c04f5ac3
JX
6388msgid "Cannot commit uninitialized/unreferenced notes tree"
6389msgstr "不能提交未初始化/未引用的注解树"
6390
07432cef 6391#: builtin/notes.c:343
c04f5ac3
JX
6392#, c-format
6393msgid "Bad notes.rewriteMode value: '%s'"
90e6ef53 6394msgstr "坏的 notes.rewriteMode 值:'%s'"
c04f5ac3 6395
07432cef 6396#: builtin/notes.c:353
c04f5ac3
JX
6397#, c-format
6398msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6399msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6400
6401#. TRANSLATORS: The first %s is the name of the
6402#. environment variable, the second %s is its value
07432cef 6403#: builtin/notes.c:380
c04f5ac3
JX
6404#, c-format
6405msgid "Bad %s value: '%s'"
90e6ef53 6406msgstr "坏的 %s 值:'%s'"
c04f5ac3 6407
07432cef 6408#: builtin/notes.c:444
c04f5ac3
JX
6409#, c-format
6410msgid "Malformed input line: '%s'."
6411msgstr "非法的输入行:'%s'。"
6412
07432cef 6413#: builtin/notes.c:459
c04f5ac3
JX
6414#, c-format
6415msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 6416msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 6417
07432cef
WS
6418#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
6419#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
6420#: builtin/notes.c:1036
c04f5ac3
JX
6421msgid "too many parameters"
6422msgstr "参数太多"
6423
07432cef 6424#: builtin/notes.c:516 builtin/notes.c:775
c04f5ac3
JX
6425#, c-format
6426msgid "No note found for object %s."
6427msgstr "未发现对象 %s 的注解。"
6428
07432cef 6429#: builtin/notes.c:538 builtin/notes.c:695
ef317cd5 6430msgid "note contents as a string"
07432cef 6431msgstr "注解内容作为一个字符串"
ef317cd5 6432
07432cef 6433#: builtin/notes.c:541 builtin/notes.c:698
ef317cd5 6434msgid "note contents in a file"
07432cef 6435msgstr "注解内容到一个文件中"
ef317cd5 6436
07432cef
WS
6437#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
6438#: builtin/notes.c:703 builtin/tag.c:476
ef317cd5 6439msgid "object"
07432cef 6440msgstr "对象"
ef317cd5 6441
07432cef 6442#: builtin/notes.c:544 builtin/notes.c:701
ef317cd5 6443msgid "reuse and edit specified note object"
07432cef 6444msgstr "重用和编辑指定的注解对象"
ef317cd5 6445
07432cef 6446#: builtin/notes.c:547 builtin/notes.c:704
ef317cd5 6447msgid "reuse specified note object"
07432cef 6448msgstr "重用指定的注解对象"
ef317cd5 6449
07432cef 6450#: builtin/notes.c:549 builtin/notes.c:617
ef317cd5 6451msgid "replace existing notes"
07432cef 6452msgstr "替换已存在的注解"
ef317cd5 6453
07432cef 6454#: builtin/notes.c:583
c04f5ac3
JX
6455#, c-format
6456msgid ""
6457"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6458"existing notes"
6459msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6460
07432cef 6461#: builtin/notes.c:588 builtin/notes.c:665
c04f5ac3
JX
6462#, c-format
6463msgid "Overwriting existing notes for object %s\n"
6464msgstr "覆盖对象 %s 现存注解\n"
6465
07432cef 6466#: builtin/notes.c:618
ef317cd5 6467msgid "read objects from stdin"
07432cef 6468msgstr "从标准输入读取对象"
ef317cd5 6469
07432cef 6470#: builtin/notes.c:620
ef317cd5 6471msgid "load rewriting config for <command> (implies --stdin)"
07432cef 6472msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 6473
07432cef 6474#: builtin/notes.c:638
c04f5ac3
JX
6475msgid "too few parameters"
6476msgstr "参数太少"
6477
07432cef 6478#: builtin/notes.c:659
c04f5ac3
JX
6479#, c-format
6480msgid ""
6481"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6482"existing notes"
6483msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6484
07432cef 6485#: builtin/notes.c:671
c04f5ac3
JX
6486#, c-format
6487msgid "Missing notes on source object %s. Cannot copy."
6488msgstr "源对象 %s 缺少注解。不能拷贝。"
6489
07432cef 6490#: builtin/notes.c:720
ef317cd5
JX
6491#, c-format
6492msgid ""
6493"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6494"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6495msgstr ""
6496"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6497"请换用 'git notes add -f -m/-F/-c/-C'。\n"
6498
07432cef 6499#: builtin/notes.c:867
ef317cd5 6500msgid "General options"
07432cef 6501msgstr "通用选项"
ef317cd5 6502
07432cef 6503#: builtin/notes.c:869
ef317cd5 6504msgid "Merge options"
07432cef 6505msgstr "合并选项"
ef317cd5 6506
07432cef 6507#: builtin/notes.c:871
ef317cd5
JX
6508msgid ""
6509"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6510"cat_sort_uniq)"
07432cef 6511msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 6512
07432cef 6513#: builtin/notes.c:873
ef317cd5 6514msgid "Committing unmerged notes"
07432cef 6515msgstr "提交未合并的注解"
ef317cd5 6516
07432cef 6517#: builtin/notes.c:875
ef317cd5 6518msgid "finalize notes merge by committing unmerged notes"
07432cef 6519msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 6520
07432cef 6521#: builtin/notes.c:877
ef317cd5 6522msgid "Aborting notes merge resolution"
07432cef 6523msgstr "中止注解合并的方案"
ef317cd5 6524
07432cef 6525#: builtin/notes.c:879
ef317cd5 6526msgid "abort notes merge"
07432cef 6527msgstr "中止注解合并"
ef317cd5 6528
07432cef 6529#: builtin/notes.c:974
ef317cd5
JX
6530#, c-format
6531msgid "Object %s has no note\n"
6532msgstr "对象 %s 没有注解\n"
6533
07432cef 6534#: builtin/notes.c:986
ef317cd5 6535msgid "attempt to remove non-existent note is not an error"
07432cef 6536msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 6537
07432cef 6538#: builtin/notes.c:989
ef317cd5 6539msgid "read object names from the standard input"
07432cef 6540msgstr "从标准输入读取对象名称"
ef317cd5 6541
07432cef 6542#: builtin/notes.c:1070
ef317cd5 6543msgid "notes_ref"
07432cef 6544msgstr "注解引用"
ef317cd5 6545
07432cef 6546#: builtin/notes.c:1071
ef317cd5 6547msgid "use notes from <notes_ref>"
07432cef 6548msgstr "从 <注解引用> 使用注解"
ef317cd5 6549
07432cef 6550#: builtin/notes.c:1106 builtin/remote.c:1598
ef317cd5
JX
6551#, c-format
6552msgid "Unknown subcommand: %s"
6553msgstr "未知子命令:%s"
6554
6555#: builtin/pack-objects.c:23
6556msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 6557msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5
JX
6558
6559#: builtin/pack-objects.c:24
6560msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 6561msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5
JX
6562
6563#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6564#, c-format
6565msgid "deflate error (%d)"
6566msgstr "压缩错误 (%d)"
6567
07432cef 6568#: builtin/pack-objects.c:2397
ef317cd5
JX
6569#, c-format
6570msgid "unsupported index version %s"
6571msgstr "不支持的索引版本 %s"
6572
07432cef 6573#: builtin/pack-objects.c:2401
ef317cd5
JX
6574#, c-format
6575msgid "bad index version '%s'"
6576msgstr "坏的索引版本 '%s'"
6577
07432cef 6578#: builtin/pack-objects.c:2424
ef317cd5
JX
6579#, c-format
6580msgid "option %s does not accept negative form"
6581msgstr "选项 %s 不接受否定格式"
6582
07432cef 6583#: builtin/pack-objects.c:2428
ef317cd5
JX
6584#, c-format
6585msgid "unable to parse value '%s' for option %s"
6586msgstr "不能解析选项 %1$s 的值 '%2$s'"
6587
07432cef 6588#: builtin/pack-objects.c:2447
ef317cd5 6589msgid "do not show progress meter"
07432cef 6590msgstr "不显示进度表"
ef317cd5 6591
07432cef 6592#: builtin/pack-objects.c:2449
ef317cd5 6593msgid "show progress meter"
07432cef 6594msgstr "显示进度表"
ef317cd5 6595
07432cef 6596#: builtin/pack-objects.c:2451
ef317cd5 6597msgid "show progress meter during object writing phase"
07432cef 6598msgstr "在对象写入阶段显示进度表"
ef317cd5 6599
07432cef 6600#: builtin/pack-objects.c:2454
ef317cd5 6601msgid "similar to --all-progress when progress meter is shown"
07432cef 6602msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 6603
07432cef 6604#: builtin/pack-objects.c:2455
ef317cd5 6605msgid "version[,offset]"
07432cef 6606msgstr "版本[,偏移]"
ef317cd5 6607
07432cef 6608#: builtin/pack-objects.c:2456
ef317cd5 6609msgid "write the pack index file in the specified idx format version"
07432cef 6610msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 6611
07432cef 6612#: builtin/pack-objects.c:2459
ef317cd5 6613msgid "maximum size of each output pack file"
07432cef 6614msgstr "每个输出包的最大尺寸"
ef317cd5 6615
07432cef 6616#: builtin/pack-objects.c:2461
ef317cd5 6617msgid "ignore borrowed objects from alternate object store"
07432cef 6618msgstr "忽略从替代对象存储里借用对象"
ef317cd5 6619
07432cef 6620#: builtin/pack-objects.c:2463
ef317cd5 6621msgid "ignore packed objects"
07432cef 6622msgstr "忽略包对象"
ef317cd5 6623
07432cef 6624#: builtin/pack-objects.c:2465
ef317cd5 6625msgid "limit pack window by objects"
07432cef 6626msgstr "限制打包窗口的对象数"
ef317cd5 6627
07432cef 6628#: builtin/pack-objects.c:2467
ef317cd5 6629msgid "limit pack window by memory in addition to object limit"
07432cef 6630msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 6631
07432cef 6632#: builtin/pack-objects.c:2469
ef317cd5 6633msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 6634msgstr "打包允许的 delta 链的最大长度"
ef317cd5 6635
07432cef 6636#: builtin/pack-objects.c:2471
ef317cd5 6637msgid "reuse existing deltas"
07432cef 6638msgstr "重用已存在的 deltas"
ef317cd5 6639
07432cef 6640#: builtin/pack-objects.c:2473
ef317cd5 6641msgid "reuse existing objects"
07432cef 6642msgstr "重用已存在的对象"
ef317cd5 6643
07432cef 6644#: builtin/pack-objects.c:2475
ef317cd5 6645msgid "use OFS_DELTA objects"
07432cef 6646msgstr "使用 OFS_DELTA 对象"
ef317cd5 6647
07432cef 6648#: builtin/pack-objects.c:2477
ef317cd5 6649msgid "use threads when searching for best delta matches"
07432cef 6650msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 6651
07432cef 6652#: builtin/pack-objects.c:2479
ef317cd5 6653msgid "do not create an empty pack output"
07432cef 6654msgstr "不创建空的包输出"
ef317cd5 6655
07432cef 6656#: builtin/pack-objects.c:2481
ef317cd5 6657msgid "read revision arguments from standard input"
07432cef 6658msgstr "从标准输入读取修订号参数"
ef317cd5 6659
07432cef 6660#: builtin/pack-objects.c:2483
ef317cd5 6661msgid "limit the objects to those that are not yet packed"
07432cef 6662msgstr "限制那些尚未打包的对象"
ef317cd5 6663
07432cef 6664#: builtin/pack-objects.c:2486
ef317cd5 6665msgid "include objects reachable from any reference"
07432cef 6666msgstr "包括可以从任何引用访问到的对象"
ef317cd5 6667
07432cef 6668#: builtin/pack-objects.c:2489
ef317cd5 6669msgid "include objects referred by reflog entries"
07432cef 6670msgstr "包括被引用日志引用到的对象"
ef317cd5 6671
07432cef 6672#: builtin/pack-objects.c:2492
ef317cd5 6673msgid "output pack to stdout"
07432cef 6674msgstr "输出包到标准输出"
ef317cd5 6675
07432cef 6676#: builtin/pack-objects.c:2494
ef317cd5 6677msgid "include tag objects that refer to objects to be packed"
07432cef 6678msgstr "包括引用了打包对象的 tag"
ef317cd5 6679
07432cef 6680#: builtin/pack-objects.c:2496
ef317cd5 6681msgid "keep unreachable objects"
07432cef 6682msgstr "维持不可达的对象"
ef317cd5 6683
07432cef 6684#: builtin/pack-objects.c:2497 parse-options.h:141
ef317cd5
JX
6685msgid "time"
6686msgstr "时间"
6687
07432cef 6688#: builtin/pack-objects.c:2498
ef317cd5 6689msgid "unpack unreachable objects newer than <time>"
07432cef 6690msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 6691
07432cef 6692#: builtin/pack-objects.c:2501
ef317cd5 6693msgid "create thin packs"
07432cef 6694msgstr "创建精简包"
ef317cd5 6695
07432cef 6696#: builtin/pack-objects.c:2503
ef317cd5 6697msgid "ignore packs that have companion .keep file"
07432cef 6698msgstr "忽略配有 .keep 文件的包"
ef317cd5 6699
07432cef 6700#: builtin/pack-objects.c:2505
ef317cd5 6701msgid "pack compression level"
07432cef 6702msgstr "打包压缩级别"
ef317cd5 6703
07432cef 6704#: builtin/pack-objects.c:2507
ef317cd5 6705msgid "do not hide commits by grafts"
07432cef 6706msgstr "不隐藏移植覆盖的提交"
ef317cd5
JX
6707
6708#: builtin/pack-refs.c:6
6709msgid "git pack-refs [options]"
07432cef 6710msgstr "git pack-refs [选项]"
c04f5ac3 6711
ef317cd5
JX
6712#: builtin/pack-refs.c:14
6713msgid "pack everything"
07432cef 6714msgstr "打包一切"
c04f5ac3 6715
ef317cd5
JX
6716#: builtin/pack-refs.c:15
6717msgid "prune loose refs (default)"
07432cef 6718msgstr "清除松散的引用(默认)"
c04f5ac3 6719
ef317cd5
JX
6720#: builtin/prune-packed.c:7
6721msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 6722msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 6723
ef317cd5
JX
6724#: builtin/prune.c:12
6725msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 6726msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 6727
ef317cd5 6728#: builtin/prune.c:132
ef317cd5 6729msgid "do not remove, show only"
07432cef 6730msgstr "不删除,只显示"
7ac1c0ad 6731
ef317cd5 6732#: builtin/prune.c:133
ef317cd5 6733msgid "report pruned objects"
07432cef 6734msgstr "报告清除的对象"
7ac1c0ad 6735
ef317cd5
JX
6736#: builtin/prune.c:136
6737msgid "expire objects older than <time>"
07432cef 6738msgstr "使早于给定时间的对象过期"
ef317cd5
JX
6739
6740#: builtin/push.c:14
ef317cd5 6741msgid "git push [<options>] [<repository> [<refspec>...]]"
07432cef 6742msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7ac1c0ad 6743
170e9899 6744#: builtin/push.c:45
c04f5ac3
JX
6745msgid "tag shorthand without <tag>"
6746msgstr "tag 简写没有跟 <tag> 参数"
6747
170e9899 6748#: builtin/push.c:64
c04f5ac3 6749msgid "--delete only accepts plain target ref names"
90e6ef53 6750msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 6751
8ada9598
JX
6752#: builtin/push.c:99
6753msgid ""
6754"\n"
6755"To choose either option permanently, see push.default in 'git help config'."
6756msgstr ""
81809b99
JX
6757"\n"
6758"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598
JX
6759
6760#: builtin/push.c:102
6761#, c-format
6762msgid ""
6763"The upstream branch of your current branch does not match\n"
6764"the name of your current branch. To push to the upstream branch\n"
6765"on the remote, use\n"
6766"\n"
6767" git push %s HEAD:%s\n"
6768"\n"
6769"To push to the branch of the same name on the remote, use\n"
6770"\n"
6771" git push %s %s\n"
6772"%s"
6773msgstr ""
81809b99
JX
6774"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
6775"上游分支,使用\n"
6776"\n"
6777" git push %s HEAD:%s\n"
6778"\n"
6779"为推送至远程同名分支,使用\n"
6780"\n"
6781" git push %s %s\n"
6782"%s"
8ada9598
JX
6783
6784#: builtin/push.c:121
c04f5ac3
JX
6785#, c-format
6786msgid ""
6787"You are not currently on a branch.\n"
6788"To push the history leading to the current (detached HEAD)\n"
6789"state now, use\n"
6790"\n"
6791" git push %s HEAD:<name-of-remote-branch>\n"
6792msgstr ""
6793"您当前不在一个分支上。\n"
90e6ef53 6794"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
6795"\n"
6796" git push %s HEAD:<name-of-remote-branch>\n"
6797
8ada9598 6798#: builtin/push.c:128
c04f5ac3
JX
6799#, c-format
6800msgid ""
6801"The current branch %s has no upstream branch.\n"
6802"To push the current branch and set the remote as upstream, use\n"
6803"\n"
6804" git push --set-upstream %s %s\n"
6805msgstr ""
6806"当前分支 %s 没有对应的上游分支。\n"
6807"为推送当前分支并建立与远程上游的跟踪,使用\n"
6808"\n"
6809" git push --set-upstream %s %s\n"
6810
8ada9598 6811#: builtin/push.c:136
c04f5ac3
JX
6812#, c-format
6813msgid "The current branch %s has multiple upstream branches, refusing to push."
6814msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
6815
8ada9598 6816#: builtin/push.c:139
73a60cd2
JX
6817#, c-format
6818msgid ""
6819"You are pushing to remote '%s', which is not the upstream of\n"
6820"your current branch '%s', without telling me what to push\n"
6821"to update which remote branch."
6822msgstr ""
6823"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
6824"而没有告诉我要推送什么、更新哪个远程分支。"
6825
c160d03f
JX
6826# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6827#: builtin/push.c:151
6828msgid ""
6829"push.default is unset; its implicit value is changing in\n"
6830"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6831"and maintain the current behavior after the default changes, use:\n"
6832"\n"
6833" git config --global push.default matching\n"
6834"\n"
6835"To squelch this message and adopt the new behavior now, use:\n"
6836"\n"
6837" git config --global push.default simple\n"
6838"\n"
6839"See 'git help config' and search for 'push.default' for further "
6840"information.\n"
6841"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6842"'current' instead of 'simple' if you sometimes use older versions of Git)"
6843msgstr ""
6844"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
6845"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
6846"进行如下设置:\n"
6847"\n"
6848" git config --global push.default matching\n"
6849"\n"
6850"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
6851"\n"
6852" git config --global push.default simple\n"
6853"\n"
6854"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
6855"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
6856"为保持兼容,请用 'current' 代替 'simple' 模式)"
6857
6858#: builtin/push.c:199
c04f5ac3
JX
6859msgid ""
6860"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90e6ef53 6861msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
c04f5ac3 6862
c160d03f 6863#: builtin/push.c:206
170e9899
JX
6864msgid ""
6865"Updates were rejected because the tip of your current branch is behind\n"
6866"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6867"before pushing again.\n"
6868"See the 'Note about fast-forwards' in 'git push --help' for details."
6869msgstr ""
eff6d3a9
JX
6870"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
6871"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
6872"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 6873
c160d03f 6874#: builtin/push.c:212
170e9899
JX
6875msgid ""
6876"Updates were rejected because a pushed branch tip is behind its remote\n"
6877"counterpart. If you did not intend to push that branch, you may want to\n"
c160d03f
JX
6878"specify branches to push or set the 'push.default' configuration variable\n"
6879"to 'simple', 'current' or 'upstream' to push only the current branch."
170e9899 6880msgstr ""
eff6d3a9
JX
6881"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
6882"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
c160d03f
JX
6883"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
6884"以便只推送当前分支。"
170e9899 6885
c160d03f 6886#: builtin/push.c:218
170e9899
JX
6887msgid ""
6888"Updates were rejected because a pushed branch tip is behind its remote\n"
6889"counterpart. Check out this branch and merge the remote changes\n"
6890"(e.g. 'git pull') before pushing again.\n"
6891"See the 'Note about fast-forwards' in 'git push --help' for details."
6892msgstr ""
eff6d3a9
JX
6893"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
6894"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
6895"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 6896
07432cef
WS
6897#: builtin/push.c:224
6898msgid ""
6899"Updates were rejected because the destination reference already exists\n"
6900"in the remote."
6901msgstr "更新被拒绝因为目标引用在远程已经存在。"
6902
6903#: builtin/push.c:269
c04f5ac3
JX
6904#, c-format
6905msgid "Pushing to %s\n"
6906msgstr "推送到 %s\n"
6907
07432cef 6908#: builtin/push.c:273
c04f5ac3
JX
6909#, c-format
6910msgid "failed to push some refs to '%s'"
6911msgstr "无法推送一些引用到 '%s'"
6912
07432cef 6913#: builtin/push.c:302
c04f5ac3
JX
6914#, c-format
6915msgid "bad repository '%s'"
90e6ef53 6916msgstr "坏的版本库 '%s'"
c04f5ac3 6917
07432cef 6918#: builtin/push.c:303
c04f5ac3
JX
6919msgid ""
6920"No configured push destination.\n"
6921"Either specify the URL from the command-line or configure a remote "
6922"repository using\n"
6923"\n"
6924" git remote add <name> <url>\n"
6925"\n"
6926"and then push using the remote name\n"
6927"\n"
6928" git push <name>\n"
6929msgstr ""
90e6ef53 6930"没有配置推送目标。\n"
07432cef 6931"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
6932"\n"
6933" git remote add <name> <url>\n"
6934"\n"
6935"然后使用该远程版本库名执行推送\n"
6936"\n"
6937" git push <name>\n"
6938
07432cef 6939#: builtin/push.c:318
c04f5ac3
JX
6940msgid "--all and --tags are incompatible"
6941msgstr "--all 和 --tags 不兼容"
6942
07432cef 6943#: builtin/push.c:319
c04f5ac3 6944msgid "--all can't be combined with refspecs"
649900bc 6945msgstr "--all 不能和引用表达式同时使用"
c04f5ac3 6946
07432cef 6947#: builtin/push.c:324
c04f5ac3
JX
6948msgid "--mirror and --tags are incompatible"
6949msgstr "--mirror 和 --tags 不兼容"
6950
07432cef 6951#: builtin/push.c:325
c04f5ac3 6952msgid "--mirror can't be combined with refspecs"
649900bc 6953msgstr "--mirror 不能和引用表达式同时使用"
c04f5ac3 6954
07432cef 6955#: builtin/push.c:330
c04f5ac3
JX
6956msgid "--all and --mirror are incompatible"
6957msgstr "--all 和 --mirror 不兼容"
6958
07432cef 6959#: builtin/push.c:390
ef317cd5 6960msgid "repository"
07432cef 6961msgstr "版本库"
ef317cd5 6962
07432cef 6963#: builtin/push.c:391
ef317cd5 6964msgid "push all refs"
07432cef 6965msgstr "推送所有引用"
ef317cd5 6966
07432cef 6967#: builtin/push.c:392
ef317cd5 6968msgid "mirror all refs"
07432cef 6969msgstr "镜像所有引用"
ef317cd5 6970
07432cef 6971#: builtin/push.c:394
ef317cd5 6972msgid "delete refs"
07432cef 6973msgstr "删除引用"
ef317cd5 6974
07432cef 6975#: builtin/push.c:395
ef317cd5 6976msgid "push tags (can't be used with --all or --mirror)"
07432cef 6977msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 6978
07432cef 6979#: builtin/push.c:398
ef317cd5
JX
6980msgid "force updates"
6981msgstr "强制更新"
6982
07432cef 6983#: builtin/push.c:399
ef317cd5 6984msgid "check"
07432cef 6985msgstr "检查"
ef317cd5 6986
07432cef 6987#: builtin/push.c:400
ef317cd5 6988msgid "control recursive pushing of submodules"
07432cef 6989msgstr "控制子模组的递归推送"
ef317cd5 6990
07432cef 6991#: builtin/push.c:402
ef317cd5 6992msgid "use thin pack"
07432cef 6993msgstr "使用精简打包"
ef317cd5 6994
07432cef 6995#: builtin/push.c:403 builtin/push.c:404
ef317cd5 6996msgid "receive pack program"
07432cef 6997msgstr "接收包程序"
ef317cd5 6998
07432cef 6999#: builtin/push.c:405
ef317cd5 7000msgid "set upstream for git pull/status"
07432cef 7001msgstr "设置 git pull/status 的上游"
ef317cd5 7002
07432cef 7003#: builtin/push.c:408
ef317cd5 7004msgid "prune locally removed refs"
07432cef 7005msgstr "清除本地删除的引用"
ef317cd5 7006
07432cef 7007#: builtin/push.c:418
c04f5ac3
JX
7008msgid "--delete is incompatible with --all, --mirror and --tags"
7009msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7010
07432cef 7011#: builtin/push.c:420
c04f5ac3
JX
7012msgid "--delete doesn't make sense without any refs"
7013msgstr "--delete 未接任何引用没有意义"
7014
ef317cd5
JX
7015#: builtin/read-tree.c:36
7016msgid ""
7017"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7018"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7019"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7020msgstr ""
07432cef
WS
7021"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7022"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7023"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5
JX
7024
7025#: builtin/read-tree.c:108
ef317cd5 7026msgid "write resulting index to <file>"
07432cef 7027msgstr "将索引结果写入 <file>"
ef317cd5
JX
7028
7029#: builtin/read-tree.c:111
ef317cd5 7030msgid "only empty the index"
07432cef 7031msgstr "只是清空索引"
ef317cd5
JX
7032
7033#: builtin/read-tree.c:113
ef317cd5 7034msgid "Merging"
07432cef 7035msgstr "合并"
ef317cd5
JX
7036
7037#: builtin/read-tree.c:115
7038msgid "perform a merge in addition to a read"
07432cef 7039msgstr "读取之余再执行一个合并"
ef317cd5
JX
7040
7041#: builtin/read-tree.c:117
7042msgid "3-way merge if no file level merging required"
07432cef 7043msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5
JX
7044
7045#: builtin/read-tree.c:119
7046msgid "3-way merge in presence of adds and removes"
07432cef 7047msgstr "存在添加和删除时,也执行三路合并"
ef317cd5
JX
7048
7049#: builtin/read-tree.c:121
7050msgid "same as -m, but discard unmerged entries"
07432cef 7051msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5
JX
7052
7053#: builtin/read-tree.c:122
ef317cd5 7054msgid "<subdirectory>/"
07432cef 7055msgstr "<子目录>/"
ef317cd5
JX
7056
7057#: builtin/read-tree.c:123
7058msgid "read the tree into the index under <subdirectory>/"
07432cef 7059msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5
JX
7060
7061#: builtin/read-tree.c:126
7062msgid "update working tree with merge result"
07432cef 7063msgstr "用合并的结果更新工作区"
ef317cd5
JX
7064
7065#: builtin/read-tree.c:128
ef317cd5 7066msgid "gitignore"
07432cef 7067msgstr "gitignore"
ef317cd5
JX
7068
7069#: builtin/read-tree.c:129
7070msgid "allow explicitly ignored files to be overwritten"
07432cef 7071msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5
JX
7072
7073#: builtin/read-tree.c:132
ef317cd5 7074msgid "don't check the working tree after merging"
07432cef 7075msgstr "合并后不检查工作区"
ef317cd5
JX
7076
7077#: builtin/read-tree.c:133
7078msgid "don't update the index or the work tree"
07432cef 7079msgstr "不更新索引区和工作区"
ef317cd5
JX
7080
7081#: builtin/read-tree.c:135
7082msgid "skip applying sparse checkout filter"
07432cef 7083msgstr "跳过应用稀疏检出过滤器"
ef317cd5
JX
7084
7085#: builtin/read-tree.c:137
7086msgid "debug unpack-trees"
07432cef 7087msgstr "调试 unpack-trees"
ef317cd5
JX
7088
7089#: builtin/remote.c:11
7090msgid "git remote [-v | --verbose]"
07432cef 7091msgstr "git remote [-v | --verbose]"
ef317cd5
JX
7092
7093#: builtin/remote.c:12
7094msgid ""
7095"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7096"mirror=<fetch|push>] <name> <url>"
7097msgstr ""
07432cef
WS
7098"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7099"mirror=<fetch|push>] <名称> <url>"
ef317cd5
JX
7100
7101#: builtin/remote.c:13 builtin/remote.c:32
7102msgid "git remote rename <old> <new>"
07432cef 7103msgstr "git remote rename <旧名称> <新名称>"
ef317cd5
JX
7104
7105#: builtin/remote.c:14 builtin/remote.c:37
7106msgid "git remote remove <name>"
07432cef 7107msgstr "git remote remove <名称>"
ef317cd5 7108
07432cef 7109#: builtin/remote.c:15 builtin/remote.c:42
ef317cd5 7110msgid "git remote set-head <name> (-a | -d | <branch>)"
07432cef 7111msgstr "git remote set-head <名称> (-a | -d | <分支>)"
ef317cd5
JX
7112
7113#: builtin/remote.c:16
7114msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 7115msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5
JX
7116
7117#: builtin/remote.c:17
7118msgid "git remote prune [-n | --dry-run] <name>"
07432cef 7119msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5
JX
7120
7121#: builtin/remote.c:18
7122msgid ""
7123"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 7124msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5
JX
7125
7126#: builtin/remote.c:19
7127msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 7128msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5
JX
7129
7130#: builtin/remote.c:20 builtin/remote.c:68
7131msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 7132msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5
JX
7133
7134#: builtin/remote.c:21 builtin/remote.c:69
7135msgid "git remote set-url --add <name> <newurl>"
07432cef 7136msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5
JX
7137
7138#: builtin/remote.c:22 builtin/remote.c:70
7139msgid "git remote set-url --delete <name> <url>"
07432cef 7140msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5
JX
7141
7142#: builtin/remote.c:27
7143msgid "git remote add [<options>] <name> <url>"
07432cef 7144msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5
JX
7145
7146#: builtin/remote.c:47
7147msgid "git remote set-branches <name> <branch>..."
07432cef 7148msgstr "git remote set-branches <名称> <分支>..."
ef317cd5
JX
7149
7150#: builtin/remote.c:48
7151msgid "git remote set-branches --add <name> <branch>..."
07432cef 7152msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5
JX
7153
7154#: builtin/remote.c:53
7155msgid "git remote show [<options>] <name>"
07432cef 7156msgstr "git remote show [<选项>] <名称>"
ef317cd5
JX
7157
7158#: builtin/remote.c:58
7159msgid "git remote prune [<options>] <name>"
07432cef 7160msgstr "git remote prune [<选项>] <名称>"
ef317cd5
JX
7161
7162#: builtin/remote.c:63
7163msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 7164msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 7165
8ada9598 7166#: builtin/remote.c:98
81809b99 7167#, c-format
8ada9598 7168msgid "Updating %s"
81809b99 7169msgstr "更新 %s 中"
8ada9598
JX
7170
7171#: builtin/remote.c:130
7172msgid ""
7173"--mirror is dangerous and deprecated; please\n"
7174"\t use --mirror=fetch or --mirror=push instead"
7175msgstr ""
81809b99
JX
7176"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7177"\t 或 --mirror=push"
8ada9598
JX
7178
7179#: builtin/remote.c:147
81809b99 7180#, c-format
8ada9598 7181msgid "unknown mirror argument: %s"
81809b99 7182msgstr "未知的镜像参数:%s"
8ada9598 7183
ef317cd5 7184#: builtin/remote.c:163
ef317cd5 7185msgid "fetch the remote branches"
07432cef 7186msgstr "抓取远程的分支"
ef317cd5
JX
7187
7188#: builtin/remote.c:165
7189msgid "import all tags and associated objects when fetching"
07432cef 7190msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5
JX
7191
7192#: builtin/remote.c:168
7193msgid "or do not fetch any tag at all (--no-tags)"
07432cef 7194msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5
JX
7195
7196#: builtin/remote.c:170
7197msgid "branch(es) to track"
07432cef 7198msgstr "跟踪的分支"
ef317cd5
JX
7199
7200#: builtin/remote.c:171
ef317cd5 7201msgid "master branch"
07432cef 7202msgstr "主线分支"
ef317cd5
JX
7203
7204#: builtin/remote.c:172
7205msgid "push|fetch"
07432cef 7206msgstr "push|fetch"
ef317cd5
JX
7207
7208#: builtin/remote.c:173
7209msgid "set up remote as a mirror to push to or fetch from"
07432cef 7210msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 7211
8ada9598
JX
7212#: builtin/remote.c:185
7213msgid "specifying a master branch makes no sense with --mirror"
81809b99 7214msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598
JX
7215
7216#: builtin/remote.c:187
7217msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 7218msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598
JX
7219
7220#: builtin/remote.c:195 builtin/remote.c:646
81809b99 7221#, c-format
8ada9598 7222msgid "remote %s already exists."
81809b99 7223msgstr "远程 %s 已经存在。"
8ada9598
JX
7224
7225#: builtin/remote.c:199 builtin/remote.c:650
81809b99 7226#, c-format
8ada9598 7227msgid "'%s' is not a valid remote name"
81809b99 7228msgstr "'%s' 不是一个有效的远程名称"
8ada9598
JX
7229
7230#: builtin/remote.c:243
81809b99 7231#, c-format
8ada9598 7232msgid "Could not setup master '%s'"
81809b99 7233msgstr "无法设置 master '%s'"
8ada9598
JX
7234
7235#: builtin/remote.c:299
81809b99 7236#, c-format
8ada9598 7237msgid "more than one %s"
81809b99 7238msgstr "多于一个 %s"
8ada9598
JX
7239
7240#: builtin/remote.c:339
81809b99 7241#, c-format
8ada9598 7242msgid "Could not get fetch map for refspec %s"
81809b99 7243msgstr "无法得到引用表达式 %s 的获取列表"
8ada9598
JX
7244
7245#: builtin/remote.c:440 builtin/remote.c:448
7246msgid "(matching)"
81809b99 7247msgstr "(匹配)"
8ada9598
JX
7248
7249#: builtin/remote.c:452
8ada9598 7250msgid "(delete)"
81809b99 7251msgstr "(删除)"
8ada9598
JX
7252
7253#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
81809b99 7254#, c-format
8ada9598 7255msgid "Could not append '%s' to '%s'"
81809b99 7256msgstr "不能添加 '%s' 至 '%s'"
8ada9598
JX
7257
7258#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
81809b99 7259#, c-format
8ada9598 7260msgid "No such remote: %s"
81809b99 7261msgstr "没有这样的远程:%s"
8ada9598
JX
7262
7263#: builtin/remote.c:656
81809b99 7264#, c-format
8ada9598 7265msgid "Could not rename config section '%s' to '%s'"
81809b99 7266msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598
JX
7267
7268#: builtin/remote.c:662 builtin/remote.c:799
81809b99 7269#, c-format
8ada9598 7270msgid "Could not remove config section '%s'"
81809b99 7271msgstr "不能移除配置小节 '%s'"
8ada9598
JX
7272
7273#: builtin/remote.c:677
7274#, c-format
7275msgid ""
d691f479 7276"Not updating non-default fetch refspec\n"
8ada9598
JX
7277"\t%s\n"
7278"\tPlease update the configuration manually if necessary."
7279msgstr ""
81809b99
JX
7280"没有更新非默认的获取引用表达式\n"
7281"\t%s\n"
7282"\t如果必要请手动更新配置。"
8ada9598
JX
7283
7284#: builtin/remote.c:683
81809b99 7285#, c-format
8ada9598 7286msgid "Could not append '%s'"
81809b99 7287msgstr "不能追加 '%s'"
8ada9598
JX
7288
7289#: builtin/remote.c:694
81809b99 7290#, c-format
8ada9598 7291msgid "Could not set '%s'"
81809b99 7292msgstr "不能设置 '%s'"
8ada9598
JX
7293
7294#: builtin/remote.c:716
81809b99 7295#, c-format
8ada9598 7296msgid "deleting '%s' failed"
81809b99 7297msgstr "删除 '%s' 失败"
8ada9598
JX
7298
7299#: builtin/remote.c:750
81809b99 7300#, c-format
8ada9598 7301msgid "creating '%s' failed"
81809b99 7302msgstr "创建 '%s' 失败"
8ada9598
JX
7303
7304#: builtin/remote.c:764
81809b99 7305#, c-format
8ada9598 7306msgid "Could not remove branch %s"
81809b99 7307msgstr "无法移除分支 %s"
8ada9598
JX
7308
7309#: builtin/remote.c:834
7310msgid ""
7311"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7312"to delete it, use:"
7313msgid_plural ""
7314"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7315"to delete them, use:"
5ae481e0
JX
7316msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7317msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598
JX
7318
7319#: builtin/remote.c:943
7320#, c-format
7321msgid " new (next fetch will store in remotes/%s)"
81809b99 7322msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598
JX
7323
7324#: builtin/remote.c:946
8ada9598 7325msgid " tracked"
81809b99 7326msgstr " 已跟踪"
8ada9598
JX
7327
7328#: builtin/remote.c:948
7329msgid " stale (use 'git remote prune' to remove)"
81809b99 7330msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598
JX
7331
7332#: builtin/remote.c:950
7333msgid " ???"
81809b99 7334msgstr " ???"
8ada9598
JX
7335
7336#: builtin/remote.c:991
7337#, c-format
7338msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 7339msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598
JX
7340
7341#: builtin/remote.c:998
81809b99 7342#, c-format
8ada9598 7343msgid "rebases onto remote %s"
81809b99 7344msgstr "变基到远程 %s"
8ada9598
JX
7345
7346#: builtin/remote.c:1001
81809b99 7347#, c-format
8ada9598 7348msgid " merges with remote %s"
81809b99 7349msgstr " 与远程 %s 合并"
8ada9598
JX
7350
7351#: builtin/remote.c:1002
7352msgid " and with remote"
81809b99 7353msgstr " 且有远程"
8ada9598
JX
7354
7355#: builtin/remote.c:1004
81809b99 7356#, c-format
8ada9598 7357msgid "merges with remote %s"
81809b99 7358msgstr "与远程 %s 合并"
8ada9598
JX
7359
7360#: builtin/remote.c:1005
7361msgid " and with remote"
81809b99 7362msgstr " 且有远程"
8ada9598
JX
7363
7364#: builtin/remote.c:1051
7365msgid "create"
81809b99 7366msgstr "创建"
8ada9598
JX
7367
7368#: builtin/remote.c:1054
8ada9598 7369msgid "delete"
81809b99 7370msgstr "删除"
8ada9598
JX
7371
7372#: builtin/remote.c:1058
8ada9598 7373msgid "up to date"
81809b99 7374msgstr "最新"
8ada9598
JX
7375
7376#: builtin/remote.c:1061
8ada9598 7377msgid "fast-forwardable"
81809b99 7378msgstr "可快进"
8ada9598
JX
7379
7380#: builtin/remote.c:1064
7381msgid "local out of date"
81809b99 7382msgstr "本地已过时"
8ada9598
JX
7383
7384#: builtin/remote.c:1071
7385#, c-format
7386msgid " %-*s forces to %-*s (%s)"
81809b99 7387msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598
JX
7388
7389#: builtin/remote.c:1074
7390#, c-format
7391msgid " %-*s pushes to %-*s (%s)"
81809b99 7392msgstr " %-*s 推送至 %-*s (%s)"
8ada9598
JX
7393
7394#: builtin/remote.c:1078
7395#, c-format
7396msgid " %-*s forces to %s"
81809b99 7397msgstr " %-*s 强制推送至 %s"
8ada9598
JX
7398
7399#: builtin/remote.c:1081
7400#, c-format
7401msgid " %-*s pushes to %s"
81809b99 7402msgstr " %-*s 推送至 %s"
8ada9598 7403
ef317cd5 7404#: builtin/remote.c:1091
ef317cd5 7405msgid "do not query remotes"
07432cef 7406msgstr "不查询远程"
ef317cd5 7407
8ada9598 7408#: builtin/remote.c:1118
81809b99 7409#, c-format
8ada9598 7410msgid "* remote %s"
81809b99 7411msgstr "* 远程 %s"
8ada9598
JX
7412
7413#: builtin/remote.c:1119
7414#, c-format
7415msgid " Fetch URL: %s"
81809b99 7416msgstr " 获取地址:%s"
8ada9598
JX
7417
7418#: builtin/remote.c:1120 builtin/remote.c:1285
7419msgid "(no URL)"
81809b99 7420msgstr "(无 URL)"
8ada9598
JX
7421
7422#: builtin/remote.c:1129 builtin/remote.c:1131
7423#, c-format
7424msgid " Push URL: %s"
81809b99 7425msgstr " 推送地址:%s"
8ada9598
JX
7426
7427#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
81809b99 7428#, c-format
8ada9598 7429msgid " HEAD branch: %s"
81809b99 7430msgstr " HEAD分支:%s"
8ada9598
JX
7431
7432#: builtin/remote.c:1139
7433#, c-format
7434msgid ""
7435" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 7436msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598
JX
7437
7438#: builtin/remote.c:1151
81809b99 7439#, c-format
8ada9598
JX
7440msgid " Remote branch:%s"
7441msgid_plural " Remote branches:%s"
81809b99 7442msgstr[0] " 远程分支:%s"
5ae481e0 7443msgstr[1] " 远程分支:%s"
8ada9598 7444
81809b99 7445# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
7446#: builtin/remote.c:1154 builtin/remote.c:1181
7447msgid " (status not queried)"
81809b99 7448msgstr "(状态未查询)"
8ada9598
JX
7449
7450#: builtin/remote.c:1163
7451msgid " Local branch configured for 'git pull':"
7452msgid_plural " Local branches configured for 'git pull':"
81809b99 7453msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 7454msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598
JX
7455
7456#: builtin/remote.c:1171
7457msgid " Local refs will be mirrored by 'git push'"
81809b99 7458msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598
JX
7459
7460#: builtin/remote.c:1178
81809b99 7461#, c-format
8ada9598
JX
7462msgid " Local ref configured for 'git push'%s:"
7463msgid_plural " Local refs configured for 'git push'%s:"
81809b99 7464msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 7465msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 7466
ef317cd5
JX
7467#: builtin/remote.c:1199
7468msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 7469msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5
JX
7470
7471#: builtin/remote.c:1201
7472msgid "delete refs/remotes/<name>/HEAD"
07432cef 7473msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 7474
8ada9598 7475#: builtin/remote.c:1216
8ada9598 7476msgid "Cannot determine remote HEAD"
81809b99 7477msgstr "无法确定远程 HEAD"
8ada9598
JX
7478
7479#: builtin/remote.c:1218
7480msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 7481msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598
JX
7482
7483#: builtin/remote.c:1228
81809b99 7484#, c-format
8ada9598 7485msgid "Could not delete %s"
81809b99 7486msgstr "无法删除 %s"
8ada9598
JX
7487
7488#: builtin/remote.c:1236
81809b99 7489#, c-format
8ada9598 7490msgid "Not a valid ref: %s"
81809b99 7491msgstr "不是一个有效引用:%s"
8ada9598
JX
7492
7493#: builtin/remote.c:1238
81809b99 7494#, c-format
8ada9598 7495msgid "Could not setup %s"
81809b99 7496msgstr "不能设置 %s"
8ada9598
JX
7497
7498# 译者:注意保持前导空格
7499#: builtin/remote.c:1274
81809b99 7500#, c-format
8ada9598 7501msgid " %s will become dangling!"
07432cef 7502msgstr " %s 将成为摇摆状态!"
8ada9598
JX
7503
7504# 译者:注意保持前导空格
7505#: builtin/remote.c:1275
81809b99 7506#, c-format
8ada9598 7507msgid " %s has become dangling!"
07432cef 7508msgstr " %s 已成为摇摆状态!"
8ada9598
JX
7509
7510#: builtin/remote.c:1281
81809b99 7511#, c-format
8ada9598 7512msgid "Pruning %s"
81809b99 7513msgstr "修剪 %s"
8ada9598
JX
7514
7515#: builtin/remote.c:1282
7516#, c-format
7517msgid "URL: %s"
81809b99 7518msgstr "URL:%s"
8ada9598
JX
7519
7520#: builtin/remote.c:1295
7521#, c-format
7522msgid " * [would prune] %s"
81809b99 7523msgstr " * [将删除] %s"
8ada9598
JX
7524
7525#: builtin/remote.c:1298
7526#, c-format
7527msgid " * [pruned] %s"
81809b99 7528msgstr " * [已删除] %s"
8ada9598 7529
ef317cd5
JX
7530#: builtin/remote.c:1321
7531msgid "prune remotes after fetching"
07432cef 7532msgstr "抓取后清除远程"
ef317cd5 7533
8ada9598 7534#: builtin/remote.c:1387 builtin/remote.c:1461
81809b99 7535#, c-format
8ada9598 7536msgid "No such remote '%s'"
81809b99 7537msgstr "没有此远程 '%s'"
8ada9598 7538
ef317cd5 7539#: builtin/remote.c:1407
ef317cd5 7540msgid "add branch"
07432cef 7541msgstr "添加分支"
ef317cd5 7542
8ada9598 7543#: builtin/remote.c:1414
8ada9598 7544msgid "no remote specified"
81809b99 7545msgstr "未指定远程"
8ada9598 7546
ef317cd5
JX
7547#: builtin/remote.c:1436
7548msgid "manipulate push URLs"
07432cef 7549msgstr "操作推送 URLS"
ef317cd5
JX
7550
7551#: builtin/remote.c:1438
7552msgid "add URL"
07432cef 7553msgstr "添加 URL"
ef317cd5
JX
7554
7555#: builtin/remote.c:1440
ef317cd5 7556msgid "delete URLs"
07432cef 7557msgstr "删除 URLS"
ef317cd5 7558
8ada9598 7559#: builtin/remote.c:1447
8ada9598 7560msgid "--add --delete doesn't make sense"
81809b99 7561msgstr "--add --delete 无意义"
8ada9598
JX
7562
7563#: builtin/remote.c:1487
81809b99 7564#, c-format
8ada9598 7565msgid "Invalid old URL pattern: %s"
81809b99 7566msgstr "无效的旧URL匹配模版:%s"
8ada9598
JX
7567
7568#: builtin/remote.c:1495
81809b99 7569#, c-format
8ada9598 7570msgid "No such URL found: %s"
81809b99 7571msgstr "未找到此URL:%s"
8ada9598
JX
7572
7573#: builtin/remote.c:1497
7574msgid "Will not delete all non-push URLs"
81809b99 7575msgstr "将不会删除所有非推送URL地址"
8ada9598 7576
ef317cd5
JX
7577#: builtin/remote.c:1569
7578msgid "be verbose; must be placed before a subcommand"
07432cef 7579msgstr "冗长输出;必须置于子命令之前"
ef317cd5
JX
7580
7581#: builtin/replace.c:17
7582msgid "git replace [-f] <object> <replacement>"
07432cef 7583msgstr "git replace [-f] <对象> <替换物>"
ef317cd5
JX
7584
7585#: builtin/replace.c:18
7586msgid "git replace -d <object>..."
07432cef 7587msgstr "git replace -d <对象>..."
ef317cd5
JX
7588
7589#: builtin/replace.c:19
7590msgid "git replace -l [<pattern>]"
07432cef 7591msgstr "git replace -l [<模式>]"
ef317cd5 7592
07432cef 7593#: builtin/replace.c:121
ef317cd5 7594msgid "list replace refs"
07432cef 7595msgstr "列出替换的引用"
ef317cd5 7596
07432cef 7597#: builtin/replace.c:122
ef317cd5 7598msgid "delete replace refs"
07432cef 7599msgstr "删除替换的引用"
ef317cd5 7600
07432cef 7601#: builtin/replace.c:123
ef317cd5 7602msgid "replace the ref if it exists"
07432cef 7603msgstr "如果存在则替换引用"
ef317cd5
JX
7604
7605#: builtin/rerere.c:11
7606msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 7607msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5
JX
7608
7609#: builtin/rerere.c:56
ef317cd5 7610msgid "register clean resolutions in index"
07432cef 7611msgstr "在索引中注册干净的解决方案"
ef317cd5
JX
7612
7613#: builtin/reset.c:25
7614msgid ""
7615"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 7616msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5
JX
7617
7618#: builtin/reset.c:26
07432cef
WS
7619msgid "git reset [-q] <tree-ish> [--] <paths>..."
7620msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5
JX
7621
7622#: builtin/reset.c:27
07432cef
WS
7623msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7624msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 7625
c04f5ac3
JX
7626#: builtin/reset.c:33
7627msgid "mixed"
7628msgstr "混杂"
7629
7630#: builtin/reset.c:33
7631msgid "soft"
7632msgstr "软性"
7633
7634#: builtin/reset.c:33
7635msgid "hard"
7636msgstr "硬性"
7637
8ada9598
JX
7638#: builtin/reset.c:33
7639msgid "merge"
7640msgstr "合并"
7641
c04f5ac3
JX
7642#: builtin/reset.c:33
7643msgid "keep"
7644msgstr "保持"
7645
07432cef 7646#: builtin/reset.c:73
c04f5ac3
JX
7647msgid "You do not have a valid HEAD."
7648msgstr "您没有一个有效的 HEAD。"
7649
07432cef 7650#: builtin/reset.c:75
c04f5ac3
JX
7651msgid "Failed to find tree of HEAD."
7652msgstr "无法找到 HEAD 指向的树。"
7653
07432cef 7654#: builtin/reset.c:81
c04f5ac3
JX
7655#, c-format
7656msgid "Failed to find tree of %s."
7657msgstr "无法找到 %s 指向的树。"
7658
07432cef 7659#: builtin/reset.c:98
c04f5ac3
JX
7660#, c-format
7661msgid "HEAD is now at %s"
7662msgstr "HEAD 现在位于 %s"
7663
90e6ef53 7664# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7665#: builtin/reset.c:169
c04f5ac3
JX
7666#, c-format
7667msgid "Cannot do a %s reset in the middle of a merge."
7668msgstr "在合并过程中不能做%s重置操作。"
7669
07432cef 7670#: builtin/reset.c:248
ef317cd5 7671msgid "be quiet, only report errors"
07432cef 7672msgstr "安静模式,只报告错误"
ef317cd5 7673
07432cef 7674#: builtin/reset.c:250
ef317cd5 7675msgid "reset HEAD and index"
07432cef 7676msgstr "重置 HEAD 和索引"
ef317cd5 7677
07432cef 7678#: builtin/reset.c:251
ef317cd5 7679msgid "reset only HEAD"
07432cef 7680msgstr "只重置 HEAD"
ef317cd5 7681
07432cef 7682#: builtin/reset.c:253 builtin/reset.c:255
ef317cd5 7683msgid "reset HEAD, index and working tree"
07432cef 7684msgstr "重置 HEAD、索引和工作区"
ef317cd5 7685
07432cef 7686#: builtin/reset.c:257
ef317cd5 7687msgid "reset HEAD but keep local changes"
07432cef 7688msgstr "重置 HEAD 但保存本地变更"
ef317cd5 7689
07432cef
WS
7690#: builtin/reset.c:275
7691#, c-format
7692msgid "Failed to resolve '%s' as a valid revision."
7693msgstr "无法将 '%s' 解析为一个有效的版本。"
7694
7695#: builtin/reset.c:278 builtin/reset.c:286
c04f5ac3
JX
7696#, c-format
7697msgid "Could not parse object '%s'."
7698msgstr "不能解析对象 '%s'。"
7699
07432cef
WS
7700#: builtin/reset.c:283
7701#, c-format
7702msgid "Failed to resolve '%s' as a valid tree."
7703msgstr "无法将 '%s' 解析为一个有效的树对象。"
7704
7705#: builtin/reset.c:292
c04f5ac3 7706msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 7707msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 7708
07432cef 7709#: builtin/reset.c:301
c04f5ac3 7710msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 7711msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 7712
90e6ef53 7713# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7714#: builtin/reset.c:303
c04f5ac3
JX
7715#, c-format
7716msgid "Cannot do %s reset with paths."
7717msgstr "不能带路径进行%s重置。"
7718
90e6ef53 7719# 译者:汉字之间无空格,故删除%s前后空格
07432cef 7720#: builtin/reset.c:313
c04f5ac3
JX
7721#, c-format
7722msgid "%s reset is not allowed in a bare repository"
7723msgstr "不能对裸版本库进行%s重置"
7724
07432cef 7725#: builtin/reset.c:333
ef317cd5
JX
7726#, c-format
7727msgid "Could not reset index file to revision '%s'."
7728msgstr "不能重置索引文件至版本 '%s'。"
7729
07432cef
WS
7730#: builtin/reset.c:339
7731msgid "Unstaged changes after reset:"
7732msgstr "重置后撤出暂存区的变更:"
7733
7734#: builtin/reset.c:344
7735msgid "Could not write new index file."
7736msgstr "不能写入新的索引文件。"
7737
ef317cd5 7738#: builtin/rev-parse.c:339
ef317cd5 7739msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 7740msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5
JX
7741
7742#: builtin/rev-parse.c:344
7743msgid "keep the `--` passed as an arg"
07432cef 7744msgstr "保持 `--` 作为一个参数传递"
ef317cd5
JX
7745
7746#: builtin/rev-parse.c:346
7747msgid "stop parsing after the first non-option argument"
07432cef 7748msgstr "遇到第一个非选项参数后停止解析"
ef317cd5
JX
7749
7750#: builtin/rev-parse.c:464
7751msgid ""
7752"git rev-parse --parseopt [options] -- [<args>...]\n"
7753" or: git rev-parse --sq-quote [<arg>...]\n"
7754" or: git rev-parse [options] [<arg>...]\n"
7755"\n"
7756"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7757msgstr ""
07432cef
WS
7758"git rev-parse --parseopt [选项] -- [<参数>...]\n"
7759" 或者:git rev-parse --sq-quote [<选项>...]\n"
7760" 或者:git rev-parse [options] [<选项>...]\n"
7761"\n"
7762"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
7763
7764#: builtin/revert.c:22
7765msgid "git revert [options] <commit-ish>"
07432cef 7766msgstr "git revert [选项] <提交号>"
ef317cd5
JX
7767
7768#: builtin/revert.c:23
7769msgid "git revert <subcommand>"
07432cef 7770msgstr "git revert <子命令>"
ef317cd5
JX
7771
7772#: builtin/revert.c:28
7773msgid "git cherry-pick [options] <commit-ish>"
07432cef 7774msgstr "git cherry-pick [选项] <提交号>"
ef317cd5
JX
7775
7776#: builtin/revert.c:29
ef317cd5 7777msgid "git cherry-pick <subcommand>"
07432cef 7778msgstr "git cherry-pick <子命令>"
ef317cd5
JX
7779
7780#: builtin/revert.c:70 builtin/revert.c:92
7781#, c-format
7782msgid "%s: %s cannot be used with %s"
7783msgstr "%s:%s 不能和 %s 同时使用"
7784
7785#: builtin/revert.c:103
7786msgid "end revert or cherry-pick sequence"
07432cef 7787msgstr "终止反转或拣选操作"
ef317cd5
JX
7788
7789#: builtin/revert.c:104
7790msgid "resume revert or cherry-pick sequence"
07432cef 7791msgstr "继续反转或拣选操作"
ef317cd5
JX
7792
7793#: builtin/revert.c:105
7794msgid "cancel revert or cherry-pick sequence"
07432cef 7795msgstr "取消反转或拣选操作"
ef317cd5
JX
7796
7797#: builtin/revert.c:106
ef317cd5 7798msgid "don't automatically commit"
07432cef 7799msgstr "不要自动提交"
ef317cd5
JX
7800
7801#: builtin/revert.c:107
ef317cd5 7802msgid "edit the commit message"
07432cef 7803msgstr "编辑提交说明"
ef317cd5
JX
7804
7805#: builtin/revert.c:110
7806msgid "parent number"
07432cef 7807msgstr "父编号"
ef317cd5
JX
7808
7809#: builtin/revert.c:112
ef317cd5 7810msgid "merge strategy"
07432cef 7811msgstr "合并策略"
ef317cd5
JX
7812
7813#: builtin/revert.c:113
ef317cd5 7814msgid "option"
07432cef 7815msgstr "选项"
ef317cd5
JX
7816
7817#: builtin/revert.c:114
ef317cd5 7818msgid "option for merge strategy"
07432cef 7819msgstr "合并策略的选项"
ef317cd5
JX
7820
7821#: builtin/revert.c:125
7822msgid "append commit name"
07432cef 7823msgstr "追加提交名称"
ef317cd5
JX
7824
7825#: builtin/revert.c:126
ef317cd5 7826msgid "allow fast-forward"
07432cef 7827msgstr "允许快进式"
c04f5ac3 7828
ef317cd5 7829#: builtin/revert.c:127
ef317cd5 7830msgid "preserve initially empty commits"
07432cef 7831msgstr "保留初始化的空提交"
ef317cd5
JX
7832
7833#: builtin/revert.c:128
ef317cd5 7834msgid "allow commits with empty messages"
07432cef 7835msgstr "允许提交说明为空"
c04f5ac3 7836
ef317cd5 7837#: builtin/revert.c:129
ef317cd5 7838msgid "keep redundant, empty commits"
07432cef 7839msgstr "保持多余的、空的提交"
ef317cd5
JX
7840
7841#: builtin/revert.c:133
c04f5ac3
JX
7842msgid "program error"
7843msgstr "程序错误"
7844
ef317cd5 7845#: builtin/revert.c:223
c04f5ac3
JX
7846msgid "revert failed"
7847msgstr "还原失败"
7848
ef317cd5 7849#: builtin/revert.c:238
c04f5ac3
JX
7850msgid "cherry-pick failed"
7851msgstr "拣选失败"
7852
07432cef 7853#: builtin/rm.c:15
ef317cd5 7854msgid "git rm [options] [--] <file>..."
07432cef
WS
7855msgstr "git rm [选项] [--] <文件>..."
7856
7857#: builtin/rm.c:64 builtin/rm.c:186
7858#, c-format
7859msgid ""
7860"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
7861"(use 'rm -rf' if you really want to remove it including all of its history)"
7862msgstr ""
7863"子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
7864"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 7865
07432cef 7866#: builtin/rm.c:174
c04f5ac3
JX
7867#, c-format
7868msgid ""
7869"'%s' has staged content different from both the file and the HEAD\n"
7870"(use -f to force removal)"
7871msgstr ""
90e6ef53 7872"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
c04f5ac3
JX
7873"(使用 -f 强制删除)"
7874
07432cef 7875#: builtin/rm.c:180
c04f5ac3
JX
7876#, c-format
7877msgid ""
7878"'%s' has changes staged in the index\n"
7879"(use --cached to keep the file, or -f to force removal)"
7880msgstr ""
90e6ef53 7881"'%s' 有变更已暂存至索引中\n"
c04f5ac3
JX
7882"(使用 --cached 保存文件,或用 -f 强制删除)"
7883
07432cef 7884#: builtin/rm.c:191
c04f5ac3
JX
7885#, c-format
7886msgid ""
7887"'%s' has local modifications\n"
7888"(use --cached to keep the file, or -f to force removal)"
7889msgstr ""
7890"'%s' 有本地修改\n"
7891"(使用 --cached 保存文件,或用 -f 强制删除)"
7892
07432cef 7893#: builtin/rm.c:207
ef317cd5 7894msgid "do not list removed files"
07432cef 7895msgstr "不列出删除的文件"
ef317cd5 7896
07432cef 7897#: builtin/rm.c:208
ef317cd5 7898msgid "only remove from the index"
07432cef 7899msgstr "只从索引区删除"
ef317cd5 7900
07432cef 7901#: builtin/rm.c:209
ef317cd5 7902msgid "override the up-to-date check"
07432cef 7903msgstr "忽略文件更新状态检查"
ef317cd5 7904
07432cef 7905#: builtin/rm.c:210
ef317cd5 7906msgid "allow recursive removal"
07432cef 7907msgstr "允许递归删除"
ef317cd5 7908
07432cef 7909#: builtin/rm.c:212
ef317cd5 7910msgid "exit with a zero status even if nothing matched"
07432cef 7911msgstr "即使没有匹配,也以零状态退出"
ef317cd5 7912
07432cef 7913#: builtin/rm.c:283
c04f5ac3
JX
7914#, c-format
7915msgid "not removing '%s' recursively without -r"
7916msgstr "未提供 -r 选项不会递归删除 '%s'"
7917
07432cef 7918#: builtin/rm.c:322
c04f5ac3
JX
7919#, c-format
7920msgid "git rm: unable to remove %s"
7921msgstr "git rm:不能删除 %s"
7922
ef317cd5
JX
7923#: builtin/shortlog.c:13
7924msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
07432cef 7925msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
ef317cd5 7926
07432cef 7927#: builtin/shortlog.c:133
c04f5ac3
JX
7928#, c-format
7929msgid "Missing author: %s"
7930msgstr "缺少作者:%s"
7931
07432cef 7932#: builtin/shortlog.c:229
ef317cd5 7933msgid "sort output according to the number of commits per author"
07432cef 7934msgstr "根据每个作者的提交数量排序"
ef317cd5 7935
07432cef 7936#: builtin/shortlog.c:231
ef317cd5 7937msgid "Suppress commit descriptions, only provides commit count"
07432cef 7938msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 7939
07432cef 7940#: builtin/shortlog.c:233
ef317cd5 7941msgid "Show the email address of each author"
07432cef 7942msgstr "显示每个作者的电子邮件地址"
ef317cd5 7943
07432cef 7944#: builtin/shortlog.c:234
ef317cd5 7945msgid "w[,i1[,i2]]"
07432cef 7946msgstr "w[,i1[,i2]]"
ef317cd5 7947
07432cef 7948#: builtin/shortlog.c:235
ef317cd5 7949msgid "Linewrap output"
07432cef 7950msgstr "折行输出"
ef317cd5
JX
7951
7952#: builtin/show-branch.c:9
7953msgid ""
7954"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7955"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7956"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7957"<glob>)...]"
7958msgstr ""
07432cef
WS
7959"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
7960"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
7961"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
7962"<glob>)...]"
ef317cd5
JX
7963
7964#: builtin/show-branch.c:10
7965msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 7966msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5
JX
7967
7968#: builtin/show-branch.c:651
ef317cd5 7969msgid "show remote-tracking and local branches"
07432cef 7970msgstr "显示远程跟踪的和本地的分支"
ef317cd5
JX
7971
7972#: builtin/show-branch.c:653
ef317cd5 7973msgid "show remote-tracking branches"
07432cef 7974msgstr "显示远程跟踪的分支"
ef317cd5
JX
7975
7976#: builtin/show-branch.c:655
7977msgid "color '*!+-' corresponding to the branch"
07432cef 7978msgstr "着色 '*!+-' 到相应的分支"
ef317cd5
JX
7979
7980#: builtin/show-branch.c:657
7981msgid "show <n> more commits after the common ancestor"
07432cef 7982msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5
JX
7983
7984#: builtin/show-branch.c:659
7985msgid "synonym to more=-1"
07432cef 7986msgstr "和 more=-1 同义"
ef317cd5
JX
7987
7988#: builtin/show-branch.c:660
7989msgid "suppress naming strings"
07432cef 7990msgstr "不显示字符串命名"
ef317cd5
JX
7991
7992#: builtin/show-branch.c:662
ef317cd5 7993msgid "include the current branch"
07432cef 7994msgstr "包括当前分支"
ef317cd5
JX
7995
7996#: builtin/show-branch.c:664
ef317cd5 7997msgid "name commits with their object names"
07432cef 7998msgstr "以对象名字命名提交"
ef317cd5
JX
7999
8000#: builtin/show-branch.c:666
8001msgid "show possible merge bases"
07432cef 8002msgstr "显示可能合并的基线"
ef317cd5
JX
8003
8004#: builtin/show-branch.c:668
8005msgid "show refs unreachable from any other ref"
07432cef 8006msgstr "显示没有任何引用的的引用"
ef317cd5
JX
8007
8008#: builtin/show-branch.c:670
8009msgid "show commits in topological order"
07432cef 8010msgstr "以拓扑顺序显示提交"
ef317cd5
JX
8011
8012#: builtin/show-branch.c:672
8013msgid "show only commits not on the first branch"
07432cef 8014msgstr "只显示不在第一个分支上的提交"
ef317cd5
JX
8015
8016#: builtin/show-branch.c:674
8017msgid "show merges reachable from only one tip"
07432cef 8018msgstr "显示仅一个分支可访问的合并提交"
ef317cd5
JX
8019
8020#: builtin/show-branch.c:676
8021msgid "show commits where no parent comes before its children"
07432cef 8022msgstr "显示提交时以时间为序且父提交不能领先子提交"
ef317cd5
JX
8023
8024#: builtin/show-branch.c:678
8025msgid "<n>[,<base>]"
07432cef 8026msgstr "<n>[,<base>]"
ef317cd5
JX
8027
8028#: builtin/show-branch.c:679
8029msgid "show <n> most recent ref-log entries starting at base"
07432cef 8030msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
8031
8032#: builtin/show-ref.c:10
8033msgid ""
8034"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
8035"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8036msgstr ""
07432cef
WS
8037"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
8038"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
8039
8040#: builtin/show-ref.c:11
8041msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 8042msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 8043
07432cef 8044#: builtin/show-ref.c:165
ef317cd5 8045msgid "only show tags (can be combined with heads)"
07432cef 8046msgstr "只显示 tags(可以和头共用)"
ef317cd5 8047
07432cef 8048#: builtin/show-ref.c:166
ef317cd5 8049msgid "only show heads (can be combined with tags)"
07432cef 8050msgstr "只显示头(可以和 tags 共用)"
ef317cd5 8051
07432cef 8052#: builtin/show-ref.c:167
ef317cd5 8053msgid "stricter reference checking, requires exact ref path"
07432cef 8054msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 8055
07432cef 8056#: builtin/show-ref.c:170 builtin/show-ref.c:172
ef317cd5 8057msgid "show the HEAD reference"
07432cef 8058msgstr "显示 HEAD 引用"
ef317cd5 8059
07432cef 8060#: builtin/show-ref.c:174
ef317cd5 8061msgid "dereference tags into object IDs"
07432cef 8062msgstr "转换 tags 到对象ID"
ef317cd5 8063
07432cef 8064#: builtin/show-ref.c:176
ef317cd5 8065msgid "only show SHA1 hash using <n> digits"
07432cef 8066msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 8067
07432cef 8068#: builtin/show-ref.c:180
ef317cd5 8069msgid "do not print results to stdout (useful with --verify)"
07432cef 8070msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 8071
07432cef 8072#: builtin/show-ref.c:182
ef317cd5 8073msgid "show refs from stdin that aren't in local repository"
07432cef 8074msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
8075
8076#: builtin/symbolic-ref.c:7
8077msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
8078msgstr "git symbolic-ref [选项] 名称 [引用]"
8079
8080#: builtin/symbolic-ref.c:8
8081msgid "git symbolic-ref -d [-q] name"
8082msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 8083
07432cef 8084#: builtin/symbolic-ref.c:40
ef317cd5 8085msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
8086msgstr "不显示非符号(分离的)引用的错误信息"
8087
8088#: builtin/symbolic-ref.c:41
8089msgid "delete symbolic ref"
8090msgstr "删除符号引用"
ef317cd5 8091
07432cef 8092#: builtin/symbolic-ref.c:42
ef317cd5 8093msgid "shorten ref output"
07432cef 8094msgstr "简短的引用输出"
ef317cd5 8095
07432cef 8096#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8097msgid "reason"
07432cef 8098msgstr "原因"
ef317cd5 8099
07432cef 8100#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8101msgid "reason of the update"
07432cef 8102msgstr "更新的原因"
ef317cd5
JX
8103
8104#: builtin/tag.c:22
8105msgid ""
8106"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8107msgstr ""
07432cef 8108"git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
8109
8110#: builtin/tag.c:23
8111msgid "git tag -d <tagname>..."
07432cef 8112msgstr "git tag -d <标签名>..."
ef317cd5
JX
8113
8114#: builtin/tag.c:24
8115msgid ""
8116"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8117"\t\t[<pattern>...]"
8118msgstr ""
07432cef
WS
8119"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8120"\t\t[<模式>...]"
ef317cd5
JX
8121
8122#: builtin/tag.c:26
8123msgid "git tag -v <tagname>..."
07432cef 8124msgstr "git tag -v <标签名>..."
ef317cd5 8125
8ada9598 8126#: builtin/tag.c:60
7ac1c0ad
JX
8127#, c-format
8128msgid "malformed object at '%s'"
8129msgstr "非法的对象于 '%s'"
8130
8ada9598 8131#: builtin/tag.c:207
c04f5ac3
JX
8132#, c-format
8133msgid "tag name too long: %.*s..."
8134msgstr "tag 名字太长:%.*s..."
8135
8ada9598 8136#: builtin/tag.c:212
c04f5ac3
JX
8137#, c-format
8138msgid "tag '%s' not found."
8139msgstr "tag '%s' 未发现。"
8140
8ada9598 8141#: builtin/tag.c:227
c04f5ac3
JX
8142#, c-format
8143msgid "Deleted tag '%s' (was %s)\n"
8144msgstr "已删除 tag '%s'(曾为 %s)\n"
8145
8ada9598 8146#: builtin/tag.c:239
c04f5ac3
JX
8147#, c-format
8148msgid "could not verify the tag '%s'"
8149msgstr "不能校验 tag '%s'"
8150
8ada9598 8151#: builtin/tag.c:249
c04f5ac3
JX
8152msgid ""
8153"\n"
8154"#\n"
8155"# Write a tag message\n"
8156"# Lines starting with '#' will be ignored.\n"
8157"#\n"
8158msgstr ""
8159"\n"
8160"#\n"
8161"# 输入一个 tag 说明\n"
8162"# 以 '#' 开头的行将被忽略。\n"
8163"#\n"
8164
8ada9598 8165#: builtin/tag.c:256
c04f5ac3
JX
8166msgid ""
8167"\n"
8168"#\n"
8169"# Write a tag message\n"
8170"# Lines starting with '#' will be kept; you may remove them yourself if you "
8171"want to.\n"
8172"#\n"
8173msgstr ""
8174"\n"
8175"#\n"
8176"# 输入一个 tag 说明\n"
8177"# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
8178"#\n"
8179
8ada9598 8180#: builtin/tag.c:298
c04f5ac3
JX
8181msgid "unable to sign the tag"
8182msgstr "无法签署 tag"
8183
8ada9598 8184#: builtin/tag.c:300
c04f5ac3
JX
8185msgid "unable to write tag file"
8186msgstr "无法写 tag 文件"
8187
8ada9598 8188#: builtin/tag.c:325
c04f5ac3 8189msgid "bad object type."
90e6ef53 8190msgstr "坏的对象类型。"
c04f5ac3 8191
8ada9598 8192#: builtin/tag.c:338
c04f5ac3 8193msgid "tag header too big."
90e6ef53 8194msgstr "tag 头信息太大。"
c04f5ac3 8195
8ada9598 8196#: builtin/tag.c:370
c04f5ac3
JX
8197msgid "no tag message?"
8198msgstr "无 tag 说明?"
8199
8ada9598 8200#: builtin/tag.c:376
c04f5ac3
JX
8201#, c-format
8202msgid "The tag message has been left in %s\n"
8203msgstr "tag 说明被保留在 %s\n"
8204
8ada9598 8205#: builtin/tag.c:425
7ac1c0ad
JX
8206msgid "switch 'points-at' requires an object"
8207msgstr "开关 'points-at' 需要一个对象"
8208
8ada9598 8209#: builtin/tag.c:427
7ac1c0ad
JX
8210#, c-format
8211msgid "malformed object name '%s'"
8212msgstr "非法的对象名 '%s'"
8213
ef317cd5
JX
8214#: builtin/tag.c:447
8215msgid "list tag names"
07432cef 8216msgstr "列出tag名称"
ef317cd5
JX
8217
8218#: builtin/tag.c:449
8219msgid "print <n> lines of each tag message"
07432cef 8220msgstr "每个 tag 信息打印 <n> 行"
ef317cd5
JX
8221
8222#: builtin/tag.c:451
ef317cd5 8223msgid "delete tags"
07432cef 8224msgstr "删除 tags"
ef317cd5
JX
8225
8226#: builtin/tag.c:452
8227msgid "verify tags"
07432cef 8228msgstr "验证 tags"
ef317cd5
JX
8229
8230#: builtin/tag.c:454
8231msgid "Tag creation options"
07432cef 8232msgstr "Tag 创建选项"
ef317cd5
JX
8233
8234#: builtin/tag.c:456
ef317cd5 8235msgid "annotated tag, needs a message"
07432cef 8236msgstr "注解 tag,需要一个说明"
ef317cd5
JX
8237
8238#: builtin/tag.c:458
ef317cd5 8239msgid "tag message"
07432cef 8240msgstr "tag 说明"
ef317cd5
JX
8241
8242#: builtin/tag.c:460
8243msgid "annotated and GPG-signed tag"
07432cef 8244msgstr "注解并 GPG 签名的 tag"
ef317cd5
JX
8245
8246#: builtin/tag.c:464
ef317cd5 8247msgid "use another key to sign the tag"
07432cef 8248msgstr "使用另外的私钥签名 tag"
ef317cd5
JX
8249
8250#: builtin/tag.c:465
8251msgid "replace the tag if exists"
07432cef 8252msgstr "如果存在,替换现有的 tag"
ef317cd5
JX
8253
8254#: builtin/tag.c:466
8255msgid "show tag list in columns"
07432cef 8256msgstr "以列的方式显示 tag"
ef317cd5
JX
8257
8258#: builtin/tag.c:468
8259msgid "Tag listing options"
07432cef 8260msgstr "Tag 列表选项"
ef317cd5
JX
8261
8262#: builtin/tag.c:471
8263msgid "print only tags that contain the commit"
07432cef 8264msgstr "只打印包含提交的tags"
ef317cd5
JX
8265
8266#: builtin/tag.c:477
8267msgid "print only tags of the object"
07432cef 8268msgstr "只打印tags对象"
ef317cd5 8269
8ada9598 8270#: builtin/tag.c:506
8ada9598 8271msgid "--column and -n are incompatible"
81809b99 8272msgstr "--column 和 -n 不兼容"
8ada9598
JX
8273
8274#: builtin/tag.c:523
c04f5ac3 8275msgid "-n option is only allowed with -l."
649900bc 8276msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 8277
8ada9598 8278#: builtin/tag.c:525
c04f5ac3 8279msgid "--contains option is only allowed with -l."
649900bc 8280msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 8281
8ada9598 8282#: builtin/tag.c:527
7ac1c0ad 8283msgid "--points-at option is only allowed with -l."
649900bc 8284msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 8285
8ada9598 8286#: builtin/tag.c:535
c04f5ac3
JX
8287msgid "only one -F or -m option is allowed."
8288msgstr "只允许一个 -F 或 -m 选项。"
8289
8ada9598 8290#: builtin/tag.c:555
c04f5ac3
JX
8291msgid "too many params"
8292msgstr "太多参数"
8293
8ada9598 8294#: builtin/tag.c:561
c04f5ac3
JX
8295#, c-format
8296msgid "'%s' is not a valid tag name."
90e6ef53 8297msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 8298
8ada9598 8299#: builtin/tag.c:566
c04f5ac3
JX
8300#, c-format
8301msgid "tag '%s' already exists"
8302msgstr "tag '%s' 已存在"
8303
8ada9598 8304#: builtin/tag.c:584
c04f5ac3
JX
8305#, c-format
8306msgid "%s: cannot lock the ref"
8307msgstr "%s:不能锁定引用"
8308
8ada9598 8309#: builtin/tag.c:586
c04f5ac3
JX
8310#, c-format
8311msgid "%s: cannot update the ref"
8312msgstr "%s:不能更新引用"
8313
8ada9598 8314#: builtin/tag.c:588
c04f5ac3
JX
8315#, c-format
8316msgid "Updated tag '%s' (was %s)\n"
8317msgstr "已更新tag '%s'(曾为 %s)\n"
8318
ef317cd5 8319#: builtin/update-index.c:401
ef317cd5 8320msgid "git update-index [options] [--] [<file>...]"
07432cef 8321msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 8322
07432cef 8323#: builtin/update-index.c:718
ef317cd5 8324msgid "continue refresh even when index needs update"
07432cef 8325msgstr "当索引需要更新时继续刷新"
8ada9598 8326
07432cef 8327#: builtin/update-index.c:721
ef317cd5 8328msgid "refresh: ignore submodules"
07432cef 8329msgstr "刷新:忽略子模组"
8ada9598 8330
07432cef 8331#: builtin/update-index.c:724
ef317cd5 8332msgid "do not ignore new files"
07432cef 8333msgstr "不忽略新的文件"
8ada9598 8334
07432cef 8335#: builtin/update-index.c:726
ef317cd5 8336msgid "let files replace directories and vice-versa"
07432cef 8337msgstr "让文件替换目录(反之亦然)"
ef317cd5 8338
07432cef 8339#: builtin/update-index.c:728
ef317cd5 8340msgid "notice files missing from worktree"
07432cef 8341msgstr "通知文件从工作区丢失"
ef317cd5 8342
07432cef 8343#: builtin/update-index.c:730
ef317cd5 8344msgid "refresh even if index contains unmerged entries"
07432cef 8345msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 8346
07432cef 8347#: builtin/update-index.c:733
ef317cd5 8348msgid "refresh stat information"
07432cef 8349msgstr "刷新统计信息"
ef317cd5 8350
07432cef 8351#: builtin/update-index.c:737
ef317cd5 8352msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 8353msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 8354
07432cef 8355#: builtin/update-index.c:741
ef317cd5 8356msgid "<mode> <object> <path>"
07432cef 8357msgstr "<mode> <object> <path>"
ef317cd5 8358
07432cef 8359#: builtin/update-index.c:742
ef317cd5 8360msgid "add the specified entry to the index"
07432cef 8361msgstr "添加指定的条目到索引区"
ef317cd5 8362
07432cef 8363#: builtin/update-index.c:746
ef317cd5 8364msgid "(+/-)x"
07432cef 8365msgstr "(+/-)x"
ef317cd5 8366
07432cef 8367#: builtin/update-index.c:747
ef317cd5 8368msgid "override the executable bit of the listed files"
07432cef 8369msgstr "覆盖列表里文件的可执行位"
ef317cd5 8370
07432cef 8371#: builtin/update-index.c:751
ef317cd5 8372msgid "mark files as \"not changing\""
07432cef 8373msgstr "把文件标记为 \"没有变更\""
ef317cd5 8374
07432cef 8375#: builtin/update-index.c:754
ef317cd5 8376msgid "clear assumed-unchanged bit"
07432cef 8377msgstr "清除 assumed-unchanged 位"
ef317cd5 8378
07432cef 8379#: builtin/update-index.c:757
ef317cd5 8380msgid "mark files as \"index-only\""
07432cef 8381msgstr "把文件标记为 \"仅索引\""
ef317cd5 8382
07432cef 8383#: builtin/update-index.c:760
ef317cd5 8384msgid "clear skip-worktree bit"
07432cef 8385msgstr "清除 skip-worktree 位"
ef317cd5 8386
07432cef 8387#: builtin/update-index.c:763
ef317cd5 8388msgid "add to index only; do not add content to object database"
07432cef 8389msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 8390
07432cef 8391#: builtin/update-index.c:765
ef317cd5 8392msgid "remove named paths even if present in worktree"
07432cef 8393msgstr "即使存在工作区里,也删除路径"
ef317cd5 8394
07432cef 8395#: builtin/update-index.c:767
ef317cd5 8396msgid "with --stdin: input lines are terminated by null bytes"
07432cef 8397msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 8398
07432cef 8399#: builtin/update-index.c:769
ef317cd5 8400msgid "read list of paths to be updated from standard input"
07432cef 8401msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 8402
07432cef 8403#: builtin/update-index.c:773
ef317cd5 8404msgid "add entries from standard input to the index"
07432cef 8405msgstr "从标准输入添加条目到索引区"
ef317cd5 8406
07432cef 8407#: builtin/update-index.c:777
ef317cd5 8408msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 8409msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 8410
07432cef 8411#: builtin/update-index.c:781
ef317cd5 8412msgid "only update entries that differ from HEAD"
07432cef 8413msgstr "只更新与 HEAD 不同的条目"
ef317cd5 8414
07432cef 8415#: builtin/update-index.c:785
ef317cd5 8416msgid "ignore files missing from worktree"
07432cef 8417msgstr "忽略工作区丢失的文件"
ef317cd5 8418
07432cef 8419#: builtin/update-index.c:788
ef317cd5 8420msgid "report actions to standard output"
07432cef 8421msgstr "在标准输出显示操作"
ef317cd5 8422
07432cef 8423#: builtin/update-index.c:790
ef317cd5 8424msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 8425msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 8426
07432cef 8427#: builtin/update-index.c:794
ef317cd5 8428msgid "write index in this format"
07432cef 8429msgstr "以这种格式写入索引区"
ef317cd5
JX
8430
8431#: builtin/update-ref.c:7
8432msgid "git update-ref [options] -d <refname> [<oldval>]"
07432cef 8433msgstr "git update-ref [options] -d <引用名> [<旧值>]"
ef317cd5
JX
8434
8435#: builtin/update-ref.c:8
8436msgid "git update-ref [options] <refname> <newval> [<oldval>]"
07432cef 8437msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
ef317cd5
JX
8438
8439#: builtin/update-ref.c:19
8440msgid "delete the reference"
07432cef 8441msgstr "删除引用"
ef317cd5
JX
8442
8443#: builtin/update-ref.c:21
8444msgid "update <refname> not the one it points to"
07432cef 8445msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5
JX
8446
8447#: builtin/update-server-info.c:6
8448msgid "git update-server-info [--force]"
07432cef 8449msgstr "git update-server-info [--force]"
ef317cd5
JX
8450
8451#: builtin/update-server-info.c:14
8452msgid "update the info files from scratch"
07432cef 8453msgstr "从头开始更新文件信息"
ef317cd5
JX
8454
8455#: builtin/verify-pack.c:56
8456msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 8457msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5
JX
8458
8459#: builtin/verify-pack.c:66
ef317cd5
JX
8460msgid "verbose"
8461msgstr "冗长输出"
8462
8463#: builtin/verify-pack.c:68
8464msgid "show statistics only"
07432cef 8465msgstr "只显示统计"
ef317cd5
JX
8466
8467#: builtin/verify-tag.c:17
8468msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 8469msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
8470
8471#: builtin/verify-tag.c:73
8472msgid "print tag contents"
07432cef 8473msgstr "打印 tag 内容"
ef317cd5
JX
8474
8475#: builtin/write-tree.c:13
8476msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 8477msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
8478
8479#: builtin/write-tree.c:26
8480msgid "<prefix>/"
07432cef 8481msgstr "<前缀>/"
ef317cd5
JX
8482
8483#: builtin/write-tree.c:27
8484msgid "write tree object for a subdirectory <prefix>"
07432cef 8485msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
8486
8487#: builtin/write-tree.c:30
8488msgid "only useful for debugging"
07432cef 8489msgstr "只对调试有用"
ef317cd5
JX
8490
8491#: git.c:16
8492msgid "See 'git help <command>' for more information on a specific command."
8493msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8ada9598
JX
8494
8495#: parse-options.h:156
8496msgid "no-op (backward compatibility)"
81809b99 8497msgstr "空操作(向后兼容)"
8ada9598 8498
07432cef 8499#: parse-options.h:232
8ada9598 8500msgid "be more verbose"
81809b99 8501msgstr "更加详细"
8ada9598 8502
07432cef 8503#: parse-options.h:234
8ada9598 8504msgid "be more quiet"
81809b99 8505msgstr "更加安静"
8ada9598 8506
07432cef 8507#: parse-options.h:240
8ada9598 8508msgid "use <n> digits to display SHA-1s"
81809b99 8509msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
8510
8511#: common-cmds.h:8
8512msgid "Add file contents to the index"
81809b99 8513msgstr "添加文件内容至索引"
8ada9598
JX
8514
8515#: common-cmds.h:9
8516msgid "Find by binary search the change that introduced a bug"
81809b99 8517msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
8518
8519#: common-cmds.h:10
8ada9598 8520msgid "List, create, or delete branches"
81809b99 8521msgstr "列出、创建或删除分支"
8ada9598
JX
8522
8523#: common-cmds.h:11
8524msgid "Checkout a branch or paths to the working tree"
81809b99 8525msgstr "检出一个分支或路径到工作区"
8ada9598
JX
8526
8527#: common-cmds.h:12
8ada9598 8528msgid "Clone a repository into a new directory"
81809b99 8529msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
8530
8531#: common-cmds.h:13
8ada9598 8532msgid "Record changes to the repository"
81809b99 8533msgstr "记录变更到版本库"
8ada9598
JX
8534
8535#: common-cmds.h:14
8536msgid "Show changes between commits, commit and working tree, etc"
81809b99 8537msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
8538
8539#: common-cmds.h:15
8540msgid "Download objects and refs from another repository"
81809b99 8541msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
8542
8543#: common-cmds.h:16
8544msgid "Print lines matching a pattern"
81809b99 8545msgstr "输出和模式匹配的行"
8ada9598
JX
8546
8547#: common-cmds.h:17
8548msgid "Create an empty git repository or reinitialize an existing one"
07432cef 8549msgstr "创建一个空的 git 版本库或重新初始化一个"
8ada9598
JX
8550
8551#: common-cmds.h:18
8ada9598 8552msgid "Show commit logs"
81809b99 8553msgstr "显示提交日志"
8ada9598
JX
8554
8555#: common-cmds.h:19
8556msgid "Join two or more development histories together"
81809b99 8557msgstr "合并两个或更多开发历史"
8ada9598
JX
8558
8559#: common-cmds.h:20
8560msgid "Move or rename a file, a directory, or a symlink"
81809b99 8561msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
8562
8563#: common-cmds.h:21
8564msgid "Fetch from and merge with another repository or a local branch"
81809b99 8565msgstr "获取并合并另外的版本库或一个本地分支"
8ada9598
JX
8566
8567#: common-cmds.h:22
8568msgid "Update remote refs along with associated objects"
81809b99 8569msgstr "更新远程引用和相关的对象"
8ada9598
JX
8570
8571#: common-cmds.h:23
8572msgid "Forward-port local commits to the updated upstream head"
81809b99 8573msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
8574
8575#: common-cmds.h:24
8576msgid "Reset current HEAD to the specified state"
81809b99 8577msgstr "重置当前HEAD到指定状态"
8ada9598
JX
8578
8579#: common-cmds.h:25
8580msgid "Remove files from the working tree and from the index"
81809b99 8581msgstr "从工作区和索引中删除文件"
8ada9598
JX
8582
8583#: common-cmds.h:26
8584msgid "Show various types of objects"
81809b99 8585msgstr "显示各种类型的对象"
8ada9598
JX
8586
8587#: common-cmds.h:27
8ada9598 8588msgid "Show the working tree status"
81809b99 8589msgstr "显示工作区状态"
8ada9598
JX
8590
8591#: common-cmds.h:28
8592msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 8593msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 8594
170e9899 8595#: git-am.sh:50
c04f5ac3
JX
8596msgid "You need to set your committer info first"
8597msgstr "您需要先设置你的提交者信息"
8598
b694fbb1
JX
8599#: git-am.sh:95
8600msgid ""
8601"You seem to have moved HEAD since the last 'am' failure.\n"
8602"Not rewinding to ORIG_HEAD"
6792b93b 8603msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1
JX
8604
8605#: git-am.sh:105
8606#, sh-format
8607msgid ""
649900bc
JX
8608"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8609"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8610"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1
JX
8611msgstr ""
8612"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8613"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8614"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8615
8616#: git-am.sh:121
8617msgid "Cannot fall back to three-way merge."
8618msgstr "无法求助于三路合并。"
8619
170e9899 8620#: git-am.sh:137
c04f5ac3 8621msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 8622msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc
JX
8623
8624#: git-am.sh:139
8625msgid "Using index info to reconstruct a base tree..."
8626msgstr "更新索引信息以重建基树..."
c04f5ac3 8627
170e9899 8628#: git-am.sh:154
c04f5ac3
JX
8629msgid ""
8630"Did you hand edit your patch?\n"
8631"It does not apply to blobs recorded in its index."
8632msgstr ""
8633"您是否曾手动编辑过您的补丁?\n"
07432cef 8634"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 8635
170e9899 8636#: git-am.sh:163
c04f5ac3 8637msgid "Falling back to patching base and 3-way merge..."
b694fbb1 8638msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 8639
649900bc
JX
8640#: git-am.sh:179
8641msgid "Failed to merge in the changes."
8642msgstr "无法合并变更。"
8643
8644#: git-am.sh:274
c04f5ac3
JX
8645msgid "Only one StGIT patch series can be applied at once"
8646msgstr "一次只能有一个 StGIT 补丁队列被应用"
8647
649900bc 8648#: git-am.sh:361
c04f5ac3
JX
8649#, sh-format
8650msgid "Patch format $patch_format is not supported."
8651msgstr "不支持 $patch_format 补丁格式。"
8652
649900bc 8653#: git-am.sh:363
c04f5ac3
JX
8654msgid "Patch format detection failed."
8655msgstr "补丁格式检测失败。"
8656
649900bc
JX
8657#: git-am.sh:389
8658msgid ""
8659"The -b/--binary option has been a no-op for long time, and\n"
8660"it will be removed. Please do not use it anymore."
8661msgstr ""
8662"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8663"请不要再使用它了。"
c04f5ac3 8664
649900bc 8665#: git-am.sh:477
c04f5ac3
JX
8666#, sh-format
8667msgid "previous rebase directory $dotest still exists but mbox given."
8668msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8669
649900bc 8670#: git-am.sh:482
c04f5ac3
JX
8671msgid "Please make up your mind. --skip or --abort?"
8672msgstr "请下决心。--skip 或是 --abort ?"
8673
649900bc 8674#: git-am.sh:509
c04f5ac3
JX
8675msgid "Resolve operation not in progress, we are not resuming."
8676msgstr "解决操作未进行,我们不会继续。"
8677
649900bc 8678#: git-am.sh:575
c04f5ac3
JX
8679#, sh-format
8680msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 8681msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 8682
649900bc 8683#: git-am.sh:679
b694fbb1
JX
8684#, sh-format
8685msgid ""
8686"Patch is empty. Was it split wrong?\n"
8687"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8688"To restore the original branch and stop patching run \"$cmdline --abort\"."
8689msgstr ""
8690"补丁为空。是不是切分错误?\n"
8691"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
8692"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8693
649900bc 8694#: git-am.sh:706
b694fbb1
JX
8695msgid "Patch does not have a valid e-mail address."
8696msgstr "补丁中没有一个有效的邮件地址。"
8697
649900bc 8698#: git-am.sh:753
c04f5ac3 8699msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 8700msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 8701
649900bc 8702#: git-am.sh:757
b694fbb1
JX
8703msgid "Commit Body is:"
8704msgstr "提交内容为:"
8705
90e6ef53 8706# 译者:注意保持句尾空格
c04f5ac3
JX
8707#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8708#. in your translation. The program will only accept English
8709#. input at this point.
649900bc 8710#: git-am.sh:764
c04f5ac3
JX
8711msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8712msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8713
649900bc 8714#: git-am.sh:800
c04f5ac3
JX
8715#, sh-format
8716msgid "Applying: $FIRSTLINE"
8717msgstr "正应用:$FIRSTLINE"
8718
649900bc 8719#: git-am.sh:821
b694fbb1
JX
8720msgid ""
8721"No changes - did you forget to use 'git add'?\n"
8722"If there is nothing left to stage, chances are that something else\n"
8723"already introduced the same changes; you might want to skip this patch."
8724msgstr ""
8725"没有变更 —— 您是不是忘了执行 'git add'?\n"
8726"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8727"您也许想要跳过这个补丁。"
8728
649900bc 8729#: git-am.sh:829
b694fbb1
JX
8730msgid ""
8731"You still have unmerged paths in your index\n"
8732"did you forget to use 'git add'?"
6792b93b 8733msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 8734
649900bc 8735#: git-am.sh:845
c04f5ac3
JX
8736msgid "No changes -- Patch already applied."
8737msgstr "没有变更 -- 补丁已经应用过。"
8738
649900bc 8739#: git-am.sh:855
b694fbb1
JX
8740#, sh-format
8741msgid "Patch failed at $msgnum $FIRSTLINE"
8742msgstr "补丁失败于 $msgnum $FIRSTLINE"
8743
ef317cd5
JX
8744#: git-am.sh:858
8745#, sh-format
8746msgid ""
8747"The copy of the patch that failed is found in:\n"
8748" $dotest/patch"
8749msgstr ""
07432cef
WS
8750"失败的补丁文件副本位于:\n"
8751" $dotest/patch"
ef317cd5 8752
649900bc 8753#: git-am.sh:876
c04f5ac3
JX
8754msgid "applying to an empty history"
8755msgstr "正应用到一个空历史上"
8756
b694fbb1
JX
8757#: git-bisect.sh:48
8758msgid "You need to start by \"git bisect start\""
8759msgstr "您需要执行 \"git bisect start\" 来开始"
8760
90e6ef53 8761# 译者:注意保持句尾空格
c04f5ac3
JX
8762#. TRANSLATORS: Make sure to include [Y] and [n] in your
8763#. translation. The program will only accept English input
8764#. at this point.
8765#: git-bisect.sh:54
8766msgid "Do you want me to do it for you [Y/n]? "
8767msgstr "您想让我为您这样做么[Y/n]? "
8768
8769#: git-bisect.sh:95
8770#, sh-format
8771msgid "unrecognised option: '$arg'"
81809b99 8772msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
8773
8774#: git-bisect.sh:99
8775#, sh-format
8776msgid "'$arg' does not appear to be a valid revision"
8777msgstr "'$arg' 看起来不像是一个有效的版本"
8778
8779#: git-bisect.sh:117
8780msgid "Bad HEAD - I need a HEAD"
8781msgstr "坏的 HEAD - 我需要一个 HEAD"
8782
8783#: git-bisect.sh:130
8784#, sh-format
8785msgid ""
8786"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8787msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
8788
8789#: git-bisect.sh:140
8790msgid "won't bisect on seeked tree"
8791msgstr "不会在已查找过的树上二分查找"
8792
8793#: git-bisect.sh:144
8794msgid "Bad HEAD - strange symbolic ref"
90e6ef53 8795msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
8796
8797#: git-bisect.sh:189
8798#, sh-format
8799msgid "Bad bisect_write argument: $state"
90e6ef53 8800msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
8801
8802#: git-bisect.sh:218
8803#, sh-format
8804msgid "Bad rev input: $arg"
90e6ef53 8805msgstr "输入坏的版本:$arg"
c04f5ac3
JX
8806
8807#: git-bisect.sh:232
8808msgid "Please call 'bisect_state' with at least one argument."
8809msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
8810
8811#: git-bisect.sh:244
8812#, sh-format
8813msgid "Bad rev input: $rev"
8814msgstr "输入坏的版本:$rev"
8815
8816#: git-bisect.sh:250
8817msgid "'git bisect bad' can take only one argument."
8818msgstr "'git bisect bad' 只能带一个参数。"
8819
b694fbb1
JX
8820#. have bad but not good. we could bisect although
8821#. this is less optimum.
8822#: git-bisect.sh:273
8823msgid "Warning: bisecting only with a bad commit."
8824msgstr "警告:在仅有一个坏提交下进行二分查找。"
8825
90e6ef53 8826# 译者:注意保持句尾空格
c04f5ac3
JX
8827#. TRANSLATORS: Make sure to include [Y] and [n] in your
8828#. translation. The program will only accept English input
8829#. at this point.
8830#: git-bisect.sh:279
8831msgid "Are you sure [Y/n]? "
8832msgstr "您确认么[Y/n]? "
8833
b694fbb1
JX
8834#: git-bisect.sh:289
8835msgid ""
8836"You need to give me at least one good and one bad revisions.\n"
8837"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8838msgstr ""
8839"您需要给我至少一个好版本和一个坏版本。\n"
8840"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8841
8842#: git-bisect.sh:292
8843msgid ""
8844"You need to start by \"git bisect start\".\n"
8845"You then need to give me at least one good and one bad revisions.\n"
8846"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8847msgstr ""
8848"您需要执行 \"git bisect start\" 来开始。\n"
8849"然后需要提供我至少一个好版本和一个坏版本。\n"
8850"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8851
8852#: git-bisect.sh:347 git-bisect.sh:474
8853msgid "We are not bisecting."
8854msgstr "我们没有在二分查找。"
8855
c04f5ac3
JX
8856#: git-bisect.sh:354
8857#, sh-format
8858msgid "'$invalid' is not a valid commit"
8859msgstr "'$invalid' 不是一个有效的提交"
8860
8861#: git-bisect.sh:363
8862#, sh-format
8863msgid ""
8864"Could not check out original HEAD '$branch'.\n"
8865"Try 'git bisect reset <commit>'."
8866msgstr ""
8867"不能检出原始 HEAD '$branch'。\n"
07432cef 8868"尝试 'git bisect reset <提交>'。"
c04f5ac3
JX
8869
8870#: git-bisect.sh:390
8871msgid "No logfile given"
8872msgstr "未提供日志文件"
8873
8874#: git-bisect.sh:391
8875#, sh-format
8876msgid "cannot read $file for replaying"
8877msgstr "不能读取 $file 来重放"
8878
8879#: git-bisect.sh:408
8880msgid "?? what are you talking about?"
8881msgstr "?? 您在说什么?"
8882
b694fbb1
JX
8883#: git-bisect.sh:420
8884#, sh-format
8885msgid "running $command"
8886msgstr "运行 $command"
8887
8888#: git-bisect.sh:427
8889#, sh-format
8890msgid ""
8891"bisect run failed:\n"
8892"exit code $res from '$command' is < 0 or >= 128"
8893msgstr ""
8894"二分查找运行失败:\n"
07432cef 8895"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1
JX
8896
8897#: git-bisect.sh:453
8898msgid "bisect run cannot continue any more"
8899msgstr "二分查找不能继续运行"
8900
8901#: git-bisect.sh:459
8902#, sh-format
8903msgid ""
8904"bisect run failed:\n"
8905"'bisect_state $state' exited with error code $res"
8906msgstr ""
8907"二分查找运行失败:\n"
8908"'bisect_state $state' 退出码为 $res"
8909
8910#: git-bisect.sh:466
8911msgid "bisect run success"
8912msgstr "二分查找运行成功"
c04f5ac3
JX
8913
8914#: git-pull.sh:21
8915msgid ""
8916"Pull is not possible because you have unmerged files.\n"
8917"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
8918"as appropriate to mark resolution, or use 'git commit -a'."
8919msgstr ""
90e6ef53 8920"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 8921"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 8922"或者使用 'git commit -a'。"
c04f5ac3
JX
8923
8924#: git-pull.sh:25
8925msgid "Pull is not possible because you have unmerged files."
90e6ef53 8926msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 8927
7ac1c0ad 8928#: git-pull.sh:197
c04f5ac3 8929msgid "updating an unborn branch with changes added to the index"
90e6ef53 8930msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 8931
b694fbb1
JX
8932#. The fetch involved updating the current branch.
8933#. The working tree and the index file is still based on the
8934#. $orig_head commit, but we are merging into $curr_head.
8935#. First update the working tree to match $curr_head.
07432cef 8936#: git-pull.sh:229
b694fbb1
JX
8937#, sh-format
8938msgid ""
8939"Warning: fetch updated the current branch head.\n"
8940"Warning: fast-forwarding your working tree from\n"
8941"Warning: commit $orig_head."
8942msgstr ""
8943"警告:fetch 更新了当前的分支。您的工作区\n"
8944"警告:从原提交 $orig_head 快进。"
8945
07432cef 8946#: git-pull.sh:254
c04f5ac3
JX
8947msgid "Cannot merge multiple branches into empty head"
8948msgstr "无法将多个分支合并到空分支"
8949
07432cef 8950#: git-pull.sh:258
c04f5ac3
JX
8951msgid "Cannot rebase onto multiple branches"
8952msgstr "无法变基到多个分支"
8953
07432cef 8954#: git-rebase.sh:53
649900bc
JX
8955msgid ""
8956"When you have resolved this problem, run \"git rebase --continue\".\n"
8957"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
8958"To check out the original branch and stop rebasing, run \"git rebase --abort"
8959"\"."
8960msgstr ""
8961"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
8962"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
8963"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
8964
07432cef 8965#: git-rebase.sh:160
649900bc
JX
8966msgid "The pre-rebase hook refused to rebase."
8967msgstr "钩子 pre-rebase 拒绝变基。"
8968
07432cef 8969#: git-rebase.sh:165
649900bc
JX
8970msgid "It looks like git-am is in progress. Cannot rebase."
8971msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
8972
07432cef 8973#: git-rebase.sh:296
649900bc
JX
8974msgid "The --exec option must be used with the --interactive option"
8975msgstr "选项 --exec 必须和选项 --interactive 同时使用"
8976
07432cef 8977#: git-rebase.sh:301
649900bc
JX
8978msgid "No rebase in progress?"
8979msgstr "没有正在进行的变基?"
8980
07432cef
WS
8981#: git-rebase.sh:312
8982msgid "The --edit-todo action can only be used during interactive rebase."
8983msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
8984
8985#: git-rebase.sh:319
649900bc
JX
8986msgid "Cannot read HEAD"
8987msgstr "不能读取 HEAD"
8988
07432cef 8989#: git-rebase.sh:322
649900bc
JX
8990msgid ""
8991"You must edit all merge conflicts and then\n"
8992"mark them as resolved using git add"
8993msgstr ""
8994"您必须编辑所有的合并冲突,然后通过 git add\n"
8995"命令将它们标记为已解决"
8996
07432cef 8997#: git-rebase.sh:340
649900bc
JX
8998#, sh-format
8999msgid "Could not move back to $head_name"
9000msgstr "无法移回 $head_name"
9001
07432cef 9002#: git-rebase.sh:359
649900bc
JX
9003#, sh-format
9004msgid ""
9005"It seems that there is already a $state_dir_base directory, and\n"
9006"I wonder if you are in the middle of another rebase. If that is the\n"
9007"case, please try\n"
9008"\t$cmd_live_rebase\n"
9009"If that is not the case, please\n"
9010"\t$cmd_clear_stale_rebase\n"
9011"and run me again. I am stopping in case you still have something\n"
9012"valuable there."
9013msgstr ""
9014"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9015"如果是这样,请尝试执行\n"
9016"\t$cmd_live_rebase\n"
9017"如果不是这样,请执行\n"
9018"\t$cmd_clear_stale_rebase\n"
9019"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9020
07432cef 9021#: git-rebase.sh:404
649900bc
JX
9022#, sh-format
9023msgid "invalid upstream $upstream_name"
9024msgstr "无效的上游 $upstream_name"
9025
07432cef 9026#: git-rebase.sh:428
649900bc
JX
9027#, sh-format
9028msgid "$onto_name: there are more than one merge bases"
9029msgstr "$onto_name: 有一个以上的合并基准"
9030
07432cef 9031#: git-rebase.sh:431 git-rebase.sh:435
649900bc
JX
9032#, sh-format
9033msgid "$onto_name: there is no merge base"
9034msgstr "$onto_name: 没有合并基准"
9035
07432cef 9036#: git-rebase.sh:440
649900bc
JX
9037#, sh-format
9038msgid "Does not point to a valid commit: $onto_name"
9039msgstr "没有指向一个有效的提交:$onto_name"
9040
07432cef 9041#: git-rebase.sh:463
649900bc
JX
9042#, sh-format
9043msgid "fatal: no such branch: $branch_name"
9044msgstr "严重错误:无此分支:$branch_name"
9045
07432cef 9046#: git-rebase.sh:483
649900bc
JX
9047msgid "Please commit or stash them."
9048msgstr "请提交或为它们保存进度。"
9049
07432cef 9050#: git-rebase.sh:501
649900bc
JX
9051#, sh-format
9052msgid "Current branch $branch_name is up to date."
9053msgstr "当前分支 $branch_name 是最新的。"
9054
07432cef 9055#: git-rebase.sh:504
649900bc
JX
9056#, sh-format
9057msgid "Current branch $branch_name is up to date, rebase forced."
9058msgstr "当前分支 $branch_name 是最新的,强制变基。"
9059
07432cef 9060#: git-rebase.sh:515
649900bc
JX
9061#, sh-format
9062msgid "Changes from $mb to $onto:"
9063msgstr "变更从 $mb 到 $onto:"
9064
9065#. Detach HEAD and reset the tree
07432cef 9066#: git-rebase.sh:524
649900bc
JX
9067msgid "First, rewinding head to replay your work on top of it..."
9068msgstr "首先,重置头指针以便在上面重放您的工作..."
9069
07432cef 9070#: git-rebase.sh:532
649900bc
JX
9071#, sh-format
9072msgid "Fast-forwarded $branch_name to $onto_name."
9073msgstr "快进 $branch_name 至 $onto_name。"
9074
c04f5ac3
JX
9075#: git-stash.sh:51
9076msgid "git stash clear with parameters is unimplemented"
9077msgstr "git stash clear 不支持参数"
9078
9079#: git-stash.sh:74
9080msgid "You do not have the initial commit yet"
9081msgstr "您尚未建立初始提交"
9082
9083#: git-stash.sh:89
9084msgid "Cannot save the current index state"
90e6ef53 9085msgstr "无法保存当前索引状态"
c04f5ac3
JX
9086
9087#: git-stash.sh:123 git-stash.sh:136
9088msgid "Cannot save the current worktree state"
9089msgstr "无法保存当前工作区状态"
9090
9091#: git-stash.sh:140
9092msgid "No changes selected"
90e6ef53 9093msgstr "没有选择变更"
c04f5ac3
JX
9094
9095#: git-stash.sh:143
9096msgid "Cannot remove temporary index (can't happen)"
90e6ef53 9097msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
9098
9099#: git-stash.sh:156
9100msgid "Cannot record working tree state"
9101msgstr "不能记录工作区状态"
9102
b694fbb1
JX
9103#. TRANSLATORS: $option is an invalid option, like
9104#. `--blah-blah'. The 7 spaces at the beginning of the
9105#. second line correspond to "error: ". So you should line
9106#. up the second line with however many characters the
9107#. translation of "error: " takes in your language. E.g. in
9108#. English this is:
9109#.
9110#. $ git stash save --blah-blah 2>&1 | head -n 2
9111#. error: unknown option for 'stash save': --blah-blah
9112#. To provide a message, use git stash save -- '--blah-blah'
9113#: git-stash.sh:202
9114#, sh-format
9115msgid ""
9116"error: unknown option for 'stash save': $option\n"
9117" To provide a message, use git stash save -- '$option'"
9118msgstr ""
9119"错误:'stash save' 的未知选项:$option\n"
9120" 要提供一个描述信息,使用 git stash save -- '$option'"
9121
c04f5ac3
JX
9122#: git-stash.sh:223
9123msgid "No local changes to save"
9124msgstr "没有要保存的本地修改"
9125
9126#: git-stash.sh:227
9127msgid "Cannot initialize stash"
90e6ef53 9128msgstr "无法初始化 stash"
c04f5ac3
JX
9129
9130#: git-stash.sh:235
9131msgid "Cannot save the current status"
9132msgstr "无法保存当前状态"
9133
9134#: git-stash.sh:253
9135msgid "Cannot remove worktree changes"
9136msgstr "无法删除工作区变更"
9137
9138#: git-stash.sh:352
9139msgid "No stash found."
90e6ef53 9140msgstr "未发现 stash。"
c04f5ac3
JX
9141
9142#: git-stash.sh:359
9143#, sh-format
9144msgid "Too many revisions specified: $REV"
90e6ef53 9145msgstr "指定了太多的版本:$REV"
c04f5ac3
JX
9146
9147#: git-stash.sh:365
9148#, sh-format
9149msgid "$reference is not valid reference"
9150msgstr "$reference 不是有效的引用"
9151
9152#: git-stash.sh:393
9153#, sh-format
9154msgid "'$args' is not a stash-like commit"
90e6ef53 9155msgstr "'$args' 不是 stash 样提交"
c04f5ac3
JX
9156
9157#: git-stash.sh:404
9158#, sh-format
9159msgid "'$args' is not a stash reference"
90e6ef53 9160msgstr "'$args' 不是一个 stash 引用"
c04f5ac3
JX
9161
9162#: git-stash.sh:412
9163msgid "unable to refresh index"
90e6ef53 9164msgstr "无法刷新索引"
c04f5ac3
JX
9165
9166#: git-stash.sh:416
9167msgid "Cannot apply a stash in the middle of a merge"
9168msgstr "无法在合并过程中恢复进度"
9169
9170#: git-stash.sh:424
9171msgid "Conflicts in index. Try without --index."
90e6ef53 9172msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3
JX
9173
9174#: git-stash.sh:426
9175msgid "Could not save index tree"
90e6ef53 9176msgstr "不能保存索引树"
c04f5ac3
JX
9177
9178#: git-stash.sh:460
9179msgid "Cannot unstage modified files"
9180msgstr "无法还原修改的文件"
9181
ef317cd5 9182#: git-stash.sh:475
b694fbb1
JX
9183msgid "Index was not unstashed."
9184msgstr "索引的进度没有被恢复。"
9185
ef317cd5 9186#: git-stash.sh:492
c04f5ac3
JX
9187#, sh-format
9188msgid "Dropped ${REV} ($s)"
9189msgstr "丢弃了 ${REV} ($s)"
9190
ef317cd5 9191#: git-stash.sh:493
c04f5ac3
JX
9192#, sh-format
9193msgid "${REV}: Could not drop stash entry"
90e6ef53 9194msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 9195
ef317cd5 9196#: git-stash.sh:500
c04f5ac3
JX
9197msgid "No branch name specified"
9198msgstr "未指定分支名"
9199
ef317cd5 9200#: git-stash.sh:571
c04f5ac3
JX
9201msgid "(To restore them type \"git stash apply\")"
9202msgstr "(为恢复数据输入 \"git stash apply\")"
9203
07432cef 9204#: git-submodule.sh:90
c04f5ac3
JX
9205#, sh-format
9206msgid "cannot strip one component off url '$remoteurl'"
9207msgstr "无法从 url '$remoteurl' 剥离一个组件"
9208
07432cef 9209#: git-submodule.sh:195
c04f5ac3 9210#, sh-format
170e9899
JX
9211msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9212msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 9213
07432cef 9214#: git-submodule.sh:238
c04f5ac3 9215#, sh-format
170e9899
JX
9216msgid "Clone of '$url' into submodule path '$sm_path' failed"
9217msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 9218
07432cef 9219#: git-submodule.sh:250
dac1de7d
JX
9220#, sh-format
9221msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 9222msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 9223
07432cef 9224#: git-submodule.sh:343
c04f5ac3
JX
9225#, sh-format
9226msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9227msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9228
07432cef 9229#: git-submodule.sh:360
c04f5ac3 9230#, sh-format
170e9899
JX
9231msgid "'$sm_path' already exists in the index"
9232msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 9233
07432cef 9234#: git-submodule.sh:364
b694fbb1
JX
9235#, sh-format
9236msgid ""
9237"The following path is ignored by one of your .gitignore files:\n"
9238"$sm_path\n"
9239"Use -f if you really want to add it."
9240msgstr ""
9241"以下路径被您的一个 .gitignore 文件所忽略:\n"
9242"$sm_path\n"
9243"如果您确实想添加它,使用 -f 参数。"
9244
07432cef 9245#: git-submodule.sh:382
b694fbb1
JX
9246#, sh-format
9247msgid "Adding existing repo at '$sm_path' to the index"
9248msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9249
07432cef 9250#: git-submodule.sh:384
c04f5ac3 9251#, sh-format
170e9899
JX
9252msgid "'$sm_path' already exists and is not a valid git repo"
9253msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 9254
07432cef
WS
9255#: git-submodule.sh:392
9256#, sh-format
9257msgid "A git directory for '$sm_name' is found locally with remote(s):"
9258msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9259
9260#: git-submodule.sh:394
9261#, sh-format
9262msgid ""
9263"If you want to reuse this local git directory instead of cloning again from"
9264msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9265
9266#: git-submodule.sh:396
9267#, sh-format
9268msgid ""
9269"use the '--force' option. If the local git directory is not the correct repo"
9270msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9271
9272#: git-submodule.sh:397
9273#, sh-format
9274msgid ""
9275"or you are unsure what this means choose another name with the '--name' "
9276"option."
9277msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9278
9279#: git-submodule.sh:399
9280#, sh-format
9281msgid "Reactivating local git directory for submodule '$sm_name'."
9282msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9283
9284#: git-submodule.sh:411
c04f5ac3 9285#, sh-format
170e9899
JX
9286msgid "Unable to checkout submodule '$sm_path'"
9287msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 9288
07432cef 9289#: git-submodule.sh:416
c04f5ac3 9290#, sh-format
170e9899
JX
9291msgid "Failed to add submodule '$sm_path'"
9292msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 9293
07432cef 9294#: git-submodule.sh:425
c04f5ac3 9295#, sh-format
170e9899
JX
9296msgid "Failed to register submodule '$sm_path'"
9297msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 9298
07432cef 9299#: git-submodule.sh:468
c04f5ac3 9300#, sh-format
170e9899
JX
9301msgid "Entering '$prefix$sm_path'"
9302msgstr "正在进入 '$prefix$sm_path'"
c04f5ac3 9303
07432cef 9304#: git-submodule.sh:482
c04f5ac3 9305#, sh-format
170e9899
JX
9306msgid "Stopping at '$sm_path'; script returned non-zero status."
9307msgstr "停止于 '$sm_path',脚本返回非零值。"
c04f5ac3 9308
07432cef 9309#: git-submodule.sh:526
c04f5ac3 9310#, sh-format
170e9899
JX
9311msgid "No url found for submodule path '$sm_path' in .gitmodules"
9312msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
c04f5ac3 9313
07432cef 9314#: git-submodule.sh:535
c04f5ac3 9315#, sh-format
170e9899
JX
9316msgid "Failed to register url for submodule path '$sm_path'"
9317msgstr "无法为子模组路径 '$sm_path' 注册 url"
c04f5ac3 9318
07432cef 9319#: git-submodule.sh:537
c04f5ac3 9320#, sh-format
170e9899
JX
9321msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9322msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
c04f5ac3 9323
07432cef 9324#: git-submodule.sh:545
d691f479
JX
9325#, sh-format
9326msgid "Failed to register update mode for submodule path '$sm_path'"
9327msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9328
07432cef 9329#: git-submodule.sh:649
c04f5ac3
JX
9330#, sh-format
9331msgid ""
170e9899 9332"Submodule path '$sm_path' not initialized\n"
c04f5ac3
JX
9333"Maybe you want to use 'update --init'?"
9334msgstr ""
170e9899 9335"子模组路径 '$sm_path' 没有初始化\n"
90e6ef53 9336"也许您想用 'update --init'?"
c04f5ac3 9337
07432cef 9338#: git-submodule.sh:662
c04f5ac3 9339#, sh-format
170e9899
JX
9340msgid "Unable to find current revision in submodule path '$sm_path'"
9341msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
c04f5ac3 9342
07432cef 9343#: git-submodule.sh:671 git-submodule.sh:695
c04f5ac3 9344#, sh-format
170e9899
JX
9345msgid "Unable to fetch in submodule path '$sm_path'"
9346msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 9347
07432cef 9348#: git-submodule.sh:709
c04f5ac3 9349#, sh-format
170e9899
JX
9350msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9351msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
c04f5ac3 9352
07432cef 9353#: git-submodule.sh:710
c04f5ac3 9354#, sh-format
170e9899
JX
9355msgid "Submodule path '$sm_path': rebased into '$sha1'"
9356msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
c04f5ac3 9357
07432cef 9358#: git-submodule.sh:715
c04f5ac3 9359#, sh-format
170e9899
JX
9360msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9361msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
c04f5ac3 9362
07432cef 9363#: git-submodule.sh:716
c04f5ac3 9364#, sh-format
170e9899
JX
9365msgid "Submodule path '$sm_path': merged in '$sha1'"
9366msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
c04f5ac3 9367
07432cef 9368#: git-submodule.sh:721
c04f5ac3 9369#, sh-format
170e9899
JX
9370msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9371msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
c04f5ac3 9372
07432cef 9373#: git-submodule.sh:722
c04f5ac3 9374#, sh-format
170e9899
JX
9375msgid "Submodule path '$sm_path': checked out '$sha1'"
9376msgstr "子模组路径 '$sm_path':检出 '$sha1'"
c04f5ac3 9377
07432cef 9378#: git-submodule.sh:744 git-submodule.sh:1066
c04f5ac3 9379#, sh-format
170e9899
JX
9380msgid "Failed to recurse into submodule path '$sm_path'"
9381msgstr "无法递归进子模组路径 '$sm_path'"
c04f5ac3 9382
07432cef 9383#: git-submodule.sh:852
649900bc
JX
9384msgid "The --cached option cannot be used with the --files option"
9385msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1
JX
9386
9387#. unexpected type
07432cef 9388#: git-submodule.sh:892
b694fbb1
JX
9389#, sh-format
9390msgid "unexpected mode $mod_dst"
9391msgstr "意外的模式 $mod_dst"
c04f5ac3 9392
90e6ef53 9393# 译者:注意保持前导空格
07432cef 9394#: git-submodule.sh:910
c04f5ac3
JX
9395#, sh-format
9396msgid " Warn: $name doesn't contain commit $sha1_src"
9397msgstr " 警告:$name 未包含提交 $sha1_src"
9398
90e6ef53 9399# 译者:注意保持前导空格
07432cef 9400#: git-submodule.sh:913
c04f5ac3
JX
9401#, sh-format
9402msgid " Warn: $name doesn't contain commit $sha1_dst"
9403msgstr " 警告:$name 未包含提交 $sha1_dst"
9404
90e6ef53 9405# 译者:注意保持前导空格
07432cef 9406#: git-submodule.sh:916
c04f5ac3
JX
9407#, sh-format
9408msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9409msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9410
07432cef 9411#: git-submodule.sh:941
c04f5ac3 9412msgid "blob"
07432cef 9413msgstr "数据对象"
c04f5ac3 9414
07432cef 9415#: git-submodule.sh:979
b694fbb1
JX
9416msgid "# Submodules changed but not updated:"
9417msgstr "# 子模组已修改但尚未更新:"
9418
07432cef 9419#: git-submodule.sh:981
b694fbb1
JX
9420msgid "# Submodule changes to be committed:"
9421msgstr "要提交的子模组变更:"
9422
07432cef 9423#: git-submodule.sh:1129
c04f5ac3 9424#, sh-format
07432cef
WS
9425msgid "Synchronizing submodule url for '$prefix$sm_path'"
9426msgstr "为 '$prefix$sm_path' 同步子模组 url"
9427
9428#~ msgid "-NUM"
9429#~ msgstr "-数字"
9430
9431#~ msgid " 0 files changed"
9432#~ msgstr " 0 个文件被修改"
9433
9434#~ msgid " %d file changed"
9435#~ msgid_plural " %d files changed"
9436#~ msgstr[0] " %d 个文件被修改"
9437#~ msgstr[1] " %d 个文件被修改"
9438
9439#~ msgid ", %d insertion(+)"
9440#~ msgid_plural ", %d insertions(+)"
9441#~ msgstr[0] ",插入 %d 行(+)"
9442#~ msgstr[1] ",插入 %d 行(+)"
9443
9444#~ msgid ", %d deletion(-)"
9445#~ msgid_plural ", %d deletions(-)"
9446#~ msgstr[0] ",删除 %d 行(-)"
9447#~ msgstr[1] ",删除 %d 行(-)"
9448
9449#~ msgid "You do not have a valid HEAD"
9450#~ msgstr "您没有一个有效的 HEAD"
9451
9452#~ msgid "oops"
9453#~ msgstr "哎哟"
9454
9455#~ msgid "Would not remove %s\n"
9456#~ msgstr "不会删除 %s\n"
9457
9458#~ msgid "Not removing %s\n"
9459#~ msgstr "未删除 %s\n"
9460
9461#~ msgid "Auto packing the repository for optimum performance.\n"
9462#~ msgstr "自动打包版本库以求最佳性能。\n"
9463
9464#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9465#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9466
9467#~ msgid "Could not read index"
9468#~ msgstr "不能读取索引"
c160d03f 9469
ef317cd5
JX
9470# 译者:中文字符串拼接,可删除前导空格
9471#~ msgid " (use \"git add\" to track)"
9472#~ msgstr "(使用 \"git add\" 建立跟踪)"
9473
9474#~ msgid "-B cannot be used with -b"
9475#~ msgstr "-B 不能和 -b 同时使用"
9476
9477#~ msgid "--patch is incompatible with all other options"
9478#~ msgstr "--patch 选项和其他选项不兼容"
9479
9480#~ msgid "--detach cannot be used with -b/-B/--orphan"
9481#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9482
9483#~ msgid "--detach cannot be used with -t"
9484#~ msgstr "--detach 不能和 -t 同时使用"
9485
9486#~ msgid "--orphan and -b|-B are mutually exclusive"
9487#~ msgstr "--orphan 和 -b|-B 互斥"
9488
9489#~ msgid "--orphan cannot be used with -t"
9490#~ msgstr "--orphan 不能和 -t 同时使用"
9491
9492#~ msgid "git checkout: -f and -m are incompatible"
9493#~ msgstr "git checkout:-f 和 -m 不兼容"
9494
9495#~ msgid ""
9496#~ "git checkout: updating paths is incompatible with switching branches."
9497#~ msgstr "git checkout:更新路径和切换分支不兼容。"
9498
c160d03f
JX
9499#~ msgid "diff setup failed"
9500#~ msgstr "diff 设置失败"
9501
9502#~ msgid "merge-recursive: disk full?"
9503#~ msgstr "merge-recursive:磁盘已满?"
9504
9505#~ msgid "diff_setup_done failed"
9506#~ msgstr "diff_setup_done 失败"