zh_CN.po 135.2 KB
Newer Older
J
Jiang Xin 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14
# Chinese translations for Git package
# Git 软件包的简体中文翻译.
# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributers:
#   - Jiang Xin <worldhello.net AT gmail.com>
#   - Riku <lu.riku AT gmail.com>
#   - Zhuang Ya <zhuangya AT me.com>
#   - Lian Cheng <rhythm.mail AT gmail.com>
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15
"POT-Creation-Date: 2012-05-21 08:57+0800\n"
16
"PO-Revision-Date: 2012-06-01 17:43+0800\n"
J
Jiang Xin 已提交
17 18 19 20 21 22
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
23
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
J
Jiang Xin 已提交
24

25
#: advice.c:40
J
Jiang Xin 已提交
26 27 28 29 30 31 32 33
#, c-format
msgid "hint: %.*s\n"
msgstr "提示:%.*s\n"

#.
#. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do.
#.
34
#: advice.c:70
J
Jiang Xin 已提交
35 36 37 38 39 40 41 42 43 44
msgid ""
"Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n"
"appropriate to mark resolution and make a commit,\n"
"or use 'git commit -a'."
msgstr ""
"请先在工作区改正文件,然后酌情使用\n"
"'git add/rm <file>' 标记解决方案,\n"
"或使用 'git commit -a'。"

45 46 47
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
48
msgstr "'%s' 不像是一个 v2 版本的包文件"
49 50

#: bundle.c:63
51
#, c-format
52
msgid "unrecognized header: %s%s (%d)"
53
msgstr "未能识别的包头:%s%s (%d)"
54 55 56 57 58 59 60 61

#: bundle.c:89 builtin/commit.c:697
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"

#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
62
msgstr "版本库缺少这些必备的提交:"
63 64 65 66 67 68 69 70 71 72 73

#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"

#: bundle.c:186
#, c-format
msgid "The bundle contains %d ref"
msgid_plural "The bundle contains %d refs"
74
msgstr[0] "这个包中含有 %d 个引用"
75
msgstr[1] "这个包中含有 %d 个引用"
76 77 78 79 80

#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
81 82
msgstr[0] "这个包需要这个引用"
msgstr[1] "这个包需要 %d 个这些引用"
83 84 85

#: bundle.c:290
msgid "rev-list died"
86
msgstr "rev-list 终止"
87 88 89 90

#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
91
msgstr "未能识别的参数:%s"
92 93 94 95

#: bundle.c:331
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
96
msgstr "引用 '%s' 被 rev-list 选项排除"
97 98 99

#: bundle.c:376
msgid "Refusing to create empty bundle."
100
msgstr "不能创建空包。"
101 102 103

#: bundle.c:394
msgid "Could not spawn pack-objects"
104
msgstr "不能生成 pack-objects 进程"
105 106 107

#: bundle.c:412
msgid "pack-objects died"
108
msgstr "pack-objects 终止"
109 110

#: bundle.c:415
111
#, c-format
112
msgid "cannot create '%s'"
113
msgstr "不能创建 '%s'"
114 115 116

#: bundle.c:437
msgid "index-pack died"
117
msgstr "index-pack 终止"
118

119
#: commit.c:48
J
Jiang Xin 已提交
120 121 122 123
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"

124
#: commit.c:50
J
Jiang Xin 已提交
125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"

#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"

#: connected.c:39
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"

#: connected.c:48
#, c-format
msgid "failed write to rev-list: %s"
msgstr "无法写入 rev-list:%s"

#: connected.c:56
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr "无法关闭 rev-list 的标准输入:%s"

147 148
#: date.c:95
msgid "in the future"
149
msgstr "在将来"
150 151 152 153 154

#: date.c:101
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
155
msgstr[0] "%lu 秒钟之前"
156
msgstr[1] "%lu 秒钟之前"
157 158 159 160 161

#: date.c:108
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
162
msgstr[0] "%lu 分钟之前"
163
msgstr[1] "%lu 分钟之前"
164 165 166 167 168

#: date.c:115
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
169
msgstr[0] "%lu 小时之前"
170
msgstr[1] "%lu 小时之前"
171 172 173 174 175

#: date.c:122
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
176
msgstr[0] "%lu 天之前"
177
msgstr[1] "%lu 天之前"
178 179 180 181 182

#: date.c:128
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
183
msgstr[0] "%lu 周之前"
184
msgstr[1] "%lu 周之前"
185 186 187 188 189

#: date.c:135
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
190
msgstr[0] "%lu 个月之前"
191
msgstr[1] "%lu 个月之前"
192 193 194 195 196

#: date.c:146
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
197
msgstr[0] "%lu 年"
198
msgstr[1] "%lu 年"
199 200 201 202 203

#: date.c:149
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
204
msgstr[0] "%s,%lu 个月之前"
205
msgstr[1] "%s,%lu 个月之前"
206 207 208 209 210

#: date.c:154 date.c:159
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
211
msgstr[0] "%lu 年前"
212
msgstr[1] "%lu 年前"
213

214
#  译者:注意保持前导空格
215
#: diff.c:105
J
Jiang Xin 已提交
216 217 218 219
#, c-format
msgid "  Failed to parse dirstat cut-off percentage '%.*s'\n"
msgstr "  无法解析 dirstat 阈值 '%.*s'\n"

220
#  译者:注意保持前导空格
221
#: diff.c:110
J
Jiang Xin 已提交
222 223 224 225
#, c-format
msgid "  Unknown dirstat parameter '%.*s'\n"
msgstr "  未知 dirstat 参数 '%.*s'\n"

226
#: diff.c:210
J
Jiang Xin 已提交
227 228 229 230 231
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
232
"发现配置变量 'diff.dirstat' 中的错误:\n"
J
Jiang Xin 已提交
233 234
"%s"

235
#: diff.c:1400
236
msgid " 0 files changed\n"
237
msgstr " 0 个文件被修改\n"
238

239
#: diff.c:1404
240 241 242
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
243
msgstr[0] " %d 个文件被修改"
244
msgstr[1] " %d 个文件被修改"
245

246
#: diff.c:1421
247 248 249
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
250
msgstr[0] ",插入 %d 行(+)"
251
msgstr[1] ",插入 %d 行(+)"
252

253
#: diff.c:1432
254 255 256
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
257
msgstr[0] ",删除 %d 行(-)"
258
msgstr[1] ",删除 %d 行(-)"
259

260
#: diff.c:3478
J
Jiang Xin 已提交
261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"无法解析 --dirstat/-X 选项的参数:\n"
"%s"

#: gpg-interface.c:59
msgid "could not run gpg."
msgstr "不能执行 gpg。"

#: gpg-interface.c:71
msgid "gpg did not accept the data"
msgstr "gpg 没有接受数据"

#: gpg-interface.c:82
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"

281
#: grep.c:1280
282 283 284 285
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"

286
#: grep.c:1297
287 288 289 290
#, c-format
msgid "'%s': %s"
msgstr "'%s':%s"

291
#: grep.c:1308
292 293 294 295
#, c-format
msgid "'%s': short read %s"
msgstr "'%s':读取不完整 %s"

296
#: help.c:207
297
#, c-format
298
msgid "available git commands in '%s'"
299
msgstr "在 '%s' 下可用的 git 命令"
300 301 302

#: help.c:214
msgid "git commands available from elsewhere on your $PATH"
303
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
304 305

#: help.c:270
J
Jiang Xin 已提交
306 307 308 309 310 311 312 313
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
"'%s' 像是一个 git 命令,但却无法运行。\n"
"可能是 git-%s 受损?"

314 315
#: help.c:327
msgid "Uh oh. Your system reports no Git commands at all."
316
msgstr "唉呀,您的系统中未发现 Git 命令。"
317 318 319 320 321 322 323

#: help.c:349
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
324 325
"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
"是 '%s'"
326 327 328 329

#: help.c:354
#, c-format
msgid "in %0.1f seconds automatically..."
330
msgstr "在 %0.1f 秒钟后自动运行..."
331 332 333 334

#: help.c:361
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
335
msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
336 337 338 339 340 341 342 343 344

#: help.c:365
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
345 346 347 348 349
"\n"
"您指的是这个么?"
msgstr[1] ""
"\n"
"您指的是这些其中一个么?"
350 351 352

#: parse-options.c:493
msgid "..."
353
msgstr "..."
354 355

#: parse-options.c:511
356
#, c-format
357
msgid "usage: %s"
358
msgstr "用法:%s"
359 360 361 362

#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#: parse-options.c:515
363
#, c-format
364
msgid "   or: %s"
365
msgstr "  或:%s"
366 367 368

#  译者:为保证在输出中对齐,注意调整句中空格!
#: parse-options.c:518
369
#, c-format
370
msgid "    %s"
371
msgstr "    %s"
372

373
#: remote.c:1607
J
Jiang Xin 已提交
374 375 376 377
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
378
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
J
Jiang Xin 已提交
379

380
#: remote.c:1613
J
Jiang Xin 已提交
381 382 383 384
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
385
msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
386
msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
J
Jiang Xin 已提交
387

388
#: remote.c:1621
J
Jiang Xin 已提交
389 390 391 392 393 394 395 396 397 398
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
msgid_plural ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"您的分支和 '%s' 出现了偏离,\n"
"并且各自分别有 %d 和 %d 处不同的提交。\n"
399 400 401
msgstr[1] ""
"您的分支和 '%s' 出现了偏离,\n"
"并且各自分别有 %d 和 %d 处不同的提交。\n"
J
Jiang Xin 已提交
402

403
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
404
#: builtin/merge.c:1088 builtin/merge.c:1098
J
Jiang Xin 已提交
405 406
#, c-format
msgid "Could not open '%s' for writing"
407
msgstr "不能为写入打开 '%s'"
J
Jiang Xin 已提交
408

409
#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
410
#: builtin/merge.c:1090 builtin/merge.c:1103
J
Jiang Xin 已提交
411 412
#, c-format
msgid "Could not write to '%s'"
413
msgstr "不能写入 '%s'"
J
Jiang Xin 已提交
414

415
#: sequencer.c:144
416 417 418 419 420 421 422
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
"命令标记修正后的文件"

423
#: sequencer.c:147
J
Jiang Xin 已提交
424 425 426 427 428 429 430 431
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
"对修正后的文件做标记,然后用 'git commit' 提交"

432
#: sequencer.c:160 sequencer.c:741 sequencer.c:824
J
Jiang Xin 已提交
433 434 435 436
#, c-format
msgid "Could not write to %s"
msgstr "不能写入 %s"

437
#: sequencer.c:163
J
Jiang Xin 已提交
438 439 440 441
#, c-format
msgid "Error wrapping up %s"
msgstr "错误收尾 %s"

442
#: sequencer.c:178
J
Jiang Xin 已提交
443 444 445
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "您的本地修改将被拣选操作覆盖。"

446
#: sequencer.c:180
J
Jiang Xin 已提交
447 448 449
msgid "Your local changes would be overwritten by revert."
msgstr "您的本地修改将被还原操作覆盖。"

450
#: sequencer.c:183
J
Jiang Xin 已提交
451 452 453 454
msgid "Commit your changes or stash them to proceed."
msgstr "提交您的修改或保存进度后再继续。"

#. TRANSLATORS: %s will be "revert" or "cherry-pick"
455
#: sequencer.c:233
J
Jiang Xin 已提交
456 457
#, c-format
msgid "%s: Unable to write new index file"
458
msgstr "%s:无法写入新索引文件"
J
Jiang Xin 已提交
459

460 461
#: sequencer.c:261
msgid "Could not resolve HEAD commit\n"
462
msgstr "不能解析 HEAD 提交\n"
463 464 465

#: sequencer.c:282
msgid "Unable to update cache tree\n"
466
msgstr "不能更新缓存\n"
467 468

#: sequencer.c:323
469
#, c-format
470
msgid "Could not parse commit %s\n"
471
msgstr "不能解析提交 %s\n"
472 473

#: sequencer.c:328
474
#, c-format
475
msgid "Could not parse parent commit %s\n"
476
msgstr "不能解析父提交 %s\n"
477 478

#: sequencer.c:358
J
Jiang Xin 已提交
479
msgid "Your index file is unmerged."
480
msgstr "您的索引文件未完成合并。"
J
Jiang Xin 已提交
481

482
#: sequencer.c:361
J
Jiang Xin 已提交
483 484 485
msgid "You do not have a valid HEAD"
msgstr "您没有一个有效的 HEAD"

486
#: sequencer.c:376
J
Jiang Xin 已提交
487 488 489 490
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

491
#: sequencer.c:384
J
Jiang Xin 已提交
492 493 494 495
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "提交 %s 没有父提交 %d"

496
#: sequencer.c:388
J
Jiang Xin 已提交
497 498
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
499
msgstr "指定了主线但提交 %s 不是一个合并。"
J
Jiang Xin 已提交
500 501 502

#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
503
#: sequencer.c:399
J
Jiang Xin 已提交
504 505 506 507
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"

508
#: sequencer.c:403
J
Jiang Xin 已提交
509 510 511 512
#, c-format
msgid "Cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"

513
#: sequencer.c:491
J
Jiang Xin 已提交
514 515 516 517
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"

518
#: sequencer.c:492
J
Jiang Xin 已提交
519 520 521 522
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"

523
#: sequencer.c:536
J
Jiang Xin 已提交
524 525 526
msgid "empty commit set passed"
msgstr "提供了空的提交集"

527
#: sequencer.c:544
J
Jiang Xin 已提交
528 529
#, c-format
msgid "git %s: failed to read the index"
530
msgstr "git %s:无法读取索引"
J
Jiang Xin 已提交
531

532
#: sequencer.c:549
J
Jiang Xin 已提交
533 534
#, c-format
msgid "git %s: failed to refresh the index"
535
msgstr "git %s:无法刷新索引"
J
Jiang Xin 已提交
536

537
#: sequencer.c:607
J
Jiang Xin 已提交
538 539
#, c-format
msgid "Cannot %s during a %s"
540
msgstr "无法 %s 在一个 %s 过程中"
J
Jiang Xin 已提交
541

542
#: sequencer.c:629
J
Jiang Xin 已提交
543 544
#, c-format
msgid "Could not parse line %d."
545
msgstr "不能解析第 %d 行。"
J
Jiang Xin 已提交
546

547
#: sequencer.c:634
J
Jiang Xin 已提交
548
msgid "No commits parsed."
549
msgstr "没有提交被解析。"
J
Jiang Xin 已提交
550

551
#: sequencer.c:647
J
Jiang Xin 已提交
552 553 554 555
#, c-format
msgid "Could not open %s"
msgstr "不能打开 %s"

556
#: sequencer.c:651
J
Jiang Xin 已提交
557 558 559 560
#, c-format
msgid "Could not read %s."
msgstr "不能读取 %s。"

561
#: sequencer.c:658
J
Jiang Xin 已提交
562 563 564 565
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "无用的指令表单:%s"

566
#: sequencer.c:686
J
Jiang Xin 已提交
567 568 569 570
#, c-format
msgid "Invalid key: %s"
msgstr "无效键名:%s"

571
#: sequencer.c:689
J
Jiang Xin 已提交
572 573
#, c-format
msgid "Invalid value for %s: %s"
574
msgstr "%s 的值无效:%s"
J
Jiang Xin 已提交
575

576
#: sequencer.c:701
J
Jiang Xin 已提交
577 578 579 580
#, c-format
msgid "Malformed options sheet: %s"
msgstr "非法的选项表单:%s"

581
#: sequencer.c:722
J
Jiang Xin 已提交
582 583 584
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"

585
#: sequencer.c:723
J
Jiang Xin 已提交
586 587 588
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

589
#: sequencer.c:727
J
Jiang Xin 已提交
590 591
#, c-format
msgid "Could not create sequencer directory %s"
592
msgstr "不能创建序列目录 %s"
J
Jiang Xin 已提交
593

594
#: sequencer.c:743 sequencer.c:828
J
Jiang Xin 已提交
595 596 597 598
#, c-format
msgid "Error wrapping up %s."
msgstr "错误收尾 %s。"

599
#: sequencer.c:762 sequencer.c:896
J
Jiang Xin 已提交
600 601 602
msgid "no cherry-pick or revert in progress"
msgstr "没有拣选或还原操作在进行"

603
#: sequencer.c:764
J
Jiang Xin 已提交
604 605 606
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"

607
#: sequencer.c:766
J
Jiang Xin 已提交
608
msgid "cannot abort from a branch yet to be born"
609
msgstr "不能从尚未建立的分支终止"
J
Jiang Xin 已提交
610

611
#: sequencer.c:788 builtin/apply.c:3689
J
Jiang Xin 已提交
612 613 614 615
#, c-format
msgid "cannot open %s: %s"
msgstr "不能打开 %s:%s"

616
#: sequencer.c:791
J
Jiang Xin 已提交
617 618 619 620
#, c-format
msgid "cannot read %s: %s"
msgstr "不能读取 %s:%s"

621
#: sequencer.c:792
J
Jiang Xin 已提交
622 623 624
msgid "unexpected end of file"
msgstr "未预期的文件结束"

625
#: sequencer.c:798
J
Jiang Xin 已提交
626 627
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
628
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
J
Jiang Xin 已提交
629

630
#: sequencer.c:821
J
Jiang Xin 已提交
631 632 633 634
#, c-format
msgid "Could not format %s."
msgstr "不能格式化 %s。"

635
#: sequencer.c:983
J
Jiang Xin 已提交
636 637 638
msgid "Can't revert as initial commit"
msgstr "不能作为初始提交还原"

639
#: sequencer.c:984
J
Jiang Xin 已提交
640 641 642
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"

643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661
#: sha1_name.c:864
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"

#: sha1_name.c:867
#, c-format
msgid "No such branch: '%s'"
msgstr "没有此分支:'%s'"

#: sha1_name.c:869
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"

#: sha1_name.c:872
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

662
#: wt-status.c:135
J
Jiang Xin 已提交
663 664 665
msgid "Unmerged paths:"
msgstr "未合并的路径:"

666
#  译者:注意保持前导空格
667
#: wt-status.c:141 wt-status.c:158
J
Jiang Xin 已提交
668 669 670 671
#, c-format
msgid "  (use \"git reset %s <file>...\" to unstage)"
msgstr "  (使用 \"git reset %s <file>...\" 撤出暂存区)"

672
#  译者:注意保持前导空格
673
#: wt-status.c:143 wt-status.c:160
J
Jiang Xin 已提交
674 675 676
msgid "  (use \"git rm --cached <file>...\" to unstage)"
msgstr "  (使用 \"git rm --cached <file>...\" 撤出暂存区)"

677
#  译者:注意保持前导空格
678
#: wt-status.c:144
J
Jiang Xin 已提交
679 680 681
msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr "  (酌情使用 \"git add/rm <file>...\" 标记解决方案)"

682
#: wt-status.c:152
J
Jiang Xin 已提交
683 684 685
msgid "Changes to be committed:"
msgstr "要提交的变更:"

686
#: wt-status.c:170
J
Jiang Xin 已提交
687
msgid "Changes not staged for commit:"
688
msgstr "尚未暂存以备提交的变更:"
J
Jiang Xin 已提交
689

690
#  译者:注意保持前导空格
691
#: wt-status.c:174
J
Jiang Xin 已提交
692 693 694
msgid "  (use \"git add <file>...\" to update what will be committed)"
msgstr "  (使用 \"git add <file>...\" 更新要提交的内容)"

695
#  译者:注意保持前导空格
696
#: wt-status.c:176
J
Jiang Xin 已提交
697 698 699
msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
msgstr "  (使用 \"git add/rm <file>...\" 更新要提交的内容)"

700
#  译者:注意保持前导空格
701
#: wt-status.c:177
J
Jiang Xin 已提交
702 703 704 705
msgid ""
"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr "  (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"

706
#  译者:注意保持前导空格
707
#: wt-status.c:179
J
Jiang Xin 已提交
708 709 710
msgid "  (commit or discard the untracked or modified content in submodules)"
msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"

711
#: wt-status.c:188
J
Jiang Xin 已提交
712 713 714 715
#, c-format
msgid "%s files:"
msgstr "%s文件:"

716
#  译者:注意保持前导空格
717
#: wt-status.c:191
J
Jiang Xin 已提交
718 719
#, c-format
msgid "  (use \"git %s <file>...\" to include in what will be committed)"
720
msgstr "  (使用 \"git %s <file>...\" 以包含要提交的内容)"
J
Jiang Xin 已提交
721

722
#: wt-status.c:208
J
Jiang Xin 已提交
723 724 725
msgid "bug"
msgstr "bug"

726
#: wt-status.c:213
J
Jiang Xin 已提交
727 728 729
msgid "both deleted:"
msgstr "双方删除:"

730
#: wt-status.c:214
J
Jiang Xin 已提交
731 732 733
msgid "added by us:"
msgstr "由我们添加:"

734
#: wt-status.c:215
J
Jiang Xin 已提交
735 736 737
msgid "deleted by them:"
msgstr "由他们删除:"

738
#: wt-status.c:216
J
Jiang Xin 已提交
739 740 741
msgid "added by them:"
msgstr "由他们添加:"

742
#: wt-status.c:217
J
Jiang Xin 已提交
743 744 745
msgid "deleted by us:"
msgstr "由我们删除:"

746
#: wt-status.c:218
J
Jiang Xin 已提交
747 748 749
msgid "both added:"
msgstr "双方添加:"

750
#: wt-status.c:219
J
Jiang Xin 已提交
751 752 753
msgid "both modified:"
msgstr "双方修改:"

754
#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
755
#: wt-status.c:249
J
Jiang Xin 已提交
756
msgid "new commits, "
757
msgstr "新提交, "
J
Jiang Xin 已提交
758

759
#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
760
#: wt-status.c:251
J
Jiang Xin 已提交
761
msgid "modified content, "
762
msgstr "修改的内容, "
J
Jiang Xin 已提交
763

764
#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
765
#: wt-status.c:253
J
Jiang Xin 已提交
766
msgid "untracked content, "
767
msgstr "未跟踪的内容, "
J
Jiang Xin 已提交
768

769
#  译者:为保证在输出中对齐,注意调整句中空格!
770
#: wt-status.c:267
J
Jiang Xin 已提交
771 772 773 774
#, c-format
msgid "new file:   %s"
msgstr "新文件:    %s"

775
#  译者:为保证在输出中对齐,注意调整句中空格!
776
#: wt-status.c:270
J
Jiang Xin 已提交
777 778 779 780
#, c-format
msgid "copied:     %s -> %s"
msgstr "拷贝:      %s -> %s"

781
#  译者:为保证在输出中对齐,注意调整句中空格!
782
#: wt-status.c:273
J
Jiang Xin 已提交
783 784 785 786
#, c-format
msgid "deleted:    %s"
msgstr "删除:      %s"

787
#  译者:为保证在输出中对齐,注意调整句中空格!
788
#: wt-status.c:276
J
Jiang Xin 已提交
789 790 791 792
#, c-format
msgid "modified:   %s"
msgstr "修改:      %s"

793
#  译者:为保证在输出中对齐,注意调整句中空格!
794
#: wt-status.c:279
J
Jiang Xin 已提交
795 796 797 798
#, c-format
msgid "renamed:    %s -> %s"
msgstr "重命名:    %s -> %s"

799
#  译者:为保证在输出中对齐,注意调整句中空格!
800
#: wt-status.c:282
J
Jiang Xin 已提交
801 802 803 804
#, c-format
msgid "typechange: %s"
msgstr "类型变更:  %s"

805
#  译者:为保证在输出中对齐,注意调整句中空格!
806
#: wt-status.c:285
J
Jiang Xin 已提交
807 808 809 810
#, c-format
msgid "unknown:    %s"
msgstr "未知:      %s"

811
#  译者:为保证在输出中对齐,注意调整句中空格!
812
#: wt-status.c:288
J
Jiang Xin 已提交
813 814 815 816
#, c-format
msgid "unmerged:   %s"
msgstr "未合并:    %s"

817
#: wt-status.c:291
J
Jiang Xin 已提交
818 819
#, c-format
msgid "bug: unhandled diff status %c"
820
msgstr "bug:未处理的差异状态 %c"
J
Jiang Xin 已提交
821

822
#: wt-status.c:737
J
Jiang Xin 已提交
823 824 825
msgid "On branch "
msgstr "位于分支 "

826
#: wt-status.c:744
J
Jiang Xin 已提交
827 828 829
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"

830
#: wt-status.c:755
J
Jiang Xin 已提交
831 832 833
msgid "Initial commit"
msgstr "初始提交"

834
#: wt-status.c:769
J
Jiang Xin 已提交
835 836 837
msgid "Untracked"
msgstr "未跟踪的"

838
#: wt-status.c:771
J
Jiang Xin 已提交
839 840 841
msgid "Ignored"
msgstr "忽略的"

842
#: wt-status.c:773
J
Jiang Xin 已提交
843 844 845 846
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"

847
#  译者:中文字符串拼接,可删除前导空格
848
#: wt-status.c:775
J
Jiang Xin 已提交
849
msgid " (use -u option to show untracked files)"
850
msgstr "(使用 -u 参数显示未跟踪的文件)"
J
Jiang Xin 已提交
851

852
#: wt-status.c:781
J
Jiang Xin 已提交
853 854 855
msgid "No changes"
msgstr "没有修改"

856
#: wt-status.c:785
J
Jiang Xin 已提交
857 858 859 860
#, c-format
msgid "no changes added to commit%s\n"
msgstr "修改尚未加入提交%s\n"

861
#  译者:中文字符串拼接,可删除前导空格
862
#: wt-status.c:787
J
Jiang Xin 已提交
863
msgid " (use \"git add\" and/or \"git commit -a\")"
864
msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
J
Jiang Xin 已提交
865

866
#: wt-status.c:789
J
Jiang Xin 已提交
867 868 869 870
#, c-format
msgid "nothing added to commit but untracked files present%s\n"
msgstr "空提交但存在未跟踪文件%s\n"

871
#  译者:中文字符串拼接,可删除前导空格
872
#: wt-status.c:791
J
Jiang Xin 已提交
873
msgid " (use \"git add\" to track)"
874
msgstr "(使用 \"git add\" 建立跟踪)"
J
Jiang Xin 已提交
875

876
#: wt-status.c:793 wt-status.c:796 wt-status.c:799
J
Jiang Xin 已提交
877 878 879 880
#, c-format
msgid "nothing to commit%s\n"
msgstr "无须提交%s\n"

881
#  译者:中文字符串拼接,可删除前导空格
882
#: wt-status.c:794
J
Jiang Xin 已提交
883
msgid " (create/copy files and use \"git add\" to track)"
884
msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
J
Jiang Xin 已提交
885

886
#  译者:中文字符串拼接,可删除前导空格
887
#: wt-status.c:797
J
Jiang Xin 已提交
888
msgid " (use -u to show untracked files)"
889
msgstr "(使用 -u 显示未跟踪文件)"
J
Jiang Xin 已提交
890

891
#  译者:中文字符串拼接,可删除前导空格
892
#: wt-status.c:800
J
Jiang Xin 已提交
893
msgid " (working directory clean)"
894
msgstr "(干净的工作区)"
J
Jiang Xin 已提交
895

896
#: wt-status.c:908
J
Jiang Xin 已提交
897
msgid "HEAD (no branch)"
898
msgstr "HEAD(非分支)"
J
Jiang Xin 已提交
899

900
#  译者:注意保持句尾空格
901
#: wt-status.c:914
J
Jiang Xin 已提交
902 903 904
msgid "Initial commit on "
msgstr "初始提交于 "

905
#  译者:注意保持句尾空格
906
#: wt-status.c:929
J
Jiang Xin 已提交
907 908 909
msgid "behind "
msgstr "落后 "

910
#  译者:注意保持句尾空格
911
#: wt-status.c:932 wt-status.c:935
J
Jiang Xin 已提交
912 913 914
msgid "ahead "
msgstr "领先 "

915
#  译者:注意保持句尾空格
916
#: wt-status.c:937
J
Jiang Xin 已提交
917 918 919 920 921 922 923 924
msgid ", behind "
msgstr ",落后 "

#: builtin/add.c:62
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"

925
#: builtin/add.c:67 builtin/commit.c:226
J
Jiang Xin 已提交
926 927 928 929 930 931 932 933 934 935 936 937 938 939 940
msgid "updating files failed"
msgstr "更新文件失败"

#: builtin/add.c:77
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"

#: builtin/add.c:176
#, c-format
msgid "Path '%s' is in submodule '%.*s'"
msgstr "路径 '%s' 属于模组 '%.*s'"

#: builtin/add.c:192
msgid "Unstaged changes after refreshing the index:"
941
msgstr "刷新索引之后尚未被暂存的变更:"
J
Jiang Xin 已提交
942 943 944 945 946 947 948 949 950 951 952 953 954

#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径 '%s' 未匹配任何文件"

#: builtin/add.c:209
#, c-format
msgid "'%s' is beyond a symbolic link"
msgstr "'%s' 位于符号链接中"

#: builtin/add.c:276
msgid "Could not read the index"
955
msgstr "不能读取索引"
J
Jiang Xin 已提交
956 957 958 959

#: builtin/add.c:286
#, c-format
msgid "Could not open '%s' for writing."
960
msgstr "不能为写入打开 '%s'。"
J
Jiang Xin 已提交
961 962 963

#: builtin/add.c:290
msgid "Could not write patch"
964
msgstr "不能写补丁"
J
Jiang Xin 已提交
965 966 967 968

#: builtin/add.c:295
#, c-format
msgid "Could not stat '%s'"
969
msgstr "不能查看文件状态 '%s'"
J
Jiang Xin 已提交
970 971 972 973 974

#: builtin/add.c:297
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"

975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025
#: builtin/add.c:303
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"

#: builtin/add.c:312
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"

#: builtin/add.c:352
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"

#: builtin/add.c:353
msgid "no files added"
msgstr "没有文件被添加"

#: builtin/add.c:359
msgid "adding files failed"
msgstr "添加文件失败"

#: builtin/add.c:391
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"

#: builtin/add.c:393
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 共用"

#: builtin/add.c:413
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件,也没有文件被添加。\n"

#: builtin/add.c:414
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'?\n"

#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr "索引文件损坏"

#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"

#: builtin/apply.c:53
msgid "git apply [options] [<patch>...]"
1026
msgstr "git apply [选项] [<补丁>...]"
1027 1028

#: builtin/apply.c:106
1029
#, c-format
1030
msgid "unrecognized whitespace option '%s'"
1031
msgstr "未能识别的空白字符选项 '%s'"
1032 1033

#: builtin/apply.c:121
1034
#, c-format
1035
msgid "unrecognized whitespace ignore option '%s'"
1036
msgstr "未能识别的空白字符忽略选项 '%s'"
1037 1038 1039 1040

#: builtin/apply.c:815
#, c-format
msgid "Cannot prepare timestamp regexp %s"
1041
msgstr "无法准备时间戳正则表达式 %s"
1042 1043 1044 1045

#: builtin/apply.c:824
#, c-format
msgid "regexec returned %d for input: %s"
1046
msgstr "regexec 返回 %d,输入为:%s"
1047 1048

#: builtin/apply.c:905
1049
#, c-format
1050
msgid "unable to find filename in patch at line %d"
1051
msgstr "不能在补丁的第 %d 行找到文件名"
1052 1053 1054 1055

#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1056
msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s"
1057 1058 1059 1060

#: builtin/apply.c:941
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1061
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1062 1063 1064 1065

#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1066
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1067 1068 1069 1070

#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
1071
msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行"
1072 1073 1074 1075

#: builtin/apply.c:1394
#, c-format
msgid "recount: unexpected line: %.*s"
1076
msgstr "recount:意外的行:%.*s"
1077 1078 1079 1080

#: builtin/apply.c:1451
#, c-format
msgid "patch fragment without header at line %d: %.*s"
1081
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1082 1083 1084 1085 1086 1087 1088 1089 1090

#: builtin/apply.c:1468
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"component (line %d)"
msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
1091 1092
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1093 1094 1095

#: builtin/apply.c:1628
msgid "new file depends on old contents"
1096
msgstr "新文件依赖旧内容"
1097 1098 1099

#: builtin/apply.c:1630
msgid "deleted file still has contents"
1100
msgstr "删除的文件仍有内容"
1101 1102 1103 1104

#: builtin/apply.c:1656
#, c-format
msgid "corrupt patch at line %d"
1105
msgstr "补丁损坏位于第 %d 行"
1106 1107 1108 1109

#: builtin/apply.c:1692
#, c-format
msgid "new file %s depends on old contents"
1110
msgstr "新文件 %s 依赖旧内容"
1111 1112 1113 1114

#: builtin/apply.c:1694
#, c-format
msgid "deleted file %s still has contents"
1115
msgstr "删除的文件 %s 仍有内容"
1116 1117 1118 1119

#: builtin/apply.c:1697
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
1120
msgstr "** 警告:文件 %s 成为空文件但并未删除"
1121 1122 1123 1124

#: builtin/apply.c:1843
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
1125
msgstr "二进制补丁在第 %d 行损坏:%.*s"
1126 1127 1128 1129 1130

#. there has to be one hunk (forward hunk)
#: builtin/apply.c:1872
#, c-format
msgid "unrecognized binary patch at line %d"
1131
msgstr "未能识别的二进制补丁位于第 %d 行"
1132 1133 1134 1135

#: builtin/apply.c:1958
#, c-format
msgid "patch with only garbage at line %d"
1136
msgstr "补丁文件的第 %d 行只有垃圾数据"
1137 1138

#: builtin/apply.c:2048
1139
#, c-format
1140
msgid "unable to read symlink %s"
1141
msgstr "无法读取符号链接 %s"
1142 1143

#: builtin/apply.c:2052
1144
#, c-format
1145
msgid "unable to open or read %s"
1146
msgstr "不能打开或读取 %s"
1147 1148 1149

#: builtin/apply.c:2123
msgid "oops"
1150
msgstr "哎哟"
1151 1152

#: builtin/apply.c:2645
1153
#, c-format
1154
msgid "invalid start of line: '%c'"
1155
msgstr "无效的行首字符:'%c'"
1156 1157 1158 1159 1160

#: builtin/apply.c:2763
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1161
msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)"
1162
msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)"
1163 1164 1165 1166

#: builtin/apply.c:2775
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1167
msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1168 1169 1170 1171 1172 1173 1174

#: builtin/apply.c:2781
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
1175 1176
"当查询:\n"
"%.*s"
1177 1178 1179 1180

#: builtin/apply.c:2800
#, c-format
msgid "missing binary patch data for '%s'"
1181
msgstr "缺失 '%s' 的二进制补丁数据"
1182 1183 1184 1185

#: builtin/apply.c:2903
#, c-format
msgid "binary patch does not apply to '%s'"
1186
msgstr "二进制补丁未应用到 '%s'"
1187 1188 1189 1190

#: builtin/apply.c:2909
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1191
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)"
1192 1193 1194 1195

#: builtin/apply.c:2930
#, c-format
msgid "patch failed: %s:%ld"
1196
msgstr "打补丁失败:%s:%ld"
1197 1198 1199 1200

#: builtin/apply.c:3045
#, c-format
msgid "patch %s has been renamed/deleted"
1201
msgstr "补丁 %s 已经被重命名/删除"
1202 1203

#: builtin/apply.c:3052 builtin/apply.c:3069
1204
#, c-format
1205
msgid "read of %s failed"
1206
msgstr "读取 %s 失败"
1207 1208 1209

#: builtin/apply.c:3084
msgid "removal patch leaves file contents"
1210
msgstr "移除补丁仍留下了文件内容"
1211 1212

#: builtin/apply.c:3105
1213
#, c-format
1214
msgid "%s: already exists in working directory"
1215
msgstr "%s:已经存在于工作区中"
1216 1217 1218 1219

#: builtin/apply.c:3143
#, c-format
msgid "%s: has been deleted/renamed"
1220
msgstr "%s:已经被删除/重命名"
1221 1222

#: builtin/apply.c:3148 builtin/apply.c:3179
1223
#, c-format
1224
msgid "%s: %s"
1225
msgstr "%s:%s"
1226 1227 1228 1229

#: builtin/apply.c:3159
#, c-format
msgid "%s: does not exist in index"
1230
msgstr "%s:不存在于索引中"
1231 1232

#: builtin/apply.c:3173
1233
#, c-format
1234
msgid "%s: does not match index"
1235
msgstr "%s:和索引不匹配"
1236 1237 1238 1239

#: builtin/apply.c:3190
#, c-format
msgid "%s: wrong type"
1240
msgstr "%s:错误类型"
1241 1242 1243 1244

#: builtin/apply.c:3192
#, c-format
msgid "%s has type %o, expected %o"
1245
msgstr "%s 的类型是 %o,预期是 %o"
1246 1247

#: builtin/apply.c:3247
1248
#, c-format
1249
msgid "%s: already exists in index"
1250
msgstr "%s:已经存在于索引中"
1251 1252

#: builtin/apply.c:3266
1253
#, fuzzy, c-format
1254
msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1255
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)%4$s%5$s 不匹配"
1256 1257 1258 1259

#: builtin/apply.c:3272
#, c-format
msgid "%s: patch does not apply"
1260
msgstr "%s:补丁未应用"
1261 1262 1263 1264

#: builtin/apply.c:3285
#, c-format
msgid "Checking patch %s..."
1265
msgstr "检查补丁 %s..."
1266 1267 1268 1269 1270 1271 1272

#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

#: builtin/apply.c:3483
1273
#, c-format
1274
msgid "unable to remove %s from index"
1275
msgstr "不能从索引中移除 %s"
1276 1277 1278 1279

#: builtin/apply.c:3510
#, c-format
msgid "corrupt patch for subproject %s"
1280
msgstr "子项目 %s 损坏的补丁"
1281 1282

#: builtin/apply.c:3514
1283
#, c-format
1284
msgid "unable to stat newly created file '%s'"
1285
msgstr "不能枚举新建文件 '%s' 的状态"
1286 1287 1288 1289

#: builtin/apply.c:3519
#, c-format
msgid "unable to create backing store for newly created file %s"
1290
msgstr "不能为新建文件 %s 创建后端存储"
1291 1292

#: builtin/apply.c:3522
1293
#, c-format
1294
msgid "unable to add cache entry for %s"
1295
msgstr "无法为 %s 添加缓存条目"
1296 1297

#: builtin/apply.c:3555
1298
#, c-format
1299
msgid "closing file '%s'"
1300
msgstr "关闭文件 '%s'"
1301 1302

#: builtin/apply.c:3604
1303
#, c-format
1304
msgid "unable to write file '%s' mode %o"
1305
msgstr "不能写文件 '%s' 权限 %o"
1306 1307 1308 1309

#: builtin/apply.c:3660
#, c-format
msgid "Applied patch %s cleanly."
1310
msgstr "成功应用补丁 %s。"
1311 1312 1313

#: builtin/apply.c:3668
msgid "internal error"
1314
msgstr "内部错误"
1315 1316 1317 1318 1319 1320

#. Say this even without --verbose
#: builtin/apply.c:3671
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
1321
msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1322
msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1323 1324 1325 1326

#: builtin/apply.c:3681
#, c-format
msgid "truncating .rej filename to %.*s.rej"
1327
msgstr "截短 .rej 文件名为 %.*s.rej"
1328 1329 1330 1331

#: builtin/apply.c:3702
#, c-format
msgid "Hunk #%d applied cleanly."
1332
msgstr "第 #%d 个片段成功应用。"
1333 1334 1335 1336

#: builtin/apply.c:3705
#, c-format
msgid "Rejected hunk #%d."
1337
msgstr "拒绝第 #%d 个片段。"
1338 1339 1340

#: builtin/apply.c:3836
msgid "unrecognized input"
1341
msgstr "未能识别的输入"
1342 1343 1344

#: builtin/apply.c:3847
msgid "unable to read index file"
1345
msgstr "无法读取索引文件"
1346 1347 1348

#: builtin/apply.c:3962 builtin/apply.c:3965
msgid "path"
1349
msgstr "路径"
1350 1351 1352

#: builtin/apply.c:3963
msgid "don't apply changes matching the given path"
1353
msgstr "不要应用与给出路径向匹配的变更"
1354 1355 1356

#: builtin/apply.c:3966
msgid "apply changes matching the given path"
1357
msgstr "应用与给出路径向匹配的变更"
1358 1359 1360

#: builtin/apply.c:3968
msgid "num"
1361
msgstr "数字"
1362 1363 1364

#: builtin/apply.c:3969
msgid "remove <num> leading slashes from traditional diff paths"
1365
msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1366 1367 1368

#: builtin/apply.c:3972
msgid "ignore additions made by the patch"
1369
msgstr "忽略补丁中的添加的文件"
1370 1371 1372

#: builtin/apply.c:3974
msgid "instead of applying the patch, output diffstat for the input"
1373
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1374 1375 1376

#: builtin/apply.c:3978
msgid "shows number of added and deleted lines in decimal notation"
1377
msgstr "以数字方式显示添加或删除行的数量"
1378 1379 1380

#: builtin/apply.c:3980
msgid "instead of applying the patch, output a summary for the input"
1381
msgstr "不应用补丁,而是显示输入的概要"
1382 1383 1384

#: builtin/apply.c:3982
msgid "instead of applying the patch, see if the patch is applicable"
1385
msgstr "不应用补丁,而是查看补丁是否可应用"
1386 1387 1388

#: builtin/apply.c:3984
msgid "make sure the patch is applicable to the current index"
1389
msgstr "确认补丁可以应用到当前索引"
1390 1391 1392

#: builtin/apply.c:3986
msgid "apply a patch without touching the working tree"
1393
msgstr "应用补丁而不修改工作区"
1394 1395 1396

#: builtin/apply.c:3988
msgid "also apply the patch (use with --stat/--summary/--check)"
1397
msgstr "同时应用此补丁(和 --stat/--summary/--check 共用)"
1398 1399 1400

#: builtin/apply.c:3990
msgid "build a temporary index based on embedded index information"
1401
msgstr "创建一个临时索引基于嵌入的索引信息"
1402 1403 1404

#: builtin/apply.c:3992
msgid "paths are separated with NUL character"
1405
msgstr "路径以 NUL 字符分隔"
1406 1407 1408

#: builtin/apply.c:3995
msgid "ensure at least <n> lines of context match"
1409
msgstr "确保至少匹配 <n> 行上下文"
1410 1411 1412

#: builtin/apply.c:3996
msgid "action"
1413
msgstr "动作"
1414 1415 1416

#: builtin/apply.c:3997
msgid "detect new or modified lines that have whitespace errors"
1417
msgstr "检查新增和修改的行中间的空白字符滥用"
1418 1419 1420

#: builtin/apply.c:4000 builtin/apply.c:4003
msgid "ignore changes in whitespace when finding context"
1421
msgstr "查找上下文时忽略空白字符的变更"
1422 1423 1424

#: builtin/apply.c:4006
msgid "apply the patch in reverse"
1425
msgstr "反向应用补丁"
1426 1427 1428

#: builtin/apply.c:4008
msgid "don't expect at least one line of context"
1429
msgstr "无需至少一行上下文"
1430 1431 1432

#: builtin/apply.c:4010
msgid "leave the rejected hunks in corresponding *.rej files"
1433
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1434 1435 1436

#: builtin/apply.c:4012
msgid "allow overlapping hunks"
1437
msgstr "允许重叠的补丁片段"
1438 1439 1440

#: builtin/apply.c:4013
msgid "be verbose"
1441
msgstr "冗长输出"
J
Jiang Xin 已提交
1442

1443 1444
#: builtin/apply.c:4015
msgid "tolerate incorrectly detected missing new-line at the end of file"
1445
msgstr "宽容不正确的文件末尾换行符"
J
Jiang Xin 已提交
1446

1447 1448
#: builtin/apply.c:4018
msgid "do not trust the line counts in the hunk headers"
1449
msgstr "不信任补丁片段的头信息中的行号"
J
Jiang Xin 已提交
1450

1451 1452
#: builtin/apply.c:4020
msgid "root"
1453
msgstr "根目录"
J
Jiang Xin 已提交
1454

1455 1456
#: builtin/apply.c:4021
msgid "prepend <root> to all filenames"
1457
msgstr "为所有文件名前添加 <根目录>"
J
Jiang Xin 已提交
1458

1459 1460
#: builtin/apply.c:4042
msgid "--index outside a repository"
1461
msgstr "--index 在一个版本库之外"
J
Jiang Xin 已提交
1462

1463 1464
#: builtin/apply.c:4045
msgid "--cached outside a repository"
1465
msgstr "--cached 在一个版本库之外"
J
Jiang Xin 已提交
1466

1467
#: builtin/apply.c:4061
1468
#, c-format
1469
msgid "can't open patch '%s'"
1470
msgstr "不能打开补丁 '%s'"
J
Jiang Xin 已提交
1471

1472
#: builtin/apply.c:4075
J
Jiang Xin 已提交
1473
#, c-format
1474 1475
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
1476
msgstr[0] "抑制下仍有 %d 个空白字符误用"
1477
msgstr[1] "抑制下仍有 %d 个空白字符误用"
J
Jiang Xin 已提交
1478

1479 1480 1481 1482
#: builtin/apply.c:4081 builtin/apply.c:4091
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
1483
msgstr[0] "%d 行有空白字符误用。"
1484
msgstr[1] "%d 行有空白字符误用。"
J
Jiang Xin 已提交
1485 1486 1487 1488

#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
1489
msgstr "不能创建归档文件 '%s'"
J
Jiang Xin 已提交
1490 1491 1492

#: builtin/archive.c:20
msgid "could not redirect output"
1493
msgstr "不能输出重定向"
J
Jiang Xin 已提交
1494 1495 1496

#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
1497
msgstr "git archive:未提供远程URL"
J
Jiang Xin 已提交
1498 1499 1500

#: builtin/archive.c:58
msgid "git archive: expected ACK/NAK, got EOF"
1501
msgstr "git archive:期待ACK/NACK,却得到EOF"
J
Jiang Xin 已提交
1502 1503 1504 1505

#: builtin/archive.c:63
#, c-format
msgid "git archive: NACK %s"
1506
msgstr "git archive:NACK %s"
J
Jiang Xin 已提交
1507 1508 1509 1510 1511 1512 1513 1514

#: builtin/archive.c:65
#, c-format
msgid "remote error: %s"
msgstr "远程错误:%s"

#: builtin/archive.c:66
msgid "git archive: protocol error"
1515
msgstr "git archive:协议错误"
J
Jiang Xin 已提交
1516 1517 1518

#: builtin/archive.c:71
msgid "git archive: expected a flush"
1519
msgstr "git archive:预期一个刷新"
J
Jiang Xin 已提交
1520

1521
#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1522
#: builtin/branch.c:144
J
Jiang Xin 已提交
1523 1524 1525 1526 1527
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"         '%s', but not yet merged to HEAD."
msgstr ""
1528
"将要删除的分支 '%s' 已经被合并到\n"
J
Jiang Xin 已提交
1529 1530
"         '%s',但未合并到 HEAD。"

1531
#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
1532
#: builtin/branch.c:148
J
Jiang Xin 已提交
1533 1534 1535 1536 1537
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"         '%s', even though it is merged to HEAD."
msgstr ""
1538 1539
"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
"         然而却尚未被合并到分支 '%s' 。"
J
Jiang Xin 已提交
1540

1541
#: builtin/branch.c:180
J
Jiang Xin 已提交
1542 1543 1544
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 共用"

1545
#: builtin/branch.c:186
J
Jiang Xin 已提交
1546 1547 1548
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"

1549
#: builtin/branch.c:191
J
Jiang Xin 已提交
1550 1551 1552 1553
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "无法删除您当前所在的分支 '%s'。"

1554
#: builtin/branch.c:202
1555
#, c-format
1556
msgid "remote branch '%s' not found."
1557
msgstr "远程分支 '%s' 未发现。"
J
Jiang Xin 已提交
1558

1559
#: builtin/branch.c:203
1560
#, c-format
1561
msgid "branch '%s' not found."
1562
msgstr "分支 '%s' 未发现。"
1563 1564

#: builtin/branch.c:210
J
Jiang Xin 已提交
1565 1566 1567 1568
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"

1569
#: builtin/branch.c:216
J
Jiang Xin 已提交
1570 1571 1572 1573 1574 1575 1576 1577
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它,执行 'git branch -D %s'。"

1578
#: builtin/branch.c:225
1579
#, c-format
1580
msgid "Error deleting remote branch '%s'"
1581
msgstr "删除远程分支 '%s' 时出错"
J
Jiang Xin 已提交
1582

1583
#: builtin/branch.c:226
1584
#, c-format
1585
msgid "Error deleting branch '%s'"
1586
msgstr "删除分支 '%s' 时出错"
1587 1588

#: builtin/branch.c:233
1589
#, c-format
1590
msgid "Deleted remote branch %s (was %s).\n"
1591
msgstr "已删除远程分支 %s(曾为 %s)。\n"
J
Jiang Xin 已提交
1592

1593
#: builtin/branch.c:234
1594
#, c-format
1595
msgid "Deleted branch %s (was %s).\n"
1596
msgstr "已删除分支 %s(曾为 %s)。\n"
1597 1598

#: builtin/branch.c:239
J
Jiang Xin 已提交
1599 1600 1601
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"

1602
#: builtin/branch.c:337
J
Jiang Xin 已提交
1603 1604 1605 1606
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "分支 '%s' 未指向一个提交"

1607
#: builtin/branch.c:409
1608
#, c-format
1609
msgid "[%s: behind %d]"
1610
msgstr "[%s:落后 %d]"
J
Jiang Xin 已提交
1611

1612
#: builtin/branch.c:411
1613
#, c-format
1614
msgid "[behind %d]"
1615
msgstr "[落后 %d]"
1616 1617

#: builtin/branch.c:415
1618
#, c-format
1619
msgid "[%s: ahead %d]"
1620
msgstr "[%s:领先 %d]"
J
Jiang Xin 已提交
1621

1622
#: builtin/branch.c:417
1623
#, c-format
1624
msgid "[ahead %d]"
1625
msgstr "[领先 %d]"
1626 1627

#: builtin/branch.c:420
1628
#, c-format
1629
msgid "[%s: ahead %d, behind %d]"
1630
msgstr "[%s:领先 %d,落后 %d]"
1631 1632

#: builtin/branch.c:423
1633
#, c-format
1634
msgid "[ahead %d, behind %d]"
1635
msgstr "[领先 %d,落后 %d]"
J
Jiang Xin 已提交
1636

1637
#: builtin/branch.c:535
J
Jiang Xin 已提交
1638 1639 1640
msgid "(no branch)"
msgstr "(非分支)"

1641
#: builtin/branch.c:600
J
Jiang Xin 已提交
1642
msgid "some refs could not be read"
1643
msgstr "一些引用不能读取"
J
Jiang Xin 已提交
1644

1645
#: builtin/branch.c:613
J
Jiang Xin 已提交
1646
msgid "cannot rename the current branch while not on any."
1647
msgstr "无法重命名当前分支因为不处于任何分支上。"
J
Jiang Xin 已提交
1648

1649
#: builtin/branch.c:623
J
Jiang Xin 已提交
1650 1651 1652 1653
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名:'%s'"

1654
#: builtin/branch.c:638
J
Jiang Xin 已提交
1655 1656 1657
msgid "Branch rename failed"
msgstr "分支重命名失败"

1658
#: builtin/branch.c:642
J
Jiang Xin 已提交
1659 1660 1661 1662
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "重命名掉一个错误命名的旧分支 '%s'"

1663
#: builtin/branch.c:646
J
Jiang Xin 已提交
1664 1665 1666 1667
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s,但 HEAD 没有更新!"

1668
#: builtin/branch.c:653
J
Jiang Xin 已提交
1669 1670 1671
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名,但更新 config 文件失败"

1672
#: builtin/branch.c:668
J
Jiang Xin 已提交
1673 1674 1675 1676
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"

1677
#: builtin/branch.c:692
1678
#, c-format
1679
msgid "could not write branch description template: %s"
1680
msgstr "不能写分支描述模版:%s"
J
Jiang Xin 已提交
1681

1682
#: builtin/branch.c:783
J
Jiang Xin 已提交
1683 1684 1685
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"

1686
#: builtin/branch.c:788 builtin/clone.c:558
J
Jiang Xin 已提交
1687
msgid "HEAD not found below refs/heads!"
1688
msgstr "HEAD 没有位于 /refs/heads 之下!"
J
Jiang Xin 已提交
1689

1690 1691
#: builtin/branch.c:808
msgid "--column and --verbose are incompatible"
1692
msgstr "--column 和 --verbose 不兼容"
1693 1694

#: builtin/branch.c:857
J
Jiang Xin 已提交
1695 1696 1697 1698 1699 1700 1701 1702 1703 1704
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

#: builtin/bundle.c:47
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"

#: builtin/bundle.c:56
msgid "Need a repository to create a bundle."
1705
msgstr "需要一个版本库来创建包。"
J
Jiang Xin 已提交
1706 1707 1708

#: builtin/bundle.c:60
msgid "Need a repository to unbundle."
1709
msgstr "需要一个版本库来解包。"
J
Jiang Xin 已提交
1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733

#: builtin/checkout.c:113 builtin/checkout.c:146
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"

#: builtin/checkout.c:115 builtin/checkout.c:148
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"

#: builtin/checkout.c:131
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"

#: builtin/checkout.c:175
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"

#: builtin/checkout.c:192
#, c-format
msgid "path '%s': cannot merge"
1734
msgstr "path '%s':无法合并"
J
Jiang Xin 已提交
1735 1736 1737 1738 1739 1740 1741 1742

#: builtin/checkout.c:209
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"

#: builtin/checkout.c:234 builtin/checkout.c:392
msgid "corrupt index file"
1743
msgstr "损坏的索引文件"
J
Jiang Xin 已提交
1744 1745 1746 1747 1748 1749

#: builtin/checkout.c:264 builtin/checkout.c:271
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"

1750
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1751
#: builtin/merge.c:812
J
Jiang Xin 已提交
1752
msgid "unable to write new index file"
1753
msgstr "无法写新的索引文件"
J
Jiang Xin 已提交
1754

1755
#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
J
Jiang Xin 已提交
1756 1757 1758 1759 1760
msgid "diff_setup_done failed"
msgstr "diff_setup_done 失败"

#: builtin/checkout.c:414
msgid "you need to resolve your current index first"
1761
msgstr "您需要先解决当前索引的冲突"
J
Jiang Xin 已提交
1762 1763 1764 1765

#: builtin/checkout.c:533
#, c-format
msgid "Can not do reflog for '%s'\n"
1766
msgstr "不能对 '%s' 执行 reflog 操作\n"
J
Jiang Xin 已提交
1767

1768
#: builtin/checkout.c:566
J
Jiang Xin 已提交
1769 1770 1771
msgid "HEAD is now at"
msgstr "HEAD 目前位于"

1772
#: builtin/checkout.c:573
J
Jiang Xin 已提交
1773 1774 1775 1776
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"

1777
#: builtin/checkout.c:576
J
Jiang Xin 已提交
1778 1779 1780 1781
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"

1782
#: builtin/checkout.c:580
J
Jiang Xin 已提交
1783 1784 1785 1786
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"

1787
#: builtin/checkout.c:582
J
Jiang Xin 已提交
1788 1789 1790 1791
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"

1792
#: builtin/checkout.c:584
J
Jiang Xin 已提交
1793 1794 1795 1796
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"

1797
#  译者:注意保持前导空格
1798
#: builtin/checkout.c:640
J
Jiang Xin 已提交
1799 1800
#, c-format
msgid " ... and %d more.\n"
1801
msgstr " ... 及其它 %d 个。\n"
J
Jiang Xin 已提交
1802 1803

#. The singular version
1804
#: builtin/checkout.c:646
J
Jiang Xin 已提交
1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgid_plural ""
"Warning: you are leaving %d commits behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgstr[0] ""
"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
"\n"
"%s\n"
1820 1821 1822 1823
msgstr[1] ""
"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
"\n"
"%s\n"
J
Jiang Xin 已提交
1824

1825
#: builtin/checkout.c:664
J
Jiang Xin 已提交
1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch new_branch_name %s\n"
"\n"
msgstr ""
"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
"如下操作:\n"
"\n"
" git branch new_branch_name %s\n"
"\n"

1840
#: builtin/checkout.c:694
J
Jiang Xin 已提交
1841 1842 1843
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"

1844
#: builtin/checkout.c:698
J
Jiang Xin 已提交
1845 1846 1847
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"

1848
#: builtin/checkout.c:724
J
Jiang Xin 已提交
1849
msgid "You are on a branch yet to be born"
1850
msgstr "您位于一个尚未初始化的分支"
J
Jiang Xin 已提交
1851 1852

#. case (1)
1853
#: builtin/checkout.c:855
J
Jiang Xin 已提交
1854 1855 1856 1857 1858
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"

#. case (1): want a tree
1859
#: builtin/checkout.c:894
J
Jiang Xin 已提交
1860 1861 1862 1863
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树:%s"

1864
#: builtin/checkout.c:974
J
Jiang Xin 已提交
1865 1866 1867
msgid "-B cannot be used with -b"
msgstr "-B 不能和 -b 共用"

1868
#: builtin/checkout.c:983
J
Jiang Xin 已提交
1869 1870 1871
msgid "--patch is incompatible with all other options"
msgstr "--patch 选项和其他选项不兼容"

1872
#: builtin/checkout.c:986
J
Jiang Xin 已提交
1873 1874 1875
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr "--detach 不能和 -b/-B/--orphan 共用"

1876
#: builtin/checkout.c:988
J
Jiang Xin 已提交
1877 1878 1879
msgid "--detach cannot be used with -t"
msgstr "--detach 不能和 -t 共用"

1880
#: builtin/checkout.c:994
J
Jiang Xin 已提交
1881 1882 1883
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"

1884
#: builtin/checkout.c:1001
J
Jiang Xin 已提交
1885 1886 1887
msgid "Missing branch name; try -b"
msgstr "缺少分支名;尝试 -b"

1888
#: builtin/checkout.c:1007
J
Jiang Xin 已提交
1889 1890 1891
msgid "--orphan and -b|-B are mutually exclusive"
msgstr "--orphan 和 -b|-B 互斥"

1892
#: builtin/checkout.c:1009
J
Jiang Xin 已提交
1893 1894 1895
msgid "--orphan cannot be used with -t"
msgstr "--orphan 不能和 -t 共用"

1896
#: builtin/checkout.c:1019
J
Jiang Xin 已提交
1897
msgid "git checkout: -f and -m are incompatible"
1898
msgstr "git checkout:-f 和 -m 不兼容"
J
Jiang Xin 已提交
1899

1900
#: builtin/checkout.c:1053
J
Jiang Xin 已提交
1901
msgid "invalid path specification"
1902
msgstr "无效的路径规格"
J
Jiang Xin 已提交
1903

1904
#: builtin/checkout.c:1061
J
Jiang Xin 已提交
1905 1906 1907 1908 1909
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
1910
"git checkout:更新路径和切换分支不兼容。\n"
J
Jiang Xin 已提交
1911 1912
"您是想要检出 '%s' 但未能将其解析为提交么?"

1913
#: builtin/checkout.c:1063
J
Jiang Xin 已提交
1914
msgid "git checkout: updating paths is incompatible with switching branches."
1915
msgstr "git checkout:更新路径和切换分支不兼容。"
J
Jiang Xin 已提交
1916

1917
#: builtin/checkout.c:1068
J
Jiang Xin 已提交
1918
msgid "git checkout: --detach does not take a path argument"
1919
msgstr "git checkout:--detach 不跟路径参数"
J
Jiang Xin 已提交
1920

1921
#: builtin/checkout.c:1071
J
Jiang Xin 已提交
1922 1923 1924 1925
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
1926
"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
J
Jiang Xin 已提交
1927

1928
#: builtin/checkout.c:1090
J
Jiang Xin 已提交
1929 1930 1931
msgid "Cannot switch branch to a non-commit."
msgstr "无法切换分支到一个非提交。"

1932
#: builtin/checkout.c:1093
J
Jiang Xin 已提交
1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943
msgid "--ours/--theirs is incompatible with switching branches."
msgstr "--ours/--theirs 和切换分支不兼容。"

#: builtin/clean.c:78
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能共用"

#: builtin/clean.c:82
msgid ""
"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
msgstr ""
1944
"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
J
Jiang Xin 已提交
1945 1946 1947 1948 1949 1950

#: builtin/clean.c:85
msgid ""
"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
"clean"
msgstr ""
1951
"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
J
Jiang Xin 已提交
1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977

#: builtin/clean.c:155 builtin/clean.c:176
#, c-format
msgid "Would remove %s\n"
msgstr "将删除 %s\n"

#: builtin/clean.c:159 builtin/clean.c:179
#, c-format
msgid "Removing %s\n"
msgstr "正删除 %s\n"

#: builtin/clean.c:162 builtin/clean.c:182
#, c-format
msgid "failed to remove %s"
msgstr "无法删除 %s"

#: builtin/clean.c:166
#, c-format
msgid "Would not remove %s\n"
msgstr "不会删除 %s\n"

#: builtin/clean.c:168
#, c-format
msgid "Not removing %s\n"
msgstr "未删除 %s\n"

1978
#: builtin/clone.c:243
J
Jiang Xin 已提交
1979 1980 1981 1982
#, c-format
msgid "reference repository '%s' is not a local directory."
msgstr "引用版本库 '%s' 不是一个本地目录。"

1983
#: builtin/clone.c:302
J
Jiang Xin 已提交
1984 1985
#, c-format
msgid "failed to open '%s'"
1986
msgstr "无法打开 '%s'"
J
Jiang Xin 已提交
1987

1988
#: builtin/clone.c:306
J
Jiang Xin 已提交
1989 1990
#, c-format
msgid "failed to create directory '%s'"
1991
msgstr "无法创建目录 '%s'"
J
Jiang Xin 已提交
1992

1993
#: builtin/clone.c:308 builtin/diff.c:75
J
Jiang Xin 已提交
1994 1995
#, c-format
msgid "failed to stat '%s'"
1996
msgstr "无法枚举 '%s' 状态"
J
Jiang Xin 已提交
1997

1998
#: builtin/clone.c:310
J
Jiang Xin 已提交
1999 2000 2001 2002
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"

2003
#: builtin/clone.c:324
J
Jiang Xin 已提交
2004 2005
#, c-format
msgid "failed to stat %s\n"
2006
msgstr "无法枚举 %s 状态\n"
J
Jiang Xin 已提交
2007

2008
#: builtin/clone.c:341
J
Jiang Xin 已提交
2009 2010
#, c-format
msgid "failed to unlink '%s'"
2011
msgstr "无法删除 '%s'"
J
Jiang Xin 已提交
2012

2013
#: builtin/clone.c:346
J
Jiang Xin 已提交
2014 2015
#, c-format
msgid "failed to create link '%s'"
2016
msgstr "无法创建链接 '%s'"
J
Jiang Xin 已提交
2017

2018
#: builtin/clone.c:350
J
Jiang Xin 已提交
2019 2020
#, c-format
msgid "failed to copy file to '%s'"
2021
msgstr "无法拷贝文件至 '%s'"
J
Jiang Xin 已提交
2022

2023
#: builtin/clone.c:373
J
Jiang Xin 已提交
2024 2025 2026 2027
#, c-format
msgid "done.\n"
msgstr "完成。\n"

2028
#: builtin/clone.c:440
J
Jiang Xin 已提交
2029 2030
#, c-format
msgid "Could not find remote branch %s to clone."
2031
msgstr "不能发现要克隆的远程分支 %s。"
J
Jiang Xin 已提交
2032

2033
#: builtin/clone.c:549
J
Jiang Xin 已提交
2034 2035 2036
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"

2037
#: builtin/clone.c:639
J
Jiang Xin 已提交
2038 2039 2040
msgid "Too many arguments."
msgstr "太多参数。"

2041
#: builtin/clone.c:643
J
Jiang Xin 已提交
2042
msgid "You must specify a repository to clone."
2043
msgstr "您必须指定一个版本库来克隆。"
J
Jiang Xin 已提交
2044

2045
#: builtin/clone.c:654
J
Jiang Xin 已提交
2046 2047 2048 2049
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"

2050
#: builtin/clone.c:668
J
Jiang Xin 已提交
2051 2052 2053 2054
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本库 '%s' 不存在"

2055
#: builtin/clone.c:673
J
Jiang Xin 已提交
2056 2057 2058
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"

2059
#: builtin/clone.c:683
J
Jiang Xin 已提交
2060 2061
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
2062
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
J
Jiang Xin 已提交
2063

2064
#: builtin/clone.c:693
J
Jiang Xin 已提交
2065 2066 2067 2068
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"

2069
#: builtin/clone.c:706 builtin/clone.c:720
J
Jiang Xin 已提交
2070 2071
#, c-format
msgid "could not create leading directories of '%s'"
2072
msgstr "不能为 '%s' 创建先导目录"
J
Jiang Xin 已提交
2073

2074
#: builtin/clone.c:709
J
Jiang Xin 已提交
2075 2076
#, c-format
msgid "could not create work tree dir '%s'."
2077
msgstr "不能为 '%s' 创建工作区目录。"
J
Jiang Xin 已提交
2078

2079
#: builtin/clone.c:728
J
Jiang Xin 已提交
2080 2081 2082 2083
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到裸版本库 '%s'...\n"

2084
#: builtin/clone.c:730
J
Jiang Xin 已提交
2085 2086 2087 2088
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"

2089
#: builtin/clone.c:786
J
Jiang Xin 已提交
2090 2091 2092 2093
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"

2094
#: builtin/clone.c:835
J
Jiang Xin 已提交
2095 2096 2097 2098
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"

2099
#: builtin/clone.c:842
J
Jiang Xin 已提交
2100 2101 2102
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空版本库。"

2103 2104
#: builtin/column.c:51
msgid "--command must be the first argument"
2105
msgstr "--command 必须是第一个参数"
2106 2107

#: builtin/commit.c:43
J
Jiang Xin 已提交
2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n"
"\n"
"    git config --global user.name \"Your Name\"\n"
"    git config --global user.email you@example.com\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
"    git commit --amend --reset-author\n"
msgstr ""
2120 2121
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
J
Jiang Xin 已提交
2122 2123 2124 2125
"\n"
"    git config --global user.name \"Your Name\"\n"
"    git config --global user.email you@example.com\n"
"\n"
2126
"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
J
Jiang Xin 已提交
2127 2128 2129
"\n"
"    git commit --amend --reset-author\n"

2130
#: builtin/commit.c:55
J
Jiang Xin 已提交
2131 2132 2133 2134 2135
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
2136 2137
"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
J
Jiang Xin 已提交
2138

2139
#: builtin/commit.c:60
J
Jiang Xin 已提交
2140 2141 2142 2143 2144 2145 2146 2147
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
"    git commit --allow-empty\n"
"\n"
"Otherwise, please use 'git reset'\n"
msgstr ""
2148 2149
"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
"也要提交,使用命令:\n"
J
Jiang Xin 已提交
2150 2151 2152
"\n"
"    git commit --allow-empty\n"
"\n"
2153
"否则,请使用命令 'git reset'\n"
J
Jiang Xin 已提交
2154

2155
#: builtin/commit.c:253
J
Jiang Xin 已提交
2156
msgid "failed to unpack HEAD tree object"
2157
msgstr "无法解包 HEAD 树对象"
J
Jiang Xin 已提交
2158

2159
#: builtin/commit.c:295
J
Jiang Xin 已提交
2160
msgid "unable to create temporary index"
2161
msgstr "不能创建临时索引"
J
Jiang Xin 已提交
2162

2163
#: builtin/commit.c:301
J
Jiang Xin 已提交
2164 2165 2166
msgid "interactive add failed"
msgstr "交互式添加失败"

2167
#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
J
Jiang Xin 已提交
2168
msgid "unable to write new_index file"
2169
msgstr "无法写 new_index 文件"
J
Jiang Xin 已提交
2170

2171 2172
#: builtin/commit.c:386
msgid "cannot do a partial commit during a merge."
2173
msgstr "在合并过程中不能做部分提交。"
J
Jiang Xin 已提交
2174

2175 2176
#: builtin/commit.c:388
msgid "cannot do a partial commit during a cherry-pick."
2177
msgstr "在拣选过程中不能做部分提交。"
2178 2179

#: builtin/commit.c:398
J
Jiang Xin 已提交
2180
msgid "cannot read the index"
2181
msgstr "无法读取索引"
J
Jiang Xin 已提交
2182

2183
#: builtin/commit.c:418
J
Jiang Xin 已提交
2184
msgid "unable to write temporary index file"
2185
msgstr "无法写临时索引文件"
J
Jiang Xin 已提交
2186

2187
#: builtin/commit.c:493 builtin/commit.c:499
J
Jiang Xin 已提交
2188 2189 2190 2191
#, c-format
msgid "invalid commit: %s"
msgstr "无效的提交:%s"

2192
#: builtin/commit.c:522
J
Jiang Xin 已提交
2193 2194 2195
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"

2196
#: builtin/commit.c:583
J
Jiang Xin 已提交
2197 2198
#, c-format
msgid "Malformed ident string: '%s'"
2199
msgstr "非法的身份字符串:'%s'"
J
Jiang Xin 已提交
2200

2201
#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
J
Jiang Xin 已提交
2202 2203 2204 2205
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"

2206
#: builtin/commit.c:633 builtin/shortlog.c:296
J
Jiang Xin 已提交
2207 2208
#, c-format
msgid "(reading log message from standard input)\n"
2209
msgstr "(正从标准输入中读取日志信息)\n"
J
Jiang Xin 已提交
2210

2211
#: builtin/commit.c:635
J
Jiang Xin 已提交
2212
msgid "could not read log from standard input"
2213
msgstr "不能从标准输入中读取日志信息"
J
Jiang Xin 已提交
2214

2215
#: builtin/commit.c:639
J
Jiang Xin 已提交
2216 2217
#, c-format
msgid "could not read log file '%s'"
2218
msgstr "不能读取日志文件 '%s'"
J
Jiang Xin 已提交
2219

2220
#: builtin/commit.c:645
J
Jiang Xin 已提交
2221 2222 2223
msgid "commit has empty message"
msgstr "提交说明为空"

2224
#: builtin/commit.c:661
J
Jiang Xin 已提交
2225
msgid "could not read MERGE_MSG"
2226
msgstr "不能读取 MERGE_MSG"
J
Jiang Xin 已提交
2227

2228
#: builtin/commit.c:665
J
Jiang Xin 已提交
2229
msgid "could not read SQUASH_MSG"
2230
msgstr "不能读取 SQUASH_MSG"
J
Jiang Xin 已提交
2231

2232
#: builtin/commit.c:669
J
Jiang Xin 已提交
2233 2234
#, c-format
msgid "could not read '%s'"
2235
msgstr "不能读取 '%s'"
J
Jiang Xin 已提交
2236

2237
#: builtin/commit.c:721
J
Jiang Xin 已提交
2238
msgid "could not write commit template"
2239
msgstr "不能写提交模版"
J
Jiang Xin 已提交
2240

2241
#: builtin/commit.c:732
2242
#, c-format
J
Jiang Xin 已提交
2243 2244
msgid ""
"\n"
2245
"It looks like you may be committing a merge.\n"
J
Jiang Xin 已提交
2246 2247 2248 2249 2250
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
"\n"
2251
"看起来您正在做一个合并提交。如果不对,请删除文件\n"
J
Jiang Xin 已提交
2252 2253 2254
"\t%s\n"
"然后重试。\n"

2255
#: builtin/commit.c:737
2256
#, c-format
2257 2258 2259 2260 2261 2262 2263 2264
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
"\n"
2265
"看起来您正在做一个拣选提交。如果不对,请删除文件\n"
2266 2267
"\t%s\n"
"然后重试。\n"
J
Jiang Xin 已提交
2268

2269
#: builtin/commit.c:749
J
Jiang Xin 已提交
2270
msgid ""
2271
"Please enter the commit message for your changes. Lines starting\n"
J
Jiang Xin 已提交
2272 2273
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
2274 2275
"请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
"说明将会终止提交。\n"
J
Jiang Xin 已提交
2276

2277
#: builtin/commit.c:754
J
Jiang Xin 已提交
2278
msgid ""
2279
"Please enter the commit message for your changes. Lines starting\n"
J
Jiang Xin 已提交
2280 2281 2282
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
2283 2284
"请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
"如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
J
Jiang Xin 已提交
2285

2286
#  译者:为保证在输出中对齐,注意调整句中空格!
2287
#: builtin/commit.c:767
J
Jiang Xin 已提交
2288 2289 2290 2291
#, c-format
msgid "%sAuthor:    %s"
msgstr "%s作者:     %s"

2292
#  译者:为保证在输出中对齐,注意调整句中空格!
2293
#: builtin/commit.c:774
J
Jiang Xin 已提交
2294 2295 2296 2297
#, c-format
msgid "%sCommitter: %s"
msgstr "%s提交者:   %s"

2298
#: builtin/commit.c:794
J
Jiang Xin 已提交
2299
msgid "Cannot read index"
2300
msgstr "无法读取索引"
J
Jiang Xin 已提交
2301

2302
#: builtin/commit.c:831
J
Jiang Xin 已提交
2303 2304 2305
msgid "Error building trees"
msgstr "无法创建树对象"

2306
#: builtin/commit.c:846 builtin/tag.c:361
J
Jiang Xin 已提交
2307 2308
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
2309
msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
J
Jiang Xin 已提交
2310

2311
#: builtin/commit.c:943
J
Jiang Xin 已提交
2312 2313 2314 2315
#, c-format
msgid "No existing author found with '%s'"
msgstr "没有找到匹配 '%s' 的作者"

2316
#: builtin/commit.c:958 builtin/commit.c:1158
J
Jiang Xin 已提交
2317 2318
#, c-format
msgid "Invalid untracked files mode '%s'"
2319
msgstr "无效的未追踪文件参数 '%s'"
J
Jiang Xin 已提交
2320

2321
#: builtin/commit.c:998
J
Jiang Xin 已提交
2322 2323 2324
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"

2325
#: builtin/commit.c:1009
J
Jiang Xin 已提交
2326
msgid "You have nothing to amend."
2327
msgstr "您没有可修补的提交。"
J
Jiang Xin 已提交
2328

2329 2330
#: builtin/commit.c:1012
msgid "You are in the middle of a merge -- cannot amend."
2331
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2332 2333 2334

#: builtin/commit.c:1014
msgid "You are in the middle of a cherry-pick -- cannot amend."
2335
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
J
Jiang Xin 已提交
2336

2337
#: builtin/commit.c:1017
J
Jiang Xin 已提交
2338 2339 2340
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能共用"

2341
#: builtin/commit.c:1027
J
Jiang Xin 已提交
2342 2343 2344
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

2345
#: builtin/commit.c:1029
J
Jiang Xin 已提交
2346 2347 2348
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"

2349
#: builtin/commit.c:1037
J
Jiang Xin 已提交
2350
msgid "--reset-author can be used only with -C, -c or --amend."
2351
msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
J
Jiang Xin 已提交
2352

2353
#: builtin/commit.c:1054
J
Jiang Xin 已提交
2354 2355 2356
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

2357
#: builtin/commit.c:1056
J
Jiang Xin 已提交
2358 2359 2360
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"

2361
#: builtin/commit.c:1058
J
Jiang Xin 已提交
2362
msgid "Clever... amending the last one with dirty index."
2363
msgstr "聪明... 在索引不干净下修补最后的提交。"
J
Jiang Xin 已提交
2364

2365
#: builtin/commit.c:1060
J
Jiang Xin 已提交
2366
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2367
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
J
Jiang Xin 已提交
2368

2369
#: builtin/commit.c:1070 builtin/tag.c:577
J
Jiang Xin 已提交
2370 2371 2372 2373
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"

2374
#: builtin/commit.c:1075
J
Jiang Xin 已提交
2375 2376 2377
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项共用没有意义。"

2378
#: builtin/commit.c:1258
J
Jiang Xin 已提交
2379 2380 2381
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"

2382
#: builtin/commit.c:1260
J
Jiang Xin 已提交
2383
msgid "could not parse newly created commit"
2384
msgstr "不能解析新创建的提交"
J
Jiang Xin 已提交
2385

2386
#: builtin/commit.c:1301
J
Jiang Xin 已提交
2387 2388 2389
msgid "detached HEAD"
msgstr "分离头指针"

2390
#  译者:中文字符串拼接,可删除前导空格
2391
#: builtin/commit.c:1303
J
Jiang Xin 已提交
2392
msgid " (root-commit)"
2393
msgstr "(根提交)"
J
Jiang Xin 已提交
2394

2395
#: builtin/commit.c:1447
J
Jiang Xin 已提交
2396
msgid "could not parse HEAD commit"
2397
msgstr "不能解析 HEAD 提交"
J
Jiang Xin 已提交
2398

2399
#: builtin/commit.c:1485 builtin/merge.c:509
J
Jiang Xin 已提交
2400 2401
#, c-format
msgid "could not open '%s' for reading"
2402
msgstr "不能为读入打开 '%s'"
J
Jiang Xin 已提交
2403

2404
#: builtin/commit.c:1492
J
Jiang Xin 已提交
2405 2406
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
2407
msgstr "损坏的 MERGE_HEAD 文件(%s)"
J
Jiang Xin 已提交
2408

2409
#: builtin/commit.c:1499
J
Jiang Xin 已提交
2410
msgid "could not read MERGE_MODE"
2411
msgstr "不能读取 MERGE_MODE"
J
Jiang Xin 已提交
2412

2413
#: builtin/commit.c:1518
J
Jiang Xin 已提交
2414 2415
#, c-format
msgid "could not read commit message: %s"
2416
msgstr "不能读取提交说明:%s"
J
Jiang Xin 已提交
2417

2418
#: builtin/commit.c:1532
2419 2420 2421 2422
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交;您未更改来自模版的提交说明。\n"

2423
#: builtin/commit.c:1537
J
Jiang Xin 已提交
2424 2425 2426 2427
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"

2428
#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
J
Jiang Xin 已提交
2429
msgid "failed to write commit object"
2430
msgstr "无法写提交对象"
J
Jiang Xin 已提交
2431

2432
#: builtin/commit.c:1573
J
Jiang Xin 已提交
2433 2434 2435
msgid "cannot lock HEAD ref"
msgstr "无法锁定 HEAD 引用"

2436
#: builtin/commit.c:1577
J
Jiang Xin 已提交
2437 2438 2439
msgid "cannot update HEAD ref"
msgstr "无法更新 HEAD 引用"

2440
#: builtin/commit.c:1588
J
Jiang Xin 已提交
2441 2442 2443 2444 2445
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
2446 2447
"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
J
Jiang Xin 已提交
2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461

#: builtin/describe.c:234
#, c-format
msgid "annotated tag %s not available"
msgstr "注释 tag %s 无效"

#: builtin/describe.c:238
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "注释 tag %s 没有嵌入名称"

#: builtin/describe.c:240
#, c-format
msgid "tag '%s' is really '%s' here"
2462
msgstr "tag '%s' 的确是在 '%s'"
J
Jiang Xin 已提交
2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504

#: builtin/describe.c:267
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"

#: builtin/describe.c:270
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"

#: builtin/describe.c:287
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有 tag 准确匹配 '%s'"

#: builtin/describe.c:289
#, c-format
msgid "searching to describe %s\n"
msgstr "搜索描述 %s\n"

#: builtin/describe.c:329
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"

#: builtin/describe.c:353
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
"没有注释 tag 能描述 '%s'。\n"
"然而,有非注释 tag:尝试 --tags。"

#: builtin/describe.c:357
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
"没有注释 tag 能描述 '%s'。\n"
2505
"尝试 --always,或者创建一些 tag。"
J
Jiang Xin 已提交
2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517

#: builtin/describe.c:378
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"

#: builtin/describe.c:381
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
2518 2519
"发现多于 %i 个 tag,列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
J
Jiang Xin 已提交
2520 2521 2522 2523 2524 2525 2526

#: builtin/describe.c:436
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"

#: builtin/describe.c:462
msgid "No names found, cannot describe anything."
2527
msgstr "没有发现名称,无法描述任何东西。"
J
Jiang Xin 已提交
2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542

#: builtin/describe.c:482
msgid "--dirty is incompatible with committishes"
msgstr "--dirty 不能与提交共用"

#: builtin/diff.c:77
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s':不是一个正规文件或符号链接"

#: builtin/diff.c:220
#, c-format
msgid "invalid option: %s"
msgstr "无效选项:%s"

2543
#: builtin/diff.c:297
J
Jiang Xin 已提交
2544 2545 2546
msgid "Not a git repository"
msgstr "不是一个 git 版本库"

2547
#: builtin/diff.c:347
J
Jiang Xin 已提交
2548 2549 2550 2551
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"

2552
#: builtin/diff.c:352
J
Jiang Xin 已提交
2553 2554 2555 2556
#, c-format
msgid "more than %d trees given: '%s'"
msgstr "提供了超过 %d 个树对象:'%s'"

2557
#: builtin/diff.c:362
J
Jiang Xin 已提交
2558 2559 2560 2561
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个 blob 对象:'%s'"

2562
#: builtin/diff.c:370
J
Jiang Xin 已提交
2563 2564 2565 2566 2567 2568 2569 2570
#, c-format
msgid "unhandled object '%s' given."
msgstr "提供了无法处理的对象 '%s'。"

#: builtin/fetch.c:200
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"

2571
#: builtin/fetch.c:253
J
Jiang Xin 已提交
2572 2573 2574 2575
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"

2576
#: builtin/fetch.c:259
J
Jiang Xin 已提交
2577 2578 2579
msgid "[up to date]"
msgstr "[最新]"

2580
#: builtin/fetch.c:273
J
Jiang Xin 已提交
2581 2582 2583 2584
#, c-format
msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"

2585
#: builtin/fetch.c:274 builtin/fetch.c:360
J
Jiang Xin 已提交
2586 2587 2588
msgid "[rejected]"
msgstr "[已拒绝]"

2589
#: builtin/fetch.c:285
J
Jiang Xin 已提交
2590 2591 2592
msgid "[tag update]"
msgstr "[tag更新]"

2593
#  译者:注意保持前导空格
2594
#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
J
Jiang Xin 已提交
2595 2596 2597
msgid "  (unable to update local ref)"
msgstr "  (不能更新本地引用)"

2598
#: builtin/fetch.c:305
J
Jiang Xin 已提交
2599 2600 2601
msgid "[new tag]"
msgstr "[新tag]"

2602
#: builtin/fetch.c:308
J
Jiang Xin 已提交
2603 2604 2605
msgid "[new branch]"
msgstr "[新分支]"

2606 2607 2608 2609 2610
#: builtin/fetch.c:311
msgid "[new ref]"
msgstr "[新引用]"

#: builtin/fetch.c:356
J
Jiang Xin 已提交
2611 2612 2613
msgid "unable to update local ref"
msgstr "不能更新本地引用"

2614
#: builtin/fetch.c:356
J
Jiang Xin 已提交
2615 2616 2617
msgid "forced update"
msgstr "强制更新"

2618
#: builtin/fetch.c:362
J
Jiang Xin 已提交
2619
msgid "(non-fast-forward)"
2620
msgstr "(非快进式)"
J
Jiang Xin 已提交
2621

2622
#: builtin/fetch.c:393 builtin/fetch.c:685
J
Jiang Xin 已提交
2623 2624 2625 2626
#, c-format
msgid "cannot open %s: %s\n"
msgstr "无法打开 %s:%s\n"

2627
#: builtin/fetch.c:402
J
Jiang Xin 已提交
2628 2629 2630 2631
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"

2632
#: builtin/fetch.c:488
J
Jiang Xin 已提交
2633 2634 2635 2636
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"

2637
#: builtin/fetch.c:499
J
Jiang Xin 已提交
2638 2639 2640 2641 2642 2643 2644 2645
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
"一些本地引用不能被更新;尝试运行\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"

2646
#  译者:注意保持前导空格
2647
#: builtin/fetch.c:549
2648
#, c-format
2649
msgid "   (%s will become dangling)"
2650
msgstr "   (%s 将成为悬空状态)"
J
Jiang Xin 已提交
2651

2652
#  译者:注意保持前导空格
2653
#: builtin/fetch.c:550
2654
#, c-format
2655
msgid "   (%s has become dangling)"
2656
msgstr "   (%s 已成为悬空状态)"
J
Jiang Xin 已提交
2657

2658
#: builtin/fetch.c:557
J
Jiang Xin 已提交
2659 2660 2661
msgid "[deleted]"
msgstr "[已删除]"

2662
#: builtin/fetch.c:558 builtin/remote.c:1055
J
Jiang Xin 已提交
2663 2664 2665
msgid "(none)"
msgstr "(无)"

2666
#: builtin/fetch.c:675
J
Jiang Xin 已提交
2667 2668 2669 2670
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非裸版本库的当前分支 %s"

2671
#: builtin/fetch.c:709
J
Jiang Xin 已提交
2672 2673 2674 2675
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "不知道如何从 %s 获取"

2676
#: builtin/fetch.c:786
J
Jiang Xin 已提交
2677 2678 2679 2680
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

2681
#: builtin/fetch.c:789
J
Jiang Xin 已提交
2682 2683
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
2684
msgstr "选项 \"%s\" 为 %s 所忽略\n"
J
Jiang Xin 已提交
2685

2686
#: builtin/fetch.c:888
J
Jiang Xin 已提交
2687 2688
#, c-format
msgid "Fetching %s\n"
2689
msgstr "正在获取 %s\n"
J
Jiang Xin 已提交
2690

2691
#: builtin/fetch.c:890 builtin/remote.c:100
J
Jiang Xin 已提交
2692 2693 2694 2695
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"

2696
#: builtin/fetch.c:907
J
Jiang Xin 已提交
2697 2698 2699
msgid ""
"No remote repository specified.  Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
2700
msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
J
Jiang Xin 已提交
2701

2702
#: builtin/fetch.c:927
J
Jiang Xin 已提交
2703
msgid "You need to specify a tag name."
2704
msgstr "您需要指定一个 tag 名称。"
J
Jiang Xin 已提交
2705

2706
#: builtin/fetch.c:979
J
Jiang Xin 已提交
2707 2708 2709
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个版本库参数"

2710
#: builtin/fetch.c:981
J
Jiang Xin 已提交
2711 2712 2713
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用表达式没有任何意义"

2714
#: builtin/fetch.c:992
J
Jiang Xin 已提交
2715 2716 2717 2718
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s"

2719
#: builtin/fetch.c:1000
J
Jiang Xin 已提交
2720
msgid "Fetching a group and specifying refspecs does not make sense"
2721
msgstr "获取组并指定引用表达式没有意义"
J
Jiang Xin 已提交
2722 2723 2724 2725 2726 2727

#: builtin/gc.c:63
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效的 %s:'%s'"

2728
#: builtin/gc.c:90
J
Jiang Xin 已提交
2729 2730 2731 2732
#, c-format
msgid "insanely long object directory %.*s"
msgstr "不正常的长对象目录 %.*s"

2733
#: builtin/gc.c:221
J
Jiang Xin 已提交
2734 2735 2736 2737
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包版本库以求最佳性能。\n"

2738
#: builtin/gc.c:224
J
Jiang Xin 已提交
2739 2740 2741 2742 2743
#, c-format
msgid ""
"Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr ""
2744 2745
"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
"参见 \"git help gc\" 以获取更多信息。\n"
J
Jiang Xin 已提交
2746

2747
#: builtin/gc.c:251
J
Jiang Xin 已提交
2748 2749
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
2750
msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
J
Jiang Xin 已提交
2751

2752
#: builtin/grep.c:216
J
Jiang Xin 已提交
2753 2754
#, c-format
msgid "grep: failed to create thread: %s"
2755
msgstr "grep:无法创建线程:%s"
J
Jiang Xin 已提交
2756

2757
#: builtin/grep.c:402
J
Jiang Xin 已提交
2758 2759 2760 2761
#, c-format
msgid "Failed to chdir: %s"
msgstr "无法切换目录:%s"

2762
#: builtin/grep.c:478 builtin/grep.c:512
J
Jiang Xin 已提交
2763 2764
#, c-format
msgid "unable to read tree (%s)"
2765
msgstr "无法读取树(%s)"
J
Jiang Xin 已提交
2766

2767
#: builtin/grep.c:526
J
Jiang Xin 已提交
2768 2769 2770 2771
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"

2772
#: builtin/grep.c:584
J
Jiang Xin 已提交
2773 2774 2775 2776
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"

2777
#: builtin/grep.c:601
J
Jiang Xin 已提交
2778 2779 2780 2781
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"

2782
#: builtin/grep.c:888
J
Jiang Xin 已提交
2783 2784 2785
msgid "no pattern given."
msgstr "未提供模式匹配。"

2786
#: builtin/grep.c:902
J
Jiang Xin 已提交
2787 2788 2789 2790
#, c-format
msgid "bad object %s"
msgstr "坏对象 %s"

2791
#: builtin/grep.c:943
J
Jiang Xin 已提交
2792 2793 2794
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"

2795
#: builtin/grep.c:966
J
Jiang Xin 已提交
2796
msgid "--cached or --untracked cannot be used with --no-index."
2797
msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
J
Jiang Xin 已提交
2798

2799
#: builtin/grep.c:971
J
Jiang Xin 已提交
2800 2801 2802
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked 不能和版本共用。"

2803
#: builtin/grep.c:974
J
Jiang Xin 已提交
2804
msgid "--[no-]exclude-standard cannot be used for tracked contents."
2805
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
J
Jiang Xin 已提交
2806

2807
#: builtin/grep.c:982
J
Jiang Xin 已提交
2808 2809 2810
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"

2811
#: builtin/help.c:59
2812
#, c-format
2813
msgid "unrecognized help format '%s'"
2814
msgstr "未能识别的帮助格式 '%s'"
2815 2816 2817

#: builtin/help.c:87
msgid "Failed to start emacsclient."
2818
msgstr "无法启动 emacsclient。"
2819 2820 2821

#: builtin/help.c:100
msgid "Failed to parse emacsclient version."
2822
msgstr "无法解析 emacsclient 版本。"
2823 2824 2825 2826

#: builtin/help.c:108
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
2827
msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2828 2829

#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2830
#, c-format
2831
msgid "failed to exec '%s': %s"
2832
msgstr "无法执行 '%s':%s"
2833 2834 2835 2836 2837 2838 2839

#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
2840 2841
"'%s':不支持的 man 手册查看器的路径。\n"
"请使用 'man.<tool>.cmd'。"
2842 2843 2844 2845 2846 2847 2848

#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
2849 2850
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<tool>.path'。"
2851 2852 2853

#: builtin/help.c:287
msgid "The most commonly used git commands are:"
2854
msgstr "最常用的 git 命令有:"
2855 2856 2857 2858

#: builtin/help.c:355
#, c-format
msgid "'%s': unknown man viewer."
2859
msgstr "'%s':未知的 man 查看器。"
2860 2861 2862

#: builtin/help.c:372
msgid "no man viewer handled the request"
2863
msgstr "没有 man 查看器处理此请求"
2864 2865 2866

#: builtin/help.c:380
msgid "no info viewer handled the request"
2867
msgstr "没有 info 查看器处理此请求"
2868 2869

#: builtin/help.c:391
2870
#, c-format
2871
msgid "'%s': not a documentation directory."
2872
msgstr "'%s':不是一个文档目录。"
2873 2874 2875 2876

#: builtin/help.c:432 builtin/help.c:439
#, c-format
msgid "usage: %s%s"
2877
msgstr "用法:%s%s"
2878 2879 2880 2881

#: builtin/help.c:453
#, c-format
msgid "`git %s' is aliased to `%s'"
2882
msgstr "`git %s' 是 `%s' 的别名"
2883 2884 2885 2886

#: builtin/index-pack.c:169
#, c-format
msgid "object type mismatch at %s"
2887
msgstr "%s 的对象类型不匹配"
2888 2889 2890

#: builtin/index-pack.c:189
msgid "object of unexpected type"
2891
msgstr "意外的类型的对象"
2892 2893

#: builtin/index-pack.c:226
2894
#, c-format
2895 2896
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
2897
msgstr[0] "无法填充 %d 字节"
2898
msgstr[1] "无法填充 %d 字节"
2899 2900 2901

#: builtin/index-pack.c:236
msgid "early EOF"
2902
msgstr "过早的文件结束符(EOF)"
2903 2904 2905

#: builtin/index-pack.c:237
msgid "read error on input"
2906
msgstr "输入上的读错误"
2907 2908 2909

#: builtin/index-pack.c:249
msgid "used more bytes than were available"
2910
msgstr "用掉了超过可用的字节"
2911 2912 2913

#: builtin/index-pack.c:256
msgid "pack too large for current definition of off_t"
2914
msgstr "包太大超过了当前 off_t 的定义"
2915 2916

#: builtin/index-pack.c:272
2917
#, c-format
2918
msgid "unable to create '%s'"
2919
msgstr "不能创建 '%s'"
2920 2921

#: builtin/index-pack.c:277
2922
#, c-format
2923
msgid "cannot open packfile '%s'"
2924
msgstr "无法打开包文件 '%s'"
2925 2926 2927

#: builtin/index-pack.c:291
msgid "pack signature mismatch"
2928
msgstr "包签名不匹配"
2929 2930 2931 2932

#: builtin/index-pack.c:311
#, c-format
msgid "pack has bad object at offset %lu: %s"
2933
msgstr "包中有错误的对象位于 %lu:%s"
2934 2935 2936 2937

#: builtin/index-pack.c:405
#, c-format
msgid "inflate returned %d"
2938
msgstr "解压缩返回 %d"
2939 2940 2941

#: builtin/index-pack.c:450
msgid "offset value overflow for delta base object"
2942
msgstr "偏移值覆盖了 delta 基准对象"
2943 2944 2945

#: builtin/index-pack.c:458
msgid "delta base offset is out of bound"
2946
msgstr "delta 基准偏移越界"
2947 2948

#: builtin/index-pack.c:466
2949
#, c-format
2950
msgid "unknown object type %d"
2951
msgstr "未知对象类型 %d"
2952 2953 2954

#: builtin/index-pack.c:495
msgid "cannot pread pack file"
2955
msgstr "无法读取包文件"
2956 2957 2958 2959 2960

#: builtin/index-pack.c:497
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
2961
msgstr[0] "包文件过早结束,缺少 %lu 字节"
2962
msgstr[1] "包文件过早结束,缺少 %lu 字节"
2963 2964 2965

#: builtin/index-pack.c:510
msgid "serious inflate inconsistency"
2966
msgstr "解压缩严重的不一致"
2967 2968

#: builtin/index-pack.c:583
2969
#, c-format
2970
msgid "cannot read existing object %s"
2971
msgstr "不能读取现存对象 %s"
2972 2973 2974 2975

#: builtin/index-pack.c:586
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
2976
msgstr "发现 %s 出现 SHA1 冲突!"
2977 2978

#: builtin/index-pack.c:598
2979
#, c-format
2980
msgid "invalid blob object %s"
2981
msgstr "无效的 blob 对象 %s"
2982 2983

#: builtin/index-pack.c:610
2984
#, c-format
2985
msgid "invalid %s"
2986
msgstr "无效的 %s"
2987 2988 2989

#: builtin/index-pack.c:612
msgid "Error in object"
2990
msgstr "对象中出错"
2991 2992 2993 2994

#: builtin/index-pack.c:614
#, c-format
msgid "Not all child objects of %s are reachable"
2995
msgstr "%s 的所有子对象并非都可达"
2996 2997 2998

#: builtin/index-pack.c:687 builtin/index-pack.c:713
msgid "failed to apply delta"
2999
msgstr "无法应用 delta"
3000 3001 3002

#: builtin/index-pack.c:850
msgid "Receiving objects"
3003
msgstr "接收对象中"
3004 3005 3006

#: builtin/index-pack.c:850
msgid "Indexing objects"
3007
msgstr "索引对象中"
3008 3009 3010

#: builtin/index-pack.c:872
msgid "pack is corrupted (SHA1 mismatch)"
3011
msgstr "包冲突(SHA1 不匹配)"
3012 3013 3014

#: builtin/index-pack.c:877
msgid "cannot fstat packfile"
3015
msgstr "不能枚举包文件状态"
3016 3017 3018

#: builtin/index-pack.c:880
msgid "pack has junk at the end"
3019
msgstr "包的结尾有垃圾数据"
3020 3021 3022

#: builtin/index-pack.c:903
msgid "Resolving deltas"
3023
msgstr "处理 delta 中"
3024 3025 3026

#: builtin/index-pack.c:954
msgid "confusion beyond insanity"
3027
msgstr "不可理喻"
3028 3029 3030 3031 3032

#: builtin/index-pack.c:973
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
3033
msgstr[0] "包有 %d 个未解决的 delta"
3034
msgstr[1] "包有 %d 个未解决的 delta"
3035 3036

#: builtin/index-pack.c:998
3037
#, c-format
3038
msgid "unable to deflate appended object (%d)"
3039
msgstr "不能缩小附加对象(%d)"
3040 3041 3042 3043

#: builtin/index-pack.c:1077
#, c-format
msgid "local object %s is corrupt"
3044
msgstr "本地对象 %s 已损坏"
3045 3046 3047

#: builtin/index-pack.c:1101
msgid "error while closing pack file"
3048
msgstr "关闭包文件时出错"
3049 3050

#: builtin/index-pack.c:1114
3051
#, c-format
3052
msgid "cannot write keep file '%s'"
3053
msgstr "无法写保留文件 '%s'"
3054 3055

#: builtin/index-pack.c:1122
3056
#, c-format
3057
msgid "cannot close written keep file '%s'"
3058
msgstr "无法关闭保留文件 '%s'"
3059 3060 3061

#: builtin/index-pack.c:1135
msgid "cannot store pack file"
3062
msgstr "无法存储包文件"
3063 3064 3065

#: builtin/index-pack.c:1146
msgid "cannot store index file"
3066
msgstr "无法存储索引文件"
3067 3068

#: builtin/index-pack.c:1247
3069
#, c-format
3070
msgid "Cannot open existing pack file '%s'"
3071
msgstr "无法打开现存包文件 '%s'"
3072 3073

#: builtin/index-pack.c:1249
3074
#, c-format
3075
msgid "Cannot open existing pack idx file for '%s'"
3076
msgstr "无法为 %s 打开包索引文件"
3077 3078

#: builtin/index-pack.c:1296
3079
#, c-format
3080 3081
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
3082
msgstr[0] "非 delta:%d 个对象"
3083
msgstr[1] "非 delta:%d 个对象"
3084 3085 3086 3087 3088

#: builtin/index-pack.c:1303
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
3089
msgstr[0] "链长 = %d: %lu 对象"
3090
msgstr[1] "链长 = %d: %lu 对象"
3091 3092 3093

#: builtin/index-pack.c:1330
msgid "Cannot come back to cwd"
3094
msgstr "无法返回当前工作目录"
3095 3096 3097

#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3098
#, c-format
3099
msgid "bad %s"
3100
msgstr "错误选项 %s"
3101 3102 3103

#: builtin/index-pack.c:1407
msgid "--fix-thin cannot be used without --stdin"
3104
msgstr "--fix-thin 不能和 --stdin 共用"
3105 3106 3107 3108

#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
3109
msgstr "包名 '%s' 没有以 '.pack' 结尾"
3110 3111 3112

#: builtin/index-pack.c:1430
msgid "--verify with no packfile name given"
3113
msgstr "--verify 没有提供包名参数"
3114

J
Jiang Xin 已提交
3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152
#: builtin/init-db.c:35
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"

#: builtin/init-db.c:62
#, c-format
msgid "insanely long template name %s"
msgstr "太长的模版名 %s"

#: builtin/init-db.c:67
#, c-format
msgid "cannot stat '%s'"
msgstr "不能枚举 '%s' 状态"

#: builtin/init-db.c:73
#, c-format
msgid "cannot stat template '%s'"
msgstr "不能枚举模版 '%s' 状态"

#: builtin/init-db.c:80
#, c-format
msgid "cannot opendir '%s'"
msgstr "不能打开目录 '%s'"

#: builtin/init-db.c:97
#, c-format
msgid "cannot readlink '%s'"
msgstr "不能读取链接 '%s'"

#: builtin/init-db.c:99
#, c-format
msgid "insanely long symlink %s"
msgstr "太长的符号链接 %s"

#: builtin/init-db.c:102
#, c-format
msgid "cannot symlink '%s' '%s'"
3153
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
J
Jiang Xin 已提交
3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177

#: builtin/init-db.c:106
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"

#: builtin/init-db.c:110
#, c-format
msgid "ignoring template %s"
msgstr "忽略模版 %s"

#: builtin/init-db.c:133
#, c-format
msgid "insanely long template path %s"
msgstr "太长的模版路径 %s"

#: builtin/init-db.c:141
#, c-format
msgid "templates not found %s"
msgstr "模版未找到 %s"

#: builtin/init-db.c:154
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
3178
msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
J
Jiang Xin 已提交
3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222

#: builtin/init-db.c:192
#, c-format
msgid "insane git directory %s"
msgstr "不正常的 git 目录 %s"

#: builtin/init-db.c:322 builtin/init-db.c:325
#, c-format
msgid "%s already exists"
msgstr "%s 已经存在"

#: builtin/init-db.c:354
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"

#: builtin/init-db.c:357
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"

#: builtin/init-db.c:362
#, c-format
msgid "Could not create git link %s"
msgstr "不能创建 git link %s"

#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
#. * "", and the last '%s%s' is the verbatim directory name.
#.
#: builtin/init-db.c:419
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git 版本库于 %s%s\n"

#: builtin/init-db.c:420
msgid "Reinitialized existing"
msgstr "重新初始化现存的"

#: builtin/init-db.c:420
msgid "Initialized empty"
msgstr "初始化空的"

3223
#  译者:中文字符串拼接,可删除前导空格
J
Jiang Xin 已提交
3224 3225
#: builtin/init-db.c:421
msgid " shared"
3226
msgstr "共享"
J
Jiang Xin 已提交
3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247

#: builtin/init-db.c:440
msgid "cannot tell cwd"
msgstr "无法获知当前路径"

#: builtin/init-db.c:521 builtin/init-db.c:528
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"

#: builtin/init-db.c:532
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"

#: builtin/init-db.c:554
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
3248 3249
"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
"dir=<directory>)"
J
Jiang Xin 已提交
3250 3251 3252 3253 3254 3255 3256 3257 3258 3259

#: builtin/init-db.c:578
msgid "Cannot access current working directory"
msgstr "不能访问当前工作目录"

#: builtin/init-db.c:585
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"

3260
#: builtin/log.c:188
J
Jiang Xin 已提交
3261 3262 3263 3264
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出:%d %s\n"

3265
#: builtin/log.c:401 builtin/log.c:489
J
Jiang Xin 已提交
3266 3267
#, c-format
msgid "Could not read object %s"
3268
msgstr "不能读取对象 %s"
J
Jiang Xin 已提交
3269

3270
#: builtin/log.c:513
J
Jiang Xin 已提交
3271 3272 3273 3274
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型:%d"

3275
#: builtin/log.c:602
J
Jiang Xin 已提交
3276 3277 3278
msgid "format.headers without value"
msgstr "format.headers 没有值"

3279
#: builtin/log.c:675
J
Jiang Xin 已提交
3280 3281 3282
msgid "name of output directory is too long"
msgstr "输出目录名太长"

3283
#: builtin/log.c:686
J
Jiang Xin 已提交
3284 3285 3286 3287
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"

3288
#: builtin/log.c:700
J
Jiang Xin 已提交
3289 3290 3291
msgid "Need exactly one range."
msgstr "只需要一个范围。"

3292
#: builtin/log.c:708
J
Jiang Xin 已提交
3293 3294 3295
msgid "Not a range."
msgstr "不是一个范围。"

3296
#: builtin/log.c:745
J
Jiang Xin 已提交
3297
msgid "Could not extract email from committer identity."
3298
msgstr "不能从提交者身份中提取邮件地址。"
J
Jiang Xin 已提交
3299

3300
#: builtin/log.c:791
J
Jiang Xin 已提交
3301 3302 3303
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"

3304
#: builtin/log.c:885
J
Jiang Xin 已提交
3305 3306 3307 3308
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to:%s"

3309
#: builtin/log.c:958
J
Jiang Xin 已提交
3310 3311 3312
msgid "Two output directories?"
msgstr "两个输出目录?"

3313
#: builtin/log.c:1179
J
Jiang Xin 已提交
3314 3315 3316 3317
#, c-format
msgid "bogus committer info %s"
msgstr "虚假的提交者信息 %s"

3318
#: builtin/log.c:1224
J
Jiang Xin 已提交
3319 3320 3321
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"

3322
#: builtin/log.c:1226
J
Jiang Xin 已提交
3323 3324 3325
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"

3326
#: builtin/log.c:1234
J
Jiang Xin 已提交
3327 3328 3329
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"

3330
#: builtin/log.c:1236
J
Jiang Xin 已提交
3331 3332 3333
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"

3334
#: builtin/log.c:1238
J
Jiang Xin 已提交
3335 3336 3337
msgid "--check does not make sense"
msgstr "--check 无意义"

3338
#: builtin/log.c:1261
J
Jiang Xin 已提交
3339 3340 3341
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录,哪一个?"

3342
#: builtin/log.c:1263
J
Jiang Xin 已提交
3343 3344
#, c-format
msgid "Could not create directory '%s'"
3345
msgstr "不能创建目录 '%s'"
J
Jiang Xin 已提交
3346

3347
#: builtin/log.c:1416
J
Jiang Xin 已提交
3348 3349 3350
msgid "Failed to create output files"
msgstr "无法创建输出文件"

3351
#: builtin/log.c:1520
J
Jiang Xin 已提交
3352 3353 3354
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
3355
msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
J
Jiang Xin 已提交
3356

3357
#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
J
Jiang Xin 已提交
3358 3359 3360 3361
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"

3362
#: builtin/merge.c:90
J
Jiang Xin 已提交
3363 3364 3365
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"

3366
#: builtin/merge.c:127
J
Jiang Xin 已提交
3367 3368
#, c-format
msgid "Could not find merge strategy '%s'.\n"
3369
msgstr "不能找到合并策略 '%s'。\n"
J
Jiang Xin 已提交
3370

3371
#: builtin/merge.c:128
J
Jiang Xin 已提交
3372 3373 3374 3375
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有:"

3376
#: builtin/merge.c:133
J
Jiang Xin 已提交
3377 3378 3379 3380
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有:"

3381
#: builtin/merge.c:240
J
Jiang Xin 已提交
3382 3383 3384
msgid "could not run stash."
msgstr "不能进行进度保存。"

3385
#: builtin/merge.c:245
J
Jiang Xin 已提交
3386 3387 3388
msgid "stash failed"
msgstr "进度保存失败"

3389
#: builtin/merge.c:250
J
Jiang Xin 已提交
3390 3391 3392 3393
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象:%s"

3394
#: builtin/merge.c:269 builtin/merge.c:286
J
Jiang Xin 已提交
3395 3396 3397
msgid "read-tree failed"
msgstr "读取树失败"

3398
#  译者:注意保持前导空格
3399
#: builtin/merge.c:316
J
Jiang Xin 已提交
3400 3401 3402
msgid " (nothing to squash)"
msgstr " (无可压缩)"

3403
#: builtin/merge.c:329
J
Jiang Xin 已提交
3404 3405 3406 3407
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"

3408
#: builtin/merge.c:361
J
Jiang Xin 已提交
3409 3410 3411
msgid "Writing SQUASH_MSG"
msgstr "写入 SQUASH_MSG"

3412
#: builtin/merge.c:363
J
Jiang Xin 已提交
3413 3414 3415 3416 3417 3418 3419 3420
msgid "Finishing SQUASH_MSG"
msgstr "完成 SQUASH_MSG"

#: builtin/merge.c:386
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"

3421
#: builtin/merge.c:437
J
Jiang Xin 已提交
3422 3423 3424 3425
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"

3426
#: builtin/merge.c:536
J
Jiang Xin 已提交
3427 3428
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
3429
msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
J
Jiang Xin 已提交
3430

3431
#: builtin/merge.c:629
J
Jiang Xin 已提交
3432 3433 3434
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"

3435
#: builtin/merge.c:679
J
Jiang Xin 已提交
3436 3437 3438
msgid "failed to read the cache"
msgstr "无法读取缓存"

3439
#: builtin/merge.c:697
J
Jiang Xin 已提交
3440
msgid "Unable to write index."
3441
msgstr "不能写索引。"
J
Jiang Xin 已提交
3442

3443
#: builtin/merge.c:710
J
Jiang Xin 已提交
3444 3445 3446
msgid "Not handling anything other than two heads merge."
msgstr "不能处理两个头合并之外的任何操作。"

3447
#: builtin/merge.c:724
J
Jiang Xin 已提交
3448 3449 3450 3451
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项:-X%s"

3452
#: builtin/merge.c:738
J
Jiang Xin 已提交
3453 3454 3455 3456
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"

3457
#: builtin/merge.c:877
J
Jiang Xin 已提交
3458 3459 3460 3461
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"

3462
#: builtin/merge.c:886
J
Jiang Xin 已提交
3463 3464 3465 3466
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"

3467
#: builtin/merge.c:892
J
Jiang Xin 已提交
3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
"Lines starting with '#' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
"合并到主题分支。\n"
"\n"
"以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"

3480
#: builtin/merge.c:916
J
Jiang Xin 已提交
3481 3482 3483
msgid "Empty commit message."
msgstr "空提交信息。"

3484
#: builtin/merge.c:928
J
Jiang Xin 已提交
3485 3486 3487 3488
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"

3489
#: builtin/merge.c:993
J
Jiang Xin 已提交
3490 3491 3492 3493
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"

3494
#: builtin/merge.c:1009
J
Jiang Xin 已提交
3495 3496 3497 3498
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' 不是一个提交"

3499
#: builtin/merge.c:1050
J
Jiang Xin 已提交
3500
msgid "No current branch."
3501
msgstr "没有当前分支。"
J
Jiang Xin 已提交
3502

3503
#: builtin/merge.c:1052
J
Jiang Xin 已提交
3504
msgid "No remote for the current branch."
3505
msgstr "当前分支没有对应的远程版本库。"
J
Jiang Xin 已提交
3506

3507
#: builtin/merge.c:1054
J
Jiang Xin 已提交
3508
msgid "No default upstream defined for the current branch."
3509
msgstr "当前分支没有定义默认的上游分支。"
J
Jiang Xin 已提交
3510

3511
#: builtin/merge.c:1059
J
Jiang Xin 已提交
3512 3513 3514 3515
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr "%s 没有来自 %s 的远程跟踪分支"

3516 3517 3518 3519 3520 3521
#: builtin/merge.c:1146 builtin/merge.c:1303
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"

#: builtin/merge.c:1214
J
Jiang Xin 已提交
3522
msgid "There is no merge to abort (MERGE_HEAD missing)."
3523
msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
J
Jiang Xin 已提交
3524

3525
#: builtin/merge.c:1230 git-pull.sh:31
J
Jiang Xin 已提交
3526 3527 3528 3529 3530
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
3531
"请在合并前先提交您的修改。"
J
Jiang Xin 已提交
3532

3533
#: builtin/merge.c:1233 git-pull.sh:34
J
Jiang Xin 已提交
3534 3535 3536
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"

3537
#: builtin/merge.c:1237
J
Jiang Xin 已提交
3538 3539 3540 3541 3542
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
3543
"请在合并前先提交您的修改。"
J
Jiang Xin 已提交
3544

3545
#: builtin/merge.c:1240
J
Jiang Xin 已提交
3546 3547 3548
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"

3549
#: builtin/merge.c:1249
J
Jiang Xin 已提交
3550 3551 3552
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 共用。"

3553
#: builtin/merge.c:1254
J
Jiang Xin 已提交
3554 3555 3556
msgid "You cannot combine --no-ff with --ff-only."
msgstr "您不能将 --no-ff 与 --ff-only 共用。"

3557
#: builtin/merge.c:1261
J
Jiang Xin 已提交
3558
msgid "No commit specified and merge.defaultToUpstream not set."
3559
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
J
Jiang Xin 已提交
3560

3561
#: builtin/merge.c:1293
J
Jiang Xin 已提交
3562
msgid "Can merge only exactly one commit into empty head"
3563
msgstr "只能将一个提交合并到空分支上"
J
Jiang Xin 已提交
3564

3565
#: builtin/merge.c:1296
J
Jiang Xin 已提交
3566 3567 3568
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"

3569
#: builtin/merge.c:1298
J
Jiang Xin 已提交
3570 3571 3572
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"

3573
#: builtin/merge.c:1413
J
Jiang Xin 已提交
3574 3575 3576 3577
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"

3578
#: builtin/merge.c:1451
J
Jiang Xin 已提交
3579 3580
#, c-format
msgid "Trying really trivial in-index merge...\n"
3581
msgstr "尝试非常小的索引内合并...\n"
J
Jiang Xin 已提交
3582

3583
#: builtin/merge.c:1458
J
Jiang Xin 已提交
3584 3585 3586 3587
#, c-format
msgid "Nope.\n"
msgstr "无。\n"

3588
#: builtin/merge.c:1490
J
Jiang Xin 已提交
3589
msgid "Not possible to fast-forward, aborting."
3590
msgstr "无法快进,终止。"
J
Jiang Xin 已提交
3591

3592
#: builtin/merge.c:1513 builtin/merge.c:1592
J
Jiang Xin 已提交
3593 3594 3595 3596
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"

3597
#: builtin/merge.c:1517
J
Jiang Xin 已提交
3598 3599 3600 3601
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"

3602
#: builtin/merge.c:1583
J
Jiang Xin 已提交
3603 3604 3605 3606
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"

3607
#: builtin/merge.c:1585
J
Jiang Xin 已提交
3608 3609 3610 3611
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"

3612
#: builtin/merge.c:1594
J
Jiang Xin 已提交
3613 3614 3615 3616
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"

3617
#: builtin/merge.c:1606
J
Jiang Xin 已提交
3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利,按要求在提交前停止\n"

#: builtin/mv.c:108
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"

#: builtin/mv.c:112
msgid "bad source"
msgstr "坏的源"

#: builtin/mv.c:115
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"

#: builtin/mv.c:118
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"

#: builtin/mv.c:128
#, c-format
msgid "Huh? %.*s is in index?"
3642
msgstr "嗯?%.*s 在索引中?"
J
Jiang Xin 已提交
3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678

#: builtin/mv.c:140
msgid "source directory is empty"
msgstr "源目录为空"

#: builtin/mv.c:171
msgid "not under version control"
msgstr "不在版本控制之下"

#: builtin/mv.c:173
msgid "destination exists"
msgstr "目标已存在"

#: builtin/mv.c:181
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"

#: builtin/mv.c:184
msgid "Cannot overwrite"
msgstr "不能覆盖"

#: builtin/mv.c:187
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"

#: builtin/mv.c:202
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s,源=%s,目标=%s"

#: builtin/mv.c:212
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"

3679
#: builtin/mv.c:215 builtin/remote.c:731
J
Jiang Xin 已提交
3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"

#: builtin/notes.c:139
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "不能为对象 '%s' 开始 'show'"

#: builtin/notes.c:145
msgid "can't fdopen 'show' output fd"
msgstr "不能打开 'show' 输出文件句柄"

#: builtin/notes.c:155
#, c-format
msgid "failed to close pipe to 'show' for object '%s'"
msgstr "无法为对象 '%s' 的 'show' 关闭管道"

#: builtin/notes.c:158
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' 完成 'show'"

3703
#: builtin/notes.c:175 builtin/tag.c:347
J
Jiang Xin 已提交
3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"

#: builtin/notes.c:189
msgid "Please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解提供内容"

#: builtin/notes.c:210 builtin/notes.c:973
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"

#: builtin/notes.c:215
msgid "unable to write note object"
msgstr "不能写注解对象"

#: builtin/notes.c:217
#, c-format
msgid "The note contents has been left in %s"
msgstr "注解内容被留在文件 %s 中"

3726
#: builtin/notes.c:251 builtin/tag.c:542
J
Jiang Xin 已提交
3727 3728 3729 3730
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"

3731
#: builtin/notes.c:253 builtin/tag.c:545
J
Jiang Xin 已提交
3732 3733 3734 3735 3736 3737 3738
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"

#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3739
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
J
Jiang Xin 已提交
3740 3741
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
3742
msgstr "无法解析 '%s' 为一个有效引用。"
J
Jiang Xin 已提交
3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755

#: builtin/notes.c:275
#, c-format
msgid "Failed to read object '%s'."
msgstr "无法读取对象 '%s'。"

#: builtin/notes.c:299
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "不能提交未初始化/未引用的注解树"

#: builtin/notes.c:340
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
3756
msgstr "坏的 notes.rewriteMode 值:'%s'"
J
Jiang Xin 已提交
3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767

#: builtin/notes.c:350
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"

#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
#: builtin/notes.c:377
#, c-format
msgid "Bad %s value: '%s'"
3768
msgstr "坏的 %s 值:'%s'"
J
Jiang Xin 已提交
3769 3770 3771 3772 3773 3774 3775 3776 3777

#: builtin/notes.c:441
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行:'%s'。"

#: builtin/notes.c:456
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
3778
msgstr "无法从 '%s' 到 '%s' 拷贝注解"
J
Jiang Xin 已提交
3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824

#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
#: builtin/notes.c:1033
msgid "too many parameters"
msgstr "参数太多"

#: builtin/notes.c:513 builtin/notes.c:772
#, c-format
msgid "No note found for object %s."
msgstr "未发现对象 %s 的注解。"

#: builtin/notes.c:580
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

#: builtin/notes.c:585 builtin/notes.c:662
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"

#: builtin/notes.c:635
msgid "too few parameters"
msgstr "参数太少"

#: builtin/notes.c:656
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

#: builtin/notes.c:668
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"

#: builtin/notes.c:717
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
3825
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
J
Jiang Xin 已提交
3826 3827 3828 3829 3830 3831 3832
"请换用 'git notes add -f -m/-F/-c/-C'。\n"

#: builtin/notes.c:971
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"

3833
#: builtin/notes.c:1103 builtin/remote.c:1598
J
Jiang Xin 已提交
3834 3835 3836 3837
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令:%s"

3838
#: builtin/pack-objects.c:2315
3839 3840
#, c-format
msgid "unsupported index version %s"
3841
msgstr "不支持的索引版本 %s"
3842

3843
#: builtin/pack-objects.c:2319
3844 3845
#, c-format
msgid "bad index version '%s'"
3846
msgstr "坏的索引版本 '%s'"
3847

3848
#: builtin/pack-objects.c:2342
3849 3850
#, c-format
msgid "option %s does not accept negative form"
3851
msgstr "选项 %s 不接受否定格式"
3852

3853
#: builtin/pack-objects.c:2346
3854 3855
#, c-format
msgid "unable to parse value '%s' for option %s"
3856
msgstr "不能解析选项 %1$s 的值 '%2$s'"
3857

3858
#: builtin/push.c:45
J
Jiang Xin 已提交
3859 3860 3861
msgid "tag shorthand without <tag>"
msgstr "tag 简写没有跟 <tag> 参数"

3862
#: builtin/push.c:64
J
Jiang Xin 已提交
3863
msgid "--delete only accepts plain target ref names"
3864
msgstr "--delete 只接受简单的目标引用名"
J
Jiang Xin 已提交
3865

3866 3867 3868 3869 3870
#: builtin/push.c:99
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
3871 3872
"\n"
"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887

#: builtin/push.c:102
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"the name of your current branch.  To push to the upstream branch\n"
"on the remote, use\n"
"\n"
"    git push %s HEAD:%s\n"
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
"    git push %s %s\n"
"%s"
msgstr ""
3888 3889 3890 3891 3892 3893 3894 3895 3896
"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
"上游分支,使用\n"
"\n"
"    git push %s HEAD:%s\n"
"\n"
"为推送至远程同名分支,使用\n"
"\n"
"    git push %s %s\n"
"%s"
3897 3898

#: builtin/push.c:121
J
Jiang Xin 已提交
3899 3900 3901 3902 3903 3904 3905 3906 3907
#, c-format
msgid ""
"You are not currently on a branch.\n"
"To push the history leading to the current (detached HEAD)\n"
"state now, use\n"
"\n"
"    git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
"您当前不在一个分支上。\n"
3908
"现在为推送当前(分离头指针)的历史,使用\n"
J
Jiang Xin 已提交
3909 3910 3911
"\n"
"    git push %s HEAD:<name-of-remote-branch>\n"

3912
#: builtin/push.c:128
J
Jiang Xin 已提交
3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"To push the current branch and set the remote as upstream, use\n"
"\n"
"    git push --set-upstream %s %s\n"
msgstr ""
"当前分支 %s 没有对应的上游分支。\n"
"为推送当前分支并建立与远程上游的跟踪,使用\n"
"\n"
"    git push --set-upstream %s %s\n"

3925
#: builtin/push.c:136
J
Jiang Xin 已提交
3926 3927 3928 3929
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支,拒绝推送。"

3930
#: builtin/push.c:139
3931 3932 3933 3934 3935 3936 3937 3938 3939
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
"而没有告诉我要推送什么、更新哪个远程分支。"

3940
#: builtin/push.c:174
J
Jiang Xin 已提交
3941 3942
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
3943
msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
J
Jiang Xin 已提交
3944

3945
#: builtin/push.c:181
3946 3947 3948 3949 3950 3951
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
"before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
3952 3953 3954
"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
3955

3956
#: builtin/push.c:187
3957 3958 3959 3960 3961 3962
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
"specify branches to push or set the 'push.default' configuration\n"
"variable to 'current' or 'upstream' to push only the current branch."
msgstr ""
3963 3964
"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
3965
"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
3966

3967
#: builtin/push.c:193
3968 3969 3970 3971 3972 3973
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and merge the remote changes\n"
"(e.g. 'git pull') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
3974 3975 3976
"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
3977

3978
#: builtin/push.c:233
J
Jiang Xin 已提交
3979 3980 3981 3982
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"

3983
#: builtin/push.c:237
J
Jiang Xin 已提交
3984 3985 3986 3987
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "无法推送一些引用到 '%s'"

3988
#: builtin/push.c:269
J
Jiang Xin 已提交
3989 3990
#, c-format
msgid "bad repository '%s'"
3991
msgstr "坏的版本库 '%s'"
J
Jiang Xin 已提交
3992

3993
#: builtin/push.c:270
J
Jiang Xin 已提交
3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"repository using\n"
"\n"
"    git remote add <name> <url>\n"
"\n"
"and then push using the remote name\n"
"\n"
"    git push <name>\n"
msgstr ""
4005 4006
"没有配置推送目标。\n"
"或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
J
Jiang Xin 已提交
4007 4008 4009 4010 4011 4012 4013
"\n"
"    git remote add <name> <url>\n"
"\n"
"然后使用该远程版本库名执行推送\n"
"\n"
"    git push <name>\n"

4014
#: builtin/push.c:285
J
Jiang Xin 已提交
4015 4016 4017
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"

4018
#: builtin/push.c:286
J
Jiang Xin 已提交
4019 4020 4021
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用表达式共用"

4022
#: builtin/push.c:291
J
Jiang Xin 已提交
4023 4024 4025
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"

4026
#: builtin/push.c:292
J
Jiang Xin 已提交
4027 4028 4029
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用表达式共用"

4030
#: builtin/push.c:297
J
Jiang Xin 已提交
4031 4032 4033
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"

4034
#: builtin/push.c:385
J
Jiang Xin 已提交
4035 4036 4037
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

4038
#: builtin/push.c:387
J
Jiang Xin 已提交
4039 4040 4041
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"

4042
#: builtin/remote.c:98
4043
#, c-format
4044
msgid "Updating %s"
4045
msgstr "更新 %s 中"
4046 4047 4048 4049 4050 4051

#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
4052 4053
"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
"\t 或 --mirror=push"
4054 4055

#: builtin/remote.c:147
4056
#, c-format
4057
msgid "unknown mirror argument: %s"
4058
msgstr "未知的镜像参数:%s"
4059 4060 4061

#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
4062
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
4063 4064 4065

#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
4066
msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"
4067 4068

#: builtin/remote.c:195 builtin/remote.c:646
4069
#, c-format
4070
msgid "remote %s already exists."
4071
msgstr "远程 %s 已经存在。"
4072 4073

#: builtin/remote.c:199 builtin/remote.c:650
4074
#, c-format
4075
msgid "'%s' is not a valid remote name"
4076
msgstr "'%s' 不是一个有效的远程名称"
4077 4078

#: builtin/remote.c:243
4079
#, c-format
4080
msgid "Could not setup master '%s'"
4081
msgstr "无法设置 master '%s'"
4082 4083

#: builtin/remote.c:299
4084
#, c-format
4085
msgid "more than one %s"
4086
msgstr "多于一个 %s"
4087 4088

#: builtin/remote.c:339
4089
#, c-format
4090
msgid "Could not get fetch map for refspec %s"
4091
msgstr "无法得到引用表达式 %s 的获取列表"
4092 4093 4094

#: builtin/remote.c:440 builtin/remote.c:448
msgid "(matching)"
4095
msgstr "(匹配)"
4096 4097 4098

#: builtin/remote.c:452
msgid "(delete)"
4099
msgstr "(删除)"
4100 4101

#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4102
#, c-format
4103
msgid "Could not append '%s' to '%s'"
4104
msgstr "不能添加 '%s' 至 '%s'"
4105 4106

#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4107
#, c-format
4108
msgid "No such remote: %s"
4109
msgstr "没有这样的远程:%s"
4110 4111

#: builtin/remote.c:656
4112
#, c-format
4113
msgid "Could not rename config section '%s' to '%s'"
4114
msgstr "不能重命名配置小节 '%s' 到 '%s'"
4115 4116

#: builtin/remote.c:662 builtin/remote.c:799
4117
#, c-format
4118
msgid "Could not remove config section '%s'"
4119
msgstr "不能移除配置小节 '%s'"
4120 4121 4122 4123 4124 4125 4126 4127

#: builtin/remote.c:677
#, c-format
msgid ""
"Not updating non-default fetch respec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
4128 4129 4130
"没有更新非默认的获取引用表达式\n"
"\t%s\n"
"\t如果必要请手动更新配置。"
4131 4132

#: builtin/remote.c:683
4133
#, c-format
4134
msgid "Could not append '%s'"
4135
msgstr "不能追加 '%s'"
4136 4137

#: builtin/remote.c:694
4138
#, c-format
4139
msgid "Could not set '%s'"
4140
msgstr "不能设置 '%s'"
4141 4142

#: builtin/remote.c:716
4143
#, c-format
4144
msgid "deleting '%s' failed"
4145
msgstr "删除 '%s' 失败"
4146 4147

#: builtin/remote.c:750
4148
#, c-format
4149
msgid "creating '%s' failed"
4150
msgstr "创建 '%s' 失败"
4151 4152

#: builtin/remote.c:764
4153
#, c-format
4154
msgid "Could not remove branch %s"
4155
msgstr "无法移除分支 %s"
4156 4157 4158 4159 4160 4161 4162 4163

#: builtin/remote.c:834
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgid_plural ""
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
"to delete them, use:"
4164 4165
msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
4166 4167 4168 4169

#: builtin/remote.c:943
#, c-format
msgid " new (next fetch will store in remotes/%s)"
4170
msgstr " 新的(下一次获取将存储于 remotes/%s)"
4171 4172 4173

#: builtin/remote.c:946
msgid " tracked"
4174
msgstr " 已跟踪"
4175 4176 4177

#: builtin/remote.c:948
msgid " stale (use 'git remote prune' to remove)"
4178
msgstr " 过时(使用 'git remote prune' 来移除)"
4179 4180 4181

#: builtin/remote.c:950
msgid " ???"
4182
msgstr " ???"
4183 4184 4185 4186

#: builtin/remote.c:991
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4187
msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
4188 4189

#: builtin/remote.c:998
4190
#, c-format
4191
msgid "rebases onto remote %s"
4192
msgstr "变基到远程 %s"
4193 4194

#: builtin/remote.c:1001
4195
#, c-format
4196
msgid " merges with remote %s"
4197
msgstr " 与远程 %s 合并"
4198 4199 4200

#: builtin/remote.c:1002
msgid "    and with remote"
4201
msgstr "    且有远程"
4202 4203

#: builtin/remote.c:1004
4204
#, c-format
4205
msgid "merges with remote %s"
4206
msgstr "与远程 %s 合并"
4207 4208 4209

#: builtin/remote.c:1005
msgid "   and with remote"
4210
msgstr "   且有远程"
4211 4212 4213

#: builtin/remote.c:1051
msgid "create"
4214
msgstr "创建"
4215 4216 4217

#: builtin/remote.c:1054
msgid "delete"
4218
msgstr "删除"
4219 4220 4221

#: builtin/remote.c:1058
msgid "up to date"
4222
msgstr "最新"
4223 4224 4225

#: builtin/remote.c:1061
msgid "fast-forwardable"
4226
msgstr "可快进"
4227 4228 4229

#: builtin/remote.c:1064
msgid "local out of date"
4230
msgstr "本地已过时"
4231 4232 4233 4234

#: builtin/remote.c:1071
#, c-format
msgid "    %-*s forces to %-*s (%s)"
4235
msgstr "    %-*s 强制推送至 %-*s (%s)"
4236 4237 4238 4239

#: builtin/remote.c:1074
#, c-format
msgid "    %-*s pushes to %-*s (%s)"
4240
msgstr "    %-*s 推送至 %-*s (%s)"
4241 4242 4243 4244

#: builtin/remote.c:1078
#, c-format
msgid "    %-*s forces to %s"
4245
msgstr "    %-*s 强制推送至 %s"
4246 4247 4248 4249

#: builtin/remote.c:1081
#, c-format
msgid "    %-*s pushes to %s"
4250
msgstr "    %-*s 推送至 %s"
4251 4252

#: builtin/remote.c:1118
4253
#, c-format
4254
msgid "* remote %s"
4255
msgstr "* 远程 %s"
4256 4257 4258 4259

#: builtin/remote.c:1119
#, c-format
msgid "  Fetch URL: %s"
4260
msgstr "  获取地址:%s"
4261 4262 4263

#: builtin/remote.c:1120 builtin/remote.c:1285
msgid "(no URL)"
4264
msgstr "(无 URL)"
4265 4266 4267 4268

#: builtin/remote.c:1129 builtin/remote.c:1131
#, c-format
msgid "  Push  URL: %s"
4269
msgstr "  推送地址:%s"
4270 4271

#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4272
#, c-format
4273
msgid "  HEAD branch: %s"
4274
msgstr "  HEAD分支:%s"
4275 4276 4277 4278 4279

#: builtin/remote.c:1139
#, c-format
msgid ""
"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4280
msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
4281 4282

#: builtin/remote.c:1151
4283
#, c-format
4284 4285
msgid "  Remote branch:%s"
msgid_plural "  Remote branches:%s"
4286
msgstr[0] "  远程分支:%s"
4287
msgstr[1] "  远程分支:%s"
4288

4289
#  译者:中文字符串拼接,可删除前导空格
4290 4291
#: builtin/remote.c:1154 builtin/remote.c:1181
msgid " (status not queried)"
4292
msgstr "(状态未查询)"
4293 4294 4295 4296

#: builtin/remote.c:1163
msgid "  Local branch configured for 'git pull':"
msgid_plural "  Local branches configured for 'git pull':"
4297
msgstr[0] "  为 'git pull' 配置的本地分支:"
4298
msgstr[1] "  为 'git pull' 配置的本地分支:"
4299 4300 4301

#: builtin/remote.c:1171
msgid "  Local refs will be mirrored by 'git push'"
4302
msgstr "  本地引用将在 'git push' 时被镜像"
4303 4304

#: builtin/remote.c:1178
4305
#, c-format
4306 4307
msgid "  Local ref configured for 'git push'%s:"
msgid_plural "  Local refs configured for 'git push'%s:"
4308
msgstr[0] "  为 'git push' 配置的本地引用%s:"
4309
msgstr[1] "  为 'git push' 配置的本地引用%s:"
4310 4311 4312

#: builtin/remote.c:1216
msgid "Cannot determine remote HEAD"
4313
msgstr "无法确定远程 HEAD"
4314 4315 4316

#: builtin/remote.c:1218
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4317
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
4318 4319

#: builtin/remote.c:1228
4320
#, c-format
4321
msgid "Could not delete %s"
4322
msgstr "无法删除 %s"
4323 4324

#: builtin/remote.c:1236
4325
#, c-format
4326
msgid "Not a valid ref: %s"
4327
msgstr "不是一个有效引用:%s"
4328 4329

#: builtin/remote.c:1238
4330
#, c-format
4331
msgid "Could not setup %s"
4332
msgstr "不能设置 %s"
4333 4334 4335

#  译者:注意保持前导空格
#: builtin/remote.c:1274
4336
#, c-format
4337
msgid " %s will become dangling!"
4338
msgstr " %s 将成为悬空状态!"
4339 4340 4341

#  译者:注意保持前导空格
#: builtin/remote.c:1275
4342
#, c-format
4343
msgid " %s has become dangling!"
4344
msgstr " %s 已成为悬空状态!"
4345 4346

#: builtin/remote.c:1281
4347
#, c-format
4348
msgid "Pruning %s"
4349
msgstr "修剪 %s"
4350 4351 4352 4353

#: builtin/remote.c:1282
#, c-format
msgid "URL: %s"
4354
msgstr "URL:%s"
4355 4356 4357 4358

#: builtin/remote.c:1295
#, c-format
msgid " * [would prune] %s"
4359
msgstr " * [将删除] %s"
4360 4361 4362 4363

#: builtin/remote.c:1298
#, c-format
msgid " * [pruned] %s"
4364
msgstr " * [已删除] %s"
4365 4366

#: builtin/remote.c:1387 builtin/remote.c:1461
4367
#, c-format
4368
msgid "No such remote '%s'"
4369
msgstr "没有此远程 '%s'"
4370 4371 4372

#: builtin/remote.c:1414
msgid "no remote specified"
4373
msgstr "未指定远程"
4374 4375 4376

#: builtin/remote.c:1447
msgid "--add --delete doesn't make sense"
4377
msgstr "--add --delete 无意义"
4378 4379

#: builtin/remote.c:1487
4380
#, c-format
4381
msgid "Invalid old URL pattern: %s"
4382
msgstr "无效的旧URL匹配模版:%s"
4383 4384

#: builtin/remote.c:1495
4385
#, c-format
4386
msgid "No such URL found: %s"
4387
msgstr "未找到此URL:%s"
4388 4389 4390

#: builtin/remote.c:1497
msgid "Will not delete all non-push URLs"
4391
msgstr "将不会删除所有非推送URL地址"
4392

J
Jiang Xin 已提交
4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404
#: builtin/reset.c:33
msgid "mixed"
msgstr "混杂"

#: builtin/reset.c:33
msgid "soft"
msgstr "软性"

#: builtin/reset.c:33
msgid "hard"
msgstr "硬性"

4405 4406 4407 4408
#: builtin/reset.c:33
msgid "merge"
msgstr "合并"

J
Jiang Xin 已提交
4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427
#: builtin/reset.c:33
msgid "keep"
msgstr "保持"

#: builtin/reset.c:77
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"

#: builtin/reset.c:79
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"

#: builtin/reset.c:85
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"

#: builtin/reset.c:96
msgid "Could not write new index file."
4428
msgstr "不能写入新的索引文件。"
J
Jiang Xin 已提交
4429 4430 4431 4432 4433 4434 4435 4436

#: builtin/reset.c:106
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"

#: builtin/reset.c:130
msgid "Could not read index"
4437
msgstr "不能读取索引"
J
Jiang Xin 已提交
4438 4439 4440

#: builtin/reset.c:133
msgid "Unstaged changes after reset:"
4441
msgstr "重置后撤出暂存区的变更:"
J
Jiang Xin 已提交
4442

4443
#  译者:汉字之间无空格,故删除%s前后空格
J
Jiang Xin 已提交
4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461
#: builtin/reset.c:223
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"

#: builtin/reset.c:297
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"

#: builtin/reset.c:302
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard,mixed,soft} 不兼容"

#: builtin/reset.c:311
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"

4462
#  译者:汉字之间无空格,故删除%s前后空格
J
Jiang Xin 已提交
4463 4464 4465 4466 4467
#: builtin/reset.c:313
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"

4468
#  译者:汉字之间无空格,故删除%s前后空格
J
Jiang Xin 已提交
4469 4470 4471 4472 4473 4474 4475 4476
#: builtin/reset.c:325
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对裸版本库进行%s重置"

#: builtin/reset.c:341
#, c-format
msgid "Could not reset index file to revision '%s'."
4477
msgstr "不能重置索引文件至版本 '%s'。"
J
Jiang Xin 已提交
4478

4479
#: builtin/revert.c:70 builtin/revert.c:92
J
Jiang Xin 已提交
4480 4481
#, c-format
msgid "%s: %s cannot be used with %s"
4482
msgstr "%s:%s 不能和 %s 共用"
J
Jiang Xin 已提交
4483

4484
#: builtin/revert.c:131
J
Jiang Xin 已提交
4485 4486 4487
msgid "program error"
msgstr "程序错误"

4488
#: builtin/revert.c:221
J
Jiang Xin 已提交
4489 4490 4491
msgid "revert failed"
msgstr "还原失败"

4492
#: builtin/revert.c:236
J
Jiang Xin 已提交
4493 4494 4495 4496 4497 4498 4499 4500 4501
msgid "cherry-pick failed"
msgstr "拣选失败"

#: builtin/rm.c:109
#, c-format
msgid ""
"'%s' has staged content different from both the file and the HEAD\n"
"(use -f to force removal)"
msgstr ""
4502
"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
J
Jiang Xin 已提交
4503 4504 4505 4506 4507 4508 4509 4510
"(使用 -f 强制删除)"

#: builtin/rm.c:115
#, c-format
msgid ""
"'%s' has changes staged in the index\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
4511
"'%s' 有变更已暂存至索引中\n"
J
Jiang Xin 已提交
4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537
"(使用 --cached 保存文件,或用 -f 强制删除)"

#: builtin/rm.c:119
#, c-format
msgid ""
"'%s' has local modifications\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"'%s' 有本地修改\n"
"(使用 --cached 保存文件,或用 -f 强制删除)"

#: builtin/rm.c:194
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"

#: builtin/rm.c:230
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm:不能删除 %s"

#: builtin/shortlog.c:157
#, c-format
msgid "Missing author: %s"
msgstr "缺少作者:%s"

4538
#: builtin/tag.c:60
4539 4540 4541 4542
#, c-format
msgid "malformed object at '%s'"
msgstr "非法的对象于 '%s'"

4543
#: builtin/tag.c:207
J
Jiang Xin 已提交
4544 4545 4546 4547
#, c-format
msgid "tag name too long: %.*s..."
msgstr "tag 名字太长:%.*s..."

4548
#: builtin/tag.c:212
J
Jiang Xin 已提交
4549 4550 4551 4552
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' 未发现。"

4553
#: builtin/tag.c:227
J
Jiang Xin 已提交
4554 4555 4556 4557
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除 tag '%s'(曾为 %s)\n"

4558
#: builtin/tag.c:239
J
Jiang Xin 已提交
4559 4560 4561 4562
#, c-format
msgid "could not verify the tag '%s'"
msgstr "不能校验 tag '%s'"

4563
#: builtin/tag.c:249
J
Jiang Xin 已提交
4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576
msgid ""
"\n"
"#\n"
"# Write a tag message\n"
"# Lines starting with '#' will be ignored.\n"
"#\n"
msgstr ""
"\n"
"#\n"
"# 输入一个 tag 说明\n"
"# 以 '#' 开头的行将被忽略。\n"
"#\n"

4577
#: builtin/tag.c:256
J
Jiang Xin 已提交
4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591
msgid ""
"\n"
"#\n"
"# Write a tag message\n"
"# Lines starting with '#' will be kept; you may remove them yourself if you "
"want to.\n"
"#\n"
msgstr ""
"\n"
"#\n"
"# 输入一个 tag 说明\n"
"# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
"#\n"

4592
#: builtin/tag.c:298
J
Jiang Xin 已提交
4593 4594 4595
msgid "unable to sign the tag"
msgstr "无法签署 tag"

4596
#: builtin/tag.c:300
J
Jiang Xin 已提交
4597 4598 4599
msgid "unable to write tag file"
msgstr "无法写 tag 文件"

4600
#: builtin/tag.c:325
J
Jiang Xin 已提交
4601
msgid "bad object type."
4602
msgstr "坏的对象类型。"
J
Jiang Xin 已提交
4603

4604
#: builtin/tag.c:338
J
Jiang Xin 已提交
4605
msgid "tag header too big."
4606
msgstr "tag 头信息太大。"
J
Jiang Xin 已提交
4607

4608
#: builtin/tag.c:370
J
Jiang Xin 已提交
4609 4610 4611
msgid "no tag message?"
msgstr "无 tag 说明?"

4612
#: builtin/tag.c:376
J
Jiang Xin 已提交
4613 4614 4615 4616
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "tag 说明被保留在 %s\n"

4617
#: builtin/tag.c:425
4618 4619 4620
msgid "switch 'points-at' requires an object"
msgstr "开关 'points-at' 需要一个对象"

4621
#: builtin/tag.c:427
4622 4623 4624 4625
#, c-format
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"

4626 4627
#: builtin/tag.c:506
msgid "--column and -n are incompatible"
4628
msgstr "--column 和 -n 不兼容"
4629 4630

#: builtin/tag.c:523
J
Jiang Xin 已提交
4631 4632 4633
msgid "-n option is only allowed with -l."
msgstr "-n 选项只允许和 -l 共用。"

4634
#: builtin/tag.c:525
J
Jiang Xin 已提交
4635 4636 4637
msgid "--contains option is only allowed with -l."
msgstr "--contains 选项只允许和 -l 共用。"

4638
#: builtin/tag.c:527
4639 4640 4641
msgid "--points-at option is only allowed with -l."
msgstr "--points-at 选项只允许和 -l 共用。"

4642
#: builtin/tag.c:535
J
Jiang Xin 已提交
4643 4644 4645
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"

4646
#: builtin/tag.c:555
J
Jiang Xin 已提交
4647 4648 4649
msgid "too many params"
msgstr "太多参数"

4650
#: builtin/tag.c:561
J
Jiang Xin 已提交
4651 4652
#, c-format
msgid "'%s' is not a valid tag name."
4653
msgstr "'%s' 不是一个有效的tag名称。"
J
Jiang Xin 已提交
4654

4655
#: builtin/tag.c:566
J
Jiang Xin 已提交
4656 4657 4658 4659
#, c-format
msgid "tag '%s' already exists"
msgstr "tag '%s' 已存在"

4660
#: builtin/tag.c:584
J
Jiang Xin 已提交
4661 4662 4663 4664
#, c-format
msgid "%s: cannot lock the ref"
msgstr "%s:不能锁定引用"

4665
#: builtin/tag.c:586
J
Jiang Xin 已提交
4666 4667 4668 4669
#, c-format
msgid "%s: cannot update the ref"
msgstr "%s:不能更新引用"

4670
#: builtin/tag.c:588
J
Jiang Xin 已提交
4671 4672 4673 4674
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新tag '%s'(曾为 %s)\n"

4675 4676
#: git.c:16
msgid "See 'git help <command>' for more information on a specific command."
4677
msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
4678 4679 4680

#: parse-options.h:133 parse-options.h:235
msgid "n"
4681
msgstr "数字"
4682 4683 4684

#: parse-options.h:141
msgid "time"
4685
msgstr "时间"
4686 4687 4688

#: parse-options.h:149
msgid "file"
4689
msgstr "文件"
4690 4691 4692

#: parse-options.h:151
msgid "when"
4693
msgstr "何时"
4694 4695 4696

#: parse-options.h:156
msgid "no-op (backward compatibility)"
4697
msgstr "空操作(向后兼容)"
4698 4699 4700

#: parse-options.h:228
msgid "be more verbose"
4701
msgstr "更加详细"
4702 4703 4704

#: parse-options.h:230
msgid "be more quiet"
4705
msgstr "更加安静"
4706 4707 4708

#: parse-options.h:236
msgid "use <n> digits to display SHA-1s"
4709
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
4710 4711 4712

#: common-cmds.h:8
msgid "Add file contents to the index"
4713
msgstr "添加文件内容至索引"
4714 4715 4716

#: common-cmds.h:9
msgid "Find by binary search the change that introduced a bug"
4717
msgstr "通过二分查找定位引入 bug 的变更"
4718 4719 4720

#: common-cmds.h:10
msgid "List, create, or delete branches"
4721
msgstr "列出、创建或删除分支"
4722 4723 4724

#: common-cmds.h:11
msgid "Checkout a branch or paths to the working tree"
4725
msgstr "检出一个分支或路径到工作区"
4726 4727 4728

#: common-cmds.h:12
msgid "Clone a repository into a new directory"
4729
msgstr "克隆一个版本库到一个新目录"
4730 4731 4732

#: common-cmds.h:13
msgid "Record changes to the repository"
4733
msgstr "记录变更到版本库"
4734 4735 4736

#: common-cmds.h:14
msgid "Show changes between commits, commit and working tree, etc"
4737
msgstr "显示提交之间、提交和工作区之间等的差异"
4738 4739 4740

#: common-cmds.h:15
msgid "Download objects and refs from another repository"
4741
msgstr "从另外一个版本库下载对象和引用"
4742 4743 4744

#: common-cmds.h:16
msgid "Print lines matching a pattern"
4745
msgstr "输出和模式匹配的行"
4746 4747 4748

#: common-cmds.h:17
msgid "Create an empty git repository or reinitialize an existing one"
4749
msgstr "创建一个空的 git 版本库或者重新初始化一个"
4750 4751 4752

#: common-cmds.h:18
msgid "Show commit logs"
4753
msgstr "显示提交日志"
4754 4755 4756

#: common-cmds.h:19
msgid "Join two or more development histories together"
4757
msgstr "合并两个或更多开发历史"
4758 4759 4760

#: common-cmds.h:20
msgid "Move or rename a file, a directory, or a symlink"
4761
msgstr "移动或重命名一个文件、目录或符号链接"
4762 4763 4764

#: common-cmds.h:21
msgid "Fetch from and merge with another repository or a local branch"
4765
msgstr "获取并合并另外的版本库或一个本地分支"
4766 4767 4768

#: common-cmds.h:22
msgid "Update remote refs along with associated objects"
4769
msgstr "更新远程引用和相关的对象"
4770 4771 4772

#: common-cmds.h:23
msgid "Forward-port local commits to the updated upstream head"
4773
msgstr "本地提交转移至更新后的上游分支中"
4774 4775 4776

#: common-cmds.h:24
msgid "Reset current HEAD to the specified state"
4777
msgstr "重置当前HEAD到指定状态"
4778 4779 4780

#: common-cmds.h:25
msgid "Remove files from the working tree and from the index"
4781
msgstr "从工作区和索引中删除文件"
4782 4783 4784

#: common-cmds.h:26
msgid "Show various types of objects"
4785
msgstr "显示各种类型的对象"
4786 4787 4788

#: common-cmds.h:27
msgid "Show the working tree status"
4789
msgstr "显示工作区状态"
4790 4791 4792

#: common-cmds.h:28
msgid "Create, list, delete or verify a tag object signed with GPG"
4793
msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4794

4795
#: git-am.sh:50
J
Jiang Xin 已提交
4796 4797 4798
msgid "You need to set your committer info first"
msgstr "您需要先设置你的提交者信息"

4799
#: git-am.sh:137
J
Jiang Xin 已提交
4800 4801 4802
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"

4803
#: git-am.sh:154
J
Jiang Xin 已提交
4804 4805 4806 4807 4808
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
"您是否曾手动编辑过您的补丁?\n"
4809
"无法应用补丁到索引中的数据上。"
J
Jiang Xin 已提交
4810

4811
#: git-am.sh:163
J
Jiang Xin 已提交
4812
msgid "Falling back to patching base and 3-way merge..."
4813
msgstr "回退到补丁基础版本并使用三路合并..."
J
Jiang Xin 已提交
4814

4815
#: git-am.sh:275
J
Jiang Xin 已提交
4816 4817 4818
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"

4819
#: git-am.sh:362
J
Jiang Xin 已提交
4820 4821 4822 4823
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr "不支持 $patch_format 补丁格式。"

4824
#: git-am.sh:364
J
Jiang Xin 已提交
4825 4826 4827
msgid "Patch format detection failed."
msgstr "补丁格式检测失败。"

4828
#: git-am.sh:418
J
Jiang Xin 已提交
4829 4830 4831
msgid "-d option is no longer supported.  Do not use."
msgstr "不再支持 -d 选项。不要使用。"

4832
#: git-am.sh:481
J
Jiang Xin 已提交
4833 4834 4835 4836
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"

4837
#: git-am.sh:486
J
Jiang Xin 已提交
4838 4839 4840
msgid "Please make up your mind. --skip or --abort?"
msgstr "请下决心。--skip 或是 --abort ?"

4841
#: git-am.sh:513
J
Jiang Xin 已提交
4842 4843 4844
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行,我们不会继续。"

4845
#: git-am.sh:579
J
Jiang Xin 已提交
4846 4847
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
4848
msgstr "脏的索引:不能应用补丁(脏文件:$files)"
J
Jiang Xin 已提交
4849

4850
#: git-am.sh:755
J
Jiang Xin 已提交
4851
msgid "cannot be interactive without stdin connected to a terminal."
4852
msgstr "标准输入没有和终端关联,不能进行交互式操作。"
J
Jiang Xin 已提交
4853

4854
#  译者:注意保持句尾空格
J
Jiang Xin 已提交
4855 4856 4857
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
4858
#: git-am.sh:766
J
Jiang Xin 已提交
4859 4860 4861
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

4862
#: git-am.sh:802
J
Jiang Xin 已提交
4863 4864 4865 4866
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr "正应用:$FIRSTLINE"

4867
#: git-am.sh:847
J
Jiang Xin 已提交
4868 4869 4870
msgid "No changes -- Patch already applied."
msgstr "没有变更 -- 补丁已经应用过。"

4871
#: git-am.sh:873
J
Jiang Xin 已提交
4872 4873 4874
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"

4875
#  译者:注意保持句尾空格
J
Jiang Xin 已提交
4876 4877 4878 4879 4880 4881 4882 4883 4884 4885
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:54
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n]? "

#: git-bisect.sh:95
#, sh-format
msgid "unrecognised option: '$arg'"
4886
msgstr "未能识别的选项:'$arg'"
J
Jiang Xin 已提交
4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908

#: git-bisect.sh:99
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "'$arg' 看起来不像是一个有效的版本"

#: git-bisect.sh:117
msgid "Bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"

#: git-bisect.sh:130
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"

#: git-bisect.sh:140
msgid "won't bisect on seeked tree"
msgstr "不会在已查找过的树上二分查找"

#: git-bisect.sh:144
msgid "Bad HEAD - strange symbolic ref"
4909
msgstr "坏的 HEAD - 奇怪的符号引用"
J
Jiang Xin 已提交
4910 4911 4912 4913

#: git-bisect.sh:189
#, sh-format
msgid "Bad bisect_write argument: $state"
4914
msgstr "坏的 bisect_write 参数:$state"
J
Jiang Xin 已提交
4915 4916 4917 4918

#: git-bisect.sh:218
#, sh-format
msgid "Bad rev input: $arg"
4919
msgstr "输入坏的版本:$arg"
J
Jiang Xin 已提交
4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933

#: git-bisect.sh:232
msgid "Please call 'bisect_state' with at least one argument."
msgstr "请在调用 'bisect_state' 时跟至少一个参数。"

#: git-bisect.sh:244
#, sh-format
msgid "Bad rev input: $rev"
msgstr "输入坏的版本:$rev"

#: git-bisect.sh:250
msgid "'git bisect bad' can take only one argument."
msgstr "'git bisect bad' 只能带一个参数。"

4934
#  译者:注意保持句尾空格
J
Jiang Xin 已提交
4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:279
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]? "

#: git-bisect.sh:354
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' 不是一个有效的提交"

#: git-bisect.sh:363
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
"不能检出原始 HEAD '$branch'。\n"
"尝试 'git bisect reset <commit>'。"

#: git-bisect.sh:390
msgid "No logfile given"
msgstr "未提供日志文件"

#: git-bisect.sh:391
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"

#: git-bisect.sh:408
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"

#: git-bisect.sh:474
msgid "We are not bisecting."
4971
msgstr "我们没有在二分查找。"
J
Jiang Xin 已提交
4972 4973 4974 4975 4976 4977 4978

#: git-pull.sh:21
msgid ""
"Pull is not possible because you have unmerged files.\n"
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution, or use 'git commit -a'."
msgstr ""
4979
"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
J
Jiang Xin 已提交
4980
"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
4981
"或者使用 'git commit -a'。"
J
Jiang Xin 已提交
4982 4983 4984

#: git-pull.sh:25
msgid "Pull is not possible because you have unmerged files."
4985
msgstr "Pull 不可用,因为您尚有未合并的文件。"
J
Jiang Xin 已提交
4986

4987
#: git-pull.sh:197
J
Jiang Xin 已提交
4988
msgid "updating an unborn branch with changes added to the index"
4989
msgstr "更新尚未诞生的分支,变更添加至索引"
J
Jiang Xin 已提交
4990

4991
#: git-pull.sh:253
J
Jiang Xin 已提交
4992 4993 4994
msgid "Cannot merge multiple branches into empty head"
msgstr "无法将多个分支合并到空分支"

4995
#: git-pull.sh:257
J
Jiang Xin 已提交
4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008
msgid "Cannot rebase onto multiple branches"
msgstr "无法变基到多个分支"

#: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"

#: git-stash.sh:74
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"

#: git-stash.sh:89
msgid "Cannot save the current index state"
5009
msgstr "无法保存当前索引状态"
J
Jiang Xin 已提交
5010 5011 5012 5013 5014 5015 5016

#: git-stash.sh:123 git-stash.sh:136
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"

#: git-stash.sh:140
msgid "No changes selected"
5017
msgstr "没有选择变更"
J
Jiang Xin 已提交
5018 5019 5020

#: git-stash.sh:143
msgid "Cannot remove temporary index (can't happen)"
5021
msgstr "无法删除临时索引(不应发生)"
J
Jiang Xin 已提交
5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032

#: git-stash.sh:156
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"

#: git-stash.sh:223
msgid "No local changes to save"
msgstr "没有要保存的本地修改"

#: git-stash.sh:227
msgid "Cannot initialize stash"
5033
msgstr "无法初始化 stash"
J
Jiang Xin 已提交
5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044

#: git-stash.sh:235
msgid "Cannot save the current status"
msgstr "无法保存当前状态"

#: git-stash.sh:253
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"

#: git-stash.sh:352
msgid "No stash found."
5045
msgstr "未发现 stash。"
J
Jiang Xin 已提交
5046 5047 5048 5049

#: git-stash.sh:359
#, sh-format
msgid "Too many revisions specified: $REV"
5050
msgstr "指定了太多的版本:$REV"
J
Jiang Xin 已提交
5051 5052 5053 5054 5055 5056 5057 5058 5059

#: git-stash.sh:365
#, sh-format
msgid "$reference is not valid reference"
msgstr "$reference 不是有效的引用"

#: git-stash.sh:393
#, sh-format
msgid "'$args' is not a stash-like commit"
5060
msgstr "'$args' 不是 stash 样提交"
J
Jiang Xin 已提交
5061 5062 5063 5064

#: git-stash.sh:404
#, sh-format
msgid "'$args' is not a stash reference"
5065
msgstr "'$args' 不是一个 stash 引用"
J
Jiang Xin 已提交
5066 5067 5068

#: git-stash.sh:412
msgid "unable to refresh index"
5069
msgstr "无法刷新索引"
J
Jiang Xin 已提交
5070 5071 5072 5073 5074 5075 5076

#: git-stash.sh:416
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程中恢复进度"

#: git-stash.sh:424
msgid "Conflicts in index. Try without --index."
5077
msgstr "索引中有冲突。尝试不使用 --index。"
J
Jiang Xin 已提交
5078 5079 5080

#: git-stash.sh:426
msgid "Could not save index tree"
5081
msgstr "不能保存索引树"
J
Jiang Xin 已提交
5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094

#: git-stash.sh:460
msgid "Cannot unstage modified files"
msgstr "无法还原修改的文件"

#: git-stash.sh:491
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"

#: git-stash.sh:492
#, sh-format
msgid "${REV}: Could not drop stash entry"
5095
msgstr "${REV}:不能丢弃进度条目"
J
Jiang Xin 已提交
5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109

#: git-stash.sh:499
msgid "No branch name specified"
msgstr "未指定分支名"

#: git-stash.sh:570
msgid "(To restore them type \"git stash apply\")"
msgstr "(为恢复数据输入 \"git stash apply\")"

#: git-submodule.sh:56
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr "无法从 url '$remoteurl' 剥离一个组件"

5110
#: git-submodule.sh:109
J
Jiang Xin 已提交
5111
#, sh-format
5112 5113
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
J
Jiang Xin 已提交
5114

5115
#: git-submodule.sh:150
J
Jiang Xin 已提交
5116
#, sh-format
5117 5118
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
J
Jiang Xin 已提交
5119

5120
#: git-submodule.sh:160
5121 5122 5123 5124
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"

5125
#: git-submodule.sh:249
J
Jiang Xin 已提交
5126 5127 5128 5129
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"

5130
#: git-submodule.sh:266
J
Jiang Xin 已提交
5131
#, sh-format
5132 5133
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
J
Jiang Xin 已提交
5134

5135
#: git-submodule.sh:283
J
Jiang Xin 已提交
5136
#, sh-format
5137 5138
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
J
Jiang Xin 已提交
5139

5140
#: git-submodule.sh:297
J
Jiang Xin 已提交
5141
#, sh-format
5142 5143
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
J
Jiang Xin 已提交
5144

5145
#: git-submodule.sh:302
J
Jiang Xin 已提交
5146
#, sh-format
5147 5148
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
J
Jiang Xin 已提交
5149

5150
#: git-submodule.sh:307
J
Jiang Xin 已提交
5151
#, sh-format
5152 5153
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
J
Jiang Xin 已提交
5154

5155
#: git-submodule.sh:349
J
Jiang Xin 已提交
5156
#, sh-format
5157 5158
msgid "Entering '$prefix$sm_path'"
msgstr "正在进入 '$prefix$sm_path'"
J
Jiang Xin 已提交
5159

5160
#: git-submodule.sh:363
J
Jiang Xin 已提交
5161
#, sh-format
5162 5163
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr "停止于 '$sm_path',脚本返回非零值。"
J
Jiang Xin 已提交
5164

5165
#: git-submodule.sh:405
J
Jiang Xin 已提交
5166
#, sh-format
5167 5168
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
J
Jiang Xin 已提交
5169

5170
#: git-submodule.sh:414
J
Jiang Xin 已提交
5171
#, sh-format
5172 5173
msgid "Failed to register url for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册 url"
J
Jiang Xin 已提交
5174

5175
#: git-submodule.sh:422
J
Jiang Xin 已提交
5176
#, sh-format
5177 5178
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
J
Jiang Xin 已提交
5179

5180
#: git-submodule.sh:424
J
Jiang Xin 已提交
5181
#, sh-format
5182 5183
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
J
Jiang Xin 已提交
5184

5185
#: git-submodule.sh:523
J
Jiang Xin 已提交
5186 5187
#, sh-format
msgid ""
5188
"Submodule path '$sm_path' not initialized\n"
J
Jiang Xin 已提交
5189 5190
"Maybe you want to use 'update --init'?"
msgstr ""
5191
"子模组路径 '$sm_path' 没有初始化\n"
5192
"也许您想用 'update --init'?"
J
Jiang Xin 已提交
5193

5194
#: git-submodule.sh:536
J
Jiang Xin 已提交
5195
#, sh-format
5196 5197
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
J
Jiang Xin 已提交
5198

5199
#: git-submodule.sh:555
J
Jiang Xin 已提交
5200
#, sh-format
5201 5202
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
J
Jiang Xin 已提交
5203

5204
#: git-submodule.sh:569
J
Jiang Xin 已提交
5205
#, sh-format
5206 5207
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
J
Jiang Xin 已提交
5208

5209
#: git-submodule.sh:570
J
Jiang Xin 已提交
5210
#, sh-format
5211 5212
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
J
Jiang Xin 已提交
5213

5214
#: git-submodule.sh:575
J
Jiang Xin 已提交
5215
#, sh-format
5216 5217
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
J
Jiang Xin 已提交
5218

5219
#: git-submodule.sh:576
J
Jiang Xin 已提交
5220
#, sh-format
5221 5222
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
J
Jiang Xin 已提交
5223

5224
#: git-submodule.sh:581
J
Jiang Xin 已提交
5225
#, sh-format
5226 5227
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
J
Jiang Xin 已提交
5228

5229
#: git-submodule.sh:582
J
Jiang Xin 已提交
5230
#, sh-format
5231 5232
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "子模组路径 '$sm_path':检出 '$sha1'"
J
Jiang Xin 已提交
5233

5234
#: git-submodule.sh:604 git-submodule.sh:927
J
Jiang Xin 已提交
5235
#, sh-format
5236 5237
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
J
Jiang Xin 已提交
5238

5239
#: git-submodule.sh:712
J
Jiang Xin 已提交
5240 5241 5242
msgid "--"
msgstr "--"

5243
#  译者:注意保持前导空格
5244
#: git-submodule.sh:770
J
Jiang Xin 已提交
5245 5246 5247 5248
#, sh-format
msgid "  Warn: $name doesn't contain commit $sha1_src"
msgstr "  警告:$name 未包含提交 $sha1_src"

5249
#  译者:注意保持前导空格
5250
#: git-submodule.sh:773
J
Jiang Xin 已提交
5251 5252 5253 5254
#, sh-format
msgid "  Warn: $name doesn't contain commit $sha1_dst"
msgstr "  警告:$name 未包含提交 $sha1_dst"

5255
#  译者:注意保持前导空格
5256
#: git-submodule.sh:776
J
Jiang Xin 已提交
5257 5258 5259 5260
#, sh-format
msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr "  警告:$name 未包含提交 $sha1_src 和 $sha1_dst"

5261
#: git-submodule.sh:801
J
Jiang Xin 已提交
5262 5263 5264
msgid "blob"
msgstr "blob"

5265
#: git-submodule.sh:802
J
Jiang Xin 已提交
5266 5267 5268
msgid "submodule"
msgstr "子模组"

5269
#: git-submodule.sh:973
J
Jiang Xin 已提交
5270 5271
#, sh-format
msgid "Synchronizing submodule url for '$name'"
5272
msgstr "为 '$name' 同步子模组 url"
5273

5274 5275 5276 5277 5278 5279
#~ msgid "cherry-pick"
#~ msgstr "拣选"

#~ msgid "Please enter the commit message for your changes."
#~ msgstr "请为您的修改输入提交说明。"

5280 5281
#~ msgid "Too many options specified"
#~ msgstr "指定了太多的选项"