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