po / zh_CN.poon commit Merge branch 'ak/show-branch-usage-string' (d62078e)
   1# Chinese translations for Git package
   2# Git 软件包的简体中文翻译.
   3# Copyright (C) 2012,2013 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: 2014-11-20 09:42+0800\n"
  16"PO-Revision-Date: 2014-11-20 16:10+0800\n"
  17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
  18"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
  19"Language: zh_CN\n"
  20"MIME-Version: 1.0\n"
  21"Content-Type: text/plain; charset=UTF-8\n"
  22"Content-Transfer-Encoding: 8bit\n"
  23"Plural-Forms: nplurals=2; plural=(n != 1);\n"
  24
  25#: advice.c:55
  26#, c-format
  27msgid "hint: %.*s\n"
  28msgstr "提示:%.*s\n"
  29
  30#: advice.c:88
  31msgid ""
  32"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
  33"as appropriate to mark resolution and make a commit."
  34msgstr ""
  35"请在工作区改正文件,然后酌情使用 'git add/rm <file>' 命令标记\n"
  36"解决方案并提交。"
  37
  38#: archive.c:11
  39msgid "git archive [options] <tree-ish> [<path>...]"
  40msgstr "git archive [选项] <树或提交> [<路径>...]"
  41
  42#: archive.c:12
  43msgid "git archive --list"
  44msgstr "git archive --list"
  45
  46#: archive.c:13
  47msgid ""
  48"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
  49msgstr ""
  50"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
  51
  52#: archive.c:14
  53msgid "git archive --remote <repo> [--exec <cmd>] --list"
  54msgstr "git archive --remote <版本库> [--exec <命令>] --list"
  55
  56#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
  57#, c-format
  58msgid "pathspec '%s' did not match any files"
  59msgstr "路径规则 '%s' 未匹配任何文件"
  60
  61#: archive.c:419
  62msgid "fmt"
  63msgstr "格式"
  64
  65#: archive.c:419
  66msgid "archive format"
  67msgstr "归档格式"
  68
  69#: archive.c:420 builtin/log.c:1204
  70msgid "prefix"
  71msgstr "前缀"
  72
  73#: archive.c:421
  74msgid "prepend prefix to each pathname in the archive"
  75msgstr "为归档中每个路径名加上前缀"
  76
  77#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517
  78#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
  79#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
  80#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411
  81#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151
  82msgid "file"
  83msgstr "文件"
  84
  85#: archive.c:423 builtin/archive.c:89
  86msgid "write the archive to this file"
  87msgstr "归档写入此文件"
  88
  89#: archive.c:425
  90msgid "read .gitattributes in working directory"
  91msgstr "读取工作区中的 .gitattributes"
  92
  93#: archive.c:426
  94msgid "report archived files on stderr"
  95msgstr "在标准错误上报告归档文件"
  96
  97#: archive.c:427
  98msgid "store only"
  99msgstr "只存储"
 100
 101#: archive.c:428
 102msgid "compress faster"
 103msgstr "压缩速度更快"
 104
 105#: archive.c:436
 106msgid "compress better"
 107msgstr "压缩效果更好"
 108
 109#: archive.c:439
 110msgid "list supported archive formats"
 111msgstr "列出支持的归档格式"
 112
 113#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85
 114msgid "repo"
 115msgstr "版本库"
 116
 117#: archive.c:442 builtin/archive.c:91
 118msgid "retrieve the archive from remote repository <repo>"
 119msgstr "从远程版本库(<版本库>)提取归档文件"
 120
 121#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490
 122msgid "command"
 123msgstr "命令"
 124
 125#: archive.c:444 builtin/archive.c:93
 126msgid "path to the remote git-upload-archive command"
 127msgstr "远程 git-upload-archive 命令的路径"
 128
 129#: attr.c:258
 130msgid ""
 131"Negative patterns are ignored in git attributes\n"
 132"Use '\\!' for literal leading exclamation."
 133msgstr ""
 134"负值模版在 git attributes 中被忽略\n"
 135"当字符串确实要以感叹号开始时,使用 '\\!'。"
 136
 137#: branch.c:60
 138#, c-format
 139msgid "Not setting branch %s as its own upstream."
 140msgstr "未设置分支 %s 作为它自己的上游。"
 141
 142#: branch.c:83
 143#, c-format
 144msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 145msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 146
 147#: branch.c:84
 148#, c-format
 149msgid "Branch %s set up to track remote branch %s from %s."
 150msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 151
 152#: branch.c:88
 153#, c-format
 154msgid "Branch %s set up to track local branch %s by rebasing."
 155msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 156
 157#: branch.c:89
 158#, c-format
 159msgid "Branch %s set up to track local branch %s."
 160msgstr "分支 %s 设置为跟踪本地分支 %s。"
 161
 162#: branch.c:94
 163#, c-format
 164msgid "Branch %s set up to track remote ref %s by rebasing."
 165msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 166
 167#: branch.c:95
 168#, c-format
 169msgid "Branch %s set up to track remote ref %s."
 170msgstr "分支 %s 设置为跟踪远程引用 %s。"
 171
 172#: branch.c:99
 173#, c-format
 174msgid "Branch %s set up to track local ref %s by rebasing."
 175msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 176
 177#: branch.c:100
 178#, c-format
 179msgid "Branch %s set up to track local ref %s."
 180msgstr "分支 %s 设置为跟踪本地引用 %s。"
 181
 182#: branch.c:133
 183#, c-format
 184msgid "Not tracking: ambiguous information for ref %s"
 185msgstr "未跟踪:引用 %s 有歧义"
 186
 187#: branch.c:162
 188#, c-format
 189msgid "'%s' is not a valid branch name."
 190msgstr "'%s' 不是一个有效的分支名称。"
 191
 192#: branch.c:167
 193#, c-format
 194msgid "A branch named '%s' already exists."
 195msgstr "一个分支名 '%s' 已经存在。"
 196
 197#: branch.c:175
 198msgid "Cannot force update the current branch."
 199msgstr "无法强制更新当前分支。"
 200
 201#: branch.c:195
 202#, c-format
 203msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 204msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
 205
 206#: branch.c:197
 207#, c-format
 208msgid "the requested upstream branch '%s' does not exist"
 209msgstr "请求的上游分支 '%s' 不存在"
 210
 211#: branch.c:199
 212msgid ""
 213"\n"
 214"If you are planning on basing your work on an upstream\n"
 215"branch that already exists at the remote, you may need to\n"
 216"run \"git fetch\" to retrieve it.\n"
 217"\n"
 218"If you are planning to push out a new local branch that\n"
 219"will track its remote counterpart, you may want to use\n"
 220"\"git push -u\" to set the upstream config as you push."
 221msgstr ""
 222"\n"
 223"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
 224"您可能需要执行 \"git fetch\" 来获取分支。\n"
 225"\n"
 226"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
 227"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 228
 229#: branch.c:243
 230#, c-format
 231msgid "Not a valid object name: '%s'."
 232msgstr "不是一个有效的对象名:'%s'。"
 233
 234#: branch.c:263
 235#, c-format
 236msgid "Ambiguous object name: '%s'."
 237msgstr "歧义的对象名:'%s'。"
 238
 239#: branch.c:268
 240#, c-format
 241msgid "Not a valid branch point: '%s'."
 242msgstr "无效的分支点:'%s'。"
 243
 244#: bundle.c:34
 245#, c-format
 246msgid "'%s' does not look like a v2 bundle file"
 247msgstr "'%s' 不像是一个 v2 版本的包文件"
 248
 249#: bundle.c:61
 250#, c-format
 251msgid "unrecognized header: %s%s (%d)"
 252msgstr "未能识别的包头:%s%s (%d)"
 253
 254#: bundle.c:87 builtin/commit.c:788
 255#, c-format
 256msgid "could not open '%s'"
 257msgstr "不能打开 '%s'"
 258
 259#: bundle.c:139
 260msgid "Repository lacks these prerequisite commits:"
 261msgstr "版本库缺少这些必备的提交:"
 262
 263#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706
 264#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330
 265#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357
 266#: builtin/shortlog.c:158
 267msgid "revision walk setup failed"
 268msgstr "版本遍历设置失败"
 269
 270#: bundle.c:185
 271#, c-format
 272msgid "The bundle contains this ref:"
 273msgid_plural "The bundle contains these %d refs:"
 274msgstr[0] "这个包中含有这个引用:"
 275msgstr[1] "这个包中含有 %d 个引用:"
 276
 277#: bundle.c:192
 278msgid "The bundle records a complete history."
 279msgstr "这个包记录一个完整历史。"
 280
 281#: bundle.c:194
 282#, c-format
 283msgid "The bundle requires this ref:"
 284msgid_plural "The bundle requires these %d refs:"
 285msgstr[0] "这个包需要这个引用:"
 286msgstr[1] "这个包需要 %d 个引用:"
 287
 288#: bundle.c:251
 289msgid "Could not spawn pack-objects"
 290msgstr "不能生成 pack-objects 进程"
 291
 292#: bundle.c:269
 293msgid "pack-objects died"
 294msgstr "pack-objects 终止"
 295
 296#: bundle.c:309
 297msgid "rev-list died"
 298msgstr "rev-list 终止"
 299
 300#: bundle.c:358
 301#, c-format
 302msgid "ref '%s' is excluded by the rev-list options"
 303msgstr "引用 '%s' 被 rev-list 选项排除"
 304
 305#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
 306#, c-format
 307msgid "unrecognized argument: %s"
 308msgstr "未能识别的参数:%s"
 309
 310#: bundle.c:444
 311msgid "Refusing to create empty bundle."
 312msgstr "不能创建空包。"
 313
 314#: bundle.c:454
 315#, c-format
 316msgid "cannot create '%s'"
 317msgstr "不能创建 '%s'"
 318
 319#: bundle.c:475
 320msgid "index-pack died"
 321msgstr "index-pack 终止"
 322
 323#: color.c:157
 324#, c-format
 325msgid "invalid color value: %.*s"
 326msgstr "无效的颜色值:%.*s"
 327
 328#: commit.c:40
 329#, c-format
 330msgid "could not parse %s"
 331msgstr "不能解析 %s"
 332
 333#: commit.c:42
 334#, c-format
 335msgid "%s %s is not a commit!"
 336msgstr "%s %s 不是一个提交!"
 337
 338#: compat/obstack.c:406 compat/obstack.c:408
 339msgid "memory exhausted"
 340msgstr "内存耗尽"
 341
 342#: config.c:469 config.c:471
 343#, c-format
 344msgid "bad config file line %d in %s"
 345msgstr "配置文件 %2$s 出错于第 %1$d 行"
 346
 347#: config.c:587
 348#, c-format
 349msgid "bad numeric config value '%s' for '%s' in %s: %s"
 350msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
 351
 352#: config.c:589
 353#, c-format
 354msgid "bad numeric config value '%s' for '%s': %s"
 355msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
 356
 357#: config.c:674
 358#, c-format
 359msgid "failed to expand user dir in: '%s'"
 360msgstr "无法扩展 '%s' 中的用户目录"
 361
 362#: config.c:752 config.c:763
 363#, c-format
 364msgid "bad zlib compression level %d"
 365msgstr "错误的 zlib 压缩级别 %d"
 366
 367#: config.c:885
 368#, c-format
 369msgid "invalid mode for object creation: %s"
 370msgstr "无效的对象创建模式:%s"
 371
 372#: config.c:1201
 373msgid "unable to parse command-line config"
 374msgstr "无法解析命令行中的配置"
 375
 376#: config.c:1262
 377msgid "unknown error occured while reading the configuration files"
 378msgstr "在读取配置文件时遇到未知错误"
 379
 380#: config.c:1586
 381#, c-format
 382msgid "unable to parse '%s' from command-line config"
 383msgstr "无法解析命令行配置中的 '%s'"
 384
 385#: config.c:1588
 386#, c-format
 387msgid "bad config variable '%s' in file '%s' at line %d"
 388msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 389
 390#: config.c:1647
 391#, c-format
 392msgid "%s has multiple values"
 393msgstr "%s 有多个取值"
 394
 395#: connected.c:69
 396msgid "Could not run 'git rev-list'"
 397msgstr "不能执行 'git rev-list'"
 398
 399#: connected.c:89
 400#, c-format
 401msgid "failed write to rev-list: %s"
 402msgstr "无法写入 rev-list:%s"
 403
 404#: connected.c:97
 405#, c-format
 406msgid "failed to close rev-list's stdin: %s"
 407msgstr "无法关闭 rev-list 的标准输入:%s"
 408
 409#: date.c:95
 410msgid "in the future"
 411msgstr "在将来"
 412
 413#: date.c:101
 414#, c-format
 415msgid "%lu second ago"
 416msgid_plural "%lu seconds ago"
 417msgstr[0] "%lu 秒钟前"
 418msgstr[1] "%lu 秒钟前"
 419
 420#: date.c:108
 421#, c-format
 422msgid "%lu minute ago"
 423msgid_plural "%lu minutes ago"
 424msgstr[0] "%lu 分钟前"
 425msgstr[1] "%lu 分钟前"
 426
 427#: date.c:115
 428#, c-format
 429msgid "%lu hour ago"
 430msgid_plural "%lu hours ago"
 431msgstr[0] "%lu 小时前"
 432msgstr[1] "%lu 小时前"
 433
 434#: date.c:122
 435#, c-format
 436msgid "%lu day ago"
 437msgid_plural "%lu days ago"
 438msgstr[0] "%lu 天前"
 439msgstr[1] "%lu 天前"
 440
 441#: date.c:128
 442#, c-format
 443msgid "%lu week ago"
 444msgid_plural "%lu weeks ago"
 445msgstr[0] "%lu 周前"
 446msgstr[1] "%lu 周前"
 447
 448#: date.c:135
 449#, c-format
 450msgid "%lu month ago"
 451msgid_plural "%lu months ago"
 452msgstr[0] "%lu 个月前"
 453msgstr[1] "%lu 个月前"
 454
 455#: date.c:146
 456#, c-format
 457msgid "%lu year"
 458msgid_plural "%lu years"
 459msgstr[0] "%lu 年"
 460msgstr[1] "%lu 年"
 461
 462#. TRANSLATORS: "%s" is "<n> years"
 463#: date.c:149
 464#, c-format
 465msgid "%s, %lu month ago"
 466msgid_plural "%s, %lu months ago"
 467msgstr[0] "%s %lu 个月前"
 468msgstr[1] "%s %lu 个月前"
 469
 470#: date.c:154 date.c:159
 471#, c-format
 472msgid "%lu year ago"
 473msgid_plural "%lu years ago"
 474msgstr[0] "%lu 年前"
 475msgstr[1] "%lu 年前"
 476
 477#: diffcore-order.c:24
 478#, c-format
 479msgid "failed to read orderfile '%s'"
 480msgstr "无法读取排序文件 '%s'"
 481
 482#: diffcore-rename.c:516
 483msgid "Performing inexact rename detection"
 484msgstr "正在进行非精确的重命名检测"
 485
 486#  译者:注意保持前导空格
 487#: diff.c:114
 488#, c-format
 489msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 490msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 491
 492#  译者:注意保持前导空格
 493#: diff.c:119
 494#, c-format
 495msgid "  Unknown dirstat parameter '%s'\n"
 496msgstr "  未知的 dirstat 参数 '%s'\n"
 497
 498#: diff.c:214
 499#, c-format
 500msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 501msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 502
 503#: diff.c:266
 504#, c-format
 505msgid ""
 506"Found errors in 'diff.dirstat' config variable:\n"
 507"%s"
 508msgstr ""
 509"发现配置变量 'diff.dirstat' 中的错误:\n"
 510"%s"
 511
 512#: diff.c:2957
 513#, c-format
 514msgid "external diff died, stopping at %s"
 515msgstr "外部 diff 退出,停止在 %s"
 516
 517#: diff.c:3352
 518msgid "--follow requires exactly one pathspec"
 519msgstr "--follow 参数后只跟一个 pathspec"
 520
 521#: diff.c:3515
 522#, c-format
 523msgid ""
 524"Failed to parse --dirstat/-X option parameter:\n"
 525"%s"
 526msgstr ""
 527"无法解析 --dirstat/-X 选项的参数:\n"
 528"%s"
 529
 530#: diff.c:3529
 531#, c-format
 532msgid "Failed to parse --submodule option parameter: '%s'"
 533msgstr "无法解析 --submodule 选项的参数:'%s'"
 534
 535#: gpg-interface.c:129 gpg-interface.c:200
 536msgid "could not run gpg."
 537msgstr "不能执行 gpg。"
 538
 539#: gpg-interface.c:141
 540msgid "gpg did not accept the data"
 541msgstr "gpg 没有接受数据"
 542
 543#: gpg-interface.c:152
 544msgid "gpg failed to sign the data"
 545msgstr "gpg 无法为数据签名"
 546
 547#: gpg-interface.c:185
 548#, c-format
 549msgid "could not create temporary file '%s': %s"
 550msgstr "不能创建临时文件 '%s':%s"
 551
 552#: gpg-interface.c:188
 553#, c-format
 554msgid "failed writing detached signature to '%s': %s"
 555msgstr "无法将分离式签名写入 '%s':%s"
 556
 557#: grep.c:1718
 558#, c-format
 559msgid "'%s': unable to read %s"
 560msgstr "'%s':无法读取 %s"
 561
 562#: grep.c:1735
 563#, c-format
 564msgid "'%s': %s"
 565msgstr "'%s':%s"
 566
 567#: grep.c:1746
 568#, c-format
 569msgid "'%s': short read %s"
 570msgstr "'%s':读取不完整 %s"
 571
 572#: help.c:207
 573#, c-format
 574msgid "available git commands in '%s'"
 575msgstr "在 '%s' 下可用的 git 命令"
 576
 577#: help.c:214
 578msgid "git commands available from elsewhere on your $PATH"
 579msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 580
 581#: help.c:230
 582msgid "The most commonly used git commands are:"
 583msgstr "最常用的 git 命令有:"
 584
 585#: help.c:289
 586#, c-format
 587msgid ""
 588"'%s' appears to be a git command, but we were not\n"
 589"able to execute it. Maybe git-%s is broken?"
 590msgstr ""
 591"'%s' 像是一个 git 命令,但却无法运行。\n"
 592"可能是 git-%s 受损?"
 593
 594#: help.c:346
 595msgid "Uh oh. Your system reports no Git commands at all."
 596msgstr "唉呀,您的系统中未发现 Git 命令。"
 597
 598#: help.c:368
 599#, c-format
 600msgid ""
 601"WARNING: You called a Git command named '%s', which does not exist.\n"
 602"Continuing under the assumption that you meant '%s'"
 603msgstr ""
 604"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 605"是 '%s'"
 606
 607#: help.c:373
 608#, c-format
 609msgid "in %0.1f seconds automatically..."
 610msgstr "在 %0.1f 秒钟后自动运行..."
 611
 612#: help.c:380
 613#, c-format
 614msgid "git: '%s' is not a git command. See 'git --help'."
 615msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
 616
 617#: help.c:384 help.c:444
 618msgid ""
 619"\n"
 620"Did you mean this?"
 621msgid_plural ""
 622"\n"
 623"Did you mean one of these?"
 624msgstr[0] ""
 625"\n"
 626"您指的是这个么?"
 627msgstr[1] ""
 628"\n"
 629"您指的是这其中的某一个么?"
 630
 631#: help.c:440
 632#, c-format
 633msgid "%s: %s - %s"
 634msgstr "%s:%s - %s"
 635
 636#: lockfile.c:275
 637msgid "BUG: reopen a lockfile that is still open"
 638msgstr "BUG: 重新打开一个仍打开着的锁文件"
 639
 640#: lockfile.c:277
 641msgid "BUG: reopen a lockfile that has been committed"
 642msgstr "BUG: 重新打开一个已提交的锁文件"
 643
 644#: merge.c:41
 645msgid "failed to read the cache"
 646msgstr "无法读取缓存"
 647
 648#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562
 649#: builtin/clone.c:659
 650msgid "unable to write new index file"
 651msgstr "无法写新的索引文件"
 652
 653#: merge-recursive.c:189
 654#, c-format
 655msgid "(bad commit)\n"
 656msgstr "(坏提交)\n"
 657
 658#: merge-recursive.c:209
 659#, c-format
 660msgid "addinfo_cache failed for path '%s'"
 661msgstr "为路径 '%s' addinfo_cache 失败"
 662
 663#: merge-recursive.c:270
 664msgid "error building trees"
 665msgstr "无法创建树"
 666
 667#: merge-recursive.c:691
 668#, c-format
 669msgid "failed to create path '%s'%s"
 670msgstr "无法创建路径 '%s'%s"
 671
 672#: merge-recursive.c:702
 673#, c-format
 674msgid "Removing %s to make room for subdirectory\n"
 675msgstr "删除 %s 以便为子目录留出空间\n"
 676
 677#: merge-recursive.c:716 merge-recursive.c:737
 678msgid ": perhaps a D/F conflict?"
 679msgstr ":可能是一个目录/文件冲突?"
 680
 681#: merge-recursive.c:727
 682#, c-format
 683msgid "refusing to lose untracked file at '%s'"
 684msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 685
 686#: merge-recursive.c:767
 687#, c-format
 688msgid "cannot read object %s '%s'"
 689msgstr "不能读取对象 %s '%s'"
 690
 691#: merge-recursive.c:769
 692#, c-format
 693msgid "blob expected for %s '%s'"
 694msgstr "%s '%s' 应为数据(blob)对象"
 695
 696#: merge-recursive.c:792 builtin/clone.c:318
 697#, c-format
 698msgid "failed to open '%s'"
 699msgstr "无法打开 '%s'"
 700
 701#: merge-recursive.c:800
 702#, c-format
 703msgid "failed to symlink '%s'"
 704msgstr "无法创建符号链接 '%s'"
 705
 706#: merge-recursive.c:803
 707#, c-format
 708msgid "do not know what to do with %06o %s '%s'"
 709msgstr "不知道如何处理 %06o %s '%s'"
 710
 711#: merge-recursive.c:941
 712msgid "Failed to execute internal merge"
 713msgstr "无法执行内部合并"
 714
 715#: merge-recursive.c:945
 716#, c-format
 717msgid "Unable to add %s to database"
 718msgstr "不能添加 %s 至对象库"
 719
 720#: merge-recursive.c:961
 721msgid "unsupported object type in the tree"
 722msgstr "在树中有不支持的对象类型"
 723
 724#: merge-recursive.c:1036 merge-recursive.c:1050
 725#, c-format
 726msgid ""
 727"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 728"in tree."
 729msgstr ""
 730"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 731"的版本被保留。"
 732
 733#: merge-recursive.c:1042 merge-recursive.c:1055
 734#, c-format
 735msgid ""
 736"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 737"in tree at %s."
 738msgstr ""
 739"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 740"的版本保留于 %8$s 中。"
 741
 742#: merge-recursive.c:1096
 743msgid "rename"
 744msgstr "重命名"
 745
 746#: merge-recursive.c:1096
 747msgid "renamed"
 748msgstr "重命名"
 749
 750#: merge-recursive.c:1152
 751#, c-format
 752msgid "%s is a directory in %s adding as %s instead"
 753msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 754
 755#: merge-recursive.c:1174
 756#, c-format
 757msgid ""
 758"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 759"\"->\"%s\" in \"%s\"%s"
 760msgstr ""
 761"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
 762"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 763
 764#: merge-recursive.c:1179
 765msgid " (left unresolved)"
 766msgstr "(留下未解决)"
 767
 768#: merge-recursive.c:1233
 769#, c-format
 770msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 771msgstr ""
 772"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
 773"%5$s"
 774
 775#: merge-recursive.c:1263
 776#, c-format
 777msgid "Renaming %s to %s and %s to %s instead"
 778msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
 779
 780#: merge-recursive.c:1462
 781#, c-format
 782msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 783msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 784
 785#: merge-recursive.c:1472
 786#, c-format
 787msgid "Adding merged %s"
 788msgstr "添加合并后的 %s"
 789
 790#: merge-recursive.c:1477 merge-recursive.c:1675
 791#, c-format
 792msgid "Adding as %s instead"
 793msgstr "而是以 %s 为名添加"
 794
 795#: merge-recursive.c:1528
 796#, c-format
 797msgid "cannot read object %s"
 798msgstr "不能读取对象 %s"
 799
 800#: merge-recursive.c:1531
 801#, c-format
 802msgid "object %s is not a blob"
 803msgstr "对象 %s 不是一个数据(blob)对象"
 804
 805#: merge-recursive.c:1579
 806msgid "modify"
 807msgstr "修改"
 808
 809#: merge-recursive.c:1579
 810msgid "modified"
 811msgstr "修改"
 812
 813#: merge-recursive.c:1589
 814msgid "content"
 815msgstr "内容"
 816
 817#: merge-recursive.c:1596
 818msgid "add/add"
 819msgstr "添加/添加"
 820
 821#: merge-recursive.c:1630
 822#, c-format
 823msgid "Skipped %s (merged same as existing)"
 824msgstr "略过 %s(已经做过相同合并)"
 825
 826#: merge-recursive.c:1644
 827#, c-format
 828msgid "Auto-merging %s"
 829msgstr "自动合并 %s"
 830
 831#: merge-recursive.c:1648 git-submodule.sh:1150
 832msgid "submodule"
 833msgstr "子模组"
 834
 835#: merge-recursive.c:1649
 836#, c-format
 837msgid "CONFLICT (%s): Merge conflict in %s"
 838msgstr "冲突(%s):合并冲突于 %s"
 839
 840#: merge-recursive.c:1735
 841#, c-format
 842msgid "Removing %s"
 843msgstr "删除 %s"
 844
 845#: merge-recursive.c:1760
 846msgid "file/directory"
 847msgstr "文件/目录"
 848
 849#: merge-recursive.c:1766
 850msgid "directory/file"
 851msgstr "目录/文件"
 852
 853#: merge-recursive.c:1771
 854#, c-format
 855msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 856msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 857
 858#: merge-recursive.c:1781
 859#, c-format
 860msgid "Adding %s"
 861msgstr "添加 %s"
 862
 863#: merge-recursive.c:1798
 864msgid "Fatal merge failure, shouldn't happen."
 865msgstr "严重的合并错误,不应发生。"
 866
 867#: merge-recursive.c:1817
 868msgid "Already up-to-date!"
 869msgstr "已经是最新的!"
 870
 871#: merge-recursive.c:1826
 872#, c-format
 873msgid "merging of trees %s and %s failed"
 874msgstr "无法合并树 %s 和 %s"
 875
 876#: merge-recursive.c:1856
 877#, c-format
 878msgid "Unprocessed path??? %s"
 879msgstr "未处理的路径??? %s"
 880
 881#: merge-recursive.c:1901
 882msgid "Merging:"
 883msgstr "合并:"
 884
 885#: merge-recursive.c:1914
 886#, c-format
 887msgid "found %u common ancestor:"
 888msgid_plural "found %u common ancestors:"
 889msgstr[0] "发现 %u 个共同祖先:"
 890msgstr[1] "发现 %u 个共同祖先:"
 891
 892#: merge-recursive.c:1951
 893msgid "merge returned no commit"
 894msgstr "合并未返回提交"
 895
 896#: merge-recursive.c:2008
 897#, c-format
 898msgid "Could not parse object '%s'"
 899msgstr "不能解析对象 '%s'"
 900
 901#: merge-recursive.c:2019 builtin/merge.c:666
 902msgid "Unable to write index."
 903msgstr "不能写入索引。"
 904
 905#: notes-utils.c:41
 906msgid "Cannot commit uninitialized/unreferenced notes tree"
 907msgstr "不能提交未初始化/未引用的注解树"
 908
 909#: notes-utils.c:83
 910#, c-format
 911msgid "Bad notes.rewriteMode value: '%s'"
 912msgstr "坏的 notes.rewriteMode 值:'%s'"
 913
 914#: notes-utils.c:93
 915#, c-format
 916msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 917msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
 918
 919#. TRANSLATORS: The first %s is the name of the
 920#. environment variable, the second %s is its value
 921#: notes-utils.c:120
 922#, c-format
 923msgid "Bad %s value: '%s'"
 924msgstr "坏的 %s 值:'%s'"
 925
 926#: object.c:241
 927#, c-format
 928msgid "unable to parse object: %s"
 929msgstr "不能解析对象:%s"
 930
 931#: parse-options.c:546
 932msgid "..."
 933msgstr "..."
 934
 935#: parse-options.c:564
 936#, c-format
 937msgid "usage: %s"
 938msgstr "用法:%s"
 939
 940#. TRANSLATORS: the colon here should align with the
 941#. one in "usage: %s" translation
 942#: parse-options.c:568
 943#, c-format
 944msgid "   or: %s"
 945msgstr "  或:%s"
 946
 947#  译者:为保证在输出中对齐,注意调整句中空格!
 948#: parse-options.c:571
 949#, c-format
 950msgid "    %s"
 951msgstr "    %s"
 952
 953#: parse-options.c:605
 954msgid "-NUM"
 955msgstr "-数字"
 956
 957#: pathspec.c:133
 958msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 959msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
 960
 961#: pathspec.c:143
 962msgid ""
 963"global 'literal' pathspec setting is incompatible with all other global "
 964"pathspec settings"
 965msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
 966
 967#: pathspec.c:177
 968msgid "invalid parameter for pathspec magic 'prefix'"
 969msgstr "路径规则包含无效的神奇前缀"
 970
 971#: pathspec.c:183
 972#, c-format
 973msgid "Invalid pathspec magic '%.*s' in '%s'"
 974msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
 975
 976#: pathspec.c:187
 977#, c-format
 978msgid "Missing ')' at the end of pathspec magic in '%s'"
 979msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
 980
 981#: pathspec.c:205
 982#, c-format
 983msgid "Unimplemented pathspec magic '%c' in '%s'"
 984msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
 985
 986#: pathspec.c:230
 987#, c-format
 988msgid "%s: 'literal' and 'glob' are incompatible"
 989msgstr "%s:'literal' 和 'glob' 不兼容"
 990
 991#: pathspec.c:241
 992#, c-format
 993msgid "%s: '%s' is outside repository"
 994msgstr "%s:'%s' 在版本库之外"
 995
 996#: pathspec.c:291
 997#, c-format
 998msgid "Pathspec '%s' is in submodule '%.*s'"
 999msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1000
1001#: pathspec.c:353
1002#, c-format
1003msgid "%s: pathspec magic not supported by this command: %s"
1004msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1005
1006#: pathspec.c:432
1007#, c-format
1008msgid "pathspec '%s' is beyond a symbolic link"
1009msgstr "路径规则 '%s' 位于符号链接中"
1010
1011#: pathspec.c:441
1012msgid ""
1013"There is nothing to exclude from by :(exclude) patterns.\n"
1014"Perhaps you forgot to add either ':/' or '.' ?"
1015msgstr ""
1016"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1017"添加 ':/' 或 '.' ?"
1018
1019#: pretty.c:968
1020msgid "unable to parse --pretty format"
1021msgstr "不能解析 --pretty 格式"
1022
1023#: progress.c:225
1024msgid "done"
1025msgstr "完成"
1026
1027#: read-cache.c:1261
1028#, c-format
1029msgid ""
1030"index.version set, but the value is invalid.\n"
1031"Using version %i"
1032msgstr ""
1033"设置了 index.version,但是取值无效。\n"
1034"使用版本 %i"
1035
1036#: read-cache.c:1271
1037#, c-format
1038msgid ""
1039"GIT_INDEX_VERSION set, but the value is invalid.\n"
1040"Using version %i"
1041msgstr ""
1042"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1043"使用版本 %i"
1044
1045#: remote.c:782
1046#, c-format
1047msgid "Cannot fetch both %s and %s to %s"
1048msgstr "不能同时获取 %s 和 %s 至 %s"
1049
1050#: remote.c:786
1051#, c-format
1052msgid "%s usually tracks %s, not %s"
1053msgstr "%s 通常跟踪 %s,而非 %s"
1054
1055#: remote.c:790
1056#, c-format
1057msgid "%s tracks both %s and %s"
1058msgstr "%s 同时跟踪 %s 和 %s"
1059
1060#: remote.c:798
1061msgid "Internal error"
1062msgstr "内部错误"
1063
1064#: remote.c:1968
1065#, c-format
1066msgid "Your branch is based on '%s', but the upstream is gone.\n"
1067msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1068
1069#: remote.c:1972
1070msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1071msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
1072
1073#: remote.c:1975
1074#, c-format
1075msgid "Your branch is up-to-date with '%s'.\n"
1076msgstr "您的分支与上游分支 '%s' 一致。\n"
1077
1078#: remote.c:1979
1079#, c-format
1080msgid "Your branch is ahead of '%s' by %d commit.\n"
1081msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1082msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1083msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1084
1085#: remote.c:1985
1086msgid "  (use \"git push\" to publish your local commits)\n"
1087msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
1088
1089#: remote.c:1988
1090#, c-format
1091msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1092msgid_plural ""
1093"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1094msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1095msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1096
1097#  译者:注意保持前导空格
1098#: remote.c:1996
1099msgid "  (use \"git pull\" to update your local branch)\n"
1100msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
1101
1102#: remote.c:1999
1103#, c-format
1104msgid ""
1105"Your branch and '%s' have diverged,\n"
1106"and have %d and %d different commit each, respectively.\n"
1107msgid_plural ""
1108"Your branch and '%s' have diverged,\n"
1109"and have %d and %d different commits each, respectively.\n"
1110msgstr[0] ""
1111"您的分支和 '%s' 出现了偏离,\n"
1112"并且分别有 %d 和 %d 处不同的提交。\n"
1113msgstr[1] ""
1114"您的分支和 '%s' 出现了偏离,\n"
1115"并且分别有 %d 和 %d 处不同的提交。\n"
1116
1117#  译者:注意保持前导空格
1118#: remote.c:2009
1119msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1120msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
1121
1122#: run-command.c:87
1123msgid "open /dev/null failed"
1124msgstr "不能打开 /dev/null"
1125
1126#: run-command.c:89
1127#, c-format
1128msgid "dup2(%d,%d) failed"
1129msgstr "不能调用 dup2(%d,%d)"
1130
1131#: send-pack.c:265
1132msgid "failed to sign the push certificate"
1133msgstr "无法为推送证书签名"
1134
1135#: send-pack.c:322
1136msgid "the receiving end does not support --signed push"
1137msgstr "接收端不支持签名推送"
1138
1139#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892
1140#: builtin/merge.c:1002 builtin/merge.c:1012
1141#, c-format
1142msgid "Could not open '%s' for writing"
1143msgstr "不能为写入打开 '%s'"
1144
1145#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784
1146#: builtin/merge.c:1004 builtin/merge.c:1017
1147#, c-format
1148msgid "Could not write to '%s'"
1149msgstr "不能写入 '%s'"
1150
1151#: sequencer.c:195
1152msgid ""
1153"after resolving the conflicts, mark the corrected paths\n"
1154"with 'git add <paths>' or 'git rm <paths>'"
1155msgstr ""
1156"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1157"命令标记修正后的文件"
1158
1159#: sequencer.c:198
1160msgid ""
1161"after resolving the conflicts, mark the corrected paths\n"
1162"with 'git add <paths>' or 'git rm <paths>'\n"
1163"and commit the result with 'git commit'"
1164msgstr ""
1165"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1166"对修正后的文件做标记,然后用 'git commit' 提交"
1167
1168#: sequencer.c:211 sequencer.c:852 sequencer.c:935
1169#, c-format
1170msgid "Could not write to %s"
1171msgstr "不能写入 %s"
1172
1173#: sequencer.c:214
1174#, c-format
1175msgid "Error wrapping up %s"
1176msgstr "错误收尾 %s"
1177
1178#: sequencer.c:229
1179msgid "Your local changes would be overwritten by cherry-pick."
1180msgstr "您的本地修改将被拣选操作覆盖。"
1181
1182#: sequencer.c:231
1183msgid "Your local changes would be overwritten by revert."
1184msgstr "您的本地修改将被还原操作覆盖。"
1185
1186#: sequencer.c:234
1187msgid "Commit your changes or stash them to proceed."
1188msgstr "提交您的修改或保存进度后再继续。"
1189
1190#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1191#: sequencer.c:304
1192#, c-format
1193msgid "%s: Unable to write new index file"
1194msgstr "%s:无法写入新索引文件"
1195
1196#: sequencer.c:335
1197msgid "Could not resolve HEAD commit\n"
1198msgstr "不能解析 HEAD 提交\n"
1199
1200#: sequencer.c:355
1201msgid "Unable to update cache tree\n"
1202msgstr "不能更新缓存\n"
1203
1204#: sequencer.c:402
1205#, c-format
1206msgid "Could not parse commit %s\n"
1207msgstr "不能解析提交 %s\n"
1208
1209#: sequencer.c:407
1210#, c-format
1211msgid "Could not parse parent commit %s\n"
1212msgstr "不能解析父提交 %s\n"
1213
1214#: sequencer.c:473
1215msgid "Your index file is unmerged."
1216msgstr "您的索引文件未完成合并。"
1217
1218#: sequencer.c:492
1219#, c-format
1220msgid "Commit %s is a merge but no -m option was given."
1221msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1222
1223#: sequencer.c:500
1224#, c-format
1225msgid "Commit %s does not have parent %d"
1226msgstr "提交 %s 没有父提交 %d"
1227
1228#: sequencer.c:504
1229#, c-format
1230msgid "Mainline was specified but commit %s is not a merge."
1231msgstr "指定了主线但提交 %s 不是一个合并。"
1232
1233#. TRANSLATORS: The first %s will be "revert" or
1234#. "cherry-pick", the second %s a SHA1
1235#: sequencer.c:517
1236#, c-format
1237msgid "%s: cannot parse parent commit %s"
1238msgstr "%s:不能解析父提交 %s"
1239
1240#: sequencer.c:521
1241#, c-format
1242msgid "Cannot get commit message for %s"
1243msgstr "不能得到 %s 的提交说明"
1244
1245#: sequencer.c:607
1246#, c-format
1247msgid "could not revert %s... %s"
1248msgstr "不能还原 %s... %s"
1249
1250#: sequencer.c:608
1251#, c-format
1252msgid "could not apply %s... %s"
1253msgstr "不能应用 %s... %s"
1254
1255#: sequencer.c:644
1256msgid "empty commit set passed"
1257msgstr "提供了空的提交集"
1258
1259#: sequencer.c:652
1260#, c-format
1261msgid "git %s: failed to read the index"
1262msgstr "git %s:无法读取索引"
1263
1264#: sequencer.c:656
1265#, c-format
1266msgid "git %s: failed to refresh the index"
1267msgstr "git %s:无法刷新索引"
1268
1269#: sequencer.c:716
1270#, c-format
1271msgid "Cannot %s during a %s"
1272msgstr "无法 %s 在一个 %s 过程中"
1273
1274#: sequencer.c:738
1275#, c-format
1276msgid "Could not parse line %d."
1277msgstr "不能解析第 %d 行。"
1278
1279#: sequencer.c:743
1280msgid "No commits parsed."
1281msgstr "没有提交被解析。"
1282
1283#: sequencer.c:756
1284#, c-format
1285msgid "Could not open %s"
1286msgstr "不能打开 %s"
1287
1288#: sequencer.c:760
1289#, c-format
1290msgid "Could not read %s."
1291msgstr "不能读取 %s。"
1292
1293#: sequencer.c:767
1294#, c-format
1295msgid "Unusable instruction sheet: %s"
1296msgstr "无用的指令表单:%s"
1297
1298#: sequencer.c:797
1299#, c-format
1300msgid "Invalid key: %s"
1301msgstr "无效键名:%s"
1302
1303#: sequencer.c:800
1304#, c-format
1305msgid "Invalid value for %s: %s"
1306msgstr "%s 的值无效:%s"
1307
1308#: sequencer.c:812
1309#, c-format
1310msgid "Malformed options sheet: %s"
1311msgstr "非法的选项表单:%s"
1312
1313#: sequencer.c:833
1314msgid "a cherry-pick or revert is already in progress"
1315msgstr "一个拣选或还原操作已在进行"
1316
1317#: sequencer.c:834
1318msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1319msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1320
1321#: sequencer.c:838
1322#, c-format
1323msgid "Could not create sequencer directory %s"
1324msgstr "不能创建序列目录 %s"
1325
1326#: sequencer.c:854 sequencer.c:939
1327#, c-format
1328msgid "Error wrapping up %s."
1329msgstr "错误收尾 %s。"
1330
1331#: sequencer.c:873 sequencer.c:1009
1332msgid "no cherry-pick or revert in progress"
1333msgstr "拣选或还原操作并未进行"
1334
1335#: sequencer.c:875
1336msgid "cannot resolve HEAD"
1337msgstr "不能解析 HEAD"
1338
1339#: sequencer.c:877
1340msgid "cannot abort from a branch yet to be born"
1341msgstr "不能从尚未建立的分支终止"
1342
1343#: sequencer.c:899 builtin/apply.c:4128
1344#, c-format
1345msgid "cannot open %s: %s"
1346msgstr "不能打开 %s:%s"
1347
1348#: sequencer.c:902
1349#, c-format
1350msgid "cannot read %s: %s"
1351msgstr "不能读取 %s:%s"
1352
1353#: sequencer.c:903
1354msgid "unexpected end of file"
1355msgstr "意外的文件结束"
1356
1357#: sequencer.c:909
1358#, c-format
1359msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1360msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1361
1362#: sequencer.c:932
1363#, c-format
1364msgid "Could not format %s."
1365msgstr "不能格式化 %s。"
1366
1367#: sequencer.c:1077
1368#, c-format
1369msgid "%s: can't cherry-pick a %s"
1370msgstr "%s:不能拣选一个%s"
1371
1372#: sequencer.c:1080
1373#, c-format
1374msgid "%s: bad revision"
1375msgstr "%s:错误的版本"
1376
1377#: sequencer.c:1114
1378msgid "Can't revert as initial commit"
1379msgstr "不能作为初始提交还原"
1380
1381#: sequencer.c:1115
1382msgid "Can't cherry-pick into empty head"
1383msgstr "不能拣选到空分支"
1384
1385#: sha1_name.c:440
1386msgid ""
1387"Git normally never creates a ref that ends with 40 hex characters\n"
1388"because it will be ignored when you just specify 40-hex. These refs\n"
1389"may be created by mistake. For example,\n"
1390"\n"
1391"  git checkout -b $br $(git rev-parse ...)\n"
1392"\n"
1393"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1394"examine these refs and maybe delete them. Turn this message off by\n"
1395"running \"git config advice.objectNameWarning false\""
1396msgstr ""
1397"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1398"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1399"\n"
1400"  git checkout -b $br $(git rev-parse ...)\n"
1401"\n"
1402"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1403"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1404"命令关闭本消息通知。"
1405
1406#: sha1_name.c:1068
1407msgid "HEAD does not point to a branch"
1408msgstr "HEAD 没有指向一个分支"
1409
1410#: sha1_name.c:1071
1411#, c-format
1412msgid "No such branch: '%s'"
1413msgstr "没有此分支:'%s'"
1414
1415#: sha1_name.c:1073
1416#, c-format
1417msgid "No upstream configured for branch '%s'"
1418msgstr "尚未给分支 '%s' 设置上游"
1419
1420#: sha1_name.c:1077
1421#, c-format
1422msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1423msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1424
1425#: submodule.c:64 submodule.c:98
1426msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1427msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1428
1429#: submodule.c:68 submodule.c:102
1430#, c-format
1431msgid "Could not find section in .gitmodules where path=%s"
1432msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1433
1434#: submodule.c:76
1435#, c-format
1436msgid "Could not update .gitmodules entry %s"
1437msgstr "不能更新 .gitmodules 条目 %s"
1438
1439#: submodule.c:109
1440#, c-format
1441msgid "Could not remove .gitmodules entry for %s"
1442msgstr "无法移除 %s 的 .gitmodules 条目"
1443
1444#: submodule.c:120
1445msgid "staging updated .gitmodules failed"
1446msgstr "将更新后 .gitmodules 添加暂存区失败"
1447
1448#: submodule.c:1111 builtin/init-db.c:363
1449#, c-format
1450msgid "Could not create git link %s"
1451msgstr "不能创建 git link %s"
1452
1453#: submodule.c:1122
1454#, c-format
1455msgid "Could not set core.worktree in %s"
1456msgstr "不能在 %s 中设置 core.worktree"
1457
1458#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565
1459#: trailer.c:569
1460#, c-format
1461msgid "unknown value '%s' for key '%s'"
1462msgstr "键 '%2$s' 的未知取值 '%1$s'"
1463
1464#: trailer.c:551 trailer.c:556 builtin/remote.c:288
1465#, c-format
1466msgid "more than one %s"
1467msgstr "多于一个 %s"
1468
1469#: trailer.c:589
1470#, c-format
1471msgid "empty trailer token in trailer '%.*s'"
1472msgstr "签名 '%.*s' 的键为空"
1473
1474#: trailer.c:709
1475#, c-format
1476msgid "could not read input file '%s'"
1477msgstr "不能读取输入文件 '%s'"
1478
1479#: trailer.c:712
1480msgid "could not read from stdin"
1481msgstr "不能自标准输入读取"
1482
1483#: unpack-trees.c:202
1484msgid "Checking out files"
1485msgstr "正在检出文件"
1486
1487#: urlmatch.c:120
1488msgid "invalid URL scheme name or missing '://' suffix"
1489msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1490
1491#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1492#, c-format
1493msgid "invalid %XX escape sequence"
1494msgstr "无效的 %XX 转义序列"
1495
1496#: urlmatch.c:172
1497msgid "missing host and scheme is not 'file:'"
1498msgstr "缺失主机名且URL方案不是 'file:'"
1499
1500#: urlmatch.c:189
1501msgid "a 'file:' URL may not have a port number"
1502msgstr "一个 'file:' URL 不应该包含端口号"
1503
1504#: urlmatch.c:199
1505msgid "invalid characters in host name"
1506msgstr "主机名中包含无效的字符"
1507
1508#: urlmatch.c:244 urlmatch.c:255
1509msgid "invalid port number"
1510msgstr "无效的端口号"
1511
1512#: urlmatch.c:322
1513msgid "invalid '..' path segment"
1514msgstr "无效的 '..' 路径片段"
1515
1516#: wrapper.c:509
1517#, c-format
1518msgid "unable to access '%s': %s"
1519msgstr "不能访问 '%s':%s"
1520
1521#: wrapper.c:530
1522#, c-format
1523msgid "unable to access '%s'"
1524msgstr "不能访问 '%s'"
1525
1526#: wrapper.c:541
1527#, c-format
1528msgid "unable to look up current user in the passwd file: %s"
1529msgstr "无法在口令文件中查询到当前用户:%s"
1530
1531#: wrapper.c:542
1532msgid "no such user"
1533msgstr "无此用户"
1534
1535#: wrapper.c:550
1536msgid "unable to get current working directory"
1537msgstr "不能获取当前工作目录"
1538
1539#: wt-status.c:150
1540msgid "Unmerged paths:"
1541msgstr "未合并的路径:"
1542
1543#  译者:注意保持前导空格
1544#: wt-status.c:177 wt-status.c:204
1545#, c-format
1546msgid "  (use \"git reset %s <file>...\" to unstage)"
1547msgstr "  (使用 \"git reset %s <file>...\" 撤出暂存区)"
1548
1549#  译者:注意保持前导空格
1550#: wt-status.c:179 wt-status.c:206
1551msgid "  (use \"git rm --cached <file>...\" to unstage)"
1552msgstr "  (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1553
1554#  译者:注意保持前导空格
1555#: wt-status.c:183
1556msgid "  (use \"git add <file>...\" to mark resolution)"
1557msgstr "  (使用 \"git add <file>...\" 标记解决方案)"
1558
1559#  译者:注意保持前导空格
1560#: wt-status.c:185 wt-status.c:189
1561msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1562msgstr "  (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1563
1564#  译者:注意保持前导空格
1565#: wt-status.c:187
1566msgid "  (use \"git rm <file>...\" to mark resolution)"
1567msgstr "  (使用 \"git rm <file>...\" 标记解决方案)"
1568
1569#: wt-status.c:198
1570msgid "Changes to be committed:"
1571msgstr "要提交的变更:"
1572
1573#: wt-status.c:216
1574msgid "Changes not staged for commit:"
1575msgstr "尚未暂存以备提交的变更:"
1576
1577#  译者:注意保持前导空格
1578#: wt-status.c:220
1579msgid "  (use \"git add <file>...\" to update what will be committed)"
1580msgstr "  (使用 \"git add <file>...\" 更新要提交的内容)"
1581
1582#  译者:注意保持前导空格
1583#: wt-status.c:222
1584msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1585msgstr "  (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1586
1587#  译者:注意保持前导空格
1588#: wt-status.c:223
1589msgid ""
1590"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1591msgstr "  (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1592
1593#  译者:注意保持前导空格
1594#: wt-status.c:225
1595msgid "  (commit or discard the untracked or modified content in submodules)"
1596msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
1597
1598#  译者:注意保持前导空格
1599#: wt-status.c:237
1600#, c-format
1601msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1602msgstr "  (使用 \"git %s <file>...\" 以包含要提交的内容)"
1603
1604#: wt-status.c:252
1605msgid "both deleted:"
1606msgstr "双方删除:"
1607
1608#: wt-status.c:254
1609msgid "added by us:"
1610msgstr "由我们添加:"
1611
1612#: wt-status.c:256
1613msgid "deleted by them:"
1614msgstr "由他们删除:"
1615
1616#: wt-status.c:258
1617msgid "added by them:"
1618msgstr "由他们添加:"
1619
1620#: wt-status.c:260
1621msgid "deleted by us:"
1622msgstr "由我们删除:"
1623
1624#: wt-status.c:262
1625msgid "both added:"
1626msgstr "双方添加:"
1627
1628#: wt-status.c:264
1629msgid "both modified:"
1630msgstr "双方修改:"
1631
1632#: wt-status.c:266
1633#, c-format
1634msgid "bug: unhandled unmerged status %x"
1635msgstr "bug:无法处理的未合并状态 %x"
1636
1637#: wt-status.c:274
1638msgid "new file:"
1639msgstr "新文件:"
1640
1641#: wt-status.c:276
1642msgid "copied:"
1643msgstr "拷贝:"
1644
1645#: wt-status.c:278
1646msgid "deleted:"
1647msgstr "删除:"
1648
1649#: wt-status.c:280
1650msgid "modified:"
1651msgstr "修改:"
1652
1653#: wt-status.c:282
1654msgid "renamed:"
1655msgstr "重命名:"
1656
1657#: wt-status.c:284
1658msgid "typechange:"
1659msgstr "类型变更:"
1660
1661#: wt-status.c:286
1662msgid "unknown:"
1663msgstr "未知:"
1664
1665#: wt-status.c:288
1666msgid "unmerged:"
1667msgstr "未合并:"
1668
1669#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1670#: wt-status.c:370
1671msgid "new commits, "
1672msgstr "新提交, "
1673
1674#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1675#: wt-status.c:372
1676msgid "modified content, "
1677msgstr "修改的内容, "
1678
1679#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1680#: wt-status.c:374
1681msgid "untracked content, "
1682msgstr "未跟踪的内容, "
1683
1684#: wt-status.c:391
1685#, c-format
1686msgid "bug: unhandled diff status %c"
1687msgstr "bug:无法处理的差异状态 %c"
1688
1689#: wt-status.c:761
1690msgid "Submodules changed but not updated:"
1691msgstr "子模组已修改但尚未更新:"
1692
1693#: wt-status.c:763
1694msgid "Submodule changes to be committed:"
1695msgstr "要提交的子模组变更:"
1696
1697#: wt-status.c:842
1698msgid ""
1699"Do not touch the line above.\n"
1700"Everything below will be removed."
1701msgstr ""
1702"不要改动上面的一行。\n"
1703"下面的所有内容均将被删除。"
1704
1705#: wt-status.c:933
1706msgid "You have unmerged paths."
1707msgstr "您有尚未合并的路径。"
1708
1709#  译者:注意保持前导空格
1710#: wt-status.c:936
1711msgid "  (fix conflicts and run \"git commit\")"
1712msgstr "  (解决冲突并运行 \"git commit\")"
1713
1714#: wt-status.c:939
1715msgid "All conflicts fixed but you are still merging."
1716msgstr "所有冲突已解决但您仍处于合并中。"
1717
1718#  译者:注意保持前导空格
1719#: wt-status.c:942
1720msgid "  (use \"git commit\" to conclude merge)"
1721msgstr "  (使用 \"git commit\" 结束合并)"
1722
1723#: wt-status.c:952
1724msgid "You are in the middle of an am session."
1725msgstr "您正处于 am 操作过程中。"
1726
1727#: wt-status.c:955
1728msgid "The current patch is empty."
1729msgstr "当前的补丁为空。"
1730
1731#  译者:注意保持前导空格
1732#: wt-status.c:959
1733msgid "  (fix conflicts and then run \"git am --continue\")"
1734msgstr "  (解决冲突,然后运行 \"git am --continue\")"
1735
1736#  译者:注意保持前导空格
1737#: wt-status.c:961
1738msgid "  (use \"git am --skip\" to skip this patch)"
1739msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
1740
1741#  译者:注意保持前导空格
1742#: wt-status.c:963
1743msgid "  (use \"git am --abort\" to restore the original branch)"
1744msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
1745
1746#: wt-status.c:1023 wt-status.c:1040
1747#, c-format
1748msgid "You are currently rebasing branch '%s' on '%s'."
1749msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1750
1751#: wt-status.c:1028 wt-status.c:1045
1752msgid "You are currently rebasing."
1753msgstr "您在执行变基操作。"
1754
1755#  译者:注意保持前导空格
1756#: wt-status.c:1031
1757msgid "  (fix conflicts and then run \"git rebase --continue\")"
1758msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
1759
1760#  译者:注意保持前导空格
1761#: wt-status.c:1033
1762msgid "  (use \"git rebase --skip\" to skip this patch)"
1763msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
1764
1765#  译者:注意保持前导空格
1766#: wt-status.c:1035
1767msgid "  (use \"git rebase --abort\" to check out the original branch)"
1768msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
1769
1770#  译者:注意保持前导空格
1771#: wt-status.c:1048
1772msgid "  (all conflicts fixed: run \"git rebase --continue\")"
1773msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
1774
1775#: wt-status.c:1052
1776#, c-format
1777msgid ""
1778"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1779msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1780
1781#: wt-status.c:1057
1782msgid "You are currently splitting a commit during a rebase."
1783msgstr "您在执行变基操作时拆分提交。"
1784
1785#  译者:注意保持前导空格
1786#: wt-status.c:1060
1787msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
1788msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1789
1790#: wt-status.c:1064
1791#, c-format
1792msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1793msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1794
1795#: wt-status.c:1069
1796msgid "You are currently editing a commit during a rebase."
1797msgstr "您在执行变基操作时编辑提交。"
1798
1799#  译者:注意保持前导空格
1800#: wt-status.c:1072
1801msgid "  (use \"git commit --amend\" to amend the current commit)"
1802msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
1803
1804#  译者:注意保持前导空格
1805#: wt-status.c:1074
1806msgid ""
1807"  (use \"git rebase --continue\" once you are satisfied with your changes)"
1808msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
1809
1810#: wt-status.c:1084
1811#, c-format
1812msgid "You are currently cherry-picking commit %s."
1813msgstr "您在执行拣选提交 %s 的操作。"
1814
1815#  译者:注意保持前导空格
1816#: wt-status.c:1089
1817msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
1818msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
1819
1820#  译者:注意保持前导空格
1821#: wt-status.c:1092
1822msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
1823msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1824
1825#  译者:注意保持前导空格
1826#: wt-status.c:1094
1827msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1828msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1829
1830#: wt-status.c:1103
1831#, c-format
1832msgid "You are currently reverting commit %s."
1833msgstr "您在执行反转提交 %s 的操作。"
1834
1835#  译者:注意保持前导空格
1836#: wt-status.c:1108
1837msgid "  (fix conflicts and run \"git revert --continue\")"
1838msgstr "  (解决冲突并运行 \"git revert --continue\")"
1839
1840#  译者:注意保持前导空格
1841#: wt-status.c:1111
1842msgid "  (all conflicts fixed: run \"git revert --continue\")"
1843msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
1844
1845#  译者:注意保持前导空格
1846#: wt-status.c:1113
1847msgid "  (use \"git revert --abort\" to cancel the revert operation)"
1848msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
1849
1850#: wt-status.c:1124
1851#, c-format
1852msgid "You are currently bisecting, started from branch '%s'."
1853msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1854
1855#: wt-status.c:1128
1856msgid "You are currently bisecting."
1857msgstr "您在执行二分查找操作。"
1858
1859#  译者:注意保持前导空格
1860#: wt-status.c:1131
1861msgid "  (use \"git bisect reset\" to get back to the original branch)"
1862msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
1863
1864#: wt-status.c:1306
1865msgid "On branch "
1866msgstr "位于分支 "
1867
1868#: wt-status.c:1313
1869msgid "rebase in progress; onto "
1870msgstr "变基操作正在进行中;至 "
1871
1872#: wt-status.c:1320
1873msgid "HEAD detached at "
1874msgstr "头指针分离于 "
1875
1876#: wt-status.c:1322
1877msgid "HEAD detached from "
1878msgstr "头指针分离自 "
1879
1880#: wt-status.c:1325
1881msgid "Not currently on any branch."
1882msgstr "当前不在任何分支上。"
1883
1884#: wt-status.c:1342
1885msgid "Initial commit"
1886msgstr "初始提交"
1887
1888#: wt-status.c:1356
1889msgid "Untracked files"
1890msgstr "未跟踪的文件"
1891
1892#: wt-status.c:1358
1893msgid "Ignored files"
1894msgstr "忽略的文件"
1895
1896#: wt-status.c:1362
1897#, c-format
1898msgid ""
1899"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1900"may speed it up, but you have to be careful not to forget to add\n"
1901"new files yourself (see 'git help status')."
1902msgstr ""
1903"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1904"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1905
1906#: wt-status.c:1368
1907#, c-format
1908msgid "Untracked files not listed%s"
1909msgstr "未跟踪的文件没有列出%s"
1910
1911#  译者:中文字符串拼接,可删除前导空格
1912#: wt-status.c:1370
1913msgid " (use -u option to show untracked files)"
1914msgstr "(使用 -u 参数显示未跟踪的文件)"
1915
1916#: wt-status.c:1376
1917msgid "No changes"
1918msgstr "没有修改"
1919
1920#: wt-status.c:1381
1921#, c-format
1922msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1923msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1924
1925#: wt-status.c:1384
1926#, c-format
1927msgid "no changes added to commit\n"
1928msgstr "修改尚未加入提交\n"
1929
1930#: wt-status.c:1387
1931#, c-format
1932msgid ""
1933"nothing added to commit but untracked files present (use \"git add\" to "
1934"track)\n"
1935msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1936
1937#: wt-status.c:1390
1938#, c-format
1939msgid "nothing added to commit but untracked files present\n"
1940msgstr "提交为空,但是存在尚未跟踪的文件\n"
1941
1942#  译者:中文字符串拼接,可删除前导空格
1943#: wt-status.c:1393
1944#, c-format
1945msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1946msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1947
1948#: wt-status.c:1396 wt-status.c:1401
1949#, c-format
1950msgid "nothing to commit\n"
1951msgstr "无文件要提交\n"
1952
1953#  译者:中文字符串拼接,可删除前导空格
1954#: wt-status.c:1399
1955#, c-format
1956msgid "nothing to commit (use -u to show untracked files)\n"
1957msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1958
1959#  译者:中文字符串拼接,可删除前导空格
1960#: wt-status.c:1403
1961#, c-format
1962msgid "nothing to commit, working directory clean\n"
1963msgstr "无文件要提交,干净的工作区\n"
1964
1965#: wt-status.c:1512
1966msgid "HEAD (no branch)"
1967msgstr "HEAD(非分支)"
1968
1969#  译者:注意保持句尾空格
1970#: wt-status.c:1518
1971msgid "Initial commit on "
1972msgstr "初始提交于 "
1973
1974#: wt-status.c:1550
1975msgid "gone"
1976msgstr "丢失"
1977
1978#  译者:注意保持句尾空格
1979#: wt-status.c:1552 wt-status.c:1560
1980msgid "behind "
1981msgstr "落后 "
1982
1983#: compat/precompose_utf8.c:55 builtin/clone.c:357
1984#, c-format
1985msgid "failed to unlink '%s'"
1986msgstr "无法删除 '%s'"
1987
1988#: builtin/add.c:22
1989msgid "git add [options] [--] <pathspec>..."
1990msgstr "git add [选项] [--] <路径规则>..."
1991
1992#: builtin/add.c:65
1993#, c-format
1994msgid "unexpected diff status %c"
1995msgstr "意外的差异状态 %c"
1996
1997#: builtin/add.c:70 builtin/commit.c:275
1998msgid "updating files failed"
1999msgstr "更新文件失败"
2000
2001#: builtin/add.c:80
2002#, c-format
2003msgid "remove '%s'\n"
2004msgstr "删除 '%s'\n"
2005
2006#: builtin/add.c:134
2007msgid "Unstaged changes after refreshing the index:"
2008msgstr "刷新索引之后尚未被暂存的变更:"
2009
2010#: builtin/add.c:194 builtin/rev-parse.c:785
2011msgid "Could not read the index"
2012msgstr "不能读取索引"
2013
2014#: builtin/add.c:205
2015#, c-format
2016msgid "Could not open '%s' for writing."
2017msgstr "不能打开 '%s' 以写入。"
2018
2019#: builtin/add.c:209
2020msgid "Could not write patch"
2021msgstr "不能生成补丁"
2022
2023#: builtin/add.c:214
2024#, c-format
2025msgid "Could not stat '%s'"
2026msgstr "不能查看文件状态 '%s'"
2027
2028#: builtin/add.c:216
2029msgid "Empty patch. Aborted."
2030msgstr "空补丁。异常终止。"
2031
2032#: builtin/add.c:221
2033#, c-format
2034msgid "Could not apply '%s'"
2035msgstr "不能应用 '%s'"
2036
2037#: builtin/add.c:231
2038msgid "The following paths are ignored by one of your .gitignore files:\n"
2039msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2040
2041#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
2042#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375
2043#: builtin/rm.c:269
2044msgid "dry run"
2045msgstr "演习"
2046
2047#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
2048#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608
2049#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2050msgid "be verbose"
2051msgstr "冗长输出"
2052
2053#: builtin/add.c:251
2054msgid "interactive picking"
2055msgstr "交互式拣选"
2056
2057#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286
2058msgid "select hunks interactively"
2059msgstr "交互式挑选数据块"
2060
2061#: builtin/add.c:253
2062msgid "edit current diff and apply"
2063msgstr "编辑当前差异并应用"
2064
2065#: builtin/add.c:254
2066msgid "allow adding otherwise ignored files"
2067msgstr "允许添加忽略的文件"
2068
2069#: builtin/add.c:255
2070msgid "update tracked files"
2071msgstr "更新已跟踪的文件"
2072
2073#: builtin/add.c:256
2074msgid "record only the fact that the path will be added later"
2075msgstr "只记录,该路径稍后再添加"
2076
2077#: builtin/add.c:257
2078msgid "add changes from all tracked and untracked files"
2079msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2080
2081#: builtin/add.c:260
2082msgid "ignore paths removed in the working tree (same as --no-all)"
2083msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2084
2085#: builtin/add.c:262
2086msgid "don't add, only refresh the index"
2087msgstr "不添加,只刷新索引"
2088
2089#: builtin/add.c:263
2090msgid "just skip files which cannot be added because of errors"
2091msgstr "跳过因出错不能添加的文件"
2092
2093#: builtin/add.c:264
2094msgid "check if - even missing - files are ignored in dry run"
2095msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2096
2097#: builtin/add.c:286
2098#, c-format
2099msgid "Use -f if you really want to add them.\n"
2100msgstr "使用 -f 参数如果您确实要添加它们。\n"
2101
2102#: builtin/add.c:287
2103msgid "no files added"
2104msgstr "没有文件被添加"
2105
2106#: builtin/add.c:293
2107msgid "adding files failed"
2108msgstr "添加文件失败"
2109
2110#: builtin/add.c:329
2111msgid "-A and -u are mutually incompatible"
2112msgstr "-A 和 -u 选项互斥"
2113
2114#: builtin/add.c:336
2115msgid "Option --ignore-missing can only be used together with --dry-run"
2116msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2117
2118#: builtin/add.c:357
2119#, c-format
2120msgid "Nothing specified, nothing added.\n"
2121msgstr "没有指定文件,也没有文件被添加。\n"
2122
2123#: builtin/add.c:358
2124#, c-format
2125msgid "Maybe you wanted to say 'git add .'?\n"
2126msgstr "也许您想要执行 'git add .'?\n"
2127
2128#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
2129#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2130msgid "index file corrupt"
2131msgstr "索引文件损坏"
2132
2133#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
2134msgid "Unable to write new index file"
2135msgstr "无法写入新索引文件"
2136
2137#: builtin/apply.c:58
2138msgid "git apply [options] [<patch>...]"
2139msgstr "git apply [选项] [<补丁>...]"
2140
2141#: builtin/apply.c:111
2142#, c-format
2143msgid "unrecognized whitespace option '%s'"
2144msgstr "未能识别的空白字符选项 '%s'"
2145
2146#: builtin/apply.c:126
2147#, c-format
2148msgid "unrecognized whitespace ignore option '%s'"
2149msgstr "未能识别的空白字符忽略选项 '%s'"
2150
2151#: builtin/apply.c:826
2152#, c-format
2153msgid "Cannot prepare timestamp regexp %s"
2154msgstr "无法准备时间戳正则表达式 %s"
2155
2156#: builtin/apply.c:835
2157#, c-format
2158msgid "regexec returned %d for input: %s"
2159msgstr "regexec 返回 %d,输入为:%s"
2160
2161#: builtin/apply.c:916
2162#, c-format
2163msgid "unable to find filename in patch at line %d"
2164msgstr "不能在补丁的第 %d 行找到文件名"
2165
2166#: builtin/apply.c:948
2167#, c-format
2168msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2169msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2170
2171#: builtin/apply.c:952
2172#, c-format
2173msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2174msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2175
2176#: builtin/apply.c:953
2177#, c-format
2178msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2179msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2180
2181#: builtin/apply.c:960
2182#, c-format
2183msgid "git apply: bad git-diff - expected /dev/null on line %d"
2184msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2185
2186#: builtin/apply.c:1423
2187#, c-format
2188msgid "recount: unexpected line: %.*s"
2189msgstr "recount:意外的行:%.*s"
2190
2191#: builtin/apply.c:1480
2192#, c-format
2193msgid "patch fragment without header at line %d: %.*s"
2194msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2195
2196#: builtin/apply.c:1497
2197#, c-format
2198msgid ""
2199"git diff header lacks filename information when removing %d leading pathname "
2200"component (line %d)"
2201msgid_plural ""
2202"git diff header lacks filename information when removing %d leading pathname "
2203"components (line %d)"
2204msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2205msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2206
2207#: builtin/apply.c:1657
2208msgid "new file depends on old contents"
2209msgstr "新文件依赖旧内容"
2210
2211#: builtin/apply.c:1659
2212msgid "deleted file still has contents"
2213msgstr "删除的文件仍有内容"
2214
2215#: builtin/apply.c:1685
2216#, c-format
2217msgid "corrupt patch at line %d"
2218msgstr "补丁在第 %d 行损坏"
2219
2220#: builtin/apply.c:1721
2221#, c-format
2222msgid "new file %s depends on old contents"
2223msgstr "新文件 %s 依赖旧内容"
2224
2225#: builtin/apply.c:1723
2226#, c-format
2227msgid "deleted file %s still has contents"
2228msgstr "删除的文件 %s 仍有内容"
2229
2230#: builtin/apply.c:1726
2231#, c-format
2232msgid "** warning: file %s becomes empty but is not deleted"
2233msgstr "** 警告:文件 %s 成为空文件但并未删除"
2234
2235#: builtin/apply.c:1872
2236#, c-format
2237msgid "corrupt binary patch at line %d: %.*s"
2238msgstr "二进制补丁在第 %d 行损坏:%.*s"
2239
2240#: builtin/apply.c:1901
2241#, c-format
2242msgid "unrecognized binary patch at line %d"
2243msgstr "未能识别的二进制补丁位于第 %d 行"
2244
2245#: builtin/apply.c:2052
2246#, c-format
2247msgid "patch with only garbage at line %d"
2248msgstr "补丁文件的第 %d 行只有垃圾数据"
2249
2250#: builtin/apply.c:2142
2251#, c-format
2252msgid "unable to read symlink %s"
2253msgstr "无法读取符号链接 %s"
2254
2255#: builtin/apply.c:2146
2256#, c-format
2257msgid "unable to open or read %s"
2258msgstr "不能打开或读取 %s"
2259
2260#: builtin/apply.c:2754
2261#, c-format
2262msgid "invalid start of line: '%c'"
2263msgstr "无效的行首字符:'%c'"
2264
2265#: builtin/apply.c:2872
2266#, c-format
2267msgid "Hunk #%d succeeded at %d (offset %d line)."
2268msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2269msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2270msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2271
2272#: builtin/apply.c:2884
2273#, c-format
2274msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2275msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2276
2277#: builtin/apply.c:2890
2278#, c-format
2279msgid ""
2280"while searching for:\n"
2281"%.*s"
2282msgstr ""
2283"当查询:\n"
2284"%.*s"
2285
2286#: builtin/apply.c:2909
2287#, c-format
2288msgid "missing binary patch data for '%s'"
2289msgstr "缺失 '%s' 的二进制补丁数据"
2290
2291#: builtin/apply.c:3010
2292#, c-format
2293msgid "binary patch does not apply to '%s'"
2294msgstr "二进制补丁未应用到 '%s'"
2295
2296#: builtin/apply.c:3016
2297#, c-format
2298msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2299msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2300
2301#: builtin/apply.c:3037
2302#, c-format
2303msgid "patch failed: %s:%ld"
2304msgstr "打补丁失败:%s:%ld"
2305
2306#: builtin/apply.c:3161
2307#, c-format
2308msgid "cannot checkout %s"
2309msgstr "不能检出 %s"
2310
2311#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
2312#, c-format
2313msgid "read of %s failed"
2314msgstr "读取 %s 失败"
2315
2316#: builtin/apply.c:3240 builtin/apply.c:3462
2317#, c-format
2318msgid "path %s has been renamed/deleted"
2319msgstr "路径 %s 已经被重命名/删除"
2320
2321#: builtin/apply.c:3321 builtin/apply.c:3476
2322#, c-format
2323msgid "%s: does not exist in index"
2324msgstr "%s:不存在于索引中"
2325
2326#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
2327#, c-format
2328msgid "%s: %s"
2329msgstr "%s:%s"
2330
2331#: builtin/apply.c:3330 builtin/apply.c:3484
2332#, c-format
2333msgid "%s: does not match index"
2334msgstr "%s:和索引不匹配"
2335
2336#: builtin/apply.c:3432
2337msgid "removal patch leaves file contents"
2338msgstr "移除补丁仍留下了文件内容"
2339
2340#: builtin/apply.c:3501
2341#, c-format
2342msgid "%s: wrong type"
2343msgstr "%s:错误类型"
2344
2345#: builtin/apply.c:3503
2346#, c-format
2347msgid "%s has type %o, expected %o"
2348msgstr "%s 的类型是 %o,应为 %o"
2349
2350#: builtin/apply.c:3604
2351#, c-format
2352msgid "%s: already exists in index"
2353msgstr "%s:已经存在于索引中"
2354
2355#: builtin/apply.c:3607
2356#, c-format
2357msgid "%s: already exists in working directory"
2358msgstr "%s:已经存在于工作区中"
2359
2360#: builtin/apply.c:3627
2361#, c-format
2362msgid "new mode (%o) of %s does not match old mode (%o)"
2363msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2364
2365#: builtin/apply.c:3632
2366#, c-format
2367msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2368msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2369
2370#: builtin/apply.c:3640
2371#, c-format
2372msgid "%s: patch does not apply"
2373msgstr "%s:补丁未应用"
2374
2375#: builtin/apply.c:3653
2376#, c-format
2377msgid "Checking patch %s..."
2378msgstr "检查补丁 %s..."
2379
2380#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135
2381#, c-format
2382msgid "make_cache_entry failed for path '%s'"
2383msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2384
2385#: builtin/apply.c:3889
2386#, c-format
2387msgid "unable to remove %s from index"
2388msgstr "不能从索引中移除 %s"
2389
2390#: builtin/apply.c:3918
2391#, c-format
2392msgid "corrupt patch for submodule %s"
2393msgstr "子模组 %s 损坏的补丁"
2394
2395#: builtin/apply.c:3922
2396#, c-format
2397msgid "unable to stat newly created file '%s'"
2398msgstr "不能枚举新建文件 '%s' 的状态"
2399
2400#: builtin/apply.c:3927
2401#, c-format
2402msgid "unable to create backing store for newly created file %s"
2403msgstr "不能为新建文件 %s 创建后端存储"
2404
2405#: builtin/apply.c:3930 builtin/apply.c:4038
2406#, c-format
2407msgid "unable to add cache entry for %s"
2408msgstr "无法为 %s 添加缓存条目"
2409
2410#: builtin/apply.c:3963
2411#, c-format
2412msgid "closing file '%s'"
2413msgstr "关闭文件 '%s'"
2414
2415#: builtin/apply.c:4012
2416#, c-format
2417msgid "unable to write file '%s' mode %o"
2418msgstr "不能写文件 '%s' 权限 %o"
2419
2420#: builtin/apply.c:4099
2421#, c-format
2422msgid "Applied patch %s cleanly."
2423msgstr "成功应用补丁 %s。"
2424
2425#: builtin/apply.c:4107
2426msgid "internal error"
2427msgstr "内部错误"
2428
2429#: builtin/apply.c:4110
2430#, c-format
2431msgid "Applying patch %%s with %d reject..."
2432msgid_plural "Applying patch %%s with %d rejects..."
2433msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2434msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2435
2436#: builtin/apply.c:4120
2437#, c-format
2438msgid "truncating .rej filename to %.*s.rej"
2439msgstr "截短 .rej 文件名为 %.*s.rej"
2440
2441#: builtin/apply.c:4141
2442#, c-format
2443msgid "Hunk #%d applied cleanly."
2444msgstr "第 #%d 个片段成功应用。"
2445
2446#: builtin/apply.c:4144
2447#, c-format
2448msgid "Rejected hunk #%d."
2449msgstr "拒绝第 #%d 个片段。"
2450
2451#: builtin/apply.c:4234
2452msgid "unrecognized input"
2453msgstr "未能识别的输入"
2454
2455#: builtin/apply.c:4245
2456msgid "unable to read index file"
2457msgstr "无法读取索引文件"
2458
2459#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91
2460#: builtin/fetch.c:93
2461msgid "path"
2462msgstr "路径"
2463
2464#: builtin/apply.c:4363
2465msgid "don't apply changes matching the given path"
2466msgstr "不要应用与给出路径向匹配的变更"
2467
2468#: builtin/apply.c:4366
2469msgid "apply changes matching the given path"
2470msgstr "应用与给出路径向匹配的变更"
2471
2472#: builtin/apply.c:4368
2473msgid "num"
2474msgstr "数字"
2475
2476#: builtin/apply.c:4369
2477msgid "remove <num> leading slashes from traditional diff paths"
2478msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2479
2480#: builtin/apply.c:4372
2481msgid "ignore additions made by the patch"
2482msgstr "忽略补丁中的添加的文件"
2483
2484#: builtin/apply.c:4374
2485msgid "instead of applying the patch, output diffstat for the input"
2486msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2487
2488#: builtin/apply.c:4378
2489msgid "show number of added and deleted lines in decimal notation"
2490msgstr "以十进制数显示添加和删除的行数"
2491
2492#: builtin/apply.c:4380
2493msgid "instead of applying the patch, output a summary for the input"
2494msgstr "不应用补丁,而是显示输入的概要"
2495
2496#: builtin/apply.c:4382
2497msgid "instead of applying the patch, see if the patch is applicable"
2498msgstr "不应用补丁,而是查看补丁是否可应用"
2499
2500#: builtin/apply.c:4384
2501msgid "make sure the patch is applicable to the current index"
2502msgstr "确认补丁可以应用到当前索引"
2503
2504#: builtin/apply.c:4386
2505msgid "apply a patch without touching the working tree"
2506msgstr "应用补丁而不修改工作区"
2507
2508#: builtin/apply.c:4388
2509msgid "also apply the patch (use with --stat/--summary/--check)"
2510msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2511
2512#: builtin/apply.c:4390
2513msgid "attempt three-way merge if a patch does not apply"
2514msgstr "如果一个补丁不能应用则尝试三路合并"
2515
2516#: builtin/apply.c:4392
2517msgid "build a temporary index based on embedded index information"
2518msgstr "创建一个临时索引基于嵌入的索引信息"
2519
2520#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
2521msgid "paths are separated with NUL character"
2522msgstr "路径以 NUL 字符分隔"
2523
2524#: builtin/apply.c:4397
2525msgid "ensure at least <n> lines of context match"
2526msgstr "确保至少匹配 <n> 行上下文"
2527
2528#: builtin/apply.c:4398
2529msgid "action"
2530msgstr "动作"
2531
2532#: builtin/apply.c:4399
2533msgid "detect new or modified lines that have whitespace errors"
2534msgstr "检查新增和修改的行中间的空白字符滥用"
2535
2536#: builtin/apply.c:4402 builtin/apply.c:4405
2537msgid "ignore changes in whitespace when finding context"
2538msgstr "查找上下文时忽略空白字符的变更"
2539
2540#: builtin/apply.c:4408
2541msgid "apply the patch in reverse"
2542msgstr "反向应用补丁"
2543
2544#: builtin/apply.c:4410
2545msgid "don't expect at least one line of context"
2546msgstr "无需至少一行上下文"
2547
2548#: builtin/apply.c:4412
2549msgid "leave the rejected hunks in corresponding *.rej files"
2550msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2551
2552#: builtin/apply.c:4414
2553msgid "allow overlapping hunks"
2554msgstr "允许重叠的补丁片段"
2555
2556#: builtin/apply.c:4417
2557msgid "tolerate incorrectly detected missing new-line at the end of file"
2558msgstr "允许不正确的文件末尾换行符"
2559
2560#: builtin/apply.c:4420
2561msgid "do not trust the line counts in the hunk headers"
2562msgstr "不信任补丁片段的头信息中的行号"
2563
2564#: builtin/apply.c:4422
2565msgid "root"
2566msgstr "根目录"
2567
2568#: builtin/apply.c:4423
2569msgid "prepend <root> to all filenames"
2570msgstr "为所有文件名前添加 <根目录>"
2571
2572#: builtin/apply.c:4445
2573msgid "--3way outside a repository"
2574msgstr "--3way 在一个版本库之外"
2575
2576#: builtin/apply.c:4453
2577msgid "--index outside a repository"
2578msgstr "--index 在一个版本库之外"
2579
2580#: builtin/apply.c:4456
2581msgid "--cached outside a repository"
2582msgstr "--cached 在一个版本库之外"
2583
2584#: builtin/apply.c:4472
2585#, c-format
2586msgid "can't open patch '%s'"
2587msgstr "不能打开补丁 '%s'"
2588
2589#: builtin/apply.c:4486
2590#, c-format
2591msgid "squelched %d whitespace error"
2592msgid_plural "squelched %d whitespace errors"
2593msgstr[0] "抑制下仍有 %d 个空白字符误用"
2594msgstr[1] "抑制下仍有 %d 个空白字符误用"
2595
2596#: builtin/apply.c:4492 builtin/apply.c:4502
2597#, c-format
2598msgid "%d line adds whitespace errors."
2599msgid_plural "%d lines add whitespace errors."
2600msgstr[0] "%d 行有空白字符误用。"
2601msgstr[1] "%d 行有空白字符误用。"
2602
2603#: builtin/archive.c:17
2604#, c-format
2605msgid "could not create archive file '%s'"
2606msgstr "不能创建归档文件 '%s'"
2607
2608#: builtin/archive.c:20
2609msgid "could not redirect output"
2610msgstr "不能重定向输出"
2611
2612#: builtin/archive.c:37
2613msgid "git archive: Remote with no URL"
2614msgstr "git archive:未提供远程URL"
2615
2616#: builtin/archive.c:58
2617msgid "git archive: expected ACK/NAK, got EOF"
2618msgstr "git archive:应为ACK/NACK,却得到EOF"
2619
2620#: builtin/archive.c:61
2621#, c-format
2622msgid "git archive: NACK %s"
2623msgstr "git archive:NACK %s"
2624
2625#: builtin/archive.c:63
2626#, c-format
2627msgid "remote error: %s"
2628msgstr "远程错误:%s"
2629
2630#: builtin/archive.c:64
2631msgid "git archive: protocol error"
2632msgstr "git archive:协议错误"
2633
2634#: builtin/archive.c:68
2635msgid "git archive: expected a flush"
2636msgstr "git archive:应为刷新"
2637
2638#: builtin/bisect--helper.c:7
2639msgid "git bisect--helper --next-all [--no-checkout]"
2640msgstr "git bisect--helper --next-all [--no-checkout]"
2641
2642#: builtin/bisect--helper.c:17
2643msgid "perform 'git bisect next'"
2644msgstr "执行 'git bisect next'"
2645
2646#: builtin/bisect--helper.c:19
2647msgid "update BISECT_HEAD instead of checking out the current commit"
2648msgstr "更新 BISECT_HEAD 而非检出当前提交"
2649
2650#: builtin/blame.c:30
2651msgid "git blame [options] [rev-opts] [rev] [--] file"
2652msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2653
2654#: builtin/blame.c:35
2655msgid "[rev-opts] are documented in git-rev-list(1)"
2656msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2657
2658#: builtin/blame.c:2501
2659msgid "Show blame entries as we find them, incrementally"
2660msgstr "增量式地显示发现的 blame 条目"
2661
2662#: builtin/blame.c:2502
2663msgid "Show blank SHA-1 for boundary commits (Default: off)"
2664msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2665
2666#: builtin/blame.c:2503
2667msgid "Do not treat root commits as boundaries (Default: off)"
2668msgstr "不把根提交作为边界(默认:关闭)"
2669
2670#: builtin/blame.c:2504
2671msgid "Show work cost statistics"
2672msgstr "显示命令消耗统计"
2673
2674#: builtin/blame.c:2505
2675msgid "Show output score for blame entries"
2676msgstr "显示判断 blame 条目位移的得分诊断信息"
2677
2678#: builtin/blame.c:2506
2679msgid "Show original filename (Default: auto)"
2680msgstr "显示原始文件名(默认:自动)"
2681
2682#: builtin/blame.c:2507
2683msgid "Show original linenumber (Default: off)"
2684msgstr "显示原始的行号(默认:关闭)"
2685
2686#: builtin/blame.c:2508
2687msgid "Show in a format designed for machine consumption"
2688msgstr "显示为一个适合机器读取的格式"
2689
2690#: builtin/blame.c:2509
2691msgid "Show porcelain format with per-line commit information"
2692msgstr "为每一行显示机器适用的提交信息"
2693
2694#: builtin/blame.c:2510
2695msgid "Use the same output mode as git-annotate (Default: off)"
2696msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2697
2698#: builtin/blame.c:2511
2699msgid "Show raw timestamp (Default: off)"
2700msgstr "显示原始时间戳(默认:关闭)"
2701
2702#: builtin/blame.c:2512
2703msgid "Show long commit SHA1 (Default: off)"
2704msgstr "显示长的SHA1提交号(默认:关闭)"
2705
2706#: builtin/blame.c:2513
2707msgid "Suppress author name and timestamp (Default: off)"
2708msgstr "隐藏作者名字和时间戳(默认:关闭)"
2709
2710#: builtin/blame.c:2514
2711msgid "Show author email instead of name (Default: off)"
2712msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2713
2714#: builtin/blame.c:2515
2715msgid "Ignore whitespace differences"
2716msgstr "忽略空白差异"
2717
2718#: builtin/blame.c:2516
2719msgid "Spend extra cycles to find better match"
2720msgstr "花费额外的循环来找到更好的匹配"
2721
2722#: builtin/blame.c:2517
2723msgid "Use revisions from <file> instead of calling git-rev-list"
2724msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2725
2726#: builtin/blame.c:2518
2727msgid "Use <file>'s contents as the final image"
2728msgstr "使用 <file> 的内容作为最终的图片"
2729
2730#: builtin/blame.c:2519 builtin/blame.c:2520
2731msgid "score"
2732msgstr "得分"
2733
2734#: builtin/blame.c:2519
2735msgid "Find line copies within and across files"
2736msgstr "找到文件内及跨文件的行拷贝"
2737
2738#: builtin/blame.c:2520
2739msgid "Find line movements within and across files"
2740msgstr "找到文件内及跨文件的行移动"
2741
2742#: builtin/blame.c:2521
2743msgid "n,m"
2744msgstr "n,m"
2745
2746#: builtin/blame.c:2521
2747msgid "Process only line range n,m, counting from 1"
2748msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2749
2750#. TRANSLATORS: This string is used to tell us the maximum
2751#. display width for a relative timestamp in "git blame"
2752#. output.  For C locale, "4 years, 11 months ago", which
2753#. takes 22 places, is the longest among various forms of
2754#. relative timestamps, but your language may need more or
2755#. fewer display columns.
2756#: builtin/blame.c:2602
2757msgid "4 years, 11 months ago"
2758msgstr "4 年 11 个月前"
2759
2760#: builtin/branch.c:24
2761msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2762msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2763
2764#: builtin/branch.c:25
2765msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2766msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2767
2768#: builtin/branch.c:26
2769msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2770msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2771
2772#: builtin/branch.c:27
2773msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2774msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2775
2776#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2777#: builtin/branch.c:152
2778#, c-format
2779msgid ""
2780"deleting branch '%s' that has been merged to\n"
2781"         '%s', but not yet merged to HEAD."
2782msgstr ""
2783"将要删除的分支 '%s' 已经被合并到\n"
2784"         '%s',但未合并到 HEAD。"
2785
2786#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2787#: builtin/branch.c:156
2788#, c-format
2789msgid ""
2790"not deleting branch '%s' that is not yet merged to\n"
2791"         '%s', even though it is merged to HEAD."
2792msgstr ""
2793"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2794"         然而却尚未被合并到分支 '%s' 。"
2795
2796#: builtin/branch.c:170
2797#, c-format
2798msgid "Couldn't look up commit object for '%s'"
2799msgstr "无法查询 '%s' 指向的提交对象"
2800
2801#: builtin/branch.c:174
2802#, c-format
2803msgid ""
2804"The branch '%s' is not fully merged.\n"
2805"If you are sure you want to delete it, run 'git branch -D %s'."
2806msgstr ""
2807"分支 '%s' 没有完全合并。\n"
2808"如果您确认要删除它,执行 'git branch -D %s'。"
2809
2810#: builtin/branch.c:187
2811msgid "Update of config-file failed"
2812msgstr "无法更新 config 文件"
2813
2814#: builtin/branch.c:215
2815msgid "cannot use -a with -d"
2816msgstr "不能将 -a 和 -d 同时使用"
2817
2818#: builtin/branch.c:221
2819msgid "Couldn't look up commit object for HEAD"
2820msgstr "无法查询 HEAD 指向的提交对象"
2821
2822#: builtin/branch.c:229
2823#, c-format
2824msgid "Cannot delete the branch '%s' which you are currently on."
2825msgstr "无法删除您当前所在的分支 '%s'。"
2826
2827#: builtin/branch.c:245
2828#, c-format
2829msgid "remote branch '%s' not found."
2830msgstr "远程分支 '%s' 未发现。"
2831
2832#: builtin/branch.c:246
2833#, c-format
2834msgid "branch '%s' not found."
2835msgstr "分支 '%s' 未发现。"
2836
2837#: builtin/branch.c:260
2838#, c-format
2839msgid "Error deleting remote branch '%s'"
2840msgstr "删除远程分支 '%s' 时出错"
2841
2842#: builtin/branch.c:261
2843#, c-format
2844msgid "Error deleting branch '%s'"
2845msgstr "删除分支 '%s' 时出错"
2846
2847#: builtin/branch.c:268
2848#, c-format
2849msgid "Deleted remote branch %s (was %s).\n"
2850msgstr "已删除远程分支 %s(曾为 %s)。\n"
2851
2852#: builtin/branch.c:269
2853#, c-format
2854msgid "Deleted branch %s (was %s).\n"
2855msgstr "已删除分支 %s(曾为 %s)。\n"
2856
2857#: builtin/branch.c:370
2858#, c-format
2859msgid "branch '%s' does not point at a commit"
2860msgstr "分支 '%s' 未指向一个提交"
2861
2862#: builtin/branch.c:459
2863#, c-format
2864msgid "[%s: gone]"
2865msgstr "[%s: 丢失]"
2866
2867#: builtin/branch.c:464
2868#, c-format
2869msgid "[%s]"
2870msgstr "[%s]"
2871
2872#: builtin/branch.c:469
2873#, c-format
2874msgid "[%s: behind %d]"
2875msgstr "[%s:落后 %d]"
2876
2877#: builtin/branch.c:471
2878#, c-format
2879msgid "[behind %d]"
2880msgstr "[落后 %d]"
2881
2882#: builtin/branch.c:475
2883#, c-format
2884msgid "[%s: ahead %d]"
2885msgstr "[%s:领先 %d]"
2886
2887#: builtin/branch.c:477
2888#, c-format
2889msgid "[ahead %d]"
2890msgstr "[领先 %d]"
2891
2892#: builtin/branch.c:480
2893#, c-format
2894msgid "[%s: ahead %d, behind %d]"
2895msgstr "[%s:领先 %d,落后 %d]"
2896
2897#: builtin/branch.c:483
2898#, c-format
2899msgid "[ahead %d, behind %d]"
2900msgstr "[领先 %d,落后 %d]"
2901
2902#: builtin/branch.c:496
2903msgid " **** invalid ref ****"
2904msgstr " **** 无效引用 ****"
2905
2906#: builtin/branch.c:587
2907#, c-format
2908msgid "(no branch, rebasing %s)"
2909msgstr "(非分支,正变基 %s)"
2910
2911#: builtin/branch.c:590
2912#, c-format
2913msgid "(no branch, bisect started on %s)"
2914msgstr "(非分支,二分查找开始于 %s)"
2915
2916#: builtin/branch.c:593
2917#, c-format
2918msgid "(detached from %s)"
2919msgstr "(分离自 %s)"
2920
2921#: builtin/branch.c:596
2922msgid "(no branch)"
2923msgstr "(非分支)"
2924
2925#: builtin/branch.c:643
2926#, c-format
2927msgid "object '%s' does not point to a commit"
2928msgstr "对象 '%s' 没有指向一个提交"
2929
2930#: builtin/branch.c:691
2931msgid "some refs could not be read"
2932msgstr "一些引用不能读取"
2933
2934#: builtin/branch.c:704
2935msgid "cannot rename the current branch while not on any."
2936msgstr "无法重命名当前分支因为不处于任何分支上。"
2937
2938#: builtin/branch.c:714
2939#, c-format
2940msgid "Invalid branch name: '%s'"
2941msgstr "无效的分支名:'%s'"
2942
2943#: builtin/branch.c:729
2944msgid "Branch rename failed"
2945msgstr "分支重命名失败"
2946
2947#: builtin/branch.c:733
2948#, c-format
2949msgid "Renamed a misnamed branch '%s' away"
2950msgstr "重命名掉一个错误命名的旧分支 '%s'"
2951
2952#: builtin/branch.c:737
2953#, c-format
2954msgid "Branch renamed to %s, but HEAD is not updated!"
2955msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2956
2957#: builtin/branch.c:744
2958msgid "Branch is renamed, but update of config-file failed"
2959msgstr "分支被重命名,但更新 config 文件失败"
2960
2961#: builtin/branch.c:759
2962#, c-format
2963msgid "malformed object name %s"
2964msgstr "非法的对象名 %s"
2965
2966#: builtin/branch.c:783
2967#, c-format
2968msgid "could not write branch description template: %s"
2969msgstr "不能写分支描述模版:%s"
2970
2971#: builtin/branch.c:813
2972msgid "Generic options"
2973msgstr "通用选项"
2974
2975#: builtin/branch.c:815
2976msgid "show hash and subject, give twice for upstream branch"
2977msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2978
2979#: builtin/branch.c:816
2980msgid "suppress informational messages"
2981msgstr "不显示信息"
2982
2983#: builtin/branch.c:817
2984msgid "set up tracking mode (see git-pull(1))"
2985msgstr "设置跟踪模式(参见 git-pull(1))"
2986
2987#: builtin/branch.c:819
2988msgid "change upstream info"
2989msgstr "改变上游信息"
2990
2991#: builtin/branch.c:823
2992msgid "use colored output"
2993msgstr "使用彩色输出"
2994
2995#: builtin/branch.c:824
2996msgid "act on remote-tracking branches"
2997msgstr "作用于远程跟踪分支"
2998
2999#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
3000#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623
3001#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616
3002#: builtin/tag.c:622
3003msgid "commit"
3004msgstr "提交"
3005
3006#: builtin/branch.c:828 builtin/branch.c:834
3007msgid "print only branches that contain the commit"
3008msgstr "只打印包含该提交的分支"
3009
3010#: builtin/branch.c:840
3011msgid "Specific git-branch actions:"
3012msgstr "具体的 git-branch 动作:"
3013
3014#: builtin/branch.c:841
3015msgid "list both remote-tracking and local branches"
3016msgstr "列出远程跟踪及本地分支"
3017
3018#: builtin/branch.c:843
3019msgid "delete fully merged branch"
3020msgstr "删除完全合并的分支"
3021
3022#: builtin/branch.c:844
3023msgid "delete branch (even if not merged)"
3024msgstr "删除分支(即使没有合并)"
3025
3026#: builtin/branch.c:845
3027msgid "move/rename a branch and its reflog"
3028msgstr "移动/重命名一个分支,以及它的引用日志"
3029
3030#: builtin/branch.c:846
3031msgid "move/rename a branch, even if target exists"
3032msgstr "移动/重命名一个分支,即使目标已存在"
3033
3034#: builtin/branch.c:847
3035msgid "list branch names"
3036msgstr "列出分支名"
3037
3038#: builtin/branch.c:848
3039msgid "create the branch's reflog"
3040msgstr "创建分支的引用日志"
3041
3042#: builtin/branch.c:850
3043msgid "edit the description for the branch"
3044msgstr "标记分支的描述"
3045
3046#: builtin/branch.c:851
3047msgid "force creation (when already exists)"
3048msgstr "强制创建(当已经存在)"
3049
3050#: builtin/branch.c:854
3051msgid "print only not merged branches"
3052msgstr "只打印没有合并的分支"
3053
3054#: builtin/branch.c:860
3055msgid "print only merged branches"
3056msgstr "只打印合并的分支"
3057
3058#: builtin/branch.c:864
3059msgid "list branches in columns"
3060msgstr "以列的方式显示分支"
3061
3062#: builtin/branch.c:877
3063msgid "Failed to resolve HEAD as a valid ref."
3064msgstr "无法将 HEAD 解析为有效引用。"
3065
3066#: builtin/branch.c:881 builtin/clone.c:634
3067msgid "HEAD not found below refs/heads!"
3068msgstr "HEAD 没有位于 /refs/heads 之下!"
3069
3070#: builtin/branch.c:903
3071msgid "--column and --verbose are incompatible"
3072msgstr "--column 和 --verbose 不兼容"
3073
3074#: builtin/branch.c:909 builtin/branch.c:948
3075msgid "branch name required"
3076msgstr "必须提供分支名"
3077
3078#: builtin/branch.c:924
3079msgid "Cannot give description to detached HEAD"
3080msgstr "不能向分离头指针提供描述"
3081
3082#: builtin/branch.c:929
3083msgid "cannot edit description of more than one branch"
3084msgstr "不能为一个以上的分支编辑描述"
3085
3086#: builtin/branch.c:936
3087#, c-format
3088msgid "No commit on branch '%s' yet."
3089msgstr "分支 '%s' 尚无提交。"
3090
3091#: builtin/branch.c:939
3092#, c-format
3093msgid "No branch named '%s'."
3094msgstr "没有分支 '%s'。"
3095
3096#: builtin/branch.c:954
3097msgid "too many branches for a rename operation"
3098msgstr "为重命名操作提供了太多的分支名"
3099
3100#: builtin/branch.c:959
3101msgid "too many branches to set new upstream"
3102msgstr "为设置新上游提供了太多的分支名"
3103
3104#: builtin/branch.c:963
3105#, c-format
3106msgid ""
3107"could not set upstream of HEAD to %s when it does not point to any branch."
3108msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3109
3110#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009
3111#, c-format
3112msgid "no such branch '%s'"
3113msgstr "没有此分支 '%s'"
3114
3115#: builtin/branch.c:970
3116#, c-format
3117msgid "branch '%s' does not exist"
3118msgstr "分支 '%s' 不存在"
3119
3120#: builtin/branch.c:982
3121msgid "too many branches to unset upstream"
3122msgstr "为取消上游设置操作提供了太多的分支名"
3123
3124#: builtin/branch.c:986
3125msgid "could not unset upstream of HEAD when it does not point to any branch."
3126msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3127
3128#: builtin/branch.c:992
3129#, c-format
3130msgid "Branch '%s' has no upstream information"
3131msgstr "分支 '%s' 没有上游信息"
3132
3133#: builtin/branch.c:1006
3134msgid "it does not make sense to create 'HEAD' manually"
3135msgstr "手工创建 'HEAD' 没有意义"
3136
3137#: builtin/branch.c:1012
3138msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3139msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3140
3141#: builtin/branch.c:1015
3142#, c-format
3143msgid ""
3144"The --set-upstream flag is deprecated and will be removed. Consider using --"
3145"track or --set-upstream-to\n"
3146msgstr ""
3147"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3148
3149#: builtin/branch.c:1032
3150#, c-format
3151msgid ""
3152"\n"
3153"If you wanted to make '%s' track '%s', do this:\n"
3154"\n"
3155msgstr ""
3156"\n"
3157"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3158"\n"
3159
3160#: builtin/branch.c:1033
3161#, c-format
3162msgid "    git branch -d %s\n"
3163msgstr "    git branch -d %s\n"
3164
3165#: builtin/branch.c:1034
3166#, c-format
3167msgid "    git branch --set-upstream-to %s\n"
3168msgstr "    git branch --set-upstream-to %s\n"
3169
3170#: builtin/bundle.c:47
3171#, c-format
3172msgid "%s is okay\n"
3173msgstr "%s 可以\n"
3174
3175#: builtin/bundle.c:56
3176msgid "Need a repository to create a bundle."
3177msgstr "需要一个版本库来创建包。"
3178
3179#: builtin/bundle.c:60
3180msgid "Need a repository to unbundle."
3181msgstr "需要一个版本库来解包。"
3182
3183#: builtin/cat-file.c:332
3184msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3185msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3186
3187#: builtin/cat-file.c:333
3188msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3189msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3190
3191#: builtin/cat-file.c:370
3192msgid "<type> can be one of: blob, tree, commit, tag"
3193msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3194
3195#: builtin/cat-file.c:371
3196msgid "show object type"
3197msgstr "显示对象类型"
3198
3199#: builtin/cat-file.c:372
3200msgid "show object size"
3201msgstr "显示对象大小"
3202
3203#: builtin/cat-file.c:374
3204msgid "exit with zero when there's no error"
3205msgstr "当没有错误时退出并返回零"
3206
3207#: builtin/cat-file.c:375
3208msgid "pretty-print object's content"
3209msgstr "美观地打印对象的内容"
3210
3211#: builtin/cat-file.c:377
3212msgid "for blob objects, run textconv on object's content"
3213msgstr "对于数据(blob)对象,对其内容执行 textconv"
3214
3215#: builtin/cat-file.c:379
3216msgid "show info and content of objects fed from the standard input"
3217msgstr "显示从标准输入提供的对象的信息和内容"
3218
3219#: builtin/cat-file.c:382
3220msgid "show info about objects fed from the standard input"
3221msgstr "显示从标准输入提供的对象的信息"
3222
3223#: builtin/check-attr.c:11
3224msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3225msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3226
3227#: builtin/check-attr.c:12
3228msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3229msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3230
3231#: builtin/check-attr.c:19
3232msgid "report all attributes set on file"
3233msgstr "报告设置在文件上的所有属性"
3234
3235#: builtin/check-attr.c:20
3236msgid "use .gitattributes only from the index"
3237msgstr "只使用索引中的 .gitattributes"
3238
3239#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
3240msgid "read file names from stdin"
3241msgstr "从标准输入读出文件名"
3242
3243#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3244msgid "terminate input and output records by a NUL character"
3245msgstr "输入和输出的记录使用 NUL 字符终结"
3246
3247#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274
3248msgid "suppress progress reporting"
3249msgstr "不显示进度报告"
3250
3251#: builtin/check-ignore.c:26
3252msgid "show non-matching input paths"
3253msgstr "显示未匹配的输入路径"
3254
3255#: builtin/check-ignore.c:28
3256msgid "ignore index when checking"
3257msgstr "检查时忽略索引"
3258
3259#: builtin/check-ignore.c:154
3260msgid "cannot specify pathnames with --stdin"
3261msgstr "不能同时提供路径及 --stdin 参数"
3262
3263#: builtin/check-ignore.c:157
3264msgid "-z only makes sense with --stdin"
3265msgstr "-z 需要和 --stdin 参数共用才有意义"
3266
3267#: builtin/check-ignore.c:159
3268msgid "no path specified"
3269msgstr "未指定路径"
3270
3271#: builtin/check-ignore.c:163
3272msgid "--quiet is only valid with a single pathname"
3273msgstr "参数 --quiet 只在提供一个路径名时有效"
3274
3275#: builtin/check-ignore.c:165
3276msgid "cannot have both --quiet and --verbose"
3277msgstr "不能同时提供 --quiet 和 --verbose 参数"
3278
3279#: builtin/check-ignore.c:168
3280msgid "--non-matching is only valid with --verbose"
3281msgstr "--non-matching 选项只在使用 --verbose 时有效"
3282
3283#: builtin/check-mailmap.c:8
3284msgid "git check-mailmap [options] <contact>..."
3285msgstr "git check-mailmap [选项] <联系地址>..."
3286
3287#: builtin/check-mailmap.c:13
3288msgid "also read contacts from stdin"
3289msgstr "还从标准输入读取联系地址"
3290
3291#: builtin/check-mailmap.c:24
3292#, c-format
3293msgid "unable to parse contact: %s"
3294msgstr "不能解析联系地址:%s"
3295
3296#: builtin/check-mailmap.c:47
3297msgid "no contacts specified"
3298msgstr "未指定联系地址"
3299
3300#: builtin/checkout-index.c:126
3301msgid "git checkout-index [options] [--] [<file>...]"
3302msgstr "git checkout-index [选项] [--] [<文件>...]"
3303
3304#: builtin/checkout-index.c:188
3305msgid "check out all files in the index"
3306msgstr "检出索引区的所有文件"
3307
3308#: builtin/checkout-index.c:189
3309msgid "force overwrite of existing files"
3310msgstr "强制覆盖现有的文件"
3311
3312#: builtin/checkout-index.c:191
3313msgid "no warning for existing files and files not in index"
3314msgstr "存在或不在索引中的文件都没有警告"
3315
3316#: builtin/checkout-index.c:193
3317msgid "don't checkout new files"
3318msgstr "不检出新文件"
3319
3320#: builtin/checkout-index.c:195
3321msgid "update stat information in the index file"
3322msgstr "更新索引中文件的状态信息"
3323
3324#: builtin/checkout-index.c:201
3325msgid "read list of paths from the standard input"
3326msgstr "从标准输入读取路径列表"
3327
3328#: builtin/checkout-index.c:203
3329msgid "write the content to temporary files"
3330msgstr "将内容写入临时文件"
3331
3332#: builtin/checkout-index.c:204 builtin/column.c:30
3333msgid "string"
3334msgstr "字符串"
3335
3336#: builtin/checkout-index.c:205
3337msgid "when creating files, prepend <string>"
3338msgstr "在创建文件时,在前面加上<字符串>"
3339
3340#: builtin/checkout-index.c:208
3341msgid "copy out the files from named stage"
3342msgstr "从指定暂存区中拷出文件"
3343
3344#: builtin/checkout.c:25
3345msgid "git checkout [options] <branch>"
3346msgstr "git checkout [选项] <分支>"
3347
3348#: builtin/checkout.c:26
3349msgid "git checkout [options] [<branch>] -- <file>..."
3350msgstr "git checkout [选项] [<分支>] -- <文件>..."
3351
3352#: builtin/checkout.c:114 builtin/checkout.c:147
3353#, c-format
3354msgid "path '%s' does not have our version"
3355msgstr "路径 '%s' 没有我们的版本"
3356
3357#: builtin/checkout.c:116 builtin/checkout.c:149
3358#, c-format
3359msgid "path '%s' does not have their version"
3360msgstr "路径 '%s' 没有他们的版本"
3361
3362#: builtin/checkout.c:132
3363#, c-format
3364msgid "path '%s' does not have all necessary versions"
3365msgstr "路径 '%s' 没有全部必须的版本"
3366
3367#: builtin/checkout.c:176
3368#, c-format
3369msgid "path '%s' does not have necessary versions"
3370msgstr "路径 '%s' 没有必须的版本"
3371
3372#: builtin/checkout.c:193
3373#, c-format
3374msgid "path '%s': cannot merge"
3375msgstr "path '%s':无法合并"
3376
3377#: builtin/checkout.c:210
3378#, c-format
3379msgid "Unable to add merge result for '%s'"
3380msgstr "无法为 '%s' 添加合并结果"
3381
3382#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
3383#: builtin/checkout.c:240
3384#, c-format
3385msgid "'%s' cannot be used with updating paths"
3386msgstr "'%s' 不能在更新路径时使用"
3387
3388#: builtin/checkout.c:243 builtin/checkout.c:246
3389#, c-format
3390msgid "'%s' cannot be used with %s"
3391msgstr "'%s' 不能和 %s 同时使用"
3392
3393#: builtin/checkout.c:249
3394#, c-format
3395msgid "Cannot update paths and switch to branch '%s' at the same time."
3396msgstr "不能同时更新路径并切换到分支'%s'。"
3397
3398#: builtin/checkout.c:260 builtin/checkout.c:449
3399msgid "corrupt index file"
3400msgstr "损坏的索引文件"
3401
3402#: builtin/checkout.c:320 builtin/checkout.c:327
3403#, c-format
3404msgid "path '%s' is unmerged"
3405msgstr "路径 '%s' 未合并"
3406
3407#: builtin/checkout.c:471
3408msgid "you need to resolve your current index first"
3409msgstr "您需要先解决当前索引的冲突"
3410
3411#: builtin/checkout.c:597
3412#, c-format
3413msgid "Can not do reflog for '%s'\n"
3414msgstr "不能对 '%s' 执行 reflog 操作\n"
3415
3416#: builtin/checkout.c:635
3417msgid "HEAD is now at"
3418msgstr "HEAD 目前位于"
3419
3420#: builtin/checkout.c:642
3421#, c-format
3422msgid "Reset branch '%s'\n"
3423msgstr "重置分支 '%s'\n"
3424
3425#: builtin/checkout.c:645
3426#, c-format
3427msgid "Already on '%s'\n"
3428msgstr "已经位于 '%s'\n"
3429
3430#: builtin/checkout.c:649
3431#, c-format
3432msgid "Switched to and reset branch '%s'\n"
3433msgstr "切换并重置分支 '%s'\n"
3434
3435#: builtin/checkout.c:651 builtin/checkout.c:1032
3436#, c-format
3437msgid "Switched to a new branch '%s'\n"
3438msgstr "切换到一个新分支 '%s'\n"
3439
3440#: builtin/checkout.c:653
3441#, c-format
3442msgid "Switched to branch '%s'\n"
3443msgstr "切换到分支 '%s'\n"
3444
3445#  译者:注意保持前导空格
3446#: builtin/checkout.c:705
3447#, c-format
3448msgid " ... and %d more.\n"
3449msgstr " ... 及其它 %d 个。\n"
3450
3451#: builtin/checkout.c:711
3452#, c-format
3453msgid ""
3454"Warning: you are leaving %d commit behind, not connected to\n"
3455"any of your branches:\n"
3456"\n"
3457"%s\n"
3458msgid_plural ""
3459"Warning: you are leaving %d commits behind, not connected to\n"
3460"any of your branches:\n"
3461"\n"
3462"%s\n"
3463msgstr[0] ""
3464"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3465"\n"
3466"%s\n"
3467msgstr[1] ""
3468"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3469"\n"
3470"%s\n"
3471
3472#: builtin/checkout.c:729
3473#, c-format
3474msgid ""
3475"If you want to keep them by creating a new branch, this may be a good time\n"
3476"to do so with:\n"
3477"\n"
3478" git branch new_branch_name %s\n"
3479"\n"
3480msgstr ""
3481"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3482"如下操作:\n"
3483"\n"
3484" git branch new_branch_name %s\n"
3485"\n"
3486
3487#: builtin/checkout.c:759
3488msgid "internal error in revision walk"
3489msgstr "在版本遍历时遇到内部错误"
3490
3491#: builtin/checkout.c:763
3492msgid "Previous HEAD position was"
3493msgstr "之前的 HEAD 位置是"
3494
3495#: builtin/checkout.c:790 builtin/checkout.c:1027
3496msgid "You are on a branch yet to be born"
3497msgstr "您位于一个尚未初始化的分支"
3498
3499#: builtin/checkout.c:934
3500#, c-format
3501msgid "only one reference expected, %d given."
3502msgstr "只要一个引用,却给出了 %d 个"
3503
3504#: builtin/checkout.c:973
3505#, c-format
3506msgid "invalid reference: %s"
3507msgstr "无效引用:%s"
3508
3509#: builtin/checkout.c:1002
3510#, c-format
3511msgid "reference is not a tree: %s"
3512msgstr "引用不是一个树:%s"
3513
3514#: builtin/checkout.c:1041
3515msgid "paths cannot be used with switching branches"
3516msgstr "路径不能和切换分支同时使用"
3517
3518#: builtin/checkout.c:1044 builtin/checkout.c:1048
3519#, c-format
3520msgid "'%s' cannot be used with switching branches"
3521msgstr "'%s' 不能和切换分支同时使用"
3522
3523#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
3524#: builtin/checkout.c:1063
3525#, c-format
3526msgid "'%s' cannot be used with '%s'"
3527msgstr "'%s' 不能和 '%s' 同时使用"
3528
3529#: builtin/checkout.c:1068
3530#, c-format
3531msgid "Cannot switch branch to a non-commit '%s'"
3532msgstr "不能切换分支到一个非提交 '%s'"
3533
3534#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89
3535#: builtin/remote.c:159 builtin/remote.c:161
3536msgid "branch"
3537msgstr "分支"
3538
3539#: builtin/checkout.c:1091
3540msgid "create and checkout a new branch"
3541msgstr "创建并检出一个新的分支"
3542
3543#: builtin/checkout.c:1093
3544msgid "create/reset and checkout a branch"
3545msgstr "创建/重置并检出一个分支"
3546
3547#: builtin/checkout.c:1094
3548msgid "create reflog for new branch"
3549msgstr "为新的分支创建引用日志"
3550
3551#: builtin/checkout.c:1095
3552msgid "detach the HEAD at named commit"
3553msgstr "成为指向该提交的分离头指针"
3554
3555#: builtin/checkout.c:1096
3556msgid "set upstream info for new branch"
3557msgstr "为新的分支设置上游信息"
3558
3559#: builtin/checkout.c:1098
3560msgid "new-branch"
3561msgstr "新分支"
3562
3563#: builtin/checkout.c:1098
3564msgid "new unparented branch"
3565msgstr "新的没有父提交的分支"
3566
3567#: builtin/checkout.c:1099
3568msgid "checkout our version for unmerged files"
3569msgstr "对尚未合并的文件检出我们的版本"
3570
3571#: builtin/checkout.c:1101
3572msgid "checkout their version for unmerged files"
3573msgstr "对尚未合并的文件检出他们的版本"
3574
3575#: builtin/checkout.c:1103
3576msgid "force checkout (throw away local modifications)"
3577msgstr "强制检出(丢弃本地修改)"
3578
3579#: builtin/checkout.c:1104
3580msgid "perform a 3-way merge with the new branch"
3581msgstr "和新的分支执行三路合并"
3582
3583#: builtin/checkout.c:1105 builtin/merge.c:226
3584msgid "update ignored files (default)"
3585msgstr "更新忽略的文件(默认)"
3586
3587#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245
3588msgid "style"
3589msgstr "风格"
3590
3591#: builtin/checkout.c:1107
3592msgid "conflict style (merge or diff3)"
3593msgstr "冲突输出风格(merge 或 diff3)"
3594
3595#: builtin/checkout.c:1110
3596msgid "do not limit pathspecs to sparse entries only"
3597msgstr "对路径不做稀疏检出的限制"
3598
3599#: builtin/checkout.c:1112
3600msgid "second guess 'git checkout no-such-branch'"
3601msgstr "再者猜测'git checkout no-such-branch'"
3602
3603#: builtin/checkout.c:1135
3604msgid "-b, -B and --orphan are mutually exclusive"
3605msgstr "-b、-B 和 --orphan 是互斥的"
3606
3607#: builtin/checkout.c:1152
3608msgid "--track needs a branch name"
3609msgstr "--track 需要一个分支名"
3610
3611#: builtin/checkout.c:1157
3612msgid "Missing branch name; try -b"
3613msgstr "缺少分支名;尝试 -b"
3614
3615#: builtin/checkout.c:1194
3616msgid "invalid path specification"
3617msgstr "无效的路径规格"
3618
3619#: builtin/checkout.c:1201
3620#, c-format
3621msgid ""
3622"Cannot update paths and switch to branch '%s' at the same time.\n"
3623"Did you intend to checkout '%s' which can not be resolved as commit?"
3624msgstr ""
3625"不能同时更新路径并切换到分支'%s'。\n"
3626"您是想要检出 '%s' 但其未能解析为提交么?"
3627
3628#: builtin/checkout.c:1206
3629#, c-format
3630msgid "git checkout: --detach does not take a path argument '%s'"
3631msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3632
3633#: builtin/checkout.c:1210
3634msgid ""
3635"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3636"checking out of the index."
3637msgstr ""
3638"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3639
3640#: builtin/clean.c:26
3641msgid ""
3642"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3643msgstr ""
3644"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3645
3646#: builtin/clean.c:30
3647#, c-format
3648msgid "Removing %s\n"
3649msgstr "正删除 %s\n"
3650
3651#: builtin/clean.c:31
3652#, c-format
3653msgid "Would remove %s\n"
3654msgstr "将删除 %s\n"
3655
3656#: builtin/clean.c:32
3657#, c-format
3658msgid "Skipping repository %s\n"
3659msgstr "忽略版本库 %s\n"
3660
3661#: builtin/clean.c:33
3662#, c-format
3663msgid "Would skip repository %s\n"
3664msgstr "将忽略版本库 %s\n"
3665
3666#: builtin/clean.c:34
3667#, c-format
3668msgid "failed to remove %s"
3669msgstr "无法删除 %s"
3670
3671#: builtin/clean.c:295
3672msgid ""
3673"Prompt help:\n"
3674"1          - select a numbered item\n"
3675"foo        - select item based on unique prefix\n"
3676"           - (empty) select nothing"
3677msgstr ""
3678"帮助:\n"
3679"1          - 通过编号选择一个选项\n"
3680"foo        - 通过标题选择一个选项\n"
3681"           - (空)什么也不选择"
3682
3683#: builtin/clean.c:299
3684msgid ""
3685"Prompt help:\n"
3686"1          - select a single item\n"
3687"3-5        - select a range of items\n"
3688"2-3,6-9    - select multiple ranges\n"
3689"foo        - select item based on unique prefix\n"
3690"-...       - unselect specified items\n"
3691"*          - choose all items\n"
3692"           - (empty) finish selecting"
3693msgstr ""
3694"帮助:\n"
3695"1          - 选择一个选项\n"
3696"3-5        - 选择一个范围内的所有选项\n"
3697"2-3,6-9    - 选择多个范围内的所有选项\n"
3698"foo        - 通过标题选择一个选项\n"
3699"-...       - 反选特定的选项\n"
3700"*          - 选择所有选项\n"
3701"           - (空)结束选择"
3702
3703#: builtin/clean.c:517
3704#, c-format
3705msgid "Huh (%s)?"
3706msgstr "嗯(%s)?"
3707
3708#: builtin/clean.c:659
3709#, c-format
3710msgid "Input ignore patterns>> "
3711msgstr "输入模版以排除条目>> "
3712
3713#: builtin/clean.c:696
3714#, c-format
3715msgid "WARNING: Cannot find items matched by: %s"
3716msgstr "警告:无法找到和 %s 匹配的条目"
3717
3718#: builtin/clean.c:717
3719msgid "Select items to delete"
3720msgstr "选择要删除的条目"
3721
3722#: builtin/clean.c:757
3723#, c-format
3724msgid "remove %s? "
3725msgstr "删除 %s?"
3726
3727#: builtin/clean.c:782
3728msgid "Bye."
3729msgstr "再见。"
3730
3731#: builtin/clean.c:790
3732msgid ""
3733"clean               - start cleaning\n"
3734"filter by pattern   - exclude items from deletion\n"
3735"select by numbers   - select items to be deleted by numbers\n"
3736"ask each            - confirm each deletion (like \"rm -i\")\n"
3737"quit                - stop cleaning\n"
3738"help                - this screen\n"
3739"?                   - help for prompt selection"
3740msgstr ""
3741"clean               - 开始清理\n"
3742"filter by pattern   - 通过模版排除要删除的条目\n"
3743"select by numbers   - 通过数字选择要删除的条目\n"
3744"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
3745"quit                - 停止删除并退出\n"
3746"help                - 显示本帮助\n"
3747"?                   - 显示如何在提示符下选择的帮助"
3748
3749#: builtin/clean.c:817
3750msgid "*** Commands ***"
3751msgstr "*** 命令 ***"
3752
3753#: builtin/clean.c:818
3754msgid "What now"
3755msgstr "请选择"
3756
3757#: builtin/clean.c:826
3758msgid "Would remove the following item:"
3759msgid_plural "Would remove the following items:"
3760msgstr[0] "将删除如下条目:"
3761msgstr[1] "将删除如下条目:"
3762
3763#: builtin/clean.c:843
3764msgid "No more files to clean, exiting."
3765msgstr "没有要清理的文件,退出。"
3766
3767#: builtin/clean.c:874
3768msgid "do not print names of files removed"
3769msgstr "不打印删除文件的名称"
3770
3771#: builtin/clean.c:876
3772msgid "force"
3773msgstr "强制"
3774
3775#: builtin/clean.c:877
3776msgid "interactive cleaning"
3777msgstr "交互式清除"
3778
3779#: builtin/clean.c:879
3780msgid "remove whole directories"
3781msgstr "删除整个目录"
3782
3783#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
3784#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
3785msgid "pattern"
3786msgstr "模式"
3787
3788#: builtin/clean.c:881
3789msgid "add <pattern> to ignore rules"
3790msgstr "添加<模式>到忽略规则"
3791
3792#: builtin/clean.c:882
3793msgid "remove ignored files, too"
3794msgstr "也删除忽略的文件"
3795
3796#: builtin/clean.c:884
3797msgid "remove only ignored files"
3798msgstr "只删除忽略的文件"
3799
3800#: builtin/clean.c:902
3801msgid "-x and -X cannot be used together"
3802msgstr "-x 和 -X 不能同时使用"
3803
3804#: builtin/clean.c:906
3805msgid ""
3806"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3807"clean"
3808msgstr ""
3809"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3810
3811#: builtin/clean.c:909
3812msgid ""
3813"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3814"refusing to clean"
3815msgstr ""
3816"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3817
3818#: builtin/clone.c:37
3819msgid "git clone [options] [--] <repo> [<dir>]"
3820msgstr "git clone [选项] [--] <版本库> [<路径>]"
3821
3822#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223
3823#: builtin/push.c:514
3824msgid "force progress reporting"
3825msgstr "强制显示进度报告"
3826
3827#: builtin/clone.c:67
3828msgid "don't create a checkout"
3829msgstr "不创建一个检出"
3830
3831#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
3832msgid "create a bare repository"
3833msgstr "创建一个纯版本库"
3834
3835#: builtin/clone.c:72
3836msgid "create a mirror repository (implies bare)"
3837msgstr "创建一个镜像版本库(也是纯版本库)"
3838
3839#: builtin/clone.c:74
3840msgid "to clone from a local repository"
3841msgstr "从本地版本库克隆"
3842
3843#: builtin/clone.c:76
3844msgid "don't use local hardlinks, always copy"
3845msgstr "不使用本地硬链接,始终复制"
3846
3847#: builtin/clone.c:78
3848msgid "setup as shared repository"
3849msgstr "设置为共享版本库"
3850
3851#: builtin/clone.c:80 builtin/clone.c:82
3852msgid "initialize submodules in the clone"
3853msgstr "在克隆时初始化子模组"
3854
3855#: builtin/clone.c:83 builtin/init-db.c:485
3856msgid "template-directory"
3857msgstr "模板目录"
3858
3859#: builtin/clone.c:84 builtin/init-db.c:486
3860msgid "directory from which templates will be used"
3861msgstr "模板目录将被使用"
3862
3863#: builtin/clone.c:86
3864msgid "reference repository"
3865msgstr "参考版本库"
3866
3867#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
3868msgid "name"
3869msgstr "名称"
3870
3871#: builtin/clone.c:88
3872msgid "use <name> instead of 'origin' to track upstream"
3873msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3874
3875#: builtin/clone.c:90
3876msgid "checkout <branch> instead of the remote's HEAD"
3877msgstr "检出<分支>而不是远程HEAD"
3878
3879#: builtin/clone.c:92
3880msgid "path to git-upload-pack on the remote"
3881msgstr "远程 git-upload-pack 路径"
3882
3883#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659
3884msgid "depth"
3885msgstr "深度"
3886
3887#: builtin/clone.c:94
3888msgid "create a shallow clone of that depth"
3889msgstr "创建一个指定深度的浅克隆"
3890
3891#: builtin/clone.c:96
3892msgid "clone only one branch, HEAD or --branch"
3893msgstr "只克隆一个分支、HEAD 或 --branch"
3894
3895#: builtin/clone.c:97 builtin/init-db.c:494
3896msgid "gitdir"
3897msgstr "git目录"
3898
3899#: builtin/clone.c:98 builtin/init-db.c:495
3900msgid "separate git dir from working tree"
3901msgstr "git目录和工作区分离"
3902
3903#: builtin/clone.c:99
3904msgid "key=value"
3905msgstr "key=value"
3906
3907#: builtin/clone.c:100
3908msgid "set config inside the new repository"
3909msgstr "在新版本库中设置配置信息"
3910
3911#: builtin/clone.c:253
3912#, c-format
3913msgid "reference repository '%s' is not a local repository."
3914msgstr "参考版本库 '%s' 不是一个本地版本库。"
3915
3916#: builtin/clone.c:257
3917#, c-format
3918msgid "reference repository '%s' is shallow"
3919msgstr "参考版本库 '%s' 是一个浅克隆"
3920
3921#: builtin/clone.c:260
3922#, c-format
3923msgid "reference repository '%s' is grafted"
3924msgstr "参考版本库 '%s' 已被嫁接"
3925
3926#: builtin/clone.c:322
3927#, c-format
3928msgid "failed to create directory '%s'"
3929msgstr "无法创建目录 '%s'"
3930
3931#: builtin/clone.c:324 builtin/diff.c:84
3932#, c-format
3933msgid "failed to stat '%s'"
3934msgstr "无法枚举 '%s' 状态"
3935
3936#: builtin/clone.c:326
3937#, c-format
3938msgid "%s exists and is not a directory"
3939msgstr "%s 存在且不是一个目录"
3940
3941#: builtin/clone.c:340
3942#, c-format
3943msgid "failed to stat %s\n"
3944msgstr "无法枚举 %s 状态\n"
3945
3946#: builtin/clone.c:362
3947#, c-format
3948msgid "failed to create link '%s'"
3949msgstr "无法创建链接 '%s'"
3950
3951#: builtin/clone.c:366
3952#, c-format
3953msgid "failed to copy file to '%s'"
3954msgstr "无法拷贝文件至 '%s'"
3955
3956#: builtin/clone.c:389 builtin/clone.c:563
3957#, c-format
3958msgid "done.\n"
3959msgstr "完成。\n"
3960
3961#: builtin/clone.c:401
3962msgid ""
3963"Clone succeeded, but checkout failed.\n"
3964"You can inspect what was checked out with 'git status'\n"
3965"and retry the checkout with 'git checkout -f HEAD'\n"
3966msgstr ""
3967"克隆成功,但是检出失败。\n"
3968"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3969"'git checkout -f HEAD' 重试\n"
3970
3971#: builtin/clone.c:478
3972#, c-format
3973msgid "Could not find remote branch %s to clone."
3974msgstr "不能发现要克隆的远程分支 %s。"
3975
3976#: builtin/clone.c:558
3977#, c-format
3978msgid "Checking connectivity... "
3979msgstr "检查连接... "
3980
3981#: builtin/clone.c:561
3982msgid "remote did not send all necessary objects"
3983msgstr "远程没有发送所有必须的对象"
3984
3985#: builtin/clone.c:625
3986msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3987msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3988
3989#: builtin/clone.c:656
3990msgid "unable to checkout working tree"
3991msgstr "不能检出工作区"
3992
3993#: builtin/clone.c:765
3994msgid "Too many arguments."
3995msgstr "太多参数。"
3996
3997#: builtin/clone.c:769
3998msgid "You must specify a repository to clone."
3999msgstr "您必须指定一个版本库来克隆。"
4000
4001#: builtin/clone.c:780
4002#, c-format
4003msgid "--bare and --origin %s options are incompatible."
4004msgstr "--bare 和 --origin %s 选项不兼容。"
4005
4006#: builtin/clone.c:783
4007msgid "--bare and --separate-git-dir are incompatible."
4008msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4009
4010#: builtin/clone.c:796
4011#, c-format
4012msgid "repository '%s' does not exist"
4013msgstr "版本库 '%s' 不存在"
4014
4015#: builtin/clone.c:802 builtin/fetch.c:1155
4016#, c-format
4017msgid "depth %s is not a positive number"
4018msgstr "深度 %s 不是一个正数"
4019
4020#: builtin/clone.c:812
4021#, c-format
4022msgid "destination path '%s' already exists and is not an empty directory."
4023msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4024
4025#: builtin/clone.c:822
4026#, c-format
4027msgid "working tree '%s' already exists."
4028msgstr "工作区 '%s' 已经存在。"
4029
4030#: builtin/clone.c:835 builtin/clone.c:847
4031#, c-format
4032msgid "could not create leading directories of '%s'"
4033msgstr "不能为 '%s' 创建先导目录"
4034
4035#: builtin/clone.c:838
4036#, c-format
4037msgid "could not create work tree dir '%s'."
4038msgstr "不能为 '%s' 创建工作区目录。"
4039
4040#: builtin/clone.c:857
4041#, c-format
4042msgid "Cloning into bare repository '%s'...\n"
4043msgstr "克隆到纯版本库 '%s'...\n"
4044
4045#: builtin/clone.c:859
4046#, c-format
4047msgid "Cloning into '%s'...\n"
4048msgstr "正克隆到 '%s'...\n"
4049
4050#: builtin/clone.c:895
4051msgid "--depth is ignored in local clones; use file:// instead."
4052msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4053
4054#: builtin/clone.c:898
4055msgid "source repository is shallow, ignoring --local"
4056msgstr "源版本库是浅克隆,忽略 --local"
4057
4058#: builtin/clone.c:903
4059msgid "--local is ignored"
4060msgstr "--local 被忽略"
4061
4062#: builtin/clone.c:907
4063#, c-format
4064msgid "Don't know how to clone %s"
4065msgstr "不知道如何克隆 %s"
4066
4067#: builtin/clone.c:958 builtin/clone.c:966
4068#, c-format
4069msgid "Remote branch %s not found in upstream %s"
4070msgstr "远程分支 %s 在上游 %s 未发现"
4071
4072#: builtin/clone.c:969
4073msgid "You appear to have cloned an empty repository."
4074msgstr "您似乎克隆了一个空版本库。"
4075
4076#: builtin/column.c:9
4077msgid "git column [options]"
4078msgstr "git column [选项]"
4079
4080#: builtin/column.c:26
4081msgid "lookup config vars"
4082msgstr "查找配置变量"
4083
4084#: builtin/column.c:27 builtin/column.c:28
4085msgid "layout to use"
4086msgstr "要使用的布局"
4087
4088#: builtin/column.c:29
4089msgid "Maximum width"
4090msgstr "最大宽度"
4091
4092#: builtin/column.c:30
4093msgid "Padding space on left border"
4094msgstr "左边框的填充空间"
4095
4096#: builtin/column.c:31
4097msgid "Padding space on right border"
4098msgstr "右边框的填充空间"
4099
4100#: builtin/column.c:32
4101msgid "Padding space between columns"
4102msgstr "两列之间的填充空间"
4103
4104#: builtin/column.c:51
4105msgid "--command must be the first argument"
4106msgstr "--command 必须是第一个参数"
4107
4108#: builtin/commit.c:37
4109msgid "git commit [options] [--] <pathspec>..."
4110msgstr "git commit [选项] [--] <路径规则>..."
4111
4112#: builtin/commit.c:42
4113msgid "git status [options] [--] <pathspec>..."
4114msgstr "git status [选项] [--] <路径规则>..."
4115
4116#: builtin/commit.c:47
4117msgid ""
4118"Your name and email address were configured automatically based\n"
4119"on your username and hostname. Please check that they are accurate.\n"
4120"You can suppress this message by setting them explicitly. Run the\n"
4121"following command and follow the instructions in your editor to edit\n"
4122"your configuration file:\n"
4123"\n"
4124"    git config --global --edit\n"
4125"\n"
4126"After doing this, you may fix the identity used for this commit with:\n"
4127"\n"
4128"    git commit --amend --reset-author\n"
4129msgstr ""
4130"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4131"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4132"中编辑您的配置文件:\n"
4133"\n"
4134"    git config --global --edit\n"
4135"\n"
4136"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4137"\n"
4138"    git commit --amend --reset-author\n"
4139
4140#: builtin/commit.c:60
4141msgid ""
4142"Your name and email address were configured automatically based\n"
4143"on your username and hostname. Please check that they are accurate.\n"
4144"You can suppress this message by setting them explicitly:\n"
4145"\n"
4146"    git config --global user.name \"Your Name\"\n"
4147"    git config --global user.email you@example.com\n"
4148"\n"
4149"After doing this, you may fix the identity used for this commit with:\n"
4150"\n"
4151"    git commit --amend --reset-author\n"
4152msgstr ""
4153"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4154"与否。您可以对其进行设置以免再出现本提示信息:\n"
4155"\n"
4156"    git config --global user.name \"Your Name\"\n"
4157"    git config --global user.email you@example.com\n"
4158"\n"
4159"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4160"\n"
4161"    git commit --amend --reset-author\n"
4162
4163#: builtin/commit.c:72
4164msgid ""
4165"You asked to amend the most recent commit, but doing so would make\n"
4166"it empty. You can repeat your command with --allow-empty, or you can\n"
4167"remove the commit entirely with \"git reset HEAD^\".\n"
4168msgstr ""
4169"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4170"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4171
4172#: builtin/commit.c:77
4173msgid ""
4174"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4175"If you wish to commit it anyway, use:\n"
4176"\n"
4177"    git commit --allow-empty\n"
4178"\n"
4179msgstr ""
4180"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4181"也要提交,使用命令:\n"
4182"\n"
4183"    git commit --allow-empty\n"
4184"\n"
4185
4186#: builtin/commit.c:84
4187msgid "Otherwise, please use 'git reset'\n"
4188msgstr "否则,请使用命令 'git reset'\n"
4189
4190#: builtin/commit.c:87
4191msgid ""
4192"If you wish to skip this commit, use:\n"
4193"\n"
4194"    git reset\n"
4195"\n"
4196"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4197"the remaining commits.\n"
4198msgstr ""
4199"如果您想跳过这个提交,使用命令:\n"
4200"\n"
4201"    git reset\n"
4202"\n"
4203"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4204"操作。\n"
4205
4206#: builtin/commit.c:302
4207msgid "failed to unpack HEAD tree object"
4208msgstr "无法解包 HEAD 树对象"
4209
4210#: builtin/commit.c:342
4211msgid "unable to create temporary index"
4212msgstr "不能创建临时索引"
4213
4214#: builtin/commit.c:348
4215msgid "interactive add failed"
4216msgstr "交互式添加失败"
4217
4218#: builtin/commit.c:359
4219msgid "unable to write index file"
4220msgstr "无法写入索引文件"
4221
4222#: builtin/commit.c:361
4223msgid "unable to update temporary index"
4224msgstr "无法更新临时索引"
4225
4226#: builtin/commit.c:363
4227msgid "Failed to update main cache tree"
4228msgstr "不能更新树的主缓存"
4229
4230#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
4231msgid "unable to write new_index file"
4232msgstr "无法写 new_index 文件"
4233
4234#: builtin/commit.c:443
4235msgid "cannot do a partial commit during a merge."
4236msgstr "在合并过程中不能做部分提交。"
4237
4238#: builtin/commit.c:445
4239msgid "cannot do a partial commit during a cherry-pick."
4240msgstr "在拣选过程中不能做部分提交。"
4241
4242#: builtin/commit.c:454
4243msgid "cannot read the index"
4244msgstr "无法读取索引"
4245
4246#: builtin/commit.c:473
4247msgid "unable to write temporary index file"
4248msgstr "无法写临时索引文件"
4249
4250#: builtin/commit.c:592
4251#, c-format
4252msgid "commit '%s' lacks author header"
4253msgstr "提交 '%s' 缺少作者信息"
4254
4255#: builtin/commit.c:594
4256#, c-format
4257msgid "commit '%s' has malformed author line"
4258msgstr "提交 '%s' 有非法的作者信息"
4259
4260#: builtin/commit.c:613
4261msgid "malformed --author parameter"
4262msgstr "非法的 --author 参数"
4263
4264#: builtin/commit.c:621
4265#, c-format
4266msgid "invalid date format: %s"
4267msgstr "无效的日期格式:%s"
4268
4269#: builtin/commit.c:642
4270#, c-format
4271msgid "Malformed ident string: '%s'"
4272msgstr "非法的身份字符串:'%s'"
4273
4274#: builtin/commit.c:675
4275msgid ""
4276"unable to select a comment character that is not used\n"
4277"in the current commit message"
4278msgstr "无法选择一个未被当前提交说明使用的注释字符"
4279
4280#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120
4281#, c-format
4282msgid "could not lookup commit %s"
4283msgstr "不能查询提交 %s"
4284
4285#: builtin/commit.c:724 builtin/shortlog.c:273
4286#, c-format
4287msgid "(reading log message from standard input)\n"
4288msgstr "(正从标准输入中读取日志信息)\n"
4289
4290#: builtin/commit.c:726
4291msgid "could not read log from standard input"
4292msgstr "不能从标准输入中读取日志信息"
4293
4294#: builtin/commit.c:730
4295#, c-format
4296msgid "could not read log file '%s'"
4297msgstr "不能读取日志文件 '%s'"
4298
4299#: builtin/commit.c:752
4300msgid "could not read MERGE_MSG"
4301msgstr "不能读取 MERGE_MSG"
4302
4303#: builtin/commit.c:756
4304msgid "could not read SQUASH_MSG"
4305msgstr "不能读取 SQUASH_MSG"
4306
4307#: builtin/commit.c:760
4308#, c-format
4309msgid "could not read '%s'"
4310msgstr "不能读取 '%s'"
4311
4312#: builtin/commit.c:831
4313msgid "could not write commit template"
4314msgstr "不能写提交模版"
4315
4316#: builtin/commit.c:849
4317#, c-format
4318msgid ""
4319"\n"
4320"It looks like you may be committing a merge.\n"
4321"If this is not correct, please remove the file\n"
4322"\t%s\n"
4323"and try again.\n"
4324msgstr ""
4325"\n"
4326"似乎您正在做一个合并提交。如果不对,请删除文件\n"
4327"\t%s\n"
4328"然后重试。\n"
4329
4330#: builtin/commit.c:854
4331#, c-format
4332msgid ""
4333"\n"
4334"It looks like you may be committing a cherry-pick.\n"
4335"If this is not correct, please remove the file\n"
4336"\t%s\n"
4337"and try again.\n"
4338msgstr ""
4339"\n"
4340"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4341"\t%s\n"
4342"然后重试。\n"
4343
4344#: builtin/commit.c:867
4345#, c-format
4346msgid ""
4347"Please enter the commit message for your changes. Lines starting\n"
4348"with '%c' will be ignored, and an empty message aborts the commit.\n"
4349msgstr ""
4350"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4351"说明将会终止提交。\n"
4352
4353#: builtin/commit.c:874
4354#, c-format
4355msgid ""
4356"Please enter the commit message for your changes. Lines starting\n"
4357"with '%c' will be kept; you may remove them yourself if you want to.\n"
4358"An empty message aborts the commit.\n"
4359msgstr ""
4360"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4361"也可以删除它们。一个空的提交说明将会终止提交。\n"
4362
4363#  译者:为保证在输出中对齐,注意调整句中空格!
4364#: builtin/commit.c:888
4365#, c-format
4366msgid "%sAuthor:    %.*s <%.*s>"
4367msgstr "%s作者:  %.*s <%.*s>"
4368
4369#  译者:为保证在输出中对齐,注意调整句中空格!
4370#: builtin/commit.c:896
4371#, c-format
4372msgid "%sDate:      %s"
4373msgstr "%s日期:  %s"
4374
4375#  译者:为保证在输出中对齐,注意调整句中空格!
4376#: builtin/commit.c:903
4377#, c-format
4378msgid "%sCommitter: %.*s <%.*s>"
4379msgstr "%s提交者:%.*s <%.*s>"
4380
4381#: builtin/commit.c:921
4382msgid "Cannot read index"
4383msgstr "无法读取索引"
4384
4385#: builtin/commit.c:978
4386msgid "Error building trees"
4387msgstr "无法创建树对象"
4388
4389#: builtin/commit.c:993 builtin/tag.c:495
4390#, c-format
4391msgid "Please supply the message using either -m or -F option.\n"
4392msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4393
4394#: builtin/commit.c:1095
4395#, c-format
4396msgid "No existing author found with '%s'"
4397msgstr "没有找到匹配 '%s' 的作者"
4398
4399#: builtin/commit.c:1110 builtin/commit.c:1350
4400#, c-format
4401msgid "Invalid untracked files mode '%s'"
4402msgstr "无效的未追踪文件参数 '%s'"
4403
4404#: builtin/commit.c:1147
4405msgid "--long and -z are incompatible"
4406msgstr "--long 和 -z 选项不兼容"
4407
4408#: builtin/commit.c:1177
4409msgid "Using both --reset-author and --author does not make sense"
4410msgstr "同时使用 --reset-author 和 --author 没有意义"
4411
4412#: builtin/commit.c:1186
4413msgid "You have nothing to amend."
4414msgstr "您没有可修补的提交。"
4415
4416#: builtin/commit.c:1189
4417msgid "You are in the middle of a merge -- cannot amend."
4418msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4419
4420#: builtin/commit.c:1191
4421msgid "You are in the middle of a cherry-pick -- cannot amend."
4422msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4423
4424#: builtin/commit.c:1194
4425msgid "Options --squash and --fixup cannot be used together"
4426msgstr "选项 --squash 和 --fixup 不能同时使用"
4427
4428#: builtin/commit.c:1204
4429msgid "Only one of -c/-C/-F/--fixup can be used."
4430msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4431
4432#: builtin/commit.c:1206
4433msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4434msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4435
4436#: builtin/commit.c:1214
4437msgid "--reset-author can be used only with -C, -c or --amend."
4438msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4439
4440#: builtin/commit.c:1231
4441msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4442msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4443
4444#: builtin/commit.c:1233
4445msgid "No paths with --include/--only does not make sense."
4446msgstr "参数 --include/--only 不跟路径没有意义。"
4447
4448#: builtin/commit.c:1235
4449msgid "Clever... amending the last one with dirty index."
4450msgstr "聪明... 在索引不干净下修补最后的提交。"
4451
4452#: builtin/commit.c:1237
4453msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4454msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4455
4456#: builtin/commit.c:1249 builtin/tag.c:728
4457#, c-format
4458msgid "Invalid cleanup mode %s"
4459msgstr "无效的清理模式 %s"
4460
4461#: builtin/commit.c:1254
4462msgid "Paths with -a does not make sense."
4463msgstr "路径和 -a 选项同时使用没有意义。"
4464
4465#: builtin/commit.c:1364 builtin/commit.c:1644
4466msgid "show status concisely"
4467msgstr "以简洁的格式显示状态"
4468
4469#: builtin/commit.c:1366 builtin/commit.c:1646
4470msgid "show branch information"
4471msgstr "显示分支信息"
4472
4473#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500
4474msgid "machine-readable output"
4475msgstr "机器可读的输出"
4476
4477#: builtin/commit.c:1371 builtin/commit.c:1650
4478msgid "show status in long format (default)"
4479msgstr "以长格式显示状态(默认)"
4480
4481#: builtin/commit.c:1374 builtin/commit.c:1653
4482msgid "terminate entries with NUL"
4483msgstr "条目以NUL字符结尾"
4484
4485#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980
4486#: builtin/fast-export.c:983 builtin/tag.c:603
4487msgid "mode"
4488msgstr "模式"
4489
4490#: builtin/commit.c:1377 builtin/commit.c:1656
4491msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4492msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4493
4494#: builtin/commit.c:1380
4495msgid "show ignored files"
4496msgstr "显示忽略的文件"
4497
4498#: builtin/commit.c:1381 parse-options.h:153
4499msgid "when"
4500msgstr "何时"
4501
4502#: builtin/commit.c:1382
4503msgid ""
4504"ignore changes to submodules, optional when: all, dirty, untracked. "
4505"(Default: all)"
4506msgstr ""
4507"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4508
4509#: builtin/commit.c:1384
4510msgid "list untracked files in columns"
4511msgstr "以列的方式显示未跟踪的文件"
4512
4513#: builtin/commit.c:1471
4514msgid "couldn't look up newly created commit"
4515msgstr "无法找到新创建的提交"
4516
4517#: builtin/commit.c:1473
4518msgid "could not parse newly created commit"
4519msgstr "不能解析新创建的提交"
4520
4521#: builtin/commit.c:1518
4522msgid "detached HEAD"
4523msgstr "分离头指针"
4524
4525#  译者:中文字符串拼接,可删除前导空格
4526#: builtin/commit.c:1521
4527msgid " (root-commit)"
4528msgstr "(根提交)"
4529
4530#: builtin/commit.c:1614
4531msgid "suppress summary after successful commit"
4532msgstr "提交成功后不显示概述信息"
4533
4534#: builtin/commit.c:1615
4535msgid "show diff in commit message template"
4536msgstr "在提交说明模板里显示差异"
4537
4538#: builtin/commit.c:1617
4539msgid "Commit message options"
4540msgstr "提交说明选项"
4541
4542#: builtin/commit.c:1618 builtin/tag.c:601
4543msgid "read message from file"
4544msgstr "从文件中读取提交说明"
4545
4546#: builtin/commit.c:1619
4547msgid "author"
4548msgstr "作者"
4549
4550#: builtin/commit.c:1619
4551msgid "override author for commit"
4552msgstr "提交时覆盖作者"
4553
4554#: builtin/commit.c:1620 builtin/gc.c:275
4555msgid "date"
4556msgstr "日期"
4557
4558#: builtin/commit.c:1620
4559msgid "override date for commit"
4560msgstr "提交时覆盖日期"
4561
4562#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408
4563#: builtin/notes.c:565 builtin/tag.c:599
4564msgid "message"
4565msgstr "说明"
4566
4567#: builtin/commit.c:1621
4568msgid "commit message"
4569msgstr "提交说明"
4570
4571#: builtin/commit.c:1622
4572msgid "reuse and edit message from specified commit"
4573msgstr "重用并编辑指定提交的提交说明"
4574
4575#: builtin/commit.c:1623
4576msgid "reuse message from specified commit"
4577msgstr "重用指定提交的提交说明"
4578
4579#: builtin/commit.c:1624
4580msgid "use autosquash formatted message to fixup specified commit"
4581msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4582
4583#: builtin/commit.c:1625
4584msgid "use autosquash formatted message to squash specified commit"
4585msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4586
4587#: builtin/commit.c:1626
4588msgid "the commit is authored by me now (used with -C/-c/--amend)"
4589msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4590
4591#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86
4592msgid "add Signed-off-by:"
4593msgstr "添加 Signed-off-by: 签名"
4594
4595#: builtin/commit.c:1628
4596msgid "use specified template file"
4597msgstr "使用指定的模板文件"
4598
4599#: builtin/commit.c:1629
4600msgid "force edit of commit"
4601msgstr "强制编辑提交"
4602
4603#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4604#: builtin/commit.c:1630
4605msgid "default"
4606msgstr "default"
4607
4608#: builtin/commit.c:1630 builtin/tag.c:604
4609msgid "how to strip spaces and #comments from message"
4610msgstr "设置如何删除提交说明里的空格和#注释"
4611
4612#: builtin/commit.c:1631
4613msgid "include status in commit message template"
4614msgstr "在提交说明模板里包含状态信息"
4615
4616#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92
4617#: builtin/tag.c:605
4618msgid "key-id"
4619msgstr "key-id"
4620
4621#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93
4622msgid "GPG sign commit"
4623msgstr "GPG 提交签名"
4624
4625#: builtin/commit.c:1636
4626msgid "Commit contents options"
4627msgstr "提交内容选项"
4628
4629#: builtin/commit.c:1637
4630msgid "commit all changed files"
4631msgstr "提交所有改动的文件"
4632
4633#: builtin/commit.c:1638
4634msgid "add specified files to index for commit"
4635msgstr "添加指定的文件到索引区等待提交"
4636
4637#: builtin/commit.c:1639
4638msgid "interactively add files"
4639msgstr "交互式添加文件"
4640
4641#: builtin/commit.c:1640
4642msgid "interactively add changes"
4643msgstr "交互式添加变更"
4644
4645#: builtin/commit.c:1641
4646msgid "commit only specified files"
4647msgstr "只提交指定的文件"
4648
4649#: builtin/commit.c:1642
4650msgid "bypass pre-commit hook"
4651msgstr "绕过 pre-commit 钩子"
4652
4653#: builtin/commit.c:1643
4654msgid "show what would be committed"
4655msgstr "显示将要提交的内容"
4656
4657#: builtin/commit.c:1654
4658msgid "amend previous commit"
4659msgstr "修改先前的提交"
4660
4661#: builtin/commit.c:1655
4662msgid "bypass post-rewrite hook"
4663msgstr "绕过 post-rewrite 钩子"
4664
4665#: builtin/commit.c:1660
4666msgid "ok to record an empty change"
4667msgstr "允许一个空提交"
4668
4669#: builtin/commit.c:1662
4670msgid "ok to record a change with an empty message"
4671msgstr "允许空的提交说明"
4672
4673#: builtin/commit.c:1691
4674msgid "could not parse HEAD commit"
4675msgstr "不能解析 HEAD 提交"
4676
4677#: builtin/commit.c:1730 builtin/merge.c:518
4678#, c-format
4679msgid "could not open '%s' for reading"
4680msgstr "不能为读入打开 '%s'"
4681
4682#: builtin/commit.c:1737
4683#, c-format
4684msgid "Corrupt MERGE_HEAD file (%s)"
4685msgstr "损坏的 MERGE_HEAD 文件(%s)"
4686
4687#: builtin/commit.c:1744
4688msgid "could not read MERGE_MODE"
4689msgstr "不能读取 MERGE_MODE"
4690
4691#: builtin/commit.c:1763
4692#, c-format
4693msgid "could not read commit message: %s"
4694msgstr "不能读取提交说明:%s"
4695
4696#: builtin/commit.c:1774
4697#, c-format
4698msgid "Aborting commit; you did not edit the message.\n"
4699msgstr "终止提交;您未更改来自模版的提交说明。\n"
4700
4701#: builtin/commit.c:1779
4702#, c-format
4703msgid "Aborting commit due to empty commit message.\n"
4704msgstr "终止提交因为提交说明为空。\n"
4705
4706#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875
4707msgid "failed to write commit object"
4708msgstr "无法写提交对象"
4709
4710#: builtin/commit.c:1827
4711msgid ""
4712"Repository has been updated, but unable to write\n"
4713"new_index file. Check that disk is not full and quota is\n"
4714"not exceeded, and then \"git reset HEAD\" to recover."
4715msgstr ""
4716"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4717"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4718
4719#: builtin/config.c:8
4720msgid "git config [options]"
4721msgstr "git config [选项]"
4722
4723#: builtin/config.c:53
4724msgid "Config file location"
4725msgstr "配置文件位置"
4726
4727#: builtin/config.c:54
4728msgid "use global config file"
4729msgstr "使用全局配置文件"
4730
4731#: builtin/config.c:55
4732msgid "use system config file"
4733msgstr "使用系统级配置文件"
4734
4735#: builtin/config.c:56
4736msgid "use repository config file"
4737msgstr "使用版本库级配置文件"
4738
4739#: builtin/config.c:57
4740msgid "use given config file"
4741msgstr "使用指定的配置文件"
4742
4743#: builtin/config.c:58
4744msgid "blob-id"
4745msgstr "数据对象ID"
4746
4747#: builtin/config.c:58
4748msgid "read config from given blob object"
4749msgstr "从给定的数据对象读取配置"
4750
4751#: builtin/config.c:59
4752msgid "Action"
4753msgstr "操作"
4754
4755#: builtin/config.c:60
4756msgid "get value: name [value-regex]"
4757msgstr "获取值:name [value-regex]"
4758
4759#: builtin/config.c:61
4760msgid "get all values: key [value-regex]"
4761msgstr "获得所有的值:key [value-regex]"
4762
4763#: builtin/config.c:62
4764msgid "get values for regexp: name-regex [value-regex]"
4765msgstr "根据正则表达式获得值:name-regex [value-regex]"
4766
4767#: builtin/config.c:63
4768msgid "get value specific for the URL: section[.var] URL"
4769msgstr "获得 URL 取值:section[.var] URL"
4770
4771#: builtin/config.c:64
4772msgid "replace all matching variables: name value [value_regex]"
4773msgstr "替换所有匹配的变量:name value [value_regex]"
4774
4775#: builtin/config.c:65
4776msgid "add a new variable: name value"
4777msgstr "添加一个新的变量:name value"
4778
4779#: builtin/config.c:66
4780msgid "remove a variable: name [value-regex]"
4781msgstr "删除一个变量:name [value-regex]"
4782
4783#: builtin/config.c:67
4784msgid "remove all matches: name [value-regex]"
4785msgstr "删除所有匹配项:name [value-regex]"
4786
4787#: builtin/config.c:68
4788msgid "rename section: old-name new-name"
4789msgstr "重命名小节:old-name new-name"
4790
4791#: builtin/config.c:69
4792msgid "remove a section: name"
4793msgstr "删除一个小节:name"
4794
4795#: builtin/config.c:70
4796msgid "list all"
4797msgstr "列出所有"
4798
4799#: builtin/config.c:71
4800msgid "open an editor"
4801msgstr "打开一个编辑器"
4802
4803#: builtin/config.c:72 builtin/config.c:73
4804msgid "slot"
4805msgstr "slot"
4806
4807#: builtin/config.c:72
4808msgid "find the color configured: [default]"
4809msgstr "找到配置的颜色:[默认]"
4810
4811#: builtin/config.c:73
4812msgid "find the color setting: [stdout-is-tty]"
4813msgstr "找到颜色设置:[stdout-is-tty]"
4814
4815#: builtin/config.c:74
4816msgid "Type"
4817msgstr "类型"
4818
4819#: builtin/config.c:75
4820msgid "value is \"true\" or \"false\""
4821msgstr "值是 \"true\" 或 \"false\""
4822
4823#: builtin/config.c:76
4824msgid "value is decimal number"
4825msgstr "值是十进制数"
4826
4827#: builtin/config.c:77
4828msgid "value is --bool or --int"
4829msgstr "值是 --bool or --int"
4830
4831#: builtin/config.c:78
4832msgid "value is a path (file or directory name)"
4833msgstr "值是一个路径(文件或目录名)"
4834
4835#: builtin/config.c:79
4836msgid "Other"
4837msgstr "其它"
4838
4839#: builtin/config.c:80
4840msgid "terminate values with NUL byte"
4841msgstr "终止值是NUL字节"
4842
4843#: builtin/config.c:81
4844msgid "respect include directives on lookup"
4845msgstr "查询时参照 include 指令递归查找"
4846
4847#: builtin/config.c:315
4848msgid "unable to parse default color value"
4849msgstr "不能解析缺省的颜色值"
4850
4851#: builtin/config.c:455
4852#, c-format
4853msgid ""
4854"# This is Git's per-user configuration file.\n"
4855"[core]\n"
4856"# Please adapt and uncomment the following lines:\n"
4857"#\tuser = %s\n"
4858"#\temail = %s\n"
4859msgstr ""
4860"# This is Git's per-user configuration file.\n"
4861"[core]\n"
4862"# Please adapt and uncomment the following lines:\n"
4863"#\tuser = %s\n"
4864"#\temail = %s\n"
4865
4866#: builtin/config.c:590
4867#, c-format
4868msgid "cannot create configuration file %s"
4869msgstr "不能创建配置文件 %s"
4870
4871#: builtin/count-objects.c:55
4872msgid "git count-objects [-v] [-H | --human-readable]"
4873msgstr "git count-objects [-v] [-H | --human-readable]"
4874
4875#: builtin/count-objects.c:65
4876msgid "print sizes in human readable format"
4877msgstr "以用户可读的格式显示大小"
4878
4879#: builtin/describe.c:17
4880msgid "git describe [options] <commit-ish>*"
4881msgstr "git describe [选项] <提交号>*"
4882
4883#: builtin/describe.c:18
4884msgid "git describe [options] --dirty"
4885msgstr "git describe [选项] --dirty"
4886
4887#: builtin/describe.c:217
4888#, c-format
4889msgid "annotated tag %s not available"
4890msgstr "注释 tag %s 无效"
4891
4892#: builtin/describe.c:221
4893#, c-format
4894msgid "annotated tag %s has no embedded name"
4895msgstr "注释 tag %s 没有嵌入名称"
4896
4897#: builtin/describe.c:223
4898#, c-format
4899msgid "tag '%s' is really '%s' here"
4900msgstr "tag '%s' 的确是在 '%s'"
4901
4902#: builtin/describe.c:250 builtin/log.c:452
4903#, c-format
4904msgid "Not a valid object name %s"
4905msgstr "不是一个有效的对象名 %s"
4906
4907#: builtin/describe.c:253
4908#, c-format
4909msgid "%s is not a valid '%s' object"
4910msgstr "%s 不是一个有效的 '%s' 对象"
4911
4912#: builtin/describe.c:270
4913#, c-format
4914msgid "no tag exactly matches '%s'"
4915msgstr "没有 tag 准确匹配 '%s'"
4916
4917#: builtin/describe.c:272
4918#, c-format
4919msgid "searching to describe %s\n"
4920msgstr "搜索描述 %s\n"
4921
4922#: builtin/describe.c:319
4923#, c-format
4924msgid "finished search at %s\n"
4925msgstr "完成搜索 %s\n"
4926
4927#: builtin/describe.c:346
4928#, c-format
4929msgid ""
4930"No annotated tags can describe '%s'.\n"
4931"However, there were unannotated tags: try --tags."
4932msgstr ""
4933"没有注释 tag 能描述 '%s'。\n"
4934"然而,有非注释 tag:尝试 --tags。"
4935
4936#: builtin/describe.c:350
4937#, c-format
4938msgid ""
4939"No tags can describe '%s'.\n"
4940"Try --always, or create some tags."
4941msgstr ""
4942"没有注释 tag 能描述 '%s'。\n"
4943"尝试 --always,或者创建一些 tag。"
4944
4945#: builtin/describe.c:371
4946#, c-format
4947msgid "traversed %lu commits\n"
4948msgstr "已遍历 %lu 个提交\n"
4949
4950#: builtin/describe.c:374
4951#, c-format
4952msgid ""
4953"more than %i tags found; listed %i most recent\n"
4954"gave up search at %s\n"
4955msgstr ""
4956"发现多于 %i 个 tag,列出最近的 %i 个\n"
4957"在 %s 放弃搜索\n"
4958
4959#: builtin/describe.c:396
4960msgid "find the tag that comes after the commit"
4961msgstr "寻找提交之后的 tag(用于描述提交)"
4962
4963#: builtin/describe.c:397
4964msgid "debug search strategy on stderr"
4965msgstr "在标准错误上调试搜索策略"
4966
4967#: builtin/describe.c:398
4968msgid "use any ref"
4969msgstr "使用任意引用"
4970
4971#: builtin/describe.c:399
4972msgid "use any tag, even unannotated"
4973msgstr "使用任意 tag,即使未带注解"
4974
4975#: builtin/describe.c:400
4976msgid "always use long format"
4977msgstr "始终使用长提交号格式"
4978
4979#: builtin/describe.c:401
4980msgid "only follow first parent"
4981msgstr "只跟随第一个父提交"
4982
4983#: builtin/describe.c:404
4984msgid "only output exact matches"
4985msgstr "只输出精确匹配"
4986
4987#: builtin/describe.c:406
4988msgid "consider <n> most recent tags (default: 10)"
4989msgstr "考虑最近 <n> 个 tags(默认:10)"
4990
4991#: builtin/describe.c:408
4992msgid "only consider tags matching <pattern>"
4993msgstr "只考虑匹配 <模式> 的 tags"
4994
4995#: builtin/describe.c:410 builtin/name-rev.c:318
4996msgid "show abbreviated commit object as fallback"
4997msgstr "显示简写的提交号作为后备"
4998
4999#: builtin/describe.c:411
5000msgid "mark"
5001msgstr "标记"
5002
5003#: builtin/describe.c:412
5004msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5005msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
5006
5007#: builtin/describe.c:430
5008msgid "--long is incompatible with --abbrev=0"
5009msgstr "--long 与 --abbrev=0 不兼容"
5010
5011#: builtin/describe.c:456
5012msgid "No names found, cannot describe anything."
5013msgstr "没有发现名称,无法描述任何东西。"
5014
5015#: builtin/describe.c:476
5016msgid "--dirty is incompatible with commit-ishes"
5017msgstr "--dirty 不能与提交同时使用"
5018
5019#: builtin/diff.c:86
5020#, c-format
5021msgid "'%s': not a regular file or symlink"
5022msgstr "'%s':不是一个正规文件或符号链接"
5023
5024#: builtin/diff.c:237
5025#, c-format
5026msgid "invalid option: %s"
5027msgstr "无效选项:%s"
5028
5029#: builtin/diff.c:358
5030msgid "Not a git repository"
5031msgstr "不是一个 git 版本库"
5032
5033#: builtin/diff.c:401
5034#, c-format
5035msgid "invalid object '%s' given."
5036msgstr "提供了无效对象 '%s'。"
5037
5038#: builtin/diff.c:410
5039#, c-format
5040msgid "more than two blobs given: '%s'"
5041msgstr "提供了超过两个数据(blob)对象:'%s'"
5042
5043#: builtin/diff.c:417
5044#, c-format
5045msgid "unhandled object '%s' given."
5046msgstr "无法处理的对象 '%s'。"
5047
5048#: builtin/fast-export.c:24
5049msgid "git fast-export [rev-list-opts]"
5050msgstr "git fast-export [rev-list-opts]"
5051
5052#: builtin/fast-export.c:979
5053msgid "show progress after <n> objects"
5054msgstr "在 <n> 个对象之后显示进度"
5055
5056#: builtin/fast-export.c:981
5057msgid "select handling of signed tags"
5058msgstr "选择如何处理签名 tags"
5059
5060#: builtin/fast-export.c:984
5061msgid "select handling of tags that tag filtered objects"
5062msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5063
5064#: builtin/fast-export.c:987
5065msgid "Dump marks to this file"
5066msgstr "把标记存储到这个文件"
5067
5068#: builtin/fast-export.c:989
5069msgid "Import marks from this file"
5070msgstr "从这个文件导入标记"
5071
5072#: builtin/fast-export.c:991
5073msgid "Fake a tagger when tags lack one"
5074msgstr "当 tags 缺少标记者字段时,假装提供一个"
5075
5076#: builtin/fast-export.c:993
5077msgid "Output full tree for each commit"
5078msgstr "每次提交都输出整个树"
5079
5080#: builtin/fast-export.c:995
5081msgid "Use the done feature to terminate the stream"
5082msgstr "使用 done 功能来终止流"
5083
5084#: builtin/fast-export.c:996
5085msgid "Skip output of blob data"
5086msgstr "跳过数据对象的输出"
5087
5088#: builtin/fast-export.c:997
5089msgid "refspec"
5090msgstr "引用表达式"
5091
5092#: builtin/fast-export.c:998
5093msgid "Apply refspec to exported refs"
5094msgstr "对导出的引用应用引用表达式"
5095
5096#: builtin/fast-export.c:999
5097msgid "anonymize output"
5098msgstr "匿名输出"
5099
5100#: builtin/fetch.c:20
5101msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5102msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5103
5104#: builtin/fetch.c:21
5105msgid "git fetch [<options>] <group>"
5106msgstr "git fetch [<选项>] <组>"
5107
5108#: builtin/fetch.c:22
5109msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5110msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5111
5112#: builtin/fetch.c:23
5113msgid "git fetch --all [<options>]"
5114msgstr "git fetch --all [<选项>]"
5115
5116#: builtin/fetch.c:90
5117msgid "fetch from all remotes"
5118msgstr "从所有的远程抓取"
5119
5120#: builtin/fetch.c:92
5121msgid "append to .git/FETCH_HEAD instead of overwriting"
5122msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5123
5124#: builtin/fetch.c:94
5125msgid "path to upload pack on remote end"
5126msgstr "上传包到远程的路径"
5127
5128#: builtin/fetch.c:95
5129msgid "force overwrite of local branch"
5130msgstr "强制覆盖本地分支"
5131
5132#: builtin/fetch.c:97
5133msgid "fetch from multiple remotes"
5134msgstr "从多个远程抓取"
5135
5136#: builtin/fetch.c:99
5137msgid "fetch all tags and associated objects"
5138msgstr "抓取所有的 tags 和关联对象"
5139
5140#: builtin/fetch.c:101
5141msgid "do not fetch all tags (--no-tags)"
5142msgstr "不抓取任何 tags (--no-tags)"
5143
5144#: builtin/fetch.c:103
5145msgid "prune remote-tracking branches no longer on remote"
5146msgstr "清除远程已经不存在的分支的跟踪分支"
5147
5148#  译者:可选值,不能翻译
5149#: builtin/fetch.c:104
5150msgid "on-demand"
5151msgstr "on-demand"
5152
5153#: builtin/fetch.c:105
5154msgid "control recursive fetching of submodules"
5155msgstr "控制子模组的递归抓取"
5156
5157#: builtin/fetch.c:109
5158msgid "keep downloaded pack"
5159msgstr "保持下载包"
5160
5161#: builtin/fetch.c:111
5162msgid "allow updating of HEAD ref"
5163msgstr "允许更新 HEAD 引用"
5164
5165#: builtin/fetch.c:114
5166msgid "deepen history of shallow clone"
5167msgstr "深化浅克隆的历史"
5168
5169#: builtin/fetch.c:116
5170msgid "convert to a complete repository"
5171msgstr "转换为一个完整的版本库"
5172
5173#: builtin/fetch.c:118 builtin/log.c:1208
5174msgid "dir"
5175msgstr "目录"
5176
5177#: builtin/fetch.c:119
5178msgid "prepend this to submodule path output"
5179msgstr "在子模组路径输出的前面加上此目录"
5180
5181#: builtin/fetch.c:122
5182msgid "default mode for recursion"
5183msgstr "递归的默认模式"
5184
5185#: builtin/fetch.c:124
5186msgid "accept refs that update .git/shallow"
5187msgstr "接受更新 .git/shallow 的引用"
5188
5189#: builtin/fetch.c:125
5190msgid "refmap"
5191msgstr "引用映射"
5192
5193#: builtin/fetch.c:126
5194msgid "specify fetch refmap"
5195msgstr "指定获取操作的引用映射"
5196
5197#: builtin/fetch.c:376
5198msgid "Couldn't find remote ref HEAD"
5199msgstr "无法发现远程 HEAD 引用"
5200
5201#: builtin/fetch.c:454
5202#, c-format
5203msgid "object %s not found"
5204msgstr "对象 %s 未发现"
5205
5206#: builtin/fetch.c:459
5207msgid "[up to date]"
5208msgstr "[最新]"
5209
5210#: builtin/fetch.c:473
5211#, c-format
5212msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
5213msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
5214
5215#: builtin/fetch.c:474 builtin/fetch.c:560
5216msgid "[rejected]"
5217msgstr "[已拒绝]"
5218
5219#: builtin/fetch.c:485
5220msgid "[tag update]"
5221msgstr "[tag更新]"
5222
5223#  译者:注意保持前导空格
5224#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
5225msgid "  (unable to update local ref)"
5226msgstr "  (不能更新本地引用)"
5227
5228#: builtin/fetch.c:505
5229msgid "[new tag]"
5230msgstr "[新tag]"
5231
5232#: builtin/fetch.c:508
5233msgid "[new branch]"
5234msgstr "[新分支]"
5235
5236#: builtin/fetch.c:511
5237msgid "[new ref]"
5238msgstr "[新引用]"
5239
5240#: builtin/fetch.c:556
5241msgid "unable to update local ref"
5242msgstr "不能更新本地引用"
5243
5244#: builtin/fetch.c:556
5245msgid "forced update"
5246msgstr "强制更新"
5247
5248#: builtin/fetch.c:562
5249msgid "(non-fast-forward)"
5250msgstr "(非快进式)"
5251
5252#: builtin/fetch.c:595 builtin/fetch.c:828
5253#, c-format
5254msgid "cannot open %s: %s\n"
5255msgstr "无法打开 %s:%s\n"
5256
5257#: builtin/fetch.c:604
5258#, c-format
5259msgid "%s did not send all necessary objects\n"
5260msgstr "%s 未发送所有必须的对象\n"
5261
5262#: builtin/fetch.c:622
5263#, c-format
5264msgid "reject %s because shallow roots are not allowed to be updated"
5265msgstr "拒绝 %s 因为浅克隆不允许被更新"
5266
5267#: builtin/fetch.c:710 builtin/fetch.c:793
5268#, c-format
5269msgid "From %.*s\n"
5270msgstr "来自 %.*s\n"
5271
5272#: builtin/fetch.c:721
5273#, c-format
5274msgid ""
5275"some local refs could not be updated; try running\n"
5276" 'git remote prune %s' to remove any old, conflicting branches"
5277msgstr ""
5278"一些本地引用不能被更新;尝试运行\n"
5279" 'git remote prune %s' 来删除旧的、有冲突的分支"
5280
5281#  译者:注意保持前导空格
5282#: builtin/fetch.c:773
5283#, c-format
5284msgid "   (%s will become dangling)"
5285msgstr "   (%s 将成为摇摆状态)"
5286
5287#  译者:注意保持前导空格
5288#: builtin/fetch.c:774
5289#, c-format
5290msgid "   (%s has become dangling)"
5291msgstr "   (%s 已成为摇摆状态)"
5292
5293#: builtin/fetch.c:798
5294msgid "[deleted]"
5295msgstr "[已删除]"
5296
5297#: builtin/fetch.c:799 builtin/remote.c:1063
5298msgid "(none)"
5299msgstr "(无)"
5300
5301#: builtin/fetch.c:818
5302#, c-format
5303msgid "Refusing to fetch into current branch %s of non-bare repository"
5304msgstr "拒绝获取到非纯版本库的当前分支 %s"
5305
5306#: builtin/fetch.c:837
5307#, c-format
5308msgid "Option \"%s\" value \"%s\" is not valid for %s"
5309msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5310
5311#: builtin/fetch.c:840
5312#, c-format
5313msgid "Option \"%s\" is ignored for %s\n"
5314msgstr "选项 \"%s\" 为 %s 所忽略\n"
5315
5316#: builtin/fetch.c:896
5317#, c-format
5318msgid "Don't know how to fetch from %s"
5319msgstr "不知道如何从 %s 获取"
5320
5321#: builtin/fetch.c:1058
5322#, c-format
5323msgid "Fetching %s\n"
5324msgstr "正在获取 %s\n"
5325
5326#: builtin/fetch.c:1060 builtin/remote.c:90
5327#, c-format
5328msgid "Could not fetch %s"
5329msgstr "不能获取 %s"
5330
5331#: builtin/fetch.c:1078
5332msgid ""
5333"No remote repository specified.  Please, specify either a URL or a\n"
5334"remote name from which new revisions should be fetched."
5335msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5336
5337#: builtin/fetch.c:1101
5338msgid "You need to specify a tag name."
5339msgstr "您需要指定一个 tag 名称。"
5340
5341#: builtin/fetch.c:1143
5342msgid "--depth and --unshallow cannot be used together"
5343msgstr "--depth 和 --unshallow 不能同时使用"
5344
5345#: builtin/fetch.c:1145
5346msgid "--unshallow on a complete repository does not make sense"
5347msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5348
5349#: builtin/fetch.c:1168
5350msgid "fetch --all does not take a repository argument"
5351msgstr "fetch --all 不能带一个版本库参数"
5352
5353#: builtin/fetch.c:1170
5354msgid "fetch --all does not make sense with refspecs"
5355msgstr "fetch --all 带引用规则没有任何意义"
5356
5357#: builtin/fetch.c:1181
5358#, c-format
5359msgid "No such remote or remote group: %s"
5360msgstr "没有这样的远程或远程组:%s"
5361
5362#: builtin/fetch.c:1189
5363msgid "Fetching a group and specifying refspecs does not make sense"
5364msgstr "获取组并指定引用规则没有意义"
5365
5366#: builtin/fmt-merge-msg.c:13
5367msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5368msgstr ""
5369"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5370
5371#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
5372#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183
5373#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590
5374#: parse-options.h:132 parse-options.h:239
5375msgid "n"
5376msgstr "n"
5377
5378#: builtin/fmt-merge-msg.c:664
5379msgid "populate log with at most <n> entries from shortlog"
5380msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5381
5382#: builtin/fmt-merge-msg.c:667
5383msgid "alias for --log (deprecated)"
5384msgstr "参数 --log 的别名(已弃用)"
5385
5386#: builtin/fmt-merge-msg.c:670
5387msgid "text"
5388msgstr "文本"
5389
5390#: builtin/fmt-merge-msg.c:671
5391msgid "use <text> as start of message"
5392msgstr "使用 <文本> 作为提交说明的开始"
5393
5394#: builtin/fmt-merge-msg.c:672
5395msgid "file to read from"
5396msgstr "从文件中读取"
5397
5398#: builtin/for-each-ref.c:676
5399msgid "unable to parse format"
5400msgstr "不能解析格式"
5401
5402#: builtin/for-each-ref.c:1057
5403msgid "git for-each-ref [options] [<pattern>]"
5404msgstr "git for-each-ref [选项] [<模式>]"
5405
5406#: builtin/for-each-ref.c:1072
5407msgid "quote placeholders suitably for shells"
5408msgstr "引用占位符适用于 shells"
5409
5410#: builtin/for-each-ref.c:1074
5411msgid "quote placeholders suitably for perl"
5412msgstr "引用占位符适用于 perl"
5413
5414#: builtin/for-each-ref.c:1076
5415msgid "quote placeholders suitably for python"
5416msgstr "引用占位符适用于 python"
5417
5418#: builtin/for-each-ref.c:1078
5419msgid "quote placeholders suitably for tcl"
5420msgstr "引用占位符适用于 tcl"
5421
5422#: builtin/for-each-ref.c:1081
5423msgid "show only <n> matched refs"
5424msgstr "只显示 <n> 个匹配的引用"
5425
5426#: builtin/for-each-ref.c:1082 builtin/replace.c:438
5427msgid "format"
5428msgstr "格式"
5429
5430#: builtin/for-each-ref.c:1082
5431msgid "format to use for the output"
5432msgstr "输出格式"
5433
5434#: builtin/for-each-ref.c:1083
5435msgid "key"
5436msgstr "key"
5437
5438#: builtin/for-each-ref.c:1084
5439msgid "field name to sort on"
5440msgstr "排序的字段名"
5441
5442#: builtin/fsck.c:147 builtin/prune.c:136
5443msgid "Checking connectivity"
5444msgstr "检查连接中"
5445
5446#: builtin/fsck.c:540
5447msgid "Checking object directories"
5448msgstr "检查对象目录中"
5449
5450#: builtin/fsck.c:603
5451msgid "git fsck [options] [<object>...]"
5452msgstr "git fsck [选项] [<对象>...]"
5453
5454#: builtin/fsck.c:609
5455msgid "show unreachable objects"
5456msgstr "显示不可达的对象"
5457
5458#: builtin/fsck.c:610
5459msgid "show dangling objects"
5460msgstr "显示摇摆的对象"
5461
5462#: builtin/fsck.c:611
5463msgid "report tags"
5464msgstr "报告 tags"
5465
5466#: builtin/fsck.c:612
5467msgid "report root nodes"
5468msgstr "报告根节点"
5469
5470#: builtin/fsck.c:613
5471msgid "make index objects head nodes"
5472msgstr "将索引亦作为检查的头节点"
5473
5474#: builtin/fsck.c:614
5475msgid "make reflogs head nodes (default)"
5476msgstr "将引用日志作为检查的头节点(默认)"
5477
5478#: builtin/fsck.c:615
5479msgid "also consider packs and alternate objects"
5480msgstr "也考虑包和备用对象"
5481
5482#: builtin/fsck.c:616
5483msgid "enable more strict checking"
5484msgstr "启用更严格的检查"
5485
5486#: builtin/fsck.c:618
5487msgid "write dangling objects in .git/lost-found"
5488msgstr "将摇摆对象写入 .git/lost-found 中"
5489
5490#: builtin/fsck.c:619 builtin/prune.c:108
5491msgid "show progress"
5492msgstr "显示进度"
5493
5494#: builtin/fsck.c:669
5495msgid "Checking objects"
5496msgstr "检查对象中"
5497
5498#: builtin/gc.c:24
5499msgid "git gc [options]"
5500msgstr "git gc [选项]"
5501
5502#: builtin/gc.c:79
5503#, c-format
5504msgid "Invalid gc.pruneexpire: '%s'"
5505msgstr "无效的 gc.pruneexpire:'%s'"
5506
5507#: builtin/gc.c:107
5508#, c-format
5509msgid "insanely long object directory %.*s"
5510msgstr "不正常的长对象目录 %.*s"
5511
5512#: builtin/gc.c:276
5513msgid "prune unreferenced objects"
5514msgstr "清除未引用的对象"
5515
5516#: builtin/gc.c:278
5517msgid "be more thorough (increased runtime)"
5518msgstr "更彻底(增加运行时间)"
5519
5520#: builtin/gc.c:279
5521msgid "enable auto-gc mode"
5522msgstr "启用自动垃圾回收模式"
5523
5524#: builtin/gc.c:280
5525msgid "force running gc even if there may be another gc running"
5526msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5527
5528#: builtin/gc.c:321
5529#, c-format
5530msgid "Auto packing the repository in background for optimum performance.\n"
5531msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5532
5533#: builtin/gc.c:323
5534#, c-format
5535msgid "Auto packing the repository for optimum performance.\n"
5536msgstr "自动打包版本库以求最佳性能。\n"
5537
5538#: builtin/gc.c:324
5539#, c-format
5540msgid "See \"git help gc\" for manual housekeeping.\n"
5541msgstr "手工维护参见 \"git help gc\"。\n"
5542
5543#: builtin/gc.c:342
5544#, c-format
5545msgid ""
5546"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5547msgstr ""
5548"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5549
5550#: builtin/gc.c:364
5551msgid ""
5552"There are too many unreachable loose objects; run 'git prune' to remove them."
5553msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5554
5555#: builtin/grep.c:23
5556msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5557msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
5558
5559#: builtin/grep.c:218
5560#, c-format
5561msgid "grep: failed to create thread: %s"
5562msgstr "grep:无法创建线程:%s"
5563
5564#: builtin/grep.c:441 builtin/grep.c:476
5565#, c-format
5566msgid "unable to read tree (%s)"
5567msgstr "无法读取树(%s)"
5568
5569#: builtin/grep.c:491
5570#, c-format
5571msgid "unable to grep from object of type %s"
5572msgstr "无法抓取来自于 %s 类型的对象"
5573
5574#: builtin/grep.c:547
5575#, c-format
5576msgid "switch `%c' expects a numerical value"
5577msgstr "开关 `%c' 期望一个数字值"
5578
5579#: builtin/grep.c:564
5580#, c-format
5581msgid "cannot open '%s'"
5582msgstr "不能打开 '%s'"
5583
5584#: builtin/grep.c:638
5585msgid "search in index instead of in the work tree"
5586msgstr "在索引区搜索而不是在工作区"
5587
5588#: builtin/grep.c:640
5589msgid "find in contents not managed by git"
5590msgstr "在未被 git 管理的内容中查找"
5591
5592#  译者:中文字符串拼接,可删除前导空格
5593#: builtin/grep.c:642
5594msgid "search in both tracked and untracked files"
5595msgstr "在跟踪和未跟踪的文件中搜索"
5596
5597#: builtin/grep.c:644
5598msgid "search also in ignored files"
5599msgstr "也在忽略的文件中搜索"
5600
5601#: builtin/grep.c:647
5602msgid "show non-matching lines"
5603msgstr "显示未匹配的行"
5604
5605#: builtin/grep.c:649
5606msgid "case insensitive matching"
5607msgstr "不区分大小写匹配"
5608
5609#: builtin/grep.c:651
5610msgid "match patterns only at word boundaries"
5611msgstr "只在单词边界匹配模式"
5612
5613#: builtin/grep.c:653
5614msgid "process binary files as text"
5615msgstr "把二进制文件当做文本处理"
5616
5617#: builtin/grep.c:655
5618msgid "don't match patterns in binary files"
5619msgstr "不在二进制文件中匹配模式"
5620
5621#: builtin/grep.c:658
5622msgid "process binary files with textconv filters"
5623msgstr "用 textconv 过滤器处理二进制文件"
5624
5625#: builtin/grep.c:660
5626msgid "descend at most <depth> levels"
5627msgstr "最多以指定的深度向下寻找"
5628
5629#: builtin/grep.c:664
5630msgid "use extended POSIX regular expressions"
5631msgstr "使用扩展的 POSIX 正则表达式"
5632
5633#: builtin/grep.c:667
5634msgid "use basic POSIX regular expressions (default)"
5635msgstr "使用基本的 POSIX 正则表达式(默认)"
5636
5637#: builtin/grep.c:670
5638msgid "interpret patterns as fixed strings"
5639msgstr "把模式解析为固定的字符串"
5640
5641#: builtin/grep.c:673
5642msgid "use Perl-compatible regular expressions"
5643msgstr "使用 Perl 兼容的正则表达式"
5644
5645#: builtin/grep.c:676
5646msgid "show line numbers"
5647msgstr "显示行号"
5648
5649#: builtin/grep.c:677
5650msgid "don't show filenames"
5651msgstr "不显示文件名"
5652
5653#: builtin/grep.c:678
5654msgid "show filenames"
5655msgstr "显示文件名"
5656
5657#: builtin/grep.c:680
5658msgid "show filenames relative to top directory"
5659msgstr "显示相对于顶级目录的文件名"
5660
5661#: builtin/grep.c:682
5662msgid "show only filenames instead of matching lines"
5663msgstr "只显示文件名而不显示匹配的行"
5664
5665#: builtin/grep.c:684
5666msgid "synonym for --files-with-matches"
5667msgstr "和 --files-with-matches 同义"
5668
5669#: builtin/grep.c:687
5670msgid "show only the names of files without match"
5671msgstr "只显示未匹配的文件名"
5672
5673#: builtin/grep.c:689
5674msgid "print NUL after filenames"
5675msgstr "在文件名后输出 NUL 字符"
5676
5677#: builtin/grep.c:691
5678msgid "show the number of matches instead of matching lines"
5679msgstr "显示总匹配行数,而不显示匹配的行"
5680
5681#: builtin/grep.c:692
5682msgid "highlight matches"
5683msgstr "高亮显示匹配项"
5684
5685#: builtin/grep.c:694
5686msgid "print empty line between matches from different files"
5687msgstr "在不同文件的匹配项之间打印空行"
5688
5689#: builtin/grep.c:696
5690msgid "show filename only once above matches from same file"
5691msgstr "只在同一文件的匹配项的上面显示一次文件名"
5692
5693#: builtin/grep.c:699
5694msgid "show <n> context lines before and after matches"
5695msgstr "显示匹配项前后的 <n> 行上下文"
5696
5697#: builtin/grep.c:702
5698msgid "show <n> context lines before matches"
5699msgstr "显示匹配项前 <n> 行上下文"
5700
5701#: builtin/grep.c:704
5702msgid "show <n> context lines after matches"
5703msgstr "显示匹配项后 <n> 行上下文"
5704
5705#: builtin/grep.c:705
5706msgid "shortcut for -C NUM"
5707msgstr "快捷键 -C 数字"
5708
5709#: builtin/grep.c:708
5710msgid "show a line with the function name before matches"
5711msgstr "在匹配的前面显示一行函数名"
5712
5713#: builtin/grep.c:710
5714msgid "show the surrounding function"
5715msgstr "显示所在函数的前后内容"
5716
5717#: builtin/grep.c:713
5718msgid "read patterns from file"
5719msgstr "从文件读取模式"
5720
5721#: builtin/grep.c:715
5722msgid "match <pattern>"
5723msgstr "匹配 <模式>"
5724
5725#: builtin/grep.c:717
5726msgid "combine patterns specified with -e"
5727msgstr "组合用 -e 参数设定的模式"
5728
5729#: builtin/grep.c:729
5730msgid "indicate hit with exit status without output"
5731msgstr "不输出,而用退出码标识命中状态"
5732
5733#: builtin/grep.c:731
5734msgid "show only matches from files that match all patterns"
5735msgstr "只显示匹配所有模式的文件中的匹配"
5736
5737#: builtin/grep.c:733
5738msgid "show parse tree for grep expression"
5739msgstr "显示 grep 表达式的解析树"
5740
5741#: builtin/grep.c:737
5742msgid "pager"
5743msgstr "分页"
5744
5745#: builtin/grep.c:737
5746msgid "show matching files in the pager"
5747msgstr "分页显示匹配的文件"
5748
5749#: builtin/grep.c:740
5750msgid "allow calling of grep(1) (ignored by this build)"
5751msgstr "允许调用 grep(1)(本次构建忽略)"
5752
5753#: builtin/grep.c:741 builtin/show-ref.c:187
5754msgid "show usage"
5755msgstr "显示用法"
5756
5757#: builtin/grep.c:808
5758msgid "no pattern given."
5759msgstr "未提供模式匹配。"
5760
5761#: builtin/grep.c:866
5762msgid "--open-files-in-pager only works on the worktree"
5763msgstr "--open-files-in-pager 仅用于工作区"
5764
5765#: builtin/grep.c:892
5766msgid "--cached or --untracked cannot be used with --no-index."
5767msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5768
5769#: builtin/grep.c:897
5770msgid "--no-index or --untracked cannot be used with revs."
5771msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5772
5773#: builtin/grep.c:900
5774msgid "--[no-]exclude-standard cannot be used for tracked contents."
5775msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5776
5777#: builtin/grep.c:908
5778msgid "both --cached and trees are given."
5779msgstr "同时给出了 --cached 和树对象。"
5780
5781#: builtin/hash-object.c:82
5782msgid ""
5783"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5784"<file>..."
5785msgstr ""
5786"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5787"<文件>..."
5788
5789#: builtin/hash-object.c:83
5790msgid "git hash-object  --stdin-paths < <list-of-paths>"
5791msgstr "git hash-object  --stdin-paths < <路径列表>"
5792
5793#: builtin/hash-object.c:94 builtin/tag.c:610
5794msgid "type"
5795msgstr "类型"
5796
5797#: builtin/hash-object.c:94
5798msgid "object type"
5799msgstr "对象类型"
5800
5801#: builtin/hash-object.c:95
5802msgid "write the object into the object database"
5803msgstr "将对象写入对象数据库"
5804
5805#: builtin/hash-object.c:97
5806msgid "read the object from stdin"
5807msgstr "从标准输入读取对象"
5808
5809#: builtin/hash-object.c:99
5810msgid "store file as is without filters"
5811msgstr "原样存储文件不使用过滤器"
5812
5813#: builtin/hash-object.c:100
5814msgid ""
5815"just hash any random garbage to create corrupt objects for debugging Git"
5816msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5817
5818#: builtin/hash-object.c:101
5819msgid "process file as it were from this path"
5820msgstr "处理文件并假设其来自于此路径"
5821
5822#: builtin/help.c:41
5823msgid "print all available commands"
5824msgstr "打印所有可用的命令"
5825
5826#: builtin/help.c:42
5827msgid "print list of useful guides"
5828msgstr "显示有用的指南列表"
5829
5830#: builtin/help.c:43
5831msgid "show man page"
5832msgstr "显示 man 手册"
5833
5834#: builtin/help.c:44
5835msgid "show manual in web browser"
5836msgstr "在 web 浏览器中显示手册"
5837
5838#: builtin/help.c:46
5839msgid "show info page"
5840msgstr "显示 info 手册"
5841
5842#: builtin/help.c:52
5843msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5844msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5845
5846#: builtin/help.c:64
5847#, c-format
5848msgid "unrecognized help format '%s'"
5849msgstr "未能识别的帮助格式 '%s'"
5850
5851#: builtin/help.c:91
5852msgid "Failed to start emacsclient."
5853msgstr "无法启动 emacsclient。"
5854
5855#: builtin/help.c:104
5856msgid "Failed to parse emacsclient version."
5857msgstr "无法解析 emacsclient 版本。"
5858
5859#: builtin/help.c:112
5860#, c-format
5861msgid "emacsclient version '%d' too old (< 22)."
5862msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5863
5864#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
5865#, c-format
5866msgid "failed to exec '%s': %s"
5867msgstr "无法执行 '%s':%s"
5868
5869#: builtin/help.c:215
5870#, c-format
5871msgid ""
5872"'%s': path for unsupported man viewer.\n"
5873"Please consider using 'man.<tool>.cmd' instead."
5874msgstr ""
5875"'%s':不支持的 man 手册查看器的路径。\n"
5876"请使用 'man.<tool>.cmd'。"
5877
5878#: builtin/help.c:227
5879#, c-format
5880msgid ""
5881"'%s': cmd for supported man viewer.\n"
5882"Please consider using 'man.<tool>.path' instead."
5883msgstr ""
5884"'%s': 支持的 man 手册查看器命令。\n"
5885"请使用 'man.<tool>.path'。"
5886
5887#: builtin/help.c:352
5888#, c-format
5889msgid "'%s': unknown man viewer."
5890msgstr "'%s':未知的 man 查看器。"
5891
5892#: builtin/help.c:369
5893msgid "no man viewer handled the request"
5894msgstr "没有 man 查看器处理此请求"
5895
5896#: builtin/help.c:377
5897msgid "no info viewer handled the request"
5898msgstr "没有 info 查看器处理此请求"
5899
5900#: builtin/help.c:423
5901msgid "Defining attributes per path"
5902msgstr "定义路径的属性"
5903
5904#: builtin/help.c:424
5905msgid "Everyday Git With 20 Commands Or So"
5906msgstr "每一天 Git 常用的约 20 条命令"
5907
5908#: builtin/help.c:425
5909msgid "A Git glossary"
5910msgstr "Git 词汇表"
5911
5912#: builtin/help.c:426
5913msgid "Specifies intentionally untracked files to ignore"
5914msgstr "忽略指定的未跟踪文件"
5915
5916#: builtin/help.c:427
5917msgid "Defining submodule properties"
5918msgstr "定义子模组属性"
5919
5920#: builtin/help.c:428
5921msgid "Specifying revisions and ranges for Git"
5922msgstr "指定 Git 的版本和版本范围"
5923
5924#: builtin/help.c:429
5925msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5926msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5927
5928#: builtin/help.c:430
5929msgid "An overview of recommended workflows with Git"
5930msgstr "Git 推荐的工作流概览"
5931
5932#: builtin/help.c:442
5933msgid "The common Git guides are:\n"
5934msgstr "最常用的 Git 向导有:\n"
5935
5936#: builtin/help.c:463 builtin/help.c:480
5937#, c-format
5938msgid "usage: %s%s"
5939msgstr "用法:%s%s"
5940
5941#: builtin/help.c:496
5942#, c-format
5943msgid "`git %s' is aliased to `%s'"
5944msgstr "`git %s' 是 `%s' 的别名"
5945
5946#: builtin/index-pack.c:150
5947#, c-format
5948msgid "unable to open %s"
5949msgstr "不能打开 %s"
5950
5951#: builtin/index-pack.c:200
5952#, c-format
5953msgid "object type mismatch at %s"
5954msgstr "%s 的对象类型不匹配"
5955
5956#: builtin/index-pack.c:220
5957#, c-format
5958msgid "did not receive expected object %s"
5959msgstr "未能获取期望的对象 %s"
5960
5961#: builtin/index-pack.c:223
5962#, c-format
5963msgid "object %s: expected type %s, found %s"
5964msgstr "对象 %s:期待类型 %s,却是 %s"
5965
5966#: builtin/index-pack.c:265
5967#, c-format
5968msgid "cannot fill %d byte"
5969msgid_plural "cannot fill %d bytes"
5970msgstr[0] "无法填充 %d 字节"
5971msgstr[1] "无法填充 %d 字节"
5972
5973#: builtin/index-pack.c:275
5974msgid "early EOF"
5975msgstr "过早的文件结束符(EOF)"
5976
5977#: builtin/index-pack.c:276
5978msgid "read error on input"
5979msgstr "输入上的读错误"
5980
5981#: builtin/index-pack.c:288
5982msgid "used more bytes than were available"
5983msgstr "用掉了超过可用的字节"
5984
5985#: builtin/index-pack.c:295
5986msgid "pack too large for current definition of off_t"
5987msgstr "包太大超过了当前 off_t 的定义"
5988
5989#: builtin/index-pack.c:311
5990#, c-format
5991msgid "unable to create '%s'"
5992msgstr "不能创建 '%s'"
5993
5994#: builtin/index-pack.c:316
5995#, c-format
5996msgid "cannot open packfile '%s'"
5997msgstr "无法打开包文件 '%s'"
5998
5999#: builtin/index-pack.c:330
6000msgid "pack signature mismatch"
6001msgstr "包签名不匹配"
6002
6003#: builtin/index-pack.c:332
6004#, c-format
6005msgid "pack version %<PRIu32> unsupported"
6006msgstr "不支持包版本 %<PRIu32>"
6007
6008#: builtin/index-pack.c:350
6009#, c-format
6010msgid "pack has bad object at offset %lu: %s"
6011msgstr "包中有错误的对象位于 %lu:%s"
6012
6013#: builtin/index-pack.c:471
6014#, c-format
6015msgid "inflate returned %d"
6016msgstr "解压缩返回 %d"
6017
6018#: builtin/index-pack.c:520
6019msgid "offset value overflow for delta base object"
6020msgstr "偏移值覆盖了 delta 基准对象"
6021
6022#: builtin/index-pack.c:528
6023msgid "delta base offset is out of bound"
6024msgstr "delta 基准偏移越界"
6025
6026#: builtin/index-pack.c:536
6027#, c-format
6028msgid "unknown object type %d"
6029msgstr "未知对象类型 %d"
6030
6031#: builtin/index-pack.c:567
6032msgid "cannot pread pack file"
6033msgstr "无法读取包文件"
6034
6035#: builtin/index-pack.c:569
6036#, c-format
6037msgid "premature end of pack file, %lu byte missing"
6038msgid_plural "premature end of pack file, %lu bytes missing"
6039msgstr[0] "包文件过早结束,缺少 %lu 字节"
6040msgstr[1] "包文件过早结束,缺少 %lu 字节"
6041
6042#: builtin/index-pack.c:595
6043msgid "serious inflate inconsistency"
6044msgstr "解压缩严重的不一致"
6045
6046#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
6047#: builtin/index-pack.c:749 builtin/index-pack.c:758
6048#, c-format
6049msgid "SHA1 COLLISION FOUND WITH %s !"
6050msgstr "发现 %s 出现 SHA1 冲突!"
6051
6052#: builtin/index-pack.c:689 builtin/pack-objects.c:164
6053#: builtin/pack-objects.c:256
6054#, c-format
6055msgid "unable to read %s"
6056msgstr "不能读 %s"
6057
6058#: builtin/index-pack.c:755
6059#, c-format
6060msgid "cannot read existing object %s"
6061msgstr "不能读取现存对象 %s"
6062
6063#: builtin/index-pack.c:769
6064#, c-format
6065msgid "invalid blob object %s"
6066msgstr "无效的数据(blob)对象 %s"
6067
6068#: builtin/index-pack.c:783
6069#, c-format
6070msgid "invalid %s"
6071msgstr "无效的 %s"
6072
6073#: builtin/index-pack.c:787
6074msgid "Error in object"
6075msgstr "对象中出错"
6076
6077#: builtin/index-pack.c:789
6078#, c-format
6079msgid "Not all child objects of %s are reachable"
6080msgstr "%s 的所有子对象并非都可达"
6081
6082#: builtin/index-pack.c:861 builtin/index-pack.c:890
6083msgid "failed to apply delta"
6084msgstr "无法应用 delta"
6085
6086#: builtin/index-pack.c:1055
6087msgid "Receiving objects"
6088msgstr "接收对象中"
6089
6090#: builtin/index-pack.c:1055
6091msgid "Indexing objects"
6092msgstr "索引对象中"
6093
6094#: builtin/index-pack.c:1081
6095msgid "pack is corrupted (SHA1 mismatch)"
6096msgstr "包冲突(SHA1 不匹配)"
6097
6098#: builtin/index-pack.c:1086
6099msgid "cannot fstat packfile"
6100msgstr "不能枚举包文件状态"
6101
6102#: builtin/index-pack.c:1089
6103msgid "pack has junk at the end"
6104msgstr "包的结尾有垃圾数据"
6105
6106#: builtin/index-pack.c:1100
6107msgid "confusion beyond insanity in parse_pack_objects()"
6108msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6109
6110#: builtin/index-pack.c:1123
6111msgid "Resolving deltas"
6112msgstr "处理 delta 中"
6113
6114#: builtin/index-pack.c:1133
6115#, c-format
6116msgid "unable to create thread: %s"
6117msgstr "不能创建线程:%s"
6118
6119#: builtin/index-pack.c:1175
6120msgid "confusion beyond insanity"
6121msgstr "不可理喻"
6122
6123#: builtin/index-pack.c:1181
6124#, c-format
6125msgid "completed with %d local objects"
6126msgstr "完成 %d 个本地对象"
6127
6128#: builtin/index-pack.c:1191
6129#, c-format
6130msgid "Unexpected tail checksum for %s (disk corruption?)"
6131msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6132
6133#: builtin/index-pack.c:1195
6134#, c-format
6135msgid "pack has %d unresolved delta"
6136msgid_plural "pack has %d unresolved deltas"
6137msgstr[0] "包有 %d 个未解决的 delta"
6138msgstr[1] "包有 %d 个未解决的 delta"
6139
6140#: builtin/index-pack.c:1220
6141#, c-format
6142msgid "unable to deflate appended object (%d)"
6143msgstr "不能压缩附加对象(%d)"
6144
6145#: builtin/index-pack.c:1299
6146#, c-format
6147msgid "local object %s is corrupt"
6148msgstr "本地对象 %s 已损坏"
6149
6150#: builtin/index-pack.c:1323
6151msgid "error while closing pack file"
6152msgstr "关闭包文件时出错"
6153
6154#: builtin/index-pack.c:1336
6155#, c-format
6156msgid "cannot write keep file '%s'"
6157msgstr "无法写保留文件 '%s'"
6158
6159#: builtin/index-pack.c:1344
6160#, c-format
6161msgid "cannot close written keep file '%s'"
6162msgstr "无法关闭保留文件 '%s'"
6163
6164#: builtin/index-pack.c:1357
6165msgid "cannot store pack file"
6166msgstr "无法存储包文件"
6167
6168#: builtin/index-pack.c:1368
6169msgid "cannot store index file"
6170msgstr "无法存储索引文件"
6171
6172#: builtin/index-pack.c:1401
6173#, c-format
6174msgid "bad pack.indexversion=%<PRIu32>"
6175msgstr "坏的 pack.indexversion=%<PRIu32>"
6176
6177#: builtin/index-pack.c:1407
6178#, c-format
6179msgid "invalid number of threads specified (%d)"
6180msgstr "指定的线程数无效(%d)"
6181
6182#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
6183#, c-format
6184msgid "no threads support, ignoring %s"
6185msgstr "没有线程支持,忽略 %s"
6186
6187#: builtin/index-pack.c:1469
6188#, c-format
6189msgid "Cannot open existing pack file '%s'"
6190msgstr "无法打开现存包文件 '%s'"
6191
6192#: builtin/index-pack.c:1471
6193#, c-format
6194msgid "Cannot open existing pack idx file for '%s'"
6195msgstr "无法为 %s 打开包索引文件"
6196
6197#: builtin/index-pack.c:1518
6198#, c-format
6199msgid "non delta: %d object"
6200msgid_plural "non delta: %d objects"
6201msgstr[0] "非 delta:%d 个对象"
6202msgstr[1] "非 delta:%d 个对象"
6203
6204#: builtin/index-pack.c:1525
6205#, c-format
6206msgid "chain length = %d: %lu object"
6207msgid_plural "chain length = %d: %lu objects"
6208msgstr[0] "链长 = %d: %lu 对象"
6209msgstr[1] "链长 = %d: %lu 对象"
6210
6211#: builtin/index-pack.c:1554
6212msgid "Cannot come back to cwd"
6213msgstr "无法返回当前工作目录"
6214
6215#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
6216#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
6217#, c-format
6218msgid "bad %s"
6219msgstr "错误选项 %s"
6220
6221#: builtin/index-pack.c:1635
6222msgid "--fix-thin cannot be used without --stdin"
6223msgstr "--fix-thin 不能和 --stdin 同时使用"
6224
6225#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
6226#, c-format
6227msgid "packfile name '%s' does not end with '.pack'"
6228msgstr "包名 '%s' 没有以 '.pack' 结尾"
6229
6230#: builtin/index-pack.c:1656
6231msgid "--verify with no packfile name given"
6232msgstr "--verify 没有提供包名参数"
6233
6234#: builtin/init-db.c:35
6235#, c-format
6236msgid "Could not make %s writable by group"
6237msgstr "不能设置 %s 为组可写"
6238
6239#: builtin/init-db.c:62
6240#, c-format
6241msgid "insanely long template name %s"
6242msgstr "太长的模版名 %s"
6243
6244#: builtin/init-db.c:67
6245#, c-format
6246msgid "cannot stat '%s'"
6247msgstr "不能枚举 '%s' 状态"
6248
6249#: builtin/init-db.c:73
6250#, c-format
6251msgid "cannot stat template '%s'"
6252msgstr "不能枚举模版 '%s' 状态"
6253
6254#: builtin/init-db.c:80
6255#, c-format
6256msgid "cannot opendir '%s'"
6257msgstr "不能打开目录 '%s'"
6258
6259#: builtin/init-db.c:97
6260#, c-format
6261msgid "cannot readlink '%s'"
6262msgstr "不能读取链接 '%s'"
6263
6264#: builtin/init-db.c:99
6265#, c-format
6266msgid "insanely long symlink %s"
6267msgstr "太长的符号链接 %s"
6268
6269#: builtin/init-db.c:102
6270#, c-format
6271msgid "cannot symlink '%s' '%s'"
6272msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6273
6274#: builtin/init-db.c:106
6275#, c-format
6276msgid "cannot copy '%s' to '%s'"
6277msgstr "不能拷贝 '%s' 至 '%s'"
6278
6279#: builtin/init-db.c:110
6280#, c-format
6281msgid "ignoring template %s"
6282msgstr "忽略模版 %s"
6283
6284#: builtin/init-db.c:133
6285#, c-format
6286msgid "insanely long template path %s"
6287msgstr "太长的模版路径 %s"
6288
6289#: builtin/init-db.c:141
6290#, c-format
6291msgid "templates not found %s"
6292msgstr "模版未找到 %s"
6293
6294#: builtin/init-db.c:154
6295#, c-format
6296msgid "not copying templates of a wrong format version %d from '%s'"
6297msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6298
6299#: builtin/init-db.c:192
6300#, c-format
6301msgid "insane git directory %s"
6302msgstr "不正常的 git 目录 %s"
6303
6304#: builtin/init-db.c:323 builtin/init-db.c:326
6305#, c-format
6306msgid "%s already exists"
6307msgstr "%s 已经存在"
6308
6309#: builtin/init-db.c:355
6310#, c-format
6311msgid "unable to handle file type %d"
6312msgstr "不能处理 %d 类型的文件"
6313
6314#: builtin/init-db.c:358
6315#, c-format
6316msgid "unable to move %s to %s"
6317msgstr "不能移动 %s 至 %s"
6318
6319#. TRANSLATORS: The first '%s' is either "Reinitialized
6320#. existing" or "Initialized empty", the second " shared" or
6321#. "", and the last '%s%s' is the verbatim directory name.
6322#: builtin/init-db.c:418
6323#, c-format
6324msgid "%s%s Git repository in %s%s\n"
6325msgstr "%s%s Git 版本库于 %s%s\n"
6326
6327#: builtin/init-db.c:419
6328msgid "Reinitialized existing"
6329msgstr "重新初始化现存的"
6330
6331#: builtin/init-db.c:419
6332msgid "Initialized empty"
6333msgstr "初始化空的"
6334
6335#  译者:中文字符串拼接,可删除前导空格
6336#: builtin/init-db.c:420
6337msgid " shared"
6338msgstr "共享"
6339
6340#: builtin/init-db.c:467
6341msgid ""
6342"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6343"shared[=<permissions>]] [directory]"
6344msgstr ""
6345"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6346"[目录]"
6347
6348#: builtin/init-db.c:490
6349msgid "permissions"
6350msgstr "权限"
6351
6352#: builtin/init-db.c:491
6353msgid "specify that the git repository is to be shared amongst several users"
6354msgstr "指定 git 版本库是多个用户之间共享的"
6355
6356#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172
6357msgid "be quiet"
6358msgstr "保持安静"
6359
6360#: builtin/init-db.c:525 builtin/init-db.c:530
6361#, c-format
6362msgid "cannot mkdir %s"
6363msgstr "不能创建目录 %s"
6364
6365#: builtin/init-db.c:534
6366#, c-format
6367msgid "cannot chdir to %s"
6368msgstr "不能切换目录到 %s"
6369
6370#: builtin/init-db.c:555
6371#, c-format
6372msgid ""
6373"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6374"dir=<directory>)"
6375msgstr ""
6376"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6377"dir=<directory>)"
6378
6379#: builtin/init-db.c:583
6380#, c-format
6381msgid "Cannot access work tree '%s'"
6382msgstr "不能访问工作区 '%s'"
6383
6384#: builtin/interpret-trailers.c:15
6385msgid ""
6386"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6387"[<file>...]"
6388msgstr ""
6389"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6390">...]"
6391
6392#: builtin/interpret-trailers.c:25
6393msgid "trim empty trailers"
6394msgstr "删除空签名"
6395
6396#: builtin/interpret-trailers.c:26
6397msgid "trailer"
6398msgstr "签名"
6399
6400#: builtin/interpret-trailers.c:27
6401msgid "trailer(s) to add"
6402msgstr "要添加的签名"
6403
6404#: builtin/log.c:41
6405msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6406msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
6407
6408#: builtin/log.c:42
6409msgid "   or: git show [options] <object>..."
6410msgstr "   或者:git show [选项] <对象>..."
6411
6412#: builtin/log.c:81
6413#, c-format
6414msgid "invalid --decorate option: %s"
6415msgstr "无效的 --decorate 选项:%s"
6416
6417#: builtin/log.c:127
6418msgid "suppress diff output"
6419msgstr "不显示差异输出"
6420
6421#: builtin/log.c:128
6422msgid "show source"
6423msgstr "显示源"
6424
6425#: builtin/log.c:129
6426msgid "Use mail map file"
6427msgstr "使用邮件映射文件"
6428
6429#: builtin/log.c:130
6430msgid "decorate options"
6431msgstr "修饰选项"
6432
6433#: builtin/log.c:133
6434msgid "Process line range n,m in file, counting from 1"
6435msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6436
6437#: builtin/log.c:229
6438#, c-format
6439msgid "Final output: %d %s\n"
6440msgstr "最终输出:%d %s\n"
6441
6442#: builtin/log.c:458
6443#, c-format
6444msgid "git show %s: bad file"
6445msgstr "git show %s: 损坏的文件"
6446
6447#: builtin/log.c:472 builtin/log.c:564
6448#, c-format
6449msgid "Could not read object %s"
6450msgstr "不能读取对象 %s"
6451
6452#: builtin/log.c:588
6453#, c-format
6454msgid "Unknown type: %d"
6455msgstr "未知类型:%d"
6456
6457#: builtin/log.c:689
6458msgid "format.headers without value"
6459msgstr "format.headers 没有值"
6460
6461#: builtin/log.c:773
6462msgid "name of output directory is too long"
6463msgstr "输出目录名太长"
6464
6465#: builtin/log.c:789
6466#, c-format
6467msgid "Cannot open patch file %s"
6468msgstr "无法打开补丁文件 %s"
6469
6470#: builtin/log.c:803
6471msgid "Need exactly one range."
6472msgstr "只需要一个范围。"
6473
6474#: builtin/log.c:811
6475msgid "Not a range."
6476msgstr "不是一个范围。"
6477
6478#: builtin/log.c:919
6479msgid "Cover letter needs email format"
6480msgstr "信封需要邮件地址格式"
6481
6482#: builtin/log.c:998
6483#, c-format
6484msgid "insane in-reply-to: %s"
6485msgstr "不正常的 in-reply-to:%s"
6486
6487#: builtin/log.c:1026
6488msgid "git format-patch [options] [<since> | <revision range>]"
6489msgstr "git format-patch [选项] [<从> | <修订集范围>]"
6490
6491#: builtin/log.c:1071
6492msgid "Two output directories?"
6493msgstr "两个输出目录?"
6494
6495#: builtin/log.c:1186
6496msgid "use [PATCH n/m] even with a single patch"
6497msgstr "使用 [PATCH n/m],即使只有一个补丁"
6498
6499#: builtin/log.c:1189
6500msgid "use [PATCH] even with multiple patches"
6501msgstr "使用 [PATCH],即使有多个补丁"
6502
6503#: builtin/log.c:1193
6504msgid "print patches to standard out"
6505msgstr "打印补丁到标准输出"
6506
6507#: builtin/log.c:1195
6508msgid "generate a cover letter"
6509msgstr "生成一封附信"
6510
6511#: builtin/log.c:1197
6512msgid "use simple number sequence for output file names"
6513msgstr "使用简单的数字序列作为输出文件名"
6514
6515#: builtin/log.c:1198
6516msgid "sfx"
6517msgstr "后缀"
6518
6519#: builtin/log.c:1199
6520msgid "use <sfx> instead of '.patch'"
6521msgstr "使用 <后缀> 代替 '.patch'"
6522
6523#: builtin/log.c:1201
6524msgid "start numbering patches at <n> instead of 1"
6525msgstr "补丁以 <n> 开始编号,而不是1"
6526
6527#: builtin/log.c:1203
6528msgid "mark the series as Nth re-roll"
6529msgstr "标记补丁系列是第几次重制"
6530
6531#: builtin/log.c:1205
6532msgid "Use [<prefix>] instead of [PATCH]"
6533msgstr "使用 [<前缀>] 代替 [PATCH]"
6534
6535#: builtin/log.c:1208
6536msgid "store resulting files in <dir>"
6537msgstr "把结果文件存储在 <dir>"
6538
6539#: builtin/log.c:1211
6540msgid "don't strip/add [PATCH]"
6541msgstr "不删除/添加 [PATCH]"
6542
6543#: builtin/log.c:1214
6544msgid "don't output binary diffs"
6545msgstr "不输出二进制差异"
6546
6547#: builtin/log.c:1216
6548msgid "don't include a patch matching a commit upstream"
6549msgstr "不包含已在上游提交中的补丁"
6550
6551#: builtin/log.c:1218
6552msgid "show patch format instead of default (patch + stat)"
6553msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6554
6555#: builtin/log.c:1220
6556msgid "Messaging"
6557msgstr "邮件发送"
6558
6559#: builtin/log.c:1221
6560msgid "header"
6561msgstr "header"
6562
6563#: builtin/log.c:1222
6564msgid "add email header"
6565msgstr "添加邮件头"
6566
6567#: builtin/log.c:1223 builtin/log.c:1225
6568msgid "email"
6569msgstr "邮件地址"
6570
6571#: builtin/log.c:1223
6572msgid "add To: header"
6573msgstr "添加收件人"
6574
6575#: builtin/log.c:1225
6576msgid "add Cc: header"
6577msgstr "添加抄送"
6578
6579#: builtin/log.c:1227
6580msgid "ident"
6581msgstr "ident"
6582
6583#: builtin/log.c:1228
6584msgid "set From address to <ident> (or committer ident if absent)"
6585msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6586
6587#: builtin/log.c:1230
6588msgid "message-id"
6589msgstr "message-id"
6590
6591#: builtin/log.c:1231
6592msgid "make first mail a reply to <message-id>"
6593msgstr "使第一封邮件作为对 <message-id> 的回复"
6594
6595#: builtin/log.c:1232 builtin/log.c:1235
6596msgid "boundary"
6597msgstr "边界"
6598
6599#: builtin/log.c:1233
6600msgid "attach the patch"
6601msgstr "附件方式添加补丁"
6602
6603#: builtin/log.c:1236
6604msgid "inline the patch"
6605msgstr "内联显示补丁"
6606
6607#: builtin/log.c:1240
6608msgid "enable message threading, styles: shallow, deep"
6609msgstr "启用邮件线索,风格:浅,深"
6610
6611#: builtin/log.c:1242
6612msgid "signature"
6613msgstr "签名"
6614
6615#: builtin/log.c:1243
6616msgid "add a signature"
6617msgstr "添加一个签名"
6618
6619#: builtin/log.c:1245
6620msgid "add a signature from a file"
6621msgstr "从文件添加一个签名"
6622
6623#: builtin/log.c:1246
6624msgid "don't print the patch filenames"
6625msgstr "不要打印补丁文件名"
6626
6627#: builtin/log.c:1320
6628#, c-format
6629msgid "invalid ident line: %s"
6630msgstr "包含无效的身份标识:%s"
6631
6632#: builtin/log.c:1335
6633msgid "-n and -k are mutually exclusive."
6634msgstr "-n 和 -k 互斥。"
6635
6636#: builtin/log.c:1337
6637msgid "--subject-prefix and -k are mutually exclusive."
6638msgstr "--subject-prefix 和 -k 互斥。"
6639
6640#: builtin/log.c:1345
6641msgid "--name-only does not make sense"
6642msgstr "--name-only 无意义"
6643
6644#: builtin/log.c:1347
6645msgid "--name-status does not make sense"
6646msgstr "--name-status 无意义"
6647
6648#: builtin/log.c:1349
6649msgid "--check does not make sense"
6650msgstr "--check 无意义"
6651
6652#: builtin/log.c:1372
6653msgid "standard output, or directory, which one?"
6654msgstr "标准输出或目录,哪一个?"
6655
6656#: builtin/log.c:1374
6657#, c-format
6658msgid "Could not create directory '%s'"
6659msgstr "不能创建目录 '%s'"
6660
6661#: builtin/log.c:1472
6662#, c-format
6663msgid "unable to read signature file '%s'"
6664msgstr "无法读取签名文件 '%s'"
6665
6666#: builtin/log.c:1535
6667msgid "Failed to create output files"
6668msgstr "无法创建输出文件"
6669
6670#: builtin/log.c:1583
6671msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6672msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6673
6674#: builtin/log.c:1638
6675#, c-format
6676msgid ""
6677"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6678msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
6679
6680#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
6681#, c-format
6682msgid "Unknown commit %s"
6683msgstr "未知提交 %s"
6684
6685#: builtin/ls-files.c:401
6686msgid "git ls-files [options] [<file>...]"
6687msgstr "git ls-files [选项] [<文件>...]"
6688
6689#: builtin/ls-files.c:458
6690msgid "identify the file status with tags"
6691msgstr "用标签标识文件的状态"
6692
6693#: builtin/ls-files.c:460
6694msgid "use lowercase letters for 'assume unchanged' files"
6695msgstr "使用小写字母表示 '假设未改变的' 文件"
6696
6697#: builtin/ls-files.c:462
6698msgid "show cached files in the output (default)"
6699msgstr "显示缓存的文件(默认)"
6700
6701#: builtin/ls-files.c:464
6702msgid "show deleted files in the output"
6703msgstr "显示已删除的文件"
6704
6705#: builtin/ls-files.c:466
6706msgid "show modified files in the output"
6707msgstr "显示已修改的文件"
6708
6709#: builtin/ls-files.c:468
6710msgid "show other files in the output"
6711msgstr "显示其它文件"
6712
6713#: builtin/ls-files.c:470
6714msgid "show ignored files in the output"
6715msgstr "显示忽略的文件"
6716
6717#: builtin/ls-files.c:473
6718msgid "show staged contents' object name in the output"
6719msgstr "显示暂存区内容的对象名称"
6720
6721#: builtin/ls-files.c:475
6722msgid "show files on the filesystem that need to be removed"
6723msgstr "显示文件系统需要删除的文件"
6724
6725#: builtin/ls-files.c:477
6726msgid "show 'other' directories' names only"
6727msgstr "只显示“其他”目录的名称"
6728
6729#: builtin/ls-files.c:480
6730msgid "don't show empty directories"
6731msgstr "不显示空目录"
6732
6733#: builtin/ls-files.c:483
6734msgid "show unmerged files in the output"
6735msgstr "显示未合并的文件"
6736
6737#: builtin/ls-files.c:485
6738msgid "show resolve-undo information"
6739msgstr "显示 resolve-undo 信息"
6740
6741#: builtin/ls-files.c:487
6742msgid "skip files matching pattern"
6743msgstr "匹配排除文件的模式"
6744
6745#: builtin/ls-files.c:490
6746msgid "exclude patterns are read from <file>"
6747msgstr "从 <文件> 中读取排除模式"
6748
6749#: builtin/ls-files.c:493
6750msgid "read additional per-directory exclude patterns in <file>"
6751msgstr "从 <文件> 读取额外的每个目录的排除模式"
6752
6753#: builtin/ls-files.c:495
6754msgid "add the standard git exclusions"
6755msgstr "添加标准的 git 排除"
6756
6757#: builtin/ls-files.c:498
6758msgid "make the output relative to the project top directory"
6759msgstr "显示相对于顶级目录的文件名"
6760
6761#: builtin/ls-files.c:501
6762msgid "if any <file> is not in the index, treat this as an error"
6763msgstr "如果任何 <文件> 都不在索引区,视为错误"
6764
6765#: builtin/ls-files.c:502
6766msgid "tree-ish"
6767msgstr "树或提交"
6768
6769#: builtin/ls-files.c:503
6770msgid "pretend that paths removed since <tree-ish> are still present"
6771msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6772
6773#: builtin/ls-files.c:505
6774msgid "show debugging data"
6775msgstr "显示调试数据"
6776
6777#: builtin/ls-tree.c:28
6778msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6779msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6780
6781#: builtin/ls-tree.c:126
6782msgid "only show trees"
6783msgstr "只显示树"
6784
6785#: builtin/ls-tree.c:128
6786msgid "recurse into subtrees"
6787msgstr "递归到子树"
6788
6789#: builtin/ls-tree.c:130
6790msgid "show trees when recursing"
6791msgstr "当递归时显示树"
6792
6793#: builtin/ls-tree.c:133
6794msgid "terminate entries with NUL byte"
6795msgstr "条目以NUL字符终止"
6796
6797#: builtin/ls-tree.c:134
6798msgid "include object size"
6799msgstr "包括对象大小"
6800
6801#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6802msgid "list only filenames"
6803msgstr "只列出文件名"
6804
6805#: builtin/ls-tree.c:141
6806msgid "use full path names"
6807msgstr "使用文件的全路径"
6808
6809#: builtin/ls-tree.c:143
6810msgid "list entire tree; not just current directory (implies --full-name)"
6811msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6812
6813#: builtin/merge.c:44
6814msgid "git merge [options] [<commit>...]"
6815msgstr "git merge [选项] [<提交>...]"
6816
6817#: builtin/merge.c:45
6818msgid "git merge [options] <msg> HEAD <commit>"
6819msgstr "git merge [选项] <说明> HEAD <提交>"
6820
6821#: builtin/merge.c:46
6822msgid "git merge --abort"
6823msgstr "git merge --abort"
6824
6825#: builtin/merge.c:99
6826msgid "switch `m' requires a value"
6827msgstr "开关 `m' 需要一个值"
6828
6829#: builtin/merge.c:136
6830#, c-format
6831msgid "Could not find merge strategy '%s'.\n"
6832msgstr "不能找到合并策略 '%s'。\n"
6833
6834#: builtin/merge.c:137
6835#, c-format
6836msgid "Available strategies are:"
6837msgstr "可用的策略有:"
6838
6839#: builtin/merge.c:142
6840#, c-format
6841msgid "Available custom strategies are:"
6842msgstr "可用的自定义策略有:"
6843
6844#: builtin/merge.c:192
6845msgid "do not show a diffstat at the end of the merge"
6846msgstr "在合并的最后不显示差异统计"
6847
6848#: builtin/merge.c:195
6849msgid "show a diffstat at the end of the merge"
6850msgstr "在合并的最后显示差异统计"
6851
6852#: builtin/merge.c:196
6853msgid "(synonym to --stat)"
6854msgstr "(和 --stat 同义)"
6855
6856#: builtin/merge.c:198
6857msgid "add (at most <n>) entries from shortlog to merge commit message"
6858msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6859
6860#: builtin/merge.c:201
6861msgid "create a single commit instead of doing a merge"
6862msgstr "创建一个单独的提交而不是做一次合并"
6863
6864#: builtin/merge.c:203
6865msgid "perform a commit if the merge succeeds (default)"
6866msgstr "如果合并成功,执行一次提交(默认)"
6867
6868#: builtin/merge.c:205
6869msgid "edit message before committing"
6870msgstr "在提交前编辑提交说明"
6871
6872#: builtin/merge.c:206
6873msgid "allow fast-forward (default)"
6874msgstr "允许快进(默认)"
6875
6876#: builtin/merge.c:208
6877msgid "abort if fast-forward is not possible"
6878msgstr "如果不能快进就放弃合并"
6879
6880#: builtin/merge.c:212
6881msgid "Verify that the named commit has a valid GPG signature"
6882msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6883
6884#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89
6885msgid "strategy"
6886msgstr "策略"
6887
6888#: builtin/merge.c:214
6889msgid "merge strategy to use"
6890msgstr "要使用的合并策略"
6891
6892#: builtin/merge.c:215
6893msgid "option=value"
6894msgstr "option=value"
6895
6896#: builtin/merge.c:216
6897msgid "option for selected merge strategy"
6898msgstr "所选的合并策略的选项"
6899
6900#: builtin/merge.c:218
6901msgid "merge commit message (for a non-fast-forward merge)"
6902msgstr "合并的提交说明(针对非快进式合并)"
6903
6904#: builtin/merge.c:222
6905msgid "abort the current in-progress merge"
6906msgstr "放弃当前正在进行的合并"
6907
6908#: builtin/merge.c:250
6909msgid "could not run stash."
6910msgstr "不能进行进度保存。"
6911
6912#: builtin/merge.c:255
6913msgid "stash failed"
6914msgstr "进度保存失败"
6915
6916#: builtin/merge.c:260
6917#, c-format
6918msgid "not a valid object: %s"
6919msgstr "不是一个有效对象:%s"
6920
6921#: builtin/merge.c:279 builtin/merge.c:296
6922msgid "read-tree failed"
6923msgstr "读取树失败"
6924
6925#  译者:注意保持前导空格
6926#: builtin/merge.c:326
6927msgid " (nothing to squash)"
6928msgstr " (无可压缩)"
6929
6930#: builtin/merge.c:339
6931#, c-format
6932msgid "Squash commit -- not updating HEAD\n"
6933msgstr "压缩提交 -- 未更新 HEAD\n"
6934
6935#: builtin/merge.c:371
6936msgid "Writing SQUASH_MSG"
6937msgstr "写入 SQUASH_MSG"
6938
6939#: builtin/merge.c:373
6940msgid "Finishing SQUASH_MSG"
6941msgstr "完成 SQUASH_MSG"
6942
6943#: builtin/merge.c:396
6944#, c-format
6945msgid "No merge message -- not updating HEAD\n"
6946msgstr "无合并信息 -- 未更新 HEAD\n"
6947
6948#: builtin/merge.c:446
6949#, c-format
6950msgid "'%s' does not point to a commit"
6951msgstr "'%s' 没有指向一个提交"
6952
6953#: builtin/merge.c:558
6954#, c-format
6955msgid "Bad branch.%s.mergeoptions string: %s"
6956msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6957
6958#: builtin/merge.c:653
6959msgid "git write-tree failed to write a tree"
6960msgstr "git write-tree 无法写入一树对象"
6961
6962#: builtin/merge.c:677
6963msgid "Not handling anything other than two heads merge."
6964msgstr "不能处理两个头合并之外的任何操作。"
6965
6966#: builtin/merge.c:691
6967#, c-format
6968msgid "Unknown option for merge-recursive: -X%s"
6969msgstr "merge-recursive 的未知选项:-X%s"
6970
6971#: builtin/merge.c:704
6972#, c-format
6973msgid "unable to write %s"
6974msgstr "不能写 %s"
6975
6976#: builtin/merge.c:793
6977#, c-format
6978msgid "Could not read from '%s'"
6979msgstr "不能从 '%s' 读取"
6980
6981#: builtin/merge.c:802
6982#, c-format
6983msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6984msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6985
6986#: builtin/merge.c:808
6987#, c-format
6988msgid ""
6989"Please enter a commit message to explain why this merge is necessary,\n"
6990"especially if it merges an updated upstream into a topic branch.\n"
6991"\n"
6992"Lines starting with '%c' will be ignored, and an empty message aborts\n"
6993"the commit.\n"
6994msgstr ""
6995"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6996"合并到主题分支。\n"
6997"\n"
6998"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6999
7000#: builtin/merge.c:832
7001msgid "Empty commit message."
7002msgstr "空提交信息。"
7003
7004#: builtin/merge.c:844
7005#, c-format
7006msgid "Wonderful.\n"
7007msgstr "太棒了。\n"
7008
7009#: builtin/merge.c:907
7010#, c-format
7011msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7012msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7013
7014#: builtin/merge.c:923
7015#, c-format
7016msgid "'%s' is not a commit"
7017msgstr "'%s' 不是一个提交"
7018
7019#: builtin/merge.c:964
7020msgid "No current branch."
7021msgstr "没有当前分支。"
7022
7023#: builtin/merge.c:966
7024msgid "No remote for the current branch."
7025msgstr "当前分支没有对应的远程版本库。"
7026
7027#: builtin/merge.c:968
7028msgid "No default upstream defined for the current branch."
7029msgstr "当前分支没有定义默认的上游分支。"
7030
7031#: builtin/merge.c:973
7032#, c-format
7033msgid "No remote-tracking branch for %s from %s"
7034msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7035
7036#: builtin/merge.c:1129
7037msgid "There is no merge to abort (MERGE_HEAD missing)."
7038msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7039
7040#: builtin/merge.c:1145
7041msgid ""
7042"You have not concluded your merge (MERGE_HEAD exists).\n"
7043"Please, commit your changes before you merge."
7044msgstr ""
7045"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7046"请在合并前先提交您的修改。"
7047
7048#: builtin/merge.c:1148 git-pull.sh:34
7049msgid "You have not concluded your merge (MERGE_HEAD exists)."
7050msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7051
7052#: builtin/merge.c:1152
7053msgid ""
7054"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7055"Please, commit your changes before you merge."
7056msgstr ""
7057"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7058"请在合并前先提交您的修改。"
7059
7060#: builtin/merge.c:1155
7061msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7062msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7063
7064#: builtin/merge.c:1164
7065msgid "You cannot combine --squash with --no-ff."
7066msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7067
7068#: builtin/merge.c:1173
7069msgid "No commit specified and merge.defaultToUpstream not set."
7070msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7071
7072#: builtin/merge.c:1205
7073msgid "Can merge only exactly one commit into empty head"
7074msgstr "只能将一个提交合并到空分支上"
7075
7076#: builtin/merge.c:1208
7077msgid "Squash commit into empty head not supported yet"
7078msgstr "尚不支持到空分支的压缩提交"
7079
7080#: builtin/merge.c:1210
7081msgid "Non-fast-forward commit does not make sense into an empty head"
7082msgstr "到空分支的非快进式提交没有意义"
7083
7084#: builtin/merge.c:1215
7085#, c-format
7086msgid "%s - not something we can merge"
7087msgstr "%s - 不能被合并"
7088
7089#: builtin/merge.c:1266
7090#, c-format
7091msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7092msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7093
7094#: builtin/merge.c:1269
7095#, c-format
7096msgid "Commit %s has a bad GPG signature allegedly by %s."
7097msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7098
7099#: builtin/merge.c:1272
7100#, c-format
7101msgid "Commit %s does not have a GPG signature."
7102msgstr "提交 %s 没有一个 GPG 签名。"
7103
7104#: builtin/merge.c:1275
7105#, c-format
7106msgid "Commit %s has a good GPG signature by %s\n"
7107msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7108
7109#: builtin/merge.c:1356
7110#, c-format
7111msgid "Updating %s..%s\n"
7112msgstr "更新 %s..%s\n"
7113
7114#: builtin/merge.c:1395
7115#, c-format
7116msgid "Trying really trivial in-index merge...\n"
7117msgstr "尝试非常小的索引内合并...\n"
7118
7119#: builtin/merge.c:1402
7120#, c-format
7121msgid "Nope.\n"
7122msgstr "无。\n"
7123
7124#: builtin/merge.c:1434
7125msgid "Not possible to fast-forward, aborting."
7126msgstr "无法快进,终止。"
7127
7128#: builtin/merge.c:1457 builtin/merge.c:1536
7129#, c-format
7130msgid "Rewinding the tree to pristine...\n"
7131msgstr "将树回滚至原始状态...\n"
7132
7133#: builtin/merge.c:1461
7134#, c-format
7135msgid "Trying merge strategy %s...\n"
7136msgstr "尝试合并策略 %s...\n"
7137
7138#: builtin/merge.c:1527
7139#, c-format
7140msgid "No merge strategy handled the merge.\n"
7141msgstr "没有合并策略处理此合并。\n"
7142
7143#: builtin/merge.c:1529
7144#, c-format
7145msgid "Merge with strategy %s failed.\n"
7146msgstr "使用策略 %s 合并失败。\n"
7147
7148#: builtin/merge.c:1538
7149#, c-format
7150msgid "Using the %s to prepare resolving by hand.\n"
7151msgstr "使用 %s 以准备手工解决。\n"
7152
7153#: builtin/merge.c:1550
7154#, c-format
7155msgid "Automatic merge went well; stopped before committing as requested\n"
7156msgstr "自动合并进展顺利,按要求在提交前停止\n"
7157
7158#: builtin/merge-base.c:29
7159msgid "git merge-base [-a|--all] <commit> <commit>..."
7160msgstr "git merge-base [-a|--all] <提交> <提交>..."
7161
7162#: builtin/merge-base.c:30
7163msgid "git merge-base [-a|--all] --octopus <commit>..."
7164msgstr "git merge-base [-a|--all] --octopus <提交>..."
7165
7166#: builtin/merge-base.c:31
7167msgid "git merge-base --independent <commit>..."
7168msgstr "git merge-base --independent <提交>..."
7169
7170#: builtin/merge-base.c:32
7171msgid "git merge-base --is-ancestor <commit> <commit>"
7172msgstr "git merge-base --is-ancestor <提交> <提交>"
7173
7174#: builtin/merge-base.c:33
7175msgid "git merge-base --fork-point <ref> [<commit>]"
7176msgstr "git merge-base --fork-point <提交> [<提交>]"
7177
7178#: builtin/merge-base.c:214
7179msgid "output all common ancestors"
7180msgstr "输出所有共同的祖先"
7181
7182#: builtin/merge-base.c:216
7183msgid "find ancestors for a single n-way merge"
7184msgstr "查找一个多路合并的祖先提交"
7185
7186#: builtin/merge-base.c:218
7187msgid "list revs not reachable from others"
7188msgstr "显示不能被其他访问到的版本"
7189
7190#: builtin/merge-base.c:220
7191msgid "is the first one ancestor of the other?"
7192msgstr "第一个是其他的祖先提交么?"
7193
7194#: builtin/merge-base.c:222
7195msgid "find where <commit> forked from reflog of <ref>"
7196msgstr "查找 <commit> 从<引用>日志的何处分支的"
7197
7198#: builtin/merge-file.c:8
7199msgid ""
7200"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7201"file2"
7202msgstr ""
7203"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
7204
7205#: builtin/merge-file.c:33
7206msgid "send results to standard output"
7207msgstr "将结果发送到标准输出"
7208
7209#: builtin/merge-file.c:34
7210msgid "use a diff3 based merge"
7211msgstr "使用基于 diff3 的合并"
7212
7213#: builtin/merge-file.c:35
7214msgid "for conflicts, use our version"
7215msgstr "如果冲突,使用我们的版本"
7216
7217#: builtin/merge-file.c:37
7218msgid "for conflicts, use their version"
7219msgstr "如果冲突,使用他们的版本"
7220
7221#: builtin/merge-file.c:39
7222msgid "for conflicts, use a union version"
7223msgstr "如果冲突,使用联合版本"
7224
7225#: builtin/merge-file.c:42
7226msgid "for conflicts, use this marker size"
7227msgstr "如果冲突,使用指定长度的标记"
7228
7229#: builtin/merge-file.c:43
7230msgid "do not warn about conflicts"
7231msgstr "不要警告冲突"
7232
7233#: builtin/merge-file.c:45
7234msgid "set labels for file1/orig_file/file2"
7235msgstr "为 file1/orig_file/file2 设置标签"
7236
7237#: builtin/mktree.c:64
7238msgid "git mktree [-z] [--missing] [--batch]"
7239msgstr "git mktree [-z] [--missing] [--batch]"
7240
7241#: builtin/mktree.c:150
7242msgid "input is NUL terminated"
7243msgstr "输入以 NUL 字符终止"
7244
7245#: builtin/mktree.c:151 builtin/write-tree.c:24
7246msgid "allow missing objects"
7247msgstr "允许丢失的对象"
7248
7249#: builtin/mktree.c:152
7250msgid "allow creation of more than one tree"
7251msgstr "允许创建一个以上的树"
7252
7253#: builtin/mv.c:15
7254msgid "git mv [options] <source>... <destination>"
7255msgstr "git mv [选项] <源>... <目标>"
7256
7257#: builtin/mv.c:69
7258#, c-format
7259msgid "Directory %s is in index and no submodule?"
7260msgstr "目录 %s 在索引中并且不是子模组?"
7261
7262#: builtin/mv.c:71
7263msgid "Please stage your changes to .gitmodules or stash them to proceed"
7264msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7265
7266#: builtin/mv.c:89
7267#, c-format
7268msgid "%.*s is in index"
7269msgstr "%.*s 在索引中"
7270
7271#: builtin/mv.c:111
7272msgid "force move/rename even if target exists"
7273msgstr "强制移动/重命令,即使目标存在"
7274
7275#: builtin/mv.c:112
7276msgid "skip move/rename errors"
7277msgstr "跳过移动/重命名错误"
7278
7279#: builtin/mv.c:151
7280#, c-format
7281msgid "destination '%s' is not a directory"
7282msgstr "目标 '%s' 不是一个目录"
7283
7284#: builtin/mv.c:162
7285#, c-format
7286msgid "Checking rename of '%s' to '%s'\n"
7287msgstr "检查 '%s' 到 '%s' 的重命名\n"
7288
7289#: builtin/mv.c:166
7290msgid "bad source"
7291msgstr "坏的源"
7292
7293#: builtin/mv.c:169
7294msgid "can not move directory into itself"
7295msgstr "不能将目录移动到自身"
7296
7297#: builtin/mv.c:172
7298msgid "cannot move directory over file"
7299msgstr "不能将目录移动到文件"
7300
7301#: builtin/mv.c:181
7302msgid "source directory is empty"
7303msgstr "源目录为空"
7304
7305#: builtin/mv.c:206
7306msgid "not under version control"
7307msgstr "不在版本控制之下"
7308
7309#: builtin/mv.c:209
7310msgid "destination exists"
7311msgstr "目标已存在"
7312
7313#: builtin/mv.c:217
7314#, c-format
7315msgid "overwriting '%s'"
7316msgstr "覆盖 '%s'"
7317
7318#: builtin/mv.c:220
7319msgid "Cannot overwrite"
7320msgstr "不能覆盖"
7321
7322#: builtin/mv.c:223
7323msgid "multiple sources for the same target"
7324msgstr "同一目标具有多个源"
7325
7326#: builtin/mv.c:225
7327msgid "destination directory does not exist"
7328msgstr "目标目录不存在"
7329
7330#: builtin/mv.c:232
7331#, c-format
7332msgid "%s, source=%s, destination=%s"
7333msgstr "%s,源=%s,目标=%s"
7334
7335#: builtin/mv.c:253
7336#, c-format
7337msgid "Renaming %s to %s\n"
7338msgstr "重命名 %s 至 %s\n"
7339
7340#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358
7341#, c-format
7342msgid "renaming '%s' failed"
7343msgstr "重命名 '%s' 失败"
7344
7345#: builtin/name-rev.c:255
7346msgid "git name-rev [options] <commit>..."
7347msgstr "git name-rev [选项] <提交>..."
7348
7349#: builtin/name-rev.c:256
7350msgid "git name-rev [options] --all"
7351msgstr "git name-rev [选项] --all"
7352
7353#: builtin/name-rev.c:257
7354msgid "git name-rev [options] --stdin"
7355msgstr "git name-rev [选项] --stdin"
7356
7357#: builtin/name-rev.c:309
7358msgid "print only names (no SHA-1)"
7359msgstr "只打印名称(无 SHA-1)"
7360
7361#: builtin/name-rev.c:310
7362msgid "only use tags to name the commits"
7363msgstr "只使用 tags 来命名提交"
7364
7365#: builtin/name-rev.c:312
7366msgid "only use refs matching <pattern>"
7367msgstr "只使用和 <模式> 相匹配的引用"
7368
7369#: builtin/name-rev.c:314
7370msgid "list all commits reachable from all refs"
7371msgstr "列出可以从所有引用访问的提交"
7372
7373#: builtin/name-rev.c:315
7374msgid "read from stdin"
7375msgstr "从标准输入读取"
7376
7377#: builtin/name-rev.c:316
7378msgid "allow to print `undefined` names (default)"
7379msgstr "允许打印 `未定义` 的名称(默认)"
7380
7381#: builtin/name-rev.c:322
7382msgid "dereference tags in the input (internal use)"
7383msgstr "反向解析输入中的 tags(内部使用)"
7384
7385#: builtin/notes.c:24
7386msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7387msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7388
7389#: builtin/notes.c:25
7390msgid ""
7391"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7392"<object>] [<object>]"
7393msgstr ""
7394"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7395"象>] [<对象>]"
7396
7397#: builtin/notes.c:26
7398msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7399msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7400
7401#: builtin/notes.c:27
7402msgid ""
7403"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7404"<object>] [<object>]"
7405msgstr ""
7406"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7407">] [<对象>]"
7408
7409#: builtin/notes.c:28
7410msgid "git notes [--ref <notes_ref>] edit [<object>]"
7411msgstr "git notes [--ref <注解引用>] edit [<对象>]"
7412
7413#: builtin/notes.c:29
7414msgid "git notes [--ref <notes_ref>] show [<object>]"
7415msgstr "git notes [--ref <注解引用>] show [<对象>]"
7416
7417#: builtin/notes.c:30
7418msgid ""
7419"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7420msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7421
7422#: builtin/notes.c:31
7423msgid "git notes merge --commit [-v | -q]"
7424msgstr "git notes merge --commit [-v | -q]"
7425
7426#: builtin/notes.c:32
7427msgid "git notes merge --abort [-v | -q]"
7428msgstr "git notes merge --abort [-v | -q]"
7429
7430#: builtin/notes.c:33
7431msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7432msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7433
7434#: builtin/notes.c:34
7435msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7436msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7437
7438#: builtin/notes.c:35
7439msgid "git notes [--ref <notes_ref>] get-ref"
7440msgstr "git notes [--ref <注解引用>] get-ref"
7441
7442#: builtin/notes.c:40
7443msgid "git notes [list [<object>]]"
7444msgstr "git notes [list [<对象>]]"
7445
7446#: builtin/notes.c:45
7447msgid "git notes add [<options>] [<object>]"
7448msgstr "git notes add [<选项>] [<对象>]"
7449
7450#: builtin/notes.c:50
7451msgid "git notes copy [<options>] <from-object> <to-object>"
7452msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7453
7454#: builtin/notes.c:51
7455msgid "git notes copy --stdin [<from-object> <to-object>]..."
7456msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7457
7458#: builtin/notes.c:56
7459msgid "git notes append [<options>] [<object>]"
7460msgstr "git notes append [<选项>] [<对象>]"
7461
7462#: builtin/notes.c:61
7463msgid "git notes edit [<object>]"
7464msgstr "git notes edit [<对象>]"
7465
7466#: builtin/notes.c:66
7467msgid "git notes show [<object>]"
7468msgstr "git notes show [<对象>]"
7469
7470#: builtin/notes.c:71
7471msgid "git notes merge [<options>] <notes_ref>"
7472msgstr "git notes merge [<选项>] <注解引用>"
7473
7474#: builtin/notes.c:72
7475msgid "git notes merge --commit [<options>]"
7476msgstr "git notes merge --commit [<选项>]"
7477
7478#: builtin/notes.c:73
7479msgid "git notes merge --abort [<options>]"
7480msgstr "git notes merge --abort [<选项>]"
7481
7482#: builtin/notes.c:78
7483msgid "git notes remove [<object>]"
7484msgstr "git notes remove [<对象>]"
7485
7486#: builtin/notes.c:83
7487msgid "git notes prune [<options>]"
7488msgstr "git notes prune [<选项>]"
7489
7490#: builtin/notes.c:88
7491msgid "git notes get-ref"
7492msgstr "git notes get-ref"
7493
7494#: builtin/notes.c:136
7495#, c-format
7496msgid "unable to start 'show' for object '%s'"
7497msgstr "不能为对象 '%s' 开始 'show'"
7498
7499#: builtin/notes.c:140
7500msgid "could not read 'show' output"
7501msgstr "不能读取 'show' 的输出"
7502
7503#: builtin/notes.c:148
7504#, c-format
7505msgid "failed to finish 'show' for object '%s'"
7506msgstr "无法为对象 '%s' 完成 'show'"
7507
7508#: builtin/notes.c:166 builtin/tag.c:477
7509#, c-format
7510msgid "could not create file '%s'"
7511msgstr "不能创建文件 '%s'"
7512
7513#: builtin/notes.c:185
7514msgid "Please supply the note contents using either -m or -F option"
7515msgstr "请通过 -m 或 -F 选项为注解提供内容"
7516
7517#: builtin/notes.c:206 builtin/notes.c:847
7518#, c-format
7519msgid "Removing note for object %s\n"
7520msgstr "删除对象 %s 的注解\n"
7521
7522#: builtin/notes.c:211
7523msgid "unable to write note object"
7524msgstr "不能写注解对象"
7525
7526#: builtin/notes.c:213
7527#, c-format
7528msgid "The note contents have been left in %s"
7529msgstr "注解内容被留在 %s 中"
7530
7531#: builtin/notes.c:247 builtin/tag.c:693
7532#, c-format
7533msgid "cannot read '%s'"
7534msgstr "不能读取 '%s'"
7535
7536#: builtin/notes.c:249 builtin/tag.c:696
7537#, c-format
7538msgid "could not open or read '%s'"
7539msgstr "不能打开或读取 '%s'"
7540
7541#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321
7542#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518
7543#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640
7544#: builtin/notes.c:842 builtin/tag.c:709
7545#, c-format
7546msgid "Failed to resolve '%s' as a valid ref."
7547msgstr "无法解析 '%s' 为一个有效引用。"
7548
7549#: builtin/notes.c:271
7550#, c-format
7551msgid "Failed to read object '%s'."
7552msgstr "无法读取对象 '%s'。"
7553
7554#: builtin/notes.c:275
7555#, c-format
7556msgid "Cannot read note data from non-blob object '%s'."
7557msgstr "不能从非数据对象 '%s' 中读取注解数据"
7558
7559#: builtin/notes.c:315
7560#, c-format
7561msgid "Malformed input line: '%s'."
7562msgstr "非法的输入行:'%s'。"
7563
7564#: builtin/notes.c:330
7565#, c-format
7566msgid "Failed to copy notes from '%s' to '%s'"
7567msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7568
7569#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501
7570#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633
7571#: builtin/notes.c:907
7572msgid "too many parameters"
7573msgstr "参数太多"
7574
7575#: builtin/notes.c:387 builtin/notes.c:646
7576#, c-format
7577msgid "No note found for object %s."
7578msgstr "未发现对象 %s 的注解。"
7579
7580#: builtin/notes.c:409 builtin/notes.c:566
7581msgid "note contents as a string"
7582msgstr "注解内容作为一个字符串"
7583
7584#: builtin/notes.c:412 builtin/notes.c:569
7585msgid "note contents in a file"
7586msgstr "注解内容到一个文件中"
7587
7588#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571
7589#: builtin/notes.c:574 builtin/tag.c:628
7590msgid "object"
7591msgstr "对象"
7592
7593#: builtin/notes.c:415 builtin/notes.c:572
7594msgid "reuse and edit specified note object"
7595msgstr "重用和编辑指定的注解对象"
7596
7597#: builtin/notes.c:418 builtin/notes.c:575
7598msgid "reuse specified note object"
7599msgstr "重用指定的注解对象"
7600
7601#: builtin/notes.c:420 builtin/notes.c:488
7602msgid "replace existing notes"
7603msgstr "替换已存在的注解"
7604
7605#: builtin/notes.c:454
7606#, c-format
7607msgid ""
7608"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7609"existing notes"
7610msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7611
7612#: builtin/notes.c:459 builtin/notes.c:536
7613#, c-format
7614msgid "Overwriting existing notes for object %s\n"
7615msgstr "覆盖对象 %s 现存注解\n"
7616
7617#: builtin/notes.c:489
7618msgid "read objects from stdin"
7619msgstr "从标准输入读取对象"
7620
7621#: builtin/notes.c:491
7622msgid "load rewriting config for <command> (implies --stdin)"
7623msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7624
7625#: builtin/notes.c:509
7626msgid "too few parameters"
7627msgstr "参数太少"
7628
7629#: builtin/notes.c:530
7630#, c-format
7631msgid ""
7632"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7633"existing notes"
7634msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7635
7636#: builtin/notes.c:542
7637#, c-format
7638msgid "Missing notes on source object %s. Cannot copy."
7639msgstr "源对象 %s 缺少注解。不能拷贝。"
7640
7641#: builtin/notes.c:591
7642#, c-format
7643msgid ""
7644"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7645"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7646msgstr ""
7647"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7648"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7649
7650#: builtin/notes.c:738
7651msgid "General options"
7652msgstr "通用选项"
7653
7654#: builtin/notes.c:740
7655msgid "Merge options"
7656msgstr "合并选项"
7657
7658#: builtin/notes.c:742
7659msgid ""
7660"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7661"cat_sort_uniq)"
7662msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7663
7664#: builtin/notes.c:744
7665msgid "Committing unmerged notes"
7666msgstr "提交未合并的注解"
7667
7668#: builtin/notes.c:746
7669msgid "finalize notes merge by committing unmerged notes"
7670msgstr "通过提交未合并的注解来完成注解合并"
7671
7672#: builtin/notes.c:748
7673msgid "Aborting notes merge resolution"
7674msgstr "中止注解合并的方案"
7675
7676#: builtin/notes.c:750
7677msgid "abort notes merge"
7678msgstr "中止注解合并"
7679
7680#: builtin/notes.c:845
7681#, c-format
7682msgid "Object %s has no note\n"
7683msgstr "对象 %s 没有注解\n"
7684
7685#: builtin/notes.c:857
7686msgid "attempt to remove non-existent note is not an error"
7687msgstr "尝试删除不存在的注解不是一个错误"
7688
7689#: builtin/notes.c:860
7690msgid "read object names from the standard input"
7691msgstr "从标准输入读取对象名称"
7692
7693#: builtin/notes.c:941
7694msgid "notes-ref"
7695msgstr "注解引用"
7696
7697#: builtin/notes.c:942
7698msgid "use notes from <notes_ref>"
7699msgstr "从 <注解引用> 使用注解"
7700
7701#: builtin/notes.c:977 builtin/remote.c:1624
7702#, c-format
7703msgid "Unknown subcommand: %s"
7704msgstr "未知子命令:%s"
7705
7706#: builtin/pack-objects.c:28
7707msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7708msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7709
7710#: builtin/pack-objects.c:29
7711msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7712msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7713
7714#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
7715#, c-format
7716msgid "deflate error (%d)"
7717msgstr "压缩错误 (%d)"
7718
7719#: builtin/pack-objects.c:773
7720msgid "Writing objects"
7721msgstr "写入对象中"
7722
7723#: builtin/pack-objects.c:1015
7724msgid "disabling bitmap writing, as some objects are not being packed"
7725msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7726
7727#: builtin/pack-objects.c:2175
7728msgid "Compressing objects"
7729msgstr "压缩对象中"
7730
7731#: builtin/pack-objects.c:2572
7732#, c-format
7733msgid "unsupported index version %s"
7734msgstr "不支持的索引版本 %s"
7735
7736#: builtin/pack-objects.c:2576
7737#, c-format
7738msgid "bad index version '%s'"
7739msgstr "坏的索引版本 '%s'"
7740
7741#: builtin/pack-objects.c:2599
7742#, c-format
7743msgid "option %s does not accept negative form"
7744msgstr "选项 %s 不接受否定格式"
7745
7746#: builtin/pack-objects.c:2603
7747#, c-format
7748msgid "unable to parse value '%s' for option %s"
7749msgstr "不能解析选项 %1$s 的值 '%2$s'"
7750
7751#: builtin/pack-objects.c:2622
7752msgid "do not show progress meter"
7753msgstr "不显示进度表"
7754
7755#: builtin/pack-objects.c:2624
7756msgid "show progress meter"
7757msgstr "显示进度表"
7758
7759#: builtin/pack-objects.c:2626
7760msgid "show progress meter during object writing phase"
7761msgstr "在对象写入阶段显示进度表"
7762
7763#: builtin/pack-objects.c:2629
7764msgid "similar to --all-progress when progress meter is shown"
7765msgstr "当进度表显示时类似于 --all-progress"
7766
7767#: builtin/pack-objects.c:2630
7768msgid "version[,offset]"
7769msgstr "版本[,偏移]"
7770
7771#: builtin/pack-objects.c:2631
7772msgid "write the pack index file in the specified idx format version"
7773msgstr "用指定的 idx 格式版本来写包索引文件"
7774
7775#: builtin/pack-objects.c:2634
7776msgid "maximum size of each output pack file"
7777msgstr "每个输出包的最大尺寸"
7778
7779#: builtin/pack-objects.c:2636
7780msgid "ignore borrowed objects from alternate object store"
7781msgstr "忽略从替代对象存储里借用对象"
7782
7783#: builtin/pack-objects.c:2638
7784msgid "ignore packed objects"
7785msgstr "忽略包对象"
7786
7787#: builtin/pack-objects.c:2640
7788msgid "limit pack window by objects"
7789msgstr "限制打包窗口的对象数"
7790
7791#: builtin/pack-objects.c:2642
7792msgid "limit pack window by memory in addition to object limit"
7793msgstr "除对象数量限制外设置打包窗口的内存限制"
7794
7795#: builtin/pack-objects.c:2644
7796msgid "maximum length of delta chain allowed in the resulting pack"
7797msgstr "打包允许的 delta 链的最大长度"
7798
7799#: builtin/pack-objects.c:2646
7800msgid "reuse existing deltas"
7801msgstr "重用已存在的 deltas"
7802
7803#: builtin/pack-objects.c:2648
7804msgid "reuse existing objects"
7805msgstr "重用已存在的对象"
7806
7807#: builtin/pack-objects.c:2650
7808msgid "use OFS_DELTA objects"
7809msgstr "使用 OFS_DELTA 对象"
7810
7811#: builtin/pack-objects.c:2652
7812msgid "use threads when searching for best delta matches"
7813msgstr "使用线程查询最佳 delta 匹配"
7814
7815#: builtin/pack-objects.c:2654
7816msgid "do not create an empty pack output"
7817msgstr "不创建空的包输出"
7818
7819#: builtin/pack-objects.c:2656
7820msgid "read revision arguments from standard input"
7821msgstr "从标准输入读取修订号参数"
7822
7823#: builtin/pack-objects.c:2658
7824msgid "limit the objects to those that are not yet packed"
7825msgstr "限制那些尚未打包的对象"
7826
7827#: builtin/pack-objects.c:2661
7828msgid "include objects reachable from any reference"
7829msgstr "包括可以从任何引用访问到的对象"
7830
7831#: builtin/pack-objects.c:2664
7832msgid "include objects referred by reflog entries"
7833msgstr "包括被引用日志引用到的对象"
7834
7835#: builtin/pack-objects.c:2667
7836msgid "include objects referred to by the index"
7837msgstr "包括被索引引用到的对象"
7838
7839#: builtin/pack-objects.c:2670
7840msgid "output pack to stdout"
7841msgstr "输出包到标准输出"
7842
7843#: builtin/pack-objects.c:2672
7844msgid "include tag objects that refer to objects to be packed"
7845msgstr "包括引用了打包对象的 tag"
7846
7847#: builtin/pack-objects.c:2674
7848msgid "keep unreachable objects"
7849msgstr "维持不可达的对象"
7850
7851#: builtin/pack-objects.c:2675 parse-options.h:140
7852msgid "time"
7853msgstr "时间"
7854
7855#: builtin/pack-objects.c:2676
7856msgid "unpack unreachable objects newer than <time>"
7857msgstr "将比给定 <时间> 新的无法访问的对象解包"
7858
7859#: builtin/pack-objects.c:2679
7860msgid "create thin packs"
7861msgstr "创建精简包"
7862
7863#: builtin/pack-objects.c:2681
7864msgid "ignore packs that have companion .keep file"
7865msgstr "忽略配有 .keep 文件的包"
7866
7867#: builtin/pack-objects.c:2683
7868msgid "pack compression level"
7869msgstr "打包压缩级别"
7870
7871#: builtin/pack-objects.c:2685
7872msgid "do not hide commits by grafts"
7873msgstr "显示被嫁接隐藏的提交"
7874
7875#: builtin/pack-objects.c:2687
7876msgid "use a bitmap index if available to speed up counting objects"
7877msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7878
7879#: builtin/pack-objects.c:2689
7880msgid "write a bitmap index together with the pack index"
7881msgstr "在建立包索引的同时创建 bitmap 索引"
7882
7883#: builtin/pack-objects.c:2778
7884msgid "Counting objects"
7885msgstr "对象计数中"
7886
7887#: builtin/pack-refs.c:6
7888msgid "git pack-refs [options]"
7889msgstr "git pack-refs [选项]"
7890
7891#: builtin/pack-refs.c:14
7892msgid "pack everything"
7893msgstr "打包一切"
7894
7895#: builtin/pack-refs.c:15
7896msgid "prune loose refs (default)"
7897msgstr "清除松散的引用(默认)"
7898
7899#: builtin/prune-packed.c:7
7900msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7901msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7902
7903#: builtin/prune-packed.c:40
7904msgid "Removing duplicate objects"
7905msgstr "正在删除重复对象"
7906
7907#: builtin/prune.c:12
7908msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7909msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7910
7911#: builtin/prune.c:106
7912msgid "do not remove, show only"
7913msgstr "不删除,只显示"
7914
7915#: builtin/prune.c:107
7916msgid "report pruned objects"
7917msgstr "报告清除的对象"
7918
7919#: builtin/prune.c:110
7920msgid "expire objects older than <time>"
7921msgstr "使早于给定时间的对象过期"
7922
7923#: builtin/push.c:14
7924msgid "git push [<options>] [<repository> [<refspec>...]]"
7925msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7926
7927#: builtin/push.c:85
7928msgid "tag shorthand without <tag>"
7929msgstr "tag 简写没有跟 <tag> 参数"
7930
7931#: builtin/push.c:95
7932msgid "--delete only accepts plain target ref names"
7933msgstr "--delete 只接受简单的目标引用名"
7934
7935#: builtin/push.c:139
7936msgid ""
7937"\n"
7938"To choose either option permanently, see push.default in 'git help config'."
7939msgstr ""
7940"\n"
7941"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7942
7943#: builtin/push.c:142
7944#, c-format
7945msgid ""
7946"The upstream branch of your current branch does not match\n"
7947"the name of your current branch.  To push to the upstream branch\n"
7948"on the remote, use\n"
7949"\n"
7950"    git push %s HEAD:%s\n"
7951"\n"
7952"To push to the branch of the same name on the remote, use\n"
7953"\n"
7954"    git push %s %s\n"
7955"%s"
7956msgstr ""
7957"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7958"上游分支,使用\n"
7959"\n"
7960"    git push %s HEAD:%s\n"
7961"\n"
7962"为推送至远程同名分支,使用\n"
7963"\n"
7964"    git push %s %s\n"
7965"%s"
7966
7967#: builtin/push.c:157
7968#, c-format
7969msgid ""
7970"You are not currently on a branch.\n"
7971"To push the history leading to the current (detached HEAD)\n"
7972"state now, use\n"
7973"\n"
7974"    git push %s HEAD:<name-of-remote-branch>\n"
7975msgstr ""
7976"您当前不在一个分支上。\n"
7977"现在为推送当前(分离头指针)的历史,使用\n"
7978"\n"
7979"    git push %s HEAD:<name-of-remote-branch>\n"
7980
7981#: builtin/push.c:171
7982#, c-format
7983msgid ""
7984"The current branch %s has no upstream branch.\n"
7985"To push the current branch and set the remote as upstream, use\n"
7986"\n"
7987"    git push --set-upstream %s %s\n"
7988msgstr ""
7989"当前分支 %s 没有对应的上游分支。\n"
7990"为推送当前分支并建立与远程上游的跟踪,使用\n"
7991"\n"
7992"    git push --set-upstream %s %s\n"
7993
7994#: builtin/push.c:179
7995#, c-format
7996msgid "The current branch %s has multiple upstream branches, refusing to push."
7997msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7998
7999#: builtin/push.c:182
8000#, c-format
8001msgid ""
8002"You are pushing to remote '%s', which is not the upstream of\n"
8003"your current branch '%s', without telling me what to push\n"
8004"to update which remote branch."
8005msgstr ""
8006"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8007"而没有告诉我要推送什么、更新哪个远程分支。"
8008
8009#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8010#: builtin/push.c:205
8011msgid ""
8012"push.default is unset; its implicit value has changed in\n"
8013"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8014"and maintain the traditional behavior, use:\n"
8015"\n"
8016"  git config --global push.default matching\n"
8017"\n"
8018"To squelch this message and adopt the new behavior now, use:\n"
8019"\n"
8020"  git config --global push.default simple\n"
8021"\n"
8022"When push.default is set to 'matching', git will push local branches\n"
8023"to the remote branches that already exist with the same name.\n"
8024"\n"
8025"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8026"behavior, which only pushes the current branch to the corresponding\n"
8027"remote branch that 'git pull' uses to update the current branch.\n"
8028"\n"
8029"See 'git help config' and search for 'push.default' for further "
8030"information.\n"
8031"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8032"'current' instead of 'simple' if you sometimes use older versions of Git)"
8033msgstr ""
8034"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8035"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8036"\n"
8037"  git config --global push.default matching\n"
8038"\n"
8039"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8040"\n"
8041"  git config --global push.default simple\n"
8042"\n"
8043"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8044"本地分支。\n"
8045"\n"
8046"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8047"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8048"\n"
8049"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8050"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8051"为保持兼容,请用 'current' 代替 'simple')"
8052
8053#: builtin/push.c:272
8054msgid ""
8055"You didn't specify any refspecs to push, and push.default is \"nothing\"."
8056msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
8057
8058#: builtin/push.c:279
8059msgid ""
8060"Updates were rejected because the tip of your current branch is behind\n"
8061"its remote counterpart. Integrate the remote changes (e.g.\n"
8062"'git pull ...') before pushing again.\n"
8063"See the 'Note about fast-forwards' in 'git push --help' for details."
8064msgstr ""
8065"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8066"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8067"'git push --help' 中的 'Note about fast-forwards' 小节。"
8068
8069#: builtin/push.c:285
8070msgid ""
8071"Updates were rejected because a pushed branch tip is behind its remote\n"
8072"counterpart. Check out this branch and integrate the remote changes\n"
8073"(e.g. 'git pull ...') before pushing again.\n"
8074"See the 'Note about fast-forwards' in 'git push --help' for details."
8075msgstr ""
8076"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8077"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8078"'git push --help' 中的 'Note about fast-forwards' 小节。"
8079
8080#: builtin/push.c:291
8081msgid ""
8082"Updates were rejected because the remote contains work that you do\n"
8083"not have locally. This is usually caused by another repository pushing\n"
8084"to the same ref. You may want to first integrate the remote changes\n"
8085"(e.g., 'git pull ...') before pushing again.\n"
8086"See the 'Note about fast-forwards' in 'git push --help' for details."
8087msgstr ""
8088"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
8089"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8090"(如 'git pull ...')。\n"
8091"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8092
8093#: builtin/push.c:298
8094msgid "Updates were rejected because the tag already exists in the remote."
8095msgstr "更新被拒绝因为 tag 在远程已经存在。"
8096
8097#: builtin/push.c:301
8098msgid ""
8099"You cannot update a remote ref that points at a non-commit object,\n"
8100"or update a remote ref to make it point at a non-commit object,\n"
8101"without using the '--force' option.\n"
8102msgstr ""
8103"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8104"也不能更新远程引用让其指向一个非提交对象。\n"
8105
8106#: builtin/push.c:360
8107#, c-format
8108msgid "Pushing to %s\n"
8109msgstr "推送到 %s\n"
8110
8111#: builtin/push.c:364
8112#, c-format
8113msgid "failed to push some refs to '%s'"
8114msgstr "无法推送一些引用到 '%s'"
8115
8116#: builtin/push.c:394
8117#, c-format
8118msgid "bad repository '%s'"
8119msgstr "坏的版本库 '%s'"
8120
8121#: builtin/push.c:395
8122msgid ""
8123"No configured push destination.\n"
8124"Either specify the URL from the command-line or configure a remote "
8125"repository using\n"
8126"\n"
8127"    git remote add <name> <url>\n"
8128"\n"
8129"and then push using the remote name\n"
8130"\n"
8131"    git push <name>\n"
8132msgstr ""
8133"没有配置推送目标。\n"
8134"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
8135"\n"
8136"    git remote add <name> <url>\n"
8137"\n"
8138"然后使用该远程版本库名执行推送\n"
8139"\n"
8140"    git push <name>\n"
8141
8142#: builtin/push.c:410
8143msgid "--all and --tags are incompatible"
8144msgstr "--all 和 --tags 不兼容"
8145
8146#: builtin/push.c:411
8147msgid "--all can't be combined with refspecs"
8148msgstr "--all 不能和引用规则同时使用"
8149
8150#: builtin/push.c:416
8151msgid "--mirror and --tags are incompatible"
8152msgstr "--mirror 和 --tags 不兼容"
8153
8154#: builtin/push.c:417
8155msgid "--mirror can't be combined with refspecs"
8156msgstr "--mirror 不能和引用规则同时使用"
8157
8158#: builtin/push.c:422
8159msgid "--all and --mirror are incompatible"
8160msgstr "--all 和 --mirror 不兼容"
8161
8162#: builtin/push.c:493
8163msgid "repository"
8164msgstr "版本库"
8165
8166#: builtin/push.c:494
8167msgid "push all refs"
8168msgstr "推送所有引用"
8169
8170#: builtin/push.c:495
8171msgid "mirror all refs"
8172msgstr "镜像所有引用"
8173
8174#: builtin/push.c:497
8175msgid "delete refs"
8176msgstr "删除引用"
8177
8178#: builtin/push.c:498
8179msgid "push tags (can't be used with --all or --mirror)"
8180msgstr "推送 tags(不能使用 --all or --mirror)"
8181
8182#: builtin/push.c:501
8183msgid "force updates"
8184msgstr "强制更新"
8185
8186#: builtin/push.c:503
8187msgid "refname>:<expect"
8188msgstr "引用名>:<期望值"
8189
8190#: builtin/push.c:504
8191msgid "require old value of ref to be at this value"
8192msgstr "要求引用旧的取值为设定值"
8193
8194#: builtin/push.c:507
8195msgid "control recursive pushing of submodules"
8196msgstr "控制子模组的递归推送"
8197
8198#: builtin/push.c:509
8199msgid "use thin pack"
8200msgstr "使用精简打包"
8201
8202#: builtin/push.c:510 builtin/push.c:511
8203msgid "receive pack program"
8204msgstr "接收包程序"
8205
8206#: builtin/push.c:512
8207msgid "set upstream for git pull/status"
8208msgstr "设置 git pull/status 的上游"
8209
8210#: builtin/push.c:515
8211msgid "prune locally removed refs"
8212msgstr "清除本地删除的引用"
8213
8214#: builtin/push.c:517
8215msgid "bypass pre-push hook"
8216msgstr "绕过 pre-push 钩子"
8217
8218#: builtin/push.c:518
8219msgid "push missing but relevant tags"
8220msgstr "推送缺失的有关的 tags"
8221
8222#: builtin/push.c:520
8223msgid "GPG sign the push"
8224msgstr "用 GPG 为推送签名"
8225
8226#: builtin/push.c:529
8227msgid "--delete is incompatible with --all, --mirror and --tags"
8228msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8229
8230#: builtin/push.c:531
8231msgid "--delete doesn't make sense without any refs"
8232msgstr "--delete 未接任何引用没有意义"
8233
8234#: builtin/read-tree.c:37
8235msgid ""
8236"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8237"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8238"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8239msgstr ""
8240"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8241"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8242"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8243
8244#: builtin/read-tree.c:110
8245msgid "write resulting index to <file>"
8246msgstr "将索引结果写入 <file>"
8247
8248#: builtin/read-tree.c:113
8249msgid "only empty the index"
8250msgstr "只是清空索引"
8251
8252#: builtin/read-tree.c:115
8253msgid "Merging"
8254msgstr "合并"
8255
8256#: builtin/read-tree.c:117
8257msgid "perform a merge in addition to a read"
8258msgstr "读取之余再执行一个合并"
8259
8260#: builtin/read-tree.c:119
8261msgid "3-way merge if no file level merging required"
8262msgstr "如果没有文件级合并需要,执行三路合并"
8263
8264#: builtin/read-tree.c:121
8265msgid "3-way merge in presence of adds and removes"
8266msgstr "存在添加和删除时,也执行三路合并"
8267
8268#: builtin/read-tree.c:123
8269msgid "same as -m, but discard unmerged entries"
8270msgstr "类似于 -m,但丢弃未合并的条目"
8271
8272#: builtin/read-tree.c:124
8273msgid "<subdirectory>/"
8274msgstr "<子目录>/"
8275
8276#: builtin/read-tree.c:125
8277msgid "read the tree into the index under <subdirectory>/"
8278msgstr "读取树对象到索引的 <子目录>/ 下"
8279
8280#: builtin/read-tree.c:128
8281msgid "update working tree with merge result"
8282msgstr "用合并的结果更新工作区"
8283
8284#: builtin/read-tree.c:130
8285msgid "gitignore"
8286msgstr "gitignore"
8287
8288#: builtin/read-tree.c:131
8289msgid "allow explicitly ignored files to be overwritten"
8290msgstr "允许忽略文件中设定的文件可以被覆盖"
8291
8292#: builtin/read-tree.c:134
8293msgid "don't check the working tree after merging"
8294msgstr "合并后不检查工作区"
8295
8296#: builtin/read-tree.c:135
8297msgid "don't update the index or the work tree"
8298msgstr "不更新索引区和工作区"
8299
8300#: builtin/read-tree.c:137
8301msgid "skip applying sparse checkout filter"
8302msgstr "跳过应用稀疏检出过滤器"
8303
8304#: builtin/read-tree.c:139
8305msgid "debug unpack-trees"
8306msgstr "调试 unpack-trees"
8307
8308#: builtin/reflog.c:499
8309#, c-format
8310msgid "%s' for '%s' is not a valid timestamp"
8311msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8312
8313#: builtin/reflog.c:615 builtin/reflog.c:620
8314#, c-format
8315msgid "'%s' is not a valid timestamp"
8316msgstr "'%s' 不是一个有效的时间戳"
8317
8318#: builtin/remote.c:12
8319msgid "git remote [-v | --verbose]"
8320msgstr "git remote [-v | --verbose]"
8321
8322#: builtin/remote.c:13
8323msgid ""
8324"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8325"mirror=<fetch|push>] <name> <url>"
8326msgstr ""
8327"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8328"mirror=<fetch|push>] <名称> <url>"
8329
8330#: builtin/remote.c:14 builtin/remote.c:33
8331msgid "git remote rename <old> <new>"
8332msgstr "git remote rename <旧名称> <新名称>"
8333
8334#: builtin/remote.c:15 builtin/remote.c:38
8335msgid "git remote remove <name>"
8336msgstr "git remote remove <名称>"
8337
8338#: builtin/remote.c:16
8339msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8340msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8341
8342#: builtin/remote.c:17
8343msgid "git remote [-v | --verbose] show [-n] <name>"
8344msgstr "git remote [-v | --verbose] show [-n] <名称>"
8345
8346#: builtin/remote.c:18
8347msgid "git remote prune [-n | --dry-run] <name>"
8348msgstr "git remote prune [-n | --dry-run] <名称>"
8349
8350#: builtin/remote.c:19
8351msgid ""
8352"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8353msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8354
8355#: builtin/remote.c:20
8356msgid "git remote set-branches [--add] <name> <branch>..."
8357msgstr "git remote set-branches [--add] <名称> <分支>..."
8358
8359#: builtin/remote.c:21 builtin/remote.c:69
8360msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8361msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8362
8363#: builtin/remote.c:22 builtin/remote.c:70
8364msgid "git remote set-url --add <name> <newurl>"
8365msgstr "git remote set-url --add <名称> <新的地址>"
8366
8367#: builtin/remote.c:23 builtin/remote.c:71
8368msgid "git remote set-url --delete <name> <url>"
8369msgstr "git remote set-url --delete <名称> <地址>"
8370
8371#: builtin/remote.c:28
8372msgid "git remote add [<options>] <name> <url>"
8373msgstr "git remote add [<选项>] <名称> <地址>"
8374
8375#: builtin/remote.c:43
8376msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8377msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8378
8379#: builtin/remote.c:48
8380msgid "git remote set-branches <name> <branch>..."
8381msgstr "git remote set-branches <名称> <分支>..."
8382
8383#: builtin/remote.c:49
8384msgid "git remote set-branches --add <name> <branch>..."
8385msgstr "git remote set-branches --add <名称> <分支>..."
8386
8387#: builtin/remote.c:54
8388msgid "git remote show [<options>] <name>"
8389msgstr "git remote show [<选项>] <名称>"
8390
8391#: builtin/remote.c:59
8392msgid "git remote prune [<options>] <name>"
8393msgstr "git remote prune [<选项>] <名称>"
8394
8395#: builtin/remote.c:64
8396msgid "git remote update [<options>] [<group> | <remote>]..."
8397msgstr "git remote update [<选项>] [<组> | <远程>]..."
8398
8399#: builtin/remote.c:88
8400#, c-format
8401msgid "Updating %s"
8402msgstr "更新 %s 中"
8403
8404#: builtin/remote.c:120
8405msgid ""
8406"--mirror is dangerous and deprecated; please\n"
8407"\t use --mirror=fetch or --mirror=push instead"
8408msgstr ""
8409"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8410"\t 或 --mirror=push"
8411
8412#: builtin/remote.c:137
8413#, c-format
8414msgid "unknown mirror argument: %s"
8415msgstr "未知的镜像参数:%s"
8416
8417#: builtin/remote.c:153
8418msgid "fetch the remote branches"
8419msgstr "抓取远程的分支"
8420
8421#: builtin/remote.c:155
8422msgid "import all tags and associated objects when fetching"
8423msgstr "抓取时导入所有的 tags 和关联对象"
8424
8425#: builtin/remote.c:158
8426msgid "or do not fetch any tag at all (--no-tags)"
8427msgstr "或不抓取任何 tag(--no-tags)"
8428
8429#: builtin/remote.c:160
8430msgid "branch(es) to track"
8431msgstr "跟踪的分支"
8432
8433#: builtin/remote.c:161
8434msgid "master branch"
8435msgstr "主线分支"
8436
8437#: builtin/remote.c:162
8438msgid "push|fetch"
8439msgstr "push|fetch"
8440
8441#: builtin/remote.c:163
8442msgid "set up remote as a mirror to push to or fetch from"
8443msgstr "把远程设置为用以推送或抓取的镜像"
8444
8445#: builtin/remote.c:175
8446msgid "specifying a master branch makes no sense with --mirror"
8447msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8448
8449#: builtin/remote.c:177
8450msgid "specifying branches to track makes sense only with fetch mirrors"
8451msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8452
8453#: builtin/remote.c:185 builtin/remote.c:641
8454#, c-format
8455msgid "remote %s already exists."
8456msgstr "远程 %s 已经存在。"
8457
8458#: builtin/remote.c:189 builtin/remote.c:645
8459#, c-format
8460msgid "'%s' is not a valid remote name"
8461msgstr "'%s' 不是一个有效的远程名称"
8462
8463#: builtin/remote.c:233
8464#, c-format
8465msgid "Could not setup master '%s'"
8466msgstr "无法设置 master '%s'"
8467
8468#: builtin/remote.c:333
8469#, c-format
8470msgid "Could not get fetch map for refspec %s"
8471msgstr "无法得到引用规则 %s 的获取列表"
8472
8473#: builtin/remote.c:434 builtin/remote.c:442
8474msgid "(matching)"
8475msgstr "(匹配)"
8476
8477#: builtin/remote.c:446
8478msgid "(delete)"
8479msgstr "(删除)"
8480
8481#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
8482#, c-format
8483msgid "Could not append '%s' to '%s'"
8484msgstr "不能添加 '%s' 至 '%s'"
8485
8486#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898
8487#, c-format
8488msgid "No such remote: %s"
8489msgstr "没有这样的远程:%s"
8490
8491#: builtin/remote.c:651
8492#, c-format
8493msgid "Could not rename config section '%s' to '%s'"
8494msgstr "不能重命名配置小节 '%s' 到 '%s'"
8495
8496#: builtin/remote.c:657 builtin/remote.c:850
8497#, c-format
8498msgid "Could not remove config section '%s'"
8499msgstr "不能移除配置小节 '%s'"
8500
8501#: builtin/remote.c:672
8502#, c-format
8503msgid ""
8504"Not updating non-default fetch refspec\n"
8505"\t%s\n"
8506"\tPlease update the configuration manually if necessary."
8507msgstr ""
8508"没有更新非默认的获取引用规则\n"
8509"\t%s\n"
8510"\t如果必要请手动更新配置。"
8511
8512#: builtin/remote.c:678
8513#, c-format
8514msgid "Could not append '%s'"
8515msgstr "不能追加 '%s'"
8516
8517#: builtin/remote.c:689
8518#, c-format
8519msgid "Could not set '%s'"
8520msgstr "不能设置 '%s'"
8521
8522#: builtin/remote.c:711
8523#, c-format
8524msgid "deleting '%s' failed"
8525msgstr "删除 '%s' 失败"
8526
8527#: builtin/remote.c:745
8528#, c-format
8529msgid "creating '%s' failed"
8530msgstr "创建 '%s' 失败"
8531
8532#: builtin/remote.c:769
8533#, c-format
8534msgid "Could not remove branch %s"
8535msgstr "无法移除分支 %s"
8536
8537#: builtin/remote.c:836
8538msgid ""
8539"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8540"to delete it, use:"
8541msgid_plural ""
8542"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8543"to delete them, use:"
8544msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8545msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8546
8547#: builtin/remote.c:951
8548#, c-format
8549msgid " new (next fetch will store in remotes/%s)"
8550msgstr " 新的(下一次获取将存储于 remotes/%s)"
8551
8552#: builtin/remote.c:954
8553msgid " tracked"
8554msgstr " 已跟踪"
8555
8556#: builtin/remote.c:956
8557msgid " stale (use 'git remote prune' to remove)"
8558msgstr " 过时(使用 'git remote prune' 来移除)"
8559
8560#: builtin/remote.c:958
8561msgid " ???"
8562msgstr " ???"
8563
8564#: builtin/remote.c:999
8565#, c-format
8566msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8567msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8568
8569#: builtin/remote.c:1006
8570#, c-format
8571msgid "rebases onto remote %s"
8572msgstr "变基到远程 %s"
8573
8574#: builtin/remote.c:1009
8575#, c-format
8576msgid " merges with remote %s"
8577msgstr " 与远程 %s 合并"
8578
8579#: builtin/remote.c:1010
8580msgid "    and with remote"
8581msgstr "    且有远程"
8582
8583#: builtin/remote.c:1012
8584#, c-format
8585msgid "merges with remote %s"
8586msgstr "与远程 %s 合并"
8587
8588#: builtin/remote.c:1013
8589msgid "   and with remote"
8590msgstr "   且有远程"
8591
8592#: builtin/remote.c:1059
8593msgid "create"
8594msgstr "创建"
8595
8596#: builtin/remote.c:1062
8597msgid "delete"
8598msgstr "删除"
8599
8600#: builtin/remote.c:1066
8601msgid "up to date"
8602msgstr "最新"
8603
8604#: builtin/remote.c:1069
8605msgid "fast-forwardable"
8606msgstr "可快进"
8607
8608#: builtin/remote.c:1072
8609msgid "local out of date"
8610msgstr "本地已过时"
8611
8612#: builtin/remote.c:1079
8613#, c-format
8614msgid "    %-*s forces to %-*s (%s)"
8615msgstr "    %-*s 强制推送至 %-*s (%s)"
8616
8617#: builtin/remote.c:1082
8618#, c-format
8619msgid "    %-*s pushes to %-*s (%s)"
8620msgstr "    %-*s 推送至 %-*s (%s)"
8621
8622#: builtin/remote.c:1086
8623#, c-format
8624msgid "    %-*s forces to %s"
8625msgstr "    %-*s 强制推送至 %s"
8626
8627#: builtin/remote.c:1089
8628#, c-format
8629msgid "    %-*s pushes to %s"
8630msgstr "    %-*s 推送至 %s"
8631
8632#: builtin/remote.c:1157
8633msgid "do not query remotes"
8634msgstr "不查询远程"
8635
8636#: builtin/remote.c:1184
8637#, c-format
8638msgid "* remote %s"
8639msgstr "* 远程 %s"
8640
8641#: builtin/remote.c:1185
8642#, c-format
8643msgid "  Fetch URL: %s"
8644msgstr "  获取地址:%s"
8645
8646#: builtin/remote.c:1186 builtin/remote.c:1333
8647msgid "(no URL)"
8648msgstr "(无 URL)"
8649
8650#: builtin/remote.c:1195 builtin/remote.c:1197
8651#, c-format
8652msgid "  Push  URL: %s"
8653msgstr "  推送地址:%s"
8654
8655#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203
8656#, c-format
8657msgid "  HEAD branch: %s"
8658msgstr "  HEAD分支:%s"
8659
8660#: builtin/remote.c:1205
8661#, c-format
8662msgid ""
8663"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8664msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8665
8666#: builtin/remote.c:1217
8667#, c-format
8668msgid "  Remote branch:%s"
8669msgid_plural "  Remote branches:%s"
8670msgstr[0] "  远程分支:%s"
8671msgstr[1] "  远程分支:%s"
8672
8673#  译者:中文字符串拼接,可删除前导空格
8674#: builtin/remote.c:1220 builtin/remote.c:1247
8675msgid " (status not queried)"
8676msgstr "(状态未查询)"
8677
8678#: builtin/remote.c:1229
8679msgid "  Local branch configured for 'git pull':"
8680msgid_plural "  Local branches configured for 'git pull':"
8681msgstr[0] "  为 'git pull' 配置的本地分支:"
8682msgstr[1] "  为 'git pull' 配置的本地分支:"
8683
8684#: builtin/remote.c:1237
8685msgid "  Local refs will be mirrored by 'git push'"
8686msgstr "  本地引用将在 'git push' 时被镜像"
8687
8688#: builtin/remote.c:1244
8689#, c-format
8690msgid "  Local ref configured for 'git push'%s:"
8691msgid_plural "  Local refs configured for 'git push'%s:"
8692msgstr[0] "  为 'git push' 配置的本地引用%s:"
8693msgstr[1] "  为 'git push' 配置的本地引用%s:"
8694
8695#: builtin/remote.c:1265
8696msgid "set refs/remotes/<name>/HEAD according to remote"
8697msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8698
8699#: builtin/remote.c:1267
8700msgid "delete refs/remotes/<name>/HEAD"
8701msgstr "删除 refs/remotes/<名称>/HEAD"
8702
8703#: builtin/remote.c:1282
8704msgid "Cannot determine remote HEAD"
8705msgstr "无法确定远程 HEAD"
8706
8707#: builtin/remote.c:1284
8708msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8709msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8710
8711#: builtin/remote.c:1294
8712#, c-format
8713msgid "Could not delete %s"
8714msgstr "无法删除 %s"
8715
8716#: builtin/remote.c:1302
8717#, c-format
8718msgid "Not a valid ref: %s"
8719msgstr "不是一个有效引用:%s"
8720
8721#: builtin/remote.c:1304
8722#, c-format
8723msgid "Could not setup %s"
8724msgstr "不能设置 %s"
8725
8726#  译者:注意保持前导空格
8727#: builtin/remote.c:1322
8728#, c-format
8729msgid " %s will become dangling!"
8730msgstr " %s 将成为摇摆状态!"
8731
8732#  译者:注意保持前导空格
8733#: builtin/remote.c:1323
8734#, c-format
8735msgid " %s has become dangling!"
8736msgstr " %s 已成为摇摆状态!"
8737
8738#: builtin/remote.c:1329
8739#, c-format
8740msgid "Pruning %s"
8741msgstr "修剪 %s"
8742
8743#: builtin/remote.c:1330
8744#, c-format
8745msgid "URL: %s"
8746msgstr "URL:%s"
8747
8748#: builtin/remote.c:1357
8749#, c-format
8750msgid " * [would prune] %s"
8751msgstr " * [将删除] %s"
8752
8753#: builtin/remote.c:1360
8754#, c-format
8755msgid " * [pruned] %s"
8756msgstr " * [已删除] %s"
8757
8758#: builtin/remote.c:1405
8759msgid "prune remotes after fetching"
8760msgstr "抓取后清除远程"
8761
8762#: builtin/remote.c:1471 builtin/remote.c:1545
8763#, c-format
8764msgid "No such remote '%s'"
8765msgstr "没有此远程 '%s'"
8766
8767#: builtin/remote.c:1491
8768msgid "add branch"
8769msgstr "添加分支"
8770
8771#: builtin/remote.c:1498
8772msgid "no remote specified"
8773msgstr "未指定远程"
8774
8775#: builtin/remote.c:1520
8776msgid "manipulate push URLs"
8777msgstr "操作推送 URLS"
8778
8779#: builtin/remote.c:1522
8780msgid "add URL"
8781msgstr "添加 URL"
8782
8783#: builtin/remote.c:1524
8784msgid "delete URLs"
8785msgstr "删除 URLS"
8786
8787#: builtin/remote.c:1531
8788msgid "--add --delete doesn't make sense"
8789msgstr "--add --delete 无意义"
8790
8791#: builtin/remote.c:1571
8792#, c-format
8793msgid "Invalid old URL pattern: %s"
8794msgstr "无效的旧URL匹配模版:%s"
8795
8796#: builtin/remote.c:1579
8797#, c-format
8798msgid "No such URL found: %s"
8799msgstr "未找到此URL:%s"
8800
8801#: builtin/remote.c:1581
8802msgid "Will not delete all non-push URLs"
8803msgstr "将不会删除所有非推送URL地址"
8804
8805#: builtin/remote.c:1595
8806msgid "be verbose; must be placed before a subcommand"
8807msgstr "冗长输出;必须置于子命令之前"
8808
8809#: builtin/repack.c:17
8810msgid "git repack [options]"
8811msgstr "git repack [选项]"
8812
8813#: builtin/repack.c:160
8814msgid "pack everything in a single pack"
8815msgstr "所有内容打包到一个包文件中"
8816
8817#: builtin/repack.c:162
8818msgid "same as -a, and turn unreachable objects loose"
8819msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8820
8821#: builtin/repack.c:165
8822msgid "remove redundant packs, and run git-prune-packed"
8823msgstr "删除多余的包,运行 git-prune-packed"
8824
8825#: builtin/repack.c:167
8826msgid "pass --no-reuse-delta to git-pack-objects"
8827msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8828
8829#: builtin/repack.c:169
8830msgid "pass --no-reuse-object to git-pack-objects"
8831msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8832
8833#: builtin/repack.c:171
8834msgid "do not run git-update-server-info"
8835msgstr "不运行 git-update-server-info"
8836
8837#: builtin/repack.c:174
8838msgid "pass --local to git-pack-objects"
8839msgstr "向 git-pack-objects 传递参数 --local"
8840
8841#: builtin/repack.c:176
8842msgid "write bitmap index"
8843msgstr "写 bitmap 索引"
8844
8845#: builtin/repack.c:177
8846msgid "approxidate"
8847msgstr "近似日期"
8848
8849#: builtin/repack.c:178
8850msgid "with -A, do not loosen objects older than this"
8851msgstr "使用 -A,不要将早于给定时间的对象过期"
8852
8853#: builtin/repack.c:180
8854msgid "size of the window used for delta compression"
8855msgstr "用于增量压缩的窗口值"
8856
8857#: builtin/repack.c:181 builtin/repack.c:185
8858msgid "bytes"
8859msgstr "字节"
8860
8861#: builtin/repack.c:182
8862msgid "same as the above, but limit memory size instead of entries count"
8863msgstr "和上面的相似,但限制内存大小而非条目数"
8864
8865#: builtin/repack.c:184
8866msgid "limits the maximum delta depth"
8867msgstr "限制最大增量深度"
8868
8869#: builtin/repack.c:186
8870msgid "maximum size of each packfile"
8871msgstr "每个包的最大尺寸"
8872
8873#: builtin/repack.c:188
8874msgid "repack objects in packs marked with .keep"
8875msgstr "对标记为 .keep 的包中的对象重新打包"
8876
8877#: builtin/repack.c:374
8878#, c-format
8879msgid "removing '%s' failed"
8880msgstr "删除 '%s' 失败"
8881
8882#: builtin/replace.c:19
8883msgid "git replace [-f] <object> <replacement>"
8884msgstr "git replace [-f] <对象> <替换物>"
8885
8886#: builtin/replace.c:20
8887msgid "git replace [-f] --edit <object>"
8888msgstr "git replace [-f] --edit <对象>"
8889
8890#: builtin/replace.c:21
8891msgid "git replace [-f] --graft <commit> [<parent>...]"
8892msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8893
8894#: builtin/replace.c:22
8895msgid "git replace -d <object>..."
8896msgstr "git replace -d <对象>..."
8897
8898#: builtin/replace.c:23
8899msgid "git replace [--format=<format>] [-l [<pattern>]]"
8900msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8901
8902#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
8903#, c-format
8904msgid "Not a valid object name: '%s'"
8905msgstr "不是一个有效的对象名:'%s'"
8906
8907#: builtin/replace.c:355
8908#, c-format
8909msgid "bad mergetag in commit '%s'"
8910msgstr "提交 '%s' 中损坏的 mergetag"
8911
8912#: builtin/replace.c:357
8913#, c-format
8914msgid "malformed mergetag in commit '%s'"
8915msgstr "提交 '%s' 中非法的 mergetag"
8916
8917#: builtin/replace.c:368
8918#, c-format
8919msgid ""
8920"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8921"instead of --graft"
8922msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8923
8924#: builtin/replace.c:401
8925#, c-format
8926msgid "the original commit '%s' has a gpg signature."
8927msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8928
8929#: builtin/replace.c:402
8930msgid "the signature will be removed in the replacement commit!"
8931msgstr "在替换的提交中签名将被移除!"
8932
8933#: builtin/replace.c:408
8934#, c-format
8935msgid "could not write replacement commit for: '%s'"
8936msgstr "不能为 '%s' 写替换提交"
8937
8938#: builtin/replace.c:432
8939msgid "list replace refs"
8940msgstr "列出替换的引用"
8941
8942#: builtin/replace.c:433
8943msgid "delete replace refs"
8944msgstr "删除替换的引用"
8945
8946#: builtin/replace.c:434
8947msgid "edit existing object"
8948msgstr "编辑现存的对象"
8949
8950#: builtin/replace.c:435
8951msgid "change a commit's parents"
8952msgstr "修改一个提交的父提交"
8953
8954#: builtin/replace.c:436
8955msgid "replace the ref if it exists"
8956msgstr "如果存在则替换引用"
8957
8958#: builtin/replace.c:437
8959msgid "do not pretty-print contents for --edit"
8960msgstr "不要为 --edit 操作美观显示内容"
8961
8962#: builtin/replace.c:438
8963msgid "use this format"
8964msgstr "使用此格式"
8965
8966#: builtin/rerere.c:12
8967msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8968msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8969
8970#: builtin/rerere.c:57
8971msgid "register clean resolutions in index"
8972msgstr "在索引中注册干净的解决方案"
8973
8974#: builtin/reset.c:26
8975msgid ""
8976"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8977msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8978
8979#: builtin/reset.c:27
8980msgid "git reset [-q] <tree-ish> [--] <paths>..."
8981msgstr "git reset [-q] <树或提交> [--] <路径>..."
8982
8983#: builtin/reset.c:28
8984msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8985msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8986
8987#: builtin/reset.c:34
8988msgid "mixed"
8989msgstr "混杂"
8990
8991#: builtin/reset.c:34
8992msgid "soft"
8993msgstr "软性"
8994
8995#: builtin/reset.c:34
8996msgid "hard"
8997msgstr "硬性"
8998
8999#: builtin/reset.c:34
9000msgid "merge"
9001msgstr "合并"
9002
9003#: builtin/reset.c:34
9004msgid "keep"
9005msgstr "保持"
9006
9007#: builtin/reset.c:74
9008msgid "You do not have a valid HEAD."
9009msgstr "您没有一个有效的 HEAD。"
9010
9011#: builtin/reset.c:76
9012msgid "Failed to find tree of HEAD."
9013msgstr "无法找到 HEAD 指向的树。"
9014
9015#: builtin/reset.c:82
9016#, c-format
9017msgid "Failed to find tree of %s."
9018msgstr "无法找到 %s 指向的树。"
9019
9020#: builtin/reset.c:100
9021#, c-format
9022msgid "HEAD is now at %s"
9023msgstr "HEAD 现在位于 %s"
9024
9025#  译者:汉字之间无空格,故删除%s前后空格
9026#: builtin/reset.c:183
9027#, c-format
9028msgid "Cannot do a %s reset in the middle of a merge."
9029msgstr "在合并过程中不能做%s重置操作。"
9030
9031#: builtin/reset.c:276
9032msgid "be quiet, only report errors"
9033msgstr "安静模式,只报告错误"
9034
9035#: builtin/reset.c:278
9036msgid "reset HEAD and index"
9037msgstr "重置 HEAD 和索引"
9038
9039#: builtin/reset.c:279
9040msgid "reset only HEAD"
9041msgstr "只重置 HEAD"
9042
9043#: builtin/reset.c:281 builtin/reset.c:283
9044msgid "reset HEAD, index and working tree"
9045msgstr "重置 HEAD、索引和工作区"
9046
9047#: builtin/reset.c:285
9048msgid "reset HEAD but keep local changes"
9049msgstr "重置 HEAD 但保存本地变更"
9050
9051#: builtin/reset.c:288
9052msgid "record only the fact that removed paths will be added later"
9053msgstr "将删除的路径标记为稍后添加"
9054
9055#: builtin/reset.c:305
9056#, c-format
9057msgid "Failed to resolve '%s' as a valid revision."
9058msgstr "无法将 '%s' 解析为一个有效的版本。"
9059
9060#: builtin/reset.c:308 builtin/reset.c:316
9061#, c-format
9062msgid "Could not parse object '%s'."
9063msgstr "不能解析对象 '%s'。"
9064
9065#: builtin/reset.c:313
9066#, c-format
9067msgid "Failed to resolve '%s' as a valid tree."
9068msgstr "无法将 '%s' 解析为一个有效的树对象。"
9069
9070#: builtin/reset.c:322
9071msgid "--patch is incompatible with --{hard,mixed,soft}"
9072msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9073
9074#: builtin/reset.c:331
9075msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9076msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
9077
9078#  译者:汉字之间无空格,故删除%s前后空格
9079#: builtin/reset.c:333
9080#, c-format
9081msgid "Cannot do %s reset with paths."
9082msgstr "不能带路径进行%s重置。"
9083
9084#  译者:汉字之间无空格,故删除%s前后空格
9085#: builtin/reset.c:343
9086#, c-format
9087msgid "%s reset is not allowed in a bare repository"
9088msgstr "不能对纯版本库进行%s重置"
9089
9090#: builtin/reset.c:347
9091msgid "-N can only be used with --mixed"
9092msgstr "-N 只能和 --mixed 同时使用"
9093
9094#: builtin/reset.c:364
9095msgid "Unstaged changes after reset:"
9096msgstr "重置后撤出暂存区的变更:"
9097
9098#: builtin/reset.c:370
9099#, c-format
9100msgid "Could not reset index file to revision '%s'."
9101msgstr "不能重置索引文件至版本 '%s'。"
9102
9103#: builtin/reset.c:374
9104msgid "Could not write new index file."
9105msgstr "不能写入新的索引文件。"
9106
9107#: builtin/rev-parse.c:361
9108msgid "git rev-parse --parseopt [options] -- [<args>...]"
9109msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
9110
9111#: builtin/rev-parse.c:366
9112msgid "keep the `--` passed as an arg"
9113msgstr "保持 `--` 作为一个参数传递"
9114
9115#: builtin/rev-parse.c:368
9116msgid "stop parsing after the first non-option argument"
9117msgstr "遇到第一个非选项参数后停止解析"
9118
9119#: builtin/rev-parse.c:371
9120msgid "output in stuck long form"
9121msgstr "以固定长格式输出"
9122
9123#: builtin/rev-parse.c:499
9124msgid ""
9125"git rev-parse --parseopt [options] -- [<args>...]\n"
9126"   or: git rev-parse --sq-quote [<arg>...]\n"
9127"   or: git rev-parse [options] [<arg>...]\n"
9128"\n"
9129"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9130msgstr ""
9131"git rev-parse --parseopt [选项] -- [<参数>...]\n"
9132"   或者:git rev-parse --sq-quote [<参数>...]\n"
9133"   或者:git rev-parse [选项] [<参数>...]\n"
9134"\n"
9135"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9136
9137#: builtin/revert.c:22
9138msgid "git revert [options] <commit-ish>..."
9139msgstr "git revert [选项] <提交号>..."
9140
9141#: builtin/revert.c:23
9142msgid "git revert <subcommand>"
9143msgstr "git revert <子命令>"
9144
9145#: builtin/revert.c:28
9146msgid "git cherry-pick [options] <commit-ish>..."
9147msgstr "git cherry-pick [选项] <提交号>..."
9148
9149#: builtin/revert.c:29
9150msgid "git cherry-pick <subcommand>"
9151msgstr "git cherry-pick <子命令>"
9152
9153#: builtin/revert.c:71
9154#, c-format
9155msgid "%s: %s cannot be used with %s"
9156msgstr "%s:%s 不能和 %s 同时使用"
9157
9158#: builtin/revert.c:80
9159msgid "end revert or cherry-pick sequence"
9160msgstr "终止反转或拣选操作"
9161
9162#: builtin/revert.c:81
9163msgid "resume revert or cherry-pick sequence"
9164msgstr "继续反转或拣选操作"
9165
9166#: builtin/revert.c:82
9167msgid "cancel revert or cherry-pick sequence"
9168msgstr "取消反转或拣选操作"
9169
9170#: builtin/revert.c:83
9171msgid "don't automatically commit"
9172msgstr "不要自动提交"
9173
9174#: builtin/revert.c:84
9175msgid "edit the commit message"
9176msgstr "编辑提交说明"
9177
9178#: builtin/revert.c:87
9179msgid "parent number"
9180msgstr "父编号"
9181
9182#: builtin/revert.c:89
9183msgid "merge strategy"
9184msgstr "合并策略"
9185
9186#: builtin/revert.c:90
9187msgid "option"
9188msgstr "选项"
9189
9190#: builtin/revert.c:91
9191msgid "option for merge strategy"
9192msgstr "合并策略的选项"
9193
9194#: builtin/revert.c:104
9195msgid "append commit name"
9196msgstr "追加提交名称"
9197
9198#: builtin/revert.c:105
9199msgid "allow fast-forward"
9200msgstr "允许快进式"
9201
9202#: builtin/revert.c:106
9203msgid "preserve initially empty commits"
9204msgstr "保留初始化的空提交"
9205
9206#: builtin/revert.c:107
9207msgid "allow commits with empty messages"
9208msgstr "允许提交说明为空"
9209
9210#: builtin/revert.c:108
9211msgid "keep redundant, empty commits"
9212msgstr "保持多余的、空的提交"
9213
9214#: builtin/revert.c:112
9215msgid "program error"
9216msgstr "程序错误"
9217
9218#: builtin/revert.c:197
9219msgid "revert failed"
9220msgstr "还原失败"
9221
9222#: builtin/revert.c:212
9223msgid "cherry-pick failed"
9224msgstr "拣选失败"
9225
9226#: builtin/rm.c:17
9227msgid "git rm [options] [--] <file>..."
9228msgstr "git rm [选项] [--] <文件>..."
9229
9230#: builtin/rm.c:65
9231msgid ""
9232"the following submodule (or one of its nested submodules)\n"
9233"uses a .git directory:"
9234msgid_plural ""
9235"the following submodules (or one of their nested submodules)\n"
9236"use a .git directory:"
9237msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9238msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9239
9240#: builtin/rm.c:71
9241msgid ""
9242"\n"
9243"(use 'rm -rf' if you really want to remove it including all of its history)"
9244msgstr ""
9245"\n"
9246"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9247
9248#: builtin/rm.c:231
9249msgid ""
9250"the following file has staged content different from both the\n"
9251"file and the HEAD:"
9252msgid_plural ""
9253"the following files have staged content different from both the\n"
9254"file and the HEAD:"
9255msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9256msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9257
9258#: builtin/rm.c:236
9259msgid ""
9260"\n"
9261"(use -f to force removal)"
9262msgstr ""
9263"\n"
9264"(使用 -f 强制删除)"
9265
9266#: builtin/rm.c:240
9267msgid "the following file has changes staged in the index:"
9268msgid_plural "the following files have changes staged in the index:"
9269msgstr[0] "如下文件相对索引区的内容有修改"
9270msgstr[1] "如下文件相对索引区的内容有修改"
9271
9272#: builtin/rm.c:244 builtin/rm.c:255
9273msgid ""
9274"\n"
9275"(use --cached to keep the file, or -f to force removal)"
9276msgstr ""
9277"\n"
9278"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9279
9280#: builtin/rm.c:252
9281msgid "the following file has local modifications:"
9282msgid_plural "the following files have local modifications:"
9283msgstr[0] "如下文件有本地修改:"
9284msgstr[1] "如下文件有本地修改:"
9285
9286#: builtin/rm.c:270
9287msgid "do not list removed files"
9288msgstr "不列出删除的文件"
9289
9290#: builtin/rm.c:271
9291msgid "only remove from the index"
9292msgstr "只从索引区删除"
9293
9294#: builtin/rm.c:272
9295msgid "override the up-to-date check"
9296msgstr "忽略文件更新状态检查"
9297
9298#: builtin/rm.c:273
9299msgid "allow recursive removal"
9300msgstr "允许递归删除"
9301
9302#: builtin/rm.c:275
9303msgid "exit with a zero status even if nothing matched"
9304msgstr "即使没有匹配,也以零状态退出"
9305
9306#: builtin/rm.c:318
9307msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9308msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9309
9310#: builtin/rm.c:336
9311#, c-format
9312msgid "not removing '%s' recursively without -r"
9313msgstr "未提供 -r 选项不会递归删除 '%s'"
9314
9315#: builtin/rm.c:375
9316#, c-format
9317msgid "git rm: unable to remove %s"
9318msgstr "git rm:不能删除 %s"
9319
9320#: builtin/shortlog.c:13
9321msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9322msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9323
9324#: builtin/shortlog.c:131
9325#, c-format
9326msgid "Missing author: %s"
9327msgstr "缺少作者:%s"
9328
9329#: builtin/shortlog.c:230
9330msgid "sort output according to the number of commits per author"
9331msgstr "根据每个作者的提交数量排序"
9332
9333#: builtin/shortlog.c:232
9334msgid "Suppress commit descriptions, only provides commit count"
9335msgstr "隐藏提交说明,只提供提交数量"
9336
9337#: builtin/shortlog.c:234
9338msgid "Show the email address of each author"
9339msgstr "显示每个作者的电子邮件地址"
9340
9341#: builtin/shortlog.c:235
9342msgid "w[,i1[,i2]]"
9343msgstr "w[,i1[,i2]]"
9344
9345#: builtin/shortlog.c:236
9346msgid "Linewrap output"
9347msgstr "折行输出"
9348
9349#: builtin/show-branch.c:9
9350msgid ""
9351"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9352"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9353"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9354"<glob>)...]"
9355msgstr ""
9356"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9357"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9358"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9359"<glob>)...]"
9360
9361#: builtin/show-branch.c:10
9362msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9363msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9364
9365#: builtin/show-branch.c:649
9366msgid "show remote-tracking and local branches"
9367msgstr "显示远程跟踪的和本地的分支"
9368
9369#: builtin/show-branch.c:651
9370msgid "show remote-tracking branches"
9371msgstr "显示远程跟踪的分支"
9372
9373#: builtin/show-branch.c:653
9374msgid "color '*!+-' corresponding to the branch"
9375msgstr "着色 '*!+-' 到相应的分支"
9376
9377#: builtin/show-branch.c:655
9378msgid "show <n> more commits after the common ancestor"
9379msgstr "显示共同祖先后的 <n> 个提交"
9380
9381#: builtin/show-branch.c:657
9382msgid "synonym to more=-1"
9383msgstr "和 more=-1 同义"
9384
9385#: builtin/show-branch.c:658
9386msgid "suppress naming strings"
9387msgstr "不显示字符串命名"
9388
9389#: builtin/show-branch.c:660
9390msgid "include the current branch"
9391msgstr "包括当前分支"
9392
9393#: builtin/show-branch.c:662
9394msgid "name commits with their object names"
9395msgstr "以对象名字命名提交"
9396
9397#: builtin/show-branch.c:664
9398msgid "show possible merge bases"
9399msgstr "显示可能合并的基线"
9400
9401#: builtin/show-branch.c:666
9402msgid "show refs unreachable from any other ref"
9403msgstr "显示没有任何引用的的引用"
9404
9405#: builtin/show-branch.c:668
9406msgid "show commits in topological order"
9407msgstr "以拓扑顺序显示提交"
9408
9409#: builtin/show-branch.c:671
9410msgid "show only commits not on the first branch"
9411msgstr "只显示不在第一个分支上的提交"
9412
9413#: builtin/show-branch.c:673
9414msgid "show merges reachable from only one tip"
9415msgstr "显示仅一个分支可访问的合并提交"
9416
9417#: builtin/show-branch.c:675
9418msgid "topologically sort, maintaining date order where possible"
9419msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9420
9421#: builtin/show-branch.c:678
9422msgid "<n>[,<base>]"
9423msgstr "<n>[,<base>]"
9424
9425#: builtin/show-branch.c:679
9426msgid "show <n> most recent ref-log entries starting at base"
9427msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9428
9429#: builtin/show-ref.c:10
9430msgid ""
9431"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9432"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9433msgstr ""
9434"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9435"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9436
9437#: builtin/show-ref.c:11
9438msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9439msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9440
9441#: builtin/show-ref.c:168
9442msgid "only show tags (can be combined with heads)"
9443msgstr "只显示 tags(可以和头共用)"
9444
9445#: builtin/show-ref.c:169
9446msgid "only show heads (can be combined with tags)"
9447msgstr "只显示头(可以和 tags 共用)"
9448
9449#: builtin/show-ref.c:170
9450msgid "stricter reference checking, requires exact ref path"
9451msgstr "更严格的引用检测,需要精确的引用路径"
9452
9453#: builtin/show-ref.c:173 builtin/show-ref.c:175
9454msgid "show the HEAD reference, even if it would be filtered out"
9455msgstr "显示 HEAD 引用,即使被过滤掉"
9456
9457#: builtin/show-ref.c:177
9458msgid "dereference tags into object IDs"
9459msgstr "转换 tags 到对象ID"
9460
9461#: builtin/show-ref.c:179
9462msgid "only show SHA1 hash using <n> digits"
9463msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9464
9465#: builtin/show-ref.c:183
9466msgid "do not print results to stdout (useful with --verify)"
9467msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9468
9469#: builtin/show-ref.c:185
9470msgid "show refs from stdin that aren't in local repository"
9471msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9472
9473#: builtin/symbolic-ref.c:7
9474msgid "git symbolic-ref [options] name [ref]"
9475msgstr "git symbolic-ref [选项] 名称 [引用]"
9476
9477#: builtin/symbolic-ref.c:8
9478msgid "git symbolic-ref -d [-q] name"
9479msgstr "git symbolic-ref -d [-q] 名称"
9480
9481#: builtin/symbolic-ref.c:40
9482msgid "suppress error message for non-symbolic (detached) refs"
9483msgstr "不显示非符号(分离的)引用的错误信息"
9484
9485#: builtin/symbolic-ref.c:41
9486msgid "delete symbolic ref"
9487msgstr "删除符号引用"
9488
9489#: builtin/symbolic-ref.c:42
9490msgid "shorten ref output"
9491msgstr "简短的引用输出"
9492
9493#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
9494msgid "reason"
9495msgstr "原因"
9496
9497#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
9498msgid "reason of the update"
9499msgstr "更新的原因"
9500
9501#: builtin/tag.c:22
9502msgid ""
9503"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9504msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9505
9506#: builtin/tag.c:23
9507msgid "git tag -d <tagname>..."
9508msgstr "git tag -d <标签名>..."
9509
9510#: builtin/tag.c:24
9511msgid ""
9512"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9513"\t\t[<pattern>...]"
9514msgstr ""
9515"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9516"\t\t[<模式>...]"
9517
9518#: builtin/tag.c:26
9519msgid "git tag -v <tagname>..."
9520msgstr "git tag -v <标签名>..."
9521
9522#: builtin/tag.c:69
9523#, c-format
9524msgid "malformed object at '%s'"
9525msgstr "非法的对象于 '%s'"
9526
9527#: builtin/tag.c:301
9528#, c-format
9529msgid "tag name too long: %.*s..."
9530msgstr "tag 名字太长:%.*s..."
9531
9532#: builtin/tag.c:306
9533#, c-format
9534msgid "tag '%s' not found."
9535msgstr "tag '%s' 未发现。"
9536
9537#: builtin/tag.c:321
9538#, c-format
9539msgid "Deleted tag '%s' (was %s)\n"
9540msgstr "已删除 tag '%s'(曾为 %s)\n"
9541
9542#: builtin/tag.c:333
9543#, c-format
9544msgid "could not verify the tag '%s'"
9545msgstr "不能校验 tag '%s'"
9546
9547#: builtin/tag.c:343
9548#, c-format
9549msgid ""
9550"\n"
9551"Write a message for tag:\n"
9552"  %s\n"
9553"Lines starting with '%c' will be ignored.\n"
9554msgstr ""
9555"\n"
9556"输入一个 tag 说明:\n"
9557"  %s\n"
9558"以 '%c' 开头的行将被忽略。\n"
9559
9560#: builtin/tag.c:347
9561#, c-format
9562msgid ""
9563"\n"
9564"Write a message for tag:\n"
9565"  %s\n"
9566"Lines starting with '%c' will be kept; you may remove them yourself if you "
9567"want to.\n"
9568msgstr ""
9569"\n"
9570"输入一个 tag 说明:\n"
9571"  %s\n"
9572"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9573
9574#: builtin/tag.c:371
9575#, c-format
9576msgid "unsupported sort specification '%s'"
9577msgstr "不支持的排序规格 '%s'"
9578
9579#: builtin/tag.c:373
9580#, c-format
9581msgid "unsupported sort specification '%s' in variable '%s'"
9582msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9583
9584#: builtin/tag.c:428
9585msgid "unable to sign the tag"
9586msgstr "无法签署 tag"
9587
9588#: builtin/tag.c:430
9589msgid "unable to write tag file"
9590msgstr "无法写 tag 文件"
9591
9592#: builtin/tag.c:455
9593msgid "bad object type."
9594msgstr "坏的对象类型。"
9595
9596#: builtin/tag.c:468
9597msgid "tag header too big."
9598msgstr "tag 头信息太大。"
9599
9600#: builtin/tag.c:504
9601msgid "no tag message?"
9602msgstr "无 tag 说明?"
9603
9604#: builtin/tag.c:510
9605#, c-format
9606msgid "The tag message has been left in %s\n"
9607msgstr "tag 说明被保留在 %s\n"
9608
9609#: builtin/tag.c:559
9610msgid "switch 'points-at' requires an object"
9611msgstr "开关 'points-at' 需要一个对象"
9612
9613#: builtin/tag.c:561
9614#, c-format
9615msgid "malformed object name '%s'"
9616msgstr "非法的对象名 '%s'"
9617
9618#: builtin/tag.c:589
9619msgid "list tag names"
9620msgstr "列出tag名称"
9621
9622#: builtin/tag.c:591
9623msgid "print <n> lines of each tag message"
9624msgstr "每个 tag 信息打印 <n> 行"
9625
9626#: builtin/tag.c:593
9627msgid "delete tags"
9628msgstr "删除 tags"
9629
9630#: builtin/tag.c:594
9631msgid "verify tags"
9632msgstr "验证 tags"
9633
9634#: builtin/tag.c:596
9635msgid "Tag creation options"
9636msgstr "Tag 创建选项"
9637
9638#: builtin/tag.c:598
9639msgid "annotated tag, needs a message"
9640msgstr "注解 tag,需要一个说明"
9641
9642#: builtin/tag.c:600
9643msgid "tag message"
9644msgstr "tag 说明"
9645
9646#: builtin/tag.c:602
9647msgid "annotated and GPG-signed tag"
9648msgstr "注解并 GPG 签名的 tag"
9649
9650#: builtin/tag.c:606
9651msgid "use another key to sign the tag"
9652msgstr "使用另外的私钥签名 tag"
9653
9654#: builtin/tag.c:607
9655msgid "replace the tag if exists"
9656msgstr "如果存在,替换现有的 tag"
9657
9658#: builtin/tag.c:608
9659msgid "show tag list in columns"
9660msgstr "以列的方式显示 tag"
9661
9662#: builtin/tag.c:610
9663msgid "sort tags"
9664msgstr "排序 tags"
9665
9666#: builtin/tag.c:614
9667msgid "Tag listing options"
9668msgstr "Tag 列表选项"
9669
9670#: builtin/tag.c:617 builtin/tag.c:623
9671msgid "print only tags that contain the commit"
9672msgstr "只打印包含提交的tags"
9673
9674#: builtin/tag.c:629
9675msgid "print only tags of the object"
9676msgstr "只打印tags对象"
9677
9678#: builtin/tag.c:655
9679msgid "--column and -n are incompatible"
9680msgstr "--column 和 -n 不兼容"
9681
9682#: builtin/tag.c:667
9683msgid "--sort and -n are incompatible"
9684msgstr "--sort 和 -n 不兼容"
9685
9686#: builtin/tag.c:674
9687msgid "-n option is only allowed with -l."
9688msgstr "-n 选项只允许和 -l 同时使用。"
9689
9690#: builtin/tag.c:676
9691msgid "--contains option is only allowed with -l."
9692msgstr "--contains 选项只允许和 -l 同时使用。"
9693
9694#: builtin/tag.c:678
9695msgid "--points-at option is only allowed with -l."
9696msgstr "--points-at 选项只允许和 -l 同时使用。"
9697
9698#: builtin/tag.c:686
9699msgid "only one -F or -m option is allowed."
9700msgstr "只允许一个 -F 或 -m 选项。"
9701
9702#: builtin/tag.c:706
9703msgid "too many params"
9704msgstr "太多参数"
9705
9706#: builtin/tag.c:712
9707#, c-format
9708msgid "'%s' is not a valid tag name."
9709msgstr "'%s' 不是一个有效的tag名称。"
9710
9711#: builtin/tag.c:717
9712#, c-format
9713msgid "tag '%s' already exists"
9714msgstr "tag '%s' 已存在"
9715
9716#: builtin/tag.c:741
9717#, c-format
9718msgid "Updated tag '%s' (was %s)\n"
9719msgstr "已更新tag '%s'(曾为 %s)\n"
9720
9721#: builtin/unpack-objects.c:489
9722msgid "Unpacking objects"
9723msgstr "展开对象中"
9724
9725#: builtin/update-index.c:403
9726msgid "git update-index [options] [--] [<file>...]"
9727msgstr "git update-index [选项] [--] [<文件>...]"
9728
9729#: builtin/update-index.c:756
9730msgid "continue refresh even when index needs update"
9731msgstr "当索引需要更新时继续刷新"
9732
9733#: builtin/update-index.c:759
9734msgid "refresh: ignore submodules"
9735msgstr "刷新:忽略子模组"
9736
9737#: builtin/update-index.c:762
9738msgid "do not ignore new files"
9739msgstr "不忽略新的文件"
9740
9741#: builtin/update-index.c:764
9742msgid "let files replace directories and vice-versa"
9743msgstr "让文件替换目录(反之亦然)"
9744
9745#: builtin/update-index.c:766
9746msgid "notice files missing from worktree"
9747msgstr "通知文件从工作区丢失"
9748
9749#: builtin/update-index.c:768
9750msgid "refresh even if index contains unmerged entries"
9751msgstr "即使索引区包含未合并的条目也执行刷新"
9752
9753#: builtin/update-index.c:771
9754msgid "refresh stat information"
9755msgstr "刷新统计信息"
9756
9757#: builtin/update-index.c:775
9758msgid "like --refresh, but ignore assume-unchanged setting"
9759msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9760
9761#: builtin/update-index.c:779
9762msgid "<mode>,<object>,<path>"
9763msgstr "<mode>,<object>,<path>"
9764
9765#: builtin/update-index.c:780
9766msgid "add the specified entry to the index"
9767msgstr "添加指定的条目到索引区"
9768
9769#: builtin/update-index.c:784
9770msgid "(+/-)x"
9771msgstr "(+/-)x"
9772
9773#: builtin/update-index.c:785
9774msgid "override the executable bit of the listed files"
9775msgstr "覆盖列表里文件的可执行位"
9776
9777#: builtin/update-index.c:789
9778msgid "mark files as \"not changing\""
9779msgstr "把文件标记为 \"没有变更\""
9780
9781#: builtin/update-index.c:792
9782msgid "clear assumed-unchanged bit"
9783msgstr "清除 assumed-unchanged 位"
9784
9785#: builtin/update-index.c:795
9786msgid "mark files as \"index-only\""
9787msgstr "把文件标记为 \"仅索引\""
9788
9789#: builtin/update-index.c:798
9790msgid "clear skip-worktree bit"
9791msgstr "清除 skip-worktree 位"
9792
9793#: builtin/update-index.c:801
9794msgid "add to index only; do not add content to object database"
9795msgstr "只添加到索引区;不添加对象到对象库"
9796
9797#: builtin/update-index.c:803
9798msgid "remove named paths even if present in worktree"
9799msgstr "即使存在工作区里,也删除路径"
9800
9801#: builtin/update-index.c:805
9802msgid "with --stdin: input lines are terminated by null bytes"
9803msgstr "携带 --stdin:输入的行以 null 字符终止"
9804
9805#: builtin/update-index.c:807
9806msgid "read list of paths to be updated from standard input"
9807msgstr "从标准输入中读取需要更新的路径列表"
9808
9809#: builtin/update-index.c:811
9810msgid "add entries from standard input to the index"
9811msgstr "从标准输入添加条目到索引区"
9812
9813#: builtin/update-index.c:815
9814msgid "repopulate stages #2 and #3 for the listed paths"
9815msgstr "为指定文件重新生成第2和第3暂存区"
9816
9817#: builtin/update-index.c:819
9818msgid "only update entries that differ from HEAD"
9819msgstr "只更新与 HEAD 不同的条目"
9820
9821#: builtin/update-index.c:823
9822msgid "ignore files missing from worktree"
9823msgstr "忽略工作区丢失的文件"
9824
9825#: builtin/update-index.c:826
9826msgid "report actions to standard output"
9827msgstr "在标准输出显示操作"
9828
9829#: builtin/update-index.c:828
9830msgid "(for porcelains) forget saved unresolved conflicts"
9831msgstr "(for porcelains) 忘记保存的未解决的冲突"
9832
9833#: builtin/update-index.c:832
9834msgid "write index in this format"
9835msgstr "以这种格式写入索引区"
9836
9837#: builtin/update-index.c:834
9838msgid "enable or disable split index"
9839msgstr "启用或禁用索引拆分"
9840
9841#: builtin/update-ref.c:9
9842msgid "git update-ref [options] -d <refname> [<oldval>]"
9843msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9844
9845#: builtin/update-ref.c:10
9846msgid "git update-ref [options]    <refname> <newval> [<oldval>]"
9847msgstr "git update-ref [选项]    <引用名> <新值> [<旧值>]"
9848
9849#: builtin/update-ref.c:11
9850msgid "git update-ref [options] --stdin [-z]"
9851msgstr "git update-ref [选项] --stdin [-z]"
9852
9853#: builtin/update-ref.c:363
9854msgid "delete the reference"
9855msgstr "删除引用"
9856
9857#: builtin/update-ref.c:365
9858msgid "update <refname> not the one it points to"
9859msgstr "更新 <引用名> 本身而不是它指向的引用"
9860
9861#: builtin/update-ref.c:366
9862msgid "stdin has NUL-terminated arguments"
9863msgstr "标准输入有以 NUL 字符终止的参数"
9864
9865#: builtin/update-ref.c:367
9866msgid "read updates from stdin"
9867msgstr "从标准输入读取更新"
9868
9869#: builtin/update-server-info.c:6
9870msgid "git update-server-info [--force]"
9871msgstr "git update-server-info [--force]"
9872
9873#: builtin/update-server-info.c:14
9874msgid "update the info files from scratch"
9875msgstr "从头开始更新文件信息"
9876
9877#: builtin/verify-commit.c:17
9878msgid "git verify-commit [-v|--verbose] <commit>..."
9879msgstr "git verify-commit [-v|--verbose] <提交>..."
9880
9881#: builtin/verify-commit.c:75
9882msgid "print commit contents"
9883msgstr "打印提交内容"
9884
9885#: builtin/verify-pack.c:54
9886msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9887msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9888
9889#: builtin/verify-pack.c:64
9890msgid "verbose"
9891msgstr "冗长输出"
9892
9893#: builtin/verify-pack.c:66
9894msgid "show statistics only"
9895msgstr "只显示统计"
9896
9897#: builtin/verify-tag.c:17
9898msgid "git verify-tag [-v|--verbose] <tag>..."
9899msgstr "git verify-tag [-v|--verbose] <tag>..."
9900
9901#: builtin/verify-tag.c:73
9902msgid "print tag contents"
9903msgstr "打印 tag 内容"
9904
9905#: builtin/write-tree.c:13
9906msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9907msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9908
9909#: builtin/write-tree.c:26
9910msgid "<prefix>/"
9911msgstr "<前缀>/"
9912
9913#: builtin/write-tree.c:27
9914msgid "write tree object for a subdirectory <prefix>"
9915msgstr "将 <前缀> 子目录内容写到一个树对象"
9916
9917#: builtin/write-tree.c:30
9918msgid "only useful for debugging"
9919msgstr "只对调试有用"
9920
9921#: credential-cache--daemon.c:267
9922msgid "print debugging messages to stderr"
9923msgstr "调试信息输出到标准错误"
9924
9925#: git.c:17
9926msgid ""
9927"'git help -a' and 'git help -g' list available subcommands and some\n"
9928"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9929"to read about a specific subcommand or concept."
9930msgstr ""
9931"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
9932"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
9933"帮助。"
9934
9935#: common-cmds.h:8
9936msgid "Add file contents to the index"
9937msgstr "添加文件内容至索引"
9938
9939#: common-cmds.h:9
9940msgid "Find by binary search the change that introduced a bug"
9941msgstr "通过二分查找定位引入 bug 的变更"
9942
9943#: common-cmds.h:10
9944msgid "List, create, or delete branches"
9945msgstr "列出、创建或删除分支"
9946
9947#: common-cmds.h:11
9948msgid "Checkout a branch or paths to the working tree"
9949msgstr "检出一个分支或路径到工作区"
9950
9951#: common-cmds.h:12
9952msgid "Clone a repository into a new directory"
9953msgstr "克隆一个版本库到一个新目录"
9954
9955#: common-cmds.h:13
9956msgid "Record changes to the repository"
9957msgstr "记录变更到版本库"
9958
9959#: common-cmds.h:14
9960msgid "Show changes between commits, commit and working tree, etc"
9961msgstr "显示提交之间、提交和工作区之间等的差异"
9962
9963#: common-cmds.h:15
9964msgid "Download objects and refs from another repository"
9965msgstr "从另外一个版本库下载对象和引用"
9966
9967#: common-cmds.h:16
9968msgid "Print lines matching a pattern"
9969msgstr "输出和模式匹配的行"
9970
9971#: common-cmds.h:17
9972msgid "Create an empty Git repository or reinitialize an existing one"
9973msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9974
9975#: common-cmds.h:18
9976msgid "Show commit logs"
9977msgstr "显示提交日志"
9978
9979#: common-cmds.h:19
9980msgid "Join two or more development histories together"
9981msgstr "合并两个或更多开发历史"
9982
9983#: common-cmds.h:20
9984msgid "Move or rename a file, a directory, or a symlink"
9985msgstr "移动或重命名一个文件、目录或符号链接"
9986
9987#: common-cmds.h:21
9988msgid "Fetch from and integrate with another repository or a local branch"
9989msgstr "获取并整合另外的版本库或一个本地分支"
9990
9991#: common-cmds.h:22
9992msgid "Update remote refs along with associated objects"
9993msgstr "更新远程引用和相关的对象"
9994
9995#: common-cmds.h:23
9996msgid "Forward-port local commits to the updated upstream head"
9997msgstr "本地提交转移至更新后的上游分支中"
9998
9999#: common-cmds.h:24
10000msgid "Reset current HEAD to the specified state"
10001msgstr "重置当前HEAD到指定状态"
10002
10003#: common-cmds.h:25
10004msgid "Remove files from the working tree and from the index"
10005msgstr "从工作区和索引中删除文件"
10006
10007#: common-cmds.h:26
10008msgid "Show various types of objects"
10009msgstr "显示各种类型的对象"
10010
10011#: common-cmds.h:27
10012msgid "Show the working tree status"
10013msgstr "显示工作区状态"
10014
10015#: common-cmds.h:28
10016msgid "Create, list, delete or verify a tag object signed with GPG"
10017msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
10018
10019#: parse-options.h:143
10020msgid "expiry-date"
10021msgstr "到期时间"
10022
10023#: parse-options.h:158
10024msgid "no-op (backward compatibility)"
10025msgstr "空操作(向后兼容)"
10026
10027#: parse-options.h:232
10028msgid "be more verbose"
10029msgstr "更加详细"
10030
10031#: parse-options.h:234
10032msgid "be more quiet"
10033msgstr "更加安静"
10034
10035#: parse-options.h:240
10036msgid "use <n> digits to display SHA-1s"
10037msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10038
10039#: rerere.h:27
10040msgid "update the index with reused conflict resolution if possible"
10041msgstr "如果可能,重用冲突解决更新索引"
10042
10043#: git-am.sh:52
10044msgid "You need to set your committer info first"
10045msgstr "您需要先设置你的提交者信息"
10046
10047#: git-am.sh:97
10048msgid ""
10049"You seem to have moved HEAD since the last 'am' failure.\n"
10050"Not rewinding to ORIG_HEAD"
10051msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10052
10053#: git-am.sh:107
10054#, sh-format
10055msgid ""
10056"When you have resolved this problem, run \"$cmdline --continue\".\n"
10057"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10058"To restore the original branch and stop patching, run \"$cmdline --abort\"."
10059msgstr ""
10060"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10061"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10062"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10063
10064#: git-am.sh:123
10065msgid "Cannot fall back to three-way merge."
10066msgstr "无法求助于三路合并。"
10067
10068#: git-am.sh:139
10069msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10070msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
10071
10072#: git-am.sh:141
10073msgid "Using index info to reconstruct a base tree..."
10074msgstr "使用索引来重建一个(三路合并的)基础目录树..."
10075
10076#: git-am.sh:156
10077msgid ""
10078"Did you hand edit your patch?\n"
10079"It does not apply to blobs recorded in its index."
10080msgstr ""
10081"您是否曾手动编辑过您的补丁?\n"
10082"无法应用补丁到索引中的数据(blob)对象上。"
10083
10084#: git-am.sh:165
10085msgid "Falling back to patching base and 3-way merge..."
10086msgstr "转而在基础版本上打补丁及进行三路合并..."
10087
10088#: git-am.sh:181
10089msgid "Failed to merge in the changes."
10090msgstr "无法合并变更。"
10091
10092#: git-am.sh:276
10093msgid "Only one StGIT patch series can be applied at once"
10094msgstr "一次只能有一个 StGIT 补丁队列被应用"
10095
10096#: git-am.sh:363
10097#, sh-format
10098msgid "Patch format $patch_format is not supported."
10099msgstr "不支持 $patch_format 补丁格式。"
10100
10101#: git-am.sh:365
10102msgid "Patch format detection failed."
10103msgstr "补丁格式检测失败。"
10104
10105#: git-am.sh:392
10106msgid ""
10107"The -b/--binary option has been a no-op for long time, and\n"
10108"it will be removed. Please do not use it anymore."
10109msgstr ""
10110"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10111"请不要再使用它了。"
10112
10113#: git-am.sh:486
10114#, sh-format
10115msgid "previous rebase directory $dotest still exists but mbox given."
10116msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10117
10118#: git-am.sh:491
10119msgid "Please make up your mind. --skip or --abort?"
10120msgstr "请下决心。--skip 或是 --abort ?"
10121
10122#: git-am.sh:527
10123#, sh-format
10124msgid ""
10125"Stray $dotest directory found.\n"
10126"Use \"git am --abort\" to remove it."
10127msgstr ""
10128"发现了错误的 $dotest 目录。\n"
10129"使用 \"git am --abort\" 删除它。"
10130
10131#: git-am.sh:535
10132msgid "Resolve operation not in progress, we are not resuming."
10133msgstr "解决操作未进行,我们不会继续。"
10134
10135#: git-am.sh:601
10136#, sh-format
10137msgid "Dirty index: cannot apply patches (dirty: $files)"
10138msgstr "脏的索引:不能应用补丁(脏文件:$files)"
10139
10140#: git-am.sh:705
10141#, sh-format
10142msgid ""
10143"Patch is empty.  Was it split wrong?\n"
10144"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10145"To restore the original branch and stop patching run \"$cmdline --abort\"."
10146msgstr ""
10147"补丁为空。是不是切分错误?\n"
10148"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10149"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10150
10151#: git-am.sh:732
10152msgid "Patch does not have a valid e-mail address."
10153msgstr "补丁中没有一个有效的邮件地址。"
10154
10155#: git-am.sh:779
10156msgid "cannot be interactive without stdin connected to a terminal."
10157msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10158
10159#: git-am.sh:783
10160msgid "Commit Body is:"
10161msgstr "提交内容为:"
10162
10163#  译者:注意保持句尾空格
10164#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10165#. in your translation. The program will only accept English
10166#. input at this point.
10167#: git-am.sh:790
10168msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10169msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10170
10171#: git-am.sh:826
10172#, sh-format
10173msgid "Applying: $FIRSTLINE"
10174msgstr "正应用:$FIRSTLINE"
10175
10176#: git-am.sh:847
10177msgid ""
10178"No changes - did you forget to use 'git add'?\n"
10179"If there is nothing left to stage, chances are that something else\n"
10180"already introduced the same changes; you might want to skip this patch."
10181msgstr ""
10182"没有变更 —— 您是不是忘了执行 'git add'?\n"
10183"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10184"您也许想要跳过这个补丁。"
10185
10186#: git-am.sh:855
10187msgid ""
10188"You still have unmerged paths in your index\n"
10189"did you forget to use 'git add'?"
10190msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10191
10192#: git-am.sh:871
10193msgid "No changes -- Patch already applied."
10194msgstr "没有变更 —— 补丁已经应用过。"
10195
10196#: git-am.sh:881
10197#, sh-format
10198msgid "Patch failed at $msgnum $FIRSTLINE"
10199msgstr "补丁失败于 $msgnum $FIRSTLINE"
10200
10201#: git-am.sh:884
10202#, sh-format
10203msgid ""
10204"The copy of the patch that failed is found in:\n"
10205"   $dotest/patch"
10206msgstr ""
10207"失败的补丁文件副本位于:\n"
10208"   $dotest/patch"
10209
10210#: git-am.sh:902
10211msgid "applying to an empty history"
10212msgstr "正应用到一个空历史上"
10213
10214#: git-bisect.sh:48
10215msgid "You need to start by \"git bisect start\""
10216msgstr "您需要执行 \"git bisect start\" 来开始"
10217
10218#  译者:注意保持句尾空格
10219#. TRANSLATORS: Make sure to include [Y] and [n] in your
10220#. translation. The program will only accept English input
10221#. at this point.
10222#: git-bisect.sh:54
10223msgid "Do you want me to do it for you [Y/n]? "
10224msgstr "您想让我为您这样做么[Y/n]? "
10225
10226#: git-bisect.sh:95
10227#, sh-format
10228msgid "unrecognised option: '$arg'"
10229msgstr "未能识别的选项:'$arg'"
10230
10231#: git-bisect.sh:99
10232#, sh-format
10233msgid "'$arg' does not appear to be a valid revision"
10234msgstr "'$arg' 看起来不像是一个有效的版本"
10235
10236#: git-bisect.sh:117
10237msgid "Bad HEAD - I need a HEAD"
10238msgstr "坏的 HEAD - 我需要一个 HEAD"
10239
10240#: git-bisect.sh:130
10241#, sh-format
10242msgid ""
10243"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10244msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
10245
10246#: git-bisect.sh:140
10247msgid "won't bisect on cg-seek'ed tree"
10248msgstr "不会在做了 cg-seek 的树上做二分查找"
10249
10250#: git-bisect.sh:144
10251msgid "Bad HEAD - strange symbolic ref"
10252msgstr "坏的 HEAD - 奇怪的符号引用"
10253
10254#: git-bisect.sh:189
10255#, sh-format
10256msgid "Bad bisect_write argument: $state"
10257msgstr "坏的 bisect_write 参数:$state"
10258
10259#: git-bisect.sh:218
10260#, sh-format
10261msgid "Bad rev input: $arg"
10262msgstr "输入坏的版本:$arg"
10263
10264#: git-bisect.sh:232
10265msgid "Please call 'bisect_state' with at least one argument."
10266msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10267
10268#: git-bisect.sh:244
10269#, sh-format
10270msgid "Bad rev input: $rev"
10271msgstr "输入坏的版本:$rev"
10272
10273#: git-bisect.sh:250
10274msgid "'git bisect bad' can take only one argument."
10275msgstr "'git bisect bad' 只能带一个参数。"
10276
10277#: git-bisect.sh:273
10278msgid "Warning: bisecting only with a bad commit."
10279msgstr "警告:在仅有一个坏提交下进行二分查找。"
10280
10281#  译者:注意保持句尾空格
10282#. TRANSLATORS: Make sure to include [Y] and [n] in your
10283#. translation. The program will only accept English input
10284#. at this point.
10285#: git-bisect.sh:279
10286msgid "Are you sure [Y/n]? "
10287msgstr "您确认么[Y/n]? "
10288
10289#: git-bisect.sh:289
10290msgid ""
10291"You need to give me at least one good and one bad revision.\n"
10292"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10293msgstr ""
10294"您需要给我至少一个好版本和一个坏版本。\n"
10295"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10296
10297#: git-bisect.sh:292
10298msgid ""
10299"You need to start by \"git bisect start\".\n"
10300"You then need to give me at least one good and one bad revision.\n"
10301"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10302msgstr ""
10303"您需要执行 \"git bisect start\" 来开始。\n"
10304"然后需要提供我至少一个好版本和一个坏版本。\n"
10305"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10306
10307#: git-bisect.sh:363 git-bisect.sh:490
10308msgid "We are not bisecting."
10309msgstr "我们没有在二分查找。"
10310
10311#: git-bisect.sh:370
10312#, sh-format
10313msgid "'$invalid' is not a valid commit"
10314msgstr "'$invalid' 不是一个有效的提交"
10315
10316#: git-bisect.sh:379
10317#, sh-format
10318msgid ""
10319"Could not check out original HEAD '$branch'.\n"
10320"Try 'git bisect reset <commit>'."
10321msgstr ""
10322"不能检出原始 HEAD '$branch'。\n"
10323"尝试 'git bisect reset <提交>'。"
10324
10325#: git-bisect.sh:406
10326msgid "No logfile given"
10327msgstr "未提供日志文件"
10328
10329#: git-bisect.sh:407
10330#, sh-format
10331msgid "cannot read $file for replaying"
10332msgstr "不能读取 $file 来重放"
10333
10334#: git-bisect.sh:424
10335msgid "?? what are you talking about?"
10336msgstr "?? 您在说什么?"
10337
10338#: git-bisect.sh:436
10339#, sh-format
10340msgid "running $command"
10341msgstr "运行 $command"
10342
10343#: git-bisect.sh:443
10344#, sh-format
10345msgid ""
10346"bisect run failed:\n"
10347"exit code $res from '$command' is < 0 or >= 128"
10348msgstr ""
10349"二分查找运行失败:\n"
10350"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10351
10352#: git-bisect.sh:469
10353msgid "bisect run cannot continue any more"
10354msgstr "二分查找不能继续运行"
10355
10356#: git-bisect.sh:475
10357#, sh-format
10358msgid ""
10359"bisect run failed:\n"
10360"'bisect_state $state' exited with error code $res"
10361msgstr ""
10362"二分查找运行失败:\n"
10363"'bisect_state $state' 退出码为 $res"
10364
10365#: git-bisect.sh:482
10366msgid "bisect run success"
10367msgstr "二分查找运行成功"
10368
10369#: git-pull.sh:21
10370msgid ""
10371"Pull is not possible because you have unmerged files.\n"
10372"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10373"as appropriate to mark resolution and make a commit."
10374msgstr ""
10375"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10376"然后酌情使用 'git add/rm <file>' 标记解决方案,再做提交。"
10377
10378#: git-pull.sh:25
10379msgid "Pull is not possible because you have unmerged files."
10380msgstr "Pull 不可用,因为您尚有未合并的文件。"
10381
10382#: git-pull.sh:31
10383msgid ""
10384"You have not concluded your merge (MERGE_HEAD exists).\n"
10385"Please, commit your changes before you can merge."
10386msgstr ""
10387"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10388"请在合并前先提交您的修改。"
10389
10390#: git-pull.sh:245
10391msgid "updating an unborn branch with changes added to the index"
10392msgstr "更新尚未诞生的分支,变更添加至索引"
10393
10394#: git-pull.sh:269
10395#, sh-format
10396msgid ""
10397"Warning: fetch updated the current branch head.\n"
10398"Warning: fast-forwarding your working tree from\n"
10399"Warning: commit $orig_head."
10400msgstr ""
10401"警告:fetch 更新了当前的分支。您的工作区\n"
10402"警告:从原提交 $orig_head 快进。"
10403
10404#: git-pull.sh:294
10405msgid "Cannot merge multiple branches into empty head"
10406msgstr "无法将多个分支合并到空分支"
10407
10408#: git-pull.sh:298
10409msgid "Cannot rebase onto multiple branches"
10410msgstr "无法变基到多个分支"
10411
10412#: git-rebase.sh:57
10413msgid ""
10414"When you have resolved this problem, run \"git rebase --continue\".\n"
10415"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10416"To check out the original branch and stop rebasing, run \"git rebase --abort"
10417"\"."
10418msgstr ""
10419"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10420"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10421"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10422
10423#: git-rebase.sh:165
10424msgid "Applied autostash."
10425msgstr "成功应用 autostash。"
10426
10427#: git-rebase.sh:168
10428#, sh-format
10429msgid "Cannot store $stash_sha1"
10430msgstr "无法保存 $stash_sha1"
10431
10432#: git-rebase.sh:169
10433msgid ""
10434"Applying autostash resulted in conflicts.\n"
10435"Your changes are safe in the stash.\n"
10436"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10437msgstr ""
10438"应用 autostash 导致冲突。\n"
10439"您的修改安全地保存在 stash 中。\n"
10440"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10441
10442#: git-rebase.sh:208
10443msgid "The pre-rebase hook refused to rebase."
10444msgstr "钩子 pre-rebase 拒绝变基操作。"
10445
10446#: git-rebase.sh:213
10447msgid "It looks like git-am is in progress. Cannot rebase."
10448msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10449
10450#: git-rebase.sh:351
10451msgid "The --exec option must be used with the --interactive option"
10452msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10453
10454#: git-rebase.sh:356
10455msgid "No rebase in progress?"
10456msgstr "没有正在进行的变基?"
10457
10458#: git-rebase.sh:367
10459msgid "The --edit-todo action can only be used during interactive rebase."
10460msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10461
10462#: git-rebase.sh:374
10463msgid "Cannot read HEAD"
10464msgstr "不能读取 HEAD"
10465
10466#: git-rebase.sh:377
10467msgid ""
10468"You must edit all merge conflicts and then\n"
10469"mark them as resolved using git add"
10470msgstr ""
10471"您必须编辑所有的合并冲突,然后通过 git add\n"
10472"命令将它们标记为已解决"
10473
10474#: git-rebase.sh:395
10475#, sh-format
10476msgid "Could not move back to $head_name"
10477msgstr "无法移回 $head_name"
10478
10479#: git-rebase.sh:414
10480#, sh-format
10481msgid ""
10482"It seems that there is already a $state_dir_base directory, and\n"
10483"I wonder if you are in the middle of another rebase.  If that is the\n"
10484"case, please try\n"
10485"\t$cmd_live_rebase\n"
10486"If that is not the case, please\n"
10487"\t$cmd_clear_stale_rebase\n"
10488"and run me again.  I am stopping in case you still have something\n"
10489"valuable there."
10490msgstr ""
10491"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10492"过程中。 如果是这样,请执行\n"
10493"\t$cmd_live_rebase\n"
10494"如果不是这样,请执行\n"
10495"\t$cmd_clear_stale_rebase\n"
10496"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10497
10498#: git-rebase.sh:465
10499#, sh-format
10500msgid "invalid upstream $upstream_name"
10501msgstr "无效的上游 $upstream_name"
10502
10503#: git-rebase.sh:489
10504#, sh-format
10505msgid "$onto_name: there are more than one merge bases"
10506msgstr "$onto_name: 有一个以上的合并基准"
10507
10508#: git-rebase.sh:492 git-rebase.sh:496
10509#, sh-format
10510msgid "$onto_name: there is no merge base"
10511msgstr "$onto_name: 没有合并基准"
10512
10513#: git-rebase.sh:501
10514#, sh-format
10515msgid "Does not point to a valid commit: $onto_name"
10516msgstr "没有指向一个有效的提交:$onto_name"
10517
10518#: git-rebase.sh:524
10519#, sh-format
10520msgid "fatal: no such branch: $branch_name"
10521msgstr "严重错误:无此分支:$branch_name"
10522
10523#: git-rebase.sh:557
10524msgid "Cannot autostash"
10525msgstr "无法 autostash"
10526
10527#: git-rebase.sh:562
10528#, sh-format
10529msgid "Created autostash: $stash_abbrev"
10530msgstr "创建了 autostash: $stash_abbrev"
10531
10532#: git-rebase.sh:566
10533msgid "Please commit or stash them."
10534msgstr "请提交或为它们保存进度。"
10535
10536#: git-rebase.sh:586
10537#, sh-format
10538msgid "Current branch $branch_name is up to date."
10539msgstr "当前分支 $branch_name 是最新的。"
10540
10541#: git-rebase.sh:590
10542#, sh-format
10543msgid "Current branch $branch_name is up to date, rebase forced."
10544msgstr "当前分支 $branch_name 是最新的,强制变基。"
10545
10546#: git-rebase.sh:601
10547#, sh-format
10548msgid "Changes from $mb to $onto:"
10549msgstr "变更从 $mb 到 $onto:"
10550
10551#: git-rebase.sh:610
10552msgid "First, rewinding head to replay your work on top of it..."
10553msgstr "首先,重置头指针以便在上面重放您的工作..."
10554
10555#: git-rebase.sh:620
10556#, sh-format
10557msgid "Fast-forwarded $branch_name to $onto_name."
10558msgstr "快进 $branch_name 至 $onto_name。"
10559
10560#: git-stash.sh:51
10561msgid "git stash clear with parameters is unimplemented"
10562msgstr "git stash clear 不支持参数"
10563
10564#: git-stash.sh:74
10565msgid "You do not have the initial commit yet"
10566msgstr "您尚未建立初始提交"
10567
10568#: git-stash.sh:89
10569msgid "Cannot save the current index state"
10570msgstr "无法保存当前索引状态"
10571
10572#: git-stash.sh:124 git-stash.sh:137
10573msgid "Cannot save the current worktree state"
10574msgstr "无法保存当前工作区状态"
10575
10576#: git-stash.sh:141
10577msgid "No changes selected"
10578msgstr "没有选择变更"
10579
10580#: git-stash.sh:144
10581msgid "Cannot remove temporary index (can't happen)"
10582msgstr "无法删除临时索引(不应发生)"
10583
10584#: git-stash.sh:157
10585msgid "Cannot record working tree state"
10586msgstr "不能记录工作区状态"
10587
10588#: git-stash.sh:191
10589#, sh-format
10590msgid "Cannot update $ref_stash with $w_commit"
10591msgstr "无法用 $w_commit 更新 $ref_stash"
10592
10593#. TRANSLATORS: $option is an invalid option, like
10594#. `--blah-blah'. The 7 spaces at the beginning of the
10595#. second line correspond to "error: ". So you should line
10596#. up the second line with however many characters the
10597#. translation of "error: " takes in your language. E.g. in
10598#. English this is:
10599#.
10600#. $ git stash save --blah-blah 2>&1 | head -n 2
10601#. error: unknown option for 'stash save': --blah-blah
10602#. To provide a message, use git stash save -- '--blah-blah'
10603#: git-stash.sh:238
10604#, sh-format
10605msgid ""
10606"error: unknown option for 'stash save': $option\n"
10607"       To provide a message, use git stash save -- '$option'"
10608msgstr ""
10609"错误:'stash save' 的未知选项:$option\n"
10610"      要提供一个描述信息,使用 git stash save -- '$option'"
10611
10612#: git-stash.sh:259
10613msgid "No local changes to save"
10614msgstr "没有要保存的本地修改"
10615
10616#: git-stash.sh:263
10617msgid "Cannot initialize stash"
10618msgstr "无法初始化 stash"
10619
10620#: git-stash.sh:267
10621msgid "Cannot save the current status"
10622msgstr "无法保存当前状态"
10623
10624#: git-stash.sh:285
10625msgid "Cannot remove worktree changes"
10626msgstr "无法删除工作区变更"
10627
10628#: git-stash.sh:384
10629msgid "No stash found."
10630msgstr "未发现 stash。"
10631
10632#: git-stash.sh:391
10633#, sh-format
10634msgid "Too many revisions specified: $REV"
10635msgstr "指定了太多的版本:$REV"
10636
10637#: git-stash.sh:397
10638#, sh-format
10639msgid "$reference is not a valid reference"
10640msgstr "$reference 不是一个有效的引用"
10641
10642#: git-stash.sh:425
10643#, sh-format
10644msgid "'$args' is not a stash-like commit"
10645msgstr "'$args' 不是 stash 样提交"
10646
10647#: git-stash.sh:436
10648#, sh-format
10649msgid "'$args' is not a stash reference"
10650msgstr "'$args' 不是一个 stash 引用"
10651
10652#: git-stash.sh:444
10653msgid "unable to refresh index"
10654msgstr "无法刷新索引"
10655
10656#: git-stash.sh:448
10657msgid "Cannot apply a stash in the middle of a merge"
10658msgstr "无法在合并过程中恢复进度"
10659
10660#: git-stash.sh:456
10661msgid "Conflicts in index. Try without --index."
10662msgstr "索引中有冲突。尝试不使用 --index。"
10663
10664#: git-stash.sh:458
10665msgid "Could not save index tree"
10666msgstr "不能保存索引树"
10667
10668#: git-stash.sh:492
10669msgid "Cannot unstage modified files"
10670msgstr "无法还原修改的文件"
10671
10672#: git-stash.sh:507
10673msgid "Index was not unstashed."
10674msgstr "索引的进度没有被恢复。"
10675
10676#: git-stash.sh:530
10677#, sh-format
10678msgid "Dropped ${REV} ($s)"
10679msgstr "丢弃了 ${REV} ($s)"
10680
10681#: git-stash.sh:531
10682#, sh-format
10683msgid "${REV}: Could not drop stash entry"
10684msgstr "${REV}:不能丢弃进度条目"
10685
10686#: git-stash.sh:539
10687msgid "No branch name specified"
10688msgstr "未指定分支名"
10689
10690#: git-stash.sh:611
10691msgid "(To restore them type \"git stash apply\")"
10692msgstr "(为恢复数据输入 \"git stash apply\")"
10693
10694#: git-submodule.sh:95
10695#, sh-format
10696msgid "cannot strip one component off url '$remoteurl'"
10697msgstr "无法从 url '$remoteurl' 剥离一个组件"
10698
10699#: git-submodule.sh:237
10700#, sh-format
10701msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10702msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10703
10704#: git-submodule.sh:287
10705#, sh-format
10706msgid "Clone of '$url' into submodule path '$sm_path' failed"
10707msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10708
10709#: git-submodule.sh:296
10710#, sh-format
10711msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10712msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10713
10714#: git-submodule.sh:406
10715msgid "Relative path can only be used from the toplevel of the working tree"
10716msgstr "只能在工作区的顶级目录中使用相对路径"
10717
10718#: git-submodule.sh:416
10719#, sh-format
10720msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10721msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10722
10723#: git-submodule.sh:433
10724#, sh-format
10725msgid "'$sm_path' already exists in the index"
10726msgstr "'$sm_path' 已经存在于索引中"
10727
10728#: git-submodule.sh:437
10729#, sh-format
10730msgid ""
10731"The following path is ignored by one of your .gitignore files:\n"
10732"$sm_path\n"
10733"Use -f if you really want to add it."
10734msgstr ""
10735"以下路径被您的一个 .gitignore 文件所忽略:\n"
10736"$sm_path\n"
10737"如果您确实想添加它,使用 -f 参数。"
10738
10739#: git-submodule.sh:455
10740#, sh-format
10741msgid "Adding existing repo at '$sm_path' to the index"
10742msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10743
10744#: git-submodule.sh:457
10745#, sh-format
10746msgid "'$sm_path' already exists and is not a valid git repo"
10747msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10748
10749#: git-submodule.sh:465
10750#, sh-format
10751msgid "A git directory for '$sm_name' is found locally with remote(s):"
10752msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10753
10754#: git-submodule.sh:467
10755#, sh-format
10756msgid ""
10757"If you want to reuse this local git directory instead of cloning again from"
10758msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10759
10760#: git-submodule.sh:469
10761#, sh-format
10762msgid ""
10763"use the '--force' option. If the local git directory is not the correct repo"
10764msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10765
10766#: git-submodule.sh:470
10767#, sh-format
10768msgid ""
10769"or you are unsure what this means choose another name with the '--name' "
10770"option."
10771msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10772
10773#: git-submodule.sh:472
10774#, sh-format
10775msgid "Reactivating local git directory for submodule '$sm_name'."
10776msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10777
10778#: git-submodule.sh:484
10779#, sh-format
10780msgid "Unable to checkout submodule '$sm_path'"
10781msgstr "不能检出子模组 '$sm_path'"
10782
10783#: git-submodule.sh:489
10784#, sh-format
10785msgid "Failed to add submodule '$sm_path'"
10786msgstr "无法添加子模组 '$sm_path'"
10787
10788#: git-submodule.sh:498
10789#, sh-format
10790msgid "Failed to register submodule '$sm_path'"
10791msgstr "无法注册子模组 '$sm_path'"
10792
10793#: git-submodule.sh:542
10794#, sh-format
10795msgid "Entering '$prefix$displaypath'"
10796msgstr "正在进入 '$prefix$displaypath'"
10797
10798#: git-submodule.sh:562
10799#, sh-format
10800msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10801msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10802
10803#: git-submodule.sh:608
10804#, sh-format
10805msgid "No url found for submodule path '$displaypath' in .gitmodules"
10806msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10807
10808#: git-submodule.sh:617
10809#, sh-format
10810msgid "Failed to register url for submodule path '$displaypath'"
10811msgstr "无法为子模组路径 '$displaypath' 注册 url"
10812
10813#: git-submodule.sh:619
10814#, sh-format
10815msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10816msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10817
10818#: git-submodule.sh:636
10819#, sh-format
10820msgid "Failed to register update mode for submodule path '$displaypath'"
10821msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10822
10823#: git-submodule.sh:674
10824#, sh-format
10825msgid "Use '.' if you really want to deinitialize all submodules"
10826msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10827
10828#: git-submodule.sh:691
10829#, sh-format
10830msgid "Submodule work tree '$displaypath' contains a .git directory"
10831msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10832
10833#: git-submodule.sh:692
10834#, sh-format
10835msgid ""
10836"(use 'rm -rf' if you really want to remove it including all of its history)"
10837msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10838
10839#: git-submodule.sh:698
10840#, sh-format
10841msgid ""
10842"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10843"discard them"
10844msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10845
10846#: git-submodule.sh:701
10847#, sh-format
10848msgid "Cleared directory '$displaypath'"
10849msgstr "已清除目录 '$displaypath'"
10850
10851#: git-submodule.sh:702
10852#, sh-format
10853msgid "Could not remove submodule work tree '$displaypath'"
10854msgstr "无法移除子模组工作区 '$displaypath'"
10855
10856#: git-submodule.sh:705
10857#, sh-format
10858msgid "Could not create empty submodule directory '$displaypath'"
10859msgstr "不能创建空的子模组目录 '$displaypath'"
10860
10861#: git-submodule.sh:714
10862#, sh-format
10863msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10864msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10865
10866#: git-submodule.sh:830
10867#, sh-format
10868msgid ""
10869"Submodule path '$displaypath' not initialized\n"
10870"Maybe you want to use 'update --init'?"
10871msgstr ""
10872"子模组路径 '$displaypath' 没有初始化\n"
10873"也许您想用 'update --init'?"
10874
10875#: git-submodule.sh:843
10876#, sh-format
10877msgid "Unable to find current revision in submodule path '$displaypath'"
10878msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10879
10880#: git-submodule.sh:852
10881#, sh-format
10882msgid "Unable to fetch in submodule path '$sm_path'"
10883msgstr "无法在子模组路径 '$sm_path' 中获取"
10884
10885#: git-submodule.sh:876
10886#, sh-format
10887msgid "Unable to fetch in submodule path '$displaypath'"
10888msgstr "无法在子模组路径 '$displaypath' 中获取"
10889
10890#: git-submodule.sh:890
10891#, sh-format
10892msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10893msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10894
10895#: git-submodule.sh:891
10896#, sh-format
10897msgid "Submodule path '$displaypath': checked out '$sha1'"
10898msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10899
10900#: git-submodule.sh:895
10901#, sh-format
10902msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10903msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10904
10905#: git-submodule.sh:896
10906#, sh-format
10907msgid "Submodule path '$displaypath': rebased into '$sha1'"
10908msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10909
10910#: git-submodule.sh:901
10911#, sh-format
10912msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10913msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10914
10915#: git-submodule.sh:902
10916#, sh-format
10917msgid "Submodule path '$displaypath': merged in '$sha1'"
10918msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10919
10920#: git-submodule.sh:907
10921#, sh-format
10922msgid ""
10923"Execution of '$command $sha1' failed in submodule  path '$prefix$sm_path'"
10924msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10925
10926#: git-submodule.sh:908
10927#, sh-format
10928msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10929msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10930
10931#: git-submodule.sh:938
10932#, sh-format
10933msgid "Failed to recurse into submodule path '$displaypath'"
10934msgstr "无法递归进子模组路径 '$displaypath'"
10935
10936#: git-submodule.sh:1046
10937msgid "The --cached option cannot be used with the --files option"
10938msgstr "选项 --cached 不能和选项 --files 同时使用"
10939
10940#: git-submodule.sh:1098
10941#, sh-format
10942msgid "unexpected mode $mod_dst"
10943msgstr "意外的模式 $mod_dst"
10944
10945#  译者:注意保持前导空格
10946#: git-submodule.sh:1118
10947#, sh-format
10948msgid "  Warn: $display_name doesn't contain commit $sha1_src"
10949msgstr "  警告:$display_name 未包含提交 $sha1_src"
10950
10951#  译者:注意保持前导空格
10952#: git-submodule.sh:1121
10953#, sh-format
10954msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
10955msgstr "  警告:$display_name 未包含提交 $sha1_dst"
10956
10957#  译者:注意保持前导空格
10958#: git-submodule.sh:1124
10959#, sh-format
10960msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10961msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10962
10963#: git-submodule.sh:1149
10964msgid "blob"
10965msgstr "数据对象"
10966
10967#: git-submodule.sh:1267
10968#, sh-format
10969msgid "Failed to recurse into submodule path '$sm_path'"
10970msgstr "无法递归进子模组路径 '$sm_path'"
10971
10972#: git-submodule.sh:1331
10973#, sh-format
10974msgid "Synchronizing submodule url for '$displaypath'"
10975msgstr "为 '$displaypath' 同步子模组 url"
10976
10977#~ msgid "Failed to lock ref for update"
10978#~ msgstr "无法为更新锁定引用"
10979
10980#~ msgid "Failed to write ref"
10981#~ msgstr "不能写引用"
10982
10983#~ msgid "Failed to lock HEAD during fast_forward_to"
10984#~ msgstr "在快进时无法为 HEAD 加锁"
10985
10986#~ msgid "invalid commit: %s"
10987#~ msgstr "无效的提交:%s"
10988
10989#~ msgid "cannot lock HEAD ref"
10990#~ msgstr "无法锁定 HEAD 引用"
10991
10992#~ msgid "cannot update HEAD ref"
10993#~ msgstr "无法更新 HEAD 引用"
10994
10995#~ msgid "Invalid %s: '%s'"
10996#~ msgstr "无效的 %s:'%s'"
10997
10998#~ msgid "cannot tell cwd"
10999#~ msgstr "无法获知当前路径"
11000
11001#~ msgid "%s: cannot lock the ref"
11002#~ msgstr "%s:不能锁定引用"
11003
11004#~ msgid "%s: cannot update the ref"
11005#~ msgstr "%s:不能更新引用"
11006
11007#~ msgid "commit has empty message"
11008#~ msgstr "提交说明为空"
11009
11010#~ msgid "Failed to chdir: %s"
11011#~ msgstr "无法切换目录:%s"
11012
11013#~ msgid "key id"
11014#~ msgstr "key id"
11015
11016#~ msgid "Tracking not set up: name too long: %s"
11017#~ msgstr "跟踪未设置:名字太长:%s"
11018
11019#~ msgid "bug"
11020#~ msgstr "bug"
11021
11022#  译者:注意保持句尾空格
11023#~ msgid "ahead "
11024#~ msgstr "领先 "
11025
11026#  译者:注意保持句尾空格
11027#~ msgid ", behind "
11028#~ msgstr ",落后 "
11029
11030#~ msgid "could not find .gitmodules in index"
11031#~ msgstr "无法在索引中找到 .gitmodules"
11032
11033#~ msgid "reading updated .gitmodules failed"
11034#~ msgstr "读取更新后的 .gitmodules 失败"
11035
11036#~ msgid "unable to stat updated .gitmodules"
11037#~ msgstr "不能枚举更新后的 .gitmodules"
11038
11039#~ msgid "unable to remove .gitmodules from index"
11040#~ msgstr "不能从索引中移除 .gitmodules"
11041
11042#~ msgid "adding updated .gitmodules failed"
11043#~ msgstr "添加更新后的 .gitmodules 失败"
11044
11045#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11046#~ msgid ""
11047#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
11048#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
11049#~ "anymore.\n"
11050#~ "To add content for the whole tree, run:\n"
11051#~ "\n"
11052#~ "  git add %s :/\n"
11053#~ "  (or git add %s :/)\n"
11054#~ "\n"
11055#~ "To restrict the command to the current directory, run:\n"
11056#~ "\n"
11057#~ "  git add %s .\n"
11058#~ "  (or git add %s .)\n"
11059#~ "\n"
11060#~ "With the current Git version, the command is restricted to the current "
11061#~ "directory.\n"
11062#~ msgstr ""
11063#~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
11064#~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
11065#~ "如果要添加整个目录树的内容,执行:\n"
11066#~ "\n"
11067#~ "  git add %s :/\n"
11068#~ "  (或 git add %s :/)\n"
11069#~ "\n"
11070#~ "如果要限制该命令只作用于当前目录,执行:\n"
11071#~ "\n"
11072#~ "  git add %s .\n"
11073#~ "  (或 git add %s .)\n"
11074#~ "\n"
11075#~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
11076
11077#~ msgid ""
11078#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
11079#~ "whose behaviour will change in Git 2.0 with respect to paths you "
11080#~ "removed.\n"
11081#~ "Paths like '%s' that are\n"
11082#~ "removed from your working tree are ignored with this version of Git.\n"
11083#~ "\n"
11084#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
11085#~ "  ignores paths you removed from your working tree.\n"
11086#~ "\n"
11087#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
11088#~ "\n"
11089#~ "Run 'git status' to check the paths you removed from your working tree.\n"
11090#~ msgstr ""
11091#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
11092#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
11093#~ "像本地工作区移除的路径 '%s'\n"
11094#~ "在此版本的 Git 中被忽略。\n"
11095#~ "\n"
11096#~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
11097#~ "  忽略您本地工作区中移除的文件。\n"
11098#~ "\n"
11099#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
11100#~ "\n"
11101#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
11102
11103#~ msgid ""
11104#~ "Auto packing the repository for optimum performance. You may also\n"
11105#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
11106#~ msgstr ""
11107#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
11108#~ "参见 \"git help gc\" 以获取更多信息。\n"
11109
11110#~ msgid ""
11111#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
11112#~ "counterpart. If you did not intend to push that branch, you may want to\n"
11113#~ "specify branches to push or set the 'push.default' configuration "
11114#~ "variable\n"
11115#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
11116#~ msgstr ""
11117#~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11118#~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
11119#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
11120#~ "以便只推送当前分支。"
11121
11122#  译者:为保证在输出中对齐,注意调整句中空格!
11123#~ msgid "copied:     %s -> %s"
11124#~ msgstr "拷贝:      %s -> %s"
11125
11126#  译者:为保证在输出中对齐,注意调整句中空格!
11127#~ msgid "deleted:    %s"
11128#~ msgstr "删除:      %s"
11129
11130#  译者:为保证在输出中对齐,注意调整句中空格!
11131#~ msgid "modified:   %s"
11132#~ msgstr "修改:      %s"
11133
11134#  译者:为保证在输出中对齐,注意调整句中空格!
11135#~ msgid "renamed:    %s -> %s"
11136#~ msgstr "重命名:    %s -> %s"
11137
11138#  译者:为保证在输出中对齐,注意调整句中空格!
11139#~ msgid "unmerged:   %s"
11140#~ msgstr "未合并:    %s"
11141
11142#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11143#~ msgid ""
11144#~ "push.default is unset; its implicit value is changing in\n"
11145#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
11146#~ "and maintain the current behavior after the default changes, use:\n"
11147#~ "\n"
11148#~ "  git config --global push.default matching\n"
11149#~ "\n"
11150#~ "To squelch this message and adopt the new behavior now, use:\n"
11151#~ "\n"
11152#~ "  git config --global push.default simple\n"
11153#~ "\n"
11154#~ "See 'git help config' and search for 'push.default' for further "
11155#~ "information.\n"
11156#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
11157#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
11158#~ msgstr ""
11159#~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
11160#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
11161#~ "\n"
11162#~ "  git config --global push.default matching\n"
11163#~ "\n"
11164#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
11165#~ "\n"
11166#~ "  git config --global push.default simple\n"
11167#~ "\n"
11168#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
11169#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
11170#~ "为保持兼容,请用 'current' 代替 'simple')"
11171
11172#~ msgid "input paths are terminated by a null character"
11173#~ msgstr "输入路径以null字符终止"
11174
11175#~ msgid ""
11176#~ "The following untracked files would NOT be saved but need to be removed "
11177#~ "by stash save:"
11178#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
11179
11180#~ msgid ""
11181#~ "Aborting. Consider using either the --force or --include-untracked option."
11182#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
11183
11184#~ msgid ""
11185#~ "the following submodule (or one of its nested submodule)\n"
11186#~ "uses a .git directory:"
11187#~ msgid_plural ""
11188#~ "the following submodules (or one of its nested submodule)\n"
11189#~ "use a .git directory:"
11190#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11191#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11192
11193#  译者:注意保持前导空格
11194#~ msgid "  (fix conflicts and then run \"git am --resolved\")"
11195#~ msgstr "  (解决冲突,然后运行 \"git am --resolved\")"
11196
11197#  译者:注意保持前导空格
11198#~ msgid "  (all conflicts fixed: run \"git commit\")"
11199#~ msgstr "  (解决所有冲突后,执行 \"git commit\")"
11200
11201#~ msgid "more than %d trees given: '%s'"
11202#~ msgstr "提供了超过 %d 个树对象:'%s'"
11203
11204#~ msgid "You cannot combine --no-ff with --ff-only."
11205#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
11206
11207#~ msgid ""
11208#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
11209#~ "(use 'rm -rf' if you really want to remove it including all of its "
11210#~ "history)"
11211#~ msgstr ""
11212#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
11213#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11214
11215#~ msgid ""
11216#~ "'%s' has changes staged in the index\n"
11217#~ "(use --cached to keep the file, or -f to force removal)"
11218#~ msgstr ""
11219#~ "'%s' 有变更已暂存至索引中\n"
11220#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
11221
11222#~ msgid "show commits where no parent comes before its children"
11223#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
11224
11225#~ msgid "show the HEAD reference"
11226#~ msgstr "显示 HEAD 引用"
11227
11228#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
11229#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
11230
11231#~ msgid "Change flags"
11232#~ msgstr "修改参数"
11233
11234#~ msgid ""
11235#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
11236#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
11237
11238#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
11239#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
11240
11241#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
11242#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11243
11244#~ msgid "See 'git help <command>' for more information on a specific command."
11245#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
11246
11247#~ msgid "BUG: impossible combination of %d and %p"
11248#~ msgstr "BUG: 无法组合 %d 和 %p"
11249
11250#  译者:以下三条实际为一个段落
11251#~ msgid "It took %.2f seconds to enumerate untracked files.  'status -uno'"
11252#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
11253
11254#  译者:为对齐,下面两句内容有调整
11255#~ msgid "may speed it up, but you have to be careful not to forget to add"
11256#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
11257
11258#~ msgid "new files yourself (see 'git help status')."
11259#~ msgstr "(参见 'git help status')。"
11260
11261#~ msgid "use any ref in .git/refs"
11262#~ msgstr "使用 .git/refs 里的任意引用"
11263
11264#~ msgid "use any tag in .git/refs/tags"
11265#~ msgstr "使用 .git/refs/tags 里的任意 tag"
11266
11267#~ msgid "bad object %s"
11268#~ msgstr "坏对象 %s"
11269
11270#~ msgid "bogus committer info %s"
11271#~ msgstr "虚假的提交者信息 %s"
11272
11273#~ msgid "can't fdopen 'show' output fd"
11274#~ msgstr "不能打开 'show' 输出文件句柄"
11275
11276#~ msgid "failed to close pipe to 'show' for object '%s'"
11277#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
11278
11279#~ msgid " 0 files changed"
11280#~ msgstr " 0 个文件被修改"
11281
11282#~ msgid " %d file changed"
11283#~ msgid_plural " %d files changed"
11284#~ msgstr[0] " %d 个文件被修改"
11285#~ msgstr[1] " %d 个文件被修改"
11286
11287#~ msgid ", %d insertion(+)"
11288#~ msgid_plural ", %d insertions(+)"
11289#~ msgstr[0] ",插入 %d 行(+)"
11290#~ msgstr[1] ",插入 %d 行(+)"
11291
11292#~ msgid ", %d deletion(-)"
11293#~ msgid_plural ", %d deletions(-)"
11294#~ msgstr[0] ",删除 %d 行(-)"
11295#~ msgstr[1] ",删除 %d 行(-)"
11296
11297#~ msgid "You do not have a valid HEAD"
11298#~ msgstr "您没有一个有效的 HEAD"
11299
11300#~ msgid "oops"
11301#~ msgstr "哎哟"
11302
11303#~ msgid "Would not remove %s\n"
11304#~ msgstr "不会删除 %s\n"
11305
11306#~ msgid "Not removing %s\n"
11307#~ msgstr "未删除 %s\n"
11308
11309#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
11310#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
11311
11312#~ msgid "Could not read index"
11313#~ msgstr "不能读取索引"
11314
11315#  译者:中文字符串拼接,可删除前导空格
11316#~ msgid " (use \"git add\" to track)"
11317#~ msgstr "(使用 \"git add\" 建立跟踪)"
11318
11319#~ msgid "--detach cannot be used with -b/-B/--orphan"
11320#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
11321
11322#~ msgid "--detach cannot be used with -t"
11323#~ msgstr "--detach 不能和 -t 同时使用"
11324
11325#~ msgid "--orphan and -b|-B are mutually exclusive"
11326#~ msgstr "--orphan 和 -b|-B 互斥"
11327
11328#~ msgid "--orphan cannot be used with -t"
11329#~ msgstr "--orphan 不能和 -t 同时使用"
11330
11331#~ msgid "git checkout: -f and -m are incompatible"
11332#~ msgstr "git checkout:-f 和 -m 不兼容"
11333
11334#~ msgid ""
11335#~ "git checkout: updating paths is incompatible with switching branches."
11336#~ msgstr "git checkout:更新路径和切换分支不兼容。"
11337
11338#~ msgid "diff setup failed"
11339#~ msgstr "diff 设置失败"
11340
11341#~ msgid "merge-recursive: disk full?"
11342#~ msgstr "merge-recursive:磁盘已满?"
11343
11344#~ msgid "diff_setup_done failed"
11345#~ msgstr "diff_setup_done 失败"