]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
[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"
cfff71a9
JX
15"POT-Creation-Date: 2014-01-18 07:42+0800\n"
16"PO-Revision-Date: 2014-01-18 10:54+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
2e8451e8 25#: advice.c:57
c04f5ac3
JX
26#, c-format
27msgid "hint: %.*s\n"
28msgstr "提示:%.*s\n"
29
30#.
31#. * Message used both when 'git commit' fails and when
32#. * other commands doing a merge do.
33#.
2e8451e8 34#: advice.c:87
c04f5ac3
JX
35msgid ""
36"Fix them up in the work tree,\n"
37"and then use 'git add/rm <file>' as\n"
38"appropriate to mark resolution and make a commit,\n"
39"or use 'git commit -a'."
40msgstr ""
41"请先在工作区改正文件,然后酌情使用\n"
42"'git add/rm <file>' 标记解决方案,\n"
43"或使用 'git commit -a'。"
44
ef317cd5 45#: archive.c:10
ef317cd5 46msgid "git archive [options] <tree-ish> [<path>...]"
07432cef 47msgstr "git archive [选项] <树或提交> [<路径>...]"
ef317cd5
JX
48
49#: archive.c:11
ef317cd5 50msgid "git archive --list"
07432cef 51msgstr "git archive --list"
ef317cd5
JX
52
53#: archive.c:12
54msgid ""
55"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
56msgstr ""
07432cef 57"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
ef317cd5
JX
58
59#: archive.c:13
60msgid "git archive --remote <repo> [--exec <cmd>] --list"
07432cef 61msgstr "git archive --remote <版本库> [--exec <命令>] --list"
ef317cd5 62
cfff71a9 63#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328
90314792
JX
64#, c-format
65msgid "pathspec '%s' did not match any files"
66msgstr "路径规则 '%s' 未匹配任何文件"
67
68#: archive.c:327
ef317cd5 69msgid "fmt"
07432cef 70msgstr "格式"
ef317cd5 71
90314792 72#: archive.c:327
ef317cd5 73msgid "archive format"
07432cef 74msgstr "归档格式"
ef317cd5 75
90314792 76#: archive.c:328 builtin/log.c:1193
ef317cd5 77msgid "prefix"
07432cef 78msgstr "前缀"
ef317cd5 79
90314792 80#: archive.c:329
ef317cd5 81msgid "prepend prefix to each pathname in the archive"
07432cef 82msgstr "为归档中每个路径名加上前缀"
ef317cd5 83
cfff71a9
JX
84#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265
85#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680
90314792
JX
86#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
87#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
88#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
ef317cd5
JX
89msgid "file"
90msgstr "文件"
91
90314792 92#: archive.c:331 builtin/archive.c:89
ef317cd5 93msgid "write the archive to this file"
07432cef 94msgstr "归档写入此文件"
ef317cd5 95
90314792 96#: archive.c:333
ef317cd5 97msgid "read .gitattributes in working directory"
07432cef 98msgstr "读取工作区中的 .gitattributes"
ef317cd5 99
90314792 100#: archive.c:334
ef317cd5 101msgid "report archived files on stderr"
07432cef 102msgstr "在标准错误上报告归档文件"
ef317cd5 103
90314792 104#: archive.c:335
ef317cd5 105msgid "store only"
07432cef 106msgstr "只存储"
ef317cd5 107
90314792 108#: archive.c:336
ef317cd5 109msgid "compress faster"
07432cef 110msgstr "压缩速度更快"
ef317cd5 111
90314792 112#: archive.c:344
ef317cd5 113msgid "compress better"
07432cef 114msgstr "压缩效果更好"
ef317cd5 115
90314792 116#: archive.c:347
ef317cd5 117msgid "list supported archive formats"
07432cef 118msgstr "列出支持的归档格式"
ef317cd5 119
90314792 120#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
ef317cd5 121msgid "repo"
07432cef 122msgstr "版本库"
ef317cd5 123
90314792 124#: archive.c:350 builtin/archive.c:91
ef317cd5 125msgid "retrieve the archive from remote repository <repo>"
07432cef 126msgstr "从远程版本库(<版本库>)提取归档文件"
ef317cd5 127
90314792 128#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
ef317cd5 129msgid "command"
07432cef 130msgstr "命令"
ef317cd5 131
90314792 132#: archive.c:352 builtin/archive.c:93
ef317cd5 133msgid "path to the remote git-upload-archive command"
07432cef
WS
134msgstr "远程 git-upload-archive 命令的路径"
135
136#: attr.c:259
137msgid ""
a7409dfb 138"Negative patterns are ignored in git attributes\n"
07432cef 139"Use '\\!' for literal leading exclamation."
ef317cd5 140msgstr ""
a7409dfb 141"负值模版在 git attributes 中被忽略\n"
07432cef 142"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 143
4dcdc3d8
JX
144#: branch.c:60
145#, c-format
146msgid "Not setting branch %s as its own upstream."
147msgstr "未设置分支 %s 作为它自己的上游。"
148
149#: branch.c:82
150#, c-format
151msgid "Branch %s set up to track remote branch %s from %s by rebasing."
152msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
153
154#: branch.c:83
155#, c-format
156msgid "Branch %s set up to track remote branch %s from %s."
157msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
158
159#: branch.c:87
160#, c-format
161msgid "Branch %s set up to track local branch %s by rebasing."
162msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
163
164#: branch.c:88
165#, c-format
166msgid "Branch %s set up to track local branch %s."
167msgstr "分支 %s 设置为跟踪本地分支 %s。"
168
169#: branch.c:92
170#, c-format
171msgid "Branch %s set up to track remote ref %s by rebasing."
172msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
173
174#: branch.c:93
175#, c-format
176msgid "Branch %s set up to track remote ref %s."
177msgstr "分支 %s 设置为跟踪远程引用 %s。"
178
179#: branch.c:97
180#, c-format
181msgid "Branch %s set up to track local ref %s by rebasing."
182msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
183
184#: branch.c:98
185#, c-format
186msgid "Branch %s set up to track local ref %s."
187msgstr "分支 %s 设置为跟踪本地引用 %s。"
188
189#: branch.c:118
190#, c-format
191msgid "Tracking not set up: name too long: %s"
192msgstr "跟踪未设置:名字太长:%s"
193
194#: branch.c:137
195#, c-format
196msgid "Not tracking: ambiguous information for ref %s"
197msgstr "未跟踪:引用 %s 有歧义"
198
199#: branch.c:182
200#, c-format
201msgid "'%s' is not a valid branch name."
202msgstr "'%s' 不是一个有效的分支名称。"
203
204#: branch.c:187
205#, c-format
206msgid "A branch named '%s' already exists."
207msgstr "一个分支名 '%s' 已经存在。"
208
209#: branch.c:195
210msgid "Cannot force update the current branch."
211msgstr "无法强制更新当前分支。"
212
90314792 213#: branch.c:215
1003b3a5
JX
214#, c-format
215msgid "Cannot setup tracking information; starting point '%s' is not a branch."
216msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
217
90314792 218#: branch.c:217
1003b3a5
JX
219#, c-format
220msgid "the requested upstream branch '%s' does not exist"
221msgstr "请求的上游分支 '%s' 不存在"
222
90314792 223#: branch.c:219
1003b3a5
JX
224msgid ""
225"\n"
226"If you are planning on basing your work on an upstream\n"
227"branch that already exists at the remote, you may need to\n"
228"run \"git fetch\" to retrieve it.\n"
229"\n"
230"If you are planning to push out a new local branch that\n"
231"will track its remote counterpart, you may want to use\n"
232"\"git push -u\" to set the upstream config as you push."
233msgstr ""
234"\n"
235"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
236"您可能需要执行 \"git fetch\" 来获取分支。\n"
237"\n"
238"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
239"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
240
90314792 241#: branch.c:264
4dcdc3d8
JX
242#, c-format
243msgid "Not a valid object name: '%s'."
244msgstr "不是一个有效的对象名:'%s'。"
245
90314792 246#: branch.c:284
4dcdc3d8
JX
247#, c-format
248msgid "Ambiguous object name: '%s'."
249msgstr "歧义的对象名:'%s'。"
250
90314792 251#: branch.c:289
4dcdc3d8
JX
252#, c-format
253msgid "Not a valid branch point: '%s'."
254msgstr "无效的分支点:'%s'。"
255
90314792 256#: branch.c:295
4dcdc3d8
JX
257msgid "Failed to lock ref for update"
258msgstr "无法为更新锁定引用"
259
90314792 260#: branch.c:313
4dcdc3d8
JX
261msgid "Failed to write ref"
262msgstr "不能写引用"
263
cfff71a9 264#: bundle.c:37
8ada9598
JX
265#, c-format
266msgid "'%s' does not look like a v2 bundle file"
81809b99 267msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 268
cfff71a9 269#: bundle.c:64
81809b99 270#, c-format
8ada9598 271msgid "unrecognized header: %s%s (%d)"
81809b99 272msgstr "未能识别的包头:%s%s (%d)"
8ada9598 273
cfff71a9 274#: bundle.c:90 builtin/commit.c:706
8ada9598
JX
275#, c-format
276msgid "could not open '%s'"
277msgstr "不能打开 '%s'"
278
cfff71a9 279#: bundle.c:141
8ada9598 280msgid "Repository lacks these prerequisite commits:"
81809b99 281msgstr "版本库缺少这些必备的提交:"
8ada9598 282
cfff71a9
JX
283#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
284#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
90314792 285#: builtin/shortlog.c:158
8ada9598
JX
286msgid "revision walk setup failed"
287msgstr "版本遍历设置失败"
288
cfff71a9 289#: bundle.c:187
8ada9598 290#, c-format
1003b3a5
JX
291msgid "The bundle contains this ref:"
292msgid_plural "The bundle contains these %d refs:"
293msgstr[0] "这个包中含有这个引用:"
294msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 295
cfff71a9 296#: bundle.c:194
6792b93b
JX
297msgid "The bundle records a complete history."
298msgstr "这个包记录一个完整历史。"
299
cfff71a9 300#: bundle.c:196
8ada9598 301#, c-format
1003b3a5
JX
302msgid "The bundle requires this ref:"
303msgid_plural "The bundle requires these %d refs:"
304msgstr[0] "这个包需要这个引用:"
305msgstr[1] "这个包需要 %d 个引用:"
8ada9598 306
cfff71a9 307#: bundle.c:296
8ada9598 308msgid "rev-list died"
81809b99 309msgstr "rev-list 终止"
8ada9598 310
cfff71a9 311#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261
8ada9598
JX
312#, c-format
313msgid "unrecognized argument: %s"
81809b99 314msgstr "未能识别的参数:%s"
8ada9598 315
cfff71a9 316#: bundle.c:337
8ada9598
JX
317#, c-format
318msgid "ref '%s' is excluded by the rev-list options"
81809b99 319msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 320
cfff71a9 321#: bundle.c:382
8ada9598 322msgid "Refusing to create empty bundle."
81809b99 323msgstr "不能创建空包。"
8ada9598 324
6792b93b 325#: bundle.c:398
8ada9598 326msgid "Could not spawn pack-objects"
81809b99 327msgstr "不能生成 pack-objects 进程"
8ada9598 328
6792b93b 329#: bundle.c:416
8ada9598 330msgid "pack-objects died"
81809b99 331msgstr "pack-objects 终止"
8ada9598 332
6792b93b 333#: bundle.c:419
81809b99 334#, c-format
8ada9598 335msgid "cannot create '%s'"
81809b99 336msgstr "不能创建 '%s'"
8ada9598 337
6792b93b 338#: bundle.c:441
8ada9598 339msgid "index-pack died"
81809b99 340msgstr "index-pack 终止"
8ada9598 341
2e8451e8 342#: commit.c:53
c04f5ac3
JX
343#, c-format
344msgid "could not parse %s"
345msgstr "不能解析 %s"
346
2e8451e8 347#: commit.c:55
c04f5ac3
JX
348#, c-format
349msgid "%s %s is not a commit!"
350msgstr "%s %s 不是一个提交!"
351
352#: compat/obstack.c:406 compat/obstack.c:408
353msgid "memory exhausted"
354msgstr "内存耗尽"
355
cfff71a9 356#: connected.c:70
c04f5ac3
JX
357msgid "Could not run 'git rev-list'"
358msgstr "不能执行 'git rev-list'"
359
cfff71a9 360#: connected.c:90
c04f5ac3
JX
361#, c-format
362msgid "failed write to rev-list: %s"
363msgstr "无法写入 rev-list:%s"
364
cfff71a9 365#: connected.c:98
c04f5ac3
JX
366#, c-format
367msgid "failed to close rev-list's stdin: %s"
368msgstr "无法关闭 rev-list 的标准输入:%s"
369
8ada9598
JX
370#: date.c:95
371msgid "in the future"
81809b99 372msgstr "在将来"
8ada9598
JX
373
374#: date.c:101
375#, c-format
376msgid "%lu second ago"
377msgid_plural "%lu seconds ago"
81809b99 378msgstr[0] "%lu 秒钟之前"
5ae481e0 379msgstr[1] "%lu 秒钟之前"
8ada9598
JX
380
381#: date.c:108
382#, c-format
383msgid "%lu minute ago"
384msgid_plural "%lu minutes ago"
81809b99 385msgstr[0] "%lu 分钟之前"
5ae481e0 386msgstr[1] "%lu 分钟之前"
8ada9598
JX
387
388#: date.c:115
389#, c-format
390msgid "%lu hour ago"
391msgid_plural "%lu hours ago"
81809b99 392msgstr[0] "%lu 小时之前"
5ae481e0 393msgstr[1] "%lu 小时之前"
8ada9598
JX
394
395#: date.c:122
396#, c-format
397msgid "%lu day ago"
398msgid_plural "%lu days ago"
81809b99 399msgstr[0] "%lu 天之前"
5ae481e0 400msgstr[1] "%lu 天之前"
8ada9598
JX
401
402#: date.c:128
403#, c-format
404msgid "%lu week ago"
405msgid_plural "%lu weeks ago"
81809b99 406msgstr[0] "%lu 周之前"
5ae481e0 407msgstr[1] "%lu 周之前"
8ada9598
JX
408
409#: date.c:135
410#, c-format
411msgid "%lu month ago"
412msgid_plural "%lu months ago"
81809b99 413msgstr[0] "%lu 个月之前"
5ae481e0 414msgstr[1] "%lu 个月之前"
8ada9598
JX
415
416#: date.c:146
417#, c-format
418msgid "%lu year"
419msgid_plural "%lu years"
81809b99 420msgstr[0] "%lu 年"
5ae481e0 421msgstr[1] "%lu 年"
8ada9598
JX
422
423#: date.c:149
424#, c-format
425msgid "%s, %lu month ago"
426msgid_plural "%s, %lu months ago"
81809b99 427msgstr[0] "%s,%lu 个月之前"
5ae481e0 428msgstr[1] "%s,%lu 个月之前"
8ada9598
JX
429
430#: date.c:154 date.c:159
431#, c-format
432msgid "%lu year ago"
433msgid_plural "%lu years ago"
81809b99 434msgstr[0] "%lu 年前"
5ae481e0 435msgstr[1] "%lu 年前"
8ada9598 436
cfff71a9
JX
437#: diffcore-order.c:24
438#, c-format
439msgid "failed to read orderfile '%s'"
440msgstr "无法读取排序文件 '%s'"
441
90e6ef53 442# 译者:注意保持前导空格
cfff71a9 443#: diff.c:113
c04f5ac3 444#, c-format
07432cef
WS
445msgid " Failed to parse dirstat cut-off percentage '%s'\n"
446msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 447
90e6ef53 448# 译者:注意保持前导空格
cfff71a9 449#: diff.c:118
c04f5ac3 450#, c-format
07432cef
WS
451msgid " Unknown dirstat parameter '%s'\n"
452msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 453
cfff71a9 454#: diff.c:213
07432cef
WS
455#, c-format
456msgid "Unknown value for 'diff.submodule' config variable: '%s'"
457msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
458
cfff71a9 459#: diff.c:263
c04f5ac3
JX
460#, c-format
461msgid ""
462"Found errors in 'diff.dirstat' config variable:\n"
463"%s"
464msgstr ""
90e6ef53 465"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
466"%s"
467
cfff71a9 468#: diff.c:3509
c04f5ac3
JX
469#, c-format
470msgid ""
471"Failed to parse --dirstat/-X option parameter:\n"
472"%s"
473msgstr ""
474"无法解析 --dirstat/-X 选项的参数:\n"
475"%s"
476
cfff71a9 477#: diff.c:3523
07432cef
WS
478#, c-format
479msgid "Failed to parse --submodule option parameter: '%s'"
480msgstr "无法解析 --submodule 选项的参数:'%s'"
481
1003b3a5 482#: gpg-interface.c:59 gpg-interface.c:131
c04f5ac3
JX
483msgid "could not run gpg."
484msgstr "不能执行 gpg。"
485
486#: gpg-interface.c:71
487msgid "gpg did not accept the data"
488msgstr "gpg 没有接受数据"
489
490#: gpg-interface.c:82
491msgid "gpg failed to sign the data"
492msgstr "gpg 无法为数据签名"
493
1003b3a5 494#: gpg-interface.c:115
a77c07d9
JX
495#, c-format
496msgid "could not create temporary file '%s': %s"
497msgstr "不能创建临时文件 '%s':%s"
498
1003b3a5 499#: gpg-interface.c:118
a77c07d9
JX
500#, c-format
501msgid "failed writing detached signature to '%s': %s"
502msgstr "无法将分离式签名写入 '%s':%s"
503
90314792 504#: grep.c:1695
7ac1c0ad
JX
505#, c-format
506msgid "'%s': unable to read %s"
507msgstr "'%s':无法读取 %s"
508
90314792 509#: grep.c:1712
7ac1c0ad
JX
510#, c-format
511msgid "'%s': %s"
512msgstr "'%s':%s"
513
90314792 514#: grep.c:1723
7ac1c0ad
JX
515#, c-format
516msgid "'%s': short read %s"
517msgstr "'%s':读取不完整 %s"
518
b1894384 519#: help.c:210
81809b99 520#, c-format
8ada9598 521msgid "available git commands in '%s'"
81809b99 522msgstr "在 '%s' 下可用的 git 命令"
8ada9598 523
b1894384 524#: help.c:217
8ada9598 525msgid "git commands available from elsewhere on your $PATH"
81809b99 526msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 527
b1894384 528#: help.c:233
a77c07d9
JX
529msgid "The most commonly used git commands are:"
530msgstr "最常用的 git 命令有:"
531
b1894384 532#: help.c:290
c04f5ac3
JX
533#, c-format
534msgid ""
535"'%s' appears to be a git command, but we were not\n"
536"able to execute it. Maybe git-%s is broken?"
537msgstr ""
538"'%s' 像是一个 git 命令,但却无法运行。\n"
539"可能是 git-%s 受损?"
540
b1894384 541#: help.c:347
8ada9598 542msgid "Uh oh. Your system reports no Git commands at all."
81809b99 543msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 544
b1894384 545#: help.c:369
8ada9598
JX
546#, c-format
547msgid ""
548"WARNING: You called a Git command named '%s', which does not exist.\n"
549"Continuing under the assumption that you meant '%s'"
550msgstr ""
81809b99
JX
551"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
552"是 '%s'"
8ada9598 553
b1894384 554#: help.c:374
8ada9598
JX
555#, c-format
556msgid "in %0.1f seconds automatically..."
81809b99 557msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 558
b1894384 559#: help.c:381
8ada9598
JX
560#, c-format
561msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 562msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 563
b1894384 564#: help.c:385 help.c:444
8ada9598
JX
565msgid ""
566"\n"
567"Did you mean this?"
568msgid_plural ""
569"\n"
570"Did you mean one of these?"
571msgstr[0] ""
81809b99
JX
572"\n"
573"您指的是这个么?"
574msgstr[1] ""
575"\n"
195febda 576"您指的是这其中的某一个么?"
8ada9598 577
b1894384 578#: help.c:440
2e8451e8
JX
579#, c-format
580msgid "%s: %s - %s"
581msgstr "%s:%s - %s"
582
07432cef
WS
583#: merge.c:56
584msgid "failed to read the cache"
585msgstr "无法读取缓存"
586
90314792 587#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
cfff71a9 588#: builtin/clone.c:661
07432cef
WS
589msgid "unable to write new index file"
590msgstr "无法写新的索引文件"
591
649900bc
JX
592#: merge-recursive.c:190
593#, c-format
594msgid "(bad commit)\n"
595msgstr "(坏提交)\n"
596
597#: merge-recursive.c:206
598#, c-format
599msgid "addinfo_cache failed for path '%s'"
600msgstr "为路径 '%s' addinfo_cache 失败"
601
2e8451e8 602#: merge-recursive.c:269
649900bc
JX
603msgid "error building trees"
604msgstr "无法创建树"
605
2e8451e8 606#: merge-recursive.c:673
649900bc
JX
607#, c-format
608msgid "failed to create path '%s'%s"
609msgstr "无法创建路径 '%s'%s"
610
2e8451e8 611#: merge-recursive.c:684
649900bc
JX
612#, c-format
613msgid "Removing %s to make room for subdirectory\n"
614msgstr "删除 %s 以便为子目录留出空间\n"
615
616#. something else exists
617#. .. but not some other error (who really cares what?)
2e8451e8 618#: merge-recursive.c:698 merge-recursive.c:719
649900bc
JX
619msgid ": perhaps a D/F conflict?"
620msgstr ":可能是一个目录/文件冲突?"
621
2e8451e8 622#: merge-recursive.c:709
649900bc
JX
623#, c-format
624msgid "refusing to lose untracked file at '%s'"
625msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
626
2e8451e8 627#: merge-recursive.c:749
649900bc
JX
628#, c-format
629msgid "cannot read object %s '%s'"
630msgstr "不能读取对象 %s '%s'"
631
2e8451e8 632#: merge-recursive.c:751
649900bc
JX
633#, c-format
634msgid "blob expected for %s '%s'"
07432cef 635msgstr "%s '%s' 应为数据(blob)对象"
649900bc 636
cfff71a9 637#: merge-recursive.c:774 builtin/clone.c:317
649900bc
JX
638#, c-format
639msgid "failed to open '%s'"
640msgstr "无法打开 '%s'"
641
2e8451e8 642#: merge-recursive.c:782
649900bc
JX
643#, c-format
644msgid "failed to symlink '%s'"
645msgstr "无法创建符号链接 '%s'"
646
2e8451e8 647#: merge-recursive.c:785
649900bc
JX
648#, c-format
649msgid "do not know what to do with %06o %s '%s'"
650msgstr "不知道如何处理 %06o %s '%s'"
651
2e8451e8 652#: merge-recursive.c:923
649900bc
JX
653msgid "Failed to execute internal merge"
654msgstr "无法执行内部合并"
655
2e8451e8 656#: merge-recursive.c:927
649900bc
JX
657#, c-format
658msgid "Unable to add %s to database"
659msgstr "不能添加 %s 至对象库"
660
2e8451e8 661#: merge-recursive.c:943
649900bc
JX
662msgid "unsupported object type in the tree"
663msgstr "在树中有不支持的对象类型"
664
2e8451e8 665#: merge-recursive.c:1022 merge-recursive.c:1036
649900bc
JX
666#, c-format
667msgid ""
668"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
669"in tree."
670msgstr ""
671"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
672"的版本被保留。"
673
2e8451e8 674#: merge-recursive.c:1028 merge-recursive.c:1041
649900bc
JX
675#, c-format
676msgid ""
677"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
678"in tree at %s."
679msgstr ""
680"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
681"的版本保留于 %8$s 中。"
682
2e8451e8 683#: merge-recursive.c:1082
649900bc
JX
684msgid "rename"
685msgstr "重命名"
686
cfff71a9 687#: merge-recursive.c:1082 wt-status.c:283
649900bc
JX
688msgid "renamed"
689msgstr "重命名"
690
2e8451e8 691#: merge-recursive.c:1138
649900bc
JX
692#, c-format
693msgid "%s is a directory in %s adding as %s instead"
694msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
695
2e8451e8 696#: merge-recursive.c:1160
649900bc
JX
697#, c-format
698msgid ""
699"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
700"\"->\"%s\" in \"%s\"%s"
701msgstr ""
702"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
703"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
704
2e8451e8 705#: merge-recursive.c:1165
649900bc
JX
706msgid " (left unresolved)"
707msgstr "(留下未解决)"
708
2e8451e8 709#: merge-recursive.c:1219
649900bc
JX
710#, c-format
711msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
712msgstr ""
713"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
714"%5$s"
715
2e8451e8 716#: merge-recursive.c:1249
649900bc
JX
717#, c-format
718msgid "Renaming %s to %s and %s to %s instead"
07432cef 719msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 720
2e8451e8 721#: merge-recursive.c:1448
649900bc
JX
722#, c-format
723msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
724msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
725
2e8451e8 726#: merge-recursive.c:1458
649900bc
JX
727#, c-format
728msgid "Adding merged %s"
729msgstr "添加合并后的 %s"
730
2e8451e8 731#: merge-recursive.c:1463 merge-recursive.c:1661
649900bc
JX
732#, c-format
733msgid "Adding as %s instead"
734msgstr "而是以 %s 为名添加"
735
2e8451e8 736#: merge-recursive.c:1514
649900bc
JX
737#, c-format
738msgid "cannot read object %s"
739msgstr "不能读取对象 %s"
740
2e8451e8 741#: merge-recursive.c:1517
649900bc
JX
742#, c-format
743msgid "object %s is not a blob"
07432cef 744msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 745
2e8451e8 746#: merge-recursive.c:1565
649900bc
JX
747msgid "modify"
748msgstr "修改"
749
cfff71a9 750#: merge-recursive.c:1565 wt-status.c:281
649900bc
JX
751msgid "modified"
752msgstr "修改"
753
2e8451e8 754#: merge-recursive.c:1575
649900bc
JX
755msgid "content"
756msgstr "内容"
757
2e8451e8 758#: merge-recursive.c:1582
649900bc
JX
759msgid "add/add"
760msgstr "添加/添加"
761
2e8451e8 762#: merge-recursive.c:1616
649900bc
JX
763#, c-format
764msgid "Skipped %s (merged same as existing)"
765msgstr "略过 %s(已经做过相同合并)"
766
2e8451e8 767#: merge-recursive.c:1630
649900bc
JX
768#, c-format
769msgid "Auto-merging %s"
770msgstr "自动合并 %s"
771
cfff71a9 772#: merge-recursive.c:1634 git-submodule.sh:1148
649900bc
JX
773msgid "submodule"
774msgstr "子模组"
775
2e8451e8 776#: merge-recursive.c:1635
649900bc
JX
777#, c-format
778msgid "CONFLICT (%s): Merge conflict in %s"
779msgstr "冲突(%s):合并冲突于 %s"
780
2e8451e8 781#: merge-recursive.c:1725
649900bc
JX
782#, c-format
783msgid "Removing %s"
784msgstr "删除 %s"
785
2e8451e8 786#: merge-recursive.c:1750
649900bc
JX
787msgid "file/directory"
788msgstr "文件/目录"
789
2e8451e8 790#: merge-recursive.c:1756
649900bc
JX
791msgid "directory/file"
792msgstr "目录/文件"
793
2e8451e8 794#: merge-recursive.c:1761
649900bc
JX
795#, c-format
796msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
797msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
798
2e8451e8 799#: merge-recursive.c:1771
649900bc
JX
800#, c-format
801msgid "Adding %s"
802msgstr "添加 %s"
803
2e8451e8 804#: merge-recursive.c:1788
649900bc
JX
805msgid "Fatal merge failure, shouldn't happen."
806msgstr "严重的合并错误,不应发生。"
807
2e8451e8 808#: merge-recursive.c:1807
649900bc
JX
809msgid "Already up-to-date!"
810msgstr "已经是最新的!"
811
2e8451e8 812#: merge-recursive.c:1816
649900bc
JX
813#, c-format
814msgid "merging of trees %s and %s failed"
815msgstr "无法合并树 %s 和 %s"
816
2e8451e8 817#: merge-recursive.c:1846
649900bc
JX
818#, c-format
819msgid "Unprocessed path??? %s"
820msgstr "未处理的路径??? %s"
821
2e8451e8 822#: merge-recursive.c:1891
649900bc
JX
823msgid "Merging:"
824msgstr "合并:"
825
2e8451e8 826#: merge-recursive.c:1904
649900bc 827#, c-format
e5e38ce4
JX
828msgid "found %u common ancestor:"
829msgid_plural "found %u common ancestors:"
830msgstr[0] "发现 %u 个共同祖先:"
831msgstr[1] "发现 %u 个共同祖先:"
649900bc 832
2e8451e8 833#: merge-recursive.c:1941
649900bc
JX
834msgid "merge returned no commit"
835msgstr "合并未返回提交"
836
2e8451e8 837#: merge-recursive.c:1998
649900bc
JX
838#, c-format
839msgid "Could not parse object '%s'"
840msgstr "不能解析对象 '%s'"
841
cfff71a9 842#: merge-recursive.c:2010 builtin/merge.c:665
649900bc
JX
843msgid "Unable to write index."
844msgstr "不能写入索引。"
845
2e8451e8
JX
846#: notes-utils.c:40
847msgid "Cannot commit uninitialized/unreferenced notes tree"
848msgstr "不能提交未初始化/未引用的注解树"
849
850#: notes-utils.c:81
851#, c-format
852msgid "Bad notes.rewriteMode value: '%s'"
853msgstr "坏的 notes.rewriteMode 值:'%s'"
854
855#: notes-utils.c:91
856#, c-format
857msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
858msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
859
860#. TRANSLATORS: The first %s is the name of the
861#. environment variable, the second %s is its value
862#: notes-utils.c:118
863#, c-format
864msgid "Bad %s value: '%s'"
865msgstr "坏的 %s 值:'%s'"
866
90314792 867#: object.c:202
1003b3a5
JX
868#, c-format
869msgid "unable to parse object: %s"
870msgstr "不能解析对象:%s"
871
90314792 872#: parse-options.c:537
8ada9598 873msgid "..."
81809b99 874msgstr "..."
8ada9598 875
90314792 876#: parse-options.c:555
81809b99 877#, c-format
8ada9598 878msgid "usage: %s"
81809b99 879msgstr "用法:%s"
8ada9598
JX
880
881#. TRANSLATORS: the colon here should align with the
882#. one in "usage: %s" translation
90314792 883#: parse-options.c:559
81809b99 884#, c-format
8ada9598 885msgid " or: %s"
81809b99 886msgstr " 或:%s"
8ada9598
JX
887
888# 译者:为保证在输出中对齐,注意调整句中空格!
90314792 889#: parse-options.c:562
81809b99 890#, c-format
8ada9598 891msgid " %s"
81809b99 892msgstr " %s"
8ada9598 893
90314792 894#: parse-options.c:596
63af42fe
JX
895msgid "-NUM"
896msgstr "-数字"
897
cfff71a9 898#: pathspec.c:133
90314792
JX
899msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
900msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
901
cfff71a9 902#: pathspec.c:143
90314792
JX
903msgid ""
904"global 'literal' pathspec setting is incompatible with all other global "
905"pathspec settings"
906msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
907
cfff71a9 908#: pathspec.c:177
90314792
JX
909msgid "invalid parameter for pathspec magic 'prefix'"
910msgstr "路径规则包含无效的神奇前缀"
911
cfff71a9 912#: pathspec.c:183
90314792
JX
913#, c-format
914msgid "Invalid pathspec magic '%.*s' in '%s'"
915msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
916
cfff71a9 917#: pathspec.c:187
90314792
JX
918#, c-format
919msgid "Missing ')' at the end of pathspec magic in '%s'"
920msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
921
cfff71a9 922#: pathspec.c:205
90314792
JX
923#, c-format
924msgid "Unimplemented pathspec magic '%c' in '%s'"
925msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
926
cfff71a9 927#: pathspec.c:230
a77c07d9 928#, c-format
90314792
JX
929msgid "%s: 'literal' and 'glob' are incompatible"
930msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 931
cfff71a9 932#: pathspec.c:241
a77c07d9 933#, c-format
90314792
JX
934msgid "%s: '%s' is outside repository"
935msgstr "%s:'%s' 在版本库之外"
a77c07d9 936
cfff71a9 937#: pathspec.c:291
90314792
JX
938#, c-format
939msgid "Pathspec '%s' is in submodule '%.*s'"
940msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
941
942#.
943#. * We may want to substitute "this command" with a command
944#. * name. E.g. when add--interactive dies when running
945#. * "checkout -p"
946#.
cfff71a9 947#: pathspec.c:353
90314792
JX
948#, c-format
949msgid "%s: pathspec magic not supported by this command: %s"
950msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
951
cfff71a9 952#: pathspec.c:433
90314792
JX
953#, c-format
954msgid "pathspec '%s' is beyond a symbolic link"
955msgstr "路径规则 '%s' 位于符号链接中"
956
cfff71a9
JX
957#: pathspec.c:442
958msgid ""
959"There is nothing to exclude from by :(exclude) patterns.\n"
960"Perhaps you forgot to add either ':/' or '.' ?"
961msgstr ""
962"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
963"添加 ':/' 或 '.' ?"
964
965#: remote.c:753
966#, c-format
967msgid "Cannot fetch both %s and %s to %s"
968msgstr "不能同时获取 %s 和 %s 至 %s"
969
970#: remote.c:757
971#, c-format
972msgid "%s usually tracks %s, not %s"
973msgstr "%s 通常跟踪 %s,而非 %s"
974
975#: remote.c:761
976#, c-format
977msgid "%s tracks both %s and %s"
978msgstr "%s 同时跟踪 %s 和 %s"
979
980#.
981#. * This last possibility doesn't occur because
982#. * FETCH_HEAD_IGNORE entries always appear at
983#. * the end of the list.
984#.
985#: remote.c:769
986msgid "Internal error"
987msgstr "内部错误"
988
989#: remote.c:1871
90314792
JX
990#, c-format
991msgid "Your branch is based on '%s', but the upstream is gone.\n"
992msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
993
cfff71a9 994#: remote.c:1875
90314792
JX
995msgid " (use \"git branch --unset-upstream\" to fixup)\n"
996msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
997
cfff71a9 998#: remote.c:1878
90314792
JX
999#, c-format
1000msgid "Your branch is up-to-date with '%s'.\n"
1001msgstr "您的分支与上游分支 '%s' 一致。\n"
1002
cfff71a9 1003#: remote.c:1882
c04f5ac3
JX
1004#, c-format
1005msgid "Your branch is ahead of '%s' by %d commit.\n"
1006msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1007msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1008msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1009
cfff71a9 1010#: remote.c:1888
07432cef
WS
1011msgid " (use \"git push\" to publish your local commits)\n"
1012msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1013
cfff71a9 1014#: remote.c:1891
c04f5ac3
JX
1015#, c-format
1016msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1017msgid_plural ""
1018"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1019msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1020msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1021
07432cef 1022# 译者:注意保持前导空格
cfff71a9 1023#: remote.c:1899
07432cef
WS
1024msgid " (use \"git pull\" to update your local branch)\n"
1025msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1026
cfff71a9 1027#: remote.c:1902
c04f5ac3
JX
1028#, c-format
1029msgid ""
1030"Your branch and '%s' have diverged,\n"
1031"and have %d and %d different commit each, respectively.\n"
1032msgid_plural ""
1033"Your branch and '%s' have diverged,\n"
1034"and have %d and %d different commits each, respectively.\n"
1035msgstr[0] ""
1036"您的分支和 '%s' 出现了偏离,\n"
195febda 1037"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1038msgstr[1] ""
1039"您的分支和 '%s' 出现了偏离,\n"
195febda 1040"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1041
07432cef 1042# 译者:注意保持前导空格
cfff71a9 1043#: remote.c:1912
07432cef
WS
1044msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1045msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1046
2e8451e8
JX
1047#: run-command.c:80
1048msgid "open /dev/null failed"
1049msgstr "不能打开 /dev/null"
1050
1051#: run-command.c:82
1052#, c-format
1053msgid "dup2(%d,%d) failed"
1054msgstr "不能调用 dup2(%d,%d)"
1055
cfff71a9
JX
1056#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896
1057#: builtin/merge.c:1006 builtin/merge.c:1016
c04f5ac3
JX
1058#, c-format
1059msgid "Could not open '%s' for writing"
90e6ef53 1060msgstr "不能为写入打开 '%s'"
c04f5ac3 1061
cfff71a9
JX
1062#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786
1063#: builtin/merge.c:1008 builtin/merge.c:1021
c04f5ac3
JX
1064#, c-format
1065msgid "Could not write to '%s'"
90e6ef53 1066msgstr "不能写入 '%s'"
c04f5ac3 1067
1003b3a5 1068#: sequencer.c:229
14c8bced
JX
1069msgid ""
1070"after resolving the conflicts, mark the corrected paths\n"
1071"with 'git add <paths>' or 'git rm <paths>'"
1072msgstr ""
1073"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1074"命令标记修正后的文件"
1075
1003b3a5 1076#: sequencer.c:232
c04f5ac3
JX
1077msgid ""
1078"after resolving the conflicts, mark the corrected paths\n"
1079"with 'git add <paths>' or 'git rm <paths>'\n"
1080"and commit the result with 'git commit'"
1081msgstr ""
1082"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1083"对修正后的文件做标记,然后用 'git commit' 提交"
1084
90314792 1085#: sequencer.c:245 sequencer.c:870 sequencer.c:953
c04f5ac3
JX
1086#, c-format
1087msgid "Could not write to %s"
1088msgstr "不能写入 %s"
1089
1003b3a5 1090#: sequencer.c:248
c04f5ac3
JX
1091#, c-format
1092msgid "Error wrapping up %s"
1093msgstr "错误收尾 %s"
1094
1003b3a5 1095#: sequencer.c:263
c04f5ac3
JX
1096msgid "Your local changes would be overwritten by cherry-pick."
1097msgstr "您的本地修改将被拣选操作覆盖。"
1098
1003b3a5 1099#: sequencer.c:265
c04f5ac3
JX
1100msgid "Your local changes would be overwritten by revert."
1101msgstr "您的本地修改将被还原操作覆盖。"
1102
1003b3a5 1103#: sequencer.c:268
c04f5ac3
JX
1104msgid "Commit your changes or stash them to proceed."
1105msgstr "提交您的修改或保存进度后再继续。"
1106
1107#. TRANSLATORS: %s will be "revert" or "cherry-pick"
90314792 1108#: sequencer.c:325
c04f5ac3
JX
1109#, c-format
1110msgid "%s: Unable to write new index file"
90e6ef53 1111msgstr "%s:无法写入新索引文件"
c04f5ac3 1112
90314792 1113#: sequencer.c:356
8ada9598 1114msgid "Could not resolve HEAD commit\n"
81809b99 1115msgstr "不能解析 HEAD 提交\n"
8ada9598 1116
90314792 1117#: sequencer.c:378
8ada9598 1118msgid "Unable to update cache tree\n"
81809b99 1119msgstr "不能更新缓存\n"
8ada9598 1120
90314792 1121#: sequencer.c:423
81809b99 1122#, c-format
8ada9598 1123msgid "Could not parse commit %s\n"
81809b99 1124msgstr "不能解析提交 %s\n"
8ada9598 1125
90314792 1126#: sequencer.c:428
81809b99 1127#, c-format
8ada9598 1128msgid "Could not parse parent commit %s\n"
81809b99 1129msgstr "不能解析父提交 %s\n"
8ada9598 1130
90314792 1131#: sequencer.c:494
c04f5ac3 1132msgid "Your index file is unmerged."
90e6ef53 1133msgstr "您的索引文件未完成合并。"
c04f5ac3 1134
90314792 1135#: sequencer.c:513
c04f5ac3
JX
1136#, c-format
1137msgid "Commit %s is a merge but no -m option was given."
1138msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1139
90314792 1140#: sequencer.c:521
c04f5ac3
JX
1141#, c-format
1142msgid "Commit %s does not have parent %d"
1143msgstr "提交 %s 没有父提交 %d"
1144
90314792 1145#: sequencer.c:525
c04f5ac3
JX
1146#, c-format
1147msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1148msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1149
1150#. TRANSLATORS: The first %s will be "revert" or
1151#. "cherry-pick", the second %s a SHA1
90314792 1152#: sequencer.c:538
c04f5ac3
JX
1153#, c-format
1154msgid "%s: cannot parse parent commit %s"
1155msgstr "%s:不能解析父提交 %s"
1156
90314792 1157#: sequencer.c:542
c04f5ac3
JX
1158#, c-format
1159msgid "Cannot get commit message for %s"
1160msgstr "不能得到 %s 的提交说明"
1161
90314792 1162#: sequencer.c:628
c04f5ac3
JX
1163#, c-format
1164msgid "could not revert %s... %s"
1165msgstr "不能还原 %s... %s"
1166
90314792 1167#: sequencer.c:629
c04f5ac3
JX
1168#, c-format
1169msgid "could not apply %s... %s"
1170msgstr "不能应用 %s... %s"
1171
90314792 1172#: sequencer.c:665
c04f5ac3
JX
1173msgid "empty commit set passed"
1174msgstr "提供了空的提交集"
1175
90314792 1176#: sequencer.c:673
c04f5ac3
JX
1177#, c-format
1178msgid "git %s: failed to read the index"
90e6ef53 1179msgstr "git %s:无法读取索引"
c04f5ac3 1180
90314792 1181#: sequencer.c:678
c04f5ac3
JX
1182#, c-format
1183msgid "git %s: failed to refresh the index"
90e6ef53 1184msgstr "git %s:无法刷新索引"
c04f5ac3 1185
90314792 1186#: sequencer.c:736
c04f5ac3
JX
1187#, c-format
1188msgid "Cannot %s during a %s"
90e6ef53 1189msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1190
90314792 1191#: sequencer.c:758
c04f5ac3
JX
1192#, c-format
1193msgid "Could not parse line %d."
90e6ef53 1194msgstr "不能解析第 %d 行。"
c04f5ac3 1195
90314792 1196#: sequencer.c:763
c04f5ac3 1197msgid "No commits parsed."
7e238ab7 1198msgstr "没有提交被解析。"
c04f5ac3 1199
90314792 1200#: sequencer.c:776
c04f5ac3
JX
1201#, c-format
1202msgid "Could not open %s"
1203msgstr "不能打开 %s"
1204
90314792 1205#: sequencer.c:780
c04f5ac3
JX
1206#, c-format
1207msgid "Could not read %s."
1208msgstr "不能读取 %s。"
1209
90314792 1210#: sequencer.c:787
c04f5ac3
JX
1211#, c-format
1212msgid "Unusable instruction sheet: %s"
1213msgstr "无用的指令表单:%s"
1214
90314792 1215#: sequencer.c:815
c04f5ac3
JX
1216#, c-format
1217msgid "Invalid key: %s"
1218msgstr "无效键名:%s"
1219
90314792 1220#: sequencer.c:818
c04f5ac3
JX
1221#, c-format
1222msgid "Invalid value for %s: %s"
81809b99 1223msgstr "%s 的值无效:%s"
c04f5ac3 1224
90314792 1225#: sequencer.c:830
c04f5ac3
JX
1226#, c-format
1227msgid "Malformed options sheet: %s"
1228msgstr "非法的选项表单:%s"
1229
90314792 1230#: sequencer.c:851
c04f5ac3
JX
1231msgid "a cherry-pick or revert is already in progress"
1232msgstr "一个拣选或还原操作已在进行"
1233
90314792 1234#: sequencer.c:852
c04f5ac3
JX
1235msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1236msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1237
90314792 1238#: sequencer.c:856
c04f5ac3
JX
1239#, c-format
1240msgid "Could not create sequencer directory %s"
90e6ef53 1241msgstr "不能创建序列目录 %s"
c04f5ac3 1242
90314792 1243#: sequencer.c:872 sequencer.c:957
c04f5ac3
JX
1244#, c-format
1245msgid "Error wrapping up %s."
1246msgstr "错误收尾 %s。"
1247
90314792 1248#: sequencer.c:891 sequencer.c:1025
c04f5ac3 1249msgid "no cherry-pick or revert in progress"
195febda 1250msgstr "拣选或还原操作并未进行"
c04f5ac3 1251
90314792 1252#: sequencer.c:893
c04f5ac3
JX
1253msgid "cannot resolve HEAD"
1254msgstr "不能解析 HEAD"
1255
90314792 1256#: sequencer.c:895
c04f5ac3 1257msgid "cannot abort from a branch yet to be born"
90e6ef53 1258msgstr "不能从尚未建立的分支终止"
c04f5ac3 1259
90314792 1260#: sequencer.c:917 builtin/apply.c:4061
c04f5ac3
JX
1261#, c-format
1262msgid "cannot open %s: %s"
1263msgstr "不能打开 %s:%s"
1264
90314792 1265#: sequencer.c:920
c04f5ac3
JX
1266#, c-format
1267msgid "cannot read %s: %s"
1268msgstr "不能读取 %s:%s"
1269
90314792 1270#: sequencer.c:921
c04f5ac3 1271msgid "unexpected end of file"
9aafc933 1272msgstr "意外的文件结束"
c04f5ac3 1273
90314792 1274#: sequencer.c:927
c04f5ac3
JX
1275#, c-format
1276msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1277msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1278
90314792 1279#: sequencer.c:950
c04f5ac3
JX
1280#, c-format
1281msgid "Could not format %s."
1282msgstr "不能格式化 %s。"
1283
90314792 1284#: sequencer.c:1093
4dcdc3d8
JX
1285#, c-format
1286msgid "%s: can't cherry-pick a %s"
1287msgstr "%s:不能拣选一个%s"
1288
90314792 1289#: sequencer.c:1096
4dcdc3d8
JX
1290#, c-format
1291msgid "%s: bad revision"
1292msgstr "%s:错误的版本"
1293
90314792 1294#: sequencer.c:1130
c04f5ac3
JX
1295msgid "Can't revert as initial commit"
1296msgstr "不能作为初始提交还原"
1297
90314792 1298#: sequencer.c:1131
c04f5ac3
JX
1299msgid "Can't cherry-pick into empty head"
1300msgstr "不能拣选到空分支"
1301
cfff71a9 1302#: sha1_name.c:439
2e8451e8
JX
1303msgid ""
1304"Git normally never creates a ref that ends with 40 hex characters\n"
1305"because it will be ignored when you just specify 40-hex. These refs\n"
1306"may be created by mistake. For example,\n"
1307"\n"
1308" git checkout -b $br $(git rev-parse ...)\n"
1309"\n"
1310"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1311"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1312"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1313msgstr ""
1314"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1315"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1316"\n"
1317" git checkout -b $br $(git rev-parse ...)\n"
1318"\n"
1319"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1320"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1321"命令关闭本消息通知。"
1322
cfff71a9 1323#: sha1_name.c:1109
170e9899
JX
1324msgid "HEAD does not point to a branch"
1325msgstr "HEAD 没有指向一个分支"
1326
cfff71a9 1327#: sha1_name.c:1112
170e9899
JX
1328#, c-format
1329msgid "No such branch: '%s'"
1330msgstr "没有此分支:'%s'"
1331
cfff71a9 1332#: sha1_name.c:1114
170e9899
JX
1333#, c-format
1334msgid "No upstream configured for branch '%s'"
1335msgstr "尚未给分支 '%s' 设置上游"
1336
cfff71a9 1337#: sha1_name.c:1118
170e9899
JX
1338#, c-format
1339msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1340msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1341
90314792
JX
1342#: submodule.c:64 submodule.c:98
1343msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1344msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1345
1346#: submodule.c:68 submodule.c:102
1347#, c-format
1348msgid "Could not find section in .gitmodules where path=%s"
1349msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1350
1351#. Maybe the user already did that, don't error out here
1352#: submodule.c:76
1353#, c-format
1354msgid "Could not update .gitmodules entry %s"
1355msgstr "不能更新 .gitmodules 条目 %s"
1356
1357#. Maybe the user already did that, don't error out here
1358#: submodule.c:109
1359#, c-format
1360msgid "Could not remove .gitmodules entry for %s"
1361msgstr "无法移除 %s 的 .gitmodules 条目"
1362
1363#: submodule.c:127
1364msgid "could not find .gitmodules in index"
1365msgstr "无法在索引中找到 .gitmodules"
1366
1367#: submodule.c:133
1368msgid "reading updated .gitmodules failed"
1369msgstr "读取更新后的 .gitmodules 失败"
1370
1371#: submodule.c:135
1372msgid "unable to stat updated .gitmodules"
1373msgstr "不能枚举更新后的 .gitmodules"
1374
1375#: submodule.c:139
1376msgid "unable to remove .gitmodules from index"
1377msgstr "不能从索引中移除 .gitmodules"
1378
1379#: submodule.c:141
1380msgid "adding updated .gitmodules failed"
1381msgstr "添加更新后的 .gitmodules 失败"
1382
1383#: submodule.c:143
1384msgid "staging updated .gitmodules failed"
1385msgstr "将更新后 .gitmodules 添加暂存区失败"
1386
1387#: submodule.c:1144 builtin/init-db.c:363
1388#, c-format
1389msgid "Could not create git link %s"
1390msgstr "不能创建 git link %s"
1391
1392#: submodule.c:1155
1393#, c-format
1394msgid "Could not set core.worktree in %s"
1395msgstr "不能在 %s 中设置 core.worktree"
1396
1397#: urlmatch.c:120
1398msgid "invalid URL scheme name or missing '://' suffix"
1399msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1400
1401#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1402#, c-format
1403msgid "invalid %XX escape sequence"
1404msgstr "无效的 %XX 转义序列"
1405
1406#: urlmatch.c:172
1407msgid "missing host and scheme is not 'file:'"
1408msgstr "缺失主机名且URL方案不是 'file:'"
1409
1410#: urlmatch.c:189
1411msgid "a 'file:' URL may not have a port number"
1412msgstr "一个 'file:' URL 不应该包含端口号"
1413
1414#: urlmatch.c:199
1415msgid "invalid characters in host name"
1416msgstr "主机名中包含无效的字符"
1417
1418#: urlmatch.c:244 urlmatch.c:255
1419msgid "invalid port number"
1420msgstr "无效的端口号"
1421
1422#: urlmatch.c:322
1423msgid "invalid '..' path segment"
1424msgstr "无效的 '..' 路径片段"
1425
1426#: wrapper.c:422
07432cef 1427#, c-format
ef317cd5 1428msgid "unable to access '%s': %s"
07432cef
WS
1429msgstr "不能访问 '%s':%s"
1430
90314792 1431#: wrapper.c:443
07432cef
WS
1432#, c-format
1433msgid "unable to access '%s'"
1434msgstr "不能访问 '%s'"
ef317cd5 1435
90314792 1436#: wrapper.c:454
d691f479
JX
1437#, c-format
1438msgid "unable to look up current user in the passwd file: %s"
07432cef 1439msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1440
90314792 1441#: wrapper.c:455
d691f479
JX
1442msgid "no such user"
1443msgstr "无此用户"
1444
cfff71a9 1445#: wt-status.c:150
c04f5ac3
JX
1446msgid "Unmerged paths:"
1447msgstr "未合并的路径:"
1448
90e6ef53 1449# 译者:注意保持前导空格
cfff71a9 1450#: wt-status.c:177 wt-status.c:204
c04f5ac3
JX
1451#, c-format
1452msgid " (use \"git reset %s <file>...\" to unstage)"
1453msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1454
90e6ef53 1455# 译者:注意保持前导空格
cfff71a9 1456#: wt-status.c:179 wt-status.c:206
c04f5ac3
JX
1457msgid " (use \"git rm --cached <file>...\" to unstage)"
1458msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1459
90e6ef53 1460# 译者:注意保持前导空格
cfff71a9 1461#: wt-status.c:183
6792b93b
JX
1462msgid " (use \"git add <file>...\" to mark resolution)"
1463msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1464
1465# 译者:注意保持前导空格
cfff71a9 1466#: wt-status.c:185 wt-status.c:189
c04f5ac3
JX
1467msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1468msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1469
6792b93b 1470# 译者:注意保持前导空格
cfff71a9 1471#: wt-status.c:187
6792b93b
JX
1472msgid " (use \"git rm <file>...\" to mark resolution)"
1473msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1474
cfff71a9 1475#: wt-status.c:198
c04f5ac3
JX
1476msgid "Changes to be committed:"
1477msgstr "要提交的变更:"
1478
cfff71a9 1479#: wt-status.c:216
c04f5ac3 1480msgid "Changes not staged for commit:"
7e238ab7 1481msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1482
90e6ef53 1483# 译者:注意保持前导空格
cfff71a9 1484#: wt-status.c:220
c04f5ac3
JX
1485msgid " (use \"git add <file>...\" to update what will be committed)"
1486msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1487
90e6ef53 1488# 译者:注意保持前导空格
cfff71a9 1489#: wt-status.c:222
c04f5ac3
JX
1490msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1491msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1492
90e6ef53 1493# 译者:注意保持前导空格
cfff71a9 1494#: wt-status.c:223
c04f5ac3
JX
1495msgid ""
1496" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1497msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1498
90e6ef53 1499# 译者:注意保持前导空格
cfff71a9 1500#: wt-status.c:225
c04f5ac3
JX
1501msgid " (commit or discard the untracked or modified content in submodules)"
1502msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1503
90e6ef53 1504# 译者:注意保持前导空格
cfff71a9 1505#: wt-status.c:237
c04f5ac3
JX
1506#, c-format
1507msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1508msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1509
cfff71a9 1510#: wt-status.c:254
c04f5ac3
JX
1511msgid "bug"
1512msgstr "bug"
1513
cfff71a9 1514#: wt-status.c:259
c04f5ac3
JX
1515msgid "both deleted:"
1516msgstr "双方删除:"
1517
cfff71a9 1518#: wt-status.c:260
c04f5ac3
JX
1519msgid "added by us:"
1520msgstr "由我们添加:"
1521
cfff71a9 1522#: wt-status.c:261
c04f5ac3
JX
1523msgid "deleted by them:"
1524msgstr "由他们删除:"
1525
cfff71a9 1526#: wt-status.c:262
c04f5ac3
JX
1527msgid "added by them:"
1528msgstr "由他们添加:"
1529
cfff71a9 1530#: wt-status.c:263
c04f5ac3
JX
1531msgid "deleted by us:"
1532msgstr "由我们删除:"
1533
cfff71a9 1534#: wt-status.c:264
c04f5ac3
JX
1535msgid "both added:"
1536msgstr "双方添加:"
1537
cfff71a9 1538#: wt-status.c:265
c04f5ac3
JX
1539msgid "both modified:"
1540msgstr "双方修改:"
1541
cfff71a9
JX
1542# 译者:为保证在输出中对齐,注意调整句中空格!
1543#: wt-status.c:275
1544msgid "new file"
1545msgstr "新文件"
1546
1547#: wt-status.c:277
1548msgid "copied"
1549msgstr "拷贝"
1550
1551#: wt-status.c:279
1552msgid "deleted"
1553msgstr "删除"
1554
1555# 译者:为保证在输出中对齐,注意调整句中空格!
1556#: wt-status.c:285
1557msgid "typechange"
1558msgstr "类型变更"
1559
1560# 译者:为保证在输出中对齐,注意调整句中空格!
1561#: wt-status.c:287
1562msgid "unknown"
1563msgstr "未知"
1564
1565#: wt-status.c:289
1566msgid "unmerged"
1567msgstr "未合并"
1568
90e6ef53 1569# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
cfff71a9 1570#: wt-status.c:336
c04f5ac3 1571msgid "new commits, "
aa9565f7 1572msgstr "新提交, "
c04f5ac3 1573
90e6ef53 1574# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
cfff71a9 1575#: wt-status.c:338
c04f5ac3 1576msgid "modified content, "
aa9565f7 1577msgstr "修改的内容, "
c04f5ac3 1578
90e6ef53 1579# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
cfff71a9 1580#: wt-status.c:340
c04f5ac3 1581msgid "untracked content, "
aa9565f7 1582msgstr "未跟踪的内容, "
c04f5ac3 1583
cfff71a9 1584#: wt-status.c:357
c04f5ac3
JX
1585#, c-format
1586msgid "bug: unhandled diff status %c"
90e6ef53 1587msgstr "bug:未处理的差异状态 %c"
c04f5ac3 1588
cfff71a9 1589#: wt-status.c:732
90314792
JX
1590msgid "Submodules changed but not updated:"
1591msgstr "子模组已修改但尚未更新:"
1592
cfff71a9 1593#: wt-status.c:734
90314792
JX
1594msgid "Submodule changes to be committed:"
1595msgstr "要提交的子模组变更:"
1596
cfff71a9
JX
1597#: wt-status.c:836
1598msgid ""
1599"Do not touch the line above.\n"
1600"Everything below will be removed."
1601msgstr ""
1602"不要改动上面的一行。\n"
1603"下面的所有内容均将被删除。"
1604
1605#: wt-status.c:899
6792b93b 1606msgid "You have unmerged paths."
195febda 1607msgstr "您有尚未合并的路径。"
6792b93b
JX
1608
1609# 译者:注意保持前导空格
cfff71a9 1610#: wt-status.c:902
6792b93b
JX
1611msgid " (fix conflicts and run \"git commit\")"
1612msgstr " (解决冲突并运行 \"git commit\")"
1613
cfff71a9 1614#: wt-status.c:905
6792b93b
JX
1615msgid "All conflicts fixed but you are still merging."
1616msgstr "所有冲突已解决但您仍处于合并中。"
1617
1618# 译者:注意保持前导空格
cfff71a9 1619#: wt-status.c:908
6792b93b
JX
1620msgid " (use \"git commit\" to conclude merge)"
1621msgstr " (使用 \"git commit\" 结束合并)"
1622
cfff71a9 1623#: wt-status.c:918
6792b93b
JX
1624msgid "You are in the middle of an am session."
1625msgstr "您正处于一个 am 过程中。"
1626
cfff71a9 1627#: wt-status.c:921
6792b93b
JX
1628msgid "The current patch is empty."
1629msgstr "当前的补丁为空。"
1630
1631# 译者:注意保持前导空格
cfff71a9 1632#: wt-status.c:925
2e8451e8
JX
1633msgid " (fix conflicts and then run \"git am --continue\")"
1634msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1635
1636# 译者:注意保持前导空格
cfff71a9 1637#: wt-status.c:927
6792b93b
JX
1638msgid " (use \"git am --skip\" to skip this patch)"
1639msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1640
1641# 译者:注意保持前导空格
cfff71a9 1642#: wt-status.c:929
6792b93b
JX
1643msgid " (use \"git am --abort\" to restore the original branch)"
1644msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1645
cfff71a9 1646#: wt-status.c:989 wt-status.c:1006
63af42fe
JX
1647#, c-format
1648msgid "You are currently rebasing branch '%s' on '%s'."
1649msgstr "您正在将分支 '%s' 变基到 '%s'。"
1650
cfff71a9 1651#: wt-status.c:994 wt-status.c:1011
6792b93b
JX
1652msgid "You are currently rebasing."
1653msgstr "您正在变基。"
1654
1655# 译者:注意保持前导空格
cfff71a9 1656#: wt-status.c:997
6792b93b
JX
1657msgid " (fix conflicts and then run \"git rebase --continue\")"
1658msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1659
1660# 译者:注意保持前导空格
cfff71a9 1661#: wt-status.c:999
6792b93b
JX
1662msgid " (use \"git rebase --skip\" to skip this patch)"
1663msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1664
1665# 译者:注意保持前导空格
cfff71a9 1666#: wt-status.c:1001
6792b93b
JX
1667msgid " (use \"git rebase --abort\" to check out the original branch)"
1668msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1669
1670# 译者:注意保持前导空格
cfff71a9 1671#: wt-status.c:1014
6792b93b
JX
1672msgid " (all conflicts fixed: run \"git rebase --continue\")"
1673msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1674
cfff71a9 1675#: wt-status.c:1018
63af42fe
JX
1676#, c-format
1677msgid ""
1678"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1679msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1680
cfff71a9 1681#: wt-status.c:1023
6792b93b
JX
1682msgid "You are currently splitting a commit during a rebase."
1683msgstr "您正在变基过程中拆分一个提交。"
1684
1685# 译者:注意保持前导空格
cfff71a9 1686#: wt-status.c:1026
6792b93b
JX
1687msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1688msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1689
cfff71a9 1690#: wt-status.c:1030
63af42fe
JX
1691#, c-format
1692msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1693msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1694
cfff71a9 1695#: wt-status.c:1035
6792b93b
JX
1696msgid "You are currently editing a commit during a rebase."
1697msgstr "您正在变基过程中编辑一个提交。"
1698
1699# 译者:注意保持前导空格
cfff71a9 1700#: wt-status.c:1038
6792b93b
JX
1701msgid " (use \"git commit --amend\" to amend the current commit)"
1702msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1703
1704# 译者:注意保持前导空格
cfff71a9 1705#: wt-status.c:1040
6792b93b
JX
1706msgid ""
1707" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1708msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1709
cfff71a9 1710#: wt-status.c:1050
90314792
JX
1711#, c-format
1712msgid "You are currently cherry-picking commit %s."
1713msgstr "您正在做拣选提交 %s。"
6792b93b 1714
2e8451e8 1715# 译者:注意保持前导空格
cfff71a9 1716#: wt-status.c:1055
2e8451e8
JX
1717msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1718msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1719
6792b93b 1720# 译者:注意保持前导空格
cfff71a9 1721#: wt-status.c:1058
2e8451e8
JX
1722msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1723msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 1724
2e8451e8 1725# 译者:注意保持前导空格
cfff71a9 1726#: wt-status.c:1060
2e8451e8
JX
1727msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1728msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1729
cfff71a9 1730#: wt-status.c:1069
1003b3a5
JX
1731#, c-format
1732msgid "You are currently reverting commit %s."
1733msgstr "您正在反转提交 %s 。"
1734
1735# 译者:注意保持前导空格
cfff71a9 1736#: wt-status.c:1074
1003b3a5
JX
1737msgid " (fix conflicts and run \"git revert --continue\")"
1738msgstr " (解决冲突并运行 \"git revert --continue\")"
1739
1740# 译者:注意保持前导空格
cfff71a9 1741#: wt-status.c:1077
1003b3a5
JX
1742msgid " (all conflicts fixed: run \"git revert --continue\")"
1743msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1744
1745# 译者:注意保持前导空格
cfff71a9 1746#: wt-status.c:1079
1003b3a5
JX
1747msgid " (use \"git revert --abort\" to cancel the revert operation)"
1748msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1749
cfff71a9 1750#: wt-status.c:1090
63af42fe 1751#, c-format
1003b3a5
JX
1752msgid "You are currently bisecting, started from branch '%s'."
1753msgstr "您正在从分支 '%s' 开始做二分查找。"
63af42fe 1754
cfff71a9 1755#: wt-status.c:1094
6792b93b
JX
1756msgid "You are currently bisecting."
1757msgstr "您正在做二分查找。"
1758
1759# 译者:注意保持前导空格
cfff71a9 1760#: wt-status.c:1097
6792b93b
JX
1761msgid " (use \"git bisect reset\" to get back to the original branch)"
1762msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1763
cfff71a9 1764#: wt-status.c:1272
c04f5ac3
JX
1765msgid "On branch "
1766msgstr "位于分支 "
1767
cfff71a9 1768#: wt-status.c:1279
2e8451e8
JX
1769msgid "rebase in progress; onto "
1770msgstr "变基正在进行中;至 "
1771
cfff71a9 1772#: wt-status.c:1286
1003b3a5
JX
1773msgid "HEAD detached at "
1774msgstr "头指针分离于 "
1775
cfff71a9 1776#: wt-status.c:1288
1003b3a5
JX
1777msgid "HEAD detached from "
1778msgstr "头指针分离自 "
1779
cfff71a9 1780#: wt-status.c:1291
c04f5ac3
JX
1781msgid "Not currently on any branch."
1782msgstr "当前不在任何分支上。"
1783
cfff71a9 1784#: wt-status.c:1308
c04f5ac3
JX
1785msgid "Initial commit"
1786msgstr "初始提交"
1787
cfff71a9 1788#: wt-status.c:1322
ef317cd5 1789msgid "Untracked files"
07432cef 1790msgstr "未跟踪的文件"
c04f5ac3 1791
cfff71a9 1792#: wt-status.c:1324
ef317cd5 1793msgid "Ignored files"
07432cef 1794msgstr "忽略的文件"
c04f5ac3 1795
cfff71a9 1796#: wt-status.c:1328
1003b3a5 1797#, c-format
4dcdc3d8
JX
1798msgid ""
1799"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1800"may speed it up, but you have to be careful not to forget to add\n"
1801"new files yourself (see 'git help status')."
1802msgstr ""
1803"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1804"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 1805
cfff71a9 1806#: wt-status.c:1334
c04f5ac3
JX
1807#, c-format
1808msgid "Untracked files not listed%s"
1809msgstr "未跟踪的文件没有列出%s"
1810
7e238ab7 1811# 译者:中文字符串拼接,可删除前导空格
cfff71a9 1812#: wt-status.c:1336
c04f5ac3 1813msgid " (use -u option to show untracked files)"
7e238ab7 1814msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1815
cfff71a9 1816#: wt-status.c:1342
c04f5ac3
JX
1817msgid "No changes"
1818msgstr "没有修改"
1819
cfff71a9 1820#: wt-status.c:1347
07432cef 1821#, c-format
ef317cd5 1822msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1823msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1824
cfff71a9 1825#: wt-status.c:1350
07432cef 1826#, c-format
ef317cd5 1827msgid "no changes added to commit\n"
07432cef 1828msgstr "修改尚未加入提交\n"
c04f5ac3 1829
cfff71a9 1830#: wt-status.c:1353
07432cef 1831#, c-format
ef317cd5
JX
1832msgid ""
1833"nothing added to commit but untracked files present (use \"git add\" to "
1834"track)\n"
07432cef 1835msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1836
cfff71a9 1837#: wt-status.c:1356
07432cef 1838#, c-format
ef317cd5 1839msgid "nothing added to commit but untracked files present\n"
07432cef 1840msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1841
7e238ab7 1842# 译者:中文字符串拼接,可删除前导空格
cfff71a9 1843#: wt-status.c:1359
07432cef 1844#, c-format
ef317cd5 1845msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1846msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1847
cfff71a9 1848#: wt-status.c:1362 wt-status.c:1367
07432cef 1849#, c-format
ef317cd5 1850msgid "nothing to commit\n"
07432cef 1851msgstr "无文件要提交\n"
ef317cd5 1852
7e238ab7 1853# 译者:中文字符串拼接,可删除前导空格
cfff71a9 1854#: wt-status.c:1365
07432cef 1855#, c-format
ef317cd5 1856msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1857msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1858
7e238ab7 1859# 译者:中文字符串拼接,可删除前导空格
cfff71a9 1860#: wt-status.c:1369
07432cef 1861#, c-format
ef317cd5 1862msgid "nothing to commit, working directory clean\n"
07432cef 1863msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1864
cfff71a9 1865#: wt-status.c:1478
c04f5ac3 1866msgid "HEAD (no branch)"
61bc0753 1867msgstr "HEAD(非分支)"
c04f5ac3 1868
90e6ef53 1869# 译者:注意保持句尾空格
cfff71a9 1870#: wt-status.c:1484
c04f5ac3
JX
1871msgid "Initial commit on "
1872msgstr "初始提交于 "
1873
cfff71a9 1874#: wt-status.c:1514
90314792
JX
1875msgid "gone"
1876msgstr "丢失"
1877
90e6ef53 1878# 译者:注意保持句尾空格
cfff71a9 1879#: wt-status.c:1516
c04f5ac3
JX
1880msgid "behind "
1881msgstr "落后 "
1882
90e6ef53 1883# 译者:注意保持句尾空格
cfff71a9 1884#: wt-status.c:1519 wt-status.c:1522
c04f5ac3
JX
1885msgid "ahead "
1886msgstr "领先 "
1887
90e6ef53 1888# 译者:注意保持句尾空格
cfff71a9 1889#: wt-status.c:1524
c04f5ac3
JX
1890msgid ", behind "
1891msgstr ",落后 "
1892
cfff71a9 1893#: compat/precompose_utf8.c:55 builtin/clone.c:356
a77c07d9
JX
1894#, c-format
1895msgid "failed to unlink '%s'"
1896msgstr "无法删除 '%s'"
1897
1898#: builtin/add.c:20
1899msgid "git add [options] [--] <pathspec>..."
90314792 1900msgstr "git add [选项] [--] <路径规则>..."
ef317cd5 1901
4dcdc3d8
JX
1902# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1903#.
1904#. * To be consistent with "git add -p" and most Git
1905#. * commands, we should default to being tree-wide, but
1906#. * this is not the original behavior and can't be
1907#. * changed until users trained themselves not to type
1908#. * "git add -u" or "git add -A". For now, we warn and
1909#. * keep the old behavior. Later, the behavior can be changed
1910#. * to tree-wide, keeping the warning for a while, and
1911#. * eventually we can drop the warning.
1912#.
1913#: builtin/add.c:58
1914#, c-format
1915msgid ""
1916"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1917"subdirectory of the tree will change in Git 2.0 and should not be used "
1918"anymore.\n"
1919"To add content for the whole tree, run:\n"
1920"\n"
1921" git add %s :/\n"
1922" (or git add %s :/)\n"
1923"\n"
1924"To restrict the command to the current directory, run:\n"
1925"\n"
1926" git add %s .\n"
1927" (or git add %s .)\n"
1928"\n"
1929"With the current Git version, the command is restricted to the current "
1930"directory.\n"
1931msgstr ""
1932"在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
1933"'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
1934"如果要添加整个目录树的内容,执行:\n"
1935"\n"
1936" git add %s :/\n"
1937" (或 git add %s :/)\n"
1938"\n"
1939"如果要限制该命令只作用于当前目录,执行:\n"
1940"\n"
1941" git add %s .\n"
1942" (或 git add %s .)\n"
1943"\n"
1944"对于当前版本的 Git,这条命令只作用于当前目录。\n"
1945
1946#: builtin/add.c:100
1947#, c-format
1948msgid ""
1949"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1950"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1951"Paths like '%s' that are\n"
1952"removed from your working tree are ignored with this version of Git.\n"
1953"\n"
1954"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1955" ignores paths you removed from your working tree.\n"
1956"\n"
1957"* 'git add --all <pathspec>' will let you also record the removals.\n"
1958"\n"
1959"Run 'git status' to check the paths you removed from your working tree.\n"
1960msgstr ""
1961"您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
1962"针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
1963"像本地工作区移除的路径 '%s'\n"
1964"在此版本的 Git 中被忽略。\n"
1965"\n"
90314792 1966"* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
4dcdc3d8
JX
1967" 忽略您本地工作区中移除的文件。\n"
1968"\n"
90314792 1969"* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
4dcdc3d8
JX
1970"\n"
1971"运行 'git status' 来检查您本地工作区中移除的路径。\n"
1972
1973#: builtin/add.c:144
c04f5ac3
JX
1974#, c-format
1975msgid "unexpected diff status %c"
1976msgstr "意外的差异状态 %c"
1977
90314792 1978#: builtin/add.c:149 builtin/commit.c:260
c04f5ac3
JX
1979msgid "updating files failed"
1980msgstr "更新文件失败"
1981
4dcdc3d8 1982#: builtin/add.c:163
c04f5ac3
JX
1983#, c-format
1984msgid "remove '%s'\n"
1985msgstr "删除 '%s'\n"
1986
90314792 1987#: builtin/add.c:237
c04f5ac3 1988msgid "Unstaged changes after refreshing the index:"
90e6ef53 1989msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1990
90314792 1991#: builtin/add.c:299
c04f5ac3 1992msgid "Could not read the index"
90e6ef53 1993msgstr "不能读取索引"
c04f5ac3 1994
90314792 1995#: builtin/add.c:310
c04f5ac3
JX
1996#, c-format
1997msgid "Could not open '%s' for writing."
195febda 1998msgstr "不能打开 '%s' 以写入。"
c04f5ac3 1999
90314792 2000#: builtin/add.c:314
c04f5ac3 2001msgid "Could not write patch"
195febda 2002msgstr "不能生成补丁"
c04f5ac3 2003
90314792 2004#: builtin/add.c:319
c04f5ac3
JX
2005#, c-format
2006msgid "Could not stat '%s'"
90e6ef53 2007msgstr "不能查看文件状态 '%s'"
c04f5ac3 2008
90314792 2009#: builtin/add.c:321
c04f5ac3
JX
2010msgid "Empty patch. Aborted."
2011msgstr "空补丁。异常终止。"
2012
90314792 2013#: builtin/add.c:327
8ada9598
JX
2014#, c-format
2015msgid "Could not apply '%s'"
2016msgstr "不能应用 '%s'"
2017
90314792 2018#: builtin/add.c:337
8ada9598 2019msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2020msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2021
cfff71a9
JX
2022#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70
2023#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344
90314792 2024#: builtin/rm.c:269
ef317cd5 2025msgid "dry run"
07432cef 2026msgstr "演习"
ef317cd5 2027
90314792
JX
2028#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
2029#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
cfff71a9 2030#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
ef317cd5
JX
2031msgid "be verbose"
2032msgstr "冗长输出"
2033
90314792 2034#: builtin/add.c:357
ef317cd5 2035msgid "interactive picking"
07432cef 2036msgstr "交互式拣选"
ef317cd5 2037
90314792 2038#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
ef317cd5 2039msgid "select hunks interactively"
07432cef 2040msgstr "交互式挑选数据块"
ef317cd5 2041
90314792 2042#: builtin/add.c:359
ef317cd5 2043msgid "edit current diff and apply"
07432cef 2044msgstr "编辑当前差异并应用"
ef317cd5 2045
90314792 2046#: builtin/add.c:360
ef317cd5 2047msgid "allow adding otherwise ignored files"
07432cef 2048msgstr "允许添加忽略的文件"
ef317cd5 2049
90314792 2050#: builtin/add.c:361
ef317cd5 2051msgid "update tracked files"
07432cef 2052msgstr "更新已跟踪的文件"
ef317cd5 2053
90314792 2054#: builtin/add.c:362
ef317cd5 2055msgid "record only the fact that the path will be added later"
07432cef 2056msgstr "只记录,该路径稍后再添加"
ef317cd5 2057
90314792 2058#: builtin/add.c:363
ef317cd5 2059msgid "add changes from all tracked and untracked files"
07432cef 2060msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2061
4dcdc3d8 2062#. takes no arguments
90314792 2063#: builtin/add.c:366
4dcdc3d8
JX
2064msgid "ignore paths removed in the working tree (same as --no-all)"
2065msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2066
90314792 2067#: builtin/add.c:368
ef317cd5 2068msgid "don't add, only refresh the index"
07432cef 2069msgstr "不添加,只刷新索引"
ef317cd5 2070
90314792 2071#: builtin/add.c:369
ef317cd5 2072msgid "just skip files which cannot be added because of errors"
07432cef 2073msgstr "跳过因出错不能添加的文件"
ef317cd5 2074
90314792 2075#: builtin/add.c:370
ef317cd5 2076msgid "check if - even missing - files are ignored in dry run"
07432cef 2077msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2078
90314792 2079#: builtin/add.c:392
8ada9598
JX
2080#, c-format
2081msgid "Use -f if you really want to add them.\n"
2082msgstr "使用 -f 参数如果您确实要添加它们。\n"
2083
90314792 2084#: builtin/add.c:393
8ada9598
JX
2085msgid "no files added"
2086msgstr "没有文件被添加"
2087
90314792 2088#: builtin/add.c:399
8ada9598
JX
2089msgid "adding files failed"
2090msgstr "添加文件失败"
2091
90314792 2092#: builtin/add.c:438
8ada9598
JX
2093msgid "-A and -u are mutually incompatible"
2094msgstr "-A 和 -u 选项互斥"
2095
90314792 2096#: builtin/add.c:456
8ada9598 2097msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2098msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2099
90314792 2100#: builtin/add.c:486
8ada9598
JX
2101#, c-format
2102msgid "Nothing specified, nothing added.\n"
2103msgstr "没有指定文件,也没有文件被添加。\n"
2104
90314792 2105#: builtin/add.c:487
8ada9598
JX
2106#, c-format
2107msgid "Maybe you wanted to say 'git add .'?\n"
2108msgstr "也许您想要执行 'git add .'?\n"
2109
90314792 2110#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
cfff71a9 2111#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299
8ada9598
JX
2112msgid "index file corrupt"
2113msgstr "索引文件损坏"
2114
cfff71a9 2115#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432
8ada9598
JX
2116msgid "Unable to write new index file"
2117msgstr "无法写入新索引文件"
2118
23ff3338 2119#: builtin/apply.c:57
8ada9598 2120msgid "git apply [options] [<patch>...]"
81809b99 2121msgstr "git apply [选项] [<补丁>...]"
8ada9598 2122
23ff3338 2123#: builtin/apply.c:110
81809b99 2124#, c-format
8ada9598 2125msgid "unrecognized whitespace option '%s'"
81809b99 2126msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2127
23ff3338 2128#: builtin/apply.c:125
81809b99 2129#, c-format
8ada9598 2130msgid "unrecognized whitespace ignore option '%s'"
81809b99 2131msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2132
c160d03f 2133#: builtin/apply.c:823
8ada9598
JX
2134#, c-format
2135msgid "Cannot prepare timestamp regexp %s"
81809b99 2136msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2137
c160d03f 2138#: builtin/apply.c:832
8ada9598
JX
2139#, c-format
2140msgid "regexec returned %d for input: %s"
81809b99 2141msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2142
c160d03f 2143#: builtin/apply.c:913
81809b99 2144#, c-format
8ada9598 2145msgid "unable to find filename in patch at line %d"
81809b99 2146msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2147
c160d03f 2148#: builtin/apply.c:945
8ada9598
JX
2149#, c-format
2150msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2151msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2152
c160d03f 2153#: builtin/apply.c:949
8ada9598
JX
2154#, c-format
2155msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2156msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2157
c160d03f 2158#: builtin/apply.c:950
8ada9598
JX
2159#, c-format
2160msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2161msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2162
c160d03f 2163#: builtin/apply.c:957
8ada9598
JX
2164#, c-format
2165msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2166msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2167
a77c07d9 2168#: builtin/apply.c:1422
8ada9598
JX
2169#, c-format
2170msgid "recount: unexpected line: %.*s"
81809b99 2171msgstr "recount:意外的行:%.*s"
8ada9598 2172
a77c07d9 2173#: builtin/apply.c:1479
8ada9598
JX
2174#, c-format
2175msgid "patch fragment without header at line %d: %.*s"
81809b99 2176msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2177
a77c07d9 2178#: builtin/apply.c:1496
8ada9598
JX
2179#, c-format
2180msgid ""
2181"git diff header lacks filename information when removing %d leading pathname "
2182"component (line %d)"
2183msgid_plural ""
2184"git diff header lacks filename information when removing %d leading pathname "
2185"components (line %d)"
5ae481e0
JX
2186msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2187msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2188
a77c07d9 2189#: builtin/apply.c:1656
8ada9598 2190msgid "new file depends on old contents"
81809b99 2191msgstr "新文件依赖旧内容"
8ada9598 2192
a77c07d9 2193#: builtin/apply.c:1658
8ada9598 2194msgid "deleted file still has contents"
81809b99 2195msgstr "删除的文件仍有内容"
8ada9598 2196
a77c07d9 2197#: builtin/apply.c:1684
8ada9598
JX
2198#, c-format
2199msgid "corrupt patch at line %d"
195febda 2200msgstr "补丁在第 %d 行损坏"
8ada9598 2201
a77c07d9 2202#: builtin/apply.c:1720
8ada9598
JX
2203#, c-format
2204msgid "new file %s depends on old contents"
81809b99 2205msgstr "新文件 %s 依赖旧内容"
8ada9598 2206
a77c07d9 2207#: builtin/apply.c:1722
8ada9598
JX
2208#, c-format
2209msgid "deleted file %s still has contents"
81809b99 2210msgstr "删除的文件 %s 仍有内容"
8ada9598 2211
a77c07d9 2212#: builtin/apply.c:1725
8ada9598
JX
2213#, c-format
2214msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2215msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2216
a77c07d9 2217#: builtin/apply.c:1871
8ada9598
JX
2218#, c-format
2219msgid "corrupt binary patch at line %d: %.*s"
81809b99 2220msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598
JX
2221
2222#. there has to be one hunk (forward hunk)
a77c07d9 2223#: builtin/apply.c:1900
8ada9598
JX
2224#, c-format
2225msgid "unrecognized binary patch at line %d"
81809b99 2226msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2227
a77c07d9 2228#: builtin/apply.c:1986
8ada9598
JX
2229#, c-format
2230msgid "patch with only garbage at line %d"
81809b99 2231msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2232
a77c07d9 2233#: builtin/apply.c:2076
81809b99 2234#, c-format
8ada9598 2235msgid "unable to read symlink %s"
81809b99 2236msgstr "无法读取符号链接 %s"
8ada9598 2237
a77c07d9 2238#: builtin/apply.c:2080
81809b99 2239#, c-format
8ada9598 2240msgid "unable to open or read %s"
81809b99 2241msgstr "不能打开或读取 %s"
8ada9598 2242
1003b3a5 2243#: builtin/apply.c:2688
81809b99 2244#, c-format
8ada9598 2245msgid "invalid start of line: '%c'"
81809b99 2246msgstr "无效的行首字符:'%c'"
8ada9598 2247
1003b3a5 2248#: builtin/apply.c:2806
8ada9598
JX
2249#, c-format
2250msgid "Hunk #%d succeeded at %d (offset %d line)."
2251msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2252msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2253msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2254
1003b3a5 2255#: builtin/apply.c:2818
8ada9598
JX
2256#, c-format
2257msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2258msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2259
1003b3a5 2260#: builtin/apply.c:2824
8ada9598
JX
2261#, c-format
2262msgid ""
2263"while searching for:\n"
2264"%.*s"
2265msgstr ""
81809b99
JX
2266"当查询:\n"
2267"%.*s"
8ada9598 2268
1003b3a5 2269#: builtin/apply.c:2843
8ada9598
JX
2270#, c-format
2271msgid "missing binary patch data for '%s'"
81809b99 2272msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2273
1003b3a5 2274#: builtin/apply.c:2946
8ada9598
JX
2275#, c-format
2276msgid "binary patch does not apply to '%s'"
81809b99 2277msgstr "二进制补丁未应用到 '%s'"
8ada9598 2278
1003b3a5 2279#: builtin/apply.c:2952
8ada9598
JX
2280#, c-format
2281msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2282msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2283
1003b3a5 2284#: builtin/apply.c:2973
8ada9598
JX
2285#, c-format
2286msgid "patch failed: %s:%ld"
81809b99 2287msgstr "打补丁失败:%s:%ld"
8ada9598 2288
1003b3a5 2289#: builtin/apply.c:3095
8ada9598 2290#, c-format
23ff3338
JX
2291msgid "cannot checkout %s"
2292msgstr "不能检出 %s"
8ada9598 2293
2e8451e8 2294#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
81809b99 2295#, c-format
8ada9598 2296msgid "read of %s failed"
81809b99 2297msgstr "读取 %s 失败"
8ada9598 2298
2e8451e8 2299#: builtin/apply.c:3174 builtin/apply.c:3396
81809b99 2300#, c-format
23ff3338
JX
2301msgid "path %s has been renamed/deleted"
2302msgstr "路径 %s 已经被重命名/删除"
8ada9598 2303
2e8451e8 2304#: builtin/apply.c:3255 builtin/apply.c:3410
8ada9598 2305#, c-format
23ff3338
JX
2306msgid "%s: does not exist in index"
2307msgstr "%s:不存在于索引中"
8ada9598 2308
2e8451e8 2309#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
81809b99 2310#, c-format
8ada9598 2311msgid "%s: %s"
81809b99 2312msgstr "%s:%s"
8ada9598 2313
2e8451e8 2314#: builtin/apply.c:3264 builtin/apply.c:3418
81809b99 2315#, c-format
8ada9598 2316msgid "%s: does not match index"
81809b99 2317msgstr "%s:和索引不匹配"
8ada9598 2318
2e8451e8 2319#: builtin/apply.c:3366
23ff3338
JX
2320msgid "removal patch leaves file contents"
2321msgstr "移除补丁仍留下了文件内容"
2322
2e8451e8 2323#: builtin/apply.c:3435
8ada9598
JX
2324#, c-format
2325msgid "%s: wrong type"
81809b99 2326msgstr "%s:错误类型"
8ada9598 2327
2e8451e8 2328#: builtin/apply.c:3437
8ada9598
JX
2329#, c-format
2330msgid "%s has type %o, expected %o"
9aafc933 2331msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2332
2e8451e8 2333#: builtin/apply.c:3538
81809b99 2334#, c-format
8ada9598 2335msgid "%s: already exists in index"
81809b99 2336msgstr "%s:已经存在于索引中"
8ada9598 2337
2e8451e8 2338#: builtin/apply.c:3541
23ff3338
JX
2339#, c-format
2340msgid "%s: already exists in working directory"
2341msgstr "%s:已经存在于工作区中"
2342
2e8451e8 2343#: builtin/apply.c:3561
d691f479
JX
2344#, c-format
2345msgid "new mode (%o) of %s does not match old mode (%o)"
2346msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2347
2e8451e8 2348#: builtin/apply.c:3566
8ada9598 2349#, c-format
d691f479
JX
2350msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2351msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2352
2e8451e8 2353#: builtin/apply.c:3574
d691f479 2354#, c-format
8ada9598 2355msgid "%s: patch does not apply"
81809b99 2356msgstr "%s:补丁未应用"
8ada9598 2357
2e8451e8 2358#: builtin/apply.c:3587
8ada9598
JX
2359#, c-format
2360msgid "Checking patch %s..."
81809b99 2361msgstr "检查补丁 %s..."
8ada9598 2362
90314792 2363#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
8ada9598
JX
2364#, c-format
2365msgid "make_cache_entry failed for path '%s'"
2366msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2367
2e8451e8 2368#: builtin/apply.c:3823
81809b99 2369#, c-format
8ada9598 2370msgid "unable to remove %s from index"
81809b99 2371msgstr "不能从索引中移除 %s"
8ada9598 2372
2e8451e8 2373#: builtin/apply.c:3851
8ada9598 2374#, c-format
2e8451e8
JX
2375msgid "corrupt patch for submodule %s"
2376msgstr "子模组 %s 损坏的补丁"
8ada9598 2377
2e8451e8 2378#: builtin/apply.c:3855
81809b99 2379#, c-format
8ada9598 2380msgid "unable to stat newly created file '%s'"
81809b99 2381msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2382
2e8451e8 2383#: builtin/apply.c:3860
8ada9598
JX
2384#, c-format
2385msgid "unable to create backing store for newly created file %s"
81809b99 2386msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2387
2e8451e8 2388#: builtin/apply.c:3863 builtin/apply.c:3971
81809b99 2389#, c-format
8ada9598 2390msgid "unable to add cache entry for %s"
81809b99 2391msgstr "无法为 %s 添加缓存条目"
8ada9598 2392
2e8451e8 2393#: builtin/apply.c:3896
81809b99 2394#, c-format
8ada9598 2395msgid "closing file '%s'"
81809b99 2396msgstr "关闭文件 '%s'"
8ada9598 2397
2e8451e8 2398#: builtin/apply.c:3945
81809b99 2399#, c-format
8ada9598 2400msgid "unable to write file '%s' mode %o"
81809b99 2401msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2402
2e8451e8 2403#: builtin/apply.c:4032
8ada9598
JX
2404#, c-format
2405msgid "Applied patch %s cleanly."
81809b99 2406msgstr "成功应用补丁 %s。"
8ada9598 2407
2e8451e8 2408#: builtin/apply.c:4040
8ada9598 2409msgid "internal error"
81809b99 2410msgstr "内部错误"
8ada9598
JX
2411
2412#. Say this even without --verbose
2e8451e8 2413#: builtin/apply.c:4043
8ada9598
JX
2414#, c-format
2415msgid "Applying patch %%s with %d reject..."
2416msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2417msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2418msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2419
2e8451e8 2420#: builtin/apply.c:4053
8ada9598
JX
2421#, c-format
2422msgid "truncating .rej filename to %.*s.rej"
81809b99 2423msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2424
2e8451e8 2425#: builtin/apply.c:4074
8ada9598
JX
2426#, c-format
2427msgid "Hunk #%d applied cleanly."
81809b99 2428msgstr "第 #%d 个片段成功应用。"
8ada9598 2429
2e8451e8 2430#: builtin/apply.c:4077
8ada9598
JX
2431#, c-format
2432msgid "Rejected hunk #%d."
81809b99 2433msgstr "拒绝第 #%d 个片段。"
8ada9598 2434
2e8451e8 2435#: builtin/apply.c:4227
8ada9598 2436msgid "unrecognized input"
81809b99 2437msgstr "未能识别的输入"
8ada9598 2438
2e8451e8 2439#: builtin/apply.c:4238
8ada9598 2440msgid "unable to read index file"
81809b99 2441msgstr "无法读取索引文件"
8ada9598 2442
90314792 2443#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
cfff71a9 2444#: builtin/fetch.c:78
8ada9598 2445msgid "path"
81809b99 2446msgstr "路径"
8ada9598 2447
2e8451e8 2448#: builtin/apply.c:4358
8ada9598 2449msgid "don't apply changes matching the given path"
81809b99 2450msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2451
2e8451e8 2452#: builtin/apply.c:4361
8ada9598 2453msgid "apply changes matching the given path"
81809b99 2454msgstr "应用与给出路径向匹配的变更"
8ada9598 2455
2e8451e8 2456#: builtin/apply.c:4363
8ada9598 2457msgid "num"
81809b99 2458msgstr "数字"
8ada9598 2459
2e8451e8 2460#: builtin/apply.c:4364
8ada9598 2461msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2462msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2463
2e8451e8 2464#: builtin/apply.c:4367
8ada9598 2465msgid "ignore additions made by the patch"
81809b99 2466msgstr "忽略补丁中的添加的文件"
8ada9598 2467
2e8451e8 2468#: builtin/apply.c:4369
8ada9598 2469msgid "instead of applying the patch, output diffstat for the input"
81809b99 2470msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2471
2e8451e8 2472#: builtin/apply.c:4373
ef317cd5 2473msgid "show number of added and deleted lines in decimal notation"
07432cef 2474msgstr "以十进制数显示添加和删除的行数"
8ada9598 2475
2e8451e8 2476#: builtin/apply.c:4375
8ada9598 2477msgid "instead of applying the patch, output a summary for the input"
81809b99 2478msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2479
2e8451e8 2480#: builtin/apply.c:4377
8ada9598 2481msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2482msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2483
2e8451e8 2484#: builtin/apply.c:4379
8ada9598 2485msgid "make sure the patch is applicable to the current index"
81809b99 2486msgstr "确认补丁可以应用到当前索引"
8ada9598 2487
2e8451e8 2488#: builtin/apply.c:4381
8ada9598 2489msgid "apply a patch without touching the working tree"
81809b99 2490msgstr "应用补丁而不修改工作区"
8ada9598 2491
2e8451e8 2492#: builtin/apply.c:4383
8ada9598 2493msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2494msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2495
2e8451e8 2496#: builtin/apply.c:4385
23ff3338
JX
2497msgid "attempt three-way merge if a patch does not apply"
2498msgstr "如果一个补丁不能应用则尝试三路合并"
2499
2e8451e8 2500#: builtin/apply.c:4387
8ada9598 2501msgid "build a temporary index based on embedded index information"
81809b99 2502msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2503
90314792 2504#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
8ada9598 2505msgid "paths are separated with NUL character"
81809b99 2506msgstr "路径以 NUL 字符分隔"
8ada9598 2507
2e8451e8 2508#: builtin/apply.c:4392
8ada9598 2509msgid "ensure at least <n> lines of context match"
81809b99 2510msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2511
2e8451e8 2512#: builtin/apply.c:4393
8ada9598 2513msgid "action"
81809b99 2514msgstr "动作"
8ada9598 2515
2e8451e8 2516#: builtin/apply.c:4394
8ada9598 2517msgid "detect new or modified lines that have whitespace errors"
81809b99 2518msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2519
2e8451e8 2520#: builtin/apply.c:4397 builtin/apply.c:4400
8ada9598 2521msgid "ignore changes in whitespace when finding context"
81809b99 2522msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2523
2e8451e8 2524#: builtin/apply.c:4403
8ada9598 2525msgid "apply the patch in reverse"
81809b99 2526msgstr "反向应用补丁"
8ada9598 2527
2e8451e8 2528#: builtin/apply.c:4405
8ada9598 2529msgid "don't expect at least one line of context"
81809b99 2530msgstr "无需至少一行上下文"
8ada9598 2531
2e8451e8 2532#: builtin/apply.c:4407
8ada9598 2533msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2534msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2535
2e8451e8 2536#: builtin/apply.c:4409
8ada9598 2537msgid "allow overlapping hunks"
81809b99 2538msgstr "允许重叠的补丁片段"
8ada9598 2539
2e8451e8 2540#: builtin/apply.c:4412
8ada9598 2541msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2542msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2543
2e8451e8 2544#: builtin/apply.c:4415
8ada9598 2545msgid "do not trust the line counts in the hunk headers"
81809b99 2546msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2547
2e8451e8 2548#: builtin/apply.c:4417
8ada9598 2549msgid "root"
81809b99 2550msgstr "根目录"
c04f5ac3 2551
2e8451e8 2552#: builtin/apply.c:4418
8ada9598 2553msgid "prepend <root> to all filenames"
81809b99 2554msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2555
2e8451e8 2556#: builtin/apply.c:4440
23ff3338
JX
2557msgid "--3way outside a repository"
2558msgstr "--3way 在一个版本库之外"
2559
2e8451e8 2560#: builtin/apply.c:4448
8ada9598 2561msgid "--index outside a repository"
81809b99 2562msgstr "--index 在一个版本库之外"
c04f5ac3 2563
2e8451e8 2564#: builtin/apply.c:4451
8ada9598 2565msgid "--cached outside a repository"
81809b99 2566msgstr "--cached 在一个版本库之外"
c04f5ac3 2567
2e8451e8 2568#: builtin/apply.c:4467
81809b99 2569#, c-format
8ada9598 2570msgid "can't open patch '%s'"
81809b99 2571msgstr "不能打开补丁 '%s'"
c04f5ac3 2572
2e8451e8 2573#: builtin/apply.c:4481
c04f5ac3 2574#, c-format
8ada9598
JX
2575msgid "squelched %d whitespace error"
2576msgid_plural "squelched %d whitespace errors"
81809b99 2577msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2578msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2579
2e8451e8 2580#: builtin/apply.c:4487 builtin/apply.c:4497
8ada9598
JX
2581#, c-format
2582msgid "%d line adds whitespace errors."
2583msgid_plural "%d lines add whitespace errors."
81809b99 2584msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2585msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2586
2587#: builtin/archive.c:17
2588#, c-format
2589msgid "could not create archive file '%s'"
90e6ef53 2590msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2591
2592#: builtin/archive.c:20
2593msgid "could not redirect output"
195febda 2594msgstr "不能重定向输出"
c04f5ac3
JX
2595
2596#: builtin/archive.c:37
2597msgid "git archive: Remote with no URL"
90e6ef53 2598msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2599
2600#: builtin/archive.c:58
2601msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2602msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3 2603
1003b3a5 2604#: builtin/archive.c:61
c04f5ac3
JX
2605#, c-format
2606msgid "git archive: NACK %s"
90e6ef53 2607msgstr "git archive:NACK %s"
c04f5ac3 2608
1003b3a5 2609#: builtin/archive.c:63
c04f5ac3
JX
2610#, c-format
2611msgid "remote error: %s"
2612msgstr "远程错误:%s"
2613
1003b3a5 2614#: builtin/archive.c:64
c04f5ac3 2615msgid "git archive: protocol error"
90e6ef53 2616msgstr "git archive:协议错误"
c04f5ac3 2617
1003b3a5 2618#: builtin/archive.c:68
c04f5ac3 2619msgid "git archive: expected a flush"
195febda 2620msgstr "git archive:应为刷新"
c04f5ac3 2621
ef317cd5
JX
2622#: builtin/bisect--helper.c:7
2623msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2624msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2625
2626#: builtin/bisect--helper.c:17
2627msgid "perform 'git bisect next'"
07432cef 2628msgstr "执行 'git bisect next'"
ef317cd5
JX
2629
2630#: builtin/bisect--helper.c:19
2631msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2632msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2633
90314792 2634#: builtin/blame.c:27
ef317cd5 2635msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2636msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5 2637
90314792 2638#: builtin/blame.c:32
ef317cd5 2639msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2640msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2641
cfff71a9 2642#: builtin/blame.c:2249
ef317cd5 2643msgid "Show blame entries as we find them, incrementally"
07432cef 2644msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2645
cfff71a9 2646#: builtin/blame.c:2250
ef317cd5 2647msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2648msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2649
cfff71a9 2650#: builtin/blame.c:2251
ef317cd5 2651msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2652msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2653
cfff71a9 2654#: builtin/blame.c:2252
ef317cd5 2655msgid "Show work cost statistics"
07432cef 2656msgstr "显示命令消耗统计"
ef317cd5 2657
cfff71a9 2658#: builtin/blame.c:2253
ef317cd5 2659msgid "Show output score for blame entries"
07432cef 2660msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2661
cfff71a9 2662#: builtin/blame.c:2254
ef317cd5 2663msgid "Show original filename (Default: auto)"
07432cef 2664msgstr "显示原始文件名(默认:自动)"
ef317cd5 2665
cfff71a9 2666#: builtin/blame.c:2255
ef317cd5 2667msgid "Show original linenumber (Default: off)"
07432cef 2668msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2669
cfff71a9 2670#: builtin/blame.c:2256
ef317cd5 2671msgid "Show in a format designed for machine consumption"
07432cef 2672msgstr "显示为一个适合机器读取的格式"
ef317cd5 2673
cfff71a9 2674#: builtin/blame.c:2257
ef317cd5 2675msgid "Show porcelain format with per-line commit information"
07432cef 2676msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2677
cfff71a9 2678#: builtin/blame.c:2258
ef317cd5 2679msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2680msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2681
cfff71a9 2682#: builtin/blame.c:2259
ef317cd5 2683msgid "Show raw timestamp (Default: off)"
07432cef 2684msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2685
cfff71a9 2686#: builtin/blame.c:2260
ef317cd5 2687msgid "Show long commit SHA1 (Default: off)"
07432cef 2688msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2689
cfff71a9 2690#: builtin/blame.c:2261
ef317cd5 2691msgid "Suppress author name and timestamp (Default: off)"
07432cef 2692msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2693
cfff71a9 2694#: builtin/blame.c:2262
ef317cd5 2695msgid "Show author email instead of name (Default: off)"
07432cef 2696msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2697
cfff71a9 2698#: builtin/blame.c:2263
ef317cd5 2699msgid "Ignore whitespace differences"
07432cef 2700msgstr "忽略空白差异"
ef317cd5 2701
cfff71a9 2702#: builtin/blame.c:2264
ef317cd5 2703msgid "Spend extra cycles to find better match"
07432cef 2704msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2705
cfff71a9 2706#: builtin/blame.c:2265
ef317cd5 2707msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2708msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2709
cfff71a9 2710#: builtin/blame.c:2266
ef317cd5 2711msgid "Use <file>'s contents as the final image"
07432cef 2712msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2713
cfff71a9 2714#: builtin/blame.c:2267 builtin/blame.c:2268
ef317cd5 2715msgid "score"
07432cef 2716msgstr "得分"
ef317cd5 2717
cfff71a9 2718#: builtin/blame.c:2267
ef317cd5 2719msgid "Find line copies within and across files"
07432cef 2720msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2721
cfff71a9 2722#: builtin/blame.c:2268
ef317cd5 2723msgid "Find line movements within and across files"
07432cef 2724msgstr "找到文件内及跨文件的行移动"
ef317cd5 2725
cfff71a9 2726#: builtin/blame.c:2269
ef317cd5 2727msgid "n,m"
07432cef 2728msgstr "n,m"
ef317cd5 2729
cfff71a9 2730#: builtin/blame.c:2269
ef317cd5 2731msgid "Process only line range n,m, counting from 1"
07432cef 2732msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2733
1003b3a5 2734#: builtin/branch.c:24
ef317cd5 2735msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2736msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5 2737
1003b3a5 2738#: builtin/branch.c:25
ef317cd5 2739msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2740msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2741
1003b3a5 2742#: builtin/branch.c:26
ef317cd5 2743msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2744msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5 2745
1003b3a5 2746#: builtin/branch.c:27
ef317cd5 2747msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2748msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2749
90e6ef53 2750# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4dcdc3d8 2751#: builtin/branch.c:150
c04f5ac3
JX
2752#, c-format
2753msgid ""
2754"deleting branch '%s' that has been merged to\n"
2755" '%s', but not yet merged to HEAD."
2756msgstr ""
70fc47bf 2757"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2758" '%s',但未合并到 HEAD。"
2759
90e6ef53 2760# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4dcdc3d8 2761#: builtin/branch.c:154
c04f5ac3
JX
2762#, c-format
2763msgid ""
2764"not deleting branch '%s' that is not yet merged to\n"
2765" '%s', even though it is merged to HEAD."
2766msgstr ""
70fc47bf
T
2767"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2768" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2769
4dcdc3d8 2770#: builtin/branch.c:168
07432cef
WS
2771#, c-format
2772msgid "Couldn't look up commit object for '%s'"
2773msgstr "无法查询 '%s' 指向的提交对象"
2774
4dcdc3d8 2775#: builtin/branch.c:172
07432cef
WS
2776#, c-format
2777msgid ""
2778"The branch '%s' is not fully merged.\n"
2779"If you are sure you want to delete it, run 'git branch -D %s'."
2780msgstr ""
2781"分支 '%s' 没有完全合并。\n"
2782"如果您确认要删除它,执行 'git branch -D %s'。"
2783
4dcdc3d8 2784#: builtin/branch.c:185
07432cef
WS
2785msgid "Update of config-file failed"
2786msgstr "无法更新 config 文件"
2787
4dcdc3d8 2788#: builtin/branch.c:213
c04f5ac3 2789msgid "cannot use -a with -d"
649900bc 2790msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2791
4dcdc3d8 2792#: builtin/branch.c:219
c04f5ac3
JX
2793msgid "Couldn't look up commit object for HEAD"
2794msgstr "无法查询 HEAD 指向的提交对象"
2795
4dcdc3d8 2796#: builtin/branch.c:227
c04f5ac3
JX
2797#, c-format
2798msgid "Cannot delete the branch '%s' which you are currently on."
2799msgstr "无法删除您当前所在的分支 '%s'。"
2800
4dcdc3d8 2801#: builtin/branch.c:240
5ae481e0 2802#, c-format
8ada9598 2803msgid "remote branch '%s' not found."
81809b99 2804msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2805
4dcdc3d8 2806#: builtin/branch.c:241
81809b99 2807#, c-format
8ada9598 2808msgid "branch '%s' not found."
81809b99 2809msgstr "分支 '%s' 未发现。"
8ada9598 2810
4dcdc3d8 2811#: builtin/branch.c:255
81809b99 2812#, c-format
8ada9598 2813msgid "Error deleting remote branch '%s'"
81809b99 2814msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2815
4dcdc3d8 2816#: builtin/branch.c:256
81809b99 2817#, c-format
8ada9598 2818msgid "Error deleting branch '%s'"
81809b99 2819msgstr "删除分支 '%s' 时出错"
8ada9598 2820
4dcdc3d8 2821#: builtin/branch.c:263
81809b99 2822#, c-format
8ada9598 2823msgid "Deleted remote branch %s (was %s).\n"
81809b99 2824msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2825
4dcdc3d8 2826#: builtin/branch.c:264
81809b99 2827#, c-format
8ada9598 2828msgid "Deleted branch %s (was %s).\n"
81809b99 2829msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2830
4dcdc3d8 2831#: builtin/branch.c:366
c04f5ac3
JX
2832#, c-format
2833msgid "branch '%s' does not point at a commit"
2834msgstr "分支 '%s' 未指向一个提交"
2835
cfff71a9 2836#: builtin/branch.c:454
81809b99 2837#, c-format
90314792
JX
2838msgid "[%s: gone]"
2839msgstr "[%s: 丢失]"
2840
cfff71a9 2841#: builtin/branch.c:459
90314792
JX
2842#, c-format
2843msgid "[%s]"
2844msgstr "[%s]"
2845
cfff71a9 2846#: builtin/branch.c:464
90314792 2847#, c-format
8ada9598 2848msgid "[%s: behind %d]"
81809b99 2849msgstr "[%s:落后 %d]"
c04f5ac3 2850
cfff71a9 2851#: builtin/branch.c:466
81809b99 2852#, c-format
8ada9598 2853msgid "[behind %d]"
81809b99 2854msgstr "[落后 %d]"
8ada9598 2855
cfff71a9 2856#: builtin/branch.c:470
81809b99 2857#, c-format
8ada9598 2858msgid "[%s: ahead %d]"
81809b99 2859msgstr "[%s:领先 %d]"
c04f5ac3 2860
cfff71a9 2861#: builtin/branch.c:472
81809b99 2862#, c-format
8ada9598 2863msgid "[ahead %d]"
81809b99 2864msgstr "[领先 %d]"
8ada9598 2865
cfff71a9 2866#: builtin/branch.c:475
81809b99 2867#, c-format
8ada9598 2868msgid "[%s: ahead %d, behind %d]"
81809b99 2869msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2870
cfff71a9 2871#: builtin/branch.c:478
81809b99 2872#, c-format
8ada9598 2873msgid "[ahead %d, behind %d]"
81809b99 2874msgstr "[领先 %d,落后 %d]"
c04f5ac3 2875
cfff71a9 2876#: builtin/branch.c:502
a77c07d9
JX
2877msgid " **** invalid ref ****"
2878msgstr " **** 无效引用 ****"
2879
cfff71a9 2880#: builtin/branch.c:594
1003b3a5
JX
2881#, c-format
2882msgid "(no branch, rebasing %s)"
2883msgstr "(非分支,正变基 %s)"
2884
cfff71a9 2885#: builtin/branch.c:597
1003b3a5
JX
2886#, c-format
2887msgid "(no branch, bisect started on %s)"
2888msgstr "(非分支,二分查找开始于 %s)"
2889
cfff71a9 2890#: builtin/branch.c:600
1003b3a5
JX
2891#, c-format
2892msgid "(detached from %s)"
2893msgstr "(分离自 %s)"
2894
cfff71a9 2895#: builtin/branch.c:603
c04f5ac3
JX
2896msgid "(no branch)"
2897msgstr "(非分支)"
2898
cfff71a9 2899#: builtin/branch.c:649
a77c07d9
JX
2900#, c-format
2901msgid "object '%s' does not point to a commit"
2902msgstr "对象 '%s' 没有指向一个提交"
2903
cfff71a9 2904#: builtin/branch.c:681
c04f5ac3 2905msgid "some refs could not be read"
90e6ef53 2906msgstr "一些引用不能读取"
c04f5ac3 2907
cfff71a9 2908#: builtin/branch.c:694
c04f5ac3 2909msgid "cannot rename the current branch while not on any."
90e6ef53 2910msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2911
cfff71a9 2912#: builtin/branch.c:704
c04f5ac3
JX
2913#, c-format
2914msgid "Invalid branch name: '%s'"
2915msgstr "无效的分支名:'%s'"
2916
cfff71a9 2917#: builtin/branch.c:719
c04f5ac3
JX
2918msgid "Branch rename failed"
2919msgstr "分支重命名失败"
2920
cfff71a9 2921#: builtin/branch.c:723
c04f5ac3
JX
2922#, c-format
2923msgid "Renamed a misnamed branch '%s' away"
2924msgstr "重命名掉一个错误命名的旧分支 '%s'"
2925
cfff71a9 2926#: builtin/branch.c:727
c04f5ac3
JX
2927#, c-format
2928msgid "Branch renamed to %s, but HEAD is not updated!"
2929msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2930
cfff71a9 2931#: builtin/branch.c:734
c04f5ac3
JX
2932msgid "Branch is renamed, but update of config-file failed"
2933msgstr "分支被重命名,但更新 config 文件失败"
2934
cfff71a9 2935#: builtin/branch.c:749
c04f5ac3
JX
2936#, c-format
2937msgid "malformed object name %s"
2938msgstr "非法的对象名 %s"
2939
cfff71a9 2940#: builtin/branch.c:773
81809b99 2941#, c-format
8ada9598 2942msgid "could not write branch description template: %s"
81809b99 2943msgstr "不能写分支描述模版:%s"
c04f5ac3 2944
cfff71a9 2945#: builtin/branch.c:803
ef317cd5 2946msgid "Generic options"
07432cef 2947msgstr "通用选项"
c04f5ac3 2948
cfff71a9 2949#: builtin/branch.c:805
ef317cd5 2950msgid "show hash and subject, give twice for upstream branch"
07432cef 2951msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2952
cfff71a9 2953#: builtin/branch.c:806
ef317cd5 2954msgid "suppress informational messages"
07432cef 2955msgstr "不显示信息"
8ada9598 2956
cfff71a9 2957#: builtin/branch.c:807
ef317cd5 2958msgid "set up tracking mode (see git-pull(1))"
07432cef 2959msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2960
cfff71a9 2961#: builtin/branch.c:809
ef317cd5 2962msgid "change upstream info"
07432cef 2963msgstr "改变上游信息"
c04f5ac3 2964
cfff71a9 2965#: builtin/branch.c:813
ef317cd5 2966msgid "use colored output"
07432cef 2967msgstr "使用彩色输出"
c04f5ac3 2968
cfff71a9 2969#: builtin/branch.c:814
ef317cd5 2970msgid "act on remote-tracking branches"
07432cef 2971msgstr "作用于远程跟踪分支"
c04f5ac3 2972
cfff71a9
JX
2973#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2974#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461
90314792 2975#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
ef317cd5 2976msgid "commit"
07432cef 2977msgstr "提交"
c04f5ac3 2978
cfff71a9 2979#: builtin/branch.c:818 builtin/branch.c:824
ef317cd5 2980msgid "print only branches that contain the commit"
07432cef 2981msgstr "只打印包含该提交的分支"
c04f5ac3 2982
cfff71a9 2983#: builtin/branch.c:830
ef317cd5 2984msgid "Specific git-branch actions:"
07432cef 2985msgstr "具体的 git-branch 动作:"
c04f5ac3 2986
cfff71a9 2987#: builtin/branch.c:831
ef317cd5 2988msgid "list both remote-tracking and local branches"
07432cef 2989msgstr "列出远程跟踪及本地分支"
c04f5ac3 2990
cfff71a9 2991#: builtin/branch.c:833
ef317cd5 2992msgid "delete fully merged branch"
07432cef 2993msgstr "删除完全合并的分支"
c04f5ac3 2994
cfff71a9 2995#: builtin/branch.c:834
ef317cd5 2996msgid "delete branch (even if not merged)"
07432cef 2997msgstr "删除分支(即使没有合并)"
c04f5ac3 2998
cfff71a9 2999#: builtin/branch.c:835
ef317cd5 3000msgid "move/rename a branch and its reflog"
07432cef 3001msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3002
cfff71a9 3003#: builtin/branch.c:836
ef317cd5 3004msgid "move/rename a branch, even if target exists"
07432cef 3005msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3006
cfff71a9 3007#: builtin/branch.c:837
ef317cd5 3008msgid "list branch names"
07432cef 3009msgstr "列出分支名"
c04f5ac3 3010
cfff71a9 3011#: builtin/branch.c:838
ef317cd5 3012msgid "create the branch's reflog"
07432cef 3013msgstr "创建分支的引用日志"
ef317cd5 3014
cfff71a9 3015#: builtin/branch.c:840
ef317cd5 3016msgid "edit the description for the branch"
07432cef 3017msgstr "标记分支的描述"
ef317cd5 3018
cfff71a9 3019#: builtin/branch.c:841
ef317cd5 3020msgid "force creation (when already exists)"
07432cef 3021msgstr "强制创建(当已经存在)"
ef317cd5 3022
cfff71a9 3023#: builtin/branch.c:844
ef317cd5 3024msgid "print only not merged branches"
07432cef 3025msgstr "只打印没有合并的分支"
ef317cd5 3026
cfff71a9 3027#: builtin/branch.c:850
ef317cd5 3028msgid "print only merged branches"
07432cef 3029msgstr "只打印合并的分支"
ef317cd5 3030
cfff71a9 3031#: builtin/branch.c:854
ef317cd5 3032msgid "list branches in columns"
07432cef 3033msgstr "以列的方式显示分支"
ef317cd5 3034
cfff71a9 3035#: builtin/branch.c:867
c04f5ac3
JX
3036msgid "Failed to resolve HEAD as a valid ref."
3037msgstr "无法将 HEAD 解析为有效引用。"
3038
cfff71a9 3039#: builtin/branch.c:872 builtin/clone.c:635
c04f5ac3 3040msgid "HEAD not found below refs/heads!"
90e6ef53 3041msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3042
cfff71a9 3043#: builtin/branch.c:896
8ada9598 3044msgid "--column and --verbose are incompatible"
81809b99 3045msgstr "--column 和 --verbose 不兼容"
8ada9598 3046
cfff71a9 3047#: builtin/branch.c:902 builtin/branch.c:941
a77c07d9
JX
3048msgid "branch name required"
3049msgstr "必须提供分支名"
3050
cfff71a9 3051#: builtin/branch.c:917
a77c07d9
JX
3052msgid "Cannot give description to detached HEAD"
3053msgstr "不能向分离头指针提供描述"
3054
cfff71a9 3055#: builtin/branch.c:922
a77c07d9
JX
3056msgid "cannot edit description of more than one branch"
3057msgstr "不能为一个以上的分支编辑描述"
3058
cfff71a9 3059#: builtin/branch.c:929
a77c07d9
JX
3060#, c-format
3061msgid "No commit on branch '%s' yet."
3062msgstr "分支 '%s' 尚无提交。"
3063
cfff71a9 3064#: builtin/branch.c:932
a77c07d9
JX
3065#, c-format
3066msgid "No branch named '%s'."
3067msgstr "没有分支 '%s'。"
3068
cfff71a9 3069#: builtin/branch.c:947
a77c07d9
JX
3070msgid "too many branches for a rename operation"
3071msgstr "为重命名操作提供了太多的分支名"
3072
cfff71a9 3073#: builtin/branch.c:952
1003b3a5
JX
3074msgid "too many branches to set new upstream"
3075msgstr "为设置新上游提供了太多的分支名"
3076
cfff71a9 3077#: builtin/branch.c:956
1003b3a5
JX
3078#, c-format
3079msgid ""
3080"could not set upstream of HEAD to %s when it does not point to any branch."
3081msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3082
cfff71a9 3083#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
1003b3a5
JX
3084#, c-format
3085msgid "no such branch '%s'"
3086msgstr "没有此分支 '%s'"
3087
cfff71a9 3088#: builtin/branch.c:963
07432cef 3089#, c-format
ef317cd5 3090msgid "branch '%s' does not exist"
07432cef 3091msgstr "分支 '%s' 不存在"
ef317cd5 3092
cfff71a9 3093#: builtin/branch.c:975
1003b3a5
JX
3094msgid "too many branches to unset upstream"
3095msgstr "为取消上游设置操作提供了太多的分支名"
3096
cfff71a9 3097#: builtin/branch.c:979
1003b3a5
JX
3098msgid "could not unset upstream of HEAD when it does not point to any branch."
3099msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3100
cfff71a9 3101#: builtin/branch.c:985
ef317cd5
JX
3102#, c-format
3103msgid "Branch '%s' has no upstream information"
07432cef 3104msgstr "分支 '%s' 没有上游信息"
ef317cd5 3105
cfff71a9 3106#: builtin/branch.c:999
1003b3a5
JX
3107msgid "it does not make sense to create 'HEAD' manually"
3108msgstr "手工创建 'HEAD' 没有意义"
3109
cfff71a9 3110#: builtin/branch.c:1005
c04f5ac3
JX
3111msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3112msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3113
cfff71a9 3114#: builtin/branch.c:1008
ef317cd5
JX
3115#, c-format
3116msgid ""
3117"The --set-upstream flag is deprecated and will be removed. Consider using --"
3118"track or --set-upstream-to\n"
3119msgstr ""
07432cef 3120"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3121
cfff71a9 3122#: builtin/branch.c:1025
ef317cd5
JX
3123#, c-format
3124msgid ""
3125"\n"
3126"If you wanted to make '%s' track '%s', do this:\n"
3127"\n"
3128msgstr ""
07432cef
WS
3129"\n"
3130"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3131"\n"
ef317cd5 3132
cfff71a9 3133#: builtin/branch.c:1026
07432cef 3134#, c-format
ef317cd5 3135msgid " git branch -d %s\n"
07432cef 3136msgstr " git branch -d %s\n"
ef317cd5 3137
cfff71a9 3138#: builtin/branch.c:1027
ef317cd5
JX
3139#, c-format
3140msgid " git branch --set-upstream-to %s\n"
07432cef 3141msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3142
c04f5ac3
JX
3143#: builtin/bundle.c:47
3144#, c-format
3145msgid "%s is okay\n"
3146msgstr "%s 可以\n"
3147
3148#: builtin/bundle.c:56
3149msgid "Need a repository to create a bundle."
90e6ef53 3150msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
3151
3152#: builtin/bundle.c:60
3153msgid "Need a repository to unbundle."
90e6ef53 3154msgstr "需要一个版本库来解包。"
c04f5ac3 3155
cfff71a9 3156#: builtin/cat-file.c:328
ef317cd5 3157msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 3158msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5 3159
cfff71a9 3160#: builtin/cat-file.c:329
ef317cd5 3161msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 3162msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5 3163
cfff71a9 3164#: builtin/cat-file.c:366
ef317cd5 3165msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3166msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3167
cfff71a9 3168#: builtin/cat-file.c:367
ef317cd5 3169msgid "show object type"
07432cef 3170msgstr "显示对象类型"
ef317cd5 3171
cfff71a9 3172#: builtin/cat-file.c:368
ef317cd5 3173msgid "show object size"
07432cef 3174msgstr "显示对象大小"
ef317cd5 3175
cfff71a9 3176#: builtin/cat-file.c:370
ef317cd5 3177msgid "exit with zero when there's no error"
07432cef 3178msgstr "当没有错误时退出并返回零"
ef317cd5 3179
cfff71a9 3180#: builtin/cat-file.c:371
ef317cd5 3181msgid "pretty-print object's content"
07432cef 3182msgstr "美观地打印对象的内容"
ef317cd5 3183
cfff71a9 3184#: builtin/cat-file.c:373
ef317cd5 3185msgid "for blob objects, run textconv on object's content"
07432cef 3186msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5 3187
cfff71a9 3188#: builtin/cat-file.c:375
ef317cd5 3189msgid "show info and content of objects fed from the standard input"
07432cef 3190msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3191
cfff71a9 3192#: builtin/cat-file.c:378
ef317cd5 3193msgid "show info about objects fed from the standard input"
07432cef 3194msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
3195
3196#: builtin/check-attr.c:11
3197msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 3198msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
3199
3200#: builtin/check-attr.c:12
07432cef
WS
3201msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3202msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
3203
3204#: builtin/check-attr.c:19
3205msgid "report all attributes set on file"
07432cef 3206msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3207
3208#: builtin/check-attr.c:20
3209msgid "use .gitattributes only from the index"
07432cef 3210msgstr "只使用索引中的 .gitattributes"
ef317cd5 3211
a77c07d9 3212#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
ef317cd5 3213msgid "read file names from stdin"
07432cef 3214msgstr "从标准输入读出文件名"
ef317cd5 3215
a77c07d9 3216#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3217msgid "terminate input and output records by a NUL character"
3218msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3219
cfff71a9 3220#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260
a77c07d9
JX
3221msgid "suppress progress reporting"
3222msgstr "不显示进度报告"
3223
2e8451e8
JX
3224#: builtin/check-ignore.c:26
3225msgid "show non-matching input paths"
3226msgstr "显示未匹配的输入路径"
3227
90314792
JX
3228#: builtin/check-ignore.c:28
3229msgid "ignore index when checking"
3230msgstr "检查时忽略索引"
3231
3232#: builtin/check-ignore.c:154
a77c07d9
JX
3233msgid "cannot specify pathnames with --stdin"
3234msgstr "不能同时提供路径及 --stdin 参数"
3235
90314792 3236#: builtin/check-ignore.c:157
a77c07d9
JX
3237msgid "-z only makes sense with --stdin"
3238msgstr "-z 需要和 --stdin 参数共用才有意义"
3239
90314792 3240#: builtin/check-ignore.c:159
a77c07d9
JX
3241msgid "no path specified"
3242msgstr "未指定路径"
3243
90314792 3244#: builtin/check-ignore.c:163
a77c07d9
JX
3245msgid "--quiet is only valid with a single pathname"
3246msgstr "参数 --quiet 只在提供一个路径名时有效"
3247
90314792 3248#: builtin/check-ignore.c:165
a77c07d9
JX
3249msgid "cannot have both --quiet and --verbose"
3250msgstr "不能同时提供 --quiet 和 --verbose 参数"
3251
90314792 3252#: builtin/check-ignore.c:168
2e8451e8
JX
3253msgid "--non-matching is only valid with --verbose"
3254msgstr "--non-matching 选项只在使用 --verbose 时有效"
3255
3256#: builtin/check-mailmap.c:8
3257msgid "git check-mailmap [options] <contact>..."
3258msgstr "git check-mailmap [选项] <联系地址>..."
3259
3260#: builtin/check-mailmap.c:13
3261msgid "also read contacts from stdin"
3262msgstr "还从标准输入读取联系地址"
3263
3264#: builtin/check-mailmap.c:24
3265#, c-format
3266msgid "unable to parse contact: %s"
3267msgstr "不能解析联系地址:%s"
3268
3269#: builtin/check-mailmap.c:47
3270msgid "no contacts specified"
3271msgstr "未指定联系地址"
3272
ef317cd5
JX
3273#: builtin/checkout-index.c:126
3274msgid "git checkout-index [options] [--] [<file>...]"
07432cef 3275msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5
JX
3276
3277#: builtin/checkout-index.c:187
3278msgid "check out all files in the index"
07432cef 3279msgstr "检出索引区的所有文件"
ef317cd5
JX
3280
3281#: builtin/checkout-index.c:188
3282msgid "force overwrite of existing files"
07432cef 3283msgstr "强制覆盖现有的文件"
ef317cd5
JX
3284
3285#: builtin/checkout-index.c:190
3286msgid "no warning for existing files and files not in index"
07432cef 3287msgstr "存在或不在索引中的文件都没有警告"
ef317cd5
JX
3288
3289#: builtin/checkout-index.c:192
ef317cd5 3290msgid "don't checkout new files"
07432cef 3291msgstr "不检出新文件"
ef317cd5
JX
3292
3293#: builtin/checkout-index.c:194
ef317cd5 3294msgid "update stat information in the index file"
07432cef 3295msgstr "更新索引中文件的状态信息"
ef317cd5
JX
3296
3297#: builtin/checkout-index.c:200
ef317cd5 3298msgid "read list of paths from the standard input"
07432cef 3299msgstr "从标准输入读取路径列表"
ef317cd5
JX
3300
3301#: builtin/checkout-index.c:202
3302msgid "write the content to temporary files"
07432cef 3303msgstr "将内容写入临时文件"
ef317cd5
JX
3304
3305#: builtin/checkout-index.c:203 builtin/column.c:30
3306msgid "string"
07432cef 3307msgstr "字符串"
ef317cd5
JX
3308
3309#: builtin/checkout-index.c:204
3310msgid "when creating files, prepend <string>"
07432cef 3311msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5
JX
3312
3313#: builtin/checkout-index.c:207
3314msgid "copy out the files from named stage"
07432cef 3315msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
3316
3317#: builtin/checkout.c:25
ef317cd5 3318msgid "git checkout [options] <branch>"
07432cef 3319msgstr "git checkout [选项] <分支>"
ef317cd5
JX
3320
3321#: builtin/checkout.c:26
ef317cd5 3322msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 3323msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5 3324
90314792 3325#: builtin/checkout.c:114 builtin/checkout.c:147
c04f5ac3
JX
3326#, c-format
3327msgid "path '%s' does not have our version"
3328msgstr "路径 '%s' 没有我们的版本"
3329
90314792 3330#: builtin/checkout.c:116 builtin/checkout.c:149
c04f5ac3
JX
3331#, c-format
3332msgid "path '%s' does not have their version"
3333msgstr "路径 '%s' 没有他们的版本"
3334
90314792 3335#: builtin/checkout.c:132
c04f5ac3
JX
3336#, c-format
3337msgid "path '%s' does not have all necessary versions"
3338msgstr "路径 '%s' 没有全部必须的版本"
3339
90314792 3340#: builtin/checkout.c:176
c04f5ac3
JX
3341#, c-format
3342msgid "path '%s' does not have necessary versions"
3343msgstr "路径 '%s' 没有必须的版本"
3344
90314792 3345#: builtin/checkout.c:193
c04f5ac3
JX
3346#, c-format
3347msgid "path '%s': cannot merge"
90e6ef53 3348msgstr "path '%s':无法合并"
c04f5ac3 3349
90314792 3350#: builtin/checkout.c:210
c04f5ac3
JX
3351#, c-format
3352msgid "Unable to add merge result for '%s'"
3353msgstr "无法为 '%s' 添加合并结果"
3354
90314792
JX
3355#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
3356#: builtin/checkout.c:241
07432cef 3357#, c-format
ef317cd5 3358msgid "'%s' cannot be used with updating paths"
07432cef 3359msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3360
90314792 3361#: builtin/checkout.c:244 builtin/checkout.c:247
07432cef 3362#, c-format
ef317cd5 3363msgid "'%s' cannot be used with %s"
07432cef 3364msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3365
90314792 3366#: builtin/checkout.c:250
ef317cd5
JX
3367#, c-format
3368msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3369msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3370
90314792 3371#: builtin/checkout.c:261 builtin/checkout.c:451
c04f5ac3 3372msgid "corrupt index file"
90e6ef53 3373msgstr "损坏的索引文件"
c04f5ac3 3374
90314792 3375#: builtin/checkout.c:322 builtin/checkout.c:329
c04f5ac3
JX
3376#, c-format
3377msgid "path '%s' is unmerged"
3378msgstr "路径 '%s' 未合并"
3379
90314792 3380#: builtin/checkout.c:473
c04f5ac3 3381msgid "you need to resolve your current index first"
90e6ef53 3382msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3383
90314792 3384#: builtin/checkout.c:594
c04f5ac3
JX
3385#, c-format
3386msgid "Can not do reflog for '%s'\n"
90e6ef53 3387msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3388
90314792 3389#: builtin/checkout.c:632
c04f5ac3
JX
3390msgid "HEAD is now at"
3391msgstr "HEAD 目前位于"
3392
90314792 3393#: builtin/checkout.c:639
c04f5ac3
JX
3394#, c-format
3395msgid "Reset branch '%s'\n"
3396msgstr "重置分支 '%s'\n"
3397
90314792 3398#: builtin/checkout.c:642
c04f5ac3
JX
3399#, c-format
3400msgid "Already on '%s'\n"
3401msgstr "已经位于 '%s'\n"
3402
90314792 3403#: builtin/checkout.c:646
c04f5ac3
JX
3404#, c-format
3405msgid "Switched to and reset branch '%s'\n"
3406msgstr "切换并重置分支 '%s'\n"
3407
90314792 3408#: builtin/checkout.c:648 builtin/checkout.c:1033
c04f5ac3
JX
3409#, c-format
3410msgid "Switched to a new branch '%s'\n"
3411msgstr "切换到一个新分支 '%s'\n"
3412
90314792 3413#: builtin/checkout.c:650
c04f5ac3
JX
3414#, c-format
3415msgid "Switched to branch '%s'\n"
3416msgstr "切换到分支 '%s'\n"
3417
90e6ef53 3418# 译者:注意保持前导空格
90314792 3419#: builtin/checkout.c:706
c04f5ac3
JX
3420#, c-format
3421msgid " ... and %d more.\n"
90e6ef53 3422msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
3423
3424#. The singular version
90314792 3425#: builtin/checkout.c:712
c04f5ac3
JX
3426#, c-format
3427msgid ""
3428"Warning: you are leaving %d commit behind, not connected to\n"
3429"any of your branches:\n"
3430"\n"
3431"%s\n"
3432msgid_plural ""
3433"Warning: you are leaving %d commits behind, not connected to\n"
3434"any of your branches:\n"
3435"\n"
3436"%s\n"
3437msgstr[0] ""
3438"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3439"\n"
3440"%s\n"
5ae481e0
JX
3441msgstr[1] ""
3442"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3443"\n"
3444"%s\n"
c04f5ac3 3445
90314792 3446#: builtin/checkout.c:730
c04f5ac3
JX
3447#, c-format
3448msgid ""
3449"If you want to keep them by creating a new branch, this may be a good time\n"
3450"to do so with:\n"
3451"\n"
3452" git branch new_branch_name %s\n"
3453"\n"
3454msgstr ""
3455"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3456"如下操作:\n"
3457"\n"
3458" git branch new_branch_name %s\n"
3459"\n"
3460
90314792 3461#: builtin/checkout.c:760
c04f5ac3
JX
3462msgid "internal error in revision walk"
3463msgstr "在版本遍历时遇到内部错误"
3464
90314792 3465#: builtin/checkout.c:764
c04f5ac3
JX
3466msgid "Previous HEAD position was"
3467msgstr "之前的 HEAD 位置是"
3468
90314792 3469#: builtin/checkout.c:791 builtin/checkout.c:1028
c04f5ac3 3470msgid "You are on a branch yet to be born"
90e6ef53 3471msgstr "您位于一个尚未初始化的分支"
c04f5ac3 3472
90314792
JX
3473#: builtin/checkout.c:935
3474#, c-format
3475msgid "only one reference expected, %d given."
3476msgstr "只要一个引用,却给出了 %d 个"
3477
3478#: builtin/checkout.c:974
c04f5ac3
JX
3479#, c-format
3480msgid "invalid reference: %s"
3481msgstr "无效引用:%s"
3482
3483#. case (1): want a tree
90314792 3484#: builtin/checkout.c:1003
c04f5ac3
JX
3485#, c-format
3486msgid "reference is not a tree: %s"
3487msgstr "引用不是一个树:%s"
3488
90314792 3489#: builtin/checkout.c:1042
ef317cd5 3490msgid "paths cannot be used with switching branches"
07432cef 3491msgstr "路径不能和切换分支同时使用"
c04f5ac3 3492
90314792 3493#: builtin/checkout.c:1045 builtin/checkout.c:1049
07432cef 3494#, c-format
ef317cd5 3495msgid "'%s' cannot be used with switching branches"
07432cef 3496msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3497
90314792
JX
3498#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
3499#: builtin/checkout.c:1064
07432cef 3500#, c-format
ef317cd5 3501msgid "'%s' cannot be used with '%s'"
07432cef 3502msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3503
90314792 3504#: builtin/checkout.c:1069
07432cef 3505#, c-format
ef317cd5 3506msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3507msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3508
90314792 3509#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
cfff71a9 3510#: builtin/remote.c:159 builtin/remote.c:161
ef317cd5 3511msgid "branch"
07432cef 3512msgstr "分支"
c04f5ac3 3513
90314792 3514#: builtin/checkout.c:1092
ef317cd5 3515msgid "create and checkout a new branch"
07432cef 3516msgstr "创建并检出一个新的分支"
c04f5ac3 3517
90314792 3518#: builtin/checkout.c:1094
ef317cd5 3519msgid "create/reset and checkout a branch"
07432cef 3520msgstr "创建/重置并检出一个分支"
c04f5ac3 3521
90314792 3522#: builtin/checkout.c:1095
ef317cd5 3523msgid "create reflog for new branch"
07432cef 3524msgstr "为新的分支创建引用日志"
ef317cd5 3525
90314792 3526#: builtin/checkout.c:1096
ef317cd5 3527msgid "detach the HEAD at named commit"
07432cef 3528msgstr "成为指向该提交的分离头指针"
ef317cd5 3529
90314792 3530#: builtin/checkout.c:1097
ef317cd5 3531msgid "set upstream info for new branch"
07432cef 3532msgstr "为新的分支设置上游信息"
ef317cd5 3533
90314792 3534#: builtin/checkout.c:1099
ef317cd5 3535msgid "new branch"
07432cef 3536msgstr "新分支"
ef317cd5 3537
90314792 3538#: builtin/checkout.c:1099
ef317cd5 3539msgid "new unparented branch"
07432cef 3540msgstr "新的没有父提交的分支"
ef317cd5 3541
90314792 3542#: builtin/checkout.c:1100
ef317cd5 3543msgid "checkout our version for unmerged files"
07432cef 3544msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3545
90314792 3546#: builtin/checkout.c:1102
ef317cd5 3547msgid "checkout their version for unmerged files"
07432cef 3548msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3549
90314792 3550#: builtin/checkout.c:1104
ef317cd5 3551msgid "force checkout (throw away local modifications)"
07432cef 3552msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3553
90314792 3554#: builtin/checkout.c:1105
ef317cd5 3555msgid "perform a 3-way merge with the new branch"
07432cef 3556msgstr "和新的分支执行三路合并"
ef317cd5 3557
cfff71a9 3558#: builtin/checkout.c:1106 builtin/merge.c:225
ef317cd5 3559msgid "update ignored files (default)"
07432cef 3560msgstr "更新忽略的文件(默认)"
c04f5ac3 3561
cfff71a9 3562#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248
ef317cd5 3563msgid "style"
07432cef 3564msgstr "风格"
ef317cd5 3565
90314792 3566#: builtin/checkout.c:1108
ef317cd5 3567msgid "conflict style (merge or diff3)"
07432cef 3568msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3569
90314792 3570#: builtin/checkout.c:1111
4dcdc3d8
JX
3571msgid "do not limit pathspecs to sparse entries only"
3572msgstr "对路径不做稀疏检出的限制"
3573
90314792 3574#: builtin/checkout.c:1113
ef317cd5 3575msgid "second guess 'git checkout no-such-branch'"
07432cef 3576msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 3577
90314792 3578#: builtin/checkout.c:1136
ef317cd5 3579msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3580msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3581
90314792 3582#: builtin/checkout.c:1153
ef317cd5
JX
3583msgid "--track needs a branch name"
3584msgstr "--track 需要一个分支名"
3585
90314792 3586#: builtin/checkout.c:1160
ef317cd5
JX
3587msgid "Missing branch name; try -b"
3588msgstr "缺少分支名;尝试 -b"
3589
90314792 3590#: builtin/checkout.c:1197
c04f5ac3 3591msgid "invalid path specification"
90e6ef53 3592msgstr "无效的路径规格"
c04f5ac3 3593
90314792 3594#: builtin/checkout.c:1204
07432cef 3595#, c-format
c04f5ac3 3596msgid ""
ef317cd5 3597"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3598"Did you intend to checkout '%s' which can not be resolved as commit?"
3599msgstr ""
07432cef
WS
3600"不能同时更新路径并切换到分支'%s'。\n"
3601"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3602
90314792 3603#: builtin/checkout.c:1209
07432cef 3604#, c-format
ef317cd5 3605msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3606msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3607
90314792 3608#: builtin/checkout.c:1213
c04f5ac3
JX
3609msgid ""
3610"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3611"checking out of the index."
3612msgstr ""
90e6ef53 3613"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3614
90314792 3615#: builtin/clean.c:26
2e8451e8
JX
3616msgid ""
3617"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3618msgstr ""
3619"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3620
90314792 3621#: builtin/clean.c:30
07432cef
WS
3622#, c-format
3623msgid "Removing %s\n"
3624msgstr "正删除 %s\n"
3625
90314792 3626#: builtin/clean.c:31
07432cef
WS
3627#, c-format
3628msgid "Would remove %s\n"
3629msgstr "将删除 %s\n"
3630
90314792 3631#: builtin/clean.c:32
07432cef
WS
3632#, c-format
3633msgid "Skipping repository %s\n"
3634msgstr "忽略版本库 %s\n"
3635
90314792 3636#: builtin/clean.c:33
07432cef
WS
3637#, c-format
3638msgid "Would skip repository %s\n"
3639msgstr "将忽略版本库 %s\n"
3640
90314792 3641#: builtin/clean.c:34
07432cef
WS
3642#, c-format
3643msgid "failed to remove %s"
3644msgstr "无法删除 %s"
3645
90314792 3646#: builtin/clean.c:294
2e8451e8
JX
3647msgid ""
3648"Prompt help:\n"
3649"1 - select a numbered item\n"
3650"foo - select item based on unique prefix\n"
3651" - (empty) select nothing"
3652msgstr ""
3653"帮助:\n"
3654"1 - 通过编号选择一个选项\n"
3655"foo - 通过标题选择一个选项\n"
3656" - (空)什么也不选择"
3657
90314792 3658#: builtin/clean.c:298
2e8451e8
JX
3659msgid ""
3660"Prompt help:\n"
3661"1 - select a single item\n"
3662"3-5 - select a range of items\n"
3663"2-3,6-9 - select multiple ranges\n"
3664"foo - select item based on unique prefix\n"
3665"-... - unselect specified items\n"
3666"* - choose all items\n"
3667" - (empty) finish selecting"
3668msgstr ""
3669"帮助:\n"
3670"1 - 选择一个选项\n"
3671"3-5 - 选择一个范围内的所有选项\n"
3672"2-3,6-9 - 选择多个范围内的所有选项\n"
3673"foo - 通过标题选择一个选项\n"
3674"-... - 反选特定的选项\n"
3675"* - 选择所有选项\n"
3676" - (空)结束选择"
3677
90314792 3678#: builtin/clean.c:516
2e8451e8
JX
3679#, c-format
3680msgid "Huh (%s)?"
3681msgstr "嗯(%s)?"
3682
90314792 3683#: builtin/clean.c:659
2e8451e8
JX
3684#, c-format
3685msgid "Input ignore patterns>> "
3686msgstr "输入模版以排除条目>> "
3687
90314792 3688#: builtin/clean.c:696
2e8451e8
JX
3689#, c-format
3690msgid "WARNING: Cannot find items matched by: %s"
3691msgstr "警告:无法找到和 %s 匹配的条目"
3692
90314792 3693#: builtin/clean.c:717
2e8451e8
JX
3694msgid "Select items to delete"
3695msgstr "选择要删除的条目"
3696
90314792 3697#: builtin/clean.c:757
2e8451e8
JX
3698#, c-format
3699msgid "remove %s? "
3700msgstr "删除 %s?"
3701
90314792 3702#: builtin/clean.c:782
2e8451e8
JX
3703msgid "Bye."
3704msgstr "再见。"
3705
90314792 3706#: builtin/clean.c:790
2e8451e8
JX
3707msgid ""
3708"clean - start cleaning\n"
3709"filter by pattern - exclude items from deletion\n"
3710"select by numbers - select items to be deleted by numbers\n"
3711"ask each - confirm each deletion (like \"rm -i\")\n"
3712"quit - stop cleaning\n"
3713"help - this screen\n"
3714"? - help for prompt selection"
3715msgstr ""
3716"clean - 开始清理\n"
3717"filter by pattern - 通过模版排除要删除的条目\n"
3718"select by numbers - 通过数字选择要删除的条目\n"
3719"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3720"quit - 停止删除并退出\n"
3721"help - 显示本帮助\n"
3722"? - 显示如何在提示符下选择的帮助"
3723
90314792 3724#: builtin/clean.c:817
2e8451e8
JX
3725msgid "*** Commands ***"
3726msgstr "*** 命令 ***"
3727
90314792 3728#: builtin/clean.c:818
2e8451e8
JX
3729msgid "What now"
3730msgstr "请选择"
3731
90314792 3732#: builtin/clean.c:826
2e8451e8
JX
3733msgid "Would remove the following item:"
3734msgid_plural "Would remove the following items:"
3735msgstr[0] "将删除如下条目:"
3736msgstr[1] "将删除如下条目:"
3737
90314792 3738#: builtin/clean.c:843
2e8451e8
JX
3739msgid "No more files to clean, exiting."
3740msgstr "没有要清理的文件,退出。"
3741
b1894384 3742#: builtin/clean.c:874
ef317cd5 3743msgid "do not print names of files removed"
07432cef 3744msgstr "不打印删除文件的名称"
ef317cd5 3745
b1894384 3746#: builtin/clean.c:876
ef317cd5 3747msgid "force"
07432cef 3748msgstr "强制"
ef317cd5 3749
b1894384 3750#: builtin/clean.c:877
2e8451e8
JX
3751msgid "interactive cleaning"
3752msgstr "交互式清除"
3753
b1894384 3754#: builtin/clean.c:879
ef317cd5 3755msgid "remove whole directories"
07432cef 3756msgstr "删除整个目录"
ef317cd5 3757
90314792 3758#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
cfff71a9 3759#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185
ef317cd5 3760msgid "pattern"
07432cef 3761msgstr "模式"
ef317cd5 3762
b1894384 3763#: builtin/clean.c:881
ef317cd5 3764msgid "add <pattern> to ignore rules"
07432cef 3765msgstr "添加<模式>到忽略规则"
ef317cd5 3766
b1894384 3767#: builtin/clean.c:882
ef317cd5 3768msgid "remove ignored files, too"
07432cef 3769msgstr "也删除忽略的文件"
ef317cd5 3770
b1894384 3771#: builtin/clean.c:884
ef317cd5 3772msgid "remove only ignored files"
07432cef 3773msgstr "只删除忽略的文件"
c04f5ac3 3774
b1894384 3775#: builtin/clean.c:902
c04f5ac3 3776msgid "-x and -X cannot be used together"
649900bc 3777msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3778
b1894384 3779#: builtin/clean.c:906
c04f5ac3 3780msgid ""
2e8451e8
JX
3781"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3782"clean"
c04f5ac3 3783msgstr ""
2e8451e8 3784"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3785
b1894384 3786#: builtin/clean.c:909
c04f5ac3 3787msgid ""
2e8451e8
JX
3788"clean.requireForce defaults to true and neither -i, -n nor -f given; "
3789"refusing to clean"
c04f5ac3 3790msgstr ""
2e8451e8 3791"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3792
2e8451e8 3793#: builtin/clone.c:36
ef317cd5 3794msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3795msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5 3796
cfff71a9
JX
3797#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
3798#: builtin/push.c:521
ef317cd5 3799msgid "force progress reporting"
07432cef 3800msgstr "强制显示进度报告"
ef317cd5 3801
2e8451e8 3802#: builtin/clone.c:66
ef317cd5 3803msgid "don't create a checkout"
07432cef 3804msgstr "不创建一个检出"
ef317cd5 3805
2e8451e8 3806#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
ef317cd5 3807msgid "create a bare repository"
07432cef 3808msgstr "创建一个裸版本库"
ef317cd5 3809
90314792 3810#: builtin/clone.c:71
ef317cd5 3811msgid "create a mirror repository (implies bare)"
07432cef 3812msgstr "创建一个镜像版本库(也是裸版本库)"
ef317cd5 3813
90314792 3814#: builtin/clone.c:73
ef317cd5 3815msgid "to clone from a local repository"
07432cef 3816msgstr "从本地版本库克隆"
ef317cd5 3817
90314792 3818#: builtin/clone.c:75
ef317cd5 3819msgid "don't use local hardlinks, always copy"
07432cef 3820msgstr "不使用本地硬链接,始终复制"
ef317cd5 3821
90314792 3822#: builtin/clone.c:77
ef317cd5 3823msgid "setup as shared repository"
07432cef 3824msgstr "设置为共享版本库"
ef317cd5 3825
90314792 3826#: builtin/clone.c:79 builtin/clone.c:81
ef317cd5 3827msgid "initialize submodules in the clone"
07432cef 3828msgstr "在克隆时初始化子模组"
ef317cd5 3829
90314792 3830#: builtin/clone.c:82 builtin/init-db.c:485
ef317cd5 3831msgid "template-directory"
07432cef 3832msgstr "模板目录"
ef317cd5 3833
90314792 3834#: builtin/clone.c:83 builtin/init-db.c:486
ef317cd5 3835msgid "directory from which templates will be used"
07432cef 3836msgstr "模板目录将被使用"
ef317cd5 3837
90314792 3838#: builtin/clone.c:85
ef317cd5 3839msgid "reference repository"
cfff71a9 3840msgstr "参考版本库"
ef317cd5 3841
90314792 3842#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3843msgid "name"
07432cef 3844msgstr "名称"
ef317cd5 3845
90314792 3846#: builtin/clone.c:87
ef317cd5 3847msgid "use <name> instead of 'origin' to track upstream"
07432cef 3848msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5 3849
90314792 3850#: builtin/clone.c:89
ef317cd5 3851msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3852msgstr "检出<分支>而不是远程HEAD"
ef317cd5 3853
90314792 3854#: builtin/clone.c:91
ef317cd5 3855msgid "path to git-upload-pack on the remote"
07432cef 3856msgstr "远程 git-upload-pack 路径"
ef317cd5 3857
cfff71a9 3858#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663
ef317cd5 3859msgid "depth"
07432cef 3860msgstr "深度"
ef317cd5 3861
90314792 3862#: builtin/clone.c:93
ef317cd5 3863msgid "create a shallow clone of that depth"
07432cef 3864msgstr "创建一个指定深度的浅克隆"
ef317cd5 3865
90314792 3866#: builtin/clone.c:95
ef317cd5 3867msgid "clone only one branch, HEAD or --branch"
07432cef 3868msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 3869
90314792 3870#: builtin/clone.c:96 builtin/init-db.c:494
ef317cd5 3871msgid "gitdir"
07432cef 3872msgstr "git目录"
ef317cd5 3873
90314792 3874#: builtin/clone.c:97 builtin/init-db.c:495
ef317cd5 3875msgid "separate git dir from working tree"
07432cef 3876msgstr "git目录和工作区分离"
ef317cd5 3877
90314792 3878#: builtin/clone.c:98
ef317cd5 3879msgid "key=value"
07432cef 3880msgstr "key=value"
ef317cd5 3881
90314792 3882#: builtin/clone.c:99
ef317cd5 3883msgid "set config inside the new repository"
07432cef 3884msgstr "在新版本库中设置配置信息"
ef317cd5 3885
90314792 3886#: builtin/clone.c:252
c04f5ac3 3887#, c-format
4dcdc3d8 3888msgid "reference repository '%s' is not a local repository."
cfff71a9 3889msgstr "参考版本库 '%s' 不是一个本地版本库。"
c04f5ac3 3890
cfff71a9
JX
3891#: builtin/clone.c:256
3892#, c-format
3893msgid "reference repository '%s' is shallow"
3894msgstr "参考版本库 '%s' 是一个浅克隆"
3895
3896#: builtin/clone.c:259
3897#, c-format
3898msgid "reference repository '%s' is grafted"
3899msgstr "参考版本库 '%s' 已被嫁接"
3900
3901#: builtin/clone.c:321
c04f5ac3
JX
3902#, c-format
3903msgid "failed to create directory '%s'"
90e6ef53 3904msgstr "无法创建目录 '%s'"
c04f5ac3 3905
cfff71a9 3906#: builtin/clone.c:323 builtin/diff.c:83
c04f5ac3
JX
3907#, c-format
3908msgid "failed to stat '%s'"
90e6ef53 3909msgstr "无法枚举 '%s' 状态"
c04f5ac3 3910
cfff71a9 3911#: builtin/clone.c:325
c04f5ac3
JX
3912#, c-format
3913msgid "%s exists and is not a directory"
3914msgstr "%s 存在且不是一个目录"
3915
cfff71a9 3916#: builtin/clone.c:339
c04f5ac3
JX
3917#, c-format
3918msgid "failed to stat %s\n"
90e6ef53 3919msgstr "无法枚举 %s 状态\n"
c04f5ac3 3920
cfff71a9 3921#: builtin/clone.c:361
c04f5ac3
JX
3922#, c-format
3923msgid "failed to create link '%s'"
90e6ef53 3924msgstr "无法创建链接 '%s'"
c04f5ac3 3925
cfff71a9 3926#: builtin/clone.c:365
c04f5ac3
JX
3927#, c-format
3928msgid "failed to copy file to '%s'"
90e6ef53 3929msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3930
cfff71a9 3931#: builtin/clone.c:388 builtin/clone.c:565
c04f5ac3
JX
3932#, c-format
3933msgid "done.\n"
3934msgstr "完成。\n"
3935
cfff71a9 3936#: builtin/clone.c:401
1003b3a5
JX
3937msgid ""
3938"Clone succeeded, but checkout failed.\n"
3939"You can inspect what was checked out with 'git status'\n"
3940"and retry the checkout with 'git checkout -f HEAD'\n"
3941msgstr ""
3942"克隆成功,但是检出失败。\n"
3943"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3944"'git checkout -f HEAD' 重试\n"
3945
cfff71a9 3946#: builtin/clone.c:480
c04f5ac3
JX
3947#, c-format
3948msgid "Could not find remote branch %s to clone."
90e6ef53 3949msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3950
cfff71a9 3951#: builtin/clone.c:560
2e8451e8
JX
3952#, c-format
3953msgid "Checking connectivity... "
3954msgstr "检查连接... "
3955
cfff71a9 3956#: builtin/clone.c:563
1003b3a5
JX
3957msgid "remote did not send all necessary objects"
3958msgstr "远程没有发送所有必须的对象"
3959
cfff71a9 3960#: builtin/clone.c:626
c04f5ac3
JX
3961msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3962msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3963
cfff71a9 3964#: builtin/clone.c:657
1003b3a5
JX
3965msgid "unable to checkout working tree"
3966msgstr "不能检出工作区"
3967
cfff71a9 3968#: builtin/clone.c:765
c04f5ac3
JX
3969msgid "Too many arguments."
3970msgstr "太多参数。"
3971
cfff71a9 3972#: builtin/clone.c:769
c04f5ac3 3973msgid "You must specify a repository to clone."
90e6ef53 3974msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 3975
cfff71a9 3976#: builtin/clone.c:780
c04f5ac3
JX
3977#, c-format
3978msgid "--bare and --origin %s options are incompatible."
3979msgstr "--bare 和 --origin %s 选项不兼容。"
3980
cfff71a9 3981#: builtin/clone.c:783
07432cef
WS
3982msgid "--bare and --separate-git-dir are incompatible."
3983msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3984
cfff71a9 3985#: builtin/clone.c:796
c04f5ac3
JX
3986#, c-format
3987msgid "repository '%s' does not exist"
3988msgstr "版本库 '%s' 不存在"
3989
cfff71a9 3990#: builtin/clone.c:802
c04f5ac3
JX
3991msgid "--depth is ignored in local clones; use file:// instead."
3992msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3993
cfff71a9
JX
3994#: builtin/clone.c:805
3995msgid "source repository is shallow, ignoring --local"
3996msgstr "源版本库是浅克隆,忽略 --local"
3997
3998#: builtin/clone.c:810
2e8451e8
JX
3999msgid "--local is ignored"
4000msgstr "--local 被忽略"
4001
cfff71a9
JX
4002#: builtin/clone.c:814 builtin/fetch.c:1119
4003#, c-format
4004msgid "depth %s is not a positive number"
4005msgstr "深度 %s 不是一个正数"
4006
4007#: builtin/clone.c:824
c04f5ac3
JX
4008#, c-format
4009msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4010msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4011
cfff71a9 4012#: builtin/clone.c:834
c04f5ac3
JX
4013#, c-format
4014msgid "working tree '%s' already exists."
4015msgstr "工作区 '%s' 已经存在。"
4016
cfff71a9 4017#: builtin/clone.c:847 builtin/clone.c:859
c04f5ac3
JX
4018#, c-format
4019msgid "could not create leading directories of '%s'"
90e6ef53 4020msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 4021
cfff71a9 4022#: builtin/clone.c:850
c04f5ac3
JX
4023#, c-format
4024msgid "could not create work tree dir '%s'."
90e6ef53 4025msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 4026
cfff71a9 4027#: builtin/clone.c:869
c04f5ac3
JX
4028#, c-format
4029msgid "Cloning into bare repository '%s'...\n"
4030msgstr "克隆到裸版本库 '%s'...\n"
4031
cfff71a9 4032#: builtin/clone.c:871
c04f5ac3
JX
4033#, c-format
4034msgid "Cloning into '%s'...\n"
4035msgstr "正克隆到 '%s'...\n"
4036
cfff71a9 4037#: builtin/clone.c:906
c04f5ac3
JX
4038#, c-format
4039msgid "Don't know how to clone %s"
4040msgstr "不知道如何克隆 %s"
4041
cfff71a9 4042#: builtin/clone.c:957 builtin/clone.c:965
c04f5ac3
JX
4043#, c-format
4044msgid "Remote branch %s not found in upstream %s"
4045msgstr "远程分支 %s 在上游 %s 未发现"
4046
cfff71a9 4047#: builtin/clone.c:968
c04f5ac3
JX
4048msgid "You appear to have cloned an empty repository."
4049msgstr "您似乎克隆了一个空版本库。"
4050
ef317cd5
JX
4051#: builtin/column.c:9
4052msgid "git column [options]"
07432cef 4053msgstr "git column [选项]"
ef317cd5
JX
4054
4055#: builtin/column.c:26
4056msgid "lookup config vars"
07432cef 4057msgstr "查找配置变量"
ef317cd5
JX
4058
4059#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4060msgid "layout to use"
07432cef 4061msgstr "要使用的布局"
ef317cd5
JX
4062
4063#: builtin/column.c:29
4064msgid "Maximum width"
07432cef 4065msgstr "最大宽度"
ef317cd5
JX
4066
4067#: builtin/column.c:30
4068msgid "Padding space on left border"
07432cef 4069msgstr "左边框的填充空间"
ef317cd5
JX
4070
4071#: builtin/column.c:31
4072msgid "Padding space on right border"
07432cef 4073msgstr "右边框的填充空间"
ef317cd5
JX
4074
4075#: builtin/column.c:32
4076msgid "Padding space between columns"
07432cef 4077msgstr "两列之间的填充空间"
ef317cd5 4078
8ada9598
JX
4079#: builtin/column.c:51
4080msgid "--command must be the first argument"
81809b99 4081msgstr "--command 必须是第一个参数"
8ada9598 4082
90314792 4083#: builtin/commit.c:36
a77c07d9 4084msgid "git commit [options] [--] <pathspec>..."
90314792 4085msgstr "git commit [选项] [--] <路径规则>..."
ef317cd5 4086
90314792 4087#: builtin/commit.c:41
a77c07d9 4088msgid "git status [options] [--] <pathspec>..."
90314792 4089msgstr "git status [选项] [--] <路径规则>..."
ef317cd5 4090
90314792 4091#: builtin/commit.c:46
c04f5ac3
JX
4092msgid ""
4093"Your name and email address were configured automatically based\n"
4094"on your username and hostname. Please check that they are accurate.\n"
4095"You can suppress this message by setting them explicitly:\n"
4096"\n"
4097" git config --global user.name \"Your Name\"\n"
4098" git config --global user.email you@example.com\n"
4099"\n"
4100"After doing this, you may fix the identity used for this commit with:\n"
4101"\n"
4102" git commit --amend --reset-author\n"
4103msgstr ""
90e6ef53
JX
4104"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4105"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
4106"\n"
4107" git config --global user.name \"Your Name\"\n"
4108" git config --global user.email you@example.com\n"
4109"\n"
90e6ef53 4110"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4111"\n"
4112" git commit --amend --reset-author\n"
4113
90314792 4114#: builtin/commit.c:58
c04f5ac3
JX
4115msgid ""
4116"You asked to amend the most recent commit, but doing so would make\n"
4117"it empty. You can repeat your command with --allow-empty, or you can\n"
4118"remove the commit entirely with \"git reset HEAD^\".\n"
4119msgstr ""
1b150dc9
T
4120"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4121"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4122
90314792 4123#: builtin/commit.c:63
c04f5ac3
JX
4124msgid ""
4125"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4126"If you wish to commit it anyway, use:\n"
4127"\n"
4128" git commit --allow-empty\n"
4129"\n"
c04f5ac3 4130msgstr ""
a9ce4543
T
4131"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4132"也要提交,使用命令:\n"
c04f5ac3
JX
4133"\n"
4134" git commit --allow-empty\n"
4135"\n"
c04f5ac3 4136
90314792 4137#: builtin/commit.c:70
b1894384
JX
4138msgid "Otherwise, please use 'git reset'\n"
4139msgstr "否则,请使用命令 'git reset'\n"
4140
90314792 4141#: builtin/commit.c:73
b1894384
JX
4142msgid ""
4143"If you wish to skip this commit, use:\n"
4144"\n"
4145" git reset\n"
4146"\n"
4147"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4148"the remaining commits.\n"
4149msgstr ""
4150"如果您想跳过这个提交,使用命令:\n"
4151"\n"
4152" git reset\n"
4153"\n"
4154"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4155"操作。\n"
4156
90314792 4157#: builtin/commit.c:287
c04f5ac3 4158msgid "failed to unpack HEAD tree object"
90e6ef53 4159msgstr "无法解包 HEAD 树对象"
c04f5ac3 4160
90314792 4161#: builtin/commit.c:329
c04f5ac3 4162msgid "unable to create temporary index"
90e6ef53 4163msgstr "不能创建临时索引"
c04f5ac3 4164
90314792 4165#: builtin/commit.c:335
c04f5ac3
JX
4166msgid "interactive add failed"
4167msgstr "交互式添加失败"
4168
90314792 4169#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
c04f5ac3 4170msgid "unable to write new_index file"
90e6ef53 4171msgstr "无法写 new_index 文件"
c04f5ac3 4172
90314792 4173#: builtin/commit.c:420
8ada9598 4174msgid "cannot do a partial commit during a merge."
81809b99 4175msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4176
90314792 4177#: builtin/commit.c:422
8ada9598 4178msgid "cannot do a partial commit during a cherry-pick."
81809b99 4179msgstr "在拣选过程中不能做部分提交。"
8ada9598 4180
90314792 4181#: builtin/commit.c:432
c04f5ac3 4182msgid "cannot read the index"
90e6ef53 4183msgstr "无法读取索引"
c04f5ac3 4184
90314792 4185#: builtin/commit.c:452
c04f5ac3 4186msgid "unable to write temporary index file"
90e6ef53 4187msgstr "无法写临时索引文件"
c04f5ac3 4188
90314792 4189#: builtin/commit.c:543 builtin/commit.c:549
c04f5ac3
JX
4190#, c-format
4191msgid "invalid commit: %s"
4192msgstr "无效的提交:%s"
4193
90314792 4194#: builtin/commit.c:571
c04f5ac3
JX
4195msgid "malformed --author parameter"
4196msgstr "非法的 --author 参数"
4197
90314792 4198#: builtin/commit.c:591
c04f5ac3
JX
4199#, c-format
4200msgid "Malformed ident string: '%s'"
90e6ef53 4201msgstr "非法的身份字符串:'%s'"
c04f5ac3 4202
90314792 4203#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
c04f5ac3
JX
4204#, c-format
4205msgid "could not lookup commit %s"
4206msgstr "不能查询提交 %s"
4207
90314792 4208#: builtin/commit.c:642 builtin/shortlog.c:273
c04f5ac3
JX
4209#, c-format
4210msgid "(reading log message from standard input)\n"
90e6ef53 4211msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 4212
90314792 4213#: builtin/commit.c:644
c04f5ac3 4214msgid "could not read log from standard input"
90e6ef53 4215msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4216
90314792 4217#: builtin/commit.c:648
c04f5ac3
JX
4218#, c-format
4219msgid "could not read log file '%s'"
90e6ef53 4220msgstr "不能读取日志文件 '%s'"
c04f5ac3 4221
90314792 4222#: builtin/commit.c:654
c04f5ac3
JX
4223msgid "commit has empty message"
4224msgstr "提交说明为空"
4225
90314792 4226#: builtin/commit.c:670
c04f5ac3 4227msgid "could not read MERGE_MSG"
90e6ef53 4228msgstr "不能读取 MERGE_MSG"
c04f5ac3 4229
90314792 4230#: builtin/commit.c:674
c04f5ac3 4231msgid "could not read SQUASH_MSG"
90e6ef53 4232msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4233
90314792 4234#: builtin/commit.c:678
c04f5ac3
JX
4235#, c-format
4236msgid "could not read '%s'"
90e6ef53 4237msgstr "不能读取 '%s'"
c04f5ac3 4238
90314792 4239#: builtin/commit.c:749
c04f5ac3 4240msgid "could not write commit template"
90e6ef53 4241msgstr "不能写提交模版"
c04f5ac3 4242
90314792 4243#: builtin/commit.c:760
81809b99 4244#, c-format
c04f5ac3
JX
4245msgid ""
4246"\n"
8ada9598 4247"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4248"If this is not correct, please remove the file\n"
4249"\t%s\n"
4250"and try again.\n"
4251msgstr ""
4252"\n"
649900bc 4253"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4254"\t%s\n"
4255"然后重试。\n"
4256
90314792 4257#: builtin/commit.c:765
81809b99 4258#, c-format
8ada9598
JX
4259msgid ""
4260"\n"
4261"It looks like you may be committing a cherry-pick.\n"
4262"If this is not correct, please remove the file\n"
4263"\t%s\n"
4264"and try again.\n"
4265msgstr ""
4266"\n"
649900bc 4267"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4268"\t%s\n"
4269"然后重试。\n"
c04f5ac3 4270
90314792 4271#: builtin/commit.c:777
a77c07d9 4272#, c-format
c04f5ac3 4273msgid ""
8ada9598 4274"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4275"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4276msgstr ""
a77c07d9 4277"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4278"说明将会终止提交。\n"
c04f5ac3 4279
90314792 4280#: builtin/commit.c:782
a77c07d9 4281#, c-format
c04f5ac3 4282msgid ""
8ada9598 4283"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4284"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4285"An empty message aborts the commit.\n"
4286msgstr ""
a77c07d9
JX
4287"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4288"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4289
90e6ef53 4290# 译者:为保证在输出中对齐,注意调整句中空格!
90314792 4291#: builtin/commit.c:795
c04f5ac3
JX
4292#, c-format
4293msgid "%sAuthor: %s"
4294msgstr "%s作者: %s"
4295
90e6ef53 4296# 译者:为保证在输出中对齐,注意调整句中空格!
90314792 4297#: builtin/commit.c:802
c04f5ac3
JX
4298#, c-format
4299msgid "%sCommitter: %s"
4300msgstr "%s提交者: %s"
4301
90314792 4302#: builtin/commit.c:822
c04f5ac3 4303msgid "Cannot read index"
90e6ef53 4304msgstr "无法读取索引"
c04f5ac3 4305
90314792 4306#: builtin/commit.c:865
c04f5ac3
JX
4307msgid "Error building trees"
4308msgstr "无法创建树对象"
4309
90314792 4310#: builtin/commit.c:880 builtin/tag.c:359
c04f5ac3
JX
4311#, c-format
4312msgid "Please supply the message using either -m or -F option.\n"
07432cef 4313msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4314
90314792 4315#: builtin/commit.c:982
c04f5ac3
JX
4316#, c-format
4317msgid "No existing author found with '%s'"
4318msgstr "没有找到匹配 '%s' 的作者"
4319
90314792 4320#: builtin/commit.c:997 builtin/commit.c:1237
c04f5ac3
JX
4321#, c-format
4322msgid "Invalid untracked files mode '%s'"
90e6ef53 4323msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4324
90314792 4325#: builtin/commit.c:1034
2e8451e8
JX
4326msgid "--long and -z are incompatible"
4327msgstr "--long 和 -z 选项不兼容"
4328
90314792 4329#: builtin/commit.c:1064
c04f5ac3
JX
4330msgid "Using both --reset-author and --author does not make sense"
4331msgstr "同时使用 --reset-author 和 --author 没有意义"
4332
90314792 4333#: builtin/commit.c:1075
c04f5ac3 4334msgid "You have nothing to amend."
90e6ef53 4335msgstr "您没有可修补的提交。"
c04f5ac3 4336
90314792 4337#: builtin/commit.c:1078
8ada9598 4338msgid "You are in the middle of a merge -- cannot amend."
81809b99 4339msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4340
90314792 4341#: builtin/commit.c:1080
8ada9598 4342msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4343msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4344
90314792 4345#: builtin/commit.c:1083
c04f5ac3 4346msgid "Options --squash and --fixup cannot be used together"
649900bc 4347msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4348
90314792 4349#: builtin/commit.c:1093
c04f5ac3
JX
4350msgid "Only one of -c/-C/-F/--fixup can be used."
4351msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4352
90314792 4353#: builtin/commit.c:1095
c04f5ac3 4354msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4355msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4356
90314792 4357#: builtin/commit.c:1103
c04f5ac3 4358msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4359msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4360
90314792 4361#: builtin/commit.c:1120
c04f5ac3
JX
4362msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4363msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4364
90314792 4365#: builtin/commit.c:1122
c04f5ac3
JX
4366msgid "No paths with --include/--only does not make sense."
4367msgstr "参数 --include/--only 不跟路径没有意义。"
4368
90314792 4369#: builtin/commit.c:1124
c04f5ac3 4370msgid "Clever... amending the last one with dirty index."
90e6ef53 4371msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 4372
90314792 4373#: builtin/commit.c:1126
c04f5ac3 4374msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 4375msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 4376
90314792 4377#: builtin/commit.c:1136 builtin/tag.c:572
c04f5ac3
JX
4378#, c-format
4379msgid "Invalid cleanup mode %s"
4380msgstr "无效的清理模式 %s"
4381
90314792 4382#: builtin/commit.c:1141
c04f5ac3 4383msgid "Paths with -a does not make sense."
649900bc 4384msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4385
90314792 4386#: builtin/commit.c:1251 builtin/commit.c:1482
ef317cd5 4387msgid "show status concisely"
07432cef 4388msgstr "以简洁的格式显示状态"
ef317cd5 4389
90314792 4390#: builtin/commit.c:1253 builtin/commit.c:1484
ef317cd5 4391msgid "show branch information"
07432cef 4392msgstr "显示分支信息"
ef317cd5 4393
cfff71a9 4394#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507
ef317cd5 4395msgid "machine-readable output"
07432cef
WS
4396msgstr "机器可读的输出"
4397
90314792 4398#: builtin/commit.c:1258 builtin/commit.c:1488
07432cef
WS
4399msgid "show status in long format (default)"
4400msgstr "以长格式显示状态(默认)"
ef317cd5 4401
90314792 4402#: builtin/commit.c:1261 builtin/commit.c:1491
ef317cd5 4403msgid "terminate entries with NUL"
07432cef 4404msgstr "条目以NUL字符结尾"
ef317cd5 4405
90314792
JX
4406#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
4407#: builtin/fast-export.c:677 builtin/tag.c:459
ef317cd5 4408msgid "mode"
07432cef 4409msgstr "模式"
ef317cd5 4410
90314792 4411#: builtin/commit.c:1264 builtin/commit.c:1494
ef317cd5 4412msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4413msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4414
90314792 4415#: builtin/commit.c:1267
ef317cd5 4416msgid "show ignored files"
07432cef 4417msgstr "显示忽略的文件"
ef317cd5 4418
90314792 4419#: builtin/commit.c:1268 parse-options.h:156
ef317cd5
JX
4420msgid "when"
4421msgstr "何时"
4422
90314792 4423#: builtin/commit.c:1269
ef317cd5
JX
4424msgid ""
4425"ignore changes to submodules, optional when: all, dirty, untracked. "
4426"(Default: all)"
4427msgstr ""
07432cef 4428"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4429
90314792 4430#: builtin/commit.c:1271
ef317cd5 4431msgid "list untracked files in columns"
07432cef 4432msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4433
90314792 4434#: builtin/commit.c:1340
c04f5ac3
JX
4435msgid "couldn't look up newly created commit"
4436msgstr "无法找到新创建的提交"
4437
90314792 4438#: builtin/commit.c:1342
c04f5ac3 4439msgid "could not parse newly created commit"
90e6ef53 4440msgstr "不能解析新创建的提交"
c04f5ac3 4441
90314792 4442#: builtin/commit.c:1383
c04f5ac3
JX
4443msgid "detached HEAD"
4444msgstr "分离头指针"
4445
7e238ab7 4446# 译者:中文字符串拼接,可删除前导空格
90314792 4447#: builtin/commit.c:1385
c04f5ac3 4448msgid " (root-commit)"
7e238ab7 4449msgstr "(根提交)"
c04f5ac3 4450
90314792 4451#: builtin/commit.c:1452
ef317cd5 4452msgid "suppress summary after successful commit"
07432cef 4453msgstr "提交成功后不显示概述信息"
c04f5ac3 4454
90314792 4455#: builtin/commit.c:1453
ef317cd5 4456msgid "show diff in commit message template"
07432cef 4457msgstr "在提交说明模板里显示差异"
c04f5ac3 4458
90314792 4459#: builtin/commit.c:1455
ef317cd5 4460msgid "Commit message options"
07432cef 4461msgstr "提交说明选项"
c04f5ac3 4462
90314792 4463#: builtin/commit.c:1456 builtin/tag.c:457
ef317cd5 4464msgid "read message from file"
07432cef 4465msgstr "从文件中读取提交说明"
c04f5ac3 4466
90314792 4467#: builtin/commit.c:1457
ef317cd5 4468msgid "author"
07432cef 4469msgstr "作者"
c04f5ac3 4470
90314792 4471#: builtin/commit.c:1457
ef317cd5 4472msgid "override author for commit"
07432cef 4473msgstr "提交时覆盖作者"
73a60cd2 4474
cfff71a9 4475#: builtin/commit.c:1458 builtin/gc.c:261
ef317cd5 4476msgid "date"
07432cef 4477msgstr "日期"
c04f5ac3 4478
90314792 4479#: builtin/commit.c:1458
ef317cd5 4480msgid "override date for commit"
07432cef 4481msgstr "提交时覆盖日期"
c04f5ac3 4482
cfff71a9 4483#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405
2e8451e8 4484#: builtin/notes.c:562 builtin/tag.c:455
ef317cd5 4485msgid "message"
07432cef 4486msgstr "说明"
c04f5ac3 4487
90314792 4488#: builtin/commit.c:1459
ef317cd5 4489msgid "commit message"
07432cef 4490msgstr "提交说明"
ef317cd5 4491
90314792 4492#: builtin/commit.c:1460
ef317cd5 4493msgid "reuse and edit message from specified commit"
07432cef 4494msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4495
90314792 4496#: builtin/commit.c:1461
ef317cd5 4497msgid "reuse message from specified commit"
07432cef 4498msgstr "重用指定提交的提交说明"
ef317cd5 4499
90314792 4500#: builtin/commit.c:1462
ef317cd5 4501msgid "use autosquash formatted message to fixup specified commit"
07432cef 4502msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4503
90314792 4504#: builtin/commit.c:1463
ef317cd5 4505msgid "use autosquash formatted message to squash specified commit"
07432cef 4506msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4507
90314792 4508#: builtin/commit.c:1464
ef317cd5 4509msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4510msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4511
90314792 4512#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
ef317cd5 4513msgid "add Signed-off-by:"
07432cef 4514msgstr "添加 Signed-off-by: 签名"
ef317cd5 4515
90314792 4516#: builtin/commit.c:1466
ef317cd5 4517msgid "use specified template file"
07432cef 4518msgstr "使用指定的模板文件"
ef317cd5 4519
90314792 4520#: builtin/commit.c:1467
ef317cd5 4521msgid "force edit of commit"
07432cef 4522msgstr "强制编辑提交"
ef317cd5 4523
07432cef 4524# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
90314792 4525#: builtin/commit.c:1468
ef317cd5 4526msgid "default"
07432cef 4527msgstr "default"
ef317cd5 4528
90314792 4529#: builtin/commit.c:1468 builtin/tag.c:460
ef317cd5 4530msgid "how to strip spaces and #comments from message"
07432cef 4531msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4532
90314792 4533#: builtin/commit.c:1469
ef317cd5 4534msgid "include status in commit message template"
07432cef 4535msgstr "在提交说明模板里包含状态信息"
ef317cd5 4536
cfff71a9 4537#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461
ef317cd5 4538msgid "key id"
07432cef 4539msgstr "key id"
ef317cd5 4540
cfff71a9 4541#: builtin/commit.c:1471 builtin/merge.c:224
ef317cd5 4542msgid "GPG sign commit"
07432cef 4543msgstr "GPG 提交签名"
ef317cd5
JX
4544
4545#. end commit message options
90314792 4546#: builtin/commit.c:1474
ef317cd5 4547msgid "Commit contents options"
07432cef 4548msgstr "提交内容选项"
ef317cd5 4549
90314792 4550#: builtin/commit.c:1475
ef317cd5 4551msgid "commit all changed files"
07432cef 4552msgstr "提交所有改动的文件"
ef317cd5 4553
90314792 4554#: builtin/commit.c:1476
ef317cd5 4555msgid "add specified files to index for commit"
07432cef 4556msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4557
90314792 4558#: builtin/commit.c:1477
ef317cd5 4559msgid "interactively add files"
07432cef 4560msgstr "交互式添加文件"
ef317cd5 4561
90314792 4562#: builtin/commit.c:1478
ef317cd5 4563msgid "interactively add changes"
07432cef 4564msgstr "交互式添加变更"
ef317cd5 4565
90314792 4566#: builtin/commit.c:1479
ef317cd5 4567msgid "commit only specified files"
07432cef 4568msgstr "只提交指定的文件"
ef317cd5 4569
90314792 4570#: builtin/commit.c:1480
ef317cd5 4571msgid "bypass pre-commit hook"
07432cef 4572msgstr "绕过 pre-commit 钩子"
ef317cd5 4573
90314792 4574#: builtin/commit.c:1481
ef317cd5 4575msgid "show what would be committed"
07432cef 4576msgstr "显示将要提交的内容"
ef317cd5 4577
90314792 4578#: builtin/commit.c:1492
ef317cd5 4579msgid "amend previous commit"
07432cef 4580msgstr "修改先前的提交"
ef317cd5 4581
90314792 4582#: builtin/commit.c:1493
ef317cd5 4583msgid "bypass post-rewrite hook"
07432cef 4584msgstr "绕过 post-rewrite 钩子"
ef317cd5 4585
90314792 4586#: builtin/commit.c:1498
ef317cd5 4587msgid "ok to record an empty change"
07432cef 4588msgstr "允许一个空提交"
ef317cd5 4589
90314792 4590#: builtin/commit.c:1500
ef317cd5 4591msgid "ok to record a change with an empty message"
07432cef 4592msgstr "允许空的提交说明"
ef317cd5 4593
90314792 4594#: builtin/commit.c:1529
c04f5ac3 4595msgid "could not parse HEAD commit"
90e6ef53 4596msgstr "不能解析 HEAD 提交"
c04f5ac3 4597
cfff71a9 4598#: builtin/commit.c:1567 builtin/merge.c:518
c04f5ac3
JX
4599#, c-format
4600msgid "could not open '%s' for reading"
90e6ef53 4601msgstr "不能为读入打开 '%s'"
c04f5ac3 4602
90314792 4603#: builtin/commit.c:1574
c04f5ac3
JX
4604#, c-format
4605msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4606msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4607
90314792 4608#: builtin/commit.c:1581
c04f5ac3 4609msgid "could not read MERGE_MODE"
90e6ef53 4610msgstr "不能读取 MERGE_MODE"
c04f5ac3 4611
90314792 4612#: builtin/commit.c:1600
c04f5ac3
JX
4613#, c-format
4614msgid "could not read commit message: %s"
90e6ef53 4615msgstr "不能读取提交说明:%s"
c04f5ac3 4616
cfff71a9 4617#: builtin/commit.c:1611
73a60cd2
JX
4618#, c-format
4619msgid "Aborting commit; you did not edit the message.\n"
4620msgstr "终止提交;您未更改来自模版的提交说明。\n"
4621
cfff71a9 4622#: builtin/commit.c:1616
c04f5ac3
JX
4623#, c-format
4624msgid "Aborting commit due to empty commit message.\n"
4625msgstr "终止提交因为提交说明为空。\n"
4626
cfff71a9 4627#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879
c04f5ac3 4628msgid "failed to write commit object"
90e6ef53 4629msgstr "无法写提交对象"
c04f5ac3 4630
cfff71a9 4631#: builtin/commit.c:1652
c04f5ac3
JX
4632msgid "cannot lock HEAD ref"
4633msgstr "无法锁定 HEAD 引用"
4634
cfff71a9 4635#: builtin/commit.c:1656
c04f5ac3
JX
4636msgid "cannot update HEAD ref"
4637msgstr "无法更新 HEAD 引用"
4638
cfff71a9 4639#: builtin/commit.c:1667
c04f5ac3
JX
4640msgid ""
4641"Repository has been updated, but unable to write\n"
4642"new_index file. Check that disk is not full or quota is\n"
4643"not exceeded, and then \"git reset HEAD\" to recover."
4644msgstr ""
90e6ef53
JX
4645"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4646"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4647
90314792 4648#: builtin/config.c:8
ef317cd5 4649msgid "git config [options]"
07432cef 4650msgstr "git config [选项]"
ef317cd5 4651
90314792 4652#: builtin/config.c:54
ef317cd5 4653msgid "Config file location"
07432cef 4654msgstr "配置文件位置"
ef317cd5 4655
90314792 4656#: builtin/config.c:55
ef317cd5 4657msgid "use global config file"
07432cef 4658msgstr "使用全局配置文件"
ef317cd5 4659
90314792 4660#: builtin/config.c:56
ef317cd5 4661msgid "use system config file"
07432cef 4662msgstr "使用系统级配置文件"
ef317cd5 4663
90314792 4664#: builtin/config.c:57
ef317cd5 4665msgid "use repository config file"
07432cef 4666msgstr "使用版本库级配置文件"
ef317cd5 4667
90314792 4668#: builtin/config.c:58
ef317cd5 4669msgid "use given config file"
07432cef 4670msgstr "使用指定的配置文件"
ef317cd5 4671
90314792 4672#: builtin/config.c:59
2e8451e8
JX
4673msgid "blob-id"
4674msgstr "数据对象ID"
4675
90314792 4676#: builtin/config.c:59
2e8451e8
JX
4677msgid "read config from given blob object"
4678msgstr "从给定的数据对象读取配置"
4679
90314792 4680#: builtin/config.c:60
ef317cd5 4681msgid "Action"
07432cef 4682msgstr "操作"
ef317cd5 4683
90314792 4684#: builtin/config.c:61
ef317cd5 4685msgid "get value: name [value-regex]"
07432cef 4686msgstr "获取值:name [value-regex]"
ef317cd5 4687
90314792 4688#: builtin/config.c:62
ef317cd5 4689msgid "get all values: key [value-regex]"
07432cef 4690msgstr "获得所有的值:key [value-regex]"
ef317cd5 4691
90314792 4692#: builtin/config.c:63
ef317cd5 4693msgid "get values for regexp: name-regex [value-regex]"
07432cef 4694msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 4695
90314792
JX
4696#: builtin/config.c:64
4697msgid "get value specific for the URL: section[.var] URL"
4698msgstr "获得 URL 取值:section[.var] URL"
4699
4700#: builtin/config.c:65
ef317cd5 4701msgid "replace all matching variables: name value [value_regex]"
07432cef 4702msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 4703
90314792 4704#: builtin/config.c:66
ef317cd5 4705msgid "add a new variable: name value"
07432cef 4706msgstr "添加一个新的变量:name value"
ef317cd5 4707
90314792 4708#: builtin/config.c:67
ef317cd5 4709msgid "remove a variable: name [value-regex]"
07432cef 4710msgstr "删除一个变量:name [value-regex]"
ef317cd5 4711
90314792 4712#: builtin/config.c:68
ef317cd5 4713msgid "remove all matches: name [value-regex]"
07432cef 4714msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 4715
90314792 4716#: builtin/config.c:69
ef317cd5 4717msgid "rename section: old-name new-name"
07432cef 4718msgstr "重命名小节:old-name new-name"
ef317cd5 4719
90314792 4720#: builtin/config.c:70
ef317cd5 4721msgid "remove a section: name"
07432cef 4722msgstr "删除一个小节:name"
ef317cd5 4723
90314792 4724#: builtin/config.c:71
ef317cd5 4725msgid "list all"
07432cef 4726msgstr "列出所有"
ef317cd5 4727
90314792 4728#: builtin/config.c:72
ef317cd5 4729msgid "open an editor"
07432cef 4730msgstr "打开一个编辑器"
ef317cd5 4731
90314792 4732#: builtin/config.c:73 builtin/config.c:74
ef317cd5 4733msgid "slot"
07432cef 4734msgstr "slot"
ef317cd5 4735
90314792 4736#: builtin/config.c:73
ef317cd5 4737msgid "find the color configured: [default]"
07432cef 4738msgstr "找到配置的颜色:[默认]"
ef317cd5 4739
90314792 4740#: builtin/config.c:74
ef317cd5 4741msgid "find the color setting: [stdout-is-tty]"
07432cef 4742msgstr "找到颜色设置:[stdout-is-tty]"
ef317cd5 4743
90314792 4744#: builtin/config.c:75
ef317cd5 4745msgid "Type"
07432cef 4746msgstr "类型"
ef317cd5 4747
90314792 4748#: builtin/config.c:76
ef317cd5 4749msgid "value is \"true\" or \"false\""
07432cef 4750msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4751
90314792 4752#: builtin/config.c:77
ef317cd5 4753msgid "value is decimal number"
07432cef 4754msgstr "值是十进制数"
ef317cd5 4755
90314792 4756#: builtin/config.c:78
ef317cd5 4757msgid "value is --bool or --int"
07432cef 4758msgstr "值是 --bool or --int"
ef317cd5 4759
90314792 4760#: builtin/config.c:79
ef317cd5 4761msgid "value is a path (file or directory name)"
07432cef 4762msgstr "值是一个路径(文件或目录名)"
ef317cd5 4763
90314792 4764#: builtin/config.c:80
ef317cd5 4765msgid "Other"
07432cef 4766msgstr "其它"
ef317cd5 4767
90314792 4768#: builtin/config.c:81
ef317cd5 4769msgid "terminate values with NUL byte"
07432cef 4770msgstr "终止值是NUL字节"
ef317cd5 4771
90314792 4772#: builtin/config.c:82
ef317cd5 4773msgid "respect include directives on lookup"
07432cef 4774msgstr "查询时参照 include 指令递归查找"
ef317cd5 4775
1003b3a5 4776#: builtin/count-objects.c:82
4dcdc3d8
JX
4777msgid "git count-objects [-v] [-H | --human-readable]"
4778msgstr "git count-objects [-v] [-H | --human-readable]"
4779
4780#: builtin/count-objects.c:97
4781msgid "print sizes in human readable format"
4782msgstr "以用户可读的格式显示大小"
ef317cd5 4783
2e8451e8 4784#: builtin/describe.c:16
a8a5406a 4785msgid "git describe [options] <commit-ish>*"
07432cef 4786msgstr "git describe [选项] <提交号>*"
ef317cd5 4787
2e8451e8 4788#: builtin/describe.c:17
ef317cd5 4789msgid "git describe [options] --dirty"
07432cef 4790msgstr "git describe [选项] --dirty"
ef317cd5 4791
2e8451e8 4792#: builtin/describe.c:237
c04f5ac3
JX
4793#, c-format
4794msgid "annotated tag %s not available"
4795msgstr "注释 tag %s 无效"
4796
2e8451e8 4797#: builtin/describe.c:241
c04f5ac3
JX
4798#, c-format
4799msgid "annotated tag %s has no embedded name"
4800msgstr "注释 tag %s 没有嵌入名称"
4801
2e8451e8 4802#: builtin/describe.c:243
c04f5ac3
JX
4803#, c-format
4804msgid "tag '%s' is really '%s' here"
90e6ef53 4805msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3 4806
2e8451e8 4807#: builtin/describe.c:270
c04f5ac3
JX
4808#, c-format
4809msgid "Not a valid object name %s"
4810msgstr "不是一个有效的对象名 %s"
4811
2e8451e8 4812#: builtin/describe.c:273
c04f5ac3
JX
4813#, c-format
4814msgid "%s is not a valid '%s' object"
4815msgstr "%s 不是一个有效的 '%s' 对象"
4816
2e8451e8 4817#: builtin/describe.c:290
c04f5ac3
JX
4818#, c-format
4819msgid "no tag exactly matches '%s'"
4820msgstr "没有 tag 准确匹配 '%s'"
4821
2e8451e8 4822#: builtin/describe.c:292
c04f5ac3
JX
4823#, c-format
4824msgid "searching to describe %s\n"
4825msgstr "搜索描述 %s\n"
4826
2e8451e8 4827#: builtin/describe.c:332
c04f5ac3
JX
4828#, c-format
4829msgid "finished search at %s\n"
4830msgstr "完成搜索 %s\n"
4831
2e8451e8 4832#: builtin/describe.c:359
c04f5ac3
JX
4833#, c-format
4834msgid ""
4835"No annotated tags can describe '%s'.\n"
4836"However, there were unannotated tags: try --tags."
4837msgstr ""
4838"没有注释 tag 能描述 '%s'。\n"
4839"然而,有非注释 tag:尝试 --tags。"
4840
2e8451e8 4841#: builtin/describe.c:363
c04f5ac3
JX
4842#, c-format
4843msgid ""
4844"No tags can describe '%s'.\n"
4845"Try --always, or create some tags."
4846msgstr ""
4847"没有注释 tag 能描述 '%s'。\n"
90e6ef53 4848"尝试 --always,或者创建一些 tag。"
c04f5ac3 4849
2e8451e8 4850#: builtin/describe.c:384
c04f5ac3
JX
4851#, c-format
4852msgid "traversed %lu commits\n"
4853msgstr "已遍历 %lu 个提交\n"
4854
2e8451e8 4855#: builtin/describe.c:387
c04f5ac3
JX
4856#, c-format
4857msgid ""
4858"more than %i tags found; listed %i most recent\n"
4859"gave up search at %s\n"
4860msgstr ""
90e6ef53
JX
4861"发现多于 %i 个 tag,列出最近的 %i 个\n"
4862"在 %s 放弃搜索\n"
c04f5ac3 4863
2e8451e8 4864#: builtin/describe.c:409
ef317cd5 4865msgid "find the tag that comes after the commit"
07432cef 4866msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5 4867
2e8451e8 4868#: builtin/describe.c:410
ef317cd5 4869msgid "debug search strategy on stderr"
07432cef 4870msgstr "在标准错误上调试搜索策略"
ef317cd5 4871
2e8451e8 4872#: builtin/describe.c:411
1003b3a5
JX
4873msgid "use any ref"
4874msgstr "使用任意引用"
4875
2e8451e8 4876#: builtin/describe.c:412
1003b3a5
JX
4877msgid "use any tag, even unannotated"
4878msgstr "使用任意 tag,即使未带注解"
ef317cd5 4879
2e8451e8 4880#: builtin/describe.c:413
ef317cd5 4881msgid "always use long format"
07432cef 4882msgstr "始终使用长提交号格式"
ef317cd5 4883
2e8451e8
JX
4884#: builtin/describe.c:414
4885msgid "only follow first parent"
4886msgstr "只跟随第一个父提交"
4887
4888#: builtin/describe.c:417
ef317cd5 4889msgid "only output exact matches"
07432cef 4890msgstr "只输出精确匹配"
ef317cd5 4891
2e8451e8 4892#: builtin/describe.c:419
ef317cd5 4893msgid "consider <n> most recent tags (default: 10)"
07432cef 4894msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5 4895
2e8451e8 4896#: builtin/describe.c:421
ef317cd5 4897msgid "only consider tags matching <pattern>"
07432cef 4898msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5 4899
cfff71a9 4900#: builtin/describe.c:423 builtin/name-rev.c:321
ef317cd5 4901msgid "show abbreviated commit object as fallback"
07432cef 4902msgstr "显示简写的提交号作为后备"
ef317cd5 4903
2e8451e8 4904#: builtin/describe.c:424
ef317cd5 4905msgid "mark"
07432cef 4906msgstr "标记"
ef317cd5 4907
2e8451e8 4908#: builtin/describe.c:425
ef317cd5 4909msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 4910msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 4911
2e8451e8 4912#: builtin/describe.c:443
c04f5ac3
JX
4913msgid "--long is incompatible with --abbrev=0"
4914msgstr "--long 与 --abbrev=0 不兼容"
4915
2e8451e8 4916#: builtin/describe.c:469
c04f5ac3 4917msgid "No names found, cannot describe anything."
90e6ef53 4918msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 4919
2e8451e8 4920#: builtin/describe.c:489
a8a5406a 4921msgid "--dirty is incompatible with commit-ishes"
649900bc 4922msgstr "--dirty 不能与提交同时使用"
c04f5ac3 4923
cfff71a9 4924#: builtin/diff.c:85
c04f5ac3
JX
4925#, c-format
4926msgid "'%s': not a regular file or symlink"
4927msgstr "'%s':不是一个正规文件或符号链接"
4928
cfff71a9 4929#: builtin/diff.c:236
c04f5ac3
JX
4930#, c-format
4931msgid "invalid option: %s"
4932msgstr "无效选项:%s"
4933
cfff71a9 4934#: builtin/diff.c:357
c04f5ac3
JX
4935msgid "Not a git repository"
4936msgstr "不是一个 git 版本库"
4937
cfff71a9 4938#: builtin/diff.c:400
c04f5ac3
JX
4939#, c-format
4940msgid "invalid object '%s' given."
4941msgstr "提供了无效对象 '%s'。"
4942
cfff71a9 4943#: builtin/diff.c:409
c04f5ac3
JX
4944#, c-format
4945msgid "more than two blobs given: '%s'"
07432cef 4946msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 4947
cfff71a9 4948#: builtin/diff.c:416
c04f5ac3
JX
4949#, c-format
4950msgid "unhandled object '%s' given."
4951msgstr "提供了无法处理的对象 '%s'。"
4952
ef317cd5
JX
4953#: builtin/fast-export.c:22
4954msgid "git fast-export [rev-list-opts]"
07432cef 4955msgstr "git fast-export [rev-list-opts]"
ef317cd5 4956
90314792 4957#: builtin/fast-export.c:673
ef317cd5 4958msgid "show progress after <n> objects"
07432cef 4959msgstr "在 <n> 个对象之后显示进度"
ef317cd5 4960
90314792 4961#: builtin/fast-export.c:675
ef317cd5 4962msgid "select handling of signed tags"
07432cef 4963msgstr "选择如何处理签名 tags"
ef317cd5 4964
90314792 4965#: builtin/fast-export.c:678
ef317cd5 4966msgid "select handling of tags that tag filtered objects"
07432cef 4967msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 4968
90314792 4969#: builtin/fast-export.c:681
ef317cd5 4970msgid "Dump marks to this file"
07432cef 4971msgstr "把标记存储到这个文件"
ef317cd5 4972
90314792 4973#: builtin/fast-export.c:683
ef317cd5 4974msgid "Import marks from this file"
07432cef 4975msgstr "从这个文件导入标记"
ef317cd5 4976
90314792 4977#: builtin/fast-export.c:685
ef317cd5 4978msgid "Fake a tagger when tags lack one"
07432cef 4979msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 4980
90314792 4981#: builtin/fast-export.c:687
ef317cd5 4982msgid "Output full tree for each commit"
07432cef 4983msgstr "每次提交都输出整个树"
ef317cd5 4984
90314792 4985#: builtin/fast-export.c:689
ef317cd5 4986msgid "Use the done feature to terminate the stream"
07432cef 4987msgstr "使用 done 功能来终止流"
ef317cd5 4988
90314792 4989#: builtin/fast-export.c:690
ef317cd5 4990msgid "Skip output of blob data"
07432cef 4991msgstr "跳过数据对象的输出"
ef317cd5
JX
4992
4993#: builtin/fetch.c:20
ef317cd5 4994msgid "git fetch [<options>] [<repository> [<refspec>...]]"
90314792 4995msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
ef317cd5
JX
4996
4997#: builtin/fetch.c:21
4998msgid "git fetch [<options>] <group>"
07432cef 4999msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
5000
5001#: builtin/fetch.c:22
5002msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 5003msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
5004
5005#: builtin/fetch.c:23
5006msgid "git fetch --all [<options>]"
07432cef 5007msgstr "git fetch --all [<选项>]"
ef317cd5 5008
cfff71a9 5009#: builtin/fetch.c:75
ef317cd5 5010msgid "fetch from all remotes"
07432cef 5011msgstr "从所有的远程抓取"
ef317cd5 5012
cfff71a9 5013#: builtin/fetch.c:77
ef317cd5 5014msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5015msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5016
cfff71a9 5017#: builtin/fetch.c:79
ef317cd5 5018msgid "path to upload pack on remote end"
07432cef 5019msgstr "上传包到远程的路径"
ef317cd5 5020
cfff71a9 5021#: builtin/fetch.c:80
ef317cd5 5022msgid "force overwrite of local branch"
07432cef 5023msgstr "强制覆盖本地分支"
ef317cd5 5024
cfff71a9 5025#: builtin/fetch.c:82
ef317cd5 5026msgid "fetch from multiple remotes"
07432cef 5027msgstr "从多个远程抓取"
ef317cd5 5028
cfff71a9 5029#: builtin/fetch.c:84
ef317cd5 5030msgid "fetch all tags and associated objects"
07432cef 5031msgstr "抓取所有的 tags 和关联对象"
ef317cd5 5032
cfff71a9 5033#: builtin/fetch.c:86
ef317cd5 5034msgid "do not fetch all tags (--no-tags)"
07432cef 5035msgstr "不抓取任何 tags (--no-tags)"
ef317cd5 5036
cfff71a9 5037#: builtin/fetch.c:88
ef317cd5 5038msgid "prune remote-tracking branches no longer on remote"
07432cef 5039msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5040
07432cef 5041# 译者:可选值,不能翻译
cfff71a9 5042#: builtin/fetch.c:89
ef317cd5 5043msgid "on-demand"
07432cef 5044msgstr "on-demand"
ef317cd5 5045
cfff71a9 5046#: builtin/fetch.c:90
ef317cd5 5047msgid "control recursive fetching of submodules"
07432cef 5048msgstr "控制子模组的递归抓取"
ef317cd5 5049
cfff71a9 5050#: builtin/fetch.c:94
ef317cd5 5051msgid "keep downloaded pack"
07432cef 5052msgstr "保持下载包"
ef317cd5 5053
cfff71a9 5054#: builtin/fetch.c:96
ef317cd5 5055msgid "allow updating of HEAD ref"
07432cef 5056msgstr "允许更新 HEAD 引用"
ef317cd5 5057
cfff71a9 5058#: builtin/fetch.c:99
ef317cd5 5059msgid "deepen history of shallow clone"
07432cef 5060msgstr "深化浅克隆的历史"
ef317cd5 5061
cfff71a9 5062#: builtin/fetch.c:101
a77c07d9
JX
5063msgid "convert to a complete repository"
5064msgstr "转换为一个完整的版本库"
5065
cfff71a9 5066#: builtin/fetch.c:103 builtin/log.c:1197
ef317cd5 5067msgid "dir"
07432cef 5068msgstr "目录"
ef317cd5 5069
cfff71a9 5070#: builtin/fetch.c:104
ef317cd5 5071msgid "prepend this to submodule path output"
07432cef 5072msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5073
cfff71a9 5074#: builtin/fetch.c:107
ef317cd5 5075msgid "default mode for recursion"
07432cef 5076msgstr "递归的默认模式"
ef317cd5 5077
cfff71a9
JX
5078#: builtin/fetch.c:109
5079msgid "accept refs that update .git/shallow"
5080msgstr "接受更新 .git/shallow 的引用"
5081
5082#: builtin/fetch.c:347
c04f5ac3
JX
5083msgid "Couldn't find remote ref HEAD"
5084msgstr "无法发现远程 HEAD 引用"
5085
cfff71a9 5086#: builtin/fetch.c:411
c04f5ac3
JX
5087#, c-format
5088msgid "object %s not found"
5089msgstr "对象 %s 未发现"
5090
cfff71a9 5091#: builtin/fetch.c:416
c04f5ac3
JX
5092msgid "[up to date]"
5093msgstr "[最新]"
5094
cfff71a9 5095#: builtin/fetch.c:430
c04f5ac3
JX
5096#, c-format
5097msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5098msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5099
cfff71a9 5100#: builtin/fetch.c:431 builtin/fetch.c:517
c04f5ac3
JX
5101msgid "[rejected]"
5102msgstr "[已拒绝]"
5103
cfff71a9 5104#: builtin/fetch.c:442
c04f5ac3
JX
5105msgid "[tag update]"
5106msgstr "[tag更新]"
5107
90e6ef53 5108# 译者:注意保持前导空格
cfff71a9 5109#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
c04f5ac3
JX
5110msgid " (unable to update local ref)"
5111msgstr " (不能更新本地引用)"
5112
cfff71a9 5113#: builtin/fetch.c:462
c04f5ac3
JX
5114msgid "[new tag]"
5115msgstr "[新tag]"
5116
cfff71a9 5117#: builtin/fetch.c:465
c04f5ac3
JX
5118msgid "[new branch]"
5119msgstr "[新分支]"
5120
cfff71a9 5121#: builtin/fetch.c:468
170e9899
JX
5122msgid "[new ref]"
5123msgstr "[新引用]"
5124
cfff71a9 5125#: builtin/fetch.c:513
c04f5ac3
JX
5126msgid "unable to update local ref"
5127msgstr "不能更新本地引用"
5128
cfff71a9 5129#: builtin/fetch.c:513
c04f5ac3
JX
5130msgid "forced update"
5131msgstr "强制更新"
5132
cfff71a9 5133#: builtin/fetch.c:519
c04f5ac3 5134msgid "(non-fast-forward)"
90e6ef53 5135msgstr "(非快进式)"
c04f5ac3 5136
cfff71a9 5137#: builtin/fetch.c:552 builtin/fetch.c:785
c04f5ac3
JX
5138#, c-format
5139msgid "cannot open %s: %s\n"
5140msgstr "无法打开 %s:%s\n"
5141
cfff71a9 5142#: builtin/fetch.c:561
c04f5ac3
JX
5143#, c-format
5144msgid "%s did not send all necessary objects\n"
5145msgstr "%s 未发送所有必须的对象\n"
5146
cfff71a9
JX
5147#: builtin/fetch.c:579
5148#, c-format
5149msgid "reject %s because shallow roots are not allowed to be updated"
5150msgstr "拒绝 %s 因为浅克隆不允许被更新"
5151
5152#: builtin/fetch.c:667 builtin/fetch.c:750
c04f5ac3
JX
5153#, c-format
5154msgid "From %.*s\n"
5155msgstr "来自 %.*s\n"
5156
cfff71a9 5157#: builtin/fetch.c:678
c04f5ac3
JX
5158#, c-format
5159msgid ""
5160"some local refs could not be updated; try running\n"
5161" 'git remote prune %s' to remove any old, conflicting branches"
5162msgstr ""
5163"一些本地引用不能被更新;尝试运行\n"
5164" 'git remote prune %s' 来删除旧的、有冲突的分支"
5165
90e6ef53 5166# 译者:注意保持前导空格
cfff71a9 5167#: builtin/fetch.c:730
81809b99 5168#, c-format
8ada9598 5169msgid " (%s will become dangling)"
07432cef 5170msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5171
90e6ef53 5172# 译者:注意保持前导空格
cfff71a9 5173#: builtin/fetch.c:731
81809b99 5174#, c-format
8ada9598 5175msgid " (%s has become dangling)"
07432cef 5176msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5177
cfff71a9 5178#: builtin/fetch.c:755
c04f5ac3
JX
5179msgid "[deleted]"
5180msgstr "[已删除]"
5181
cfff71a9 5182#: builtin/fetch.c:756 builtin/remote.c:1050
c04f5ac3
JX
5183msgid "(none)"
5184msgstr "(无)"
5185
cfff71a9 5186#: builtin/fetch.c:775
c04f5ac3
JX
5187#, c-format
5188msgid "Refusing to fetch into current branch %s of non-bare repository"
5189msgstr "拒绝获取到非裸版本库的当前分支 %s"
5190
cfff71a9 5191#: builtin/fetch.c:794
c04f5ac3
JX
5192#, c-format
5193msgid "Option \"%s\" value \"%s\" is not valid for %s"
5194msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5195
cfff71a9 5196#: builtin/fetch.c:797
c04f5ac3
JX
5197#, c-format
5198msgid "Option \"%s\" is ignored for %s\n"
81809b99 5199msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 5200
cfff71a9 5201#: builtin/fetch.c:853
90314792
JX
5202#, c-format
5203msgid "Don't know how to fetch from %s"
5204msgstr "不知道如何从 %s 获取"
5205
cfff71a9 5206#: builtin/fetch.c:1015
c04f5ac3
JX
5207#, c-format
5208msgid "Fetching %s\n"
d4a8e00b 5209msgstr "正在获取 %s\n"
c04f5ac3 5210
cfff71a9 5211#: builtin/fetch.c:1017 builtin/remote.c:90
c04f5ac3
JX
5212#, c-format
5213msgid "Could not fetch %s"
5214msgstr "不能获取 %s"
5215
cfff71a9 5216#: builtin/fetch.c:1036
c04f5ac3
JX
5217msgid ""
5218"No remote repository specified. Please, specify either a URL or a\n"
5219"remote name from which new revisions should be fetched."
90e6ef53 5220msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 5221
cfff71a9 5222#: builtin/fetch.c:1059
c04f5ac3 5223msgid "You need to specify a tag name."
90e6ef53 5224msgstr "您需要指定一个 tag 名称。"
c04f5ac3 5225
cfff71a9 5226#: builtin/fetch.c:1107
a77c07d9
JX
5227msgid "--depth and --unshallow cannot be used together"
5228msgstr "--depth 和 --unshallow 不能同时使用"
5229
cfff71a9 5230#: builtin/fetch.c:1109
a77c07d9
JX
5231msgid "--unshallow on a complete repository does not make sense"
5232msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5233
cfff71a9 5234#: builtin/fetch.c:1132
c04f5ac3
JX
5235msgid "fetch --all does not take a repository argument"
5236msgstr "fetch --all 不能带一个版本库参数"
5237
cfff71a9 5238#: builtin/fetch.c:1134
c04f5ac3 5239msgid "fetch --all does not make sense with refspecs"
90314792 5240msgstr "fetch --all 带引用规则没有任何意义"
c04f5ac3 5241
cfff71a9 5242#: builtin/fetch.c:1145
c04f5ac3
JX
5243#, c-format
5244msgid "No such remote or remote group: %s"
5245msgstr "没有这样的远程或远程组:%s"
5246
cfff71a9 5247#: builtin/fetch.c:1153
c04f5ac3 5248msgid "Fetching a group and specifying refspecs does not make sense"
90314792 5249msgstr "获取组并指定引用规则没有意义"
c04f5ac3 5250
ef317cd5
JX
5251#: builtin/fmt-merge-msg.c:13
5252msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5253msgstr ""
07432cef 5254"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 5255
90314792 5256#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
cfff71a9
JX
5257#: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178
5258#: builtin/tag.c:446 parse-options.h:135 parse-options.h:242
ef317cd5 5259msgid "n"
07432cef 5260msgstr "n"
c04f5ac3 5261
4dcdc3d8 5262#: builtin/fmt-merge-msg.c:664
ef317cd5 5263msgid "populate log with at most <n> entries from shortlog"
07432cef 5264msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5265
4dcdc3d8 5266#: builtin/fmt-merge-msg.c:667
ef317cd5 5267msgid "alias for --log (deprecated)"
07432cef 5268msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5269
4dcdc3d8 5270#: builtin/fmt-merge-msg.c:670
ef317cd5 5271msgid "text"
07432cef 5272msgstr "文本"
ef317cd5 5273
4dcdc3d8 5274#: builtin/fmt-merge-msg.c:671
ef317cd5 5275msgid "use <text> as start of message"
07432cef 5276msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5277
4dcdc3d8 5278#: builtin/fmt-merge-msg.c:672
ef317cd5 5279msgid "file to read from"
07432cef 5280msgstr "从文件中读取"
ef317cd5 5281
cfff71a9 5282#: builtin/for-each-ref.c:1063
ef317cd5 5283msgid "git for-each-ref [options] [<pattern>]"
07432cef 5284msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5 5285
cfff71a9 5286#: builtin/for-each-ref.c:1078
ef317cd5 5287msgid "quote placeholders suitably for shells"
07432cef 5288msgstr "引用占位符适用于 shells"
ef317cd5 5289
cfff71a9 5290#: builtin/for-each-ref.c:1080
ef317cd5 5291msgid "quote placeholders suitably for perl"
07432cef 5292msgstr "引用占位符适用于 perl"
ef317cd5 5293
cfff71a9 5294#: builtin/for-each-ref.c:1082
ef317cd5 5295msgid "quote placeholders suitably for python"
07432cef 5296msgstr "引用占位符适用于 python"
ef317cd5 5297
cfff71a9 5298#: builtin/for-each-ref.c:1084
ef317cd5 5299msgid "quote placeholders suitably for tcl"
07432cef 5300msgstr "引用占位符适用于 tcl"
ef317cd5 5301
cfff71a9 5302#: builtin/for-each-ref.c:1087
ef317cd5 5303msgid "show only <n> matched refs"
07432cef 5304msgstr "只显示 <n> 个匹配的引用"
ef317cd5 5305
cfff71a9 5306#: builtin/for-each-ref.c:1088 builtin/replace.c:177
ef317cd5 5307msgid "format"
07432cef 5308msgstr "格式"
ef317cd5 5309
cfff71a9 5310#: builtin/for-each-ref.c:1088
ef317cd5 5311msgid "format to use for the output"
07432cef 5312msgstr "输出格式"
ef317cd5 5313
cfff71a9 5314#: builtin/for-each-ref.c:1089
ef317cd5 5315msgid "key"
07432cef 5316msgstr "key"
ef317cd5 5317
cfff71a9 5318#: builtin/for-each-ref.c:1090
ef317cd5 5319msgid "field name to sort on"
07432cef 5320msgstr "排序的字段名"
ef317cd5 5321
90314792 5322#: builtin/fsck.c:607
ef317cd5 5323msgid "git fsck [options] [<object>...]"
07432cef 5324msgstr "git fsck [选项] [<对象>...]"
ef317cd5 5325
90314792 5326#: builtin/fsck.c:613
ef317cd5 5327msgid "show unreachable objects"
07432cef 5328msgstr "显示不可达的对象"
ef317cd5 5329
90314792 5330#: builtin/fsck.c:614
ef317cd5 5331msgid "show dangling objects"
07432cef 5332msgstr "显示摇摆的对象"
ef317cd5 5333
90314792 5334#: builtin/fsck.c:615
ef317cd5 5335msgid "report tags"
07432cef 5336msgstr "报告 tags"
ef317cd5 5337
90314792 5338#: builtin/fsck.c:616
ef317cd5 5339msgid "report root nodes"
07432cef 5340msgstr "报告根节点"
ef317cd5 5341
90314792 5342#: builtin/fsck.c:617
ef317cd5 5343msgid "make index objects head nodes"
07432cef 5344msgstr "将索引亦作为检查的头节点"
ef317cd5 5345
90314792 5346#: builtin/fsck.c:618
ef317cd5 5347msgid "make reflogs head nodes (default)"
07432cef 5348msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 5349
90314792 5350#: builtin/fsck.c:619
ef317cd5 5351msgid "also consider packs and alternate objects"
07432cef 5352msgstr "也考虑包和备用对象"
ef317cd5 5353
90314792 5354#: builtin/fsck.c:620
ef317cd5 5355msgid "enable more strict checking"
07432cef 5356msgstr "启用更严格的检查"
ef317cd5 5357
90314792 5358#: builtin/fsck.c:622
ef317cd5 5359msgid "write dangling objects in .git/lost-found"
07432cef 5360msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 5361
cfff71a9 5362#: builtin/fsck.c:623 builtin/prune.c:144
ef317cd5 5363msgid "show progress"
07432cef 5364msgstr "显示进度"
ef317cd5 5365
cfff71a9 5366#: builtin/gc.c:24
ef317cd5 5367msgid "git gc [options]"
07432cef 5368msgstr "git gc [选项]"
ef317cd5 5369
cfff71a9 5370#: builtin/gc.c:80
c04f5ac3
JX
5371#, c-format
5372msgid "Invalid %s: '%s'"
5373msgstr "无效的 %s:'%s'"
5374
cfff71a9 5375#: builtin/gc.c:107
c04f5ac3
JX
5376#, c-format
5377msgid "insanely long object directory %.*s"
5378msgstr "不正常的长对象目录 %.*s"
5379
cfff71a9 5380#: builtin/gc.c:262
ef317cd5 5381msgid "prune unreferenced objects"
07432cef 5382msgstr "清除未引用的对象"
ef317cd5 5383
cfff71a9 5384#: builtin/gc.c:264
ef317cd5 5385msgid "be more thorough (increased runtime)"
07432cef 5386msgstr "更彻底(增加运行时间)"
ef317cd5 5387
cfff71a9 5388#: builtin/gc.c:265
ef317cd5 5389msgid "enable auto-gc mode"
07432cef 5390msgstr "启用自动垃圾回收模式"
ef317cd5 5391
cfff71a9 5392#: builtin/gc.c:266
90314792
JX
5393msgid "force running gc even if there may be another gc running"
5394msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5395
cfff71a9 5396#: builtin/gc.c:306
c04f5ac3
JX
5397#, c-format
5398msgid ""
5399"Auto packing the repository for optimum performance. You may also\n"
5400"run \"git gc\" manually. See \"git help gc\" for more information.\n"
5401msgstr ""
90e6ef53
JX
5402"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
5403"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 5404
90314792 5405#. be quiet on --auto
cfff71a9 5406#: builtin/gc.c:316
90314792
JX
5407#, c-format
5408msgid ""
5409"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5410msgstr ""
5411"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5412
cfff71a9 5413#: builtin/gc.c:341
c04f5ac3
JX
5414msgid ""
5415"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5416msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5417
90314792 5418#: builtin/grep.c:23
ef317cd5 5419msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 5420msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 5421
90314792 5422#: builtin/grep.c:218
c04f5ac3
JX
5423#, c-format
5424msgid "grep: failed to create thread: %s"
90e6ef53 5425msgstr "grep:无法创建线程:%s"
c04f5ac3 5426
90314792 5427#: builtin/grep.c:365
c04f5ac3
JX
5428#, c-format
5429msgid "Failed to chdir: %s"
5430msgstr "无法切换目录:%s"
5431
90314792 5432#: builtin/grep.c:443 builtin/grep.c:478
c04f5ac3
JX
5433#, c-format
5434msgid "unable to read tree (%s)"
90e6ef53 5435msgstr "无法读取树(%s)"
c04f5ac3 5436
90314792 5437#: builtin/grep.c:493
c04f5ac3
JX
5438#, c-format
5439msgid "unable to grep from object of type %s"
5440msgstr "无法抓取来自于 %s 类型的对象"
5441
90314792 5442#: builtin/grep.c:551
c04f5ac3
JX
5443#, c-format
5444msgid "switch `%c' expects a numerical value"
5445msgstr "开关 `%c' 期望一个数字值"
5446
90314792 5447#: builtin/grep.c:568
c04f5ac3
JX
5448#, c-format
5449msgid "cannot open '%s'"
5450msgstr "不能打开 '%s'"
5451
2e8451e8 5452#: builtin/grep.c:642
ef317cd5 5453msgid "search in index instead of in the work tree"
07432cef 5454msgstr "在索引区搜索而不是在工作区"
ef317cd5 5455
2e8451e8 5456#: builtin/grep.c:644
ef317cd5 5457msgid "find in contents not managed by git"
07432cef 5458msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5459
5460# 译者:中文字符串拼接,可删除前导空格
2e8451e8 5461#: builtin/grep.c:646
ef317cd5 5462msgid "search in both tracked and untracked files"
07432cef 5463msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5464
2e8451e8 5465#: builtin/grep.c:648
ef317cd5 5466msgid "search also in ignored files"
07432cef 5467msgstr "也在忽略的文件中搜索"
ef317cd5 5468
2e8451e8 5469#: builtin/grep.c:651
ef317cd5 5470msgid "show non-matching lines"
07432cef 5471msgstr "显示未匹配的行"
ef317cd5 5472
2e8451e8 5473#: builtin/grep.c:653
ef317cd5 5474msgid "case insensitive matching"
07432cef 5475msgstr "不区分大小写匹配"
ef317cd5 5476
2e8451e8 5477#: builtin/grep.c:655
ef317cd5 5478msgid "match patterns only at word boundaries"
07432cef 5479msgstr "只在单词边界匹配模式"
ef317cd5 5480
2e8451e8 5481#: builtin/grep.c:657
ef317cd5 5482msgid "process binary files as text"
07432cef 5483msgstr "把二进制文件当做文本处理"
ef317cd5 5484
2e8451e8 5485#: builtin/grep.c:659
ef317cd5 5486msgid "don't match patterns in binary files"
07432cef 5487msgstr "不在二进制文件中匹配模式"
ef317cd5 5488
2e8451e8 5489#: builtin/grep.c:662
90314792
JX
5490msgid "process binary files with textconv filters"
5491msgstr "用 textconv 过滤器处理二进制文件"
5492
5493#: builtin/grep.c:664
ef317cd5 5494msgid "descend at most <depth> levels"
07432cef 5495msgstr "最多以指定的深度向下寻找"
ef317cd5 5496
90314792 5497#: builtin/grep.c:668
ef317cd5 5498msgid "use extended POSIX regular expressions"
07432cef 5499msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5500
90314792 5501#: builtin/grep.c:671
ef317cd5 5502msgid "use basic POSIX regular expressions (default)"
07432cef 5503msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5504
90314792 5505#: builtin/grep.c:674
ef317cd5 5506msgid "interpret patterns as fixed strings"
07432cef 5507msgstr "把模式解析为固定的字符串"
ef317cd5 5508
90314792 5509#: builtin/grep.c:677
ef317cd5 5510msgid "use Perl-compatible regular expressions"
07432cef 5511msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5512
90314792 5513#: builtin/grep.c:680
ef317cd5 5514msgid "show line numbers"
07432cef 5515msgstr "显示行号"
ef317cd5 5516
90314792 5517#: builtin/grep.c:681
ef317cd5 5518msgid "don't show filenames"
07432cef 5519msgstr "不显示文件名"
ef317cd5 5520
90314792 5521#: builtin/grep.c:682
ef317cd5 5522msgid "show filenames"
07432cef 5523msgstr "显示文件名"
ef317cd5 5524
90314792 5525#: builtin/grep.c:684
ef317cd5 5526msgid "show filenames relative to top directory"
07432cef 5527msgstr "显示相对于顶级目录的文件名"
ef317cd5 5528
90314792 5529#: builtin/grep.c:686
ef317cd5 5530msgid "show only filenames instead of matching lines"
07432cef 5531msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5532
90314792 5533#: builtin/grep.c:688
ef317cd5 5534msgid "synonym for --files-with-matches"
07432cef 5535msgstr "和 --files-with-matches 同义"
ef317cd5 5536
90314792 5537#: builtin/grep.c:691
ef317cd5 5538msgid "show only the names of files without match"
07432cef 5539msgstr "只显示未匹配的文件名"
ef317cd5 5540
90314792 5541#: builtin/grep.c:693
ef317cd5 5542msgid "print NUL after filenames"
07432cef 5543msgstr "在文件名后输出 NUL 字符"
ef317cd5 5544
90314792 5545#: builtin/grep.c:695
ef317cd5 5546msgid "show the number of matches instead of matching lines"
07432cef 5547msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5548
90314792 5549#: builtin/grep.c:696
ef317cd5 5550msgid "highlight matches"
07432cef 5551msgstr "高亮显示匹配项"
ef317cd5 5552
90314792 5553#: builtin/grep.c:698
ef317cd5 5554msgid "print empty line between matches from different files"
07432cef 5555msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5556
90314792 5557#: builtin/grep.c:700
ef317cd5 5558msgid "show filename only once above matches from same file"
07432cef 5559msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5560
90314792 5561#: builtin/grep.c:703
ef317cd5 5562msgid "show <n> context lines before and after matches"
07432cef 5563msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5564
90314792 5565#: builtin/grep.c:706
ef317cd5 5566msgid "show <n> context lines before matches"
07432cef 5567msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5568
90314792 5569#: builtin/grep.c:708
ef317cd5 5570msgid "show <n> context lines after matches"
07432cef 5571msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5572
90314792 5573#: builtin/grep.c:709
ef317cd5 5574msgid "shortcut for -C NUM"
07432cef 5575msgstr "快捷键 -C 数字"
ef317cd5 5576
90314792 5577#: builtin/grep.c:712
ef317cd5 5578msgid "show a line with the function name before matches"
07432cef 5579msgstr "在匹配的前面显示一行函数名"
ef317cd5 5580
90314792 5581#: builtin/grep.c:714
ef317cd5 5582msgid "show the surrounding function"
07432cef 5583msgstr "显示所在函数的前后内容"
ef317cd5 5584
90314792 5585#: builtin/grep.c:717
ef317cd5 5586msgid "read patterns from file"
07432cef 5587msgstr "从文件读取模式"
ef317cd5 5588
90314792 5589#: builtin/grep.c:719
ef317cd5 5590msgid "match <pattern>"
07432cef 5591msgstr "匹配 <模式>"
ef317cd5 5592
90314792 5593#: builtin/grep.c:721
ef317cd5 5594msgid "combine patterns specified with -e"
07432cef 5595msgstr "组合用 -e 参数设定的模式"
ef317cd5 5596
90314792 5597#: builtin/grep.c:733
ef317cd5 5598msgid "indicate hit with exit status without output"
07432cef 5599msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5600
90314792 5601#: builtin/grep.c:735
ef317cd5 5602msgid "show only matches from files that match all patterns"
07432cef 5603msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5604
90314792 5605#: builtin/grep.c:737
07432cef
WS
5606msgid "show parse tree for grep expression"
5607msgstr "显示 grep 表达式的解析树"
5608
90314792 5609#: builtin/grep.c:741
ef317cd5 5610msgid "pager"
07432cef 5611msgstr "分页"
ef317cd5 5612
90314792 5613#: builtin/grep.c:741
ef317cd5 5614msgid "show matching files in the pager"
07432cef 5615msgstr "分页显示匹配的文件"
ef317cd5 5616
90314792 5617#: builtin/grep.c:744
ef317cd5 5618msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5619msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5620
90314792 5621#: builtin/grep.c:745 builtin/show-ref.c:187
ef317cd5 5622msgid "show usage"
07432cef 5623msgstr "显示用法"
ef317cd5 5624
90314792 5625#: builtin/grep.c:812
c04f5ac3
JX
5626msgid "no pattern given."
5627msgstr "未提供模式匹配。"
5628
90314792 5629#: builtin/grep.c:870
c04f5ac3
JX
5630msgid "--open-files-in-pager only works on the worktree"
5631msgstr "--open-files-in-pager 仅用于工作区"
5632
90314792 5633#: builtin/grep.c:893
c04f5ac3 5634msgid "--cached or --untracked cannot be used with --no-index."
649900bc 5635msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 5636
90314792 5637#: builtin/grep.c:898
c04f5ac3 5638msgid "--no-index or --untracked cannot be used with revs."
649900bc 5639msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 5640
90314792 5641#: builtin/grep.c:901
c04f5ac3 5642msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 5643msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 5644
90314792 5645#: builtin/grep.c:909
c04f5ac3
JX
5646msgid "both --cached and trees are given."
5647msgstr "同时给出了 --cached 和树对象。"
5648
ef317cd5
JX
5649#: builtin/hash-object.c:60
5650msgid ""
5651"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5652"<file>..."
5653msgstr ""
07432cef
WS
5654"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5655"<文件>..."
ef317cd5
JX
5656
5657#: builtin/hash-object.c:61
5658msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 5659msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5
JX
5660
5661#: builtin/hash-object.c:72
5662msgid "type"
07432cef 5663msgstr "类型"
ef317cd5
JX
5664
5665#: builtin/hash-object.c:72
ef317cd5 5666msgid "object type"
07432cef 5667msgstr "对象类型"
ef317cd5
JX
5668
5669#: builtin/hash-object.c:73
5670msgid "write the object into the object database"
07432cef 5671msgstr "将对象写入对象数据库"
ef317cd5
JX
5672
5673#: builtin/hash-object.c:74
5674msgid "read the object from stdin"
07432cef 5675msgstr "从标准输入读取对象"
ef317cd5
JX
5676
5677#: builtin/hash-object.c:76
5678msgid "store file as is without filters"
07432cef 5679msgstr "原样存储文件不使用过滤器"
ef317cd5
JX
5680
5681#: builtin/hash-object.c:77
5682msgid "process file as it were from this path"
07432cef 5683msgstr "处理文件并假设其来自于此路径"
ef317cd5 5684
2e8451e8 5685#: builtin/help.c:41
ef317cd5 5686msgid "print all available commands"
07432cef 5687msgstr "打印所有可用的命令"
ef317cd5 5688
2e8451e8 5689#: builtin/help.c:42
4dcdc3d8
JX
5690msgid "print list of useful guides"
5691msgstr "显示有用的指南列表"
5692
2e8451e8 5693#: builtin/help.c:43
ef317cd5 5694msgid "show man page"
07432cef 5695msgstr "显示 man 手册"
ef317cd5 5696
2e8451e8 5697#: builtin/help.c:44
ef317cd5 5698msgid "show manual in web browser"
07432cef 5699msgstr "在 web 浏览器中显示手册"
ef317cd5 5700
2e8451e8 5701#: builtin/help.c:46
ef317cd5 5702msgid "show info page"
07432cef 5703msgstr "显示 info 手册"
ef317cd5 5704
2e8451e8 5705#: builtin/help.c:52
4dcdc3d8
JX
5706msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5707msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
ef317cd5 5708
2e8451e8 5709#: builtin/help.c:64
81809b99 5710#, c-format
8ada9598 5711msgid "unrecognized help format '%s'"
81809b99 5712msgstr "未能识别的帮助格式 '%s'"
8ada9598 5713
2e8451e8 5714#: builtin/help.c:92
8ada9598 5715msgid "Failed to start emacsclient."
81809b99 5716msgstr "无法启动 emacsclient。"
8ada9598 5717
2e8451e8 5718#: builtin/help.c:105
8ada9598 5719msgid "Failed to parse emacsclient version."
81809b99 5720msgstr "无法解析 emacsclient 版本。"
8ada9598 5721
2e8451e8 5722#: builtin/help.c:113
8ada9598
JX
5723#, c-format
5724msgid "emacsclient version '%d' too old (< 22)."
07432cef 5725msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 5726
2e8451e8 5727#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
81809b99 5728#, c-format
8ada9598 5729msgid "failed to exec '%s': %s"
81809b99 5730msgstr "无法执行 '%s':%s"
8ada9598 5731
2e8451e8 5732#: builtin/help.c:216
8ada9598
JX
5733#, c-format
5734msgid ""
5735"'%s': path for unsupported man viewer.\n"
5736"Please consider using 'man.<tool>.cmd' instead."
5737msgstr ""
81809b99
JX
5738"'%s':不支持的 man 手册查看器的路径。\n"
5739"请使用 'man.<tool>.cmd'。"
8ada9598 5740
2e8451e8 5741#: builtin/help.c:228
8ada9598
JX
5742#, c-format
5743msgid ""
5744"'%s': cmd for supported man viewer.\n"
5745"Please consider using 'man.<tool>.path' instead."
5746msgstr ""
81809b99
JX
5747"'%s': 支持的 man 手册查看器命令。\n"
5748"请使用 'man.<tool>.path'。"
8ada9598 5749
cfff71a9 5750#: builtin/help.c:353
8ada9598
JX
5751#, c-format
5752msgid "'%s': unknown man viewer."
81809b99 5753msgstr "'%s':未知的 man 查看器。"
8ada9598 5754
cfff71a9 5755#: builtin/help.c:370
8ada9598 5756msgid "no man viewer handled the request"
81809b99 5757msgstr "没有 man 查看器处理此请求"
8ada9598 5758
cfff71a9 5759#: builtin/help.c:378
8ada9598 5760msgid "no info viewer handled the request"
81809b99 5761msgstr "没有 info 查看器处理此请求"
8ada9598 5762
cfff71a9 5763#: builtin/help.c:424
4dcdc3d8
JX
5764msgid "Defining attributes per path"
5765msgstr "定义路径的属性"
5766
cfff71a9 5767#: builtin/help.c:425
4dcdc3d8
JX
5768msgid "A Git glossary"
5769msgstr "Git 词汇表"
5770
cfff71a9 5771#: builtin/help.c:426
4dcdc3d8
JX
5772msgid "Specifies intentionally untracked files to ignore"
5773msgstr "忽略指定的未跟踪文件"
5774
cfff71a9 5775#: builtin/help.c:427
4dcdc3d8
JX
5776msgid "Defining submodule properties"
5777msgstr "定义子模组属性"
5778
cfff71a9 5779#: builtin/help.c:428
4dcdc3d8
JX
5780msgid "Specifying revisions and ranges for Git"
5781msgstr "指定 Git 的版本和版本范围"
5782
cfff71a9 5783#: builtin/help.c:429
4dcdc3d8
JX
5784msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5785msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5786
cfff71a9 5787#: builtin/help.c:430
4dcdc3d8
JX
5788msgid "An overview of recommended workflows with Git"
5789msgstr "Git 推荐的工作流概览"
5790
cfff71a9 5791#: builtin/help.c:442
4dcdc3d8
JX
5792msgid "The common Git guides are:\n"
5793msgstr "最常用的 Git 向导有:\n"
5794
cfff71a9 5795#: builtin/help.c:463 builtin/help.c:480
8ada9598
JX
5796#, c-format
5797msgid "usage: %s%s"
81809b99 5798msgstr "用法:%s%s"
8ada9598 5799
cfff71a9 5800#: builtin/help.c:496
8ada9598
JX
5801#, c-format
5802msgid "`git %s' is aliased to `%s'"
81809b99 5803msgstr "`git %s' 是 `%s' 的别名"
8ada9598 5804
2e8451e8 5805#: builtin/index-pack.c:184
8ada9598
JX
5806#, c-format
5807msgid "object type mismatch at %s"
81809b99 5808msgstr "%s 的对象类型不匹配"
8ada9598 5809
2e8451e8 5810#: builtin/index-pack.c:204
8ada9598 5811msgid "object of unexpected type"
81809b99 5812msgstr "意外的类型的对象"
8ada9598 5813
2e8451e8 5814#: builtin/index-pack.c:244
81809b99 5815#, c-format
8ada9598
JX
5816msgid "cannot fill %d byte"
5817msgid_plural "cannot fill %d bytes"
81809b99 5818msgstr[0] "无法填充 %d 字节"
5ae481e0 5819msgstr[1] "无法填充 %d 字节"
8ada9598 5820
2e8451e8 5821#: builtin/index-pack.c:254
8ada9598 5822msgid "early EOF"
81809b99 5823msgstr "过早的文件结束符(EOF)"
8ada9598 5824
2e8451e8 5825#: builtin/index-pack.c:255
8ada9598 5826msgid "read error on input"
81809b99 5827msgstr "输入上的读错误"
8ada9598 5828
2e8451e8 5829#: builtin/index-pack.c:267
8ada9598 5830msgid "used more bytes than were available"
81809b99 5831msgstr "用掉了超过可用的字节"
8ada9598 5832
2e8451e8 5833#: builtin/index-pack.c:274
8ada9598 5834msgid "pack too large for current definition of off_t"
81809b99 5835msgstr "包太大超过了当前 off_t 的定义"
8ada9598 5836
2e8451e8 5837#: builtin/index-pack.c:290
81809b99 5838#, c-format
8ada9598 5839msgid "unable to create '%s'"
81809b99 5840msgstr "不能创建 '%s'"
8ada9598 5841
2e8451e8 5842#: builtin/index-pack.c:295
81809b99 5843#, c-format
8ada9598 5844msgid "cannot open packfile '%s'"
81809b99 5845msgstr "无法打开包文件 '%s'"
8ada9598 5846
2e8451e8 5847#: builtin/index-pack.c:309
8ada9598 5848msgid "pack signature mismatch"
81809b99 5849msgstr "包签名不匹配"
8ada9598 5850
2e8451e8 5851#: builtin/index-pack.c:311
ef317cd5
JX
5852#, c-format
5853msgid "pack version %<PRIu32> unsupported"
07432cef 5854msgstr "不支持包版本 %<PRIu32>"
ef317cd5 5855
2e8451e8 5856#: builtin/index-pack.c:329
8ada9598
JX
5857#, c-format
5858msgid "pack has bad object at offset %lu: %s"
81809b99 5859msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 5860
2e8451e8 5861#: builtin/index-pack.c:451
8ada9598
JX
5862#, c-format
5863msgid "inflate returned %d"
81809b99 5864msgstr "解压缩返回 %d"
8ada9598 5865
2e8451e8 5866#: builtin/index-pack.c:500
8ada9598 5867msgid "offset value overflow for delta base object"
81809b99 5868msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 5869
2e8451e8 5870#: builtin/index-pack.c:508
8ada9598 5871msgid "delta base offset is out of bound"
81809b99 5872msgstr "delta 基准偏移越界"
8ada9598 5873
2e8451e8 5874#: builtin/index-pack.c:516
81809b99 5875#, c-format
8ada9598 5876msgid "unknown object type %d"
81809b99 5877msgstr "未知对象类型 %d"
8ada9598 5878
2e8451e8 5879#: builtin/index-pack.c:547
8ada9598 5880msgid "cannot pread pack file"
81809b99 5881msgstr "无法读取包文件"
8ada9598 5882
2e8451e8 5883#: builtin/index-pack.c:549
8ada9598
JX
5884#, c-format
5885msgid "premature end of pack file, %lu byte missing"
5886msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 5887msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 5888msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 5889
2e8451e8 5890#: builtin/index-pack.c:575
8ada9598 5891msgid "serious inflate inconsistency"
81809b99 5892msgstr "解压缩严重的不一致"
8ada9598 5893
2e8451e8
JX
5894#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5895#: builtin/index-pack.c:729 builtin/index-pack.c:738
8ada9598
JX
5896#, c-format
5897msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 5898msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 5899
90314792
JX
5900#: builtin/index-pack.c:669 builtin/pack-objects.c:171
5901#: builtin/pack-objects.c:263
6792b93b
JX
5902#, c-format
5903msgid "unable to read %s"
5904msgstr "不能读 %s"
5905
2e8451e8 5906#: builtin/index-pack.c:735
6792b93b
JX
5907#, c-format
5908msgid "cannot read existing object %s"
5909msgstr "不能读取现存对象 %s"
5910
2e8451e8 5911#: builtin/index-pack.c:749
81809b99 5912#, c-format
8ada9598 5913msgid "invalid blob object %s"
07432cef 5914msgstr "无效的数据(blob)对象 %s"
8ada9598 5915
2e8451e8 5916#: builtin/index-pack.c:763
81809b99 5917#, c-format
8ada9598 5918msgid "invalid %s"
81809b99 5919msgstr "无效的 %s"
8ada9598 5920
2e8451e8 5921#: builtin/index-pack.c:766
8ada9598 5922msgid "Error in object"
81809b99 5923msgstr "对象中出错"
8ada9598 5924
2e8451e8 5925#: builtin/index-pack.c:768
8ada9598
JX
5926#, c-format
5927msgid "Not all child objects of %s are reachable"
81809b99 5928msgstr "%s 的所有子对象并非都可达"
8ada9598 5929
90314792 5930#: builtin/index-pack.c:839 builtin/index-pack.c:869
8ada9598 5931msgid "failed to apply delta"
81809b99 5932msgstr "无法应用 delta"
8ada9598 5933
90314792 5934#: builtin/index-pack.c:1010
8ada9598 5935msgid "Receiving objects"
81809b99 5936msgstr "接收对象中"
8ada9598 5937
90314792 5938#: builtin/index-pack.c:1010
8ada9598 5939msgid "Indexing objects"
81809b99 5940msgstr "索引对象中"
8ada9598 5941
90314792 5942#: builtin/index-pack.c:1036
8ada9598 5943msgid "pack is corrupted (SHA1 mismatch)"
81809b99 5944msgstr "包冲突(SHA1 不匹配)"
8ada9598 5945
90314792 5946#: builtin/index-pack.c:1041
8ada9598 5947msgid "cannot fstat packfile"
81809b99 5948msgstr "不能枚举包文件状态"
8ada9598 5949
90314792 5950#: builtin/index-pack.c:1044
8ada9598 5951msgid "pack has junk at the end"
81809b99 5952msgstr "包的结尾有垃圾数据"
8ada9598 5953
90314792 5954#: builtin/index-pack.c:1055
6792b93b
JX
5955msgid "confusion beyond insanity in parse_pack_objects()"
5956msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5957
90314792 5958#: builtin/index-pack.c:1078
8ada9598 5959msgid "Resolving deltas"
81809b99 5960msgstr "处理 delta 中"
8ada9598 5961
90314792 5962#: builtin/index-pack.c:1088
07432cef 5963#, c-format
ef317cd5 5964msgid "unable to create thread: %s"
07432cef 5965msgstr "不能创建线程:%s"
ef317cd5 5966
90314792 5967#: builtin/index-pack.c:1130
8ada9598 5968msgid "confusion beyond insanity"
81809b99 5969msgstr "不可理喻"
8ada9598 5970
90314792 5971#: builtin/index-pack.c:1138
ef317cd5
JX
5972#, c-format
5973msgid "completed with %d local objects"
07432cef 5974msgstr "完成 %d 个本地对象"
ef317cd5 5975
90314792 5976#: builtin/index-pack.c:1148
ef317cd5
JX
5977#, c-format
5978msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 5979msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 5980
90314792 5981#: builtin/index-pack.c:1152
8ada9598
JX
5982#, c-format
5983msgid "pack has %d unresolved delta"
5984msgid_plural "pack has %d unresolved deltas"
81809b99 5985msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 5986msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 5987
90314792 5988#: builtin/index-pack.c:1177
81809b99 5989#, c-format
8ada9598 5990msgid "unable to deflate appended object (%d)"
07432cef 5991msgstr "不能压缩附加对象(%d)"
8ada9598 5992
90314792 5993#: builtin/index-pack.c:1256
8ada9598
JX
5994#, c-format
5995msgid "local object %s is corrupt"
81809b99 5996msgstr "本地对象 %s 已损坏"
8ada9598 5997
90314792 5998#: builtin/index-pack.c:1280
8ada9598 5999msgid "error while closing pack file"
81809b99 6000msgstr "关闭包文件时出错"
8ada9598 6001
90314792 6002#: builtin/index-pack.c:1293
81809b99 6003#, c-format
8ada9598 6004msgid "cannot write keep file '%s'"
81809b99 6005msgstr "无法写保留文件 '%s'"
8ada9598 6006
90314792 6007#: builtin/index-pack.c:1301
81809b99 6008#, c-format
8ada9598 6009msgid "cannot close written keep file '%s'"
81809b99 6010msgstr "无法关闭保留文件 '%s'"
8ada9598 6011
90314792 6012#: builtin/index-pack.c:1314
8ada9598 6013msgid "cannot store pack file"
81809b99 6014msgstr "无法存储包文件"
8ada9598 6015
90314792 6016#: builtin/index-pack.c:1325
8ada9598 6017msgid "cannot store index file"
81809b99 6018msgstr "无法存储索引文件"
8ada9598 6019
90314792 6020#: builtin/index-pack.c:1358
07432cef 6021#, c-format
ef317cd5 6022msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6023msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6024
90314792 6025#: builtin/index-pack.c:1364
ef317cd5
JX
6026#, c-format
6027msgid "invalid number of threads specified (%d)"
07432cef 6028msgstr "指定的线程数无效(%d)"
ef317cd5 6029
90314792 6030#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
ef317cd5
JX
6031#, c-format
6032msgid "no threads support, ignoring %s"
07432cef 6033msgstr "没有线程支持,忽略 %s"
ef317cd5 6034
90314792 6035#: builtin/index-pack.c:1426
81809b99 6036#, c-format
8ada9598 6037msgid "Cannot open existing pack file '%s'"
81809b99 6038msgstr "无法打开现存包文件 '%s'"
8ada9598 6039
90314792 6040#: builtin/index-pack.c:1428
81809b99 6041#, c-format
8ada9598 6042msgid "Cannot open existing pack idx file for '%s'"
81809b99 6043msgstr "无法为 %s 打开包索引文件"
8ada9598 6044
90314792 6045#: builtin/index-pack.c:1475
81809b99 6046#, c-format
8ada9598
JX
6047msgid "non delta: %d object"
6048msgid_plural "non delta: %d objects"
81809b99 6049msgstr[0] "非 delta:%d 个对象"
5ae481e0 6050msgstr[1] "非 delta:%d 个对象"
8ada9598 6051
90314792 6052#: builtin/index-pack.c:1482
8ada9598
JX
6053#, c-format
6054msgid "chain length = %d: %lu object"
6055msgid_plural "chain length = %d: %lu objects"
81809b99 6056msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6057msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6058
90314792 6059#: builtin/index-pack.c:1510
8ada9598 6060msgid "Cannot come back to cwd"
81809b99 6061msgstr "无法返回当前工作目录"
8ada9598 6062
90314792
JX
6063#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
6064#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
81809b99 6065#, c-format
8ada9598 6066msgid "bad %s"
81809b99 6067msgstr "错误选项 %s"
8ada9598 6068
90314792 6069#: builtin/index-pack.c:1591
8ada9598 6070msgid "--fix-thin cannot be used without --stdin"
649900bc 6071msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6072
90314792 6073#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
8ada9598
JX
6074#, c-format
6075msgid "packfile name '%s' does not end with '.pack'"
81809b99 6076msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 6077
90314792 6078#: builtin/index-pack.c:1614
8ada9598 6079msgid "--verify with no packfile name given"
81809b99 6080msgstr "--verify 没有提供包名参数"
8ada9598 6081
c04f5ac3
JX
6082#: builtin/init-db.c:35
6083#, c-format
6084msgid "Could not make %s writable by group"
6085msgstr "不能设置 %s 为组可写"
6086
6087#: builtin/init-db.c:62
6088#, c-format
6089msgid "insanely long template name %s"
6090msgstr "太长的模版名 %s"
6091
6092#: builtin/init-db.c:67
6093#, c-format
6094msgid "cannot stat '%s'"
6095msgstr "不能枚举 '%s' 状态"
6096
6097#: builtin/init-db.c:73
6098#, c-format
6099msgid "cannot stat template '%s'"
6100msgstr "不能枚举模版 '%s' 状态"
6101
6102#: builtin/init-db.c:80
6103#, c-format
6104msgid "cannot opendir '%s'"
6105msgstr "不能打开目录 '%s'"
6106
6107#: builtin/init-db.c:97
6108#, c-format
6109msgid "cannot readlink '%s'"
6110msgstr "不能读取链接 '%s'"
6111
6112#: builtin/init-db.c:99
6113#, c-format
6114msgid "insanely long symlink %s"
6115msgstr "太长的符号链接 %s"
6116
6117#: builtin/init-db.c:102
6118#, c-format
6119msgid "cannot symlink '%s' '%s'"
90e6ef53 6120msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
6121
6122#: builtin/init-db.c:106
6123#, c-format
6124msgid "cannot copy '%s' to '%s'"
6125msgstr "不能拷贝 '%s' 至 '%s'"
6126
6127#: builtin/init-db.c:110
6128#, c-format
6129msgid "ignoring template %s"
6130msgstr "忽略模版 %s"
6131
6132#: builtin/init-db.c:133
6133#, c-format
6134msgid "insanely long template path %s"
6135msgstr "太长的模版路径 %s"
6136
6137#: builtin/init-db.c:141
6138#, c-format
6139msgid "templates not found %s"
6140msgstr "模版未找到 %s"
6141
6142#: builtin/init-db.c:154
6143#, c-format
6144msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6145msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
6146
6147#: builtin/init-db.c:192
6148#, c-format
6149msgid "insane git directory %s"
6150msgstr "不正常的 git 目录 %s"
6151
23ff3338 6152#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
6153#, c-format
6154msgid "%s already exists"
6155msgstr "%s 已经存在"
6156
23ff3338 6157#: builtin/init-db.c:355
c04f5ac3
JX
6158#, c-format
6159msgid "unable to handle file type %d"
6160msgstr "不能处理 %d 类型的文件"
6161
23ff3338 6162#: builtin/init-db.c:358
c04f5ac3
JX
6163#, c-format
6164msgid "unable to move %s to %s"
6165msgstr "不能移动 %s 至 %s"
6166
c04f5ac3
JX
6167#.
6168#. * TRANSLATORS: The first '%s' is either "Reinitialized
6169#. * existing" or "Initialized empty", the second " shared" or
6170#. * "", and the last '%s%s' is the verbatim directory name.
6171#.
23ff3338 6172#: builtin/init-db.c:420
c04f5ac3
JX
6173#, c-format
6174msgid "%s%s Git repository in %s%s\n"
6175msgstr "%s%s Git 版本库于 %s%s\n"
6176
23ff3338 6177#: builtin/init-db.c:421
c04f5ac3
JX
6178msgid "Reinitialized existing"
6179msgstr "重新初始化现存的"
6180
23ff3338 6181#: builtin/init-db.c:421
c04f5ac3
JX
6182msgid "Initialized empty"
6183msgstr "初始化空的"
6184
7e238ab7 6185# 译者:中文字符串拼接,可删除前导空格
23ff3338 6186#: builtin/init-db.c:422
c04f5ac3 6187msgid " shared"
90e6ef53 6188msgstr "共享"
c04f5ac3 6189
23ff3338 6190#: builtin/init-db.c:441
c04f5ac3
JX
6191msgid "cannot tell cwd"
6192msgstr "无法获知当前路径"
6193
ef317cd5
JX
6194#: builtin/init-db.c:467
6195msgid ""
a77c07d9
JX
6196"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6197"shared[=<permissions>]] [directory]"
ef317cd5 6198msgstr ""
07432cef
WS
6199"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6200"[目录]"
ef317cd5
JX
6201
6202#: builtin/init-db.c:490
6203msgid "permissions"
07432cef 6204msgstr "权限"
ef317cd5
JX
6205
6206#: builtin/init-db.c:491
6207msgid "specify that the git repository is to be shared amongst several users"
07432cef 6208msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5 6209
cfff71a9 6210#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155
ef317cd5 6211msgid "be quiet"
07432cef 6212msgstr "保持安静"
ef317cd5 6213
23ff3338 6214#: builtin/init-db.c:522 builtin/init-db.c:529
c04f5ac3
JX
6215#, c-format
6216msgid "cannot mkdir %s"
6217msgstr "不能创建目录 %s"
6218
23ff3338 6219#: builtin/init-db.c:533
c04f5ac3
JX
6220#, c-format
6221msgid "cannot chdir to %s"
6222msgstr "不能切换目录到 %s"
6223
23ff3338 6224#: builtin/init-db.c:555
c04f5ac3
JX
6225#, c-format
6226msgid ""
6227"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6228"dir=<directory>)"
6229msgstr ""
73a60cd2
JX
6230"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6231"dir=<directory>)"
c04f5ac3 6232
23ff3338 6233#: builtin/init-db.c:579
c04f5ac3
JX
6234msgid "Cannot access current working directory"
6235msgstr "不能访问当前工作目录"
6236
23ff3338 6237#: builtin/init-db.c:586
c04f5ac3
JX
6238#, c-format
6239msgid "Cannot access work tree '%s'"
6240msgstr "不能访问工作区 '%s'"
6241
2e8451e8 6242#: builtin/log.c:41
4dcdc3d8
JX
6243msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6244msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
ef317cd5 6245
2e8451e8 6246#: builtin/log.c:42
ef317cd5 6247msgid " or: git show [options] <object>..."
07432cef 6248msgstr " 或者:git show [选项] <对象>..."
ef317cd5 6249
90314792 6250#: builtin/log.c:125
ef317cd5 6251msgid "suppress diff output"
07432cef 6252msgstr "不显示差异输出"
ef317cd5 6253
90314792 6254#: builtin/log.c:126
ef317cd5 6255msgid "show source"
07432cef 6256msgstr "显示源"
ef317cd5 6257
90314792 6258#: builtin/log.c:127
07432cef
WS
6259msgid "Use mail map file"
6260msgstr "使用邮件映射文件"
6261
90314792 6262#: builtin/log.c:128
ef317cd5 6263msgid "decorate options"
07432cef 6264msgstr "修饰选项"
ef317cd5 6265
90314792 6266#: builtin/log.c:231
c04f5ac3
JX
6267#, c-format
6268msgid "Final output: %d %s\n"
6269msgstr "最终输出:%d %s\n"
6270
90314792 6271#: builtin/log.c:473 builtin/log.c:565
c04f5ac3
JX
6272#, c-format
6273msgid "Could not read object %s"
90e6ef53 6274msgstr "不能读取对象 %s"
c04f5ac3 6275
90314792 6276#: builtin/log.c:589
c04f5ac3
JX
6277#, c-format
6278msgid "Unknown type: %d"
6279msgstr "未知类型:%d"
6280
90314792 6281#: builtin/log.c:689
c04f5ac3
JX
6282msgid "format.headers without value"
6283msgstr "format.headers 没有值"
6284
90314792 6285#: builtin/log.c:771
c04f5ac3
JX
6286msgid "name of output directory is too long"
6287msgstr "输出目录名太长"
6288
90314792 6289#: builtin/log.c:787
c04f5ac3
JX
6290#, c-format
6291msgid "Cannot open patch file %s"
6292msgstr "无法打开补丁文件 %s"
6293
90314792 6294#: builtin/log.c:801
c04f5ac3
JX
6295msgid "Need exactly one range."
6296msgstr "只需要一个范围。"
6297
90314792 6298#: builtin/log.c:809
c04f5ac3
JX
6299msgid "Not a range."
6300msgstr "不是一个范围。"
6301
90314792 6302#: builtin/log.c:911
c04f5ac3
JX
6303msgid "Cover letter needs email format"
6304msgstr "信封需要邮件地址格式"
6305
90314792 6306#: builtin/log.c:987
c04f5ac3
JX
6307#, c-format
6308msgid "insane in-reply-to: %s"
6309msgstr "不正常的 in-reply-to:%s"
6310
90314792 6311#: builtin/log.c:1015
ef317cd5 6312msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 6313msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 6314
90314792 6315#: builtin/log.c:1060
c04f5ac3
JX
6316msgid "Two output directories?"
6317msgstr "两个输出目录?"
6318
90314792 6319#: builtin/log.c:1175
ef317cd5 6320msgid "use [PATCH n/m] even with a single patch"
07432cef 6321msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6322
90314792 6323#: builtin/log.c:1178
ef317cd5 6324msgid "use [PATCH] even with multiple patches"
07432cef 6325msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6326
90314792 6327#: builtin/log.c:1182
ef317cd5 6328msgid "print patches to standard out"
07432cef 6329msgstr "打印补丁到标准输出"
c04f5ac3 6330
90314792 6331#: builtin/log.c:1184
ef317cd5 6332msgid "generate a cover letter"
07432cef 6333msgstr "生成一封附信"
c04f5ac3 6334
90314792 6335#: builtin/log.c:1186
ef317cd5 6336msgid "use simple number sequence for output file names"
07432cef 6337msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6338
90314792 6339#: builtin/log.c:1187
ef317cd5 6340msgid "sfx"
07432cef 6341msgstr "后缀"
ef317cd5 6342
90314792 6343#: builtin/log.c:1188
ef317cd5 6344msgid "use <sfx> instead of '.patch'"
07432cef 6345msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6346
90314792 6347#: builtin/log.c:1190
ef317cd5 6348msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6349msgstr "补丁以 <n> 开始编号,而不是1"
6350
90314792 6351#: builtin/log.c:1192
07432cef
WS
6352msgid "mark the series as Nth re-roll"
6353msgstr "标记补丁系列是第几次重制"
ef317cd5 6354
90314792 6355#: builtin/log.c:1194
ef317cd5 6356msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6357msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6358
90314792 6359#: builtin/log.c:1197
ef317cd5 6360msgid "store resulting files in <dir>"
07432cef 6361msgstr "把结果文件存储在 <dir>"
ef317cd5 6362
90314792 6363#: builtin/log.c:1200
ef317cd5 6364msgid "don't strip/add [PATCH]"
07432cef 6365msgstr "不删除/添加 [PATCH]"
ef317cd5 6366
90314792 6367#: builtin/log.c:1203
ef317cd5 6368msgid "don't output binary diffs"
07432cef 6369msgstr "不输出二进制差异"
ef317cd5 6370
90314792 6371#: builtin/log.c:1205
ef317cd5 6372msgid "don't include a patch matching a commit upstream"
07432cef 6373msgstr "不包含已在上游提交中的补丁"
ef317cd5 6374
90314792 6375#: builtin/log.c:1207
ef317cd5 6376msgid "show patch format instead of default (patch + stat)"
07432cef 6377msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6378
90314792 6379#: builtin/log.c:1209
ef317cd5 6380msgid "Messaging"
07432cef 6381msgstr "邮件发送"
ef317cd5 6382
90314792 6383#: builtin/log.c:1210
ef317cd5 6384msgid "header"
07432cef 6385msgstr "header"
ef317cd5 6386
90314792 6387#: builtin/log.c:1211
ef317cd5 6388msgid "add email header"
07432cef 6389msgstr "添加邮件头"
ef317cd5 6390
90314792 6391#: builtin/log.c:1212 builtin/log.c:1214
ef317cd5 6392msgid "email"
07432cef 6393msgstr "邮件地址"
ef317cd5 6394
90314792 6395#: builtin/log.c:1212
ef317cd5 6396msgid "add To: header"
07432cef 6397msgstr "添加收件人"
ef317cd5 6398
90314792 6399#: builtin/log.c:1214
ef317cd5 6400msgid "add Cc: header"
07432cef 6401msgstr "添加抄送"
ef317cd5 6402
90314792 6403#: builtin/log.c:1216
2e8451e8
JX
6404msgid "ident"
6405msgstr "ident"
6406
90314792 6407#: builtin/log.c:1217
2e8451e8
JX
6408msgid "set From address to <ident> (or committer ident if absent)"
6409msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6410
90314792 6411#: builtin/log.c:1219
ef317cd5 6412msgid "message-id"
07432cef 6413msgstr "message-id"
ef317cd5 6414
90314792 6415#: builtin/log.c:1220
ef317cd5 6416msgid "make first mail a reply to <message-id>"
07432cef 6417msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 6418
90314792 6419#: builtin/log.c:1221 builtin/log.c:1224
ef317cd5 6420msgid "boundary"
07432cef 6421msgstr "边界"
ef317cd5 6422
90314792 6423#: builtin/log.c:1222
ef317cd5 6424msgid "attach the patch"
07432cef 6425msgstr "附件方式添加补丁"
ef317cd5 6426
90314792 6427#: builtin/log.c:1225
ef317cd5 6428msgid "inline the patch"
07432cef 6429msgstr "内联显示补丁"
ef317cd5 6430
90314792 6431#: builtin/log.c:1229
ef317cd5 6432msgid "enable message threading, styles: shallow, deep"
07432cef 6433msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6434
90314792 6435#: builtin/log.c:1231
ef317cd5 6436msgid "signature"
07432cef 6437msgstr "签名"
ef317cd5 6438
90314792 6439#: builtin/log.c:1232
ef317cd5 6440msgid "add a signature"
07432cef 6441msgstr "添加一个签名"
ef317cd5 6442
90314792 6443#: builtin/log.c:1233
ef317cd5 6444msgid "don't print the patch filenames"
07432cef 6445msgstr "不要打印补丁文件名"
ef317cd5 6446
90314792 6447#: builtin/log.c:1307
2e8451e8
JX
6448#, c-format
6449msgid "invalid ident line: %s"
6450msgstr "包含无效的身份标识:%s"
6451
90314792 6452#: builtin/log.c:1322
c04f5ac3
JX
6453msgid "-n and -k are mutually exclusive."
6454msgstr "-n 和 -k 互斥。"
6455
90314792 6456#: builtin/log.c:1324
c04f5ac3
JX
6457msgid "--subject-prefix and -k are mutually exclusive."
6458msgstr "--subject-prefix 和 -k 互斥。"
6459
90314792 6460#: builtin/log.c:1332
c04f5ac3
JX
6461msgid "--name-only does not make sense"
6462msgstr "--name-only 无意义"
6463
90314792 6464#: builtin/log.c:1334
c04f5ac3
JX
6465msgid "--name-status does not make sense"
6466msgstr "--name-status 无意义"
6467
90314792 6468#: builtin/log.c:1336
c04f5ac3
JX
6469msgid "--check does not make sense"
6470msgstr "--check 无意义"
6471
90314792 6472#: builtin/log.c:1359
c04f5ac3
JX
6473msgid "standard output, or directory, which one?"
6474msgstr "标准输出或目录,哪一个?"
6475
90314792 6476#: builtin/log.c:1361
c04f5ac3
JX
6477#, c-format
6478msgid "Could not create directory '%s'"
90e6ef53 6479msgstr "不能创建目录 '%s'"
c04f5ac3 6480
90314792 6481#: builtin/log.c:1509
c04f5ac3
JX
6482msgid "Failed to create output files"
6483msgstr "无法创建输出文件"
6484
90314792 6485#: builtin/log.c:1558
ef317cd5 6486msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6487msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6488
90314792 6489#: builtin/log.c:1613
c04f5ac3
JX
6490#, c-format
6491msgid ""
6492"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 6493msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 6494
90314792 6495#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
c04f5ac3
JX
6496#, c-format
6497msgid "Unknown commit %s"
6498msgstr "未知提交 %s"
6499
90314792 6500#: builtin/ls-files.c:398
ef317cd5 6501msgid "git ls-files [options] [<file>...]"
07432cef 6502msgstr "git ls-files [选项] [<文件>...]"
ef317cd5 6503
90314792 6504#: builtin/ls-files.c:455
ef317cd5 6505msgid "identify the file status with tags"
07432cef 6506msgstr "用标签标识文件的状态"
ef317cd5 6507
90314792 6508#: builtin/ls-files.c:457
ef317cd5 6509msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6510msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6511
90314792 6512#: builtin/ls-files.c:459
ef317cd5 6513msgid "show cached files in the output (default)"
07432cef 6514msgstr "显示缓存的文件(默认)"
ef317cd5 6515
90314792 6516#: builtin/ls-files.c:461
ef317cd5 6517msgid "show deleted files in the output"
07432cef 6518msgstr "显示已删除的文件"
ef317cd5 6519
90314792 6520#: builtin/ls-files.c:463
ef317cd5 6521msgid "show modified files in the output"
07432cef 6522msgstr "显示已修改的文件"
ef317cd5 6523
90314792 6524#: builtin/ls-files.c:465
ef317cd5 6525msgid "show other files in the output"
07432cef 6526msgstr "显示其它文件"
ef317cd5 6527
90314792 6528#: builtin/ls-files.c:467
ef317cd5 6529msgid "show ignored files in the output"
07432cef 6530msgstr "显示忽略的文件"
ef317cd5 6531
90314792 6532#: builtin/ls-files.c:470
ef317cd5 6533msgid "show staged contents' object name in the output"
07432cef 6534msgstr "显示暂存区内容的对象名称"
ef317cd5 6535
90314792 6536#: builtin/ls-files.c:472
ef317cd5 6537msgid "show files on the filesystem that need to be removed"
07432cef 6538msgstr "显示文件系统需要删除的文件"
ef317cd5 6539
90314792 6540#: builtin/ls-files.c:474
ef317cd5 6541msgid "show 'other' directories' name only"
07432cef 6542msgstr "只显示“其他”目录的名称"
ef317cd5 6543
90314792 6544#: builtin/ls-files.c:477
ef317cd5 6545msgid "don't show empty directories"
07432cef 6546msgstr "不显示空目录"
ef317cd5 6547
90314792 6548#: builtin/ls-files.c:480
ef317cd5 6549msgid "show unmerged files in the output"
07432cef 6550msgstr "显示未合并的文件"
ef317cd5 6551
90314792 6552#: builtin/ls-files.c:482
ef317cd5 6553msgid "show resolve-undo information"
07432cef 6554msgstr "显示 resolve-undo 信息"
ef317cd5 6555
90314792 6556#: builtin/ls-files.c:484
ef317cd5 6557msgid "skip files matching pattern"
07432cef 6558msgstr "匹配排除文件的模式"
ef317cd5 6559
90314792 6560#: builtin/ls-files.c:487
ef317cd5 6561msgid "exclude patterns are read from <file>"
07432cef 6562msgstr "从 <文件> 中读取排除模式"
ef317cd5 6563
90314792 6564#: builtin/ls-files.c:490
ef317cd5 6565msgid "read additional per-directory exclude patterns in <file>"
07432cef 6566msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6567
90314792 6568#: builtin/ls-files.c:492
ef317cd5 6569msgid "add the standard git exclusions"
07432cef 6570msgstr "添加标准的 git 排除"
ef317cd5 6571
90314792 6572#: builtin/ls-files.c:495
ef317cd5 6573msgid "make the output relative to the project top directory"
07432cef 6574msgstr "显示相对于顶级目录的文件名"
ef317cd5 6575
90314792 6576#: builtin/ls-files.c:498
ef317cd5 6577msgid "if any <file> is not in the index, treat this as an error"
07432cef 6578msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 6579
90314792 6580#: builtin/ls-files.c:499
ef317cd5 6581msgid "tree-ish"
07432cef 6582msgstr "树或提交"
ef317cd5 6583
90314792 6584#: builtin/ls-files.c:500
ef317cd5 6585msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 6586msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 6587
90314792 6588#: builtin/ls-files.c:502
ef317cd5 6589msgid "show debugging data"
07432cef 6590msgstr "显示调试数据"
ef317cd5 6591
90314792 6592#: builtin/ls-tree.c:28
ef317cd5 6593msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 6594msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 6595
90314792 6596#: builtin/ls-tree.c:126
ef317cd5 6597msgid "only show trees"
07432cef 6598msgstr "只显示树"
ef317cd5 6599
90314792 6600#: builtin/ls-tree.c:128
ef317cd5 6601msgid "recurse into subtrees"
07432cef 6602msgstr "递归到子树"
ef317cd5 6603
90314792 6604#: builtin/ls-tree.c:130
ef317cd5 6605msgid "show trees when recursing"
07432cef 6606msgstr "当递归时显示树"
ef317cd5 6607
90314792 6608#: builtin/ls-tree.c:133
ef317cd5 6609msgid "terminate entries with NUL byte"
07432cef 6610msgstr "条目以NUL字符终止"
ef317cd5 6611
90314792 6612#: builtin/ls-tree.c:134
ef317cd5 6613msgid "include object size"
07432cef 6614msgstr "包括对象大小"
ef317cd5 6615
90314792 6616#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
ef317cd5 6617msgid "list only filenames"
07432cef 6618msgstr "只列出文件名"
ef317cd5 6619
90314792 6620#: builtin/ls-tree.c:141
ef317cd5 6621msgid "use full path names"
07432cef 6622msgstr "使用文件的全路径"
ef317cd5 6623
90314792 6624#: builtin/ls-tree.c:143
ef317cd5 6625msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 6626msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5
JX
6627
6628#: builtin/merge.c:43
ef317cd5 6629msgid "git merge [options] [<commit>...]"
07432cef 6630msgstr "git merge [选项] [<提交>...]"
ef317cd5
JX
6631
6632#: builtin/merge.c:44
6633msgid "git merge [options] <msg> HEAD <commit>"
07432cef 6634msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5
JX
6635
6636#: builtin/merge.c:45
6637msgid "git merge --abort"
07432cef 6638msgstr "git merge --abort"
ef317cd5 6639
2e8451e8 6640#: builtin/merge.c:98
c04f5ac3
JX
6641msgid "switch `m' requires a value"
6642msgstr "开关 `m' 需要一个值"
6643
2e8451e8 6644#: builtin/merge.c:135
c04f5ac3
JX
6645#, c-format
6646msgid "Could not find merge strategy '%s'.\n"
90e6ef53 6647msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 6648
2e8451e8 6649#: builtin/merge.c:136
c04f5ac3
JX
6650#, c-format
6651msgid "Available strategies are:"
6652msgstr "可用的策略有:"
6653
2e8451e8 6654#: builtin/merge.c:141
c04f5ac3
JX
6655#, c-format
6656msgid "Available custom strategies are:"
6657msgstr "可用的自定义策略有:"
6658
cfff71a9 6659#: builtin/merge.c:191
ef317cd5 6660msgid "do not show a diffstat at the end of the merge"
07432cef 6661msgstr "在合并的最后不显示差异统计"
ef317cd5 6662
cfff71a9 6663#: builtin/merge.c:194
ef317cd5 6664msgid "show a diffstat at the end of the merge"
07432cef 6665msgstr "在合并的最后显示差异统计"
ef317cd5 6666
cfff71a9 6667#: builtin/merge.c:195
ef317cd5 6668msgid "(synonym to --stat)"
07432cef 6669msgstr "(和 --stat 同义)"
ef317cd5 6670
cfff71a9 6671#: builtin/merge.c:197
ef317cd5 6672msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 6673msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 6674
cfff71a9 6675#: builtin/merge.c:200
ef317cd5 6676msgid "create a single commit instead of doing a merge"
07432cef 6677msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 6678
cfff71a9 6679#: builtin/merge.c:202
ef317cd5 6680msgid "perform a commit if the merge succeeds (default)"
07432cef 6681msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 6682
cfff71a9 6683#: builtin/merge.c:204
ef317cd5 6684msgid "edit message before committing"
07432cef 6685msgstr "在提交前编辑提交说明"
ef317cd5 6686
cfff71a9 6687#: builtin/merge.c:205
ef317cd5 6688msgid "allow fast-forward (default)"
07432cef 6689msgstr "允许快进(默认)"
ef317cd5 6690
cfff71a9 6691#: builtin/merge.c:207
ef317cd5 6692msgid "abort if fast-forward is not possible"
07432cef 6693msgstr "如果不能快进就放弃合并"
ef317cd5 6694
cfff71a9 6695#: builtin/merge.c:211
1003b3a5
JX
6696msgid "Verify that the named commit has a valid GPG signature"
6697msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6698
cfff71a9 6699#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89
ef317cd5 6700msgid "strategy"
07432cef 6701msgstr "策略"
ef317cd5 6702
cfff71a9 6703#: builtin/merge.c:213
ef317cd5 6704msgid "merge strategy to use"
07432cef 6705msgstr "要使用的合并策略"
ef317cd5 6706
cfff71a9 6707#: builtin/merge.c:214
ef317cd5 6708msgid "option=value"
07432cef 6709msgstr "option=value"
ef317cd5 6710
cfff71a9 6711#: builtin/merge.c:215
ef317cd5 6712msgid "option for selected merge strategy"
07432cef 6713msgstr "所选的合并策略的选项"
ef317cd5 6714
cfff71a9 6715#: builtin/merge.c:217
ef317cd5 6716msgid "merge commit message (for a non-fast-forward merge)"
07432cef 6717msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 6718
cfff71a9 6719#: builtin/merge.c:221
ef317cd5 6720msgid "abort the current in-progress merge"
07432cef 6721msgstr "放弃当前正在进行的合并"
ef317cd5 6722
cfff71a9 6723#: builtin/merge.c:250
c04f5ac3
JX
6724msgid "could not run stash."
6725msgstr "不能进行进度保存。"
6726
cfff71a9 6727#: builtin/merge.c:255
c04f5ac3
JX
6728msgid "stash failed"
6729msgstr "进度保存失败"
6730
cfff71a9 6731#: builtin/merge.c:260
c04f5ac3
JX
6732#, c-format
6733msgid "not a valid object: %s"
6734msgstr "不是一个有效对象:%s"
6735
cfff71a9 6736#: builtin/merge.c:279 builtin/merge.c:296
c04f5ac3
JX
6737msgid "read-tree failed"
6738msgstr "读取树失败"
6739
90e6ef53 6740# 译者:注意保持前导空格
cfff71a9 6741#: builtin/merge.c:326
c04f5ac3
JX
6742msgid " (nothing to squash)"
6743msgstr " (无可压缩)"
6744
cfff71a9 6745#: builtin/merge.c:339
c04f5ac3
JX
6746#, c-format
6747msgid "Squash commit -- not updating HEAD\n"
6748msgstr "压缩提交 -- 未更新 HEAD\n"
6749
cfff71a9 6750#: builtin/merge.c:371
c04f5ac3
JX
6751msgid "Writing SQUASH_MSG"
6752msgstr "写入 SQUASH_MSG"
6753
cfff71a9 6754#: builtin/merge.c:373
c04f5ac3
JX
6755msgid "Finishing SQUASH_MSG"
6756msgstr "完成 SQUASH_MSG"
6757
cfff71a9 6758#: builtin/merge.c:396
c04f5ac3
JX
6759#, c-format
6760msgid "No merge message -- not updating HEAD\n"
6761msgstr "无合并信息 -- 未更新 HEAD\n"
6762
cfff71a9 6763#: builtin/merge.c:446
c04f5ac3
JX
6764#, c-format
6765msgid "'%s' does not point to a commit"
6766msgstr "'%s' 没有指向一个提交"
6767
cfff71a9 6768#: builtin/merge.c:558
c04f5ac3
JX
6769#, c-format
6770msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 6771msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 6772
cfff71a9 6773#: builtin/merge.c:650
c04f5ac3
JX
6774msgid "git write-tree failed to write a tree"
6775msgstr "git write-tree 无法写入一树对象"
6776
cfff71a9 6777#: builtin/merge.c:678
c04f5ac3
JX
6778msgid "Not handling anything other than two heads merge."
6779msgstr "不能处理两个头合并之外的任何操作。"
6780
cfff71a9 6781#: builtin/merge.c:692
c04f5ac3
JX
6782#, c-format
6783msgid "Unknown option for merge-recursive: -X%s"
6784msgstr "merge-recursive 的未知选项:-X%s"
6785
cfff71a9 6786#: builtin/merge.c:706
c04f5ac3
JX
6787#, c-format
6788msgid "unable to write %s"
6789msgstr "不能写 %s"
6790
cfff71a9 6791#: builtin/merge.c:795
c04f5ac3
JX
6792#, c-format
6793msgid "Could not read from '%s'"
6794msgstr "不能从 '%s' 读取"
6795
cfff71a9 6796#: builtin/merge.c:804
c04f5ac3
JX
6797#, c-format
6798msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6799msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6800
cfff71a9 6801#: builtin/merge.c:810
a77c07d9 6802#, c-format
c04f5ac3
JX
6803msgid ""
6804"Please enter a commit message to explain why this merge is necessary,\n"
6805"especially if it merges an updated upstream into a topic branch.\n"
6806"\n"
a77c07d9 6807"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
6808"the commit.\n"
6809msgstr ""
6810"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6811"合并到主题分支。\n"
6812"\n"
a77c07d9 6813"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 6814
cfff71a9 6815#: builtin/merge.c:834
c04f5ac3
JX
6816msgid "Empty commit message."
6817msgstr "空提交信息。"
6818
cfff71a9 6819#: builtin/merge.c:846
c04f5ac3
JX
6820#, c-format
6821msgid "Wonderful.\n"
6822msgstr "太棒了。\n"
6823
cfff71a9 6824#: builtin/merge.c:911
c04f5ac3
JX
6825#, c-format
6826msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6827msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6828
cfff71a9 6829#: builtin/merge.c:927
c04f5ac3
JX
6830#, c-format
6831msgid "'%s' is not a commit"
6832msgstr "'%s' 不是一个提交"
6833
cfff71a9 6834#: builtin/merge.c:968
c04f5ac3 6835msgid "No current branch."
90e6ef53 6836msgstr "没有当前分支。"
c04f5ac3 6837
cfff71a9 6838#: builtin/merge.c:970
c04f5ac3 6839msgid "No remote for the current branch."
90e6ef53 6840msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 6841
cfff71a9 6842#: builtin/merge.c:972
c04f5ac3 6843msgid "No default upstream defined for the current branch."
90e6ef53 6844msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 6845
cfff71a9 6846#: builtin/merge.c:977
170e9899 6847#, c-format
2e8451e8
JX
6848msgid "No remote-tracking branch for %s from %s"
6849msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 6850
cfff71a9 6851#: builtin/merge.c:1133
c04f5ac3 6852msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 6853msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 6854
cfff71a9 6855#: builtin/merge.c:1149 git-pull.sh:31
c04f5ac3
JX
6856msgid ""
6857"You have not concluded your merge (MERGE_HEAD exists).\n"
6858"Please, commit your changes before you can merge."
6859msgstr ""
6860"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 6861"请在合并前先提交您的修改。"
c04f5ac3 6862
cfff71a9 6863#: builtin/merge.c:1152 git-pull.sh:34
c04f5ac3
JX
6864msgid "You have not concluded your merge (MERGE_HEAD exists)."
6865msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6866
cfff71a9 6867#: builtin/merge.c:1156
c04f5ac3
JX
6868msgid ""
6869"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6870"Please, commit your changes before you can merge."
6871msgstr ""
6872"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 6873"请在合并前先提交您的修改。"
c04f5ac3 6874
cfff71a9 6875#: builtin/merge.c:1159
c04f5ac3
JX
6876msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6877msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6878
cfff71a9 6879#: builtin/merge.c:1168
c04f5ac3 6880msgid "You cannot combine --squash with --no-ff."
649900bc 6881msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 6882
cfff71a9 6883#: builtin/merge.c:1177
c04f5ac3 6884msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 6885msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 6886
cfff71a9 6887#: builtin/merge.c:1209
c04f5ac3 6888msgid "Can merge only exactly one commit into empty head"
90e6ef53 6889msgstr "只能将一个提交合并到空分支上"
c04f5ac3 6890
cfff71a9 6891#: builtin/merge.c:1212
c04f5ac3
JX
6892msgid "Squash commit into empty head not supported yet"
6893msgstr "尚不支持到空分支的压缩提交"
6894
cfff71a9 6895#: builtin/merge.c:1214
c04f5ac3
JX
6896msgid "Non-fast-forward commit does not make sense into an empty head"
6897msgstr "到空分支的非快进式提交没有意义"
6898
cfff71a9 6899#: builtin/merge.c:1219
2e8451e8
JX
6900#, c-format
6901msgid "%s - not something we can merge"
6902msgstr "%s - 不能被合并"
6903
cfff71a9 6904#: builtin/merge.c:1270
1003b3a5
JX
6905#, c-format
6906msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6907msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6908
cfff71a9 6909#: builtin/merge.c:1273
1003b3a5
JX
6910#, c-format
6911msgid "Commit %s has a bad GPG signature allegedly by %s."
6912msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6913
6914#. 'N'
cfff71a9 6915#: builtin/merge.c:1276
1003b3a5
JX
6916#, c-format
6917msgid "Commit %s does not have a GPG signature."
6918msgstr "提交 %s 没有一个 GPG 签名。"
6919
cfff71a9 6920#: builtin/merge.c:1279
1003b3a5
JX
6921#, c-format
6922msgid "Commit %s has a good GPG signature by %s\n"
6923msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6924
cfff71a9 6925#: builtin/merge.c:1363
c04f5ac3
JX
6926#, c-format
6927msgid "Updating %s..%s\n"
6928msgstr "更新 %s..%s\n"
6929
cfff71a9 6930#: builtin/merge.c:1402
c04f5ac3
JX
6931#, c-format
6932msgid "Trying really trivial in-index merge...\n"
90e6ef53 6933msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 6934
cfff71a9 6935#: builtin/merge.c:1409
c04f5ac3
JX
6936#, c-format
6937msgid "Nope.\n"
6938msgstr "无。\n"
6939
cfff71a9 6940#: builtin/merge.c:1441
c04f5ac3 6941msgid "Not possible to fast-forward, aborting."
1aabac65 6942msgstr "无法快进,终止。"
c04f5ac3 6943
cfff71a9 6944#: builtin/merge.c:1464 builtin/merge.c:1543
c04f5ac3
JX
6945#, c-format
6946msgid "Rewinding the tree to pristine...\n"
6947msgstr "将树回滚至原始状态...\n"
6948
cfff71a9 6949#: builtin/merge.c:1468
c04f5ac3
JX
6950#, c-format
6951msgid "Trying merge strategy %s...\n"
6952msgstr "尝试合并策略 %s...\n"
6953
cfff71a9 6954#: builtin/merge.c:1534
c04f5ac3
JX
6955#, c-format
6956msgid "No merge strategy handled the merge.\n"
6957msgstr "没有合并策略处理此合并。\n"
6958
cfff71a9 6959#: builtin/merge.c:1536
c04f5ac3
JX
6960#, c-format
6961msgid "Merge with strategy %s failed.\n"
6962msgstr "使用策略 %s 合并失败。\n"
6963
cfff71a9 6964#: builtin/merge.c:1545
c04f5ac3
JX
6965#, c-format
6966msgid "Using the %s to prepare resolving by hand.\n"
6967msgstr "使用 %s 以准备手工解决。\n"
6968
cfff71a9 6969#: builtin/merge.c:1557
c04f5ac3
JX
6970#, c-format
6971msgid "Automatic merge went well; stopped before committing as requested\n"
6972msgstr "自动合并进展顺利,按要求在提交前停止\n"
6973
cfff71a9 6974#: builtin/merge-base.c:29
ef317cd5 6975msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 6976msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5 6977
cfff71a9 6978#: builtin/merge-base.c:30
ef317cd5 6979msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 6980msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5 6981
cfff71a9 6982#: builtin/merge-base.c:31
ef317cd5 6983msgid "git merge-base --independent <commit>..."
07432cef 6984msgstr "git merge-base --independent <提交>..."
ef317cd5 6985
cfff71a9 6986#: builtin/merge-base.c:32
ef317cd5 6987msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 6988msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 6989
cfff71a9
JX
6990#: builtin/merge-base.c:33
6991msgid "git merge-base --fork-point <ref> [<commit>]"
6992msgstr "git merge-base --fork-point <提交> [<提交>]"
6993
6994#: builtin/merge-base.c:214
ef317cd5 6995msgid "output all common ancestors"
07432cef 6996msgstr "输出所有共同的祖先"
ef317cd5 6997
cfff71a9 6998#: builtin/merge-base.c:216
ef317cd5 6999msgid "find ancestors for a single n-way merge"
07432cef 7000msgstr "查找一个多路合并的祖先提交"
ef317cd5 7001
cfff71a9 7002#: builtin/merge-base.c:218
ef317cd5 7003msgid "list revs not reachable from others"
07432cef 7004msgstr "显示不能被其他访问到的版本"
ef317cd5 7005
cfff71a9 7006#: builtin/merge-base.c:220
ef317cd5 7007msgid "is the first one ancestor of the other?"
07432cef 7008msgstr "第一个是其他的祖先提交么?"
ef317cd5 7009
cfff71a9
JX
7010#: builtin/merge-base.c:222
7011msgid "find where <commit> forked from reflog of <ref>"
7012msgstr "查找 <commit> 从<引用>日志的何处分支的"
7013
ef317cd5
JX
7014#: builtin/merge-file.c:8
7015msgid ""
7016"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7017"file2"
7018msgstr ""
07432cef 7019"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
7020
7021#: builtin/merge-file.c:33
7022msgid "send results to standard output"
07432cef 7023msgstr "将结果发送到标准输出"
ef317cd5
JX
7024
7025#: builtin/merge-file.c:34
7026msgid "use a diff3 based merge"
07432cef 7027msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7028
7029#: builtin/merge-file.c:35
7030msgid "for conflicts, use our version"
07432cef 7031msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7032
7033#: builtin/merge-file.c:37
7034msgid "for conflicts, use their version"
07432cef 7035msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7036
7037#: builtin/merge-file.c:39
7038msgid "for conflicts, use a union version"
07432cef 7039msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7040
7041#: builtin/merge-file.c:42
7042msgid "for conflicts, use this marker size"
07432cef 7043msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7044
7045#: builtin/merge-file.c:43
7046msgid "do not warn about conflicts"
07432cef 7047msgstr "不要警告冲突"
ef317cd5
JX
7048
7049#: builtin/merge-file.c:45
7050msgid "set labels for file1/orig_file/file2"
07432cef 7051msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 7052
ef317cd5
JX
7053#: builtin/mktree.c:67
7054msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7055msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7056
ef317cd5
JX
7057#: builtin/mktree.c:153
7058msgid "input is NUL terminated"
07432cef 7059msgstr "输入以 NUL 字符终止"
c04f5ac3 7060
ef317cd5 7061#: builtin/mktree.c:154 builtin/write-tree.c:24
ef317cd5 7062msgid "allow missing objects"
07432cef 7063msgstr "允许丢失的对象"
c04f5ac3 7064
ef317cd5
JX
7065#: builtin/mktree.c:155
7066msgid "allow creation of more than one tree"
07432cef 7067msgstr "允许创建一个以上的树"
c04f5ac3 7068
90314792 7069#: builtin/mv.c:15
ef317cd5 7070msgid "git mv [options] <source>... <destination>"
07432cef 7071msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 7072
cfff71a9 7073#: builtin/mv.c:71
ef317cd5 7074msgid "force move/rename even if target exists"
07432cef 7075msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7076
cfff71a9 7077#: builtin/mv.c:72
ef317cd5 7078msgid "skip move/rename errors"
07432cef 7079msgstr "跳过移动/重命名错误"
c04f5ac3 7080
cfff71a9 7081#: builtin/mv.c:122
c04f5ac3
JX
7082#, c-format
7083msgid "Checking rename of '%s' to '%s'\n"
7084msgstr "检查 '%s' 到 '%s' 的重命名\n"
7085
cfff71a9 7086#: builtin/mv.c:126
c04f5ac3
JX
7087msgid "bad source"
7088msgstr "坏的源"
7089
cfff71a9 7090#: builtin/mv.c:129
c04f5ac3
JX
7091msgid "can not move directory into itself"
7092msgstr "不能将目录移动到自身"
7093
cfff71a9 7094#: builtin/mv.c:132
c04f5ac3
JX
7095msgid "cannot move directory over file"
7096msgstr "不能将目录移动到文件"
7097
cfff71a9 7098#: builtin/mv.c:138
90314792
JX
7099#, c-format
7100msgid "Huh? Directory %s is in index and no submodule?"
7101msgstr "嗯?目录 %s 在索引中并且不是子模组?"
7102
cfff71a9 7103#: builtin/mv.c:140 builtin/rm.c:318
90314792
JX
7104msgid "Please, stage your changes to .gitmodules or stash them to proceed"
7105msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7106
cfff71a9 7107#: builtin/mv.c:156
c04f5ac3
JX
7108#, c-format
7109msgid "Huh? %.*s is in index?"
90e6ef53 7110msgstr "嗯?%.*s 在索引中?"
c04f5ac3 7111
cfff71a9 7112#: builtin/mv.c:168
c04f5ac3
JX
7113msgid "source directory is empty"
7114msgstr "源目录为空"
7115
cfff71a9 7116#: builtin/mv.c:200
c04f5ac3
JX
7117msgid "not under version control"
7118msgstr "不在版本控制之下"
7119
cfff71a9 7120#: builtin/mv.c:202
c04f5ac3
JX
7121msgid "destination exists"
7122msgstr "目标已存在"
7123
cfff71a9 7124#: builtin/mv.c:210
c04f5ac3
JX
7125#, c-format
7126msgid "overwriting '%s'"
7127msgstr "覆盖 '%s'"
7128
cfff71a9 7129#: builtin/mv.c:213
c04f5ac3
JX
7130msgid "Cannot overwrite"
7131msgstr "不能覆盖"
7132
cfff71a9 7133#: builtin/mv.c:216
c04f5ac3
JX
7134msgid "multiple sources for the same target"
7135msgstr "同一目标具有多个源"
7136
cfff71a9
JX
7137#: builtin/mv.c:218
7138msgid "destination directory does not exist"
7139msgstr "目标目录不存在"
7140
7141#: builtin/mv.c:233
c04f5ac3
JX
7142#, c-format
7143msgid "%s, source=%s, destination=%s"
7144msgstr "%s,源=%s,目标=%s"
7145
cfff71a9 7146#: builtin/mv.c:243
c04f5ac3
JX
7147#, c-format
7148msgid "Renaming %s to %s\n"
7149msgstr "重命名 %s 至 %s\n"
7150
cfff71a9 7151#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328
c04f5ac3
JX
7152#, c-format
7153msgid "renaming '%s' failed"
7154msgstr "重命名 '%s' 失败"
7155
cfff71a9 7156#: builtin/name-rev.c:258
ef317cd5 7157msgid "git name-rev [options] <commit>..."
07432cef 7158msgstr "git name-rev [选项] <提交>..."
ef317cd5 7159
cfff71a9 7160#: builtin/name-rev.c:259
ef317cd5 7161msgid "git name-rev [options] --all"
07432cef 7162msgstr "git name-rev [选项] --all"
ef317cd5 7163
cfff71a9 7164#: builtin/name-rev.c:260
ef317cd5 7165msgid "git name-rev [options] --stdin"
07432cef 7166msgstr "git name-rev [选项] --stdin"
ef317cd5 7167
cfff71a9 7168#: builtin/name-rev.c:312
ef317cd5 7169msgid "print only names (no SHA-1)"
07432cef 7170msgstr "只打印名称(无 SHA-1)"
ef317cd5 7171
cfff71a9 7172#: builtin/name-rev.c:313
ef317cd5 7173msgid "only use tags to name the commits"
07432cef 7174msgstr "只使用 tags 来命名提交"
ef317cd5 7175
cfff71a9 7176#: builtin/name-rev.c:315
ef317cd5 7177msgid "only use refs matching <pattern>"
07432cef 7178msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 7179
cfff71a9 7180#: builtin/name-rev.c:317
ef317cd5 7181msgid "list all commits reachable from all refs"
07432cef 7182msgstr "列出可以从所有引用访问的提交"
ef317cd5 7183
cfff71a9 7184#: builtin/name-rev.c:318
ef317cd5 7185msgid "read from stdin"
07432cef 7186msgstr "从标准输入读取"
ef317cd5 7187
cfff71a9 7188#: builtin/name-rev.c:319
90314792
JX
7189msgid "allow to print `undefined` names (default)"
7190msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 7191
cfff71a9 7192#: builtin/name-rev.c:325
2e8451e8
JX
7193msgid "dereference tags in the input (internal use)"
7194msgstr "反向解析输入中的 tags(内部使用)"
7195
7196#: builtin/notes.c:24
ef317cd5 7197msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 7198msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 7199
2e8451e8 7200#: builtin/notes.c:25
ef317cd5
JX
7201msgid ""
7202"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7203"<object>] [<object>]"
7204msgstr ""
07432cef
WS
7205"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7206"象>] [<对象>]"
ef317cd5 7207
2e8451e8 7208#: builtin/notes.c:26
ef317cd5 7209msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 7210msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 7211
2e8451e8 7212#: builtin/notes.c:27
ef317cd5
JX
7213msgid ""
7214"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7215"<object>] [<object>]"
7216msgstr ""
07432cef
WS
7217"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7218">] [<对象>]"
ef317cd5 7219
2e8451e8 7220#: builtin/notes.c:28
ef317cd5 7221msgid "git notes [--ref <notes_ref>] edit [<object>]"
07432cef 7222msgstr "git notes [--ref <注解引用>] edit [<对象>]"
ef317cd5 7223
2e8451e8 7224#: builtin/notes.c:29
ef317cd5 7225msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 7226msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 7227
2e8451e8 7228#: builtin/notes.c:30
ef317cd5
JX
7229msgid ""
7230"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 7231msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 7232
2e8451e8 7233#: builtin/notes.c:31
ef317cd5 7234msgid "git notes merge --commit [-v | -q]"
07432cef 7235msgstr "git notes merge --commit [-v | -q]"
ef317cd5 7236
2e8451e8 7237#: builtin/notes.c:32
ef317cd5 7238msgid "git notes merge --abort [-v | -q]"
07432cef 7239msgstr "git notes merge --abort [-v | -q]"
ef317cd5 7240
2e8451e8 7241#: builtin/notes.c:33
ef317cd5 7242msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 7243msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 7244
2e8451e8 7245#: builtin/notes.c:34
ef317cd5 7246msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 7247msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 7248
2e8451e8 7249#: builtin/notes.c:35
ef317cd5 7250msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 7251msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 7252
2e8451e8 7253#: builtin/notes.c:40
ef317cd5 7254msgid "git notes [list [<object>]]"
07432cef 7255msgstr "git notes [list [<对象>]]"
ef317cd5 7256
2e8451e8 7257#: builtin/notes.c:45
ef317cd5 7258msgid "git notes add [<options>] [<object>]"
07432cef 7259msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 7260
2e8451e8 7261#: builtin/notes.c:50
ef317cd5 7262msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7263msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7264
2e8451e8 7265#: builtin/notes.c:51
ef317cd5 7266msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7267msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7268
2e8451e8 7269#: builtin/notes.c:56
ef317cd5 7270msgid "git notes append [<options>] [<object>]"
07432cef 7271msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7272
2e8451e8 7273#: builtin/notes.c:61
ef317cd5 7274msgid "git notes edit [<object>]"
07432cef 7275msgstr "git notes edit [<对象>]"
ef317cd5 7276
2e8451e8 7277#: builtin/notes.c:66
ef317cd5 7278msgid "git notes show [<object>]"
07432cef 7279msgstr "git notes show [<对象>]"
ef317cd5 7280
2e8451e8 7281#: builtin/notes.c:71
ef317cd5 7282msgid "git notes merge [<options>] <notes_ref>"
07432cef 7283msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7284
2e8451e8 7285#: builtin/notes.c:72
ef317cd5 7286msgid "git notes merge --commit [<options>]"
07432cef 7287msgstr "git notes merge --commit [<选项>]"
ef317cd5 7288
2e8451e8 7289#: builtin/notes.c:73
ef317cd5 7290msgid "git notes merge --abort [<options>]"
07432cef 7291msgstr "git notes merge --abort [<选项>]"
ef317cd5 7292
2e8451e8 7293#: builtin/notes.c:78
ef317cd5 7294msgid "git notes remove [<object>]"
07432cef 7295msgstr "git notes remove [<对象>]"
ef317cd5 7296
2e8451e8 7297#: builtin/notes.c:83
ef317cd5 7298msgid "git notes prune [<options>]"
07432cef 7299msgstr "git notes prune [<选项>]"
ef317cd5 7300
2e8451e8 7301#: builtin/notes.c:88
ef317cd5 7302msgid "git notes get-ref"
07432cef 7303msgstr "git notes get-ref"
ef317cd5 7304
2e8451e8 7305#: builtin/notes.c:137
c04f5ac3
JX
7306#, c-format
7307msgid "unable to start 'show' for object '%s'"
7308msgstr "不能为对象 '%s' 开始 'show'"
7309
2e8451e8 7310#: builtin/notes.c:141
a77c07d9
JX
7311msgid "could not read 'show' output"
7312msgstr "不能读取 'show' 的输出"
c04f5ac3 7313
2e8451e8 7314#: builtin/notes.c:149
c04f5ac3
JX
7315#, c-format
7316msgid "failed to finish 'show' for object '%s'"
7317msgstr "无法为对象 '%s' 完成 'show'"
7318
2e8451e8 7319#: builtin/notes.c:167 builtin/tag.c:341
c04f5ac3
JX
7320#, c-format
7321msgid "could not create file '%s'"
7322msgstr "不能创建文件 '%s'"
7323
2e8451e8 7324#: builtin/notes.c:186
c04f5ac3
JX
7325msgid "Please supply the note contents using either -m or -F option"
7326msgstr "请通过 -m 或 -F 选项为注解提供内容"
7327
2e8451e8 7328#: builtin/notes.c:207 builtin/notes.c:844
c04f5ac3
JX
7329#, c-format
7330msgid "Removing note for object %s\n"
7331msgstr "删除对象 %s 的注解\n"
7332
2e8451e8 7333#: builtin/notes.c:212
c04f5ac3
JX
7334msgid "unable to write note object"
7335msgstr "不能写注解对象"
7336
2e8451e8 7337#: builtin/notes.c:214
c04f5ac3
JX
7338#, c-format
7339msgid "The note contents has been left in %s"
7340msgstr "注解内容被留在文件 %s 中"
7341
90314792 7342#: builtin/notes.c:248 builtin/tag.c:537
c04f5ac3
JX
7343#, c-format
7344msgid "cannot read '%s'"
7345msgstr "不能读取 '%s'"
7346
90314792 7347#: builtin/notes.c:250 builtin/tag.c:540
c04f5ac3
JX
7348#, c-format
7349msgid "could not open or read '%s'"
7350msgstr "不能打开或读取 '%s'"
7351
2e8451e8
JX
7352#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
7353#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
7354#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
90314792 7355#: builtin/notes.c:839 builtin/tag.c:553
c04f5ac3
JX
7356#, c-format
7357msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7358msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7359
2e8451e8 7360#: builtin/notes.c:272
c04f5ac3
JX
7361#, c-format
7362msgid "Failed to read object '%s'."
7363msgstr "无法读取对象 '%s'。"
7364
2e8451e8 7365#: builtin/notes.c:312
c04f5ac3
JX
7366#, c-format
7367msgid "Malformed input line: '%s'."
7368msgstr "非法的输入行:'%s'。"
7369
2e8451e8 7370#: builtin/notes.c:327
c04f5ac3
JX
7371#, c-format
7372msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7373msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7374
2e8451e8
JX
7375#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
7376#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
7377#: builtin/notes.c:904
c04f5ac3
JX
7378msgid "too many parameters"
7379msgstr "参数太多"
7380
2e8451e8 7381#: builtin/notes.c:384 builtin/notes.c:643
c04f5ac3
JX
7382#, c-format
7383msgid "No note found for object %s."
7384msgstr "未发现对象 %s 的注解。"
7385
2e8451e8 7386#: builtin/notes.c:406 builtin/notes.c:563
ef317cd5 7387msgid "note contents as a string"
07432cef 7388msgstr "注解内容作为一个字符串"
ef317cd5 7389
2e8451e8 7390#: builtin/notes.c:409 builtin/notes.c:566
ef317cd5 7391msgid "note contents in a file"
07432cef 7392msgstr "注解内容到一个文件中"
ef317cd5 7393
2e8451e8
JX
7394#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
7395#: builtin/notes.c:571 builtin/tag.c:474
ef317cd5 7396msgid "object"
07432cef 7397msgstr "对象"
ef317cd5 7398
2e8451e8 7399#: builtin/notes.c:412 builtin/notes.c:569
ef317cd5 7400msgid "reuse and edit specified note object"
07432cef 7401msgstr "重用和编辑指定的注解对象"
ef317cd5 7402
2e8451e8 7403#: builtin/notes.c:415 builtin/notes.c:572
ef317cd5 7404msgid "reuse specified note object"
07432cef 7405msgstr "重用指定的注解对象"
ef317cd5 7406
2e8451e8 7407#: builtin/notes.c:417 builtin/notes.c:485
ef317cd5 7408msgid "replace existing notes"
07432cef 7409msgstr "替换已存在的注解"
ef317cd5 7410
2e8451e8 7411#: builtin/notes.c:451
c04f5ac3
JX
7412#, c-format
7413msgid ""
7414"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7415"existing notes"
7416msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7417
2e8451e8 7418#: builtin/notes.c:456 builtin/notes.c:533
c04f5ac3
JX
7419#, c-format
7420msgid "Overwriting existing notes for object %s\n"
7421msgstr "覆盖对象 %s 现存注解\n"
7422
2e8451e8 7423#: builtin/notes.c:486
ef317cd5 7424msgid "read objects from stdin"
07432cef 7425msgstr "从标准输入读取对象"
ef317cd5 7426
2e8451e8 7427#: builtin/notes.c:488
ef317cd5 7428msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7429msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7430
2e8451e8 7431#: builtin/notes.c:506
c04f5ac3
JX
7432msgid "too few parameters"
7433msgstr "参数太少"
7434
2e8451e8 7435#: builtin/notes.c:527
c04f5ac3
JX
7436#, c-format
7437msgid ""
7438"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7439"existing notes"
7440msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7441
2e8451e8 7442#: builtin/notes.c:539
c04f5ac3
JX
7443#, c-format
7444msgid "Missing notes on source object %s. Cannot copy."
7445msgstr "源对象 %s 缺少注解。不能拷贝。"
7446
2e8451e8 7447#: builtin/notes.c:588
ef317cd5
JX
7448#, c-format
7449msgid ""
7450"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7451"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7452msgstr ""
7453"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7454"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7455
2e8451e8 7456#: builtin/notes.c:735
ef317cd5 7457msgid "General options"
07432cef 7458msgstr "通用选项"
ef317cd5 7459
2e8451e8 7460#: builtin/notes.c:737
ef317cd5 7461msgid "Merge options"
07432cef 7462msgstr "合并选项"
ef317cd5 7463
2e8451e8 7464#: builtin/notes.c:739
ef317cd5
JX
7465msgid ""
7466"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7467"cat_sort_uniq)"
07432cef 7468msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7469
2e8451e8 7470#: builtin/notes.c:741
ef317cd5 7471msgid "Committing unmerged notes"
07432cef 7472msgstr "提交未合并的注解"
ef317cd5 7473
2e8451e8 7474#: builtin/notes.c:743
ef317cd5 7475msgid "finalize notes merge by committing unmerged notes"
07432cef 7476msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7477
2e8451e8 7478#: builtin/notes.c:745
ef317cd5 7479msgid "Aborting notes merge resolution"
07432cef 7480msgstr "中止注解合并的方案"
ef317cd5 7481
2e8451e8 7482#: builtin/notes.c:747
ef317cd5 7483msgid "abort notes merge"
07432cef 7484msgstr "中止注解合并"
ef317cd5 7485
2e8451e8 7486#: builtin/notes.c:842
ef317cd5
JX
7487#, c-format
7488msgid "Object %s has no note\n"
7489msgstr "对象 %s 没有注解\n"
7490
2e8451e8 7491#: builtin/notes.c:854
ef317cd5 7492msgid "attempt to remove non-existent note is not an error"
07432cef 7493msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7494
2e8451e8 7495#: builtin/notes.c:857
ef317cd5 7496msgid "read object names from the standard input"
07432cef 7497msgstr "从标准输入读取对象名称"
ef317cd5 7498
2e8451e8 7499#: builtin/notes.c:938
ef317cd5 7500msgid "notes_ref"
07432cef 7501msgstr "注解引用"
ef317cd5 7502
2e8451e8 7503#: builtin/notes.c:939
ef317cd5 7504msgid "use notes from <notes_ref>"
07432cef 7505msgstr "从 <注解引用> 使用注解"
ef317cd5 7506
cfff71a9 7507#: builtin/notes.c:974 builtin/remote.c:1593
ef317cd5
JX
7508#, c-format
7509msgid "Unknown subcommand: %s"
7510msgstr "未知子命令:%s"
7511
7512#: builtin/pack-objects.c:23
7513msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7514msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5
JX
7515
7516#: builtin/pack-objects.c:24
7517msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7518msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5 7519
90314792 7520#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
ef317cd5
JX
7521#, c-format
7522msgid "deflate error (%d)"
7523msgstr "压缩错误 (%d)"
7524
cfff71a9 7525#: builtin/pack-objects.c:2396
ef317cd5
JX
7526#, c-format
7527msgid "unsupported index version %s"
7528msgstr "不支持的索引版本 %s"
7529
cfff71a9 7530#: builtin/pack-objects.c:2400
ef317cd5
JX
7531#, c-format
7532msgid "bad index version '%s'"
7533msgstr "坏的索引版本 '%s'"
7534
cfff71a9 7535#: builtin/pack-objects.c:2423
ef317cd5
JX
7536#, c-format
7537msgid "option %s does not accept negative form"
7538msgstr "选项 %s 不接受否定格式"
7539
cfff71a9 7540#: builtin/pack-objects.c:2427
ef317cd5
JX
7541#, c-format
7542msgid "unable to parse value '%s' for option %s"
7543msgstr "不能解析选项 %1$s 的值 '%2$s'"
7544
cfff71a9 7545#: builtin/pack-objects.c:2446
ef317cd5 7546msgid "do not show progress meter"
07432cef 7547msgstr "不显示进度表"
ef317cd5 7548
cfff71a9 7549#: builtin/pack-objects.c:2448
ef317cd5 7550msgid "show progress meter"
07432cef 7551msgstr "显示进度表"
ef317cd5 7552
cfff71a9 7553#: builtin/pack-objects.c:2450
ef317cd5 7554msgid "show progress meter during object writing phase"
07432cef 7555msgstr "在对象写入阶段显示进度表"
ef317cd5 7556
cfff71a9 7557#: builtin/pack-objects.c:2453
ef317cd5 7558msgid "similar to --all-progress when progress meter is shown"
07432cef 7559msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 7560
cfff71a9 7561#: builtin/pack-objects.c:2454
ef317cd5 7562msgid "version[,offset]"
07432cef 7563msgstr "版本[,偏移]"
ef317cd5 7564
cfff71a9 7565#: builtin/pack-objects.c:2455
ef317cd5 7566msgid "write the pack index file in the specified idx format version"
07432cef 7567msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 7568
cfff71a9 7569#: builtin/pack-objects.c:2458
ef317cd5 7570msgid "maximum size of each output pack file"
07432cef 7571msgstr "每个输出包的最大尺寸"
ef317cd5 7572
cfff71a9 7573#: builtin/pack-objects.c:2460
ef317cd5 7574msgid "ignore borrowed objects from alternate object store"
07432cef 7575msgstr "忽略从替代对象存储里借用对象"
ef317cd5 7576
cfff71a9 7577#: builtin/pack-objects.c:2462
ef317cd5 7578msgid "ignore packed objects"
07432cef 7579msgstr "忽略包对象"
ef317cd5 7580
cfff71a9 7581#: builtin/pack-objects.c:2464
ef317cd5 7582msgid "limit pack window by objects"
07432cef 7583msgstr "限制打包窗口的对象数"
ef317cd5 7584
cfff71a9 7585#: builtin/pack-objects.c:2466
ef317cd5 7586msgid "limit pack window by memory in addition to object limit"
07432cef 7587msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 7588
cfff71a9 7589#: builtin/pack-objects.c:2468
ef317cd5 7590msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 7591msgstr "打包允许的 delta 链的最大长度"
ef317cd5 7592
cfff71a9 7593#: builtin/pack-objects.c:2470
ef317cd5 7594msgid "reuse existing deltas"
07432cef 7595msgstr "重用已存在的 deltas"
ef317cd5 7596
cfff71a9 7597#: builtin/pack-objects.c:2472
ef317cd5 7598msgid "reuse existing objects"
07432cef 7599msgstr "重用已存在的对象"
ef317cd5 7600
cfff71a9 7601#: builtin/pack-objects.c:2474
ef317cd5 7602msgid "use OFS_DELTA objects"
07432cef 7603msgstr "使用 OFS_DELTA 对象"
ef317cd5 7604
cfff71a9 7605#: builtin/pack-objects.c:2476
ef317cd5 7606msgid "use threads when searching for best delta matches"
07432cef 7607msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 7608
cfff71a9 7609#: builtin/pack-objects.c:2478
ef317cd5 7610msgid "do not create an empty pack output"
07432cef 7611msgstr "不创建空的包输出"
ef317cd5 7612
cfff71a9 7613#: builtin/pack-objects.c:2480
ef317cd5 7614msgid "read revision arguments from standard input"
07432cef 7615msgstr "从标准输入读取修订号参数"
ef317cd5 7616
cfff71a9 7617#: builtin/pack-objects.c:2482
ef317cd5 7618msgid "limit the objects to those that are not yet packed"
07432cef 7619msgstr "限制那些尚未打包的对象"
ef317cd5 7620
cfff71a9 7621#: builtin/pack-objects.c:2485
ef317cd5 7622msgid "include objects reachable from any reference"
07432cef 7623msgstr "包括可以从任何引用访问到的对象"
ef317cd5 7624
cfff71a9 7625#: builtin/pack-objects.c:2488
ef317cd5 7626msgid "include objects referred by reflog entries"
07432cef 7627msgstr "包括被引用日志引用到的对象"
ef317cd5 7628
cfff71a9 7629#: builtin/pack-objects.c:2491
ef317cd5 7630msgid "output pack to stdout"
07432cef 7631msgstr "输出包到标准输出"
ef317cd5 7632
cfff71a9 7633#: builtin/pack-objects.c:2493
ef317cd5 7634msgid "include tag objects that refer to objects to be packed"
07432cef 7635msgstr "包括引用了打包对象的 tag"
ef317cd5 7636
cfff71a9 7637#: builtin/pack-objects.c:2495
ef317cd5 7638msgid "keep unreachable objects"
07432cef 7639msgstr "维持不可达的对象"
ef317cd5 7640
cfff71a9 7641#: builtin/pack-objects.c:2496 parse-options.h:143
ef317cd5
JX
7642msgid "time"
7643msgstr "时间"
7644
cfff71a9 7645#: builtin/pack-objects.c:2497
ef317cd5 7646msgid "unpack unreachable objects newer than <time>"
07432cef 7647msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 7648
cfff71a9 7649#: builtin/pack-objects.c:2500
ef317cd5 7650msgid "create thin packs"
07432cef 7651msgstr "创建精简包"
ef317cd5 7652
cfff71a9 7653#: builtin/pack-objects.c:2502
ef317cd5 7654msgid "ignore packs that have companion .keep file"
07432cef 7655msgstr "忽略配有 .keep 文件的包"
ef317cd5 7656
cfff71a9 7657#: builtin/pack-objects.c:2504
ef317cd5 7658msgid "pack compression level"
07432cef 7659msgstr "打包压缩级别"
ef317cd5 7660
cfff71a9 7661#: builtin/pack-objects.c:2506
ef317cd5 7662msgid "do not hide commits by grafts"
cfff71a9 7663msgstr "显示被嫁接隐藏的提交"
ef317cd5
JX
7664
7665#: builtin/pack-refs.c:6
7666msgid "git pack-refs [options]"
07432cef 7667msgstr "git pack-refs [选项]"
c04f5ac3 7668
ef317cd5
JX
7669#: builtin/pack-refs.c:14
7670msgid "pack everything"
07432cef 7671msgstr "打包一切"
c04f5ac3 7672
ef317cd5
JX
7673#: builtin/pack-refs.c:15
7674msgid "prune loose refs (default)"
07432cef 7675msgstr "清除松散的引用(默认)"
c04f5ac3 7676
ef317cd5
JX
7677#: builtin/prune-packed.c:7
7678msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 7679msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 7680
ef317cd5
JX
7681#: builtin/prune.c:12
7682msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 7683msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 7684
cfff71a9 7685#: builtin/prune.c:142
ef317cd5 7686msgid "do not remove, show only"
07432cef 7687msgstr "不删除,只显示"
7ac1c0ad 7688
cfff71a9 7689#: builtin/prune.c:143
ef317cd5 7690msgid "report pruned objects"
07432cef 7691msgstr "报告清除的对象"
7ac1c0ad 7692
cfff71a9 7693#: builtin/prune.c:146
ef317cd5 7694msgid "expire objects older than <time>"
07432cef 7695msgstr "使早于给定时间的对象过期"
ef317cd5
JX
7696
7697#: builtin/push.c:14
ef317cd5 7698msgid "git push [<options>] [<repository> [<refspec>...]]"
90314792 7699msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7ac1c0ad 7700
cfff71a9 7701#: builtin/push.c:86
c04f5ac3
JX
7702msgid "tag shorthand without <tag>"
7703msgstr "tag 简写没有跟 <tag> 参数"
7704
cfff71a9 7705#: builtin/push.c:96
c04f5ac3 7706msgid "--delete only accepts plain target ref names"
90e6ef53 7707msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 7708
cfff71a9 7709#: builtin/push.c:141
8ada9598
JX
7710msgid ""
7711"\n"
7712"To choose either option permanently, see push.default in 'git help config'."
7713msgstr ""
81809b99
JX
7714"\n"
7715"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 7716
cfff71a9 7717#: builtin/push.c:144
8ada9598
JX
7718#, c-format
7719msgid ""
7720"The upstream branch of your current branch does not match\n"
7721"the name of your current branch. To push to the upstream branch\n"
7722"on the remote, use\n"
7723"\n"
7724" git push %s HEAD:%s\n"
7725"\n"
7726"To push to the branch of the same name on the remote, use\n"
7727"\n"
7728" git push %s %s\n"
7729"%s"
7730msgstr ""
81809b99
JX
7731"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7732"上游分支,使用\n"
7733"\n"
7734" git push %s HEAD:%s\n"
7735"\n"
7736"为推送至远程同名分支,使用\n"
7737"\n"
7738" git push %s %s\n"
7739"%s"
8ada9598 7740
cfff71a9 7741#: builtin/push.c:159
c04f5ac3
JX
7742#, c-format
7743msgid ""
7744"You are not currently on a branch.\n"
7745"To push the history leading to the current (detached HEAD)\n"
7746"state now, use\n"
7747"\n"
7748" git push %s HEAD:<name-of-remote-branch>\n"
7749msgstr ""
7750"您当前不在一个分支上。\n"
90e6ef53 7751"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
7752"\n"
7753" git push %s HEAD:<name-of-remote-branch>\n"
7754
cfff71a9 7755#: builtin/push.c:173
c04f5ac3
JX
7756#, c-format
7757msgid ""
7758"The current branch %s has no upstream branch.\n"
7759"To push the current branch and set the remote as upstream, use\n"
7760"\n"
7761" git push --set-upstream %s %s\n"
7762msgstr ""
7763"当前分支 %s 没有对应的上游分支。\n"
7764"为推送当前分支并建立与远程上游的跟踪,使用\n"
7765"\n"
7766" git push --set-upstream %s %s\n"
7767
cfff71a9 7768#: builtin/push.c:181
c04f5ac3
JX
7769#, c-format
7770msgid "The current branch %s has multiple upstream branches, refusing to push."
7771msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7772
cfff71a9 7773#: builtin/push.c:184
73a60cd2
JX
7774#, c-format
7775msgid ""
7776"You are pushing to remote '%s', which is not the upstream of\n"
7777"your current branch '%s', without telling me what to push\n"
7778"to update which remote branch."
7779msgstr ""
7780"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7781"而没有告诉我要推送什么、更新哪个远程分支。"
7782
c160d03f 7783# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
cfff71a9 7784#: builtin/push.c:207
c160d03f
JX
7785msgid ""
7786"push.default is unset; its implicit value is changing in\n"
7787"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7788"and maintain the current behavior after the default changes, use:\n"
7789"\n"
7790" git config --global push.default matching\n"
7791"\n"
7792"To squelch this message and adopt the new behavior now, use:\n"
7793"\n"
7794" git config --global push.default simple\n"
7795"\n"
cfff71a9
JX
7796"When push.default is set to 'matching', git will push local branches\n"
7797"to the remote branches that already exist with the same name.\n"
7798"\n"
7799"In Git 2.0, Git will default to the more conservative 'simple'\n"
7800"behavior, which only pushes the current branch to the corresponding\n"
7801"remote branch that 'git pull' uses to update the current branch.\n"
7802"\n"
c160d03f
JX
7803"See 'git help config' and search for 'push.default' for further "
7804"information.\n"
7805"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7806"'current' instead of 'simple' if you sometimes use older versions of Git)"
7807msgstr ""
cfff71a9
JX
7808"push.default 尚未设置,它的默认值在 Git 2.0 从 'matching'\n"
7809"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
7810"\n"
7811" git config --global push.default matching\n"
7812"\n"
7813"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7814"\n"
7815" git config --global push.default simple\n"
7816"\n"
cfff71a9
JX
7817"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
7818"本地分支。\n"
7819"\n"
7820"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
7821"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
7822"\n"
c160d03f
JX
7823"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7824"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 7825"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 7826
cfff71a9 7827#: builtin/push.c:274
c04f5ac3
JX
7828msgid ""
7829"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90314792 7830msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
c04f5ac3 7831
cfff71a9 7832#: builtin/push.c:281
170e9899
JX
7833msgid ""
7834"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
7835"its remote counterpart. Integrate the remote changes (e.g.\n"
7836"'git pull ...') before pushing again.\n"
170e9899
JX
7837"See the 'Note about fast-forwards' in 'git push --help' for details."
7838msgstr ""
eff6d3a9 7839"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 7840"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 7841"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7842
cfff71a9 7843#: builtin/push.c:287
170e9899
JX
7844msgid ""
7845"Updates were rejected because a pushed branch tip is behind its remote\n"
7846"counterpart. If you did not intend to push that branch, you may want to\n"
c160d03f
JX
7847"specify branches to push or set the 'push.default' configuration variable\n"
7848"to 'simple', 'current' or 'upstream' to push only the current branch."
170e9899 7849msgstr ""
eff6d3a9
JX
7850"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7851"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
c160d03f
JX
7852"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7853"以便只推送当前分支。"
170e9899 7854
cfff71a9 7855#: builtin/push.c:293
170e9899
JX
7856msgid ""
7857"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
7858"counterpart. Check out this branch and integrate the remote changes\n"
7859"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
7860"See the 'Note about fast-forwards' in 'git push --help' for details."
7861msgstr ""
eff6d3a9 7862"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 7863"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 7864"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7865
cfff71a9 7866#: builtin/push.c:299
07432cef 7867msgid ""
a77c07d9
JX
7868"Updates were rejected because the remote contains work that you do\n"
7869"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
7870"to the same ref. You may want to first integrate the remote changes\n"
7871"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
7872"See the 'Note about fast-forwards' in 'git push --help' for details."
7873msgstr ""
7874"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
2e8451e8
JX
7875"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7876"(如 'git pull ...')。\n"
a77c07d9
JX
7877"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7878
cfff71a9 7879#: builtin/push.c:306
a77c07d9
JX
7880msgid "Updates were rejected because the tag already exists in the remote."
7881msgstr "更新被拒绝因为 tag 在远程已经存在。"
7882
cfff71a9 7883#: builtin/push.c:309
a77c07d9
JX
7884msgid ""
7885"You cannot update a remote ref that points at a non-commit object,\n"
7886"or update a remote ref to make it point at a non-commit object,\n"
7887"without using the '--force' option.\n"
7888msgstr ""
7889"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7890"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 7891
cfff71a9 7892#: builtin/push.c:375
c04f5ac3
JX
7893#, c-format
7894msgid "Pushing to %s\n"
7895msgstr "推送到 %s\n"
7896
cfff71a9 7897#: builtin/push.c:379
c04f5ac3
JX
7898#, c-format
7899msgid "failed to push some refs to '%s'"
7900msgstr "无法推送一些引用到 '%s'"
7901
cfff71a9 7902#: builtin/push.c:412
c04f5ac3
JX
7903#, c-format
7904msgid "bad repository '%s'"
90e6ef53 7905msgstr "坏的版本库 '%s'"
c04f5ac3 7906
cfff71a9 7907#: builtin/push.c:413
c04f5ac3
JX
7908msgid ""
7909"No configured push destination.\n"
7910"Either specify the URL from the command-line or configure a remote "
7911"repository using\n"
7912"\n"
7913" git remote add <name> <url>\n"
7914"\n"
7915"and then push using the remote name\n"
7916"\n"
7917" git push <name>\n"
7918msgstr ""
90e6ef53 7919"没有配置推送目标。\n"
07432cef 7920"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
7921"\n"
7922" git remote add <name> <url>\n"
7923"\n"
7924"然后使用该远程版本库名执行推送\n"
7925"\n"
7926" git push <name>\n"
7927
cfff71a9 7928#: builtin/push.c:428
c04f5ac3
JX
7929msgid "--all and --tags are incompatible"
7930msgstr "--all 和 --tags 不兼容"
7931
cfff71a9 7932#: builtin/push.c:429
c04f5ac3 7933msgid "--all can't be combined with refspecs"
90314792 7934msgstr "--all 不能和引用规则同时使用"
c04f5ac3 7935
cfff71a9 7936#: builtin/push.c:434
c04f5ac3
JX
7937msgid "--mirror and --tags are incompatible"
7938msgstr "--mirror 和 --tags 不兼容"
7939
cfff71a9 7940#: builtin/push.c:435
c04f5ac3 7941msgid "--mirror can't be combined with refspecs"
90314792 7942msgstr "--mirror 不能和引用规则同时使用"
c04f5ac3 7943
cfff71a9 7944#: builtin/push.c:440
c04f5ac3
JX
7945msgid "--all and --mirror are incompatible"
7946msgstr "--all 和 --mirror 不兼容"
7947
cfff71a9 7948#: builtin/push.c:500
ef317cd5 7949msgid "repository"
07432cef 7950msgstr "版本库"
ef317cd5 7951
cfff71a9 7952#: builtin/push.c:501
ef317cd5 7953msgid "push all refs"
07432cef 7954msgstr "推送所有引用"
ef317cd5 7955
cfff71a9 7956#: builtin/push.c:502
ef317cd5 7957msgid "mirror all refs"
07432cef 7958msgstr "镜像所有引用"
ef317cd5 7959
cfff71a9 7960#: builtin/push.c:504
ef317cd5 7961msgid "delete refs"
07432cef 7962msgstr "删除引用"
ef317cd5 7963
cfff71a9 7964#: builtin/push.c:505
ef317cd5 7965msgid "push tags (can't be used with --all or --mirror)"
07432cef 7966msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 7967
cfff71a9 7968#: builtin/push.c:508
ef317cd5
JX
7969msgid "force updates"
7970msgstr "强制更新"
7971
cfff71a9 7972#: builtin/push.c:510
90314792
JX
7973msgid "refname>:<expect"
7974msgstr "引用名>:<期望值"
7975
cfff71a9 7976#: builtin/push.c:511
90314792
JX
7977msgid "require old value of ref to be at this value"
7978msgstr "要求引用旧的取值为设定值"
7979
cfff71a9 7980#: builtin/push.c:513
ef317cd5 7981msgid "check"
07432cef 7982msgstr "检查"
ef317cd5 7983
cfff71a9 7984#: builtin/push.c:514
ef317cd5 7985msgid "control recursive pushing of submodules"
07432cef 7986msgstr "控制子模组的递归推送"
ef317cd5 7987
cfff71a9 7988#: builtin/push.c:516
ef317cd5 7989msgid "use thin pack"
07432cef 7990msgstr "使用精简打包"
ef317cd5 7991
cfff71a9 7992#: builtin/push.c:517 builtin/push.c:518
ef317cd5 7993msgid "receive pack program"
07432cef 7994msgstr "接收包程序"
ef317cd5 7995
cfff71a9 7996#: builtin/push.c:519
ef317cd5 7997msgid "set upstream for git pull/status"
07432cef 7998msgstr "设置 git pull/status 的上游"
ef317cd5 7999
cfff71a9 8000#: builtin/push.c:522
ef317cd5 8001msgid "prune locally removed refs"
07432cef 8002msgstr "清除本地删除的引用"
ef317cd5 8003
cfff71a9 8004#: builtin/push.c:524
a77c07d9
JX
8005msgid "bypass pre-push hook"
8006msgstr "绕过 pre-push 钩子"
8007
cfff71a9 8008#: builtin/push.c:525
1003b3a5
JX
8009msgid "push missing but relevant tags"
8010msgstr "推送缺失的有关的 tags"
8011
cfff71a9 8012#: builtin/push.c:535
c04f5ac3
JX
8013msgid "--delete is incompatible with --all, --mirror and --tags"
8014msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8015
cfff71a9 8016#: builtin/push.c:537
c04f5ac3
JX
8017msgid "--delete doesn't make sense without any refs"
8018msgstr "--delete 未接任何引用没有意义"
8019
ef317cd5
JX
8020#: builtin/read-tree.c:36
8021msgid ""
8022"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8023"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8024"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8025msgstr ""
07432cef
WS
8026"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8027"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8028"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 8029
2e8451e8 8030#: builtin/read-tree.c:109
ef317cd5 8031msgid "write resulting index to <file>"
07432cef 8032msgstr "将索引结果写入 <file>"
ef317cd5 8033
2e8451e8 8034#: builtin/read-tree.c:112
ef317cd5 8035msgid "only empty the index"
07432cef 8036msgstr "只是清空索引"
ef317cd5 8037
2e8451e8 8038#: builtin/read-tree.c:114
ef317cd5 8039msgid "Merging"
07432cef 8040msgstr "合并"
ef317cd5 8041
2e8451e8 8042#: builtin/read-tree.c:116
ef317cd5 8043msgid "perform a merge in addition to a read"
07432cef 8044msgstr "读取之余再执行一个合并"
ef317cd5 8045
2e8451e8 8046#: builtin/read-tree.c:118
ef317cd5 8047msgid "3-way merge if no file level merging required"
07432cef 8048msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5 8049
2e8451e8 8050#: builtin/read-tree.c:120
ef317cd5 8051msgid "3-way merge in presence of adds and removes"
07432cef 8052msgstr "存在添加和删除时,也执行三路合并"
ef317cd5 8053
2e8451e8 8054#: builtin/read-tree.c:122
ef317cd5 8055msgid "same as -m, but discard unmerged entries"
07432cef 8056msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 8057
2e8451e8 8058#: builtin/read-tree.c:123
ef317cd5 8059msgid "<subdirectory>/"
07432cef 8060msgstr "<子目录>/"
ef317cd5 8061
2e8451e8 8062#: builtin/read-tree.c:124
ef317cd5 8063msgid "read the tree into the index under <subdirectory>/"
07432cef 8064msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 8065
2e8451e8 8066#: builtin/read-tree.c:127
ef317cd5 8067msgid "update working tree with merge result"
07432cef 8068msgstr "用合并的结果更新工作区"
ef317cd5 8069
2e8451e8 8070#: builtin/read-tree.c:129
ef317cd5 8071msgid "gitignore"
07432cef 8072msgstr "gitignore"
ef317cd5 8073
2e8451e8 8074#: builtin/read-tree.c:130
ef317cd5 8075msgid "allow explicitly ignored files to be overwritten"
07432cef 8076msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 8077
2e8451e8 8078#: builtin/read-tree.c:133
ef317cd5 8079msgid "don't check the working tree after merging"
07432cef 8080msgstr "合并后不检查工作区"
ef317cd5 8081
2e8451e8 8082#: builtin/read-tree.c:134
ef317cd5 8083msgid "don't update the index or the work tree"
07432cef 8084msgstr "不更新索引区和工作区"
ef317cd5 8085
2e8451e8 8086#: builtin/read-tree.c:136
ef317cd5 8087msgid "skip applying sparse checkout filter"
07432cef 8088msgstr "跳过应用稀疏检出过滤器"
ef317cd5 8089
2e8451e8 8090#: builtin/read-tree.c:138
ef317cd5 8091msgid "debug unpack-trees"
07432cef 8092msgstr "调试 unpack-trees"
ef317cd5 8093
90314792 8094#: builtin/reflog.c:499
2e8451e8
JX
8095#, c-format
8096msgid "%s' for '%s' is not a valid timestamp"
8097msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8098
90314792 8099#: builtin/reflog.c:615 builtin/reflog.c:620
2e8451e8
JX
8100#, c-format
8101msgid "'%s' is not a valid timestamp"
8102msgstr "'%s' 不是一个有效的时间戳"
8103
cfff71a9 8104#: builtin/remote.c:12
ef317cd5 8105msgid "git remote [-v | --verbose]"
07432cef 8106msgstr "git remote [-v | --verbose]"
ef317cd5 8107
cfff71a9 8108#: builtin/remote.c:13
ef317cd5
JX
8109msgid ""
8110"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8111"mirror=<fetch|push>] <name> <url>"
8112msgstr ""
07432cef
WS
8113"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8114"mirror=<fetch|push>] <名称> <url>"
ef317cd5 8115
cfff71a9 8116#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 8117msgid "git remote rename <old> <new>"
07432cef 8118msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 8119
cfff71a9 8120#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 8121msgid "git remote remove <name>"
07432cef 8122msgstr "git remote remove <名称>"
ef317cd5 8123
cfff71a9 8124#: builtin/remote.c:16
90314792
JX
8125msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8126msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
ef317cd5 8127
cfff71a9 8128#: builtin/remote.c:17
ef317cd5 8129msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 8130msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 8131
cfff71a9 8132#: builtin/remote.c:18
ef317cd5 8133msgid "git remote prune [-n | --dry-run] <name>"
07432cef 8134msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 8135
cfff71a9 8136#: builtin/remote.c:19
ef317cd5
JX
8137msgid ""
8138"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 8139msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 8140
cfff71a9 8141#: builtin/remote.c:20
ef317cd5 8142msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 8143msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 8144
cfff71a9 8145#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 8146msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 8147msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 8148
cfff71a9 8149#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 8150msgid "git remote set-url --add <name> <newurl>"
07432cef 8151msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 8152
cfff71a9 8153#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 8154msgid "git remote set-url --delete <name> <url>"
07432cef 8155msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 8156
cfff71a9 8157#: builtin/remote.c:28
ef317cd5 8158msgid "git remote add [<options>] <name> <url>"
07432cef 8159msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 8160
cfff71a9 8161#: builtin/remote.c:43
90314792
JX
8162msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8163msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8164
cfff71a9 8165#: builtin/remote.c:48
ef317cd5 8166msgid "git remote set-branches <name> <branch>..."
07432cef 8167msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 8168
cfff71a9 8169#: builtin/remote.c:49
ef317cd5 8170msgid "git remote set-branches --add <name> <branch>..."
07432cef 8171msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 8172
cfff71a9 8173#: builtin/remote.c:54
ef317cd5 8174msgid "git remote show [<options>] <name>"
07432cef 8175msgstr "git remote show [<选项>] <名称>"
ef317cd5 8176
cfff71a9 8177#: builtin/remote.c:59
ef317cd5 8178msgid "git remote prune [<options>] <name>"
07432cef 8179msgstr "git remote prune [<选项>] <名称>"
ef317cd5 8180
cfff71a9 8181#: builtin/remote.c:64
ef317cd5 8182msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 8183msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 8184
cfff71a9 8185#: builtin/remote.c:88
81809b99 8186#, c-format
8ada9598 8187msgid "Updating %s"
81809b99 8188msgstr "更新 %s 中"
8ada9598 8189
cfff71a9 8190#: builtin/remote.c:120
8ada9598
JX
8191msgid ""
8192"--mirror is dangerous and deprecated; please\n"
8193"\t use --mirror=fetch or --mirror=push instead"
8194msgstr ""
81809b99
JX
8195"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8196"\t 或 --mirror=push"
8ada9598 8197
cfff71a9 8198#: builtin/remote.c:137
81809b99 8199#, c-format
8ada9598 8200msgid "unknown mirror argument: %s"
81809b99 8201msgstr "未知的镜像参数:%s"
8ada9598 8202
cfff71a9 8203#: builtin/remote.c:153
ef317cd5 8204msgid "fetch the remote branches"
07432cef 8205msgstr "抓取远程的分支"
ef317cd5 8206
cfff71a9 8207#: builtin/remote.c:155
ef317cd5 8208msgid "import all tags and associated objects when fetching"
07432cef 8209msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5 8210
cfff71a9 8211#: builtin/remote.c:158
ef317cd5 8212msgid "or do not fetch any tag at all (--no-tags)"
07432cef 8213msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5 8214
cfff71a9 8215#: builtin/remote.c:160
ef317cd5 8216msgid "branch(es) to track"
07432cef 8217msgstr "跟踪的分支"
ef317cd5 8218
cfff71a9 8219#: builtin/remote.c:161
ef317cd5 8220msgid "master branch"
07432cef 8221msgstr "主线分支"
ef317cd5 8222
cfff71a9 8223#: builtin/remote.c:162
ef317cd5 8224msgid "push|fetch"
07432cef 8225msgstr "push|fetch"
ef317cd5 8226
cfff71a9 8227#: builtin/remote.c:163
ef317cd5 8228msgid "set up remote as a mirror to push to or fetch from"
07432cef 8229msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 8230
cfff71a9 8231#: builtin/remote.c:175
8ada9598 8232msgid "specifying a master branch makes no sense with --mirror"
81809b99 8233msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 8234
cfff71a9 8235#: builtin/remote.c:177
8ada9598 8236msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 8237msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 8238
cfff71a9 8239#: builtin/remote.c:185 builtin/remote.c:641
81809b99 8240#, c-format
8ada9598 8241msgid "remote %s already exists."
81809b99 8242msgstr "远程 %s 已经存在。"
8ada9598 8243
cfff71a9 8244#: builtin/remote.c:189 builtin/remote.c:645
81809b99 8245#, c-format
8ada9598 8246msgid "'%s' is not a valid remote name"
81809b99 8247msgstr "'%s' 不是一个有效的远程名称"
8ada9598 8248
cfff71a9 8249#: builtin/remote.c:233
81809b99 8250#, c-format
8ada9598 8251msgid "Could not setup master '%s'"
81809b99 8252msgstr "无法设置 master '%s'"
8ada9598 8253
cfff71a9 8254#: builtin/remote.c:289
81809b99 8255#, c-format
8ada9598 8256msgid "more than one %s"
81809b99 8257msgstr "多于一个 %s"
8ada9598 8258
cfff71a9 8259#: builtin/remote.c:334
81809b99 8260#, c-format
8ada9598 8261msgid "Could not get fetch map for refspec %s"
90314792 8262msgstr "无法得到引用规则 %s 的获取列表"
8ada9598 8263
cfff71a9 8264#: builtin/remote.c:435 builtin/remote.c:443
8ada9598 8265msgid "(matching)"
81809b99 8266msgstr "(匹配)"
8ada9598 8267
cfff71a9 8268#: builtin/remote.c:447
8ada9598 8269msgid "(delete)"
81809b99 8270msgstr "(删除)"
8ada9598 8271
cfff71a9 8272#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
81809b99 8273#, c-format
8ada9598 8274msgid "Could not append '%s' to '%s'"
81809b99 8275msgstr "不能添加 '%s' 至 '%s'"
8ada9598 8276
cfff71a9 8277#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
81809b99 8278#, c-format
8ada9598 8279msgid "No such remote: %s"
81809b99 8280msgstr "没有这样的远程:%s"
8ada9598 8281
cfff71a9 8282#: builtin/remote.c:651
81809b99 8283#, c-format
8ada9598 8284msgid "Could not rename config section '%s' to '%s'"
81809b99 8285msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 8286
cfff71a9 8287#: builtin/remote.c:657 builtin/remote.c:794
81809b99 8288#, c-format
8ada9598 8289msgid "Could not remove config section '%s'"
81809b99 8290msgstr "不能移除配置小节 '%s'"
8ada9598 8291
cfff71a9 8292#: builtin/remote.c:672
8ada9598
JX
8293#, c-format
8294msgid ""
d691f479 8295"Not updating non-default fetch refspec\n"
8ada9598
JX
8296"\t%s\n"
8297"\tPlease update the configuration manually if necessary."
8298msgstr ""
90314792 8299"没有更新非默认的获取引用规则\n"
81809b99
JX
8300"\t%s\n"
8301"\t如果必要请手动更新配置。"
8ada9598 8302
cfff71a9 8303#: builtin/remote.c:678
81809b99 8304#, c-format
8ada9598 8305msgid "Could not append '%s'"
81809b99 8306msgstr "不能追加 '%s'"
8ada9598 8307
cfff71a9 8308#: builtin/remote.c:689
81809b99 8309#, c-format
8ada9598 8310msgid "Could not set '%s'"
81809b99 8311msgstr "不能设置 '%s'"
8ada9598 8312
cfff71a9 8313#: builtin/remote.c:711
81809b99 8314#, c-format
8ada9598 8315msgid "deleting '%s' failed"
81809b99 8316msgstr "删除 '%s' 失败"
8ada9598 8317
cfff71a9 8318#: builtin/remote.c:745
81809b99 8319#, c-format
8ada9598 8320msgid "creating '%s' failed"
81809b99 8321msgstr "创建 '%s' 失败"
8ada9598 8322
cfff71a9 8323#: builtin/remote.c:759
81809b99 8324#, c-format
8ada9598 8325msgid "Could not remove branch %s"
81809b99 8326msgstr "无法移除分支 %s"
8ada9598 8327
cfff71a9 8328#: builtin/remote.c:829
8ada9598
JX
8329msgid ""
8330"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8331"to delete it, use:"
8332msgid_plural ""
8333"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8334"to delete them, use:"
5ae481e0
JX
8335msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8336msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 8337
cfff71a9 8338#: builtin/remote.c:938
8ada9598
JX
8339#, c-format
8340msgid " new (next fetch will store in remotes/%s)"
81809b99 8341msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 8342
cfff71a9 8343#: builtin/remote.c:941
8ada9598 8344msgid " tracked"
81809b99 8345msgstr " 已跟踪"
8ada9598 8346
cfff71a9 8347#: builtin/remote.c:943
8ada9598 8348msgid " stale (use 'git remote prune' to remove)"
81809b99 8349msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 8350
cfff71a9 8351#: builtin/remote.c:945
8ada9598 8352msgid " ???"
81809b99 8353msgstr " ???"
8ada9598 8354
cfff71a9 8355#: builtin/remote.c:986
8ada9598
JX
8356#, c-format
8357msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8358msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 8359
cfff71a9 8360#: builtin/remote.c:993
81809b99 8361#, c-format
8ada9598 8362msgid "rebases onto remote %s"
81809b99 8363msgstr "变基到远程 %s"
8ada9598 8364
cfff71a9 8365#: builtin/remote.c:996
81809b99 8366#, c-format
8ada9598 8367msgid " merges with remote %s"
81809b99 8368msgstr " 与远程 %s 合并"
8ada9598 8369
cfff71a9 8370#: builtin/remote.c:997
8ada9598 8371msgid " and with remote"
81809b99 8372msgstr " 且有远程"
8ada9598 8373
cfff71a9 8374#: builtin/remote.c:999
81809b99 8375#, c-format
8ada9598 8376msgid "merges with remote %s"
81809b99 8377msgstr "与远程 %s 合并"
8ada9598 8378
cfff71a9 8379#: builtin/remote.c:1000
8ada9598 8380msgid " and with remote"
81809b99 8381msgstr " 且有远程"
8ada9598 8382
cfff71a9 8383#: builtin/remote.c:1046
8ada9598 8384msgid "create"
81809b99 8385msgstr "创建"
8ada9598 8386
cfff71a9 8387#: builtin/remote.c:1049
8ada9598 8388msgid "delete"
81809b99 8389msgstr "删除"
8ada9598 8390
cfff71a9 8391#: builtin/remote.c:1053
8ada9598 8392msgid "up to date"
81809b99 8393msgstr "最新"
8ada9598 8394
cfff71a9 8395#: builtin/remote.c:1056
8ada9598 8396msgid "fast-forwardable"
81809b99 8397msgstr "可快进"
8ada9598 8398
cfff71a9 8399#: builtin/remote.c:1059
8ada9598 8400msgid "local out of date"
81809b99 8401msgstr "本地已过时"
8ada9598 8402
cfff71a9 8403#: builtin/remote.c:1066
8ada9598
JX
8404#, c-format
8405msgid " %-*s forces to %-*s (%s)"
81809b99 8406msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 8407
cfff71a9 8408#: builtin/remote.c:1069
8ada9598
JX
8409#, c-format
8410msgid " %-*s pushes to %-*s (%s)"
81809b99 8411msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 8412
cfff71a9 8413#: builtin/remote.c:1073
8ada9598
JX
8414#, c-format
8415msgid " %-*s forces to %s"
81809b99 8416msgstr " %-*s 强制推送至 %s"
8ada9598 8417
cfff71a9 8418#: builtin/remote.c:1076
8ada9598
JX
8419#, c-format
8420msgid " %-*s pushes to %s"
81809b99 8421msgstr " %-*s 推送至 %s"
8ada9598 8422
cfff71a9 8423#: builtin/remote.c:1144
ef317cd5 8424msgid "do not query remotes"
07432cef 8425msgstr "不查询远程"
ef317cd5 8426
cfff71a9 8427#: builtin/remote.c:1171
81809b99 8428#, c-format
8ada9598 8429msgid "* remote %s"
81809b99 8430msgstr "* 远程 %s"
8ada9598 8431
cfff71a9 8432#: builtin/remote.c:1172
8ada9598
JX
8433#, c-format
8434msgid " Fetch URL: %s"
81809b99 8435msgstr " 获取地址:%s"
8ada9598 8436
cfff71a9 8437#: builtin/remote.c:1173 builtin/remote.c:1318
8ada9598 8438msgid "(no URL)"
81809b99 8439msgstr "(无 URL)"
8ada9598 8440
cfff71a9 8441#: builtin/remote.c:1182 builtin/remote.c:1184
8ada9598
JX
8442#, c-format
8443msgid " Push URL: %s"
81809b99 8444msgstr " 推送地址:%s"
8ada9598 8445
cfff71a9 8446#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
81809b99 8447#, c-format
8ada9598 8448msgid " HEAD branch: %s"
81809b99 8449msgstr " HEAD分支:%s"
8ada9598 8450
cfff71a9 8451#: builtin/remote.c:1192
8ada9598
JX
8452#, c-format
8453msgid ""
8454" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8455msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 8456
cfff71a9 8457#: builtin/remote.c:1204
81809b99 8458#, c-format
8ada9598
JX
8459msgid " Remote branch:%s"
8460msgid_plural " Remote branches:%s"
81809b99 8461msgstr[0] " 远程分支:%s"
5ae481e0 8462msgstr[1] " 远程分支:%s"
8ada9598 8463
81809b99 8464# 译者:中文字符串拼接,可删除前导空格
cfff71a9 8465#: builtin/remote.c:1207 builtin/remote.c:1234
8ada9598 8466msgid " (status not queried)"
81809b99 8467msgstr "(状态未查询)"
8ada9598 8468
cfff71a9 8469#: builtin/remote.c:1216
8ada9598
JX
8470msgid " Local branch configured for 'git pull':"
8471msgid_plural " Local branches configured for 'git pull':"
81809b99 8472msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8473msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 8474
cfff71a9 8475#: builtin/remote.c:1224
8ada9598 8476msgid " Local refs will be mirrored by 'git push'"
81809b99 8477msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 8478
cfff71a9 8479#: builtin/remote.c:1231
81809b99 8480#, c-format
8ada9598
JX
8481msgid " Local ref configured for 'git push'%s:"
8482msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8483msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8484msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8485
cfff71a9 8486#: builtin/remote.c:1252
ef317cd5 8487msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8488msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 8489
cfff71a9 8490#: builtin/remote.c:1254
ef317cd5 8491msgid "delete refs/remotes/<name>/HEAD"
07432cef 8492msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8493
cfff71a9 8494#: builtin/remote.c:1269
8ada9598 8495msgid "Cannot determine remote HEAD"
81809b99 8496msgstr "无法确定远程 HEAD"
8ada9598 8497
cfff71a9 8498#: builtin/remote.c:1271
8ada9598 8499msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8500msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 8501
cfff71a9 8502#: builtin/remote.c:1281
81809b99 8503#, c-format
8ada9598 8504msgid "Could not delete %s"
81809b99 8505msgstr "无法删除 %s"
8ada9598 8506
cfff71a9 8507#: builtin/remote.c:1289
81809b99 8508#, c-format
8ada9598 8509msgid "Not a valid ref: %s"
81809b99 8510msgstr "不是一个有效引用:%s"
8ada9598 8511
cfff71a9 8512#: builtin/remote.c:1291
81809b99 8513#, c-format
8ada9598 8514msgid "Could not setup %s"
81809b99 8515msgstr "不能设置 %s"
8ada9598
JX
8516
8517# 译者:注意保持前导空格
cfff71a9 8518#: builtin/remote.c:1307
81809b99 8519#, c-format
8ada9598 8520msgid " %s will become dangling!"
07432cef 8521msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8522
8523# 译者:注意保持前导空格
cfff71a9 8524#: builtin/remote.c:1308
81809b99 8525#, c-format
8ada9598 8526msgid " %s has become dangling!"
07432cef 8527msgstr " %s 已成为摇摆状态!"
8ada9598 8528
cfff71a9 8529#: builtin/remote.c:1314
81809b99 8530#, c-format
8ada9598 8531msgid "Pruning %s"
81809b99 8532msgstr "修剪 %s"
8ada9598 8533
cfff71a9 8534#: builtin/remote.c:1315
8ada9598
JX
8535#, c-format
8536msgid "URL: %s"
81809b99 8537msgstr "URL:%s"
8ada9598 8538
cfff71a9 8539#: builtin/remote.c:1328
8ada9598
JX
8540#, c-format
8541msgid " * [would prune] %s"
81809b99 8542msgstr " * [将删除] %s"
8ada9598 8543
cfff71a9 8544#: builtin/remote.c:1331
8ada9598
JX
8545#, c-format
8546msgid " * [pruned] %s"
81809b99 8547msgstr " * [已删除] %s"
8ada9598 8548
cfff71a9 8549#: builtin/remote.c:1374
ef317cd5 8550msgid "prune remotes after fetching"
07432cef 8551msgstr "抓取后清除远程"
ef317cd5 8552
cfff71a9 8553#: builtin/remote.c:1440 builtin/remote.c:1514
81809b99 8554#, c-format
8ada9598 8555msgid "No such remote '%s'"
81809b99 8556msgstr "没有此远程 '%s'"
8ada9598 8557
cfff71a9 8558#: builtin/remote.c:1460
ef317cd5 8559msgid "add branch"
07432cef 8560msgstr "添加分支"
ef317cd5 8561
cfff71a9 8562#: builtin/remote.c:1467
8ada9598 8563msgid "no remote specified"
81809b99 8564msgstr "未指定远程"
8ada9598 8565
cfff71a9 8566#: builtin/remote.c:1489
ef317cd5 8567msgid "manipulate push URLs"
07432cef 8568msgstr "操作推送 URLS"
ef317cd5 8569
cfff71a9 8570#: builtin/remote.c:1491
ef317cd5 8571msgid "add URL"
07432cef 8572msgstr "添加 URL"
ef317cd5 8573
cfff71a9 8574#: builtin/remote.c:1493
ef317cd5 8575msgid "delete URLs"
07432cef 8576msgstr "删除 URLS"
ef317cd5 8577
cfff71a9 8578#: builtin/remote.c:1500
8ada9598 8579msgid "--add --delete doesn't make sense"
81809b99 8580msgstr "--add --delete 无意义"
8ada9598 8581
cfff71a9 8582#: builtin/remote.c:1540
81809b99 8583#, c-format
8ada9598 8584msgid "Invalid old URL pattern: %s"
81809b99 8585msgstr "无效的旧URL匹配模版:%s"
8ada9598 8586
cfff71a9 8587#: builtin/remote.c:1548
81809b99 8588#, c-format
8ada9598 8589msgid "No such URL found: %s"
81809b99 8590msgstr "未找到此URL:%s"
8ada9598 8591
cfff71a9 8592#: builtin/remote.c:1550
8ada9598 8593msgid "Will not delete all non-push URLs"
81809b99 8594msgstr "将不会删除所有非推送URL地址"
8ada9598 8595
cfff71a9 8596#: builtin/remote.c:1564
ef317cd5 8597msgid "be verbose; must be placed before a subcommand"
07432cef 8598msgstr "冗长输出;必须置于子命令之前"
ef317cd5 8599
90314792
JX
8600#: builtin/repack.c:15
8601msgid "git repack [options]"
8602msgstr "git repack [选项]"
8603
8604#: builtin/repack.c:143
8605msgid "pack everything in a single pack"
8606msgstr "所有内容打包到一个包文件中"
8607
8608#: builtin/repack.c:145
8609msgid "same as -a, and turn unreachable objects loose"
8610msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8611
8612#: builtin/repack.c:148
8613msgid "remove redundant packs, and run git-prune-packed"
8614msgstr "删除多余的包,运行 git-prune-packed"
8615
8616#: builtin/repack.c:150
8617msgid "pass --no-reuse-delta to git-pack-objects"
8618msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8619
8620#: builtin/repack.c:152
8621msgid "pass --no-reuse-object to git-pack-objects"
8622msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8623
8624#: builtin/repack.c:154
8625msgid "do not run git-update-server-info"
8626msgstr "不运行 git-update-server-info"
8627
8628#: builtin/repack.c:157
8629msgid "pass --local to git-pack-objects"
8630msgstr "向 git-pack-objects 传递参数 --local"
8631
8632#: builtin/repack.c:158
8633msgid "approxidate"
8634msgstr "近似日期"
8635
8636#: builtin/repack.c:159
8637msgid "with -A, do not loosen objects older than this"
8638msgstr "使用 -A,不要将早于给定时间的对象过期"
8639
8640#: builtin/repack.c:161
8641msgid "size of the window used for delta compression"
8642msgstr "用于增量压缩的窗口值"
8643
8644#: builtin/repack.c:163
8645msgid "same as the above, but limit memory size instead of entries count"
8646msgstr "和上面的相似,但限制内存大小而非条目数"
8647
8648#: builtin/repack.c:165
8649msgid "limits the maximum delta depth"
8650msgstr "限制最大增量深度"
8651
8652#: builtin/repack.c:167
8653msgid "maximum size of each packfile"
8654msgstr "每个包的最大尺寸"
8655
cfff71a9 8656#: builtin/repack.c:343
90314792
JX
8657#, c-format
8658msgid "removing '%s' failed"
8659msgstr "删除 '%s' 失败"
8660
ef317cd5
JX
8661#: builtin/replace.c:17
8662msgid "git replace [-f] <object> <replacement>"
07432cef 8663msgstr "git replace [-f] <对象> <替换物>"
ef317cd5
JX
8664
8665#: builtin/replace.c:18
8666msgid "git replace -d <object>..."
07432cef 8667msgstr "git replace -d <对象>..."
ef317cd5
JX
8668
8669#: builtin/replace.c:19
cfff71a9
JX
8670msgid "git replace [--format=<format>] [-l [<pattern>]]"
8671msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 8672
cfff71a9 8673#: builtin/replace.c:174
ef317cd5 8674msgid "list replace refs"
07432cef 8675msgstr "列出替换的引用"
ef317cd5 8676
cfff71a9 8677#: builtin/replace.c:175
ef317cd5 8678msgid "delete replace refs"
07432cef 8679msgstr "删除替换的引用"
ef317cd5 8680
cfff71a9 8681#: builtin/replace.c:176
ef317cd5 8682msgid "replace the ref if it exists"
07432cef 8683msgstr "如果存在则替换引用"
ef317cd5 8684
cfff71a9
JX
8685#: builtin/replace.c:177
8686msgid "use this format"
8687msgstr "使用此格式"
8688
90314792 8689#: builtin/rerere.c:12
ef317cd5 8690msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 8691msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5 8692
90314792 8693#: builtin/rerere.c:57
ef317cd5 8694msgid "register clean resolutions in index"
07432cef 8695msgstr "在索引中注册干净的解决方案"
ef317cd5
JX
8696
8697#: builtin/reset.c:25
8698msgid ""
8699"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 8700msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5
JX
8701
8702#: builtin/reset.c:26
07432cef
WS
8703msgid "git reset [-q] <tree-ish> [--] <paths>..."
8704msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5
JX
8705
8706#: builtin/reset.c:27
07432cef
WS
8707msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8708msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 8709
c04f5ac3
JX
8710#: builtin/reset.c:33
8711msgid "mixed"
8712msgstr "混杂"
8713
8714#: builtin/reset.c:33
8715msgid "soft"
8716msgstr "软性"
8717
8718#: builtin/reset.c:33
8719msgid "hard"
8720msgstr "硬性"
8721
8ada9598
JX
8722#: builtin/reset.c:33
8723msgid "merge"
8724msgstr "合并"
8725
c04f5ac3
JX
8726#: builtin/reset.c:33
8727msgid "keep"
8728msgstr "保持"
8729
07432cef 8730#: builtin/reset.c:73
c04f5ac3
JX
8731msgid "You do not have a valid HEAD."
8732msgstr "您没有一个有效的 HEAD。"
8733
07432cef 8734#: builtin/reset.c:75
c04f5ac3
JX
8735msgid "Failed to find tree of HEAD."
8736msgstr "无法找到 HEAD 指向的树。"
8737
07432cef 8738#: builtin/reset.c:81
c04f5ac3
JX
8739#, c-format
8740msgid "Failed to find tree of %s."
8741msgstr "无法找到 %s 指向的树。"
8742
2e8451e8 8743#: builtin/reset.c:99
c04f5ac3
JX
8744#, c-format
8745msgid "HEAD is now at %s"
8746msgstr "HEAD 现在位于 %s"
8747
90e6ef53 8748# 译者:汉字之间无空格,故删除%s前后空格
2e8451e8 8749#: builtin/reset.c:172
c04f5ac3
JX
8750#, c-format
8751msgid "Cannot do a %s reset in the middle of a merge."
8752msgstr "在合并过程中不能做%s重置操作。"
8753
90314792 8754#: builtin/reset.c:262
ef317cd5 8755msgid "be quiet, only report errors"
07432cef 8756msgstr "安静模式,只报告错误"
ef317cd5 8757
90314792 8758#: builtin/reset.c:264
ef317cd5 8759msgid "reset HEAD and index"
07432cef 8760msgstr "重置 HEAD 和索引"
ef317cd5 8761
90314792 8762#: builtin/reset.c:265
ef317cd5 8763msgid "reset only HEAD"
07432cef 8764msgstr "只重置 HEAD"
ef317cd5 8765
90314792 8766#: builtin/reset.c:267 builtin/reset.c:269
ef317cd5 8767msgid "reset HEAD, index and working tree"
07432cef 8768msgstr "重置 HEAD、索引和工作区"
ef317cd5 8769
90314792 8770#: builtin/reset.c:271
ef317cd5 8771msgid "reset HEAD but keep local changes"
07432cef 8772msgstr "重置 HEAD 但保存本地变更"
ef317cd5 8773
90314792 8774#: builtin/reset.c:289
07432cef
WS
8775#, c-format
8776msgid "Failed to resolve '%s' as a valid revision."
8777msgstr "无法将 '%s' 解析为一个有效的版本。"
8778
90314792 8779#: builtin/reset.c:292 builtin/reset.c:300
c04f5ac3
JX
8780#, c-format
8781msgid "Could not parse object '%s'."
8782msgstr "不能解析对象 '%s'。"
8783
90314792 8784#: builtin/reset.c:297
07432cef
WS
8785#, c-format
8786msgid "Failed to resolve '%s' as a valid tree."
8787msgstr "无法将 '%s' 解析为一个有效的树对象。"
8788
90314792 8789#: builtin/reset.c:306
c04f5ac3 8790msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 8791msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 8792
90314792 8793#: builtin/reset.c:315
c04f5ac3 8794msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 8795msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 8796
90e6ef53 8797# 译者:汉字之间无空格,故删除%s前后空格
90314792 8798#: builtin/reset.c:317
c04f5ac3
JX
8799#, c-format
8800msgid "Cannot do %s reset with paths."
8801msgstr "不能带路径进行%s重置。"
8802
90e6ef53 8803# 译者:汉字之间无空格,故删除%s前后空格
90314792 8804#: builtin/reset.c:327
c04f5ac3
JX
8805#, c-format
8806msgid "%s reset is not allowed in a bare repository"
8807msgstr "不能对裸版本库进行%s重置"
8808
90314792
JX
8809#: builtin/reset.c:344
8810msgid "Unstaged changes after reset:"
8811msgstr "重置后撤出暂存区的变更:"
8812
8813#: builtin/reset.c:350
ef317cd5
JX
8814#, c-format
8815msgid "Could not reset index file to revision '%s'."
8816msgstr "不能重置索引文件至版本 '%s'。"
8817
90314792 8818#: builtin/reset.c:355
07432cef
WS
8819msgid "Could not write new index file."
8820msgstr "不能写入新的索引文件。"
8821
cfff71a9 8822#: builtin/rev-parse.c:359
ef317cd5 8823msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 8824msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5 8825
cfff71a9 8826#: builtin/rev-parse.c:364
ef317cd5 8827msgid "keep the `--` passed as an arg"
07432cef 8828msgstr "保持 `--` 作为一个参数传递"
ef317cd5 8829
cfff71a9 8830#: builtin/rev-parse.c:366
ef317cd5 8831msgid "stop parsing after the first non-option argument"
07432cef 8832msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 8833
cfff71a9
JX
8834#: builtin/rev-parse.c:369
8835msgid "output in stuck long form"
8836msgstr "以固定长格式输出"
8837
8838#: builtin/rev-parse.c:486
ef317cd5
JX
8839msgid ""
8840"git rev-parse --parseopt [options] -- [<args>...]\n"
8841" or: git rev-parse --sq-quote [<arg>...]\n"
8842" or: git rev-parse [options] [<arg>...]\n"
8843"\n"
8844"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8845msgstr ""
07432cef 8846"git rev-parse --parseopt [选项] -- [<参数>...]\n"
90314792
JX
8847" 或者:git rev-parse --sq-quote [<参数>...]\n"
8848" 或者:git rev-parse [选项] [<参数>...]\n"
07432cef
WS
8849"\n"
8850"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
8851
8852#: builtin/revert.c:22
4dcdc3d8
JX
8853msgid "git revert [options] <commit-ish>..."
8854msgstr "git revert [选项] <提交号>..."
ef317cd5
JX
8855
8856#: builtin/revert.c:23
8857msgid "git revert <subcommand>"
07432cef 8858msgstr "git revert <子命令>"
ef317cd5
JX
8859
8860#: builtin/revert.c:28
4dcdc3d8
JX
8861msgid "git cherry-pick [options] <commit-ish>..."
8862msgstr "git cherry-pick [选项] <提交号>..."
ef317cd5
JX
8863
8864#: builtin/revert.c:29
ef317cd5 8865msgid "git cherry-pick <subcommand>"
07432cef 8866msgstr "git cherry-pick <子命令>"
ef317cd5 8867
90314792 8868#: builtin/revert.c:71
ef317cd5
JX
8869#, c-format
8870msgid "%s: %s cannot be used with %s"
8871msgstr "%s:%s 不能和 %s 同时使用"
8872
90314792 8873#: builtin/revert.c:80
ef317cd5 8874msgid "end revert or cherry-pick sequence"
07432cef 8875msgstr "终止反转或拣选操作"
ef317cd5 8876
90314792 8877#: builtin/revert.c:81
ef317cd5 8878msgid "resume revert or cherry-pick sequence"
07432cef 8879msgstr "继续反转或拣选操作"
ef317cd5 8880
90314792 8881#: builtin/revert.c:82
ef317cd5 8882msgid "cancel revert or cherry-pick sequence"
07432cef 8883msgstr "取消反转或拣选操作"
ef317cd5 8884
90314792 8885#: builtin/revert.c:83
ef317cd5 8886msgid "don't automatically commit"
07432cef 8887msgstr "不要自动提交"
ef317cd5 8888
90314792 8889#: builtin/revert.c:84
ef317cd5 8890msgid "edit the commit message"
07432cef 8891msgstr "编辑提交说明"
ef317cd5 8892
90314792 8893#: builtin/revert.c:87
ef317cd5 8894msgid "parent number"
07432cef 8895msgstr "父编号"
ef317cd5 8896
90314792 8897#: builtin/revert.c:89
ef317cd5 8898msgid "merge strategy"
07432cef 8899msgstr "合并策略"
ef317cd5 8900
90314792 8901#: builtin/revert.c:90
ef317cd5 8902msgid "option"
07432cef 8903msgstr "选项"
ef317cd5 8904
90314792 8905#: builtin/revert.c:91
ef317cd5 8906msgid "option for merge strategy"
07432cef 8907msgstr "合并策略的选项"
ef317cd5 8908
90314792 8909#: builtin/revert.c:102
ef317cd5 8910msgid "append commit name"
07432cef 8911msgstr "追加提交名称"
ef317cd5 8912
90314792 8913#: builtin/revert.c:103
ef317cd5 8914msgid "allow fast-forward"
07432cef 8915msgstr "允许快进式"
c04f5ac3 8916
90314792 8917#: builtin/revert.c:104
ef317cd5 8918msgid "preserve initially empty commits"
07432cef 8919msgstr "保留初始化的空提交"
ef317cd5 8920
90314792 8921#: builtin/revert.c:105
ef317cd5 8922msgid "allow commits with empty messages"
07432cef 8923msgstr "允许提交说明为空"
c04f5ac3 8924
90314792 8925#: builtin/revert.c:106
ef317cd5 8926msgid "keep redundant, empty commits"
07432cef 8927msgstr "保持多余的、空的提交"
ef317cd5 8928
90314792 8929#: builtin/revert.c:110
c04f5ac3
JX
8930msgid "program error"
8931msgstr "程序错误"
8932
90314792 8933#: builtin/revert.c:195
c04f5ac3
JX
8934msgid "revert failed"
8935msgstr "还原失败"
8936
90314792 8937#: builtin/revert.c:210
c04f5ac3
JX
8938msgid "cherry-pick failed"
8939msgstr "拣选失败"
8940
90314792 8941#: builtin/rm.c:17
ef317cd5 8942msgid "git rm [options] [--] <file>..."
07432cef
WS
8943msgstr "git rm [选项] [--] <文件>..."
8944
90314792 8945#: builtin/rm.c:65
2e8451e8
JX
8946msgid ""
8947"the following submodule (or one of its nested submodules)\n"
8948"uses a .git directory:"
8949msgid_plural ""
8950"the following submodules (or one of its nested submodules)\n"
8951"use a .git directory:"
8952msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8953msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8954
90314792 8955#: builtin/rm.c:71
07432cef 8956msgid ""
2e8451e8 8957"\n"
07432cef
WS
8958"(use 'rm -rf' if you really want to remove it including all of its history)"
8959msgstr ""
2e8451e8 8960"\n"
07432cef 8961"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 8962
90314792 8963#: builtin/rm.c:231
c04f5ac3 8964msgid ""
2e8451e8
JX
8965"the following file has staged content different from both the\n"
8966"file and the HEAD:"
8967msgid_plural ""
8968"the following files have staged content different from both the\n"
8969"file and the HEAD:"
8970msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8971msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8972
90314792 8973#: builtin/rm.c:236
2e8451e8
JX
8974msgid ""
8975"\n"
c04f5ac3
JX
8976"(use -f to force removal)"
8977msgstr ""
2e8451e8 8978"\n"
c04f5ac3
JX
8979"(使用 -f 强制删除)"
8980
90314792 8981#: builtin/rm.c:240
2e8451e8
JX
8982msgid "the following file has changes staged in the index:"
8983msgid_plural "the following files have changes staged in the index:"
8984msgstr[0] "如下文件相对索引区的内容有修改"
8985msgstr[1] "如下文件相对索引区的内容有修改"
c04f5ac3 8986
90314792 8987#: builtin/rm.c:244 builtin/rm.c:255
c04f5ac3 8988msgid ""
2e8451e8 8989"\n"
c04f5ac3
JX
8990"(use --cached to keep the file, or -f to force removal)"
8991msgstr ""
2e8451e8
JX
8992"\n"
8993"(使用 --cached 保留本地文件,或用 -f 强制删除)"
8994
90314792 8995#: builtin/rm.c:252
2e8451e8
JX
8996msgid "the following file has local modifications:"
8997msgid_plural "the following files have local modifications:"
8998msgstr[0] "如下文件有本地修改:"
8999msgstr[1] "如下文件有本地修改:"
c04f5ac3 9000
90314792 9001#: builtin/rm.c:270
ef317cd5 9002msgid "do not list removed files"
07432cef 9003msgstr "不列出删除的文件"
ef317cd5 9004
90314792 9005#: builtin/rm.c:271
ef317cd5 9006msgid "only remove from the index"
07432cef 9007msgstr "只从索引区删除"
ef317cd5 9008
90314792 9009#: builtin/rm.c:272
ef317cd5 9010msgid "override the up-to-date check"
07432cef 9011msgstr "忽略文件更新状态检查"
ef317cd5 9012
90314792 9013#: builtin/rm.c:273
ef317cd5 9014msgid "allow recursive removal"
07432cef 9015msgstr "允许递归删除"
ef317cd5 9016
90314792 9017#: builtin/rm.c:275
ef317cd5 9018msgid "exit with a zero status even if nothing matched"
07432cef 9019msgstr "即使没有匹配,也以零状态退出"
ef317cd5 9020
90314792 9021#: builtin/rm.c:336
c04f5ac3
JX
9022#, c-format
9023msgid "not removing '%s' recursively without -r"
9024msgstr "未提供 -r 选项不会递归删除 '%s'"
9025
90314792 9026#: builtin/rm.c:375
c04f5ac3
JX
9027#, c-format
9028msgid "git rm: unable to remove %s"
9029msgstr "git rm:不能删除 %s"
9030
ef317cd5 9031#: builtin/shortlog.c:13
4dcdc3d8
JX
9032msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9033msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 9034
4dcdc3d8 9035#: builtin/shortlog.c:131
c04f5ac3
JX
9036#, c-format
9037msgid "Missing author: %s"
9038msgstr "缺少作者:%s"
9039
90314792 9040#: builtin/shortlog.c:230
ef317cd5 9041msgid "sort output according to the number of commits per author"
07432cef 9042msgstr "根据每个作者的提交数量排序"
ef317cd5 9043
90314792 9044#: builtin/shortlog.c:232
ef317cd5 9045msgid "Suppress commit descriptions, only provides commit count"
07432cef 9046msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 9047
90314792 9048#: builtin/shortlog.c:234
ef317cd5 9049msgid "Show the email address of each author"
07432cef 9050msgstr "显示每个作者的电子邮件地址"
ef317cd5 9051
90314792 9052#: builtin/shortlog.c:235
ef317cd5 9053msgid "w[,i1[,i2]]"
07432cef 9054msgstr "w[,i1[,i2]]"
ef317cd5 9055
90314792 9056#: builtin/shortlog.c:236
ef317cd5 9057msgid "Linewrap output"
07432cef 9058msgstr "折行输出"
ef317cd5
JX
9059
9060#: builtin/show-branch.c:9
9061msgid ""
9062"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9063"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9064"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9065"<glob>)...]"
9066msgstr ""
07432cef
WS
9067"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9068"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9069"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9070"<glob>)...]"
ef317cd5
JX
9071
9072#: builtin/show-branch.c:10
9073msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 9074msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5 9075
cfff71a9 9076#: builtin/show-branch.c:649
ef317cd5 9077msgid "show remote-tracking and local branches"
07432cef 9078msgstr "显示远程跟踪的和本地的分支"
ef317cd5 9079
cfff71a9 9080#: builtin/show-branch.c:651
ef317cd5 9081msgid "show remote-tracking branches"
07432cef 9082msgstr "显示远程跟踪的分支"
ef317cd5 9083
cfff71a9 9084#: builtin/show-branch.c:653
ef317cd5 9085msgid "color '*!+-' corresponding to the branch"
07432cef 9086msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 9087
cfff71a9 9088#: builtin/show-branch.c:655
ef317cd5 9089msgid "show <n> more commits after the common ancestor"
07432cef 9090msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 9091
cfff71a9 9092#: builtin/show-branch.c:657
ef317cd5 9093msgid "synonym to more=-1"
07432cef 9094msgstr "和 more=-1 同义"
ef317cd5 9095
cfff71a9 9096#: builtin/show-branch.c:658
ef317cd5 9097msgid "suppress naming strings"
07432cef 9098msgstr "不显示字符串命名"
ef317cd5 9099
cfff71a9 9100#: builtin/show-branch.c:660
ef317cd5 9101msgid "include the current branch"
07432cef 9102msgstr "包括当前分支"
ef317cd5 9103
cfff71a9 9104#: builtin/show-branch.c:662
ef317cd5 9105msgid "name commits with their object names"
07432cef 9106msgstr "以对象名字命名提交"
ef317cd5 9107
cfff71a9 9108#: builtin/show-branch.c:664
ef317cd5 9109msgid "show possible merge bases"
07432cef 9110msgstr "显示可能合并的基线"
ef317cd5 9111
cfff71a9 9112#: builtin/show-branch.c:666
ef317cd5 9113msgid "show refs unreachable from any other ref"
07432cef 9114msgstr "显示没有任何引用的的引用"
ef317cd5 9115
cfff71a9 9116#: builtin/show-branch.c:668
ef317cd5 9117msgid "show commits in topological order"
07432cef 9118msgstr "以拓扑顺序显示提交"
ef317cd5 9119
cfff71a9 9120#: builtin/show-branch.c:671
ef317cd5 9121msgid "show only commits not on the first branch"
07432cef 9122msgstr "只显示不在第一个分支上的提交"
ef317cd5 9123
cfff71a9 9124#: builtin/show-branch.c:673
ef317cd5 9125msgid "show merges reachable from only one tip"
07432cef 9126msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 9127
cfff71a9 9128#: builtin/show-branch.c:675
2e8451e8
JX
9129msgid "topologically sort, maintaining date order where possible"
9130msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 9131
cfff71a9 9132#: builtin/show-branch.c:678
ef317cd5 9133msgid "<n>[,<base>]"
07432cef 9134msgstr "<n>[,<base>]"
ef317cd5 9135
cfff71a9 9136#: builtin/show-branch.c:679
ef317cd5 9137msgid "show <n> most recent ref-log entries starting at base"
07432cef 9138msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
9139
9140#: builtin/show-ref.c:10
9141msgid ""
a77c07d9
JX
9142"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9143"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5 9144msgstr ""
a77c07d9
JX
9145"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9146"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
9147
9148#: builtin/show-ref.c:11
9149msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 9150msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 9151
2e8451e8 9152#: builtin/show-ref.c:168
ef317cd5 9153msgid "only show tags (can be combined with heads)"
07432cef 9154msgstr "只显示 tags(可以和头共用)"
ef317cd5 9155
2e8451e8 9156#: builtin/show-ref.c:169
ef317cd5 9157msgid "only show heads (can be combined with tags)"
07432cef 9158msgstr "只显示头(可以和 tags 共用)"
ef317cd5 9159
2e8451e8 9160#: builtin/show-ref.c:170
ef317cd5 9161msgid "stricter reference checking, requires exact ref path"
07432cef 9162msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 9163
90314792 9164#: builtin/show-ref.c:173 builtin/show-ref.c:175
2e8451e8
JX
9165msgid "show the HEAD reference, even if it would be filtered out"
9166msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 9167
90314792 9168#: builtin/show-ref.c:177
ef317cd5 9169msgid "dereference tags into object IDs"
07432cef 9170msgstr "转换 tags 到对象ID"
ef317cd5 9171
90314792 9172#: builtin/show-ref.c:179
ef317cd5 9173msgid "only show SHA1 hash using <n> digits"
07432cef 9174msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 9175
90314792 9176#: builtin/show-ref.c:183
ef317cd5 9177msgid "do not print results to stdout (useful with --verify)"
07432cef 9178msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 9179
90314792 9180#: builtin/show-ref.c:185
ef317cd5 9181msgid "show refs from stdin that aren't in local repository"
07432cef 9182msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
9183
9184#: builtin/symbolic-ref.c:7
9185msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
9186msgstr "git symbolic-ref [选项] 名称 [引用]"
9187
9188#: builtin/symbolic-ref.c:8
9189msgid "git symbolic-ref -d [-q] name"
9190msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 9191
07432cef 9192#: builtin/symbolic-ref.c:40
ef317cd5 9193msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
9194msgstr "不显示非符号(分离的)引用的错误信息"
9195
9196#: builtin/symbolic-ref.c:41
9197msgid "delete symbolic ref"
9198msgstr "删除符号引用"
ef317cd5 9199
07432cef 9200#: builtin/symbolic-ref.c:42
ef317cd5 9201msgid "shorten ref output"
07432cef 9202msgstr "简短的引用输出"
ef317cd5 9203
90314792 9204#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
ef317cd5 9205msgid "reason"
07432cef 9206msgstr "原因"
ef317cd5 9207
90314792 9208#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
ef317cd5 9209msgid "reason of the update"
07432cef 9210msgstr "更新的原因"
ef317cd5
JX
9211
9212#: builtin/tag.c:22
9213msgid ""
9214"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
a77c07d9 9215msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
9216
9217#: builtin/tag.c:23
9218msgid "git tag -d <tagname>..."
07432cef 9219msgstr "git tag -d <标签名>..."
ef317cd5
JX
9220
9221#: builtin/tag.c:24
9222msgid ""
9223"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9224"\t\t[<pattern>...]"
9225msgstr ""
07432cef
WS
9226"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9227"\t\t[<模式>...]"
ef317cd5
JX
9228
9229#: builtin/tag.c:26
9230msgid "git tag -v <tagname>..."
07432cef 9231msgstr "git tag -v <标签名>..."
ef317cd5 9232
8ada9598 9233#: builtin/tag.c:60
7ac1c0ad
JX
9234#, c-format
9235msgid "malformed object at '%s'"
9236msgstr "非法的对象于 '%s'"
9237
8ada9598 9238#: builtin/tag.c:207
c04f5ac3
JX
9239#, c-format
9240msgid "tag name too long: %.*s..."
9241msgstr "tag 名字太长:%.*s..."
9242
8ada9598 9243#: builtin/tag.c:212
c04f5ac3
JX
9244#, c-format
9245msgid "tag '%s' not found."
9246msgstr "tag '%s' 未发现。"
9247
8ada9598 9248#: builtin/tag.c:227
c04f5ac3
JX
9249#, c-format
9250msgid "Deleted tag '%s' (was %s)\n"
9251msgstr "已删除 tag '%s'(曾为 %s)\n"
9252
8ada9598 9253#: builtin/tag.c:239
c04f5ac3
JX
9254#, c-format
9255msgid "could not verify the tag '%s'"
9256msgstr "不能校验 tag '%s'"
9257
8ada9598 9258#: builtin/tag.c:249
a77c07d9 9259#, c-format
c04f5ac3
JX
9260msgid ""
9261"\n"
a77c07d9
JX
9262"Write a tag message\n"
9263"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
9264msgstr ""
9265"\n"
a77c07d9
JX
9266"输入一个 tag 说明\n"
9267"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 9268
a77c07d9
JX
9269#: builtin/tag.c:253
9270#, c-format
c04f5ac3
JX
9271msgid ""
9272"\n"
a77c07d9
JX
9273"Write a tag message\n"
9274"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 9275"want to.\n"
c04f5ac3
JX
9276msgstr ""
9277"\n"
a77c07d9
JX
9278"输入一个 tag 说明\n"
9279"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 9280
a77c07d9 9281#: builtin/tag.c:292
c04f5ac3
JX
9282msgid "unable to sign the tag"
9283msgstr "无法签署 tag"
9284
a77c07d9 9285#: builtin/tag.c:294
c04f5ac3
JX
9286msgid "unable to write tag file"
9287msgstr "无法写 tag 文件"
9288
a77c07d9 9289#: builtin/tag.c:319
c04f5ac3 9290msgid "bad object type."
90e6ef53 9291msgstr "坏的对象类型。"
c04f5ac3 9292
a77c07d9 9293#: builtin/tag.c:332
c04f5ac3 9294msgid "tag header too big."
90e6ef53 9295msgstr "tag 头信息太大。"
c04f5ac3 9296
a77c07d9 9297#: builtin/tag.c:368
c04f5ac3
JX
9298msgid "no tag message?"
9299msgstr "无 tag 说明?"
9300
a77c07d9 9301#: builtin/tag.c:374
c04f5ac3
JX
9302#, c-format
9303msgid "The tag message has been left in %s\n"
9304msgstr "tag 说明被保留在 %s\n"
9305
a77c07d9 9306#: builtin/tag.c:423
7ac1c0ad
JX
9307msgid "switch 'points-at' requires an object"
9308msgstr "开关 'points-at' 需要一个对象"
9309
a77c07d9 9310#: builtin/tag.c:425
7ac1c0ad
JX
9311#, c-format
9312msgid "malformed object name '%s'"
9313msgstr "非法的对象名 '%s'"
9314
a77c07d9 9315#: builtin/tag.c:445
ef317cd5 9316msgid "list tag names"
07432cef 9317msgstr "列出tag名称"
ef317cd5 9318
a77c07d9 9319#: builtin/tag.c:447
ef317cd5 9320msgid "print <n> lines of each tag message"
07432cef 9321msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 9322
a77c07d9 9323#: builtin/tag.c:449
ef317cd5 9324msgid "delete tags"
07432cef 9325msgstr "删除 tags"
ef317cd5 9326
a77c07d9 9327#: builtin/tag.c:450
ef317cd5 9328msgid "verify tags"
07432cef 9329msgstr "验证 tags"
ef317cd5 9330
a77c07d9 9331#: builtin/tag.c:452
ef317cd5 9332msgid "Tag creation options"
07432cef 9333msgstr "Tag 创建选项"
ef317cd5 9334
a77c07d9 9335#: builtin/tag.c:454
ef317cd5 9336msgid "annotated tag, needs a message"
07432cef 9337msgstr "注解 tag,需要一个说明"
ef317cd5 9338
a77c07d9 9339#: builtin/tag.c:456
ef317cd5 9340msgid "tag message"
07432cef 9341msgstr "tag 说明"
ef317cd5 9342
a77c07d9 9343#: builtin/tag.c:458
ef317cd5 9344msgid "annotated and GPG-signed tag"
07432cef 9345msgstr "注解并 GPG 签名的 tag"
ef317cd5 9346
a77c07d9 9347#: builtin/tag.c:462
ef317cd5 9348msgid "use another key to sign the tag"
07432cef 9349msgstr "使用另外的私钥签名 tag"
ef317cd5 9350
a77c07d9 9351#: builtin/tag.c:463
ef317cd5 9352msgid "replace the tag if exists"
07432cef 9353msgstr "如果存在,替换现有的 tag"
ef317cd5 9354
a77c07d9 9355#: builtin/tag.c:464
ef317cd5 9356msgid "show tag list in columns"
07432cef 9357msgstr "以列的方式显示 tag"
ef317cd5 9358
a77c07d9 9359#: builtin/tag.c:466
ef317cd5 9360msgid "Tag listing options"
07432cef 9361msgstr "Tag 列表选项"
ef317cd5 9362
a77c07d9 9363#: builtin/tag.c:469
ef317cd5 9364msgid "print only tags that contain the commit"
07432cef 9365msgstr "只打印包含提交的tags"
ef317cd5 9366
a77c07d9 9367#: builtin/tag.c:475
ef317cd5 9368msgid "print only tags of the object"
07432cef 9369msgstr "只打印tags对象"
ef317cd5 9370
90314792 9371#: builtin/tag.c:501
8ada9598 9372msgid "--column and -n are incompatible"
81809b99 9373msgstr "--column 和 -n 不兼容"
8ada9598 9374
90314792 9375#: builtin/tag.c:518
c04f5ac3 9376msgid "-n option is only allowed with -l."
649900bc 9377msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9378
90314792 9379#: builtin/tag.c:520
c04f5ac3 9380msgid "--contains option is only allowed with -l."
649900bc 9381msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9382
90314792 9383#: builtin/tag.c:522
7ac1c0ad 9384msgid "--points-at option is only allowed with -l."
649900bc 9385msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9386
90314792 9387#: builtin/tag.c:530
c04f5ac3
JX
9388msgid "only one -F or -m option is allowed."
9389msgstr "只允许一个 -F 或 -m 选项。"
9390
90314792 9391#: builtin/tag.c:550
c04f5ac3
JX
9392msgid "too many params"
9393msgstr "太多参数"
9394
90314792 9395#: builtin/tag.c:556
c04f5ac3
JX
9396#, c-format
9397msgid "'%s' is not a valid tag name."
90e6ef53 9398msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 9399
90314792 9400#: builtin/tag.c:561
c04f5ac3
JX
9401#, c-format
9402msgid "tag '%s' already exists"
9403msgstr "tag '%s' 已存在"
9404
90314792 9405#: builtin/tag.c:579
c04f5ac3
JX
9406#, c-format
9407msgid "%s: cannot lock the ref"
9408msgstr "%s:不能锁定引用"
9409
90314792 9410#: builtin/tag.c:581
c04f5ac3
JX
9411#, c-format
9412msgid "%s: cannot update the ref"
9413msgstr "%s:不能更新引用"
9414
90314792 9415#: builtin/tag.c:583
c04f5ac3
JX
9416#, c-format
9417msgid "Updated tag '%s' (was %s)\n"
9418msgstr "已更新tag '%s'(曾为 %s)\n"
9419
90314792 9420#: builtin/update-index.c:402
ef317cd5 9421msgid "git update-index [options] [--] [<file>...]"
07432cef 9422msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 9423
90314792 9424#: builtin/update-index.c:720
ef317cd5 9425msgid "continue refresh even when index needs update"
07432cef 9426msgstr "当索引需要更新时继续刷新"
8ada9598 9427
90314792 9428#: builtin/update-index.c:723
ef317cd5 9429msgid "refresh: ignore submodules"
07432cef 9430msgstr "刷新:忽略子模组"
8ada9598 9431
90314792 9432#: builtin/update-index.c:726
ef317cd5 9433msgid "do not ignore new files"
07432cef 9434msgstr "不忽略新的文件"
8ada9598 9435
90314792 9436#: builtin/update-index.c:728
ef317cd5 9437msgid "let files replace directories and vice-versa"
07432cef 9438msgstr "让文件替换目录(反之亦然)"
ef317cd5 9439
90314792 9440#: builtin/update-index.c:730
ef317cd5 9441msgid "notice files missing from worktree"
07432cef 9442msgstr "通知文件从工作区丢失"
ef317cd5 9443
90314792 9444#: builtin/update-index.c:732
ef317cd5 9445msgid "refresh even if index contains unmerged entries"
07432cef 9446msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 9447
90314792 9448#: builtin/update-index.c:735
ef317cd5 9449msgid "refresh stat information"
07432cef 9450msgstr "刷新统计信息"
ef317cd5 9451
90314792 9452#: builtin/update-index.c:739
ef317cd5 9453msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 9454msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 9455
90314792 9456#: builtin/update-index.c:743
ef317cd5 9457msgid "<mode> <object> <path>"
07432cef 9458msgstr "<mode> <object> <path>"
ef317cd5 9459
90314792 9460#: builtin/update-index.c:744
ef317cd5 9461msgid "add the specified entry to the index"
07432cef 9462msgstr "添加指定的条目到索引区"
ef317cd5 9463
90314792 9464#: builtin/update-index.c:748
ef317cd5 9465msgid "(+/-)x"
07432cef 9466msgstr "(+/-)x"
ef317cd5 9467
90314792 9468#: builtin/update-index.c:749
ef317cd5 9469msgid "override the executable bit of the listed files"
07432cef 9470msgstr "覆盖列表里文件的可执行位"
ef317cd5 9471
90314792 9472#: builtin/update-index.c:753
ef317cd5 9473msgid "mark files as \"not changing\""
07432cef 9474msgstr "把文件标记为 \"没有变更\""
ef317cd5 9475
90314792 9476#: builtin/update-index.c:756
ef317cd5 9477msgid "clear assumed-unchanged bit"
07432cef 9478msgstr "清除 assumed-unchanged 位"
ef317cd5 9479
90314792 9480#: builtin/update-index.c:759
ef317cd5 9481msgid "mark files as \"index-only\""
07432cef 9482msgstr "把文件标记为 \"仅索引\""
ef317cd5 9483
90314792 9484#: builtin/update-index.c:762
ef317cd5 9485msgid "clear skip-worktree bit"
07432cef 9486msgstr "清除 skip-worktree 位"
ef317cd5 9487
90314792 9488#: builtin/update-index.c:765
ef317cd5 9489msgid "add to index only; do not add content to object database"
07432cef 9490msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 9491
90314792 9492#: builtin/update-index.c:767
ef317cd5 9493msgid "remove named paths even if present in worktree"
07432cef 9494msgstr "即使存在工作区里,也删除路径"
ef317cd5 9495
90314792 9496#: builtin/update-index.c:769
ef317cd5 9497msgid "with --stdin: input lines are terminated by null bytes"
07432cef 9498msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 9499
90314792 9500#: builtin/update-index.c:771
ef317cd5 9501msgid "read list of paths to be updated from standard input"
07432cef 9502msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 9503
90314792 9504#: builtin/update-index.c:775
ef317cd5 9505msgid "add entries from standard input to the index"
07432cef 9506msgstr "从标准输入添加条目到索引区"
ef317cd5 9507
90314792 9508#: builtin/update-index.c:779
ef317cd5 9509msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 9510msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 9511
90314792 9512#: builtin/update-index.c:783
ef317cd5 9513msgid "only update entries that differ from HEAD"
07432cef 9514msgstr "只更新与 HEAD 不同的条目"
ef317cd5 9515
90314792 9516#: builtin/update-index.c:787
ef317cd5 9517msgid "ignore files missing from worktree"
07432cef 9518msgstr "忽略工作区丢失的文件"
ef317cd5 9519
90314792 9520#: builtin/update-index.c:790
ef317cd5 9521msgid "report actions to standard output"
07432cef 9522msgstr "在标准输出显示操作"
ef317cd5 9523
90314792 9524#: builtin/update-index.c:792
ef317cd5 9525msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 9526msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 9527
90314792 9528#: builtin/update-index.c:796
ef317cd5 9529msgid "write index in this format"
07432cef 9530msgstr "以这种格式写入索引区"
ef317cd5 9531
90314792 9532#: builtin/update-ref.c:9
ef317cd5 9533msgid "git update-ref [options] -d <refname> [<oldval>]"
90314792 9534msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
ef317cd5 9535
90314792 9536#: builtin/update-ref.c:10
ef317cd5 9537msgid "git update-ref [options] <refname> <newval> [<oldval>]"
90314792
JX
9538msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9539
9540#: builtin/update-ref.c:11
9541msgid "git update-ref [options] --stdin [-z]"
9542msgstr "git update-ref [选项] --stdin [-z]"
ef317cd5 9543
90314792 9544#: builtin/update-ref.c:255
ef317cd5 9545msgid "delete the reference"
07432cef 9546msgstr "删除引用"
ef317cd5 9547
90314792 9548#: builtin/update-ref.c:257
ef317cd5 9549msgid "update <refname> not the one it points to"
07432cef 9550msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 9551
90314792
JX
9552#: builtin/update-ref.c:258
9553msgid "stdin has NUL-terminated arguments"
9554msgstr "标准输入有以 NUL 字符终止的参数"
9555
9556#: builtin/update-ref.c:259
9557msgid "read updates from stdin"
9558msgstr "从标准输入读取更新"
9559
ef317cd5
JX
9560#: builtin/update-server-info.c:6
9561msgid "git update-server-info [--force]"
07432cef 9562msgstr "git update-server-info [--force]"
ef317cd5
JX
9563
9564#: builtin/update-server-info.c:14
9565msgid "update the info files from scratch"
07432cef 9566msgstr "从头开始更新文件信息"
ef317cd5
JX
9567
9568#: builtin/verify-pack.c:56
9569msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 9570msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5
JX
9571
9572#: builtin/verify-pack.c:66
ef317cd5
JX
9573msgid "verbose"
9574msgstr "冗长输出"
9575
9576#: builtin/verify-pack.c:68
9577msgid "show statistics only"
07432cef 9578msgstr "只显示统计"
ef317cd5
JX
9579
9580#: builtin/verify-tag.c:17
9581msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 9582msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
9583
9584#: builtin/verify-tag.c:73
9585msgid "print tag contents"
07432cef 9586msgstr "打印 tag 内容"
ef317cd5
JX
9587
9588#: builtin/write-tree.c:13
9589msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 9590msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
9591
9592#: builtin/write-tree.c:26
9593msgid "<prefix>/"
07432cef 9594msgstr "<前缀>/"
ef317cd5
JX
9595
9596#: builtin/write-tree.c:27
9597msgid "write tree object for a subdirectory <prefix>"
07432cef 9598msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
9599
9600#: builtin/write-tree.c:30
9601msgid "only useful for debugging"
07432cef 9602msgstr "只对调试有用"
ef317cd5 9603
2e8451e8 9604#: git.c:17
4dcdc3d8
JX
9605msgid ""
9606"'git help -a' and 'git help -g' lists available subcommands and some\n"
9607"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9608"to read about a specific subcommand or concept."
9609msgstr ""
9610"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9611"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
8ada9598 9612
90314792 9613#: parse-options.h:146
2e8451e8
JX
9614msgid "expiry date"
9615msgstr "逾期日期"
9616
90314792 9617#: parse-options.h:161
8ada9598 9618msgid "no-op (backward compatibility)"
81809b99 9619msgstr "空操作(向后兼容)"
8ada9598 9620
cfff71a9 9621#: parse-options.h:235
8ada9598 9622msgid "be more verbose"
81809b99 9623msgstr "更加详细"
8ada9598 9624
cfff71a9 9625#: parse-options.h:237
8ada9598 9626msgid "be more quiet"
81809b99 9627msgstr "更加安静"
8ada9598 9628
cfff71a9 9629#: parse-options.h:243
8ada9598 9630msgid "use <n> digits to display SHA-1s"
81809b99 9631msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
9632
9633#: common-cmds.h:8
9634msgid "Add file contents to the index"
81809b99 9635msgstr "添加文件内容至索引"
8ada9598
JX
9636
9637#: common-cmds.h:9
9638msgid "Find by binary search the change that introduced a bug"
81809b99 9639msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
9640
9641#: common-cmds.h:10
8ada9598 9642msgid "List, create, or delete branches"
81809b99 9643msgstr "列出、创建或删除分支"
8ada9598
JX
9644
9645#: common-cmds.h:11
9646msgid "Checkout a branch or paths to the working tree"
81809b99 9647msgstr "检出一个分支或路径到工作区"
8ada9598
JX
9648
9649#: common-cmds.h:12
8ada9598 9650msgid "Clone a repository into a new directory"
81809b99 9651msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
9652
9653#: common-cmds.h:13
8ada9598 9654msgid "Record changes to the repository"
81809b99 9655msgstr "记录变更到版本库"
8ada9598
JX
9656
9657#: common-cmds.h:14
9658msgid "Show changes between commits, commit and working tree, etc"
81809b99 9659msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
9660
9661#: common-cmds.h:15
9662msgid "Download objects and refs from another repository"
81809b99 9663msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
9664
9665#: common-cmds.h:16
9666msgid "Print lines matching a pattern"
81809b99 9667msgstr "输出和模式匹配的行"
8ada9598
JX
9668
9669#: common-cmds.h:17
a77c07d9
JX
9670msgid "Create an empty Git repository or reinitialize an existing one"
9671msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598
JX
9672
9673#: common-cmds.h:18
8ada9598 9674msgid "Show commit logs"
81809b99 9675msgstr "显示提交日志"
8ada9598
JX
9676
9677#: common-cmds.h:19
9678msgid "Join two or more development histories together"
81809b99 9679msgstr "合并两个或更多开发历史"
8ada9598
JX
9680
9681#: common-cmds.h:20
9682msgid "Move or rename a file, a directory, or a symlink"
81809b99 9683msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
9684
9685#: common-cmds.h:21
2e8451e8
JX
9686msgid "Fetch from and integrate with another repository or a local branch"
9687msgstr "获取并整合另外的版本库或一个本地分支"
8ada9598
JX
9688
9689#: common-cmds.h:22
9690msgid "Update remote refs along with associated objects"
81809b99 9691msgstr "更新远程引用和相关的对象"
8ada9598
JX
9692
9693#: common-cmds.h:23
9694msgid "Forward-port local commits to the updated upstream head"
81809b99 9695msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
9696
9697#: common-cmds.h:24
9698msgid "Reset current HEAD to the specified state"
81809b99 9699msgstr "重置当前HEAD到指定状态"
8ada9598
JX
9700
9701#: common-cmds.h:25
9702msgid "Remove files from the working tree and from the index"
81809b99 9703msgstr "从工作区和索引中删除文件"
8ada9598
JX
9704
9705#: common-cmds.h:26
9706msgid "Show various types of objects"
81809b99 9707msgstr "显示各种类型的对象"
8ada9598
JX
9708
9709#: common-cmds.h:27
8ada9598 9710msgid "Show the working tree status"
81809b99 9711msgstr "显示工作区状态"
8ada9598
JX
9712
9713#: common-cmds.h:28
9714msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 9715msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 9716
170e9899 9717#: git-am.sh:50
c04f5ac3
JX
9718msgid "You need to set your committer info first"
9719msgstr "您需要先设置你的提交者信息"
9720
b694fbb1
JX
9721#: git-am.sh:95
9722msgid ""
9723"You seem to have moved HEAD since the last 'am' failure.\n"
9724"Not rewinding to ORIG_HEAD"
6792b93b 9725msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1
JX
9726
9727#: git-am.sh:105
9728#, sh-format
9729msgid ""
2e8451e8 9730"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
9731"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9732"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 9733msgstr ""
2e8451e8 9734"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
9735"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9736"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9737
9738#: git-am.sh:121
9739msgid "Cannot fall back to three-way merge."
9740msgstr "无法求助于三路合并。"
9741
170e9899 9742#: git-am.sh:137
c04f5ac3 9743msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 9744msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc
JX
9745
9746#: git-am.sh:139
9747msgid "Using index info to reconstruct a base tree..."
63af42fe 9748msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 9749
170e9899 9750#: git-am.sh:154
c04f5ac3
JX
9751msgid ""
9752"Did you hand edit your patch?\n"
9753"It does not apply to blobs recorded in its index."
9754msgstr ""
9755"您是否曾手动编辑过您的补丁?\n"
07432cef 9756"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 9757
170e9899 9758#: git-am.sh:163
c04f5ac3 9759msgid "Falling back to patching base and 3-way merge..."
b694fbb1 9760msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 9761
649900bc
JX
9762#: git-am.sh:179
9763msgid "Failed to merge in the changes."
9764msgstr "无法合并变更。"
9765
9766#: git-am.sh:274
c04f5ac3
JX
9767msgid "Only one StGIT patch series can be applied at once"
9768msgstr "一次只能有一个 StGIT 补丁队列被应用"
9769
649900bc 9770#: git-am.sh:361
c04f5ac3
JX
9771#, sh-format
9772msgid "Patch format $patch_format is not supported."
9773msgstr "不支持 $patch_format 补丁格式。"
9774
649900bc 9775#: git-am.sh:363
c04f5ac3
JX
9776msgid "Patch format detection failed."
9777msgstr "补丁格式检测失败。"
9778
649900bc
JX
9779#: git-am.sh:389
9780msgid ""
9781"The -b/--binary option has been a no-op for long time, and\n"
9782"it will be removed. Please do not use it anymore."
9783msgstr ""
9784"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9785"请不要再使用它了。"
c04f5ac3 9786
2e8451e8 9787#: git-am.sh:479
c04f5ac3
JX
9788#, sh-format
9789msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 9790msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 9791
2e8451e8 9792#: git-am.sh:484
c04f5ac3
JX
9793msgid "Please make up your mind. --skip or --abort?"
9794msgstr "请下决心。--skip 或是 --abort ?"
9795
2e8451e8
JX
9796#: git-am.sh:520
9797#, sh-format
9798msgid ""
9799"Stray $dotest directory found.\n"
9800"Use \"git am --abort\" to remove it."
9801msgstr ""
9802"发现了错误的 $dotest 目录。\n"
9803"使用 \"git am --abort\" 删除它。"
9804
9805#: git-am.sh:528
c04f5ac3
JX
9806msgid "Resolve operation not in progress, we are not resuming."
9807msgstr "解决操作未进行,我们不会继续。"
9808
2e8451e8 9809#: git-am.sh:594
c04f5ac3
JX
9810#, sh-format
9811msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 9812msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 9813
2e8451e8 9814#: git-am.sh:698
b694fbb1
JX
9815#, sh-format
9816msgid ""
9817"Patch is empty. Was it split wrong?\n"
9818"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9819"To restore the original branch and stop patching run \"$cmdline --abort\"."
9820msgstr ""
9821"补丁为空。是不是切分错误?\n"
9822"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9823"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9824
2e8451e8 9825#: git-am.sh:725
b694fbb1
JX
9826msgid "Patch does not have a valid e-mail address."
9827msgstr "补丁中没有一个有效的邮件地址。"
9828
2e8451e8 9829#: git-am.sh:772
c04f5ac3 9830msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 9831msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 9832
2e8451e8 9833#: git-am.sh:776
b694fbb1
JX
9834msgid "Commit Body is:"
9835msgstr "提交内容为:"
9836
90e6ef53 9837# 译者:注意保持句尾空格
c04f5ac3
JX
9838#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9839#. in your translation. The program will only accept English
9840#. input at this point.
2e8451e8 9841#: git-am.sh:783
c04f5ac3
JX
9842msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9843msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9844
2e8451e8 9845#: git-am.sh:819
c04f5ac3
JX
9846#, sh-format
9847msgid "Applying: $FIRSTLINE"
9848msgstr "正应用:$FIRSTLINE"
9849
2e8451e8 9850#: git-am.sh:840
b694fbb1
JX
9851msgid ""
9852"No changes - did you forget to use 'git add'?\n"
9853"If there is nothing left to stage, chances are that something else\n"
9854"already introduced the same changes; you might want to skip this patch."
9855msgstr ""
9856"没有变更 —— 您是不是忘了执行 'git add'?\n"
9857"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9858"您也许想要跳过这个补丁。"
9859
2e8451e8 9860#: git-am.sh:848
b694fbb1
JX
9861msgid ""
9862"You still have unmerged paths in your index\n"
9863"did you forget to use 'git add'?"
6792b93b 9864msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 9865
2e8451e8 9866#: git-am.sh:864
c04f5ac3 9867msgid "No changes -- Patch already applied."
63af42fe 9868msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 9869
2e8451e8 9870#: git-am.sh:874
b694fbb1
JX
9871#, sh-format
9872msgid "Patch failed at $msgnum $FIRSTLINE"
9873msgstr "补丁失败于 $msgnum $FIRSTLINE"
9874
2e8451e8 9875#: git-am.sh:877
ef317cd5
JX
9876#, sh-format
9877msgid ""
9878"The copy of the patch that failed is found in:\n"
9879" $dotest/patch"
9880msgstr ""
07432cef
WS
9881"失败的补丁文件副本位于:\n"
9882" $dotest/patch"
ef317cd5 9883
2e8451e8 9884#: git-am.sh:895
c04f5ac3
JX
9885msgid "applying to an empty history"
9886msgstr "正应用到一个空历史上"
9887
b694fbb1
JX
9888#: git-bisect.sh:48
9889msgid "You need to start by \"git bisect start\""
9890msgstr "您需要执行 \"git bisect start\" 来开始"
9891
90e6ef53 9892# 译者:注意保持句尾空格
c04f5ac3
JX
9893#. TRANSLATORS: Make sure to include [Y] and [n] in your
9894#. translation. The program will only accept English input
9895#. at this point.
9896#: git-bisect.sh:54
9897msgid "Do you want me to do it for you [Y/n]? "
9898msgstr "您想让我为您这样做么[Y/n]? "
9899
9900#: git-bisect.sh:95
9901#, sh-format
9902msgid "unrecognised option: '$arg'"
81809b99 9903msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
9904
9905#: git-bisect.sh:99
9906#, sh-format
9907msgid "'$arg' does not appear to be a valid revision"
9908msgstr "'$arg' 看起来不像是一个有效的版本"
9909
9910#: git-bisect.sh:117
9911msgid "Bad HEAD - I need a HEAD"
9912msgstr "坏的 HEAD - 我需要一个 HEAD"
9913
9914#: git-bisect.sh:130
9915#, sh-format
9916msgid ""
9917"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9918msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9919
9920#: git-bisect.sh:140
cfff71a9
JX
9921msgid "won't bisect on cg-seek'ed tree"
9922msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3
JX
9923
9924#: git-bisect.sh:144
9925msgid "Bad HEAD - strange symbolic ref"
90e6ef53 9926msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
9927
9928#: git-bisect.sh:189
9929#, sh-format
9930msgid "Bad bisect_write argument: $state"
90e6ef53 9931msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
9932
9933#: git-bisect.sh:218
9934#, sh-format
9935msgid "Bad rev input: $arg"
90e6ef53 9936msgstr "输入坏的版本:$arg"
c04f5ac3
JX
9937
9938#: git-bisect.sh:232
9939msgid "Please call 'bisect_state' with at least one argument."
9940msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9941
9942#: git-bisect.sh:244
9943#, sh-format
9944msgid "Bad rev input: $rev"
9945msgstr "输入坏的版本:$rev"
9946
9947#: git-bisect.sh:250
9948msgid "'git bisect bad' can take only one argument."
9949msgstr "'git bisect bad' 只能带一个参数。"
9950
b694fbb1
JX
9951#. have bad but not good. we could bisect although
9952#. this is less optimum.
9953#: git-bisect.sh:273
9954msgid "Warning: bisecting only with a bad commit."
9955msgstr "警告:在仅有一个坏提交下进行二分查找。"
9956
90e6ef53 9957# 译者:注意保持句尾空格
c04f5ac3
JX
9958#. TRANSLATORS: Make sure to include [Y] and [n] in your
9959#. translation. The program will only accept English input
9960#. at this point.
9961#: git-bisect.sh:279
9962msgid "Are you sure [Y/n]? "
9963msgstr "您确认么[Y/n]? "
9964
b694fbb1
JX
9965#: git-bisect.sh:289
9966msgid ""
9967"You need to give me at least one good and one bad revisions.\n"
9968"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9969msgstr ""
9970"您需要给我至少一个好版本和一个坏版本。\n"
9971"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9972
9973#: git-bisect.sh:292
9974msgid ""
9975"You need to start by \"git bisect start\".\n"
9976"You then need to give me at least one good and one bad revisions.\n"
9977"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9978msgstr ""
9979"您需要执行 \"git bisect start\" 来开始。\n"
9980"然后需要提供我至少一个好版本和一个坏版本。\n"
9981"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9982
4dcdc3d8 9983#: git-bisect.sh:363 git-bisect.sh:490
b694fbb1
JX
9984msgid "We are not bisecting."
9985msgstr "我们没有在二分查找。"
9986
4dcdc3d8 9987#: git-bisect.sh:370
c04f5ac3
JX
9988#, sh-format
9989msgid "'$invalid' is not a valid commit"
9990msgstr "'$invalid' 不是一个有效的提交"
9991
4dcdc3d8 9992#: git-bisect.sh:379
c04f5ac3
JX
9993#, sh-format
9994msgid ""
9995"Could not check out original HEAD '$branch'.\n"
9996"Try 'git bisect reset <commit>'."
9997msgstr ""
9998"不能检出原始 HEAD '$branch'。\n"
07432cef 9999"尝试 'git bisect reset <提交>'。"
c04f5ac3 10000
4dcdc3d8 10001#: git-bisect.sh:406
c04f5ac3
JX
10002msgid "No logfile given"
10003msgstr "未提供日志文件"
10004
4dcdc3d8 10005#: git-bisect.sh:407
c04f5ac3
JX
10006#, sh-format
10007msgid "cannot read $file for replaying"
10008msgstr "不能读取 $file 来重放"
10009
4dcdc3d8 10010#: git-bisect.sh:424
c04f5ac3
JX
10011msgid "?? what are you talking about?"
10012msgstr "?? 您在说什么?"
10013
4dcdc3d8 10014#: git-bisect.sh:436
b694fbb1
JX
10015#, sh-format
10016msgid "running $command"
10017msgstr "运行 $command"
10018
4dcdc3d8 10019#: git-bisect.sh:443
b694fbb1
JX
10020#, sh-format
10021msgid ""
10022"bisect run failed:\n"
10023"exit code $res from '$command' is < 0 or >= 128"
10024msgstr ""
10025"二分查找运行失败:\n"
07432cef 10026"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 10027
4dcdc3d8 10028#: git-bisect.sh:469
b694fbb1
JX
10029msgid "bisect run cannot continue any more"
10030msgstr "二分查找不能继续运行"
10031
4dcdc3d8 10032#: git-bisect.sh:475
b694fbb1
JX
10033#, sh-format
10034msgid ""
10035"bisect run failed:\n"
10036"'bisect_state $state' exited with error code $res"
10037msgstr ""
10038"二分查找运行失败:\n"
10039"'bisect_state $state' 退出码为 $res"
10040
4dcdc3d8 10041#: git-bisect.sh:482
b694fbb1
JX
10042msgid "bisect run success"
10043msgstr "二分查找运行成功"
c04f5ac3
JX
10044
10045#: git-pull.sh:21
10046msgid ""
10047"Pull is not possible because you have unmerged files.\n"
10048"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10049"as appropriate to mark resolution, or use 'git commit -a'."
10050msgstr ""
90e6ef53 10051"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 10052"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 10053"或者使用 'git commit -a'。"
c04f5ac3
JX
10054
10055#: git-pull.sh:25
10056msgid "Pull is not possible because you have unmerged files."
90e6ef53 10057msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 10058
90314792 10059#: git-pull.sh:223
c04f5ac3 10060msgid "updating an unborn branch with changes added to the index"
90e6ef53 10061msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 10062
b694fbb1
JX
10063#. The fetch involved updating the current branch.
10064#. The working tree and the index file is still based on the
10065#. $orig_head commit, but we are merging into $curr_head.
10066#. First update the working tree to match $curr_head.
cfff71a9 10067#: git-pull.sh:247
b694fbb1
JX
10068#, sh-format
10069msgid ""
10070"Warning: fetch updated the current branch head.\n"
10071"Warning: fast-forwarding your working tree from\n"
10072"Warning: commit $orig_head."
10073msgstr ""
10074"警告:fetch 更新了当前的分支。您的工作区\n"
10075"警告:从原提交 $orig_head 快进。"
10076
cfff71a9 10077#: git-pull.sh:272
c04f5ac3
JX
10078msgid "Cannot merge multiple branches into empty head"
10079msgstr "无法将多个分支合并到空分支"
10080
cfff71a9 10081#: git-pull.sh:276
c04f5ac3
JX
10082msgid "Cannot rebase onto multiple branches"
10083msgstr "无法变基到多个分支"
10084
cfff71a9 10085#: git-rebase.sh:55
649900bc
JX
10086msgid ""
10087"When you have resolved this problem, run \"git rebase --continue\".\n"
10088"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10089"To check out the original branch and stop rebasing, run \"git rebase --abort"
10090"\"."
10091msgstr ""
10092"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10093"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10094"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10095
cfff71a9 10096#: git-rebase.sh:158
2e8451e8
JX
10097msgid "Applied autostash."
10098msgstr "成功应用 autostash。"
10099
cfff71a9 10100#: git-rebase.sh:161
2e8451e8
JX
10101#, sh-format
10102msgid "Cannot store $stash_sha1"
10103msgstr "无法保存 $stash_sha1"
10104
cfff71a9 10105#: git-rebase.sh:162
2e8451e8
JX
10106msgid ""
10107"Applying autostash resulted in conflicts.\n"
10108"Your changes are safe in the stash.\n"
b1894384 10109"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
10110msgstr ""
10111"应用 autostash 导致冲突。\n"
10112"您的修改安全地保存在 stash 中。\n"
10113"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10114
cfff71a9 10115#: git-rebase.sh:201
649900bc
JX
10116msgid "The pre-rebase hook refused to rebase."
10117msgstr "钩子 pre-rebase 拒绝变基。"
10118
cfff71a9 10119#: git-rebase.sh:206
649900bc
JX
10120msgid "It looks like git-am is in progress. Cannot rebase."
10121msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10122
cfff71a9 10123#: git-rebase.sh:346
649900bc
JX
10124msgid "The --exec option must be used with the --interactive option"
10125msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10126
cfff71a9 10127#: git-rebase.sh:351
649900bc
JX
10128msgid "No rebase in progress?"
10129msgstr "没有正在进行的变基?"
10130
cfff71a9 10131#: git-rebase.sh:362
07432cef
WS
10132msgid "The --edit-todo action can only be used during interactive rebase."
10133msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10134
cfff71a9 10135#: git-rebase.sh:369
649900bc
JX
10136msgid "Cannot read HEAD"
10137msgstr "不能读取 HEAD"
10138
cfff71a9 10139#: git-rebase.sh:372
649900bc
JX
10140msgid ""
10141"You must edit all merge conflicts and then\n"
10142"mark them as resolved using git add"
10143msgstr ""
10144"您必须编辑所有的合并冲突,然后通过 git add\n"
10145"命令将它们标记为已解决"
10146
cfff71a9 10147#: git-rebase.sh:390
649900bc
JX
10148#, sh-format
10149msgid "Could not move back to $head_name"
10150msgstr "无法移回 $head_name"
10151
cfff71a9 10152#: git-rebase.sh:409
649900bc
JX
10153#, sh-format
10154msgid ""
10155"It seems that there is already a $state_dir_base directory, and\n"
10156"I wonder if you are in the middle of another rebase. If that is the\n"
10157"case, please try\n"
10158"\t$cmd_live_rebase\n"
10159"If that is not the case, please\n"
10160"\t$cmd_clear_stale_rebase\n"
10161"and run me again. I am stopping in case you still have something\n"
10162"valuable there."
10163msgstr ""
10164"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
10165"如果是这样,请尝试执行\n"
10166"\t$cmd_live_rebase\n"
10167"如果不是这样,请执行\n"
10168"\t$cmd_clear_stale_rebase\n"
10169"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
10170
cfff71a9 10171#: git-rebase.sh:456
649900bc
JX
10172#, sh-format
10173msgid "invalid upstream $upstream_name"
10174msgstr "无效的上游 $upstream_name"
10175
cfff71a9 10176#: git-rebase.sh:480
649900bc
JX
10177#, sh-format
10178msgid "$onto_name: there are more than one merge bases"
10179msgstr "$onto_name: 有一个以上的合并基准"
10180
cfff71a9 10181#: git-rebase.sh:483 git-rebase.sh:487
649900bc
JX
10182#, sh-format
10183msgid "$onto_name: there is no merge base"
10184msgstr "$onto_name: 没有合并基准"
10185
cfff71a9 10186#: git-rebase.sh:492
649900bc
JX
10187#, sh-format
10188msgid "Does not point to a valid commit: $onto_name"
10189msgstr "没有指向一个有效的提交:$onto_name"
10190
cfff71a9 10191#: git-rebase.sh:515
649900bc
JX
10192#, sh-format
10193msgid "fatal: no such branch: $branch_name"
10194msgstr "严重错误:无此分支:$branch_name"
10195
cfff71a9 10196#: git-rebase.sh:548
2e8451e8
JX
10197msgid "Cannot autostash"
10198msgstr "无法 autostash"
10199
cfff71a9 10200#: git-rebase.sh:553
2e8451e8
JX
10201#, sh-format
10202msgid "Created autostash: $stash_abbrev"
10203msgstr "创建了 autostash: $stash_abbrev"
10204
cfff71a9 10205#: git-rebase.sh:557
649900bc
JX
10206msgid "Please commit or stash them."
10207msgstr "请提交或为它们保存进度。"
10208
cfff71a9 10209#: git-rebase.sh:577
649900bc
JX
10210#, sh-format
10211msgid "Current branch $branch_name is up to date."
10212msgstr "当前分支 $branch_name 是最新的。"
10213
cfff71a9 10214#: git-rebase.sh:581
649900bc
JX
10215#, sh-format
10216msgid "Current branch $branch_name is up to date, rebase forced."
10217msgstr "当前分支 $branch_name 是最新的,强制变基。"
10218
cfff71a9 10219#: git-rebase.sh:592
649900bc
JX
10220#, sh-format
10221msgid "Changes from $mb to $onto:"
10222msgstr "变更从 $mb 到 $onto:"
10223
10224#. Detach HEAD and reset the tree
cfff71a9 10225#: git-rebase.sh:601
649900bc
JX
10226msgid "First, rewinding head to replay your work on top of it..."
10227msgstr "首先,重置头指针以便在上面重放您的工作..."
10228
cfff71a9 10229#: git-rebase.sh:611
649900bc
JX
10230#, sh-format
10231msgid "Fast-forwarded $branch_name to $onto_name."
10232msgstr "快进 $branch_name 至 $onto_name。"
10233
c04f5ac3
JX
10234#: git-stash.sh:51
10235msgid "git stash clear with parameters is unimplemented"
10236msgstr "git stash clear 不支持参数"
10237
10238#: git-stash.sh:74
10239msgid "You do not have the initial commit yet"
10240msgstr "您尚未建立初始提交"
10241
10242#: git-stash.sh:89
10243msgid "Cannot save the current index state"
90e6ef53 10244msgstr "无法保存当前索引状态"
c04f5ac3
JX
10245
10246#: git-stash.sh:123 git-stash.sh:136
10247msgid "Cannot save the current worktree state"
10248msgstr "无法保存当前工作区状态"
10249
10250#: git-stash.sh:140
10251msgid "No changes selected"
90e6ef53 10252msgstr "没有选择变更"
c04f5ac3
JX
10253
10254#: git-stash.sh:143
10255msgid "Cannot remove temporary index (can't happen)"
90e6ef53 10256msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
10257
10258#: git-stash.sh:156
10259msgid "Cannot record working tree state"
10260msgstr "不能记录工作区状态"
10261
2e8451e8
JX
10262#: git-stash.sh:190
10263#, sh-format
10264msgid "Cannot update $ref_stash with $w_commit"
10265msgstr "无法用 $w_commit 更新 $ref_stash"
10266
b694fbb1
JX
10267#. TRANSLATORS: $option is an invalid option, like
10268#. `--blah-blah'. The 7 spaces at the beginning of the
10269#. second line correspond to "error: ". So you should line
10270#. up the second line with however many characters the
10271#. translation of "error: " takes in your language. E.g. in
10272#. English this is:
10273#.
10274#. $ git stash save --blah-blah 2>&1 | head -n 2
10275#. error: unknown option for 'stash save': --blah-blah
10276#. To provide a message, use git stash save -- '--blah-blah'
90314792 10277#: git-stash.sh:237
b694fbb1
JX
10278#, sh-format
10279msgid ""
10280"error: unknown option for 'stash save': $option\n"
10281" To provide a message, use git stash save -- '$option'"
10282msgstr ""
10283"错误:'stash save' 的未知选项:$option\n"
10284" 要提供一个描述信息,使用 git stash save -- '$option'"
10285
90314792 10286#: git-stash.sh:258
c04f5ac3
JX
10287msgid "No local changes to save"
10288msgstr "没有要保存的本地修改"
10289
90314792 10290#: git-stash.sh:262
c04f5ac3 10291msgid "Cannot initialize stash"
90e6ef53 10292msgstr "无法初始化 stash"
c04f5ac3 10293
90314792 10294#: git-stash.sh:266
c04f5ac3
JX
10295msgid "Cannot save the current status"
10296msgstr "无法保存当前状态"
10297
90314792 10298#: git-stash.sh:284
c04f5ac3
JX
10299msgid "Cannot remove worktree changes"
10300msgstr "无法删除工作区变更"
10301
90314792 10302#: git-stash.sh:383
c04f5ac3 10303msgid "No stash found."
90e6ef53 10304msgstr "未发现 stash。"
c04f5ac3 10305
90314792 10306#: git-stash.sh:390
c04f5ac3
JX
10307#, sh-format
10308msgid "Too many revisions specified: $REV"
90e6ef53 10309msgstr "指定了太多的版本:$REV"
c04f5ac3 10310
90314792 10311#: git-stash.sh:396
c04f5ac3
JX
10312#, sh-format
10313msgid "$reference is not valid reference"
10314msgstr "$reference 不是有效的引用"
10315
90314792 10316#: git-stash.sh:424
c04f5ac3
JX
10317#, sh-format
10318msgid "'$args' is not a stash-like commit"
90e6ef53 10319msgstr "'$args' 不是 stash 样提交"
c04f5ac3 10320
90314792 10321#: git-stash.sh:435
c04f5ac3
JX
10322#, sh-format
10323msgid "'$args' is not a stash reference"
90e6ef53 10324msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 10325
90314792 10326#: git-stash.sh:443
c04f5ac3 10327msgid "unable to refresh index"
90e6ef53 10328msgstr "无法刷新索引"
c04f5ac3 10329
90314792 10330#: git-stash.sh:447
c04f5ac3
JX
10331msgid "Cannot apply a stash in the middle of a merge"
10332msgstr "无法在合并过程中恢复进度"
10333
90314792 10334#: git-stash.sh:455
c04f5ac3 10335msgid "Conflicts in index. Try without --index."
90e6ef53 10336msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 10337
90314792 10338#: git-stash.sh:457
c04f5ac3 10339msgid "Could not save index tree"
90e6ef53 10340msgstr "不能保存索引树"
c04f5ac3 10341
90314792 10342#: git-stash.sh:491
c04f5ac3
JX
10343msgid "Cannot unstage modified files"
10344msgstr "无法还原修改的文件"
10345
90314792 10346#: git-stash.sh:506
b694fbb1
JX
10347msgid "Index was not unstashed."
10348msgstr "索引的进度没有被恢复。"
10349
90314792 10350#: git-stash.sh:523
c04f5ac3
JX
10351#, sh-format
10352msgid "Dropped ${REV} ($s)"
10353msgstr "丢弃了 ${REV} ($s)"
10354
90314792 10355#: git-stash.sh:524
c04f5ac3
JX
10356#, sh-format
10357msgid "${REV}: Could not drop stash entry"
90e6ef53 10358msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 10359
90314792 10360#: git-stash.sh:531
c04f5ac3
JX
10361msgid "No branch name specified"
10362msgstr "未指定分支名"
10363
90314792 10364#: git-stash.sh:603
c04f5ac3
JX
10365msgid "(To restore them type \"git stash apply\")"
10366msgstr "(为恢复数据输入 \"git stash apply\")"
10367
2e8451e8 10368#: git-submodule.sh:95
c04f5ac3
JX
10369#, sh-format
10370msgid "cannot strip one component off url '$remoteurl'"
10371msgstr "无法从 url '$remoteurl' 剥离一个组件"
10372
2e8451e8 10373#: git-submodule.sh:237
c04f5ac3 10374#, sh-format
170e9899
JX
10375msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10376msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 10377
2e8451e8 10378#: git-submodule.sh:281
c04f5ac3 10379#, sh-format
170e9899
JX
10380msgid "Clone of '$url' into submodule path '$sm_path' failed"
10381msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 10382
2e8451e8 10383#: git-submodule.sh:293
dac1de7d
JX
10384#, sh-format
10385msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 10386msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 10387
2e8451e8
JX
10388#: git-submodule.sh:403
10389msgid "Relative path can only be used from the toplevel of the working tree"
10390msgstr "只能在工作区的顶级目录中使用相对路径"
10391
10392#: git-submodule.sh:413
c04f5ac3
JX
10393#, sh-format
10394msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10395msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10396
2e8451e8 10397#: git-submodule.sh:430
c04f5ac3 10398#, sh-format
170e9899
JX
10399msgid "'$sm_path' already exists in the index"
10400msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 10401
2e8451e8 10402#: git-submodule.sh:434
b694fbb1
JX
10403#, sh-format
10404msgid ""
10405"The following path is ignored by one of your .gitignore files:\n"
10406"$sm_path\n"
10407"Use -f if you really want to add it."
10408msgstr ""
10409"以下路径被您的一个 .gitignore 文件所忽略:\n"
10410"$sm_path\n"
10411"如果您确实想添加它,使用 -f 参数。"
10412
2e8451e8 10413#: git-submodule.sh:452
b694fbb1
JX
10414#, sh-format
10415msgid "Adding existing repo at '$sm_path' to the index"
10416msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10417
2e8451e8 10418#: git-submodule.sh:454
c04f5ac3 10419#, sh-format
170e9899
JX
10420msgid "'$sm_path' already exists and is not a valid git repo"
10421msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 10422
2e8451e8 10423#: git-submodule.sh:462
07432cef
WS
10424#, sh-format
10425msgid "A git directory for '$sm_name' is found locally with remote(s):"
10426msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10427
2e8451e8 10428#: git-submodule.sh:464
07432cef
WS
10429#, sh-format
10430msgid ""
10431"If you want to reuse this local git directory instead of cloning again from"
10432msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10433
2e8451e8 10434#: git-submodule.sh:466
07432cef
WS
10435#, sh-format
10436msgid ""
10437"use the '--force' option. If the local git directory is not the correct repo"
10438msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10439
2e8451e8 10440#: git-submodule.sh:467
07432cef
WS
10441#, sh-format
10442msgid ""
10443"or you are unsure what this means choose another name with the '--name' "
10444"option."
10445msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10446
2e8451e8 10447#: git-submodule.sh:469
07432cef
WS
10448#, sh-format
10449msgid "Reactivating local git directory for submodule '$sm_name'."
10450msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10451
2e8451e8 10452#: git-submodule.sh:481
c04f5ac3 10453#, sh-format
170e9899
JX
10454msgid "Unable to checkout submodule '$sm_path'"
10455msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 10456
2e8451e8 10457#: git-submodule.sh:486
c04f5ac3 10458#, sh-format
170e9899
JX
10459msgid "Failed to add submodule '$sm_path'"
10460msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 10461
2e8451e8 10462#: git-submodule.sh:495
c04f5ac3 10463#, sh-format
170e9899
JX
10464msgid "Failed to register submodule '$sm_path'"
10465msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 10466
2e8451e8 10467#: git-submodule.sh:539
c04f5ac3 10468#, sh-format
2e8451e8
JX
10469msgid "Entering '$prefix$displaypath'"
10470msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 10471
cfff71a9 10472#: git-submodule.sh:559
c04f5ac3 10473#, sh-format
2e8451e8
JX
10474msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10475msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 10476
cfff71a9 10477#: git-submodule.sh:605
c04f5ac3 10478#, sh-format
2e8451e8
JX
10479msgid "No url found for submodule path '$displaypath' in .gitmodules"
10480msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 10481
cfff71a9 10482#: git-submodule.sh:614
c04f5ac3 10483#, sh-format
2e8451e8
JX
10484msgid "Failed to register url for submodule path '$displaypath'"
10485msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 10486
cfff71a9 10487#: git-submodule.sh:616
c04f5ac3 10488#, sh-format
2e8451e8
JX
10489msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10490msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 10491
cfff71a9 10492#: git-submodule.sh:633
d691f479 10493#, sh-format
2e8451e8
JX
10494msgid "Failed to register update mode for submodule path '$displaypath'"
10495msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 10496
cfff71a9 10497#: git-submodule.sh:671
1003b3a5
JX
10498#, sh-format
10499msgid "Use '.' if you really want to deinitialize all submodules"
10500msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10501
cfff71a9 10502#: git-submodule.sh:688
1003b3a5 10503#, sh-format
2e8451e8
JX
10504msgid "Submodule work tree '$displaypath' contains a .git directory"
10505msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 10506
cfff71a9 10507#: git-submodule.sh:689
1003b3a5
JX
10508#, sh-format
10509msgid ""
10510"(use 'rm -rf' if you really want to remove it including all of its history)"
10511msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10512
cfff71a9 10513#: git-submodule.sh:695
c04f5ac3
JX
10514#, sh-format
10515msgid ""
2e8451e8 10516"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 10517"discard them"
2e8451e8 10518msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 10519
cfff71a9 10520#: git-submodule.sh:698
1003b3a5 10521#, sh-format
2e8451e8
JX
10522msgid "Cleared directory '$displaypath'"
10523msgstr "已清除目录 '$displaypath'"
1003b3a5 10524
cfff71a9 10525#: git-submodule.sh:699
1003b3a5 10526#, sh-format
2e8451e8
JX
10527msgid "Could not remove submodule work tree '$displaypath'"
10528msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 10529
cfff71a9 10530#: git-submodule.sh:702
1003b3a5 10531#, sh-format
2e8451e8
JX
10532msgid "Could not create empty submodule directory '$displaypath'"
10533msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 10534
cfff71a9 10535#: git-submodule.sh:711
1003b3a5 10536#, sh-format
2e8451e8
JX
10537msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10538msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 10539
cfff71a9 10540#: git-submodule.sh:834
1003b3a5
JX
10541#, sh-format
10542msgid ""
2e8451e8 10543"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
10544"Maybe you want to use 'update --init'?"
10545msgstr ""
2e8451e8 10546"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 10547"也许您想用 'update --init'?"
c04f5ac3 10548
cfff71a9 10549#: git-submodule.sh:847
c04f5ac3 10550#, sh-format
2e8451e8
JX
10551msgid "Unable to find current revision in submodule path '$displaypath'"
10552msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 10553
cfff71a9 10554#: git-submodule.sh:856
c04f5ac3 10555#, sh-format
170e9899
JX
10556msgid "Unable to fetch in submodule path '$sm_path'"
10557msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 10558
cfff71a9 10559#: git-submodule.sh:880
2e8451e8
JX
10560#, sh-format
10561msgid "Unable to fetch in submodule path '$displaypath'"
10562msgstr "无法在子模组路径 '$displaypath' 中获取"
10563
cfff71a9 10564#: git-submodule.sh:894
c04f5ac3 10565#, sh-format
2e8451e8
JX
10566msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10567msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 10568
cfff71a9 10569#: git-submodule.sh:895
c04f5ac3 10570#, sh-format
2e8451e8
JX
10571msgid "Submodule path '$displaypath': rebased into '$sha1'"
10572msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 10573
cfff71a9 10574#: git-submodule.sh:900
c04f5ac3 10575#, sh-format
2e8451e8
JX
10576msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10577msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 10578
cfff71a9 10579#: git-submodule.sh:901
c04f5ac3 10580#, sh-format
2e8451e8
JX
10581msgid "Submodule path '$displaypath': merged in '$sha1'"
10582msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 10583
cfff71a9 10584#: git-submodule.sh:906
c04f5ac3 10585#, sh-format
2e8451e8
JX
10586msgid ""
10587"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10588msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 10589
cfff71a9 10590#: git-submodule.sh:907
c04f5ac3 10591#, sh-format
2e8451e8
JX
10592msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10593msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 10594
cfff71a9 10595#: git-submodule.sh:912
c04f5ac3 10596#, sh-format
2e8451e8
JX
10597msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10598msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
1003b3a5 10599
cfff71a9 10600#: git-submodule.sh:913
1003b3a5 10601#, sh-format
2e8451e8
JX
10602msgid "Submodule path '$displaypath': checked out '$sha1'"
10603msgstr "子模组路径 '$displaypath':检出 '$sha1'"
c04f5ac3 10604
cfff71a9 10605#: git-submodule.sh:940
2e8451e8
JX
10606#, sh-format
10607msgid "Failed to recurse into submodule path '$displaypath'"
10608msgstr "无法递归进子模组路径 '$displaypath'"
10609
cfff71a9 10610#: git-submodule.sh:1048
649900bc
JX
10611msgid "The --cached option cannot be used with the --files option"
10612msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1
JX
10613
10614#. unexpected type
cfff71a9 10615#: git-submodule.sh:1096
b694fbb1
JX
10616#, sh-format
10617msgid "unexpected mode $mod_dst"
10618msgstr "意外的模式 $mod_dst"
c04f5ac3 10619
90e6ef53 10620# 译者:注意保持前导空格
cfff71a9 10621#: git-submodule.sh:1116
c04f5ac3 10622#, sh-format
2e8451e8
JX
10623msgid " Warn: $display_name doesn't contain commit $sha1_src"
10624msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 10625
90e6ef53 10626# 译者:注意保持前导空格
cfff71a9 10627#: git-submodule.sh:1119
c04f5ac3 10628#, sh-format
2e8451e8
JX
10629msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10630msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 10631
90e6ef53 10632# 译者:注意保持前导空格
cfff71a9 10633#: git-submodule.sh:1122
c04f5ac3 10634#, sh-format
2e8451e8
JX
10635msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10636msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 10637
cfff71a9 10638#: git-submodule.sh:1147
c04f5ac3 10639msgid "blob"
07432cef 10640msgstr "数据对象"
c04f5ac3 10641
cfff71a9 10642#: git-submodule.sh:1261
1003b3a5
JX
10643#, sh-format
10644msgid "Failed to recurse into submodule path '$sm_path'"
10645msgstr "无法递归进子模组路径 '$sm_path'"
10646
cfff71a9 10647#: git-submodule.sh:1325
c04f5ac3 10648#, sh-format
2e8451e8
JX
10649msgid "Synchronizing submodule url for '$displaypath'"
10650msgstr "为 '$displaypath' 同步子模组 url"
10651
cfff71a9
JX
10652# 译者:为保证在输出中对齐,注意调整句中空格!
10653#~ msgid "copied: %s -> %s"
10654#~ msgstr "拷贝: %s -> %s"
10655
10656# 译者:为保证在输出中对齐,注意调整句中空格!
10657#~ msgid "deleted: %s"
10658#~ msgstr "删除: %s"
10659
10660# 译者:为保证在输出中对齐,注意调整句中空格!
10661#~ msgid "modified: %s"
10662#~ msgstr "修改: %s"
10663
10664# 译者:为保证在输出中对齐,注意调整句中空格!
10665#~ msgid "renamed: %s -> %s"
10666#~ msgstr "重命名: %s -> %s"
10667
10668# 译者:为保证在输出中对齐,注意调整句中空格!
10669#~ msgid "unmerged: %s"
10670#~ msgstr "未合并: %s"
10671
10672# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10673#~ msgid ""
10674#~ "push.default is unset; its implicit value is changing in\n"
10675#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
10676#~ "and maintain the current behavior after the default changes, use:\n"
10677#~ "\n"
10678#~ " git config --global push.default matching\n"
10679#~ "\n"
10680#~ "To squelch this message and adopt the new behavior now, use:\n"
10681#~ "\n"
10682#~ " git config --global push.default simple\n"
10683#~ "\n"
10684#~ "See 'git help config' and search for 'push.default' for further "
10685#~ "information.\n"
10686#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
10687#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
10688#~ msgstr ""
10689#~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
10690#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
10691#~ "\n"
10692#~ " git config --global push.default matching\n"
10693#~ "\n"
10694#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
10695#~ "\n"
10696#~ " git config --global push.default simple\n"
10697#~ "\n"
10698#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
10699#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
10700#~ "为保持兼容,请用 'current' 代替 'simple')"
10701
90314792
JX
10702#~ msgid "done\n"
10703#~ msgstr "完成\n"
10704
10705#~ msgid "input paths are terminated by a null character"
10706#~ msgstr "输入路径以null字符终止"
10707
10708#~ msgid ""
10709#~ "The following untracked files would NOT be saved but need to be removed "
10710#~ "by stash save:"
10711#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
10712
10713#~ msgid ""
10714#~ "Aborting. Consider using either the --force or --include-untracked option."
10715#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
10716
2e8451e8
JX
10717#~ msgid ""
10718#~ "the following submodule (or one of its nested submodule)\n"
10719#~ "uses a .git directory:"
10720#~ msgid_plural ""
10721#~ "the following submodules (or one of its nested submodule)\n"
10722#~ "use a .git directory:"
10723#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10724#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10725
2e8451e8
JX
10726# 译者:注意保持前导空格
10727#~ msgid " (fix conflicts and then run \"git am --resolved\")"
10728#~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
10729
10730# 译者:注意保持前导空格
10731#~ msgid " (all conflicts fixed: run \"git commit\")"
10732#~ msgstr " (解决所有冲突后,执行 \"git commit\")"
10733
10734#~ msgid "more than %d trees given: '%s'"
10735#~ msgstr "提供了超过 %d 个树对象:'%s'"
10736
10737#~ msgid "You cannot combine --no-ff with --ff-only."
10738#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10739
2e8451e8
JX
10740#~ msgid ""
10741#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10742#~ "(use 'rm -rf' if you really want to remove it including all of its "
10743#~ "history)"
10744#~ msgstr ""
10745#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10746#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10747
10748#~ msgid ""
10749#~ "'%s' has changes staged in the index\n"
10750#~ "(use --cached to keep the file, or -f to force removal)"
10751#~ msgstr ""
10752#~ "'%s' 有变更已暂存至索引中\n"
10753#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10754
10755#~ msgid "show commits where no parent comes before its children"
10756#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10757
10758#~ msgid "show the HEAD reference"
10759#~ msgstr "显示 HEAD 引用"
10760
10761#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10762#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10763
10764#~ msgid "Change flags"
10765#~ msgstr "修改参数"
10766
10767#~ msgid ""
10768#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10769#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10770
10771#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
10772#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
07432cef 10773
4dcdc3d8
JX
10774#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
10775#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
10776
10777#~ msgid "See 'git help <command>' for more information on a specific command."
10778#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
10779
10780#~ msgid "BUG: impossible combination of %d and %p"
10781#~ msgstr "BUG: 无法组合 %d 和 %p"
10782
10783# 译者:以下三条实际为一个段落
10784#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
10785#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
10786
10787# 译者:为对齐,下面两句内容有调整
10788#~ msgid "may speed it up, but you have to be careful not to forget to add"
10789#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
10790
10791#~ msgid "new files yourself (see 'git help status')."
10792#~ msgstr "(参见 'git help status')。"
10793
1003b3a5
JX
10794#~ msgid "use any ref in .git/refs"
10795#~ msgstr "使用 .git/refs 里的任意引用"
10796
10797#~ msgid "use any tag in .git/refs/tags"
10798#~ msgstr "使用 .git/refs/tags 里的任意 tag"
10799
10800#~ msgid "bad object %s"
10801#~ msgstr "坏对象 %s"
10802
10803#~ msgid "bogus committer info %s"
10804#~ msgstr "虚假的提交者信息 %s"
10805
a77c07d9
JX
10806#~ msgid "can't fdopen 'show' output fd"
10807#~ msgstr "不能打开 'show' 输出文件句柄"
10808
10809#~ msgid "failed to close pipe to 'show' for object '%s'"
10810#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
10811
07432cef
WS
10812#~ msgid " 0 files changed"
10813#~ msgstr " 0 个文件被修改"
10814
10815#~ msgid " %d file changed"
10816#~ msgid_plural " %d files changed"
10817#~ msgstr[0] " %d 个文件被修改"
10818#~ msgstr[1] " %d 个文件被修改"
10819
10820#~ msgid ", %d insertion(+)"
10821#~ msgid_plural ", %d insertions(+)"
10822#~ msgstr[0] ",插入 %d 行(+)"
10823#~ msgstr[1] ",插入 %d 行(+)"
10824
10825#~ msgid ", %d deletion(-)"
10826#~ msgid_plural ", %d deletions(-)"
10827#~ msgstr[0] ",删除 %d 行(-)"
10828#~ msgstr[1] ",删除 %d 行(-)"
10829
10830#~ msgid "You do not have a valid HEAD"
10831#~ msgstr "您没有一个有效的 HEAD"
10832
10833#~ msgid "oops"
10834#~ msgstr "哎哟"
10835
10836#~ msgid "Would not remove %s\n"
10837#~ msgstr "不会删除 %s\n"
10838
10839#~ msgid "Not removing %s\n"
10840#~ msgstr "未删除 %s\n"
10841
10842#~ msgid "Auto packing the repository for optimum performance.\n"
10843#~ msgstr "自动打包版本库以求最佳性能。\n"
10844
10845#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
10846#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
10847
10848#~ msgid "Could not read index"
10849#~ msgstr "不能读取索引"
c160d03f 10850
ef317cd5
JX
10851# 译者:中文字符串拼接,可删除前导空格
10852#~ msgid " (use \"git add\" to track)"
10853#~ msgstr "(使用 \"git add\" 建立跟踪)"
10854
10855#~ msgid "-B cannot be used with -b"
10856#~ msgstr "-B 不能和 -b 同时使用"
10857
ef317cd5
JX
10858#~ msgid "--detach cannot be used with -b/-B/--orphan"
10859#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
10860
10861#~ msgid "--detach cannot be used with -t"
10862#~ msgstr "--detach 不能和 -t 同时使用"
10863
10864#~ msgid "--orphan and -b|-B are mutually exclusive"
10865#~ msgstr "--orphan 和 -b|-B 互斥"
10866
10867#~ msgid "--orphan cannot be used with -t"
10868#~ msgstr "--orphan 不能和 -t 同时使用"
10869
10870#~ msgid "git checkout: -f and -m are incompatible"
10871#~ msgstr "git checkout:-f 和 -m 不兼容"
10872
10873#~ msgid ""
10874#~ "git checkout: updating paths is incompatible with switching branches."
10875#~ msgstr "git checkout:更新路径和切换分支不兼容。"
10876
c160d03f
JX
10877#~ msgid "diff setup failed"
10878#~ msgstr "diff 设置失败"
10879
10880#~ msgid "merge-recursive: disk full?"
10881#~ msgstr "merge-recursive:磁盘已满?"
10882
10883#~ msgid "diff_setup_done failed"
10884#~ msgstr "diff_setup_done 失败"