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