]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: zh_CN.po: update one translation
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
3# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com>
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"
e5e38ce4
JX
15"POT-Creation-Date: 2012-08-06 23:47+0800\n"
16"PO-Revision-Date: 2012-08-07 01:07+0800\n"
c04f5ac3
JX
17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19"Language: zh_CN\n"
20"MIME-Version: 1.0\n"
21"Content-Type: text/plain; charset=UTF-8\n"
22"Content-Transfer-Encoding: 8bit\n"
5ae481e0 23"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 24
170e9899 25#: advice.c:40
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#.
170e9899 34#: advice.c:70
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
8ada9598
JX
45#: bundle.c:36
46#, c-format
47msgid "'%s' does not look like a v2 bundle file"
81809b99 48msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598
JX
49
50#: bundle.c:63
81809b99 51#, c-format
8ada9598 52msgid "unrecognized header: %s%s (%d)"
81809b99 53msgstr "未能识别的包头:%s%s (%d)"
8ada9598 54
23ff3338 55#: bundle.c:89 builtin/commit.c:699
8ada9598
JX
56#, c-format
57msgid "could not open '%s'"
58msgstr "不能打开 '%s'"
59
60#: bundle.c:140
61msgid "Repository lacks these prerequisite commits:"
81809b99 62msgstr "版本库缺少这些必备的提交:"
8ada9598 63
6792b93b 64#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
23ff3338 65#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
8ada9598
JX
66#: builtin/shortlog.c:181
67msgid "revision walk setup failed"
68msgstr "版本遍历设置失败"
69
70#: bundle.c:186
71#, c-format
72msgid "The bundle contains %d ref"
73msgid_plural "The bundle contains %d refs"
81809b99 74msgstr[0] "这个包中含有 %d 个引用"
5ae481e0 75msgstr[1] "这个包中含有 %d 个引用"
8ada9598
JX
76
77#: bundle.c:192
6792b93b
JX
78msgid "The bundle records a complete history."
79msgstr "这个包记录一个完整历史。"
80
81#: bundle.c:195
8ada9598
JX
82#, c-format
83msgid "The bundle requires this ref"
84msgid_plural "The bundle requires these %d refs"
81809b99
JX
85msgstr[0] "这个包需要这个引用"
86msgstr[1] "这个包需要 %d 个这些引用"
8ada9598 87
6792b93b 88#: bundle.c:294
8ada9598 89msgid "rev-list died"
81809b99 90msgstr "rev-list 终止"
8ada9598 91
23ff3338 92#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
8ada9598
JX
93#, c-format
94msgid "unrecognized argument: %s"
81809b99 95msgstr "未能识别的参数:%s"
8ada9598 96
6792b93b 97#: bundle.c:335
8ada9598
JX
98#, c-format
99msgid "ref '%s' is excluded by the rev-list options"
81809b99 100msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 101
6792b93b 102#: bundle.c:380
8ada9598 103msgid "Refusing to create empty bundle."
81809b99 104msgstr "不能创建空包。"
8ada9598 105
6792b93b 106#: bundle.c:398
8ada9598 107msgid "Could not spawn pack-objects"
81809b99 108msgstr "不能生成 pack-objects 进程"
8ada9598 109
6792b93b 110#: bundle.c:416
8ada9598 111msgid "pack-objects died"
81809b99 112msgstr "pack-objects 终止"
8ada9598 113
6792b93b 114#: bundle.c:419
81809b99 115#, c-format
8ada9598 116msgid "cannot create '%s'"
81809b99 117msgstr "不能创建 '%s'"
8ada9598 118
6792b93b 119#: bundle.c:441
8ada9598 120msgid "index-pack died"
81809b99 121msgstr "index-pack 终止"
8ada9598 122
170e9899 123#: commit.c:48
c04f5ac3
JX
124#, c-format
125msgid "could not parse %s"
126msgstr "不能解析 %s"
127
170e9899 128#: commit.c:50
c04f5ac3
JX
129#, c-format
130msgid "%s %s is not a commit!"
131msgstr "%s %s 不是一个提交!"
132
133#: compat/obstack.c:406 compat/obstack.c:408
134msgid "memory exhausted"
135msgstr "内存耗尽"
136
137#: connected.c:39
138msgid "Could not run 'git rev-list'"
139msgstr "不能执行 'git rev-list'"
140
141#: connected.c:48
142#, c-format
143msgid "failed write to rev-list: %s"
144msgstr "无法写入 rev-list:%s"
145
146#: connected.c:56
147#, c-format
148msgid "failed to close rev-list's stdin: %s"
149msgstr "无法关闭 rev-list 的标准输入:%s"
150
8ada9598
JX
151#: date.c:95
152msgid "in the future"
81809b99 153msgstr "在将来"
8ada9598
JX
154
155#: date.c:101
156#, c-format
157msgid "%lu second ago"
158msgid_plural "%lu seconds ago"
81809b99 159msgstr[0] "%lu 秒钟之前"
5ae481e0 160msgstr[1] "%lu 秒钟之前"
8ada9598
JX
161
162#: date.c:108
163#, c-format
164msgid "%lu minute ago"
165msgid_plural "%lu minutes ago"
81809b99 166msgstr[0] "%lu 分钟之前"
5ae481e0 167msgstr[1] "%lu 分钟之前"
8ada9598
JX
168
169#: date.c:115
170#, c-format
171msgid "%lu hour ago"
172msgid_plural "%lu hours ago"
81809b99 173msgstr[0] "%lu 小时之前"
5ae481e0 174msgstr[1] "%lu 小时之前"
8ada9598
JX
175
176#: date.c:122
177#, c-format
178msgid "%lu day ago"
179msgid_plural "%lu days ago"
81809b99 180msgstr[0] "%lu 天之前"
5ae481e0 181msgstr[1] "%lu 天之前"
8ada9598
JX
182
183#: date.c:128
184#, c-format
185msgid "%lu week ago"
186msgid_plural "%lu weeks ago"
81809b99 187msgstr[0] "%lu 周之前"
5ae481e0 188msgstr[1] "%lu 周之前"
8ada9598
JX
189
190#: date.c:135
191#, c-format
192msgid "%lu month ago"
193msgid_plural "%lu months ago"
81809b99 194msgstr[0] "%lu 个月之前"
5ae481e0 195msgstr[1] "%lu 个月之前"
8ada9598
JX
196
197#: date.c:146
198#, c-format
199msgid "%lu year"
200msgid_plural "%lu years"
81809b99 201msgstr[0] "%lu 年"
5ae481e0 202msgstr[1] "%lu 年"
8ada9598
JX
203
204#: date.c:149
205#, c-format
206msgid "%s, %lu month ago"
207msgid_plural "%s, %lu months ago"
81809b99 208msgstr[0] "%s,%lu 个月之前"
5ae481e0 209msgstr[1] "%s,%lu 个月之前"
8ada9598
JX
210
211#: date.c:154 date.c:159
212#, c-format
213msgid "%lu year ago"
214msgid_plural "%lu years ago"
81809b99 215msgstr[0] "%lu 年前"
5ae481e0 216msgstr[1] "%lu 年前"
8ada9598 217
90e6ef53 218# 译者:注意保持前导空格
14c8bced 219#: diff.c:105
c04f5ac3
JX
220#, c-format
221msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
222msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
223
90e6ef53 224# 译者:注意保持前导空格
14c8bced 225#: diff.c:110
c04f5ac3
JX
226#, c-format
227msgid " Unknown dirstat parameter '%.*s'\n"
228msgstr " 未知 dirstat 参数 '%.*s'\n"
229
14c8bced 230#: diff.c:210
c04f5ac3
JX
231#, c-format
232msgid ""
233"Found errors in 'diff.dirstat' config variable:\n"
234"%s"
235msgstr ""
90e6ef53 236"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
237"%s"
238
73a60cd2 239#: diff.c:1400
649900bc
JX
240msgid " 0 files changed"
241msgstr " 0 个文件被修改"
7ac1c0ad 242
73a60cd2 243#: diff.c:1404
7ac1c0ad
JX
244#, c-format
245msgid " %d file changed"
246msgid_plural " %d files changed"
61bc0753 247msgstr[0] " %d 个文件被修改"
5ae481e0 248msgstr[1] " %d 个文件被修改"
7ac1c0ad 249
73a60cd2 250#: diff.c:1421
7ac1c0ad
JX
251#, c-format
252msgid ", %d insertion(+)"
253msgid_plural ", %d insertions(+)"
8ea38f47 254msgstr[0] ",插入 %d 行(+)"
5ae481e0 255msgstr[1] ",插入 %d 行(+)"
7ac1c0ad 256
73a60cd2 257#: diff.c:1432
7ac1c0ad
JX
258#, c-format
259msgid ", %d deletion(-)"
260msgid_plural ", %d deletions(-)"
8ea38f47 261msgstr[0] ",删除 %d 行(-)"
5ae481e0 262msgstr[1] ",删除 %d 行(-)"
7ac1c0ad 263
23ff3338 264#: diff.c:3461
c04f5ac3
JX
265#, c-format
266msgid ""
267"Failed to parse --dirstat/-X option parameter:\n"
268"%s"
269msgstr ""
270"无法解析 --dirstat/-X 选项的参数:\n"
271"%s"
272
273#: gpg-interface.c:59
274msgid "could not run gpg."
275msgstr "不能执行 gpg。"
276
277#: gpg-interface.c:71
278msgid "gpg did not accept the data"
279msgstr "gpg 没有接受数据"
280
281#: gpg-interface.c:82
282msgid "gpg failed to sign the data"
283msgstr "gpg 无法为数据签名"
284
d691f479 285#: grep.c:1320
7ac1c0ad
JX
286#, c-format
287msgid "'%s': unable to read %s"
288msgstr "'%s':无法读取 %s"
289
d691f479 290#: grep.c:1337
7ac1c0ad
JX
291#, c-format
292msgid "'%s': %s"
293msgstr "'%s':%s"
294
d691f479 295#: grep.c:1348
7ac1c0ad
JX
296#, c-format
297msgid "'%s': short read %s"
298msgstr "'%s':读取不完整 %s"
299
23ff3338 300#: help.c:212
81809b99 301#, c-format
8ada9598 302msgid "available git commands in '%s'"
81809b99 303msgstr "在 '%s' 下可用的 git 命令"
8ada9598 304
23ff3338 305#: help.c:219
8ada9598 306msgid "git commands available from elsewhere on your $PATH"
81809b99 307msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 308
23ff3338 309#: help.c:275
c04f5ac3
JX
310#, c-format
311msgid ""
312"'%s' appears to be a git command, but we were not\n"
313"able to execute it. Maybe git-%s is broken?"
314msgstr ""
315"'%s' 像是一个 git 命令,但却无法运行。\n"
316"可能是 git-%s 受损?"
317
23ff3338 318#: help.c:332
8ada9598 319msgid "Uh oh. Your system reports no Git commands at all."
81809b99 320msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 321
23ff3338 322#: help.c:354
8ada9598
JX
323#, c-format
324msgid ""
325"WARNING: You called a Git command named '%s', which does not exist.\n"
326"Continuing under the assumption that you meant '%s'"
327msgstr ""
81809b99
JX
328"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
329"是 '%s'"
8ada9598 330
23ff3338 331#: help.c:359
8ada9598
JX
332#, c-format
333msgid "in %0.1f seconds automatically..."
81809b99 334msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 335
23ff3338 336#: help.c:366
8ada9598
JX
337#, c-format
338msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 339msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 340
23ff3338 341#: help.c:370
8ada9598
JX
342msgid ""
343"\n"
344"Did you mean this?"
345msgid_plural ""
346"\n"
347"Did you mean one of these?"
348msgstr[0] ""
81809b99
JX
349"\n"
350"您指的是这个么?"
351msgstr[1] ""
352"\n"
353"您指的是这些其中一个么?"
8ada9598 354
649900bc
JX
355#: merge-recursive.c:190
356#, c-format
357msgid "(bad commit)\n"
358msgstr "(坏提交)\n"
359
360#: merge-recursive.c:206
361#, c-format
362msgid "addinfo_cache failed for path '%s'"
363msgstr "为路径 '%s' addinfo_cache 失败"
364
365#: merge-recursive.c:268
366msgid "error building trees"
367msgstr "无法创建树"
368
369#: merge-recursive.c:497
370msgid "diff setup failed"
371msgstr "diff 设置失败"
372
373#: merge-recursive.c:627
374msgid "merge-recursive: disk full?"
375msgstr "merge-recursive:磁盘已满?"
376
377#: merge-recursive.c:690
378#, c-format
379msgid "failed to create path '%s'%s"
380msgstr "无法创建路径 '%s'%s"
381
382#: merge-recursive.c:701
383#, c-format
384msgid "Removing %s to make room for subdirectory\n"
385msgstr "删除 %s 以便为子目录留出空间\n"
386
387#. something else exists
388#. .. but not some other error (who really cares what?)
389#: merge-recursive.c:715 merge-recursive.c:736
390msgid ": perhaps a D/F conflict?"
391msgstr ":可能是一个目录/文件冲突?"
392
393#: merge-recursive.c:726
394#, c-format
395msgid "refusing to lose untracked file at '%s'"
396msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
397
398#: merge-recursive.c:766
399#, c-format
400msgid "cannot read object %s '%s'"
401msgstr "不能读取对象 %s '%s'"
402
403#: merge-recursive.c:768
404#, c-format
405msgid "blob expected for %s '%s'"
406msgstr "%s '%s' 应为二进制对象(blob)"
407
408#: merge-recursive.c:791 builtin/clone.c:302
409#, c-format
410msgid "failed to open '%s'"
411msgstr "无法打开 '%s'"
412
413#: merge-recursive.c:799
414#, c-format
415msgid "failed to symlink '%s'"
416msgstr "无法创建符号链接 '%s'"
417
418#: merge-recursive.c:802
419#, c-format
420msgid "do not know what to do with %06o %s '%s'"
421msgstr "不知道如何处理 %06o %s '%s'"
422
423#: merge-recursive.c:939
424msgid "Failed to execute internal merge"
425msgstr "无法执行内部合并"
426
427#: merge-recursive.c:943
428#, c-format
429msgid "Unable to add %s to database"
430msgstr "不能添加 %s 至对象库"
431
432#: merge-recursive.c:959
433msgid "unsupported object type in the tree"
434msgstr "在树中有不支持的对象类型"
435
436#: merge-recursive.c:1038 merge-recursive.c:1052
437#, c-format
438msgid ""
439"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
440"in tree."
441msgstr ""
442"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
443"的版本被保留。"
444
445#: merge-recursive.c:1044 merge-recursive.c:1057
446#, c-format
447msgid ""
448"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
449"in tree at %s."
450msgstr ""
451"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
452"的版本保留于 %8$s 中。"
453
454#: merge-recursive.c:1098
455msgid "rename"
456msgstr "重命名"
457
458#: merge-recursive.c:1098
459msgid "renamed"
460msgstr "重命名"
461
462#: merge-recursive.c:1154
463#, c-format
464msgid "%s is a directory in %s adding as %s instead"
465msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
466
467#: merge-recursive.c:1176
468#, c-format
469msgid ""
470"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
471"\"->\"%s\" in \"%s\"%s"
472msgstr ""
473"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
474"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
475
476#: merge-recursive.c:1181
477msgid " (left unresolved)"
478msgstr "(留下未解决)"
479
480#: merge-recursive.c:1235
481#, c-format
482msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
483msgstr ""
484"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
485"%5$s"
486
487#: merge-recursive.c:1265
488#, c-format
489msgid "Renaming %s to %s and %s to %s instead"
490msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"
491
492#: merge-recursive.c:1464
493#, c-format
494msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
495msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
496
497#: merge-recursive.c:1474
498#, c-format
499msgid "Adding merged %s"
500msgstr "添加合并后的 %s"
501
502#: merge-recursive.c:1479 merge-recursive.c:1677
503#, c-format
504msgid "Adding as %s instead"
505msgstr "而是以 %s 为名添加"
506
507#: merge-recursive.c:1530
508#, c-format
509msgid "cannot read object %s"
510msgstr "不能读取对象 %s"
511
512#: merge-recursive.c:1533
513#, c-format
514msgid "object %s is not a blob"
515msgstr "对象 %s 不是一个二进制对象(blob)"
516
517#: merge-recursive.c:1581
518msgid "modify"
519msgstr "修改"
520
521#: merge-recursive.c:1581
522msgid "modified"
523msgstr "修改"
524
525#: merge-recursive.c:1591
526msgid "content"
527msgstr "内容"
528
529#: merge-recursive.c:1598
530msgid "add/add"
531msgstr "添加/添加"
532
533#: merge-recursive.c:1632
534#, c-format
535msgid "Skipped %s (merged same as existing)"
536msgstr "略过 %s(已经做过相同合并)"
537
538#: merge-recursive.c:1646
539#, c-format
540msgid "Auto-merging %s"
541msgstr "自动合并 %s"
542
543#: merge-recursive.c:1650 git-submodule.sh:844
544msgid "submodule"
545msgstr "子模组"
546
547#: merge-recursive.c:1651
548#, c-format
549msgid "CONFLICT (%s): Merge conflict in %s"
550msgstr "冲突(%s):合并冲突于 %s"
551
552#: merge-recursive.c:1741
553#, c-format
554msgid "Removing %s"
555msgstr "删除 %s"
556
557#: merge-recursive.c:1766
558msgid "file/directory"
559msgstr "文件/目录"
560
561#: merge-recursive.c:1772
562msgid "directory/file"
563msgstr "目录/文件"
564
565#: merge-recursive.c:1777
566#, c-format
567msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
568msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
569
570#: merge-recursive.c:1787
571#, c-format
572msgid "Adding %s"
573msgstr "添加 %s"
574
575#: merge-recursive.c:1804
576msgid "Fatal merge failure, shouldn't happen."
577msgstr "严重的合并错误,不应发生。"
578
579#: merge-recursive.c:1823
580msgid "Already up-to-date!"
581msgstr "已经是最新的!"
582
583#: merge-recursive.c:1832
584#, c-format
585msgid "merging of trees %s and %s failed"
586msgstr "无法合并树 %s 和 %s"
587
588#: merge-recursive.c:1862
589#, c-format
590msgid "Unprocessed path??? %s"
591msgstr "未处理的路径??? %s"
592
593#: merge-recursive.c:1907
594msgid "Merging:"
595msgstr "合并:"
596
e5e38ce4 597#: merge-recursive.c:1920
649900bc 598#, c-format
e5e38ce4
JX
599msgid "found %u common ancestor:"
600msgid_plural "found %u common ancestors:"
601msgstr[0] "发现 %u 个共同祖先:"
602msgstr[1] "发现 %u 个共同祖先:"
649900bc 603
e5e38ce4 604#: merge-recursive.c:1957
649900bc
JX
605msgid "merge returned no commit"
606msgstr "合并未返回提交"
607
e5e38ce4 608#: merge-recursive.c:2014
649900bc
JX
609#, c-format
610msgid "Could not parse object '%s'"
611msgstr "不能解析对象 '%s'"
612
e5e38ce4 613#: merge-recursive.c:2026 builtin/merge.c:697
649900bc
JX
614msgid "Unable to write index."
615msgstr "不能写入索引。"
616
23ff3338 617#: parse-options.c:494
8ada9598 618msgid "..."
81809b99 619msgstr "..."
8ada9598 620
23ff3338 621#: parse-options.c:512
81809b99 622#, c-format
8ada9598 623msgid "usage: %s"
81809b99 624msgstr "用法:%s"
8ada9598
JX
625
626#. TRANSLATORS: the colon here should align with the
627#. one in "usage: %s" translation
23ff3338 628#: parse-options.c:516
81809b99 629#, c-format
8ada9598 630msgid " or: %s"
81809b99 631msgstr " 或:%s"
8ada9598
JX
632
633# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 634#: parse-options.c:519
81809b99 635#, c-format
8ada9598 636msgid " %s"
81809b99 637msgstr " %s"
8ada9598 638
23ff3338 639#: remote.c:1632
c04f5ac3
JX
640#, c-format
641msgid "Your branch is ahead of '%s' by %d commit.\n"
642msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
643msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 644msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 645
23ff3338 646#: remote.c:1638
c04f5ac3
JX
647#, c-format
648msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
649msgid_plural ""
650"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 651msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 652msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 653
23ff3338 654#: remote.c:1646
c04f5ac3
JX
655#, c-format
656msgid ""
657"Your branch and '%s' have diverged,\n"
658"and have %d and %d different commit each, respectively.\n"
659msgid_plural ""
660"Your branch and '%s' have diverged,\n"
661"and have %d and %d different commits each, respectively.\n"
662msgstr[0] ""
663"您的分支和 '%s' 出现了偏离,\n"
664"并且各自分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
665msgstr[1] ""
666"您的分支和 '%s' 出现了偏离,\n"
667"并且各自分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 668
8ada9598 669#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
170e9899 670#: builtin/merge.c:1088 builtin/merge.c:1098
c04f5ac3
JX
671#, c-format
672msgid "Could not open '%s' for writing"
90e6ef53 673msgstr "不能为写入打开 '%s'"
c04f5ac3 674
8ada9598 675#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
170e9899 676#: builtin/merge.c:1090 builtin/merge.c:1103
c04f5ac3
JX
677#, c-format
678msgid "Could not write to '%s'"
90e6ef53 679msgstr "不能写入 '%s'"
c04f5ac3 680
8ada9598 681#: sequencer.c:144
14c8bced
JX
682msgid ""
683"after resolving the conflicts, mark the corrected paths\n"
684"with 'git add <paths>' or 'git rm <paths>'"
685msgstr ""
686"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
687"命令标记修正后的文件"
688
8ada9598 689#: sequencer.c:147
c04f5ac3
JX
690msgid ""
691"after resolving the conflicts, mark the corrected paths\n"
692"with 'git add <paths>' or 'git rm <paths>'\n"
693"and commit the result with 'git commit'"
694msgstr ""
695"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
696"对修正后的文件做标记,然后用 'git commit' 提交"
697
d691f479 698#: sequencer.c:160 sequencer.c:758 sequencer.c:841
c04f5ac3
JX
699#, c-format
700msgid "Could not write to %s"
701msgstr "不能写入 %s"
702
8ada9598 703#: sequencer.c:163
c04f5ac3
JX
704#, c-format
705msgid "Error wrapping up %s"
706msgstr "错误收尾 %s"
707
8ada9598 708#: sequencer.c:178
c04f5ac3
JX
709msgid "Your local changes would be overwritten by cherry-pick."
710msgstr "您的本地修改将被拣选操作覆盖。"
711
8ada9598 712#: sequencer.c:180
c04f5ac3
JX
713msgid "Your local changes would be overwritten by revert."
714msgstr "您的本地修改将被还原操作覆盖。"
715
8ada9598 716#: sequencer.c:183
c04f5ac3
JX
717msgid "Commit your changes or stash them to proceed."
718msgstr "提交您的修改或保存进度后再继续。"
719
720#. TRANSLATORS: %s will be "revert" or "cherry-pick"
8ada9598 721#: sequencer.c:233
c04f5ac3
JX
722#, c-format
723msgid "%s: Unable to write new index file"
90e6ef53 724msgstr "%s:无法写入新索引文件"
c04f5ac3 725
8ada9598 726#: sequencer.c:261
8ada9598 727msgid "Could not resolve HEAD commit\n"
81809b99 728msgstr "不能解析 HEAD 提交\n"
8ada9598
JX
729
730#: sequencer.c:282
8ada9598 731msgid "Unable to update cache tree\n"
81809b99 732msgstr "不能更新缓存\n"
8ada9598 733
d691f479 734#: sequencer.c:324
81809b99 735#, c-format
8ada9598 736msgid "Could not parse commit %s\n"
81809b99 737msgstr "不能解析提交 %s\n"
8ada9598 738
d691f479 739#: sequencer.c:329
81809b99 740#, c-format
8ada9598 741msgid "Could not parse parent commit %s\n"
81809b99 742msgstr "不能解析父提交 %s\n"
8ada9598 743
d691f479 744#: sequencer.c:395
c04f5ac3 745msgid "Your index file is unmerged."
90e6ef53 746msgstr "您的索引文件未完成合并。"
c04f5ac3 747
d691f479 748#: sequencer.c:398
c04f5ac3
JX
749msgid "You do not have a valid HEAD"
750msgstr "您没有一个有效的 HEAD"
751
d691f479 752#: sequencer.c:413
c04f5ac3
JX
753#, c-format
754msgid "Commit %s is a merge but no -m option was given."
755msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
756
d691f479 757#: sequencer.c:421
c04f5ac3
JX
758#, c-format
759msgid "Commit %s does not have parent %d"
760msgstr "提交 %s 没有父提交 %d"
761
d691f479 762#: sequencer.c:425
c04f5ac3
JX
763#, c-format
764msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 765msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
766
767#. TRANSLATORS: The first %s will be "revert" or
768#. "cherry-pick", the second %s a SHA1
d691f479 769#: sequencer.c:436
c04f5ac3
JX
770#, c-format
771msgid "%s: cannot parse parent commit %s"
772msgstr "%s:不能解析父提交 %s"
773
d691f479 774#: sequencer.c:440
c04f5ac3
JX
775#, c-format
776msgid "Cannot get commit message for %s"
777msgstr "不能得到 %s 的提交说明"
778
d691f479 779#: sequencer.c:524
c04f5ac3
JX
780#, c-format
781msgid "could not revert %s... %s"
782msgstr "不能还原 %s... %s"
783
d691f479 784#: sequencer.c:525
c04f5ac3
JX
785#, c-format
786msgid "could not apply %s... %s"
787msgstr "不能应用 %s... %s"
788
d691f479 789#: sequencer.c:553
c04f5ac3
JX
790msgid "empty commit set passed"
791msgstr "提供了空的提交集"
792
d691f479 793#: sequencer.c:561
c04f5ac3
JX
794#, c-format
795msgid "git %s: failed to read the index"
90e6ef53 796msgstr "git %s:无法读取索引"
c04f5ac3 797
d691f479 798#: sequencer.c:566
c04f5ac3
JX
799#, c-format
800msgid "git %s: failed to refresh the index"
90e6ef53 801msgstr "git %s:无法刷新索引"
c04f5ac3 802
d691f479 803#: sequencer.c:624
c04f5ac3
JX
804#, c-format
805msgid "Cannot %s during a %s"
90e6ef53 806msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 807
d691f479 808#: sequencer.c:646
c04f5ac3
JX
809#, c-format
810msgid "Could not parse line %d."
90e6ef53 811msgstr "不能解析第 %d 行。"
c04f5ac3 812
d691f479 813#: sequencer.c:651
c04f5ac3 814msgid "No commits parsed."
7e238ab7 815msgstr "没有提交被解析。"
c04f5ac3 816
d691f479 817#: sequencer.c:664
c04f5ac3
JX
818#, c-format
819msgid "Could not open %s"
820msgstr "不能打开 %s"
821
d691f479 822#: sequencer.c:668
c04f5ac3
JX
823#, c-format
824msgid "Could not read %s."
825msgstr "不能读取 %s。"
826
d691f479 827#: sequencer.c:675
c04f5ac3
JX
828#, c-format
829msgid "Unusable instruction sheet: %s"
830msgstr "无用的指令表单:%s"
831
d691f479 832#: sequencer.c:703
c04f5ac3
JX
833#, c-format
834msgid "Invalid key: %s"
835msgstr "无效键名:%s"
836
d691f479 837#: sequencer.c:706
c04f5ac3
JX
838#, c-format
839msgid "Invalid value for %s: %s"
81809b99 840msgstr "%s 的值无效:%s"
c04f5ac3 841
d691f479 842#: sequencer.c:718
c04f5ac3
JX
843#, c-format
844msgid "Malformed options sheet: %s"
845msgstr "非法的选项表单:%s"
846
d691f479 847#: sequencer.c:739
c04f5ac3
JX
848msgid "a cherry-pick or revert is already in progress"
849msgstr "一个拣选或还原操作已在进行"
850
d691f479 851#: sequencer.c:740
c04f5ac3
JX
852msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
853msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
854
d691f479 855#: sequencer.c:744
c04f5ac3
JX
856#, c-format
857msgid "Could not create sequencer directory %s"
90e6ef53 858msgstr "不能创建序列目录 %s"
c04f5ac3 859
d691f479 860#: sequencer.c:760 sequencer.c:845
c04f5ac3
JX
861#, c-format
862msgid "Error wrapping up %s."
863msgstr "错误收尾 %s。"
864
d691f479 865#: sequencer.c:779 sequencer.c:913
c04f5ac3
JX
866msgid "no cherry-pick or revert in progress"
867msgstr "没有拣选或还原操作在进行"
868
d691f479 869#: sequencer.c:781
c04f5ac3
JX
870msgid "cannot resolve HEAD"
871msgstr "不能解析 HEAD"
872
d691f479 873#: sequencer.c:783
c04f5ac3 874msgid "cannot abort from a branch yet to be born"
90e6ef53 875msgstr "不能从尚未建立的分支终止"
c04f5ac3 876
23ff3338 877#: sequencer.c:805 builtin/apply.c:3988
c04f5ac3
JX
878#, c-format
879msgid "cannot open %s: %s"
880msgstr "不能打开 %s:%s"
881
d691f479 882#: sequencer.c:808
c04f5ac3
JX
883#, c-format
884msgid "cannot read %s: %s"
885msgstr "不能读取 %s:%s"
886
d691f479 887#: sequencer.c:809
c04f5ac3
JX
888msgid "unexpected end of file"
889msgstr "未预期的文件结束"
890
d691f479 891#: sequencer.c:815
c04f5ac3
JX
892#, c-format
893msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 894msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 895
d691f479 896#: sequencer.c:838
c04f5ac3
JX
897#, c-format
898msgid "Could not format %s."
899msgstr "不能格式化 %s。"
900
d691f479 901#: sequencer.c:1000
c04f5ac3
JX
902msgid "Can't revert as initial commit"
903msgstr "不能作为初始提交还原"
904
d691f479 905#: sequencer.c:1001
c04f5ac3
JX
906msgid "Can't cherry-pick into empty head"
907msgstr "不能拣选到空分支"
908
23ff3338 909#: sha1_name.c:1044
170e9899
JX
910msgid "HEAD does not point to a branch"
911msgstr "HEAD 没有指向一个分支"
912
23ff3338 913#: sha1_name.c:1047
170e9899
JX
914#, c-format
915msgid "No such branch: '%s'"
916msgstr "没有此分支:'%s'"
917
23ff3338 918#: sha1_name.c:1049
170e9899
JX
919#, c-format
920msgid "No upstream configured for branch '%s'"
921msgstr "尚未给分支 '%s' 设置上游"
922
23ff3338 923#: sha1_name.c:1052
170e9899
JX
924#, c-format
925msgid "Upstream branch '%s' not stored as a remote-tracking branch"
926msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
927
d691f479
JX
928#: wrapper.c:413
929#, c-format
930msgid "unable to look up current user in the passwd file: %s"
931msgstr "无法在 passwd 文件中查询到当前用户:%s"
932
933#: wrapper.c:414
934msgid "no such user"
935msgstr "无此用户"
936
23ff3338 937#: wt-status.c:140
c04f5ac3
JX
938msgid "Unmerged paths:"
939msgstr "未合并的路径:"
940
90e6ef53 941# 译者:注意保持前导空格
23ff3338 942#: wt-status.c:167 wt-status.c:194
c04f5ac3
JX
943#, c-format
944msgid " (use \"git reset %s <file>...\" to unstage)"
945msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
946
90e6ef53 947# 译者:注意保持前导空格
23ff3338 948#: wt-status.c:169 wt-status.c:196
c04f5ac3
JX
949msgid " (use \"git rm --cached <file>...\" to unstage)"
950msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
951
90e6ef53 952# 译者:注意保持前导空格
23ff3338 953#: wt-status.c:173
6792b93b
JX
954msgid " (use \"git add <file>...\" to mark resolution)"
955msgstr " (使用 \"git add <file>...\" 标记解决方案)"
956
957# 译者:注意保持前导空格
23ff3338 958#: wt-status.c:175 wt-status.c:179
c04f5ac3
JX
959msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
960msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
961
6792b93b 962# 译者:注意保持前导空格
23ff3338 963#: wt-status.c:177
6792b93b
JX
964msgid " (use \"git rm <file>...\" to mark resolution)"
965msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
966
23ff3338 967#: wt-status.c:188
c04f5ac3
JX
968msgid "Changes to be committed:"
969msgstr "要提交的变更:"
970
23ff3338 971#: wt-status.c:206
c04f5ac3 972msgid "Changes not staged for commit:"
7e238ab7 973msgstr "尚未暂存以备提交的变更:"
c04f5ac3 974
90e6ef53 975# 译者:注意保持前导空格
23ff3338 976#: wt-status.c:210
c04f5ac3
JX
977msgid " (use \"git add <file>...\" to update what will be committed)"
978msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
979
90e6ef53 980# 译者:注意保持前导空格
23ff3338 981#: wt-status.c:212
c04f5ac3
JX
982msgid " (use \"git add/rm <file>...\" to update what will be committed)"
983msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
984
90e6ef53 985# 译者:注意保持前导空格
23ff3338 986#: wt-status.c:213
c04f5ac3
JX
987msgid ""
988" (use \"git checkout -- <file>...\" to discard changes in working directory)"
989msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
990
90e6ef53 991# 译者:注意保持前导空格
23ff3338 992#: wt-status.c:215
c04f5ac3
JX
993msgid " (commit or discard the untracked or modified content in submodules)"
994msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
995
23ff3338 996#: wt-status.c:224
c04f5ac3
JX
997#, c-format
998msgid "%s files:"
999msgstr "%s文件:"
1000
90e6ef53 1001# 译者:注意保持前导空格
23ff3338 1002#: wt-status.c:227
c04f5ac3
JX
1003#, c-format
1004msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1005msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1006
23ff3338 1007#: wt-status.c:244
c04f5ac3
JX
1008msgid "bug"
1009msgstr "bug"
1010
23ff3338 1011#: wt-status.c:249
c04f5ac3
JX
1012msgid "both deleted:"
1013msgstr "双方删除:"
1014
23ff3338 1015#: wt-status.c:250
c04f5ac3
JX
1016msgid "added by us:"
1017msgstr "由我们添加:"
1018
23ff3338 1019#: wt-status.c:251
c04f5ac3
JX
1020msgid "deleted by them:"
1021msgstr "由他们删除:"
1022
23ff3338 1023#: wt-status.c:252
c04f5ac3
JX
1024msgid "added by them:"
1025msgstr "由他们添加:"
1026
23ff3338 1027#: wt-status.c:253
c04f5ac3
JX
1028msgid "deleted by us:"
1029msgstr "由我们删除:"
1030
23ff3338 1031#: wt-status.c:254
c04f5ac3
JX
1032msgid "both added:"
1033msgstr "双方添加:"
1034
23ff3338 1035#: wt-status.c:255
c04f5ac3
JX
1036msgid "both modified:"
1037msgstr "双方修改:"
1038
90e6ef53 1039# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1040#: wt-status.c:285
c04f5ac3 1041msgid "new commits, "
aa9565f7 1042msgstr "新提交, "
c04f5ac3 1043
90e6ef53 1044# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1045#: wt-status.c:287
c04f5ac3 1046msgid "modified content, "
aa9565f7 1047msgstr "修改的内容, "
c04f5ac3 1048
90e6ef53 1049# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
23ff3338 1050#: wt-status.c:289
c04f5ac3 1051msgid "untracked content, "
aa9565f7 1052msgstr "未跟踪的内容, "
c04f5ac3 1053
90e6ef53 1054# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1055#: wt-status.c:303
c04f5ac3
JX
1056#, c-format
1057msgid "new file: %s"
1058msgstr "新文件: %s"
1059
90e6ef53 1060# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1061#: wt-status.c:306
c04f5ac3
JX
1062#, c-format
1063msgid "copied: %s -> %s"
1064msgstr "拷贝: %s -> %s"
1065
90e6ef53 1066# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1067#: wt-status.c:309
c04f5ac3
JX
1068#, c-format
1069msgid "deleted: %s"
1070msgstr "删除: %s"
1071
90e6ef53 1072# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1073#: wt-status.c:312
c04f5ac3
JX
1074#, c-format
1075msgid "modified: %s"
1076msgstr "修改: %s"
1077
90e6ef53 1078# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1079#: wt-status.c:315
c04f5ac3
JX
1080#, c-format
1081msgid "renamed: %s -> %s"
1082msgstr "重命名: %s -> %s"
1083
90e6ef53 1084# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1085#: wt-status.c:318
c04f5ac3
JX
1086#, c-format
1087msgid "typechange: %s"
1088msgstr "类型变更: %s"
1089
90e6ef53 1090# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1091#: wt-status.c:321
c04f5ac3
JX
1092#, c-format
1093msgid "unknown: %s"
1094msgstr "未知: %s"
1095
90e6ef53 1096# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 1097#: wt-status.c:324
c04f5ac3
JX
1098#, c-format
1099msgid "unmerged: %s"
1100msgstr "未合并: %s"
1101
23ff3338 1102#: wt-status.c:327
c04f5ac3
JX
1103#, c-format
1104msgid "bug: unhandled diff status %c"
90e6ef53 1105msgstr "bug:未处理的差异状态 %c"
c04f5ac3 1106
23ff3338 1107#: wt-status.c:785
6792b93b
JX
1108msgid "You have unmerged paths."
1109msgstr "您有路径尚未合并。"
1110
1111# 译者:注意保持前导空格
23ff3338 1112#: wt-status.c:788 wt-status.c:912
6792b93b
JX
1113msgid " (fix conflicts and run \"git commit\")"
1114msgstr " (解决冲突并运行 \"git commit\")"
1115
23ff3338 1116#: wt-status.c:791
6792b93b
JX
1117msgid "All conflicts fixed but you are still merging."
1118msgstr "所有冲突已解决但您仍处于合并中。"
1119
1120# 译者:注意保持前导空格
23ff3338 1121#: wt-status.c:794
6792b93b
JX
1122msgid " (use \"git commit\" to conclude merge)"
1123msgstr " (使用 \"git commit\" 结束合并)"
1124
23ff3338 1125#: wt-status.c:804
6792b93b
JX
1126msgid "You are in the middle of an am session."
1127msgstr "您正处于一个 am 过程中。"
1128
23ff3338 1129#: wt-status.c:807
6792b93b
JX
1130msgid "The current patch is empty."
1131msgstr "当前的补丁为空。"
1132
1133# 译者:注意保持前导空格
23ff3338 1134#: wt-status.c:811
6792b93b
JX
1135msgid " (fix conflicts and then run \"git am --resolved\")"
1136msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1137
1138# 译者:注意保持前导空格
23ff3338 1139#: wt-status.c:813
6792b93b
JX
1140msgid " (use \"git am --skip\" to skip this patch)"
1141msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1142
1143# 译者:注意保持前导空格
23ff3338 1144#: wt-status.c:815
6792b93b
JX
1145msgid " (use \"git am --abort\" to restore the original branch)"
1146msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1147
23ff3338 1148#: wt-status.c:873 wt-status.c:883
6792b93b
JX
1149msgid "You are currently rebasing."
1150msgstr "您正在变基。"
1151
1152# 译者:注意保持前导空格
23ff3338 1153#: wt-status.c:876
6792b93b
JX
1154msgid " (fix conflicts and then run \"git rebase --continue\")"
1155msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1156
1157# 译者:注意保持前导空格
23ff3338 1158#: wt-status.c:878
6792b93b
JX
1159msgid " (use \"git rebase --skip\" to skip this patch)"
1160msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1161
1162# 译者:注意保持前导空格
23ff3338 1163#: wt-status.c:880
6792b93b
JX
1164msgid " (use \"git rebase --abort\" to check out the original branch)"
1165msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1166
1167# 译者:注意保持前导空格
23ff3338 1168#: wt-status.c:886
6792b93b
JX
1169msgid " (all conflicts fixed: run \"git rebase --continue\")"
1170msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1171
23ff3338 1172#: wt-status.c:888
6792b93b
JX
1173msgid "You are currently splitting a commit during a rebase."
1174msgstr "您正在变基过程中拆分一个提交。"
1175
1176# 译者:注意保持前导空格
23ff3338 1177#: wt-status.c:891
6792b93b
JX
1178msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1179msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1180
23ff3338 1181#: wt-status.c:893
6792b93b
JX
1182msgid "You are currently editing a commit during a rebase."
1183msgstr "您正在变基过程中编辑一个提交。"
1184
1185# 译者:注意保持前导空格
23ff3338 1186#: wt-status.c:896
6792b93b
JX
1187msgid " (use \"git commit --amend\" to amend the current commit)"
1188msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1189
1190# 译者:注意保持前导空格
23ff3338 1191#: wt-status.c:898
6792b93b
JX
1192msgid ""
1193" (use \"git rebase --continue\" once you are satisfied with your changes)"
23ff3338 1194msgstr " (执行 \"git rebase --continue\" 一旦您满意您的修改)"
6792b93b 1195
23ff3338 1196#: wt-status.c:908
6792b93b
JX
1197msgid "You are currently cherry-picking."
1198msgstr "您正在做拣选操作。"
1199
1200# 译者:注意保持前导空格
23ff3338 1201#: wt-status.c:915
6792b93b
JX
1202msgid " (all conflicts fixed: run \"git commit\")"
1203msgstr " (解决所有冲突后,执行 \"git commit\")"
1204
23ff3338 1205#: wt-status.c:924
6792b93b
JX
1206msgid "You are currently bisecting."
1207msgstr "您正在做二分查找。"
1208
1209# 译者:注意保持前导空格
23ff3338 1210#: wt-status.c:927
6792b93b
JX
1211msgid " (use \"git bisect reset\" to get back to the original branch)"
1212msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1213
23ff3338 1214#: wt-status.c:978
c04f5ac3
JX
1215msgid "On branch "
1216msgstr "位于分支 "
1217
23ff3338 1218#: wt-status.c:985
c04f5ac3
JX
1219msgid "Not currently on any branch."
1220msgstr "当前不在任何分支上。"
1221
23ff3338 1222#: wt-status.c:997
c04f5ac3
JX
1223msgid "Initial commit"
1224msgstr "初始提交"
1225
23ff3338 1226#: wt-status.c:1011
c04f5ac3
JX
1227msgid "Untracked"
1228msgstr "未跟踪的"
1229
23ff3338 1230#: wt-status.c:1013
c04f5ac3
JX
1231msgid "Ignored"
1232msgstr "忽略的"
1233
23ff3338 1234#: wt-status.c:1015
c04f5ac3
JX
1235#, c-format
1236msgid "Untracked files not listed%s"
1237msgstr "未跟踪的文件没有列出%s"
1238
7e238ab7 1239# 译者:中文字符串拼接,可删除前导空格
23ff3338 1240#: wt-status.c:1017
c04f5ac3 1241msgid " (use -u option to show untracked files)"
7e238ab7 1242msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1243
23ff3338 1244#: wt-status.c:1023
c04f5ac3
JX
1245msgid "No changes"
1246msgstr "没有修改"
1247
23ff3338 1248#: wt-status.c:1027
c04f5ac3
JX
1249#, c-format
1250msgid "no changes added to commit%s\n"
1251msgstr "修改尚未加入提交%s\n"
1252
7e238ab7 1253# 译者:中文字符串拼接,可删除前导空格
23ff3338 1254#: wt-status.c:1029
c04f5ac3 1255msgid " (use \"git add\" and/or \"git commit -a\")"
7e238ab7 1256msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
c04f5ac3 1257
23ff3338 1258#: wt-status.c:1031
c04f5ac3
JX
1259#, c-format
1260msgid "nothing added to commit but untracked files present%s\n"
1261msgstr "空提交但存在未跟踪文件%s\n"
1262
7e238ab7 1263# 译者:中文字符串拼接,可删除前导空格
23ff3338 1264#: wt-status.c:1033
c04f5ac3 1265msgid " (use \"git add\" to track)"
7e238ab7 1266msgstr "(使用 \"git add\" 建立跟踪)"
c04f5ac3 1267
23ff3338 1268#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
c04f5ac3
JX
1269#, c-format
1270msgid "nothing to commit%s\n"
1271msgstr "无须提交%s\n"
1272
7e238ab7 1273# 译者:中文字符串拼接,可删除前导空格
23ff3338 1274#: wt-status.c:1036
c04f5ac3 1275msgid " (create/copy files and use \"git add\" to track)"
7e238ab7 1276msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
c04f5ac3 1277
7e238ab7 1278# 译者:中文字符串拼接,可删除前导空格
23ff3338 1279#: wt-status.c:1039
c04f5ac3 1280msgid " (use -u to show untracked files)"
7e238ab7 1281msgstr "(使用 -u 显示未跟踪文件)"
c04f5ac3 1282
7e238ab7 1283# 译者:中文字符串拼接,可删除前导空格
23ff3338 1284#: wt-status.c:1042
c04f5ac3 1285msgid " (working directory clean)"
7e238ab7 1286msgstr "(干净的工作区)"
c04f5ac3 1287
23ff3338 1288#: wt-status.c:1150
c04f5ac3 1289msgid "HEAD (no branch)"
61bc0753 1290msgstr "HEAD(非分支)"
c04f5ac3 1291
90e6ef53 1292# 译者:注意保持句尾空格
23ff3338 1293#: wt-status.c:1156
c04f5ac3
JX
1294msgid "Initial commit on "
1295msgstr "初始提交于 "
1296
90e6ef53 1297# 译者:注意保持句尾空格
23ff3338 1298#: wt-status.c:1171
c04f5ac3
JX
1299msgid "behind "
1300msgstr "落后 "
1301
90e6ef53 1302# 译者:注意保持句尾空格
23ff3338 1303#: wt-status.c:1174 wt-status.c:1177
c04f5ac3
JX
1304msgid "ahead "
1305msgstr "领先 "
1306
90e6ef53 1307# 译者:注意保持句尾空格
23ff3338 1308#: wt-status.c:1179
c04f5ac3
JX
1309msgid ", behind "
1310msgstr ",落后 "
1311
1312#: builtin/add.c:62
1313#, c-format
1314msgid "unexpected diff status %c"
1315msgstr "意外的差异状态 %c"
1316
23ff3338 1317#: builtin/add.c:67 builtin/commit.c:229
c04f5ac3
JX
1318msgid "updating files failed"
1319msgstr "更新文件失败"
1320
1321#: builtin/add.c:77
1322#, c-format
1323msgid "remove '%s'\n"
1324msgstr "删除 '%s'\n"
1325
1326#: builtin/add.c:176
1327#, c-format
1328msgid "Path '%s' is in submodule '%.*s'"
1329msgstr "路径 '%s' 属于模组 '%.*s'"
1330
1331#: builtin/add.c:192
1332msgid "Unstaged changes after refreshing the index:"
90e6ef53 1333msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1334
6792b93b 1335#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
c04f5ac3
JX
1336#, c-format
1337msgid "pathspec '%s' did not match any files"
1338msgstr "路径 '%s' 未匹配任何文件"
1339
1340#: builtin/add.c:209
1341#, c-format
1342msgid "'%s' is beyond a symbolic link"
1343msgstr "'%s' 位于符号链接中"
1344
1345#: builtin/add.c:276
1346msgid "Could not read the index"
90e6ef53 1347msgstr "不能读取索引"
c04f5ac3
JX
1348
1349#: builtin/add.c:286
1350#, c-format
1351msgid "Could not open '%s' for writing."
90e6ef53 1352msgstr "不能为写入打开 '%s'。"
c04f5ac3
JX
1353
1354#: builtin/add.c:290
1355msgid "Could not write patch"
90e6ef53 1356msgstr "不能写补丁"
c04f5ac3
JX
1357
1358#: builtin/add.c:295
1359#, c-format
1360msgid "Could not stat '%s'"
90e6ef53 1361msgstr "不能查看文件状态 '%s'"
c04f5ac3
JX
1362
1363#: builtin/add.c:297
1364msgid "Empty patch. Aborted."
1365msgstr "空补丁。异常终止。"
1366
8ada9598
JX
1367#: builtin/add.c:303
1368#, c-format
1369msgid "Could not apply '%s'"
1370msgstr "不能应用 '%s'"
1371
1372#: builtin/add.c:312
1373msgid "The following paths are ignored by one of your .gitignore files:\n"
1374msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
1375
1376#: builtin/add.c:352
1377#, c-format
1378msgid "Use -f if you really want to add them.\n"
1379msgstr "使用 -f 参数如果您确实要添加它们。\n"
1380
1381#: builtin/add.c:353
1382msgid "no files added"
1383msgstr "没有文件被添加"
1384
1385#: builtin/add.c:359
1386msgid "adding files failed"
1387msgstr "添加文件失败"
1388
1389#: builtin/add.c:391
1390msgid "-A and -u are mutually incompatible"
1391msgstr "-A 和 -u 选项互斥"
1392
1393#: builtin/add.c:393
1394msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 1395msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598
JX
1396
1397#: builtin/add.c:413
1398#, c-format
1399msgid "Nothing specified, nothing added.\n"
1400msgstr "没有指定文件,也没有文件被添加。\n"
1401
1402#: builtin/add.c:414
1403#, c-format
1404msgid "Maybe you wanted to say 'git add .'?\n"
1405msgstr "也许您想要执行 'git add .'?\n"
1406
23ff3338 1407#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
8ada9598
JX
1408#: builtin/rm.c:162
1409msgid "index file corrupt"
1410msgstr "索引文件损坏"
1411
23ff3338 1412#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
8ada9598
JX
1413msgid "Unable to write new index file"
1414msgstr "无法写入新索引文件"
1415
23ff3338 1416#: builtin/apply.c:57
8ada9598 1417msgid "git apply [options] [<patch>...]"
81809b99 1418msgstr "git apply [选项] [<补丁>...]"
8ada9598 1419
23ff3338 1420#: builtin/apply.c:110
81809b99 1421#, c-format
8ada9598 1422msgid "unrecognized whitespace option '%s'"
81809b99 1423msgstr "未能识别的空白字符选项 '%s'"
8ada9598 1424
23ff3338 1425#: builtin/apply.c:125
81809b99 1426#, c-format
8ada9598 1427msgid "unrecognized whitespace ignore option '%s'"
81809b99 1428msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 1429
23ff3338 1430#: builtin/apply.c:824
8ada9598
JX
1431#, c-format
1432msgid "Cannot prepare timestamp regexp %s"
81809b99 1433msgstr "无法准备时间戳正则表达式 %s"
8ada9598 1434
23ff3338 1435#: builtin/apply.c:833
8ada9598
JX
1436#, c-format
1437msgid "regexec returned %d for input: %s"
81809b99 1438msgstr "regexec 返回 %d,输入为:%s"
8ada9598 1439
23ff3338 1440#: builtin/apply.c:914
81809b99 1441#, c-format
8ada9598 1442msgid "unable to find filename in patch at line %d"
81809b99 1443msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 1444
23ff3338 1445#: builtin/apply.c:946
8ada9598
JX
1446#, c-format
1447msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
81809b99 1448msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 1449
23ff3338 1450#: builtin/apply.c:950
8ada9598
JX
1451#, c-format
1452msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 1453msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 1454
23ff3338 1455#: builtin/apply.c:951
8ada9598
JX
1456#, c-format
1457msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 1458msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 1459
23ff3338 1460#: builtin/apply.c:958
8ada9598
JX
1461#, c-format
1462msgid "git apply: bad git-diff - expected /dev/null on line %d"
81809b99 1463msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行"
8ada9598 1464
23ff3338 1465#: builtin/apply.c:1403
8ada9598
JX
1466#, c-format
1467msgid "recount: unexpected line: %.*s"
81809b99 1468msgstr "recount:意外的行:%.*s"
8ada9598 1469
23ff3338 1470#: builtin/apply.c:1460
8ada9598
JX
1471#, c-format
1472msgid "patch fragment without header at line %d: %.*s"
81809b99 1473msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 1474
23ff3338 1475#: builtin/apply.c:1477
8ada9598
JX
1476#, c-format
1477msgid ""
1478"git diff header lacks filename information when removing %d leading pathname "
1479"component (line %d)"
1480msgid_plural ""
1481"git diff header lacks filename information when removing %d leading pathname "
1482"components (line %d)"
5ae481e0
JX
1483msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1484msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 1485
23ff3338 1486#: builtin/apply.c:1637
8ada9598 1487msgid "new file depends on old contents"
81809b99 1488msgstr "新文件依赖旧内容"
8ada9598 1489
23ff3338 1490#: builtin/apply.c:1639
8ada9598 1491msgid "deleted file still has contents"
81809b99 1492msgstr "删除的文件仍有内容"
8ada9598 1493
23ff3338 1494#: builtin/apply.c:1665
8ada9598
JX
1495#, c-format
1496msgid "corrupt patch at line %d"
81809b99 1497msgstr "补丁损坏位于第 %d 行"
8ada9598 1498
23ff3338 1499#: builtin/apply.c:1701
8ada9598
JX
1500#, c-format
1501msgid "new file %s depends on old contents"
81809b99 1502msgstr "新文件 %s 依赖旧内容"
8ada9598 1503
23ff3338 1504#: builtin/apply.c:1703
8ada9598
JX
1505#, c-format
1506msgid "deleted file %s still has contents"
81809b99 1507msgstr "删除的文件 %s 仍有内容"
8ada9598 1508
23ff3338 1509#: builtin/apply.c:1706
8ada9598
JX
1510#, c-format
1511msgid "** warning: file %s becomes empty but is not deleted"
81809b99 1512msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 1513
23ff3338 1514#: builtin/apply.c:1852
8ada9598
JX
1515#, c-format
1516msgid "corrupt binary patch at line %d: %.*s"
81809b99 1517msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598
JX
1518
1519#. there has to be one hunk (forward hunk)
23ff3338 1520#: builtin/apply.c:1881
8ada9598
JX
1521#, c-format
1522msgid "unrecognized binary patch at line %d"
81809b99 1523msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 1524
23ff3338 1525#: builtin/apply.c:1967
8ada9598
JX
1526#, c-format
1527msgid "patch with only garbage at line %d"
81809b99 1528msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 1529
23ff3338 1530#: builtin/apply.c:2057
81809b99 1531#, c-format
8ada9598 1532msgid "unable to read symlink %s"
81809b99 1533msgstr "无法读取符号链接 %s"
8ada9598 1534
23ff3338 1535#: builtin/apply.c:2061
81809b99 1536#, c-format
8ada9598 1537msgid "unable to open or read %s"
81809b99 1538msgstr "不能打开或读取 %s"
8ada9598 1539
23ff3338 1540#: builtin/apply.c:2132
8ada9598 1541msgid "oops"
81809b99 1542msgstr "哎哟"
8ada9598 1543
23ff3338 1544#: builtin/apply.c:2654
81809b99 1545#, c-format
8ada9598 1546msgid "invalid start of line: '%c'"
81809b99 1547msgstr "无效的行首字符:'%c'"
8ada9598 1548
23ff3338 1549#: builtin/apply.c:2772
8ada9598
JX
1550#, c-format
1551msgid "Hunk #%d succeeded at %d (offset %d line)."
1552msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
81809b99 1553msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)"
5ae481e0 1554msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)"
8ada9598 1555
23ff3338 1556#: builtin/apply.c:2784
8ada9598
JX
1557#, c-format
1558msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 1559msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 1560
23ff3338 1561#: builtin/apply.c:2790
8ada9598
JX
1562#, c-format
1563msgid ""
1564"while searching for:\n"
1565"%.*s"
1566msgstr ""
81809b99
JX
1567"当查询:\n"
1568"%.*s"
8ada9598 1569
23ff3338 1570#: builtin/apply.c:2809
8ada9598
JX
1571#, c-format
1572msgid "missing binary patch data for '%s'"
81809b99 1573msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 1574
23ff3338 1575#: builtin/apply.c:2912
8ada9598
JX
1576#, c-format
1577msgid "binary patch does not apply to '%s'"
81809b99 1578msgstr "二进制补丁未应用到 '%s'"
8ada9598 1579
23ff3338 1580#: builtin/apply.c:2918
8ada9598
JX
1581#, c-format
1582msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
81809b99 1583msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)"
8ada9598 1584
23ff3338 1585#: builtin/apply.c:2939
8ada9598
JX
1586#, c-format
1587msgid "patch failed: %s:%ld"
81809b99 1588msgstr "打补丁失败:%s:%ld"
8ada9598 1589
23ff3338 1590#: builtin/apply.c:3061
8ada9598 1591#, c-format
23ff3338
JX
1592msgid "cannot checkout %s"
1593msgstr "不能检出 %s"
8ada9598 1594
23ff3338 1595#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
81809b99 1596#, c-format
8ada9598 1597msgid "read of %s failed"
81809b99 1598msgstr "读取 %s 失败"
8ada9598 1599
23ff3338 1600#: builtin/apply.c:3139 builtin/apply.c:3361
81809b99 1601#, c-format
23ff3338
JX
1602msgid "path %s has been renamed/deleted"
1603msgstr "路径 %s 已经被重命名/删除"
8ada9598 1604
23ff3338 1605#: builtin/apply.c:3220 builtin/apply.c:3375
8ada9598 1606#, c-format
23ff3338
JX
1607msgid "%s: does not exist in index"
1608msgstr "%s:不存在于索引中"
8ada9598 1609
23ff3338 1610#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
81809b99 1611#, c-format
8ada9598 1612msgid "%s: %s"
81809b99 1613msgstr "%s:%s"
8ada9598 1614
23ff3338 1615#: builtin/apply.c:3229 builtin/apply.c:3383
81809b99 1616#, c-format
8ada9598 1617msgid "%s: does not match index"
81809b99 1618msgstr "%s:和索引不匹配"
8ada9598 1619
23ff3338
JX
1620#: builtin/apply.c:3331
1621msgid "removal patch leaves file contents"
1622msgstr "移除补丁仍留下了文件内容"
1623
1624#: builtin/apply.c:3400
8ada9598
JX
1625#, c-format
1626msgid "%s: wrong type"
81809b99 1627msgstr "%s:错误类型"
8ada9598 1628
23ff3338 1629#: builtin/apply.c:3402
8ada9598
JX
1630#, c-format
1631msgid "%s has type %o, expected %o"
81809b99 1632msgstr "%s 的类型是 %o,预期是 %o"
8ada9598 1633
23ff3338 1634#: builtin/apply.c:3503
81809b99 1635#, c-format
8ada9598 1636msgid "%s: already exists in index"
81809b99 1637msgstr "%s:已经存在于索引中"
8ada9598 1638
23ff3338
JX
1639#: builtin/apply.c:3506
1640#, c-format
1641msgid "%s: already exists in working directory"
1642msgstr "%s:已经存在于工作区中"
1643
1644#: builtin/apply.c:3526
d691f479
JX
1645#, c-format
1646msgid "new mode (%o) of %s does not match old mode (%o)"
1647msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 1648
23ff3338 1649#: builtin/apply.c:3531
8ada9598 1650#, c-format
d691f479
JX
1651msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1652msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1653
23ff3338 1654#: builtin/apply.c:3539
d691f479 1655#, c-format
8ada9598 1656msgid "%s: patch does not apply"
81809b99 1657msgstr "%s:补丁未应用"
8ada9598 1658
23ff3338 1659#: builtin/apply.c:3552
8ada9598
JX
1660#, c-format
1661msgid "Checking patch %s..."
81809b99 1662msgstr "检查补丁 %s..."
8ada9598 1663
23ff3338 1664#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
8ada9598
JX
1665#, c-format
1666msgid "make_cache_entry failed for path '%s'"
1667msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1668
23ff3338 1669#: builtin/apply.c:3750
81809b99 1670#, c-format
8ada9598 1671msgid "unable to remove %s from index"
81809b99 1672msgstr "不能从索引中移除 %s"
8ada9598 1673
23ff3338 1674#: builtin/apply.c:3778
8ada9598
JX
1675#, c-format
1676msgid "corrupt patch for subproject %s"
81809b99 1677msgstr "子项目 %s 损坏的补丁"
8ada9598 1678
23ff3338 1679#: builtin/apply.c:3782
81809b99 1680#, c-format
8ada9598 1681msgid "unable to stat newly created file '%s'"
81809b99 1682msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 1683
23ff3338 1684#: builtin/apply.c:3787
8ada9598
JX
1685#, c-format
1686msgid "unable to create backing store for newly created file %s"
81809b99 1687msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1688
23ff3338 1689#: builtin/apply.c:3790 builtin/apply.c:3898
81809b99 1690#, c-format
8ada9598 1691msgid "unable to add cache entry for %s"
81809b99 1692msgstr "无法为 %s 添加缓存条目"
8ada9598 1693
23ff3338 1694#: builtin/apply.c:3823
81809b99 1695#, c-format
8ada9598 1696msgid "closing file '%s'"
81809b99 1697msgstr "关闭文件 '%s'"
8ada9598 1698
23ff3338 1699#: builtin/apply.c:3872
81809b99 1700#, c-format
8ada9598 1701msgid "unable to write file '%s' mode %o"
81809b99 1702msgstr "不能写文件 '%s' 权限 %o"
8ada9598 1703
23ff3338 1704#: builtin/apply.c:3959
8ada9598
JX
1705#, c-format
1706msgid "Applied patch %s cleanly."
81809b99 1707msgstr "成功应用补丁 %s。"
8ada9598 1708
23ff3338 1709#: builtin/apply.c:3967
8ada9598 1710msgid "internal error"
81809b99 1711msgstr "内部错误"
8ada9598
JX
1712
1713#. Say this even without --verbose
23ff3338 1714#: builtin/apply.c:3970
8ada9598
JX
1715#, c-format
1716msgid "Applying patch %%s with %d reject..."
1717msgid_plural "Applying patch %%s with %d rejects..."
81809b99 1718msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
5ae481e0 1719msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
8ada9598 1720
23ff3338 1721#: builtin/apply.c:3980
8ada9598
JX
1722#, c-format
1723msgid "truncating .rej filename to %.*s.rej"
81809b99 1724msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 1725
23ff3338 1726#: builtin/apply.c:4001
8ada9598
JX
1727#, c-format
1728msgid "Hunk #%d applied cleanly."
81809b99 1729msgstr "第 #%d 个片段成功应用。"
8ada9598 1730
23ff3338 1731#: builtin/apply.c:4004
8ada9598
JX
1732#, c-format
1733msgid "Rejected hunk #%d."
81809b99 1734msgstr "拒绝第 #%d 个片段。"
8ada9598 1735
23ff3338 1736#: builtin/apply.c:4154
8ada9598 1737msgid "unrecognized input"
81809b99 1738msgstr "未能识别的输入"
8ada9598 1739
23ff3338 1740#: builtin/apply.c:4165
8ada9598 1741msgid "unable to read index file"
81809b99 1742msgstr "无法读取索引文件"
8ada9598 1743
23ff3338 1744#: builtin/apply.c:4284 builtin/apply.c:4287
8ada9598 1745msgid "path"
81809b99 1746msgstr "路径"
8ada9598 1747
23ff3338 1748#: builtin/apply.c:4285
8ada9598 1749msgid "don't apply changes matching the given path"
81809b99 1750msgstr "不要应用与给出路径向匹配的变更"
8ada9598 1751
23ff3338 1752#: builtin/apply.c:4288
8ada9598 1753msgid "apply changes matching the given path"
81809b99 1754msgstr "应用与给出路径向匹配的变更"
8ada9598 1755
23ff3338 1756#: builtin/apply.c:4290
8ada9598 1757msgid "num"
81809b99 1758msgstr "数字"
8ada9598 1759
23ff3338 1760#: builtin/apply.c:4291
8ada9598 1761msgid "remove <num> leading slashes from traditional diff paths"
81809b99 1762msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
8ada9598 1763
23ff3338 1764#: builtin/apply.c:4294
8ada9598 1765msgid "ignore additions made by the patch"
81809b99 1766msgstr "忽略补丁中的添加的文件"
8ada9598 1767
23ff3338 1768#: builtin/apply.c:4296
8ada9598 1769msgid "instead of applying the patch, output diffstat for the input"
81809b99 1770msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 1771
23ff3338 1772#: builtin/apply.c:4300
8ada9598 1773msgid "shows number of added and deleted lines in decimal notation"
81809b99 1774msgstr "以数字方式显示添加或删除行的数量"
8ada9598 1775
23ff3338 1776#: builtin/apply.c:4302
8ada9598 1777msgid "instead of applying the patch, output a summary for the input"
81809b99 1778msgstr "不应用补丁,而是显示输入的概要"
8ada9598 1779
23ff3338 1780#: builtin/apply.c:4304
8ada9598 1781msgid "instead of applying the patch, see if the patch is applicable"
81809b99 1782msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 1783
23ff3338 1784#: builtin/apply.c:4306
8ada9598 1785msgid "make sure the patch is applicable to the current index"
81809b99 1786msgstr "确认补丁可以应用到当前索引"
8ada9598 1787
23ff3338 1788#: builtin/apply.c:4308
8ada9598 1789msgid "apply a patch without touching the working tree"
81809b99 1790msgstr "应用补丁而不修改工作区"
8ada9598 1791
23ff3338 1792#: builtin/apply.c:4310
8ada9598 1793msgid "also apply the patch (use with --stat/--summary/--check)"
649900bc 1794msgstr "还应用此补丁(使用 --stat/--summary/--check 参数)"
8ada9598 1795
23ff3338
JX
1796#: builtin/apply.c:4312
1797msgid "attempt three-way merge if a patch does not apply"
1798msgstr "如果一个补丁不能应用则尝试三路合并"
1799
1800#: builtin/apply.c:4314
8ada9598 1801msgid "build a temporary index based on embedded index information"
81809b99 1802msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 1803
23ff3338 1804#: builtin/apply.c:4316
8ada9598 1805msgid "paths are separated with NUL character"
81809b99 1806msgstr "路径以 NUL 字符分隔"
8ada9598 1807
23ff3338 1808#: builtin/apply.c:4319
8ada9598 1809msgid "ensure at least <n> lines of context match"
81809b99 1810msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1811
23ff3338 1812#: builtin/apply.c:4320
8ada9598 1813msgid "action"
81809b99 1814msgstr "动作"
8ada9598 1815
23ff3338 1816#: builtin/apply.c:4321
8ada9598 1817msgid "detect new or modified lines that have whitespace errors"
81809b99 1818msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1819
23ff3338 1820#: builtin/apply.c:4324 builtin/apply.c:4327
8ada9598 1821msgid "ignore changes in whitespace when finding context"
81809b99 1822msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1823
23ff3338 1824#: builtin/apply.c:4330
8ada9598 1825msgid "apply the patch in reverse"
81809b99 1826msgstr "反向应用补丁"
8ada9598 1827
23ff3338 1828#: builtin/apply.c:4332
8ada9598 1829msgid "don't expect at least one line of context"
81809b99 1830msgstr "无需至少一行上下文"
8ada9598 1831
23ff3338 1832#: builtin/apply.c:4334
8ada9598 1833msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 1834msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1835
23ff3338 1836#: builtin/apply.c:4336
8ada9598 1837msgid "allow overlapping hunks"
81809b99 1838msgstr "允许重叠的补丁片段"
8ada9598 1839
23ff3338 1840#: builtin/apply.c:4337
8ada9598 1841msgid "be verbose"
81809b99 1842msgstr "冗长输出"
c04f5ac3 1843
23ff3338 1844#: builtin/apply.c:4339
8ada9598 1845msgid "tolerate incorrectly detected missing new-line at the end of file"
81809b99 1846msgstr "宽容不正确的文件末尾换行符"
c04f5ac3 1847
23ff3338 1848#: builtin/apply.c:4342
8ada9598 1849msgid "do not trust the line counts in the hunk headers"
81809b99 1850msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 1851
23ff3338 1852#: builtin/apply.c:4344
8ada9598 1853msgid "root"
81809b99 1854msgstr "根目录"
c04f5ac3 1855
23ff3338 1856#: builtin/apply.c:4345
8ada9598 1857msgid "prepend <root> to all filenames"
81809b99 1858msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 1859
23ff3338
JX
1860#: builtin/apply.c:4367
1861msgid "--3way outside a repository"
1862msgstr "--3way 在一个版本库之外"
1863
1864#: builtin/apply.c:4375
8ada9598 1865msgid "--index outside a repository"
81809b99 1866msgstr "--index 在一个版本库之外"
c04f5ac3 1867
23ff3338 1868#: builtin/apply.c:4378
8ada9598 1869msgid "--cached outside a repository"
81809b99 1870msgstr "--cached 在一个版本库之外"
c04f5ac3 1871
23ff3338 1872#: builtin/apply.c:4394
81809b99 1873#, c-format
8ada9598 1874msgid "can't open patch '%s'"
81809b99 1875msgstr "不能打开补丁 '%s'"
c04f5ac3 1876
23ff3338 1877#: builtin/apply.c:4408
c04f5ac3 1878#, c-format
8ada9598
JX
1879msgid "squelched %d whitespace error"
1880msgid_plural "squelched %d whitespace errors"
81809b99 1881msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 1882msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 1883
23ff3338 1884#: builtin/apply.c:4414 builtin/apply.c:4424
8ada9598
JX
1885#, c-format
1886msgid "%d line adds whitespace errors."
1887msgid_plural "%d lines add whitespace errors."
81809b99 1888msgstr[0] "%d 行有空白字符误用。"
5ae481e0 1889msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
1890
1891#: builtin/archive.c:17
1892#, c-format
1893msgid "could not create archive file '%s'"
90e6ef53 1894msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
1895
1896#: builtin/archive.c:20
1897msgid "could not redirect output"
90e6ef53 1898msgstr "不能输出重定向"
c04f5ac3
JX
1899
1900#: builtin/archive.c:37
1901msgid "git archive: Remote with no URL"
90e6ef53 1902msgstr "git archive:未提供远程URL"
c04f5ac3
JX
1903
1904#: builtin/archive.c:58
1905msgid "git archive: expected ACK/NAK, got EOF"
90e6ef53 1906msgstr "git archive:期待ACK/NACK,却得到EOF"
c04f5ac3
JX
1907
1908#: builtin/archive.c:63
1909#, c-format
1910msgid "git archive: NACK %s"
90e6ef53 1911msgstr "git archive:NACK %s"
c04f5ac3
JX
1912
1913#: builtin/archive.c:65
1914#, c-format
1915msgid "remote error: %s"
1916msgstr "远程错误:%s"
1917
1918#: builtin/archive.c:66
1919msgid "git archive: protocol error"
90e6ef53 1920msgstr "git archive:协议错误"
c04f5ac3
JX
1921
1922#: builtin/archive.c:71
1923msgid "git archive: expected a flush"
90e6ef53 1924msgstr "git archive:预期一个刷新"
c04f5ac3 1925
90e6ef53 1926# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
8ada9598 1927#: builtin/branch.c:144
c04f5ac3
JX
1928#, c-format
1929msgid ""
1930"deleting branch '%s' that has been merged to\n"
1931" '%s', but not yet merged to HEAD."
1932msgstr ""
70fc47bf 1933"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
1934" '%s',但未合并到 HEAD。"
1935
90e6ef53 1936# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
8ada9598 1937#: builtin/branch.c:148
c04f5ac3
JX
1938#, c-format
1939msgid ""
1940"not deleting branch '%s' that is not yet merged to\n"
1941" '%s', even though it is merged to HEAD."
1942msgstr ""
70fc47bf
T
1943"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
1944" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 1945
8ada9598 1946#: builtin/branch.c:180
c04f5ac3 1947msgid "cannot use -a with -d"
649900bc 1948msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 1949
8ada9598 1950#: builtin/branch.c:186
c04f5ac3
JX
1951msgid "Couldn't look up commit object for HEAD"
1952msgstr "无法查询 HEAD 指向的提交对象"
1953
8ada9598 1954#: builtin/branch.c:191
c04f5ac3
JX
1955#, c-format
1956msgid "Cannot delete the branch '%s' which you are currently on."
1957msgstr "无法删除您当前所在的分支 '%s'。"
1958
8ada9598 1959#: builtin/branch.c:202
5ae481e0 1960#, c-format
8ada9598 1961msgid "remote branch '%s' not found."
81809b99 1962msgstr "远程分支 '%s' 未发现。"
c04f5ac3 1963
8ada9598 1964#: builtin/branch.c:203
81809b99 1965#, c-format
8ada9598 1966msgid "branch '%s' not found."
81809b99 1967msgstr "分支 '%s' 未发现。"
8ada9598
JX
1968
1969#: builtin/branch.c:210
c04f5ac3
JX
1970#, c-format
1971msgid "Couldn't look up commit object for '%s'"
1972msgstr "无法查询 '%s' 指向的提交对象"
1973
8ada9598 1974#: builtin/branch.c:216
c04f5ac3
JX
1975#, c-format
1976msgid ""
1977"The branch '%s' is not fully merged.\n"
1978"If you are sure you want to delete it, run 'git branch -D %s'."
1979msgstr ""
1980"分支 '%s' 没有完全合并。\n"
1981"如果您确认要删除它,执行 'git branch -D %s'。"
1982
8ada9598 1983#: builtin/branch.c:225
81809b99 1984#, c-format
8ada9598 1985msgid "Error deleting remote branch '%s'"
81809b99 1986msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 1987
8ada9598 1988#: builtin/branch.c:226
81809b99 1989#, c-format
8ada9598 1990msgid "Error deleting branch '%s'"
81809b99 1991msgstr "删除分支 '%s' 时出错"
8ada9598
JX
1992
1993#: builtin/branch.c:233
81809b99 1994#, c-format
8ada9598 1995msgid "Deleted remote branch %s (was %s).\n"
81809b99 1996msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 1997
8ada9598 1998#: builtin/branch.c:234
81809b99 1999#, c-format
8ada9598 2000msgid "Deleted branch %s (was %s).\n"
81809b99 2001msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598
JX
2002
2003#: builtin/branch.c:239
c04f5ac3
JX
2004msgid "Update of config-file failed"
2005msgstr "无法更新 config 文件"
2006
8ada9598 2007#: builtin/branch.c:337
c04f5ac3
JX
2008#, c-format
2009msgid "branch '%s' does not point at a commit"
2010msgstr "分支 '%s' 未指向一个提交"
2011
8ada9598 2012#: builtin/branch.c:409
81809b99 2013#, c-format
8ada9598 2014msgid "[%s: behind %d]"
81809b99 2015msgstr "[%s:落后 %d]"
c04f5ac3 2016
8ada9598 2017#: builtin/branch.c:411
81809b99 2018#, c-format
8ada9598 2019msgid "[behind %d]"
81809b99 2020msgstr "[落后 %d]"
8ada9598 2021
8ada9598 2022#: builtin/branch.c:415
81809b99 2023#, c-format
8ada9598 2024msgid "[%s: ahead %d]"
81809b99 2025msgstr "[%s:领先 %d]"
c04f5ac3 2026
8ada9598 2027#: builtin/branch.c:417
81809b99 2028#, c-format
8ada9598 2029msgid "[ahead %d]"
81809b99 2030msgstr "[领先 %d]"
8ada9598 2031
8ada9598 2032#: builtin/branch.c:420
81809b99 2033#, c-format
8ada9598 2034msgid "[%s: ahead %d, behind %d]"
81809b99 2035msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2036
8ada9598 2037#: builtin/branch.c:423
81809b99 2038#, c-format
8ada9598 2039msgid "[ahead %d, behind %d]"
81809b99 2040msgstr "[领先 %d,落后 %d]"
c04f5ac3 2041
8ada9598 2042#: builtin/branch.c:535
c04f5ac3
JX
2043msgid "(no branch)"
2044msgstr "(非分支)"
2045
8ada9598 2046#: builtin/branch.c:600
c04f5ac3 2047msgid "some refs could not be read"
90e6ef53 2048msgstr "一些引用不能读取"
c04f5ac3 2049
8ada9598 2050#: builtin/branch.c:613
c04f5ac3 2051msgid "cannot rename the current branch while not on any."
90e6ef53 2052msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2053
8ada9598 2054#: builtin/branch.c:623
c04f5ac3
JX
2055#, c-format
2056msgid "Invalid branch name: '%s'"
2057msgstr "无效的分支名:'%s'"
2058
8ada9598 2059#: builtin/branch.c:638
c04f5ac3
JX
2060msgid "Branch rename failed"
2061msgstr "分支重命名失败"
2062
8ada9598 2063#: builtin/branch.c:642
c04f5ac3
JX
2064#, c-format
2065msgid "Renamed a misnamed branch '%s' away"
2066msgstr "重命名掉一个错误命名的旧分支 '%s'"
2067
8ada9598 2068#: builtin/branch.c:646
c04f5ac3
JX
2069#, c-format
2070msgid "Branch renamed to %s, but HEAD is not updated!"
2071msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2072
8ada9598 2073#: builtin/branch.c:653
c04f5ac3
JX
2074msgid "Branch is renamed, but update of config-file failed"
2075msgstr "分支被重命名,但更新 config 文件失败"
2076
8ada9598 2077#: builtin/branch.c:668
c04f5ac3
JX
2078#, c-format
2079msgid "malformed object name %s"
2080msgstr "非法的对象名 %s"
2081
8ada9598 2082#: builtin/branch.c:692
81809b99 2083#, c-format
8ada9598 2084msgid "could not write branch description template: %s"
81809b99 2085msgstr "不能写分支描述模版:%s"
c04f5ac3 2086
8ada9598 2087#: builtin/branch.c:783
c04f5ac3
JX
2088msgid "Failed to resolve HEAD as a valid ref."
2089msgstr "无法将 HEAD 解析为有效引用。"
2090
23ff3338 2091#: builtin/branch.c:788 builtin/clone.c:561
c04f5ac3 2092msgid "HEAD not found below refs/heads!"
90e6ef53 2093msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 2094
8ada9598 2095#: builtin/branch.c:808
8ada9598 2096msgid "--column and --verbose are incompatible"
81809b99 2097msgstr "--column 和 --verbose 不兼容"
8ada9598
JX
2098
2099#: builtin/branch.c:857
c04f5ac3
JX
2100msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2101msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2102
2103#: builtin/bundle.c:47
2104#, c-format
2105msgid "%s is okay\n"
2106msgstr "%s 可以\n"
2107
2108#: builtin/bundle.c:56
2109msgid "Need a repository to create a bundle."
90e6ef53 2110msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
2111
2112#: builtin/bundle.c:60
2113msgid "Need a repository to unbundle."
90e6ef53 2114msgstr "需要一个版本库来解包。"
c04f5ac3 2115
23ff3338 2116#: builtin/checkout.c:114 builtin/checkout.c:147
c04f5ac3
JX
2117#, c-format
2118msgid "path '%s' does not have our version"
2119msgstr "路径 '%s' 没有我们的版本"
2120
23ff3338 2121#: builtin/checkout.c:116 builtin/checkout.c:149
c04f5ac3
JX
2122#, c-format
2123msgid "path '%s' does not have their version"
2124msgstr "路径 '%s' 没有他们的版本"
2125
23ff3338 2126#: builtin/checkout.c:132
c04f5ac3
JX
2127#, c-format
2128msgid "path '%s' does not have all necessary versions"
2129msgstr "路径 '%s' 没有全部必须的版本"
2130
23ff3338 2131#: builtin/checkout.c:176
c04f5ac3
JX
2132#, c-format
2133msgid "path '%s' does not have necessary versions"
2134msgstr "路径 '%s' 没有必须的版本"
2135
23ff3338 2136#: builtin/checkout.c:193
c04f5ac3
JX
2137#, c-format
2138msgid "path '%s': cannot merge"
90e6ef53 2139msgstr "path '%s':无法合并"
c04f5ac3 2140
23ff3338 2141#: builtin/checkout.c:210
c04f5ac3
JX
2142#, c-format
2143msgid "Unable to add merge result for '%s'"
2144msgstr "无法为 '%s' 添加合并结果"
2145
23ff3338 2146#: builtin/checkout.c:235 builtin/checkout.c:393
c04f5ac3 2147msgid "corrupt index file"
90e6ef53 2148msgstr "损坏的索引文件"
c04f5ac3 2149
23ff3338 2150#: builtin/checkout.c:265 builtin/checkout.c:272
c04f5ac3
JX
2151#, c-format
2152msgid "path '%s' is unmerged"
2153msgstr "路径 '%s' 未合并"
2154
23ff3338 2155#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
170e9899 2156#: builtin/merge.c:812
c04f5ac3 2157msgid "unable to write new index file"
90e6ef53 2158msgstr "无法写新的索引文件"
c04f5ac3 2159
23ff3338 2160#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
c04f5ac3
JX
2161msgid "diff_setup_done failed"
2162msgstr "diff_setup_done 失败"
2163
23ff3338 2164#: builtin/checkout.c:415
c04f5ac3 2165msgid "you need to resolve your current index first"
90e6ef53 2166msgstr "您需要先解决当前索引的冲突"
c04f5ac3 2167
23ff3338 2168#: builtin/checkout.c:534
c04f5ac3
JX
2169#, c-format
2170msgid "Can not do reflog for '%s'\n"
90e6ef53 2171msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 2172
23ff3338 2173#: builtin/checkout.c:567
c04f5ac3
JX
2174msgid "HEAD is now at"
2175msgstr "HEAD 目前位于"
2176
23ff3338 2177#: builtin/checkout.c:574
c04f5ac3
JX
2178#, c-format
2179msgid "Reset branch '%s'\n"
2180msgstr "重置分支 '%s'\n"
2181
23ff3338 2182#: builtin/checkout.c:577
c04f5ac3
JX
2183#, c-format
2184msgid "Already on '%s'\n"
2185msgstr "已经位于 '%s'\n"
2186
23ff3338 2187#: builtin/checkout.c:581
c04f5ac3
JX
2188#, c-format
2189msgid "Switched to and reset branch '%s'\n"
2190msgstr "切换并重置分支 '%s'\n"
2191
23ff3338 2192#: builtin/checkout.c:583
c04f5ac3
JX
2193#, c-format
2194msgid "Switched to a new branch '%s'\n"
2195msgstr "切换到一个新分支 '%s'\n"
2196
23ff3338 2197#: builtin/checkout.c:585
c04f5ac3
JX
2198#, c-format
2199msgid "Switched to branch '%s'\n"
2200msgstr "切换到分支 '%s'\n"
2201
90e6ef53 2202# 译者:注意保持前导空格
23ff3338 2203#: builtin/checkout.c:641
c04f5ac3
JX
2204#, c-format
2205msgid " ... and %d more.\n"
90e6ef53 2206msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
2207
2208#. The singular version
23ff3338 2209#: builtin/checkout.c:647
c04f5ac3
JX
2210#, c-format
2211msgid ""
2212"Warning: you are leaving %d commit behind, not connected to\n"
2213"any of your branches:\n"
2214"\n"
2215"%s\n"
2216msgid_plural ""
2217"Warning: you are leaving %d commits behind, not connected to\n"
2218"any of your branches:\n"
2219"\n"
2220"%s\n"
2221msgstr[0] ""
2222"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2223"\n"
2224"%s\n"
5ae481e0
JX
2225msgstr[1] ""
2226"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2227"\n"
2228"%s\n"
c04f5ac3 2229
23ff3338 2230#: builtin/checkout.c:665
c04f5ac3
JX
2231#, c-format
2232msgid ""
2233"If you want to keep them by creating a new branch, this may be a good time\n"
2234"to do so with:\n"
2235"\n"
2236" git branch new_branch_name %s\n"
2237"\n"
2238msgstr ""
2239"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2240"如下操作:\n"
2241"\n"
2242" git branch new_branch_name %s\n"
2243"\n"
2244
23ff3338 2245#: builtin/checkout.c:695
c04f5ac3
JX
2246msgid "internal error in revision walk"
2247msgstr "在版本遍历时遇到内部错误"
2248
23ff3338 2249#: builtin/checkout.c:699
c04f5ac3
JX
2250msgid "Previous HEAD position was"
2251msgstr "之前的 HEAD 位置是"
2252
23ff3338 2253#: builtin/checkout.c:725 builtin/checkout.c:920
c04f5ac3 2254msgid "You are on a branch yet to be born"
90e6ef53 2255msgstr "您位于一个尚未初始化的分支"
c04f5ac3
JX
2256
2257#. case (1)
23ff3338 2258#: builtin/checkout.c:856
c04f5ac3
JX
2259#, c-format
2260msgid "invalid reference: %s"
2261msgstr "无效引用:%s"
2262
2263#. case (1): want a tree
23ff3338 2264#: builtin/checkout.c:895
c04f5ac3
JX
2265#, c-format
2266msgid "reference is not a tree: %s"
2267msgstr "引用不是一个树:%s"
2268
23ff3338 2269#: builtin/checkout.c:977
c04f5ac3 2270msgid "-B cannot be used with -b"
649900bc 2271msgstr "-B 不能和 -b 同时使用"
c04f5ac3 2272
23ff3338 2273#: builtin/checkout.c:986
c04f5ac3
JX
2274msgid "--patch is incompatible with all other options"
2275msgstr "--patch 选项和其他选项不兼容"
2276
23ff3338 2277#: builtin/checkout.c:989
c04f5ac3 2278msgid "--detach cannot be used with -b/-B/--orphan"
649900bc 2279msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
c04f5ac3 2280
23ff3338 2281#: builtin/checkout.c:991
c04f5ac3 2282msgid "--detach cannot be used with -t"
649900bc 2283msgstr "--detach 不能和 -t 同时使用"
c04f5ac3 2284
23ff3338 2285#: builtin/checkout.c:997
c04f5ac3
JX
2286msgid "--track needs a branch name"
2287msgstr "--track 需要一个分支名"
2288
23ff3338 2289#: builtin/checkout.c:1004
c04f5ac3
JX
2290msgid "Missing branch name; try -b"
2291msgstr "缺少分支名;尝试 -b"
2292
23ff3338 2293#: builtin/checkout.c:1010
c04f5ac3
JX
2294msgid "--orphan and -b|-B are mutually exclusive"
2295msgstr "--orphan 和 -b|-B 互斥"
2296
23ff3338 2297#: builtin/checkout.c:1012
c04f5ac3 2298msgid "--orphan cannot be used with -t"
649900bc 2299msgstr "--orphan 不能和 -t 同时使用"
c04f5ac3 2300
23ff3338 2301#: builtin/checkout.c:1022
c04f5ac3 2302msgid "git checkout: -f and -m are incompatible"
90e6ef53 2303msgstr "git checkout:-f 和 -m 不兼容"
c04f5ac3 2304
23ff3338 2305#: builtin/checkout.c:1056
c04f5ac3 2306msgid "invalid path specification"
90e6ef53 2307msgstr "无效的路径规格"
c04f5ac3 2308
23ff3338 2309#: builtin/checkout.c:1064
c04f5ac3
JX
2310#, c-format
2311msgid ""
2312"git checkout: updating paths is incompatible with switching branches.\n"
2313"Did you intend to checkout '%s' which can not be resolved as commit?"
2314msgstr ""
90e6ef53 2315"git checkout:更新路径和切换分支不兼容。\n"
c04f5ac3
JX
2316"您是想要检出 '%s' 但未能将其解析为提交么?"
2317
23ff3338 2318#: builtin/checkout.c:1066
c04f5ac3 2319msgid "git checkout: updating paths is incompatible with switching branches."
90e6ef53 2320msgstr "git checkout:更新路径和切换分支不兼容。"
c04f5ac3 2321
23ff3338 2322#: builtin/checkout.c:1071
c04f5ac3 2323msgid "git checkout: --detach does not take a path argument"
90e6ef53 2324msgstr "git checkout:--detach 不跟路径参数"
c04f5ac3 2325
23ff3338 2326#: builtin/checkout.c:1074
c04f5ac3
JX
2327msgid ""
2328"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2329"checking out of the index."
2330msgstr ""
90e6ef53 2331"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 2332
23ff3338 2333#: builtin/checkout.c:1093
c04f5ac3
JX
2334msgid "Cannot switch branch to a non-commit."
2335msgstr "无法切换分支到一个非提交。"
2336
23ff3338 2337#: builtin/checkout.c:1096
c04f5ac3
JX
2338msgid "--ours/--theirs is incompatible with switching branches."
2339msgstr "--ours/--theirs 和切换分支不兼容。"
2340
2341#: builtin/clean.c:78
2342msgid "-x and -X cannot be used together"
649900bc 2343msgstr "-x 和 -X 不能同时使用"
c04f5ac3
JX
2344
2345#: builtin/clean.c:82
2346msgid ""
2347"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2348msgstr ""
90e6ef53 2349"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3
JX
2350
2351#: builtin/clean.c:85
2352msgid ""
2353"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2354"clean"
2355msgstr ""
90e6ef53 2356"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3
JX
2357
2358#: builtin/clean.c:155 builtin/clean.c:176
2359#, c-format
2360msgid "Would remove %s\n"
2361msgstr "将删除 %s\n"
2362
2363#: builtin/clean.c:159 builtin/clean.c:179
2364#, c-format
2365msgid "Removing %s\n"
2366msgstr "正删除 %s\n"
2367
2368#: builtin/clean.c:162 builtin/clean.c:182
2369#, c-format
2370msgid "failed to remove %s"
2371msgstr "无法删除 %s"
2372
2373#: builtin/clean.c:166
2374#, c-format
2375msgid "Would not remove %s\n"
2376msgstr "不会删除 %s\n"
2377
2378#: builtin/clean.c:168
2379#, c-format
2380msgid "Not removing %s\n"
2381msgstr "未删除 %s\n"
2382
7ac1c0ad 2383#: builtin/clone.c:243
c04f5ac3
JX
2384#, c-format
2385msgid "reference repository '%s' is not a local directory."
2386msgstr "引用版本库 '%s' 不是一个本地目录。"
2387
7ac1c0ad 2388#: builtin/clone.c:306
c04f5ac3
JX
2389#, c-format
2390msgid "failed to create directory '%s'"
90e6ef53 2391msgstr "无法创建目录 '%s'"
c04f5ac3 2392
7ac1c0ad 2393#: builtin/clone.c:308 builtin/diff.c:75
c04f5ac3
JX
2394#, c-format
2395msgid "failed to stat '%s'"
90e6ef53 2396msgstr "无法枚举 '%s' 状态"
c04f5ac3 2397
7ac1c0ad 2398#: builtin/clone.c:310
c04f5ac3
JX
2399#, c-format
2400msgid "%s exists and is not a directory"
2401msgstr "%s 存在且不是一个目录"
2402
7ac1c0ad 2403#: builtin/clone.c:324
c04f5ac3
JX
2404#, c-format
2405msgid "failed to stat %s\n"
90e6ef53 2406msgstr "无法枚举 %s 状态\n"
c04f5ac3 2407
7ac1c0ad 2408#: builtin/clone.c:341
c04f5ac3
JX
2409#, c-format
2410msgid "failed to unlink '%s'"
90e6ef53 2411msgstr "无法删除 '%s'"
c04f5ac3 2412
7ac1c0ad 2413#: builtin/clone.c:346
c04f5ac3
JX
2414#, c-format
2415msgid "failed to create link '%s'"
90e6ef53 2416msgstr "无法创建链接 '%s'"
c04f5ac3 2417
7ac1c0ad 2418#: builtin/clone.c:350
c04f5ac3
JX
2419#, c-format
2420msgid "failed to copy file to '%s'"
90e6ef53 2421msgstr "无法拷贝文件至 '%s'"
c04f5ac3 2422
7ac1c0ad 2423#: builtin/clone.c:373
c04f5ac3
JX
2424#, c-format
2425msgid "done.\n"
2426msgstr "完成。\n"
2427
23ff3338 2428#: builtin/clone.c:443
c04f5ac3
JX
2429#, c-format
2430msgid "Could not find remote branch %s to clone."
90e6ef53 2431msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 2432
23ff3338 2433#: builtin/clone.c:552
c04f5ac3
JX
2434msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2435msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
2436
23ff3338 2437#: builtin/clone.c:642
c04f5ac3
JX
2438msgid "Too many arguments."
2439msgstr "太多参数。"
2440
23ff3338 2441#: builtin/clone.c:646
c04f5ac3 2442msgid "You must specify a repository to clone."
90e6ef53 2443msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 2444
23ff3338 2445#: builtin/clone.c:657
c04f5ac3
JX
2446#, c-format
2447msgid "--bare and --origin %s options are incompatible."
2448msgstr "--bare 和 --origin %s 选项不兼容。"
2449
23ff3338 2450#: builtin/clone.c:671
c04f5ac3
JX
2451#, c-format
2452msgid "repository '%s' does not exist"
2453msgstr "版本库 '%s' 不存在"
2454
23ff3338 2455#: builtin/clone.c:676
c04f5ac3
JX
2456msgid "--depth is ignored in local clones; use file:// instead."
2457msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
2458
23ff3338 2459#: builtin/clone.c:686
c04f5ac3
JX
2460#, c-format
2461msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 2462msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 2463
23ff3338 2464#: builtin/clone.c:696
c04f5ac3
JX
2465#, c-format
2466msgid "working tree '%s' already exists."
2467msgstr "工作区 '%s' 已经存在。"
2468
23ff3338 2469#: builtin/clone.c:709 builtin/clone.c:723
c04f5ac3
JX
2470#, c-format
2471msgid "could not create leading directories of '%s'"
90e6ef53 2472msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 2473
23ff3338 2474#: builtin/clone.c:712
c04f5ac3
JX
2475#, c-format
2476msgid "could not create work tree dir '%s'."
90e6ef53 2477msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 2478
23ff3338 2479#: builtin/clone.c:731
c04f5ac3
JX
2480#, c-format
2481msgid "Cloning into bare repository '%s'...\n"
2482msgstr "克隆到裸版本库 '%s'...\n"
2483
23ff3338 2484#: builtin/clone.c:733
c04f5ac3
JX
2485#, c-format
2486msgid "Cloning into '%s'...\n"
2487msgstr "正克隆到 '%s'...\n"
2488
23ff3338 2489#: builtin/clone.c:789
c04f5ac3
JX
2490#, c-format
2491msgid "Don't know how to clone %s"
2492msgstr "不知道如何克隆 %s"
2493
23ff3338 2494#: builtin/clone.c:838
c04f5ac3
JX
2495#, c-format
2496msgid "Remote branch %s not found in upstream %s"
2497msgstr "远程分支 %s 在上游 %s 未发现"
2498
23ff3338 2499#: builtin/clone.c:845
c04f5ac3
JX
2500msgid "You appear to have cloned an empty repository."
2501msgstr "您似乎克隆了一个空版本库。"
2502
8ada9598
JX
2503#: builtin/column.c:51
2504msgid "--command must be the first argument"
81809b99 2505msgstr "--command 必须是第一个参数"
8ada9598
JX
2506
2507#: builtin/commit.c:43
c04f5ac3
JX
2508msgid ""
2509"Your name and email address were configured automatically based\n"
2510"on your username and hostname. Please check that they are accurate.\n"
2511"You can suppress this message by setting them explicitly:\n"
2512"\n"
2513" git config --global user.name \"Your Name\"\n"
2514" git config --global user.email you@example.com\n"
2515"\n"
2516"After doing this, you may fix the identity used for this commit with:\n"
2517"\n"
2518" git commit --amend --reset-author\n"
2519msgstr ""
90e6ef53
JX
2520"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2521"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
2522"\n"
2523" git config --global user.name \"Your Name\"\n"
2524" git config --global user.email you@example.com\n"
2525"\n"
90e6ef53 2526"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
2527"\n"
2528" git commit --amend --reset-author\n"
2529
8ada9598 2530#: builtin/commit.c:55
c04f5ac3
JX
2531msgid ""
2532"You asked to amend the most recent commit, but doing so would make\n"
2533"it empty. You can repeat your command with --allow-empty, or you can\n"
2534"remove the commit entirely with \"git reset HEAD^\".\n"
2535msgstr ""
1b150dc9
T
2536"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2537"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 2538
8ada9598 2539#: builtin/commit.c:60
c04f5ac3
JX
2540msgid ""
2541"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2542"If you wish to commit it anyway, use:\n"
2543"\n"
2544" git commit --allow-empty\n"
2545"\n"
2546"Otherwise, please use 'git reset'\n"
2547msgstr ""
a9ce4543
T
2548"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
2549"也要提交,使用命令:\n"
c04f5ac3
JX
2550"\n"
2551" git commit --allow-empty\n"
2552"\n"
a9ce4543 2553"否则,请使用命令 'git reset'\n"
c04f5ac3 2554
23ff3338 2555#: builtin/commit.c:256
c04f5ac3 2556msgid "failed to unpack HEAD tree object"
90e6ef53 2557msgstr "无法解包 HEAD 树对象"
c04f5ac3 2558
23ff3338 2559#: builtin/commit.c:298
c04f5ac3 2560msgid "unable to create temporary index"
90e6ef53 2561msgstr "不能创建临时索引"
c04f5ac3 2562
23ff3338 2563#: builtin/commit.c:304
c04f5ac3
JX
2564msgid "interactive add failed"
2565msgstr "交互式添加失败"
2566
23ff3338 2567#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
c04f5ac3 2568msgid "unable to write new_index file"
90e6ef53 2569msgstr "无法写 new_index 文件"
c04f5ac3 2570
23ff3338 2571#: builtin/commit.c:389
8ada9598 2572msgid "cannot do a partial commit during a merge."
81809b99 2573msgstr "在合并过程中不能做部分提交。"
c04f5ac3 2574
23ff3338 2575#: builtin/commit.c:391
8ada9598 2576msgid "cannot do a partial commit during a cherry-pick."
81809b99 2577msgstr "在拣选过程中不能做部分提交。"
8ada9598 2578
23ff3338 2579#: builtin/commit.c:401
c04f5ac3 2580msgid "cannot read the index"
90e6ef53 2581msgstr "无法读取索引"
c04f5ac3 2582
23ff3338 2583#: builtin/commit.c:421
c04f5ac3 2584msgid "unable to write temporary index file"
90e6ef53 2585msgstr "无法写临时索引文件"
c04f5ac3 2586
23ff3338 2587#: builtin/commit.c:496 builtin/commit.c:502
c04f5ac3
JX
2588#, c-format
2589msgid "invalid commit: %s"
2590msgstr "无效的提交:%s"
2591
23ff3338 2592#: builtin/commit.c:525
c04f5ac3
JX
2593msgid "malformed --author parameter"
2594msgstr "非法的 --author 参数"
2595
23ff3338 2596#: builtin/commit.c:585
c04f5ac3
JX
2597#, c-format
2598msgid "Malformed ident string: '%s'"
90e6ef53 2599msgstr "非法的身份字符串:'%s'"
c04f5ac3 2600
23ff3338 2601#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
c04f5ac3
JX
2602#, c-format
2603msgid "could not lookup commit %s"
2604msgstr "不能查询提交 %s"
2605
23ff3338 2606#: builtin/commit.c:635 builtin/shortlog.c:296
c04f5ac3
JX
2607#, c-format
2608msgid "(reading log message from standard input)\n"
90e6ef53 2609msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 2610
23ff3338 2611#: builtin/commit.c:637
c04f5ac3 2612msgid "could not read log from standard input"
90e6ef53 2613msgstr "不能从标准输入中读取日志信息"
c04f5ac3 2614
23ff3338 2615#: builtin/commit.c:641
c04f5ac3
JX
2616#, c-format
2617msgid "could not read log file '%s'"
90e6ef53 2618msgstr "不能读取日志文件 '%s'"
c04f5ac3 2619
23ff3338 2620#: builtin/commit.c:647
c04f5ac3
JX
2621msgid "commit has empty message"
2622msgstr "提交说明为空"
2623
23ff3338 2624#: builtin/commit.c:663
c04f5ac3 2625msgid "could not read MERGE_MSG"
90e6ef53 2626msgstr "不能读取 MERGE_MSG"
c04f5ac3 2627
23ff3338 2628#: builtin/commit.c:667
c04f5ac3 2629msgid "could not read SQUASH_MSG"
90e6ef53 2630msgstr "不能读取 SQUASH_MSG"
c04f5ac3 2631
23ff3338 2632#: builtin/commit.c:671
c04f5ac3
JX
2633#, c-format
2634msgid "could not read '%s'"
90e6ef53 2635msgstr "不能读取 '%s'"
c04f5ac3 2636
23ff3338 2637#: builtin/commit.c:723
c04f5ac3 2638msgid "could not write commit template"
90e6ef53 2639msgstr "不能写提交模版"
c04f5ac3 2640
23ff3338 2641#: builtin/commit.c:734
81809b99 2642#, c-format
c04f5ac3
JX
2643msgid ""
2644"\n"
8ada9598 2645"It looks like you may be committing a merge.\n"
c04f5ac3
JX
2646"If this is not correct, please remove the file\n"
2647"\t%s\n"
2648"and try again.\n"
2649msgstr ""
2650"\n"
649900bc 2651"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
2652"\t%s\n"
2653"然后重试。\n"
2654
23ff3338 2655#: builtin/commit.c:739
81809b99 2656#, c-format
8ada9598
JX
2657msgid ""
2658"\n"
2659"It looks like you may be committing a cherry-pick.\n"
2660"If this is not correct, please remove the file\n"
2661"\t%s\n"
2662"and try again.\n"
2663msgstr ""
2664"\n"
649900bc 2665"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
2666"\t%s\n"
2667"然后重试。\n"
c04f5ac3 2668
23ff3338 2669#: builtin/commit.c:751
c04f5ac3 2670msgid ""
8ada9598 2671"Please enter the commit message for your changes. Lines starting\n"
c04f5ac3
JX
2672"with '#' will be ignored, and an empty message aborts the commit.\n"
2673msgstr ""
81809b99
JX
2674"请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
2675"说明将会终止提交。\n"
c04f5ac3 2676
23ff3338 2677#: builtin/commit.c:756
c04f5ac3 2678msgid ""
8ada9598 2679"Please enter the commit message for your changes. Lines starting\n"
c04f5ac3
JX
2680"with '#' will be kept; you may remove them yourself if you want to.\n"
2681"An empty message aborts the commit.\n"
2682msgstr ""
81809b99
JX
2683"请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
2684"如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
c04f5ac3 2685
90e6ef53 2686# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 2687#: builtin/commit.c:769
c04f5ac3
JX
2688#, c-format
2689msgid "%sAuthor: %s"
2690msgstr "%s作者: %s"
2691
90e6ef53 2692# 译者:为保证在输出中对齐,注意调整句中空格!
23ff3338 2693#: builtin/commit.c:776
c04f5ac3
JX
2694#, c-format
2695msgid "%sCommitter: %s"
2696msgstr "%s提交者: %s"
2697
23ff3338 2698#: builtin/commit.c:796
c04f5ac3 2699msgid "Cannot read index"
90e6ef53 2700msgstr "无法读取索引"
c04f5ac3 2701
23ff3338 2702#: builtin/commit.c:833
c04f5ac3
JX
2703msgid "Error building trees"
2704msgstr "无法创建树对象"
2705
23ff3338 2706#: builtin/commit.c:848 builtin/tag.c:361
c04f5ac3
JX
2707#, c-format
2708msgid "Please supply the message using either -m or -F option.\n"
90e6ef53 2709msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
c04f5ac3 2710
23ff3338 2711#: builtin/commit.c:945
c04f5ac3
JX
2712#, c-format
2713msgid "No existing author found with '%s'"
2714msgstr "没有找到匹配 '%s' 的作者"
2715
23ff3338 2716#: builtin/commit.c:960 builtin/commit.c:1160
c04f5ac3
JX
2717#, c-format
2718msgid "Invalid untracked files mode '%s'"
90e6ef53 2719msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 2720
23ff3338 2721#: builtin/commit.c:1000
c04f5ac3
JX
2722msgid "Using both --reset-author and --author does not make sense"
2723msgstr "同时使用 --reset-author 和 --author 没有意义"
2724
23ff3338 2725#: builtin/commit.c:1011
c04f5ac3 2726msgid "You have nothing to amend."
90e6ef53 2727msgstr "您没有可修补的提交。"
c04f5ac3 2728
23ff3338 2729#: builtin/commit.c:1014
8ada9598 2730msgid "You are in the middle of a merge -- cannot amend."
81809b99 2731msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 2732
23ff3338 2733#: builtin/commit.c:1016
8ada9598 2734msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 2735msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 2736
23ff3338 2737#: builtin/commit.c:1019
c04f5ac3 2738msgid "Options --squash and --fixup cannot be used together"
649900bc 2739msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 2740
23ff3338 2741#: builtin/commit.c:1029
c04f5ac3
JX
2742msgid "Only one of -c/-C/-F/--fixup can be used."
2743msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2744
23ff3338 2745#: builtin/commit.c:1031
c04f5ac3 2746msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 2747msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 2748
23ff3338 2749#: builtin/commit.c:1039
c04f5ac3 2750msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 2751msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 2752
23ff3338 2753#: builtin/commit.c:1056
c04f5ac3
JX
2754msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2755msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2756
23ff3338 2757#: builtin/commit.c:1058
c04f5ac3
JX
2758msgid "No paths with --include/--only does not make sense."
2759msgstr "参数 --include/--only 不跟路径没有意义。"
2760
23ff3338 2761#: builtin/commit.c:1060
c04f5ac3 2762msgid "Clever... amending the last one with dirty index."
90e6ef53 2763msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 2764
23ff3338 2765#: builtin/commit.c:1062
c04f5ac3 2766msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 2767msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 2768
23ff3338 2769#: builtin/commit.c:1072 builtin/tag.c:577
c04f5ac3
JX
2770#, c-format
2771msgid "Invalid cleanup mode %s"
2772msgstr "无效的清理模式 %s"
2773
23ff3338 2774#: builtin/commit.c:1077
c04f5ac3 2775msgid "Paths with -a does not make sense."
649900bc 2776msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 2777
23ff3338 2778#: builtin/commit.c:1260
c04f5ac3
JX
2779msgid "couldn't look up newly created commit"
2780msgstr "无法找到新创建的提交"
2781
23ff3338 2782#: builtin/commit.c:1262
c04f5ac3 2783msgid "could not parse newly created commit"
90e6ef53 2784msgstr "不能解析新创建的提交"
c04f5ac3 2785
23ff3338 2786#: builtin/commit.c:1303
c04f5ac3
JX
2787msgid "detached HEAD"
2788msgstr "分离头指针"
2789
7e238ab7 2790# 译者:中文字符串拼接,可删除前导空格
23ff3338 2791#: builtin/commit.c:1305
c04f5ac3 2792msgid " (root-commit)"
7e238ab7 2793msgstr "(根提交)"
c04f5ac3 2794
23ff3338 2795#: builtin/commit.c:1449
c04f5ac3 2796msgid "could not parse HEAD commit"
90e6ef53 2797msgstr "不能解析 HEAD 提交"
c04f5ac3 2798
23ff3338 2799#: builtin/commit.c:1487 builtin/merge.c:509
c04f5ac3
JX
2800#, c-format
2801msgid "could not open '%s' for reading"
90e6ef53 2802msgstr "不能为读入打开 '%s'"
c04f5ac3 2803
23ff3338 2804#: builtin/commit.c:1494
c04f5ac3
JX
2805#, c-format
2806msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 2807msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 2808
23ff3338 2809#: builtin/commit.c:1501
c04f5ac3 2810msgid "could not read MERGE_MODE"
90e6ef53 2811msgstr "不能读取 MERGE_MODE"
c04f5ac3 2812
23ff3338 2813#: builtin/commit.c:1520
c04f5ac3
JX
2814#, c-format
2815msgid "could not read commit message: %s"
90e6ef53 2816msgstr "不能读取提交说明:%s"
c04f5ac3 2817
23ff3338 2818#: builtin/commit.c:1534
73a60cd2
JX
2819#, c-format
2820msgid "Aborting commit; you did not edit the message.\n"
2821msgstr "终止提交;您未更改来自模版的提交说明。\n"
2822
23ff3338 2823#: builtin/commit.c:1539
c04f5ac3
JX
2824#, c-format
2825msgid "Aborting commit due to empty commit message.\n"
2826msgstr "终止提交因为提交说明为空。\n"
2827
23ff3338 2828#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
c04f5ac3 2829msgid "failed to write commit object"
90e6ef53 2830msgstr "无法写提交对象"
c04f5ac3 2831
23ff3338 2832#: builtin/commit.c:1575
c04f5ac3
JX
2833msgid "cannot lock HEAD ref"
2834msgstr "无法锁定 HEAD 引用"
2835
23ff3338 2836#: builtin/commit.c:1579
c04f5ac3
JX
2837msgid "cannot update HEAD ref"
2838msgstr "无法更新 HEAD 引用"
2839
23ff3338 2840#: builtin/commit.c:1590
c04f5ac3
JX
2841msgid ""
2842"Repository has been updated, but unable to write\n"
2843"new_index file. Check that disk is not full or quota is\n"
2844"not exceeded, and then \"git reset HEAD\" to recover."
2845msgstr ""
90e6ef53
JX
2846"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
2847"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3
JX
2848
2849#: builtin/describe.c:234
2850#, c-format
2851msgid "annotated tag %s not available"
2852msgstr "注释 tag %s 无效"
2853
2854#: builtin/describe.c:238
2855#, c-format
2856msgid "annotated tag %s has no embedded name"
2857msgstr "注释 tag %s 没有嵌入名称"
2858
2859#: builtin/describe.c:240
2860#, c-format
2861msgid "tag '%s' is really '%s' here"
90e6ef53 2862msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3
JX
2863
2864#: builtin/describe.c:267
2865#, c-format
2866msgid "Not a valid object name %s"
2867msgstr "不是一个有效的对象名 %s"
2868
2869#: builtin/describe.c:270
2870#, c-format
2871msgid "%s is not a valid '%s' object"
2872msgstr "%s 不是一个有效的 '%s' 对象"
2873
2874#: builtin/describe.c:287
2875#, c-format
2876msgid "no tag exactly matches '%s'"
2877msgstr "没有 tag 准确匹配 '%s'"
2878
2879#: builtin/describe.c:289
2880#, c-format
2881msgid "searching to describe %s\n"
2882msgstr "搜索描述 %s\n"
2883
2884#: builtin/describe.c:329
2885#, c-format
2886msgid "finished search at %s\n"
2887msgstr "完成搜索 %s\n"
2888
2889#: builtin/describe.c:353
2890#, c-format
2891msgid ""
2892"No annotated tags can describe '%s'.\n"
2893"However, there were unannotated tags: try --tags."
2894msgstr ""
2895"没有注释 tag 能描述 '%s'。\n"
2896"然而,有非注释 tag:尝试 --tags。"
2897
2898#: builtin/describe.c:357
2899#, c-format
2900msgid ""
2901"No tags can describe '%s'.\n"
2902"Try --always, or create some tags."
2903msgstr ""
2904"没有注释 tag 能描述 '%s'。\n"
90e6ef53 2905"尝试 --always,或者创建一些 tag。"
c04f5ac3
JX
2906
2907#: builtin/describe.c:378
2908#, c-format
2909msgid "traversed %lu commits\n"
2910msgstr "已遍历 %lu 个提交\n"
2911
2912#: builtin/describe.c:381
2913#, c-format
2914msgid ""
2915"more than %i tags found; listed %i most recent\n"
2916"gave up search at %s\n"
2917msgstr ""
90e6ef53
JX
2918"发现多于 %i 个 tag,列出最近的 %i 个\n"
2919"在 %s 放弃搜索\n"
c04f5ac3
JX
2920
2921#: builtin/describe.c:436
2922msgid "--long is incompatible with --abbrev=0"
2923msgstr "--long 与 --abbrev=0 不兼容"
2924
2925#: builtin/describe.c:462
2926msgid "No names found, cannot describe anything."
90e6ef53 2927msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3
JX
2928
2929#: builtin/describe.c:482
2930msgid "--dirty is incompatible with committishes"
649900bc 2931msgstr "--dirty 不能与提交同时使用"
c04f5ac3
JX
2932
2933#: builtin/diff.c:77
2934#, c-format
2935msgid "'%s': not a regular file or symlink"
2936msgstr "'%s':不是一个正规文件或符号链接"
2937
2938#: builtin/diff.c:220
2939#, c-format
2940msgid "invalid option: %s"
2941msgstr "无效选项:%s"
2942
14c8bced 2943#: builtin/diff.c:297
c04f5ac3
JX
2944msgid "Not a git repository"
2945msgstr "不是一个 git 版本库"
2946
6792b93b 2947#: builtin/diff.c:341
c04f5ac3
JX
2948#, c-format
2949msgid "invalid object '%s' given."
2950msgstr "提供了无效对象 '%s'。"
2951
6792b93b 2952#: builtin/diff.c:346
c04f5ac3
JX
2953#, c-format
2954msgid "more than %d trees given: '%s'"
2955msgstr "提供了超过 %d 个树对象:'%s'"
2956
6792b93b 2957#: builtin/diff.c:356
c04f5ac3
JX
2958#, c-format
2959msgid "more than two blobs given: '%s'"
649900bc 2960msgstr "提供了超过两个二进制对象(blob):'%s'"
c04f5ac3 2961
6792b93b 2962#: builtin/diff.c:364
c04f5ac3
JX
2963#, c-format
2964msgid "unhandled object '%s' given."
2965msgstr "提供了无法处理的对象 '%s'。"
2966
2967#: builtin/fetch.c:200
2968msgid "Couldn't find remote ref HEAD"
2969msgstr "无法发现远程 HEAD 引用"
2970
170e9899 2971#: builtin/fetch.c:253
c04f5ac3
JX
2972#, c-format
2973msgid "object %s not found"
2974msgstr "对象 %s 未发现"
2975
170e9899 2976#: builtin/fetch.c:259
c04f5ac3
JX
2977msgid "[up to date]"
2978msgstr "[最新]"
2979
170e9899 2980#: builtin/fetch.c:273
c04f5ac3
JX
2981#, c-format
2982msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2983msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
2984
170e9899 2985#: builtin/fetch.c:274 builtin/fetch.c:360
c04f5ac3
JX
2986msgid "[rejected]"
2987msgstr "[已拒绝]"
2988
170e9899 2989#: builtin/fetch.c:285
c04f5ac3
JX
2990msgid "[tag update]"
2991msgstr "[tag更新]"
2992
90e6ef53 2993# 译者:注意保持前导空格
170e9899 2994#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
c04f5ac3
JX
2995msgid " (unable to update local ref)"
2996msgstr " (不能更新本地引用)"
2997
170e9899 2998#: builtin/fetch.c:305
c04f5ac3
JX
2999msgid "[new tag]"
3000msgstr "[新tag]"
3001
170e9899 3002#: builtin/fetch.c:308
c04f5ac3
JX
3003msgid "[new branch]"
3004msgstr "[新分支]"
3005
170e9899
JX
3006#: builtin/fetch.c:311
3007msgid "[new ref]"
3008msgstr "[新引用]"
3009
3010#: builtin/fetch.c:356
c04f5ac3
JX
3011msgid "unable to update local ref"
3012msgstr "不能更新本地引用"
3013
170e9899 3014#: builtin/fetch.c:356
c04f5ac3
JX
3015msgid "forced update"
3016msgstr "强制更新"
3017
170e9899 3018#: builtin/fetch.c:362
c04f5ac3 3019msgid "(non-fast-forward)"
90e6ef53 3020msgstr "(非快进式)"
c04f5ac3 3021
170e9899 3022#: builtin/fetch.c:393 builtin/fetch.c:685
c04f5ac3
JX
3023#, c-format
3024msgid "cannot open %s: %s\n"
3025msgstr "无法打开 %s:%s\n"
3026
170e9899 3027#: builtin/fetch.c:402
c04f5ac3
JX
3028#, c-format
3029msgid "%s did not send all necessary objects\n"
3030msgstr "%s 未发送所有必须的对象\n"
3031
170e9899 3032#: builtin/fetch.c:488
c04f5ac3
JX
3033#, c-format
3034msgid "From %.*s\n"
3035msgstr "来自 %.*s\n"
3036
170e9899 3037#: builtin/fetch.c:499
c04f5ac3
JX
3038#, c-format
3039msgid ""
3040"some local refs could not be updated; try running\n"
3041" 'git remote prune %s' to remove any old, conflicting branches"
3042msgstr ""
3043"一些本地引用不能被更新;尝试运行\n"
3044" 'git remote prune %s' 来删除旧的、有冲突的分支"
3045
90e6ef53 3046# 译者:注意保持前导空格
170e9899 3047#: builtin/fetch.c:549
81809b99 3048#, c-format
8ada9598 3049msgid " (%s will become dangling)"
81809b99 3050msgstr " (%s 将成为悬空状态)"
c04f5ac3 3051
90e6ef53 3052# 译者:注意保持前导空格
170e9899 3053#: builtin/fetch.c:550
81809b99 3054#, c-format
8ada9598 3055msgid " (%s has become dangling)"
81809b99 3056msgstr " (%s 已成为悬空状态)"
c04f5ac3 3057
170e9899 3058#: builtin/fetch.c:557
c04f5ac3
JX
3059msgid "[deleted]"
3060msgstr "[已删除]"
3061
8ada9598 3062#: builtin/fetch.c:558 builtin/remote.c:1055
c04f5ac3
JX
3063msgid "(none)"
3064msgstr "(无)"
3065
170e9899 3066#: builtin/fetch.c:675
c04f5ac3
JX
3067#, c-format
3068msgid "Refusing to fetch into current branch %s of non-bare repository"
3069msgstr "拒绝获取到非裸版本库的当前分支 %s"
3070
170e9899 3071#: builtin/fetch.c:709
c04f5ac3
JX
3072#, c-format
3073msgid "Don't know how to fetch from %s"
3074msgstr "不知道如何从 %s 获取"
3075
170e9899 3076#: builtin/fetch.c:786
c04f5ac3
JX
3077#, c-format
3078msgid "Option \"%s\" value \"%s\" is not valid for %s"
3079msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
3080
170e9899 3081#: builtin/fetch.c:789
c04f5ac3
JX
3082#, c-format
3083msgid "Option \"%s\" is ignored for %s\n"
81809b99 3084msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 3085
170e9899 3086#: builtin/fetch.c:888
c04f5ac3
JX
3087#, c-format
3088msgid "Fetching %s\n"
d4a8e00b 3089msgstr "正在获取 %s\n"
c04f5ac3 3090
8ada9598 3091#: builtin/fetch.c:890 builtin/remote.c:100
c04f5ac3
JX
3092#, c-format
3093msgid "Could not fetch %s"
3094msgstr "不能获取 %s"
3095
170e9899 3096#: builtin/fetch.c:907
c04f5ac3
JX
3097msgid ""
3098"No remote repository specified. Please, specify either a URL or a\n"
3099"remote name from which new revisions should be fetched."
90e6ef53 3100msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 3101
170e9899 3102#: builtin/fetch.c:927
c04f5ac3 3103msgid "You need to specify a tag name."
90e6ef53 3104msgstr "您需要指定一个 tag 名称。"
c04f5ac3 3105
170e9899 3106#: builtin/fetch.c:979
c04f5ac3
JX
3107msgid "fetch --all does not take a repository argument"
3108msgstr "fetch --all 不能带一个版本库参数"
3109
170e9899 3110#: builtin/fetch.c:981
c04f5ac3
JX
3111msgid "fetch --all does not make sense with refspecs"
3112msgstr "fetch --all 带引用表达式没有任何意义"
3113
170e9899 3114#: builtin/fetch.c:992
c04f5ac3
JX
3115#, c-format
3116msgid "No such remote or remote group: %s"
3117msgstr "没有这样的远程或远程组:%s"
3118
170e9899 3119#: builtin/fetch.c:1000
c04f5ac3 3120msgid "Fetching a group and specifying refspecs does not make sense"
90e6ef53 3121msgstr "获取组并指定引用表达式没有意义"
c04f5ac3
JX
3122
3123#: builtin/gc.c:63
3124#, c-format
3125msgid "Invalid %s: '%s'"
3126msgstr "无效的 %s:'%s'"
3127
eff6d3a9 3128#: builtin/gc.c:90
c04f5ac3
JX
3129#, c-format
3130msgid "insanely long object directory %.*s"
3131msgstr "不正常的长对象目录 %.*s"
3132
eff6d3a9 3133#: builtin/gc.c:221
c04f5ac3
JX
3134#, c-format
3135msgid "Auto packing the repository for optimum performance.\n"
3136msgstr "自动打包版本库以求最佳性能。\n"
3137
eff6d3a9 3138#: builtin/gc.c:224
c04f5ac3
JX
3139#, c-format
3140msgid ""
3141"Auto packing the repository for optimum performance. You may also\n"
3142"run \"git gc\" manually. See \"git help gc\" for more information.\n"
3143msgstr ""
90e6ef53
JX
3144"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
3145"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 3146
eff6d3a9 3147#: builtin/gc.c:251
c04f5ac3
JX
3148msgid ""
3149"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 3150msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 3151
7ac1c0ad 3152#: builtin/grep.c:216
c04f5ac3
JX
3153#, c-format
3154msgid "grep: failed to create thread: %s"
90e6ef53 3155msgstr "grep:无法创建线程:%s"
c04f5ac3 3156
7ac1c0ad 3157#: builtin/grep.c:402
c04f5ac3
JX
3158#, c-format
3159msgid "Failed to chdir: %s"
3160msgstr "无法切换目录:%s"
3161
7ac1c0ad 3162#: builtin/grep.c:478 builtin/grep.c:512
c04f5ac3
JX
3163#, c-format
3164msgid "unable to read tree (%s)"
90e6ef53 3165msgstr "无法读取树(%s)"
c04f5ac3 3166
7ac1c0ad 3167#: builtin/grep.c:526
c04f5ac3
JX
3168#, c-format
3169msgid "unable to grep from object of type %s"
3170msgstr "无法抓取来自于 %s 类型的对象"
3171
7ac1c0ad 3172#: builtin/grep.c:584
c04f5ac3
JX
3173#, c-format
3174msgid "switch `%c' expects a numerical value"
3175msgstr "开关 `%c' 期望一个数字值"
3176
7ac1c0ad 3177#: builtin/grep.c:601
c04f5ac3
JX
3178#, c-format
3179msgid "cannot open '%s'"
3180msgstr "不能打开 '%s'"
3181
d691f479 3182#: builtin/grep.c:885
c04f5ac3
JX
3183msgid "no pattern given."
3184msgstr "未提供模式匹配。"
3185
d691f479 3186#: builtin/grep.c:899
c04f5ac3
JX
3187#, c-format
3188msgid "bad object %s"
3189msgstr "坏对象 %s"
3190
d691f479 3191#: builtin/grep.c:940
c04f5ac3
JX
3192msgid "--open-files-in-pager only works on the worktree"
3193msgstr "--open-files-in-pager 仅用于工作区"
3194
d691f479 3195#: builtin/grep.c:963
c04f5ac3 3196msgid "--cached or --untracked cannot be used with --no-index."
649900bc 3197msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 3198
d691f479 3199#: builtin/grep.c:968
c04f5ac3 3200msgid "--no-index or --untracked cannot be used with revs."
649900bc 3201msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 3202
d691f479 3203#: builtin/grep.c:971
c04f5ac3 3204msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 3205msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 3206
d691f479 3207#: builtin/grep.c:979
c04f5ac3
JX
3208msgid "both --cached and trees are given."
3209msgstr "同时给出了 --cached 和树对象。"
3210
23ff3338 3211#: builtin/help.c:65
81809b99 3212#, c-format
8ada9598 3213msgid "unrecognized help format '%s'"
81809b99 3214msgstr "未能识别的帮助格式 '%s'"
8ada9598 3215
23ff3338 3216#: builtin/help.c:93
8ada9598 3217msgid "Failed to start emacsclient."
81809b99 3218msgstr "无法启动 emacsclient。"
8ada9598 3219
23ff3338 3220#: builtin/help.c:106
8ada9598 3221msgid "Failed to parse emacsclient version."
81809b99 3222msgstr "无法解析 emacsclient 版本。"
8ada9598 3223
23ff3338 3224#: builtin/help.c:114
8ada9598
JX
3225#, c-format
3226msgid "emacsclient version '%d' too old (< 22)."
81809b99 3227msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
8ada9598 3228
23ff3338 3229#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
81809b99 3230#, c-format
8ada9598 3231msgid "failed to exec '%s': %s"
81809b99 3232msgstr "无法执行 '%s':%s"
8ada9598 3233
23ff3338 3234#: builtin/help.c:217
8ada9598
JX
3235#, c-format
3236msgid ""
3237"'%s': path for unsupported man viewer.\n"
3238"Please consider using 'man.<tool>.cmd' instead."
3239msgstr ""
81809b99
JX
3240"'%s':不支持的 man 手册查看器的路径。\n"
3241"请使用 'man.<tool>.cmd'。"
8ada9598 3242
23ff3338 3243#: builtin/help.c:229
8ada9598
JX
3244#, c-format
3245msgid ""
3246"'%s': cmd for supported man viewer.\n"
3247"Please consider using 'man.<tool>.path' instead."
3248msgstr ""
81809b99
JX
3249"'%s': 支持的 man 手册查看器命令。\n"
3250"请使用 'man.<tool>.path'。"
8ada9598 3251
23ff3338 3252#: builtin/help.c:299
8ada9598 3253msgid "The most commonly used git commands are:"
81809b99 3254msgstr "最常用的 git 命令有:"
8ada9598 3255
23ff3338 3256#: builtin/help.c:367
8ada9598
JX
3257#, c-format
3258msgid "'%s': unknown man viewer."
81809b99 3259msgstr "'%s':未知的 man 查看器。"
8ada9598 3260
23ff3338 3261#: builtin/help.c:384
8ada9598 3262msgid "no man viewer handled the request"
81809b99 3263msgstr "没有 man 查看器处理此请求"
8ada9598 3264
23ff3338 3265#: builtin/help.c:392
8ada9598 3266msgid "no info viewer handled the request"
81809b99 3267msgstr "没有 info 查看器处理此请求"
8ada9598 3268
23ff3338 3269#: builtin/help.c:447 builtin/help.c:454
8ada9598
JX
3270#, c-format
3271msgid "usage: %s%s"
81809b99 3272msgstr "用法:%s%s"
8ada9598 3273
23ff3338 3274#: builtin/help.c:470
8ada9598
JX
3275#, c-format
3276msgid "`git %s' is aliased to `%s'"
81809b99 3277msgstr "`git %s' 是 `%s' 的别名"
8ada9598 3278
6792b93b 3279#: builtin/index-pack.c:170
8ada9598
JX
3280#, c-format
3281msgid "object type mismatch at %s"
81809b99 3282msgstr "%s 的对象类型不匹配"
8ada9598 3283
6792b93b 3284#: builtin/index-pack.c:190
8ada9598 3285msgid "object of unexpected type"
81809b99 3286msgstr "意外的类型的对象"
8ada9598 3287
6792b93b 3288#: builtin/index-pack.c:227
81809b99 3289#, c-format
8ada9598
JX
3290msgid "cannot fill %d byte"
3291msgid_plural "cannot fill %d bytes"
81809b99 3292msgstr[0] "无法填充 %d 字节"
5ae481e0 3293msgstr[1] "无法填充 %d 字节"
8ada9598 3294
6792b93b 3295#: builtin/index-pack.c:237
8ada9598 3296msgid "early EOF"
81809b99 3297msgstr "过早的文件结束符(EOF)"
8ada9598 3298
6792b93b 3299#: builtin/index-pack.c:238
8ada9598 3300msgid "read error on input"
81809b99 3301msgstr "输入上的读错误"
8ada9598 3302
6792b93b 3303#: builtin/index-pack.c:250
8ada9598 3304msgid "used more bytes than were available"
81809b99 3305msgstr "用掉了超过可用的字节"
8ada9598 3306
6792b93b 3307#: builtin/index-pack.c:257
8ada9598 3308msgid "pack too large for current definition of off_t"
81809b99 3309msgstr "包太大超过了当前 off_t 的定义"
8ada9598 3310
6792b93b 3311#: builtin/index-pack.c:273
81809b99 3312#, c-format
8ada9598 3313msgid "unable to create '%s'"
81809b99 3314msgstr "不能创建 '%s'"
8ada9598 3315
6792b93b 3316#: builtin/index-pack.c:278
81809b99 3317#, c-format
8ada9598 3318msgid "cannot open packfile '%s'"
81809b99 3319msgstr "无法打开包文件 '%s'"
8ada9598 3320
6792b93b 3321#: builtin/index-pack.c:292
8ada9598 3322msgid "pack signature mismatch"
81809b99 3323msgstr "包签名不匹配"
8ada9598 3324
6792b93b 3325#: builtin/index-pack.c:312
8ada9598
JX
3326#, c-format
3327msgid "pack has bad object at offset %lu: %s"
81809b99 3328msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 3329
6792b93b 3330#: builtin/index-pack.c:434
8ada9598
JX
3331#, c-format
3332msgid "inflate returned %d"
81809b99 3333msgstr "解压缩返回 %d"
8ada9598 3334
6792b93b 3335#: builtin/index-pack.c:483
8ada9598 3336msgid "offset value overflow for delta base object"
81809b99 3337msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 3338
6792b93b 3339#: builtin/index-pack.c:491
8ada9598 3340msgid "delta base offset is out of bound"
81809b99 3341msgstr "delta 基准偏移越界"
8ada9598 3342
6792b93b 3343#: builtin/index-pack.c:499
81809b99 3344#, c-format
8ada9598 3345msgid "unknown object type %d"
81809b99 3346msgstr "未知对象类型 %d"
8ada9598 3347
23ff3338 3348#: builtin/index-pack.c:530
8ada9598 3349msgid "cannot pread pack file"
81809b99 3350msgstr "无法读取包文件"
8ada9598 3351
23ff3338 3352#: builtin/index-pack.c:532
8ada9598
JX
3353#, c-format
3354msgid "premature end of pack file, %lu byte missing"
3355msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 3356msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 3357msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 3358
23ff3338 3359#: builtin/index-pack.c:558
8ada9598 3360msgid "serious inflate inconsistency"
81809b99 3361msgstr "解压缩严重的不一致"
8ada9598 3362
23ff3338
JX
3363#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
3364#: builtin/index-pack.c:712 builtin/index-pack.c:721
8ada9598
JX
3365#, c-format
3366msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 3367msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 3368
23ff3338 3369#: builtin/index-pack.c:652 builtin/pack-objects.c:170
6792b93b
JX
3370#: builtin/pack-objects.c:262
3371#, c-format
3372msgid "unable to read %s"
3373msgstr "不能读 %s"
3374
23ff3338 3375#: builtin/index-pack.c:718
6792b93b
JX
3376#, c-format
3377msgid "cannot read existing object %s"
3378msgstr "不能读取现存对象 %s"
3379
23ff3338 3380#: builtin/index-pack.c:732
81809b99 3381#, c-format
8ada9598 3382msgid "invalid blob object %s"
649900bc 3383msgstr "无效的二进制对象(blob)%s"
8ada9598 3384
23ff3338 3385#: builtin/index-pack.c:747
81809b99 3386#, c-format
8ada9598 3387msgid "invalid %s"
81809b99 3388msgstr "无效的 %s"
8ada9598 3389
23ff3338 3390#: builtin/index-pack.c:749
8ada9598 3391msgid "Error in object"
81809b99 3392msgstr "对象中出错"
8ada9598 3393
23ff3338 3394#: builtin/index-pack.c:751
8ada9598
JX
3395#, c-format
3396msgid "Not all child objects of %s are reachable"
81809b99 3397msgstr "%s 的所有子对象并非都可达"
8ada9598 3398
23ff3338 3399#: builtin/index-pack.c:821 builtin/index-pack.c:847
8ada9598 3400msgid "failed to apply delta"
81809b99 3401msgstr "无法应用 delta"
8ada9598 3402
23ff3338 3403#: builtin/index-pack.c:986
8ada9598 3404msgid "Receiving objects"
81809b99 3405msgstr "接收对象中"
8ada9598 3406
23ff3338 3407#: builtin/index-pack.c:986
8ada9598 3408msgid "Indexing objects"
81809b99 3409msgstr "索引对象中"
8ada9598 3410
23ff3338 3411#: builtin/index-pack.c:1012
8ada9598 3412msgid "pack is corrupted (SHA1 mismatch)"
81809b99 3413msgstr "包冲突(SHA1 不匹配)"
8ada9598 3414
23ff3338 3415#: builtin/index-pack.c:1017
8ada9598 3416msgid "cannot fstat packfile"
81809b99 3417msgstr "不能枚举包文件状态"
8ada9598 3418
23ff3338 3419#: builtin/index-pack.c:1020
8ada9598 3420msgid "pack has junk at the end"
81809b99 3421msgstr "包的结尾有垃圾数据"
8ada9598 3422
23ff3338 3423#: builtin/index-pack.c:1031
6792b93b
JX
3424msgid "confusion beyond insanity in parse_pack_objects()"
3425msgstr "parse_pack_objects() 中遇到不可理喻的问题"
3426
23ff3338 3427#: builtin/index-pack.c:1054
8ada9598 3428msgid "Resolving deltas"
81809b99 3429msgstr "处理 delta 中"
8ada9598 3430
23ff3338 3431#: builtin/index-pack.c:1105
8ada9598 3432msgid "confusion beyond insanity"
81809b99 3433msgstr "不可理喻"
8ada9598 3434
23ff3338 3435#: builtin/index-pack.c:1124
8ada9598
JX
3436#, c-format
3437msgid "pack has %d unresolved delta"
3438msgid_plural "pack has %d unresolved deltas"
81809b99 3439msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 3440msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 3441
23ff3338 3442#: builtin/index-pack.c:1149
81809b99 3443#, c-format
8ada9598 3444msgid "unable to deflate appended object (%d)"
81809b99 3445msgstr "不能缩小附加对象(%d)"
8ada9598 3446
23ff3338 3447#: builtin/index-pack.c:1228
8ada9598
JX
3448#, c-format
3449msgid "local object %s is corrupt"
81809b99 3450msgstr "本地对象 %s 已损坏"
8ada9598 3451
23ff3338 3452#: builtin/index-pack.c:1252
8ada9598 3453msgid "error while closing pack file"
81809b99 3454msgstr "关闭包文件时出错"
8ada9598 3455
23ff3338 3456#: builtin/index-pack.c:1265
81809b99 3457#, c-format
8ada9598 3458msgid "cannot write keep file '%s'"
81809b99 3459msgstr "无法写保留文件 '%s'"
8ada9598 3460
23ff3338 3461#: builtin/index-pack.c:1273
81809b99 3462#, c-format
8ada9598 3463msgid "cannot close written keep file '%s'"
81809b99 3464msgstr "无法关闭保留文件 '%s'"
8ada9598 3465
23ff3338 3466#: builtin/index-pack.c:1286
8ada9598 3467msgid "cannot store pack file"
81809b99 3468msgstr "无法存储包文件"
8ada9598 3469
23ff3338 3470#: builtin/index-pack.c:1297
8ada9598 3471msgid "cannot store index file"
81809b99 3472msgstr "无法存储索引文件"
8ada9598 3473
23ff3338 3474#: builtin/index-pack.c:1398
81809b99 3475#, c-format
8ada9598 3476msgid "Cannot open existing pack file '%s'"
81809b99 3477msgstr "无法打开现存包文件 '%s'"
8ada9598 3478
23ff3338 3479#: builtin/index-pack.c:1400
81809b99 3480#, c-format
8ada9598 3481msgid "Cannot open existing pack idx file for '%s'"
81809b99 3482msgstr "无法为 %s 打开包索引文件"
8ada9598 3483
23ff3338 3484#: builtin/index-pack.c:1447
81809b99 3485#, c-format
8ada9598
JX
3486msgid "non delta: %d object"
3487msgid_plural "non delta: %d objects"
81809b99 3488msgstr[0] "非 delta:%d 个对象"
5ae481e0 3489msgstr[1] "非 delta:%d 个对象"
8ada9598 3490
23ff3338 3491#: builtin/index-pack.c:1454
8ada9598
JX
3492#, c-format
3493msgid "chain length = %d: %lu object"
3494msgid_plural "chain length = %d: %lu objects"
81809b99 3495msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 3496msgstr[1] "链长 = %d: %lu 对象"
8ada9598 3497
23ff3338 3498#: builtin/index-pack.c:1481
8ada9598 3499msgid "Cannot come back to cwd"
81809b99 3500msgstr "无法返回当前工作目录"
8ada9598 3501
23ff3338
JX
3502#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
3503#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
81809b99 3504#, c-format
8ada9598 3505msgid "bad %s"
81809b99 3506msgstr "错误选项 %s"
8ada9598 3507
23ff3338 3508#: builtin/index-pack.c:1558
8ada9598 3509msgid "--fix-thin cannot be used without --stdin"
649900bc 3510msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 3511
23ff3338 3512#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
8ada9598
JX
3513#, c-format
3514msgid "packfile name '%s' does not end with '.pack'"
81809b99 3515msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 3516
23ff3338 3517#: builtin/index-pack.c:1581
8ada9598 3518msgid "--verify with no packfile name given"
81809b99 3519msgstr "--verify 没有提供包名参数"
8ada9598 3520
c04f5ac3
JX
3521#: builtin/init-db.c:35
3522#, c-format
3523msgid "Could not make %s writable by group"
3524msgstr "不能设置 %s 为组可写"
3525
3526#: builtin/init-db.c:62
3527#, c-format
3528msgid "insanely long template name %s"
3529msgstr "太长的模版名 %s"
3530
3531#: builtin/init-db.c:67
3532#, c-format
3533msgid "cannot stat '%s'"
3534msgstr "不能枚举 '%s' 状态"
3535
3536#: builtin/init-db.c:73
3537#, c-format
3538msgid "cannot stat template '%s'"
3539msgstr "不能枚举模版 '%s' 状态"
3540
3541#: builtin/init-db.c:80
3542#, c-format
3543msgid "cannot opendir '%s'"
3544msgstr "不能打开目录 '%s'"
3545
3546#: builtin/init-db.c:97
3547#, c-format
3548msgid "cannot readlink '%s'"
3549msgstr "不能读取链接 '%s'"
3550
3551#: builtin/init-db.c:99
3552#, c-format
3553msgid "insanely long symlink %s"
3554msgstr "太长的符号链接 %s"
3555
3556#: builtin/init-db.c:102
3557#, c-format
3558msgid "cannot symlink '%s' '%s'"
90e6ef53 3559msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
3560
3561#: builtin/init-db.c:106
3562#, c-format
3563msgid "cannot copy '%s' to '%s'"
3564msgstr "不能拷贝 '%s' 至 '%s'"
3565
3566#: builtin/init-db.c:110
3567#, c-format
3568msgid "ignoring template %s"
3569msgstr "忽略模版 %s"
3570
3571#: builtin/init-db.c:133
3572#, c-format
3573msgid "insanely long template path %s"
3574msgstr "太长的模版路径 %s"
3575
3576#: builtin/init-db.c:141
3577#, c-format
3578msgid "templates not found %s"
3579msgstr "模版未找到 %s"
3580
3581#: builtin/init-db.c:154
3582#, c-format
3583msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 3584msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
3585
3586#: builtin/init-db.c:192
3587#, c-format
3588msgid "insane git directory %s"
3589msgstr "不正常的 git 目录 %s"
3590
23ff3338 3591#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
3592#, c-format
3593msgid "%s already exists"
3594msgstr "%s 已经存在"
3595
23ff3338 3596#: builtin/init-db.c:355
c04f5ac3
JX
3597#, c-format
3598msgid "unable to handle file type %d"
3599msgstr "不能处理 %d 类型的文件"
3600
23ff3338 3601#: builtin/init-db.c:358
c04f5ac3
JX
3602#, c-format
3603msgid "unable to move %s to %s"
3604msgstr "不能移动 %s 至 %s"
3605
23ff3338 3606#: builtin/init-db.c:363
c04f5ac3
JX
3607#, c-format
3608msgid "Could not create git link %s"
3609msgstr "不能创建 git link %s"
3610
3611#.
3612#. * TRANSLATORS: The first '%s' is either "Reinitialized
3613#. * existing" or "Initialized empty", the second " shared" or
3614#. * "", and the last '%s%s' is the verbatim directory name.
3615#.
23ff3338 3616#: builtin/init-db.c:420
c04f5ac3
JX
3617#, c-format
3618msgid "%s%s Git repository in %s%s\n"
3619msgstr "%s%s Git 版本库于 %s%s\n"
3620
23ff3338 3621#: builtin/init-db.c:421
c04f5ac3
JX
3622msgid "Reinitialized existing"
3623msgstr "重新初始化现存的"
3624
23ff3338 3625#: builtin/init-db.c:421
c04f5ac3
JX
3626msgid "Initialized empty"
3627msgstr "初始化空的"
3628
7e238ab7 3629# 译者:中文字符串拼接,可删除前导空格
23ff3338 3630#: builtin/init-db.c:422
c04f5ac3 3631msgid " shared"
90e6ef53 3632msgstr "共享"
c04f5ac3 3633
23ff3338 3634#: builtin/init-db.c:441
c04f5ac3
JX
3635msgid "cannot tell cwd"
3636msgstr "无法获知当前路径"
3637
23ff3338 3638#: builtin/init-db.c:522 builtin/init-db.c:529
c04f5ac3
JX
3639#, c-format
3640msgid "cannot mkdir %s"
3641msgstr "不能创建目录 %s"
3642
23ff3338 3643#: builtin/init-db.c:533
c04f5ac3
JX
3644#, c-format
3645msgid "cannot chdir to %s"
3646msgstr "不能切换目录到 %s"
3647
23ff3338 3648#: builtin/init-db.c:555
c04f5ac3
JX
3649#, c-format
3650msgid ""
3651"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3652"dir=<directory>)"
3653msgstr ""
73a60cd2
JX
3654"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
3655"dir=<directory>)"
c04f5ac3 3656
23ff3338 3657#: builtin/init-db.c:579
c04f5ac3
JX
3658msgid "Cannot access current working directory"
3659msgstr "不能访问当前工作目录"
3660
23ff3338 3661#: builtin/init-db.c:586
c04f5ac3
JX
3662#, c-format
3663msgid "Cannot access work tree '%s'"
3664msgstr "不能访问工作区 '%s'"
3665
6792b93b 3666#: builtin/log.c:189
c04f5ac3
JX
3667#, c-format
3668msgid "Final output: %d %s\n"
3669msgstr "最终输出:%d %s\n"
3670
23ff3338 3671#: builtin/log.c:403 builtin/log.c:494
c04f5ac3
JX
3672#, c-format
3673msgid "Could not read object %s"
90e6ef53 3674msgstr "不能读取对象 %s"
c04f5ac3 3675
23ff3338 3676#: builtin/log.c:518
c04f5ac3
JX
3677#, c-format
3678msgid "Unknown type: %d"
3679msgstr "未知类型:%d"
3680
23ff3338 3681#: builtin/log.c:608
c04f5ac3
JX
3682msgid "format.headers without value"
3683msgstr "format.headers 没有值"
3684
23ff3338 3685#: builtin/log.c:682
c04f5ac3
JX
3686msgid "name of output directory is too long"
3687msgstr "输出目录名太长"
3688
23ff3338 3689#: builtin/log.c:693
c04f5ac3
JX
3690#, c-format
3691msgid "Cannot open patch file %s"
3692msgstr "无法打开补丁文件 %s"
3693
23ff3338 3694#: builtin/log.c:707
c04f5ac3
JX
3695msgid "Need exactly one range."
3696msgstr "只需要一个范围。"
3697
23ff3338 3698#: builtin/log.c:715
c04f5ac3
JX
3699msgid "Not a range."
3700msgstr "不是一个范围。"
3701
23ff3338 3702#: builtin/log.c:792
c04f5ac3
JX
3703msgid "Cover letter needs email format"
3704msgstr "信封需要邮件地址格式"
3705
23ff3338 3706#: builtin/log.c:865
c04f5ac3
JX
3707#, c-format
3708msgid "insane in-reply-to: %s"
3709msgstr "不正常的 in-reply-to:%s"
3710
23ff3338 3711#: builtin/log.c:938
c04f5ac3
JX
3712msgid "Two output directories?"
3713msgstr "两个输出目录?"
3714
23ff3338 3715#: builtin/log.c:1160
c04f5ac3
JX
3716#, c-format
3717msgid "bogus committer info %s"
3718msgstr "虚假的提交者信息 %s"
3719
23ff3338 3720#: builtin/log.c:1205
c04f5ac3
JX
3721msgid "-n and -k are mutually exclusive."
3722msgstr "-n 和 -k 互斥。"
3723
23ff3338 3724#: builtin/log.c:1207
c04f5ac3
JX
3725msgid "--subject-prefix and -k are mutually exclusive."
3726msgstr "--subject-prefix 和 -k 互斥。"
3727
23ff3338 3728#: builtin/log.c:1215
c04f5ac3
JX
3729msgid "--name-only does not make sense"
3730msgstr "--name-only 无意义"
3731
23ff3338 3732#: builtin/log.c:1217
c04f5ac3
JX
3733msgid "--name-status does not make sense"
3734msgstr "--name-status 无意义"
3735
23ff3338 3736#: builtin/log.c:1219
c04f5ac3
JX
3737msgid "--check does not make sense"
3738msgstr "--check 无意义"
3739
23ff3338 3740#: builtin/log.c:1242
c04f5ac3
JX
3741msgid "standard output, or directory, which one?"
3742msgstr "标准输出或目录,哪一个?"
3743
23ff3338 3744#: builtin/log.c:1244
c04f5ac3
JX
3745#, c-format
3746msgid "Could not create directory '%s'"
90e6ef53 3747msgstr "不能创建目录 '%s'"
c04f5ac3 3748
23ff3338 3749#: builtin/log.c:1397
c04f5ac3
JX
3750msgid "Failed to create output files"
3751msgstr "无法创建输出文件"
3752
23ff3338 3753#: builtin/log.c:1501
c04f5ac3
JX
3754#, c-format
3755msgid ""
3756"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 3757msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 3758
23ff3338 3759#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
c04f5ac3
JX
3760#, c-format
3761msgid "Unknown commit %s"
3762msgstr "未知提交 %s"
3763
170e9899 3764#: builtin/merge.c:90
c04f5ac3
JX
3765msgid "switch `m' requires a value"
3766msgstr "开关 `m' 需要一个值"
3767
170e9899 3768#: builtin/merge.c:127
c04f5ac3
JX
3769#, c-format
3770msgid "Could not find merge strategy '%s'.\n"
90e6ef53 3771msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 3772
170e9899 3773#: builtin/merge.c:128
c04f5ac3
JX
3774#, c-format
3775msgid "Available strategies are:"
3776msgstr "可用的策略有:"
3777
170e9899 3778#: builtin/merge.c:133
c04f5ac3
JX
3779#, c-format
3780msgid "Available custom strategies are:"
3781msgstr "可用的自定义策略有:"
3782
170e9899 3783#: builtin/merge.c:240
c04f5ac3
JX
3784msgid "could not run stash."
3785msgstr "不能进行进度保存。"
3786
170e9899 3787#: builtin/merge.c:245
c04f5ac3
JX
3788msgid "stash failed"
3789msgstr "进度保存失败"
3790
170e9899 3791#: builtin/merge.c:250
c04f5ac3
JX
3792#, c-format
3793msgid "not a valid object: %s"
3794msgstr "不是一个有效对象:%s"
3795
170e9899 3796#: builtin/merge.c:269 builtin/merge.c:286
c04f5ac3
JX
3797msgid "read-tree failed"
3798msgstr "读取树失败"
3799
90e6ef53 3800# 译者:注意保持前导空格
170e9899 3801#: builtin/merge.c:316
c04f5ac3
JX
3802msgid " (nothing to squash)"
3803msgstr " (无可压缩)"
3804
170e9899 3805#: builtin/merge.c:329
c04f5ac3
JX
3806#, c-format
3807msgid "Squash commit -- not updating HEAD\n"
3808msgstr "压缩提交 -- 未更新 HEAD\n"
3809
170e9899 3810#: builtin/merge.c:361
c04f5ac3
JX
3811msgid "Writing SQUASH_MSG"
3812msgstr "写入 SQUASH_MSG"
3813
170e9899 3814#: builtin/merge.c:363
c04f5ac3
JX
3815msgid "Finishing SQUASH_MSG"
3816msgstr "完成 SQUASH_MSG"
3817
3818#: builtin/merge.c:386
3819#, c-format
3820msgid "No merge message -- not updating HEAD\n"
3821msgstr "无合并信息 -- 未更新 HEAD\n"
3822
14c8bced 3823#: builtin/merge.c:437
c04f5ac3
JX
3824#, c-format
3825msgid "'%s' does not point to a commit"
3826msgstr "'%s' 没有指向一个提交"
3827
14c8bced 3828#: builtin/merge.c:536
c04f5ac3
JX
3829#, c-format
3830msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 3831msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 3832
14c8bced 3833#: builtin/merge.c:629
c04f5ac3
JX
3834msgid "git write-tree failed to write a tree"
3835msgstr "git write-tree 无法写入一树对象"
3836
14c8bced 3837#: builtin/merge.c:679
c04f5ac3
JX
3838msgid "failed to read the cache"
3839msgstr "无法读取缓存"
3840
170e9899 3841#: builtin/merge.c:710
c04f5ac3
JX
3842msgid "Not handling anything other than two heads merge."
3843msgstr "不能处理两个头合并之外的任何操作。"
3844
170e9899 3845#: builtin/merge.c:724
c04f5ac3
JX
3846#, c-format
3847msgid "Unknown option for merge-recursive: -X%s"
3848msgstr "merge-recursive 的未知选项:-X%s"
3849
170e9899 3850#: builtin/merge.c:738
c04f5ac3
JX
3851#, c-format
3852msgid "unable to write %s"
3853msgstr "不能写 %s"
3854
170e9899 3855#: builtin/merge.c:877
c04f5ac3
JX
3856#, c-format
3857msgid "Could not read from '%s'"
3858msgstr "不能从 '%s' 读取"
3859
170e9899 3860#: builtin/merge.c:886
c04f5ac3
JX
3861#, c-format
3862msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3863msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
3864
170e9899 3865#: builtin/merge.c:892
c04f5ac3
JX
3866msgid ""
3867"Please enter a commit message to explain why this merge is necessary,\n"
3868"especially if it merges an updated upstream into a topic branch.\n"
3869"\n"
3870"Lines starting with '#' will be ignored, and an empty message aborts\n"
3871"the commit.\n"
3872msgstr ""
3873"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
3874"合并到主题分支。\n"
3875"\n"
3876"以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
3877
170e9899 3878#: builtin/merge.c:916
c04f5ac3
JX
3879msgid "Empty commit message."
3880msgstr "空提交信息。"
3881
170e9899 3882#: builtin/merge.c:928
c04f5ac3
JX
3883#, c-format
3884msgid "Wonderful.\n"
3885msgstr "太棒了。\n"
3886
170e9899 3887#: builtin/merge.c:993
c04f5ac3
JX
3888#, c-format
3889msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3890msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
3891
170e9899 3892#: builtin/merge.c:1009
c04f5ac3
JX
3893#, c-format
3894msgid "'%s' is not a commit"
3895msgstr "'%s' 不是一个提交"
3896
170e9899 3897#: builtin/merge.c:1050
c04f5ac3 3898msgid "No current branch."
90e6ef53 3899msgstr "没有当前分支。"
c04f5ac3 3900
170e9899 3901#: builtin/merge.c:1052
c04f5ac3 3902msgid "No remote for the current branch."
90e6ef53 3903msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 3904
170e9899 3905#: builtin/merge.c:1054
c04f5ac3 3906msgid "No default upstream defined for the current branch."
90e6ef53 3907msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 3908
170e9899 3909#: builtin/merge.c:1059
c04f5ac3
JX
3910#, c-format
3911msgid "No remote tracking branch for %s from %s"
3912msgstr "%s 没有来自 %s 的远程跟踪分支"
3913
170e9899
JX
3914#: builtin/merge.c:1146 builtin/merge.c:1303
3915#, c-format
3916msgid "%s - not something we can merge"
3917msgstr "%s - 不能被合并"
3918
3919#: builtin/merge.c:1214
c04f5ac3 3920msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 3921msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 3922
170e9899 3923#: builtin/merge.c:1230 git-pull.sh:31
c04f5ac3
JX
3924msgid ""
3925"You have not concluded your merge (MERGE_HEAD exists).\n"
3926"Please, commit your changes before you can merge."
3927msgstr ""
3928"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 3929"请在合并前先提交您的修改。"
c04f5ac3 3930
170e9899 3931#: builtin/merge.c:1233 git-pull.sh:34
c04f5ac3
JX
3932msgid "You have not concluded your merge (MERGE_HEAD exists)."
3933msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
3934
170e9899 3935#: builtin/merge.c:1237
c04f5ac3
JX
3936msgid ""
3937"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3938"Please, commit your changes before you can merge."
3939msgstr ""
3940"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 3941"请在合并前先提交您的修改。"
c04f5ac3 3942
170e9899 3943#: builtin/merge.c:1240
c04f5ac3
JX
3944msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3945msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
3946
170e9899 3947#: builtin/merge.c:1249
c04f5ac3 3948msgid "You cannot combine --squash with --no-ff."
649900bc 3949msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 3950
170e9899 3951#: builtin/merge.c:1254
c04f5ac3 3952msgid "You cannot combine --no-ff with --ff-only."
649900bc 3953msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
c04f5ac3 3954
170e9899 3955#: builtin/merge.c:1261
c04f5ac3 3956msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 3957msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 3958
170e9899 3959#: builtin/merge.c:1293
c04f5ac3 3960msgid "Can merge only exactly one commit into empty head"
90e6ef53 3961msgstr "只能将一个提交合并到空分支上"
c04f5ac3 3962
170e9899 3963#: builtin/merge.c:1296
c04f5ac3
JX
3964msgid "Squash commit into empty head not supported yet"
3965msgstr "尚不支持到空分支的压缩提交"
3966
170e9899 3967#: builtin/merge.c:1298
c04f5ac3
JX
3968msgid "Non-fast-forward commit does not make sense into an empty head"
3969msgstr "到空分支的非快进式提交没有意义"
3970
170e9899 3971#: builtin/merge.c:1413
c04f5ac3
JX
3972#, c-format
3973msgid "Updating %s..%s\n"
3974msgstr "更新 %s..%s\n"
3975
170e9899 3976#: builtin/merge.c:1451
c04f5ac3
JX
3977#, c-format
3978msgid "Trying really trivial in-index merge...\n"
90e6ef53 3979msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 3980
170e9899 3981#: builtin/merge.c:1458
c04f5ac3
JX
3982#, c-format
3983msgid "Nope.\n"
3984msgstr "无。\n"
3985
170e9899 3986#: builtin/merge.c:1490
c04f5ac3 3987msgid "Not possible to fast-forward, aborting."
1aabac65 3988msgstr "无法快进,终止。"
c04f5ac3 3989
170e9899 3990#: builtin/merge.c:1513 builtin/merge.c:1592
c04f5ac3
JX
3991#, c-format
3992msgid "Rewinding the tree to pristine...\n"
3993msgstr "将树回滚至原始状态...\n"
3994
170e9899 3995#: builtin/merge.c:1517
c04f5ac3
JX
3996#, c-format
3997msgid "Trying merge strategy %s...\n"
3998msgstr "尝试合并策略 %s...\n"
3999
170e9899 4000#: builtin/merge.c:1583
c04f5ac3
JX
4001#, c-format
4002msgid "No merge strategy handled the merge.\n"
4003msgstr "没有合并策略处理此合并。\n"
4004
170e9899 4005#: builtin/merge.c:1585
c04f5ac3
JX
4006#, c-format
4007msgid "Merge with strategy %s failed.\n"
4008msgstr "使用策略 %s 合并失败。\n"
4009
170e9899 4010#: builtin/merge.c:1594
c04f5ac3
JX
4011#, c-format
4012msgid "Using the %s to prepare resolving by hand.\n"
4013msgstr "使用 %s 以准备手工解决。\n"
4014
170e9899 4015#: builtin/merge.c:1606
c04f5ac3
JX
4016#, c-format
4017msgid "Automatic merge went well; stopped before committing as requested\n"
4018msgstr "自动合并进展顺利,按要求在提交前停止\n"
4019
4020#: builtin/mv.c:108
4021#, c-format
4022msgid "Checking rename of '%s' to '%s'\n"
4023msgstr "检查 '%s' 到 '%s' 的重命名\n"
4024
4025#: builtin/mv.c:112
4026msgid "bad source"
4027msgstr "坏的源"
4028
4029#: builtin/mv.c:115
4030msgid "can not move directory into itself"
4031msgstr "不能将目录移动到自身"
4032
4033#: builtin/mv.c:118
4034msgid "cannot move directory over file"
4035msgstr "不能将目录移动到文件"
4036
4037#: builtin/mv.c:128
4038#, c-format
4039msgid "Huh? %.*s is in index?"
90e6ef53 4040msgstr "嗯?%.*s 在索引中?"
c04f5ac3
JX
4041
4042#: builtin/mv.c:140
4043msgid "source directory is empty"
4044msgstr "源目录为空"
4045
4046#: builtin/mv.c:171
4047msgid "not under version control"
4048msgstr "不在版本控制之下"
4049
4050#: builtin/mv.c:173
4051msgid "destination exists"
4052msgstr "目标已存在"
4053
4054#: builtin/mv.c:181
4055#, c-format
4056msgid "overwriting '%s'"
4057msgstr "覆盖 '%s'"
4058
4059#: builtin/mv.c:184
4060msgid "Cannot overwrite"
4061msgstr "不能覆盖"
4062
4063#: builtin/mv.c:187
4064msgid "multiple sources for the same target"
4065msgstr "同一目标具有多个源"
4066
4067#: builtin/mv.c:202
4068#, c-format
4069msgid "%s, source=%s, destination=%s"
4070msgstr "%s,源=%s,目标=%s"
4071
4072#: builtin/mv.c:212
4073#, c-format
4074msgid "Renaming %s to %s\n"
4075msgstr "重命名 %s 至 %s\n"
4076
8ada9598 4077#: builtin/mv.c:215 builtin/remote.c:731
c04f5ac3
JX
4078#, c-format
4079msgid "renaming '%s' failed"
4080msgstr "重命名 '%s' 失败"
4081
4082#: builtin/notes.c:139
4083#, c-format
4084msgid "unable to start 'show' for object '%s'"
4085msgstr "不能为对象 '%s' 开始 'show'"
4086
4087#: builtin/notes.c:145
4088msgid "can't fdopen 'show' output fd"
4089msgstr "不能打开 'show' 输出文件句柄"
4090
4091#: builtin/notes.c:155
4092#, c-format
4093msgid "failed to close pipe to 'show' for object '%s'"
4094msgstr "无法为对象 '%s' 的 'show' 关闭管道"
4095
4096#: builtin/notes.c:158
4097#, c-format
4098msgid "failed to finish 'show' for object '%s'"
4099msgstr "无法为对象 '%s' 完成 'show'"
4100
8ada9598 4101#: builtin/notes.c:175 builtin/tag.c:347
c04f5ac3
JX
4102#, c-format
4103msgid "could not create file '%s'"
4104msgstr "不能创建文件 '%s'"
4105
4106#: builtin/notes.c:189
4107msgid "Please supply the note contents using either -m or -F option"
4108msgstr "请通过 -m 或 -F 选项为注解提供内容"
4109
4110#: builtin/notes.c:210 builtin/notes.c:973
4111#, c-format
4112msgid "Removing note for object %s\n"
4113msgstr "删除对象 %s 的注解\n"
4114
4115#: builtin/notes.c:215
4116msgid "unable to write note object"
4117msgstr "不能写注解对象"
4118
4119#: builtin/notes.c:217
4120#, c-format
4121msgid "The note contents has been left in %s"
4122msgstr "注解内容被留在文件 %s 中"
4123
8ada9598 4124#: builtin/notes.c:251 builtin/tag.c:542
c04f5ac3
JX
4125#, c-format
4126msgid "cannot read '%s'"
4127msgstr "不能读取 '%s'"
4128
8ada9598 4129#: builtin/notes.c:253 builtin/tag.c:545
c04f5ac3
JX
4130#, c-format
4131msgid "could not open or read '%s'"
4132msgstr "不能打开或读取 '%s'"
4133
4134#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
4135#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
4136#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
8ada9598 4137#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
c04f5ac3
JX
4138#, c-format
4139msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 4140msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3
JX
4141
4142#: builtin/notes.c:275
4143#, c-format
4144msgid "Failed to read object '%s'."
4145msgstr "无法读取对象 '%s'。"
4146
4147#: builtin/notes.c:299
4148msgid "Cannot commit uninitialized/unreferenced notes tree"
4149msgstr "不能提交未初始化/未引用的注解树"
4150
4151#: builtin/notes.c:340
4152#, c-format
4153msgid "Bad notes.rewriteMode value: '%s'"
90e6ef53 4154msgstr "坏的 notes.rewriteMode 值:'%s'"
c04f5ac3
JX
4155
4156#: builtin/notes.c:350
4157#, c-format
4158msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
4159msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
4160
4161#. TRANSLATORS: The first %s is the name of the
4162#. environment variable, the second %s is its value
4163#: builtin/notes.c:377
4164#, c-format
4165msgid "Bad %s value: '%s'"
90e6ef53 4166msgstr "坏的 %s 值:'%s'"
c04f5ac3
JX
4167
4168#: builtin/notes.c:441
4169#, c-format
4170msgid "Malformed input line: '%s'."
4171msgstr "非法的输入行:'%s'。"
4172
4173#: builtin/notes.c:456
4174#, c-format
4175msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 4176msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3
JX
4177
4178#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
4179#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
4180#: builtin/notes.c:1033
4181msgid "too many parameters"
4182msgstr "参数太多"
4183
4184#: builtin/notes.c:513 builtin/notes.c:772
4185#, c-format
4186msgid "No note found for object %s."
4187msgstr "未发现对象 %s 的注解。"
4188
4189#: builtin/notes.c:580
4190#, c-format
4191msgid ""
4192"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
4193"existing notes"
4194msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
4195
4196#: builtin/notes.c:585 builtin/notes.c:662
4197#, c-format
4198msgid "Overwriting existing notes for object %s\n"
4199msgstr "覆盖对象 %s 现存注解\n"
4200
4201#: builtin/notes.c:635
4202msgid "too few parameters"
4203msgstr "参数太少"
4204
4205#: builtin/notes.c:656
4206#, c-format
4207msgid ""
4208"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
4209"existing notes"
4210msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
4211
4212#: builtin/notes.c:668
4213#, c-format
4214msgid "Missing notes on source object %s. Cannot copy."
4215msgstr "源对象 %s 缺少注解。不能拷贝。"
4216
4217#: builtin/notes.c:717
4218#, c-format
4219msgid ""
4220"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
4221"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
4222msgstr ""
90e6ef53 4223"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
c04f5ac3
JX
4224"请换用 'git notes add -f -m/-F/-c/-C'。\n"
4225
4226#: builtin/notes.c:971
4227#, c-format
4228msgid "Object %s has no note\n"
4229msgstr "对象 %s 没有注解\n"
4230
8ada9598 4231#: builtin/notes.c:1103 builtin/remote.c:1598
c04f5ac3
JX
4232#, c-format
4233msgid "Unknown subcommand: %s"
4234msgstr "未知子命令:%s"
4235
6792b93b
JX
4236#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
4237#, c-format
4238msgid "deflate error (%d)"
4239msgstr "压缩错误 (%d)"
4240
4241#: builtin/pack-objects.c:2398
7ac1c0ad
JX
4242#, c-format
4243msgid "unsupported index version %s"
90e6ef53 4244msgstr "不支持的索引版本 %s"
7ac1c0ad 4245
6792b93b 4246#: builtin/pack-objects.c:2402
7ac1c0ad
JX
4247#, c-format
4248msgid "bad index version '%s'"
90e6ef53 4249msgstr "坏的索引版本 '%s'"
7ac1c0ad 4250
6792b93b 4251#: builtin/pack-objects.c:2425
7ac1c0ad
JX
4252#, c-format
4253msgid "option %s does not accept negative form"
90e6ef53 4254msgstr "选项 %s 不接受否定格式"
7ac1c0ad 4255
6792b93b 4256#: builtin/pack-objects.c:2429
7ac1c0ad
JX
4257#, c-format
4258msgid "unable to parse value '%s' for option %s"
81809b99 4259msgstr "不能解析选项 %1$s 的值 '%2$s'"
7ac1c0ad 4260
170e9899 4261#: builtin/push.c:45
c04f5ac3
JX
4262msgid "tag shorthand without <tag>"
4263msgstr "tag 简写没有跟 <tag> 参数"
4264
170e9899 4265#: builtin/push.c:64
c04f5ac3 4266msgid "--delete only accepts plain target ref names"
90e6ef53 4267msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 4268
8ada9598
JX
4269#: builtin/push.c:99
4270msgid ""
4271"\n"
4272"To choose either option permanently, see push.default in 'git help config'."
4273msgstr ""
81809b99
JX
4274"\n"
4275"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598
JX
4276
4277#: builtin/push.c:102
4278#, c-format
4279msgid ""
4280"The upstream branch of your current branch does not match\n"
4281"the name of your current branch. To push to the upstream branch\n"
4282"on the remote, use\n"
4283"\n"
4284" git push %s HEAD:%s\n"
4285"\n"
4286"To push to the branch of the same name on the remote, use\n"
4287"\n"
4288" git push %s %s\n"
4289"%s"
4290msgstr ""
81809b99
JX
4291"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
4292"上游分支,使用\n"
4293"\n"
4294" git push %s HEAD:%s\n"
4295"\n"
4296"为推送至远程同名分支,使用\n"
4297"\n"
4298" git push %s %s\n"
4299"%s"
8ada9598
JX
4300
4301#: builtin/push.c:121
c04f5ac3
JX
4302#, c-format
4303msgid ""
4304"You are not currently on a branch.\n"
4305"To push the history leading to the current (detached HEAD)\n"
4306"state now, use\n"
4307"\n"
4308" git push %s HEAD:<name-of-remote-branch>\n"
4309msgstr ""
4310"您当前不在一个分支上。\n"
90e6ef53 4311"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
4312"\n"
4313" git push %s HEAD:<name-of-remote-branch>\n"
4314
8ada9598 4315#: builtin/push.c:128
c04f5ac3
JX
4316#, c-format
4317msgid ""
4318"The current branch %s has no upstream branch.\n"
4319"To push the current branch and set the remote as upstream, use\n"
4320"\n"
4321" git push --set-upstream %s %s\n"
4322msgstr ""
4323"当前分支 %s 没有对应的上游分支。\n"
4324"为推送当前分支并建立与远程上游的跟踪,使用\n"
4325"\n"
4326" git push --set-upstream %s %s\n"
4327
8ada9598 4328#: builtin/push.c:136
c04f5ac3
JX
4329#, c-format
4330msgid "The current branch %s has multiple upstream branches, refusing to push."
4331msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
4332
8ada9598 4333#: builtin/push.c:139
73a60cd2
JX
4334#, c-format
4335msgid ""
4336"You are pushing to remote '%s', which is not the upstream of\n"
4337"your current branch '%s', without telling me what to push\n"
4338"to update which remote branch."
4339msgstr ""
4340"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
4341"而没有告诉我要推送什么、更新哪个远程分支。"
4342
8ada9598 4343#: builtin/push.c:174
c04f5ac3
JX
4344msgid ""
4345"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90e6ef53 4346msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
c04f5ac3 4347
8ada9598 4348#: builtin/push.c:181
170e9899
JX
4349msgid ""
4350"Updates were rejected because the tip of your current branch is behind\n"
4351"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
4352"before pushing again.\n"
4353"See the 'Note about fast-forwards' in 'git push --help' for details."
4354msgstr ""
eff6d3a9
JX
4355"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
4356"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
4357"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 4358
8ada9598 4359#: builtin/push.c:187
170e9899
JX
4360msgid ""
4361"Updates were rejected because a pushed branch tip is behind its remote\n"
4362"counterpart. If you did not intend to push that branch, you may want to\n"
4363"specify branches to push or set the 'push.default' configuration\n"
4364"variable to 'current' or 'upstream' to push only the current branch."
4365msgstr ""
eff6d3a9
JX
4366"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
4367"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
8ada9598 4368"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
170e9899 4369
8ada9598 4370#: builtin/push.c:193
170e9899
JX
4371msgid ""
4372"Updates were rejected because a pushed branch tip is behind its remote\n"
4373"counterpart. Check out this branch and merge the remote changes\n"
4374"(e.g. 'git pull') before pushing again.\n"
4375"See the 'Note about fast-forwards' in 'git push --help' for details."
4376msgstr ""
eff6d3a9
JX
4377"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
4378"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
4379"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 4380
8ada9598 4381#: builtin/push.c:233
c04f5ac3
JX
4382#, c-format
4383msgid "Pushing to %s\n"
4384msgstr "推送到 %s\n"
4385
8ada9598 4386#: builtin/push.c:237
c04f5ac3
JX
4387#, c-format
4388msgid "failed to push some refs to '%s'"
4389msgstr "无法推送一些引用到 '%s'"
4390
8ada9598 4391#: builtin/push.c:269
c04f5ac3
JX
4392#, c-format
4393msgid "bad repository '%s'"
90e6ef53 4394msgstr "坏的版本库 '%s'"
c04f5ac3 4395
8ada9598 4396#: builtin/push.c:270
c04f5ac3
JX
4397msgid ""
4398"No configured push destination.\n"
4399"Either specify the URL from the command-line or configure a remote "
4400"repository using\n"
4401"\n"
4402" git remote add <name> <url>\n"
4403"\n"
4404"and then push using the remote name\n"
4405"\n"
4406" git push <name>\n"
4407msgstr ""
90e6ef53
JX
4408"没有配置推送目标。\n"
4409"或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
c04f5ac3
JX
4410"\n"
4411" git remote add <name> <url>\n"
4412"\n"
4413"然后使用该远程版本库名执行推送\n"
4414"\n"
4415" git push <name>\n"
4416
8ada9598 4417#: builtin/push.c:285
c04f5ac3
JX
4418msgid "--all and --tags are incompatible"
4419msgstr "--all 和 --tags 不兼容"
4420
8ada9598 4421#: builtin/push.c:286
c04f5ac3 4422msgid "--all can't be combined with refspecs"
649900bc 4423msgstr "--all 不能和引用表达式同时使用"
c04f5ac3 4424
8ada9598 4425#: builtin/push.c:291
c04f5ac3
JX
4426msgid "--mirror and --tags are incompatible"
4427msgstr "--mirror 和 --tags 不兼容"
4428
8ada9598 4429#: builtin/push.c:292
c04f5ac3 4430msgid "--mirror can't be combined with refspecs"
649900bc 4431msgstr "--mirror 不能和引用表达式同时使用"
c04f5ac3 4432
8ada9598 4433#: builtin/push.c:297
c04f5ac3
JX
4434msgid "--all and --mirror are incompatible"
4435msgstr "--all 和 --mirror 不兼容"
4436
8ada9598 4437#: builtin/push.c:385
c04f5ac3
JX
4438msgid "--delete is incompatible with --all, --mirror and --tags"
4439msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4440
8ada9598 4441#: builtin/push.c:387
c04f5ac3
JX
4442msgid "--delete doesn't make sense without any refs"
4443msgstr "--delete 未接任何引用没有意义"
4444
8ada9598 4445#: builtin/remote.c:98
81809b99 4446#, c-format
8ada9598 4447msgid "Updating %s"
81809b99 4448msgstr "更新 %s 中"
8ada9598
JX
4449
4450#: builtin/remote.c:130
4451msgid ""
4452"--mirror is dangerous and deprecated; please\n"
4453"\t use --mirror=fetch or --mirror=push instead"
4454msgstr ""
81809b99
JX
4455"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
4456"\t 或 --mirror=push"
8ada9598
JX
4457
4458#: builtin/remote.c:147
81809b99 4459#, c-format
8ada9598 4460msgid "unknown mirror argument: %s"
81809b99 4461msgstr "未知的镜像参数:%s"
8ada9598
JX
4462
4463#: builtin/remote.c:185
4464msgid "specifying a master branch makes no sense with --mirror"
81809b99 4465msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598
JX
4466
4467#: builtin/remote.c:187
4468msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 4469msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598
JX
4470
4471#: builtin/remote.c:195 builtin/remote.c:646
81809b99 4472#, c-format
8ada9598 4473msgid "remote %s already exists."
81809b99 4474msgstr "远程 %s 已经存在。"
8ada9598
JX
4475
4476#: builtin/remote.c:199 builtin/remote.c:650
81809b99 4477#, c-format
8ada9598 4478msgid "'%s' is not a valid remote name"
81809b99 4479msgstr "'%s' 不是一个有效的远程名称"
8ada9598
JX
4480
4481#: builtin/remote.c:243
81809b99 4482#, c-format
8ada9598 4483msgid "Could not setup master '%s'"
81809b99 4484msgstr "无法设置 master '%s'"
8ada9598
JX
4485
4486#: builtin/remote.c:299
81809b99 4487#, c-format
8ada9598 4488msgid "more than one %s"
81809b99 4489msgstr "多于一个 %s"
8ada9598
JX
4490
4491#: builtin/remote.c:339
81809b99 4492#, c-format
8ada9598 4493msgid "Could not get fetch map for refspec %s"
81809b99 4494msgstr "无法得到引用表达式 %s 的获取列表"
8ada9598
JX
4495
4496#: builtin/remote.c:440 builtin/remote.c:448
4497msgid "(matching)"
81809b99 4498msgstr "(匹配)"
8ada9598
JX
4499
4500#: builtin/remote.c:452
8ada9598 4501msgid "(delete)"
81809b99 4502msgstr "(删除)"
8ada9598
JX
4503
4504#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
81809b99 4505#, c-format
8ada9598 4506msgid "Could not append '%s' to '%s'"
81809b99 4507msgstr "不能添加 '%s' 至 '%s'"
8ada9598
JX
4508
4509#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
81809b99 4510#, c-format
8ada9598 4511msgid "No such remote: %s"
81809b99 4512msgstr "没有这样的远程:%s"
8ada9598
JX
4513
4514#: builtin/remote.c:656
81809b99 4515#, c-format
8ada9598 4516msgid "Could not rename config section '%s' to '%s'"
81809b99 4517msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598
JX
4518
4519#: builtin/remote.c:662 builtin/remote.c:799
81809b99 4520#, c-format
8ada9598 4521msgid "Could not remove config section '%s'"
81809b99 4522msgstr "不能移除配置小节 '%s'"
8ada9598
JX
4523
4524#: builtin/remote.c:677
4525#, c-format
4526msgid ""
d691f479 4527"Not updating non-default fetch refspec\n"
8ada9598
JX
4528"\t%s\n"
4529"\tPlease update the configuration manually if necessary."
4530msgstr ""
81809b99
JX
4531"没有更新非默认的获取引用表达式\n"
4532"\t%s\n"
4533"\t如果必要请手动更新配置。"
8ada9598
JX
4534
4535#: builtin/remote.c:683
81809b99 4536#, c-format
8ada9598 4537msgid "Could not append '%s'"
81809b99 4538msgstr "不能追加 '%s'"
8ada9598
JX
4539
4540#: builtin/remote.c:694
81809b99 4541#, c-format
8ada9598 4542msgid "Could not set '%s'"
81809b99 4543msgstr "不能设置 '%s'"
8ada9598
JX
4544
4545#: builtin/remote.c:716
81809b99 4546#, c-format
8ada9598 4547msgid "deleting '%s' failed"
81809b99 4548msgstr "删除 '%s' 失败"
8ada9598
JX
4549
4550#: builtin/remote.c:750
81809b99 4551#, c-format
8ada9598 4552msgid "creating '%s' failed"
81809b99 4553msgstr "创建 '%s' 失败"
8ada9598
JX
4554
4555#: builtin/remote.c:764
81809b99 4556#, c-format
8ada9598 4557msgid "Could not remove branch %s"
81809b99 4558msgstr "无法移除分支 %s"
8ada9598
JX
4559
4560#: builtin/remote.c:834
4561msgid ""
4562"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4563"to delete it, use:"
4564msgid_plural ""
4565"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4566"to delete them, use:"
5ae481e0
JX
4567msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
4568msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598
JX
4569
4570#: builtin/remote.c:943
4571#, c-format
4572msgid " new (next fetch will store in remotes/%s)"
81809b99 4573msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598
JX
4574
4575#: builtin/remote.c:946
8ada9598 4576msgid " tracked"
81809b99 4577msgstr " 已跟踪"
8ada9598
JX
4578
4579#: builtin/remote.c:948
4580msgid " stale (use 'git remote prune' to remove)"
81809b99 4581msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598
JX
4582
4583#: builtin/remote.c:950
4584msgid " ???"
81809b99 4585msgstr " ???"
8ada9598
JX
4586
4587#: builtin/remote.c:991
4588#, c-format
4589msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 4590msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598
JX
4591
4592#: builtin/remote.c:998
81809b99 4593#, c-format
8ada9598 4594msgid "rebases onto remote %s"
81809b99 4595msgstr "变基到远程 %s"
8ada9598
JX
4596
4597#: builtin/remote.c:1001
81809b99 4598#, c-format
8ada9598 4599msgid " merges with remote %s"
81809b99 4600msgstr " 与远程 %s 合并"
8ada9598
JX
4601
4602#: builtin/remote.c:1002
4603msgid " and with remote"
81809b99 4604msgstr " 且有远程"
8ada9598
JX
4605
4606#: builtin/remote.c:1004
81809b99 4607#, c-format
8ada9598 4608msgid "merges with remote %s"
81809b99 4609msgstr "与远程 %s 合并"
8ada9598
JX
4610
4611#: builtin/remote.c:1005
4612msgid " and with remote"
81809b99 4613msgstr " 且有远程"
8ada9598
JX
4614
4615#: builtin/remote.c:1051
4616msgid "create"
81809b99 4617msgstr "创建"
8ada9598
JX
4618
4619#: builtin/remote.c:1054
8ada9598 4620msgid "delete"
81809b99 4621msgstr "删除"
8ada9598
JX
4622
4623#: builtin/remote.c:1058
8ada9598 4624msgid "up to date"
81809b99 4625msgstr "最新"
8ada9598
JX
4626
4627#: builtin/remote.c:1061
8ada9598 4628msgid "fast-forwardable"
81809b99 4629msgstr "可快进"
8ada9598
JX
4630
4631#: builtin/remote.c:1064
4632msgid "local out of date"
81809b99 4633msgstr "本地已过时"
8ada9598
JX
4634
4635#: builtin/remote.c:1071
4636#, c-format
4637msgid " %-*s forces to %-*s (%s)"
81809b99 4638msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598
JX
4639
4640#: builtin/remote.c:1074
4641#, c-format
4642msgid " %-*s pushes to %-*s (%s)"
81809b99 4643msgstr " %-*s 推送至 %-*s (%s)"
8ada9598
JX
4644
4645#: builtin/remote.c:1078
4646#, c-format
4647msgid " %-*s forces to %s"
81809b99 4648msgstr " %-*s 强制推送至 %s"
8ada9598
JX
4649
4650#: builtin/remote.c:1081
4651#, c-format
4652msgid " %-*s pushes to %s"
81809b99 4653msgstr " %-*s 推送至 %s"
8ada9598 4654
8ada9598 4655#: builtin/remote.c:1118
81809b99 4656#, c-format
8ada9598 4657msgid "* remote %s"
81809b99 4658msgstr "* 远程 %s"
8ada9598
JX
4659
4660#: builtin/remote.c:1119
4661#, c-format
4662msgid " Fetch URL: %s"
81809b99 4663msgstr " 获取地址:%s"
8ada9598
JX
4664
4665#: builtin/remote.c:1120 builtin/remote.c:1285
4666msgid "(no URL)"
81809b99 4667msgstr "(无 URL)"
8ada9598
JX
4668
4669#: builtin/remote.c:1129 builtin/remote.c:1131
4670#, c-format
4671msgid " Push URL: %s"
81809b99 4672msgstr " 推送地址:%s"
8ada9598
JX
4673
4674#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
81809b99 4675#, c-format
8ada9598 4676msgid " HEAD branch: %s"
81809b99 4677msgstr " HEAD分支:%s"
8ada9598
JX
4678
4679#: builtin/remote.c:1139
4680#, c-format
4681msgid ""
4682" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 4683msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598
JX
4684
4685#: builtin/remote.c:1151
81809b99 4686#, c-format
8ada9598
JX
4687msgid " Remote branch:%s"
4688msgid_plural " Remote branches:%s"
81809b99 4689msgstr[0] " 远程分支:%s"
5ae481e0 4690msgstr[1] " 远程分支:%s"
8ada9598 4691
81809b99 4692# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
4693#: builtin/remote.c:1154 builtin/remote.c:1181
4694msgid " (status not queried)"
81809b99 4695msgstr "(状态未查询)"
8ada9598
JX
4696
4697#: builtin/remote.c:1163
4698msgid " Local branch configured for 'git pull':"
4699msgid_plural " Local branches configured for 'git pull':"
81809b99 4700msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 4701msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598
JX
4702
4703#: builtin/remote.c:1171
4704msgid " Local refs will be mirrored by 'git push'"
81809b99 4705msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598
JX
4706
4707#: builtin/remote.c:1178
81809b99 4708#, c-format
8ada9598
JX
4709msgid " Local ref configured for 'git push'%s:"
4710msgid_plural " Local refs configured for 'git push'%s:"
81809b99 4711msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 4712msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598
JX
4713
4714#: builtin/remote.c:1216
8ada9598 4715msgid "Cannot determine remote HEAD"
81809b99 4716msgstr "无法确定远程 HEAD"
8ada9598
JX
4717
4718#: builtin/remote.c:1218
4719msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 4720msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598
JX
4721
4722#: builtin/remote.c:1228
81809b99 4723#, c-format
8ada9598 4724msgid "Could not delete %s"
81809b99 4725msgstr "无法删除 %s"
8ada9598
JX
4726
4727#: builtin/remote.c:1236
81809b99 4728#, c-format
8ada9598 4729msgid "Not a valid ref: %s"
81809b99 4730msgstr "不是一个有效引用:%s"
8ada9598
JX
4731
4732#: builtin/remote.c:1238
81809b99 4733#, c-format
8ada9598 4734msgid "Could not setup %s"
81809b99 4735msgstr "不能设置 %s"
8ada9598
JX
4736
4737# 译者:注意保持前导空格
4738#: builtin/remote.c:1274
81809b99 4739#, c-format
8ada9598 4740msgid " %s will become dangling!"
81809b99 4741msgstr " %s 将成为悬空状态!"
8ada9598
JX
4742
4743# 译者:注意保持前导空格
4744#: builtin/remote.c:1275
81809b99 4745#, c-format
8ada9598 4746msgid " %s has become dangling!"
81809b99 4747msgstr " %s 已成为悬空状态!"
8ada9598
JX
4748
4749#: builtin/remote.c:1281
81809b99 4750#, c-format
8ada9598 4751msgid "Pruning %s"
81809b99 4752msgstr "修剪 %s"
8ada9598
JX
4753
4754#: builtin/remote.c:1282
4755#, c-format
4756msgid "URL: %s"
81809b99 4757msgstr "URL:%s"
8ada9598
JX
4758
4759#: builtin/remote.c:1295
4760#, c-format
4761msgid " * [would prune] %s"
81809b99 4762msgstr " * [将删除] %s"
8ada9598
JX
4763
4764#: builtin/remote.c:1298
4765#, c-format
4766msgid " * [pruned] %s"
81809b99 4767msgstr " * [已删除] %s"
8ada9598
JX
4768
4769#: builtin/remote.c:1387 builtin/remote.c:1461
81809b99 4770#, c-format
8ada9598 4771msgid "No such remote '%s'"
81809b99 4772msgstr "没有此远程 '%s'"
8ada9598
JX
4773
4774#: builtin/remote.c:1414
8ada9598 4775msgid "no remote specified"
81809b99 4776msgstr "未指定远程"
8ada9598
JX
4777
4778#: builtin/remote.c:1447
8ada9598 4779msgid "--add --delete doesn't make sense"
81809b99 4780msgstr "--add --delete 无意义"
8ada9598
JX
4781
4782#: builtin/remote.c:1487
81809b99 4783#, c-format
8ada9598 4784msgid "Invalid old URL pattern: %s"
81809b99 4785msgstr "无效的旧URL匹配模版:%s"
8ada9598
JX
4786
4787#: builtin/remote.c:1495
81809b99 4788#, c-format
8ada9598 4789msgid "No such URL found: %s"
81809b99 4790msgstr "未找到此URL:%s"
8ada9598
JX
4791
4792#: builtin/remote.c:1497
4793msgid "Will not delete all non-push URLs"
81809b99 4794msgstr "将不会删除所有非推送URL地址"
8ada9598 4795
c04f5ac3
JX
4796#: builtin/reset.c:33
4797msgid "mixed"
4798msgstr "混杂"
4799
4800#: builtin/reset.c:33
4801msgid "soft"
4802msgstr "软性"
4803
4804#: builtin/reset.c:33
4805msgid "hard"
4806msgstr "硬性"
4807
8ada9598
JX
4808#: builtin/reset.c:33
4809msgid "merge"
4810msgstr "合并"
4811
c04f5ac3
JX
4812#: builtin/reset.c:33
4813msgid "keep"
4814msgstr "保持"
4815
4816#: builtin/reset.c:77
4817msgid "You do not have a valid HEAD."
4818msgstr "您没有一个有效的 HEAD。"
4819
4820#: builtin/reset.c:79
4821msgid "Failed to find tree of HEAD."
4822msgstr "无法找到 HEAD 指向的树。"
4823
4824#: builtin/reset.c:85
4825#, c-format
4826msgid "Failed to find tree of %s."
4827msgstr "无法找到 %s 指向的树。"
4828
4829#: builtin/reset.c:96
4830msgid "Could not write new index file."
90e6ef53 4831msgstr "不能写入新的索引文件。"
c04f5ac3
JX
4832
4833#: builtin/reset.c:106
4834#, c-format
4835msgid "HEAD is now at %s"
4836msgstr "HEAD 现在位于 %s"
4837
4838#: builtin/reset.c:130
4839msgid "Could not read index"
90e6ef53 4840msgstr "不能读取索引"
c04f5ac3
JX
4841
4842#: builtin/reset.c:133
4843msgid "Unstaged changes after reset:"
90e6ef53 4844msgstr "重置后撤出暂存区的变更:"
c04f5ac3 4845
90e6ef53 4846# 译者:汉字之间无空格,故删除%s前后空格
c04f5ac3
JX
4847#: builtin/reset.c:223
4848#, c-format
4849msgid "Cannot do a %s reset in the middle of a merge."
4850msgstr "在合并过程中不能做%s重置操作。"
4851
23ff3338 4852#: builtin/reset.c:303
c04f5ac3
JX
4853#, c-format
4854msgid "Could not parse object '%s'."
4855msgstr "不能解析对象 '%s'。"
4856
23ff3338 4857#: builtin/reset.c:308
c04f5ac3
JX
4858msgid "--patch is incompatible with --{hard,mixed,soft}"
4859msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4860
23ff3338 4861#: builtin/reset.c:317
c04f5ac3 4862msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 4863msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 4864
90e6ef53 4865# 译者:汉字之间无空格,故删除%s前后空格
23ff3338 4866#: builtin/reset.c:319
c04f5ac3
JX
4867#, c-format
4868msgid "Cannot do %s reset with paths."
4869msgstr "不能带路径进行%s重置。"
4870
90e6ef53 4871# 译者:汉字之间无空格,故删除%s前后空格
23ff3338 4872#: builtin/reset.c:331
c04f5ac3
JX
4873#, c-format
4874msgid "%s reset is not allowed in a bare repository"
4875msgstr "不能对裸版本库进行%s重置"
4876
23ff3338 4877#: builtin/reset.c:347
c04f5ac3
JX
4878#, c-format
4879msgid "Could not reset index file to revision '%s'."
90e6ef53 4880msgstr "不能重置索引文件至版本 '%s'。"
c04f5ac3 4881
170e9899 4882#: builtin/revert.c:70 builtin/revert.c:92
c04f5ac3
JX
4883#, c-format
4884msgid "%s: %s cannot be used with %s"
649900bc 4885msgstr "%s:%s 不能和 %s 同时使用"
c04f5ac3 4886
8ada9598 4887#: builtin/revert.c:131
c04f5ac3
JX
4888msgid "program error"
4889msgstr "程序错误"
4890
8ada9598 4891#: builtin/revert.c:221
c04f5ac3
JX
4892msgid "revert failed"
4893msgstr "还原失败"
4894
8ada9598 4895#: builtin/revert.c:236
c04f5ac3
JX
4896msgid "cherry-pick failed"
4897msgstr "拣选失败"
4898
4899#: builtin/rm.c:109
4900#, c-format
4901msgid ""
4902"'%s' has staged content different from both the file and the HEAD\n"
4903"(use -f to force removal)"
4904msgstr ""
90e6ef53 4905"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
c04f5ac3
JX
4906"(使用 -f 强制删除)"
4907
4908#: builtin/rm.c:115
4909#, c-format
4910msgid ""
4911"'%s' has changes staged in the index\n"
4912"(use --cached to keep the file, or -f to force removal)"
4913msgstr ""
90e6ef53 4914"'%s' 有变更已暂存至索引中\n"
c04f5ac3
JX
4915"(使用 --cached 保存文件,或用 -f 强制删除)"
4916
4917#: builtin/rm.c:119
4918#, c-format
4919msgid ""
4920"'%s' has local modifications\n"
4921"(use --cached to keep the file, or -f to force removal)"
4922msgstr ""
4923"'%s' 有本地修改\n"
4924"(使用 --cached 保存文件,或用 -f 强制删除)"
4925
4926#: builtin/rm.c:194
4927#, c-format
4928msgid "not removing '%s' recursively without -r"
4929msgstr "未提供 -r 选项不会递归删除 '%s'"
4930
4931#: builtin/rm.c:230
4932#, c-format
4933msgid "git rm: unable to remove %s"
4934msgstr "git rm:不能删除 %s"
4935
4936#: builtin/shortlog.c:157
4937#, c-format
4938msgid "Missing author: %s"
4939msgstr "缺少作者:%s"
4940
8ada9598 4941#: builtin/tag.c:60
7ac1c0ad
JX
4942#, c-format
4943msgid "malformed object at '%s'"
4944msgstr "非法的对象于 '%s'"
4945
8ada9598 4946#: builtin/tag.c:207
c04f5ac3
JX
4947#, c-format
4948msgid "tag name too long: %.*s..."
4949msgstr "tag 名字太长:%.*s..."
4950
8ada9598 4951#: builtin/tag.c:212
c04f5ac3
JX
4952#, c-format
4953msgid "tag '%s' not found."
4954msgstr "tag '%s' 未发现。"
4955
8ada9598 4956#: builtin/tag.c:227
c04f5ac3
JX
4957#, c-format
4958msgid "Deleted tag '%s' (was %s)\n"
4959msgstr "已删除 tag '%s'(曾为 %s)\n"
4960
8ada9598 4961#: builtin/tag.c:239
c04f5ac3
JX
4962#, c-format
4963msgid "could not verify the tag '%s'"
4964msgstr "不能校验 tag '%s'"
4965
8ada9598 4966#: builtin/tag.c:249
c04f5ac3
JX
4967msgid ""
4968"\n"
4969"#\n"
4970"# Write a tag message\n"
4971"# Lines starting with '#' will be ignored.\n"
4972"#\n"
4973msgstr ""
4974"\n"
4975"#\n"
4976"# 输入一个 tag 说明\n"
4977"# 以 '#' 开头的行将被忽略。\n"
4978"#\n"
4979
8ada9598 4980#: builtin/tag.c:256
c04f5ac3
JX
4981msgid ""
4982"\n"
4983"#\n"
4984"# Write a tag message\n"
4985"# Lines starting with '#' will be kept; you may remove them yourself if you "
4986"want to.\n"
4987"#\n"
4988msgstr ""
4989"\n"
4990"#\n"
4991"# 输入一个 tag 说明\n"
4992"# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
4993"#\n"
4994
8ada9598 4995#: builtin/tag.c:298
c04f5ac3
JX
4996msgid "unable to sign the tag"
4997msgstr "无法签署 tag"
4998
8ada9598 4999#: builtin/tag.c:300
c04f5ac3
JX
5000msgid "unable to write tag file"
5001msgstr "无法写 tag 文件"
5002
8ada9598 5003#: builtin/tag.c:325
c04f5ac3 5004msgid "bad object type."
90e6ef53 5005msgstr "坏的对象类型。"
c04f5ac3 5006
8ada9598 5007#: builtin/tag.c:338
c04f5ac3 5008msgid "tag header too big."
90e6ef53 5009msgstr "tag 头信息太大。"
c04f5ac3 5010
8ada9598 5011#: builtin/tag.c:370
c04f5ac3
JX
5012msgid "no tag message?"
5013msgstr "无 tag 说明?"
5014
8ada9598 5015#: builtin/tag.c:376
c04f5ac3
JX
5016#, c-format
5017msgid "The tag message has been left in %s\n"
5018msgstr "tag 说明被保留在 %s\n"
5019
8ada9598 5020#: builtin/tag.c:425
7ac1c0ad
JX
5021msgid "switch 'points-at' requires an object"
5022msgstr "开关 'points-at' 需要一个对象"
5023
8ada9598 5024#: builtin/tag.c:427
7ac1c0ad
JX
5025#, c-format
5026msgid "malformed object name '%s'"
5027msgstr "非法的对象名 '%s'"
5028
8ada9598 5029#: builtin/tag.c:506
8ada9598 5030msgid "--column and -n are incompatible"
81809b99 5031msgstr "--column 和 -n 不兼容"
8ada9598
JX
5032
5033#: builtin/tag.c:523
c04f5ac3 5034msgid "-n option is only allowed with -l."
649900bc 5035msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 5036
8ada9598 5037#: builtin/tag.c:525
c04f5ac3 5038msgid "--contains option is only allowed with -l."
649900bc 5039msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 5040
8ada9598 5041#: builtin/tag.c:527
7ac1c0ad 5042msgid "--points-at option is only allowed with -l."
649900bc 5043msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 5044
8ada9598 5045#: builtin/tag.c:535
c04f5ac3
JX
5046msgid "only one -F or -m option is allowed."
5047msgstr "只允许一个 -F 或 -m 选项。"
5048
8ada9598 5049#: builtin/tag.c:555
c04f5ac3
JX
5050msgid "too many params"
5051msgstr "太多参数"
5052
8ada9598 5053#: builtin/tag.c:561
c04f5ac3
JX
5054#, c-format
5055msgid "'%s' is not a valid tag name."
90e6ef53 5056msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 5057
8ada9598 5058#: builtin/tag.c:566
c04f5ac3
JX
5059#, c-format
5060msgid "tag '%s' already exists"
5061msgstr "tag '%s' 已存在"
5062
8ada9598 5063#: builtin/tag.c:584
c04f5ac3
JX
5064#, c-format
5065msgid "%s: cannot lock the ref"
5066msgstr "%s:不能锁定引用"
5067
8ada9598 5068#: builtin/tag.c:586
c04f5ac3
JX
5069#, c-format
5070msgid "%s: cannot update the ref"
5071msgstr "%s:不能更新引用"
5072
8ada9598 5073#: builtin/tag.c:588
c04f5ac3
JX
5074#, c-format
5075msgid "Updated tag '%s' (was %s)\n"
5076msgstr "已更新tag '%s'(曾为 %s)\n"
5077
8ada9598
JX
5078#: git.c:16
5079msgid "See 'git help <command>' for more information on a specific command."
81809b99 5080msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8ada9598
JX
5081
5082#: parse-options.h:133 parse-options.h:235
5083msgid "n"
81809b99 5084msgstr "数字"
8ada9598
JX
5085
5086#: parse-options.h:141
5087msgid "time"
81809b99 5088msgstr "时间"
8ada9598
JX
5089
5090#: parse-options.h:149
8ada9598 5091msgid "file"
81809b99 5092msgstr "文件"
8ada9598
JX
5093
5094#: parse-options.h:151
5095msgid "when"
81809b99 5096msgstr "何时"
8ada9598
JX
5097
5098#: parse-options.h:156
5099msgid "no-op (backward compatibility)"
81809b99 5100msgstr "空操作(向后兼容)"
8ada9598
JX
5101
5102#: parse-options.h:228
5103msgid "be more verbose"
81809b99 5104msgstr "更加详细"
8ada9598
JX
5105
5106#: parse-options.h:230
5107msgid "be more quiet"
81809b99 5108msgstr "更加安静"
8ada9598
JX
5109
5110#: parse-options.h:236
5111msgid "use <n> digits to display SHA-1s"
81809b99 5112msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
5113
5114#: common-cmds.h:8
5115msgid "Add file contents to the index"
81809b99 5116msgstr "添加文件内容至索引"
8ada9598
JX
5117
5118#: common-cmds.h:9
5119msgid "Find by binary search the change that introduced a bug"
81809b99 5120msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
5121
5122#: common-cmds.h:10
8ada9598 5123msgid "List, create, or delete branches"
81809b99 5124msgstr "列出、创建或删除分支"
8ada9598
JX
5125
5126#: common-cmds.h:11
5127msgid "Checkout a branch or paths to the working tree"
81809b99 5128msgstr "检出一个分支或路径到工作区"
8ada9598
JX
5129
5130#: common-cmds.h:12
8ada9598 5131msgid "Clone a repository into a new directory"
81809b99 5132msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
5133
5134#: common-cmds.h:13
8ada9598 5135msgid "Record changes to the repository"
81809b99 5136msgstr "记录变更到版本库"
8ada9598
JX
5137
5138#: common-cmds.h:14
5139msgid "Show changes between commits, commit and working tree, etc"
81809b99 5140msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
5141
5142#: common-cmds.h:15
5143msgid "Download objects and refs from another repository"
81809b99 5144msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
5145
5146#: common-cmds.h:16
5147msgid "Print lines matching a pattern"
81809b99 5148msgstr "输出和模式匹配的行"
8ada9598
JX
5149
5150#: common-cmds.h:17
5151msgid "Create an empty git repository or reinitialize an existing one"
81809b99 5152msgstr "创建一个空的 git 版本库或者重新初始化一个"
8ada9598
JX
5153
5154#: common-cmds.h:18
8ada9598 5155msgid "Show commit logs"
81809b99 5156msgstr "显示提交日志"
8ada9598
JX
5157
5158#: common-cmds.h:19
5159msgid "Join two or more development histories together"
81809b99 5160msgstr "合并两个或更多开发历史"
8ada9598
JX
5161
5162#: common-cmds.h:20
5163msgid "Move or rename a file, a directory, or a symlink"
81809b99 5164msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
5165
5166#: common-cmds.h:21
5167msgid "Fetch from and merge with another repository or a local branch"
81809b99 5168msgstr "获取并合并另外的版本库或一个本地分支"
8ada9598
JX
5169
5170#: common-cmds.h:22
5171msgid "Update remote refs along with associated objects"
81809b99 5172msgstr "更新远程引用和相关的对象"
8ada9598
JX
5173
5174#: common-cmds.h:23
5175msgid "Forward-port local commits to the updated upstream head"
81809b99 5176msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
5177
5178#: common-cmds.h:24
5179msgid "Reset current HEAD to the specified state"
81809b99 5180msgstr "重置当前HEAD到指定状态"
8ada9598
JX
5181
5182#: common-cmds.h:25
5183msgid "Remove files from the working tree and from the index"
81809b99 5184msgstr "从工作区和索引中删除文件"
8ada9598
JX
5185
5186#: common-cmds.h:26
5187msgid "Show various types of objects"
81809b99 5188msgstr "显示各种类型的对象"
8ada9598
JX
5189
5190#: common-cmds.h:27
8ada9598 5191msgid "Show the working tree status"
81809b99 5192msgstr "显示工作区状态"
8ada9598
JX
5193
5194#: common-cmds.h:28
5195msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 5196msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 5197
170e9899 5198#: git-am.sh:50
c04f5ac3
JX
5199msgid "You need to set your committer info first"
5200msgstr "您需要先设置你的提交者信息"
5201
b694fbb1
JX
5202#: git-am.sh:95
5203msgid ""
5204"You seem to have moved HEAD since the last 'am' failure.\n"
5205"Not rewinding to ORIG_HEAD"
6792b93b 5206msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1
JX
5207
5208#: git-am.sh:105
5209#, sh-format
5210msgid ""
649900bc
JX
5211"When you have resolved this problem, run \"$cmdline --resolved\".\n"
5212"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
5213"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1
JX
5214msgstr ""
5215"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
5216"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
5217"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
5218
5219#: git-am.sh:121
5220msgid "Cannot fall back to three-way merge."
5221msgstr "无法求助于三路合并。"
5222
170e9899 5223#: git-am.sh:137
c04f5ac3 5224msgid "Repository lacks necessary blobs to fall back on 3-way merge."
649900bc
JX
5225msgstr "版本库缺乏必要的二进制对象(blob)以进行三路合并。"
5226
5227#: git-am.sh:139
5228msgid "Using index info to reconstruct a base tree..."
5229msgstr "更新索引信息以重建基树..."
c04f5ac3 5230
170e9899 5231#: git-am.sh:154
c04f5ac3
JX
5232msgid ""
5233"Did you hand edit your patch?\n"
5234"It does not apply to blobs recorded in its index."
5235msgstr ""
5236"您是否曾手动编辑过您的补丁?\n"
649900bc 5237"无法应用补丁到索引中的二进制对象(blob)上。"
c04f5ac3 5238
170e9899 5239#: git-am.sh:163
c04f5ac3 5240msgid "Falling back to patching base and 3-way merge..."
b694fbb1 5241msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 5242
649900bc
JX
5243#: git-am.sh:179
5244msgid "Failed to merge in the changes."
5245msgstr "无法合并变更。"
5246
5247#: git-am.sh:274
c04f5ac3
JX
5248msgid "Only one StGIT patch series can be applied at once"
5249msgstr "一次只能有一个 StGIT 补丁队列被应用"
5250
649900bc 5251#: git-am.sh:361
c04f5ac3
JX
5252#, sh-format
5253msgid "Patch format $patch_format is not supported."
5254msgstr "不支持 $patch_format 补丁格式。"
5255
649900bc 5256#: git-am.sh:363
c04f5ac3
JX
5257msgid "Patch format detection failed."
5258msgstr "补丁格式检测失败。"
5259
649900bc
JX
5260#: git-am.sh:389
5261msgid ""
5262"The -b/--binary option has been a no-op for long time, and\n"
5263"it will be removed. Please do not use it anymore."
5264msgstr ""
5265"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
5266"请不要再使用它了。"
c04f5ac3 5267
649900bc 5268#: git-am.sh:477
c04f5ac3
JX
5269#, sh-format
5270msgid "previous rebase directory $dotest still exists but mbox given."
5271msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
5272
649900bc 5273#: git-am.sh:482
c04f5ac3
JX
5274msgid "Please make up your mind. --skip or --abort?"
5275msgstr "请下决心。--skip 或是 --abort ?"
5276
649900bc 5277#: git-am.sh:509
c04f5ac3
JX
5278msgid "Resolve operation not in progress, we are not resuming."
5279msgstr "解决操作未进行,我们不会继续。"
5280
649900bc 5281#: git-am.sh:575
c04f5ac3
JX
5282#, sh-format
5283msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 5284msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 5285
649900bc 5286#: git-am.sh:679
b694fbb1
JX
5287#, sh-format
5288msgid ""
5289"Patch is empty. Was it split wrong?\n"
5290"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
5291"To restore the original branch and stop patching run \"$cmdline --abort\"."
5292msgstr ""
5293"补丁为空。是不是切分错误?\n"
5294"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
5295"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
5296
649900bc 5297#: git-am.sh:706
b694fbb1
JX
5298msgid "Patch does not have a valid e-mail address."
5299msgstr "补丁中没有一个有效的邮件地址。"
5300
649900bc 5301#: git-am.sh:753
c04f5ac3 5302msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 5303msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 5304
649900bc 5305#: git-am.sh:757
b694fbb1
JX
5306msgid "Commit Body is:"
5307msgstr "提交内容为:"
5308
90e6ef53 5309# 译者:注意保持句尾空格
c04f5ac3
JX
5310#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5311#. in your translation. The program will only accept English
5312#. input at this point.
649900bc 5313#: git-am.sh:764
c04f5ac3
JX
5314msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5315msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5316
649900bc 5317#: git-am.sh:800
c04f5ac3
JX
5318#, sh-format
5319msgid "Applying: $FIRSTLINE"
5320msgstr "正应用:$FIRSTLINE"
5321
649900bc 5322#: git-am.sh:821
b694fbb1
JX
5323msgid ""
5324"No changes - did you forget to use 'git add'?\n"
5325"If there is nothing left to stage, chances are that something else\n"
5326"already introduced the same changes; you might want to skip this patch."
5327msgstr ""
5328"没有变更 —— 您是不是忘了执行 'git add'?\n"
5329"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5330"您也许想要跳过这个补丁。"
5331
649900bc 5332#: git-am.sh:829
b694fbb1
JX
5333msgid ""
5334"You still have unmerged paths in your index\n"
5335"did you forget to use 'git add'?"
6792b93b 5336msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 5337
649900bc 5338#: git-am.sh:845
c04f5ac3
JX
5339msgid "No changes -- Patch already applied."
5340msgstr "没有变更 -- 补丁已经应用过。"
5341
649900bc 5342#: git-am.sh:855
b694fbb1
JX
5343#, sh-format
5344msgid "Patch failed at $msgnum $FIRSTLINE"
5345msgstr "补丁失败于 $msgnum $FIRSTLINE"
5346
649900bc 5347#: git-am.sh:876
c04f5ac3
JX
5348msgid "applying to an empty history"
5349msgstr "正应用到一个空历史上"
5350
b694fbb1
JX
5351#: git-bisect.sh:48
5352msgid "You need to start by \"git bisect start\""
5353msgstr "您需要执行 \"git bisect start\" 来开始"
5354
90e6ef53 5355# 译者:注意保持句尾空格
c04f5ac3
JX
5356#. TRANSLATORS: Make sure to include [Y] and [n] in your
5357#. translation. The program will only accept English input
5358#. at this point.
5359#: git-bisect.sh:54
5360msgid "Do you want me to do it for you [Y/n]? "
5361msgstr "您想让我为您这样做么[Y/n]? "
5362
5363#: git-bisect.sh:95
5364#, sh-format
5365msgid "unrecognised option: '$arg'"
81809b99 5366msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
5367
5368#: git-bisect.sh:99
5369#, sh-format
5370msgid "'$arg' does not appear to be a valid revision"
5371msgstr "'$arg' 看起来不像是一个有效的版本"
5372
5373#: git-bisect.sh:117
5374msgid "Bad HEAD - I need a HEAD"
5375msgstr "坏的 HEAD - 我需要一个 HEAD"
5376
5377#: git-bisect.sh:130
5378#, sh-format
5379msgid ""
5380"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
5381msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
5382
5383#: git-bisect.sh:140
5384msgid "won't bisect on seeked tree"
5385msgstr "不会在已查找过的树上二分查找"
5386
5387#: git-bisect.sh:144
5388msgid "Bad HEAD - strange symbolic ref"
90e6ef53 5389msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
5390
5391#: git-bisect.sh:189
5392#, sh-format
5393msgid "Bad bisect_write argument: $state"
90e6ef53 5394msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
5395
5396#: git-bisect.sh:218
5397#, sh-format
5398msgid "Bad rev input: $arg"
90e6ef53 5399msgstr "输入坏的版本:$arg"
c04f5ac3
JX
5400
5401#: git-bisect.sh:232
5402msgid "Please call 'bisect_state' with at least one argument."
5403msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
5404
5405#: git-bisect.sh:244
5406#, sh-format
5407msgid "Bad rev input: $rev"
5408msgstr "输入坏的版本:$rev"
5409
5410#: git-bisect.sh:250
5411msgid "'git bisect bad' can take only one argument."
5412msgstr "'git bisect bad' 只能带一个参数。"
5413
b694fbb1
JX
5414#. have bad but not good. we could bisect although
5415#. this is less optimum.
5416#: git-bisect.sh:273
5417msgid "Warning: bisecting only with a bad commit."
5418msgstr "警告:在仅有一个坏提交下进行二分查找。"
5419
90e6ef53 5420# 译者:注意保持句尾空格
c04f5ac3
JX
5421#. TRANSLATORS: Make sure to include [Y] and [n] in your
5422#. translation. The program will only accept English input
5423#. at this point.
5424#: git-bisect.sh:279
5425msgid "Are you sure [Y/n]? "
5426msgstr "您确认么[Y/n]? "
5427
b694fbb1
JX
5428#: git-bisect.sh:289
5429msgid ""
5430"You need to give me at least one good and one bad revisions.\n"
5431"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5432msgstr ""
5433"您需要给我至少一个好版本和一个坏版本。\n"
5434"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
5435
5436#: git-bisect.sh:292
5437msgid ""
5438"You need to start by \"git bisect start\".\n"
5439"You then need to give me at least one good and one bad revisions.\n"
5440"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5441msgstr ""
5442"您需要执行 \"git bisect start\" 来开始。\n"
5443"然后需要提供我至少一个好版本和一个坏版本。\n"
5444"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
5445
5446#: git-bisect.sh:347 git-bisect.sh:474
5447msgid "We are not bisecting."
5448msgstr "我们没有在二分查找。"
5449
c04f5ac3
JX
5450#: git-bisect.sh:354
5451#, sh-format
5452msgid "'$invalid' is not a valid commit"
5453msgstr "'$invalid' 不是一个有效的提交"
5454
5455#: git-bisect.sh:363
5456#, sh-format
5457msgid ""
5458"Could not check out original HEAD '$branch'.\n"
5459"Try 'git bisect reset <commit>'."
5460msgstr ""
5461"不能检出原始 HEAD '$branch'。\n"
5462"尝试 'git bisect reset <commit>'。"
5463
5464#: git-bisect.sh:390
5465msgid "No logfile given"
5466msgstr "未提供日志文件"
5467
5468#: git-bisect.sh:391
5469#, sh-format
5470msgid "cannot read $file for replaying"
5471msgstr "不能读取 $file 来重放"
5472
5473#: git-bisect.sh:408
5474msgid "?? what are you talking about?"
5475msgstr "?? 您在说什么?"
5476
b694fbb1
JX
5477#: git-bisect.sh:420
5478#, sh-format
5479msgid "running $command"
5480msgstr "运行 $command"
5481
5482#: git-bisect.sh:427
5483#, sh-format
5484msgid ""
5485"bisect run failed:\n"
5486"exit code $res from '$command' is < 0 or >= 128"
5487msgstr ""
5488"二分查找运行失败:\n"
5489"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128"
5490
5491#: git-bisect.sh:453
5492msgid "bisect run cannot continue any more"
5493msgstr "二分查找不能继续运行"
5494
5495#: git-bisect.sh:459
5496#, sh-format
5497msgid ""
5498"bisect run failed:\n"
5499"'bisect_state $state' exited with error code $res"
5500msgstr ""
5501"二分查找运行失败:\n"
5502"'bisect_state $state' 退出码为 $res"
5503
5504#: git-bisect.sh:466
5505msgid "bisect run success"
5506msgstr "二分查找运行成功"
c04f5ac3
JX
5507
5508#: git-pull.sh:21
5509msgid ""
5510"Pull is not possible because you have unmerged files.\n"
5511"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
5512"as appropriate to mark resolution, or use 'git commit -a'."
5513msgstr ""
90e6ef53 5514"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 5515"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 5516"或者使用 'git commit -a'。"
c04f5ac3
JX
5517
5518#: git-pull.sh:25
5519msgid "Pull is not possible because you have unmerged files."
90e6ef53 5520msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 5521
7ac1c0ad 5522#: git-pull.sh:197
c04f5ac3 5523msgid "updating an unborn branch with changes added to the index"
90e6ef53 5524msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 5525
b694fbb1
JX
5526#. The fetch involved updating the current branch.
5527#. The working tree and the index file is still based on the
5528#. $orig_head commit, but we are merging into $curr_head.
5529#. First update the working tree to match $curr_head.
5530#: git-pull.sh:228
5531#, sh-format
5532msgid ""
5533"Warning: fetch updated the current branch head.\n"
5534"Warning: fast-forwarding your working tree from\n"
5535"Warning: commit $orig_head."
5536msgstr ""
5537"警告:fetch 更新了当前的分支。您的工作区\n"
5538"警告:从原提交 $orig_head 快进。"
5539
7ac1c0ad 5540#: git-pull.sh:253
c04f5ac3
JX
5541msgid "Cannot merge multiple branches into empty head"
5542msgstr "无法将多个分支合并到空分支"
5543
7ac1c0ad 5544#: git-pull.sh:257
c04f5ac3
JX
5545msgid "Cannot rebase onto multiple branches"
5546msgstr "无法变基到多个分支"
5547
649900bc
JX
5548#: git-rebase.sh:52
5549msgid ""
5550"When you have resolved this problem, run \"git rebase --continue\".\n"
5551"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
5552"To check out the original branch and stop rebasing, run \"git rebase --abort"
5553"\"."
5554msgstr ""
5555"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
5556"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
5557"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
5558
5559#: git-rebase.sh:159
5560msgid "The pre-rebase hook refused to rebase."
5561msgstr "钩子 pre-rebase 拒绝变基。"
5562
5563#: git-rebase.sh:164
5564msgid "It looks like git-am is in progress. Cannot rebase."
5565msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
5566
5567#: git-rebase.sh:295
5568msgid "The --exec option must be used with the --interactive option"
5569msgstr "选项 --exec 必须和选项 --interactive 同时使用"
5570
5571#: git-rebase.sh:300
5572msgid "No rebase in progress?"
5573msgstr "没有正在进行的变基?"
5574
5575#: git-rebase.sh:313
5576msgid "Cannot read HEAD"
5577msgstr "不能读取 HEAD"
5578
5579#: git-rebase.sh:316
5580msgid ""
5581"You must edit all merge conflicts and then\n"
5582"mark them as resolved using git add"
5583msgstr ""
5584"您必须编辑所有的合并冲突,然后通过 git add\n"
5585"命令将它们标记为已解决"
5586
5587#: git-rebase.sh:334
5588#, sh-format
5589msgid "Could not move back to $head_name"
5590msgstr "无法移回 $head_name"
5591
5592#: git-rebase.sh:350
5593#, sh-format
5594msgid ""
5595"It seems that there is already a $state_dir_base directory, and\n"
5596"I wonder if you are in the middle of another rebase. If that is the\n"
5597"case, please try\n"
5598"\t$cmd_live_rebase\n"
5599"If that is not the case, please\n"
5600"\t$cmd_clear_stale_rebase\n"
5601"and run me again. I am stopping in case you still have something\n"
5602"valuable there."
5603msgstr ""
5604"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
5605"如果是这样,请尝试执行\n"
5606"\t$cmd_live_rebase\n"
5607"如果不是这样,请执行\n"
5608"\t$cmd_clear_stale_rebase\n"
5609"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
5610
5611#: git-rebase.sh:395
5612#, sh-format
5613msgid "invalid upstream $upstream_name"
5614msgstr "无效的上游 $upstream_name"
5615
5616#: git-rebase.sh:419
5617#, sh-format
5618msgid "$onto_name: there are more than one merge bases"
5619msgstr "$onto_name: 有一个以上的合并基准"
5620
5621#: git-rebase.sh:422 git-rebase.sh:426
5622#, sh-format
5623msgid "$onto_name: there is no merge base"
5624msgstr "$onto_name: 没有合并基准"
5625
5626#: git-rebase.sh:431
5627#, sh-format
5628msgid "Does not point to a valid commit: $onto_name"
5629msgstr "没有指向一个有效的提交:$onto_name"
5630
5631#: git-rebase.sh:454
5632#, sh-format
5633msgid "fatal: no such branch: $branch_name"
5634msgstr "严重错误:无此分支:$branch_name"
5635
5636#: git-rebase.sh:474
5637msgid "Please commit or stash them."
5638msgstr "请提交或为它们保存进度。"
5639
5640#: git-rebase.sh:492
5641#, sh-format
5642msgid "Current branch $branch_name is up to date."
5643msgstr "当前分支 $branch_name 是最新的。"
5644
5645#: git-rebase.sh:495
5646#, sh-format
5647msgid "Current branch $branch_name is up to date, rebase forced."
5648msgstr "当前分支 $branch_name 是最新的,强制变基。"
5649
5650#: git-rebase.sh:506
5651#, sh-format
5652msgid "Changes from $mb to $onto:"
5653msgstr "变更从 $mb 到 $onto:"
5654
5655#. Detach HEAD and reset the tree
5656#: git-rebase.sh:515
5657msgid "First, rewinding head to replay your work on top of it..."
5658msgstr "首先,重置头指针以便在上面重放您的工作..."
5659
5660#: git-rebase.sh:523
5661#, sh-format
5662msgid "Fast-forwarded $branch_name to $onto_name."
5663msgstr "快进 $branch_name 至 $onto_name。"
5664
c04f5ac3
JX
5665#: git-stash.sh:51
5666msgid "git stash clear with parameters is unimplemented"
5667msgstr "git stash clear 不支持参数"
5668
5669#: git-stash.sh:74
5670msgid "You do not have the initial commit yet"
5671msgstr "您尚未建立初始提交"
5672
5673#: git-stash.sh:89
5674msgid "Cannot save the current index state"
90e6ef53 5675msgstr "无法保存当前索引状态"
c04f5ac3
JX
5676
5677#: git-stash.sh:123 git-stash.sh:136
5678msgid "Cannot save the current worktree state"
5679msgstr "无法保存当前工作区状态"
5680
5681#: git-stash.sh:140
5682msgid "No changes selected"
90e6ef53 5683msgstr "没有选择变更"
c04f5ac3
JX
5684
5685#: git-stash.sh:143
5686msgid "Cannot remove temporary index (can't happen)"
90e6ef53 5687msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
5688
5689#: git-stash.sh:156
5690msgid "Cannot record working tree state"
5691msgstr "不能记录工作区状态"
5692
b694fbb1
JX
5693#. TRANSLATORS: $option is an invalid option, like
5694#. `--blah-blah'. The 7 spaces at the beginning of the
5695#. second line correspond to "error: ". So you should line
5696#. up the second line with however many characters the
5697#. translation of "error: " takes in your language. E.g. in
5698#. English this is:
5699#.
5700#. $ git stash save --blah-blah 2>&1 | head -n 2
5701#. error: unknown option for 'stash save': --blah-blah
5702#. To provide a message, use git stash save -- '--blah-blah'
5703#: git-stash.sh:202
5704#, sh-format
5705msgid ""
5706"error: unknown option for 'stash save': $option\n"
5707" To provide a message, use git stash save -- '$option'"
5708msgstr ""
5709"错误:'stash save' 的未知选项:$option\n"
5710" 要提供一个描述信息,使用 git stash save -- '$option'"
5711
c04f5ac3
JX
5712#: git-stash.sh:223
5713msgid "No local changes to save"
5714msgstr "没有要保存的本地修改"
5715
5716#: git-stash.sh:227
5717msgid "Cannot initialize stash"
90e6ef53 5718msgstr "无法初始化 stash"
c04f5ac3
JX
5719
5720#: git-stash.sh:235
5721msgid "Cannot save the current status"
5722msgstr "无法保存当前状态"
5723
5724#: git-stash.sh:253
5725msgid "Cannot remove worktree changes"
5726msgstr "无法删除工作区变更"
5727
5728#: git-stash.sh:352
5729msgid "No stash found."
90e6ef53 5730msgstr "未发现 stash。"
c04f5ac3
JX
5731
5732#: git-stash.sh:359
5733#, sh-format
5734msgid "Too many revisions specified: $REV"
90e6ef53 5735msgstr "指定了太多的版本:$REV"
c04f5ac3
JX
5736
5737#: git-stash.sh:365
5738#, sh-format
5739msgid "$reference is not valid reference"
5740msgstr "$reference 不是有效的引用"
5741
5742#: git-stash.sh:393
5743#, sh-format
5744msgid "'$args' is not a stash-like commit"
90e6ef53 5745msgstr "'$args' 不是 stash 样提交"
c04f5ac3
JX
5746
5747#: git-stash.sh:404
5748#, sh-format
5749msgid "'$args' is not a stash reference"
90e6ef53 5750msgstr "'$args' 不是一个 stash 引用"
c04f5ac3
JX
5751
5752#: git-stash.sh:412
5753msgid "unable to refresh index"
90e6ef53 5754msgstr "无法刷新索引"
c04f5ac3
JX
5755
5756#: git-stash.sh:416
5757msgid "Cannot apply a stash in the middle of a merge"
5758msgstr "无法在合并过程中恢复进度"
5759
5760#: git-stash.sh:424
5761msgid "Conflicts in index. Try without --index."
90e6ef53 5762msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3
JX
5763
5764#: git-stash.sh:426
5765msgid "Could not save index tree"
90e6ef53 5766msgstr "不能保存索引树"
c04f5ac3
JX
5767
5768#: git-stash.sh:460
5769msgid "Cannot unstage modified files"
5770msgstr "无法还原修改的文件"
5771
b694fbb1
JX
5772#: git-stash.sh:474
5773msgid "Index was not unstashed."
5774msgstr "索引的进度没有被恢复。"
5775
c04f5ac3
JX
5776#: git-stash.sh:491
5777#, sh-format
5778msgid "Dropped ${REV} ($s)"
5779msgstr "丢弃了 ${REV} ($s)"
5780
5781#: git-stash.sh:492
5782#, sh-format
5783msgid "${REV}: Could not drop stash entry"
90e6ef53 5784msgstr "${REV}:不能丢弃进度条目"
c04f5ac3
JX
5785
5786#: git-stash.sh:499
5787msgid "No branch name specified"
5788msgstr "未指定分支名"
5789
5790#: git-stash.sh:570
5791msgid "(To restore them type \"git stash apply\")"
5792msgstr "(为恢复数据输入 \"git stash apply\")"
5793
6792b93b 5794#: git-submodule.sh:88
c04f5ac3
JX
5795#, sh-format
5796msgid "cannot strip one component off url '$remoteurl'"
5797msgstr "无法从 url '$remoteurl' 剥离一个组件"
5798
6792b93b 5799#: git-submodule.sh:145
c04f5ac3 5800#, sh-format
170e9899
JX
5801msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5802msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 5803
23ff3338 5804#: git-submodule.sh:189
c04f5ac3 5805#, sh-format
170e9899
JX
5806msgid "Clone of '$url' into submodule path '$sm_path' failed"
5807msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 5808
23ff3338 5809#: git-submodule.sh:201
dac1de7d
JX
5810#, sh-format
5811msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5812msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5813
23ff3338 5814#: git-submodule.sh:290
c04f5ac3
JX
5815#, sh-format
5816msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5817msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
5818
23ff3338 5819#: git-submodule.sh:307
c04f5ac3 5820#, sh-format
170e9899
JX
5821msgid "'$sm_path' already exists in the index"
5822msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 5823
23ff3338 5824#: git-submodule.sh:311
b694fbb1
JX
5825#, sh-format
5826msgid ""
5827"The following path is ignored by one of your .gitignore files:\n"
5828"$sm_path\n"
5829"Use -f if you really want to add it."
5830msgstr ""
5831"以下路径被您的一个 .gitignore 文件所忽略:\n"
5832"$sm_path\n"
5833"如果您确实想添加它,使用 -f 参数。"
5834
23ff3338 5835#: git-submodule.sh:322
b694fbb1
JX
5836#, sh-format
5837msgid "Adding existing repo at '$sm_path' to the index"
5838msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5839
23ff3338 5840#: git-submodule.sh:324
c04f5ac3 5841#, sh-format
170e9899
JX
5842msgid "'$sm_path' already exists and is not a valid git repo"
5843msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 5844
23ff3338 5845#: git-submodule.sh:338
c04f5ac3 5846#, sh-format
170e9899
JX
5847msgid "Unable to checkout submodule '$sm_path'"
5848msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 5849
23ff3338 5850#: git-submodule.sh:343
c04f5ac3 5851#, sh-format
170e9899
JX
5852msgid "Failed to add submodule '$sm_path'"
5853msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 5854
23ff3338 5855#: git-submodule.sh:348
c04f5ac3 5856#, sh-format
170e9899
JX
5857msgid "Failed to register submodule '$sm_path'"
5858msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 5859
23ff3338 5860#: git-submodule.sh:390
c04f5ac3 5861#, sh-format
170e9899
JX
5862msgid "Entering '$prefix$sm_path'"
5863msgstr "正在进入 '$prefix$sm_path'"
c04f5ac3 5864
23ff3338 5865#: git-submodule.sh:404
c04f5ac3 5866#, sh-format
170e9899
JX
5867msgid "Stopping at '$sm_path'; script returned non-zero status."
5868msgstr "停止于 '$sm_path',脚本返回非零值。"
c04f5ac3 5869
23ff3338 5870#: git-submodule.sh:447
c04f5ac3 5871#, sh-format
170e9899
JX
5872msgid "No url found for submodule path '$sm_path' in .gitmodules"
5873msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
c04f5ac3 5874
23ff3338 5875#: git-submodule.sh:456
c04f5ac3 5876#, sh-format
170e9899
JX
5877msgid "Failed to register url for submodule path '$sm_path'"
5878msgstr "无法为子模组路径 '$sm_path' 注册 url"
c04f5ac3 5879
23ff3338 5880#: git-submodule.sh:458
c04f5ac3 5881#, sh-format
170e9899
JX
5882msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5883msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
c04f5ac3 5884
23ff3338 5885#: git-submodule.sh:466
d691f479
JX
5886#, sh-format
5887msgid "Failed to register update mode for submodule path '$sm_path'"
5888msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5889
23ff3338 5890#: git-submodule.sh:565
c04f5ac3
JX
5891#, sh-format
5892msgid ""
170e9899 5893"Submodule path '$sm_path' not initialized\n"
c04f5ac3
JX
5894"Maybe you want to use 'update --init'?"
5895msgstr ""
170e9899 5896"子模组路径 '$sm_path' 没有初始化\n"
90e6ef53 5897"也许您想用 'update --init'?"
c04f5ac3 5898
23ff3338 5899#: git-submodule.sh:578
c04f5ac3 5900#, sh-format
170e9899
JX
5901msgid "Unable to find current revision in submodule path '$sm_path'"
5902msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
c04f5ac3 5903
23ff3338 5904#: git-submodule.sh:597
c04f5ac3 5905#, sh-format
170e9899
JX
5906msgid "Unable to fetch in submodule path '$sm_path'"
5907msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 5908
23ff3338 5909#: git-submodule.sh:611
c04f5ac3 5910#, sh-format
170e9899
JX
5911msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5912msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
c04f5ac3 5913
23ff3338 5914#: git-submodule.sh:612
c04f5ac3 5915#, sh-format
170e9899
JX
5916msgid "Submodule path '$sm_path': rebased into '$sha1'"
5917msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
c04f5ac3 5918
23ff3338 5919#: git-submodule.sh:617
c04f5ac3 5920#, sh-format
170e9899
JX
5921msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5922msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
c04f5ac3 5923
23ff3338 5924#: git-submodule.sh:618
c04f5ac3 5925#, sh-format
170e9899
JX
5926msgid "Submodule path '$sm_path': merged in '$sha1'"
5927msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
c04f5ac3 5928
23ff3338 5929#: git-submodule.sh:623
c04f5ac3 5930#, sh-format
170e9899
JX
5931msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5932msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
c04f5ac3 5933
23ff3338 5934#: git-submodule.sh:624
c04f5ac3 5935#, sh-format
170e9899
JX
5936msgid "Submodule path '$sm_path': checked out '$sha1'"
5937msgstr "子模组路径 '$sm_path':检出 '$sha1'"
c04f5ac3 5938
23ff3338 5939#: git-submodule.sh:646 git-submodule.sh:969
c04f5ac3 5940#, sh-format
170e9899
JX
5941msgid "Failed to recurse into submodule path '$sm_path'"
5942msgstr "无法递归进子模组路径 '$sm_path'"
c04f5ac3 5943
23ff3338 5944#: git-submodule.sh:754
649900bc
JX
5945msgid "The --cached option cannot be used with the --files option"
5946msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1
JX
5947
5948#. unexpected type
23ff3338 5949#: git-submodule.sh:794
b694fbb1
JX
5950#, sh-format
5951msgid "unexpected mode $mod_dst"
5952msgstr "意外的模式 $mod_dst"
c04f5ac3 5953
90e6ef53 5954# 译者:注意保持前导空格
23ff3338 5955#: git-submodule.sh:812
c04f5ac3
JX
5956#, sh-format
5957msgid " Warn: $name doesn't contain commit $sha1_src"
5958msgstr " 警告:$name 未包含提交 $sha1_src"
5959
90e6ef53 5960# 译者:注意保持前导空格
23ff3338 5961#: git-submodule.sh:815
c04f5ac3
JX
5962#, sh-format
5963msgid " Warn: $name doesn't contain commit $sha1_dst"
5964msgstr " 警告:$name 未包含提交 $sha1_dst"
5965
90e6ef53 5966# 译者:注意保持前导空格
23ff3338 5967#: git-submodule.sh:818
c04f5ac3
JX
5968#, sh-format
5969msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5970msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
5971
23ff3338 5972#: git-submodule.sh:843
c04f5ac3 5973msgid "blob"
649900bc 5974msgstr "二进制对象"
c04f5ac3 5975
23ff3338 5976#: git-submodule.sh:881
b694fbb1
JX
5977msgid "# Submodules changed but not updated:"
5978msgstr "# 子模组已修改但尚未更新:"
5979
23ff3338 5980#: git-submodule.sh:883
b694fbb1
JX
5981msgid "# Submodule changes to be committed:"
5982msgstr "要提交的子模组变更:"
5983
23ff3338 5984#: git-submodule.sh:1027
c04f5ac3
JX
5985#, sh-format
5986msgid "Synchronizing submodule url for '$name'"
90e6ef53 5987msgstr "为 '$name' 同步子模组 url"