po / zh_CN.poon commit git-p4: Verify detection of "empty" branch creation (ad71f66)
   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-03-16 20:18+0800\n"
  16"PO-Revision-Date: 2012-01-30 00:00+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=1; plural=0;\n"
  24
  25#: advice.c:34
  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:64
  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#: commit.c:47
  46#, c-format
  47msgid "could not parse %s"
  48msgstr "不能解析 %s"
  49
  50#: commit.c:49
  51#, c-format
  52msgid "%s %s is not a commit!"
  53msgstr "%s %s 不是一个提交!"
  54
  55#: compat/obstack.c:406 compat/obstack.c:408
  56msgid "memory exhausted"
  57msgstr "内存耗尽"
  58
  59#: connected.c:39
  60msgid "Could not run 'git rev-list'"
  61msgstr "不能执行 'git rev-list'"
  62
  63#: connected.c:48
  64#, c-format
  65msgid "failed write to rev-list: %s"
  66msgstr "无法写入 rev-list:%s"
  67
  68#: connected.c:56
  69#, c-format
  70msgid "failed to close rev-list's stdin: %s"
  71msgstr "无法关闭 rev-list 的标准输入:%s"
  72
  73#  译者:注意保持前导空格
  74#: diff.c:105
  75#, c-format
  76msgid "  Failed to parse dirstat cut-off percentage '%.*s'\n"
  77msgstr "  无法解析 dirstat 阈值 '%.*s'\n"
  78
  79#  译者:注意保持前导空格
  80#: diff.c:110
  81#, c-format
  82msgid "  Unknown dirstat parameter '%.*s'\n"
  83msgstr "  未知 dirstat 参数 '%.*s'\n"
  84
  85#: diff.c:210
  86#, c-format
  87msgid ""
  88"Found errors in 'diff.dirstat' config variable:\n"
  89"%s"
  90msgstr ""
  91"发现配置变量 'diff.dirstat' 中的错误:\n"
  92"%s"
  93
  94#: diff.c:1336
  95msgid " 0 files changed\n"
  96msgstr " 0 个文件被修改\n"
  97
  98#: diff.c:1340
  99#, c-format
 100msgid " %d file changed"
 101msgid_plural " %d files changed"
 102msgstr[0] " %d 个文件被修改"
 103
 104#: diff.c:1357
 105#, c-format
 106msgid ", %d insertion(+)"
 107msgid_plural ", %d insertions(+)"
 108msgstr[0] ",插入 %d 行(+)"
 109
 110#: diff.c:1368
 111#, c-format
 112msgid ", %d deletion(-)"
 113msgid_plural ", %d deletions(-)"
 114msgstr[0] ",删除 %d 行(-)"
 115
 116#: diff.c:3424
 117#, c-format
 118msgid ""
 119"Failed to parse --dirstat/-X option parameter:\n"
 120"%s"
 121msgstr ""
 122"无法解析 --dirstat/-X 选项的参数:\n"
 123"%s"
 124
 125#: gpg-interface.c:59
 126msgid "could not run gpg."
 127msgstr "不能执行 gpg。"
 128
 129#: gpg-interface.c:71
 130msgid "gpg did not accept the data"
 131msgstr "gpg 没有接受数据"
 132
 133#: gpg-interface.c:82
 134msgid "gpg failed to sign the data"
 135msgstr "gpg 无法为数据签名"
 136
 137#: grep.c:1280
 138#, c-format
 139msgid "'%s': unable to read %s"
 140msgstr "'%s':无法读取 %s"
 141
 142#: grep.c:1297
 143#, c-format
 144msgid "'%s': %s"
 145msgstr "'%s':%s"
 146
 147#: grep.c:1308
 148#, c-format
 149msgid "'%s': short read %s"
 150msgstr "'%s':读取不完整 %s"
 151
 152#: help.c:287
 153#, c-format
 154msgid ""
 155"'%s' appears to be a git command, but we were not\n"
 156"able to execute it. Maybe git-%s is broken?"
 157msgstr ""
 158"'%s' 像是一个 git 命令,但却无法运行。\n"
 159"可能是 git-%s 受损?"
 160
 161#: remote.c:1607
 162#, c-format
 163msgid "Your branch is ahead of '%s' by %d commit.\n"
 164msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 165msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 166
 167#: remote.c:1613
 168#, c-format
 169msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 170msgid_plural ""
 171"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 172msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
 173
 174#: remote.c:1621
 175#, c-format
 176msgid ""
 177"Your branch and '%s' have diverged,\n"
 178"and have %d and %d different commit each, respectively.\n"
 179msgid_plural ""
 180"Your branch and '%s' have diverged,\n"
 181"and have %d and %d different commits each, respectively.\n"
 182msgstr[0] ""
 183"您的分支和 '%s' 出现了偏离,\n"
 184"并且各自分别有 %d 和 %d 处不同的提交。\n"
 185
 186#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985
 187#: builtin/merge.c:1095 builtin/merge.c:1105
 188#, c-format
 189msgid "Could not open '%s' for writing"
 190msgstr "不能为写入打开 '%s'"
 191
 192#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867
 193#: builtin/merge.c:1097 builtin/merge.c:1110
 194#, c-format
 195msgid "Could not write to '%s'"
 196msgstr "不能写入 '%s'"
 197
 198#: sequencer.c:143
 199msgid ""
 200"after resolving the conflicts, mark the corrected paths\n"
 201"with 'git add <paths>' or 'git rm <paths>'"
 202msgstr ""
 203"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
 204"命令标记修正后的文件"
 205
 206#: sequencer.c:146
 207msgid ""
 208"after resolving the conflicts, mark the corrected paths\n"
 209"with 'git add <paths>' or 'git rm <paths>'\n"
 210"and commit the result with 'git commit'"
 211msgstr ""
 212"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
 213"对修正后的文件做标记,然后用 'git commit' 提交"
 214
 215#: sequencer.c:159 sequencer.c:685 sequencer.c:768
 216#, c-format
 217msgid "Could not write to %s"
 218msgstr "不能写入 %s"
 219
 220#: sequencer.c:162
 221#, c-format
 222msgid "Error wrapping up %s"
 223msgstr "错误收尾 %s"
 224
 225#: sequencer.c:177
 226msgid "Your local changes would be overwritten by cherry-pick."
 227msgstr "您的本地修改将被拣选操作覆盖。"
 228
 229#: sequencer.c:179
 230msgid "Your local changes would be overwritten by revert."
 231msgstr "您的本地修改将被还原操作覆盖。"
 232
 233#: sequencer.c:182
 234msgid "Commit your changes or stash them to proceed."
 235msgstr "提交您的修改或保存进度后再继续。"
 236
 237#. TRANSLATORS: %s will be "revert" or "cherry-pick"
 238#: sequencer.c:232
 239#, c-format
 240msgid "%s: Unable to write new index file"
 241msgstr "%s:无法写入新索引文件"
 242
 243#: sequencer.c:298
 244msgid "Your index file is unmerged."
 245msgstr "您的索引文件未完成合并。"
 246
 247#: sequencer.c:301
 248msgid "You do not have a valid HEAD"
 249msgstr "您没有一个有效的 HEAD"
 250
 251#: sequencer.c:316
 252#, c-format
 253msgid "Commit %s is a merge but no -m option was given."
 254msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 255
 256#: sequencer.c:324
 257#, c-format
 258msgid "Commit %s does not have parent %d"
 259msgstr "提交 %s 没有父提交 %d"
 260
 261#: sequencer.c:328
 262#, c-format
 263msgid "Mainline was specified but commit %s is not a merge."
 264msgstr "指定了主线但提交 %s 不是一个合并。"
 265
 266#. TRANSLATORS: The first %s will be "revert" or
 267#. "cherry-pick", the second %s a SHA1
 268#: sequencer.c:339
 269#, c-format
 270msgid "%s: cannot parse parent commit %s"
 271msgstr "%s:不能解析父提交 %s"
 272
 273#: sequencer.c:343
 274#, c-format
 275msgid "Cannot get commit message for %s"
 276msgstr "不能得到 %s 的提交说明"
 277
 278#: sequencer.c:427
 279#, c-format
 280msgid "could not revert %s... %s"
 281msgstr "不能还原 %s... %s"
 282
 283#: sequencer.c:428
 284#, c-format
 285msgid "could not apply %s... %s"
 286msgstr "不能应用 %s... %s"
 287
 288#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
 289#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348
 290#: builtin/shortlog.c:181
 291msgid "revision walk setup failed"
 292msgstr "版本遍历设置失败"
 293
 294#: sequencer.c:453
 295msgid "empty commit set passed"
 296msgstr "提供了空的提交集"
 297
 298#: sequencer.c:461
 299#, c-format
 300msgid "git %s: failed to read the index"
 301msgstr "git %s:无法读取索引"
 302
 303#: sequencer.c:466
 304#, c-format
 305msgid "git %s: failed to refresh the index"
 306msgstr "git %s:无法刷新索引"
 307
 308#: sequencer.c:551
 309#, c-format
 310msgid "Cannot %s during a %s"
 311msgstr "无法 %s 在一个 %s 过程中"
 312
 313#: sequencer.c:573
 314#, c-format
 315msgid "Could not parse line %d."
 316msgstr "不能解析第 %d 行。"
 317
 318#: sequencer.c:578
 319msgid "No commits parsed."
 320msgstr "没有提交被解析。"
 321
 322#: sequencer.c:591
 323#, c-format
 324msgid "Could not open %s"
 325msgstr "不能打开 %s"
 326
 327#: sequencer.c:595
 328#, c-format
 329msgid "Could not read %s."
 330msgstr "不能读取 %s。"
 331
 332#: sequencer.c:602
 333#, c-format
 334msgid "Unusable instruction sheet: %s"
 335msgstr "无用的指令表单:%s"
 336
 337#: sequencer.c:630
 338#, c-format
 339msgid "Invalid key: %s"
 340msgstr "无效键名:%s"
 341
 342#: sequencer.c:633
 343#, c-format
 344msgid "Invalid value for %s: %s"
 345msgstr "无效的 %s 值:%s"
 346
 347#: sequencer.c:645
 348#, c-format
 349msgid "Malformed options sheet: %s"
 350msgstr "非法的选项表单:%s"
 351
 352#: sequencer.c:666
 353msgid "a cherry-pick or revert is already in progress"
 354msgstr "一个拣选或还原操作已在进行"
 355
 356#: sequencer.c:667
 357msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 358msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 359
 360#: sequencer.c:671
 361#, c-format
 362msgid "Could not create sequencer directory %s"
 363msgstr "不能创建序列目录 %s"
 364
 365#: sequencer.c:687 sequencer.c:772
 366#, c-format
 367msgid "Error wrapping up %s."
 368msgstr "错误收尾 %s。"
 369
 370#: sequencer.c:706 sequencer.c:840
 371msgid "no cherry-pick or revert in progress"
 372msgstr "没有拣选或还原操作在进行"
 373
 374#: sequencer.c:708
 375msgid "cannot resolve HEAD"
 376msgstr "不能解析 HEAD"
 377
 378#: sequencer.c:710
 379msgid "cannot abort from a branch yet to be born"
 380msgstr "不能从尚未建立的分支终止"
 381
 382#: sequencer.c:732
 383#, c-format
 384msgid "cannot open %s: %s"
 385msgstr "不能打开 %s:%s"
 386
 387#: sequencer.c:735
 388#, c-format
 389msgid "cannot read %s: %s"
 390msgstr "不能读取 %s:%s"
 391
 392#: sequencer.c:736
 393msgid "unexpected end of file"
 394msgstr "未预期的文件结束"
 395
 396#: sequencer.c:742
 397#, c-format
 398msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 399msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 400
 401#: sequencer.c:765
 402#, c-format
 403msgid "Could not format %s."
 404msgstr "不能格式化 %s。"
 405
 406#: sequencer.c:927
 407msgid "Can't revert as initial commit"
 408msgstr "不能作为初始提交还原"
 409
 410#: sequencer.c:928
 411msgid "Can't cherry-pick into empty head"
 412msgstr "不能拣选到空分支"
 413
 414#: wt-status.c:134
 415msgid "Unmerged paths:"
 416msgstr "未合并的路径:"
 417
 418#  译者:注意保持前导空格
 419#: wt-status.c:140 wt-status.c:157
 420#, c-format
 421msgid "  (use \"git reset %s <file>...\" to unstage)"
 422msgstr "  (使用 \"git reset %s <file>...\" 撤出暂存区)"
 423
 424#  译者:注意保持前导空格
 425#: wt-status.c:142 wt-status.c:159
 426msgid "  (use \"git rm --cached <file>...\" to unstage)"
 427msgstr "  (使用 \"git rm --cached <file>...\" 撤出暂存区)"
 428
 429#  译者:注意保持前导空格
 430#: wt-status.c:143
 431msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 432msgstr "  (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
 433
 434#: wt-status.c:151
 435msgid "Changes to be committed:"
 436msgstr "要提交的变更:"
 437
 438#: wt-status.c:169
 439msgid "Changes not staged for commit:"
 440msgstr "尚未暂存以备提交的变更:"
 441
 442#  译者:注意保持前导空格
 443#: wt-status.c:173
 444msgid "  (use \"git add <file>...\" to update what will be committed)"
 445msgstr "  (使用 \"git add <file>...\" 更新要提交的内容)"
 446
 447#  译者:注意保持前导空格
 448#: wt-status.c:175
 449msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 450msgstr "  (使用 \"git add/rm <file>...\" 更新要提交的内容)"
 451
 452#  译者:注意保持前导空格
 453#: wt-status.c:176
 454msgid ""
 455"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 456msgstr "  (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
 457
 458#  译者:注意保持前导空格
 459#: wt-status.c:178
 460msgid "  (commit or discard the untracked or modified content in submodules)"
 461msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
 462
 463#: wt-status.c:187
 464#, c-format
 465msgid "%s files:"
 466msgstr "%s文件:"
 467
 468#  译者:注意保持前导空格
 469#: wt-status.c:190
 470#, c-format
 471msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 472msgstr "  (使用 \"git %s <file>...\" 以包含要提交的内容)"
 473
 474#: wt-status.c:207
 475msgid "bug"
 476msgstr "bug"
 477
 478#: wt-status.c:212
 479msgid "both deleted:"
 480msgstr "双方删除:"
 481
 482#: wt-status.c:213
 483msgid "added by us:"
 484msgstr "由我们添加:"
 485
 486#: wt-status.c:214
 487msgid "deleted by them:"
 488msgstr "由他们删除:"
 489
 490#: wt-status.c:215
 491msgid "added by them:"
 492msgstr "由他们添加:"
 493
 494#: wt-status.c:216
 495msgid "deleted by us:"
 496msgstr "由我们删除:"
 497
 498#: wt-status.c:217
 499msgid "both added:"
 500msgstr "双方添加:"
 501
 502#: wt-status.c:218
 503msgid "both modified:"
 504msgstr "双方修改:"
 505
 506#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
 507#: wt-status.c:248
 508msgid "new commits, "
 509msgstr "新提交, "
 510
 511#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
 512#: wt-status.c:250
 513msgid "modified content, "
 514msgstr "修改的内容, "
 515
 516#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
 517#: wt-status.c:252
 518msgid "untracked content, "
 519msgstr "未跟踪的内容, "
 520
 521#  译者:为保证在输出中对齐,注意调整句中空格!
 522#: wt-status.c:266
 523#, c-format
 524msgid "new file:   %s"
 525msgstr "新文件:    %s"
 526
 527#  译者:为保证在输出中对齐,注意调整句中空格!
 528#: wt-status.c:269
 529#, c-format
 530msgid "copied:     %s -> %s"
 531msgstr "拷贝:      %s -> %s"
 532
 533#  译者:为保证在输出中对齐,注意调整句中空格!
 534#: wt-status.c:272
 535#, c-format
 536msgid "deleted:    %s"
 537msgstr "删除:      %s"
 538
 539#  译者:为保证在输出中对齐,注意调整句中空格!
 540#: wt-status.c:275
 541#, c-format
 542msgid "modified:   %s"
 543msgstr "修改:      %s"
 544
 545#  译者:为保证在输出中对齐,注意调整句中空格!
 546#: wt-status.c:278
 547#, c-format
 548msgid "renamed:    %s -> %s"
 549msgstr "重命名:    %s -> %s"
 550
 551#  译者:为保证在输出中对齐,注意调整句中空格!
 552#: wt-status.c:281
 553#, c-format
 554msgid "typechange: %s"
 555msgstr "类型变更:  %s"
 556
 557#  译者:为保证在输出中对齐,注意调整句中空格!
 558#: wt-status.c:284
 559#, c-format
 560msgid "unknown:    %s"
 561msgstr "未知:      %s"
 562
 563#  译者:为保证在输出中对齐,注意调整句中空格!
 564#: wt-status.c:287
 565#, c-format
 566msgid "unmerged:   %s"
 567msgstr "未合并:    %s"
 568
 569#: wt-status.c:290
 570#, c-format
 571msgid "bug: unhandled diff status %c"
 572msgstr "bug:未处理的差异状态 %c"
 573
 574#: wt-status.c:713
 575msgid "On branch "
 576msgstr "位于分支 "
 577
 578#: wt-status.c:720
 579msgid "Not currently on any branch."
 580msgstr "当前不在任何分支上。"
 581
 582#: wt-status.c:731
 583msgid "Initial commit"
 584msgstr "初始提交"
 585
 586#: wt-status.c:745
 587msgid "Untracked"
 588msgstr "未跟踪的"
 589
 590#: wt-status.c:747
 591msgid "Ignored"
 592msgstr "忽略的"
 593
 594#: wt-status.c:749
 595#, c-format
 596msgid "Untracked files not listed%s"
 597msgstr "未跟踪的文件没有列出%s"
 598
 599#  译者:中文字符串拼接,可删除前导空格
 600#: wt-status.c:751
 601msgid " (use -u option to show untracked files)"
 602msgstr "(使用 -u 参数显示未跟踪的文件)"
 603
 604#: wt-status.c:757
 605msgid "No changes"
 606msgstr "没有修改"
 607
 608#: wt-status.c:761
 609#, c-format
 610msgid "no changes added to commit%s\n"
 611msgstr "修改尚未加入提交%s\n"
 612
 613#  译者:中文字符串拼接,可删除前导空格
 614#: wt-status.c:763
 615msgid " (use \"git add\" and/or \"git commit -a\")"
 616msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
 617
 618#: wt-status.c:765
 619#, c-format
 620msgid "nothing added to commit but untracked files present%s\n"
 621msgstr "空提交但存在未跟踪文件%s\n"
 622
 623#  译者:中文字符串拼接,可删除前导空格
 624#: wt-status.c:767
 625msgid " (use \"git add\" to track)"
 626msgstr "(使用 \"git add\" 建立跟踪)"
 627
 628#: wt-status.c:769 wt-status.c:772 wt-status.c:775
 629#, c-format
 630msgid "nothing to commit%s\n"
 631msgstr "无须提交%s\n"
 632
 633#  译者:中文字符串拼接,可删除前导空格
 634#: wt-status.c:770
 635msgid " (create/copy files and use \"git add\" to track)"
 636msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
 637
 638#  译者:中文字符串拼接,可删除前导空格
 639#: wt-status.c:773
 640msgid " (use -u to show untracked files)"
 641msgstr "(使用 -u 显示未跟踪文件)"
 642
 643#  译者:中文字符串拼接,可删除前导空格
 644#: wt-status.c:776
 645msgid " (working directory clean)"
 646msgstr "(干净的工作区)"
 647
 648#: wt-status.c:884
 649msgid "HEAD (no branch)"
 650msgstr "HEAD(非分支)"
 651
 652#  译者:注意保持句尾空格
 653#: wt-status.c:890
 654msgid "Initial commit on "
 655msgstr "初始提交于 "
 656
 657#  译者:注意保持句尾空格
 658#: wt-status.c:905
 659msgid "behind "
 660msgstr "落后 "
 661
 662#  译者:注意保持句尾空格
 663#: wt-status.c:908 wt-status.c:911
 664msgid "ahead "
 665msgstr "领先 "
 666
 667#  译者:注意保持句尾空格
 668#: wt-status.c:913
 669msgid ", behind "
 670msgstr ",落后 "
 671
 672#: builtin/add.c:62
 673#, c-format
 674msgid "unexpected diff status %c"
 675msgstr "意外的差异状态 %c"
 676
 677#: builtin/add.c:67 builtin/commit.c:298
 678msgid "updating files failed"
 679msgstr "更新文件失败"
 680
 681#: builtin/add.c:77
 682#, c-format
 683msgid "remove '%s'\n"
 684msgstr "删除 '%s'\n"
 685
 686#: builtin/add.c:176
 687#, c-format
 688msgid "Path '%s' is in submodule '%.*s'"
 689msgstr "路径 '%s' 属于模组 '%.*s'"
 690
 691#: builtin/add.c:192
 692msgid "Unstaged changes after refreshing the index:"
 693msgstr "刷新索引之后尚未被暂存的变更:"
 694
 695#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
 696#, c-format
 697msgid "pathspec '%s' did not match any files"
 698msgstr "路径 '%s' 未匹配任何文件"
 699
 700#: builtin/add.c:209
 701#, c-format
 702msgid "'%s' is beyond a symbolic link"
 703msgstr "'%s' 位于符号链接中"
 704
 705#: builtin/add.c:276
 706msgid "Could not read the index"
 707msgstr "不能读取索引"
 708
 709#: builtin/add.c:286
 710#, c-format
 711msgid "Could not open '%s' for writing."
 712msgstr "不能为写入打开 '%s'。"
 713
 714#: builtin/add.c:290
 715msgid "Could not write patch"
 716msgstr "不能写补丁"
 717
 718#: builtin/add.c:295
 719#, c-format
 720msgid "Could not stat '%s'"
 721msgstr "不能查看文件状态 '%s'"
 722
 723#: builtin/add.c:297
 724msgid "Empty patch. Aborted."
 725msgstr "空补丁。异常终止。"
 726
 727#: builtin/add.c:303
 728#, c-format
 729msgid "Could not apply '%s'"
 730msgstr "不能应用 '%s'"
 731
 732#: builtin/add.c:312
 733msgid "The following paths are ignored by one of your .gitignore files:\n"
 734msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
 735
 736#: builtin/add.c:352
 737#, c-format
 738msgid "Use -f if you really want to add them.\n"
 739msgstr "使用 -f 参数如果您确实要添加它们。\n"
 740
 741#: builtin/add.c:353
 742msgid "no files added"
 743msgstr "没有文件被添加"
 744
 745#: builtin/add.c:359
 746msgid "adding files failed"
 747msgstr "添加文件失败"
 748
 749#: builtin/add.c:391
 750msgid "-A and -u are mutually incompatible"
 751msgstr "-A 和 -u 选项互斥"
 752
 753#: builtin/add.c:393
 754msgid "Option --ignore-missing can only be used together with --dry-run"
 755msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
 756
 757#: builtin/add.c:413
 758#, c-format
 759msgid "Nothing specified, nothing added.\n"
 760msgstr "没有指定文件,也没有文件被添加。\n"
 761
 762#: builtin/add.c:414
 763#, c-format
 764msgid "Maybe you wanted to say 'git add .'?\n"
 765msgstr "也许您想要执行 'git add .'?\n"
 766
 767#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
 768#: builtin/rm.c:162
 769msgid "index file corrupt"
 770msgstr "索引文件损坏"
 771
 772#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
 773msgid "Unable to write new index file"
 774msgstr "无法写入新索引文件"
 775
 776#: builtin/archive.c:17
 777#, c-format
 778msgid "could not create archive file '%s'"
 779msgstr "不能创建归档文件 '%s'"
 780
 781#: builtin/archive.c:20
 782msgid "could not redirect output"
 783msgstr "不能输出重定向"
 784
 785#: builtin/archive.c:37
 786msgid "git archive: Remote with no URL"
 787msgstr "git archive:未提供远程URL"
 788
 789#: builtin/archive.c:58
 790msgid "git archive: expected ACK/NAK, got EOF"
 791msgstr "git archive:期待ACK/NACK,却得到EOF"
 792
 793#: builtin/archive.c:63
 794#, c-format
 795msgid "git archive: NACK %s"
 796msgstr "git archive:NACK %s"
 797
 798#: builtin/archive.c:65
 799#, c-format
 800msgid "remote error: %s"
 801msgstr "远程错误:%s"
 802
 803#: builtin/archive.c:66
 804msgid "git archive: protocol error"
 805msgstr "git archive:协议错误"
 806
 807#: builtin/archive.c:71
 808msgid "git archive: expected a flush"
 809msgstr "git archive:预期一个刷新"
 810
 811#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
 812#: builtin/branch.c:137
 813#, c-format
 814msgid ""
 815"deleting branch '%s' that has been merged to\n"
 816"         '%s', but not yet merged to HEAD."
 817msgstr ""
 818"将要删除的分支 '%s' 已经被合并到\n"
 819"         '%s',但未合并到 HEAD。"
 820
 821#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
 822#: builtin/branch.c:141
 823#, c-format
 824msgid ""
 825"not deleting branch '%s' that is not yet merged to\n"
 826"         '%s', even though it is merged to HEAD."
 827msgstr ""
 828"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
 829"         然而却尚未被合并到分支 '%s' 。"
 830
 831#  译者:汉字之间无空格,故删除尾部空格
 832#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
 833#: builtin/branch.c:163
 834msgid "remote "
 835msgstr "远程"
 836
 837#: builtin/branch.c:171
 838msgid "cannot use -a with -d"
 839msgstr "不能将 -a 和 -d 共用"
 840
 841#: builtin/branch.c:177
 842msgid "Couldn't look up commit object for HEAD"
 843msgstr "无法查询 HEAD 指向的提交对象"
 844
 845#: builtin/branch.c:182
 846#, c-format
 847msgid "Cannot delete the branch '%s' which you are currently on."
 848msgstr "无法删除您当前所在的分支 '%s'。"
 849
 850#: builtin/branch.c:192
 851#, c-format
 852msgid "%sbranch '%s' not found."
 853msgstr "%s分支 '%s' 未发现。"
 854
 855#: builtin/branch.c:200
 856#, c-format
 857msgid "Couldn't look up commit object for '%s'"
 858msgstr "无法查询 '%s' 指向的提交对象"
 859
 860#: builtin/branch.c:206
 861#, c-format
 862msgid ""
 863"The branch '%s' is not fully merged.\n"
 864"If you are sure you want to delete it, run 'git branch -D %s'."
 865msgstr ""
 866"分支 '%s' 没有完全合并。\n"
 867"如果您确认要删除它,执行 'git branch -D %s'。"
 868
 869#: builtin/branch.c:214
 870#, c-format
 871msgid "Error deleting %sbranch '%s'"
 872msgstr "删除 %s分支 '%s' 时出错"
 873
 874#: builtin/branch.c:219
 875#, c-format
 876msgid "Deleted %sbranch %s (was %s).\n"
 877msgstr "已删除 %s分支 %s(曾为 %s)。\n"
 878
 879#: builtin/branch.c:224
 880msgid "Update of config-file failed"
 881msgstr "无法更新 config 文件"
 882
 883#: builtin/branch.c:322
 884#, c-format
 885msgid "branch '%s' does not point at a commit"
 886msgstr "分支 '%s' 未指向一个提交"
 887
 888#  译者:注意保持句尾空格
 889#: builtin/branch.c:394
 890#, c-format
 891msgid "behind %d] "
 892msgstr "落后 %d] "
 893
 894#  译者:注意保持句尾空格
 895#: builtin/branch.c:396
 896#, c-format
 897msgid "ahead %d] "
 898msgstr "领先 %d] "
 899
 900#  译者:注意保持句尾空格
 901#: builtin/branch.c:398
 902#, c-format
 903msgid "ahead %d, behind %d] "
 904msgstr "领先 %d,落后 %d] "
 905
 906#: builtin/branch.c:501
 907msgid "(no branch)"
 908msgstr "(非分支)"
 909
 910#: builtin/branch.c:566
 911msgid "some refs could not be read"
 912msgstr "一些引用不能读取"
 913
 914#: builtin/branch.c:579
 915msgid "cannot rename the current branch while not on any."
 916msgstr "无法重命名当前分支因为不处于任何分支上。"
 917
 918#: builtin/branch.c:589
 919#, c-format
 920msgid "Invalid branch name: '%s'"
 921msgstr "无效的分支名:'%s'"
 922
 923#: builtin/branch.c:604
 924msgid "Branch rename failed"
 925msgstr "分支重命名失败"
 926
 927#: builtin/branch.c:608
 928#, c-format
 929msgid "Renamed a misnamed branch '%s' away"
 930msgstr "重命名掉一个错误命名的旧分支 '%s'"
 931
 932#: builtin/branch.c:612
 933#, c-format
 934msgid "Branch renamed to %s, but HEAD is not updated!"
 935msgstr "分支重命名为 %s,但 HEAD 没有更新!"
 936
 937#: builtin/branch.c:619
 938msgid "Branch is renamed, but update of config-file failed"
 939msgstr "分支被重命名,但更新 config 文件失败"
 940
 941#: builtin/branch.c:634
 942#, c-format
 943msgid "malformed object name %s"
 944msgstr "非法的对象名 %s"
 945
 946#: builtin/branch.c:658
 947#, c-format
 948msgid "could not write branch description template: %s\n"
 949msgstr "不能写分支描述模版:%s\n"
 950
 951#: builtin/branch.c:746
 952msgid "Failed to resolve HEAD as a valid ref."
 953msgstr "无法将 HEAD 解析为有效引用。"
 954
 955#: builtin/branch.c:751 builtin/clone.c:558
 956msgid "HEAD not found below refs/heads!"
 957msgstr "HEAD 没有位于 /refs/heads 之下!"
 958
 959#: builtin/branch.c:809
 960msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 961msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
 962
 963#: builtin/bundle.c:47
 964#, c-format
 965msgid "%s is okay\n"
 966msgstr "%s 可以\n"
 967
 968#: builtin/bundle.c:56
 969msgid "Need a repository to create a bundle."
 970msgstr "需要一个版本库来创建包。"
 971
 972#: builtin/bundle.c:60
 973msgid "Need a repository to unbundle."
 974msgstr "需要一个版本库来解包。"
 975
 976#: builtin/checkout.c:113 builtin/checkout.c:146
 977#, c-format
 978msgid "path '%s' does not have our version"
 979msgstr "路径 '%s' 没有我们的版本"
 980
 981#: builtin/checkout.c:115 builtin/checkout.c:148
 982#, c-format
 983msgid "path '%s' does not have their version"
 984msgstr "路径 '%s' 没有他们的版本"
 985
 986#: builtin/checkout.c:131
 987#, c-format
 988msgid "path '%s' does not have all necessary versions"
 989msgstr "路径 '%s' 没有全部必须的版本"
 990
 991#: builtin/checkout.c:175
 992#, c-format
 993msgid "path '%s' does not have necessary versions"
 994msgstr "路径 '%s' 没有必须的版本"
 995
 996#: builtin/checkout.c:192
 997#, c-format
 998msgid "path '%s': cannot merge"
 999msgstr "path '%s':无法合并"
1000
1001#: builtin/checkout.c:209
1002#, c-format
1003msgid "Unable to add merge result for '%s'"
1004msgstr "无法为 '%s' 添加合并结果"
1005
1006#: builtin/checkout.c:212 builtin/reset.c:158
1007#, c-format
1008msgid "make_cache_entry failed for path '%s'"
1009msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1010
1011#: builtin/checkout.c:234 builtin/checkout.c:392
1012msgid "corrupt index file"
1013msgstr "损坏的索引文件"
1014
1015#: builtin/checkout.c:264 builtin/checkout.c:271
1016#, c-format
1017msgid "path '%s' is unmerged"
1018msgstr "路径 '%s' 未合并"
1019
1020#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1021#: builtin/merge.c:811
1022msgid "unable to write new index file"
1023msgstr "无法写新的索引文件"
1024
1025#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1026msgid "diff_setup_done failed"
1027msgstr "diff_setup_done 失败"
1028
1029#: builtin/checkout.c:414
1030msgid "you need to resolve your current index first"
1031msgstr "您需要先解决当前索引的冲突"
1032
1033#: builtin/checkout.c:533
1034#, c-format
1035msgid "Can not do reflog for '%s'\n"
1036msgstr "不能对 '%s' 执行 reflog 操作\n"
1037
1038#: builtin/checkout.c:565
1039msgid "HEAD is now at"
1040msgstr "HEAD 目前位于"
1041
1042#: builtin/checkout.c:572
1043#, c-format
1044msgid "Reset branch '%s'\n"
1045msgstr "重置分支 '%s'\n"
1046
1047#: builtin/checkout.c:575
1048#, c-format
1049msgid "Already on '%s'\n"
1050msgstr "已经位于 '%s'\n"
1051
1052#: builtin/checkout.c:579
1053#, c-format
1054msgid "Switched to and reset branch '%s'\n"
1055msgstr "切换并重置分支 '%s'\n"
1056
1057#: builtin/checkout.c:581
1058#, c-format
1059msgid "Switched to a new branch '%s'\n"
1060msgstr "切换到一个新分支 '%s'\n"
1061
1062#: builtin/checkout.c:583
1063#, c-format
1064msgid "Switched to branch '%s'\n"
1065msgstr "切换到分支 '%s'\n"
1066
1067#  译者:注意保持前导空格
1068#: builtin/checkout.c:639
1069#, c-format
1070msgid " ... and %d more.\n"
1071msgstr " ... 及其它 %d 个。\n"
1072
1073#. The singular version
1074#: builtin/checkout.c:645
1075#, c-format
1076msgid ""
1077"Warning: you are leaving %d commit behind, not connected to\n"
1078"any of your branches:\n"
1079"\n"
1080"%s\n"
1081msgid_plural ""
1082"Warning: you are leaving %d commits behind, not connected to\n"
1083"any of your branches:\n"
1084"\n"
1085"%s\n"
1086msgstr[0] ""
1087"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1088"\n"
1089"%s\n"
1090
1091#: builtin/checkout.c:663
1092#, c-format
1093msgid ""
1094"If you want to keep them by creating a new branch, this may be a good time\n"
1095"to do so with:\n"
1096"\n"
1097" git branch new_branch_name %s\n"
1098"\n"
1099msgstr ""
1100"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1101"如下操作:\n"
1102"\n"
1103" git branch new_branch_name %s\n"
1104"\n"
1105
1106#: builtin/checkout.c:692
1107msgid "internal error in revision walk"
1108msgstr "在版本遍历时遇到内部错误"
1109
1110#: builtin/checkout.c:696
1111msgid "Previous HEAD position was"
1112msgstr "之前的 HEAD 位置是"
1113
1114#: builtin/checkout.c:722
1115msgid "You are on a branch yet to be born"
1116msgstr "您位于一个尚未初始化的分支"
1117
1118#. case (1)
1119#: builtin/checkout.c:853
1120#, c-format
1121msgid "invalid reference: %s"
1122msgstr "无效引用:%s"
1123
1124#. case (1): want a tree
1125#: builtin/checkout.c:892
1126#, c-format
1127msgid "reference is not a tree: %s"
1128msgstr "引用不是一个树:%s"
1129
1130#: builtin/checkout.c:972
1131msgid "-B cannot be used with -b"
1132msgstr "-B 不能和 -b 共用"
1133
1134#: builtin/checkout.c:981
1135msgid "--patch is incompatible with all other options"
1136msgstr "--patch 选项和其他选项不兼容"
1137
1138#: builtin/checkout.c:984
1139msgid "--detach cannot be used with -b/-B/--orphan"
1140msgstr "--detach 不能和 -b/-B/--orphan 共用"
1141
1142#: builtin/checkout.c:986
1143msgid "--detach cannot be used with -t"
1144msgstr "--detach 不能和 -t 共用"
1145
1146#: builtin/checkout.c:992
1147msgid "--track needs a branch name"
1148msgstr "--track 需要一个分支名"
1149
1150#: builtin/checkout.c:999
1151msgid "Missing branch name; try -b"
1152msgstr "缺少分支名;尝试 -b"
1153
1154#: builtin/checkout.c:1005
1155msgid "--orphan and -b|-B are mutually exclusive"
1156msgstr "--orphan 和 -b|-B 互斥"
1157
1158#: builtin/checkout.c:1007
1159msgid "--orphan cannot be used with -t"
1160msgstr "--orphan 不能和 -t 共用"
1161
1162#: builtin/checkout.c:1017
1163msgid "git checkout: -f and -m are incompatible"
1164msgstr "git checkout:-f 和 -m 不兼容"
1165
1166#: builtin/checkout.c:1051
1167msgid "invalid path specification"
1168msgstr "无效的路径规格"
1169
1170#: builtin/checkout.c:1059
1171#, c-format
1172msgid ""
1173"git checkout: updating paths is incompatible with switching branches.\n"
1174"Did you intend to checkout '%s' which can not be resolved as commit?"
1175msgstr ""
1176"git checkout:更新路径和切换分支不兼容。\n"
1177"您是想要检出 '%s' 但未能将其解析为提交么?"
1178
1179#: builtin/checkout.c:1061
1180msgid "git checkout: updating paths is incompatible with switching branches."
1181msgstr "git checkout:更新路径和切换分支不兼容。"
1182
1183#: builtin/checkout.c:1066
1184msgid "git checkout: --detach does not take a path argument"
1185msgstr "git checkout:--detach 不跟路径参数"
1186
1187#: builtin/checkout.c:1069
1188msgid ""
1189"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1190"checking out of the index."
1191msgstr ""
1192"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
1193
1194#: builtin/checkout.c:1088
1195msgid "Cannot switch branch to a non-commit."
1196msgstr "无法切换分支到一个非提交。"
1197
1198#: builtin/checkout.c:1091
1199msgid "--ours/--theirs is incompatible with switching branches."
1200msgstr "--ours/--theirs 和切换分支不兼容。"
1201
1202#: builtin/clean.c:78
1203msgid "-x and -X cannot be used together"
1204msgstr "-x 和 -X 不能共用"
1205
1206#: builtin/clean.c:82
1207msgid ""
1208"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1209msgstr ""
1210"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1211
1212#: builtin/clean.c:85
1213msgid ""
1214"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1215"clean"
1216msgstr ""
1217"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
1218
1219#: builtin/clean.c:155 builtin/clean.c:176
1220#, c-format
1221msgid "Would remove %s\n"
1222msgstr "将删除 %s\n"
1223
1224#: builtin/clean.c:159 builtin/clean.c:179
1225#, c-format
1226msgid "Removing %s\n"
1227msgstr "正删除 %s\n"
1228
1229#: builtin/clean.c:162 builtin/clean.c:182
1230#, c-format
1231msgid "failed to remove %s"
1232msgstr "无法删除 %s"
1233
1234#: builtin/clean.c:166
1235#, c-format
1236msgid "Would not remove %s\n"
1237msgstr "不会删除 %s\n"
1238
1239#: builtin/clean.c:168
1240#, c-format
1241msgid "Not removing %s\n"
1242msgstr "未删除 %s\n"
1243
1244#: builtin/clone.c:243
1245#, c-format
1246msgid "reference repository '%s' is not a local directory."
1247msgstr "引用版本库 '%s' 不是一个本地目录。"
1248
1249#: builtin/clone.c:302
1250#, c-format
1251msgid "failed to open '%s'"
1252msgstr "无法打开 '%s'"
1253
1254#: builtin/clone.c:306
1255#, c-format
1256msgid "failed to create directory '%s'"
1257msgstr "无法创建目录 '%s'"
1258
1259#: builtin/clone.c:308 builtin/diff.c:75
1260#, c-format
1261msgid "failed to stat '%s'"
1262msgstr "无法枚举 '%s' 状态"
1263
1264#: builtin/clone.c:310
1265#, c-format
1266msgid "%s exists and is not a directory"
1267msgstr "%s 存在且不是一个目录"
1268
1269#: builtin/clone.c:324
1270#, c-format
1271msgid "failed to stat %s\n"
1272msgstr "无法枚举 %s 状态\n"
1273
1274#: builtin/clone.c:341
1275#, c-format
1276msgid "failed to unlink '%s'"
1277msgstr "无法删除 '%s'"
1278
1279#: builtin/clone.c:346
1280#, c-format
1281msgid "failed to create link '%s'"
1282msgstr "无法创建链接 '%s'"
1283
1284#: builtin/clone.c:350
1285#, c-format
1286msgid "failed to copy file to '%s'"
1287msgstr "无法拷贝文件至 '%s'"
1288
1289#: builtin/clone.c:373
1290#, c-format
1291msgid "done.\n"
1292msgstr "完成。\n"
1293
1294#: builtin/clone.c:440
1295#, c-format
1296msgid "Could not find remote branch %s to clone."
1297msgstr "不能发现要克隆的远程分支 %s。"
1298
1299#: builtin/clone.c:549
1300msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1301msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
1302
1303#: builtin/clone.c:639
1304msgid "Too many arguments."
1305msgstr "太多参数。"
1306
1307#: builtin/clone.c:643
1308msgid "You must specify a repository to clone."
1309msgstr "您必须指定一个版本库来克隆。"
1310
1311#: builtin/clone.c:654
1312#, c-format
1313msgid "--bare and --origin %s options are incompatible."
1314msgstr "--bare 和 --origin %s 选项不兼容。"
1315
1316#: builtin/clone.c:668
1317#, c-format
1318msgid "repository '%s' does not exist"
1319msgstr "版本库 '%s' 不存在"
1320
1321#: builtin/clone.c:673
1322msgid "--depth is ignored in local clones; use file:// instead."
1323msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
1324
1325#: builtin/clone.c:683
1326#, c-format
1327msgid "destination path '%s' already exists and is not an empty directory."
1328msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
1329
1330#: builtin/clone.c:693
1331#, c-format
1332msgid "working tree '%s' already exists."
1333msgstr "工作区 '%s' 已经存在。"
1334
1335#: builtin/clone.c:706 builtin/clone.c:720
1336#, c-format
1337msgid "could not create leading directories of '%s'"
1338msgstr "不能为 '%s' 创建先导目录"
1339
1340#: builtin/clone.c:709
1341#, c-format
1342msgid "could not create work tree dir '%s'."
1343msgstr "不能为 '%s' 创建工作区目录。"
1344
1345#: builtin/clone.c:728
1346#, c-format
1347msgid "Cloning into bare repository '%s'...\n"
1348msgstr "克隆到裸版本库 '%s'...\n"
1349
1350#: builtin/clone.c:730
1351#, c-format
1352msgid "Cloning into '%s'...\n"
1353msgstr "正克隆到 '%s'...\n"
1354
1355#: builtin/clone.c:786
1356#, c-format
1357msgid "Don't know how to clone %s"
1358msgstr "不知道如何克隆 %s"
1359
1360#: builtin/clone.c:835
1361#, c-format
1362msgid "Remote branch %s not found in upstream %s"
1363msgstr "远程分支 %s 在上游 %s 未发现"
1364
1365#: builtin/clone.c:842
1366msgid "You appear to have cloned an empty repository."
1367msgstr "您似乎克隆了一个空版本库。"
1368
1369#: builtin/commit.c:42
1370msgid ""
1371"Your name and email address were configured automatically based\n"
1372"on your username and hostname. Please check that they are accurate.\n"
1373"You can suppress this message by setting them explicitly:\n"
1374"\n"
1375"    git config --global user.name \"Your Name\"\n"
1376"    git config --global user.email you@example.com\n"
1377"\n"
1378"After doing this, you may fix the identity used for this commit with:\n"
1379"\n"
1380"    git commit --amend --reset-author\n"
1381msgstr ""
1382"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
1383"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
1384"\n"
1385"    git config --global user.name \"Your Name\"\n"
1386"    git config --global user.email you@example.com\n"
1387"\n"
1388"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
1389"\n"
1390"    git commit --amend --reset-author\n"
1391
1392#: builtin/commit.c:54
1393msgid ""
1394"You asked to amend the most recent commit, but doing so would make\n"
1395"it empty. You can repeat your command with --allow-empty, or you can\n"
1396"remove the commit entirely with \"git reset HEAD^\".\n"
1397msgstr ""
1398"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
1399"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
1400
1401#: builtin/commit.c:59
1402msgid ""
1403"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
1404"If you wish to commit it anyway, use:\n"
1405"\n"
1406"    git commit --allow-empty\n"
1407"\n"
1408"Otherwise, please use 'git reset'\n"
1409msgstr ""
1410"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
1411"也要提交,使用命令:\n"
1412"\n"
1413"    git commit --allow-empty\n"
1414"\n"
1415"否则,请使用命令 'git reset'\n"
1416
1417#: builtin/commit.c:205 builtin/reset.c:33
1418msgid "merge"
1419msgstr "合并"
1420
1421#: builtin/commit.c:208
1422msgid "cherry-pick"
1423msgstr "拣选"
1424
1425#: builtin/commit.c:325
1426msgid "failed to unpack HEAD tree object"
1427msgstr "无法解包 HEAD 树对象"
1428
1429#: builtin/commit.c:367
1430msgid "unable to create temporary index"
1431msgstr "不能创建临时索引"
1432
1433#: builtin/commit.c:373
1434msgid "interactive add failed"
1435msgstr "交互式添加失败"
1436
1437#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
1438msgid "unable to write new_index file"
1439msgstr "无法写 new_index 文件"
1440
1441#  译者:%s若翻为中文,前后不需要空格
1442#: builtin/commit.c:457
1443#, c-format
1444msgid "cannot do a partial commit during a %s."
1445msgstr "在%s过程中不能做部分提交。"
1446
1447#: builtin/commit.c:466
1448msgid "cannot read the index"
1449msgstr "无法读取索引"
1450
1451#: builtin/commit.c:486
1452msgid "unable to write temporary index file"
1453msgstr "无法写临时索引文件"
1454
1455#: builtin/commit.c:550 builtin/commit.c:556
1456#, c-format
1457msgid "invalid commit: %s"
1458msgstr "无效的提交:%s"
1459
1460#: builtin/commit.c:579
1461msgid "malformed --author parameter"
1462msgstr "非法的 --author 参数"
1463
1464#: builtin/commit.c:635
1465#, c-format
1466msgid "Malformed ident string: '%s'"
1467msgstr "非法的身份字符串:'%s'"
1468
1469#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
1470#, c-format
1471msgid "could not lookup commit %s"
1472msgstr "不能查询提交 %s"
1473
1474#: builtin/commit.c:682 builtin/shortlog.c:296
1475#, c-format
1476msgid "(reading log message from standard input)\n"
1477msgstr "(正从标准输入中读取日志信息)\n"
1478
1479#: builtin/commit.c:684
1480msgid "could not read log from standard input"
1481msgstr "不能从标准输入中读取日志信息"
1482
1483#: builtin/commit.c:688
1484#, c-format
1485msgid "could not read log file '%s'"
1486msgstr "不能读取日志文件 '%s'"
1487
1488#: builtin/commit.c:694
1489msgid "commit has empty message"
1490msgstr "提交说明为空"
1491
1492#: builtin/commit.c:710
1493msgid "could not read MERGE_MSG"
1494msgstr "不能读取 MERGE_MSG"
1495
1496#: builtin/commit.c:714
1497msgid "could not read SQUASH_MSG"
1498msgstr "不能读取 SQUASH_MSG"
1499
1500#: builtin/commit.c:718
1501#, c-format
1502msgid "could not read '%s'"
1503msgstr "不能读取 '%s'"
1504
1505#: builtin/commit.c:746
1506#, c-format
1507msgid "could not open '%s'"
1508msgstr "不能打开 '%s'"
1509
1510#: builtin/commit.c:770
1511msgid "could not write commit template"
1512msgstr "不能写提交模版"
1513
1514#  译者:%s若翻为中文,前后不需要空格
1515#: builtin/commit.c:783
1516#, c-format
1517msgid ""
1518"\n"
1519"It looks like you may be committing a %s.\n"
1520"If this is not correct, please remove the file\n"
1521"\t%s\n"
1522"and try again.\n"
1523msgstr ""
1524"\n"
1525"看起来您正在提交一个%s。\n"
1526"如果不是这样,请删除文件\n"
1527"\t%s\n"
1528"然后重试。\n"
1529
1530#: builtin/commit.c:796
1531msgid "Please enter the commit message for your changes."
1532msgstr "请为您的修改输入提交说明。"
1533
1534#  译者:中文字符串拼接,可删除前导空格
1535#: builtin/commit.c:799
1536msgid ""
1537" Lines starting\n"
1538"with '#' will be ignored, and an empty message aborts the commit.\n"
1539msgstr ""
1540"以 '#' 开头\n"
1541"的行将被忽略,并且空的提交说明将会中止提交。\n"
1542
1543#  译者:中文字符串拼接,可删除前导空格
1544#: builtin/commit.c:804
1545msgid ""
1546" Lines starting\n"
1547"with '#' will be kept; you may remove them yourself if you want to.\n"
1548"An empty message aborts the commit.\n"
1549msgstr ""
1550"以 '#' 开头\n"
1551"的行将被保留,您可以删除它们如果您想这样做的话。空的提交说明将会\n"
1552"中止提交。\n"
1553
1554#  译者:为保证在输出中对齐,注意调整句中空格!
1555#: builtin/commit.c:816
1556#, c-format
1557msgid "%sAuthor:    %s"
1558msgstr "%s作者:     %s"
1559
1560#  译者:为保证在输出中对齐,注意调整句中空格!
1561#: builtin/commit.c:823
1562#, c-format
1563msgid "%sCommitter: %s"
1564msgstr "%s提交者:   %s"
1565
1566#: builtin/commit.c:843
1567msgid "Cannot read index"
1568msgstr "无法读取索引"
1569
1570#: builtin/commit.c:880
1571msgid "Error building trees"
1572msgstr "无法创建树对象"
1573
1574#: builtin/commit.c:895 builtin/tag.c:357
1575#, c-format
1576msgid "Please supply the message using either -m or -F option.\n"
1577msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
1578
1579#: builtin/commit.c:975
1580#, c-format
1581msgid "No existing author found with '%s'"
1582msgstr "没有找到匹配 '%s' 的作者"
1583
1584#: builtin/commit.c:990 builtin/commit.c:1182
1585#, c-format
1586msgid "Invalid untracked files mode '%s'"
1587msgstr "无效的未追踪文件参数 '%s'"
1588
1589#: builtin/commit.c:1030
1590msgid "Using both --reset-author and --author does not make sense"
1591msgstr "同时使用 --reset-author 和 --author 没有意义"
1592
1593#: builtin/commit.c:1041
1594msgid "You have nothing to amend."
1595msgstr "您没有可修补的提交。"
1596
1597#  译者:%s若翻为中文,前后不需要空格
1598#: builtin/commit.c:1043
1599#, c-format
1600msgid "You are in the middle of a %s -- cannot amend."
1601msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
1602
1603#: builtin/commit.c:1045
1604msgid "Options --squash and --fixup cannot be used together"
1605msgstr "选项 --squash 和 --fixup 不能共用"
1606
1607#: builtin/commit.c:1055
1608msgid "Only one of -c/-C/-F/--fixup can be used."
1609msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
1610
1611#: builtin/commit.c:1057
1612msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
1613msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
1614
1615#: builtin/commit.c:1063
1616msgid "--reset-author can be used only with -C, -c or --amend."
1617msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
1618
1619#: builtin/commit.c:1080
1620msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
1621msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
1622
1623#: builtin/commit.c:1082
1624msgid "No paths with --include/--only does not make sense."
1625msgstr "参数 --include/--only 不跟路径没有意义。"
1626
1627#: builtin/commit.c:1084
1628msgid "Clever... amending the last one with dirty index."
1629msgstr "聪明... 在索引不干净下修补最后的提交。"
1630
1631#: builtin/commit.c:1086
1632msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
1633msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
1634
1635#: builtin/commit.c:1096 builtin/tag.c:556
1636#, c-format
1637msgid "Invalid cleanup mode %s"
1638msgstr "无效的清理模式 %s"
1639
1640#: builtin/commit.c:1101
1641msgid "Paths with -a does not make sense."
1642msgstr "路径和 -a 选项共用没有意义。"
1643
1644#: builtin/commit.c:1280
1645msgid "couldn't look up newly created commit"
1646msgstr "无法找到新创建的提交"
1647
1648#: builtin/commit.c:1282
1649msgid "could not parse newly created commit"
1650msgstr "不能解析新创建的提交"
1651
1652#: builtin/commit.c:1323
1653msgid "detached HEAD"
1654msgstr "分离头指针"
1655
1656#  译者:中文字符串拼接,可删除前导空格
1657#: builtin/commit.c:1325
1658msgid " (root-commit)"
1659msgstr "(根提交)"
1660
1661#: builtin/commit.c:1415
1662msgid "could not parse HEAD commit"
1663msgstr "不能解析 HEAD 提交"
1664
1665#: builtin/commit.c:1452 builtin/merge.c:509
1666#, c-format
1667msgid "could not open '%s' for reading"
1668msgstr "不能为读入打开 '%s'"
1669
1670#: builtin/commit.c:1459
1671#, c-format
1672msgid "Corrupt MERGE_HEAD file (%s)"
1673msgstr "损坏的 MERGE_HEAD 文件(%s)"
1674
1675#: builtin/commit.c:1466
1676msgid "could not read MERGE_MODE"
1677msgstr "不能读取 MERGE_MODE"
1678
1679#: builtin/commit.c:1485
1680#, c-format
1681msgid "could not read commit message: %s"
1682msgstr "不能读取提交说明:%s"
1683
1684#: builtin/commit.c:1499
1685#, c-format
1686msgid "Aborting commit due to empty commit message.\n"
1687msgstr "终止提交因为提交说明为空。\n"
1688
1689#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968
1690msgid "failed to write commit object"
1691msgstr "无法写提交对象"
1692
1693#: builtin/commit.c:1535
1694msgid "cannot lock HEAD ref"
1695msgstr "无法锁定 HEAD 引用"
1696
1697#: builtin/commit.c:1539
1698msgid "cannot update HEAD ref"
1699msgstr "无法更新 HEAD 引用"
1700
1701#: builtin/commit.c:1550
1702msgid ""
1703"Repository has been updated, but unable to write\n"
1704"new_index file. Check that disk is not full or quota is\n"
1705"not exceeded, and then \"git reset HEAD\" to recover."
1706msgstr ""
1707"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
1708"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
1709
1710#: builtin/describe.c:234
1711#, c-format
1712msgid "annotated tag %s not available"
1713msgstr "注释 tag %s 无效"
1714
1715#: builtin/describe.c:238
1716#, c-format
1717msgid "annotated tag %s has no embedded name"
1718msgstr "注释 tag %s 没有嵌入名称"
1719
1720#: builtin/describe.c:240
1721#, c-format
1722msgid "tag '%s' is really '%s' here"
1723msgstr "tag '%s' 的确是在 '%s'"
1724
1725#: builtin/describe.c:267
1726#, c-format
1727msgid "Not a valid object name %s"
1728msgstr "不是一个有效的对象名 %s"
1729
1730#: builtin/describe.c:270
1731#, c-format
1732msgid "%s is not a valid '%s' object"
1733msgstr "%s 不是一个有效的 '%s' 对象"
1734
1735#: builtin/describe.c:287
1736#, c-format
1737msgid "no tag exactly matches '%s'"
1738msgstr "没有 tag 准确匹配 '%s'"
1739
1740#: builtin/describe.c:289
1741#, c-format
1742msgid "searching to describe %s\n"
1743msgstr "搜索描述 %s\n"
1744
1745#: builtin/describe.c:329
1746#, c-format
1747msgid "finished search at %s\n"
1748msgstr "完成搜索 %s\n"
1749
1750#: builtin/describe.c:353
1751#, c-format
1752msgid ""
1753"No annotated tags can describe '%s'.\n"
1754"However, there were unannotated tags: try --tags."
1755msgstr ""
1756"没有注释 tag 能描述 '%s'。\n"
1757"然而,有非注释 tag:尝试 --tags。"
1758
1759#: builtin/describe.c:357
1760#, c-format
1761msgid ""
1762"No tags can describe '%s'.\n"
1763"Try --always, or create some tags."
1764msgstr ""
1765"没有注释 tag 能描述 '%s'。\n"
1766"尝试 --always,或者创建一些 tag。"
1767
1768#: builtin/describe.c:378
1769#, c-format
1770msgid "traversed %lu commits\n"
1771msgstr "已遍历 %lu 个提交\n"
1772
1773#: builtin/describe.c:381
1774#, c-format
1775msgid ""
1776"more than %i tags found; listed %i most recent\n"
1777"gave up search at %s\n"
1778msgstr ""
1779"发现多于 %i 个 tag,列出最近的 %i 个\n"
1780"在 %s 放弃搜索\n"
1781
1782#: builtin/describe.c:436
1783msgid "--long is incompatible with --abbrev=0"
1784msgstr "--long 与 --abbrev=0 不兼容"
1785
1786#: builtin/describe.c:462
1787msgid "No names found, cannot describe anything."
1788msgstr "没有发现名称,无法描述任何东西。"
1789
1790#: builtin/describe.c:482
1791msgid "--dirty is incompatible with committishes"
1792msgstr "--dirty 不能与提交共用"
1793
1794#: builtin/diff.c:77
1795#, c-format
1796msgid "'%s': not a regular file or symlink"
1797msgstr "'%s':不是一个正规文件或符号链接"
1798
1799#: builtin/diff.c:220
1800#, c-format
1801msgid "invalid option: %s"
1802msgstr "无效选项:%s"
1803
1804#: builtin/diff.c:297
1805msgid "Not a git repository"
1806msgstr "不是一个 git 版本库"
1807
1808#: builtin/diff.c:347
1809#, c-format
1810msgid "invalid object '%s' given."
1811msgstr "提供了无效对象 '%s'。"
1812
1813#: builtin/diff.c:352
1814#, c-format
1815msgid "more than %d trees given: '%s'"
1816msgstr "提供了超过 %d 个树对象:'%s'"
1817
1818#: builtin/diff.c:362
1819#, c-format
1820msgid "more than two blobs given: '%s'"
1821msgstr "提供了超过两个 blob 对象:'%s'"
1822
1823#: builtin/diff.c:370
1824#, c-format
1825msgid "unhandled object '%s' given."
1826msgstr "提供了无法处理的对象 '%s'。"
1827
1828#: builtin/fetch.c:200
1829msgid "Couldn't find remote ref HEAD"
1830msgstr "无法发现远程 HEAD 引用"
1831
1832#: builtin/fetch.c:252
1833#, c-format
1834msgid "object %s not found"
1835msgstr "对象 %s 未发现"
1836
1837#: builtin/fetch.c:258
1838msgid "[up to date]"
1839msgstr "[最新]"
1840
1841#: builtin/fetch.c:272
1842#, c-format
1843msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
1844msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
1845
1846#: builtin/fetch.c:273 builtin/fetch.c:351
1847msgid "[rejected]"
1848msgstr "[已拒绝]"
1849
1850#: builtin/fetch.c:284
1851msgid "[tag update]"
1852msgstr "[tag更新]"
1853
1854#  译者:注意保持前导空格
1855#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
1856msgid "  (unable to update local ref)"
1857msgstr "  (不能更新本地引用)"
1858
1859#: builtin/fetch.c:298
1860msgid "[new tag]"
1861msgstr "[新tag]"
1862
1863#: builtin/fetch.c:302
1864msgid "[new branch]"
1865msgstr "[新分支]"
1866
1867#: builtin/fetch.c:347
1868msgid "unable to update local ref"
1869msgstr "不能更新本地引用"
1870
1871#: builtin/fetch.c:347
1872msgid "forced update"
1873msgstr "强制更新"
1874
1875#: builtin/fetch.c:353
1876msgid "(non-fast-forward)"
1877msgstr "(非快进式)"
1878
1879#: builtin/fetch.c:384 builtin/fetch.c:676
1880#, c-format
1881msgid "cannot open %s: %s\n"
1882msgstr "无法打开 %s:%s\n"
1883
1884#: builtin/fetch.c:393
1885#, c-format
1886msgid "%s did not send all necessary objects\n"
1887msgstr "%s 未发送所有必须的对象\n"
1888
1889#: builtin/fetch.c:479
1890#, c-format
1891msgid "From %.*s\n"
1892msgstr "来自 %.*s\n"
1893
1894#: builtin/fetch.c:490
1895#, c-format
1896msgid ""
1897"some local refs could not be updated; try running\n"
1898" 'git remote prune %s' to remove any old, conflicting branches"
1899msgstr ""
1900"一些本地引用不能被更新;尝试运行\n"
1901" 'git remote prune %s' 来删除旧的、有冲突的分支"
1902
1903#  译者:注意保持前导空格
1904#: builtin/fetch.c:540
1905#, c-format
1906msgid "   (%s will become dangling)\n"
1907msgstr "   (%s 将成为悬空状态)\n"
1908
1909#  译者:注意保持前导空格
1910#: builtin/fetch.c:541
1911#, c-format
1912msgid "   (%s has become dangling)\n"
1913msgstr "   (%s 已成为悬空状态)\n"
1914
1915#: builtin/fetch.c:548
1916msgid "[deleted]"
1917msgstr "[已删除]"
1918
1919#: builtin/fetch.c:549
1920msgid "(none)"
1921msgstr "(无)"
1922
1923#: builtin/fetch.c:666
1924#, c-format
1925msgid "Refusing to fetch into current branch %s of non-bare repository"
1926msgstr "拒绝获取到非裸版本库的当前分支 %s"
1927
1928#: builtin/fetch.c:700
1929#, c-format
1930msgid "Don't know how to fetch from %s"
1931msgstr "不知道如何从 %s 获取"
1932
1933#: builtin/fetch.c:777
1934#, c-format
1935msgid "Option \"%s\" value \"%s\" is not valid for %s"
1936msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
1937
1938#: builtin/fetch.c:780
1939#, c-format
1940msgid "Option \"%s\" is ignored for %s\n"
1941msgstr "选项 \"%s\" 对于 %s 被忽略\n"
1942
1943#: builtin/fetch.c:879
1944#, c-format
1945msgid "Fetching %s\n"
1946msgstr "正在获取 %s\n"
1947
1948#: builtin/fetch.c:881
1949#, c-format
1950msgid "Could not fetch %s"
1951msgstr "不能获取 %s"
1952
1953#: builtin/fetch.c:898
1954msgid ""
1955"No remote repository specified.  Please, specify either a URL or a\n"
1956"remote name from which new revisions should be fetched."
1957msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
1958
1959#: builtin/fetch.c:918
1960msgid "You need to specify a tag name."
1961msgstr "您需要指定一个 tag 名称。"
1962
1963#: builtin/fetch.c:970
1964msgid "fetch --all does not take a repository argument"
1965msgstr "fetch --all 不能带一个版本库参数"
1966
1967#: builtin/fetch.c:972
1968msgid "fetch --all does not make sense with refspecs"
1969msgstr "fetch --all 带引用表达式没有任何意义"
1970
1971#: builtin/fetch.c:983
1972#, c-format
1973msgid "No such remote or remote group: %s"
1974msgstr "没有这样的远程或远程组:%s"
1975
1976#: builtin/fetch.c:991
1977msgid "Fetching a group and specifying refspecs does not make sense"
1978msgstr "获取组并指定引用表达式没有意义"
1979
1980#: builtin/gc.c:63
1981#, c-format
1982msgid "Invalid %s: '%s'"
1983msgstr "无效的 %s:'%s'"
1984
1985#: builtin/gc.c:78
1986msgid "Too many options specified"
1987msgstr "指定了太多的选项"
1988
1989#: builtin/gc.c:103
1990#, c-format
1991msgid "insanely long object directory %.*s"
1992msgstr "不正常的长对象目录 %.*s"
1993
1994#: builtin/gc.c:223
1995#, c-format
1996msgid "Auto packing the repository for optimum performance.\n"
1997msgstr "自动打包版本库以求最佳性能。\n"
1998
1999#: builtin/gc.c:226
2000#, c-format
2001msgid ""
2002"Auto packing the repository for optimum performance. You may also\n"
2003"run \"git gc\" manually. See \"git help gc\" for more information.\n"
2004msgstr ""
2005"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2006"参见 \"git help gc\" 以获取更多信息。\n"
2007
2008#: builtin/gc.c:256
2009msgid ""
2010"There are too many unreachable loose objects; run 'git prune' to remove them."
2011msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
2012
2013#: builtin/grep.c:216
2014#, c-format
2015msgid "grep: failed to create thread: %s"
2016msgstr "grep:无法创建线程:%s"
2017
2018#: builtin/grep.c:402
2019#, c-format
2020msgid "Failed to chdir: %s"
2021msgstr "无法切换目录:%s"
2022
2023#: builtin/grep.c:478 builtin/grep.c:512
2024#, c-format
2025msgid "unable to read tree (%s)"
2026msgstr "无法读取树(%s)"
2027
2028#: builtin/grep.c:526
2029#, c-format
2030msgid "unable to grep from object of type %s"
2031msgstr "无法抓取来自于 %s 类型的对象"
2032
2033#: builtin/grep.c:584
2034#, c-format
2035msgid "switch `%c' expects a numerical value"
2036msgstr "开关 `%c' 期望一个数字值"
2037
2038#: builtin/grep.c:601
2039#, c-format
2040msgid "cannot open '%s'"
2041msgstr "不能打开 '%s'"
2042
2043#: builtin/grep.c:888
2044msgid "no pattern given."
2045msgstr "未提供模式匹配。"
2046
2047#: builtin/grep.c:902
2048#, c-format
2049msgid "bad object %s"
2050msgstr "坏对象 %s"
2051
2052#: builtin/grep.c:943
2053msgid "--open-files-in-pager only works on the worktree"
2054msgstr "--open-files-in-pager 仅用于工作区"
2055
2056#: builtin/grep.c:966
2057msgid "--cached or --untracked cannot be used with --no-index."
2058msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
2059
2060#: builtin/grep.c:971
2061msgid "--no-index or --untracked cannot be used with revs."
2062msgstr "--no-index 或 --untracked 不能和版本共用。"
2063
2064#: builtin/grep.c:974
2065msgid "--[no-]exclude-standard cannot be used for tracked contents."
2066msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2067
2068#: builtin/grep.c:982
2069msgid "both --cached and trees are given."
2070msgstr "同时给出了 --cached 和树对象。"
2071
2072#: builtin/init-db.c:35
2073#, c-format
2074msgid "Could not make %s writable by group"
2075msgstr "不能设置 %s 为组可写"
2076
2077#: builtin/init-db.c:62
2078#, c-format
2079msgid "insanely long template name %s"
2080msgstr "太长的模版名 %s"
2081
2082#: builtin/init-db.c:67
2083#, c-format
2084msgid "cannot stat '%s'"
2085msgstr "不能枚举 '%s' 状态"
2086
2087#: builtin/init-db.c:73
2088#, c-format
2089msgid "cannot stat template '%s'"
2090msgstr "不能枚举模版 '%s' 状态"
2091
2092#: builtin/init-db.c:80
2093#, c-format
2094msgid "cannot opendir '%s'"
2095msgstr "不能打开目录 '%s'"
2096
2097#: builtin/init-db.c:97
2098#, c-format
2099msgid "cannot readlink '%s'"
2100msgstr "不能读取链接 '%s'"
2101
2102#: builtin/init-db.c:99
2103#, c-format
2104msgid "insanely long symlink %s"
2105msgstr "太长的符号链接 %s"
2106
2107#: builtin/init-db.c:102
2108#, c-format
2109msgid "cannot symlink '%s' '%s'"
2110msgstr "不能自 '%s' 到 '%s' 创建符号链接"
2111
2112#: builtin/init-db.c:106
2113#, c-format
2114msgid "cannot copy '%s' to '%s'"
2115msgstr "不能拷贝 '%s' 至 '%s'"
2116
2117#: builtin/init-db.c:110
2118#, c-format
2119msgid "ignoring template %s"
2120msgstr "忽略模版 %s"
2121
2122#: builtin/init-db.c:133
2123#, c-format
2124msgid "insanely long template path %s"
2125msgstr "太长的模版路径 %s"
2126
2127#: builtin/init-db.c:141
2128#, c-format
2129msgid "templates not found %s"
2130msgstr "模版未找到 %s"
2131
2132#: builtin/init-db.c:154
2133#, c-format
2134msgid "not copying templates of a wrong format version %d from '%s'"
2135msgstr "未复制错误版本 %d 的模版自 '%s'"
2136
2137#: builtin/init-db.c:192
2138#, c-format
2139msgid "insane git directory %s"
2140msgstr "不正常的 git 目录 %s"
2141
2142#: builtin/init-db.c:322 builtin/init-db.c:325
2143#, c-format
2144msgid "%s already exists"
2145msgstr "%s 已经存在"
2146
2147#: builtin/init-db.c:354
2148#, c-format
2149msgid "unable to handle file type %d"
2150msgstr "不能处理 %d 类型的文件"
2151
2152#: builtin/init-db.c:357
2153#, c-format
2154msgid "unable to move %s to %s"
2155msgstr "不能移动 %s 至 %s"
2156
2157#: builtin/init-db.c:362
2158#, c-format
2159msgid "Could not create git link %s"
2160msgstr "不能创建 git link %s"
2161
2162#.
2163#. * TRANSLATORS: The first '%s' is either "Reinitialized
2164#. * existing" or "Initialized empty", the second " shared" or
2165#. * "", and the last '%s%s' is the verbatim directory name.
2166#.
2167#: builtin/init-db.c:419
2168#, c-format
2169msgid "%s%s Git repository in %s%s\n"
2170msgstr "%s%s Git 版本库于 %s%s\n"
2171
2172#: builtin/init-db.c:420
2173msgid "Reinitialized existing"
2174msgstr "重新初始化现存的"
2175
2176#: builtin/init-db.c:420
2177msgid "Initialized empty"
2178msgstr "初始化空的"
2179
2180#  译者:中文字符串拼接,可删除前导空格
2181#: builtin/init-db.c:421
2182msgid " shared"
2183msgstr "共享"
2184
2185#: builtin/init-db.c:440
2186msgid "cannot tell cwd"
2187msgstr "无法获知当前路径"
2188
2189#: builtin/init-db.c:521 builtin/init-db.c:528
2190#, c-format
2191msgid "cannot mkdir %s"
2192msgstr "不能创建目录 %s"
2193
2194#: builtin/init-db.c:532
2195#, c-format
2196msgid "cannot chdir to %s"
2197msgstr "不能切换目录到 %s"
2198
2199#: builtin/init-db.c:554
2200#, c-format
2201msgid ""
2202"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
2203"dir=<directory>)"
2204msgstr ""
2205"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-dir=<directory>)"
2206
2207#: builtin/init-db.c:578
2208msgid "Cannot access current working directory"
2209msgstr "不能访问当前工作目录"
2210
2211#: builtin/init-db.c:585
2212#, c-format
2213msgid "Cannot access work tree '%s'"
2214msgstr "不能访问工作区 '%s'"
2215
2216#: builtin/log.c:187
2217#, c-format
2218msgid "Final output: %d %s\n"
2219msgstr "最终输出:%d %s\n"
2220
2221#: builtin/log.c:395 builtin/log.c:483
2222#, c-format
2223msgid "Could not read object %s"
2224msgstr "不能读取对象 %s"
2225
2226#: builtin/log.c:507
2227#, c-format
2228msgid "Unknown type: %d"
2229msgstr "未知类型:%d"
2230
2231#: builtin/log.c:596
2232msgid "format.headers without value"
2233msgstr "format.headers 没有值"
2234
2235#: builtin/log.c:669
2236msgid "name of output directory is too long"
2237msgstr "输出目录名太长"
2238
2239#: builtin/log.c:680
2240#, c-format
2241msgid "Cannot open patch file %s"
2242msgstr "无法打开补丁文件 %s"
2243
2244#: builtin/log.c:694
2245msgid "Need exactly one range."
2246msgstr "只需要一个范围。"
2247
2248#: builtin/log.c:702
2249msgid "Not a range."
2250msgstr "不是一个范围。"
2251
2252#: builtin/log.c:739
2253msgid "Could not extract email from committer identity."
2254msgstr "不能从提交者身份中提取邮件地址。"
2255
2256#: builtin/log.c:785
2257msgid "Cover letter needs email format"
2258msgstr "信封需要邮件地址格式"
2259
2260#: builtin/log.c:879
2261#, c-format
2262msgid "insane in-reply-to: %s"
2263msgstr "不正常的 in-reply-to:%s"
2264
2265#: builtin/log.c:952
2266msgid "Two output directories?"
2267msgstr "两个输出目录?"
2268
2269#: builtin/log.c:1173
2270#, c-format
2271msgid "bogus committer info %s"
2272msgstr "虚假的提交者信息 %s"
2273
2274#: builtin/log.c:1218
2275msgid "-n and -k are mutually exclusive."
2276msgstr "-n 和 -k 互斥。"
2277
2278#: builtin/log.c:1220
2279msgid "--subject-prefix and -k are mutually exclusive."
2280msgstr "--subject-prefix 和 -k 互斥。"
2281
2282#: builtin/log.c:1225 builtin/shortlog.c:284
2283#, c-format
2284msgid "unrecognized argument: %s"
2285msgstr "未识别的参数:%s"
2286
2287#: builtin/log.c:1228
2288msgid "--name-only does not make sense"
2289msgstr "--name-only 无意义"
2290
2291#: builtin/log.c:1230
2292msgid "--name-status does not make sense"
2293msgstr "--name-status 无意义"
2294
2295#: builtin/log.c:1232
2296msgid "--check does not make sense"
2297msgstr "--check 无意义"
2298
2299#: builtin/log.c:1255
2300msgid "standard output, or directory, which one?"
2301msgstr "标准输出或目录,哪一个?"
2302
2303#: builtin/log.c:1257
2304#, c-format
2305msgid "Could not create directory '%s'"
2306msgstr "不能创建目录 '%s'"
2307
2308#: builtin/log.c:1410
2309msgid "Failed to create output files"
2310msgstr "无法创建输出文件"
2311
2312#: builtin/log.c:1514
2313#, c-format
2314msgid ""
2315"Could not find a tracked remote branch, please specify <upstream> manually.\n"
2316msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
2317
2318#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
2319#, c-format
2320msgid "Unknown commit %s"
2321msgstr "未知提交 %s"
2322
2323#: builtin/merge.c:91
2324msgid "switch `m' requires a value"
2325msgstr "开关 `m' 需要一个值"
2326
2327#: builtin/merge.c:128
2328#, c-format
2329msgid "Could not find merge strategy '%s'.\n"
2330msgstr "不能找到合并策略 '%s'。\n"
2331
2332#: builtin/merge.c:129
2333#, c-format
2334msgid "Available strategies are:"
2335msgstr "可用的策略有:"
2336
2337#: builtin/merge.c:134
2338#, c-format
2339msgid "Available custom strategies are:"
2340msgstr "可用的自定义策略有:"
2341
2342#: builtin/merge.c:241
2343msgid "could not run stash."
2344msgstr "不能进行进度保存。"
2345
2346#: builtin/merge.c:246
2347msgid "stash failed"
2348msgstr "进度保存失败"
2349
2350#: builtin/merge.c:251
2351#, c-format
2352msgid "not a valid object: %s"
2353msgstr "不是一个有效对象:%s"
2354
2355#: builtin/merge.c:270 builtin/merge.c:287
2356msgid "read-tree failed"
2357msgstr "读取树失败"
2358
2359#  译者:注意保持前导空格
2360#: builtin/merge.c:317
2361msgid " (nothing to squash)"
2362msgstr " (无可压缩)"
2363
2364#: builtin/merge.c:330
2365#, c-format
2366msgid "Squash commit -- not updating HEAD\n"
2367msgstr "压缩提交 -- 未更新 HEAD\n"
2368
2369#: builtin/merge.c:362
2370msgid "Writing SQUASH_MSG"
2371msgstr "写入 SQUASH_MSG"
2372
2373#: builtin/merge.c:364
2374msgid "Finishing SQUASH_MSG"
2375msgstr "完成 SQUASH_MSG"
2376
2377#: builtin/merge.c:386
2378#, c-format
2379msgid "No merge message -- not updating HEAD\n"
2380msgstr "无合并信息 -- 未更新 HEAD\n"
2381
2382#: builtin/merge.c:437
2383#, c-format
2384msgid "'%s' does not point to a commit"
2385msgstr "'%s' 没有指向一个提交"
2386
2387#: builtin/merge.c:536
2388#, c-format
2389msgid "Bad branch.%s.mergeoptions string: %s"
2390msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
2391
2392#: builtin/merge.c:629
2393msgid "git write-tree failed to write a tree"
2394msgstr "git write-tree 无法写入一树对象"
2395
2396#: builtin/merge.c:679
2397msgid "failed to read the cache"
2398msgstr "无法读取缓存"
2399
2400#: builtin/merge.c:696
2401msgid "Unable to write index."
2402msgstr "不能写索引。"
2403
2404#: builtin/merge.c:709
2405msgid "Not handling anything other than two heads merge."
2406msgstr "不能处理两个头合并之外的任何操作。"
2407
2408#: builtin/merge.c:723
2409#, c-format
2410msgid "Unknown option for merge-recursive: -X%s"
2411msgstr "merge-recursive 的未知选项:-X%s"
2412
2413#: builtin/merge.c:737
2414#, c-format
2415msgid "unable to write %s"
2416msgstr "不能写 %s"
2417
2418#: builtin/merge.c:876
2419#, c-format
2420msgid "Could not read from '%s'"
2421msgstr "不能从 '%s' 读取"
2422
2423#: builtin/merge.c:885
2424#, c-format
2425msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2426msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
2427
2428#: builtin/merge.c:891
2429msgid ""
2430"Please enter a commit message to explain why this merge is necessary,\n"
2431"especially if it merges an updated upstream into a topic branch.\n"
2432"\n"
2433"Lines starting with '#' will be ignored, and an empty message aborts\n"
2434"the commit.\n"
2435msgstr ""
2436"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
2437"合并到主题分支。\n"
2438"\n"
2439"以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
2440
2441#: builtin/merge.c:915
2442msgid "Empty commit message."
2443msgstr "空提交信息。"
2444
2445#: builtin/merge.c:927
2446#, c-format
2447msgid "Wonderful.\n"
2448msgstr "太棒了。\n"
2449
2450#: builtin/merge.c:1000
2451#, c-format
2452msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2453msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
2454
2455#: builtin/merge.c:1016
2456#, c-format
2457msgid "'%s' is not a commit"
2458msgstr "'%s' 不是一个提交"
2459
2460#: builtin/merge.c:1057
2461msgid "No current branch."
2462msgstr "没有当前分支。"
2463
2464#: builtin/merge.c:1059
2465msgid "No remote for the current branch."
2466msgstr "当前分支没有对应的远程版本库。"
2467
2468#: builtin/merge.c:1061
2469msgid "No default upstream defined for the current branch."
2470msgstr "当前分支没有定义默认的上游分支。"
2471
2472#: builtin/merge.c:1066
2473#, c-format
2474msgid "No remote tracking branch for %s from %s"
2475msgstr "%s 没有来自 %s 的远程跟踪分支"
2476
2477#: builtin/merge.c:1188
2478msgid "There is no merge to abort (MERGE_HEAD missing)."
2479msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
2480
2481#: builtin/merge.c:1204 git-pull.sh:31
2482msgid ""
2483"You have not concluded your merge (MERGE_HEAD exists).\n"
2484"Please, commit your changes before you can merge."
2485msgstr ""
2486"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
2487"请在合并前先提交您的修改。"
2488
2489#: builtin/merge.c:1207 git-pull.sh:34
2490msgid "You have not concluded your merge (MERGE_HEAD exists)."
2491msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
2492
2493#: builtin/merge.c:1211
2494msgid ""
2495"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2496"Please, commit your changes before you can merge."
2497msgstr ""
2498"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
2499"请在合并前先提交您的修改。"
2500
2501#: builtin/merge.c:1214
2502msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2503msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
2504
2505#: builtin/merge.c:1223
2506msgid "You cannot combine --squash with --no-ff."
2507msgstr "您不能将 --squash 与 --no-ff 共用。"
2508
2509#: builtin/merge.c:1228
2510msgid "You cannot combine --no-ff with --ff-only."
2511msgstr "您不能将 --no-ff 与 --ff-only 共用。"
2512
2513#: builtin/merge.c:1235
2514msgid "No commit specified and merge.defaultToUpstream not set."
2515msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
2516
2517#: builtin/merge.c:1266
2518msgid "Can merge only exactly one commit into empty head"
2519msgstr "只能将一个提交合并到空分支上"
2520
2521#: builtin/merge.c:1269
2522msgid "Squash commit into empty head not supported yet"
2523msgstr "尚不支持到空分支的压缩提交"
2524
2525#: builtin/merge.c:1271
2526msgid "Non-fast-forward commit does not make sense into an empty head"
2527msgstr "到空分支的非快进式提交没有意义"
2528
2529#: builtin/merge.c:1275 builtin/merge.c:1319
2530#, c-format
2531msgid "%s - not something we can merge"
2532msgstr "%s - 不能被合并"
2533
2534#: builtin/merge.c:1385
2535#, c-format
2536msgid "Updating %s..%s\n"
2537msgstr "更新 %s..%s\n"
2538
2539#: builtin/merge.c:1423
2540#, c-format
2541msgid "Trying really trivial in-index merge...\n"
2542msgstr "尝试非常小的索引内合并...\n"
2543
2544#: builtin/merge.c:1430
2545#, c-format
2546msgid "Nope.\n"
2547msgstr "无。\n"
2548
2549#: builtin/merge.c:1462
2550msgid "Not possible to fast-forward, aborting."
2551msgstr "无法快进,终止。"
2552
2553#: builtin/merge.c:1485 builtin/merge.c:1562
2554#, c-format
2555msgid "Rewinding the tree to pristine...\n"
2556msgstr "将树回滚至原始状态...\n"
2557
2558#: builtin/merge.c:1489
2559#, c-format
2560msgid "Trying merge strategy %s...\n"
2561msgstr "尝试合并策略 %s...\n"
2562
2563#: builtin/merge.c:1553
2564#, c-format
2565msgid "No merge strategy handled the merge.\n"
2566msgstr "没有合并策略处理此合并。\n"
2567
2568#: builtin/merge.c:1555
2569#, c-format
2570msgid "Merge with strategy %s failed.\n"
2571msgstr "使用策略 %s 合并失败。\n"
2572
2573#: builtin/merge.c:1564
2574#, c-format
2575msgid "Using the %s to prepare resolving by hand.\n"
2576msgstr "使用 %s 以准备手工解决。\n"
2577
2578#: builtin/merge.c:1575
2579#, c-format
2580msgid "Automatic merge went well; stopped before committing as requested\n"
2581msgstr "自动合并进展顺利,按要求在提交前停止\n"
2582
2583#: builtin/mv.c:108
2584#, c-format
2585msgid "Checking rename of '%s' to '%s'\n"
2586msgstr "检查 '%s' 到 '%s' 的重命名\n"
2587
2588#: builtin/mv.c:112
2589msgid "bad source"
2590msgstr "坏的源"
2591
2592#: builtin/mv.c:115
2593msgid "can not move directory into itself"
2594msgstr "不能将目录移动到自身"
2595
2596#: builtin/mv.c:118
2597msgid "cannot move directory over file"
2598msgstr "不能将目录移动到文件"
2599
2600#: builtin/mv.c:128
2601#, c-format
2602msgid "Huh? %.*s is in index?"
2603msgstr "嗯?%.*s 在索引中?"
2604
2605#: builtin/mv.c:140
2606msgid "source directory is empty"
2607msgstr "源目录为空"
2608
2609#: builtin/mv.c:171
2610msgid "not under version control"
2611msgstr "不在版本控制之下"
2612
2613#: builtin/mv.c:173
2614msgid "destination exists"
2615msgstr "目标已存在"
2616
2617#: builtin/mv.c:181
2618#, c-format
2619msgid "overwriting '%s'"
2620msgstr "覆盖 '%s'"
2621
2622#: builtin/mv.c:184
2623msgid "Cannot overwrite"
2624msgstr "不能覆盖"
2625
2626#: builtin/mv.c:187
2627msgid "multiple sources for the same target"
2628msgstr "同一目标具有多个源"
2629
2630#: builtin/mv.c:202
2631#, c-format
2632msgid "%s, source=%s, destination=%s"
2633msgstr "%s,源=%s,目标=%s"
2634
2635#: builtin/mv.c:212
2636#, c-format
2637msgid "Renaming %s to %s\n"
2638msgstr "重命名 %s 至 %s\n"
2639
2640#: builtin/mv.c:215
2641#, c-format
2642msgid "renaming '%s' failed"
2643msgstr "重命名 '%s' 失败"
2644
2645#: builtin/notes.c:139
2646#, c-format
2647msgid "unable to start 'show' for object '%s'"
2648msgstr "不能为对象 '%s' 开始 'show'"
2649
2650#: builtin/notes.c:145
2651msgid "can't fdopen 'show' output fd"
2652msgstr "不能打开 'show' 输出文件句柄"
2653
2654#: builtin/notes.c:155
2655#, c-format
2656msgid "failed to close pipe to 'show' for object '%s'"
2657msgstr "无法为对象 '%s' 的 'show' 关闭管道"
2658
2659#: builtin/notes.c:158
2660#, c-format
2661msgid "failed to finish 'show' for object '%s'"
2662msgstr "无法为对象 '%s' 完成 'show'"
2663
2664#: builtin/notes.c:175 builtin/tag.c:343
2665#, c-format
2666msgid "could not create file '%s'"
2667msgstr "不能创建文件 '%s'"
2668
2669#: builtin/notes.c:189
2670msgid "Please supply the note contents using either -m or -F option"
2671msgstr "请通过 -m 或 -F 选项为注解提供内容"
2672
2673#: builtin/notes.c:210 builtin/notes.c:973
2674#, c-format
2675msgid "Removing note for object %s\n"
2676msgstr "删除对象 %s 的注解\n"
2677
2678#: builtin/notes.c:215
2679msgid "unable to write note object"
2680msgstr "不能写注解对象"
2681
2682#: builtin/notes.c:217
2683#, c-format
2684msgid "The note contents has been left in %s"
2685msgstr "注解内容被留在文件 %s 中"
2686
2687#: builtin/notes.c:251 builtin/tag.c:521
2688#, c-format
2689msgid "cannot read '%s'"
2690msgstr "不能读取 '%s'"
2691
2692#: builtin/notes.c:253 builtin/tag.c:524
2693#, c-format
2694msgid "could not open or read '%s'"
2695msgstr "不能打开或读取 '%s'"
2696
2697#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
2698#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
2699#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
2700#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
2701#, c-format
2702msgid "Failed to resolve '%s' as a valid ref."
2703msgstr "无法解析 '%s' 为一个有效引用。"
2704
2705#: builtin/notes.c:275
2706#, c-format
2707msgid "Failed to read object '%s'."
2708msgstr "无法读取对象 '%s'。"
2709
2710#: builtin/notes.c:299
2711msgid "Cannot commit uninitialized/unreferenced notes tree"
2712msgstr "不能提交未初始化/未引用的注解树"
2713
2714#: builtin/notes.c:340
2715#, c-format
2716msgid "Bad notes.rewriteMode value: '%s'"
2717msgstr "坏的 notes.rewriteMode 值:'%s'"
2718
2719#: builtin/notes.c:350
2720#, c-format
2721msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2722msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2723
2724#. TRANSLATORS: The first %s is the name of the
2725#. environment variable, the second %s is its value
2726#: builtin/notes.c:377
2727#, c-format
2728msgid "Bad %s value: '%s'"
2729msgstr "坏的 %s 值:'%s'"
2730
2731#: builtin/notes.c:441
2732#, c-format
2733msgid "Malformed input line: '%s'."
2734msgstr "非法的输入行:'%s'。"
2735
2736#: builtin/notes.c:456
2737#, c-format
2738msgid "Failed to copy notes from '%s' to '%s'"
2739msgstr "无法从 '%s' 到 '%s' 拷贝注解"
2740
2741#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
2742#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
2743#: builtin/notes.c:1033
2744msgid "too many parameters"
2745msgstr "参数太多"
2746
2747#: builtin/notes.c:513 builtin/notes.c:772
2748#, c-format
2749msgid "No note found for object %s."
2750msgstr "未发现对象 %s 的注解。"
2751
2752#: builtin/notes.c:580
2753#, c-format
2754msgid ""
2755"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
2756"existing notes"
2757msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
2758
2759#: builtin/notes.c:585 builtin/notes.c:662
2760#, c-format
2761msgid "Overwriting existing notes for object %s\n"
2762msgstr "覆盖对象 %s 现存注解\n"
2763
2764#: builtin/notes.c:635
2765msgid "too few parameters"
2766msgstr "参数太少"
2767
2768#: builtin/notes.c:656
2769#, c-format
2770msgid ""
2771"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
2772"existing notes"
2773msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
2774
2775#: builtin/notes.c:668
2776#, c-format
2777msgid "Missing notes on source object %s. Cannot copy."
2778msgstr "源对象 %s 缺少注解。不能拷贝。"
2779
2780#: builtin/notes.c:717
2781#, c-format
2782msgid ""
2783"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
2784"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
2785msgstr ""
2786"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
2787"请换用 'git notes add -f -m/-F/-c/-C'。\n"
2788
2789#: builtin/notes.c:971
2790#, c-format
2791msgid "Object %s has no note\n"
2792msgstr "对象 %s 没有注解\n"
2793
2794#: builtin/notes.c:1103
2795#, c-format
2796msgid "Unknown subcommand: %s"
2797msgstr "未知子命令:%s"
2798
2799#: builtin/pack-objects.c:2310
2800#, c-format
2801msgid "unsupported index version %s"
2802msgstr "不支持的索引版本 %s"
2803
2804#: builtin/pack-objects.c:2314
2805#, c-format
2806msgid "bad index version '%s'"
2807msgstr "坏的索引版本 '%s'"
2808
2809#: builtin/pack-objects.c:2322
2810#, c-format
2811msgid "option %s does not accept negative form"
2812msgstr "选项 %s 不接受否定格式"
2813
2814#: builtin/pack-objects.c:2326
2815#, c-format
2816msgid "unable to parse value '%s' for option %s"
2817msgstr "不能解析值 '%s' 针对于选项 %s"
2818
2819#: builtin/push.c:44
2820msgid "tag shorthand without <tag>"
2821msgstr "tag 简写没有跟 <tag> 参数"
2822
2823#: builtin/push.c:63
2824msgid "--delete only accepts plain target ref names"
2825msgstr "--delete 只接受简单的目标引用名"
2826
2827#: builtin/push.c:73
2828#, c-format
2829msgid ""
2830"You are not currently on a branch.\n"
2831"To push the history leading to the current (detached HEAD)\n"
2832"state now, use\n"
2833"\n"
2834"    git push %s HEAD:<name-of-remote-branch>\n"
2835msgstr ""
2836"您当前不在一个分支上。\n"
2837"现在为推送当前(分离头指针)的历史,使用\n"
2838"\n"
2839"    git push %s HEAD:<name-of-remote-branch>\n"
2840
2841#: builtin/push.c:80
2842#, c-format
2843msgid ""
2844"The current branch %s has no upstream branch.\n"
2845"To push the current branch and set the remote as upstream, use\n"
2846"\n"
2847"    git push --set-upstream %s %s\n"
2848msgstr ""
2849"当前分支 %s 没有对应的上游分支。\n"
2850"为推送当前分支并建立与远程上游的跟踪,使用\n"
2851"\n"
2852"    git push --set-upstream %s %s\n"
2853
2854#: builtin/push.c:88
2855#, c-format
2856msgid "The current branch %s has multiple upstream branches, refusing to push."
2857msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
2858
2859#: builtin/push.c:111
2860msgid ""
2861"You didn't specify any refspecs to push, and push.default is \"nothing\"."
2862msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
2863
2864#: builtin/push.c:131
2865#, c-format
2866msgid "Pushing to %s\n"
2867msgstr "推送到 %s\n"
2868
2869#: builtin/push.c:135
2870#, c-format
2871msgid "failed to push some refs to '%s'"
2872msgstr "无法推送一些引用到 '%s'"
2873
2874#: builtin/push.c:143
2875#, c-format
2876msgid ""
2877"To prevent you from losing history, non-fast-forward updates were rejected\n"
2878"Merge the remote changes (e.g. 'git pull') before pushing again.  See the\n"
2879"'Note about fast-forwards' section of 'git push --help' for details.\n"
2880msgstr ""
2881"为了防止您丢失提交历史,非快进式更新被拒绝。\n"
2882"再次推送前先与远程变更合并(如 'git pull')。详见\n"
2883"'git push --help' 中的 'Note about fast-forwards' 小节。\n"
2884
2885#: builtin/push.c:160
2886#, c-format
2887msgid "bad repository '%s'"
2888msgstr "坏的版本库 '%s'"
2889
2890#: builtin/push.c:161
2891msgid ""
2892"No configured push destination.\n"
2893"Either specify the URL from the command-line or configure a remote "
2894"repository using\n"
2895"\n"
2896"    git remote add <name> <url>\n"
2897"\n"
2898"and then push using the remote name\n"
2899"\n"
2900"    git push <name>\n"
2901msgstr ""
2902"没有配置推送目标。\n"
2903"或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
2904"\n"
2905"    git remote add <name> <url>\n"
2906"\n"
2907"然后使用该远程版本库名执行推送\n"
2908"\n"
2909"    git push <name>\n"
2910
2911#: builtin/push.c:176
2912msgid "--all and --tags are incompatible"
2913msgstr "--all 和 --tags 不兼容"
2914
2915#: builtin/push.c:177
2916msgid "--all can't be combined with refspecs"
2917msgstr "--all 不能和引用表达式共用"
2918
2919#: builtin/push.c:182
2920msgid "--mirror and --tags are incompatible"
2921msgstr "--mirror 和 --tags 不兼容"
2922
2923#: builtin/push.c:183
2924msgid "--mirror can't be combined with refspecs"
2925msgstr "--mirror 不能和引用表达式共用"
2926
2927#: builtin/push.c:188
2928msgid "--all and --mirror are incompatible"
2929msgstr "--all 和 --mirror 不兼容"
2930
2931#: builtin/push.c:274
2932msgid "--delete is incompatible with --all, --mirror and --tags"
2933msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
2934
2935#: builtin/push.c:276
2936msgid "--delete doesn't make sense without any refs"
2937msgstr "--delete 未接任何引用没有意义"
2938
2939#: builtin/reset.c:33
2940msgid "mixed"
2941msgstr "混杂"
2942
2943#: builtin/reset.c:33
2944msgid "soft"
2945msgstr "软性"
2946
2947#: builtin/reset.c:33
2948msgid "hard"
2949msgstr "硬性"
2950
2951#: builtin/reset.c:33
2952msgid "keep"
2953msgstr "保持"
2954
2955#: builtin/reset.c:77
2956msgid "You do not have a valid HEAD."
2957msgstr "您没有一个有效的 HEAD。"
2958
2959#: builtin/reset.c:79
2960msgid "Failed to find tree of HEAD."
2961msgstr "无法找到 HEAD 指向的树。"
2962
2963#: builtin/reset.c:85
2964#, c-format
2965msgid "Failed to find tree of %s."
2966msgstr "无法找到 %s 指向的树。"
2967
2968#: builtin/reset.c:96
2969msgid "Could not write new index file."
2970msgstr "不能写入新的索引文件。"
2971
2972#: builtin/reset.c:106
2973#, c-format
2974msgid "HEAD is now at %s"
2975msgstr "HEAD 现在位于 %s"
2976
2977#: builtin/reset.c:130
2978msgid "Could not read index"
2979msgstr "不能读取索引"
2980
2981#: builtin/reset.c:133
2982msgid "Unstaged changes after reset:"
2983msgstr "重置后撤出暂存区的变更:"
2984
2985#  译者:汉字之间无空格,故删除%s前后空格
2986#: builtin/reset.c:223
2987#, c-format
2988msgid "Cannot do a %s reset in the middle of a merge."
2989msgstr "在合并过程中不能做%s重置操作。"
2990
2991#: builtin/reset.c:297
2992#, c-format
2993msgid "Could not parse object '%s'."
2994msgstr "不能解析对象 '%s'。"
2995
2996#: builtin/reset.c:302
2997msgid "--patch is incompatible with --{hard,mixed,soft}"
2998msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
2999
3000#: builtin/reset.c:311
3001msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
3002msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
3003
3004#  译者:汉字之间无空格,故删除%s前后空格
3005#: builtin/reset.c:313
3006#, c-format
3007msgid "Cannot do %s reset with paths."
3008msgstr "不能带路径进行%s重置。"
3009
3010#  译者:汉字之间无空格,故删除%s前后空格
3011#: builtin/reset.c:325
3012#, c-format
3013msgid "%s reset is not allowed in a bare repository"
3014msgstr "不能对裸版本库进行%s重置"
3015
3016#: builtin/reset.c:341
3017#, c-format
3018msgid "Could not reset index file to revision '%s'."
3019msgstr "不能重置索引文件至版本 '%s'。"
3020
3021#: builtin/revert.c:70 builtin/revert.c:91
3022#, c-format
3023msgid "%s: %s cannot be used with %s"
3024msgstr "%s:%s 不能和 %s 共用"
3025
3026#: builtin/revert.c:126
3027msgid "program error"
3028msgstr "程序错误"
3029
3030#: builtin/revert.c:209
3031msgid "revert failed"
3032msgstr "还原失败"
3033
3034#: builtin/revert.c:224
3035msgid "cherry-pick failed"
3036msgstr "拣选失败"
3037
3038#: builtin/rm.c:109
3039#, c-format
3040msgid ""
3041"'%s' has staged content different from both the file and the HEAD\n"
3042"(use -f to force removal)"
3043msgstr ""
3044"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
3045"(使用 -f 强制删除)"
3046
3047#: builtin/rm.c:115
3048#, c-format
3049msgid ""
3050"'%s' has changes staged in the index\n"
3051"(use --cached to keep the file, or -f to force removal)"
3052msgstr ""
3053"'%s' 有变更已暂存至索引中\n"
3054"(使用 --cached 保存文件,或用 -f 强制删除)"
3055
3056#: builtin/rm.c:119
3057#, c-format
3058msgid ""
3059"'%s' has local modifications\n"
3060"(use --cached to keep the file, or -f to force removal)"
3061msgstr ""
3062"'%s' 有本地修改\n"
3063"(使用 --cached 保存文件,或用 -f 强制删除)"
3064
3065#: builtin/rm.c:194
3066#, c-format
3067msgid "not removing '%s' recursively without -r"
3068msgstr "未提供 -r 选项不会递归删除 '%s'"
3069
3070#: builtin/rm.c:230
3071#, c-format
3072msgid "git rm: unable to remove %s"
3073msgstr "git rm:不能删除 %s"
3074
3075#: builtin/shortlog.c:157
3076#, c-format
3077msgid "Missing author: %s"
3078msgstr "缺少作者:%s"
3079
3080#: builtin/tag.c:58
3081#, c-format
3082msgid "malformed object at '%s'"
3083msgstr "非法的对象于 '%s'"
3084
3085#: builtin/tag.c:205
3086#, c-format
3087msgid "tag name too long: %.*s..."
3088msgstr "tag 名字太长:%.*s..."
3089
3090#: builtin/tag.c:210
3091#, c-format
3092msgid "tag '%s' not found."
3093msgstr "tag '%s' 未发现。"
3094
3095#: builtin/tag.c:225
3096#, c-format
3097msgid "Deleted tag '%s' (was %s)\n"
3098msgstr "已删除 tag '%s'(曾为 %s)\n"
3099
3100#: builtin/tag.c:237
3101#, c-format
3102msgid "could not verify the tag '%s'"
3103msgstr "不能校验 tag '%s'"
3104
3105#: builtin/tag.c:247
3106msgid ""
3107"\n"
3108"#\n"
3109"# Write a tag message\n"
3110"# Lines starting with '#' will be ignored.\n"
3111"#\n"
3112msgstr ""
3113"\n"
3114"#\n"
3115"# 输入一个 tag 说明\n"
3116"# 以 '#' 开头的行将被忽略。\n"
3117"#\n"
3118
3119#: builtin/tag.c:254
3120msgid ""
3121"\n"
3122"#\n"
3123"# Write a tag message\n"
3124"# Lines starting with '#' will be kept; you may remove them yourself if you "
3125"want to.\n"
3126"#\n"
3127msgstr ""
3128"\n"
3129"#\n"
3130"# 输入一个 tag 说明\n"
3131"# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
3132"#\n"
3133
3134#: builtin/tag.c:294
3135msgid "unable to sign the tag"
3136msgstr "无法签署 tag"
3137
3138#: builtin/tag.c:296
3139msgid "unable to write tag file"
3140msgstr "无法写 tag 文件"
3141
3142#: builtin/tag.c:321
3143msgid "bad object type."
3144msgstr "坏的对象类型。"
3145
3146#: builtin/tag.c:334
3147msgid "tag header too big."
3148msgstr "tag 头信息太大。"
3149
3150#: builtin/tag.c:366
3151msgid "no tag message?"
3152msgstr "无 tag 说明?"
3153
3154#: builtin/tag.c:372
3155#, c-format
3156msgid "The tag message has been left in %s\n"
3157msgstr "tag 说明被保留在 %s\n"
3158
3159#: builtin/tag.c:421
3160msgid "switch 'points-at' requires an object"
3161msgstr "开关 'points-at' 需要一个对象"
3162
3163#: builtin/tag.c:423
3164#, c-format
3165msgid "malformed object name '%s'"
3166msgstr "非法的对象名 '%s'"
3167
3168#: builtin/tag.c:502
3169msgid "-n option is only allowed with -l."
3170msgstr "-n 选项只允许和 -l 共用。"
3171
3172#: builtin/tag.c:504
3173msgid "--contains option is only allowed with -l."
3174msgstr "--contains 选项只允许和 -l 共用。"
3175
3176#: builtin/tag.c:506
3177msgid "--points-at option is only allowed with -l."
3178msgstr "--points-at 选项只允许和 -l 共用。"
3179
3180#: builtin/tag.c:514
3181msgid "only one -F or -m option is allowed."
3182msgstr "只允许一个 -F 或 -m 选项。"
3183
3184#: builtin/tag.c:534
3185msgid "too many params"
3186msgstr "太多参数"
3187
3188#: builtin/tag.c:540
3189#, c-format
3190msgid "'%s' is not a valid tag name."
3191msgstr "'%s' 不是一个有效的tag名称。"
3192
3193#: builtin/tag.c:545
3194#, c-format
3195msgid "tag '%s' already exists"
3196msgstr "tag '%s' 已存在"
3197
3198#: builtin/tag.c:563
3199#, c-format
3200msgid "%s: cannot lock the ref"
3201msgstr "%s:不能锁定引用"
3202
3203#: builtin/tag.c:565
3204#, c-format
3205msgid "%s: cannot update the ref"
3206msgstr "%s:不能更新引用"
3207
3208#: builtin/tag.c:567
3209#, c-format
3210msgid "Updated tag '%s' (was %s)\n"
3211msgstr "已更新tag '%s'(曾为 %s)\n"
3212
3213#: git-am.sh:49
3214msgid "You need to set your committer info first"
3215msgstr "您需要先设置你的提交者信息"
3216
3217#: git-am.sh:136
3218msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3219msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
3220
3221#: git-am.sh:147
3222msgid ""
3223"Did you hand edit your patch?\n"
3224"It does not apply to blobs recorded in its index."
3225msgstr ""
3226"您是否曾手动编辑过您的补丁?\n"
3227"无法应用补丁到索引中的数据上。"
3228
3229#: git-am.sh:156
3230msgid "Falling back to patching base and 3-way merge..."
3231msgstr "回退到补丁基础版本并使用三路合并..."
3232
3233#: git-am.sh:268
3234msgid "Only one StGIT patch series can be applied at once"
3235msgstr "一次只能有一个 StGIT 补丁队列被应用"
3236
3237#: git-am.sh:355
3238#, sh-format
3239msgid "Patch format $patch_format is not supported."
3240msgstr "不支持 $patch_format 补丁格式。"
3241
3242#: git-am.sh:357
3243msgid "Patch format detection failed."
3244msgstr "补丁格式检测失败。"
3245
3246#: git-am.sh:411
3247msgid "-d option is no longer supported.  Do not use."
3248msgstr "不再支持 -d 选项。不要使用。"
3249
3250#: git-am.sh:474
3251#, sh-format
3252msgid "previous rebase directory $dotest still exists but mbox given."
3253msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
3254
3255#: git-am.sh:479
3256msgid "Please make up your mind. --skip or --abort?"
3257msgstr "请下决心。--skip 或是 --abort ?"
3258
3259#: git-am.sh:506
3260msgid "Resolve operation not in progress, we are not resuming."
3261msgstr "解决操作未进行,我们不会继续。"
3262
3263#: git-am.sh:572
3264#, sh-format
3265msgid "Dirty index: cannot apply patches (dirty: $files)"
3266msgstr "脏的索引:不能应用补丁(脏文件:$files)"
3267
3268#: git-am.sh:748
3269msgid "cannot be interactive without stdin connected to a terminal."
3270msgstr "标准输入没有和终端关联,不能进行交互式操作。"
3271
3272#  译者:注意保持句尾空格
3273#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3274#. in your translation. The program will only accept English
3275#. input at this point.
3276#: git-am.sh:759
3277msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3278msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3279
3280#: git-am.sh:795
3281#, sh-format
3282msgid "Applying: $FIRSTLINE"
3283msgstr "正应用:$FIRSTLINE"
3284
3285#: git-am.sh:840
3286msgid "No changes -- Patch already applied."
3287msgstr "没有变更 -- 补丁已经应用过。"
3288
3289#: git-am.sh:866
3290msgid "applying to an empty history"
3291msgstr "正应用到一个空历史上"
3292
3293#  译者:注意保持句尾空格
3294#. TRANSLATORS: Make sure to include [Y] and [n] in your
3295#. translation. The program will only accept English input
3296#. at this point.
3297#: git-bisect.sh:54
3298msgid "Do you want me to do it for you [Y/n]? "
3299msgstr "您想让我为您这样做么[Y/n]? "
3300
3301#: git-bisect.sh:95
3302#, sh-format
3303msgid "unrecognised option: '$arg'"
3304msgstr "未识别的选项:'$arg'"
3305
3306#: git-bisect.sh:99
3307#, sh-format
3308msgid "'$arg' does not appear to be a valid revision"
3309msgstr "'$arg' 看起来不像是一个有效的版本"
3310
3311#: git-bisect.sh:117
3312msgid "Bad HEAD - I need a HEAD"
3313msgstr "坏的 HEAD - 我需要一个 HEAD"
3314
3315#: git-bisect.sh:130
3316#, sh-format
3317msgid ""
3318"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
3319msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
3320
3321#: git-bisect.sh:140
3322msgid "won't bisect on seeked tree"
3323msgstr "不会在已查找过的树上二分查找"
3324
3325#: git-bisect.sh:144
3326msgid "Bad HEAD - strange symbolic ref"
3327msgstr "坏的 HEAD - 奇怪的符号引用"
3328
3329#: git-bisect.sh:189
3330#, sh-format
3331msgid "Bad bisect_write argument: $state"
3332msgstr "坏的 bisect_write 参数:$state"
3333
3334#: git-bisect.sh:218
3335#, sh-format
3336msgid "Bad rev input: $arg"
3337msgstr "输入坏的版本:$arg"
3338
3339#: git-bisect.sh:232
3340msgid "Please call 'bisect_state' with at least one argument."
3341msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
3342
3343#: git-bisect.sh:244
3344#, sh-format
3345msgid "Bad rev input: $rev"
3346msgstr "输入坏的版本:$rev"
3347
3348#: git-bisect.sh:250
3349msgid "'git bisect bad' can take only one argument."
3350msgstr "'git bisect bad' 只能带一个参数。"
3351
3352#  译者:注意保持句尾空格
3353#. TRANSLATORS: Make sure to include [Y] and [n] in your
3354#. translation. The program will only accept English input
3355#. at this point.
3356#: git-bisect.sh:279
3357msgid "Are you sure [Y/n]? "
3358msgstr "您确认么[Y/n]? "
3359
3360#: git-bisect.sh:354
3361#, sh-format
3362msgid "'$invalid' is not a valid commit"
3363msgstr "'$invalid' 不是一个有效的提交"
3364
3365#: git-bisect.sh:363
3366#, sh-format
3367msgid ""
3368"Could not check out original HEAD '$branch'.\n"
3369"Try 'git bisect reset <commit>'."
3370msgstr ""
3371"不能检出原始 HEAD '$branch'。\n"
3372"尝试 'git bisect reset <commit>'。"
3373
3374#: git-bisect.sh:390
3375msgid "No logfile given"
3376msgstr "未提供日志文件"
3377
3378#: git-bisect.sh:391
3379#, sh-format
3380msgid "cannot read $file for replaying"
3381msgstr "不能读取 $file 来重放"
3382
3383#: git-bisect.sh:408
3384msgid "?? what are you talking about?"
3385msgstr "?? 您在说什么?"
3386
3387#: git-bisect.sh:474
3388msgid "We are not bisecting."
3389msgstr "我们没有在二分查找。"
3390
3391#: git-pull.sh:21
3392msgid ""
3393"Pull is not possible because you have unmerged files.\n"
3394"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
3395"as appropriate to mark resolution, or use 'git commit -a'."
3396msgstr ""
3397"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
3398"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
3399"或者使用 'git commit -a'。"
3400
3401#: git-pull.sh:25
3402msgid "Pull is not possible because you have unmerged files."
3403msgstr "Pull 不可用,因为您尚有未合并的文件。"
3404
3405#: git-pull.sh:197
3406msgid "updating an unborn branch with changes added to the index"
3407msgstr "更新尚未诞生的分支,变更添加至索引"
3408
3409#: git-pull.sh:253
3410msgid "Cannot merge multiple branches into empty head"
3411msgstr "无法将多个分支合并到空分支"
3412
3413#: git-pull.sh:257
3414msgid "Cannot rebase onto multiple branches"
3415msgstr "无法变基到多个分支"
3416
3417#: git-stash.sh:51
3418msgid "git stash clear with parameters is unimplemented"
3419msgstr "git stash clear 不支持参数"
3420
3421#: git-stash.sh:74
3422msgid "You do not have the initial commit yet"
3423msgstr "您尚未建立初始提交"
3424
3425#: git-stash.sh:89
3426msgid "Cannot save the current index state"
3427msgstr "无法保存当前索引状态"
3428
3429#: git-stash.sh:123 git-stash.sh:136
3430msgid "Cannot save the current worktree state"
3431msgstr "无法保存当前工作区状态"
3432
3433#: git-stash.sh:140
3434msgid "No changes selected"
3435msgstr "没有选择变更"
3436
3437#: git-stash.sh:143
3438msgid "Cannot remove temporary index (can't happen)"
3439msgstr "无法删除临时索引(不应发生)"
3440
3441#: git-stash.sh:156
3442msgid "Cannot record working tree state"
3443msgstr "不能记录工作区状态"
3444
3445#: git-stash.sh:223
3446msgid "No local changes to save"
3447msgstr "没有要保存的本地修改"
3448
3449#: git-stash.sh:227
3450msgid "Cannot initialize stash"
3451msgstr "无法初始化 stash"
3452
3453#: git-stash.sh:235
3454msgid "Cannot save the current status"
3455msgstr "无法保存当前状态"
3456
3457#: git-stash.sh:253
3458msgid "Cannot remove worktree changes"
3459msgstr "无法删除工作区变更"
3460
3461#: git-stash.sh:352
3462msgid "No stash found."
3463msgstr "未发现 stash。"
3464
3465#: git-stash.sh:359
3466#, sh-format
3467msgid "Too many revisions specified: $REV"
3468msgstr "指定了太多的版本:$REV"
3469
3470#: git-stash.sh:365
3471#, sh-format
3472msgid "$reference is not valid reference"
3473msgstr "$reference 不是有效的引用"
3474
3475#: git-stash.sh:393
3476#, sh-format
3477msgid "'$args' is not a stash-like commit"
3478msgstr "'$args' 不是 stash 样提交"
3479
3480#: git-stash.sh:404
3481#, sh-format
3482msgid "'$args' is not a stash reference"
3483msgstr "'$args' 不是一个 stash 引用"
3484
3485#: git-stash.sh:412
3486msgid "unable to refresh index"
3487msgstr "无法刷新索引"
3488
3489#: git-stash.sh:416
3490msgid "Cannot apply a stash in the middle of a merge"
3491msgstr "无法在合并过程中恢复进度"
3492
3493#: git-stash.sh:424
3494msgid "Conflicts in index. Try without --index."
3495msgstr "索引中有冲突。尝试不使用 --index。"
3496
3497#: git-stash.sh:426
3498msgid "Could not save index tree"
3499msgstr "不能保存索引树"
3500
3501#: git-stash.sh:460
3502msgid "Cannot unstage modified files"
3503msgstr "无法还原修改的文件"
3504
3505#: git-stash.sh:491
3506#, sh-format
3507msgid "Dropped ${REV} ($s)"
3508msgstr "丢弃了 ${REV} ($s)"
3509
3510#: git-stash.sh:492
3511#, sh-format
3512msgid "${REV}: Could not drop stash entry"
3513msgstr "${REV}:不能丢弃进度条目"
3514
3515#: git-stash.sh:499
3516msgid "No branch name specified"
3517msgstr "未指定分支名"
3518
3519#: git-stash.sh:570
3520msgid "(To restore them type \"git stash apply\")"
3521msgstr "(为恢复数据输入 \"git stash apply\")"
3522
3523#: git-submodule.sh:56
3524#, sh-format
3525msgid "cannot strip one component off url '$remoteurl'"
3526msgstr "无法从 url '$remoteurl' 剥离一个组件"
3527
3528#: git-submodule.sh:108
3529#, sh-format
3530msgid "No submodule mapping found in .gitmodules for path '$path'"
3531msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"
3532
3533#: git-submodule.sh:149
3534#, sh-format
3535msgid "Clone of '$url' into submodule path '$path' failed"
3536msgstr "无法克隆 '$url' 到子模组路径 '$path'"
3537
3538#: git-submodule.sh:159
3539#, sh-format
3540msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3541msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
3542
3543#: git-submodule.sh:247
3544#, sh-format
3545msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3546msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
3547
3548#: git-submodule.sh:264
3549#, sh-format
3550msgid "'$path' already exists in the index"
3551msgstr "'$path' 已经存在于索引中"
3552
3553#: git-submodule.sh:281
3554#, sh-format
3555msgid "'$path' already exists and is not a valid git repo"
3556msgstr "'$path' 已存在且不是一个有效的 git 版本库"
3557
3558#: git-submodule.sh:295
3559#, sh-format
3560msgid "Unable to checkout submodule '$path'"
3561msgstr "不能检出子模组 '$path'"
3562
3563#: git-submodule.sh:300
3564#, sh-format
3565msgid "Failed to add submodule '$path'"
3566msgstr "无法添加子模组 '$path'"
3567
3568#: git-submodule.sh:305
3569#, sh-format
3570msgid "Failed to register submodule '$path'"
3571msgstr "无法注册子模组 '$path'"
3572
3573#: git-submodule.sh:347
3574#, sh-format
3575msgid "Entering '$prefix$path'"
3576msgstr "正在进入 '$prefix$path'"
3577
3578#: git-submodule.sh:359
3579#, sh-format
3580msgid "Stopping at '$path'; script returned non-zero status."
3581msgstr "停止于 '$path',脚本返回非零值。"
3582
3583#: git-submodule.sh:401
3584#, sh-format
3585msgid "No url found for submodule path '$path' in .gitmodules"
3586msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的 url"
3587
3588#: git-submodule.sh:410
3589#, sh-format
3590msgid "Failed to register url for submodule path '$path'"
3591msgstr "无法为子模组路径 '$path' 注册 url"
3592
3593#: git-submodule.sh:418
3594#, sh-format
3595msgid "Failed to register update mode for submodule path '$path'"
3596msgstr "无法为子模组路径 '$path' 注册更新模式"
3597
3598#: git-submodule.sh:420
3599#, sh-format
3600msgid "Submodule '$name' ($url) registered for path '$path'"
3601msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册"
3602
3603#: git-submodule.sh:519
3604#, sh-format
3605msgid ""
3606"Submodule path '$path' not initialized\n"
3607"Maybe you want to use 'update --init'?"
3608msgstr ""
3609"子模组路径 '$path' 没有初始化\n"
3610"也许您想用 'update --init'?"
3611
3612#: git-submodule.sh:532
3613#, sh-format
3614msgid "Unable to find current revision in submodule path '$path'"
3615msgstr "无法在子模组路径 '$path' 中找到当前版本"
3616
3617#: git-submodule.sh:551
3618#, sh-format
3619msgid "Unable to fetch in submodule path '$path'"
3620msgstr "无法在子模组路径 '$path' 中获取"
3621
3622#: git-submodule.sh:565
3623#, sh-format
3624msgid "Unable to rebase '$sha1' in submodule path '$path'"
3625msgstr "无法在子模组路径 '$path' 中变基 '$sha1'"
3626
3627#: git-submodule.sh:566
3628#, sh-format
3629msgid "Submodule path '$path': rebased into '$sha1'"
3630msgstr "子模组路径 '$path':变基至 '$sha1'"
3631
3632#: git-submodule.sh:571
3633#, sh-format
3634msgid "Unable to merge '$sha1' in submodule path '$path'"
3635msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中"
3636
3637#: git-submodule.sh:572
3638#, sh-format
3639msgid "Submodule path '$path': merged in '$sha1'"
3640msgstr "子模组路径 '$path':已合并入 '$sha1'"
3641
3642#: git-submodule.sh:577
3643#, sh-format
3644msgid "Unable to checkout '$sha1' in submodule path '$path'"
3645msgstr "无法在子模组路径 '$path' 中检出 '$sha1'"
3646
3647#: git-submodule.sh:578
3648#, sh-format
3649msgid "Submodule path '$path': checked out '$sha1'"
3650msgstr "子模组路径 '$path':检出 '$sha1'"
3651
3652#: git-submodule.sh:600 git-submodule.sh:923
3653#, sh-format
3654msgid "Failed to recurse into submodule path '$path'"
3655msgstr "无法递归进子模组路径 '$path'"
3656
3657#: git-submodule.sh:708
3658msgid "--"
3659msgstr "--"
3660
3661#  译者:注意保持前导空格
3662#: git-submodule.sh:766
3663#, sh-format
3664msgid "  Warn: $name doesn't contain commit $sha1_src"
3665msgstr "  警告:$name 未包含提交 $sha1_src"
3666
3667#  译者:注意保持前导空格
3668#: git-submodule.sh:769
3669#, sh-format
3670msgid "  Warn: $name doesn't contain commit $sha1_dst"
3671msgstr "  警告:$name 未包含提交 $sha1_dst"
3672
3673#  译者:注意保持前导空格
3674#: git-submodule.sh:772
3675#, sh-format
3676msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3677msgstr "  警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
3678
3679#: git-submodule.sh:797
3680msgid "blob"
3681msgstr "blob"
3682
3683#: git-submodule.sh:798
3684msgid "submodule"
3685msgstr "子模组"
3686
3687#: git-submodule.sh:969
3688#, sh-format
3689msgid "Synchronizing submodule url for '$name'"
3690msgstr "为 '$name' 同步子模组 url"