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