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