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