]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: zh_CN: translations for git v2.1.0-rc0
[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"
6acbf033
JX
15"POT-Creation-Date: 2014-08-04 14:48+0800\n"
16"PO-Revision-Date: 2014-08-04 16:16+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
6c94aba5 25#: advice.c:55
c04f5ac3
JX
26#, c-format
27msgid "hint: %.*s\n"
28msgstr "提示:%.*s\n"
29
6acbf033 30#: advice.c:88
c04f5ac3 31msgid ""
6acbf033
JX
32"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
33"as appropriate to mark resolution and make a commit, or use\n"
34"'git commit -a'."
c04f5ac3 35msgstr ""
6acbf033
JX
36"请在工作区改正文件,然后酌情使用 'git add/rm <file>' 命令标记\n"
37"解决方案并提交,或者使用 'git commit -a'。"
c04f5ac3 38
ef317cd5 39#: archive.c:10
ef317cd5 40msgid "git archive [options] <tree-ish> [<path>...]"
07432cef 41msgstr "git archive [选项] <树或提交> [<路径>...]"
ef317cd5
JX
42
43#: archive.c:11
ef317cd5 44msgid "git archive --list"
07432cef 45msgstr "git archive --list"
ef317cd5
JX
46
47#: archive.c:12
48msgid ""
49"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
50msgstr ""
07432cef 51"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
ef317cd5
JX
52
53#: archive.c:13
54msgid "git archive --remote <repo> [--exec <cmd>] --list"
07432cef 55msgstr "git archive --remote <版本库> [--exec <命令>] --list"
ef317cd5 56
6acbf033 57#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
90314792
JX
58#, c-format
59msgid "pathspec '%s' did not match any files"
60msgstr "路径规则 '%s' 未匹配任何文件"
61
6c94aba5 62#: archive.c:328
ef317cd5 63msgid "fmt"
07432cef 64msgstr "格式"
ef317cd5 65
6c94aba5 66#: archive.c:328
ef317cd5 67msgid "archive format"
07432cef 68msgstr "归档格式"
ef317cd5 69
6acbf033 70#: archive.c:329 builtin/log.c:1201
ef317cd5 71msgid "prefix"
07432cef 72msgstr "前缀"
ef317cd5 73
6c94aba5 74#: archive.c:330
ef317cd5 75msgid "prepend prefix to each pathname in the archive"
07432cef 76msgstr "为归档中每个路径名加上前缀"
ef317cd5 77
6acbf033
JX
78#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
79#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
80#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77
6c94aba5
JX
81#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
82#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
ef317cd5
JX
83msgid "file"
84msgstr "文件"
85
6c94aba5 86#: archive.c:332 builtin/archive.c:89
ef317cd5 87msgid "write the archive to this file"
07432cef 88msgstr "归档写入此文件"
ef317cd5 89
6c94aba5 90#: archive.c:334
ef317cd5 91msgid "read .gitattributes in working directory"
07432cef 92msgstr "读取工作区中的 .gitattributes"
ef317cd5 93
6c94aba5 94#: archive.c:335
ef317cd5 95msgid "report archived files on stderr"
07432cef 96msgstr "在标准错误上报告归档文件"
ef317cd5 97
6c94aba5 98#: archive.c:336
ef317cd5 99msgid "store only"
07432cef 100msgstr "只存储"
ef317cd5 101
6c94aba5 102#: archive.c:337
ef317cd5 103msgid "compress faster"
07432cef 104msgstr "压缩速度更快"
ef317cd5 105
6c94aba5 106#: archive.c:345
ef317cd5 107msgid "compress better"
07432cef 108msgstr "压缩效果更好"
ef317cd5 109
6c94aba5 110#: archive.c:348
ef317cd5 111msgid "list supported archive formats"
07432cef 112msgstr "列出支持的归档格式"
ef317cd5 113
6c94aba5 114#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
ef317cd5 115msgid "repo"
07432cef 116msgstr "版本库"
ef317cd5 117
6c94aba5 118#: archive.c:351 builtin/archive.c:91
ef317cd5 119msgid "retrieve the archive from remote repository <repo>"
07432cef 120msgstr "从远程版本库(<版本库>)提取归档文件"
ef317cd5 121
6c94aba5 122#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
ef317cd5 123msgid "command"
07432cef 124msgstr "命令"
ef317cd5 125
6c94aba5 126#: archive.c:353 builtin/archive.c:93
ef317cd5 127msgid "path to the remote git-upload-archive command"
07432cef
WS
128msgstr "远程 git-upload-archive 命令的路径"
129
130#: attr.c:259
131msgid ""
a7409dfb 132"Negative patterns are ignored in git attributes\n"
07432cef 133"Use '\\!' for literal leading exclamation."
ef317cd5 134msgstr ""
a7409dfb 135"负值模版在 git attributes 中被忽略\n"
07432cef 136"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 137
4dcdc3d8
JX
138#: branch.c:60
139#, c-format
140msgid "Not setting branch %s as its own upstream."
141msgstr "未设置分支 %s 作为它自己的上游。"
142
6c94aba5 143#: branch.c:83
4dcdc3d8
JX
144#, c-format
145msgid "Branch %s set up to track remote branch %s from %s by rebasing."
146msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
147
6c94aba5 148#: branch.c:84
4dcdc3d8
JX
149#, c-format
150msgid "Branch %s set up to track remote branch %s from %s."
151msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
152
6c94aba5 153#: branch.c:88
4dcdc3d8
JX
154#, c-format
155msgid "Branch %s set up to track local branch %s by rebasing."
156msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
157
6c94aba5 158#: branch.c:89
4dcdc3d8
JX
159#, c-format
160msgid "Branch %s set up to track local branch %s."
161msgstr "分支 %s 设置为跟踪本地分支 %s。"
162
6c94aba5 163#: branch.c:94
4dcdc3d8
JX
164#, c-format
165msgid "Branch %s set up to track remote ref %s by rebasing."
166msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
167
6c94aba5 168#: branch.c:95
4dcdc3d8
JX
169#, c-format
170msgid "Branch %s set up to track remote ref %s."
171msgstr "分支 %s 设置为跟踪远程引用 %s。"
172
6c94aba5 173#: branch.c:99
4dcdc3d8
JX
174#, c-format
175msgid "Branch %s set up to track local ref %s by rebasing."
176msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
177
6c94aba5 178#: branch.c:100
4dcdc3d8
JX
179#, c-format
180msgid "Branch %s set up to track local ref %s."
181msgstr "分支 %s 设置为跟踪本地引用 %s。"
182
6c94aba5 183#: branch.c:133
4dcdc3d8
JX
184#, c-format
185msgid "Not tracking: ambiguous information for ref %s"
186msgstr "未跟踪:引用 %s 有歧义"
187
6c94aba5 188#: branch.c:178
4dcdc3d8
JX
189#, c-format
190msgid "'%s' is not a valid branch name."
191msgstr "'%s' 不是一个有效的分支名称。"
192
6c94aba5 193#: branch.c:183
4dcdc3d8
JX
194#, c-format
195msgid "A branch named '%s' already exists."
196msgstr "一个分支名 '%s' 已经存在。"
197
6c94aba5 198#: branch.c:191
4dcdc3d8
JX
199msgid "Cannot force update the current branch."
200msgstr "无法强制更新当前分支。"
201
6c94aba5 202#: branch.c:211
1003b3a5
JX
203#, c-format
204msgid "Cannot setup tracking information; starting point '%s' is not a branch."
205msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
206
6c94aba5 207#: branch.c:213
1003b3a5
JX
208#, c-format
209msgid "the requested upstream branch '%s' does not exist"
210msgstr "请求的上游分支 '%s' 不存在"
211
6c94aba5 212#: branch.c:215
1003b3a5
JX
213msgid ""
214"\n"
215"If you are planning on basing your work on an upstream\n"
216"branch that already exists at the remote, you may need to\n"
217"run \"git fetch\" to retrieve it.\n"
218"\n"
219"If you are planning to push out a new local branch that\n"
220"will track its remote counterpart, you may want to use\n"
221"\"git push -u\" to set the upstream config as you push."
222msgstr ""
223"\n"
224"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
225"您可能需要执行 \"git fetch\" 来获取分支。\n"
226"\n"
227"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
228"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
229
6c94aba5 230#: branch.c:260
4dcdc3d8
JX
231#, c-format
232msgid "Not a valid object name: '%s'."
233msgstr "不是一个有效的对象名:'%s'。"
234
6c94aba5 235#: branch.c:280
4dcdc3d8
JX
236#, c-format
237msgid "Ambiguous object name: '%s'."
238msgstr "歧义的对象名:'%s'。"
239
6c94aba5 240#: branch.c:285
4dcdc3d8
JX
241#, c-format
242msgid "Not a valid branch point: '%s'."
243msgstr "无效的分支点:'%s'。"
244
6c94aba5 245#: branch.c:291
4dcdc3d8
JX
246msgid "Failed to lock ref for update"
247msgstr "无法为更新锁定引用"
248
6c94aba5 249#: branch.c:309
4dcdc3d8
JX
250msgid "Failed to write ref"
251msgstr "不能写引用"
252
6c94aba5 253#: bundle.c:33
8ada9598
JX
254#, c-format
255msgid "'%s' does not look like a v2 bundle file"
81809b99 256msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 257
6c94aba5 258#: bundle.c:60
81809b99 259#, c-format
8ada9598 260msgid "unrecognized header: %s%s (%d)"
81809b99 261msgstr "未能识别的包头:%s%s (%d)"
8ada9598 262
6acbf033 263#: bundle.c:86 builtin/commit.c:755
8ada9598
JX
264#, c-format
265msgid "could not open '%s'"
266msgstr "不能打开 '%s'"
267
6c94aba5 268#: bundle.c:138
8ada9598 269msgid "Repository lacks these prerequisite commits:"
81809b99 270msgstr "版本库缺少这些必备的提交:"
8ada9598 271
6acbf033
JX
272#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
273#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357
90314792 274#: builtin/shortlog.c:158
8ada9598
JX
275msgid "revision walk setup failed"
276msgstr "版本遍历设置失败"
277
6c94aba5 278#: bundle.c:184
8ada9598 279#, c-format
1003b3a5
JX
280msgid "The bundle contains this ref:"
281msgid_plural "The bundle contains these %d refs:"
282msgstr[0] "这个包中含有这个引用:"
283msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 284
6c94aba5 285#: bundle.c:191
6792b93b
JX
286msgid "The bundle records a complete history."
287msgstr "这个包记录一个完整历史。"
288
6c94aba5 289#: bundle.c:193
8ada9598 290#, c-format
1003b3a5
JX
291msgid "The bundle requires this ref:"
292msgid_plural "The bundle requires these %d refs:"
293msgstr[0] "这个包需要这个引用:"
294msgstr[1] "这个包需要 %d 个引用:"
8ada9598 295
6acbf033 296#: bundle.c:289
8ada9598 297msgid "rev-list died"
81809b99 298msgstr "rev-list 终止"
8ada9598 299
6acbf033 300#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
8ada9598
JX
301#, c-format
302msgid "unrecognized argument: %s"
81809b99 303msgstr "未能识别的参数:%s"
8ada9598 304
6acbf033 305#: bundle.c:330
8ada9598
JX
306#, c-format
307msgid "ref '%s' is excluded by the rev-list options"
81809b99 308msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 309
6acbf033 310#: bundle.c:375
8ada9598 311msgid "Refusing to create empty bundle."
81809b99 312msgstr "不能创建空包。"
8ada9598 313
6acbf033 314#: bundle.c:390
8ada9598 315msgid "Could not spawn pack-objects"
81809b99 316msgstr "不能生成 pack-objects 进程"
8ada9598 317
6acbf033 318#: bundle.c:408
8ada9598 319msgid "pack-objects died"
81809b99 320msgstr "pack-objects 终止"
8ada9598 321
6acbf033 322#: bundle.c:411
81809b99 323#, c-format
8ada9598 324msgid "cannot create '%s'"
81809b99 325msgstr "不能创建 '%s'"
8ada9598 326
6acbf033 327#: bundle.c:433
8ada9598 328msgid "index-pack died"
81809b99 329msgstr "index-pack 终止"
8ada9598 330
6acbf033 331#: commit.c:40
c04f5ac3
JX
332#, c-format
333msgid "could not parse %s"
334msgstr "不能解析 %s"
335
6acbf033 336#: commit.c:42
c04f5ac3
JX
337#, c-format
338msgid "%s %s is not a commit!"
339msgstr "%s %s 不是一个提交!"
340
341#: compat/obstack.c:406 compat/obstack.c:408
342msgid "memory exhausted"
343msgstr "内存耗尽"
344
cfff71a9 345#: connected.c:70
c04f5ac3
JX
346msgid "Could not run 'git rev-list'"
347msgstr "不能执行 'git rev-list'"
348
cfff71a9 349#: connected.c:90
c04f5ac3
JX
350#, c-format
351msgid "failed write to rev-list: %s"
352msgstr "无法写入 rev-list:%s"
353
cfff71a9 354#: connected.c:98
c04f5ac3
JX
355#, c-format
356msgid "failed to close rev-list's stdin: %s"
357msgstr "无法关闭 rev-list 的标准输入:%s"
358
8ada9598
JX
359#: date.c:95
360msgid "in the future"
81809b99 361msgstr "在将来"
8ada9598
JX
362
363#: date.c:101
364#, c-format
365msgid "%lu second ago"
366msgid_plural "%lu seconds ago"
6c94aba5
JX
367msgstr[0] "%lu 秒钟前"
368msgstr[1] "%lu 秒钟前"
8ada9598
JX
369
370#: date.c:108
371#, c-format
372msgid "%lu minute ago"
373msgid_plural "%lu minutes ago"
6c94aba5
JX
374msgstr[0] "%lu 分钟前"
375msgstr[1] "%lu 分钟前"
8ada9598
JX
376
377#: date.c:115
378#, c-format
379msgid "%lu hour ago"
380msgid_plural "%lu hours ago"
6c94aba5
JX
381msgstr[0] "%lu 小时前"
382msgstr[1] "%lu 小时前"
8ada9598
JX
383
384#: date.c:122
385#, c-format
386msgid "%lu day ago"
387msgid_plural "%lu days ago"
6c94aba5
JX
388msgstr[0] "%lu 天前"
389msgstr[1] "%lu 天前"
8ada9598
JX
390
391#: date.c:128
392#, c-format
393msgid "%lu week ago"
394msgid_plural "%lu weeks ago"
6c94aba5
JX
395msgstr[0] "%lu 周前"
396msgstr[1] "%lu 周前"
8ada9598
JX
397
398#: date.c:135
399#, c-format
400msgid "%lu month ago"
401msgid_plural "%lu months ago"
6c94aba5
JX
402msgstr[0] "%lu 个月前"
403msgstr[1] "%lu 个月前"
8ada9598
JX
404
405#: date.c:146
406#, c-format
407msgid "%lu year"
408msgid_plural "%lu years"
81809b99 409msgstr[0] "%lu 年"
5ae481e0 410msgstr[1] "%lu 年"
8ada9598 411
6c94aba5 412#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
413#: date.c:149
414#, c-format
415msgid "%s, %lu month ago"
416msgid_plural "%s, %lu months ago"
6c94aba5
JX
417msgstr[0] "%s %lu 个月前"
418msgstr[1] "%s %lu 个月前"
8ada9598
JX
419
420#: date.c:154 date.c:159
421#, c-format
422msgid "%lu year ago"
423msgid_plural "%lu years ago"
81809b99 424msgstr[0] "%lu 年前"
5ae481e0 425msgstr[1] "%lu 年前"
8ada9598 426
cfff71a9
JX
427#: diffcore-order.c:24
428#, c-format
429msgid "failed to read orderfile '%s'"
430msgstr "无法读取排序文件 '%s'"
431
6acbf033 432#: diffcore-rename.c:514
6c94aba5
JX
433msgid "Performing inexact rename detection"
434msgstr "正在进行非精确的重命名检测"
435
90e6ef53 436# 译者:注意保持前导空格
6acbf033 437#: diff.c:114
c04f5ac3 438#, c-format
07432cef
WS
439msgid " Failed to parse dirstat cut-off percentage '%s'\n"
440msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 441
90e6ef53 442# 译者:注意保持前导空格
6acbf033 443#: diff.c:119
c04f5ac3 444#, c-format
07432cef
WS
445msgid " Unknown dirstat parameter '%s'\n"
446msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 447
6acbf033 448#: diff.c:214
07432cef
WS
449#, c-format
450msgid "Unknown value for 'diff.submodule' config variable: '%s'"
451msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
452
6acbf033 453#: diff.c:267
c04f5ac3
JX
454#, c-format
455msgid ""
456"Found errors in 'diff.dirstat' config variable:\n"
457"%s"
458msgstr ""
90e6ef53 459"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
460"%s"
461
6acbf033
JX
462#: diff.c:2934
463#, c-format
464msgid "external diff died, stopping at %s"
465msgstr "外部 diff 退出,停止在 %s"
466
467#: diff.c:3329
468msgid "--follow requires exactly one pathspec"
469msgstr "--follow 参数后只跟一个 pathspec"
470
471#: diff.c:3492
c04f5ac3
JX
472#, c-format
473msgid ""
474"Failed to parse --dirstat/-X option parameter:\n"
475"%s"
476msgstr ""
477"无法解析 --dirstat/-X 选项的参数:\n"
478"%s"
479
6acbf033 480#: diff.c:3506
07432cef
WS
481#, c-format
482msgid "Failed to parse --submodule option parameter: '%s'"
483msgstr "无法解析 --submodule 选项的参数:'%s'"
484
6acbf033 485#: gpg-interface.c:73 gpg-interface.c:145
c04f5ac3
JX
486msgid "could not run gpg."
487msgstr "不能执行 gpg。"
488
6acbf033 489#: gpg-interface.c:85
c04f5ac3
JX
490msgid "gpg did not accept the data"
491msgstr "gpg 没有接受数据"
492
6acbf033 493#: gpg-interface.c:96
c04f5ac3
JX
494msgid "gpg failed to sign the data"
495msgstr "gpg 无法为数据签名"
496
6acbf033 497#: gpg-interface.c:129
a77c07d9
JX
498#, c-format
499msgid "could not create temporary file '%s': %s"
500msgstr "不能创建临时文件 '%s':%s"
501
6acbf033 502#: gpg-interface.c:132
a77c07d9
JX
503#, c-format
504msgid "failed writing detached signature to '%s': %s"
505msgstr "无法将分离式签名写入 '%s':%s"
506
6acbf033 507#: grep.c:1703
7ac1c0ad
JX
508#, c-format
509msgid "'%s': unable to read %s"
510msgstr "'%s':无法读取 %s"
511
6acbf033 512#: grep.c:1720
7ac1c0ad
JX
513#, c-format
514msgid "'%s': %s"
515msgstr "'%s':%s"
516
6acbf033 517#: grep.c:1731
7ac1c0ad
JX
518#, c-format
519msgid "'%s': short read %s"
520msgstr "'%s':读取不完整 %s"
521
6acbf033 522#: help.c:207
81809b99 523#, c-format
8ada9598 524msgid "available git commands in '%s'"
81809b99 525msgstr "在 '%s' 下可用的 git 命令"
8ada9598 526
6acbf033 527#: help.c:214
8ada9598 528msgid "git commands available from elsewhere on your $PATH"
81809b99 529msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 530
6acbf033 531#: help.c:230
a77c07d9
JX
532msgid "The most commonly used git commands are:"
533msgstr "最常用的 git 命令有:"
534
6c94aba5 535#: help.c:289
c04f5ac3
JX
536#, c-format
537msgid ""
538"'%s' appears to be a git command, but we were not\n"
539"able to execute it. Maybe git-%s is broken?"
540msgstr ""
541"'%s' 像是一个 git 命令,但却无法运行。\n"
542"可能是 git-%s 受损?"
543
6c94aba5 544#: help.c:346
8ada9598 545msgid "Uh oh. Your system reports no Git commands at all."
81809b99 546msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 547
6c94aba5 548#: help.c:368
8ada9598
JX
549#, c-format
550msgid ""
551"WARNING: You called a Git command named '%s', which does not exist.\n"
552"Continuing under the assumption that you meant '%s'"
553msgstr ""
81809b99
JX
554"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
555"是 '%s'"
8ada9598 556
6c94aba5 557#: help.c:373
8ada9598
JX
558#, c-format
559msgid "in %0.1f seconds automatically..."
81809b99 560msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 561
6c94aba5 562#: help.c:380
8ada9598
JX
563#, c-format
564msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 565msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 566
6acbf033 567#: help.c:384 help.c:444
8ada9598
JX
568msgid ""
569"\n"
570"Did you mean this?"
571msgid_plural ""
572"\n"
573"Did you mean one of these?"
574msgstr[0] ""
81809b99
JX
575"\n"
576"您指的是这个么?"
577msgstr[1] ""
578"\n"
195febda 579"您指的是这其中的某一个么?"
8ada9598 580
6acbf033 581#: help.c:440
2e8451e8
JX
582#, c-format
583msgid "%s: %s - %s"
584msgstr "%s:%s - %s"
585
6acbf033 586#: merge.c:40
07432cef
WS
587msgid "failed to read the cache"
588msgstr "无法读取缓存"
589
6acbf033 590#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
cfff71a9 591#: builtin/clone.c:661
07432cef
WS
592msgid "unable to write new index file"
593msgstr "无法写新的索引文件"
594
649900bc
JX
595#: merge-recursive.c:190
596#, c-format
597msgid "(bad commit)\n"
598msgstr "(坏提交)\n"
599
6acbf033 600#: merge-recursive.c:210
649900bc
JX
601#, c-format
602msgid "addinfo_cache failed for path '%s'"
603msgstr "为路径 '%s' addinfo_cache 失败"
604
6c94aba5 605#: merge-recursive.c:271
649900bc
JX
606msgid "error building trees"
607msgstr "无法创建树"
608
6acbf033 609#: merge-recursive.c:692
649900bc
JX
610#, c-format
611msgid "failed to create path '%s'%s"
612msgstr "无法创建路径 '%s'%s"
613
6acbf033 614#: merge-recursive.c:703
649900bc
JX
615#, c-format
616msgid "Removing %s to make room for subdirectory\n"
617msgstr "删除 %s 以便为子目录留出空间\n"
618
6acbf033 619#: merge-recursive.c:717 merge-recursive.c:738
649900bc
JX
620msgid ": perhaps a D/F conflict?"
621msgstr ":可能是一个目录/文件冲突?"
622
6acbf033 623#: merge-recursive.c:728
649900bc
JX
624#, c-format
625msgid "refusing to lose untracked file at '%s'"
626msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
627
6acbf033 628#: merge-recursive.c:768
649900bc
JX
629#, c-format
630msgid "cannot read object %s '%s'"
631msgstr "不能读取对象 %s '%s'"
632
6acbf033 633#: merge-recursive.c:770
649900bc
JX
634#, c-format
635msgid "blob expected for %s '%s'"
07432cef 636msgstr "%s '%s' 应为数据(blob)对象"
649900bc 637
6acbf033 638#: merge-recursive.c:793 builtin/clone.c:317
649900bc
JX
639#, c-format
640msgid "failed to open '%s'"
641msgstr "无法打开 '%s'"
642
6acbf033 643#: merge-recursive.c:801
649900bc
JX
644#, c-format
645msgid "failed to symlink '%s'"
646msgstr "无法创建符号链接 '%s'"
647
6acbf033 648#: merge-recursive.c:804
649900bc
JX
649#, c-format
650msgid "do not know what to do with %06o %s '%s'"
651msgstr "不知道如何处理 %06o %s '%s'"
652
6acbf033 653#: merge-recursive.c:942
649900bc
JX
654msgid "Failed to execute internal merge"
655msgstr "无法执行内部合并"
656
6acbf033 657#: merge-recursive.c:946
649900bc
JX
658#, c-format
659msgid "Unable to add %s to database"
660msgstr "不能添加 %s 至对象库"
661
6acbf033 662#: merge-recursive.c:962
649900bc
JX
663msgid "unsupported object type in the tree"
664msgstr "在树中有不支持的对象类型"
665
6acbf033 666#: merge-recursive.c:1037 merge-recursive.c:1051
649900bc
JX
667#, c-format
668msgid ""
669"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
670"in tree."
671msgstr ""
672"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
673"的版本被保留。"
674
6acbf033 675#: merge-recursive.c:1043 merge-recursive.c:1056
649900bc
JX
676#, c-format
677msgid ""
678"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
679"in tree at %s."
680msgstr ""
681"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
682"的版本保留于 %8$s 中。"
683
6acbf033 684#: merge-recursive.c:1097
649900bc
JX
685msgid "rename"
686msgstr "重命名"
687
6acbf033 688#: merge-recursive.c:1097
649900bc
JX
689msgid "renamed"
690msgstr "重命名"
691
6acbf033 692#: merge-recursive.c:1153
649900bc
JX
693#, c-format
694msgid "%s is a directory in %s adding as %s instead"
695msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
696
6acbf033 697#: merge-recursive.c:1175
649900bc
JX
698#, c-format
699msgid ""
700"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
701"\"->\"%s\" in \"%s\"%s"
702msgstr ""
703"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
704"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
705
6acbf033 706#: merge-recursive.c:1180
649900bc
JX
707msgid " (left unresolved)"
708msgstr "(留下未解决)"
709
6acbf033 710#: merge-recursive.c:1234
649900bc
JX
711#, c-format
712msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
713msgstr ""
714"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
715"%5$s"
716
6acbf033 717#: merge-recursive.c:1264
649900bc
JX
718#, c-format
719msgid "Renaming %s to %s and %s to %s instead"
07432cef 720msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 721
6acbf033 722#: merge-recursive.c:1463
649900bc
JX
723#, c-format
724msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
725msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
726
6acbf033 727#: merge-recursive.c:1473
649900bc
JX
728#, c-format
729msgid "Adding merged %s"
730msgstr "添加合并后的 %s"
731
6acbf033 732#: merge-recursive.c:1478 merge-recursive.c:1676
649900bc
JX
733#, c-format
734msgid "Adding as %s instead"
735msgstr "而是以 %s 为名添加"
736
6acbf033 737#: merge-recursive.c:1529
649900bc
JX
738#, c-format
739msgid "cannot read object %s"
740msgstr "不能读取对象 %s"
741
6acbf033 742#: merge-recursive.c:1532
649900bc
JX
743#, c-format
744msgid "object %s is not a blob"
07432cef 745msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 746
6acbf033 747#: merge-recursive.c:1580
649900bc
JX
748msgid "modify"
749msgstr "修改"
750
6acbf033 751#: merge-recursive.c:1580
649900bc
JX
752msgid "modified"
753msgstr "修改"
754
6acbf033 755#: merge-recursive.c:1590
649900bc
JX
756msgid "content"
757msgstr "内容"
758
6acbf033 759#: merge-recursive.c:1597
649900bc
JX
760msgid "add/add"
761msgstr "添加/添加"
762
6acbf033 763#: merge-recursive.c:1631
649900bc
JX
764#, c-format
765msgid "Skipped %s (merged same as existing)"
766msgstr "略过 %s(已经做过相同合并)"
767
6acbf033 768#: merge-recursive.c:1645
649900bc
JX
769#, c-format
770msgid "Auto-merging %s"
771msgstr "自动合并 %s"
772
6acbf033 773#: merge-recursive.c:1649 git-submodule.sh:1150
649900bc
JX
774msgid "submodule"
775msgstr "子模组"
776
6acbf033 777#: merge-recursive.c:1650
649900bc
JX
778#, c-format
779msgid "CONFLICT (%s): Merge conflict in %s"
780msgstr "冲突(%s):合并冲突于 %s"
781
6acbf033 782#: merge-recursive.c:1740
649900bc
JX
783#, c-format
784msgid "Removing %s"
785msgstr "删除 %s"
786
6acbf033 787#: merge-recursive.c:1765
649900bc
JX
788msgid "file/directory"
789msgstr "文件/目录"
790
6acbf033 791#: merge-recursive.c:1771
649900bc
JX
792msgid "directory/file"
793msgstr "目录/文件"
794
6acbf033 795#: merge-recursive.c:1776
649900bc
JX
796#, c-format
797msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
798msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
799
6acbf033 800#: merge-recursive.c:1786
649900bc
JX
801#, c-format
802msgid "Adding %s"
803msgstr "添加 %s"
804
6acbf033 805#: merge-recursive.c:1803
649900bc
JX
806msgid "Fatal merge failure, shouldn't happen."
807msgstr "严重的合并错误,不应发生。"
808
6acbf033 809#: merge-recursive.c:1822
649900bc
JX
810msgid "Already up-to-date!"
811msgstr "已经是最新的!"
812
6acbf033 813#: merge-recursive.c:1831
649900bc
JX
814#, c-format
815msgid "merging of trees %s and %s failed"
816msgstr "无法合并树 %s 和 %s"
817
6acbf033 818#: merge-recursive.c:1861
649900bc
JX
819#, c-format
820msgid "Unprocessed path??? %s"
821msgstr "未处理的路径??? %s"
822
6acbf033 823#: merge-recursive.c:1906
649900bc
JX
824msgid "Merging:"
825msgstr "合并:"
826
6acbf033 827#: merge-recursive.c:1919
649900bc 828#, c-format
e5e38ce4
JX
829msgid "found %u common ancestor:"
830msgid_plural "found %u common ancestors:"
831msgstr[0] "发现 %u 个共同祖先:"
832msgstr[1] "发现 %u 个共同祖先:"
649900bc 833
6acbf033 834#: merge-recursive.c:1956
649900bc
JX
835msgid "merge returned no commit"
836msgstr "合并未返回提交"
837
6acbf033 838#: merge-recursive.c:2013
649900bc
JX
839#, c-format
840msgid "Could not parse object '%s'"
841msgstr "不能解析对象 '%s'"
842
6acbf033 843#: merge-recursive.c:2024 builtin/merge.c:666
649900bc
JX
844msgid "Unable to write index."
845msgstr "不能写入索引。"
846
6acbf033 847#: notes-utils.c:41
2e8451e8
JX
848msgid "Cannot commit uninitialized/unreferenced notes tree"
849msgstr "不能提交未初始化/未引用的注解树"
850
6acbf033 851#: notes-utils.c:83
2e8451e8
JX
852#, c-format
853msgid "Bad notes.rewriteMode value: '%s'"
854msgstr "坏的 notes.rewriteMode 值:'%s'"
855
6acbf033 856#: notes-utils.c:93
2e8451e8
JX
857#, c-format
858msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
859msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
860
861#. TRANSLATORS: The first %s is the name of the
862#. environment variable, the second %s is its value
6acbf033 863#: notes-utils.c:120
2e8451e8
JX
864#, c-format
865msgid "Bad %s value: '%s'"
866msgstr "坏的 %s 值:'%s'"
867
6acbf033 868#: object.c:234
1003b3a5
JX
869#, c-format
870msgid "unable to parse object: %s"
871msgstr "不能解析对象:%s"
872
6acbf033 873#: parse-options.c:534
8ada9598 874msgid "..."
81809b99 875msgstr "..."
8ada9598 876
6acbf033 877#: parse-options.c:552
81809b99 878#, c-format
8ada9598 879msgid "usage: %s"
81809b99 880msgstr "用法:%s"
8ada9598
JX
881
882#. TRANSLATORS: the colon here should align with the
883#. one in "usage: %s" translation
6acbf033 884#: parse-options.c:556
81809b99 885#, c-format
8ada9598 886msgid " or: %s"
81809b99 887msgstr " 或:%s"
8ada9598
JX
888
889# 译者:为保证在输出中对齐,注意调整句中空格!
6acbf033 890#: parse-options.c:559
81809b99 891#, c-format
8ada9598 892msgid " %s"
81809b99 893msgstr " %s"
8ada9598 894
6acbf033 895#: parse-options.c:593
63af42fe
JX
896msgid "-NUM"
897msgstr "-数字"
898
cfff71a9 899#: pathspec.c:133
90314792
JX
900msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
901msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
902
cfff71a9 903#: pathspec.c:143
90314792
JX
904msgid ""
905"global 'literal' pathspec setting is incompatible with all other global "
906"pathspec settings"
907msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
908
cfff71a9 909#: pathspec.c:177
90314792
JX
910msgid "invalid parameter for pathspec magic 'prefix'"
911msgstr "路径规则包含无效的神奇前缀"
912
cfff71a9 913#: pathspec.c:183
90314792
JX
914#, c-format
915msgid "Invalid pathspec magic '%.*s' in '%s'"
916msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
917
cfff71a9 918#: pathspec.c:187
90314792
JX
919#, c-format
920msgid "Missing ')' at the end of pathspec magic in '%s'"
921msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
922
cfff71a9 923#: pathspec.c:205
90314792
JX
924#, c-format
925msgid "Unimplemented pathspec magic '%c' in '%s'"
926msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
927
cfff71a9 928#: pathspec.c:230
a77c07d9 929#, c-format
90314792
JX
930msgid "%s: 'literal' and 'glob' are incompatible"
931msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 932
cfff71a9 933#: pathspec.c:241
a77c07d9 934#, c-format
90314792
JX
935msgid "%s: '%s' is outside repository"
936msgstr "%s:'%s' 在版本库之外"
a77c07d9 937
cfff71a9 938#: pathspec.c:291
90314792
JX
939#, c-format
940msgid "Pathspec '%s' is in submodule '%.*s'"
941msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
942
cfff71a9 943#: pathspec.c:353
90314792
JX
944#, c-format
945msgid "%s: pathspec magic not supported by this command: %s"
946msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
947
6acbf033 948#: pathspec.c:432
90314792
JX
949#, c-format
950msgid "pathspec '%s' is beyond a symbolic link"
951msgstr "路径规则 '%s' 位于符号链接中"
952
6acbf033 953#: pathspec.c:441
cfff71a9
JX
954msgid ""
955"There is nothing to exclude from by :(exclude) patterns.\n"
956"Perhaps you forgot to add either ':/' or '.' ?"
957msgstr ""
958"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
959"添加 ':/' 或 '.' ?"
960
6acbf033 961#: progress.c:225
6c94aba5
JX
962msgid "done"
963msgstr "完成"
964
6acbf033 965#: read-cache.c:1260
6c94aba5
JX
966#, c-format
967msgid ""
968"index.version set, but the value is invalid.\n"
969"Using version %i"
970msgstr ""
971"设置了 index.version,但是取值无效。\n"
972"使用版本 %i"
973
6acbf033 974#: read-cache.c:1270
6c94aba5
JX
975#, c-format
976msgid ""
977"GIT_INDEX_VERSION set, but the value is invalid.\n"
978"Using version %i"
979msgstr ""
980"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
981"使用版本 %i"
982
6acbf033 983#: remote.c:753
cfff71a9
JX
984#, c-format
985msgid "Cannot fetch both %s and %s to %s"
986msgstr "不能同时获取 %s 和 %s 至 %s"
987
6acbf033 988#: remote.c:757
cfff71a9
JX
989#, c-format
990msgid "%s usually tracks %s, not %s"
991msgstr "%s 通常跟踪 %s,而非 %s"
992
6acbf033 993#: remote.c:761
cfff71a9
JX
994#, c-format
995msgid "%s tracks both %s and %s"
996msgstr "%s 同时跟踪 %s 和 %s"
997
6acbf033 998#: remote.c:769
cfff71a9
JX
999msgid "Internal error"
1000msgstr "内部错误"
1001
6acbf033 1002#: remote.c:1943
90314792
JX
1003#, c-format
1004msgid "Your branch is based on '%s', but the upstream is gone.\n"
1005msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1006
6acbf033 1007#: remote.c:1947
90314792
JX
1008msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1009msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1010
6acbf033 1011#: remote.c:1950
90314792
JX
1012#, c-format
1013msgid "Your branch is up-to-date with '%s'.\n"
1014msgstr "您的分支与上游分支 '%s' 一致。\n"
1015
6acbf033 1016#: remote.c:1954
c04f5ac3
JX
1017#, c-format
1018msgid "Your branch is ahead of '%s' by %d commit.\n"
1019msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1020msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1021msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1022
6acbf033 1023#: remote.c:1960
07432cef
WS
1024msgid " (use \"git push\" to publish your local commits)\n"
1025msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1026
6acbf033 1027#: remote.c:1963
c04f5ac3
JX
1028#, c-format
1029msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1030msgid_plural ""
1031"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1032msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1033msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1034
07432cef 1035# 译者:注意保持前导空格
6acbf033 1036#: remote.c:1971
07432cef
WS
1037msgid " (use \"git pull\" to update your local branch)\n"
1038msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1039
6acbf033 1040#: remote.c:1974
c04f5ac3
JX
1041#, c-format
1042msgid ""
1043"Your branch and '%s' have diverged,\n"
1044"and have %d and %d different commit each, respectively.\n"
1045msgid_plural ""
1046"Your branch and '%s' have diverged,\n"
1047"and have %d and %d different commits each, respectively.\n"
1048msgstr[0] ""
1049"您的分支和 '%s' 出现了偏离,\n"
195febda 1050"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1051msgstr[1] ""
1052"您的分支和 '%s' 出现了偏离,\n"
195febda 1053"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1054
07432cef 1055# 译者:注意保持前导空格
6acbf033 1056#: remote.c:1984
07432cef
WS
1057msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1058msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1059
2e8451e8
JX
1060#: run-command.c:80
1061msgid "open /dev/null failed"
1062msgstr "不能打开 /dev/null"
1063
1064#: run-command.c:82
1065#, c-format
1066msgid "dup2(%d,%d) failed"
1067msgstr "不能调用 dup2(%d,%d)"
1068
6acbf033
JX
1069#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
1070#: builtin/merge.c:1003 builtin/merge.c:1013
c04f5ac3
JX
1071#, c-format
1072msgid "Could not open '%s' for writing"
90e6ef53 1073msgstr "不能为写入打开 '%s'"
c04f5ac3 1074
6acbf033
JX
1075#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
1076#: builtin/merge.c:1005 builtin/merge.c:1018
c04f5ac3
JX
1077#, c-format
1078msgid "Could not write to '%s'"
90e6ef53 1079msgstr "不能写入 '%s'"
c04f5ac3 1080
6acbf033 1081#: sequencer.c:194
14c8bced
JX
1082msgid ""
1083"after resolving the conflicts, mark the corrected paths\n"
1084"with 'git add <paths>' or 'git rm <paths>'"
1085msgstr ""
1086"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1087"命令标记修正后的文件"
1088
6acbf033 1089#: sequencer.c:197
c04f5ac3
JX
1090msgid ""
1091"after resolving the conflicts, mark the corrected paths\n"
1092"with 'git add <paths>' or 'git rm <paths>'\n"
1093"and commit the result with 'git commit'"
1094msgstr ""
1095"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1096"对修正后的文件做标记,然后用 'git commit' 提交"
1097
6acbf033 1098#: sequencer.c:210 sequencer.c:841 sequencer.c:924
c04f5ac3
JX
1099#, c-format
1100msgid "Could not write to %s"
1101msgstr "不能写入 %s"
1102
6acbf033 1103#: sequencer.c:213
c04f5ac3
JX
1104#, c-format
1105msgid "Error wrapping up %s"
1106msgstr "错误收尾 %s"
1107
6acbf033 1108#: sequencer.c:228
c04f5ac3
JX
1109msgid "Your local changes would be overwritten by cherry-pick."
1110msgstr "您的本地修改将被拣选操作覆盖。"
1111
6acbf033 1112#: sequencer.c:230
c04f5ac3
JX
1113msgid "Your local changes would be overwritten by revert."
1114msgstr "您的本地修改将被还原操作覆盖。"
1115
6acbf033 1116#: sequencer.c:233
c04f5ac3
JX
1117msgid "Commit your changes or stash them to proceed."
1118msgstr "提交您的修改或保存进度后再继续。"
1119
6acbf033
JX
1120#: sequencer.c:250
1121msgid "Failed to lock HEAD during fast_forward_to"
1122msgstr "在快进时无法为 HEAD 加锁"
1123
c04f5ac3 1124#. TRANSLATORS: %s will be "revert" or "cherry-pick"
6acbf033 1125#: sequencer.c:293
c04f5ac3
JX
1126#, c-format
1127msgid "%s: Unable to write new index file"
90e6ef53 1128msgstr "%s:无法写入新索引文件"
c04f5ac3 1129
6acbf033 1130#: sequencer.c:324
8ada9598 1131msgid "Could not resolve HEAD commit\n"
81809b99 1132msgstr "不能解析 HEAD 提交\n"
8ada9598 1133
6acbf033 1134#: sequencer.c:344
8ada9598 1135msgid "Unable to update cache tree\n"
81809b99 1136msgstr "不能更新缓存\n"
8ada9598 1137
6acbf033 1138#: sequencer.c:391
81809b99 1139#, c-format
8ada9598 1140msgid "Could not parse commit %s\n"
81809b99 1141msgstr "不能解析提交 %s\n"
8ada9598 1142
6acbf033 1143#: sequencer.c:396
81809b99 1144#, c-format
8ada9598 1145msgid "Could not parse parent commit %s\n"
81809b99 1146msgstr "不能解析父提交 %s\n"
8ada9598 1147
6acbf033 1148#: sequencer.c:462
c04f5ac3 1149msgid "Your index file is unmerged."
90e6ef53 1150msgstr "您的索引文件未完成合并。"
c04f5ac3 1151
6acbf033 1152#: sequencer.c:481
c04f5ac3
JX
1153#, c-format
1154msgid "Commit %s is a merge but no -m option was given."
1155msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1156
6acbf033 1157#: sequencer.c:489
c04f5ac3
JX
1158#, c-format
1159msgid "Commit %s does not have parent %d"
1160msgstr "提交 %s 没有父提交 %d"
1161
6acbf033 1162#: sequencer.c:493
c04f5ac3
JX
1163#, c-format
1164msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1165msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1166
1167#. TRANSLATORS: The first %s will be "revert" or
1168#. "cherry-pick", the second %s a SHA1
6acbf033 1169#: sequencer.c:506
c04f5ac3
JX
1170#, c-format
1171msgid "%s: cannot parse parent commit %s"
1172msgstr "%s:不能解析父提交 %s"
1173
6acbf033 1174#: sequencer.c:510
c04f5ac3
JX
1175#, c-format
1176msgid "Cannot get commit message for %s"
1177msgstr "不能得到 %s 的提交说明"
1178
6acbf033 1179#: sequencer.c:596
c04f5ac3
JX
1180#, c-format
1181msgid "could not revert %s... %s"
1182msgstr "不能还原 %s... %s"
1183
6acbf033 1184#: sequencer.c:597
c04f5ac3
JX
1185#, c-format
1186msgid "could not apply %s... %s"
1187msgstr "不能应用 %s... %s"
1188
6acbf033 1189#: sequencer.c:633
c04f5ac3
JX
1190msgid "empty commit set passed"
1191msgstr "提供了空的提交集"
1192
6acbf033 1193#: sequencer.c:641
c04f5ac3
JX
1194#, c-format
1195msgid "git %s: failed to read the index"
90e6ef53 1196msgstr "git %s:无法读取索引"
c04f5ac3 1197
6acbf033 1198#: sequencer.c:645
c04f5ac3
JX
1199#, c-format
1200msgid "git %s: failed to refresh the index"
90e6ef53 1201msgstr "git %s:无法刷新索引"
c04f5ac3 1202
6acbf033 1203#: sequencer.c:705
c04f5ac3
JX
1204#, c-format
1205msgid "Cannot %s during a %s"
90e6ef53 1206msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1207
6acbf033 1208#: sequencer.c:727
c04f5ac3
JX
1209#, c-format
1210msgid "Could not parse line %d."
90e6ef53 1211msgstr "不能解析第 %d 行。"
c04f5ac3 1212
6acbf033 1213#: sequencer.c:732
c04f5ac3 1214msgid "No commits parsed."
7e238ab7 1215msgstr "没有提交被解析。"
c04f5ac3 1216
6acbf033 1217#: sequencer.c:745
c04f5ac3
JX
1218#, c-format
1219msgid "Could not open %s"
1220msgstr "不能打开 %s"
1221
6acbf033 1222#: sequencer.c:749
c04f5ac3
JX
1223#, c-format
1224msgid "Could not read %s."
1225msgstr "不能读取 %s。"
1226
6acbf033 1227#: sequencer.c:756
c04f5ac3
JX
1228#, c-format
1229msgid "Unusable instruction sheet: %s"
1230msgstr "无用的指令表单:%s"
1231
6acbf033 1232#: sequencer.c:786
c04f5ac3
JX
1233#, c-format
1234msgid "Invalid key: %s"
1235msgstr "无效键名:%s"
1236
6acbf033 1237#: sequencer.c:789
c04f5ac3
JX
1238#, c-format
1239msgid "Invalid value for %s: %s"
81809b99 1240msgstr "%s 的值无效:%s"
c04f5ac3 1241
6acbf033 1242#: sequencer.c:801
c04f5ac3
JX
1243#, c-format
1244msgid "Malformed options sheet: %s"
1245msgstr "非法的选项表单:%s"
1246
6acbf033 1247#: sequencer.c:822
c04f5ac3
JX
1248msgid "a cherry-pick or revert is already in progress"
1249msgstr "一个拣选或还原操作已在进行"
1250
6acbf033 1251#: sequencer.c:823
c04f5ac3
JX
1252msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1253msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1254
6acbf033 1255#: sequencer.c:827
c04f5ac3
JX
1256#, c-format
1257msgid "Could not create sequencer directory %s"
90e6ef53 1258msgstr "不能创建序列目录 %s"
c04f5ac3 1259
6acbf033 1260#: sequencer.c:843 sequencer.c:928
c04f5ac3
JX
1261#, c-format
1262msgid "Error wrapping up %s."
1263msgstr "错误收尾 %s。"
1264
6acbf033 1265#: sequencer.c:862 sequencer.c:998
c04f5ac3 1266msgid "no cherry-pick or revert in progress"
195febda 1267msgstr "拣选或还原操作并未进行"
c04f5ac3 1268
6acbf033 1269#: sequencer.c:864
c04f5ac3
JX
1270msgid "cannot resolve HEAD"
1271msgstr "不能解析 HEAD"
1272
6acbf033 1273#: sequencer.c:866
c04f5ac3 1274msgid "cannot abort from a branch yet to be born"
90e6ef53 1275msgstr "不能从尚未建立的分支终止"
c04f5ac3 1276
6acbf033 1277#: sequencer.c:888 builtin/apply.c:4062
c04f5ac3
JX
1278#, c-format
1279msgid "cannot open %s: %s"
1280msgstr "不能打开 %s:%s"
1281
6acbf033 1282#: sequencer.c:891
c04f5ac3
JX
1283#, c-format
1284msgid "cannot read %s: %s"
1285msgstr "不能读取 %s:%s"
1286
6acbf033 1287#: sequencer.c:892
c04f5ac3 1288msgid "unexpected end of file"
9aafc933 1289msgstr "意外的文件结束"
c04f5ac3 1290
6acbf033 1291#: sequencer.c:898
c04f5ac3
JX
1292#, c-format
1293msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1294msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1295
6acbf033 1296#: sequencer.c:921
c04f5ac3
JX
1297#, c-format
1298msgid "Could not format %s."
1299msgstr "不能格式化 %s。"
1300
6acbf033 1301#: sequencer.c:1066
4dcdc3d8
JX
1302#, c-format
1303msgid "%s: can't cherry-pick a %s"
1304msgstr "%s:不能拣选一个%s"
1305
6acbf033 1306#: sequencer.c:1069
4dcdc3d8
JX
1307#, c-format
1308msgid "%s: bad revision"
1309msgstr "%s:错误的版本"
1310
6acbf033 1311#: sequencer.c:1103
c04f5ac3
JX
1312msgid "Can't revert as initial commit"
1313msgstr "不能作为初始提交还原"
1314
6acbf033 1315#: sequencer.c:1104
c04f5ac3
JX
1316msgid "Can't cherry-pick into empty head"
1317msgstr "不能拣选到空分支"
1318
cfff71a9 1319#: sha1_name.c:439
2e8451e8
JX
1320msgid ""
1321"Git normally never creates a ref that ends with 40 hex characters\n"
1322"because it will be ignored when you just specify 40-hex. These refs\n"
1323"may be created by mistake. For example,\n"
1324"\n"
1325" git checkout -b $br $(git rev-parse ...)\n"
1326"\n"
1327"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1328"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1329"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1330msgstr ""
1331"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1332"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1333"\n"
1334" git checkout -b $br $(git rev-parse ...)\n"
1335"\n"
1336"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1337"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1338"命令关闭本消息通知。"
1339
6acbf033 1340#: sha1_name.c:1060
170e9899
JX
1341msgid "HEAD does not point to a branch"
1342msgstr "HEAD 没有指向一个分支"
1343
6acbf033 1344#: sha1_name.c:1063
170e9899
JX
1345#, c-format
1346msgid "No such branch: '%s'"
1347msgstr "没有此分支:'%s'"
1348
6acbf033 1349#: sha1_name.c:1065
170e9899
JX
1350#, c-format
1351msgid "No upstream configured for branch '%s'"
1352msgstr "尚未给分支 '%s' 设置上游"
1353
6acbf033 1354#: sha1_name.c:1069
170e9899
JX
1355#, c-format
1356msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1357msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1358
90314792
JX
1359#: submodule.c:64 submodule.c:98
1360msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1361msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1362
1363#: submodule.c:68 submodule.c:102
1364#, c-format
1365msgid "Could not find section in .gitmodules where path=%s"
1366msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1367
90314792
JX
1368#: submodule.c:76
1369#, c-format
1370msgid "Could not update .gitmodules entry %s"
1371msgstr "不能更新 .gitmodules 条目 %s"
1372
90314792
JX
1373#: submodule.c:109
1374#, c-format
1375msgid "Could not remove .gitmodules entry for %s"
1376msgstr "无法移除 %s 的 .gitmodules 条目"
1377
6c94aba5 1378#: submodule.c:120
90314792
JX
1379msgid "staging updated .gitmodules failed"
1380msgstr "将更新后 .gitmodules 添加暂存区失败"
1381
6acbf033 1382#: submodule.c:1118 builtin/init-db.c:363
90314792
JX
1383#, c-format
1384msgid "Could not create git link %s"
1385msgstr "不能创建 git link %s"
1386
6acbf033 1387#: submodule.c:1129
90314792
JX
1388#, c-format
1389msgid "Could not set core.worktree in %s"
1390msgstr "不能在 %s 中设置 core.worktree"
1391
6acbf033 1392#: unpack-trees.c:202
6c94aba5
JX
1393msgid "Checking out files"
1394msgstr "正在检出文件"
1395
90314792
JX
1396#: urlmatch.c:120
1397msgid "invalid URL scheme name or missing '://' suffix"
1398msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1399
1400#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1401#, c-format
1402msgid "invalid %XX escape sequence"
1403msgstr "无效的 %XX 转义序列"
1404
1405#: urlmatch.c:172
1406msgid "missing host and scheme is not 'file:'"
1407msgstr "缺失主机名且URL方案不是 'file:'"
1408
1409#: urlmatch.c:189
1410msgid "a 'file:' URL may not have a port number"
1411msgstr "一个 'file:' URL 不应该包含端口号"
1412
1413#: urlmatch.c:199
1414msgid "invalid characters in host name"
1415msgstr "主机名中包含无效的字符"
1416
1417#: urlmatch.c:244 urlmatch.c:255
1418msgid "invalid port number"
1419msgstr "无效的端口号"
1420
1421#: urlmatch.c:322
1422msgid "invalid '..' path segment"
1423msgstr "无效的 '..' 路径片段"
1424
6acbf033 1425#: wrapper.c:460
07432cef 1426#, c-format
ef317cd5 1427msgid "unable to access '%s': %s"
07432cef
WS
1428msgstr "不能访问 '%s':%s"
1429
6acbf033 1430#: wrapper.c:481
07432cef
WS
1431#, c-format
1432msgid "unable to access '%s'"
1433msgstr "不能访问 '%s'"
ef317cd5 1434
6acbf033 1435#: wrapper.c:492
d691f479
JX
1436#, c-format
1437msgid "unable to look up current user in the passwd file: %s"
07432cef 1438msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1439
6acbf033 1440#: wrapper.c:493
d691f479
JX
1441msgid "no such user"
1442msgstr "无此用户"
1443
cfff71a9 1444#: wt-status.c:150
c04f5ac3
JX
1445msgid "Unmerged paths:"
1446msgstr "未合并的路径:"
1447
90e6ef53 1448# 译者:注意保持前导空格
cfff71a9 1449#: wt-status.c:177 wt-status.c:204
c04f5ac3
JX
1450#, c-format
1451msgid " (use \"git reset %s <file>...\" to unstage)"
1452msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1453
90e6ef53 1454# 译者:注意保持前导空格
cfff71a9 1455#: wt-status.c:179 wt-status.c:206
c04f5ac3
JX
1456msgid " (use \"git rm --cached <file>...\" to unstage)"
1457msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1458
90e6ef53 1459# 译者:注意保持前导空格
cfff71a9 1460#: wt-status.c:183
6792b93b
JX
1461msgid " (use \"git add <file>...\" to mark resolution)"
1462msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1463
1464# 译者:注意保持前导空格
cfff71a9 1465#: wt-status.c:185 wt-status.c:189
c04f5ac3
JX
1466msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1467msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1468
6792b93b 1469# 译者:注意保持前导空格
cfff71a9 1470#: wt-status.c:187
6792b93b
JX
1471msgid " (use \"git rm <file>...\" to mark resolution)"
1472msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1473
cfff71a9 1474#: wt-status.c:198
c04f5ac3
JX
1475msgid "Changes to be committed:"
1476msgstr "要提交的变更:"
1477
cfff71a9 1478#: wt-status.c:216
c04f5ac3 1479msgid "Changes not staged for commit:"
7e238ab7 1480msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1481
90e6ef53 1482# 译者:注意保持前导空格
cfff71a9 1483#: wt-status.c:220
c04f5ac3
JX
1484msgid " (use \"git add <file>...\" to update what will be committed)"
1485msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1486
90e6ef53 1487# 译者:注意保持前导空格
cfff71a9 1488#: wt-status.c:222
c04f5ac3
JX
1489msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1490msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1491
90e6ef53 1492# 译者:注意保持前导空格
cfff71a9 1493#: wt-status.c:223
c04f5ac3
JX
1494msgid ""
1495" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1496msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1497
90e6ef53 1498# 译者:注意保持前导空格
cfff71a9 1499#: wt-status.c:225
c04f5ac3
JX
1500msgid " (commit or discard the untracked or modified content in submodules)"
1501msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1502
90e6ef53 1503# 译者:注意保持前导空格
cfff71a9 1504#: wt-status.c:237
c04f5ac3
JX
1505#, c-format
1506msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1507msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1508
6c94aba5 1509#: wt-status.c:252
c04f5ac3
JX
1510msgid "both deleted:"
1511msgstr "双方删除:"
1512
6c94aba5 1513#: wt-status.c:254
c04f5ac3
JX
1514msgid "added by us:"
1515msgstr "由我们添加:"
1516
6c94aba5 1517#: wt-status.c:256
c04f5ac3
JX
1518msgid "deleted by them:"
1519msgstr "由他们删除:"
1520
6c94aba5 1521#: wt-status.c:258
c04f5ac3
JX
1522msgid "added by them:"
1523msgstr "由他们添加:"
1524
6c94aba5 1525#: wt-status.c:260
c04f5ac3
JX
1526msgid "deleted by us:"
1527msgstr "由我们删除:"
1528
6c94aba5 1529#: wt-status.c:262
c04f5ac3
JX
1530msgid "both added:"
1531msgstr "双方添加:"
1532
6c94aba5 1533#: wt-status.c:264
c04f5ac3
JX
1534msgid "both modified:"
1535msgstr "双方修改:"
1536
6c94aba5
JX
1537#: wt-status.c:266
1538#, c-format
1539msgid "bug: unhandled unmerged status %x"
1540msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1541
6c94aba5
JX
1542#: wt-status.c:274
1543msgid "new file:"
1544msgstr "新文件:"
cfff71a9 1545
6c94aba5
JX
1546#: wt-status.c:276
1547msgid "copied:"
1548msgstr "拷贝:"
cfff71a9 1549
6c94aba5
JX
1550#: wt-status.c:278
1551msgid "deleted:"
1552msgstr "删除:"
cfff71a9 1553
6c94aba5
JX
1554#: wt-status.c:280
1555msgid "modified:"
1556msgstr "修改:"
1557
1558#: wt-status.c:282
1559msgid "renamed:"
1560msgstr "重命名:"
1561
1562#: wt-status.c:284
1563msgid "typechange:"
1564msgstr "类型变更:"
1565
1566#: wt-status.c:286
1567msgid "unknown:"
1568msgstr "未知:"
cfff71a9 1569
6c94aba5
JX
1570#: wt-status.c:288
1571msgid "unmerged:"
1572msgstr "未合并:"
cfff71a9 1573
90e6ef53 1574# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1575#: wt-status.c:370
c04f5ac3 1576msgid "new commits, "
aa9565f7 1577msgstr "新提交, "
c04f5ac3 1578
90e6ef53 1579# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1580#: wt-status.c:372
c04f5ac3 1581msgid "modified content, "
aa9565f7 1582msgstr "修改的内容, "
c04f5ac3 1583
90e6ef53 1584# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1585#: wt-status.c:374
c04f5ac3 1586msgid "untracked content, "
aa9565f7 1587msgstr "未跟踪的内容, "
c04f5ac3 1588
6c94aba5 1589#: wt-status.c:391
c04f5ac3
JX
1590#, c-format
1591msgid "bug: unhandled diff status %c"
6c94aba5 1592msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1593
6acbf033 1594#: wt-status.c:764
90314792
JX
1595msgid "Submodules changed but not updated:"
1596msgstr "子模组已修改但尚未更新:"
1597
6acbf033 1598#: wt-status.c:766
90314792
JX
1599msgid "Submodule changes to be committed:"
1600msgstr "要提交的子模组变更:"
1601
6acbf033 1602#: wt-status.c:845
cfff71a9
JX
1603msgid ""
1604"Do not touch the line above.\n"
1605"Everything below will be removed."
1606msgstr ""
1607"不要改动上面的一行。\n"
1608"下面的所有内容均将被删除。"
1609
6acbf033 1610#: wt-status.c:936
6792b93b 1611msgid "You have unmerged paths."
195febda 1612msgstr "您有尚未合并的路径。"
6792b93b
JX
1613
1614# 译者:注意保持前导空格
6acbf033 1615#: wt-status.c:939
6792b93b
JX
1616msgid " (fix conflicts and run \"git commit\")"
1617msgstr " (解决冲突并运行 \"git commit\")"
1618
6acbf033 1619#: wt-status.c:942
6792b93b
JX
1620msgid "All conflicts fixed but you are still merging."
1621msgstr "所有冲突已解决但您仍处于合并中。"
1622
1623# 译者:注意保持前导空格
6acbf033 1624#: wt-status.c:945
6792b93b
JX
1625msgid " (use \"git commit\" to conclude merge)"
1626msgstr " (使用 \"git commit\" 结束合并)"
1627
6acbf033 1628#: wt-status.c:955
6792b93b 1629msgid "You are in the middle of an am session."
98b2761d 1630msgstr "您正处于 am 操作过程中。"
6792b93b 1631
6acbf033 1632#: wt-status.c:958
6792b93b
JX
1633msgid "The current patch is empty."
1634msgstr "当前的补丁为空。"
1635
1636# 译者:注意保持前导空格
6acbf033 1637#: wt-status.c:962
2e8451e8
JX
1638msgid " (fix conflicts and then run \"git am --continue\")"
1639msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1640
1641# 译者:注意保持前导空格
6acbf033 1642#: wt-status.c:964
6792b93b
JX
1643msgid " (use \"git am --skip\" to skip this patch)"
1644msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1645
1646# 译者:注意保持前导空格
6acbf033 1647#: wt-status.c:966
6792b93b
JX
1648msgid " (use \"git am --abort\" to restore the original branch)"
1649msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1650
6acbf033 1651#: wt-status.c:1026 wt-status.c:1043
63af42fe
JX
1652#, c-format
1653msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 1654msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 1655
6acbf033 1656#: wt-status.c:1031 wt-status.c:1048
6792b93b 1657msgid "You are currently rebasing."
98b2761d 1658msgstr "您在执行变基操作。"
6792b93b
JX
1659
1660# 译者:注意保持前导空格
6acbf033 1661#: wt-status.c:1034
6792b93b
JX
1662msgid " (fix conflicts and then run \"git rebase --continue\")"
1663msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1664
1665# 译者:注意保持前导空格
6acbf033 1666#: wt-status.c:1036
6792b93b
JX
1667msgid " (use \"git rebase --skip\" to skip this patch)"
1668msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1669
1670# 译者:注意保持前导空格
6acbf033 1671#: wt-status.c:1038
6792b93b
JX
1672msgid " (use \"git rebase --abort\" to check out the original branch)"
1673msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1674
1675# 译者:注意保持前导空格
6acbf033 1676#: wt-status.c:1051
6792b93b
JX
1677msgid " (all conflicts fixed: run \"git rebase --continue\")"
1678msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1679
6acbf033 1680#: wt-status.c:1055
63af42fe
JX
1681#, c-format
1682msgid ""
1683"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 1684msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 1685
6acbf033 1686#: wt-status.c:1060
6792b93b 1687msgid "You are currently splitting a commit during a rebase."
98b2761d 1688msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
1689
1690# 译者:注意保持前导空格
6acbf033 1691#: wt-status.c:1063
6792b93b
JX
1692msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1693msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1694
6acbf033 1695#: wt-status.c:1067
63af42fe
JX
1696#, c-format
1697msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 1698msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 1699
6acbf033 1700#: wt-status.c:1072
6792b93b 1701msgid "You are currently editing a commit during a rebase."
98b2761d 1702msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
1703
1704# 译者:注意保持前导空格
6acbf033 1705#: wt-status.c:1075
6792b93b
JX
1706msgid " (use \"git commit --amend\" to amend the current commit)"
1707msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1708
1709# 译者:注意保持前导空格
6acbf033 1710#: wt-status.c:1077
6792b93b
JX
1711msgid ""
1712" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1713msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1714
6acbf033 1715#: wt-status.c:1087
90314792
JX
1716#, c-format
1717msgid "You are currently cherry-picking commit %s."
98b2761d 1718msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 1719
2e8451e8 1720# 译者:注意保持前导空格
6acbf033 1721#: wt-status.c:1092
2e8451e8
JX
1722msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1723msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1724
6792b93b 1725# 译者:注意保持前导空格
6acbf033 1726#: wt-status.c:1095
2e8451e8
JX
1727msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1728msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 1729
2e8451e8 1730# 译者:注意保持前导空格
6acbf033 1731#: wt-status.c:1097
2e8451e8
JX
1732msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1733msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1734
6acbf033 1735#: wt-status.c:1106
1003b3a5
JX
1736#, c-format
1737msgid "You are currently reverting commit %s."
98b2761d 1738msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
1739
1740# 译者:注意保持前导空格
6acbf033 1741#: wt-status.c:1111
1003b3a5
JX
1742msgid " (fix conflicts and run \"git revert --continue\")"
1743msgstr " (解决冲突并运行 \"git revert --continue\")"
1744
1745# 译者:注意保持前导空格
6acbf033 1746#: wt-status.c:1114
1003b3a5
JX
1747msgid " (all conflicts fixed: run \"git revert --continue\")"
1748msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1749
1750# 译者:注意保持前导空格
6acbf033 1751#: wt-status.c:1116
1003b3a5
JX
1752msgid " (use \"git revert --abort\" to cancel the revert operation)"
1753msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1754
6acbf033 1755#: wt-status.c:1127
63af42fe 1756#, c-format
1003b3a5 1757msgid "You are currently bisecting, started from branch '%s'."
98b2761d 1758msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 1759
6acbf033 1760#: wt-status.c:1131
6792b93b 1761msgid "You are currently bisecting."
98b2761d 1762msgstr "您在执行二分查找操作。"
6792b93b
JX
1763
1764# 译者:注意保持前导空格
6acbf033 1765#: wt-status.c:1134
6792b93b
JX
1766msgid " (use \"git bisect reset\" to get back to the original branch)"
1767msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1768
6acbf033 1769#: wt-status.c:1309
c04f5ac3
JX
1770msgid "On branch "
1771msgstr "位于分支 "
1772
6acbf033 1773#: wt-status.c:1316
2e8451e8 1774msgid "rebase in progress; onto "
98b2761d 1775msgstr "变基操作正在进行中;至 "
2e8451e8 1776
6acbf033 1777#: wt-status.c:1323
1003b3a5
JX
1778msgid "HEAD detached at "
1779msgstr "头指针分离于 "
1780
6acbf033 1781#: wt-status.c:1325
1003b3a5
JX
1782msgid "HEAD detached from "
1783msgstr "头指针分离自 "
1784
6acbf033 1785#: wt-status.c:1328
c04f5ac3
JX
1786msgid "Not currently on any branch."
1787msgstr "当前不在任何分支上。"
1788
6acbf033 1789#: wt-status.c:1345
c04f5ac3
JX
1790msgid "Initial commit"
1791msgstr "初始提交"
1792
6acbf033 1793#: wt-status.c:1359
ef317cd5 1794msgid "Untracked files"
07432cef 1795msgstr "未跟踪的文件"
c04f5ac3 1796
6acbf033 1797#: wt-status.c:1361
ef317cd5 1798msgid "Ignored files"
07432cef 1799msgstr "忽略的文件"
c04f5ac3 1800
6acbf033 1801#: wt-status.c:1365
1003b3a5 1802#, c-format
4dcdc3d8
JX
1803msgid ""
1804"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1805"may speed it up, but you have to be careful not to forget to add\n"
1806"new files yourself (see 'git help status')."
1807msgstr ""
1808"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1809"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 1810
6acbf033 1811#: wt-status.c:1371
c04f5ac3
JX
1812#, c-format
1813msgid "Untracked files not listed%s"
1814msgstr "未跟踪的文件没有列出%s"
1815
7e238ab7 1816# 译者:中文字符串拼接,可删除前导空格
6acbf033 1817#: wt-status.c:1373
c04f5ac3 1818msgid " (use -u option to show untracked files)"
7e238ab7 1819msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1820
6acbf033 1821#: wt-status.c:1379
c04f5ac3
JX
1822msgid "No changes"
1823msgstr "没有修改"
1824
6acbf033 1825#: wt-status.c:1384
07432cef 1826#, c-format
ef317cd5 1827msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1828msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1829
6acbf033 1830#: wt-status.c:1387
07432cef 1831#, c-format
ef317cd5 1832msgid "no changes added to commit\n"
07432cef 1833msgstr "修改尚未加入提交\n"
c04f5ac3 1834
6acbf033 1835#: wt-status.c:1390
07432cef 1836#, c-format
ef317cd5
JX
1837msgid ""
1838"nothing added to commit but untracked files present (use \"git add\" to "
1839"track)\n"
07432cef 1840msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1841
6acbf033 1842#: wt-status.c:1393
07432cef 1843#, c-format
ef317cd5 1844msgid "nothing added to commit but untracked files present\n"
07432cef 1845msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1846
7e238ab7 1847# 译者:中文字符串拼接,可删除前导空格
6acbf033 1848#: wt-status.c:1396
07432cef 1849#, c-format
ef317cd5 1850msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1851msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1852
6acbf033 1853#: wt-status.c:1399 wt-status.c:1404
07432cef 1854#, c-format
ef317cd5 1855msgid "nothing to commit\n"
07432cef 1856msgstr "无文件要提交\n"
ef317cd5 1857
7e238ab7 1858# 译者:中文字符串拼接,可删除前导空格
6acbf033 1859#: wt-status.c:1402
07432cef 1860#, c-format
ef317cd5 1861msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1862msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1863
7e238ab7 1864# 译者:中文字符串拼接,可删除前导空格
6acbf033 1865#: wt-status.c:1406
07432cef 1866#, c-format
ef317cd5 1867msgid "nothing to commit, working directory clean\n"
07432cef 1868msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1869
6acbf033 1870#: wt-status.c:1515
c04f5ac3 1871msgid "HEAD (no branch)"
61bc0753 1872msgstr "HEAD(非分支)"
c04f5ac3 1873
90e6ef53 1874# 译者:注意保持句尾空格
6acbf033 1875#: wt-status.c:1521
c04f5ac3
JX
1876msgid "Initial commit on "
1877msgstr "初始提交于 "
1878
6acbf033 1879#: wt-status.c:1553
90314792
JX
1880msgid "gone"
1881msgstr "丢失"
1882
90e6ef53 1883# 译者:注意保持句尾空格
6acbf033 1884#: wt-status.c:1555 wt-status.c:1563
c04f5ac3
JX
1885msgid "behind "
1886msgstr "落后 "
1887
cfff71a9 1888#: compat/precompose_utf8.c:55 builtin/clone.c:356
a77c07d9
JX
1889#, c-format
1890msgid "failed to unlink '%s'"
1891msgstr "无法删除 '%s'"
1892
6c94aba5 1893#: builtin/add.c:21
a77c07d9 1894msgid "git add [options] [--] <pathspec>..."
90314792 1895msgstr "git add [选项] [--] <路径规则>..."
ef317cd5 1896
6c94aba5 1897#: builtin/add.c:64
c04f5ac3
JX
1898#, c-format
1899msgid "unexpected diff status %c"
1900msgstr "意外的差异状态 %c"
1901
6c94aba5 1902#: builtin/add.c:69 builtin/commit.c:261
c04f5ac3
JX
1903msgid "updating files failed"
1904msgstr "更新文件失败"
1905
6c94aba5 1906#: builtin/add.c:79
c04f5ac3
JX
1907#, c-format
1908msgid "remove '%s'\n"
1909msgstr "删除 '%s'\n"
1910
6c94aba5 1911#: builtin/add.c:133
c04f5ac3 1912msgid "Unstaged changes after refreshing the index:"
90e6ef53 1913msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1914
6acbf033 1915#: builtin/add.c:193 builtin/rev-parse.c:781
c04f5ac3 1916msgid "Could not read the index"
90e6ef53 1917msgstr "不能读取索引"
c04f5ac3 1918
6c94aba5 1919#: builtin/add.c:204
c04f5ac3
JX
1920#, c-format
1921msgid "Could not open '%s' for writing."
195febda 1922msgstr "不能打开 '%s' 以写入。"
c04f5ac3 1923
6c94aba5 1924#: builtin/add.c:208
c04f5ac3 1925msgid "Could not write patch"
195febda 1926msgstr "不能生成补丁"
c04f5ac3 1927
6c94aba5 1928#: builtin/add.c:213
c04f5ac3
JX
1929#, c-format
1930msgid "Could not stat '%s'"
90e6ef53 1931msgstr "不能查看文件状态 '%s'"
c04f5ac3 1932
6c94aba5 1933#: builtin/add.c:215
c04f5ac3
JX
1934msgid "Empty patch. Aborted."
1935msgstr "空补丁。异常终止。"
1936
6c94aba5 1937#: builtin/add.c:221
8ada9598
JX
1938#, c-format
1939msgid "Could not apply '%s'"
1940msgstr "不能应用 '%s'"
1941
6c94aba5 1942#: builtin/add.c:231
8ada9598 1943msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 1944msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 1945
6acbf033
JX
1946#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
1947#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
90314792 1948#: builtin/rm.c:269
ef317cd5 1949msgid "dry run"
07432cef 1950msgstr "演习"
ef317cd5 1951
6acbf033
JX
1952#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
1953#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
1954#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
ef317cd5
JX
1955msgid "be verbose"
1956msgstr "冗长输出"
1957
6c94aba5 1958#: builtin/add.c:251
ef317cd5 1959msgid "interactive picking"
07432cef 1960msgstr "交互式拣选"
ef317cd5 1961
6acbf033 1962#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
ef317cd5 1963msgid "select hunks interactively"
07432cef 1964msgstr "交互式挑选数据块"
ef317cd5 1965
6c94aba5 1966#: builtin/add.c:253
ef317cd5 1967msgid "edit current diff and apply"
07432cef 1968msgstr "编辑当前差异并应用"
ef317cd5 1969
6c94aba5 1970#: builtin/add.c:254
ef317cd5 1971msgid "allow adding otherwise ignored files"
07432cef 1972msgstr "允许添加忽略的文件"
ef317cd5 1973
6c94aba5 1974#: builtin/add.c:255
ef317cd5 1975msgid "update tracked files"
07432cef 1976msgstr "更新已跟踪的文件"
ef317cd5 1977
6c94aba5 1978#: builtin/add.c:256
ef317cd5 1979msgid "record only the fact that the path will be added later"
07432cef 1980msgstr "只记录,该路径稍后再添加"
ef317cd5 1981
6c94aba5 1982#: builtin/add.c:257
ef317cd5 1983msgid "add changes from all tracked and untracked files"
07432cef 1984msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 1985
6c94aba5 1986#: builtin/add.c:260
4dcdc3d8
JX
1987msgid "ignore paths removed in the working tree (same as --no-all)"
1988msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
1989
6c94aba5 1990#: builtin/add.c:262
ef317cd5 1991msgid "don't add, only refresh the index"
07432cef 1992msgstr "不添加,只刷新索引"
ef317cd5 1993
6c94aba5 1994#: builtin/add.c:263
ef317cd5 1995msgid "just skip files which cannot be added because of errors"
07432cef 1996msgstr "跳过因出错不能添加的文件"
ef317cd5 1997
6c94aba5 1998#: builtin/add.c:264
ef317cd5 1999msgid "check if - even missing - files are ignored in dry run"
07432cef 2000msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2001
6c94aba5 2002#: builtin/add.c:286
8ada9598
JX
2003#, c-format
2004msgid "Use -f if you really want to add them.\n"
2005msgstr "使用 -f 参数如果您确实要添加它们。\n"
2006
6c94aba5 2007#: builtin/add.c:287
8ada9598
JX
2008msgid "no files added"
2009msgstr "没有文件被添加"
2010
6c94aba5 2011#: builtin/add.c:293
8ada9598
JX
2012msgid "adding files failed"
2013msgstr "添加文件失败"
2014
6acbf033 2015#: builtin/add.c:329
8ada9598
JX
2016msgid "-A and -u are mutually incompatible"
2017msgstr "-A 和 -u 选项互斥"
2018
6acbf033 2019#: builtin/add.c:336
8ada9598 2020msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2021msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2022
6acbf033 2023#: builtin/add.c:357
8ada9598
JX
2024#, c-format
2025msgid "Nothing specified, nothing added.\n"
2026msgstr "没有指定文件,也没有文件被添加。\n"
2027
6acbf033 2028#: builtin/add.c:358
8ada9598
JX
2029#, c-format
2030msgid "Maybe you wanted to say 'git add .'?\n"
2031msgstr "也许您想要执行 'git add .'?\n"
2032
6acbf033
JX
2033#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
2034#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
8ada9598
JX
2035msgid "index file corrupt"
2036msgstr "索引文件损坏"
2037
6acbf033 2038#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431
8ada9598
JX
2039msgid "Unable to write new index file"
2040msgstr "无法写入新索引文件"
2041
23ff3338 2042#: builtin/apply.c:57
8ada9598 2043msgid "git apply [options] [<patch>...]"
81809b99 2044msgstr "git apply [选项] [<补丁>...]"
8ada9598 2045
23ff3338 2046#: builtin/apply.c:110
81809b99 2047#, c-format
8ada9598 2048msgid "unrecognized whitespace option '%s'"
81809b99 2049msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2050
23ff3338 2051#: builtin/apply.c:125
81809b99 2052#, c-format
8ada9598 2053msgid "unrecognized whitespace ignore option '%s'"
81809b99 2054msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2055
6acbf033 2056#: builtin/apply.c:825
8ada9598
JX
2057#, c-format
2058msgid "Cannot prepare timestamp regexp %s"
81809b99 2059msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2060
6acbf033 2061#: builtin/apply.c:834
8ada9598
JX
2062#, c-format
2063msgid "regexec returned %d for input: %s"
81809b99 2064msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2065
6acbf033 2066#: builtin/apply.c:915
81809b99 2067#, c-format
8ada9598 2068msgid "unable to find filename in patch at line %d"
81809b99 2069msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2070
6acbf033 2071#: builtin/apply.c:947
8ada9598
JX
2072#, c-format
2073msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2074msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2075
6acbf033 2076#: builtin/apply.c:951
8ada9598
JX
2077#, c-format
2078msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2079msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2080
6acbf033 2081#: builtin/apply.c:952
8ada9598
JX
2082#, c-format
2083msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2084msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2085
6acbf033 2086#: builtin/apply.c:959
8ada9598
JX
2087#, c-format
2088msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2089msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2090
a77c07d9 2091#: builtin/apply.c:1422
8ada9598
JX
2092#, c-format
2093msgid "recount: unexpected line: %.*s"
81809b99 2094msgstr "recount:意外的行:%.*s"
8ada9598 2095
a77c07d9 2096#: builtin/apply.c:1479
8ada9598
JX
2097#, c-format
2098msgid "patch fragment without header at line %d: %.*s"
81809b99 2099msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2100
a77c07d9 2101#: builtin/apply.c:1496
8ada9598
JX
2102#, c-format
2103msgid ""
2104"git diff header lacks filename information when removing %d leading pathname "
2105"component (line %d)"
2106msgid_plural ""
2107"git diff header lacks filename information when removing %d leading pathname "
2108"components (line %d)"
5ae481e0
JX
2109msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2110msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2111
a77c07d9 2112#: builtin/apply.c:1656
8ada9598 2113msgid "new file depends on old contents"
81809b99 2114msgstr "新文件依赖旧内容"
8ada9598 2115
a77c07d9 2116#: builtin/apply.c:1658
8ada9598 2117msgid "deleted file still has contents"
81809b99 2118msgstr "删除的文件仍有内容"
8ada9598 2119
a77c07d9 2120#: builtin/apply.c:1684
8ada9598
JX
2121#, c-format
2122msgid "corrupt patch at line %d"
195febda 2123msgstr "补丁在第 %d 行损坏"
8ada9598 2124
a77c07d9 2125#: builtin/apply.c:1720
8ada9598
JX
2126#, c-format
2127msgid "new file %s depends on old contents"
81809b99 2128msgstr "新文件 %s 依赖旧内容"
8ada9598 2129
a77c07d9 2130#: builtin/apply.c:1722
8ada9598
JX
2131#, c-format
2132msgid "deleted file %s still has contents"
81809b99 2133msgstr "删除的文件 %s 仍有内容"
8ada9598 2134
a77c07d9 2135#: builtin/apply.c:1725
8ada9598
JX
2136#, c-format
2137msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2138msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2139
a77c07d9 2140#: builtin/apply.c:1871
8ada9598
JX
2141#, c-format
2142msgid "corrupt binary patch at line %d: %.*s"
81809b99 2143msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2144
a77c07d9 2145#: builtin/apply.c:1900
8ada9598
JX
2146#, c-format
2147msgid "unrecognized binary patch at line %d"
81809b99 2148msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2149
a77c07d9 2150#: builtin/apply.c:1986
8ada9598
JX
2151#, c-format
2152msgid "patch with only garbage at line %d"
81809b99 2153msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2154
a77c07d9 2155#: builtin/apply.c:2076
81809b99 2156#, c-format
8ada9598 2157msgid "unable to read symlink %s"
81809b99 2158msgstr "无法读取符号链接 %s"
8ada9598 2159
a77c07d9 2160#: builtin/apply.c:2080
81809b99 2161#, c-format
8ada9598 2162msgid "unable to open or read %s"
81809b99 2163msgstr "不能打开或读取 %s"
8ada9598 2164
1003b3a5 2165#: builtin/apply.c:2688
81809b99 2166#, c-format
8ada9598 2167msgid "invalid start of line: '%c'"
81809b99 2168msgstr "无效的行首字符:'%c'"
8ada9598 2169
1003b3a5 2170#: builtin/apply.c:2806
8ada9598
JX
2171#, c-format
2172msgid "Hunk #%d succeeded at %d (offset %d line)."
2173msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2174msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2175msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2176
1003b3a5 2177#: builtin/apply.c:2818
8ada9598
JX
2178#, c-format
2179msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2180msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2181
1003b3a5 2182#: builtin/apply.c:2824
8ada9598
JX
2183#, c-format
2184msgid ""
2185"while searching for:\n"
2186"%.*s"
2187msgstr ""
81809b99
JX
2188"当查询:\n"
2189"%.*s"
8ada9598 2190
1003b3a5 2191#: builtin/apply.c:2843
8ada9598
JX
2192#, c-format
2193msgid "missing binary patch data for '%s'"
81809b99 2194msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2195
6acbf033 2196#: builtin/apply.c:2944
8ada9598
JX
2197#, c-format
2198msgid "binary patch does not apply to '%s'"
81809b99 2199msgstr "二进制补丁未应用到 '%s'"
8ada9598 2200
6acbf033 2201#: builtin/apply.c:2950
8ada9598
JX
2202#, c-format
2203msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2204msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2205
6acbf033 2206#: builtin/apply.c:2971
8ada9598
JX
2207#, c-format
2208msgid "patch failed: %s:%ld"
81809b99 2209msgstr "打补丁失败:%s:%ld"
8ada9598 2210
1003b3a5 2211#: builtin/apply.c:3095
8ada9598 2212#, c-format
23ff3338
JX
2213msgid "cannot checkout %s"
2214msgstr "不能检出 %s"
8ada9598 2215
2e8451e8 2216#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
81809b99 2217#, c-format
8ada9598 2218msgid "read of %s failed"
81809b99 2219msgstr "读取 %s 失败"
8ada9598 2220
2e8451e8 2221#: builtin/apply.c:3174 builtin/apply.c:3396
81809b99 2222#, c-format
23ff3338
JX
2223msgid "path %s has been renamed/deleted"
2224msgstr "路径 %s 已经被重命名/删除"
8ada9598 2225
2e8451e8 2226#: builtin/apply.c:3255 builtin/apply.c:3410
8ada9598 2227#, c-format
23ff3338
JX
2228msgid "%s: does not exist in index"
2229msgstr "%s:不存在于索引中"
8ada9598 2230
2e8451e8 2231#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
81809b99 2232#, c-format
8ada9598 2233msgid "%s: %s"
81809b99 2234msgstr "%s:%s"
8ada9598 2235
2e8451e8 2236#: builtin/apply.c:3264 builtin/apply.c:3418
81809b99 2237#, c-format
8ada9598 2238msgid "%s: does not match index"
81809b99 2239msgstr "%s:和索引不匹配"
8ada9598 2240
2e8451e8 2241#: builtin/apply.c:3366
23ff3338
JX
2242msgid "removal patch leaves file contents"
2243msgstr "移除补丁仍留下了文件内容"
2244
2e8451e8 2245#: builtin/apply.c:3435
8ada9598
JX
2246#, c-format
2247msgid "%s: wrong type"
81809b99 2248msgstr "%s:错误类型"
8ada9598 2249
2e8451e8 2250#: builtin/apply.c:3437
8ada9598
JX
2251#, c-format
2252msgid "%s has type %o, expected %o"
9aafc933 2253msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2254
2e8451e8 2255#: builtin/apply.c:3538
81809b99 2256#, c-format
8ada9598 2257msgid "%s: already exists in index"
81809b99 2258msgstr "%s:已经存在于索引中"
8ada9598 2259
2e8451e8 2260#: builtin/apply.c:3541
23ff3338
JX
2261#, c-format
2262msgid "%s: already exists in working directory"
2263msgstr "%s:已经存在于工作区中"
2264
2e8451e8 2265#: builtin/apply.c:3561
d691f479
JX
2266#, c-format
2267msgid "new mode (%o) of %s does not match old mode (%o)"
2268msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2269
2e8451e8 2270#: builtin/apply.c:3566
8ada9598 2271#, c-format
d691f479
JX
2272msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2273msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2274
2e8451e8 2275#: builtin/apply.c:3574
d691f479 2276#, c-format
8ada9598 2277msgid "%s: patch does not apply"
81809b99 2278msgstr "%s:补丁未应用"
8ada9598 2279
2e8451e8 2280#: builtin/apply.c:3587
8ada9598
JX
2281#, c-format
2282msgid "Checking patch %s..."
81809b99 2283msgstr "检查补丁 %s..."
8ada9598 2284
6c94aba5 2285#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
8ada9598
JX
2286#, c-format
2287msgid "make_cache_entry failed for path '%s'"
2288msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2289
2e8451e8 2290#: builtin/apply.c:3823
81809b99 2291#, c-format
8ada9598 2292msgid "unable to remove %s from index"
81809b99 2293msgstr "不能从索引中移除 %s"
8ada9598 2294
6acbf033 2295#: builtin/apply.c:3852
8ada9598 2296#, c-format
2e8451e8
JX
2297msgid "corrupt patch for submodule %s"
2298msgstr "子模组 %s 损坏的补丁"
8ada9598 2299
6acbf033 2300#: builtin/apply.c:3856
81809b99 2301#, c-format
8ada9598 2302msgid "unable to stat newly created file '%s'"
81809b99 2303msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2304
6acbf033 2305#: builtin/apply.c:3861
8ada9598
JX
2306#, c-format
2307msgid "unable to create backing store for newly created file %s"
81809b99 2308msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2309
6acbf033 2310#: builtin/apply.c:3864 builtin/apply.c:3972
81809b99 2311#, c-format
8ada9598 2312msgid "unable to add cache entry for %s"
81809b99 2313msgstr "无法为 %s 添加缓存条目"
8ada9598 2314
6acbf033 2315#: builtin/apply.c:3897
81809b99 2316#, c-format
8ada9598 2317msgid "closing file '%s'"
81809b99 2318msgstr "关闭文件 '%s'"
8ada9598 2319
6acbf033 2320#: builtin/apply.c:3946
81809b99 2321#, c-format
8ada9598 2322msgid "unable to write file '%s' mode %o"
81809b99 2323msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2324
6acbf033 2325#: builtin/apply.c:4033
8ada9598
JX
2326#, c-format
2327msgid "Applied patch %s cleanly."
81809b99 2328msgstr "成功应用补丁 %s。"
8ada9598 2329
6acbf033 2330#: builtin/apply.c:4041
8ada9598 2331msgid "internal error"
81809b99 2332msgstr "内部错误"
8ada9598 2333
6acbf033 2334#: builtin/apply.c:4044
8ada9598
JX
2335#, c-format
2336msgid "Applying patch %%s with %d reject..."
2337msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2338msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2339msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2340
6acbf033 2341#: builtin/apply.c:4054
8ada9598
JX
2342#, c-format
2343msgid "truncating .rej filename to %.*s.rej"
81809b99 2344msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2345
6acbf033 2346#: builtin/apply.c:4075
8ada9598
JX
2347#, c-format
2348msgid "Hunk #%d applied cleanly."
81809b99 2349msgstr "第 #%d 个片段成功应用。"
8ada9598 2350
6acbf033 2351#: builtin/apply.c:4078
8ada9598
JX
2352#, c-format
2353msgid "Rejected hunk #%d."
81809b99 2354msgstr "拒绝第 #%d 个片段。"
8ada9598 2355
6acbf033 2356#: builtin/apply.c:4228
8ada9598 2357msgid "unrecognized input"
81809b99 2358msgstr "未能识别的输入"
8ada9598 2359
6acbf033 2360#: builtin/apply.c:4239
8ada9598 2361msgid "unable to read index file"
81809b99 2362msgstr "无法读取索引文件"
8ada9598 2363
6acbf033
JX
2364#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
2365#: builtin/fetch.c:93
8ada9598 2366msgid "path"
81809b99 2367msgstr "路径"
8ada9598 2368
6acbf033 2369#: builtin/apply.c:4359
8ada9598 2370msgid "don't apply changes matching the given path"
81809b99 2371msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2372
6acbf033 2373#: builtin/apply.c:4362
8ada9598 2374msgid "apply changes matching the given path"
81809b99 2375msgstr "应用与给出路径向匹配的变更"
8ada9598 2376
6acbf033 2377#: builtin/apply.c:4364
8ada9598 2378msgid "num"
81809b99 2379msgstr "数字"
8ada9598 2380
6acbf033 2381#: builtin/apply.c:4365
8ada9598 2382msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2383msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2384
6acbf033 2385#: builtin/apply.c:4368
8ada9598 2386msgid "ignore additions made by the patch"
81809b99 2387msgstr "忽略补丁中的添加的文件"
8ada9598 2388
6acbf033 2389#: builtin/apply.c:4370
8ada9598 2390msgid "instead of applying the patch, output diffstat for the input"
81809b99 2391msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2392
6acbf033 2393#: builtin/apply.c:4374
ef317cd5 2394msgid "show number of added and deleted lines in decimal notation"
07432cef 2395msgstr "以十进制数显示添加和删除的行数"
8ada9598 2396
6acbf033 2397#: builtin/apply.c:4376
8ada9598 2398msgid "instead of applying the patch, output a summary for the input"
81809b99 2399msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2400
6acbf033 2401#: builtin/apply.c:4378
8ada9598 2402msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2403msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2404
6acbf033 2405#: builtin/apply.c:4380
8ada9598 2406msgid "make sure the patch is applicable to the current index"
81809b99 2407msgstr "确认补丁可以应用到当前索引"
8ada9598 2408
6acbf033 2409#: builtin/apply.c:4382
8ada9598 2410msgid "apply a patch without touching the working tree"
81809b99 2411msgstr "应用补丁而不修改工作区"
8ada9598 2412
6acbf033 2413#: builtin/apply.c:4384
8ada9598 2414msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2415msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2416
6acbf033 2417#: builtin/apply.c:4386
23ff3338
JX
2418msgid "attempt three-way merge if a patch does not apply"
2419msgstr "如果一个补丁不能应用则尝试三路合并"
2420
6acbf033 2421#: builtin/apply.c:4388
8ada9598 2422msgid "build a temporary index based on embedded index information"
81809b99 2423msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2424
6acbf033 2425#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
8ada9598 2426msgid "paths are separated with NUL character"
81809b99 2427msgstr "路径以 NUL 字符分隔"
8ada9598 2428
6acbf033 2429#: builtin/apply.c:4393
8ada9598 2430msgid "ensure at least <n> lines of context match"
81809b99 2431msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2432
6acbf033 2433#: builtin/apply.c:4394
8ada9598 2434msgid "action"
81809b99 2435msgstr "动作"
8ada9598 2436
6acbf033 2437#: builtin/apply.c:4395
8ada9598 2438msgid "detect new or modified lines that have whitespace errors"
81809b99 2439msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2440
6acbf033 2441#: builtin/apply.c:4398 builtin/apply.c:4401
8ada9598 2442msgid "ignore changes in whitespace when finding context"
81809b99 2443msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2444
6acbf033 2445#: builtin/apply.c:4404
8ada9598 2446msgid "apply the patch in reverse"
81809b99 2447msgstr "反向应用补丁"
8ada9598 2448
6acbf033 2449#: builtin/apply.c:4406
8ada9598 2450msgid "don't expect at least one line of context"
81809b99 2451msgstr "无需至少一行上下文"
8ada9598 2452
6acbf033 2453#: builtin/apply.c:4408
8ada9598 2454msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2455msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2456
6acbf033 2457#: builtin/apply.c:4410
8ada9598 2458msgid "allow overlapping hunks"
81809b99 2459msgstr "允许重叠的补丁片段"
8ada9598 2460
6acbf033 2461#: builtin/apply.c:4413
8ada9598 2462msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2463msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2464
6acbf033 2465#: builtin/apply.c:4416
8ada9598 2466msgid "do not trust the line counts in the hunk headers"
81809b99 2467msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2468
6acbf033 2469#: builtin/apply.c:4418
8ada9598 2470msgid "root"
81809b99 2471msgstr "根目录"
c04f5ac3 2472
6acbf033 2473#: builtin/apply.c:4419
8ada9598 2474msgid "prepend <root> to all filenames"
81809b99 2475msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2476
6acbf033 2477#: builtin/apply.c:4441
23ff3338
JX
2478msgid "--3way outside a repository"
2479msgstr "--3way 在一个版本库之外"
2480
6acbf033 2481#: builtin/apply.c:4449
8ada9598 2482msgid "--index outside a repository"
81809b99 2483msgstr "--index 在一个版本库之外"
c04f5ac3 2484
6acbf033 2485#: builtin/apply.c:4452
8ada9598 2486msgid "--cached outside a repository"
81809b99 2487msgstr "--cached 在一个版本库之外"
c04f5ac3 2488
6acbf033 2489#: builtin/apply.c:4468
81809b99 2490#, c-format
8ada9598 2491msgid "can't open patch '%s'"
81809b99 2492msgstr "不能打开补丁 '%s'"
c04f5ac3 2493
6acbf033 2494#: builtin/apply.c:4482
c04f5ac3 2495#, c-format
8ada9598
JX
2496msgid "squelched %d whitespace error"
2497msgid_plural "squelched %d whitespace errors"
81809b99 2498msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2499msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2500
6acbf033 2501#: builtin/apply.c:4488 builtin/apply.c:4498
8ada9598
JX
2502#, c-format
2503msgid "%d line adds whitespace errors."
2504msgid_plural "%d lines add whitespace errors."
81809b99 2505msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2506msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2507
2508#: builtin/archive.c:17
2509#, c-format
2510msgid "could not create archive file '%s'"
90e6ef53 2511msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2512
2513#: builtin/archive.c:20
2514msgid "could not redirect output"
195febda 2515msgstr "不能重定向输出"
c04f5ac3
JX
2516
2517#: builtin/archive.c:37
2518msgid "git archive: Remote with no URL"
90e6ef53 2519msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2520
2521#: builtin/archive.c:58
2522msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2523msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3 2524
1003b3a5 2525#: builtin/archive.c:61
c04f5ac3
JX
2526#, c-format
2527msgid "git archive: NACK %s"
90e6ef53 2528msgstr "git archive:NACK %s"
c04f5ac3 2529
1003b3a5 2530#: builtin/archive.c:63
c04f5ac3
JX
2531#, c-format
2532msgid "remote error: %s"
2533msgstr "远程错误:%s"
2534
1003b3a5 2535#: builtin/archive.c:64
c04f5ac3 2536msgid "git archive: protocol error"
90e6ef53 2537msgstr "git archive:协议错误"
c04f5ac3 2538
1003b3a5 2539#: builtin/archive.c:68
c04f5ac3 2540msgid "git archive: expected a flush"
195febda 2541msgstr "git archive:应为刷新"
c04f5ac3 2542
ef317cd5
JX
2543#: builtin/bisect--helper.c:7
2544msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2545msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2546
2547#: builtin/bisect--helper.c:17
2548msgid "perform 'git bisect next'"
07432cef 2549msgstr "执行 'git bisect next'"
ef317cd5
JX
2550
2551#: builtin/bisect--helper.c:19
2552msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2553msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2554
6acbf033 2555#: builtin/blame.c:30
ef317cd5 2556msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2557msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5 2558
6acbf033 2559#: builtin/blame.c:35
ef317cd5 2560msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2561msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2562
6acbf033 2563#: builtin/blame.c:2501
ef317cd5 2564msgid "Show blame entries as we find them, incrementally"
07432cef 2565msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2566
6acbf033 2567#: builtin/blame.c:2502
ef317cd5 2568msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2569msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2570
6acbf033 2571#: builtin/blame.c:2503
ef317cd5 2572msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2573msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2574
6acbf033 2575#: builtin/blame.c:2504
ef317cd5 2576msgid "Show work cost statistics"
07432cef 2577msgstr "显示命令消耗统计"
ef317cd5 2578
6acbf033 2579#: builtin/blame.c:2505
ef317cd5 2580msgid "Show output score for blame entries"
07432cef 2581msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2582
6acbf033 2583#: builtin/blame.c:2506
ef317cd5 2584msgid "Show original filename (Default: auto)"
07432cef 2585msgstr "显示原始文件名(默认:自动)"
ef317cd5 2586
6acbf033 2587#: builtin/blame.c:2507
ef317cd5 2588msgid "Show original linenumber (Default: off)"
07432cef 2589msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2590
6acbf033 2591#: builtin/blame.c:2508
ef317cd5 2592msgid "Show in a format designed for machine consumption"
07432cef 2593msgstr "显示为一个适合机器读取的格式"
ef317cd5 2594
6acbf033 2595#: builtin/blame.c:2509
ef317cd5 2596msgid "Show porcelain format with per-line commit information"
07432cef 2597msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2598
6acbf033 2599#: builtin/blame.c:2510
ef317cd5 2600msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2601msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2602
6acbf033 2603#: builtin/blame.c:2511
ef317cd5 2604msgid "Show raw timestamp (Default: off)"
07432cef 2605msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2606
6acbf033 2607#: builtin/blame.c:2512
ef317cd5 2608msgid "Show long commit SHA1 (Default: off)"
07432cef 2609msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2610
6acbf033 2611#: builtin/blame.c:2513
ef317cd5 2612msgid "Suppress author name and timestamp (Default: off)"
07432cef 2613msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2614
6acbf033 2615#: builtin/blame.c:2514
ef317cd5 2616msgid "Show author email instead of name (Default: off)"
07432cef 2617msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2618
6acbf033 2619#: builtin/blame.c:2515
ef317cd5 2620msgid "Ignore whitespace differences"
07432cef 2621msgstr "忽略空白差异"
ef317cd5 2622
6acbf033 2623#: builtin/blame.c:2516
ef317cd5 2624msgid "Spend extra cycles to find better match"
07432cef 2625msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2626
6acbf033 2627#: builtin/blame.c:2517
ef317cd5 2628msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2629msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2630
6acbf033 2631#: builtin/blame.c:2518
ef317cd5 2632msgid "Use <file>'s contents as the final image"
07432cef 2633msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2634
6acbf033 2635#: builtin/blame.c:2519 builtin/blame.c:2520
ef317cd5 2636msgid "score"
07432cef 2637msgstr "得分"
ef317cd5 2638
6acbf033 2639#: builtin/blame.c:2519
ef317cd5 2640msgid "Find line copies within and across files"
07432cef 2641msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2642
6acbf033 2643#: builtin/blame.c:2520
ef317cd5 2644msgid "Find line movements within and across files"
07432cef 2645msgstr "找到文件内及跨文件的行移动"
ef317cd5 2646
6acbf033 2647#: builtin/blame.c:2521
ef317cd5 2648msgid "n,m"
07432cef 2649msgstr "n,m"
ef317cd5 2650
6acbf033 2651#: builtin/blame.c:2521
ef317cd5 2652msgid "Process only line range n,m, counting from 1"
07432cef 2653msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2654
6c94aba5
JX
2655#. TRANSLATORS: This string is used to tell us the maximum
2656#. display width for a relative timestamp in "git blame"
2657#. output. For C locale, "4 years, 11 months ago", which
2658#. takes 22 places, is the longest among various forms of
2659#. relative timestamps, but your language may need more or
2660#. fewer display columns.
6acbf033 2661#: builtin/blame.c:2599
6c94aba5
JX
2662msgid "4 years, 11 months ago"
2663msgstr "4 年 11 个月前"
2664
1003b3a5 2665#: builtin/branch.c:24
ef317cd5 2666msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2667msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5 2668
1003b3a5 2669#: builtin/branch.c:25
ef317cd5 2670msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2671msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2672
1003b3a5 2673#: builtin/branch.c:26
ef317cd5 2674msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2675msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5 2676
1003b3a5 2677#: builtin/branch.c:27
ef317cd5 2678msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2679msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2680
90e6ef53 2681# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4dcdc3d8 2682#: builtin/branch.c:150
c04f5ac3
JX
2683#, c-format
2684msgid ""
2685"deleting branch '%s' that has been merged to\n"
2686" '%s', but not yet merged to HEAD."
2687msgstr ""
70fc47bf 2688"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2689" '%s',但未合并到 HEAD。"
2690
90e6ef53 2691# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4dcdc3d8 2692#: builtin/branch.c:154
c04f5ac3
JX
2693#, c-format
2694msgid ""
2695"not deleting branch '%s' that is not yet merged to\n"
2696" '%s', even though it is merged to HEAD."
2697msgstr ""
70fc47bf
T
2698"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2699" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2700
4dcdc3d8 2701#: builtin/branch.c:168
07432cef
WS
2702#, c-format
2703msgid "Couldn't look up commit object for '%s'"
2704msgstr "无法查询 '%s' 指向的提交对象"
2705
4dcdc3d8 2706#: builtin/branch.c:172
07432cef
WS
2707#, c-format
2708msgid ""
2709"The branch '%s' is not fully merged.\n"
2710"If you are sure you want to delete it, run 'git branch -D %s'."
2711msgstr ""
2712"分支 '%s' 没有完全合并。\n"
2713"如果您确认要删除它,执行 'git branch -D %s'。"
2714
4dcdc3d8 2715#: builtin/branch.c:185
07432cef
WS
2716msgid "Update of config-file failed"
2717msgstr "无法更新 config 文件"
2718
4dcdc3d8 2719#: builtin/branch.c:213
c04f5ac3 2720msgid "cannot use -a with -d"
649900bc 2721msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2722
4dcdc3d8 2723#: builtin/branch.c:219
c04f5ac3
JX
2724msgid "Couldn't look up commit object for HEAD"
2725msgstr "无法查询 HEAD 指向的提交对象"
2726
4dcdc3d8 2727#: builtin/branch.c:227
c04f5ac3
JX
2728#, c-format
2729msgid "Cannot delete the branch '%s' which you are currently on."
2730msgstr "无法删除您当前所在的分支 '%s'。"
2731
4dcdc3d8 2732#: builtin/branch.c:240
5ae481e0 2733#, c-format
8ada9598 2734msgid "remote branch '%s' not found."
81809b99 2735msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2736
4dcdc3d8 2737#: builtin/branch.c:241
81809b99 2738#, c-format
8ada9598 2739msgid "branch '%s' not found."
81809b99 2740msgstr "分支 '%s' 未发现。"
8ada9598 2741
4dcdc3d8 2742#: builtin/branch.c:255
81809b99 2743#, c-format
8ada9598 2744msgid "Error deleting remote branch '%s'"
81809b99 2745msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2746
4dcdc3d8 2747#: builtin/branch.c:256
81809b99 2748#, c-format
8ada9598 2749msgid "Error deleting branch '%s'"
81809b99 2750msgstr "删除分支 '%s' 时出错"
8ada9598 2751
4dcdc3d8 2752#: builtin/branch.c:263
81809b99 2753#, c-format
8ada9598 2754msgid "Deleted remote branch %s (was %s).\n"
81809b99 2755msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2756
4dcdc3d8 2757#: builtin/branch.c:264
81809b99 2758#, c-format
8ada9598 2759msgid "Deleted branch %s (was %s).\n"
81809b99 2760msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2761
4dcdc3d8 2762#: builtin/branch.c:366
c04f5ac3
JX
2763#, c-format
2764msgid "branch '%s' does not point at a commit"
2765msgstr "分支 '%s' 未指向一个提交"
2766
cfff71a9 2767#: builtin/branch.c:454
81809b99 2768#, c-format
90314792
JX
2769msgid "[%s: gone]"
2770msgstr "[%s: 丢失]"
2771
cfff71a9 2772#: builtin/branch.c:459
90314792
JX
2773#, c-format
2774msgid "[%s]"
2775msgstr "[%s]"
2776
cfff71a9 2777#: builtin/branch.c:464
90314792 2778#, c-format
8ada9598 2779msgid "[%s: behind %d]"
81809b99 2780msgstr "[%s:落后 %d]"
c04f5ac3 2781
cfff71a9 2782#: builtin/branch.c:466
81809b99 2783#, c-format
8ada9598 2784msgid "[behind %d]"
81809b99 2785msgstr "[落后 %d]"
8ada9598 2786
cfff71a9 2787#: builtin/branch.c:470
81809b99 2788#, c-format
8ada9598 2789msgid "[%s: ahead %d]"
81809b99 2790msgstr "[%s:领先 %d]"
c04f5ac3 2791
cfff71a9 2792#: builtin/branch.c:472
81809b99 2793#, c-format
8ada9598 2794msgid "[ahead %d]"
81809b99 2795msgstr "[领先 %d]"
8ada9598 2796
cfff71a9 2797#: builtin/branch.c:475
81809b99 2798#, c-format
8ada9598 2799msgid "[%s: ahead %d, behind %d]"
81809b99 2800msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2801
cfff71a9 2802#: builtin/branch.c:478
81809b99 2803#, c-format
8ada9598 2804msgid "[ahead %d, behind %d]"
81809b99 2805msgstr "[领先 %d,落后 %d]"
c04f5ac3 2806
cfff71a9 2807#: builtin/branch.c:502
a77c07d9
JX
2808msgid " **** invalid ref ****"
2809msgstr " **** 无效引用 ****"
2810
cfff71a9 2811#: builtin/branch.c:594
1003b3a5
JX
2812#, c-format
2813msgid "(no branch, rebasing %s)"
2814msgstr "(非分支,正变基 %s)"
2815
cfff71a9 2816#: builtin/branch.c:597
1003b3a5
JX
2817#, c-format
2818msgid "(no branch, bisect started on %s)"
2819msgstr "(非分支,二分查找开始于 %s)"
2820
cfff71a9 2821#: builtin/branch.c:600
1003b3a5
JX
2822#, c-format
2823msgid "(detached from %s)"
2824msgstr "(分离自 %s)"
2825
cfff71a9 2826#: builtin/branch.c:603
c04f5ac3
JX
2827msgid "(no branch)"
2828msgstr "(非分支)"
2829
cfff71a9 2830#: builtin/branch.c:649
a77c07d9
JX
2831#, c-format
2832msgid "object '%s' does not point to a commit"
2833msgstr "对象 '%s' 没有指向一个提交"
2834
cfff71a9 2835#: builtin/branch.c:681
c04f5ac3 2836msgid "some refs could not be read"
90e6ef53 2837msgstr "一些引用不能读取"
c04f5ac3 2838
cfff71a9 2839#: builtin/branch.c:694
c04f5ac3 2840msgid "cannot rename the current branch while not on any."
90e6ef53 2841msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2842
cfff71a9 2843#: builtin/branch.c:704
c04f5ac3
JX
2844#, c-format
2845msgid "Invalid branch name: '%s'"
2846msgstr "无效的分支名:'%s'"
2847
cfff71a9 2848#: builtin/branch.c:719
c04f5ac3
JX
2849msgid "Branch rename failed"
2850msgstr "分支重命名失败"
2851
cfff71a9 2852#: builtin/branch.c:723
c04f5ac3
JX
2853#, c-format
2854msgid "Renamed a misnamed branch '%s' away"
2855msgstr "重命名掉一个错误命名的旧分支 '%s'"
2856
cfff71a9 2857#: builtin/branch.c:727
c04f5ac3
JX
2858#, c-format
2859msgid "Branch renamed to %s, but HEAD is not updated!"
2860msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2861
cfff71a9 2862#: builtin/branch.c:734
c04f5ac3
JX
2863msgid "Branch is renamed, but update of config-file failed"
2864msgstr "分支被重命名,但更新 config 文件失败"
2865
cfff71a9 2866#: builtin/branch.c:749
c04f5ac3
JX
2867#, c-format
2868msgid "malformed object name %s"
2869msgstr "非法的对象名 %s"
2870
cfff71a9 2871#: builtin/branch.c:773
81809b99 2872#, c-format
8ada9598 2873msgid "could not write branch description template: %s"
81809b99 2874msgstr "不能写分支描述模版:%s"
c04f5ac3 2875
cfff71a9 2876#: builtin/branch.c:803
ef317cd5 2877msgid "Generic options"
07432cef 2878msgstr "通用选项"
c04f5ac3 2879
cfff71a9 2880#: builtin/branch.c:805
ef317cd5 2881msgid "show hash and subject, give twice for upstream branch"
07432cef 2882msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2883
cfff71a9 2884#: builtin/branch.c:806
ef317cd5 2885msgid "suppress informational messages"
07432cef 2886msgstr "不显示信息"
8ada9598 2887
cfff71a9 2888#: builtin/branch.c:807
ef317cd5 2889msgid "set up tracking mode (see git-pull(1))"
07432cef 2890msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2891
cfff71a9 2892#: builtin/branch.c:809
ef317cd5 2893msgid "change upstream info"
07432cef 2894msgstr "改变上游信息"
c04f5ac3 2895
cfff71a9 2896#: builtin/branch.c:813
ef317cd5 2897msgid "use colored output"
07432cef 2898msgstr "使用彩色输出"
c04f5ac3 2899
cfff71a9 2900#: builtin/branch.c:814
ef317cd5 2901msgid "act on remote-tracking branches"
07432cef 2902msgstr "作用于远程跟踪分支"
c04f5ac3 2903
cfff71a9 2904#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
6acbf033
JX
2905#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
2906#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
2907#: builtin/tag.c:621
ef317cd5 2908msgid "commit"
07432cef 2909msgstr "提交"
c04f5ac3 2910
cfff71a9 2911#: builtin/branch.c:818 builtin/branch.c:824
ef317cd5 2912msgid "print only branches that contain the commit"
07432cef 2913msgstr "只打印包含该提交的分支"
c04f5ac3 2914
cfff71a9 2915#: builtin/branch.c:830
ef317cd5 2916msgid "Specific git-branch actions:"
07432cef 2917msgstr "具体的 git-branch 动作:"
c04f5ac3 2918
cfff71a9 2919#: builtin/branch.c:831
ef317cd5 2920msgid "list both remote-tracking and local branches"
07432cef 2921msgstr "列出远程跟踪及本地分支"
c04f5ac3 2922
cfff71a9 2923#: builtin/branch.c:833
ef317cd5 2924msgid "delete fully merged branch"
07432cef 2925msgstr "删除完全合并的分支"
c04f5ac3 2926
cfff71a9 2927#: builtin/branch.c:834
ef317cd5 2928msgid "delete branch (even if not merged)"
07432cef 2929msgstr "删除分支(即使没有合并)"
c04f5ac3 2930
cfff71a9 2931#: builtin/branch.c:835
ef317cd5 2932msgid "move/rename a branch and its reflog"
07432cef 2933msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 2934
cfff71a9 2935#: builtin/branch.c:836
ef317cd5 2936msgid "move/rename a branch, even if target exists"
07432cef 2937msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 2938
cfff71a9 2939#: builtin/branch.c:837
ef317cd5 2940msgid "list branch names"
07432cef 2941msgstr "列出分支名"
c04f5ac3 2942
cfff71a9 2943#: builtin/branch.c:838
ef317cd5 2944msgid "create the branch's reflog"
07432cef 2945msgstr "创建分支的引用日志"
ef317cd5 2946
cfff71a9 2947#: builtin/branch.c:840
ef317cd5 2948msgid "edit the description for the branch"
07432cef 2949msgstr "标记分支的描述"
ef317cd5 2950
cfff71a9 2951#: builtin/branch.c:841
ef317cd5 2952msgid "force creation (when already exists)"
07432cef 2953msgstr "强制创建(当已经存在)"
ef317cd5 2954
cfff71a9 2955#: builtin/branch.c:844
ef317cd5 2956msgid "print only not merged branches"
07432cef 2957msgstr "只打印没有合并的分支"
ef317cd5 2958
cfff71a9 2959#: builtin/branch.c:850
ef317cd5 2960msgid "print only merged branches"
07432cef 2961msgstr "只打印合并的分支"
ef317cd5 2962
cfff71a9 2963#: builtin/branch.c:854
ef317cd5 2964msgid "list branches in columns"
07432cef 2965msgstr "以列的方式显示分支"
ef317cd5 2966
cfff71a9 2967#: builtin/branch.c:867
c04f5ac3
JX
2968msgid "Failed to resolve HEAD as a valid ref."
2969msgstr "无法将 HEAD 解析为有效引用。"
2970
6acbf033 2971#: builtin/branch.c:872 builtin/clone.c:636
c04f5ac3 2972msgid "HEAD not found below refs/heads!"
90e6ef53 2973msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 2974
cfff71a9 2975#: builtin/branch.c:896
8ada9598 2976msgid "--column and --verbose are incompatible"
81809b99 2977msgstr "--column 和 --verbose 不兼容"
8ada9598 2978
cfff71a9 2979#: builtin/branch.c:902 builtin/branch.c:941
a77c07d9
JX
2980msgid "branch name required"
2981msgstr "必须提供分支名"
2982
cfff71a9 2983#: builtin/branch.c:917
a77c07d9
JX
2984msgid "Cannot give description to detached HEAD"
2985msgstr "不能向分离头指针提供描述"
2986
cfff71a9 2987#: builtin/branch.c:922
a77c07d9
JX
2988msgid "cannot edit description of more than one branch"
2989msgstr "不能为一个以上的分支编辑描述"
2990
cfff71a9 2991#: builtin/branch.c:929
a77c07d9
JX
2992#, c-format
2993msgid "No commit on branch '%s' yet."
2994msgstr "分支 '%s' 尚无提交。"
2995
cfff71a9 2996#: builtin/branch.c:932
a77c07d9
JX
2997#, c-format
2998msgid "No branch named '%s'."
2999msgstr "没有分支 '%s'。"
3000
cfff71a9 3001#: builtin/branch.c:947
a77c07d9
JX
3002msgid "too many branches for a rename operation"
3003msgstr "为重命名操作提供了太多的分支名"
3004
cfff71a9 3005#: builtin/branch.c:952
1003b3a5
JX
3006msgid "too many branches to set new upstream"
3007msgstr "为设置新上游提供了太多的分支名"
3008
cfff71a9 3009#: builtin/branch.c:956
1003b3a5
JX
3010#, c-format
3011msgid ""
3012"could not set upstream of HEAD to %s when it does not point to any branch."
3013msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3014
cfff71a9 3015#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
1003b3a5
JX
3016#, c-format
3017msgid "no such branch '%s'"
3018msgstr "没有此分支 '%s'"
3019
cfff71a9 3020#: builtin/branch.c:963
07432cef 3021#, c-format
ef317cd5 3022msgid "branch '%s' does not exist"
07432cef 3023msgstr "分支 '%s' 不存在"
ef317cd5 3024
cfff71a9 3025#: builtin/branch.c:975
1003b3a5
JX
3026msgid "too many branches to unset upstream"
3027msgstr "为取消上游设置操作提供了太多的分支名"
3028
cfff71a9 3029#: builtin/branch.c:979
1003b3a5
JX
3030msgid "could not unset upstream of HEAD when it does not point to any branch."
3031msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3032
cfff71a9 3033#: builtin/branch.c:985
ef317cd5
JX
3034#, c-format
3035msgid "Branch '%s' has no upstream information"
07432cef 3036msgstr "分支 '%s' 没有上游信息"
ef317cd5 3037
cfff71a9 3038#: builtin/branch.c:999
1003b3a5
JX
3039msgid "it does not make sense to create 'HEAD' manually"
3040msgstr "手工创建 'HEAD' 没有意义"
3041
cfff71a9 3042#: builtin/branch.c:1005
c04f5ac3
JX
3043msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3044msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3045
cfff71a9 3046#: builtin/branch.c:1008
ef317cd5
JX
3047#, c-format
3048msgid ""
3049"The --set-upstream flag is deprecated and will be removed. Consider using --"
3050"track or --set-upstream-to\n"
3051msgstr ""
07432cef 3052"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3053
cfff71a9 3054#: builtin/branch.c:1025
ef317cd5
JX
3055#, c-format
3056msgid ""
3057"\n"
3058"If you wanted to make '%s' track '%s', do this:\n"
3059"\n"
3060msgstr ""
07432cef
WS
3061"\n"
3062"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3063"\n"
ef317cd5 3064
cfff71a9 3065#: builtin/branch.c:1026
07432cef 3066#, c-format
ef317cd5 3067msgid " git branch -d %s\n"
07432cef 3068msgstr " git branch -d %s\n"
ef317cd5 3069
cfff71a9 3070#: builtin/branch.c:1027
ef317cd5
JX
3071#, c-format
3072msgid " git branch --set-upstream-to %s\n"
07432cef 3073msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3074
c04f5ac3
JX
3075#: builtin/bundle.c:47
3076#, c-format
3077msgid "%s is okay\n"
3078msgstr "%s 可以\n"
3079
3080#: builtin/bundle.c:56
3081msgid "Need a repository to create a bundle."
90e6ef53 3082msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
3083
3084#: builtin/bundle.c:60
3085msgid "Need a repository to unbundle."
90e6ef53 3086msgstr "需要一个版本库来解包。"
c04f5ac3 3087
6c94aba5 3088#: builtin/cat-file.c:331
ef317cd5 3089msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 3090msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5 3091
6c94aba5 3092#: builtin/cat-file.c:332
ef317cd5 3093msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 3094msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5 3095
6c94aba5 3096#: builtin/cat-file.c:369
ef317cd5 3097msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3098msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3099
6c94aba5 3100#: builtin/cat-file.c:370
ef317cd5 3101msgid "show object type"
07432cef 3102msgstr "显示对象类型"
ef317cd5 3103
6c94aba5 3104#: builtin/cat-file.c:371
ef317cd5 3105msgid "show object size"
07432cef 3106msgstr "显示对象大小"
ef317cd5 3107
6c94aba5 3108#: builtin/cat-file.c:373
ef317cd5 3109msgid "exit with zero when there's no error"
07432cef 3110msgstr "当没有错误时退出并返回零"
ef317cd5 3111
6c94aba5 3112#: builtin/cat-file.c:374
ef317cd5 3113msgid "pretty-print object's content"
07432cef 3114msgstr "美观地打印对象的内容"
ef317cd5 3115
6c94aba5 3116#: builtin/cat-file.c:376
ef317cd5 3117msgid "for blob objects, run textconv on object's content"
07432cef 3118msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5 3119
6c94aba5 3120#: builtin/cat-file.c:378
ef317cd5 3121msgid "show info and content of objects fed from the standard input"
07432cef 3122msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3123
6c94aba5 3124#: builtin/cat-file.c:381
ef317cd5 3125msgid "show info about objects fed from the standard input"
07432cef 3126msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
3127
3128#: builtin/check-attr.c:11
3129msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 3130msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
3131
3132#: builtin/check-attr.c:12
07432cef
WS
3133msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3134msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
3135
3136#: builtin/check-attr.c:19
3137msgid "report all attributes set on file"
07432cef 3138msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3139
3140#: builtin/check-attr.c:20
3141msgid "use .gitattributes only from the index"
07432cef 3142msgstr "只使用索引中的 .gitattributes"
ef317cd5 3143
a77c07d9 3144#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
ef317cd5 3145msgid "read file names from stdin"
07432cef 3146msgstr "从标准输入读出文件名"
ef317cd5 3147
a77c07d9 3148#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3149msgid "terminate input and output records by a NUL character"
3150msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3151
6acbf033 3152#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285
a77c07d9
JX
3153msgid "suppress progress reporting"
3154msgstr "不显示进度报告"
3155
2e8451e8
JX
3156#: builtin/check-ignore.c:26
3157msgid "show non-matching input paths"
3158msgstr "显示未匹配的输入路径"
3159
90314792
JX
3160#: builtin/check-ignore.c:28
3161msgid "ignore index when checking"
3162msgstr "检查时忽略索引"
3163
3164#: builtin/check-ignore.c:154
a77c07d9
JX
3165msgid "cannot specify pathnames with --stdin"
3166msgstr "不能同时提供路径及 --stdin 参数"
3167
90314792 3168#: builtin/check-ignore.c:157
a77c07d9
JX
3169msgid "-z only makes sense with --stdin"
3170msgstr "-z 需要和 --stdin 参数共用才有意义"
3171
90314792 3172#: builtin/check-ignore.c:159
a77c07d9
JX
3173msgid "no path specified"
3174msgstr "未指定路径"
3175
90314792 3176#: builtin/check-ignore.c:163
a77c07d9
JX
3177msgid "--quiet is only valid with a single pathname"
3178msgstr "参数 --quiet 只在提供一个路径名时有效"
3179
90314792 3180#: builtin/check-ignore.c:165
a77c07d9
JX
3181msgid "cannot have both --quiet and --verbose"
3182msgstr "不能同时提供 --quiet 和 --verbose 参数"
3183
90314792 3184#: builtin/check-ignore.c:168
2e8451e8
JX
3185msgid "--non-matching is only valid with --verbose"
3186msgstr "--non-matching 选项只在使用 --verbose 时有效"
3187
3188#: builtin/check-mailmap.c:8
3189msgid "git check-mailmap [options] <contact>..."
3190msgstr "git check-mailmap [选项] <联系地址>..."
3191
3192#: builtin/check-mailmap.c:13
3193msgid "also read contacts from stdin"
3194msgstr "还从标准输入读取联系地址"
3195
3196#: builtin/check-mailmap.c:24
3197#, c-format
3198msgid "unable to parse contact: %s"
3199msgstr "不能解析联系地址:%s"
3200
3201#: builtin/check-mailmap.c:47
3202msgid "no contacts specified"
3203msgstr "未指定联系地址"
3204
ef317cd5
JX
3205#: builtin/checkout-index.c:126
3206msgid "git checkout-index [options] [--] [<file>...]"
07432cef 3207msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5 3208
6acbf033 3209#: builtin/checkout-index.c:188
ef317cd5 3210msgid "check out all files in the index"
07432cef 3211msgstr "检出索引区的所有文件"
ef317cd5 3212
6acbf033 3213#: builtin/checkout-index.c:189
ef317cd5 3214msgid "force overwrite of existing files"
07432cef 3215msgstr "强制覆盖现有的文件"
ef317cd5 3216
6acbf033 3217#: builtin/checkout-index.c:191
ef317cd5 3218msgid "no warning for existing files and files not in index"
07432cef 3219msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 3220
6acbf033 3221#: builtin/checkout-index.c:193
ef317cd5 3222msgid "don't checkout new files"
07432cef 3223msgstr "不检出新文件"
ef317cd5 3224
6acbf033 3225#: builtin/checkout-index.c:195
ef317cd5 3226msgid "update stat information in the index file"
07432cef 3227msgstr "更新索引中文件的状态信息"
ef317cd5 3228
6acbf033 3229#: builtin/checkout-index.c:201
ef317cd5 3230msgid "read list of paths from the standard input"
07432cef 3231msgstr "从标准输入读取路径列表"
ef317cd5 3232
6acbf033 3233#: builtin/checkout-index.c:203
ef317cd5 3234msgid "write the content to temporary files"
07432cef 3235msgstr "将内容写入临时文件"
ef317cd5 3236
6acbf033 3237#: builtin/checkout-index.c:204 builtin/column.c:30
ef317cd5 3238msgid "string"
07432cef 3239msgstr "字符串"
ef317cd5 3240
6acbf033 3241#: builtin/checkout-index.c:205
ef317cd5 3242msgid "when creating files, prepend <string>"
07432cef 3243msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5 3244
6acbf033 3245#: builtin/checkout-index.c:208
ef317cd5 3246msgid "copy out the files from named stage"
07432cef 3247msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
3248
3249#: builtin/checkout.c:25
ef317cd5 3250msgid "git checkout [options] <branch>"
07432cef 3251msgstr "git checkout [选项] <分支>"
ef317cd5
JX
3252
3253#: builtin/checkout.c:26
ef317cd5 3254msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 3255msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5 3256
90314792 3257#: builtin/checkout.c:114 builtin/checkout.c:147
c04f5ac3
JX
3258#, c-format
3259msgid "path '%s' does not have our version"
3260msgstr "路径 '%s' 没有我们的版本"
3261
90314792 3262#: builtin/checkout.c:116 builtin/checkout.c:149
c04f5ac3
JX
3263#, c-format
3264msgid "path '%s' does not have their version"
3265msgstr "路径 '%s' 没有他们的版本"
3266
90314792 3267#: builtin/checkout.c:132
c04f5ac3
JX
3268#, c-format
3269msgid "path '%s' does not have all necessary versions"
3270msgstr "路径 '%s' 没有全部必须的版本"
3271
90314792 3272#: builtin/checkout.c:176
c04f5ac3
JX
3273#, c-format
3274msgid "path '%s' does not have necessary versions"
3275msgstr "路径 '%s' 没有必须的版本"
3276
90314792 3277#: builtin/checkout.c:193
c04f5ac3
JX
3278#, c-format
3279msgid "path '%s': cannot merge"
90e6ef53 3280msgstr "path '%s':无法合并"
c04f5ac3 3281
90314792 3282#: builtin/checkout.c:210
c04f5ac3
JX
3283#, c-format
3284msgid "Unable to add merge result for '%s'"
3285msgstr "无法为 '%s' 添加合并结果"
3286
6acbf033
JX
3287#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
3288#: builtin/checkout.c:240
07432cef 3289#, c-format
ef317cd5 3290msgid "'%s' cannot be used with updating paths"
07432cef 3291msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3292
6acbf033 3293#: builtin/checkout.c:243 builtin/checkout.c:246
07432cef 3294#, c-format
ef317cd5 3295msgid "'%s' cannot be used with %s"
07432cef 3296msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3297
6acbf033 3298#: builtin/checkout.c:249
ef317cd5
JX
3299#, c-format
3300msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3301msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3302
6acbf033 3303#: builtin/checkout.c:260 builtin/checkout.c:449
c04f5ac3 3304msgid "corrupt index file"
90e6ef53 3305msgstr "损坏的索引文件"
c04f5ac3 3306
6acbf033 3307#: builtin/checkout.c:320 builtin/checkout.c:327
c04f5ac3
JX
3308#, c-format
3309msgid "path '%s' is unmerged"
3310msgstr "路径 '%s' 未合并"
3311
6acbf033 3312#: builtin/checkout.c:471
c04f5ac3 3313msgid "you need to resolve your current index first"
90e6ef53 3314msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3315
6acbf033 3316#: builtin/checkout.c:591
c04f5ac3
JX
3317#, c-format
3318msgid "Can not do reflog for '%s'\n"
90e6ef53 3319msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3320
6acbf033 3321#: builtin/checkout.c:629
c04f5ac3
JX
3322msgid "HEAD is now at"
3323msgstr "HEAD 目前位于"
3324
6acbf033 3325#: builtin/checkout.c:636
c04f5ac3
JX
3326#, c-format
3327msgid "Reset branch '%s'\n"
3328msgstr "重置分支 '%s'\n"
3329
6acbf033 3330#: builtin/checkout.c:639
c04f5ac3
JX
3331#, c-format
3332msgid "Already on '%s'\n"
3333msgstr "已经位于 '%s'\n"
3334
6acbf033 3335#: builtin/checkout.c:643
c04f5ac3
JX
3336#, c-format
3337msgid "Switched to and reset branch '%s'\n"
3338msgstr "切换并重置分支 '%s'\n"
3339
6acbf033 3340#: builtin/checkout.c:645 builtin/checkout.c:1026
c04f5ac3
JX
3341#, c-format
3342msgid "Switched to a new branch '%s'\n"
3343msgstr "切换到一个新分支 '%s'\n"
3344
6acbf033 3345#: builtin/checkout.c:647
c04f5ac3
JX
3346#, c-format
3347msgid "Switched to branch '%s'\n"
3348msgstr "切换到分支 '%s'\n"
3349
90e6ef53 3350# 译者:注意保持前导空格
6acbf033 3351#: builtin/checkout.c:699
c04f5ac3
JX
3352#, c-format
3353msgid " ... and %d more.\n"
90e6ef53 3354msgstr " ... 及其它 %d 个。\n"
c04f5ac3 3355
6acbf033 3356#: builtin/checkout.c:705
c04f5ac3
JX
3357#, c-format
3358msgid ""
3359"Warning: you are leaving %d commit behind, not connected to\n"
3360"any of your branches:\n"
3361"\n"
3362"%s\n"
3363msgid_plural ""
3364"Warning: you are leaving %d commits behind, not connected to\n"
3365"any of your branches:\n"
3366"\n"
3367"%s\n"
3368msgstr[0] ""
3369"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3370"\n"
3371"%s\n"
5ae481e0
JX
3372msgstr[1] ""
3373"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3374"\n"
3375"%s\n"
c04f5ac3 3376
6acbf033 3377#: builtin/checkout.c:723
c04f5ac3
JX
3378#, c-format
3379msgid ""
3380"If you want to keep them by creating a new branch, this may be a good time\n"
3381"to do so with:\n"
3382"\n"
3383" git branch new_branch_name %s\n"
3384"\n"
3385msgstr ""
3386"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3387"如下操作:\n"
3388"\n"
3389" git branch new_branch_name %s\n"
3390"\n"
3391
6acbf033 3392#: builtin/checkout.c:753
c04f5ac3
JX
3393msgid "internal error in revision walk"
3394msgstr "在版本遍历时遇到内部错误"
3395
6acbf033 3396#: builtin/checkout.c:757
c04f5ac3
JX
3397msgid "Previous HEAD position was"
3398msgstr "之前的 HEAD 位置是"
3399
6acbf033 3400#: builtin/checkout.c:784 builtin/checkout.c:1021
c04f5ac3 3401msgid "You are on a branch yet to be born"
90e6ef53 3402msgstr "您位于一个尚未初始化的分支"
c04f5ac3 3403
6acbf033 3404#: builtin/checkout.c:928
90314792
JX
3405#, c-format
3406msgid "only one reference expected, %d given."
3407msgstr "只要一个引用,却给出了 %d 个"
3408
6acbf033 3409#: builtin/checkout.c:967
c04f5ac3
JX
3410#, c-format
3411msgid "invalid reference: %s"
3412msgstr "无效引用:%s"
3413
6acbf033 3414#: builtin/checkout.c:996
c04f5ac3
JX
3415#, c-format
3416msgid "reference is not a tree: %s"
3417msgstr "引用不是一个树:%s"
3418
6acbf033 3419#: builtin/checkout.c:1035
ef317cd5 3420msgid "paths cannot be used with switching branches"
07432cef 3421msgstr "路径不能和切换分支同时使用"
c04f5ac3 3422
6acbf033 3423#: builtin/checkout.c:1038 builtin/checkout.c:1042
07432cef 3424#, c-format
ef317cd5 3425msgid "'%s' cannot be used with switching branches"
07432cef 3426msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3427
6acbf033
JX
3428#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
3429#: builtin/checkout.c:1057
07432cef 3430#, c-format
ef317cd5 3431msgid "'%s' cannot be used with '%s'"
07432cef 3432msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3433
6acbf033 3434#: builtin/checkout.c:1062
07432cef 3435#, c-format
ef317cd5 3436msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3437msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3438
6acbf033 3439#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
cfff71a9 3440#: builtin/remote.c:159 builtin/remote.c:161
ef317cd5 3441msgid "branch"
07432cef 3442msgstr "分支"
c04f5ac3 3443
6acbf033 3444#: builtin/checkout.c:1085
ef317cd5 3445msgid "create and checkout a new branch"
07432cef 3446msgstr "创建并检出一个新的分支"
c04f5ac3 3447
6acbf033 3448#: builtin/checkout.c:1087
ef317cd5 3449msgid "create/reset and checkout a branch"
07432cef 3450msgstr "创建/重置并检出一个分支"
c04f5ac3 3451
6acbf033 3452#: builtin/checkout.c:1088
ef317cd5 3453msgid "create reflog for new branch"
07432cef 3454msgstr "为新的分支创建引用日志"
ef317cd5 3455
6acbf033 3456#: builtin/checkout.c:1089
ef317cd5 3457msgid "detach the HEAD at named commit"
07432cef 3458msgstr "成为指向该提交的分离头指针"
ef317cd5 3459
6acbf033 3460#: builtin/checkout.c:1090
ef317cd5 3461msgid "set upstream info for new branch"
07432cef 3462msgstr "为新的分支设置上游信息"
ef317cd5 3463
6acbf033 3464#: builtin/checkout.c:1092
6c94aba5 3465msgid "new-branch"
07432cef 3466msgstr "新分支"
ef317cd5 3467
6acbf033 3468#: builtin/checkout.c:1092
ef317cd5 3469msgid "new unparented branch"
07432cef 3470msgstr "新的没有父提交的分支"
ef317cd5 3471
6acbf033 3472#: builtin/checkout.c:1093
ef317cd5 3473msgid "checkout our version for unmerged files"
07432cef 3474msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3475
6acbf033 3476#: builtin/checkout.c:1095
ef317cd5 3477msgid "checkout their version for unmerged files"
07432cef 3478msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3479
6acbf033 3480#: builtin/checkout.c:1097
ef317cd5 3481msgid "force checkout (throw away local modifications)"
07432cef 3482msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3483
6acbf033 3484#: builtin/checkout.c:1098
ef317cd5 3485msgid "perform a 3-way merge with the new branch"
07432cef 3486msgstr "和新的分支执行三路合并"
ef317cd5 3487
6acbf033 3488#: builtin/checkout.c:1099 builtin/merge.c:225
ef317cd5 3489msgid "update ignored files (default)"
07432cef 3490msgstr "更新忽略的文件(默认)"
c04f5ac3 3491
6acbf033 3492#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245
ef317cd5 3493msgid "style"
07432cef 3494msgstr "风格"
ef317cd5 3495
6acbf033 3496#: builtin/checkout.c:1101
ef317cd5 3497msgid "conflict style (merge or diff3)"
07432cef 3498msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3499
6acbf033 3500#: builtin/checkout.c:1104
4dcdc3d8
JX
3501msgid "do not limit pathspecs to sparse entries only"
3502msgstr "对路径不做稀疏检出的限制"
3503
6acbf033 3504#: builtin/checkout.c:1106
ef317cd5 3505msgid "second guess 'git checkout no-such-branch'"
07432cef 3506msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 3507
6acbf033 3508#: builtin/checkout.c:1129
ef317cd5 3509msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3510msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3511
6acbf033 3512#: builtin/checkout.c:1146
ef317cd5
JX
3513msgid "--track needs a branch name"
3514msgstr "--track 需要一个分支名"
3515
6acbf033 3516#: builtin/checkout.c:1153
ef317cd5
JX
3517msgid "Missing branch name; try -b"
3518msgstr "缺少分支名;尝试 -b"
3519
6acbf033 3520#: builtin/checkout.c:1190
c04f5ac3 3521msgid "invalid path specification"
90e6ef53 3522msgstr "无效的路径规格"
c04f5ac3 3523
6acbf033 3524#: builtin/checkout.c:1197
07432cef 3525#, c-format
c04f5ac3 3526msgid ""
ef317cd5 3527"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3528"Did you intend to checkout '%s' which can not be resolved as commit?"
3529msgstr ""
07432cef
WS
3530"不能同时更新路径并切换到分支'%s'。\n"
3531"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3532
6acbf033 3533#: builtin/checkout.c:1202
07432cef 3534#, c-format
ef317cd5 3535msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3536msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3537
6acbf033 3538#: builtin/checkout.c:1206
c04f5ac3
JX
3539msgid ""
3540"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3541"checking out of the index."
3542msgstr ""
90e6ef53 3543"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3544
90314792 3545#: builtin/clean.c:26
2e8451e8
JX
3546msgid ""
3547"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3548msgstr ""
3549"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3550
90314792 3551#: builtin/clean.c:30
07432cef
WS
3552#, c-format
3553msgid "Removing %s\n"
3554msgstr "正删除 %s\n"
3555
90314792 3556#: builtin/clean.c:31
07432cef
WS
3557#, c-format
3558msgid "Would remove %s\n"
3559msgstr "将删除 %s\n"
3560
90314792 3561#: builtin/clean.c:32
07432cef
WS
3562#, c-format
3563msgid "Skipping repository %s\n"
3564msgstr "忽略版本库 %s\n"
3565
90314792 3566#: builtin/clean.c:33
07432cef
WS
3567#, c-format
3568msgid "Would skip repository %s\n"
3569msgstr "将忽略版本库 %s\n"
3570
90314792 3571#: builtin/clean.c:34
07432cef
WS
3572#, c-format
3573msgid "failed to remove %s"
3574msgstr "无法删除 %s"
3575
6c94aba5 3576#: builtin/clean.c:295
2e8451e8
JX
3577msgid ""
3578"Prompt help:\n"
3579"1 - select a numbered item\n"
3580"foo - select item based on unique prefix\n"
3581" - (empty) select nothing"
3582msgstr ""
3583"帮助:\n"
3584"1 - 通过编号选择一个选项\n"
3585"foo - 通过标题选择一个选项\n"
3586" - (空)什么也不选择"
3587
6c94aba5 3588#: builtin/clean.c:299
2e8451e8
JX
3589msgid ""
3590"Prompt help:\n"
3591"1 - select a single item\n"
3592"3-5 - select a range of items\n"
3593"2-3,6-9 - select multiple ranges\n"
3594"foo - select item based on unique prefix\n"
3595"-... - unselect specified items\n"
3596"* - choose all items\n"
3597" - (empty) finish selecting"
3598msgstr ""
3599"帮助:\n"
3600"1 - 选择一个选项\n"
3601"3-5 - 选择一个范围内的所有选项\n"
3602"2-3,6-9 - 选择多个范围内的所有选项\n"
3603"foo - 通过标题选择一个选项\n"
3604"-... - 反选特定的选项\n"
3605"* - 选择所有选项\n"
3606" - (空)结束选择"
3607
6c94aba5 3608#: builtin/clean.c:517
2e8451e8
JX
3609#, c-format
3610msgid "Huh (%s)?"
3611msgstr "嗯(%s)?"
3612
6acbf033 3613#: builtin/clean.c:659
2e8451e8
JX
3614#, c-format
3615msgid "Input ignore patterns>> "
3616msgstr "输入模版以排除条目>> "
3617
6acbf033 3618#: builtin/clean.c:696
2e8451e8
JX
3619#, c-format
3620msgid "WARNING: Cannot find items matched by: %s"
3621msgstr "警告:无法找到和 %s 匹配的条目"
3622
6acbf033 3623#: builtin/clean.c:717
2e8451e8
JX
3624msgid "Select items to delete"
3625msgstr "选择要删除的条目"
3626
6acbf033 3627#: builtin/clean.c:757
2e8451e8
JX
3628#, c-format
3629msgid "remove %s? "
3630msgstr "删除 %s?"
3631
6acbf033 3632#: builtin/clean.c:782
2e8451e8
JX
3633msgid "Bye."
3634msgstr "再见。"
3635
6acbf033 3636#: builtin/clean.c:790
2e8451e8
JX
3637msgid ""
3638"clean - start cleaning\n"
3639"filter by pattern - exclude items from deletion\n"
3640"select by numbers - select items to be deleted by numbers\n"
3641"ask each - confirm each deletion (like \"rm -i\")\n"
3642"quit - stop cleaning\n"
3643"help - this screen\n"
3644"? - help for prompt selection"
3645msgstr ""
3646"clean - 开始清理\n"
3647"filter by pattern - 通过模版排除要删除的条目\n"
3648"select by numbers - 通过数字选择要删除的条目\n"
3649"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3650"quit - 停止删除并退出\n"
3651"help - 显示本帮助\n"
3652"? - 显示如何在提示符下选择的帮助"
3653
6acbf033 3654#: builtin/clean.c:817
2e8451e8
JX
3655msgid "*** Commands ***"
3656msgstr "*** 命令 ***"
3657
6acbf033 3658#: builtin/clean.c:818
2e8451e8
JX
3659msgid "What now"
3660msgstr "请选择"
3661
6acbf033 3662#: builtin/clean.c:826
2e8451e8
JX
3663msgid "Would remove the following item:"
3664msgid_plural "Would remove the following items:"
3665msgstr[0] "将删除如下条目:"
3666msgstr[1] "将删除如下条目:"
3667
6acbf033 3668#: builtin/clean.c:843
2e8451e8
JX
3669msgid "No more files to clean, exiting."
3670msgstr "没有要清理的文件,退出。"
3671
6acbf033 3672#: builtin/clean.c:874
ef317cd5 3673msgid "do not print names of files removed"
07432cef 3674msgstr "不打印删除文件的名称"
ef317cd5 3675
6acbf033 3676#: builtin/clean.c:876
ef317cd5 3677msgid "force"
07432cef 3678msgstr "强制"
ef317cd5 3679
6acbf033 3680#: builtin/clean.c:877
2e8451e8
JX
3681msgid "interactive cleaning"
3682msgstr "交互式清除"
3683
6acbf033 3684#: builtin/clean.c:879
ef317cd5 3685msgid "remove whole directories"
07432cef 3686msgstr "删除整个目录"
ef317cd5 3687
6acbf033
JX
3688#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
3689#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
ef317cd5 3690msgid "pattern"
07432cef 3691msgstr "模式"
ef317cd5 3692
6acbf033 3693#: builtin/clean.c:881
ef317cd5 3694msgid "add <pattern> to ignore rules"
07432cef 3695msgstr "添加<模式>到忽略规则"
ef317cd5 3696
6acbf033 3697#: builtin/clean.c:882
ef317cd5 3698msgid "remove ignored files, too"
07432cef 3699msgstr "也删除忽略的文件"
ef317cd5 3700
6acbf033 3701#: builtin/clean.c:884
ef317cd5 3702msgid "remove only ignored files"
07432cef 3703msgstr "只删除忽略的文件"
c04f5ac3 3704
6acbf033 3705#: builtin/clean.c:902
c04f5ac3 3706msgid "-x and -X cannot be used together"
649900bc 3707msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3708
6acbf033 3709#: builtin/clean.c:906
c04f5ac3 3710msgid ""
6c94aba5 3711"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 3712"clean"
c04f5ac3 3713msgstr ""
2e8451e8 3714"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3715
6acbf033 3716#: builtin/clean.c:909
c04f5ac3 3717msgid ""
6c94aba5 3718"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 3719"refusing to clean"
c04f5ac3 3720msgstr ""
2e8451e8 3721"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3722
2e8451e8 3723#: builtin/clone.c:36
ef317cd5 3724msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3725msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5 3726
6acbf033
JX
3727#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
3728#: builtin/push.c:503
ef317cd5 3729msgid "force progress reporting"
07432cef 3730msgstr "强制显示进度报告"
ef317cd5 3731
2e8451e8 3732#: builtin/clone.c:66
ef317cd5 3733msgid "don't create a checkout"
07432cef 3734msgstr "不创建一个检出"
ef317cd5 3735
6c94aba5 3736#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
ef317cd5 3737msgid "create a bare repository"
07432cef 3738msgstr "创建一个裸版本库"
ef317cd5 3739
90314792 3740#: builtin/clone.c:71
ef317cd5 3741msgid "create a mirror repository (implies bare)"
07432cef 3742msgstr "创建一个镜像版本库(也是裸版本库)"
ef317cd5 3743
90314792 3744#: builtin/clone.c:73
ef317cd5 3745msgid "to clone from a local repository"
07432cef 3746msgstr "从本地版本库克隆"
ef317cd5 3747
90314792 3748#: builtin/clone.c:75
ef317cd5 3749msgid "don't use local hardlinks, always copy"
07432cef 3750msgstr "不使用本地硬链接,始终复制"
ef317cd5 3751
90314792 3752#: builtin/clone.c:77
ef317cd5 3753msgid "setup as shared repository"
07432cef 3754msgstr "设置为共享版本库"
ef317cd5 3755
90314792 3756#: builtin/clone.c:79 builtin/clone.c:81
ef317cd5 3757msgid "initialize submodules in the clone"
07432cef 3758msgstr "在克隆时初始化子模组"
ef317cd5 3759
6c94aba5 3760#: builtin/clone.c:82 builtin/init-db.c:483
ef317cd5 3761msgid "template-directory"
07432cef 3762msgstr "模板目录"
ef317cd5 3763
6c94aba5 3764#: builtin/clone.c:83 builtin/init-db.c:484
ef317cd5 3765msgid "directory from which templates will be used"
07432cef 3766msgstr "模板目录将被使用"
ef317cd5 3767
90314792 3768#: builtin/clone.c:85
ef317cd5 3769msgid "reference repository"
cfff71a9 3770msgstr "参考版本库"
ef317cd5 3771
90314792 3772#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3773msgid "name"
07432cef 3774msgstr "名称"
ef317cd5 3775
90314792 3776#: builtin/clone.c:87
ef317cd5 3777msgid "use <name> instead of 'origin' to track upstream"
07432cef 3778msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5 3779
90314792 3780#: builtin/clone.c:89
ef317cd5 3781msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3782msgstr "检出<分支>而不是远程HEAD"
ef317cd5 3783
90314792 3784#: builtin/clone.c:91
ef317cd5 3785msgid "path to git-upload-pack on the remote"
07432cef 3786msgstr "远程 git-upload-pack 路径"
ef317cd5 3787
6acbf033 3788#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
ef317cd5 3789msgid "depth"
07432cef 3790msgstr "深度"
ef317cd5 3791
90314792 3792#: builtin/clone.c:93
ef317cd5 3793msgid "create a shallow clone of that depth"
07432cef 3794msgstr "创建一个指定深度的浅克隆"
ef317cd5 3795
90314792 3796#: builtin/clone.c:95
ef317cd5 3797msgid "clone only one branch, HEAD or --branch"
07432cef 3798msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 3799
6c94aba5 3800#: builtin/clone.c:96 builtin/init-db.c:492
ef317cd5 3801msgid "gitdir"
07432cef 3802msgstr "git目录"
ef317cd5 3803
6c94aba5 3804#: builtin/clone.c:97 builtin/init-db.c:493
ef317cd5 3805msgid "separate git dir from working tree"
07432cef 3806msgstr "git目录和工作区分离"
ef317cd5 3807
90314792 3808#: builtin/clone.c:98
ef317cd5 3809msgid "key=value"
07432cef 3810msgstr "key=value"
ef317cd5 3811
90314792 3812#: builtin/clone.c:99
ef317cd5 3813msgid "set config inside the new repository"
07432cef 3814msgstr "在新版本库中设置配置信息"
ef317cd5 3815
90314792 3816#: builtin/clone.c:252
c04f5ac3 3817#, c-format
4dcdc3d8 3818msgid "reference repository '%s' is not a local repository."
cfff71a9 3819msgstr "参考版本库 '%s' 不是一个本地版本库。"
c04f5ac3 3820
cfff71a9
JX
3821#: builtin/clone.c:256
3822#, c-format
3823msgid "reference repository '%s' is shallow"
3824msgstr "参考版本库 '%s' 是一个浅克隆"
3825
3826#: builtin/clone.c:259
3827#, c-format
3828msgid "reference repository '%s' is grafted"
3829msgstr "参考版本库 '%s' 已被嫁接"
3830
3831#: builtin/clone.c:321
c04f5ac3
JX
3832#, c-format
3833msgid "failed to create directory '%s'"
90e6ef53 3834msgstr "无法创建目录 '%s'"
c04f5ac3 3835
cfff71a9 3836#: builtin/clone.c:323 builtin/diff.c:83
c04f5ac3
JX
3837#, c-format
3838msgid "failed to stat '%s'"
90e6ef53 3839msgstr "无法枚举 '%s' 状态"
c04f5ac3 3840
cfff71a9 3841#: builtin/clone.c:325
c04f5ac3
JX
3842#, c-format
3843msgid "%s exists and is not a directory"
3844msgstr "%s 存在且不是一个目录"
3845
cfff71a9 3846#: builtin/clone.c:339
c04f5ac3
JX
3847#, c-format
3848msgid "failed to stat %s\n"
90e6ef53 3849msgstr "无法枚举 %s 状态\n"
c04f5ac3 3850
cfff71a9 3851#: builtin/clone.c:361
c04f5ac3
JX
3852#, c-format
3853msgid "failed to create link '%s'"
90e6ef53 3854msgstr "无法创建链接 '%s'"
c04f5ac3 3855
cfff71a9 3856#: builtin/clone.c:365
c04f5ac3
JX
3857#, c-format
3858msgid "failed to copy file to '%s'"
90e6ef53 3859msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3860
cfff71a9 3861#: builtin/clone.c:388 builtin/clone.c:565
c04f5ac3
JX
3862#, c-format
3863msgid "done.\n"
3864msgstr "完成。\n"
3865
cfff71a9 3866#: builtin/clone.c:401
1003b3a5
JX
3867msgid ""
3868"Clone succeeded, but checkout failed.\n"
3869"You can inspect what was checked out with 'git status'\n"
3870"and retry the checkout with 'git checkout -f HEAD'\n"
3871msgstr ""
3872"克隆成功,但是检出失败。\n"
3873"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3874"'git checkout -f HEAD' 重试\n"
3875
cfff71a9 3876#: builtin/clone.c:480
c04f5ac3
JX
3877#, c-format
3878msgid "Could not find remote branch %s to clone."
90e6ef53 3879msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3880
cfff71a9 3881#: builtin/clone.c:560
2e8451e8
JX
3882#, c-format
3883msgid "Checking connectivity... "
3884msgstr "检查连接... "
3885
cfff71a9 3886#: builtin/clone.c:563
1003b3a5
JX
3887msgid "remote did not send all necessary objects"
3888msgstr "远程没有发送所有必须的对象"
3889
6acbf033 3890#: builtin/clone.c:627
c04f5ac3
JX
3891msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3892msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3893
6acbf033 3894#: builtin/clone.c:658
1003b3a5
JX
3895msgid "unable to checkout working tree"
3896msgstr "不能检出工作区"
3897
6acbf033 3898#: builtin/clone.c:768
c04f5ac3
JX
3899msgid "Too many arguments."
3900msgstr "太多参数。"
3901
6acbf033 3902#: builtin/clone.c:772
c04f5ac3 3903msgid "You must specify a repository to clone."
90e6ef53 3904msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 3905
6acbf033 3906#: builtin/clone.c:783
c04f5ac3
JX
3907#, c-format
3908msgid "--bare and --origin %s options are incompatible."
3909msgstr "--bare 和 --origin %s 选项不兼容。"
3910
6acbf033 3911#: builtin/clone.c:786
07432cef
WS
3912msgid "--bare and --separate-git-dir are incompatible."
3913msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3914
6acbf033 3915#: builtin/clone.c:799
c04f5ac3
JX
3916#, c-format
3917msgid "repository '%s' does not exist"
3918msgstr "版本库 '%s' 不存在"
3919
6acbf033 3920#: builtin/clone.c:805 builtin/fetch.c:1143
cfff71a9
JX
3921#, c-format
3922msgid "depth %s is not a positive number"
3923msgstr "深度 %s 不是一个正数"
3924
6acbf033 3925#: builtin/clone.c:815
c04f5ac3
JX
3926#, c-format
3927msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 3928msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 3929
6acbf033 3930#: builtin/clone.c:825
c04f5ac3
JX
3931#, c-format
3932msgid "working tree '%s' already exists."
3933msgstr "工作区 '%s' 已经存在。"
3934
6acbf033 3935#: builtin/clone.c:838 builtin/clone.c:850
c04f5ac3
JX
3936#, c-format
3937msgid "could not create leading directories of '%s'"
90e6ef53 3938msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 3939
6acbf033 3940#: builtin/clone.c:841
c04f5ac3
JX
3941#, c-format
3942msgid "could not create work tree dir '%s'."
90e6ef53 3943msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 3944
6acbf033 3945#: builtin/clone.c:860
c04f5ac3
JX
3946#, c-format
3947msgid "Cloning into bare repository '%s'...\n"
3948msgstr "克隆到裸版本库 '%s'...\n"
3949
6acbf033 3950#: builtin/clone.c:862
c04f5ac3
JX
3951#, c-format
3952msgid "Cloning into '%s'...\n"
3953msgstr "正克隆到 '%s'...\n"
3954
6acbf033
JX
3955#: builtin/clone.c:898
3956msgid "--depth is ignored in local clones; use file:// instead."
3957msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3958
3959#: builtin/clone.c:901
3960msgid "source repository is shallow, ignoring --local"
3961msgstr "源版本库是浅克隆,忽略 --local"
3962
cfff71a9 3963#: builtin/clone.c:906
6acbf033
JX
3964msgid "--local is ignored"
3965msgstr "--local 被忽略"
3966
3967#: builtin/clone.c:910
c04f5ac3
JX
3968#, c-format
3969msgid "Don't know how to clone %s"
3970msgstr "不知道如何克隆 %s"
3971
6acbf033 3972#: builtin/clone.c:961 builtin/clone.c:969
c04f5ac3
JX
3973#, c-format
3974msgid "Remote branch %s not found in upstream %s"
3975msgstr "远程分支 %s 在上游 %s 未发现"
3976
6acbf033 3977#: builtin/clone.c:972
c04f5ac3
JX
3978msgid "You appear to have cloned an empty repository."
3979msgstr "您似乎克隆了一个空版本库。"
3980
ef317cd5
JX
3981#: builtin/column.c:9
3982msgid "git column [options]"
07432cef 3983msgstr "git column [选项]"
ef317cd5
JX
3984
3985#: builtin/column.c:26
3986msgid "lookup config vars"
07432cef 3987msgstr "查找配置变量"
ef317cd5
JX
3988
3989#: builtin/column.c:27 builtin/column.c:28
ef317cd5 3990msgid "layout to use"
07432cef 3991msgstr "要使用的布局"
ef317cd5
JX
3992
3993#: builtin/column.c:29
3994msgid "Maximum width"
07432cef 3995msgstr "最大宽度"
ef317cd5
JX
3996
3997#: builtin/column.c:30
3998msgid "Padding space on left border"
07432cef 3999msgstr "左边框的填充空间"
ef317cd5
JX
4000
4001#: builtin/column.c:31
4002msgid "Padding space on right border"
07432cef 4003msgstr "右边框的填充空间"
ef317cd5
JX
4004
4005#: builtin/column.c:32
4006msgid "Padding space between columns"
07432cef 4007msgstr "两列之间的填充空间"
ef317cd5 4008
8ada9598
JX
4009#: builtin/column.c:51
4010msgid "--command must be the first argument"
81809b99 4011msgstr "--command 必须是第一个参数"
8ada9598 4012
90314792 4013#: builtin/commit.c:36
a77c07d9 4014msgid "git commit [options] [--] <pathspec>..."
90314792 4015msgstr "git commit [选项] [--] <路径规则>..."
ef317cd5 4016
90314792 4017#: builtin/commit.c:41
a77c07d9 4018msgid "git status [options] [--] <pathspec>..."
90314792 4019msgstr "git status [选项] [--] <路径规则>..."
ef317cd5 4020
90314792 4021#: builtin/commit.c:46
c04f5ac3
JX
4022msgid ""
4023"Your name and email address were configured automatically based\n"
4024"on your username and hostname. Please check that they are accurate.\n"
4025"You can suppress this message by setting them explicitly:\n"
4026"\n"
4027" git config --global user.name \"Your Name\"\n"
4028" git config --global user.email you@example.com\n"
4029"\n"
4030"After doing this, you may fix the identity used for this commit with:\n"
4031"\n"
4032" git commit --amend --reset-author\n"
4033msgstr ""
90e6ef53
JX
4034"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4035"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
4036"\n"
4037" git config --global user.name \"Your Name\"\n"
4038" git config --global user.email you@example.com\n"
4039"\n"
90e6ef53 4040"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4041"\n"
4042" git commit --amend --reset-author\n"
4043
90314792 4044#: builtin/commit.c:58
c04f5ac3
JX
4045msgid ""
4046"You asked to amend the most recent commit, but doing so would make\n"
4047"it empty. You can repeat your command with --allow-empty, or you can\n"
4048"remove the commit entirely with \"git reset HEAD^\".\n"
4049msgstr ""
1b150dc9
T
4050"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4051"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4052
90314792 4053#: builtin/commit.c:63
c04f5ac3
JX
4054msgid ""
4055"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4056"If you wish to commit it anyway, use:\n"
4057"\n"
4058" git commit --allow-empty\n"
4059"\n"
c04f5ac3 4060msgstr ""
a9ce4543
T
4061"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4062"也要提交,使用命令:\n"
c04f5ac3
JX
4063"\n"
4064" git commit --allow-empty\n"
4065"\n"
c04f5ac3 4066
90314792 4067#: builtin/commit.c:70
b1894384
JX
4068msgid "Otherwise, please use 'git reset'\n"
4069msgstr "否则,请使用命令 'git reset'\n"
4070
90314792 4071#: builtin/commit.c:73
b1894384
JX
4072msgid ""
4073"If you wish to skip this commit, use:\n"
4074"\n"
4075" git reset\n"
4076"\n"
4077"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4078"the remaining commits.\n"
4079msgstr ""
4080"如果您想跳过这个提交,使用命令:\n"
4081"\n"
4082" git reset\n"
4083"\n"
4084"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4085"操作。\n"
4086
6c94aba5 4087#: builtin/commit.c:288
c04f5ac3 4088msgid "failed to unpack HEAD tree object"
90e6ef53 4089msgstr "无法解包 HEAD 树对象"
c04f5ac3 4090
6acbf033 4091#: builtin/commit.c:328
c04f5ac3 4092msgid "unable to create temporary index"
90e6ef53 4093msgstr "不能创建临时索引"
c04f5ac3 4094
6acbf033 4095#: builtin/commit.c:334
c04f5ac3
JX
4096msgid "interactive add failed"
4097msgstr "交互式添加失败"
4098
6acbf033 4099#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
c04f5ac3 4100msgid "unable to write new_index file"
90e6ef53 4101msgstr "无法写 new_index 文件"
c04f5ac3 4102
6acbf033 4103#: builtin/commit.c:418
8ada9598 4104msgid "cannot do a partial commit during a merge."
81809b99 4105msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4106
6acbf033 4107#: builtin/commit.c:420
8ada9598 4108msgid "cannot do a partial commit during a cherry-pick."
81809b99 4109msgstr "在拣选过程中不能做部分提交。"
8ada9598 4110
6acbf033 4111#: builtin/commit.c:429
c04f5ac3 4112msgid "cannot read the index"
90e6ef53 4113msgstr "无法读取索引"
c04f5ac3 4114
6acbf033 4115#: builtin/commit.c:447
c04f5ac3 4116msgid "unable to write temporary index file"
90e6ef53 4117msgstr "无法写临时索引文件"
c04f5ac3 4118
6acbf033 4119#: builtin/commit.c:557 builtin/commit.c:563
c04f5ac3
JX
4120#, c-format
4121msgid "invalid commit: %s"
4122msgstr "无效的提交:%s"
4123
6acbf033 4124#: builtin/commit.c:585
c04f5ac3
JX
4125msgid "malformed --author parameter"
4126msgstr "非法的 --author 参数"
4127
6c94aba5 4128#: builtin/commit.c:592
c04f5ac3 4129#, c-format
6acbf033
JX
4130msgid "invalid date format: %s"
4131msgstr "无效的日期格式:%s"
4132
4133#: builtin/commit.c:609
4134#, c-format
c04f5ac3 4135msgid "Malformed ident string: '%s'"
90e6ef53 4136msgstr "非法的身份字符串:'%s'"
c04f5ac3 4137
6acbf033
JX
4138#: builtin/commit.c:642
4139msgid ""
4140"unable to select a comment character that is not used\n"
4141"in the current commit message"
4142msgstr "无法选择一个未被当前提交说明使用的注释字符"
4143
4144#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
c04f5ac3
JX
4145#, c-format
4146msgid "could not lookup commit %s"
4147msgstr "不能查询提交 %s"
4148
6acbf033 4149#: builtin/commit.c:691 builtin/shortlog.c:273
c04f5ac3
JX
4150#, c-format
4151msgid "(reading log message from standard input)\n"
90e6ef53 4152msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 4153
6acbf033 4154#: builtin/commit.c:693
c04f5ac3 4155msgid "could not read log from standard input"
90e6ef53 4156msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4157
6acbf033 4158#: builtin/commit.c:697
c04f5ac3
JX
4159#, c-format
4160msgid "could not read log file '%s'"
90e6ef53 4161msgstr "不能读取日志文件 '%s'"
c04f5ac3 4162
6acbf033 4163#: builtin/commit.c:719
c04f5ac3 4164msgid "could not read MERGE_MSG"
90e6ef53 4165msgstr "不能读取 MERGE_MSG"
c04f5ac3 4166
6acbf033 4167#: builtin/commit.c:723
c04f5ac3 4168msgid "could not read SQUASH_MSG"
90e6ef53 4169msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4170
6acbf033 4171#: builtin/commit.c:727
c04f5ac3
JX
4172#, c-format
4173msgid "could not read '%s'"
90e6ef53 4174msgstr "不能读取 '%s'"
c04f5ac3 4175
6acbf033 4176#: builtin/commit.c:798
c04f5ac3 4177msgid "could not write commit template"
90e6ef53 4178msgstr "不能写提交模版"
c04f5ac3 4179
6acbf033 4180#: builtin/commit.c:816
81809b99 4181#, c-format
c04f5ac3
JX
4182msgid ""
4183"\n"
8ada9598 4184"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4185"If this is not correct, please remove the file\n"
4186"\t%s\n"
4187"and try again.\n"
4188msgstr ""
4189"\n"
649900bc 4190"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4191"\t%s\n"
4192"然后重试。\n"
4193
6acbf033 4194#: builtin/commit.c:821
81809b99 4195#, c-format
8ada9598
JX
4196msgid ""
4197"\n"
4198"It looks like you may be committing a cherry-pick.\n"
4199"If this is not correct, please remove the file\n"
4200"\t%s\n"
4201"and try again.\n"
4202msgstr ""
4203"\n"
649900bc 4204"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4205"\t%s\n"
4206"然后重试。\n"
c04f5ac3 4207
6acbf033 4208#: builtin/commit.c:834
a77c07d9 4209#, c-format
c04f5ac3 4210msgid ""
8ada9598 4211"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4212"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4213msgstr ""
a77c07d9 4214"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4215"说明将会终止提交。\n"
c04f5ac3 4216
6acbf033 4217#: builtin/commit.c:841
a77c07d9 4218#, c-format
c04f5ac3 4219msgid ""
8ada9598 4220"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4221"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4222"An empty message aborts the commit.\n"
4223msgstr ""
a77c07d9
JX
4224"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4225"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4226
90e6ef53 4227# 译者:为保证在输出中对齐,注意调整句中空格!
6acbf033
JX
4228#: builtin/commit.c:855
4229#, c-format
4230msgid "%sAuthor: %.*s <%.*s>"
4231msgstr "%s作者: %.*s <%.*s>"
4232
4233# 译者:为保证在输出中对齐,注意调整句中空格!
4234#: builtin/commit.c:863
c04f5ac3 4235#, c-format
6acbf033
JX
4236msgid "%sDate: %s"
4237msgstr "%s日期: %s"
c04f5ac3 4238
90e6ef53 4239# 译者:为保证在输出中对齐,注意调整句中空格!
6acbf033 4240#: builtin/commit.c:870
c04f5ac3 4241#, c-format
6acbf033
JX
4242msgid "%sCommitter: %.*s <%.*s>"
4243msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 4244
6acbf033 4245#: builtin/commit.c:888
c04f5ac3 4246msgid "Cannot read index"
90e6ef53 4247msgstr "无法读取索引"
c04f5ac3 4248
6acbf033 4249#: builtin/commit.c:945
c04f5ac3
JX
4250msgid "Error building trees"
4251msgstr "无法创建树对象"
4252
6acbf033 4253#: builtin/commit.c:960 builtin/tag.c:495
c04f5ac3
JX
4254#, c-format
4255msgid "Please supply the message using either -m or -F option.\n"
07432cef 4256msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4257
6acbf033 4258#: builtin/commit.c:1061
c04f5ac3
JX
4259#, c-format
4260msgid "No existing author found with '%s'"
4261msgstr "没有找到匹配 '%s' 的作者"
4262
6acbf033 4263#: builtin/commit.c:1076 builtin/commit.c:1316
c04f5ac3
JX
4264#, c-format
4265msgid "Invalid untracked files mode '%s'"
90e6ef53 4266msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4267
6acbf033 4268#: builtin/commit.c:1113
2e8451e8
JX
4269msgid "--long and -z are incompatible"
4270msgstr "--long 和 -z 选项不兼容"
4271
6acbf033 4272#: builtin/commit.c:1143
c04f5ac3
JX
4273msgid "Using both --reset-author and --author does not make sense"
4274msgstr "同时使用 --reset-author 和 --author 没有意义"
4275
6acbf033 4276#: builtin/commit.c:1152
c04f5ac3 4277msgid "You have nothing to amend."
90e6ef53 4278msgstr "您没有可修补的提交。"
c04f5ac3 4279
6acbf033 4280#: builtin/commit.c:1155
8ada9598 4281msgid "You are in the middle of a merge -- cannot amend."
81809b99 4282msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4283
6acbf033 4284#: builtin/commit.c:1157
8ada9598 4285msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4286msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4287
6acbf033 4288#: builtin/commit.c:1160
c04f5ac3 4289msgid "Options --squash and --fixup cannot be used together"
649900bc 4290msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4291
6acbf033 4292#: builtin/commit.c:1170
c04f5ac3
JX
4293msgid "Only one of -c/-C/-F/--fixup can be used."
4294msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4295
6acbf033 4296#: builtin/commit.c:1172
c04f5ac3 4297msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4298msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4299
6acbf033 4300#: builtin/commit.c:1180
c04f5ac3 4301msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4302msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4303
6acbf033 4304#: builtin/commit.c:1197
c04f5ac3
JX
4305msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4306msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4307
6acbf033 4308#: builtin/commit.c:1199
c04f5ac3
JX
4309msgid "No paths with --include/--only does not make sense."
4310msgstr "参数 --include/--only 不跟路径没有意义。"
4311
6acbf033 4312#: builtin/commit.c:1201
c04f5ac3 4313msgid "Clever... amending the last one with dirty index."
90e6ef53 4314msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 4315
6acbf033 4316#: builtin/commit.c:1203
6c94aba5
JX
4317msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4318msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 4319
6acbf033 4320#: builtin/commit.c:1215 builtin/tag.c:727
c04f5ac3
JX
4321#, c-format
4322msgid "Invalid cleanup mode %s"
4323msgstr "无效的清理模式 %s"
4324
6acbf033 4325#: builtin/commit.c:1220
c04f5ac3 4326msgid "Paths with -a does not make sense."
649900bc 4327msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4328
6acbf033 4329#: builtin/commit.c:1330 builtin/commit.c:1595
ef317cd5 4330msgid "show status concisely"
07432cef 4331msgstr "以简洁的格式显示状态"
ef317cd5 4332
6acbf033 4333#: builtin/commit.c:1332 builtin/commit.c:1597
ef317cd5 4334msgid "show branch information"
07432cef 4335msgstr "显示分支信息"
ef317cd5 4336
6acbf033 4337#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
ef317cd5 4338msgid "machine-readable output"
07432cef
WS
4339msgstr "机器可读的输出"
4340
6acbf033 4341#: builtin/commit.c:1337 builtin/commit.c:1601
07432cef
WS
4342msgid "show status in long format (default)"
4343msgstr "以长格式显示状态(默认)"
ef317cd5 4344
6acbf033 4345#: builtin/commit.c:1340 builtin/commit.c:1604
ef317cd5 4346msgid "terminate entries with NUL"
07432cef 4347msgstr "条目以NUL字符结尾"
ef317cd5 4348
6acbf033
JX
4349#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
4350#: builtin/fast-export.c:706 builtin/tag.c:602
ef317cd5 4351msgid "mode"
07432cef 4352msgstr "模式"
ef317cd5 4353
6acbf033 4354#: builtin/commit.c:1343 builtin/commit.c:1607
ef317cd5 4355msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4356msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4357
6acbf033 4358#: builtin/commit.c:1346
ef317cd5 4359msgid "show ignored files"
07432cef 4360msgstr "显示忽略的文件"
ef317cd5 4361
6acbf033 4362#: builtin/commit.c:1347 parse-options.h:153
ef317cd5
JX
4363msgid "when"
4364msgstr "何时"
4365
6acbf033 4366#: builtin/commit.c:1348
ef317cd5
JX
4367msgid ""
4368"ignore changes to submodules, optional when: all, dirty, untracked. "
4369"(Default: all)"
4370msgstr ""
07432cef 4371"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4372
6acbf033 4373#: builtin/commit.c:1350
ef317cd5 4374msgid "list untracked files in columns"
07432cef 4375msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4376
6acbf033 4377#: builtin/commit.c:1419
c04f5ac3
JX
4378msgid "couldn't look up newly created commit"
4379msgstr "无法找到新创建的提交"
4380
6acbf033 4381#: builtin/commit.c:1421
c04f5ac3 4382msgid "could not parse newly created commit"
90e6ef53 4383msgstr "不能解析新创建的提交"
c04f5ac3 4384
6acbf033 4385#: builtin/commit.c:1469
c04f5ac3
JX
4386msgid "detached HEAD"
4387msgstr "分离头指针"
4388
7e238ab7 4389# 译者:中文字符串拼接,可删除前导空格
6acbf033 4390#: builtin/commit.c:1471
c04f5ac3 4391msgid " (root-commit)"
7e238ab7 4392msgstr "(根提交)"
c04f5ac3 4393
6acbf033 4394#: builtin/commit.c:1565
ef317cd5 4395msgid "suppress summary after successful commit"
07432cef 4396msgstr "提交成功后不显示概述信息"
c04f5ac3 4397
6acbf033 4398#: builtin/commit.c:1566
ef317cd5 4399msgid "show diff in commit message template"
07432cef 4400msgstr "在提交说明模板里显示差异"
c04f5ac3 4401
6acbf033 4402#: builtin/commit.c:1568
ef317cd5 4403msgid "Commit message options"
07432cef 4404msgstr "提交说明选项"
c04f5ac3 4405
6acbf033 4406#: builtin/commit.c:1569 builtin/tag.c:600
ef317cd5 4407msgid "read message from file"
07432cef 4408msgstr "从文件中读取提交说明"
c04f5ac3 4409
6acbf033 4410#: builtin/commit.c:1570
ef317cd5 4411msgid "author"
07432cef 4412msgstr "作者"
c04f5ac3 4413
6acbf033 4414#: builtin/commit.c:1570
ef317cd5 4415msgid "override author for commit"
07432cef 4416msgstr "提交时覆盖作者"
73a60cd2 4417
6acbf033 4418#: builtin/commit.c:1571 builtin/gc.c:286
ef317cd5 4419msgid "date"
07432cef 4420msgstr "日期"
c04f5ac3 4421
6acbf033 4422#: builtin/commit.c:1571
ef317cd5 4423msgid "override date for commit"
07432cef 4424msgstr "提交时覆盖日期"
c04f5ac3 4425
6acbf033
JX
4426#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
4427#: builtin/notes.c:566 builtin/tag.c:598
ef317cd5 4428msgid "message"
07432cef 4429msgstr "说明"
c04f5ac3 4430
6acbf033 4431#: builtin/commit.c:1572
ef317cd5 4432msgid "commit message"
07432cef 4433msgstr "提交说明"
ef317cd5 4434
6acbf033 4435#: builtin/commit.c:1573
ef317cd5 4436msgid "reuse and edit message from specified commit"
07432cef 4437msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4438
6acbf033 4439#: builtin/commit.c:1574
ef317cd5 4440msgid "reuse message from specified commit"
07432cef 4441msgstr "重用指定提交的提交说明"
ef317cd5 4442
6acbf033 4443#: builtin/commit.c:1575
ef317cd5 4444msgid "use autosquash formatted message to fixup specified commit"
07432cef 4445msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4446
6acbf033 4447#: builtin/commit.c:1576
ef317cd5 4448msgid "use autosquash formatted message to squash specified commit"
07432cef 4449msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4450
6acbf033 4451#: builtin/commit.c:1577
ef317cd5 4452msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4453msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4454
6acbf033 4455#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
ef317cd5 4456msgid "add Signed-off-by:"
07432cef 4457msgstr "添加 Signed-off-by: 签名"
ef317cd5 4458
6acbf033 4459#: builtin/commit.c:1579
ef317cd5 4460msgid "use specified template file"
07432cef 4461msgstr "使用指定的模板文件"
ef317cd5 4462
6acbf033 4463#: builtin/commit.c:1580
ef317cd5 4464msgid "force edit of commit"
07432cef 4465msgstr "强制编辑提交"
ef317cd5 4466
07432cef 4467# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
6acbf033 4468#: builtin/commit.c:1581
ef317cd5 4469msgid "default"
07432cef 4470msgstr "default"
ef317cd5 4471
6acbf033 4472#: builtin/commit.c:1581 builtin/tag.c:603
ef317cd5 4473msgid "how to strip spaces and #comments from message"
07432cef 4474msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4475
6acbf033 4476#: builtin/commit.c:1582
ef317cd5 4477msgid "include status in commit message template"
07432cef 4478msgstr "在提交说明模板里包含状态信息"
ef317cd5 4479
6acbf033
JX
4480#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
4481#: builtin/tag.c:604
6c94aba5
JX
4482msgid "key-id"
4483msgstr "key-id"
ef317cd5 4484
6acbf033 4485#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
ef317cd5 4486msgid "GPG sign commit"
07432cef 4487msgstr "GPG 提交签名"
ef317cd5 4488
6acbf033 4489#: builtin/commit.c:1587
ef317cd5 4490msgid "Commit contents options"
07432cef 4491msgstr "提交内容选项"
ef317cd5 4492
6acbf033 4493#: builtin/commit.c:1588
ef317cd5 4494msgid "commit all changed files"
07432cef 4495msgstr "提交所有改动的文件"
ef317cd5 4496
6acbf033 4497#: builtin/commit.c:1589
ef317cd5 4498msgid "add specified files to index for commit"
07432cef 4499msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4500
6acbf033 4501#: builtin/commit.c:1590
ef317cd5 4502msgid "interactively add files"
07432cef 4503msgstr "交互式添加文件"
ef317cd5 4504
6acbf033 4505#: builtin/commit.c:1591
ef317cd5 4506msgid "interactively add changes"
07432cef 4507msgstr "交互式添加变更"
ef317cd5 4508
6acbf033 4509#: builtin/commit.c:1592
ef317cd5 4510msgid "commit only specified files"
07432cef 4511msgstr "只提交指定的文件"
ef317cd5 4512
6acbf033 4513#: builtin/commit.c:1593
ef317cd5 4514msgid "bypass pre-commit hook"
07432cef 4515msgstr "绕过 pre-commit 钩子"
ef317cd5 4516
6acbf033 4517#: builtin/commit.c:1594
ef317cd5 4518msgid "show what would be committed"
07432cef 4519msgstr "显示将要提交的内容"
ef317cd5 4520
6acbf033 4521#: builtin/commit.c:1605
ef317cd5 4522msgid "amend previous commit"
07432cef 4523msgstr "修改先前的提交"
ef317cd5 4524
6acbf033 4525#: builtin/commit.c:1606
ef317cd5 4526msgid "bypass post-rewrite hook"
07432cef 4527msgstr "绕过 post-rewrite 钩子"
ef317cd5 4528
6acbf033 4529#: builtin/commit.c:1611
ef317cd5 4530msgid "ok to record an empty change"
07432cef 4531msgstr "允许一个空提交"
ef317cd5 4532
6acbf033 4533#: builtin/commit.c:1613
ef317cd5 4534msgid "ok to record a change with an empty message"
07432cef 4535msgstr "允许空的提交说明"
ef317cd5 4536
6acbf033 4537#: builtin/commit.c:1641
c04f5ac3 4538msgid "could not parse HEAD commit"
90e6ef53 4539msgstr "不能解析 HEAD 提交"
c04f5ac3 4540
6acbf033 4541#: builtin/commit.c:1680 builtin/merge.c:518
c04f5ac3
JX
4542#, c-format
4543msgid "could not open '%s' for reading"
90e6ef53 4544msgstr "不能为读入打开 '%s'"
c04f5ac3 4545
6acbf033 4546#: builtin/commit.c:1687
c04f5ac3
JX
4547#, c-format
4548msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4549msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4550
6acbf033 4551#: builtin/commit.c:1694
c04f5ac3 4552msgid "could not read MERGE_MODE"
90e6ef53 4553msgstr "不能读取 MERGE_MODE"
c04f5ac3 4554
6acbf033 4555#: builtin/commit.c:1713
c04f5ac3
JX
4556#, c-format
4557msgid "could not read commit message: %s"
90e6ef53 4558msgstr "不能读取提交说明:%s"
c04f5ac3 4559
6acbf033 4560#: builtin/commit.c:1724
73a60cd2
JX
4561#, c-format
4562msgid "Aborting commit; you did not edit the message.\n"
4563msgstr "终止提交;您未更改来自模版的提交说明。\n"
4564
6acbf033 4565#: builtin/commit.c:1729
c04f5ac3
JX
4566#, c-format
4567msgid "Aborting commit due to empty commit message.\n"
4568msgstr "终止提交因为提交说明为空。\n"
4569
6acbf033 4570#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876
c04f5ac3 4571msgid "failed to write commit object"
90e6ef53 4572msgstr "无法写提交对象"
c04f5ac3 4573
6acbf033 4574#: builtin/commit.c:1756
c04f5ac3
JX
4575msgid "cannot lock HEAD ref"
4576msgstr "无法锁定 HEAD 引用"
4577
6acbf033 4578#: builtin/commit.c:1769
c04f5ac3
JX
4579msgid "cannot update HEAD ref"
4580msgstr "无法更新 HEAD 引用"
4581
6acbf033 4582#: builtin/commit.c:1780
c04f5ac3
JX
4583msgid ""
4584"Repository has been updated, but unable to write\n"
4585"new_index file. Check that disk is not full or quota is\n"
4586"not exceeded, and then \"git reset HEAD\" to recover."
4587msgstr ""
90e6ef53
JX
4588"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4589"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4590
90314792 4591#: builtin/config.c:8
ef317cd5 4592msgid "git config [options]"
07432cef 4593msgstr "git config [选项]"
ef317cd5 4594
6c94aba5 4595#: builtin/config.c:53
ef317cd5 4596msgid "Config file location"
07432cef 4597msgstr "配置文件位置"
ef317cd5 4598
6c94aba5 4599#: builtin/config.c:54
ef317cd5 4600msgid "use global config file"
07432cef 4601msgstr "使用全局配置文件"
ef317cd5 4602
6c94aba5 4603#: builtin/config.c:55
ef317cd5 4604msgid "use system config file"
07432cef 4605msgstr "使用系统级配置文件"
ef317cd5 4606
6c94aba5 4607#: builtin/config.c:56
ef317cd5 4608msgid "use repository config file"
07432cef 4609msgstr "使用版本库级配置文件"
ef317cd5 4610
6c94aba5 4611#: builtin/config.c:57
ef317cd5 4612msgid "use given config file"
07432cef 4613msgstr "使用指定的配置文件"
ef317cd5 4614
6c94aba5 4615#: builtin/config.c:58
2e8451e8
JX
4616msgid "blob-id"
4617msgstr "数据对象ID"
4618
6c94aba5 4619#: builtin/config.c:58
2e8451e8
JX
4620msgid "read config from given blob object"
4621msgstr "从给定的数据对象读取配置"
4622
6c94aba5 4623#: builtin/config.c:59
ef317cd5 4624msgid "Action"
07432cef 4625msgstr "操作"
ef317cd5 4626
6c94aba5 4627#: builtin/config.c:60
ef317cd5 4628msgid "get value: name [value-regex]"
07432cef 4629msgstr "获取值:name [value-regex]"
ef317cd5 4630
6c94aba5 4631#: builtin/config.c:61
ef317cd5 4632msgid "get all values: key [value-regex]"
07432cef 4633msgstr "获得所有的值:key [value-regex]"
ef317cd5 4634
6c94aba5 4635#: builtin/config.c:62
ef317cd5 4636msgid "get values for regexp: name-regex [value-regex]"
07432cef 4637msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 4638
6c94aba5 4639#: builtin/config.c:63
90314792
JX
4640msgid "get value specific for the URL: section[.var] URL"
4641msgstr "获得 URL 取值:section[.var] URL"
4642
6c94aba5 4643#: builtin/config.c:64
ef317cd5 4644msgid "replace all matching variables: name value [value_regex]"
07432cef 4645msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 4646
6c94aba5 4647#: builtin/config.c:65
ef317cd5 4648msgid "add a new variable: name value"
07432cef 4649msgstr "添加一个新的变量:name value"
ef317cd5 4650
6c94aba5 4651#: builtin/config.c:66
ef317cd5 4652msgid "remove a variable: name [value-regex]"
07432cef 4653msgstr "删除一个变量:name [value-regex]"
ef317cd5 4654
6c94aba5 4655#: builtin/config.c:67
ef317cd5 4656msgid "remove all matches: name [value-regex]"
07432cef 4657msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 4658
6c94aba5 4659#: builtin/config.c:68
ef317cd5 4660msgid "rename section: old-name new-name"
07432cef 4661msgstr "重命名小节:old-name new-name"
ef317cd5 4662
6c94aba5 4663#: builtin/config.c:69
ef317cd5 4664msgid "remove a section: name"
07432cef 4665msgstr "删除一个小节:name"
ef317cd5 4666
6c94aba5 4667#: builtin/config.c:70
ef317cd5 4668msgid "list all"
07432cef 4669msgstr "列出所有"
ef317cd5 4670
6c94aba5 4671#: builtin/config.c:71
ef317cd5 4672msgid "open an editor"
07432cef 4673msgstr "打开一个编辑器"
ef317cd5 4674
6c94aba5 4675#: builtin/config.c:72 builtin/config.c:73
ef317cd5 4676msgid "slot"
07432cef 4677msgstr "slot"
ef317cd5 4678
6c94aba5 4679#: builtin/config.c:72
ef317cd5 4680msgid "find the color configured: [default]"
07432cef 4681msgstr "找到配置的颜色:[默认]"
ef317cd5 4682
6c94aba5 4683#: builtin/config.c:73
ef317cd5 4684msgid "find the color setting: [stdout-is-tty]"
07432cef 4685msgstr "找到颜色设置:[stdout-is-tty]"
ef317cd5 4686
6c94aba5 4687#: builtin/config.c:74
ef317cd5 4688msgid "Type"
07432cef 4689msgstr "类型"
ef317cd5 4690
6c94aba5 4691#: builtin/config.c:75
ef317cd5 4692msgid "value is \"true\" or \"false\""
07432cef 4693msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4694
6c94aba5 4695#: builtin/config.c:76
ef317cd5 4696msgid "value is decimal number"
07432cef 4697msgstr "值是十进制数"
ef317cd5 4698
6c94aba5 4699#: builtin/config.c:77
ef317cd5 4700msgid "value is --bool or --int"
07432cef 4701msgstr "值是 --bool or --int"
ef317cd5 4702
6c94aba5 4703#: builtin/config.c:78
ef317cd5 4704msgid "value is a path (file or directory name)"
07432cef 4705msgstr "值是一个路径(文件或目录名)"
ef317cd5 4706
6c94aba5 4707#: builtin/config.c:79
ef317cd5 4708msgid "Other"
07432cef 4709msgstr "其它"
ef317cd5 4710
6c94aba5 4711#: builtin/config.c:80
ef317cd5 4712msgid "terminate values with NUL byte"
07432cef 4713msgstr "终止值是NUL字节"
ef317cd5 4714
6c94aba5 4715#: builtin/config.c:81
ef317cd5 4716msgid "respect include directives on lookup"
07432cef 4717msgstr "查询时参照 include 指令递归查找"
ef317cd5 4718
1003b3a5 4719#: builtin/count-objects.c:82
4dcdc3d8
JX
4720msgid "git count-objects [-v] [-H | --human-readable]"
4721msgstr "git count-objects [-v] [-H | --human-readable]"
4722
4723#: builtin/count-objects.c:97
4724msgid "print sizes in human readable format"
4725msgstr "以用户可读的格式显示大小"
ef317cd5 4726
2e8451e8 4727#: builtin/describe.c:16
a8a5406a 4728msgid "git describe [options] <commit-ish>*"
07432cef 4729msgstr "git describe [选项] <提交号>*"
ef317cd5 4730
2e8451e8 4731#: builtin/describe.c:17
ef317cd5 4732msgid "git describe [options] --dirty"
07432cef 4733msgstr "git describe [选项] --dirty"
ef317cd5 4734
6acbf033 4735#: builtin/describe.c:216
c04f5ac3
JX
4736#, c-format
4737msgid "annotated tag %s not available"
4738msgstr "注释 tag %s 无效"
4739
6acbf033 4740#: builtin/describe.c:220
c04f5ac3
JX
4741#, c-format
4742msgid "annotated tag %s has no embedded name"
4743msgstr "注释 tag %s 没有嵌入名称"
4744
6acbf033 4745#: builtin/describe.c:222
c04f5ac3
JX
4746#, c-format
4747msgid "tag '%s' is really '%s' here"
90e6ef53 4748msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3 4749
6acbf033 4750#: builtin/describe.c:249
c04f5ac3
JX
4751#, c-format
4752msgid "Not a valid object name %s"
4753msgstr "不是一个有效的对象名 %s"
4754
6acbf033 4755#: builtin/describe.c:252
c04f5ac3
JX
4756#, c-format
4757msgid "%s is not a valid '%s' object"
4758msgstr "%s 不是一个有效的 '%s' 对象"
4759
6acbf033 4760#: builtin/describe.c:269
c04f5ac3
JX
4761#, c-format
4762msgid "no tag exactly matches '%s'"
4763msgstr "没有 tag 准确匹配 '%s'"
4764
6acbf033 4765#: builtin/describe.c:271
c04f5ac3
JX
4766#, c-format
4767msgid "searching to describe %s\n"
4768msgstr "搜索描述 %s\n"
4769
6acbf033 4770#: builtin/describe.c:318
c04f5ac3
JX
4771#, c-format
4772msgid "finished search at %s\n"
4773msgstr "完成搜索 %s\n"
4774
6acbf033 4775#: builtin/describe.c:345
c04f5ac3
JX
4776#, c-format
4777msgid ""
4778"No annotated tags can describe '%s'.\n"
4779"However, there were unannotated tags: try --tags."
4780msgstr ""
4781"没有注释 tag 能描述 '%s'。\n"
4782"然而,有非注释 tag:尝试 --tags。"
4783
6acbf033 4784#: builtin/describe.c:349
c04f5ac3
JX
4785#, c-format
4786msgid ""
4787"No tags can describe '%s'.\n"
4788"Try --always, or create some tags."
4789msgstr ""
4790"没有注释 tag 能描述 '%s'。\n"
90e6ef53 4791"尝试 --always,或者创建一些 tag。"
c04f5ac3 4792
6acbf033 4793#: builtin/describe.c:370
c04f5ac3
JX
4794#, c-format
4795msgid "traversed %lu commits\n"
4796msgstr "已遍历 %lu 个提交\n"
4797
6acbf033 4798#: builtin/describe.c:373
c04f5ac3
JX
4799#, c-format
4800msgid ""
4801"more than %i tags found; listed %i most recent\n"
4802"gave up search at %s\n"
4803msgstr ""
90e6ef53
JX
4804"发现多于 %i 个 tag,列出最近的 %i 个\n"
4805"在 %s 放弃搜索\n"
c04f5ac3 4806
6acbf033 4807#: builtin/describe.c:395
ef317cd5 4808msgid "find the tag that comes after the commit"
07432cef 4809msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5 4810
6acbf033 4811#: builtin/describe.c:396
ef317cd5 4812msgid "debug search strategy on stderr"
07432cef 4813msgstr "在标准错误上调试搜索策略"
ef317cd5 4814
6acbf033 4815#: builtin/describe.c:397
1003b3a5
JX
4816msgid "use any ref"
4817msgstr "使用任意引用"
4818
6acbf033 4819#: builtin/describe.c:398
1003b3a5
JX
4820msgid "use any tag, even unannotated"
4821msgstr "使用任意 tag,即使未带注解"
ef317cd5 4822
6acbf033 4823#: builtin/describe.c:399
ef317cd5 4824msgid "always use long format"
07432cef 4825msgstr "始终使用长提交号格式"
ef317cd5 4826
6acbf033 4827#: builtin/describe.c:400
2e8451e8
JX
4828msgid "only follow first parent"
4829msgstr "只跟随第一个父提交"
4830
6acbf033 4831#: builtin/describe.c:403
ef317cd5 4832msgid "only output exact matches"
07432cef 4833msgstr "只输出精确匹配"
ef317cd5 4834
6acbf033 4835#: builtin/describe.c:405
ef317cd5 4836msgid "consider <n> most recent tags (default: 10)"
07432cef 4837msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5 4838
6acbf033 4839#: builtin/describe.c:407
ef317cd5 4840msgid "only consider tags matching <pattern>"
07432cef 4841msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5 4842
6acbf033 4843#: builtin/describe.c:409 builtin/name-rev.c:318
ef317cd5 4844msgid "show abbreviated commit object as fallback"
07432cef 4845msgstr "显示简写的提交号作为后备"
ef317cd5 4846
6acbf033 4847#: builtin/describe.c:410
ef317cd5 4848msgid "mark"
07432cef 4849msgstr "标记"
ef317cd5 4850
6acbf033 4851#: builtin/describe.c:411
ef317cd5 4852msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 4853msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 4854
6acbf033 4855#: builtin/describe.c:429
c04f5ac3
JX
4856msgid "--long is incompatible with --abbrev=0"
4857msgstr "--long 与 --abbrev=0 不兼容"
4858
6acbf033 4859#: builtin/describe.c:455
c04f5ac3 4860msgid "No names found, cannot describe anything."
90e6ef53 4861msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 4862
6acbf033 4863#: builtin/describe.c:475
a8a5406a 4864msgid "--dirty is incompatible with commit-ishes"
649900bc 4865msgstr "--dirty 不能与提交同时使用"
c04f5ac3 4866
cfff71a9 4867#: builtin/diff.c:85
c04f5ac3
JX
4868#, c-format
4869msgid "'%s': not a regular file or symlink"
4870msgstr "'%s':不是一个正规文件或符号链接"
4871
cfff71a9 4872#: builtin/diff.c:236
c04f5ac3
JX
4873#, c-format
4874msgid "invalid option: %s"
4875msgstr "无效选项:%s"
4876
cfff71a9 4877#: builtin/diff.c:357
c04f5ac3
JX
4878msgid "Not a git repository"
4879msgstr "不是一个 git 版本库"
4880
cfff71a9 4881#: builtin/diff.c:400
c04f5ac3
JX
4882#, c-format
4883msgid "invalid object '%s' given."
4884msgstr "提供了无效对象 '%s'。"
4885
cfff71a9 4886#: builtin/diff.c:409
c04f5ac3
JX
4887#, c-format
4888msgid "more than two blobs given: '%s'"
07432cef 4889msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 4890
cfff71a9 4891#: builtin/diff.c:416
c04f5ac3
JX
4892#, c-format
4893msgid "unhandled object '%s' given."
6c94aba5 4894msgstr "无法处理的对象 '%s'。"
c04f5ac3 4895
6acbf033 4896#: builtin/fast-export.c:23
ef317cd5 4897msgid "git fast-export [rev-list-opts]"
07432cef 4898msgstr "git fast-export [rev-list-opts]"
ef317cd5 4899
6acbf033 4900#: builtin/fast-export.c:702
ef317cd5 4901msgid "show progress after <n> objects"
07432cef 4902msgstr "在 <n> 个对象之后显示进度"
ef317cd5 4903
6acbf033 4904#: builtin/fast-export.c:704
ef317cd5 4905msgid "select handling of signed tags"
07432cef 4906msgstr "选择如何处理签名 tags"
ef317cd5 4907
6acbf033 4908#: builtin/fast-export.c:707
ef317cd5 4909msgid "select handling of tags that tag filtered objects"
07432cef 4910msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 4911
6acbf033 4912#: builtin/fast-export.c:710
ef317cd5 4913msgid "Dump marks to this file"
07432cef 4914msgstr "把标记存储到这个文件"
ef317cd5 4915
6acbf033 4916#: builtin/fast-export.c:712
ef317cd5 4917msgid "Import marks from this file"
07432cef 4918msgstr "从这个文件导入标记"
ef317cd5 4919
6acbf033 4920#: builtin/fast-export.c:714
ef317cd5 4921msgid "Fake a tagger when tags lack one"
07432cef 4922msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 4923
6acbf033 4924#: builtin/fast-export.c:716
ef317cd5 4925msgid "Output full tree for each commit"
07432cef 4926msgstr "每次提交都输出整个树"
ef317cd5 4927
6acbf033 4928#: builtin/fast-export.c:718
ef317cd5 4929msgid "Use the done feature to terminate the stream"
07432cef 4930msgstr "使用 done 功能来终止流"
ef317cd5 4931
6acbf033 4932#: builtin/fast-export.c:719
ef317cd5 4933msgid "Skip output of blob data"
07432cef 4934msgstr "跳过数据对象的输出"
ef317cd5 4935
6acbf033
JX
4936#: builtin/fast-export.c:720
4937msgid "refspec"
4938msgstr "引用表达式"
4939
4940#: builtin/fast-export.c:721
4941msgid "Apply refspec to exported refs"
4942msgstr "对导出的引用应用引用表达式"
4943
ef317cd5 4944#: builtin/fetch.c:20
ef317cd5 4945msgid "git fetch [<options>] [<repository> [<refspec>...]]"
90314792 4946msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
ef317cd5
JX
4947
4948#: builtin/fetch.c:21
4949msgid "git fetch [<options>] <group>"
07432cef 4950msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
4951
4952#: builtin/fetch.c:22
4953msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 4954msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
4955
4956#: builtin/fetch.c:23
4957msgid "git fetch --all [<options>]"
07432cef 4958msgstr "git fetch --all [<选项>]"
ef317cd5 4959
6acbf033 4960#: builtin/fetch.c:90
ef317cd5 4961msgid "fetch from all remotes"
07432cef 4962msgstr "从所有的远程抓取"
ef317cd5 4963
6acbf033 4964#: builtin/fetch.c:92
ef317cd5 4965msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 4966msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 4967
6acbf033 4968#: builtin/fetch.c:94
ef317cd5 4969msgid "path to upload pack on remote end"
07432cef 4970msgstr "上传包到远程的路径"
ef317cd5 4971
6acbf033 4972#: builtin/fetch.c:95
ef317cd5 4973msgid "force overwrite of local branch"
07432cef 4974msgstr "强制覆盖本地分支"
ef317cd5 4975
6acbf033 4976#: builtin/fetch.c:97
ef317cd5 4977msgid "fetch from multiple remotes"
07432cef 4978msgstr "从多个远程抓取"
ef317cd5 4979
6acbf033 4980#: builtin/fetch.c:99
ef317cd5 4981msgid "fetch all tags and associated objects"
07432cef 4982msgstr "抓取所有的 tags 和关联对象"
ef317cd5 4983
6acbf033 4984#: builtin/fetch.c:101
ef317cd5 4985msgid "do not fetch all tags (--no-tags)"
07432cef 4986msgstr "不抓取任何 tags (--no-tags)"
ef317cd5 4987
6acbf033 4988#: builtin/fetch.c:103
ef317cd5 4989msgid "prune remote-tracking branches no longer on remote"
07432cef 4990msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 4991
07432cef 4992# 译者:可选值,不能翻译
6acbf033 4993#: builtin/fetch.c:104
ef317cd5 4994msgid "on-demand"
07432cef 4995msgstr "on-demand"
ef317cd5 4996
6acbf033 4997#: builtin/fetch.c:105
ef317cd5 4998msgid "control recursive fetching of submodules"
07432cef 4999msgstr "控制子模组的递归抓取"
ef317cd5 5000
6acbf033 5001#: builtin/fetch.c:109
ef317cd5 5002msgid "keep downloaded pack"
07432cef 5003msgstr "保持下载包"
ef317cd5 5004
6acbf033 5005#: builtin/fetch.c:111
ef317cd5 5006msgid "allow updating of HEAD ref"
07432cef 5007msgstr "允许更新 HEAD 引用"
ef317cd5 5008
6acbf033 5009#: builtin/fetch.c:114
ef317cd5 5010msgid "deepen history of shallow clone"
07432cef 5011msgstr "深化浅克隆的历史"
ef317cd5 5012
6acbf033 5013#: builtin/fetch.c:116
a77c07d9
JX
5014msgid "convert to a complete repository"
5015msgstr "转换为一个完整的版本库"
5016
6acbf033 5017#: builtin/fetch.c:118 builtin/log.c:1205
ef317cd5 5018msgid "dir"
07432cef 5019msgstr "目录"
ef317cd5 5020
6acbf033 5021#: builtin/fetch.c:119
ef317cd5 5022msgid "prepend this to submodule path output"
07432cef 5023msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5024
6acbf033 5025#: builtin/fetch.c:122
ef317cd5 5026msgid "default mode for recursion"
07432cef 5027msgstr "递归的默认模式"
ef317cd5 5028
6acbf033 5029#: builtin/fetch.c:124
cfff71a9
JX
5030msgid "accept refs that update .git/shallow"
5031msgstr "接受更新 .git/shallow 的引用"
5032
6acbf033
JX
5033#: builtin/fetch.c:125
5034msgid "refmap"
5035msgstr "引用映射"
5036
5037#: builtin/fetch.c:126
5038msgid "specify fetch refmap"
5039msgstr "指定获取操作的引用映射"
5040
5041#: builtin/fetch.c:376
c04f5ac3
JX
5042msgid "Couldn't find remote ref HEAD"
5043msgstr "无法发现远程 HEAD 引用"
5044
6acbf033 5045#: builtin/fetch.c:440
c04f5ac3
JX
5046#, c-format
5047msgid "object %s not found"
5048msgstr "对象 %s 未发现"
5049
6acbf033 5050#: builtin/fetch.c:445
c04f5ac3
JX
5051msgid "[up to date]"
5052msgstr "[最新]"
5053
6acbf033 5054#: builtin/fetch.c:459
c04f5ac3
JX
5055#, c-format
5056msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5057msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5058
6acbf033 5059#: builtin/fetch.c:460 builtin/fetch.c:546
c04f5ac3
JX
5060msgid "[rejected]"
5061msgstr "[已拒绝]"
5062
6acbf033 5063#: builtin/fetch.c:471
c04f5ac3
JX
5064msgid "[tag update]"
5065msgstr "[tag更新]"
5066
90e6ef53 5067# 译者:注意保持前导空格
6acbf033 5068#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
c04f5ac3
JX
5069msgid " (unable to update local ref)"
5070msgstr " (不能更新本地引用)"
5071
6acbf033 5072#: builtin/fetch.c:491
c04f5ac3
JX
5073msgid "[new tag]"
5074msgstr "[新tag]"
5075
6acbf033 5076#: builtin/fetch.c:494
c04f5ac3
JX
5077msgid "[new branch]"
5078msgstr "[新分支]"
5079
6acbf033 5080#: builtin/fetch.c:497
170e9899
JX
5081msgid "[new ref]"
5082msgstr "[新引用]"
5083
6acbf033 5084#: builtin/fetch.c:542
c04f5ac3
JX
5085msgid "unable to update local ref"
5086msgstr "不能更新本地引用"
5087
6acbf033 5088#: builtin/fetch.c:542
c04f5ac3
JX
5089msgid "forced update"
5090msgstr "强制更新"
5091
6acbf033 5092#: builtin/fetch.c:548
c04f5ac3 5093msgid "(non-fast-forward)"
90e6ef53 5094msgstr "(非快进式)"
c04f5ac3 5095
6acbf033 5096#: builtin/fetch.c:581 builtin/fetch.c:814
c04f5ac3
JX
5097#, c-format
5098msgid "cannot open %s: %s\n"
5099msgstr "无法打开 %s:%s\n"
5100
6acbf033 5101#: builtin/fetch.c:590
c04f5ac3
JX
5102#, c-format
5103msgid "%s did not send all necessary objects\n"
5104msgstr "%s 未发送所有必须的对象\n"
5105
6acbf033 5106#: builtin/fetch.c:608
cfff71a9
JX
5107#, c-format
5108msgid "reject %s because shallow roots are not allowed to be updated"
5109msgstr "拒绝 %s 因为浅克隆不允许被更新"
5110
6acbf033 5111#: builtin/fetch.c:696 builtin/fetch.c:779
c04f5ac3
JX
5112#, c-format
5113msgid "From %.*s\n"
5114msgstr "来自 %.*s\n"
5115
6acbf033 5116#: builtin/fetch.c:707
c04f5ac3
JX
5117#, c-format
5118msgid ""
5119"some local refs could not be updated; try running\n"
5120" 'git remote prune %s' to remove any old, conflicting branches"
5121msgstr ""
5122"一些本地引用不能被更新;尝试运行\n"
5123" 'git remote prune %s' 来删除旧的、有冲突的分支"
5124
90e6ef53 5125# 译者:注意保持前导空格
6acbf033 5126#: builtin/fetch.c:759
81809b99 5127#, c-format
8ada9598 5128msgid " (%s will become dangling)"
07432cef 5129msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5130
90e6ef53 5131# 译者:注意保持前导空格
6acbf033 5132#: builtin/fetch.c:760
81809b99 5133#, c-format
8ada9598 5134msgid " (%s has become dangling)"
07432cef 5135msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5136
6acbf033 5137#: builtin/fetch.c:784
c04f5ac3
JX
5138msgid "[deleted]"
5139msgstr "[已删除]"
5140
6acbf033 5141#: builtin/fetch.c:785 builtin/remote.c:1059
c04f5ac3
JX
5142msgid "(none)"
5143msgstr "(无)"
5144
6acbf033 5145#: builtin/fetch.c:804
c04f5ac3
JX
5146#, c-format
5147msgid "Refusing to fetch into current branch %s of non-bare repository"
5148msgstr "拒绝获取到非裸版本库的当前分支 %s"
5149
6acbf033 5150#: builtin/fetch.c:823
c04f5ac3
JX
5151#, c-format
5152msgid "Option \"%s\" value \"%s\" is not valid for %s"
5153msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5154
6acbf033 5155#: builtin/fetch.c:826
c04f5ac3
JX
5156#, c-format
5157msgid "Option \"%s\" is ignored for %s\n"
81809b99 5158msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 5159
6acbf033 5160#: builtin/fetch.c:882
90314792
JX
5161#, c-format
5162msgid "Don't know how to fetch from %s"
5163msgstr "不知道如何从 %s 获取"
5164
6acbf033 5165#: builtin/fetch.c:1044
c04f5ac3
JX
5166#, c-format
5167msgid "Fetching %s\n"
d4a8e00b 5168msgstr "正在获取 %s\n"
c04f5ac3 5169
6acbf033 5170#: builtin/fetch.c:1046 builtin/remote.c:90
c04f5ac3
JX
5171#, c-format
5172msgid "Could not fetch %s"
5173msgstr "不能获取 %s"
5174
6acbf033 5175#: builtin/fetch.c:1064
c04f5ac3
JX
5176msgid ""
5177"No remote repository specified. Please, specify either a URL or a\n"
5178"remote name from which new revisions should be fetched."
90e6ef53 5179msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 5180
6acbf033 5181#: builtin/fetch.c:1087
c04f5ac3 5182msgid "You need to specify a tag name."
90e6ef53 5183msgstr "您需要指定一个 tag 名称。"
c04f5ac3 5184
6acbf033 5185#: builtin/fetch.c:1131
a77c07d9
JX
5186msgid "--depth and --unshallow cannot be used together"
5187msgstr "--depth 和 --unshallow 不能同时使用"
5188
6acbf033 5189#: builtin/fetch.c:1133
a77c07d9
JX
5190msgid "--unshallow on a complete repository does not make sense"
5191msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5192
6acbf033 5193#: builtin/fetch.c:1156
c04f5ac3
JX
5194msgid "fetch --all does not take a repository argument"
5195msgstr "fetch --all 不能带一个版本库参数"
5196
6acbf033 5197#: builtin/fetch.c:1158
c04f5ac3 5198msgid "fetch --all does not make sense with refspecs"
90314792 5199msgstr "fetch --all 带引用规则没有任何意义"
c04f5ac3 5200
6acbf033 5201#: builtin/fetch.c:1169
c04f5ac3
JX
5202#, c-format
5203msgid "No such remote or remote group: %s"
5204msgstr "没有这样的远程或远程组:%s"
5205
6acbf033 5206#: builtin/fetch.c:1177
c04f5ac3 5207msgid "Fetching a group and specifying refspecs does not make sense"
90314792 5208msgstr "获取组并指定引用规则没有意义"
c04f5ac3 5209
ef317cd5
JX
5210#: builtin/fmt-merge-msg.c:13
5211msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5212msgstr ""
07432cef 5213"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 5214
6acbf033
JX
5215#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
5216#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183
5217#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589
6c94aba5 5218#: parse-options.h:132 parse-options.h:239
ef317cd5 5219msgid "n"
07432cef 5220msgstr "n"
c04f5ac3 5221
4dcdc3d8 5222#: builtin/fmt-merge-msg.c:664
ef317cd5 5223msgid "populate log with at most <n> entries from shortlog"
07432cef 5224msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5225
4dcdc3d8 5226#: builtin/fmt-merge-msg.c:667
ef317cd5 5227msgid "alias for --log (deprecated)"
07432cef 5228msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5229
4dcdc3d8 5230#: builtin/fmt-merge-msg.c:670
ef317cd5 5231msgid "text"
07432cef 5232msgstr "文本"
ef317cd5 5233
4dcdc3d8 5234#: builtin/fmt-merge-msg.c:671
ef317cd5 5235msgid "use <text> as start of message"
07432cef 5236msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5237
4dcdc3d8 5238#: builtin/fmt-merge-msg.c:672
ef317cd5 5239msgid "file to read from"
07432cef 5240msgstr "从文件中读取"
ef317cd5 5241
6acbf033 5242#: builtin/for-each-ref.c:1051
ef317cd5 5243msgid "git for-each-ref [options] [<pattern>]"
07432cef 5244msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5 5245
6acbf033 5246#: builtin/for-each-ref.c:1066
ef317cd5 5247msgid "quote placeholders suitably for shells"
07432cef 5248msgstr "引用占位符适用于 shells"
ef317cd5 5249
6acbf033 5250#: builtin/for-each-ref.c:1068
ef317cd5 5251msgid "quote placeholders suitably for perl"
07432cef 5252msgstr "引用占位符适用于 perl"
ef317cd5 5253
6acbf033 5254#: builtin/for-each-ref.c:1070
ef317cd5 5255msgid "quote placeholders suitably for python"
07432cef 5256msgstr "引用占位符适用于 python"
ef317cd5 5257
6acbf033 5258#: builtin/for-each-ref.c:1072
ef317cd5 5259msgid "quote placeholders suitably for tcl"
07432cef 5260msgstr "引用占位符适用于 tcl"
ef317cd5 5261
6acbf033 5262#: builtin/for-each-ref.c:1075
ef317cd5 5263msgid "show only <n> matched refs"
07432cef 5264msgstr "只显示 <n> 个匹配的引用"
ef317cd5 5265
6acbf033 5266#: builtin/for-each-ref.c:1076 builtin/replace.c:435
ef317cd5 5267msgid "format"
07432cef 5268msgstr "格式"
ef317cd5 5269
6acbf033 5270#: builtin/for-each-ref.c:1076
ef317cd5 5271msgid "format to use for the output"
07432cef 5272msgstr "输出格式"
ef317cd5 5273
6acbf033 5274#: builtin/for-each-ref.c:1077
ef317cd5 5275msgid "key"
07432cef 5276msgstr "key"
ef317cd5 5277
6acbf033 5278#: builtin/for-each-ref.c:1078
ef317cd5 5279msgid "field name to sort on"
07432cef 5280msgstr "排序的字段名"
ef317cd5 5281
6c94aba5
JX
5282#: builtin/fsck.c:147 builtin/prune.c:172
5283msgid "Checking connectivity"
5284msgstr "检查连接中"
5285
6acbf033 5286#: builtin/fsck.c:538
6c94aba5
JX
5287msgid "Checking object directories"
5288msgstr "检查对象目录中"
5289
6acbf033 5290#: builtin/fsck.c:601
ef317cd5 5291msgid "git fsck [options] [<object>...]"
07432cef 5292msgstr "git fsck [选项] [<对象>...]"
ef317cd5 5293
6acbf033 5294#: builtin/fsck.c:607
ef317cd5 5295msgid "show unreachable objects"
07432cef 5296msgstr "显示不可达的对象"
ef317cd5 5297
6acbf033 5298#: builtin/fsck.c:608
ef317cd5 5299msgid "show dangling objects"
07432cef 5300msgstr "显示摇摆的对象"
ef317cd5 5301
6acbf033 5302#: builtin/fsck.c:609
ef317cd5 5303msgid "report tags"
07432cef 5304msgstr "报告 tags"
ef317cd5 5305
6acbf033 5306#: builtin/fsck.c:610
ef317cd5 5307msgid "report root nodes"
07432cef 5308msgstr "报告根节点"
ef317cd5 5309
6acbf033 5310#: builtin/fsck.c:611
ef317cd5 5311msgid "make index objects head nodes"
07432cef 5312msgstr "将索引亦作为检查的头节点"
ef317cd5 5313
6acbf033 5314#: builtin/fsck.c:612
ef317cd5 5315msgid "make reflogs head nodes (default)"
07432cef 5316msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 5317
6acbf033 5318#: builtin/fsck.c:613
ef317cd5 5319msgid "also consider packs and alternate objects"
07432cef 5320msgstr "也考虑包和备用对象"
ef317cd5 5321
6acbf033 5322#: builtin/fsck.c:614
ef317cd5 5323msgid "enable more strict checking"
07432cef 5324msgstr "启用更严格的检查"
ef317cd5 5325
6acbf033 5326#: builtin/fsck.c:616
ef317cd5 5327msgid "write dangling objects in .git/lost-found"
07432cef 5328msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 5329
6acbf033 5330#: builtin/fsck.c:617 builtin/prune.c:144
ef317cd5 5331msgid "show progress"
07432cef 5332msgstr "显示进度"
ef317cd5 5333
6acbf033 5334#: builtin/fsck.c:667
6c94aba5
JX
5335msgid "Checking objects"
5336msgstr "检查对象中"
5337
cfff71a9 5338#: builtin/gc.c:24
ef317cd5 5339msgid "git gc [options]"
07432cef 5340msgstr "git gc [选项]"
ef317cd5 5341
6acbf033 5342#: builtin/gc.c:91
c04f5ac3
JX
5343#, c-format
5344msgid "Invalid %s: '%s'"
5345msgstr "无效的 %s:'%s'"
5346
6acbf033 5347#: builtin/gc.c:118
c04f5ac3
JX
5348#, c-format
5349msgid "insanely long object directory %.*s"
5350msgstr "不正常的长对象目录 %.*s"
5351
6acbf033 5352#: builtin/gc.c:287
ef317cd5 5353msgid "prune unreferenced objects"
07432cef 5354msgstr "清除未引用的对象"
ef317cd5 5355
6acbf033 5356#: builtin/gc.c:289
ef317cd5 5357msgid "be more thorough (increased runtime)"
07432cef 5358msgstr "更彻底(增加运行时间)"
ef317cd5 5359
6acbf033 5360#: builtin/gc.c:290
ef317cd5 5361msgid "enable auto-gc mode"
07432cef 5362msgstr "启用自动垃圾回收模式"
ef317cd5 5363
6acbf033 5364#: builtin/gc.c:291
90314792
JX
5365msgid "force running gc even if there may be another gc running"
5366msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5367
6acbf033 5368#: builtin/gc.c:332
c04f5ac3 5369#, c-format
6c94aba5
JX
5370msgid "Auto packing the repository in background for optimum performance.\n"
5371msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5372
6acbf033 5373#: builtin/gc.c:334
6c94aba5
JX
5374#, c-format
5375msgid "Auto packing the repository for optimum performance.\n"
5376msgstr "自动打包版本库以求最佳性能。\n"
5377
6acbf033 5378#: builtin/gc.c:335
6c94aba5
JX
5379#, c-format
5380msgid "See \"git help gc\" for manual housekeeping.\n"
5381msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 5382
6acbf033 5383#: builtin/gc.c:353
90314792
JX
5384#, c-format
5385msgid ""
5386"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5387msgstr ""
5388"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5389
6acbf033 5390#: builtin/gc.c:375
c04f5ac3
JX
5391msgid ""
5392"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5393msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5394
90314792 5395#: builtin/grep.c:23
ef317cd5 5396msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 5397msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 5398
90314792 5399#: builtin/grep.c:218
c04f5ac3
JX
5400#, c-format
5401msgid "grep: failed to create thread: %s"
90e6ef53 5402msgstr "grep:无法创建线程:%s"
c04f5ac3 5403
6acbf033 5404#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
5405#, c-format
5406msgid "unable to read tree (%s)"
90e6ef53 5407msgstr "无法读取树(%s)"
c04f5ac3 5408
6acbf033 5409#: builtin/grep.c:491
c04f5ac3
JX
5410#, c-format
5411msgid "unable to grep from object of type %s"
5412msgstr "无法抓取来自于 %s 类型的对象"
5413
6acbf033 5414#: builtin/grep.c:547
c04f5ac3
JX
5415#, c-format
5416msgid "switch `%c' expects a numerical value"
5417msgstr "开关 `%c' 期望一个数字值"
5418
6acbf033 5419#: builtin/grep.c:564
c04f5ac3
JX
5420#, c-format
5421msgid "cannot open '%s'"
5422msgstr "不能打开 '%s'"
5423
6acbf033 5424#: builtin/grep.c:638
ef317cd5 5425msgid "search in index instead of in the work tree"
07432cef 5426msgstr "在索引区搜索而不是在工作区"
ef317cd5 5427
6acbf033 5428#: builtin/grep.c:640
ef317cd5 5429msgid "find in contents not managed by git"
07432cef 5430msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5431
5432# 译者:中文字符串拼接,可删除前导空格
6acbf033 5433#: builtin/grep.c:642
ef317cd5 5434msgid "search in both tracked and untracked files"
07432cef 5435msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5436
6acbf033 5437#: builtin/grep.c:644
ef317cd5 5438msgid "search also in ignored files"
07432cef 5439msgstr "也在忽略的文件中搜索"
ef317cd5 5440
6acbf033 5441#: builtin/grep.c:647
ef317cd5 5442msgid "show non-matching lines"
07432cef 5443msgstr "显示未匹配的行"
ef317cd5 5444
6acbf033 5445#: builtin/grep.c:649
ef317cd5 5446msgid "case insensitive matching"
07432cef 5447msgstr "不区分大小写匹配"
ef317cd5 5448
6acbf033 5449#: builtin/grep.c:651
ef317cd5 5450msgid "match patterns only at word boundaries"
07432cef 5451msgstr "只在单词边界匹配模式"
ef317cd5 5452
6acbf033 5453#: builtin/grep.c:653
ef317cd5 5454msgid "process binary files as text"
07432cef 5455msgstr "把二进制文件当做文本处理"
ef317cd5 5456
6acbf033 5457#: builtin/grep.c:655
ef317cd5 5458msgid "don't match patterns in binary files"
07432cef 5459msgstr "不在二进制文件中匹配模式"
ef317cd5 5460
6acbf033 5461#: builtin/grep.c:658
90314792
JX
5462msgid "process binary files with textconv filters"
5463msgstr "用 textconv 过滤器处理二进制文件"
5464
6acbf033 5465#: builtin/grep.c:660
ef317cd5 5466msgid "descend at most <depth> levels"
07432cef 5467msgstr "最多以指定的深度向下寻找"
ef317cd5 5468
6acbf033 5469#: builtin/grep.c:664
ef317cd5 5470msgid "use extended POSIX regular expressions"
07432cef 5471msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5472
6acbf033 5473#: builtin/grep.c:667
ef317cd5 5474msgid "use basic POSIX regular expressions (default)"
07432cef 5475msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5476
6acbf033 5477#: builtin/grep.c:670
ef317cd5 5478msgid "interpret patterns as fixed strings"
07432cef 5479msgstr "把模式解析为固定的字符串"
ef317cd5 5480
6acbf033 5481#: builtin/grep.c:673
ef317cd5 5482msgid "use Perl-compatible regular expressions"
07432cef 5483msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5484
6acbf033 5485#: builtin/grep.c:676
ef317cd5 5486msgid "show line numbers"
07432cef 5487msgstr "显示行号"
ef317cd5 5488
6acbf033 5489#: builtin/grep.c:677
ef317cd5 5490msgid "don't show filenames"
07432cef 5491msgstr "不显示文件名"
ef317cd5 5492
6acbf033 5493#: builtin/grep.c:678
ef317cd5 5494msgid "show filenames"
07432cef 5495msgstr "显示文件名"
ef317cd5 5496
6acbf033 5497#: builtin/grep.c:680
ef317cd5 5498msgid "show filenames relative to top directory"
07432cef 5499msgstr "显示相对于顶级目录的文件名"
ef317cd5 5500
6acbf033 5501#: builtin/grep.c:682
ef317cd5 5502msgid "show only filenames instead of matching lines"
07432cef 5503msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5504
6acbf033 5505#: builtin/grep.c:684
ef317cd5 5506msgid "synonym for --files-with-matches"
07432cef 5507msgstr "和 --files-with-matches 同义"
ef317cd5 5508
6acbf033 5509#: builtin/grep.c:687
ef317cd5 5510msgid "show only the names of files without match"
07432cef 5511msgstr "只显示未匹配的文件名"
ef317cd5 5512
6acbf033 5513#: builtin/grep.c:689
ef317cd5 5514msgid "print NUL after filenames"
07432cef 5515msgstr "在文件名后输出 NUL 字符"
ef317cd5 5516
6acbf033 5517#: builtin/grep.c:691
ef317cd5 5518msgid "show the number of matches instead of matching lines"
07432cef 5519msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5520
6acbf033 5521#: builtin/grep.c:692
ef317cd5 5522msgid "highlight matches"
07432cef 5523msgstr "高亮显示匹配项"
ef317cd5 5524
6acbf033 5525#: builtin/grep.c:694
ef317cd5 5526msgid "print empty line between matches from different files"
07432cef 5527msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5528
6acbf033 5529#: builtin/grep.c:696
ef317cd5 5530msgid "show filename only once above matches from same file"
07432cef 5531msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5532
6acbf033 5533#: builtin/grep.c:699
ef317cd5 5534msgid "show <n> context lines before and after matches"
07432cef 5535msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5536
6acbf033 5537#: builtin/grep.c:702
ef317cd5 5538msgid "show <n> context lines before matches"
07432cef 5539msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5540
6acbf033 5541#: builtin/grep.c:704
ef317cd5 5542msgid "show <n> context lines after matches"
07432cef 5543msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5544
6acbf033 5545#: builtin/grep.c:705
ef317cd5 5546msgid "shortcut for -C NUM"
07432cef 5547msgstr "快捷键 -C 数字"
ef317cd5 5548
6acbf033 5549#: builtin/grep.c:708
ef317cd5 5550msgid "show a line with the function name before matches"
07432cef 5551msgstr "在匹配的前面显示一行函数名"
ef317cd5 5552
6acbf033 5553#: builtin/grep.c:710
ef317cd5 5554msgid "show the surrounding function"
07432cef 5555msgstr "显示所在函数的前后内容"
ef317cd5 5556
6acbf033 5557#: builtin/grep.c:713
ef317cd5 5558msgid "read patterns from file"
07432cef 5559msgstr "从文件读取模式"
ef317cd5 5560
6acbf033 5561#: builtin/grep.c:715
ef317cd5 5562msgid "match <pattern>"
07432cef 5563msgstr "匹配 <模式>"
ef317cd5 5564
6acbf033 5565#: builtin/grep.c:717
ef317cd5 5566msgid "combine patterns specified with -e"
07432cef 5567msgstr "组合用 -e 参数设定的模式"
ef317cd5 5568
6acbf033 5569#: builtin/grep.c:729
ef317cd5 5570msgid "indicate hit with exit status without output"
07432cef 5571msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5572
6acbf033 5573#: builtin/grep.c:731
ef317cd5 5574msgid "show only matches from files that match all patterns"
07432cef 5575msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5576
6acbf033 5577#: builtin/grep.c:733
07432cef
WS
5578msgid "show parse tree for grep expression"
5579msgstr "显示 grep 表达式的解析树"
5580
6acbf033 5581#: builtin/grep.c:737
ef317cd5 5582msgid "pager"
07432cef 5583msgstr "分页"
ef317cd5 5584
6acbf033 5585#: builtin/grep.c:737
ef317cd5 5586msgid "show matching files in the pager"
07432cef 5587msgstr "分页显示匹配的文件"
ef317cd5 5588
6acbf033 5589#: builtin/grep.c:740
ef317cd5 5590msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5591msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5592
6acbf033 5593#: builtin/grep.c:741 builtin/show-ref.c:187
ef317cd5 5594msgid "show usage"
07432cef 5595msgstr "显示用法"
ef317cd5 5596
6acbf033 5597#: builtin/grep.c:808
c04f5ac3
JX
5598msgid "no pattern given."
5599msgstr "未提供模式匹配。"
5600
6acbf033 5601#: builtin/grep.c:866
c04f5ac3
JX
5602msgid "--open-files-in-pager only works on the worktree"
5603msgstr "--open-files-in-pager 仅用于工作区"
5604
6acbf033 5605#: builtin/grep.c:892
c04f5ac3 5606msgid "--cached or --untracked cannot be used with --no-index."
649900bc 5607msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 5608
6acbf033 5609#: builtin/grep.c:897
c04f5ac3 5610msgid "--no-index or --untracked cannot be used with revs."
649900bc 5611msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 5612
6acbf033 5613#: builtin/grep.c:900
c04f5ac3 5614msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 5615msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 5616
6acbf033 5617#: builtin/grep.c:908
c04f5ac3
JX
5618msgid "both --cached and trees are given."
5619msgstr "同时给出了 --cached 和树对象。"
5620
ef317cd5
JX
5621#: builtin/hash-object.c:60
5622msgid ""
5623"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5624"<file>..."
5625msgstr ""
07432cef
WS
5626"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5627"<文件>..."
ef317cd5
JX
5628
5629#: builtin/hash-object.c:61
5630msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 5631msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5 5632
6acbf033 5633#: builtin/hash-object.c:72 builtin/tag.c:609
ef317cd5 5634msgid "type"
07432cef 5635msgstr "类型"
ef317cd5
JX
5636
5637#: builtin/hash-object.c:72
ef317cd5 5638msgid "object type"
07432cef 5639msgstr "对象类型"
ef317cd5
JX
5640
5641#: builtin/hash-object.c:73
5642msgid "write the object into the object database"
07432cef 5643msgstr "将对象写入对象数据库"
ef317cd5
JX
5644
5645#: builtin/hash-object.c:74
5646msgid "read the object from stdin"
07432cef 5647msgstr "从标准输入读取对象"
ef317cd5
JX
5648
5649#: builtin/hash-object.c:76
5650msgid "store file as is without filters"
07432cef 5651msgstr "原样存储文件不使用过滤器"
ef317cd5
JX
5652
5653#: builtin/hash-object.c:77
5654msgid "process file as it were from this path"
07432cef 5655msgstr "处理文件并假设其来自于此路径"
ef317cd5 5656
2e8451e8 5657#: builtin/help.c:41
ef317cd5 5658msgid "print all available commands"
07432cef 5659msgstr "打印所有可用的命令"
ef317cd5 5660
2e8451e8 5661#: builtin/help.c:42
4dcdc3d8
JX
5662msgid "print list of useful guides"
5663msgstr "显示有用的指南列表"
5664
2e8451e8 5665#: builtin/help.c:43
ef317cd5 5666msgid "show man page"
07432cef 5667msgstr "显示 man 手册"
ef317cd5 5668
2e8451e8 5669#: builtin/help.c:44
ef317cd5 5670msgid "show manual in web browser"
07432cef 5671msgstr "在 web 浏览器中显示手册"
ef317cd5 5672
2e8451e8 5673#: builtin/help.c:46
ef317cd5 5674msgid "show info page"
07432cef 5675msgstr "显示 info 手册"
ef317cd5 5676
2e8451e8 5677#: builtin/help.c:52
4dcdc3d8
JX
5678msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5679msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
ef317cd5 5680
2e8451e8 5681#: builtin/help.c:64
81809b99 5682#, c-format
8ada9598 5683msgid "unrecognized help format '%s'"
81809b99 5684msgstr "未能识别的帮助格式 '%s'"
8ada9598 5685
2e8451e8 5686#: builtin/help.c:92
8ada9598 5687msgid "Failed to start emacsclient."
81809b99 5688msgstr "无法启动 emacsclient。"
8ada9598 5689
2e8451e8 5690#: builtin/help.c:105
8ada9598 5691msgid "Failed to parse emacsclient version."
81809b99 5692msgstr "无法解析 emacsclient 版本。"
8ada9598 5693
2e8451e8 5694#: builtin/help.c:113
8ada9598
JX
5695#, c-format
5696msgid "emacsclient version '%d' too old (< 22)."
07432cef 5697msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 5698
2e8451e8 5699#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
81809b99 5700#, c-format
8ada9598 5701msgid "failed to exec '%s': %s"
81809b99 5702msgstr "无法执行 '%s':%s"
8ada9598 5703
2e8451e8 5704#: builtin/help.c:216
8ada9598
JX
5705#, c-format
5706msgid ""
5707"'%s': path for unsupported man viewer.\n"
5708"Please consider using 'man.<tool>.cmd' instead."
5709msgstr ""
81809b99
JX
5710"'%s':不支持的 man 手册查看器的路径。\n"
5711"请使用 'man.<tool>.cmd'。"
8ada9598 5712
2e8451e8 5713#: builtin/help.c:228
8ada9598
JX
5714#, c-format
5715msgid ""
5716"'%s': cmd for supported man viewer.\n"
5717"Please consider using 'man.<tool>.path' instead."
5718msgstr ""
81809b99
JX
5719"'%s': 支持的 man 手册查看器命令。\n"
5720"请使用 'man.<tool>.path'。"
8ada9598 5721
cfff71a9 5722#: builtin/help.c:353
8ada9598
JX
5723#, c-format
5724msgid "'%s': unknown man viewer."
81809b99 5725msgstr "'%s':未知的 man 查看器。"
8ada9598 5726
cfff71a9 5727#: builtin/help.c:370
8ada9598 5728msgid "no man viewer handled the request"
81809b99 5729msgstr "没有 man 查看器处理此请求"
8ada9598 5730
cfff71a9 5731#: builtin/help.c:378
8ada9598 5732msgid "no info viewer handled the request"
81809b99 5733msgstr "没有 info 查看器处理此请求"
8ada9598 5734
cfff71a9 5735#: builtin/help.c:424
4dcdc3d8
JX
5736msgid "Defining attributes per path"
5737msgstr "定义路径的属性"
5738
cfff71a9 5739#: builtin/help.c:425
4dcdc3d8
JX
5740msgid "A Git glossary"
5741msgstr "Git 词汇表"
5742
cfff71a9 5743#: builtin/help.c:426
4dcdc3d8
JX
5744msgid "Specifies intentionally untracked files to ignore"
5745msgstr "忽略指定的未跟踪文件"
5746
cfff71a9 5747#: builtin/help.c:427
4dcdc3d8
JX
5748msgid "Defining submodule properties"
5749msgstr "定义子模组属性"
5750
cfff71a9 5751#: builtin/help.c:428
4dcdc3d8
JX
5752msgid "Specifying revisions and ranges for Git"
5753msgstr "指定 Git 的版本和版本范围"
5754
cfff71a9 5755#: builtin/help.c:429
4dcdc3d8
JX
5756msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5757msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5758
cfff71a9 5759#: builtin/help.c:430
4dcdc3d8
JX
5760msgid "An overview of recommended workflows with Git"
5761msgstr "Git 推荐的工作流概览"
5762
cfff71a9 5763#: builtin/help.c:442
4dcdc3d8
JX
5764msgid "The common Git guides are:\n"
5765msgstr "最常用的 Git 向导有:\n"
5766
cfff71a9 5767#: builtin/help.c:463 builtin/help.c:480
8ada9598
JX
5768#, c-format
5769msgid "usage: %s%s"
81809b99 5770msgstr "用法:%s%s"
8ada9598 5771
cfff71a9 5772#: builtin/help.c:496
8ada9598
JX
5773#, c-format
5774msgid "`git %s' is aliased to `%s'"
81809b99 5775msgstr "`git %s' 是 `%s' 的别名"
8ada9598 5776
6acbf033
JX
5777#: builtin/index-pack.c:145
5778#, c-format
5779msgid "unable to open %s"
5780msgstr "不能打开 %s"
5781
5782#: builtin/index-pack.c:191
8ada9598
JX
5783#, c-format
5784msgid "object type mismatch at %s"
81809b99 5785msgstr "%s 的对象类型不匹配"
8ada9598 5786
6acbf033
JX
5787#: builtin/index-pack.c:211
5788#, c-format
5789msgid "did not receive expected object %s"
5790msgstr "未能获取期望的对象 %s"
8ada9598 5791
6acbf033
JX
5792#: builtin/index-pack.c:214
5793#, c-format
5794msgid "object %s: expected type %s, found %s"
5795msgstr "对象 %s:期待类型 %s,却是 %s"
5796
5797#: builtin/index-pack.c:256
81809b99 5798#, c-format
8ada9598
JX
5799msgid "cannot fill %d byte"
5800msgid_plural "cannot fill %d bytes"
81809b99 5801msgstr[0] "无法填充 %d 字节"
5ae481e0 5802msgstr[1] "无法填充 %d 字节"
8ada9598 5803
6acbf033 5804#: builtin/index-pack.c:266
8ada9598 5805msgid "early EOF"
81809b99 5806msgstr "过早的文件结束符(EOF)"
8ada9598 5807
6acbf033 5808#: builtin/index-pack.c:267
8ada9598 5809msgid "read error on input"
81809b99 5810msgstr "输入上的读错误"
8ada9598 5811
6acbf033 5812#: builtin/index-pack.c:279
8ada9598 5813msgid "used more bytes than were available"
81809b99 5814msgstr "用掉了超过可用的字节"
8ada9598 5815
6acbf033 5816#: builtin/index-pack.c:286
8ada9598 5817msgid "pack too large for current definition of off_t"
81809b99 5818msgstr "包太大超过了当前 off_t 的定义"
8ada9598 5819
6acbf033 5820#: builtin/index-pack.c:302
81809b99 5821#, c-format
8ada9598 5822msgid "unable to create '%s'"
81809b99 5823msgstr "不能创建 '%s'"
8ada9598 5824
6acbf033 5825#: builtin/index-pack.c:307
81809b99 5826#, c-format
8ada9598 5827msgid "cannot open packfile '%s'"
81809b99 5828msgstr "无法打开包文件 '%s'"
8ada9598 5829
6acbf033 5830#: builtin/index-pack.c:321
8ada9598 5831msgid "pack signature mismatch"
81809b99 5832msgstr "包签名不匹配"
8ada9598 5833
6acbf033 5834#: builtin/index-pack.c:323
ef317cd5
JX
5835#, c-format
5836msgid "pack version %<PRIu32> unsupported"
07432cef 5837msgstr "不支持包版本 %<PRIu32>"
ef317cd5 5838
6acbf033 5839#: builtin/index-pack.c:341
8ada9598
JX
5840#, c-format
5841msgid "pack has bad object at offset %lu: %s"
81809b99 5842msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 5843
6acbf033 5844#: builtin/index-pack.c:462
8ada9598
JX
5845#, c-format
5846msgid "inflate returned %d"
81809b99 5847msgstr "解压缩返回 %d"
8ada9598 5848
6acbf033 5849#: builtin/index-pack.c:511
8ada9598 5850msgid "offset value overflow for delta base object"
81809b99 5851msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 5852
6acbf033 5853#: builtin/index-pack.c:519
8ada9598 5854msgid "delta base offset is out of bound"
81809b99 5855msgstr "delta 基准偏移越界"
8ada9598 5856
6acbf033 5857#: builtin/index-pack.c:527
81809b99 5858#, c-format
8ada9598 5859msgid "unknown object type %d"
81809b99 5860msgstr "未知对象类型 %d"
8ada9598 5861
6acbf033 5862#: builtin/index-pack.c:558
8ada9598 5863msgid "cannot pread pack file"
81809b99 5864msgstr "无法读取包文件"
8ada9598 5865
6acbf033 5866#: builtin/index-pack.c:560
8ada9598
JX
5867#, c-format
5868msgid "premature end of pack file, %lu byte missing"
5869msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 5870msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 5871msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 5872
6acbf033 5873#: builtin/index-pack.c:586
8ada9598 5874msgid "serious inflate inconsistency"
81809b99 5875msgstr "解压缩严重的不一致"
8ada9598 5876
6acbf033
JX
5877#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
5878#: builtin/index-pack.c:740 builtin/index-pack.c:749
8ada9598
JX
5879#, c-format
5880msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 5881msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 5882
6acbf033 5883#: builtin/index-pack.c:680 builtin/pack-objects.c:162
6c94aba5 5884#: builtin/pack-objects.c:254
6792b93b
JX
5885#, c-format
5886msgid "unable to read %s"
5887msgstr "不能读 %s"
5888
6acbf033 5889#: builtin/index-pack.c:746
6792b93b
JX
5890#, c-format
5891msgid "cannot read existing object %s"
5892msgstr "不能读取现存对象 %s"
5893
6acbf033 5894#: builtin/index-pack.c:760
81809b99 5895#, c-format
8ada9598 5896msgid "invalid blob object %s"
07432cef 5897msgstr "无效的数据(blob)对象 %s"
8ada9598 5898
6acbf033 5899#: builtin/index-pack.c:774
81809b99 5900#, c-format
8ada9598 5901msgid "invalid %s"
81809b99 5902msgstr "无效的 %s"
8ada9598 5903
6acbf033 5904#: builtin/index-pack.c:777
8ada9598 5905msgid "Error in object"
81809b99 5906msgstr "对象中出错"
8ada9598 5907
6acbf033 5908#: builtin/index-pack.c:779
8ada9598
JX
5909#, c-format
5910msgid "Not all child objects of %s are reachable"
81809b99 5911msgstr "%s 的所有子对象并非都可达"
8ada9598 5912
6acbf033 5913#: builtin/index-pack.c:851 builtin/index-pack.c:881
8ada9598 5914msgid "failed to apply delta"
81809b99 5915msgstr "无法应用 delta"
8ada9598 5916
6acbf033 5917#: builtin/index-pack.c:1022
8ada9598 5918msgid "Receiving objects"
81809b99 5919msgstr "接收对象中"
8ada9598 5920
6acbf033 5921#: builtin/index-pack.c:1022
8ada9598 5922msgid "Indexing objects"
81809b99 5923msgstr "索引对象中"
8ada9598 5924
6acbf033 5925#: builtin/index-pack.c:1048
8ada9598 5926msgid "pack is corrupted (SHA1 mismatch)"
81809b99 5927msgstr "包冲突(SHA1 不匹配)"
8ada9598 5928
6acbf033 5929#: builtin/index-pack.c:1053
8ada9598 5930msgid "cannot fstat packfile"
81809b99 5931msgstr "不能枚举包文件状态"
8ada9598 5932
6acbf033 5933#: builtin/index-pack.c:1056
8ada9598 5934msgid "pack has junk at the end"
81809b99 5935msgstr "包的结尾有垃圾数据"
8ada9598 5936
6acbf033 5937#: builtin/index-pack.c:1067
6792b93b
JX
5938msgid "confusion beyond insanity in parse_pack_objects()"
5939msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5940
6acbf033 5941#: builtin/index-pack.c:1090
8ada9598 5942msgid "Resolving deltas"
81809b99 5943msgstr "处理 delta 中"
8ada9598 5944
6acbf033 5945#: builtin/index-pack.c:1100
07432cef 5946#, c-format
ef317cd5 5947msgid "unable to create thread: %s"
07432cef 5948msgstr "不能创建线程:%s"
ef317cd5 5949
6acbf033 5950#: builtin/index-pack.c:1142
8ada9598 5951msgid "confusion beyond insanity"
81809b99 5952msgstr "不可理喻"
8ada9598 5953
6acbf033 5954#: builtin/index-pack.c:1150
ef317cd5
JX
5955#, c-format
5956msgid "completed with %d local objects"
07432cef 5957msgstr "完成 %d 个本地对象"
ef317cd5 5958
6acbf033 5959#: builtin/index-pack.c:1160
ef317cd5
JX
5960#, c-format
5961msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 5962msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 5963
6acbf033 5964#: builtin/index-pack.c:1164
8ada9598
JX
5965#, c-format
5966msgid "pack has %d unresolved delta"
5967msgid_plural "pack has %d unresolved deltas"
81809b99 5968msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 5969msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 5970
6acbf033 5971#: builtin/index-pack.c:1189
81809b99 5972#, c-format
8ada9598 5973msgid "unable to deflate appended object (%d)"
07432cef 5974msgstr "不能压缩附加对象(%d)"
8ada9598 5975
6acbf033 5976#: builtin/index-pack.c:1268
8ada9598
JX
5977#, c-format
5978msgid "local object %s is corrupt"
81809b99 5979msgstr "本地对象 %s 已损坏"
8ada9598 5980
6acbf033 5981#: builtin/index-pack.c:1292
8ada9598 5982msgid "error while closing pack file"
81809b99 5983msgstr "关闭包文件时出错"
8ada9598 5984
6acbf033 5985#: builtin/index-pack.c:1305
81809b99 5986#, c-format
8ada9598 5987msgid "cannot write keep file '%s'"
81809b99 5988msgstr "无法写保留文件 '%s'"
8ada9598 5989
6acbf033 5990#: builtin/index-pack.c:1313
81809b99 5991#, c-format
8ada9598 5992msgid "cannot close written keep file '%s'"
81809b99 5993msgstr "无法关闭保留文件 '%s'"
8ada9598 5994
6acbf033 5995#: builtin/index-pack.c:1326
8ada9598 5996msgid "cannot store pack file"
81809b99 5997msgstr "无法存储包文件"
8ada9598 5998
6acbf033 5999#: builtin/index-pack.c:1337
8ada9598 6000msgid "cannot store index file"
81809b99 6001msgstr "无法存储索引文件"
8ada9598 6002
6acbf033 6003#: builtin/index-pack.c:1370
07432cef 6004#, c-format
ef317cd5 6005msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6006msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6007
6acbf033 6008#: builtin/index-pack.c:1376
ef317cd5
JX
6009#, c-format
6010msgid "invalid number of threads specified (%d)"
07432cef 6011msgstr "指定的线程数无效(%d)"
ef317cd5 6012
6acbf033 6013#: builtin/index-pack.c:1380 builtin/index-pack.c:1559
ef317cd5
JX
6014#, c-format
6015msgid "no threads support, ignoring %s"
07432cef 6016msgstr "没有线程支持,忽略 %s"
ef317cd5 6017
6acbf033 6018#: builtin/index-pack.c:1438
81809b99 6019#, c-format
8ada9598 6020msgid "Cannot open existing pack file '%s'"
81809b99 6021msgstr "无法打开现存包文件 '%s'"
8ada9598 6022
6acbf033 6023#: builtin/index-pack.c:1440
81809b99 6024#, c-format
8ada9598 6025msgid "Cannot open existing pack idx file for '%s'"
81809b99 6026msgstr "无法为 %s 打开包索引文件"
8ada9598 6027
6acbf033 6028#: builtin/index-pack.c:1487
81809b99 6029#, c-format
8ada9598
JX
6030msgid "non delta: %d object"
6031msgid_plural "non delta: %d objects"
81809b99 6032msgstr[0] "非 delta:%d 个对象"
5ae481e0 6033msgstr[1] "非 delta:%d 个对象"
8ada9598 6034
6acbf033 6035#: builtin/index-pack.c:1494
8ada9598
JX
6036#, c-format
6037msgid "chain length = %d: %lu object"
6038msgid_plural "chain length = %d: %lu objects"
81809b99 6039msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6040msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6041
6acbf033 6042#: builtin/index-pack.c:1523
8ada9598 6043msgid "Cannot come back to cwd"
81809b99 6044msgstr "无法返回当前工作目录"
8ada9598 6045
6acbf033
JX
6046#: builtin/index-pack.c:1571 builtin/index-pack.c:1574
6047#: builtin/index-pack.c:1586 builtin/index-pack.c:1590
81809b99 6048#, c-format
8ada9598 6049msgid "bad %s"
81809b99 6050msgstr "错误选项 %s"
8ada9598 6051
6acbf033 6052#: builtin/index-pack.c:1604
8ada9598 6053msgid "--fix-thin cannot be used without --stdin"
649900bc 6054msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6055
6acbf033 6056#: builtin/index-pack.c:1608 builtin/index-pack.c:1617
8ada9598
JX
6057#, c-format
6058msgid "packfile name '%s' does not end with '.pack'"
81809b99 6059msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 6060
6acbf033 6061#: builtin/index-pack.c:1625
8ada9598 6062msgid "--verify with no packfile name given"
81809b99 6063msgstr "--verify 没有提供包名参数"
8ada9598 6064
c04f5ac3
JX
6065#: builtin/init-db.c:35
6066#, c-format
6067msgid "Could not make %s writable by group"
6068msgstr "不能设置 %s 为组可写"
6069
6070#: builtin/init-db.c:62
6071#, c-format
6072msgid "insanely long template name %s"
6073msgstr "太长的模版名 %s"
6074
6075#: builtin/init-db.c:67
6076#, c-format
6077msgid "cannot stat '%s'"
6078msgstr "不能枚举 '%s' 状态"
6079
6080#: builtin/init-db.c:73
6081#, c-format
6082msgid "cannot stat template '%s'"
6083msgstr "不能枚举模版 '%s' 状态"
6084
6085#: builtin/init-db.c:80
6086#, c-format
6087msgid "cannot opendir '%s'"
6088msgstr "不能打开目录 '%s'"
6089
6090#: builtin/init-db.c:97
6091#, c-format
6092msgid "cannot readlink '%s'"
6093msgstr "不能读取链接 '%s'"
6094
6095#: builtin/init-db.c:99
6096#, c-format
6097msgid "insanely long symlink %s"
6098msgstr "太长的符号链接 %s"
6099
6100#: builtin/init-db.c:102
6101#, c-format
6102msgid "cannot symlink '%s' '%s'"
90e6ef53 6103msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
6104
6105#: builtin/init-db.c:106
6106#, c-format
6107msgid "cannot copy '%s' to '%s'"
6108msgstr "不能拷贝 '%s' 至 '%s'"
6109
6110#: builtin/init-db.c:110
6111#, c-format
6112msgid "ignoring template %s"
6113msgstr "忽略模版 %s"
6114
6115#: builtin/init-db.c:133
6116#, c-format
6117msgid "insanely long template path %s"
6118msgstr "太长的模版路径 %s"
6119
6120#: builtin/init-db.c:141
6121#, c-format
6122msgid "templates not found %s"
6123msgstr "模版未找到 %s"
6124
6125#: builtin/init-db.c:154
6126#, c-format
6127msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6128msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
6129
6130#: builtin/init-db.c:192
6131#, c-format
6132msgid "insane git directory %s"
6133msgstr "不正常的 git 目录 %s"
6134
23ff3338 6135#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
6136#, c-format
6137msgid "%s already exists"
6138msgstr "%s 已经存在"
6139
23ff3338 6140#: builtin/init-db.c:355
c04f5ac3
JX
6141#, c-format
6142msgid "unable to handle file type %d"
6143msgstr "不能处理 %d 类型的文件"
6144
23ff3338 6145#: builtin/init-db.c:358
c04f5ac3
JX
6146#, c-format
6147msgid "unable to move %s to %s"
6148msgstr "不能移动 %s 至 %s"
6149
6c94aba5
JX
6150#. TRANSLATORS: The first '%s' is either "Reinitialized
6151#. existing" or "Initialized empty", the second " shared" or
6152#. "", and the last '%s%s' is the verbatim directory name.
6153#: builtin/init-db.c:418
c04f5ac3
JX
6154#, c-format
6155msgid "%s%s Git repository in %s%s\n"
6156msgstr "%s%s Git 版本库于 %s%s\n"
6157
6c94aba5 6158#: builtin/init-db.c:419
c04f5ac3
JX
6159msgid "Reinitialized existing"
6160msgstr "重新初始化现存的"
6161
6c94aba5 6162#: builtin/init-db.c:419
c04f5ac3
JX
6163msgid "Initialized empty"
6164msgstr "初始化空的"
6165
7e238ab7 6166# 译者:中文字符串拼接,可删除前导空格
6c94aba5 6167#: builtin/init-db.c:420
c04f5ac3 6168msgid " shared"
90e6ef53 6169msgstr "共享"
c04f5ac3 6170
6c94aba5 6171#: builtin/init-db.c:439
c04f5ac3
JX
6172msgid "cannot tell cwd"
6173msgstr "无法获知当前路径"
6174
6c94aba5 6175#: builtin/init-db.c:465
ef317cd5 6176msgid ""
a77c07d9
JX
6177"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6178"shared[=<permissions>]] [directory]"
ef317cd5 6179msgstr ""
07432cef
WS
6180"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6181"[目录]"
ef317cd5 6182
6c94aba5 6183#: builtin/init-db.c:488
ef317cd5 6184msgid "permissions"
07432cef 6185msgstr "权限"
ef317cd5 6186
6c94aba5 6187#: builtin/init-db.c:489
ef317cd5 6188msgid "specify that the git repository is to be shared amongst several users"
07432cef 6189msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5 6190
6acbf033 6191#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172
ef317cd5 6192msgid "be quiet"
07432cef 6193msgstr "保持安静"
ef317cd5 6194
6c94aba5 6195#: builtin/init-db.c:523 builtin/init-db.c:528
c04f5ac3
JX
6196#, c-format
6197msgid "cannot mkdir %s"
6198msgstr "不能创建目录 %s"
6199
6c94aba5 6200#: builtin/init-db.c:532
c04f5ac3
JX
6201#, c-format
6202msgid "cannot chdir to %s"
6203msgstr "不能切换目录到 %s"
6204
6c94aba5 6205#: builtin/init-db.c:554
c04f5ac3
JX
6206#, c-format
6207msgid ""
6208"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6209"dir=<directory>)"
6210msgstr ""
73a60cd2
JX
6211"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6212"dir=<directory>)"
c04f5ac3 6213
6c94aba5 6214#: builtin/init-db.c:578
c04f5ac3
JX
6215msgid "Cannot access current working directory"
6216msgstr "不能访问当前工作目录"
6217
6c94aba5 6218#: builtin/init-db.c:585
c04f5ac3
JX
6219#, c-format
6220msgid "Cannot access work tree '%s'"
6221msgstr "不能访问工作区 '%s'"
6222
2e8451e8 6223#: builtin/log.c:41
4dcdc3d8
JX
6224msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6225msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
ef317cd5 6226
2e8451e8 6227#: builtin/log.c:42
ef317cd5 6228msgid " or: git show [options] <object>..."
07432cef 6229msgstr " 或者:git show [选项] <对象>..."
ef317cd5 6230
6acbf033 6231#: builtin/log.c:127
ef317cd5 6232msgid "suppress diff output"
07432cef 6233msgstr "不显示差异输出"
ef317cd5 6234
6acbf033 6235#: builtin/log.c:128
ef317cd5 6236msgid "show source"
07432cef 6237msgstr "显示源"
ef317cd5 6238
6acbf033 6239#: builtin/log.c:129
07432cef
WS
6240msgid "Use mail map file"
6241msgstr "使用邮件映射文件"
6242
6acbf033 6243#: builtin/log.c:130
ef317cd5 6244msgid "decorate options"
07432cef 6245msgstr "修饰选项"
ef317cd5 6246
6acbf033 6247#: builtin/log.c:229
c04f5ac3
JX
6248#, c-format
6249msgid "Final output: %d %s\n"
6250msgstr "最终输出:%d %s\n"
6251
6acbf033 6252#: builtin/log.c:470 builtin/log.c:562
c04f5ac3
JX
6253#, c-format
6254msgid "Could not read object %s"
90e6ef53 6255msgstr "不能读取对象 %s"
c04f5ac3 6256
6acbf033 6257#: builtin/log.c:586
c04f5ac3
JX
6258#, c-format
6259msgid "Unknown type: %d"
6260msgstr "未知类型:%d"
6261
6acbf033 6262#: builtin/log.c:687
c04f5ac3
JX
6263msgid "format.headers without value"
6264msgstr "format.headers 没有值"
6265
90314792 6266#: builtin/log.c:771
c04f5ac3
JX
6267msgid "name of output directory is too long"
6268msgstr "输出目录名太长"
6269
90314792 6270#: builtin/log.c:787
c04f5ac3
JX
6271#, c-format
6272msgid "Cannot open patch file %s"
6273msgstr "无法打开补丁文件 %s"
6274
90314792 6275#: builtin/log.c:801
c04f5ac3
JX
6276msgid "Need exactly one range."
6277msgstr "只需要一个范围。"
6278
90314792 6279#: builtin/log.c:809
c04f5ac3
JX
6280msgid "Not a range."
6281msgstr "不是一个范围。"
6282
6acbf033 6283#: builtin/log.c:916
c04f5ac3
JX
6284msgid "Cover letter needs email format"
6285msgstr "信封需要邮件地址格式"
6286
6acbf033 6287#: builtin/log.c:995
c04f5ac3
JX
6288#, c-format
6289msgid "insane in-reply-to: %s"
6290msgstr "不正常的 in-reply-to:%s"
6291
6acbf033 6292#: builtin/log.c:1023
ef317cd5 6293msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 6294msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 6295
6acbf033 6296#: builtin/log.c:1068
c04f5ac3
JX
6297msgid "Two output directories?"
6298msgstr "两个输出目录?"
6299
6acbf033 6300#: builtin/log.c:1183
ef317cd5 6301msgid "use [PATCH n/m] even with a single patch"
07432cef 6302msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6303
6acbf033 6304#: builtin/log.c:1186
ef317cd5 6305msgid "use [PATCH] even with multiple patches"
07432cef 6306msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6307
6acbf033 6308#: builtin/log.c:1190
ef317cd5 6309msgid "print patches to standard out"
07432cef 6310msgstr "打印补丁到标准输出"
c04f5ac3 6311
6acbf033 6312#: builtin/log.c:1192
ef317cd5 6313msgid "generate a cover letter"
07432cef 6314msgstr "生成一封附信"
c04f5ac3 6315
6acbf033 6316#: builtin/log.c:1194
ef317cd5 6317msgid "use simple number sequence for output file names"
07432cef 6318msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6319
6acbf033 6320#: builtin/log.c:1195
ef317cd5 6321msgid "sfx"
07432cef 6322msgstr "后缀"
ef317cd5 6323
6acbf033 6324#: builtin/log.c:1196
ef317cd5 6325msgid "use <sfx> instead of '.patch'"
07432cef 6326msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6327
6acbf033 6328#: builtin/log.c:1198
ef317cd5 6329msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6330msgstr "补丁以 <n> 开始编号,而不是1"
6331
6acbf033 6332#: builtin/log.c:1200
07432cef
WS
6333msgid "mark the series as Nth re-roll"
6334msgstr "标记补丁系列是第几次重制"
ef317cd5 6335
6acbf033 6336#: builtin/log.c:1202
ef317cd5 6337msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6338msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6339
6acbf033 6340#: builtin/log.c:1205
ef317cd5 6341msgid "store resulting files in <dir>"
07432cef 6342msgstr "把结果文件存储在 <dir>"
ef317cd5 6343
6acbf033 6344#: builtin/log.c:1208
ef317cd5 6345msgid "don't strip/add [PATCH]"
07432cef 6346msgstr "不删除/添加 [PATCH]"
ef317cd5 6347
6acbf033 6348#: builtin/log.c:1211
ef317cd5 6349msgid "don't output binary diffs"
07432cef 6350msgstr "不输出二进制差异"
ef317cd5 6351
6acbf033 6352#: builtin/log.c:1213
ef317cd5 6353msgid "don't include a patch matching a commit upstream"
07432cef 6354msgstr "不包含已在上游提交中的补丁"
ef317cd5 6355
6acbf033 6356#: builtin/log.c:1215
ef317cd5 6357msgid "show patch format instead of default (patch + stat)"
07432cef 6358msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6359
6acbf033 6360#: builtin/log.c:1217
ef317cd5 6361msgid "Messaging"
07432cef 6362msgstr "邮件发送"
ef317cd5 6363
6acbf033 6364#: builtin/log.c:1218
ef317cd5 6365msgid "header"
07432cef 6366msgstr "header"
ef317cd5 6367
6acbf033 6368#: builtin/log.c:1219
ef317cd5 6369msgid "add email header"
07432cef 6370msgstr "添加邮件头"
ef317cd5 6371
6acbf033 6372#: builtin/log.c:1220 builtin/log.c:1222
ef317cd5 6373msgid "email"
07432cef 6374msgstr "邮件地址"
ef317cd5 6375
6acbf033 6376#: builtin/log.c:1220
ef317cd5 6377msgid "add To: header"
07432cef 6378msgstr "添加收件人"
ef317cd5 6379
6acbf033 6380#: builtin/log.c:1222
ef317cd5 6381msgid "add Cc: header"
07432cef 6382msgstr "添加抄送"
ef317cd5 6383
6acbf033 6384#: builtin/log.c:1224
2e8451e8
JX
6385msgid "ident"
6386msgstr "ident"
6387
6acbf033 6388#: builtin/log.c:1225
2e8451e8
JX
6389msgid "set From address to <ident> (or committer ident if absent)"
6390msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6391
6acbf033 6392#: builtin/log.c:1227
ef317cd5 6393msgid "message-id"
07432cef 6394msgstr "message-id"
ef317cd5 6395
6acbf033 6396#: builtin/log.c:1228
ef317cd5 6397msgid "make first mail a reply to <message-id>"
07432cef 6398msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 6399
6acbf033 6400#: builtin/log.c:1229 builtin/log.c:1232
ef317cd5 6401msgid "boundary"
07432cef 6402msgstr "边界"
ef317cd5 6403
6acbf033 6404#: builtin/log.c:1230
ef317cd5 6405msgid "attach the patch"
07432cef 6406msgstr "附件方式添加补丁"
ef317cd5 6407
6acbf033 6408#: builtin/log.c:1233
ef317cd5 6409msgid "inline the patch"
07432cef 6410msgstr "内联显示补丁"
ef317cd5 6411
6acbf033 6412#: builtin/log.c:1237
ef317cd5 6413msgid "enable message threading, styles: shallow, deep"
07432cef 6414msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6415
6acbf033 6416#: builtin/log.c:1239
ef317cd5 6417msgid "signature"
07432cef 6418msgstr "签名"
ef317cd5 6419
6acbf033 6420#: builtin/log.c:1240
ef317cd5 6421msgid "add a signature"
07432cef 6422msgstr "添加一个签名"
ef317cd5 6423
6acbf033
JX
6424#: builtin/log.c:1242
6425msgid "add a signature from a file"
6426msgstr "从文件添加一个签名"
6427
6428#: builtin/log.c:1243
ef317cd5 6429msgid "don't print the patch filenames"
07432cef 6430msgstr "不要打印补丁文件名"
ef317cd5 6431
6acbf033 6432#: builtin/log.c:1317
2e8451e8
JX
6433#, c-format
6434msgid "invalid ident line: %s"
6435msgstr "包含无效的身份标识:%s"
6436
6acbf033 6437#: builtin/log.c:1332
c04f5ac3
JX
6438msgid "-n and -k are mutually exclusive."
6439msgstr "-n 和 -k 互斥。"
6440
6acbf033 6441#: builtin/log.c:1334
c04f5ac3
JX
6442msgid "--subject-prefix and -k are mutually exclusive."
6443msgstr "--subject-prefix 和 -k 互斥。"
6444
6acbf033 6445#: builtin/log.c:1342
c04f5ac3
JX
6446msgid "--name-only does not make sense"
6447msgstr "--name-only 无意义"
6448
6acbf033 6449#: builtin/log.c:1344
c04f5ac3
JX
6450msgid "--name-status does not make sense"
6451msgstr "--name-status 无意义"
6452
6acbf033 6453#: builtin/log.c:1346
c04f5ac3
JX
6454msgid "--check does not make sense"
6455msgstr "--check 无意义"
6456
6acbf033 6457#: builtin/log.c:1369
c04f5ac3
JX
6458msgid "standard output, or directory, which one?"
6459msgstr "标准输出或目录,哪一个?"
6460
6acbf033 6461#: builtin/log.c:1371
c04f5ac3
JX
6462#, c-format
6463msgid "Could not create directory '%s'"
90e6ef53 6464msgstr "不能创建目录 '%s'"
c04f5ac3 6465
6acbf033
JX
6466#: builtin/log.c:1468
6467#, c-format
6468msgid "unable to read signature file '%s'"
6469msgstr "无法读取签名文件 '%s'"
6470
6471#: builtin/log.c:1531
c04f5ac3
JX
6472msgid "Failed to create output files"
6473msgstr "无法创建输出文件"
6474
6acbf033 6475#: builtin/log.c:1579
ef317cd5 6476msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6477msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6478
6acbf033 6479#: builtin/log.c:1634
c04f5ac3
JX
6480#, c-format
6481msgid ""
6482"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 6483msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 6484
6acbf033 6485#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661
c04f5ac3
JX
6486#, c-format
6487msgid "Unknown commit %s"
6488msgstr "未知提交 %s"
6489
6c94aba5 6490#: builtin/ls-files.c:401
ef317cd5 6491msgid "git ls-files [options] [<file>...]"
07432cef 6492msgstr "git ls-files [选项] [<文件>...]"
ef317cd5 6493
6c94aba5 6494#: builtin/ls-files.c:458
ef317cd5 6495msgid "identify the file status with tags"
07432cef 6496msgstr "用标签标识文件的状态"
ef317cd5 6497
6c94aba5 6498#: builtin/ls-files.c:460
ef317cd5 6499msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6500msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6501
6c94aba5 6502#: builtin/ls-files.c:462
ef317cd5 6503msgid "show cached files in the output (default)"
07432cef 6504msgstr "显示缓存的文件(默认)"
ef317cd5 6505
6c94aba5 6506#: builtin/ls-files.c:464
ef317cd5 6507msgid "show deleted files in the output"
07432cef 6508msgstr "显示已删除的文件"
ef317cd5 6509
6c94aba5 6510#: builtin/ls-files.c:466
ef317cd5 6511msgid "show modified files in the output"
07432cef 6512msgstr "显示已修改的文件"
ef317cd5 6513
6c94aba5 6514#: builtin/ls-files.c:468
ef317cd5 6515msgid "show other files in the output"
07432cef 6516msgstr "显示其它文件"
ef317cd5 6517
6c94aba5 6518#: builtin/ls-files.c:470
ef317cd5 6519msgid "show ignored files in the output"
07432cef 6520msgstr "显示忽略的文件"
ef317cd5 6521
6c94aba5 6522#: builtin/ls-files.c:473
ef317cd5 6523msgid "show staged contents' object name in the output"
07432cef 6524msgstr "显示暂存区内容的对象名称"
ef317cd5 6525
6c94aba5 6526#: builtin/ls-files.c:475
ef317cd5 6527msgid "show files on the filesystem that need to be removed"
07432cef 6528msgstr "显示文件系统需要删除的文件"
ef317cd5 6529
6c94aba5 6530#: builtin/ls-files.c:477
ef317cd5 6531msgid "show 'other' directories' name only"
07432cef 6532msgstr "只显示“其他”目录的名称"
ef317cd5 6533
6c94aba5 6534#: builtin/ls-files.c:480
ef317cd5 6535msgid "don't show empty directories"
07432cef 6536msgstr "不显示空目录"
ef317cd5 6537
6c94aba5 6538#: builtin/ls-files.c:483
ef317cd5 6539msgid "show unmerged files in the output"
07432cef 6540msgstr "显示未合并的文件"
ef317cd5 6541
6c94aba5 6542#: builtin/ls-files.c:485
ef317cd5 6543msgid "show resolve-undo information"
07432cef 6544msgstr "显示 resolve-undo 信息"
ef317cd5 6545
6c94aba5 6546#: builtin/ls-files.c:487
ef317cd5 6547msgid "skip files matching pattern"
07432cef 6548msgstr "匹配排除文件的模式"
ef317cd5 6549
6c94aba5 6550#: builtin/ls-files.c:490
ef317cd5 6551msgid "exclude patterns are read from <file>"
07432cef 6552msgstr "从 <文件> 中读取排除模式"
ef317cd5 6553
6c94aba5 6554#: builtin/ls-files.c:493
ef317cd5 6555msgid "read additional per-directory exclude patterns in <file>"
07432cef 6556msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6557
6c94aba5 6558#: builtin/ls-files.c:495
ef317cd5 6559msgid "add the standard git exclusions"
07432cef 6560msgstr "添加标准的 git 排除"
ef317cd5 6561
6c94aba5 6562#: builtin/ls-files.c:498
ef317cd5 6563msgid "make the output relative to the project top directory"
07432cef 6564msgstr "显示相对于顶级目录的文件名"
ef317cd5 6565
6c94aba5 6566#: builtin/ls-files.c:501
ef317cd5 6567msgid "if any <file> is not in the index, treat this as an error"
07432cef 6568msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 6569
6c94aba5 6570#: builtin/ls-files.c:502
ef317cd5 6571msgid "tree-ish"
07432cef 6572msgstr "树或提交"
ef317cd5 6573
6c94aba5 6574#: builtin/ls-files.c:503
ef317cd5 6575msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 6576msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 6577
6c94aba5 6578#: builtin/ls-files.c:505
ef317cd5 6579msgid "show debugging data"
07432cef 6580msgstr "显示调试数据"
ef317cd5 6581
90314792 6582#: builtin/ls-tree.c:28
ef317cd5 6583msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 6584msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 6585
90314792 6586#: builtin/ls-tree.c:126
ef317cd5 6587msgid "only show trees"
07432cef 6588msgstr "只显示树"
ef317cd5 6589
90314792 6590#: builtin/ls-tree.c:128
ef317cd5 6591msgid "recurse into subtrees"
07432cef 6592msgstr "递归到子树"
ef317cd5 6593
90314792 6594#: builtin/ls-tree.c:130
ef317cd5 6595msgid "show trees when recursing"
07432cef 6596msgstr "当递归时显示树"
ef317cd5 6597
90314792 6598#: builtin/ls-tree.c:133
ef317cd5 6599msgid "terminate entries with NUL byte"
07432cef 6600msgstr "条目以NUL字符终止"
ef317cd5 6601
90314792 6602#: builtin/ls-tree.c:134
ef317cd5 6603msgid "include object size"
07432cef 6604msgstr "包括对象大小"
ef317cd5 6605
90314792 6606#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
ef317cd5 6607msgid "list only filenames"
07432cef 6608msgstr "只列出文件名"
ef317cd5 6609
90314792 6610#: builtin/ls-tree.c:141
ef317cd5 6611msgid "use full path names"
07432cef 6612msgstr "使用文件的全路径"
ef317cd5 6613
90314792 6614#: builtin/ls-tree.c:143
ef317cd5 6615msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 6616msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5
JX
6617
6618#: builtin/merge.c:43
ef317cd5 6619msgid "git merge [options] [<commit>...]"
07432cef 6620msgstr "git merge [选项] [<提交>...]"
ef317cd5
JX
6621
6622#: builtin/merge.c:44
6623msgid "git merge [options] <msg> HEAD <commit>"
07432cef 6624msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5
JX
6625
6626#: builtin/merge.c:45
6627msgid "git merge --abort"
07432cef 6628msgstr "git merge --abort"
ef317cd5 6629
2e8451e8 6630#: builtin/merge.c:98
c04f5ac3
JX
6631msgid "switch `m' requires a value"
6632msgstr "开关 `m' 需要一个值"
6633
2e8451e8 6634#: builtin/merge.c:135
c04f5ac3
JX
6635#, c-format
6636msgid "Could not find merge strategy '%s'.\n"
90e6ef53 6637msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 6638
2e8451e8 6639#: builtin/merge.c:136
c04f5ac3
JX
6640#, c-format
6641msgid "Available strategies are:"
6642msgstr "可用的策略有:"
6643
2e8451e8 6644#: builtin/merge.c:141
c04f5ac3
JX
6645#, c-format
6646msgid "Available custom strategies are:"
6647msgstr "可用的自定义策略有:"
6648
cfff71a9 6649#: builtin/merge.c:191
ef317cd5 6650msgid "do not show a diffstat at the end of the merge"
07432cef 6651msgstr "在合并的最后不显示差异统计"
ef317cd5 6652
cfff71a9 6653#: builtin/merge.c:194
ef317cd5 6654msgid "show a diffstat at the end of the merge"
07432cef 6655msgstr "在合并的最后显示差异统计"
ef317cd5 6656
cfff71a9 6657#: builtin/merge.c:195
ef317cd5 6658msgid "(synonym to --stat)"
07432cef 6659msgstr "(和 --stat 同义)"
ef317cd5 6660
cfff71a9 6661#: builtin/merge.c:197
ef317cd5 6662msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 6663msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 6664
cfff71a9 6665#: builtin/merge.c:200
ef317cd5 6666msgid "create a single commit instead of doing a merge"
07432cef 6667msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 6668
cfff71a9 6669#: builtin/merge.c:202
ef317cd5 6670msgid "perform a commit if the merge succeeds (default)"
07432cef 6671msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 6672
cfff71a9 6673#: builtin/merge.c:204
ef317cd5 6674msgid "edit message before committing"
07432cef 6675msgstr "在提交前编辑提交说明"
ef317cd5 6676
cfff71a9 6677#: builtin/merge.c:205
ef317cd5 6678msgid "allow fast-forward (default)"
07432cef 6679msgstr "允许快进(默认)"
ef317cd5 6680
cfff71a9 6681#: builtin/merge.c:207
ef317cd5 6682msgid "abort if fast-forward is not possible"
07432cef 6683msgstr "如果不能快进就放弃合并"
ef317cd5 6684
cfff71a9 6685#: builtin/merge.c:211
1003b3a5
JX
6686msgid "Verify that the named commit has a valid GPG signature"
6687msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6688
6c94aba5 6689#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
ef317cd5 6690msgid "strategy"
07432cef 6691msgstr "策略"
ef317cd5 6692
cfff71a9 6693#: builtin/merge.c:213
ef317cd5 6694msgid "merge strategy to use"
07432cef 6695msgstr "要使用的合并策略"
ef317cd5 6696
cfff71a9 6697#: builtin/merge.c:214
ef317cd5 6698msgid "option=value"
07432cef 6699msgstr "option=value"
ef317cd5 6700
cfff71a9 6701#: builtin/merge.c:215
ef317cd5 6702msgid "option for selected merge strategy"
07432cef 6703msgstr "所选的合并策略的选项"
ef317cd5 6704
cfff71a9 6705#: builtin/merge.c:217
ef317cd5 6706msgid "merge commit message (for a non-fast-forward merge)"
07432cef 6707msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 6708
cfff71a9 6709#: builtin/merge.c:221
ef317cd5 6710msgid "abort the current in-progress merge"
07432cef 6711msgstr "放弃当前正在进行的合并"
ef317cd5 6712
cfff71a9 6713#: builtin/merge.c:250
c04f5ac3
JX
6714msgid "could not run stash."
6715msgstr "不能进行进度保存。"
6716
cfff71a9 6717#: builtin/merge.c:255
c04f5ac3
JX
6718msgid "stash failed"
6719msgstr "进度保存失败"
6720
cfff71a9 6721#: builtin/merge.c:260
c04f5ac3
JX
6722#, c-format
6723msgid "not a valid object: %s"
6724msgstr "不是一个有效对象:%s"
6725
cfff71a9 6726#: builtin/merge.c:279 builtin/merge.c:296
c04f5ac3
JX
6727msgid "read-tree failed"
6728msgstr "读取树失败"
6729
90e6ef53 6730# 译者:注意保持前导空格
cfff71a9 6731#: builtin/merge.c:326
c04f5ac3
JX
6732msgid " (nothing to squash)"
6733msgstr " (无可压缩)"
6734
cfff71a9 6735#: builtin/merge.c:339
c04f5ac3
JX
6736#, c-format
6737msgid "Squash commit -- not updating HEAD\n"
6738msgstr "压缩提交 -- 未更新 HEAD\n"
6739
cfff71a9 6740#: builtin/merge.c:371
c04f5ac3
JX
6741msgid "Writing SQUASH_MSG"
6742msgstr "写入 SQUASH_MSG"
6743
cfff71a9 6744#: builtin/merge.c:373
c04f5ac3
JX
6745msgid "Finishing SQUASH_MSG"
6746msgstr "完成 SQUASH_MSG"
6747
cfff71a9 6748#: builtin/merge.c:396
c04f5ac3
JX
6749#, c-format
6750msgid "No merge message -- not updating HEAD\n"
6751msgstr "无合并信息 -- 未更新 HEAD\n"
6752
cfff71a9 6753#: builtin/merge.c:446
c04f5ac3
JX
6754#, c-format
6755msgid "'%s' does not point to a commit"
6756msgstr "'%s' 没有指向一个提交"
6757
cfff71a9 6758#: builtin/merge.c:558
c04f5ac3
JX
6759#, c-format
6760msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 6761msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 6762
6c94aba5 6763#: builtin/merge.c:653
c04f5ac3
JX
6764msgid "git write-tree failed to write a tree"
6765msgstr "git write-tree 无法写入一树对象"
6766
6acbf033 6767#: builtin/merge.c:678
c04f5ac3
JX
6768msgid "Not handling anything other than two heads merge."
6769msgstr "不能处理两个头合并之外的任何操作。"
6770
6acbf033 6771#: builtin/merge.c:692
c04f5ac3
JX
6772#, c-format
6773msgid "Unknown option for merge-recursive: -X%s"
6774msgstr "merge-recursive 的未知选项:-X%s"
6775
6acbf033 6776#: builtin/merge.c:705
c04f5ac3
JX
6777#, c-format
6778msgid "unable to write %s"
6779msgstr "不能写 %s"
6780
6acbf033 6781#: builtin/merge.c:794
c04f5ac3
JX
6782#, c-format
6783msgid "Could not read from '%s'"
6784msgstr "不能从 '%s' 读取"
6785
6acbf033 6786#: builtin/merge.c:803
c04f5ac3
JX
6787#, c-format
6788msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6789msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6790
6acbf033 6791#: builtin/merge.c:809
a77c07d9 6792#, c-format
c04f5ac3
JX
6793msgid ""
6794"Please enter a commit message to explain why this merge is necessary,\n"
6795"especially if it merges an updated upstream into a topic branch.\n"
6796"\n"
a77c07d9 6797"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
6798"the commit.\n"
6799msgstr ""
6800"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6801"合并到主题分支。\n"
6802"\n"
a77c07d9 6803"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 6804
6acbf033 6805#: builtin/merge.c:833
c04f5ac3
JX
6806msgid "Empty commit message."
6807msgstr "空提交信息。"
6808
6acbf033 6809#: builtin/merge.c:845
c04f5ac3
JX
6810#, c-format
6811msgid "Wonderful.\n"
6812msgstr "太棒了。\n"
6813
6acbf033 6814#: builtin/merge.c:908
c04f5ac3
JX
6815#, c-format
6816msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6817msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6818
6acbf033 6819#: builtin/merge.c:924
c04f5ac3
JX
6820#, c-format
6821msgid "'%s' is not a commit"
6822msgstr "'%s' 不是一个提交"
6823
6acbf033 6824#: builtin/merge.c:965
c04f5ac3 6825msgid "No current branch."
90e6ef53 6826msgstr "没有当前分支。"
c04f5ac3 6827
6acbf033 6828#: builtin/merge.c:967
c04f5ac3 6829msgid "No remote for the current branch."
90e6ef53 6830msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 6831
6acbf033 6832#: builtin/merge.c:969
c04f5ac3 6833msgid "No default upstream defined for the current branch."
90e6ef53 6834msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 6835
6acbf033 6836#: builtin/merge.c:974
170e9899 6837#, c-format
2e8451e8
JX
6838msgid "No remote-tracking branch for %s from %s"
6839msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 6840
6acbf033 6841#: builtin/merge.c:1130
c04f5ac3 6842msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 6843msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 6844
6acbf033 6845#: builtin/merge.c:1146 git-pull.sh:31
c04f5ac3
JX
6846msgid ""
6847"You have not concluded your merge (MERGE_HEAD exists).\n"
6848"Please, commit your changes before you can merge."
6849msgstr ""
6850"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 6851"请在合并前先提交您的修改。"
c04f5ac3 6852
6acbf033 6853#: builtin/merge.c:1149 git-pull.sh:34
c04f5ac3
JX
6854msgid "You have not concluded your merge (MERGE_HEAD exists)."
6855msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6856
6acbf033 6857#: builtin/merge.c:1153
c04f5ac3
JX
6858msgid ""
6859"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6860"Please, commit your changes before you can merge."
6861msgstr ""
6862"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 6863"请在合并前先提交您的修改。"
c04f5ac3 6864
6acbf033 6865#: builtin/merge.c:1156
c04f5ac3
JX
6866msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6867msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6868
6acbf033 6869#: builtin/merge.c:1165
c04f5ac3 6870msgid "You cannot combine --squash with --no-ff."
649900bc 6871msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 6872
6acbf033 6873#: builtin/merge.c:1174
c04f5ac3 6874msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 6875msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 6876
6acbf033 6877#: builtin/merge.c:1206
c04f5ac3 6878msgid "Can merge only exactly one commit into empty head"
90e6ef53 6879msgstr "只能将一个提交合并到空分支上"
c04f5ac3 6880
6acbf033 6881#: builtin/merge.c:1209
c04f5ac3
JX
6882msgid "Squash commit into empty head not supported yet"
6883msgstr "尚不支持到空分支的压缩提交"
6884
6acbf033 6885#: builtin/merge.c:1211
c04f5ac3
JX
6886msgid "Non-fast-forward commit does not make sense into an empty head"
6887msgstr "到空分支的非快进式提交没有意义"
6888
6acbf033 6889#: builtin/merge.c:1216
2e8451e8
JX
6890#, c-format
6891msgid "%s - not something we can merge"
6892msgstr "%s - 不能被合并"
6893
6acbf033 6894#: builtin/merge.c:1267
1003b3a5
JX
6895#, c-format
6896msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6897msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6898
6acbf033 6899#: builtin/merge.c:1270
1003b3a5
JX
6900#, c-format
6901msgid "Commit %s has a bad GPG signature allegedly by %s."
6902msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6903
6acbf033 6904#: builtin/merge.c:1273
1003b3a5
JX
6905#, c-format
6906msgid "Commit %s does not have a GPG signature."
6907msgstr "提交 %s 没有一个 GPG 签名。"
6908
6acbf033 6909#: builtin/merge.c:1276
1003b3a5
JX
6910#, c-format
6911msgid "Commit %s has a good GPG signature by %s\n"
6912msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6913
6acbf033 6914#: builtin/merge.c:1357
c04f5ac3
JX
6915#, c-format
6916msgid "Updating %s..%s\n"
6917msgstr "更新 %s..%s\n"
6918
6acbf033 6919#: builtin/merge.c:1396
c04f5ac3
JX
6920#, c-format
6921msgid "Trying really trivial in-index merge...\n"
90e6ef53 6922msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 6923
6acbf033 6924#: builtin/merge.c:1403
c04f5ac3
JX
6925#, c-format
6926msgid "Nope.\n"
6927msgstr "无。\n"
6928
6acbf033 6929#: builtin/merge.c:1435
c04f5ac3 6930msgid "Not possible to fast-forward, aborting."
1aabac65 6931msgstr "无法快进,终止。"
c04f5ac3 6932
6acbf033 6933#: builtin/merge.c:1458 builtin/merge.c:1537
c04f5ac3
JX
6934#, c-format
6935msgid "Rewinding the tree to pristine...\n"
6936msgstr "将树回滚至原始状态...\n"
6937
6acbf033 6938#: builtin/merge.c:1462
c04f5ac3
JX
6939#, c-format
6940msgid "Trying merge strategy %s...\n"
6941msgstr "尝试合并策略 %s...\n"
6942
6acbf033 6943#: builtin/merge.c:1528
c04f5ac3
JX
6944#, c-format
6945msgid "No merge strategy handled the merge.\n"
6946msgstr "没有合并策略处理此合并。\n"
6947
6acbf033 6948#: builtin/merge.c:1530
c04f5ac3
JX
6949#, c-format
6950msgid "Merge with strategy %s failed.\n"
6951msgstr "使用策略 %s 合并失败。\n"
6952
6acbf033 6953#: builtin/merge.c:1539
c04f5ac3
JX
6954#, c-format
6955msgid "Using the %s to prepare resolving by hand.\n"
6956msgstr "使用 %s 以准备手工解决。\n"
6957
6acbf033 6958#: builtin/merge.c:1551
c04f5ac3
JX
6959#, c-format
6960msgid "Automatic merge went well; stopped before committing as requested\n"
6961msgstr "自动合并进展顺利,按要求在提交前停止\n"
6962
cfff71a9 6963#: builtin/merge-base.c:29
ef317cd5 6964msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 6965msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5 6966
cfff71a9 6967#: builtin/merge-base.c:30
ef317cd5 6968msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 6969msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5 6970
cfff71a9 6971#: builtin/merge-base.c:31
ef317cd5 6972msgid "git merge-base --independent <commit>..."
07432cef 6973msgstr "git merge-base --independent <提交>..."
ef317cd5 6974
cfff71a9 6975#: builtin/merge-base.c:32
ef317cd5 6976msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 6977msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 6978
cfff71a9
JX
6979#: builtin/merge-base.c:33
6980msgid "git merge-base --fork-point <ref> [<commit>]"
6981msgstr "git merge-base --fork-point <提交> [<提交>]"
6982
6983#: builtin/merge-base.c:214
ef317cd5 6984msgid "output all common ancestors"
07432cef 6985msgstr "输出所有共同的祖先"
ef317cd5 6986
cfff71a9 6987#: builtin/merge-base.c:216
ef317cd5 6988msgid "find ancestors for a single n-way merge"
07432cef 6989msgstr "查找一个多路合并的祖先提交"
ef317cd5 6990
cfff71a9 6991#: builtin/merge-base.c:218
ef317cd5 6992msgid "list revs not reachable from others"
07432cef 6993msgstr "显示不能被其他访问到的版本"
ef317cd5 6994
cfff71a9 6995#: builtin/merge-base.c:220
ef317cd5 6996msgid "is the first one ancestor of the other?"
07432cef 6997msgstr "第一个是其他的祖先提交么?"
ef317cd5 6998
cfff71a9
JX
6999#: builtin/merge-base.c:222
7000msgid "find where <commit> forked from reflog of <ref>"
7001msgstr "查找 <commit> 从<引用>日志的何处分支的"
7002
ef317cd5
JX
7003#: builtin/merge-file.c:8
7004msgid ""
7005"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7006"file2"
7007msgstr ""
07432cef 7008"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
7009
7010#: builtin/merge-file.c:33
7011msgid "send results to standard output"
07432cef 7012msgstr "将结果发送到标准输出"
ef317cd5
JX
7013
7014#: builtin/merge-file.c:34
7015msgid "use a diff3 based merge"
07432cef 7016msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7017
7018#: builtin/merge-file.c:35
7019msgid "for conflicts, use our version"
07432cef 7020msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7021
7022#: builtin/merge-file.c:37
7023msgid "for conflicts, use their version"
07432cef 7024msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7025
7026#: builtin/merge-file.c:39
7027msgid "for conflicts, use a union version"
07432cef 7028msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7029
7030#: builtin/merge-file.c:42
7031msgid "for conflicts, use this marker size"
07432cef 7032msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7033
7034#: builtin/merge-file.c:43
7035msgid "do not warn about conflicts"
07432cef 7036msgstr "不要警告冲突"
ef317cd5
JX
7037
7038#: builtin/merge-file.c:45
7039msgid "set labels for file1/orig_file/file2"
07432cef 7040msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 7041
6c94aba5 7042#: builtin/mktree.c:64
ef317cd5 7043msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7044msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7045
6c94aba5 7046#: builtin/mktree.c:150
ef317cd5 7047msgid "input is NUL terminated"
07432cef 7048msgstr "输入以 NUL 字符终止"
c04f5ac3 7049
6c94aba5 7050#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 7051msgid "allow missing objects"
07432cef 7052msgstr "允许丢失的对象"
c04f5ac3 7053
6c94aba5 7054#: builtin/mktree.c:152
ef317cd5 7055msgid "allow creation of more than one tree"
07432cef 7056msgstr "允许创建一个以上的树"
c04f5ac3 7057
90314792 7058#: builtin/mv.c:15
ef317cd5 7059msgid "git mv [options] <source>... <destination>"
07432cef 7060msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 7061
cfff71a9 7062#: builtin/mv.c:71
ef317cd5 7063msgid "force move/rename even if target exists"
07432cef 7064msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7065
cfff71a9 7066#: builtin/mv.c:72
ef317cd5 7067msgid "skip move/rename errors"
07432cef 7068msgstr "跳过移动/重命名错误"
c04f5ac3 7069
cfff71a9 7070#: builtin/mv.c:122
c04f5ac3
JX
7071#, c-format
7072msgid "Checking rename of '%s' to '%s'\n"
7073msgstr "检查 '%s' 到 '%s' 的重命名\n"
7074
cfff71a9 7075#: builtin/mv.c:126
c04f5ac3
JX
7076msgid "bad source"
7077msgstr "坏的源"
7078
cfff71a9 7079#: builtin/mv.c:129
c04f5ac3
JX
7080msgid "can not move directory into itself"
7081msgstr "不能将目录移动到自身"
7082
cfff71a9 7083#: builtin/mv.c:132
c04f5ac3
JX
7084msgid "cannot move directory over file"
7085msgstr "不能将目录移动到文件"
7086
cfff71a9 7087#: builtin/mv.c:138
90314792
JX
7088#, c-format
7089msgid "Huh? Directory %s is in index and no submodule?"
7090msgstr "嗯?目录 %s 在索引中并且不是子模组?"
7091
cfff71a9 7092#: builtin/mv.c:140 builtin/rm.c:318
90314792
JX
7093msgid "Please, stage your changes to .gitmodules or stash them to proceed"
7094msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7095
cfff71a9 7096#: builtin/mv.c:156
c04f5ac3
JX
7097#, c-format
7098msgid "Huh? %.*s is in index?"
90e6ef53 7099msgstr "嗯?%.*s 在索引中?"
c04f5ac3 7100
6c94aba5 7101#: builtin/mv.c:169
c04f5ac3
JX
7102msgid "source directory is empty"
7103msgstr "源目录为空"
7104
6c94aba5 7105#: builtin/mv.c:205
c04f5ac3
JX
7106msgid "not under version control"
7107msgstr "不在版本控制之下"
7108
6acbf033 7109#: builtin/mv.c:208
c04f5ac3
JX
7110msgid "destination exists"
7111msgstr "目标已存在"
7112
6acbf033 7113#: builtin/mv.c:216
c04f5ac3
JX
7114#, c-format
7115msgid "overwriting '%s'"
7116msgstr "覆盖 '%s'"
7117
6acbf033 7118#: builtin/mv.c:219
c04f5ac3
JX
7119msgid "Cannot overwrite"
7120msgstr "不能覆盖"
7121
6acbf033 7122#: builtin/mv.c:222
c04f5ac3
JX
7123msgid "multiple sources for the same target"
7124msgstr "同一目标具有多个源"
7125
6acbf033 7126#: builtin/mv.c:224
cfff71a9
JX
7127msgid "destination directory does not exist"
7128msgstr "目标目录不存在"
7129
6acbf033 7130#: builtin/mv.c:244
c04f5ac3
JX
7131#, c-format
7132msgid "%s, source=%s, destination=%s"
7133msgstr "%s,源=%s,目标=%s"
7134
6acbf033 7135#: builtin/mv.c:254
c04f5ac3
JX
7136#, c-format
7137msgid "Renaming %s to %s\n"
7138msgstr "重命名 %s 至 %s\n"
7139
6acbf033 7140#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358
c04f5ac3
JX
7141#, c-format
7142msgid "renaming '%s' failed"
7143msgstr "重命名 '%s' 失败"
7144
6acbf033 7145#: builtin/name-rev.c:255
ef317cd5 7146msgid "git name-rev [options] <commit>..."
07432cef 7147msgstr "git name-rev [选项] <提交>..."
ef317cd5 7148
6acbf033 7149#: builtin/name-rev.c:256
ef317cd5 7150msgid "git name-rev [options] --all"
07432cef 7151msgstr "git name-rev [选项] --all"
ef317cd5 7152
6acbf033 7153#: builtin/name-rev.c:257
ef317cd5 7154msgid "git name-rev [options] --stdin"
07432cef 7155msgstr "git name-rev [选项] --stdin"
ef317cd5 7156
6acbf033 7157#: builtin/name-rev.c:309
ef317cd5 7158msgid "print only names (no SHA-1)"
07432cef 7159msgstr "只打印名称(无 SHA-1)"
ef317cd5 7160
6acbf033 7161#: builtin/name-rev.c:310
ef317cd5 7162msgid "only use tags to name the commits"
07432cef 7163msgstr "只使用 tags 来命名提交"
ef317cd5 7164
6acbf033 7165#: builtin/name-rev.c:312
ef317cd5 7166msgid "only use refs matching <pattern>"
07432cef 7167msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 7168
6acbf033 7169#: builtin/name-rev.c:314
ef317cd5 7170msgid "list all commits reachable from all refs"
07432cef 7171msgstr "列出可以从所有引用访问的提交"
ef317cd5 7172
6acbf033 7173#: builtin/name-rev.c:315
ef317cd5 7174msgid "read from stdin"
07432cef 7175msgstr "从标准输入读取"
ef317cd5 7176
6acbf033 7177#: builtin/name-rev.c:316
90314792
JX
7178msgid "allow to print `undefined` names (default)"
7179msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 7180
6acbf033 7181#: builtin/name-rev.c:322
2e8451e8
JX
7182msgid "dereference tags in the input (internal use)"
7183msgstr "反向解析输入中的 tags(内部使用)"
7184
7185#: builtin/notes.c:24
ef317cd5 7186msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 7187msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 7188
2e8451e8 7189#: builtin/notes.c:25
ef317cd5
JX
7190msgid ""
7191"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7192"<object>] [<object>]"
7193msgstr ""
07432cef
WS
7194"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7195"象>] [<对象>]"
ef317cd5 7196
2e8451e8 7197#: builtin/notes.c:26
ef317cd5 7198msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 7199msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 7200
2e8451e8 7201#: builtin/notes.c:27
ef317cd5
JX
7202msgid ""
7203"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7204"<object>] [<object>]"
7205msgstr ""
07432cef
WS
7206"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7207">] [<对象>]"
ef317cd5 7208
2e8451e8 7209#: builtin/notes.c:28
ef317cd5 7210msgid "git notes [--ref <notes_ref>] edit [<object>]"
07432cef 7211msgstr "git notes [--ref <注解引用>] edit [<对象>]"
ef317cd5 7212
2e8451e8 7213#: builtin/notes.c:29
ef317cd5 7214msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 7215msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 7216
2e8451e8 7217#: builtin/notes.c:30
ef317cd5
JX
7218msgid ""
7219"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 7220msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 7221
2e8451e8 7222#: builtin/notes.c:31
ef317cd5 7223msgid "git notes merge --commit [-v | -q]"
07432cef 7224msgstr "git notes merge --commit [-v | -q]"
ef317cd5 7225
2e8451e8 7226#: builtin/notes.c:32
ef317cd5 7227msgid "git notes merge --abort [-v | -q]"
07432cef 7228msgstr "git notes merge --abort [-v | -q]"
ef317cd5 7229
2e8451e8 7230#: builtin/notes.c:33
ef317cd5 7231msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 7232msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 7233
2e8451e8 7234#: builtin/notes.c:34
ef317cd5 7235msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 7236msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 7237
2e8451e8 7238#: builtin/notes.c:35
ef317cd5 7239msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 7240msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 7241
2e8451e8 7242#: builtin/notes.c:40
ef317cd5 7243msgid "git notes [list [<object>]]"
07432cef 7244msgstr "git notes [list [<对象>]]"
ef317cd5 7245
2e8451e8 7246#: builtin/notes.c:45
ef317cd5 7247msgid "git notes add [<options>] [<object>]"
07432cef 7248msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 7249
2e8451e8 7250#: builtin/notes.c:50
ef317cd5 7251msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7252msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7253
2e8451e8 7254#: builtin/notes.c:51
ef317cd5 7255msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7256msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7257
2e8451e8 7258#: builtin/notes.c:56
ef317cd5 7259msgid "git notes append [<options>] [<object>]"
07432cef 7260msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7261
2e8451e8 7262#: builtin/notes.c:61
ef317cd5 7263msgid "git notes edit [<object>]"
07432cef 7264msgstr "git notes edit [<对象>]"
ef317cd5 7265
2e8451e8 7266#: builtin/notes.c:66
ef317cd5 7267msgid "git notes show [<object>]"
07432cef 7268msgstr "git notes show [<对象>]"
ef317cd5 7269
2e8451e8 7270#: builtin/notes.c:71
ef317cd5 7271msgid "git notes merge [<options>] <notes_ref>"
07432cef 7272msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7273
2e8451e8 7274#: builtin/notes.c:72
ef317cd5 7275msgid "git notes merge --commit [<options>]"
07432cef 7276msgstr "git notes merge --commit [<选项>]"
ef317cd5 7277
2e8451e8 7278#: builtin/notes.c:73
ef317cd5 7279msgid "git notes merge --abort [<options>]"
07432cef 7280msgstr "git notes merge --abort [<选项>]"
ef317cd5 7281
2e8451e8 7282#: builtin/notes.c:78
ef317cd5 7283msgid "git notes remove [<object>]"
07432cef 7284msgstr "git notes remove [<对象>]"
ef317cd5 7285
2e8451e8 7286#: builtin/notes.c:83
ef317cd5 7287msgid "git notes prune [<options>]"
07432cef 7288msgstr "git notes prune [<选项>]"
ef317cd5 7289
2e8451e8 7290#: builtin/notes.c:88
ef317cd5 7291msgid "git notes get-ref"
07432cef 7292msgstr "git notes get-ref"
ef317cd5 7293
2e8451e8 7294#: builtin/notes.c:137
c04f5ac3
JX
7295#, c-format
7296msgid "unable to start 'show' for object '%s'"
7297msgstr "不能为对象 '%s' 开始 'show'"
7298
2e8451e8 7299#: builtin/notes.c:141
a77c07d9
JX
7300msgid "could not read 'show' output"
7301msgstr "不能读取 'show' 的输出"
c04f5ac3 7302
2e8451e8 7303#: builtin/notes.c:149
c04f5ac3
JX
7304#, c-format
7305msgid "failed to finish 'show' for object '%s'"
7306msgstr "无法为对象 '%s' 完成 'show'"
7307
6acbf033 7308#: builtin/notes.c:167 builtin/tag.c:477
c04f5ac3
JX
7309#, c-format
7310msgid "could not create file '%s'"
7311msgstr "不能创建文件 '%s'"
7312
2e8451e8 7313#: builtin/notes.c:186
c04f5ac3
JX
7314msgid "Please supply the note contents using either -m or -F option"
7315msgstr "请通过 -m 或 -F 选项为注解提供内容"
7316
6c94aba5 7317#: builtin/notes.c:207 builtin/notes.c:848
c04f5ac3
JX
7318#, c-format
7319msgid "Removing note for object %s\n"
7320msgstr "删除对象 %s 的注解\n"
7321
2e8451e8 7322#: builtin/notes.c:212
c04f5ac3
JX
7323msgid "unable to write note object"
7324msgstr "不能写注解对象"
7325
2e8451e8 7326#: builtin/notes.c:214
c04f5ac3
JX
7327#, c-format
7328msgid "The note contents has been left in %s"
7329msgstr "注解内容被留在文件 %s 中"
7330
6acbf033 7331#: builtin/notes.c:248 builtin/tag.c:692
c04f5ac3
JX
7332#, c-format
7333msgid "cannot read '%s'"
7334msgstr "不能读取 '%s'"
7335
6acbf033 7336#: builtin/notes.c:250 builtin/tag.c:695
c04f5ac3
JX
7337#, c-format
7338msgid "could not open or read '%s'"
7339msgstr "不能打开或读取 '%s'"
7340
6c94aba5
JX
7341#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
7342#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
7343#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
6acbf033 7344#: builtin/notes.c:843 builtin/tag.c:708
c04f5ac3
JX
7345#, c-format
7346msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7347msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7348
2e8451e8 7349#: builtin/notes.c:272
c04f5ac3
JX
7350#, c-format
7351msgid "Failed to read object '%s'."
7352msgstr "无法读取对象 '%s'。"
7353
6c94aba5
JX
7354#: builtin/notes.c:276
7355#, c-format
7356msgid "Cannot read note data from non-blob object '%s'."
7357msgstr "不能从非数据对象 '%s' 中读取注解数据"
7358
7359#: builtin/notes.c:316
c04f5ac3
JX
7360#, c-format
7361msgid "Malformed input line: '%s'."
7362msgstr "非法的输入行:'%s'。"
7363
6c94aba5 7364#: builtin/notes.c:331
c04f5ac3
JX
7365#, c-format
7366msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7367msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7368
6c94aba5
JX
7369#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
7370#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
7371#: builtin/notes.c:908
c04f5ac3
JX
7372msgid "too many parameters"
7373msgstr "参数太多"
7374
6c94aba5 7375#: builtin/notes.c:388 builtin/notes.c:647
c04f5ac3
JX
7376#, c-format
7377msgid "No note found for object %s."
7378msgstr "未发现对象 %s 的注解。"
7379
6c94aba5 7380#: builtin/notes.c:410 builtin/notes.c:567
ef317cd5 7381msgid "note contents as a string"
07432cef 7382msgstr "注解内容作为一个字符串"
ef317cd5 7383
6c94aba5 7384#: builtin/notes.c:413 builtin/notes.c:570
ef317cd5 7385msgid "note contents in a file"
07432cef 7386msgstr "注解内容到一个文件中"
ef317cd5 7387
6c94aba5 7388#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
6acbf033 7389#: builtin/notes.c:575 builtin/tag.c:627
ef317cd5 7390msgid "object"
07432cef 7391msgstr "对象"
ef317cd5 7392
6c94aba5 7393#: builtin/notes.c:416 builtin/notes.c:573
ef317cd5 7394msgid "reuse and edit specified note object"
07432cef 7395msgstr "重用和编辑指定的注解对象"
ef317cd5 7396
6c94aba5 7397#: builtin/notes.c:419 builtin/notes.c:576
ef317cd5 7398msgid "reuse specified note object"
07432cef 7399msgstr "重用指定的注解对象"
ef317cd5 7400
6c94aba5 7401#: builtin/notes.c:421 builtin/notes.c:489
ef317cd5 7402msgid "replace existing notes"
07432cef 7403msgstr "替换已存在的注解"
ef317cd5 7404
6c94aba5 7405#: builtin/notes.c:455
c04f5ac3
JX
7406#, c-format
7407msgid ""
7408"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7409"existing notes"
7410msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7411
6c94aba5 7412#: builtin/notes.c:460 builtin/notes.c:537
c04f5ac3
JX
7413#, c-format
7414msgid "Overwriting existing notes for object %s\n"
7415msgstr "覆盖对象 %s 现存注解\n"
7416
6c94aba5 7417#: builtin/notes.c:490
ef317cd5 7418msgid "read objects from stdin"
07432cef 7419msgstr "从标准输入读取对象"
ef317cd5 7420
6c94aba5 7421#: builtin/notes.c:492
ef317cd5 7422msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7423msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7424
6c94aba5 7425#: builtin/notes.c:510
c04f5ac3
JX
7426msgid "too few parameters"
7427msgstr "参数太少"
7428
6c94aba5 7429#: builtin/notes.c:531
c04f5ac3
JX
7430#, c-format
7431msgid ""
7432"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7433"existing notes"
7434msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7435
6c94aba5 7436#: builtin/notes.c:543
c04f5ac3
JX
7437#, c-format
7438msgid "Missing notes on source object %s. Cannot copy."
7439msgstr "源对象 %s 缺少注解。不能拷贝。"
7440
6c94aba5 7441#: builtin/notes.c:592
ef317cd5
JX
7442#, c-format
7443msgid ""
7444"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7445"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7446msgstr ""
7447"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7448"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7449
6c94aba5 7450#: builtin/notes.c:739
ef317cd5 7451msgid "General options"
07432cef 7452msgstr "通用选项"
ef317cd5 7453
6c94aba5 7454#: builtin/notes.c:741
ef317cd5 7455msgid "Merge options"
07432cef 7456msgstr "合并选项"
ef317cd5 7457
6c94aba5 7458#: builtin/notes.c:743
ef317cd5
JX
7459msgid ""
7460"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7461"cat_sort_uniq)"
07432cef 7462msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7463
6c94aba5 7464#: builtin/notes.c:745
ef317cd5 7465msgid "Committing unmerged notes"
07432cef 7466msgstr "提交未合并的注解"
ef317cd5 7467
6c94aba5 7468#: builtin/notes.c:747
ef317cd5 7469msgid "finalize notes merge by committing unmerged notes"
07432cef 7470msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7471
6c94aba5 7472#: builtin/notes.c:749
ef317cd5 7473msgid "Aborting notes merge resolution"
07432cef 7474msgstr "中止注解合并的方案"
ef317cd5 7475
6c94aba5 7476#: builtin/notes.c:751
ef317cd5 7477msgid "abort notes merge"
07432cef 7478msgstr "中止注解合并"
ef317cd5 7479
6c94aba5 7480#: builtin/notes.c:846
ef317cd5
JX
7481#, c-format
7482msgid "Object %s has no note\n"
7483msgstr "对象 %s 没有注解\n"
7484
6c94aba5 7485#: builtin/notes.c:858
ef317cd5 7486msgid "attempt to remove non-existent note is not an error"
07432cef 7487msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7488
6c94aba5 7489#: builtin/notes.c:861
ef317cd5 7490msgid "read object names from the standard input"
07432cef 7491msgstr "从标准输入读取对象名称"
ef317cd5 7492
6c94aba5
JX
7493#: builtin/notes.c:942
7494msgid "notes-ref"
07432cef 7495msgstr "注解引用"
ef317cd5 7496
6c94aba5 7497#: builtin/notes.c:943
ef317cd5 7498msgid "use notes from <notes_ref>"
07432cef 7499msgstr "从 <注解引用> 使用注解"
ef317cd5 7500
6acbf033 7501#: builtin/notes.c:978 builtin/remote.c:1616
ef317cd5
JX
7502#, c-format
7503msgid "Unknown subcommand: %s"
7504msgstr "未知子命令:%s"
7505
6c94aba5 7506#: builtin/pack-objects.c:25
ef317cd5 7507msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7508msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5 7509
6c94aba5 7510#: builtin/pack-objects.c:26
ef317cd5 7511msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7512msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5 7513
6c94aba5 7514#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
7515#, c-format
7516msgid "deflate error (%d)"
7517msgstr "压缩错误 (%d)"
7518
6c94aba5
JX
7519#: builtin/pack-objects.c:771
7520msgid "Writing objects"
7521msgstr "写入对象中"
7522
7523#: builtin/pack-objects.c:1012
7524msgid "disabling bitmap writing, as some objects are not being packed"
7525msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7526
7527#: builtin/pack-objects.c:2174
7528msgid "Compressing objects"
7529msgstr "压缩对象中"
7530
6acbf033 7531#: builtin/pack-objects.c:2526
ef317cd5
JX
7532#, c-format
7533msgid "unsupported index version %s"
7534msgstr "不支持的索引版本 %s"
7535
6acbf033 7536#: builtin/pack-objects.c:2530
ef317cd5
JX
7537#, c-format
7538msgid "bad index version '%s'"
7539msgstr "坏的索引版本 '%s'"
7540
6acbf033 7541#: builtin/pack-objects.c:2553
ef317cd5
JX
7542#, c-format
7543msgid "option %s does not accept negative form"
7544msgstr "选项 %s 不接受否定格式"
7545
6acbf033 7546#: builtin/pack-objects.c:2557
ef317cd5
JX
7547#, c-format
7548msgid "unable to parse value '%s' for option %s"
7549msgstr "不能解析选项 %1$s 的值 '%2$s'"
7550
6acbf033 7551#: builtin/pack-objects.c:2576
ef317cd5 7552msgid "do not show progress meter"
07432cef 7553msgstr "不显示进度表"
ef317cd5 7554
6acbf033 7555#: builtin/pack-objects.c:2578
ef317cd5 7556msgid "show progress meter"
07432cef 7557msgstr "显示进度表"
ef317cd5 7558
6acbf033 7559#: builtin/pack-objects.c:2580
ef317cd5 7560msgid "show progress meter during object writing phase"
07432cef 7561msgstr "在对象写入阶段显示进度表"
ef317cd5 7562
6acbf033 7563#: builtin/pack-objects.c:2583
ef317cd5 7564msgid "similar to --all-progress when progress meter is shown"
07432cef 7565msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 7566
6acbf033 7567#: builtin/pack-objects.c:2584
ef317cd5 7568msgid "version[,offset]"
07432cef 7569msgstr "版本[,偏移]"
ef317cd5 7570
6acbf033 7571#: builtin/pack-objects.c:2585
ef317cd5 7572msgid "write the pack index file in the specified idx format version"
07432cef 7573msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 7574
6acbf033 7575#: builtin/pack-objects.c:2588
ef317cd5 7576msgid "maximum size of each output pack file"
07432cef 7577msgstr "每个输出包的最大尺寸"
ef317cd5 7578
6acbf033 7579#: builtin/pack-objects.c:2590
ef317cd5 7580msgid "ignore borrowed objects from alternate object store"
07432cef 7581msgstr "忽略从替代对象存储里借用对象"
ef317cd5 7582
6acbf033 7583#: builtin/pack-objects.c:2592
ef317cd5 7584msgid "ignore packed objects"
07432cef 7585msgstr "忽略包对象"
ef317cd5 7586
6acbf033 7587#: builtin/pack-objects.c:2594
ef317cd5 7588msgid "limit pack window by objects"
07432cef 7589msgstr "限制打包窗口的对象数"
ef317cd5 7590
6acbf033 7591#: builtin/pack-objects.c:2596
ef317cd5 7592msgid "limit pack window by memory in addition to object limit"
07432cef 7593msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 7594
6acbf033 7595#: builtin/pack-objects.c:2598
ef317cd5 7596msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 7597msgstr "打包允许的 delta 链的最大长度"
ef317cd5 7598
6acbf033 7599#: builtin/pack-objects.c:2600
ef317cd5 7600msgid "reuse existing deltas"
07432cef 7601msgstr "重用已存在的 deltas"
ef317cd5 7602
6acbf033 7603#: builtin/pack-objects.c:2602
ef317cd5 7604msgid "reuse existing objects"
07432cef 7605msgstr "重用已存在的对象"
ef317cd5 7606
6acbf033 7607#: builtin/pack-objects.c:2604
ef317cd5 7608msgid "use OFS_DELTA objects"
07432cef 7609msgstr "使用 OFS_DELTA 对象"
ef317cd5 7610
6acbf033 7611#: builtin/pack-objects.c:2606
ef317cd5 7612msgid "use threads when searching for best delta matches"
07432cef 7613msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 7614
6acbf033 7615#: builtin/pack-objects.c:2608
ef317cd5 7616msgid "do not create an empty pack output"
07432cef 7617msgstr "不创建空的包输出"
ef317cd5 7618
6acbf033 7619#: builtin/pack-objects.c:2610
ef317cd5 7620msgid "read revision arguments from standard input"
07432cef 7621msgstr "从标准输入读取修订号参数"
ef317cd5 7622
6acbf033 7623#: builtin/pack-objects.c:2612
ef317cd5 7624msgid "limit the objects to those that are not yet packed"
07432cef 7625msgstr "限制那些尚未打包的对象"
ef317cd5 7626
6acbf033 7627#: builtin/pack-objects.c:2615
ef317cd5 7628msgid "include objects reachable from any reference"
07432cef 7629msgstr "包括可以从任何引用访问到的对象"
ef317cd5 7630
6acbf033 7631#: builtin/pack-objects.c:2618
ef317cd5 7632msgid "include objects referred by reflog entries"
07432cef 7633msgstr "包括被引用日志引用到的对象"
ef317cd5 7634
6acbf033 7635#: builtin/pack-objects.c:2621
ef317cd5 7636msgid "output pack to stdout"
07432cef 7637msgstr "输出包到标准输出"
ef317cd5 7638
6acbf033 7639#: builtin/pack-objects.c:2623
ef317cd5 7640msgid "include tag objects that refer to objects to be packed"
07432cef 7641msgstr "包括引用了打包对象的 tag"
ef317cd5 7642
6acbf033 7643#: builtin/pack-objects.c:2625
ef317cd5 7644msgid "keep unreachable objects"
07432cef 7645msgstr "维持不可达的对象"
ef317cd5 7646
6acbf033 7647#: builtin/pack-objects.c:2626 parse-options.h:140
ef317cd5
JX
7648msgid "time"
7649msgstr "时间"
7650
6acbf033 7651#: builtin/pack-objects.c:2627
ef317cd5 7652msgid "unpack unreachable objects newer than <time>"
07432cef 7653msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 7654
6acbf033 7655#: builtin/pack-objects.c:2630
ef317cd5 7656msgid "create thin packs"
07432cef 7657msgstr "创建精简包"
ef317cd5 7658
6acbf033 7659#: builtin/pack-objects.c:2632
ef317cd5 7660msgid "ignore packs that have companion .keep file"
07432cef 7661msgstr "忽略配有 .keep 文件的包"
ef317cd5 7662
6acbf033 7663#: builtin/pack-objects.c:2634
ef317cd5 7664msgid "pack compression level"
07432cef 7665msgstr "打包压缩级别"
ef317cd5 7666
6acbf033 7667#: builtin/pack-objects.c:2636
ef317cd5 7668msgid "do not hide commits by grafts"
cfff71a9 7669msgstr "显示被嫁接隐藏的提交"
ef317cd5 7670
6acbf033 7671#: builtin/pack-objects.c:2638
6c94aba5
JX
7672msgid "use a bitmap index if available to speed up counting objects"
7673msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7674
6acbf033 7675#: builtin/pack-objects.c:2640
6c94aba5
JX
7676msgid "write a bitmap index together with the pack index"
7677msgstr "在建立包索引的同时创建 bitmap 索引"
7678
6acbf033 7679#: builtin/pack-objects.c:2719
6c94aba5
JX
7680msgid "Counting objects"
7681msgstr "对象计数中"
7682
ef317cd5
JX
7683#: builtin/pack-refs.c:6
7684msgid "git pack-refs [options]"
07432cef 7685msgstr "git pack-refs [选项]"
c04f5ac3 7686
ef317cd5
JX
7687#: builtin/pack-refs.c:14
7688msgid "pack everything"
07432cef 7689msgstr "打包一切"
c04f5ac3 7690
ef317cd5
JX
7691#: builtin/pack-refs.c:15
7692msgid "prune loose refs (default)"
07432cef 7693msgstr "清除松散的引用(默认)"
c04f5ac3 7694
ef317cd5
JX
7695#: builtin/prune-packed.c:7
7696msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 7697msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 7698
6c94aba5
JX
7699#: builtin/prune-packed.c:49
7700msgid "Removing duplicate objects"
7701msgstr "正在删除重复对象"
7702
ef317cd5
JX
7703#: builtin/prune.c:12
7704msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 7705msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 7706
cfff71a9 7707#: builtin/prune.c:142
ef317cd5 7708msgid "do not remove, show only"
07432cef 7709msgstr "不删除,只显示"
7ac1c0ad 7710
cfff71a9 7711#: builtin/prune.c:143
ef317cd5 7712msgid "report pruned objects"
07432cef 7713msgstr "报告清除的对象"
7ac1c0ad 7714
cfff71a9 7715#: builtin/prune.c:146
ef317cd5 7716msgid "expire objects older than <time>"
07432cef 7717msgstr "使早于给定时间的对象过期"
ef317cd5
JX
7718
7719#: builtin/push.c:14
ef317cd5 7720msgid "git push [<options>] [<repository> [<refspec>...]]"
90314792 7721msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7ac1c0ad 7722
6c94aba5 7723#: builtin/push.c:85
c04f5ac3
JX
7724msgid "tag shorthand without <tag>"
7725msgstr "tag 简写没有跟 <tag> 参数"
7726
6c94aba5 7727#: builtin/push.c:95
c04f5ac3 7728msgid "--delete only accepts plain target ref names"
90e6ef53 7729msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 7730
6acbf033 7731#: builtin/push.c:139
8ada9598
JX
7732msgid ""
7733"\n"
7734"To choose either option permanently, see push.default in 'git help config'."
7735msgstr ""
81809b99
JX
7736"\n"
7737"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 7738
6acbf033 7739#: builtin/push.c:142
8ada9598
JX
7740#, c-format
7741msgid ""
7742"The upstream branch of your current branch does not match\n"
7743"the name of your current branch. To push to the upstream branch\n"
7744"on the remote, use\n"
7745"\n"
7746" git push %s HEAD:%s\n"
7747"\n"
7748"To push to the branch of the same name on the remote, use\n"
7749"\n"
7750" git push %s %s\n"
7751"%s"
7752msgstr ""
81809b99
JX
7753"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7754"上游分支,使用\n"
7755"\n"
7756" git push %s HEAD:%s\n"
7757"\n"
7758"为推送至远程同名分支,使用\n"
7759"\n"
7760" git push %s %s\n"
7761"%s"
8ada9598 7762
6acbf033 7763#: builtin/push.c:157
c04f5ac3
JX
7764#, c-format
7765msgid ""
7766"You are not currently on a branch.\n"
7767"To push the history leading to the current (detached HEAD)\n"
7768"state now, use\n"
7769"\n"
7770" git push %s HEAD:<name-of-remote-branch>\n"
7771msgstr ""
7772"您当前不在一个分支上。\n"
90e6ef53 7773"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
7774"\n"
7775" git push %s HEAD:<name-of-remote-branch>\n"
7776
6acbf033 7777#: builtin/push.c:171
c04f5ac3
JX
7778#, c-format
7779msgid ""
7780"The current branch %s has no upstream branch.\n"
7781"To push the current branch and set the remote as upstream, use\n"
7782"\n"
7783" git push --set-upstream %s %s\n"
7784msgstr ""
7785"当前分支 %s 没有对应的上游分支。\n"
7786"为推送当前分支并建立与远程上游的跟踪,使用\n"
7787"\n"
7788" git push --set-upstream %s %s\n"
7789
6acbf033 7790#: builtin/push.c:179
c04f5ac3
JX
7791#, c-format
7792msgid "The current branch %s has multiple upstream branches, refusing to push."
7793msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7794
6acbf033 7795#: builtin/push.c:182
73a60cd2
JX
7796#, c-format
7797msgid ""
7798"You are pushing to remote '%s', which is not the upstream of\n"
7799"your current branch '%s', without telling me what to push\n"
7800"to update which remote branch."
7801msgstr ""
7802"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7803"而没有告诉我要推送什么、更新哪个远程分支。"
7804
c160d03f 7805# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6acbf033 7806#: builtin/push.c:205
c160d03f 7807msgid ""
6c94aba5 7808"push.default is unset; its implicit value has changed in\n"
c160d03f 7809"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 7810"and maintain the traditional behavior, use:\n"
c160d03f
JX
7811"\n"
7812" git config --global push.default matching\n"
7813"\n"
7814"To squelch this message and adopt the new behavior now, use:\n"
7815"\n"
7816" git config --global push.default simple\n"
7817"\n"
cfff71a9
JX
7818"When push.default is set to 'matching', git will push local branches\n"
7819"to the remote branches that already exist with the same name.\n"
7820"\n"
6c94aba5 7821"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
7822"behavior, which only pushes the current branch to the corresponding\n"
7823"remote branch that 'git pull' uses to update the current branch.\n"
7824"\n"
c160d03f
JX
7825"See 'git help config' and search for 'push.default' for further "
7826"information.\n"
7827"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7828"'current' instead of 'simple' if you sometimes use older versions of Git)"
7829msgstr ""
6c94aba5 7830"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 7831"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
7832"\n"
7833" git config --global push.default matching\n"
7834"\n"
7835"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7836"\n"
7837" git config --global push.default simple\n"
7838"\n"
cfff71a9
JX
7839"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
7840"本地分支。\n"
7841"\n"
7842"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
7843"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
7844"\n"
c160d03f
JX
7845"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7846"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 7847"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 7848
6acbf033 7849#: builtin/push.c:272
c04f5ac3
JX
7850msgid ""
7851"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90314792 7852msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
c04f5ac3 7853
6acbf033 7854#: builtin/push.c:279
170e9899
JX
7855msgid ""
7856"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
7857"its remote counterpart. Integrate the remote changes (e.g.\n"
7858"'git pull ...') before pushing again.\n"
170e9899
JX
7859"See the 'Note about fast-forwards' in 'git push --help' for details."
7860msgstr ""
eff6d3a9 7861"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 7862"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 7863"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7864
6acbf033 7865#: builtin/push.c:285
170e9899
JX
7866msgid ""
7867"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
7868"counterpart. Check out this branch and integrate the remote changes\n"
7869"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
7870"See the 'Note about fast-forwards' in 'git push --help' for details."
7871msgstr ""
eff6d3a9 7872"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 7873"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 7874"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7875
6acbf033 7876#: builtin/push.c:291
07432cef 7877msgid ""
a77c07d9
JX
7878"Updates were rejected because the remote contains work that you do\n"
7879"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
7880"to the same ref. You may want to first integrate the remote changes\n"
7881"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
7882"See the 'Note about fast-forwards' in 'git push --help' for details."
7883msgstr ""
7884"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
2e8451e8
JX
7885"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7886"(如 'git pull ...')。\n"
a77c07d9
JX
7887"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7888
6acbf033 7889#: builtin/push.c:298
a77c07d9
JX
7890msgid "Updates were rejected because the tag already exists in the remote."
7891msgstr "更新被拒绝因为 tag 在远程已经存在。"
7892
6acbf033 7893#: builtin/push.c:301
a77c07d9
JX
7894msgid ""
7895"You cannot update a remote ref that points at a non-commit object,\n"
7896"or update a remote ref to make it point at a non-commit object,\n"
7897"without using the '--force' option.\n"
7898msgstr ""
7899"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7900"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 7901
6acbf033 7902#: builtin/push.c:360
c04f5ac3
JX
7903#, c-format
7904msgid "Pushing to %s\n"
7905msgstr "推送到 %s\n"
7906
6acbf033 7907#: builtin/push.c:364
c04f5ac3
JX
7908#, c-format
7909msgid "failed to push some refs to '%s'"
7910msgstr "无法推送一些引用到 '%s'"
7911
6acbf033 7912#: builtin/push.c:394
c04f5ac3
JX
7913#, c-format
7914msgid "bad repository '%s'"
90e6ef53 7915msgstr "坏的版本库 '%s'"
c04f5ac3 7916
6acbf033 7917#: builtin/push.c:395
c04f5ac3
JX
7918msgid ""
7919"No configured push destination.\n"
7920"Either specify the URL from the command-line or configure a remote "
7921"repository using\n"
7922"\n"
7923" git remote add <name> <url>\n"
7924"\n"
7925"and then push using the remote name\n"
7926"\n"
7927" git push <name>\n"
7928msgstr ""
90e6ef53 7929"没有配置推送目标。\n"
07432cef 7930"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
7931"\n"
7932" git remote add <name> <url>\n"
7933"\n"
7934"然后使用该远程版本库名执行推送\n"
7935"\n"
7936" git push <name>\n"
7937
6acbf033 7938#: builtin/push.c:410
c04f5ac3
JX
7939msgid "--all and --tags are incompatible"
7940msgstr "--all 和 --tags 不兼容"
7941
6acbf033 7942#: builtin/push.c:411
c04f5ac3 7943msgid "--all can't be combined with refspecs"
90314792 7944msgstr "--all 不能和引用规则同时使用"
c04f5ac3 7945
6acbf033 7946#: builtin/push.c:416
c04f5ac3
JX
7947msgid "--mirror and --tags are incompatible"
7948msgstr "--mirror 和 --tags 不兼容"
7949
6acbf033 7950#: builtin/push.c:417
c04f5ac3 7951msgid "--mirror can't be combined with refspecs"
90314792 7952msgstr "--mirror 不能和引用规则同时使用"
c04f5ac3 7953
6acbf033 7954#: builtin/push.c:422
c04f5ac3
JX
7955msgid "--all and --mirror are incompatible"
7956msgstr "--all 和 --mirror 不兼容"
7957
6acbf033 7958#: builtin/push.c:482
ef317cd5 7959msgid "repository"
07432cef 7960msgstr "版本库"
ef317cd5 7961
6acbf033 7962#: builtin/push.c:483
ef317cd5 7963msgid "push all refs"
07432cef 7964msgstr "推送所有引用"
ef317cd5 7965
6acbf033 7966#: builtin/push.c:484
ef317cd5 7967msgid "mirror all refs"
07432cef 7968msgstr "镜像所有引用"
ef317cd5 7969
6acbf033 7970#: builtin/push.c:486
ef317cd5 7971msgid "delete refs"
07432cef 7972msgstr "删除引用"
ef317cd5 7973
6acbf033 7974#: builtin/push.c:487
ef317cd5 7975msgid "push tags (can't be used with --all or --mirror)"
07432cef 7976msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 7977
6acbf033 7978#: builtin/push.c:490
ef317cd5
JX
7979msgid "force updates"
7980msgstr "强制更新"
7981
6acbf033 7982#: builtin/push.c:492
90314792
JX
7983msgid "refname>:<expect"
7984msgstr "引用名>:<期望值"
7985
6acbf033 7986#: builtin/push.c:493
90314792
JX
7987msgid "require old value of ref to be at this value"
7988msgstr "要求引用旧的取值为设定值"
7989
6acbf033 7990#: builtin/push.c:495
ef317cd5 7991msgid "check"
07432cef 7992msgstr "检查"
ef317cd5 7993
6acbf033 7994#: builtin/push.c:496
ef317cd5 7995msgid "control recursive pushing of submodules"
07432cef 7996msgstr "控制子模组的递归推送"
ef317cd5 7997
6acbf033 7998#: builtin/push.c:498
ef317cd5 7999msgid "use thin pack"
07432cef 8000msgstr "使用精简打包"
ef317cd5 8001
6acbf033 8002#: builtin/push.c:499 builtin/push.c:500
ef317cd5 8003msgid "receive pack program"
07432cef 8004msgstr "接收包程序"
ef317cd5 8005
6acbf033 8006#: builtin/push.c:501
ef317cd5 8007msgid "set upstream for git pull/status"
07432cef 8008msgstr "设置 git pull/status 的上游"
ef317cd5 8009
6acbf033 8010#: builtin/push.c:504
ef317cd5 8011msgid "prune locally removed refs"
07432cef 8012msgstr "清除本地删除的引用"
ef317cd5 8013
6acbf033 8014#: builtin/push.c:506
a77c07d9
JX
8015msgid "bypass pre-push hook"
8016msgstr "绕过 pre-push 钩子"
8017
6acbf033 8018#: builtin/push.c:507
1003b3a5
JX
8019msgid "push missing but relevant tags"
8020msgstr "推送缺失的有关的 tags"
8021
6acbf033 8022#: builtin/push.c:517
c04f5ac3
JX
8023msgid "--delete is incompatible with --all, --mirror and --tags"
8024msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8025
6acbf033 8026#: builtin/push.c:519
c04f5ac3
JX
8027msgid "--delete doesn't make sense without any refs"
8028msgstr "--delete 未接任何引用没有意义"
8029
ef317cd5
JX
8030#: builtin/read-tree.c:36
8031msgid ""
8032"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8033"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8034"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8035msgstr ""
07432cef
WS
8036"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8037"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8038"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 8039
2e8451e8 8040#: builtin/read-tree.c:109
ef317cd5 8041msgid "write resulting index to <file>"
07432cef 8042msgstr "将索引结果写入 <file>"
ef317cd5 8043
2e8451e8 8044#: builtin/read-tree.c:112
ef317cd5 8045msgid "only empty the index"
07432cef 8046msgstr "只是清空索引"
ef317cd5 8047
2e8451e8 8048#: builtin/read-tree.c:114
ef317cd5 8049msgid "Merging"
07432cef 8050msgstr "合并"
ef317cd5 8051
2e8451e8 8052#: builtin/read-tree.c:116
ef317cd5 8053msgid "perform a merge in addition to a read"
07432cef 8054msgstr "读取之余再执行一个合并"
ef317cd5 8055
2e8451e8 8056#: builtin/read-tree.c:118
ef317cd5 8057msgid "3-way merge if no file level merging required"
07432cef 8058msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5 8059
2e8451e8 8060#: builtin/read-tree.c:120
ef317cd5 8061msgid "3-way merge in presence of adds and removes"
07432cef 8062msgstr "存在添加和删除时,也执行三路合并"
ef317cd5 8063
2e8451e8 8064#: builtin/read-tree.c:122
ef317cd5 8065msgid "same as -m, but discard unmerged entries"
07432cef 8066msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 8067
2e8451e8 8068#: builtin/read-tree.c:123
ef317cd5 8069msgid "<subdirectory>/"
07432cef 8070msgstr "<子目录>/"
ef317cd5 8071
2e8451e8 8072#: builtin/read-tree.c:124
ef317cd5 8073msgid "read the tree into the index under <subdirectory>/"
07432cef 8074msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 8075
2e8451e8 8076#: builtin/read-tree.c:127
ef317cd5 8077msgid "update working tree with merge result"
07432cef 8078msgstr "用合并的结果更新工作区"
ef317cd5 8079
2e8451e8 8080#: builtin/read-tree.c:129
ef317cd5 8081msgid "gitignore"
07432cef 8082msgstr "gitignore"
ef317cd5 8083
2e8451e8 8084#: builtin/read-tree.c:130
ef317cd5 8085msgid "allow explicitly ignored files to be overwritten"
07432cef 8086msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 8087
2e8451e8 8088#: builtin/read-tree.c:133
ef317cd5 8089msgid "don't check the working tree after merging"
07432cef 8090msgstr "合并后不检查工作区"
ef317cd5 8091
2e8451e8 8092#: builtin/read-tree.c:134
ef317cd5 8093msgid "don't update the index or the work tree"
07432cef 8094msgstr "不更新索引区和工作区"
ef317cd5 8095
2e8451e8 8096#: builtin/read-tree.c:136
ef317cd5 8097msgid "skip applying sparse checkout filter"
07432cef 8098msgstr "跳过应用稀疏检出过滤器"
ef317cd5 8099
2e8451e8 8100#: builtin/read-tree.c:138
ef317cd5 8101msgid "debug unpack-trees"
07432cef 8102msgstr "调试 unpack-trees"
ef317cd5 8103
90314792 8104#: builtin/reflog.c:499
2e8451e8
JX
8105#, c-format
8106msgid "%s' for '%s' is not a valid timestamp"
8107msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8108
90314792 8109#: builtin/reflog.c:615 builtin/reflog.c:620
2e8451e8
JX
8110#, c-format
8111msgid "'%s' is not a valid timestamp"
8112msgstr "'%s' 不是一个有效的时间戳"
8113
cfff71a9 8114#: builtin/remote.c:12
ef317cd5 8115msgid "git remote [-v | --verbose]"
07432cef 8116msgstr "git remote [-v | --verbose]"
ef317cd5 8117
cfff71a9 8118#: builtin/remote.c:13
ef317cd5
JX
8119msgid ""
8120"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8121"mirror=<fetch|push>] <name> <url>"
8122msgstr ""
07432cef
WS
8123"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8124"mirror=<fetch|push>] <名称> <url>"
ef317cd5 8125
cfff71a9 8126#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 8127msgid "git remote rename <old> <new>"
07432cef 8128msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 8129
cfff71a9 8130#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 8131msgid "git remote remove <name>"
07432cef 8132msgstr "git remote remove <名称>"
ef317cd5 8133
cfff71a9 8134#: builtin/remote.c:16
90314792
JX
8135msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8136msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
ef317cd5 8137
cfff71a9 8138#: builtin/remote.c:17
ef317cd5 8139msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 8140msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 8141
cfff71a9 8142#: builtin/remote.c:18
ef317cd5 8143msgid "git remote prune [-n | --dry-run] <name>"
07432cef 8144msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 8145
cfff71a9 8146#: builtin/remote.c:19
ef317cd5
JX
8147msgid ""
8148"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 8149msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 8150
cfff71a9 8151#: builtin/remote.c:20
ef317cd5 8152msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 8153msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 8154
cfff71a9 8155#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 8156msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 8157msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 8158
cfff71a9 8159#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 8160msgid "git remote set-url --add <name> <newurl>"
07432cef 8161msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 8162
cfff71a9 8163#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 8164msgid "git remote set-url --delete <name> <url>"
07432cef 8165msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 8166
cfff71a9 8167#: builtin/remote.c:28
ef317cd5 8168msgid "git remote add [<options>] <name> <url>"
07432cef 8169msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 8170
cfff71a9 8171#: builtin/remote.c:43
90314792
JX
8172msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8173msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8174
cfff71a9 8175#: builtin/remote.c:48
ef317cd5 8176msgid "git remote set-branches <name> <branch>..."
07432cef 8177msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 8178
cfff71a9 8179#: builtin/remote.c:49
ef317cd5 8180msgid "git remote set-branches --add <name> <branch>..."
07432cef 8181msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 8182
cfff71a9 8183#: builtin/remote.c:54
ef317cd5 8184msgid "git remote show [<options>] <name>"
07432cef 8185msgstr "git remote show [<选项>] <名称>"
ef317cd5 8186
cfff71a9 8187#: builtin/remote.c:59
ef317cd5 8188msgid "git remote prune [<options>] <name>"
07432cef 8189msgstr "git remote prune [<选项>] <名称>"
ef317cd5 8190
cfff71a9 8191#: builtin/remote.c:64
ef317cd5 8192msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 8193msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 8194
cfff71a9 8195#: builtin/remote.c:88
81809b99 8196#, c-format
8ada9598 8197msgid "Updating %s"
81809b99 8198msgstr "更新 %s 中"
8ada9598 8199
cfff71a9 8200#: builtin/remote.c:120
8ada9598
JX
8201msgid ""
8202"--mirror is dangerous and deprecated; please\n"
8203"\t use --mirror=fetch or --mirror=push instead"
8204msgstr ""
81809b99
JX
8205"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8206"\t 或 --mirror=push"
8ada9598 8207
cfff71a9 8208#: builtin/remote.c:137
81809b99 8209#, c-format
8ada9598 8210msgid "unknown mirror argument: %s"
81809b99 8211msgstr "未知的镜像参数:%s"
8ada9598 8212
cfff71a9 8213#: builtin/remote.c:153
ef317cd5 8214msgid "fetch the remote branches"
07432cef 8215msgstr "抓取远程的分支"
ef317cd5 8216
cfff71a9 8217#: builtin/remote.c:155
ef317cd5 8218msgid "import all tags and associated objects when fetching"
07432cef 8219msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5 8220
cfff71a9 8221#: builtin/remote.c:158
ef317cd5 8222msgid "or do not fetch any tag at all (--no-tags)"
07432cef 8223msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5 8224
cfff71a9 8225#: builtin/remote.c:160
ef317cd5 8226msgid "branch(es) to track"
07432cef 8227msgstr "跟踪的分支"
ef317cd5 8228
cfff71a9 8229#: builtin/remote.c:161
ef317cd5 8230msgid "master branch"
07432cef 8231msgstr "主线分支"
ef317cd5 8232
cfff71a9 8233#: builtin/remote.c:162
ef317cd5 8234msgid "push|fetch"
07432cef 8235msgstr "push|fetch"
ef317cd5 8236
cfff71a9 8237#: builtin/remote.c:163
ef317cd5 8238msgid "set up remote as a mirror to push to or fetch from"
07432cef 8239msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 8240
cfff71a9 8241#: builtin/remote.c:175
8ada9598 8242msgid "specifying a master branch makes no sense with --mirror"
81809b99 8243msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 8244
cfff71a9 8245#: builtin/remote.c:177
8ada9598 8246msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 8247msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 8248
6acbf033 8249#: builtin/remote.c:185 builtin/remote.c:640
81809b99 8250#, c-format
8ada9598 8251msgid "remote %s already exists."
81809b99 8252msgstr "远程 %s 已经存在。"
8ada9598 8253
6acbf033 8254#: builtin/remote.c:189 builtin/remote.c:644
81809b99 8255#, c-format
8ada9598 8256msgid "'%s' is not a valid remote name"
81809b99 8257msgstr "'%s' 不是一个有效的远程名称"
8ada9598 8258
cfff71a9 8259#: builtin/remote.c:233
81809b99 8260#, c-format
8ada9598 8261msgid "Could not setup master '%s'"
81809b99 8262msgstr "无法设置 master '%s'"
8ada9598 8263
6acbf033 8264#: builtin/remote.c:288
81809b99 8265#, c-format
8ada9598 8266msgid "more than one %s"
81809b99 8267msgstr "多于一个 %s"
8ada9598 8268
6acbf033 8269#: builtin/remote.c:333
81809b99 8270#, c-format
8ada9598 8271msgid "Could not get fetch map for refspec %s"
90314792 8272msgstr "无法得到引用规则 %s 的获取列表"
8ada9598 8273
6acbf033 8274#: builtin/remote.c:434 builtin/remote.c:442
8ada9598 8275msgid "(matching)"
81809b99 8276msgstr "(匹配)"
8ada9598 8277
6acbf033 8278#: builtin/remote.c:446
8ada9598 8279msgid "(delete)"
81809b99 8280msgstr "(删除)"
8ada9598 8281
6acbf033 8282#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
81809b99 8283#, c-format
8ada9598 8284msgid "Could not append '%s' to '%s'"
81809b99 8285msgstr "不能添加 '%s' 至 '%s'"
8ada9598 8286
6acbf033 8287#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894
81809b99 8288#, c-format
8ada9598 8289msgid "No such remote: %s"
81809b99 8290msgstr "没有这样的远程:%s"
8ada9598 8291
6acbf033 8292#: builtin/remote.c:650
81809b99 8293#, c-format
8ada9598 8294msgid "Could not rename config section '%s' to '%s'"
81809b99 8295msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 8296
6acbf033 8297#: builtin/remote.c:656 builtin/remote.c:846
81809b99 8298#, c-format
8ada9598 8299msgid "Could not remove config section '%s'"
81809b99 8300msgstr "不能移除配置小节 '%s'"
8ada9598 8301
6acbf033 8302#: builtin/remote.c:671
8ada9598
JX
8303#, c-format
8304msgid ""
d691f479 8305"Not updating non-default fetch refspec\n"
8ada9598
JX
8306"\t%s\n"
8307"\tPlease update the configuration manually if necessary."
8308msgstr ""
90314792 8309"没有更新非默认的获取引用规则\n"
81809b99
JX
8310"\t%s\n"
8311"\t如果必要请手动更新配置。"
8ada9598 8312
6acbf033 8313#: builtin/remote.c:677
81809b99 8314#, c-format
8ada9598 8315msgid "Could not append '%s'"
81809b99 8316msgstr "不能追加 '%s'"
8ada9598 8317
6acbf033 8318#: builtin/remote.c:688
81809b99 8319#, c-format
8ada9598 8320msgid "Could not set '%s'"
81809b99 8321msgstr "不能设置 '%s'"
8ada9598 8322
6acbf033 8323#: builtin/remote.c:710
81809b99 8324#, c-format
8ada9598 8325msgid "deleting '%s' failed"
81809b99 8326msgstr "删除 '%s' 失败"
8ada9598 8327
6acbf033 8328#: builtin/remote.c:744
81809b99 8329#, c-format
8ada9598 8330msgid "creating '%s' failed"
81809b99 8331msgstr "创建 '%s' 失败"
8ada9598 8332
6acbf033 8333#: builtin/remote.c:765
81809b99 8334#, c-format
8ada9598 8335msgid "Could not remove branch %s"
81809b99 8336msgstr "无法移除分支 %s"
8ada9598 8337
6acbf033 8338#: builtin/remote.c:832
8ada9598
JX
8339msgid ""
8340"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8341"to delete it, use:"
8342msgid_plural ""
8343"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8344"to delete them, use:"
5ae481e0
JX
8345msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8346msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 8347
6acbf033 8348#: builtin/remote.c:947
8ada9598
JX
8349#, c-format
8350msgid " new (next fetch will store in remotes/%s)"
81809b99 8351msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 8352
6acbf033 8353#: builtin/remote.c:950
8ada9598 8354msgid " tracked"
81809b99 8355msgstr " 已跟踪"
8ada9598 8356
6acbf033 8357#: builtin/remote.c:952
8ada9598 8358msgid " stale (use 'git remote prune' to remove)"
81809b99 8359msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 8360
6acbf033 8361#: builtin/remote.c:954
8ada9598 8362msgid " ???"
81809b99 8363msgstr " ???"
8ada9598 8364
6acbf033 8365#: builtin/remote.c:995
8ada9598
JX
8366#, c-format
8367msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8368msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 8369
6acbf033 8370#: builtin/remote.c:1002
81809b99 8371#, c-format
8ada9598 8372msgid "rebases onto remote %s"
81809b99 8373msgstr "变基到远程 %s"
8ada9598 8374
6acbf033 8375#: builtin/remote.c:1005
81809b99 8376#, c-format
8ada9598 8377msgid " merges with remote %s"
81809b99 8378msgstr " 与远程 %s 合并"
8ada9598 8379
6acbf033 8380#: builtin/remote.c:1006
8ada9598 8381msgid " and with remote"
81809b99 8382msgstr " 且有远程"
8ada9598 8383
6acbf033 8384#: builtin/remote.c:1008
81809b99 8385#, c-format
8ada9598 8386msgid "merges with remote %s"
81809b99 8387msgstr "与远程 %s 合并"
8ada9598 8388
6acbf033 8389#: builtin/remote.c:1009
8ada9598 8390msgid " and with remote"
81809b99 8391msgstr " 且有远程"
8ada9598 8392
6acbf033 8393#: builtin/remote.c:1055
8ada9598 8394msgid "create"
81809b99 8395msgstr "创建"
8ada9598 8396
6acbf033 8397#: builtin/remote.c:1058
8ada9598 8398msgid "delete"
81809b99 8399msgstr "删除"
8ada9598 8400
6acbf033 8401#: builtin/remote.c:1062
8ada9598 8402msgid "up to date"
81809b99 8403msgstr "最新"
8ada9598 8404
6acbf033 8405#: builtin/remote.c:1065
8ada9598 8406msgid "fast-forwardable"
81809b99 8407msgstr "可快进"
8ada9598 8408
6acbf033 8409#: builtin/remote.c:1068
8ada9598 8410msgid "local out of date"
81809b99 8411msgstr "本地已过时"
8ada9598 8412
6acbf033 8413#: builtin/remote.c:1075
8ada9598
JX
8414#, c-format
8415msgid " %-*s forces to %-*s (%s)"
81809b99 8416msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 8417
6acbf033 8418#: builtin/remote.c:1078
8ada9598
JX
8419#, c-format
8420msgid " %-*s pushes to %-*s (%s)"
81809b99 8421msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 8422
6acbf033 8423#: builtin/remote.c:1082
8ada9598
JX
8424#, c-format
8425msgid " %-*s forces to %s"
81809b99 8426msgstr " %-*s 强制推送至 %s"
8ada9598 8427
6acbf033 8428#: builtin/remote.c:1085
8ada9598
JX
8429#, c-format
8430msgid " %-*s pushes to %s"
81809b99 8431msgstr " %-*s 推送至 %s"
8ada9598 8432
6acbf033 8433#: builtin/remote.c:1153
ef317cd5 8434msgid "do not query remotes"
07432cef 8435msgstr "不查询远程"
ef317cd5 8436
6acbf033 8437#: builtin/remote.c:1180
81809b99 8438#, c-format
8ada9598 8439msgid "* remote %s"
81809b99 8440msgstr "* 远程 %s"
8ada9598 8441
6acbf033 8442#: builtin/remote.c:1181
8ada9598
JX
8443#, c-format
8444msgid " Fetch URL: %s"
81809b99 8445msgstr " 获取地址:%s"
8ada9598 8446
6acbf033 8447#: builtin/remote.c:1182 builtin/remote.c:1329
8ada9598 8448msgid "(no URL)"
81809b99 8449msgstr "(无 URL)"
8ada9598 8450
6acbf033 8451#: builtin/remote.c:1191 builtin/remote.c:1193
8ada9598
JX
8452#, c-format
8453msgid " Push URL: %s"
81809b99 8454msgstr " 推送地址:%s"
8ada9598 8455
6acbf033 8456#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
81809b99 8457#, c-format
8ada9598 8458msgid " HEAD branch: %s"
81809b99 8459msgstr " HEAD分支:%s"
8ada9598 8460
6acbf033 8461#: builtin/remote.c:1201
8ada9598
JX
8462#, c-format
8463msgid ""
8464" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8465msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 8466
6acbf033 8467#: builtin/remote.c:1213
81809b99 8468#, c-format
8ada9598
JX
8469msgid " Remote branch:%s"
8470msgid_plural " Remote branches:%s"
81809b99 8471msgstr[0] " 远程分支:%s"
5ae481e0 8472msgstr[1] " 远程分支:%s"
8ada9598 8473
81809b99 8474# 译者:中文字符串拼接,可删除前导空格
6acbf033 8475#: builtin/remote.c:1216 builtin/remote.c:1243
8ada9598 8476msgid " (status not queried)"
81809b99 8477msgstr "(状态未查询)"
8ada9598 8478
6acbf033 8479#: builtin/remote.c:1225
8ada9598
JX
8480msgid " Local branch configured for 'git pull':"
8481msgid_plural " Local branches configured for 'git pull':"
81809b99 8482msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8483msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 8484
6acbf033 8485#: builtin/remote.c:1233
8ada9598 8486msgid " Local refs will be mirrored by 'git push'"
81809b99 8487msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 8488
6acbf033 8489#: builtin/remote.c:1240
81809b99 8490#, c-format
8ada9598
JX
8491msgid " Local ref configured for 'git push'%s:"
8492msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8493msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8494msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8495
6acbf033 8496#: builtin/remote.c:1261
ef317cd5 8497msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8498msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 8499
6acbf033 8500#: builtin/remote.c:1263
ef317cd5 8501msgid "delete refs/remotes/<name>/HEAD"
07432cef 8502msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8503
6acbf033 8504#: builtin/remote.c:1278
8ada9598 8505msgid "Cannot determine remote HEAD"
81809b99 8506msgstr "无法确定远程 HEAD"
8ada9598 8507
6acbf033 8508#: builtin/remote.c:1280
8ada9598 8509msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8510msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 8511
6acbf033 8512#: builtin/remote.c:1290
81809b99 8513#, c-format
8ada9598 8514msgid "Could not delete %s"
81809b99 8515msgstr "无法删除 %s"
8ada9598 8516
6acbf033 8517#: builtin/remote.c:1298
81809b99 8518#, c-format
8ada9598 8519msgid "Not a valid ref: %s"
81809b99 8520msgstr "不是一个有效引用:%s"
8ada9598 8521
6acbf033 8522#: builtin/remote.c:1300
81809b99 8523#, c-format
8ada9598 8524msgid "Could not setup %s"
81809b99 8525msgstr "不能设置 %s"
8ada9598
JX
8526
8527# 译者:注意保持前导空格
6acbf033 8528#: builtin/remote.c:1318
81809b99 8529#, c-format
8ada9598 8530msgid " %s will become dangling!"
07432cef 8531msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8532
8533# 译者:注意保持前导空格
6acbf033 8534#: builtin/remote.c:1319
81809b99 8535#, c-format
8ada9598 8536msgid " %s has become dangling!"
07432cef 8537msgstr " %s 已成为摇摆状态!"
8ada9598 8538
6acbf033 8539#: builtin/remote.c:1325
81809b99 8540#, c-format
8ada9598 8541msgid "Pruning %s"
81809b99 8542msgstr "修剪 %s"
8ada9598 8543
6acbf033 8544#: builtin/remote.c:1326
8ada9598
JX
8545#, c-format
8546msgid "URL: %s"
81809b99 8547msgstr "URL:%s"
8ada9598 8548
6acbf033 8549#: builtin/remote.c:1349
8ada9598
JX
8550#, c-format
8551msgid " * [would prune] %s"
81809b99 8552msgstr " * [将删除] %s"
8ada9598 8553
6acbf033 8554#: builtin/remote.c:1352
8ada9598
JX
8555#, c-format
8556msgid " * [pruned] %s"
81809b99 8557msgstr " * [已删除] %s"
8ada9598 8558
6acbf033 8559#: builtin/remote.c:1397
ef317cd5 8560msgid "prune remotes after fetching"
07432cef 8561msgstr "抓取后清除远程"
ef317cd5 8562
6acbf033 8563#: builtin/remote.c:1463 builtin/remote.c:1537
81809b99 8564#, c-format
8ada9598 8565msgid "No such remote '%s'"
81809b99 8566msgstr "没有此远程 '%s'"
8ada9598 8567
6acbf033 8568#: builtin/remote.c:1483
ef317cd5 8569msgid "add branch"
07432cef 8570msgstr "添加分支"
ef317cd5 8571
6acbf033 8572#: builtin/remote.c:1490
8ada9598 8573msgid "no remote specified"
81809b99 8574msgstr "未指定远程"
8ada9598 8575
6acbf033 8576#: builtin/remote.c:1512
ef317cd5 8577msgid "manipulate push URLs"
07432cef 8578msgstr "操作推送 URLS"
ef317cd5 8579
6acbf033 8580#: builtin/remote.c:1514
ef317cd5 8581msgid "add URL"
07432cef 8582msgstr "添加 URL"
ef317cd5 8583
6acbf033 8584#: builtin/remote.c:1516
ef317cd5 8585msgid "delete URLs"
07432cef 8586msgstr "删除 URLS"
ef317cd5 8587
6acbf033 8588#: builtin/remote.c:1523
8ada9598 8589msgid "--add --delete doesn't make sense"
81809b99 8590msgstr "--add --delete 无意义"
8ada9598 8591
6acbf033 8592#: builtin/remote.c:1563
81809b99 8593#, c-format
8ada9598 8594msgid "Invalid old URL pattern: %s"
81809b99 8595msgstr "无效的旧URL匹配模版:%s"
8ada9598 8596
6acbf033 8597#: builtin/remote.c:1571
81809b99 8598#, c-format
8ada9598 8599msgid "No such URL found: %s"
81809b99 8600msgstr "未找到此URL:%s"
8ada9598 8601
6acbf033 8602#: builtin/remote.c:1573
8ada9598 8603msgid "Will not delete all non-push URLs"
81809b99 8604msgstr "将不会删除所有非推送URL地址"
8ada9598 8605
6acbf033 8606#: builtin/remote.c:1587
ef317cd5 8607msgid "be verbose; must be placed before a subcommand"
07432cef 8608msgstr "冗长输出;必须置于子命令之前"
ef317cd5 8609
6acbf033 8610#: builtin/repack.c:17
90314792
JX
8611msgid "git repack [options]"
8612msgstr "git repack [选项]"
8613
6acbf033 8614#: builtin/repack.c:160
90314792
JX
8615msgid "pack everything in a single pack"
8616msgstr "所有内容打包到一个包文件中"
8617
6acbf033 8618#: builtin/repack.c:162
90314792
JX
8619msgid "same as -a, and turn unreachable objects loose"
8620msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8621
6acbf033 8622#: builtin/repack.c:165
90314792
JX
8623msgid "remove redundant packs, and run git-prune-packed"
8624msgstr "删除多余的包,运行 git-prune-packed"
8625
6acbf033 8626#: builtin/repack.c:167
90314792
JX
8627msgid "pass --no-reuse-delta to git-pack-objects"
8628msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8629
6acbf033 8630#: builtin/repack.c:169
90314792
JX
8631msgid "pass --no-reuse-object to git-pack-objects"
8632msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8633
6acbf033 8634#: builtin/repack.c:171
90314792
JX
8635msgid "do not run git-update-server-info"
8636msgstr "不运行 git-update-server-info"
8637
6acbf033 8638#: builtin/repack.c:174
90314792
JX
8639msgid "pass --local to git-pack-objects"
8640msgstr "向 git-pack-objects 传递参数 --local"
8641
6acbf033 8642#: builtin/repack.c:176
6c94aba5
JX
8643msgid "write bitmap index"
8644msgstr "写 bitmap 索引"
8645
6acbf033 8646#: builtin/repack.c:177
90314792
JX
8647msgid "approxidate"
8648msgstr "近似日期"
8649
6acbf033 8650#: builtin/repack.c:178
90314792
JX
8651msgid "with -A, do not loosen objects older than this"
8652msgstr "使用 -A,不要将早于给定时间的对象过期"
8653
6acbf033 8654#: builtin/repack.c:180
90314792
JX
8655msgid "size of the window used for delta compression"
8656msgstr "用于增量压缩的窗口值"
8657
6acbf033 8658#: builtin/repack.c:181 builtin/repack.c:185
8376b58d
JX
8659msgid "bytes"
8660msgstr "字节"
8661
6acbf033 8662#: builtin/repack.c:182
90314792
JX
8663msgid "same as the above, but limit memory size instead of entries count"
8664msgstr "和上面的相似,但限制内存大小而非条目数"
8665
6acbf033 8666#: builtin/repack.c:184
90314792
JX
8667msgid "limits the maximum delta depth"
8668msgstr "限制最大增量深度"
8669
6acbf033 8670#: builtin/repack.c:186
90314792
JX
8671msgid "maximum size of each packfile"
8672msgstr "每个包的最大尺寸"
8673
6acbf033 8674#: builtin/repack.c:188
6c94aba5
JX
8675msgid "repack objects in packs marked with .keep"
8676msgstr "对标记为 .keep 的包中的对象重新打包"
8677
6acbf033 8678#: builtin/repack.c:374
90314792
JX
8679#, c-format
8680msgid "removing '%s' failed"
8681msgstr "删除 '%s' 失败"
8682
6acbf033 8683#: builtin/replace.c:19
ef317cd5 8684msgid "git replace [-f] <object> <replacement>"
07432cef 8685msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 8686
6acbf033
JX
8687#: builtin/replace.c:20
8688msgid "git replace [-f] --edit <object>"
8689msgstr "git replace [-f] --edit <对象>"
8690
8691#: builtin/replace.c:21
8692msgid "git replace [-f] --graft <commit> [<parent>...]"
8693msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8694
8695#: builtin/replace.c:22
ef317cd5 8696msgid "git replace -d <object>..."
07432cef 8697msgstr "git replace -d <对象>..."
ef317cd5 8698
6acbf033 8699#: builtin/replace.c:23
cfff71a9
JX
8700msgid "git replace [--format=<format>] [-l [<pattern>]]"
8701msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 8702
6acbf033
JX
8703#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388
8704#, c-format
8705msgid "Not a valid object name: '%s'"
8706msgstr "不是一个有效的对象名:'%s'"
8707
8708#: builtin/replace.c:352
8709#, c-format
8710msgid "bad mergetag in commit '%s'"
8711msgstr "提交 '%s' 中损坏的 mergetag"
8712
8713#: builtin/replace.c:354
8714#, c-format
8715msgid "malformed mergetag in commit '%s'"
8716msgstr "提交 '%s' 中非法的 mergetag"
8717
8718#: builtin/replace.c:365
8719#, c-format
8720msgid ""
8721"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8722"instead of --graft"
8723msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8724
8725#: builtin/replace.c:398
8726#, c-format
8727msgid "the original commit '%s' has a gpg signature."
8728msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8729
8730#: builtin/replace.c:399
8731msgid "the signature will be removed in the replacement commit!"
8732msgstr "在替换的提交中签名将被移除!"
8733
8734#: builtin/replace.c:405
8735#, c-format
8736msgid "could not write replacement commit for: '%s'"
8737msgstr "不能为 '%s' 写替换提交"
8738
8739#: builtin/replace.c:429
ef317cd5 8740msgid "list replace refs"
07432cef 8741msgstr "列出替换的引用"
ef317cd5 8742
6acbf033 8743#: builtin/replace.c:430
ef317cd5 8744msgid "delete replace refs"
07432cef 8745msgstr "删除替换的引用"
ef317cd5 8746
6acbf033
JX
8747#: builtin/replace.c:431
8748msgid "edit existing object"
8749msgstr "编辑现存的对象"
8750
8751#: builtin/replace.c:432
8752msgid "change a commit's parents"
8753msgstr "修改一个提交的父提交"
8754
8755#: builtin/replace.c:433
ef317cd5 8756msgid "replace the ref if it exists"
07432cef 8757msgstr "如果存在则替换引用"
ef317cd5 8758
6acbf033
JX
8759#: builtin/replace.c:434
8760msgid "do not pretty-print contents for --edit"
8761msgstr "不要为 --edit 操作美观显示内容"
8762
8763#: builtin/replace.c:435
cfff71a9
JX
8764msgid "use this format"
8765msgstr "使用此格式"
8766
90314792 8767#: builtin/rerere.c:12
ef317cd5 8768msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 8769msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5 8770
90314792 8771#: builtin/rerere.c:57
ef317cd5 8772msgid "register clean resolutions in index"
07432cef 8773msgstr "在索引中注册干净的解决方案"
ef317cd5
JX
8774
8775#: builtin/reset.c:25
8776msgid ""
8777"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 8778msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5
JX
8779
8780#: builtin/reset.c:26
07432cef
WS
8781msgid "git reset [-q] <tree-ish> [--] <paths>..."
8782msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5
JX
8783
8784#: builtin/reset.c:27
07432cef
WS
8785msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8786msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 8787
c04f5ac3
JX
8788#: builtin/reset.c:33
8789msgid "mixed"
8790msgstr "混杂"
8791
8792#: builtin/reset.c:33
8793msgid "soft"
8794msgstr "软性"
8795
8796#: builtin/reset.c:33
8797msgid "hard"
8798msgstr "硬性"
8799
8ada9598
JX
8800#: builtin/reset.c:33
8801msgid "merge"
8802msgstr "合并"
8803
c04f5ac3
JX
8804#: builtin/reset.c:33
8805msgid "keep"
8806msgstr "保持"
8807
07432cef 8808#: builtin/reset.c:73
c04f5ac3
JX
8809msgid "You do not have a valid HEAD."
8810msgstr "您没有一个有效的 HEAD。"
8811
07432cef 8812#: builtin/reset.c:75
c04f5ac3
JX
8813msgid "Failed to find tree of HEAD."
8814msgstr "无法找到 HEAD 指向的树。"
8815
07432cef 8816#: builtin/reset.c:81
c04f5ac3
JX
8817#, c-format
8818msgid "Failed to find tree of %s."
8819msgstr "无法找到 %s 指向的树。"
8820
2e8451e8 8821#: builtin/reset.c:99
c04f5ac3
JX
8822#, c-format
8823msgid "HEAD is now at %s"
8824msgstr "HEAD 现在位于 %s"
8825
90e6ef53 8826# 译者:汉字之间无空格,故删除%s前后空格
6c94aba5 8827#: builtin/reset.c:182
c04f5ac3
JX
8828#, c-format
8829msgid "Cannot do a %s reset in the middle of a merge."
8830msgstr "在合并过程中不能做%s重置操作。"
8831
6acbf033 8832#: builtin/reset.c:275
ef317cd5 8833msgid "be quiet, only report errors"
07432cef 8834msgstr "安静模式,只报告错误"
ef317cd5 8835
6acbf033 8836#: builtin/reset.c:277
ef317cd5 8837msgid "reset HEAD and index"
07432cef 8838msgstr "重置 HEAD 和索引"
ef317cd5 8839
6acbf033 8840#: builtin/reset.c:278
ef317cd5 8841msgid "reset only HEAD"
07432cef 8842msgstr "只重置 HEAD"
ef317cd5 8843
6acbf033 8844#: builtin/reset.c:280 builtin/reset.c:282
ef317cd5 8845msgid "reset HEAD, index and working tree"
07432cef 8846msgstr "重置 HEAD、索引和工作区"
ef317cd5 8847
6acbf033 8848#: builtin/reset.c:284
ef317cd5 8849msgid "reset HEAD but keep local changes"
07432cef 8850msgstr "重置 HEAD 但保存本地变更"
ef317cd5 8851
6acbf033 8852#: builtin/reset.c:287
6c94aba5
JX
8853msgid "record only the fact that removed paths will be added later"
8854msgstr "将删除的路径标记为稍后添加"
8855
6acbf033 8856#: builtin/reset.c:304
07432cef
WS
8857#, c-format
8858msgid "Failed to resolve '%s' as a valid revision."
8859msgstr "无法将 '%s' 解析为一个有效的版本。"
8860
6acbf033 8861#: builtin/reset.c:307 builtin/reset.c:315
c04f5ac3
JX
8862#, c-format
8863msgid "Could not parse object '%s'."
8864msgstr "不能解析对象 '%s'。"
8865
6acbf033 8866#: builtin/reset.c:312
07432cef
WS
8867#, c-format
8868msgid "Failed to resolve '%s' as a valid tree."
8869msgstr "无法将 '%s' 解析为一个有效的树对象。"
8870
6acbf033 8871#: builtin/reset.c:321
c04f5ac3 8872msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 8873msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 8874
6acbf033 8875#: builtin/reset.c:330
c04f5ac3 8876msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 8877msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 8878
90e6ef53 8879# 译者:汉字之间无空格,故删除%s前后空格
6acbf033 8880#: builtin/reset.c:332
c04f5ac3
JX
8881#, c-format
8882msgid "Cannot do %s reset with paths."
8883msgstr "不能带路径进行%s重置。"
8884
90e6ef53 8885# 译者:汉字之间无空格,故删除%s前后空格
6acbf033 8886#: builtin/reset.c:342
c04f5ac3
JX
8887#, c-format
8888msgid "%s reset is not allowed in a bare repository"
8889msgstr "不能对裸版本库进行%s重置"
8890
6acbf033 8891#: builtin/reset.c:346
6c94aba5
JX
8892msgid "-N can only be used with --mixed"
8893msgstr "-N 只能和 --mixed 同时使用"
8894
6acbf033 8895#: builtin/reset.c:363
90314792
JX
8896msgid "Unstaged changes after reset:"
8897msgstr "重置后撤出暂存区的变更:"
8898
6acbf033 8899#: builtin/reset.c:369
ef317cd5
JX
8900#, c-format
8901msgid "Could not reset index file to revision '%s'."
8902msgstr "不能重置索引文件至版本 '%s'。"
8903
6acbf033 8904#: builtin/reset.c:373
07432cef
WS
8905msgid "Could not write new index file."
8906msgstr "不能写入新的索引文件。"
8907
6acbf033 8908#: builtin/rev-parse.c:360
ef317cd5 8909msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 8910msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5 8911
6acbf033 8912#: builtin/rev-parse.c:365
ef317cd5 8913msgid "keep the `--` passed as an arg"
07432cef 8914msgstr "保持 `--` 作为一个参数传递"
ef317cd5 8915
6acbf033 8916#: builtin/rev-parse.c:367
ef317cd5 8917msgid "stop parsing after the first non-option argument"
07432cef 8918msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 8919
6acbf033 8920#: builtin/rev-parse.c:370
cfff71a9
JX
8921msgid "output in stuck long form"
8922msgstr "以固定长格式输出"
8923
6acbf033 8924#: builtin/rev-parse.c:498
ef317cd5
JX
8925msgid ""
8926"git rev-parse --parseopt [options] -- [<args>...]\n"
8927" or: git rev-parse --sq-quote [<arg>...]\n"
8928" or: git rev-parse [options] [<arg>...]\n"
8929"\n"
8930"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8931msgstr ""
07432cef 8932"git rev-parse --parseopt [选项] -- [<参数>...]\n"
90314792
JX
8933" 或者:git rev-parse --sq-quote [<参数>...]\n"
8934" 或者:git rev-parse [选项] [<参数>...]\n"
07432cef
WS
8935"\n"
8936"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
8937
8938#: builtin/revert.c:22
4dcdc3d8
JX
8939msgid "git revert [options] <commit-ish>..."
8940msgstr "git revert [选项] <提交号>..."
ef317cd5
JX
8941
8942#: builtin/revert.c:23
8943msgid "git revert <subcommand>"
07432cef 8944msgstr "git revert <子命令>"
ef317cd5
JX
8945
8946#: builtin/revert.c:28
4dcdc3d8
JX
8947msgid "git cherry-pick [options] <commit-ish>..."
8948msgstr "git cherry-pick [选项] <提交号>..."
ef317cd5
JX
8949
8950#: builtin/revert.c:29
ef317cd5 8951msgid "git cherry-pick <subcommand>"
07432cef 8952msgstr "git cherry-pick <子命令>"
ef317cd5 8953
90314792 8954#: builtin/revert.c:71
ef317cd5
JX
8955#, c-format
8956msgid "%s: %s cannot be used with %s"
8957msgstr "%s:%s 不能和 %s 同时使用"
8958
90314792 8959#: builtin/revert.c:80
ef317cd5 8960msgid "end revert or cherry-pick sequence"
07432cef 8961msgstr "终止反转或拣选操作"
ef317cd5 8962
90314792 8963#: builtin/revert.c:81
ef317cd5 8964msgid "resume revert or cherry-pick sequence"
07432cef 8965msgstr "继续反转或拣选操作"
ef317cd5 8966
90314792 8967#: builtin/revert.c:82
ef317cd5 8968msgid "cancel revert or cherry-pick sequence"
07432cef 8969msgstr "取消反转或拣选操作"
ef317cd5 8970
90314792 8971#: builtin/revert.c:83
ef317cd5 8972msgid "don't automatically commit"
07432cef 8973msgstr "不要自动提交"
ef317cd5 8974
90314792 8975#: builtin/revert.c:84
ef317cd5 8976msgid "edit the commit message"
07432cef 8977msgstr "编辑提交说明"
ef317cd5 8978
90314792 8979#: builtin/revert.c:87
ef317cd5 8980msgid "parent number"
07432cef 8981msgstr "父编号"
ef317cd5 8982
90314792 8983#: builtin/revert.c:89
ef317cd5 8984msgid "merge strategy"
07432cef 8985msgstr "合并策略"
ef317cd5 8986
90314792 8987#: builtin/revert.c:90
ef317cd5 8988msgid "option"
07432cef 8989msgstr "选项"
ef317cd5 8990
90314792 8991#: builtin/revert.c:91
ef317cd5 8992msgid "option for merge strategy"
07432cef 8993msgstr "合并策略的选项"
ef317cd5 8994
6c94aba5 8995#: builtin/revert.c:104
ef317cd5 8996msgid "append commit name"
07432cef 8997msgstr "追加提交名称"
ef317cd5 8998
6c94aba5 8999#: builtin/revert.c:105
ef317cd5 9000msgid "allow fast-forward"
07432cef 9001msgstr "允许快进式"
c04f5ac3 9002
6c94aba5 9003#: builtin/revert.c:106
ef317cd5 9004msgid "preserve initially empty commits"
07432cef 9005msgstr "保留初始化的空提交"
ef317cd5 9006
6c94aba5 9007#: builtin/revert.c:107
ef317cd5 9008msgid "allow commits with empty messages"
07432cef 9009msgstr "允许提交说明为空"
c04f5ac3 9010
6c94aba5 9011#: builtin/revert.c:108
ef317cd5 9012msgid "keep redundant, empty commits"
07432cef 9013msgstr "保持多余的、空的提交"
ef317cd5 9014
6c94aba5 9015#: builtin/revert.c:112
c04f5ac3
JX
9016msgid "program error"
9017msgstr "程序错误"
9018
6c94aba5 9019#: builtin/revert.c:197
c04f5ac3
JX
9020msgid "revert failed"
9021msgstr "还原失败"
9022
6c94aba5 9023#: builtin/revert.c:212
c04f5ac3
JX
9024msgid "cherry-pick failed"
9025msgstr "拣选失败"
9026
90314792 9027#: builtin/rm.c:17
ef317cd5 9028msgid "git rm [options] [--] <file>..."
07432cef
WS
9029msgstr "git rm [选项] [--] <文件>..."
9030
90314792 9031#: builtin/rm.c:65
2e8451e8
JX
9032msgid ""
9033"the following submodule (or one of its nested submodules)\n"
9034"uses a .git directory:"
9035msgid_plural ""
9036"the following submodules (or one of its nested submodules)\n"
9037"use a .git directory:"
9038msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9039msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9040
90314792 9041#: builtin/rm.c:71
07432cef 9042msgid ""
2e8451e8 9043"\n"
07432cef
WS
9044"(use 'rm -rf' if you really want to remove it including all of its history)"
9045msgstr ""
2e8451e8 9046"\n"
07432cef 9047"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 9048
90314792 9049#: builtin/rm.c:231
c04f5ac3 9050msgid ""
2e8451e8
JX
9051"the following file has staged content different from both the\n"
9052"file and the HEAD:"
9053msgid_plural ""
9054"the following files have staged content different from both the\n"
9055"file and the HEAD:"
9056msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9057msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9058
90314792 9059#: builtin/rm.c:236
2e8451e8
JX
9060msgid ""
9061"\n"
c04f5ac3
JX
9062"(use -f to force removal)"
9063msgstr ""
2e8451e8 9064"\n"
c04f5ac3
JX
9065"(使用 -f 强制删除)"
9066
90314792 9067#: builtin/rm.c:240
2e8451e8
JX
9068msgid "the following file has changes staged in the index:"
9069msgid_plural "the following files have changes staged in the index:"
9070msgstr[0] "如下文件相对索引区的内容有修改"
9071msgstr[1] "如下文件相对索引区的内容有修改"
c04f5ac3 9072
90314792 9073#: builtin/rm.c:244 builtin/rm.c:255
c04f5ac3 9074msgid ""
2e8451e8 9075"\n"
c04f5ac3
JX
9076"(use --cached to keep the file, or -f to force removal)"
9077msgstr ""
2e8451e8
JX
9078"\n"
9079"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9080
90314792 9081#: builtin/rm.c:252
2e8451e8
JX
9082msgid "the following file has local modifications:"
9083msgid_plural "the following files have local modifications:"
9084msgstr[0] "如下文件有本地修改:"
9085msgstr[1] "如下文件有本地修改:"
c04f5ac3 9086
90314792 9087#: builtin/rm.c:270
ef317cd5 9088msgid "do not list removed files"
07432cef 9089msgstr "不列出删除的文件"
ef317cd5 9090
90314792 9091#: builtin/rm.c:271
ef317cd5 9092msgid "only remove from the index"
07432cef 9093msgstr "只从索引区删除"
ef317cd5 9094
90314792 9095#: builtin/rm.c:272
ef317cd5 9096msgid "override the up-to-date check"
07432cef 9097msgstr "忽略文件更新状态检查"
ef317cd5 9098
90314792 9099#: builtin/rm.c:273
ef317cd5 9100msgid "allow recursive removal"
07432cef 9101msgstr "允许递归删除"
ef317cd5 9102
90314792 9103#: builtin/rm.c:275
ef317cd5 9104msgid "exit with a zero status even if nothing matched"
07432cef 9105msgstr "即使没有匹配,也以零状态退出"
ef317cd5 9106
90314792 9107#: builtin/rm.c:336
c04f5ac3
JX
9108#, c-format
9109msgid "not removing '%s' recursively without -r"
9110msgstr "未提供 -r 选项不会递归删除 '%s'"
9111
90314792 9112#: builtin/rm.c:375
c04f5ac3
JX
9113#, c-format
9114msgid "git rm: unable to remove %s"
9115msgstr "git rm:不能删除 %s"
9116
ef317cd5 9117#: builtin/shortlog.c:13
4dcdc3d8
JX
9118msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9119msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 9120
4dcdc3d8 9121#: builtin/shortlog.c:131
c04f5ac3
JX
9122#, c-format
9123msgid "Missing author: %s"
9124msgstr "缺少作者:%s"
9125
90314792 9126#: builtin/shortlog.c:230
ef317cd5 9127msgid "sort output according to the number of commits per author"
07432cef 9128msgstr "根据每个作者的提交数量排序"
ef317cd5 9129
90314792 9130#: builtin/shortlog.c:232
ef317cd5 9131msgid "Suppress commit descriptions, only provides commit count"
07432cef 9132msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 9133
90314792 9134#: builtin/shortlog.c:234
ef317cd5 9135msgid "Show the email address of each author"
07432cef 9136msgstr "显示每个作者的电子邮件地址"
ef317cd5 9137
90314792 9138#: builtin/shortlog.c:235
ef317cd5 9139msgid "w[,i1[,i2]]"
07432cef 9140msgstr "w[,i1[,i2]]"
ef317cd5 9141
90314792 9142#: builtin/shortlog.c:236
ef317cd5 9143msgid "Linewrap output"
07432cef 9144msgstr "折行输出"
ef317cd5
JX
9145
9146#: builtin/show-branch.c:9
9147msgid ""
9148"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9149"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9150"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9151"<glob>)...]"
9152msgstr ""
07432cef
WS
9153"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9154"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9155"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9156"<glob>)...]"
ef317cd5
JX
9157
9158#: builtin/show-branch.c:10
9159msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 9160msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5 9161
cfff71a9 9162#: builtin/show-branch.c:649
ef317cd5 9163msgid "show remote-tracking and local branches"
07432cef 9164msgstr "显示远程跟踪的和本地的分支"
ef317cd5 9165
cfff71a9 9166#: builtin/show-branch.c:651
ef317cd5 9167msgid "show remote-tracking branches"
07432cef 9168msgstr "显示远程跟踪的分支"
ef317cd5 9169
cfff71a9 9170#: builtin/show-branch.c:653
ef317cd5 9171msgid "color '*!+-' corresponding to the branch"
07432cef 9172msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 9173
cfff71a9 9174#: builtin/show-branch.c:655
ef317cd5 9175msgid "show <n> more commits after the common ancestor"
07432cef 9176msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 9177
cfff71a9 9178#: builtin/show-branch.c:657
ef317cd5 9179msgid "synonym to more=-1"
07432cef 9180msgstr "和 more=-1 同义"
ef317cd5 9181
cfff71a9 9182#: builtin/show-branch.c:658
ef317cd5 9183msgid "suppress naming strings"
07432cef 9184msgstr "不显示字符串命名"
ef317cd5 9185
cfff71a9 9186#: builtin/show-branch.c:660
ef317cd5 9187msgid "include the current branch"
07432cef 9188msgstr "包括当前分支"
ef317cd5 9189
cfff71a9 9190#: builtin/show-branch.c:662
ef317cd5 9191msgid "name commits with their object names"
07432cef 9192msgstr "以对象名字命名提交"
ef317cd5 9193
cfff71a9 9194#: builtin/show-branch.c:664
ef317cd5 9195msgid "show possible merge bases"
07432cef 9196msgstr "显示可能合并的基线"
ef317cd5 9197
cfff71a9 9198#: builtin/show-branch.c:666
ef317cd5 9199msgid "show refs unreachable from any other ref"
07432cef 9200msgstr "显示没有任何引用的的引用"
ef317cd5 9201
cfff71a9 9202#: builtin/show-branch.c:668
ef317cd5 9203msgid "show commits in topological order"
07432cef 9204msgstr "以拓扑顺序显示提交"
ef317cd5 9205
cfff71a9 9206#: builtin/show-branch.c:671
ef317cd5 9207msgid "show only commits not on the first branch"
07432cef 9208msgstr "只显示不在第一个分支上的提交"
ef317cd5 9209
cfff71a9 9210#: builtin/show-branch.c:673
ef317cd5 9211msgid "show merges reachable from only one tip"
07432cef 9212msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 9213
cfff71a9 9214#: builtin/show-branch.c:675
2e8451e8
JX
9215msgid "topologically sort, maintaining date order where possible"
9216msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 9217
cfff71a9 9218#: builtin/show-branch.c:678
ef317cd5 9219msgid "<n>[,<base>]"
07432cef 9220msgstr "<n>[,<base>]"
ef317cd5 9221
cfff71a9 9222#: builtin/show-branch.c:679
ef317cd5 9223msgid "show <n> most recent ref-log entries starting at base"
07432cef 9224msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
9225
9226#: builtin/show-ref.c:10
9227msgid ""
a77c07d9
JX
9228"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9229"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5 9230msgstr ""
a77c07d9
JX
9231"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9232"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
9233
9234#: builtin/show-ref.c:11
9235msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 9236msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 9237
2e8451e8 9238#: builtin/show-ref.c:168
ef317cd5 9239msgid "only show tags (can be combined with heads)"
07432cef 9240msgstr "只显示 tags(可以和头共用)"
ef317cd5 9241
2e8451e8 9242#: builtin/show-ref.c:169
ef317cd5 9243msgid "only show heads (can be combined with tags)"
07432cef 9244msgstr "只显示头(可以和 tags 共用)"
ef317cd5 9245
2e8451e8 9246#: builtin/show-ref.c:170
ef317cd5 9247msgid "stricter reference checking, requires exact ref path"
07432cef 9248msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 9249
90314792 9250#: builtin/show-ref.c:173 builtin/show-ref.c:175
2e8451e8
JX
9251msgid "show the HEAD reference, even if it would be filtered out"
9252msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 9253
90314792 9254#: builtin/show-ref.c:177
ef317cd5 9255msgid "dereference tags into object IDs"
07432cef 9256msgstr "转换 tags 到对象ID"
ef317cd5 9257
90314792 9258#: builtin/show-ref.c:179
ef317cd5 9259msgid "only show SHA1 hash using <n> digits"
07432cef 9260msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 9261
90314792 9262#: builtin/show-ref.c:183
ef317cd5 9263msgid "do not print results to stdout (useful with --verify)"
07432cef 9264msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 9265
90314792 9266#: builtin/show-ref.c:185
ef317cd5 9267msgid "show refs from stdin that aren't in local repository"
07432cef 9268msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
9269
9270#: builtin/symbolic-ref.c:7
9271msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
9272msgstr "git symbolic-ref [选项] 名称 [引用]"
9273
9274#: builtin/symbolic-ref.c:8
9275msgid "git symbolic-ref -d [-q] name"
9276msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 9277
07432cef 9278#: builtin/symbolic-ref.c:40
ef317cd5 9279msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
9280msgstr "不显示非符号(分离的)引用的错误信息"
9281
9282#: builtin/symbolic-ref.c:41
9283msgid "delete symbolic ref"
9284msgstr "删除符号引用"
ef317cd5 9285
07432cef 9286#: builtin/symbolic-ref.c:42
ef317cd5 9287msgid "shorten ref output"
07432cef 9288msgstr "简短的引用输出"
ef317cd5 9289
6acbf033 9290#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
ef317cd5 9291msgid "reason"
07432cef 9292msgstr "原因"
ef317cd5 9293
6acbf033 9294#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
ef317cd5 9295msgid "reason of the update"
07432cef 9296msgstr "更新的原因"
ef317cd5
JX
9297
9298#: builtin/tag.c:22
9299msgid ""
9300"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
a77c07d9 9301msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
9302
9303#: builtin/tag.c:23
9304msgid "git tag -d <tagname>..."
07432cef 9305msgstr "git tag -d <标签名>..."
ef317cd5
JX
9306
9307#: builtin/tag.c:24
9308msgid ""
9309"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9310"\t\t[<pattern>...]"
9311msgstr ""
07432cef
WS
9312"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9313"\t\t[<模式>...]"
ef317cd5
JX
9314
9315#: builtin/tag.c:26
9316msgid "git tag -v <tagname>..."
07432cef 9317msgstr "git tag -v <标签名>..."
ef317cd5 9318
6acbf033 9319#: builtin/tag.c:69
7ac1c0ad
JX
9320#, c-format
9321msgid "malformed object at '%s'"
9322msgstr "非法的对象于 '%s'"
9323
6acbf033 9324#: builtin/tag.c:301
c04f5ac3
JX
9325#, c-format
9326msgid "tag name too long: %.*s..."
9327msgstr "tag 名字太长:%.*s..."
9328
6acbf033 9329#: builtin/tag.c:306
c04f5ac3
JX
9330#, c-format
9331msgid "tag '%s' not found."
9332msgstr "tag '%s' 未发现。"
9333
6acbf033 9334#: builtin/tag.c:321
c04f5ac3
JX
9335#, c-format
9336msgid "Deleted tag '%s' (was %s)\n"
9337msgstr "已删除 tag '%s'(曾为 %s)\n"
9338
6acbf033 9339#: builtin/tag.c:333
c04f5ac3
JX
9340#, c-format
9341msgid "could not verify the tag '%s'"
9342msgstr "不能校验 tag '%s'"
9343
6acbf033 9344#: builtin/tag.c:343
a77c07d9 9345#, c-format
c04f5ac3
JX
9346msgid ""
9347"\n"
6acbf033
JX
9348"Write a message for tag:\n"
9349" %s\n"
a77c07d9 9350"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
9351msgstr ""
9352"\n"
6acbf033
JX
9353"输入一个 tag 说明:\n"
9354" %s\n"
a77c07d9 9355"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 9356
6acbf033 9357#: builtin/tag.c:347
a77c07d9 9358#, c-format
c04f5ac3
JX
9359msgid ""
9360"\n"
6acbf033
JX
9361"Write a message for tag:\n"
9362" %s\n"
a77c07d9 9363"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 9364"want to.\n"
c04f5ac3
JX
9365msgstr ""
9366"\n"
6acbf033
JX
9367"输入一个 tag 说明:\n"
9368" %s\n"
a77c07d9 9369"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 9370
6acbf033
JX
9371#: builtin/tag.c:371
9372#, c-format
9373msgid "unsupported sort specification '%s'"
9374msgstr "不支持的排序规格 '%s'"
9375
9376#: builtin/tag.c:373
9377#, c-format
9378msgid "unsupported sort specification '%s' in variable '%s'"
9379msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9380
9381#: builtin/tag.c:428
c04f5ac3
JX
9382msgid "unable to sign the tag"
9383msgstr "无法签署 tag"
9384
6acbf033 9385#: builtin/tag.c:430
c04f5ac3
JX
9386msgid "unable to write tag file"
9387msgstr "无法写 tag 文件"
9388
6acbf033 9389#: builtin/tag.c:455
c04f5ac3 9390msgid "bad object type."
90e6ef53 9391msgstr "坏的对象类型。"
c04f5ac3 9392
6acbf033 9393#: builtin/tag.c:468
c04f5ac3 9394msgid "tag header too big."
90e6ef53 9395msgstr "tag 头信息太大。"
c04f5ac3 9396
6acbf033 9397#: builtin/tag.c:504
c04f5ac3
JX
9398msgid "no tag message?"
9399msgstr "无 tag 说明?"
9400
6acbf033 9401#: builtin/tag.c:510
c04f5ac3
JX
9402#, c-format
9403msgid "The tag message has been left in %s\n"
9404msgstr "tag 说明被保留在 %s\n"
9405
6acbf033 9406#: builtin/tag.c:559
7ac1c0ad
JX
9407msgid "switch 'points-at' requires an object"
9408msgstr "开关 'points-at' 需要一个对象"
9409
6acbf033 9410#: builtin/tag.c:561
7ac1c0ad
JX
9411#, c-format
9412msgid "malformed object name '%s'"
9413msgstr "非法的对象名 '%s'"
9414
6acbf033 9415#: builtin/tag.c:588
ef317cd5 9416msgid "list tag names"
07432cef 9417msgstr "列出tag名称"
ef317cd5 9418
6acbf033 9419#: builtin/tag.c:590
ef317cd5 9420msgid "print <n> lines of each tag message"
07432cef 9421msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 9422
6acbf033 9423#: builtin/tag.c:592
ef317cd5 9424msgid "delete tags"
07432cef 9425msgstr "删除 tags"
ef317cd5 9426
6acbf033 9427#: builtin/tag.c:593
ef317cd5 9428msgid "verify tags"
07432cef 9429msgstr "验证 tags"
ef317cd5 9430
6acbf033 9431#: builtin/tag.c:595
ef317cd5 9432msgid "Tag creation options"
07432cef 9433msgstr "Tag 创建选项"
ef317cd5 9434
6acbf033 9435#: builtin/tag.c:597
ef317cd5 9436msgid "annotated tag, needs a message"
07432cef 9437msgstr "注解 tag,需要一个说明"
ef317cd5 9438
6acbf033 9439#: builtin/tag.c:599
ef317cd5 9440msgid "tag message"
07432cef 9441msgstr "tag 说明"
ef317cd5 9442
6acbf033 9443#: builtin/tag.c:601
ef317cd5 9444msgid "annotated and GPG-signed tag"
07432cef 9445msgstr "注解并 GPG 签名的 tag"
ef317cd5 9446
6acbf033 9447#: builtin/tag.c:605
ef317cd5 9448msgid "use another key to sign the tag"
07432cef 9449msgstr "使用另外的私钥签名 tag"
ef317cd5 9450
6acbf033 9451#: builtin/tag.c:606
ef317cd5 9452msgid "replace the tag if exists"
07432cef 9453msgstr "如果存在,替换现有的 tag"
ef317cd5 9454
6acbf033 9455#: builtin/tag.c:607
ef317cd5 9456msgid "show tag list in columns"
07432cef 9457msgstr "以列的方式显示 tag"
ef317cd5 9458
6acbf033 9459#: builtin/tag.c:609
6c94aba5
JX
9460msgid "sort tags"
9461msgstr "排序 tags"
9462
6acbf033 9463#: builtin/tag.c:613
ef317cd5 9464msgid "Tag listing options"
07432cef 9465msgstr "Tag 列表选项"
ef317cd5 9466
6acbf033 9467#: builtin/tag.c:616 builtin/tag.c:622
ef317cd5 9468msgid "print only tags that contain the commit"
07432cef 9469msgstr "只打印包含提交的tags"
ef317cd5 9470
6acbf033 9471#: builtin/tag.c:628
ef317cd5 9472msgid "print only tags of the object"
07432cef 9473msgstr "只打印tags对象"
ef317cd5 9474
6acbf033 9475#: builtin/tag.c:654
8ada9598 9476msgid "--column and -n are incompatible"
81809b99 9477msgstr "--column 和 -n 不兼容"
8ada9598 9478
6acbf033 9479#: builtin/tag.c:666
6c94aba5
JX
9480msgid "--sort and -n are incompatible"
9481msgstr "--sort 和 -n 不兼容"
9482
6acbf033 9483#: builtin/tag.c:673
c04f5ac3 9484msgid "-n option is only allowed with -l."
649900bc 9485msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9486
6acbf033 9487#: builtin/tag.c:675
c04f5ac3 9488msgid "--contains option is only allowed with -l."
649900bc 9489msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9490
6acbf033 9491#: builtin/tag.c:677
7ac1c0ad 9492msgid "--points-at option is only allowed with -l."
649900bc 9493msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9494
6acbf033 9495#: builtin/tag.c:685
c04f5ac3
JX
9496msgid "only one -F or -m option is allowed."
9497msgstr "只允许一个 -F 或 -m 选项。"
9498
6acbf033 9499#: builtin/tag.c:705
c04f5ac3
JX
9500msgid "too many params"
9501msgstr "太多参数"
9502
6acbf033 9503#: builtin/tag.c:711
c04f5ac3
JX
9504#, c-format
9505msgid "'%s' is not a valid tag name."
90e6ef53 9506msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 9507
6acbf033 9508#: builtin/tag.c:716
c04f5ac3
JX
9509#, c-format
9510msgid "tag '%s' already exists"
9511msgstr "tag '%s' 已存在"
9512
6acbf033 9513#: builtin/tag.c:734
c04f5ac3
JX
9514#, c-format
9515msgid "%s: cannot lock the ref"
9516msgstr "%s:不能锁定引用"
9517
6acbf033 9518#: builtin/tag.c:736
c04f5ac3
JX
9519#, c-format
9520msgid "%s: cannot update the ref"
9521msgstr "%s:不能更新引用"
9522
6acbf033 9523#: builtin/tag.c:738
c04f5ac3
JX
9524#, c-format
9525msgid "Updated tag '%s' (was %s)\n"
9526msgstr "已更新tag '%s'(曾为 %s)\n"
9527
6c94aba5
JX
9528#: builtin/unpack-objects.c:483
9529msgid "Unpacking objects"
9530msgstr "展开对象中"
9531
6acbf033 9532#: builtin/update-index.c:402
ef317cd5 9533msgid "git update-index [options] [--] [<file>...]"
07432cef 9534msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 9535
6acbf033 9536#: builtin/update-index.c:755
ef317cd5 9537msgid "continue refresh even when index needs update"
07432cef 9538msgstr "当索引需要更新时继续刷新"
8ada9598 9539
6acbf033 9540#: builtin/update-index.c:758
ef317cd5 9541msgid "refresh: ignore submodules"
07432cef 9542msgstr "刷新:忽略子模组"
8ada9598 9543
6acbf033 9544#: builtin/update-index.c:761
ef317cd5 9545msgid "do not ignore new files"
07432cef 9546msgstr "不忽略新的文件"
8ada9598 9547
6acbf033 9548#: builtin/update-index.c:763
ef317cd5 9549msgid "let files replace directories and vice-versa"
07432cef 9550msgstr "让文件替换目录(反之亦然)"
ef317cd5 9551
6acbf033 9552#: builtin/update-index.c:765
ef317cd5 9553msgid "notice files missing from worktree"
07432cef 9554msgstr "通知文件从工作区丢失"
ef317cd5 9555
6acbf033 9556#: builtin/update-index.c:767
ef317cd5 9557msgid "refresh even if index contains unmerged entries"
07432cef 9558msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 9559
6acbf033 9560#: builtin/update-index.c:770
ef317cd5 9561msgid "refresh stat information"
07432cef 9562msgstr "刷新统计信息"
ef317cd5 9563
6acbf033 9564#: builtin/update-index.c:774
ef317cd5 9565msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 9566msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 9567
6acbf033 9568#: builtin/update-index.c:778
6c94aba5
JX
9569msgid "<mode>,<object>,<path>"
9570msgstr "<mode>,<object>,<path>"
ef317cd5 9571
6acbf033 9572#: builtin/update-index.c:779
ef317cd5 9573msgid "add the specified entry to the index"
07432cef 9574msgstr "添加指定的条目到索引区"
ef317cd5 9575
6acbf033 9576#: builtin/update-index.c:783
ef317cd5 9577msgid "(+/-)x"
07432cef 9578msgstr "(+/-)x"
ef317cd5 9579
6acbf033 9580#: builtin/update-index.c:784
ef317cd5 9581msgid "override the executable bit of the listed files"
07432cef 9582msgstr "覆盖列表里文件的可执行位"
ef317cd5 9583
6acbf033 9584#: builtin/update-index.c:788
ef317cd5 9585msgid "mark files as \"not changing\""
07432cef 9586msgstr "把文件标记为 \"没有变更\""
ef317cd5 9587
6acbf033 9588#: builtin/update-index.c:791
ef317cd5 9589msgid "clear assumed-unchanged bit"
07432cef 9590msgstr "清除 assumed-unchanged 位"
ef317cd5 9591
6acbf033 9592#: builtin/update-index.c:794
ef317cd5 9593msgid "mark files as \"index-only\""
07432cef 9594msgstr "把文件标记为 \"仅索引\""
ef317cd5 9595
6acbf033 9596#: builtin/update-index.c:797
ef317cd5 9597msgid "clear skip-worktree bit"
07432cef 9598msgstr "清除 skip-worktree 位"
ef317cd5 9599
6acbf033 9600#: builtin/update-index.c:800
ef317cd5 9601msgid "add to index only; do not add content to object database"
07432cef 9602msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 9603
6acbf033 9604#: builtin/update-index.c:802
ef317cd5 9605msgid "remove named paths even if present in worktree"
07432cef 9606msgstr "即使存在工作区里,也删除路径"
ef317cd5 9607
6acbf033 9608#: builtin/update-index.c:804
ef317cd5 9609msgid "with --stdin: input lines are terminated by null bytes"
07432cef 9610msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 9611
6acbf033 9612#: builtin/update-index.c:806
ef317cd5 9613msgid "read list of paths to be updated from standard input"
07432cef 9614msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 9615
6acbf033 9616#: builtin/update-index.c:810
ef317cd5 9617msgid "add entries from standard input to the index"
07432cef 9618msgstr "从标准输入添加条目到索引区"
ef317cd5 9619
6acbf033 9620#: builtin/update-index.c:814
ef317cd5 9621msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 9622msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 9623
6acbf033 9624#: builtin/update-index.c:818
ef317cd5 9625msgid "only update entries that differ from HEAD"
07432cef 9626msgstr "只更新与 HEAD 不同的条目"
ef317cd5 9627
6acbf033 9628#: builtin/update-index.c:822
ef317cd5 9629msgid "ignore files missing from worktree"
07432cef 9630msgstr "忽略工作区丢失的文件"
ef317cd5 9631
6acbf033 9632#: builtin/update-index.c:825
ef317cd5 9633msgid "report actions to standard output"
07432cef 9634msgstr "在标准输出显示操作"
ef317cd5 9635
6acbf033 9636#: builtin/update-index.c:827
ef317cd5 9637msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 9638msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 9639
6acbf033 9640#: builtin/update-index.c:831
ef317cd5 9641msgid "write index in this format"
07432cef 9642msgstr "以这种格式写入索引区"
ef317cd5 9643
6acbf033
JX
9644#: builtin/update-index.c:833
9645msgid "enable or disable split index"
9646msgstr "启用或禁用索引拆分"
9647
90314792 9648#: builtin/update-ref.c:9
ef317cd5 9649msgid "git update-ref [options] -d <refname> [<oldval>]"
90314792 9650msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
ef317cd5 9651
90314792 9652#: builtin/update-ref.c:10
ef317cd5 9653msgid "git update-ref [options] <refname> <newval> [<oldval>]"
90314792
JX
9654msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9655
9656#: builtin/update-ref.c:11
9657msgid "git update-ref [options] --stdin [-z]"
9658msgstr "git update-ref [选项] --stdin [-z]"
ef317cd5 9659
6acbf033 9660#: builtin/update-ref.c:350
ef317cd5 9661msgid "delete the reference"
07432cef 9662msgstr "删除引用"
ef317cd5 9663
6acbf033 9664#: builtin/update-ref.c:352
ef317cd5 9665msgid "update <refname> not the one it points to"
07432cef 9666msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 9667
6acbf033 9668#: builtin/update-ref.c:353
90314792
JX
9669msgid "stdin has NUL-terminated arguments"
9670msgstr "标准输入有以 NUL 字符终止的参数"
9671
6acbf033 9672#: builtin/update-ref.c:354
90314792
JX
9673msgid "read updates from stdin"
9674msgstr "从标准输入读取更新"
9675
ef317cd5
JX
9676#: builtin/update-server-info.c:6
9677msgid "git update-server-info [--force]"
07432cef 9678msgstr "git update-server-info [--force]"
ef317cd5
JX
9679
9680#: builtin/update-server-info.c:14
9681msgid "update the info files from scratch"
07432cef 9682msgstr "从头开始更新文件信息"
ef317cd5 9683
6acbf033
JX
9684#: builtin/verify-commit.c:17
9685msgid "git verify-commit [-v|--verbose] <commit>..."
9686msgstr "git verify-commit [-v|--verbose] <提交>..."
9687
9688#: builtin/verify-commit.c:75
9689msgid "print commit contents"
9690msgstr "打印提交内容"
9691
9692#: builtin/verify-pack.c:55
ef317cd5 9693msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 9694msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5 9695
6acbf033 9696#: builtin/verify-pack.c:65
ef317cd5
JX
9697msgid "verbose"
9698msgstr "冗长输出"
9699
6acbf033 9700#: builtin/verify-pack.c:67
ef317cd5 9701msgid "show statistics only"
07432cef 9702msgstr "只显示统计"
ef317cd5
JX
9703
9704#: builtin/verify-tag.c:17
9705msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 9706msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
9707
9708#: builtin/verify-tag.c:73
9709msgid "print tag contents"
07432cef 9710msgstr "打印 tag 内容"
ef317cd5
JX
9711
9712#: builtin/write-tree.c:13
9713msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 9714msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
9715
9716#: builtin/write-tree.c:26
9717msgid "<prefix>/"
07432cef 9718msgstr "<前缀>/"
ef317cd5
JX
9719
9720#: builtin/write-tree.c:27
9721msgid "write tree object for a subdirectory <prefix>"
07432cef 9722msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
9723
9724#: builtin/write-tree.c:30
9725msgid "only useful for debugging"
07432cef 9726msgstr "只对调试有用"
ef317cd5 9727
2e8451e8 9728#: git.c:17
4dcdc3d8
JX
9729msgid ""
9730"'git help -a' and 'git help -g' lists available subcommands and some\n"
9731"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9732"to read about a specific subcommand or concept."
9733msgstr ""
9734"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9735"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
8ada9598 9736
6c94aba5
JX
9737#: parse-options.h:143
9738msgid "expiry-date"
2e8451e8
JX
9739msgstr "逾期日期"
9740
6c94aba5 9741#: parse-options.h:158
8ada9598 9742msgid "no-op (backward compatibility)"
81809b99 9743msgstr "空操作(向后兼容)"
8ada9598 9744
6c94aba5 9745#: parse-options.h:232
8ada9598 9746msgid "be more verbose"
81809b99 9747msgstr "更加详细"
8ada9598 9748
6c94aba5 9749#: parse-options.h:234
8ada9598 9750msgid "be more quiet"
81809b99 9751msgstr "更加安静"
8ada9598 9752
6c94aba5 9753#: parse-options.h:240
8ada9598 9754msgid "use <n> digits to display SHA-1s"
81809b99 9755msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
9756
9757#: common-cmds.h:8
9758msgid "Add file contents to the index"
81809b99 9759msgstr "添加文件内容至索引"
8ada9598
JX
9760
9761#: common-cmds.h:9
9762msgid "Find by binary search the change that introduced a bug"
81809b99 9763msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
9764
9765#: common-cmds.h:10
8ada9598 9766msgid "List, create, or delete branches"
81809b99 9767msgstr "列出、创建或删除分支"
8ada9598
JX
9768
9769#: common-cmds.h:11
9770msgid "Checkout a branch or paths to the working tree"
81809b99 9771msgstr "检出一个分支或路径到工作区"
8ada9598
JX
9772
9773#: common-cmds.h:12
8ada9598 9774msgid "Clone a repository into a new directory"
81809b99 9775msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
9776
9777#: common-cmds.h:13
8ada9598 9778msgid "Record changes to the repository"
81809b99 9779msgstr "记录变更到版本库"
8ada9598
JX
9780
9781#: common-cmds.h:14
9782msgid "Show changes between commits, commit and working tree, etc"
81809b99 9783msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
9784
9785#: common-cmds.h:15
9786msgid "Download objects and refs from another repository"
81809b99 9787msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
9788
9789#: common-cmds.h:16
9790msgid "Print lines matching a pattern"
81809b99 9791msgstr "输出和模式匹配的行"
8ada9598
JX
9792
9793#: common-cmds.h:17
a77c07d9
JX
9794msgid "Create an empty Git repository or reinitialize an existing one"
9795msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598
JX
9796
9797#: common-cmds.h:18
8ada9598 9798msgid "Show commit logs"
81809b99 9799msgstr "显示提交日志"
8ada9598
JX
9800
9801#: common-cmds.h:19
9802msgid "Join two or more development histories together"
81809b99 9803msgstr "合并两个或更多开发历史"
8ada9598
JX
9804
9805#: common-cmds.h:20
9806msgid "Move or rename a file, a directory, or a symlink"
81809b99 9807msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
9808
9809#: common-cmds.h:21
2e8451e8
JX
9810msgid "Fetch from and integrate with another repository or a local branch"
9811msgstr "获取并整合另外的版本库或一个本地分支"
8ada9598
JX
9812
9813#: common-cmds.h:22
9814msgid "Update remote refs along with associated objects"
81809b99 9815msgstr "更新远程引用和相关的对象"
8ada9598
JX
9816
9817#: common-cmds.h:23
9818msgid "Forward-port local commits to the updated upstream head"
81809b99 9819msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
9820
9821#: common-cmds.h:24
9822msgid "Reset current HEAD to the specified state"
81809b99 9823msgstr "重置当前HEAD到指定状态"
8ada9598
JX
9824
9825#: common-cmds.h:25
9826msgid "Remove files from the working tree and from the index"
81809b99 9827msgstr "从工作区和索引中删除文件"
8ada9598
JX
9828
9829#: common-cmds.h:26
9830msgid "Show various types of objects"
81809b99 9831msgstr "显示各种类型的对象"
8ada9598
JX
9832
9833#: common-cmds.h:27
8ada9598 9834msgid "Show the working tree status"
81809b99 9835msgstr "显示工作区状态"
8ada9598
JX
9836
9837#: common-cmds.h:28
9838msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 9839msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 9840
6c94aba5 9841#: git-am.sh:52
c04f5ac3
JX
9842msgid "You need to set your committer info first"
9843msgstr "您需要先设置你的提交者信息"
9844
6c94aba5 9845#: git-am.sh:97
b694fbb1
JX
9846msgid ""
9847"You seem to have moved HEAD since the last 'am' failure.\n"
9848"Not rewinding to ORIG_HEAD"
6792b93b 9849msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1 9850
6c94aba5 9851#: git-am.sh:107
b694fbb1
JX
9852#, sh-format
9853msgid ""
2e8451e8 9854"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
9855"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9856"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 9857msgstr ""
2e8451e8 9858"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
9859"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9860"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9861
6c94aba5 9862#: git-am.sh:123
b694fbb1
JX
9863msgid "Cannot fall back to three-way merge."
9864msgstr "无法求助于三路合并。"
9865
6c94aba5 9866#: git-am.sh:139
c04f5ac3 9867msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 9868msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc 9869
6c94aba5 9870#: git-am.sh:141
649900bc 9871msgid "Using index info to reconstruct a base tree..."
63af42fe 9872msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 9873
6c94aba5 9874#: git-am.sh:156
c04f5ac3
JX
9875msgid ""
9876"Did you hand edit your patch?\n"
9877"It does not apply to blobs recorded in its index."
9878msgstr ""
9879"您是否曾手动编辑过您的补丁?\n"
07432cef 9880"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 9881
6c94aba5 9882#: git-am.sh:165
c04f5ac3 9883msgid "Falling back to patching base and 3-way merge..."
b694fbb1 9884msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 9885
6c94aba5 9886#: git-am.sh:181
649900bc
JX
9887msgid "Failed to merge in the changes."
9888msgstr "无法合并变更。"
9889
6c94aba5 9890#: git-am.sh:276
c04f5ac3
JX
9891msgid "Only one StGIT patch series can be applied at once"
9892msgstr "一次只能有一个 StGIT 补丁队列被应用"
9893
6c94aba5 9894#: git-am.sh:363
c04f5ac3
JX
9895#, sh-format
9896msgid "Patch format $patch_format is not supported."
9897msgstr "不支持 $patch_format 补丁格式。"
9898
6c94aba5 9899#: git-am.sh:365
c04f5ac3
JX
9900msgid "Patch format detection failed."
9901msgstr "补丁格式检测失败。"
9902
6c94aba5 9903#: git-am.sh:392
649900bc
JX
9904msgid ""
9905"The -b/--binary option has been a no-op for long time, and\n"
9906"it will be removed. Please do not use it anymore."
9907msgstr ""
9908"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9909"请不要再使用它了。"
c04f5ac3 9910
6c94aba5 9911#: git-am.sh:486
c04f5ac3
JX
9912#, sh-format
9913msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 9914msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 9915
6c94aba5 9916#: git-am.sh:491
c04f5ac3
JX
9917msgid "Please make up your mind. --skip or --abort?"
9918msgstr "请下决心。--skip 或是 --abort ?"
9919
6c94aba5 9920#: git-am.sh:527
2e8451e8
JX
9921#, sh-format
9922msgid ""
9923"Stray $dotest directory found.\n"
9924"Use \"git am --abort\" to remove it."
9925msgstr ""
9926"发现了错误的 $dotest 目录。\n"
9927"使用 \"git am --abort\" 删除它。"
9928
6c94aba5 9929#: git-am.sh:535
c04f5ac3
JX
9930msgid "Resolve operation not in progress, we are not resuming."
9931msgstr "解决操作未进行,我们不会继续。"
9932
6c94aba5 9933#: git-am.sh:601
c04f5ac3
JX
9934#, sh-format
9935msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 9936msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 9937
6c94aba5 9938#: git-am.sh:705
b694fbb1
JX
9939#, sh-format
9940msgid ""
9941"Patch is empty. Was it split wrong?\n"
9942"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9943"To restore the original branch and stop patching run \"$cmdline --abort\"."
9944msgstr ""
9945"补丁为空。是不是切分错误?\n"
9946"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9947"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9948
6c94aba5 9949#: git-am.sh:732
b694fbb1
JX
9950msgid "Patch does not have a valid e-mail address."
9951msgstr "补丁中没有一个有效的邮件地址。"
9952
6c94aba5 9953#: git-am.sh:779
c04f5ac3 9954msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 9955msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 9956
6c94aba5 9957#: git-am.sh:783
b694fbb1
JX
9958msgid "Commit Body is:"
9959msgstr "提交内容为:"
9960
90e6ef53 9961# 译者:注意保持句尾空格
c04f5ac3
JX
9962#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9963#. in your translation. The program will only accept English
9964#. input at this point.
6c94aba5 9965#: git-am.sh:790
c04f5ac3
JX
9966msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9967msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9968
6c94aba5 9969#: git-am.sh:826
c04f5ac3
JX
9970#, sh-format
9971msgid "Applying: $FIRSTLINE"
9972msgstr "正应用:$FIRSTLINE"
9973
6c94aba5 9974#: git-am.sh:847
b694fbb1
JX
9975msgid ""
9976"No changes - did you forget to use 'git add'?\n"
9977"If there is nothing left to stage, chances are that something else\n"
9978"already introduced the same changes; you might want to skip this patch."
9979msgstr ""
9980"没有变更 —— 您是不是忘了执行 'git add'?\n"
9981"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9982"您也许想要跳过这个补丁。"
9983
6c94aba5 9984#: git-am.sh:855
b694fbb1
JX
9985msgid ""
9986"You still have unmerged paths in your index\n"
9987"did you forget to use 'git add'?"
6792b93b 9988msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 9989
6c94aba5 9990#: git-am.sh:871
c04f5ac3 9991msgid "No changes -- Patch already applied."
63af42fe 9992msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 9993
6c94aba5 9994#: git-am.sh:881
b694fbb1
JX
9995#, sh-format
9996msgid "Patch failed at $msgnum $FIRSTLINE"
9997msgstr "补丁失败于 $msgnum $FIRSTLINE"
9998
6c94aba5 9999#: git-am.sh:884
ef317cd5
JX
10000#, sh-format
10001msgid ""
10002"The copy of the patch that failed is found in:\n"
10003" $dotest/patch"
10004msgstr ""
07432cef
WS
10005"失败的补丁文件副本位于:\n"
10006" $dotest/patch"
ef317cd5 10007
6c94aba5 10008#: git-am.sh:902
c04f5ac3
JX
10009msgid "applying to an empty history"
10010msgstr "正应用到一个空历史上"
10011
b694fbb1
JX
10012#: git-bisect.sh:48
10013msgid "You need to start by \"git bisect start\""
10014msgstr "您需要执行 \"git bisect start\" 来开始"
10015
90e6ef53 10016# 译者:注意保持句尾空格
c04f5ac3
JX
10017#. TRANSLATORS: Make sure to include [Y] and [n] in your
10018#. translation. The program will only accept English input
10019#. at this point.
10020#: git-bisect.sh:54
10021msgid "Do you want me to do it for you [Y/n]? "
10022msgstr "您想让我为您这样做么[Y/n]? "
10023
10024#: git-bisect.sh:95
10025#, sh-format
10026msgid "unrecognised option: '$arg'"
81809b99 10027msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
10028
10029#: git-bisect.sh:99
10030#, sh-format
10031msgid "'$arg' does not appear to be a valid revision"
10032msgstr "'$arg' 看起来不像是一个有效的版本"
10033
10034#: git-bisect.sh:117
10035msgid "Bad HEAD - I need a HEAD"
10036msgstr "坏的 HEAD - 我需要一个 HEAD"
10037
10038#: git-bisect.sh:130
10039#, sh-format
10040msgid ""
10041"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10042msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
10043
10044#: git-bisect.sh:140
cfff71a9
JX
10045msgid "won't bisect on cg-seek'ed tree"
10046msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3
JX
10047
10048#: git-bisect.sh:144
10049msgid "Bad HEAD - strange symbolic ref"
90e6ef53 10050msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
10051
10052#: git-bisect.sh:189
10053#, sh-format
10054msgid "Bad bisect_write argument: $state"
90e6ef53 10055msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
10056
10057#: git-bisect.sh:218
10058#, sh-format
10059msgid "Bad rev input: $arg"
90e6ef53 10060msgstr "输入坏的版本:$arg"
c04f5ac3
JX
10061
10062#: git-bisect.sh:232
10063msgid "Please call 'bisect_state' with at least one argument."
10064msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10065
10066#: git-bisect.sh:244
10067#, sh-format
10068msgid "Bad rev input: $rev"
10069msgstr "输入坏的版本:$rev"
10070
10071#: git-bisect.sh:250
10072msgid "'git bisect bad' can take only one argument."
10073msgstr "'git bisect bad' 只能带一个参数。"
10074
b694fbb1
JX
10075#: git-bisect.sh:273
10076msgid "Warning: bisecting only with a bad commit."
10077msgstr "警告:在仅有一个坏提交下进行二分查找。"
10078
90e6ef53 10079# 译者:注意保持句尾空格
c04f5ac3
JX
10080#. TRANSLATORS: Make sure to include [Y] and [n] in your
10081#. translation. The program will only accept English input
10082#. at this point.
10083#: git-bisect.sh:279
10084msgid "Are you sure [Y/n]? "
10085msgstr "您确认么[Y/n]? "
10086
b694fbb1
JX
10087#: git-bisect.sh:289
10088msgid ""
10089"You need to give me at least one good and one bad revisions.\n"
10090"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10091msgstr ""
10092"您需要给我至少一个好版本和一个坏版本。\n"
10093"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
10094
10095#: git-bisect.sh:292
10096msgid ""
10097"You need to start by \"git bisect start\".\n"
10098"You then need to give me at least one good and one bad revisions.\n"
10099"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10100msgstr ""
10101"您需要执行 \"git bisect start\" 来开始。\n"
10102"然后需要提供我至少一个好版本和一个坏版本。\n"
10103"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
10104
4dcdc3d8 10105#: git-bisect.sh:363 git-bisect.sh:490
b694fbb1
JX
10106msgid "We are not bisecting."
10107msgstr "我们没有在二分查找。"
10108
4dcdc3d8 10109#: git-bisect.sh:370
c04f5ac3
JX
10110#, sh-format
10111msgid "'$invalid' is not a valid commit"
10112msgstr "'$invalid' 不是一个有效的提交"
10113
4dcdc3d8 10114#: git-bisect.sh:379
c04f5ac3
JX
10115#, sh-format
10116msgid ""
10117"Could not check out original HEAD '$branch'.\n"
10118"Try 'git bisect reset <commit>'."
10119msgstr ""
10120"不能检出原始 HEAD '$branch'。\n"
07432cef 10121"尝试 'git bisect reset <提交>'。"
c04f5ac3 10122
4dcdc3d8 10123#: git-bisect.sh:406
c04f5ac3
JX
10124msgid "No logfile given"
10125msgstr "未提供日志文件"
10126
4dcdc3d8 10127#: git-bisect.sh:407
c04f5ac3
JX
10128#, sh-format
10129msgid "cannot read $file for replaying"
10130msgstr "不能读取 $file 来重放"
10131
4dcdc3d8 10132#: git-bisect.sh:424
c04f5ac3
JX
10133msgid "?? what are you talking about?"
10134msgstr "?? 您在说什么?"
10135
4dcdc3d8 10136#: git-bisect.sh:436
b694fbb1
JX
10137#, sh-format
10138msgid "running $command"
10139msgstr "运行 $command"
10140
4dcdc3d8 10141#: git-bisect.sh:443
b694fbb1
JX
10142#, sh-format
10143msgid ""
10144"bisect run failed:\n"
10145"exit code $res from '$command' is < 0 or >= 128"
10146msgstr ""
10147"二分查找运行失败:\n"
07432cef 10148"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 10149
4dcdc3d8 10150#: git-bisect.sh:469
b694fbb1
JX
10151msgid "bisect run cannot continue any more"
10152msgstr "二分查找不能继续运行"
10153
4dcdc3d8 10154#: git-bisect.sh:475
b694fbb1
JX
10155#, sh-format
10156msgid ""
10157"bisect run failed:\n"
10158"'bisect_state $state' exited with error code $res"
10159msgstr ""
10160"二分查找运行失败:\n"
10161"'bisect_state $state' 退出码为 $res"
10162
4dcdc3d8 10163#: git-bisect.sh:482
b694fbb1
JX
10164msgid "bisect run success"
10165msgstr "二分查找运行成功"
c04f5ac3
JX
10166
10167#: git-pull.sh:21
10168msgid ""
10169"Pull is not possible because you have unmerged files.\n"
10170"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10171"as appropriate to mark resolution, or use 'git commit -a'."
10172msgstr ""
90e6ef53 10173"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 10174"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 10175"或者使用 'git commit -a'。"
c04f5ac3
JX
10176
10177#: git-pull.sh:25
10178msgid "Pull is not possible because you have unmerged files."
90e6ef53 10179msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 10180
6acbf033 10181#: git-pull.sh:245
c04f5ac3 10182msgid "updating an unborn branch with changes added to the index"
90e6ef53 10183msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 10184
6acbf033 10185#: git-pull.sh:269
b694fbb1
JX
10186#, sh-format
10187msgid ""
10188"Warning: fetch updated the current branch head.\n"
10189"Warning: fast-forwarding your working tree from\n"
10190"Warning: commit $orig_head."
10191msgstr ""
10192"警告:fetch 更新了当前的分支。您的工作区\n"
10193"警告:从原提交 $orig_head 快进。"
10194
6acbf033 10195#: git-pull.sh:294
c04f5ac3
JX
10196msgid "Cannot merge multiple branches into empty head"
10197msgstr "无法将多个分支合并到空分支"
10198
6acbf033 10199#: git-pull.sh:298
c04f5ac3
JX
10200msgid "Cannot rebase onto multiple branches"
10201msgstr "无法变基到多个分支"
10202
6c94aba5 10203#: git-rebase.sh:57
649900bc
JX
10204msgid ""
10205"When you have resolved this problem, run \"git rebase --continue\".\n"
10206"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10207"To check out the original branch and stop rebasing, run \"git rebase --abort"
10208"\"."
10209msgstr ""
10210"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10211"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10212"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10213
6acbf033 10214#: git-rebase.sh:165
2e8451e8
JX
10215msgid "Applied autostash."
10216msgstr "成功应用 autostash。"
10217
6acbf033 10218#: git-rebase.sh:168
2e8451e8
JX
10219#, sh-format
10220msgid "Cannot store $stash_sha1"
10221msgstr "无法保存 $stash_sha1"
10222
6acbf033 10223#: git-rebase.sh:169
2e8451e8
JX
10224msgid ""
10225"Applying autostash resulted in conflicts.\n"
10226"Your changes are safe in the stash.\n"
b1894384 10227"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
10228msgstr ""
10229"应用 autostash 导致冲突。\n"
10230"您的修改安全地保存在 stash 中。\n"
10231"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10232
6acbf033 10233#: git-rebase.sh:208
649900bc 10234msgid "The pre-rebase hook refused to rebase."
98b2761d 10235msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 10236
6acbf033 10237#: git-rebase.sh:213
649900bc
JX
10238msgid "It looks like git-am is in progress. Cannot rebase."
10239msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10240
6acbf033 10241#: git-rebase.sh:351
649900bc
JX
10242msgid "The --exec option must be used with the --interactive option"
10243msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10244
6acbf033 10245#: git-rebase.sh:356
649900bc
JX
10246msgid "No rebase in progress?"
10247msgstr "没有正在进行的变基?"
10248
6acbf033 10249#: git-rebase.sh:367
07432cef
WS
10250msgid "The --edit-todo action can only be used during interactive rebase."
10251msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10252
6acbf033 10253#: git-rebase.sh:374
649900bc
JX
10254msgid "Cannot read HEAD"
10255msgstr "不能读取 HEAD"
10256
6acbf033 10257#: git-rebase.sh:377
649900bc
JX
10258msgid ""
10259"You must edit all merge conflicts and then\n"
10260"mark them as resolved using git add"
10261msgstr ""
10262"您必须编辑所有的合并冲突,然后通过 git add\n"
10263"命令将它们标记为已解决"
10264
6acbf033 10265#: git-rebase.sh:395
649900bc
JX
10266#, sh-format
10267msgid "Could not move back to $head_name"
10268msgstr "无法移回 $head_name"
10269
6acbf033 10270#: git-rebase.sh:414
649900bc
JX
10271#, sh-format
10272msgid ""
10273"It seems that there is already a $state_dir_base directory, and\n"
10274"I wonder if you are in the middle of another rebase. If that is the\n"
10275"case, please try\n"
10276"\t$cmd_live_rebase\n"
10277"If that is not the case, please\n"
10278"\t$cmd_clear_stale_rebase\n"
10279"and run me again. I am stopping in case you still have something\n"
10280"valuable there."
10281msgstr ""
98b2761d
JX
10282"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10283"过程中。 如果是这样,请执行\n"
649900bc
JX
10284"\t$cmd_live_rebase\n"
10285"如果不是这样,请执行\n"
10286"\t$cmd_clear_stale_rebase\n"
98b2761d 10287"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 10288
6acbf033 10289#: git-rebase.sh:465
649900bc
JX
10290#, sh-format
10291msgid "invalid upstream $upstream_name"
10292msgstr "无效的上游 $upstream_name"
10293
6acbf033 10294#: git-rebase.sh:489
649900bc
JX
10295#, sh-format
10296msgid "$onto_name: there are more than one merge bases"
10297msgstr "$onto_name: 有一个以上的合并基准"
10298
6acbf033 10299#: git-rebase.sh:492 git-rebase.sh:496
649900bc
JX
10300#, sh-format
10301msgid "$onto_name: there is no merge base"
10302msgstr "$onto_name: 没有合并基准"
10303
6acbf033 10304#: git-rebase.sh:501
649900bc
JX
10305#, sh-format
10306msgid "Does not point to a valid commit: $onto_name"
10307msgstr "没有指向一个有效的提交:$onto_name"
10308
6acbf033 10309#: git-rebase.sh:524
649900bc
JX
10310#, sh-format
10311msgid "fatal: no such branch: $branch_name"
10312msgstr "严重错误:无此分支:$branch_name"
10313
6acbf033 10314#: git-rebase.sh:557
2e8451e8
JX
10315msgid "Cannot autostash"
10316msgstr "无法 autostash"
10317
6acbf033 10318#: git-rebase.sh:562
2e8451e8
JX
10319#, sh-format
10320msgid "Created autostash: $stash_abbrev"
10321msgstr "创建了 autostash: $stash_abbrev"
10322
6acbf033 10323#: git-rebase.sh:566
649900bc
JX
10324msgid "Please commit or stash them."
10325msgstr "请提交或为它们保存进度。"
10326
6acbf033 10327#: git-rebase.sh:586
649900bc
JX
10328#, sh-format
10329msgid "Current branch $branch_name is up to date."
10330msgstr "当前分支 $branch_name 是最新的。"
10331
6acbf033 10332#: git-rebase.sh:590
649900bc
JX
10333#, sh-format
10334msgid "Current branch $branch_name is up to date, rebase forced."
10335msgstr "当前分支 $branch_name 是最新的,强制变基。"
10336
6acbf033 10337#: git-rebase.sh:601
649900bc
JX
10338#, sh-format
10339msgid "Changes from $mb to $onto:"
10340msgstr "变更从 $mb 到 $onto:"
10341
6acbf033 10342#: git-rebase.sh:610
649900bc
JX
10343msgid "First, rewinding head to replay your work on top of it..."
10344msgstr "首先,重置头指针以便在上面重放您的工作..."
10345
6acbf033 10346#: git-rebase.sh:620
649900bc
JX
10347#, sh-format
10348msgid "Fast-forwarded $branch_name to $onto_name."
10349msgstr "快进 $branch_name 至 $onto_name。"
10350
c04f5ac3
JX
10351#: git-stash.sh:51
10352msgid "git stash clear with parameters is unimplemented"
10353msgstr "git stash clear 不支持参数"
10354
10355#: git-stash.sh:74
10356msgid "You do not have the initial commit yet"
10357msgstr "您尚未建立初始提交"
10358
10359#: git-stash.sh:89
10360msgid "Cannot save the current index state"
90e6ef53 10361msgstr "无法保存当前索引状态"
c04f5ac3 10362
6acbf033 10363#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
10364msgid "Cannot save the current worktree state"
10365msgstr "无法保存当前工作区状态"
10366
6acbf033 10367#: git-stash.sh:141
c04f5ac3 10368msgid "No changes selected"
90e6ef53 10369msgstr "没有选择变更"
c04f5ac3 10370
6acbf033 10371#: git-stash.sh:144
c04f5ac3 10372msgid "Cannot remove temporary index (can't happen)"
90e6ef53 10373msgstr "无法删除临时索引(不应发生)"
c04f5ac3 10374
6acbf033 10375#: git-stash.sh:157
c04f5ac3
JX
10376msgid "Cannot record working tree state"
10377msgstr "不能记录工作区状态"
10378
6acbf033 10379#: git-stash.sh:191
2e8451e8
JX
10380#, sh-format
10381msgid "Cannot update $ref_stash with $w_commit"
10382msgstr "无法用 $w_commit 更新 $ref_stash"
10383
b694fbb1
JX
10384#. TRANSLATORS: $option is an invalid option, like
10385#. `--blah-blah'. The 7 spaces at the beginning of the
10386#. second line correspond to "error: ". So you should line
10387#. up the second line with however many characters the
10388#. translation of "error: " takes in your language. E.g. in
10389#. English this is:
10390#.
10391#. $ git stash save --blah-blah 2>&1 | head -n 2
10392#. error: unknown option for 'stash save': --blah-blah
10393#. To provide a message, use git stash save -- '--blah-blah'
6acbf033 10394#: git-stash.sh:238
b694fbb1
JX
10395#, sh-format
10396msgid ""
10397"error: unknown option for 'stash save': $option\n"
10398" To provide a message, use git stash save -- '$option'"
10399msgstr ""
10400"错误:'stash save' 的未知选项:$option\n"
10401" 要提供一个描述信息,使用 git stash save -- '$option'"
10402
6acbf033 10403#: git-stash.sh:259
c04f5ac3
JX
10404msgid "No local changes to save"
10405msgstr "没有要保存的本地修改"
10406
6acbf033 10407#: git-stash.sh:263
c04f5ac3 10408msgid "Cannot initialize stash"
90e6ef53 10409msgstr "无法初始化 stash"
c04f5ac3 10410
6acbf033 10411#: git-stash.sh:267
c04f5ac3
JX
10412msgid "Cannot save the current status"
10413msgstr "无法保存当前状态"
10414
6acbf033 10415#: git-stash.sh:285
c04f5ac3
JX
10416msgid "Cannot remove worktree changes"
10417msgstr "无法删除工作区变更"
10418
6acbf033 10419#: git-stash.sh:384
c04f5ac3 10420msgid "No stash found."
90e6ef53 10421msgstr "未发现 stash。"
c04f5ac3 10422
6acbf033 10423#: git-stash.sh:391
c04f5ac3
JX
10424#, sh-format
10425msgid "Too many revisions specified: $REV"
90e6ef53 10426msgstr "指定了太多的版本:$REV"
c04f5ac3 10427
6acbf033 10428#: git-stash.sh:397
c04f5ac3
JX
10429#, sh-format
10430msgid "$reference is not valid reference"
10431msgstr "$reference 不是有效的引用"
10432
6acbf033 10433#: git-stash.sh:425
c04f5ac3
JX
10434#, sh-format
10435msgid "'$args' is not a stash-like commit"
90e6ef53 10436msgstr "'$args' 不是 stash 样提交"
c04f5ac3 10437
6acbf033 10438#: git-stash.sh:436
c04f5ac3
JX
10439#, sh-format
10440msgid "'$args' is not a stash reference"
90e6ef53 10441msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 10442
6acbf033 10443#: git-stash.sh:444
c04f5ac3 10444msgid "unable to refresh index"
90e6ef53 10445msgstr "无法刷新索引"
c04f5ac3 10446
6acbf033 10447#: git-stash.sh:448
c04f5ac3
JX
10448msgid "Cannot apply a stash in the middle of a merge"
10449msgstr "无法在合并过程中恢复进度"
10450
6acbf033 10451#: git-stash.sh:456
c04f5ac3 10452msgid "Conflicts in index. Try without --index."
90e6ef53 10453msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 10454
6acbf033 10455#: git-stash.sh:458
c04f5ac3 10456msgid "Could not save index tree"
90e6ef53 10457msgstr "不能保存索引树"
c04f5ac3 10458
6acbf033 10459#: git-stash.sh:492
c04f5ac3
JX
10460msgid "Cannot unstage modified files"
10461msgstr "无法还原修改的文件"
10462
6acbf033 10463#: git-stash.sh:507
b694fbb1
JX
10464msgid "Index was not unstashed."
10465msgstr "索引的进度没有被恢复。"
10466
6acbf033 10467#: git-stash.sh:530
c04f5ac3
JX
10468#, sh-format
10469msgid "Dropped ${REV} ($s)"
10470msgstr "丢弃了 ${REV} ($s)"
10471
6acbf033 10472#: git-stash.sh:531
c04f5ac3
JX
10473#, sh-format
10474msgid "${REV}: Could not drop stash entry"
90e6ef53 10475msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 10476
6acbf033 10477#: git-stash.sh:538
c04f5ac3
JX
10478msgid "No branch name specified"
10479msgstr "未指定分支名"
10480
6acbf033 10481#: git-stash.sh:610
c04f5ac3
JX
10482msgid "(To restore them type \"git stash apply\")"
10483msgstr "(为恢复数据输入 \"git stash apply\")"
10484
2e8451e8 10485#: git-submodule.sh:95
c04f5ac3
JX
10486#, sh-format
10487msgid "cannot strip one component off url '$remoteurl'"
10488msgstr "无法从 url '$remoteurl' 剥离一个组件"
10489
2e8451e8 10490#: git-submodule.sh:237
c04f5ac3 10491#, sh-format
170e9899
JX
10492msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10493msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 10494
6c94aba5 10495#: git-submodule.sh:287
c04f5ac3 10496#, sh-format
170e9899
JX
10497msgid "Clone of '$url' into submodule path '$sm_path' failed"
10498msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 10499
6acbf033 10500#: git-submodule.sh:296
dac1de7d
JX
10501#, sh-format
10502msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 10503msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 10504
6acbf033 10505#: git-submodule.sh:406
2e8451e8
JX
10506msgid "Relative path can only be used from the toplevel of the working tree"
10507msgstr "只能在工作区的顶级目录中使用相对路径"
10508
6acbf033 10509#: git-submodule.sh:416
c04f5ac3
JX
10510#, sh-format
10511msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10512msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10513
6acbf033 10514#: git-submodule.sh:433
c04f5ac3 10515#, sh-format
170e9899
JX
10516msgid "'$sm_path' already exists in the index"
10517msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 10518
6acbf033 10519#: git-submodule.sh:437
b694fbb1
JX
10520#, sh-format
10521msgid ""
10522"The following path is ignored by one of your .gitignore files:\n"
10523"$sm_path\n"
10524"Use -f if you really want to add it."
10525msgstr ""
10526"以下路径被您的一个 .gitignore 文件所忽略:\n"
10527"$sm_path\n"
10528"如果您确实想添加它,使用 -f 参数。"
10529
6acbf033 10530#: git-submodule.sh:455
b694fbb1
JX
10531#, sh-format
10532msgid "Adding existing repo at '$sm_path' to the index"
10533msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10534
6acbf033 10535#: git-submodule.sh:457
c04f5ac3 10536#, sh-format
170e9899
JX
10537msgid "'$sm_path' already exists and is not a valid git repo"
10538msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 10539
6acbf033 10540#: git-submodule.sh:465
07432cef
WS
10541#, sh-format
10542msgid "A git directory for '$sm_name' is found locally with remote(s):"
10543msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10544
6acbf033 10545#: git-submodule.sh:467
07432cef
WS
10546#, sh-format
10547msgid ""
10548"If you want to reuse this local git directory instead of cloning again from"
10549msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10550
6acbf033 10551#: git-submodule.sh:469
07432cef
WS
10552#, sh-format
10553msgid ""
10554"use the '--force' option. If the local git directory is not the correct repo"
10555msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10556
6acbf033 10557#: git-submodule.sh:470
07432cef
WS
10558#, sh-format
10559msgid ""
10560"or you are unsure what this means choose another name with the '--name' "
10561"option."
10562msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10563
6acbf033 10564#: git-submodule.sh:472
07432cef
WS
10565#, sh-format
10566msgid "Reactivating local git directory for submodule '$sm_name'."
10567msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10568
6acbf033 10569#: git-submodule.sh:484
c04f5ac3 10570#, sh-format
170e9899
JX
10571msgid "Unable to checkout submodule '$sm_path'"
10572msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 10573
6acbf033 10574#: git-submodule.sh:489
c04f5ac3 10575#, sh-format
170e9899
JX
10576msgid "Failed to add submodule '$sm_path'"
10577msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 10578
6acbf033 10579#: git-submodule.sh:498
c04f5ac3 10580#, sh-format
170e9899
JX
10581msgid "Failed to register submodule '$sm_path'"
10582msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 10583
6acbf033 10584#: git-submodule.sh:542
c04f5ac3 10585#, sh-format
2e8451e8
JX
10586msgid "Entering '$prefix$displaypath'"
10587msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 10588
6acbf033 10589#: git-submodule.sh:562
c04f5ac3 10590#, sh-format
2e8451e8
JX
10591msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10592msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 10593
6acbf033 10594#: git-submodule.sh:608
c04f5ac3 10595#, sh-format
2e8451e8
JX
10596msgid "No url found for submodule path '$displaypath' in .gitmodules"
10597msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 10598
6acbf033 10599#: git-submodule.sh:617
c04f5ac3 10600#, sh-format
2e8451e8
JX
10601msgid "Failed to register url for submodule path '$displaypath'"
10602msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 10603
6acbf033 10604#: git-submodule.sh:619
c04f5ac3 10605#, sh-format
2e8451e8
JX
10606msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10607msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 10608
6acbf033 10609#: git-submodule.sh:636
d691f479 10610#, sh-format
2e8451e8
JX
10611msgid "Failed to register update mode for submodule path '$displaypath'"
10612msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 10613
6acbf033 10614#: git-submodule.sh:674
1003b3a5
JX
10615#, sh-format
10616msgid "Use '.' if you really want to deinitialize all submodules"
10617msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10618
6acbf033 10619#: git-submodule.sh:691
1003b3a5 10620#, sh-format
2e8451e8
JX
10621msgid "Submodule work tree '$displaypath' contains a .git directory"
10622msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 10623
6acbf033 10624#: git-submodule.sh:692
1003b3a5
JX
10625#, sh-format
10626msgid ""
10627"(use 'rm -rf' if you really want to remove it including all of its history)"
10628msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10629
6acbf033 10630#: git-submodule.sh:698
c04f5ac3
JX
10631#, sh-format
10632msgid ""
2e8451e8 10633"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 10634"discard them"
2e8451e8 10635msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 10636
6acbf033 10637#: git-submodule.sh:701
1003b3a5 10638#, sh-format
2e8451e8
JX
10639msgid "Cleared directory '$displaypath'"
10640msgstr "已清除目录 '$displaypath'"
1003b3a5 10641
6acbf033 10642#: git-submodule.sh:702
1003b3a5 10643#, sh-format
2e8451e8
JX
10644msgid "Could not remove submodule work tree '$displaypath'"
10645msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 10646
6acbf033 10647#: git-submodule.sh:705
1003b3a5 10648#, sh-format
2e8451e8
JX
10649msgid "Could not create empty submodule directory '$displaypath'"
10650msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 10651
6acbf033 10652#: git-submodule.sh:714
1003b3a5 10653#, sh-format
2e8451e8
JX
10654msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10655msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 10656
6acbf033 10657#: git-submodule.sh:830
1003b3a5
JX
10658#, sh-format
10659msgid ""
2e8451e8 10660"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
10661"Maybe you want to use 'update --init'?"
10662msgstr ""
2e8451e8 10663"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 10664"也许您想用 'update --init'?"
c04f5ac3 10665
6acbf033 10666#: git-submodule.sh:843
c04f5ac3 10667#, sh-format
2e8451e8
JX
10668msgid "Unable to find current revision in submodule path '$displaypath'"
10669msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 10670
6acbf033 10671#: git-submodule.sh:852
c04f5ac3 10672#, sh-format
170e9899
JX
10673msgid "Unable to fetch in submodule path '$sm_path'"
10674msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 10675
6acbf033 10676#: git-submodule.sh:876
2e8451e8
JX
10677#, sh-format
10678msgid "Unable to fetch in submodule path '$displaypath'"
10679msgstr "无法在子模组路径 '$displaypath' 中获取"
10680
6acbf033 10681#: git-submodule.sh:890
6c94aba5
JX
10682#, sh-format
10683msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10684msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10685
6acbf033 10686#: git-submodule.sh:891
c04f5ac3 10687#, sh-format
6c94aba5
JX
10688msgid "Submodule path '$displaypath': checked out '$sha1'"
10689msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10690
6acbf033 10691#: git-submodule.sh:895
6c94aba5 10692#, sh-format
2e8451e8
JX
10693msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10694msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 10695
6acbf033 10696#: git-submodule.sh:896
c04f5ac3 10697#, sh-format
2e8451e8
JX
10698msgid "Submodule path '$displaypath': rebased into '$sha1'"
10699msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 10700
6acbf033 10701#: git-submodule.sh:901
c04f5ac3 10702#, sh-format
2e8451e8
JX
10703msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10704msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 10705
6acbf033 10706#: git-submodule.sh:902
c04f5ac3 10707#, sh-format
2e8451e8
JX
10708msgid "Submodule path '$displaypath': merged in '$sha1'"
10709msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 10710
6acbf033 10711#: git-submodule.sh:907
c04f5ac3 10712#, sh-format
2e8451e8
JX
10713msgid ""
10714"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10715msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 10716
6acbf033 10717#: git-submodule.sh:908
c04f5ac3 10718#, sh-format
2e8451e8
JX
10719msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10720msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 10721
6acbf033 10722#: git-submodule.sh:938
2e8451e8
JX
10723#, sh-format
10724msgid "Failed to recurse into submodule path '$displaypath'"
10725msgstr "无法递归进子模组路径 '$displaypath'"
10726
6acbf033 10727#: git-submodule.sh:1046
649900bc
JX
10728msgid "The --cached option cannot be used with the --files option"
10729msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 10730
6acbf033 10731#: git-submodule.sh:1098
b694fbb1
JX
10732#, sh-format
10733msgid "unexpected mode $mod_dst"
10734msgstr "意外的模式 $mod_dst"
c04f5ac3 10735
90e6ef53 10736# 译者:注意保持前导空格
6acbf033 10737#: git-submodule.sh:1118
c04f5ac3 10738#, sh-format
2e8451e8
JX
10739msgid " Warn: $display_name doesn't contain commit $sha1_src"
10740msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 10741
90e6ef53 10742# 译者:注意保持前导空格
6acbf033 10743#: git-submodule.sh:1121
c04f5ac3 10744#, sh-format
2e8451e8
JX
10745msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10746msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 10747
90e6ef53 10748# 译者:注意保持前导空格
6acbf033 10749#: git-submodule.sh:1124
c04f5ac3 10750#, sh-format
2e8451e8
JX
10751msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10752msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 10753
6acbf033 10754#: git-submodule.sh:1149
c04f5ac3 10755msgid "blob"
07432cef 10756msgstr "数据对象"
c04f5ac3 10757
6acbf033 10758#: git-submodule.sh:1267
1003b3a5
JX
10759#, sh-format
10760msgid "Failed to recurse into submodule path '$sm_path'"
10761msgstr "无法递归进子模组路径 '$sm_path'"
10762
6acbf033 10763#: git-submodule.sh:1331
c04f5ac3 10764#, sh-format
2e8451e8
JX
10765msgid "Synchronizing submodule url for '$displaypath'"
10766msgstr "为 '$displaypath' 同步子模组 url"
10767
6acbf033
JX
10768#~ msgid "commit has empty message"
10769#~ msgstr "提交说明为空"
10770
10771#~ msgid "Failed to chdir: %s"
10772#~ msgstr "无法切换目录:%s"
10773
6c94aba5
JX
10774#~ msgid "key id"
10775#~ msgstr "key id"
10776
10777#~ msgid "Tracking not set up: name too long: %s"
10778#~ msgstr "跟踪未设置:名字太长:%s"
10779
10780#~ msgid "bug"
10781#~ msgstr "bug"
10782
10783# 译者:注意保持句尾空格
10784#~ msgid "ahead "
10785#~ msgstr "领先 "
10786
10787# 译者:注意保持句尾空格
10788#~ msgid ", behind "
10789#~ msgstr ",落后 "
10790
10791#~ msgid "could not find .gitmodules in index"
10792#~ msgstr "无法在索引中找到 .gitmodules"
10793
10794#~ msgid "reading updated .gitmodules failed"
10795#~ msgstr "读取更新后的 .gitmodules 失败"
10796
10797#~ msgid "unable to stat updated .gitmodules"
10798#~ msgstr "不能枚举更新后的 .gitmodules"
10799
10800#~ msgid "unable to remove .gitmodules from index"
10801#~ msgstr "不能从索引中移除 .gitmodules"
10802
10803#~ msgid "adding updated .gitmodules failed"
10804#~ msgstr "添加更新后的 .gitmodules 失败"
10805
10806# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10807#~ msgid ""
10808#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
10809#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
10810#~ "anymore.\n"
10811#~ "To add content for the whole tree, run:\n"
10812#~ "\n"
10813#~ " git add %s :/\n"
10814#~ " (or git add %s :/)\n"
10815#~ "\n"
10816#~ "To restrict the command to the current directory, run:\n"
10817#~ "\n"
10818#~ " git add %s .\n"
10819#~ " (or git add %s .)\n"
10820#~ "\n"
10821#~ "With the current Git version, the command is restricted to the current "
10822#~ "directory.\n"
10823#~ msgstr ""
10824#~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
10825#~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
10826#~ "如果要添加整个目录树的内容,执行:\n"
10827#~ "\n"
10828#~ " git add %s :/\n"
10829#~ " (或 git add %s :/)\n"
10830#~ "\n"
10831#~ "如果要限制该命令只作用于当前目录,执行:\n"
10832#~ "\n"
10833#~ " git add %s .\n"
10834#~ " (或 git add %s .)\n"
10835#~ "\n"
10836#~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
10837
10838#~ msgid ""
10839#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
10840#~ "whose behaviour will change in Git 2.0 with respect to paths you "
10841#~ "removed.\n"
10842#~ "Paths like '%s' that are\n"
10843#~ "removed from your working tree are ignored with this version of Git.\n"
10844#~ "\n"
10845#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
10846#~ " ignores paths you removed from your working tree.\n"
10847#~ "\n"
10848#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
10849#~ "\n"
10850#~ "Run 'git status' to check the paths you removed from your working tree.\n"
10851#~ msgstr ""
10852#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
10853#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
10854#~ "像本地工作区移除的路径 '%s'\n"
10855#~ "在此版本的 Git 中被忽略。\n"
10856#~ "\n"
10857#~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
10858#~ " 忽略您本地工作区中移除的文件。\n"
10859#~ "\n"
10860#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
10861#~ "\n"
10862#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
10863
10864#~ msgid ""
10865#~ "Auto packing the repository for optimum performance. You may also\n"
10866#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
10867#~ msgstr ""
10868#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
10869#~ "参见 \"git help gc\" 以获取更多信息。\n"
10870
10871#~ msgid ""
10872#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
10873#~ "counterpart. If you did not intend to push that branch, you may want to\n"
10874#~ "specify branches to push or set the 'push.default' configuration "
10875#~ "variable\n"
10876#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
10877#~ msgstr ""
10878#~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
10879#~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
10880#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
10881#~ "以便只推送当前分支。"
10882
cfff71a9
JX
10883# 译者:为保证在输出中对齐,注意调整句中空格!
10884#~ msgid "copied: %s -> %s"
10885#~ msgstr "拷贝: %s -> %s"
10886
10887# 译者:为保证在输出中对齐,注意调整句中空格!
10888#~ msgid "deleted: %s"
10889#~ msgstr "删除: %s"
10890
10891# 译者:为保证在输出中对齐,注意调整句中空格!
10892#~ msgid "modified: %s"
10893#~ msgstr "修改: %s"
10894
10895# 译者:为保证在输出中对齐,注意调整句中空格!
10896#~ msgid "renamed: %s -> %s"
10897#~ msgstr "重命名: %s -> %s"
10898
10899# 译者:为保证在输出中对齐,注意调整句中空格!
10900#~ msgid "unmerged: %s"
10901#~ msgstr "未合并: %s"
10902
10903# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10904#~ msgid ""
10905#~ "push.default is unset; its implicit value is changing in\n"
10906#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
10907#~ "and maintain the current behavior after the default changes, use:\n"
10908#~ "\n"
10909#~ " git config --global push.default matching\n"
10910#~ "\n"
10911#~ "To squelch this message and adopt the new behavior now, use:\n"
10912#~ "\n"
10913#~ " git config --global push.default simple\n"
10914#~ "\n"
10915#~ "See 'git help config' and search for 'push.default' for further "
10916#~ "information.\n"
10917#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
10918#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
10919#~ msgstr ""
10920#~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
10921#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
10922#~ "\n"
10923#~ " git config --global push.default matching\n"
10924#~ "\n"
10925#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
10926#~ "\n"
10927#~ " git config --global push.default simple\n"
10928#~ "\n"
10929#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
10930#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
10931#~ "为保持兼容,请用 'current' 代替 'simple')"
10932
90314792
JX
10933#~ msgid "input paths are terminated by a null character"
10934#~ msgstr "输入路径以null字符终止"
10935
10936#~ msgid ""
10937#~ "The following untracked files would NOT be saved but need to be removed "
10938#~ "by stash save:"
10939#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
10940
10941#~ msgid ""
10942#~ "Aborting. Consider using either the --force or --include-untracked option."
10943#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
10944
2e8451e8
JX
10945#~ msgid ""
10946#~ "the following submodule (or one of its nested submodule)\n"
10947#~ "uses a .git directory:"
10948#~ msgid_plural ""
10949#~ "the following submodules (or one of its nested submodule)\n"
10950#~ "use a .git directory:"
10951#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10952#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10953
2e8451e8
JX
10954# 译者:注意保持前导空格
10955#~ msgid " (fix conflicts and then run \"git am --resolved\")"
10956#~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
10957
10958# 译者:注意保持前导空格
10959#~ msgid " (all conflicts fixed: run \"git commit\")"
10960#~ msgstr " (解决所有冲突后,执行 \"git commit\")"
10961
10962#~ msgid "more than %d trees given: '%s'"
10963#~ msgstr "提供了超过 %d 个树对象:'%s'"
10964
10965#~ msgid "You cannot combine --no-ff with --ff-only."
10966#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10967
2e8451e8
JX
10968#~ msgid ""
10969#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10970#~ "(use 'rm -rf' if you really want to remove it including all of its "
10971#~ "history)"
10972#~ msgstr ""
10973#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10974#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10975
10976#~ msgid ""
10977#~ "'%s' has changes staged in the index\n"
10978#~ "(use --cached to keep the file, or -f to force removal)"
10979#~ msgstr ""
10980#~ "'%s' 有变更已暂存至索引中\n"
10981#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10982
10983#~ msgid "show commits where no parent comes before its children"
10984#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10985
10986#~ msgid "show the HEAD reference"
10987#~ msgstr "显示 HEAD 引用"
10988
10989#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10990#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10991
10992#~ msgid "Change flags"
10993#~ msgstr "修改参数"
10994
10995#~ msgid ""
10996#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10997#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10998
10999#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
11000#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
07432cef 11001
4dcdc3d8
JX
11002#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
11003#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11004
11005#~ msgid "See 'git help <command>' for more information on a specific command."
11006#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
11007
11008#~ msgid "BUG: impossible combination of %d and %p"
11009#~ msgstr "BUG: 无法组合 %d 和 %p"
11010
11011# 译者:以下三条实际为一个段落
11012#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
11013#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
11014
11015# 译者:为对齐,下面两句内容有调整
11016#~ msgid "may speed it up, but you have to be careful not to forget to add"
11017#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
11018
11019#~ msgid "new files yourself (see 'git help status')."
11020#~ msgstr "(参见 'git help status')。"
11021
1003b3a5
JX
11022#~ msgid "use any ref in .git/refs"
11023#~ msgstr "使用 .git/refs 里的任意引用"
11024
11025#~ msgid "use any tag in .git/refs/tags"
11026#~ msgstr "使用 .git/refs/tags 里的任意 tag"
11027
11028#~ msgid "bad object %s"
11029#~ msgstr "坏对象 %s"
11030
11031#~ msgid "bogus committer info %s"
11032#~ msgstr "虚假的提交者信息 %s"
11033
a77c07d9
JX
11034#~ msgid "can't fdopen 'show' output fd"
11035#~ msgstr "不能打开 'show' 输出文件句柄"
11036
11037#~ msgid "failed to close pipe to 'show' for object '%s'"
11038#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
11039
07432cef
WS
11040#~ msgid " 0 files changed"
11041#~ msgstr " 0 个文件被修改"
11042
11043#~ msgid " %d file changed"
11044#~ msgid_plural " %d files changed"
11045#~ msgstr[0] " %d 个文件被修改"
11046#~ msgstr[1] " %d 个文件被修改"
11047
11048#~ msgid ", %d insertion(+)"
11049#~ msgid_plural ", %d insertions(+)"
11050#~ msgstr[0] ",插入 %d 行(+)"
11051#~ msgstr[1] ",插入 %d 行(+)"
11052
11053#~ msgid ", %d deletion(-)"
11054#~ msgid_plural ", %d deletions(-)"
11055#~ msgstr[0] ",删除 %d 行(-)"
11056#~ msgstr[1] ",删除 %d 行(-)"
11057
11058#~ msgid "You do not have a valid HEAD"
11059#~ msgstr "您没有一个有效的 HEAD"
11060
11061#~ msgid "oops"
11062#~ msgstr "哎哟"
11063
11064#~ msgid "Would not remove %s\n"
11065#~ msgstr "不会删除 %s\n"
11066
11067#~ msgid "Not removing %s\n"
11068#~ msgstr "未删除 %s\n"
11069
07432cef
WS
11070#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
11071#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
11072
11073#~ msgid "Could not read index"
11074#~ msgstr "不能读取索引"
c160d03f 11075
ef317cd5
JX
11076# 译者:中文字符串拼接,可删除前导空格
11077#~ msgid " (use \"git add\" to track)"
11078#~ msgstr "(使用 \"git add\" 建立跟踪)"
11079
ef317cd5
JX
11080#~ msgid "--detach cannot be used with -b/-B/--orphan"
11081#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
11082
11083#~ msgid "--detach cannot be used with -t"
11084#~ msgstr "--detach 不能和 -t 同时使用"
11085
11086#~ msgid "--orphan and -b|-B are mutually exclusive"
11087#~ msgstr "--orphan 和 -b|-B 互斥"
11088
11089#~ msgid "--orphan cannot be used with -t"
11090#~ msgstr "--orphan 不能和 -t 同时使用"
11091
11092#~ msgid "git checkout: -f and -m are incompatible"
11093#~ msgstr "git checkout:-f 和 -m 不兼容"
11094
11095#~ msgid ""
11096#~ "git checkout: updating paths is incompatible with switching branches."
11097#~ msgstr "git checkout:更新路径和切换分支不兼容。"
11098
c160d03f
JX
11099#~ msgid "diff setup failed"
11100#~ msgstr "diff 设置失败"
11101
11102#~ msgid "merge-recursive: disk full?"
11103#~ msgstr "merge-recursive:磁盘已满?"
11104
11105#~ msgid "diff_setup_done failed"
11106#~ msgstr "diff_setup_done 失败"