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