po / zh_CN.poon commit Sync with v1.8.2.3 (b387c77)
   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: 2013-04-30 08:25+0800\n"
  16"PO-Revision-Date: 2013-04-12 09:23+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:53
  26#, c-format
  27msgid "hint: %.*s\n"
  28msgstr "提示:%.*s\n"
  29
  30#.
  31#. * Message used both when 'git commit' fails and when
  32#. * other commands doing a merge do.
  33#.
  34#: advice.c:83
  35msgid ""
  36"Fix them up in the work tree,\n"
  37"and then use 'git add/rm <file>' as\n"
  38"appropriate to mark resolution and make a commit,\n"
  39"or use 'git commit -a'."
  40msgstr ""
  41"请先在工作区改正文件,然后酌情使用\n"
  42"'git add/rm <file>' 标记解决方案,\n"
  43"或使用 'git commit -a'。"
  44
  45#: archive.c:10
  46msgid "git archive [options] <tree-ish> [<path>...]"
  47msgstr "git archive [选项] <树或提交> [<路径>...]"
  48
  49#: archive.c:11
  50msgid "git archive --list"
  51msgstr "git archive --list"
  52
  53#: archive.c:12
  54msgid ""
  55"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
  56msgstr ""
  57"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
  58
  59#: archive.c:13
  60msgid "git archive --remote <repo> [--exec <cmd>] --list"
  61msgstr "git archive --remote <版本库> [--exec <命令>] --list"
  62
  63#: archive.c:323
  64msgid "fmt"
  65msgstr "格式"
  66
  67#: archive.c:323
  68msgid "archive format"
  69msgstr "归档格式"
  70
  71#: archive.c:324 builtin/log.c:1126
  72msgid "prefix"
  73msgstr "前缀"
  74
  75#: archive.c:325
  76msgid "prepend prefix to each pathname in the archive"
  77msgstr "为归档中每个路径名加上前缀"
  78
  79#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371
  80#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665
  81#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77
  82#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536
  83#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
  84msgid "file"
  85msgstr "文件"
  86
  87#: archive.c:327 builtin/archive.c:89
  88msgid "write the archive to this file"
  89msgstr "归档写入此文件"
  90
  91#: archive.c:329
  92msgid "read .gitattributes in working directory"
  93msgstr "读取工作区中的 .gitattributes"
  94
  95#: archive.c:330
  96msgid "report archived files on stderr"
  97msgstr "在标准错误上报告归档文件"
  98
  99#: archive.c:331
 100msgid "store only"
 101msgstr "只存储"
 102
 103#: archive.c:332
 104msgid "compress faster"
 105msgstr "压缩速度更快"
 106
 107#: archive.c:340
 108msgid "compress better"
 109msgstr "压缩效果更好"
 110
 111#: archive.c:343
 112msgid "list supported archive formats"
 113msgstr "列出支持的归档格式"
 114
 115#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86
 116msgid "repo"
 117msgstr "版本库"
 118
 119#: archive.c:346 builtin/archive.c:91
 120msgid "retrieve the archive from remote repository <repo>"
 121msgstr "从远程版本库(<版本库>)提取归档文件"
 122
 123#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615
 124msgid "command"
 125msgstr "命令"
 126
 127#: archive.c:348 builtin/archive.c:93
 128msgid "path to the remote git-upload-archive command"
 129msgstr "远程 git-upload-archive 命令的路径"
 130
 131#: attr.c:259
 132msgid ""
 133"Negative patterns are ignored in git attributes\n"
 134"Use '\\!' for literal leading exclamation."
 135msgstr ""
 136"负值模版在 git attributes 中被忽略\n"
 137"当字符串确实要以感叹号开始时,使用 '\\!'。"
 138
 139#: branch.c:60
 140#, c-format
 141msgid "Not setting branch %s as its own upstream."
 142msgstr "未设置分支 %s 作为它自己的上游。"
 143
 144#: branch.c:82
 145#, c-format
 146msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 147msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 148
 149#: branch.c:83
 150#, c-format
 151msgid "Branch %s set up to track remote branch %s from %s."
 152msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 153
 154#: branch.c:87
 155#, c-format
 156msgid "Branch %s set up to track local branch %s by rebasing."
 157msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 158
 159#: branch.c:88
 160#, c-format
 161msgid "Branch %s set up to track local branch %s."
 162msgstr "分支 %s 设置为跟踪本地分支 %s。"
 163
 164#: branch.c:92
 165#, c-format
 166msgid "Branch %s set up to track remote ref %s by rebasing."
 167msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 168
 169#: branch.c:93
 170#, c-format
 171msgid "Branch %s set up to track remote ref %s."
 172msgstr "分支 %s 设置为跟踪远程引用 %s。"
 173
 174#: branch.c:97
 175#, c-format
 176msgid "Branch %s set up to track local ref %s by rebasing."
 177msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 178
 179#: branch.c:98
 180#, c-format
 181msgid "Branch %s set up to track local ref %s."
 182msgstr "分支 %s 设置为跟踪本地引用 %s。"
 183
 184#: branch.c:118
 185#, c-format
 186msgid "Tracking not set up: name too long: %s"
 187msgstr "跟踪未设置:名字太长:%s"
 188
 189#: branch.c:137
 190#, c-format
 191msgid "Not tracking: ambiguous information for ref %s"
 192msgstr "未跟踪:引用 %s 有歧义"
 193
 194#: branch.c:182
 195#, c-format
 196msgid "'%s' is not a valid branch name."
 197msgstr "'%s' 不是一个有效的分支名称。"
 198
 199#: branch.c:187
 200#, c-format
 201msgid "A branch named '%s' already exists."
 202msgstr "一个分支名 '%s' 已经存在。"
 203
 204#: branch.c:195
 205msgid "Cannot force update the current branch."
 206msgstr "无法强制更新当前分支。"
 207
 208#: branch.c:201
 209#, c-format
 210msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 211msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
 212
 213#: branch.c:203
 214#, c-format
 215msgid "the requested upstream branch '%s' does not exist"
 216msgstr "请求的上游分支 '%s' 不存在"
 217
 218#: branch.c:205
 219msgid ""
 220"\n"
 221"If you are planning on basing your work on an upstream\n"
 222"branch that already exists at the remote, you may need to\n"
 223"run \"git fetch\" to retrieve it.\n"
 224"\n"
 225"If you are planning to push out a new local branch that\n"
 226"will track its remote counterpart, you may want to use\n"
 227"\"git push -u\" to set the upstream config as you push."
 228msgstr ""
 229"\n"
 230"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
 231"您可能需要执行 \"git fetch\" 来获取分支。\n"
 232"\n"
 233"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
 234"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 235
 236#: branch.c:250
 237#, c-format
 238msgid "Not a valid object name: '%s'."
 239msgstr "不是一个有效的对象名:'%s'。"
 240
 241#: branch.c:270
 242#, c-format
 243msgid "Ambiguous object name: '%s'."
 244msgstr "歧义的对象名:'%s'。"
 245
 246#: branch.c:275
 247#, c-format
 248msgid "Not a valid branch point: '%s'."
 249msgstr "无效的分支点:'%s'。"
 250
 251#: branch.c:281
 252msgid "Failed to lock ref for update"
 253msgstr "无法为更新锁定引用"
 254
 255#: branch.c:299
 256msgid "Failed to write ref"
 257msgstr "不能写引用"
 258
 259#: bundle.c:36
 260#, c-format
 261msgid "'%s' does not look like a v2 bundle file"
 262msgstr "'%s' 不像是一个 v2 版本的包文件"
 263
 264#: bundle.c:63
 265#, c-format
 266msgid "unrecognized header: %s%s (%d)"
 267msgstr "未能识别的包头:%s%s (%d)"
 268
 269#: bundle.c:89 builtin/commit.c:676
 270#, c-format
 271msgid "could not open '%s'"
 272msgstr "不能打开 '%s'"
 273
 274#: bundle.c:140
 275msgid "Repository lacks these prerequisite commits:"
 276msgstr "版本库缺少这些必备的提交:"
 277
 278#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300
 279#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349
 280#: builtin/shortlog.c:155
 281msgid "revision walk setup failed"
 282msgstr "版本遍历设置失败"
 283
 284#: bundle.c:186
 285#, c-format
 286msgid "The bundle contains this ref:"
 287msgid_plural "The bundle contains these %d refs:"
 288msgstr[0] "这个包中含有这个引用:"
 289msgstr[1] "这个包中含有 %d 个引用:"
 290
 291#: bundle.c:193
 292msgid "The bundle records a complete history."
 293msgstr "这个包记录一个完整历史。"
 294
 295#: bundle.c:195
 296#, c-format
 297msgid "The bundle requires this ref:"
 298msgid_plural "The bundle requires these %d refs:"
 299msgstr[0] "这个包需要这个引用:"
 300msgstr[1] "这个包需要 %d 个引用:"
 301
 302#: bundle.c:294
 303msgid "rev-list died"
 304msgstr "rev-list 终止"
 305
 306#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258
 307#, c-format
 308msgid "unrecognized argument: %s"
 309msgstr "未能识别的参数:%s"
 310
 311#: bundle.c:335
 312#, c-format
 313msgid "ref '%s' is excluded by the rev-list options"
 314msgstr "引用 '%s' 被 rev-list 选项排除"
 315
 316#: bundle.c:380
 317msgid "Refusing to create empty bundle."
 318msgstr "不能创建空包。"
 319
 320#: bundle.c:398
 321msgid "Could not spawn pack-objects"
 322msgstr "不能生成 pack-objects 进程"
 323
 324#: bundle.c:416
 325msgid "pack-objects died"
 326msgstr "pack-objects 终止"
 327
 328#: bundle.c:419
 329#, c-format
 330msgid "cannot create '%s'"
 331msgstr "不能创建 '%s'"
 332
 333#: bundle.c:441
 334msgid "index-pack died"
 335msgstr "index-pack 终止"
 336
 337#: commit.c:50
 338#, c-format
 339msgid "could not parse %s"
 340msgstr "不能解析 %s"
 341
 342#: commit.c:52
 343#, c-format
 344msgid "%s %s is not a commit!"
 345msgstr "%s %s 不是一个提交!"
 346
 347#: compat/obstack.c:406 compat/obstack.c:408
 348msgid "memory exhausted"
 349msgstr "内存耗尽"
 350
 351#: connected.c:39
 352msgid "Could not run 'git rev-list'"
 353msgstr "不能执行 'git rev-list'"
 354
 355#: connected.c:48
 356#, c-format
 357msgid "failed write to rev-list: %s"
 358msgstr "无法写入 rev-list:%s"
 359
 360#: connected.c:56
 361#, c-format
 362msgid "failed to close rev-list's stdin: %s"
 363msgstr "无法关闭 rev-list 的标准输入:%s"
 364
 365#: date.c:95
 366msgid "in the future"
 367msgstr "在将来"
 368
 369#: date.c:101
 370#, c-format
 371msgid "%lu second ago"
 372msgid_plural "%lu seconds ago"
 373msgstr[0] "%lu 秒钟之前"
 374msgstr[1] "%lu 秒钟之前"
 375
 376#: date.c:108
 377#, c-format
 378msgid "%lu minute ago"
 379msgid_plural "%lu minutes ago"
 380msgstr[0] "%lu 分钟之前"
 381msgstr[1] "%lu 分钟之前"
 382
 383#: date.c:115
 384#, c-format
 385msgid "%lu hour ago"
 386msgid_plural "%lu hours ago"
 387msgstr[0] "%lu 小时之前"
 388msgstr[1] "%lu 小时之前"
 389
 390#: date.c:122
 391#, c-format
 392msgid "%lu day ago"
 393msgid_plural "%lu days ago"
 394msgstr[0] "%lu 天之前"
 395msgstr[1] "%lu 天之前"
 396
 397#: date.c:128
 398#, c-format
 399msgid "%lu week ago"
 400msgid_plural "%lu weeks ago"
 401msgstr[0] "%lu 周之前"
 402msgstr[1] "%lu 周之前"
 403
 404#: date.c:135
 405#, c-format
 406msgid "%lu month ago"
 407msgid_plural "%lu months ago"
 408msgstr[0] "%lu 个月之前"
 409msgstr[1] "%lu 个月之前"
 410
 411#: date.c:146
 412#, c-format
 413msgid "%lu year"
 414msgid_plural "%lu years"
 415msgstr[0] "%lu 年"
 416msgstr[1] "%lu 年"
 417
 418#: date.c:149
 419#, c-format
 420msgid "%s, %lu month ago"
 421msgid_plural "%s, %lu months ago"
 422msgstr[0] "%s,%lu 个月之前"
 423msgstr[1] "%s,%lu 个月之前"
 424
 425#: date.c:154 date.c:159
 426#, c-format
 427msgid "%lu year ago"
 428msgid_plural "%lu years ago"
 429msgstr[0] "%lu 年前"
 430msgstr[1] "%lu 年前"
 431
 432#  译者:注意保持前导空格
 433#: diff.c:112
 434#, c-format
 435msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 436msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 437
 438#  译者:注意保持前导空格
 439#: diff.c:117
 440#, c-format
 441msgid "  Unknown dirstat parameter '%s'\n"
 442msgstr "  未知的 dirstat 参数 '%s'\n"
 443
 444#: diff.c:210
 445#, c-format
 446msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 447msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 448
 449#: diff.c:260
 450#, c-format
 451msgid ""
 452"Found errors in 'diff.dirstat' config variable:\n"
 453"%s"
 454msgstr ""
 455"发现配置变量 'diff.dirstat' 中的错误:\n"
 456"%s"
 457
 458#: diff.c:3481
 459#, c-format
 460msgid ""
 461"Failed to parse --dirstat/-X option parameter:\n"
 462"%s"
 463msgstr ""
 464"无法解析 --dirstat/-X 选项的参数:\n"
 465"%s"
 466
 467#: diff.c:3495
 468#, c-format
 469msgid "Failed to parse --submodule option parameter: '%s'"
 470msgstr "无法解析 --submodule 选项的参数:'%s'"
 471
 472#: gpg-interface.c:59 gpg-interface.c:131
 473msgid "could not run gpg."
 474msgstr "不能执行 gpg。"
 475
 476#: gpg-interface.c:71
 477msgid "gpg did not accept the data"
 478msgstr "gpg 没有接受数据"
 479
 480#: gpg-interface.c:82
 481msgid "gpg failed to sign the data"
 482msgstr "gpg 无法为数据签名"
 483
 484#: gpg-interface.c:115
 485#, c-format
 486msgid "could not create temporary file '%s': %s"
 487msgstr "不能创建临时文件 '%s':%s"
 488
 489#: gpg-interface.c:118
 490#, c-format
 491msgid "failed writing detached signature to '%s': %s"
 492msgstr "无法将分离式签名写入 '%s':%s"
 493
 494#: grep.c:1623
 495#, c-format
 496msgid "'%s': unable to read %s"
 497msgstr "'%s':无法读取 %s"
 498
 499#: grep.c:1640
 500#, c-format
 501msgid "'%s': %s"
 502msgstr "'%s':%s"
 503
 504#: grep.c:1651
 505#, c-format
 506msgid "'%s': short read %s"
 507msgstr "'%s':读取不完整 %s"
 508
 509#: help.c:212
 510#, c-format
 511msgid "available git commands in '%s'"
 512msgstr "在 '%s' 下可用的 git 命令"
 513
 514#: help.c:219
 515msgid "git commands available from elsewhere on your $PATH"
 516msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 517
 518#: help.c:235
 519msgid "The most commonly used git commands are:"
 520msgstr "最常用的 git 命令有:"
 521
 522#: help.c:292
 523#, c-format
 524msgid ""
 525"'%s' appears to be a git command, but we were not\n"
 526"able to execute it. Maybe git-%s is broken?"
 527msgstr ""
 528"'%s' 像是一个 git 命令,但却无法运行。\n"
 529"可能是 git-%s 受损?"
 530
 531#: help.c:349
 532msgid "Uh oh. Your system reports no Git commands at all."
 533msgstr "唉呀,您的系统中未发现 Git 命令。"
 534
 535#: help.c:371
 536#, c-format
 537msgid ""
 538"WARNING: You called a Git command named '%s', which does not exist.\n"
 539"Continuing under the assumption that you meant '%s'"
 540msgstr ""
 541"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 542"是 '%s'"
 543
 544#: help.c:376
 545#, c-format
 546msgid "in %0.1f seconds automatically..."
 547msgstr "在 %0.1f 秒钟后自动运行..."
 548
 549#: help.c:383
 550#, c-format
 551msgid "git: '%s' is not a git command. See 'git --help'."
 552msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
 553
 554#: help.c:387
 555msgid ""
 556"\n"
 557"Did you mean this?"
 558msgid_plural ""
 559"\n"
 560"Did you mean one of these?"
 561msgstr[0] ""
 562"\n"
 563"您指的是这个么?"
 564msgstr[1] ""
 565"\n"
 566"您指的是这其中的某一个么?"
 567
 568#: merge.c:56
 569msgid "failed to read the cache"
 570msgstr "无法读取缓存"
 571
 572#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
 573#: builtin/clone.c:645
 574msgid "unable to write new index file"
 575msgstr "无法写新的索引文件"
 576
 577#: merge-recursive.c:190
 578#, c-format
 579msgid "(bad commit)\n"
 580msgstr "(坏提交)\n"
 581
 582#: merge-recursive.c:206
 583#, c-format
 584msgid "addinfo_cache failed for path '%s'"
 585msgstr "为路径 '%s' addinfo_cache 失败"
 586
 587#: merge-recursive.c:268
 588msgid "error building trees"
 589msgstr "无法创建树"
 590
 591#: merge-recursive.c:672
 592#, c-format
 593msgid "failed to create path '%s'%s"
 594msgstr "无法创建路径 '%s'%s"
 595
 596#: merge-recursive.c:683
 597#, c-format
 598msgid "Removing %s to make room for subdirectory\n"
 599msgstr "删除 %s 以便为子目录留出空间\n"
 600
 601#. something else exists
 602#. .. but not some other error (who really cares what?)
 603#: merge-recursive.c:697 merge-recursive.c:718
 604msgid ": perhaps a D/F conflict?"
 605msgstr ":可能是一个目录/文件冲突?"
 606
 607#: merge-recursive.c:708
 608#, c-format
 609msgid "refusing to lose untracked file at '%s'"
 610msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 611
 612#: merge-recursive.c:748
 613#, c-format
 614msgid "cannot read object %s '%s'"
 615msgstr "不能读取对象 %s '%s'"
 616
 617#: merge-recursive.c:750
 618#, c-format
 619msgid "blob expected for %s '%s'"
 620msgstr "%s '%s' 应为数据(blob)对象"
 621
 622#: merge-recursive.c:773 builtin/clone.c:313
 623#, c-format
 624msgid "failed to open '%s'"
 625msgstr "无法打开 '%s'"
 626
 627#: merge-recursive.c:781
 628#, c-format
 629msgid "failed to symlink '%s'"
 630msgstr "无法创建符号链接 '%s'"
 631
 632#: merge-recursive.c:784
 633#, c-format
 634msgid "do not know what to do with %06o %s '%s'"
 635msgstr "不知道如何处理 %06o %s '%s'"
 636
 637#: merge-recursive.c:922
 638msgid "Failed to execute internal merge"
 639msgstr "无法执行内部合并"
 640
 641#: merge-recursive.c:926
 642#, c-format
 643msgid "Unable to add %s to database"
 644msgstr "不能添加 %s 至对象库"
 645
 646#: merge-recursive.c:942
 647msgid "unsupported object type in the tree"
 648msgstr "在树中有不支持的对象类型"
 649
 650#: merge-recursive.c:1021 merge-recursive.c:1035
 651#, c-format
 652msgid ""
 653"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 654"in tree."
 655msgstr ""
 656"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 657"的版本被保留。"
 658
 659#: merge-recursive.c:1027 merge-recursive.c:1040
 660#, c-format
 661msgid ""
 662"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 663"in tree at %s."
 664msgstr ""
 665"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 666"的版本保留于 %8$s 中。"
 667
 668#: merge-recursive.c:1081
 669msgid "rename"
 670msgstr "重命名"
 671
 672#: merge-recursive.c:1081
 673msgid "renamed"
 674msgstr "重命名"
 675
 676#: merge-recursive.c:1137
 677#, c-format
 678msgid "%s is a directory in %s adding as %s instead"
 679msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 680
 681#: merge-recursive.c:1159
 682#, c-format
 683msgid ""
 684"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 685"\"->\"%s\" in \"%s\"%s"
 686msgstr ""
 687"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
 688"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 689
 690#: merge-recursive.c:1164
 691msgid " (left unresolved)"
 692msgstr "(留下未解决)"
 693
 694#: merge-recursive.c:1218
 695#, c-format
 696msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 697msgstr ""
 698"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
 699"%5$s"
 700
 701#: merge-recursive.c:1248
 702#, c-format
 703msgid "Renaming %s to %s and %s to %s instead"
 704msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
 705
 706#: merge-recursive.c:1447
 707#, c-format
 708msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 709msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 710
 711#: merge-recursive.c:1457
 712#, c-format
 713msgid "Adding merged %s"
 714msgstr "添加合并后的 %s"
 715
 716#: merge-recursive.c:1462 merge-recursive.c:1660
 717#, c-format
 718msgid "Adding as %s instead"
 719msgstr "而是以 %s 为名添加"
 720
 721#: merge-recursive.c:1513
 722#, c-format
 723msgid "cannot read object %s"
 724msgstr "不能读取对象 %s"
 725
 726#: merge-recursive.c:1516
 727#, c-format
 728msgid "object %s is not a blob"
 729msgstr "对象 %s 不是一个数据(blob)对象"
 730
 731#: merge-recursive.c:1564
 732msgid "modify"
 733msgstr "修改"
 734
 735#: merge-recursive.c:1564
 736msgid "modified"
 737msgstr "修改"
 738
 739#: merge-recursive.c:1574
 740msgid "content"
 741msgstr "内容"
 742
 743#: merge-recursive.c:1581
 744msgid "add/add"
 745msgstr "添加/添加"
 746
 747#: merge-recursive.c:1615
 748#, c-format
 749msgid "Skipped %s (merged same as existing)"
 750msgstr "略过 %s(已经做过相同合并)"
 751
 752#: merge-recursive.c:1629
 753#, c-format
 754msgid "Auto-merging %s"
 755msgstr "自动合并 %s"
 756
 757#: merge-recursive.c:1633 git-submodule.sh:1029
 758msgid "submodule"
 759msgstr "子模组"
 760
 761#: merge-recursive.c:1634
 762#, c-format
 763msgid "CONFLICT (%s): Merge conflict in %s"
 764msgstr "冲突(%s):合并冲突于 %s"
 765
 766#: merge-recursive.c:1724
 767#, c-format
 768msgid "Removing %s"
 769msgstr "删除 %s"
 770
 771#: merge-recursive.c:1749
 772msgid "file/directory"
 773msgstr "文件/目录"
 774
 775#: merge-recursive.c:1755
 776msgid "directory/file"
 777msgstr "目录/文件"
 778
 779#: merge-recursive.c:1760
 780#, c-format
 781msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 782msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 783
 784#: merge-recursive.c:1770
 785#, c-format
 786msgid "Adding %s"
 787msgstr "添加 %s"
 788
 789#: merge-recursive.c:1787
 790msgid "Fatal merge failure, shouldn't happen."
 791msgstr "严重的合并错误,不应发生。"
 792
 793#: merge-recursive.c:1806
 794msgid "Already up-to-date!"
 795msgstr "已经是最新的!"
 796
 797#: merge-recursive.c:1815
 798#, c-format
 799msgid "merging of trees %s and %s failed"
 800msgstr "无法合并树 %s 和 %s"
 801
 802#: merge-recursive.c:1845
 803#, c-format
 804msgid "Unprocessed path??? %s"
 805msgstr "未处理的路径??? %s"
 806
 807#: merge-recursive.c:1890
 808msgid "Merging:"
 809msgstr "合并:"
 810
 811#: merge-recursive.c:1903
 812#, c-format
 813msgid "found %u common ancestor:"
 814msgid_plural "found %u common ancestors:"
 815msgstr[0] "发现 %u 个共同祖先:"
 816msgstr[1] "发现 %u 个共同祖先:"
 817
 818#: merge-recursive.c:1940
 819msgid "merge returned no commit"
 820msgstr "合并未返回提交"
 821
 822#: merge-recursive.c:1997
 823#, c-format
 824msgid "Could not parse object '%s'"
 825msgstr "不能解析对象 '%s'"
 826
 827#: merge-recursive.c:2009 builtin/merge.c:658
 828msgid "Unable to write index."
 829msgstr "不能写入索引。"
 830
 831#: object.c:195
 832#, c-format
 833msgid "unable to parse object: %s"
 834msgstr "不能解析对象:%s"
 835
 836#: parse-options.c:489
 837msgid "..."
 838msgstr "..."
 839
 840#: parse-options.c:507
 841#, c-format
 842msgid "usage: %s"
 843msgstr "用法:%s"
 844
 845#. TRANSLATORS: the colon here should align with the
 846#. one in "usage: %s" translation
 847#: parse-options.c:511
 848#, c-format
 849msgid "   or: %s"
 850msgstr "  或:%s"
 851
 852#  译者:为保证在输出中对齐,注意调整句中空格!
 853#: parse-options.c:514
 854#, c-format
 855msgid "    %s"
 856msgstr "    %s"
 857
 858#: parse-options.c:548
 859msgid "-NUM"
 860msgstr "-数字"
 861
 862#: pathspec.c:83
 863#, c-format
 864msgid "Path '%s' is in submodule '%.*s'"
 865msgstr "路径 '%s' 属于模组 '%.*s'"
 866
 867#: pathspec.c:99
 868#, c-format
 869msgid "'%s' is beyond a symbolic link"
 870msgstr "'%s' 位于符号链接中"
 871
 872#: remote.c:1781
 873#, c-format
 874msgid "Your branch is ahead of '%s' by %d commit.\n"
 875msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 876msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 877msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
 878
 879#: remote.c:1787
 880msgid "  (use \"git push\" to publish your local commits)\n"
 881msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
 882
 883#: remote.c:1790
 884#, c-format
 885msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 886msgid_plural ""
 887"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 888msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
 889msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
 890
 891#  译者:注意保持前导空格
 892#: remote.c:1798
 893msgid "  (use \"git pull\" to update your local branch)\n"
 894msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
 895
 896#: remote.c:1801
 897#, c-format
 898msgid ""
 899"Your branch and '%s' have diverged,\n"
 900"and have %d and %d different commit each, respectively.\n"
 901msgid_plural ""
 902"Your branch and '%s' have diverged,\n"
 903"and have %d and %d different commits each, respectively.\n"
 904msgstr[0] ""
 905"您的分支和 '%s' 出现了偏离,\n"
 906"并且分别有 %d 和 %d 处不同的提交。\n"
 907msgstr[1] ""
 908"您的分支和 '%s' 出现了偏离,\n"
 909"并且分别有 %d 和 %d 处不同的提交。\n"
 910
 911#  译者:注意保持前导空格
 912#: remote.c:1811
 913msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 914msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
 915
 916#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999
 917#: builtin/merge.c:1009
 918#, c-format
 919msgid "Could not open '%s' for writing"
 920msgstr "不能为写入打开 '%s'"
 921
 922#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779
 923#: builtin/merge.c:1001 builtin/merge.c:1014
 924#, c-format
 925msgid "Could not write to '%s'"
 926msgstr "不能写入 '%s'"
 927
 928#: sequencer.c:229
 929msgid ""
 930"after resolving the conflicts, mark the corrected paths\n"
 931"with 'git add <paths>' or 'git rm <paths>'"
 932msgstr ""
 933"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
 934"命令标记修正后的文件"
 935
 936#: sequencer.c:232
 937msgid ""
 938"after resolving the conflicts, mark the corrected paths\n"
 939"with 'git add <paths>' or 'git rm <paths>'\n"
 940"and commit the result with 'git commit'"
 941msgstr ""
 942"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
 943"对修正后的文件做标记,然后用 'git commit' 提交"
 944
 945#: sequencer.c:245 sequencer.c:859 sequencer.c:942
 946#, c-format
 947msgid "Could not write to %s"
 948msgstr "不能写入 %s"
 949
 950#: sequencer.c:248
 951#, c-format
 952msgid "Error wrapping up %s"
 953msgstr "错误收尾 %s"
 954
 955#: sequencer.c:263
 956msgid "Your local changes would be overwritten by cherry-pick."
 957msgstr "您的本地修改将被拣选操作覆盖。"
 958
 959#: sequencer.c:265
 960msgid "Your local changes would be overwritten by revert."
 961msgstr "您的本地修改将被还原操作覆盖。"
 962
 963#: sequencer.c:268
 964msgid "Commit your changes or stash them to proceed."
 965msgstr "提交您的修改或保存进度后再继续。"
 966
 967#. TRANSLATORS: %s will be "revert" or "cherry-pick"
 968#: sequencer.c:319
 969#, c-format
 970msgid "%s: Unable to write new index file"
 971msgstr "%s:无法写入新索引文件"
 972
 973#: sequencer.c:350
 974msgid "Could not resolve HEAD commit\n"
 975msgstr "不能解析 HEAD 提交\n"
 976
 977#: sequencer.c:371
 978msgid "Unable to update cache tree\n"
 979msgstr "不能更新缓存\n"
 980
 981#: sequencer.c:416
 982#, c-format
 983msgid "Could not parse commit %s\n"
 984msgstr "不能解析提交 %s\n"
 985
 986#: sequencer.c:421
 987#, c-format
 988msgid "Could not parse parent commit %s\n"
 989msgstr "不能解析父提交 %s\n"
 990
 991#: sequencer.c:487
 992msgid "Your index file is unmerged."
 993msgstr "您的索引文件未完成合并。"
 994
 995#: sequencer.c:506
 996#, c-format
 997msgid "Commit %s is a merge but no -m option was given."
 998msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 999
1000#: sequencer.c:514
1001#, c-format
1002msgid "Commit %s does not have parent %d"
1003msgstr "提交 %s 没有父提交 %d"
1004
1005#: sequencer.c:518
1006#, c-format
1007msgid "Mainline was specified but commit %s is not a merge."
1008msgstr "指定了主线但提交 %s 不是一个合并。"
1009
1010#. TRANSLATORS: The first %s will be "revert" or
1011#. "cherry-pick", the second %s a SHA1
1012#: sequencer.c:531
1013#, c-format
1014msgid "%s: cannot parse parent commit %s"
1015msgstr "%s:不能解析父提交 %s"
1016
1017#: sequencer.c:535
1018#, c-format
1019msgid "Cannot get commit message for %s"
1020msgstr "不能得到 %s 的提交说明"
1021
1022#: sequencer.c:621
1023#, c-format
1024msgid "could not revert %s... %s"
1025msgstr "不能还原 %s... %s"
1026
1027#: sequencer.c:622
1028#, c-format
1029msgid "could not apply %s... %s"
1030msgstr "不能应用 %s... %s"
1031
1032#: sequencer.c:654
1033msgid "empty commit set passed"
1034msgstr "提供了空的提交集"
1035
1036#: sequencer.c:662
1037#, c-format
1038msgid "git %s: failed to read the index"
1039msgstr "git %s:无法读取索引"
1040
1041#: sequencer.c:667
1042#, c-format
1043msgid "git %s: failed to refresh the index"
1044msgstr "git %s:无法刷新索引"
1045
1046#: sequencer.c:725
1047#, c-format
1048msgid "Cannot %s during a %s"
1049msgstr "无法 %s 在一个 %s 过程中"
1050
1051#: sequencer.c:747
1052#, c-format
1053msgid "Could not parse line %d."
1054msgstr "不能解析第 %d 行。"
1055
1056#: sequencer.c:752
1057msgid "No commits parsed."
1058msgstr "没有提交被解析。"
1059
1060#: sequencer.c:765
1061#, c-format
1062msgid "Could not open %s"
1063msgstr "不能打开 %s"
1064
1065#: sequencer.c:769
1066#, c-format
1067msgid "Could not read %s."
1068msgstr "不能读取 %s。"
1069
1070#: sequencer.c:776
1071#, c-format
1072msgid "Unusable instruction sheet: %s"
1073msgstr "无用的指令表单:%s"
1074
1075#: sequencer.c:804
1076#, c-format
1077msgid "Invalid key: %s"
1078msgstr "无效键名:%s"
1079
1080#: sequencer.c:807
1081#, c-format
1082msgid "Invalid value for %s: %s"
1083msgstr "%s 的值无效:%s"
1084
1085#: sequencer.c:819
1086#, c-format
1087msgid "Malformed options sheet: %s"
1088msgstr "非法的选项表单:%s"
1089
1090#: sequencer.c:840
1091msgid "a cherry-pick or revert is already in progress"
1092msgstr "一个拣选或还原操作已在进行"
1093
1094#: sequencer.c:841
1095msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1096msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1097
1098#: sequencer.c:845
1099#, c-format
1100msgid "Could not create sequencer directory %s"
1101msgstr "不能创建序列目录 %s"
1102
1103#: sequencer.c:861 sequencer.c:946
1104#, c-format
1105msgid "Error wrapping up %s."
1106msgstr "错误收尾 %s。"
1107
1108#: sequencer.c:880 sequencer.c:1014
1109msgid "no cherry-pick or revert in progress"
1110msgstr "拣选或还原操作并未进行"
1111
1112#: sequencer.c:882
1113msgid "cannot resolve HEAD"
1114msgstr "不能解析 HEAD"
1115
1116#: sequencer.c:884
1117msgid "cannot abort from a branch yet to be born"
1118msgstr "不能从尚未建立的分支终止"
1119
1120#: sequencer.c:906 builtin/apply.c:4060
1121#, c-format
1122msgid "cannot open %s: %s"
1123msgstr "不能打开 %s:%s"
1124
1125#: sequencer.c:909
1126#, c-format
1127msgid "cannot read %s: %s"
1128msgstr "不能读取 %s:%s"
1129
1130#: sequencer.c:910
1131msgid "unexpected end of file"
1132msgstr "意外的文件结束"
1133
1134#: sequencer.c:916
1135#, c-format
1136msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1137msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1138
1139#: sequencer.c:939
1140#, c-format
1141msgid "Could not format %s."
1142msgstr "不能格式化 %s。"
1143
1144#: sequencer.c:1083
1145#, c-format
1146msgid "%s: can't cherry-pick a %s"
1147msgstr "%s:不能拣选一个%s"
1148
1149#: sequencer.c:1085
1150#, c-format
1151msgid "%s: bad revision"
1152msgstr "%s:错误的版本"
1153
1154#: sequencer.c:1119
1155msgid "Can't revert as initial commit"
1156msgstr "不能作为初始提交还原"
1157
1158#: sequencer.c:1120
1159msgid "Can't cherry-pick into empty head"
1160msgstr "不能拣选到空分支"
1161
1162#: sha1_name.c:1036
1163msgid "HEAD does not point to a branch"
1164msgstr "HEAD 没有指向一个分支"
1165
1166#: sha1_name.c:1039
1167#, c-format
1168msgid "No such branch: '%s'"
1169msgstr "没有此分支:'%s'"
1170
1171#: sha1_name.c:1041
1172#, c-format
1173msgid "No upstream configured for branch '%s'"
1174msgstr "尚未给分支 '%s' 设置上游"
1175
1176#: sha1_name.c:1044
1177#, c-format
1178msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1179msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1180
1181#: wrapper.c:408
1182#, c-format
1183msgid "unable to access '%s': %s"
1184msgstr "不能访问 '%s':%s"
1185
1186#: wrapper.c:423
1187#, c-format
1188msgid "unable to access '%s'"
1189msgstr "不能访问 '%s'"
1190
1191#: wrapper.c:434
1192#, c-format
1193msgid "unable to look up current user in the passwd file: %s"
1194msgstr "无法在口令文件中查询到当前用户:%s"
1195
1196#: wrapper.c:435
1197msgid "no such user"
1198msgstr "无此用户"
1199
1200#: wt-status.c:140
1201msgid "Unmerged paths:"
1202msgstr "未合并的路径:"
1203
1204#  译者:注意保持前导空格
1205#: wt-status.c:167 wt-status.c:194
1206#, c-format
1207msgid "  (use \"git reset %s <file>...\" to unstage)"
1208msgstr "  (使用 \"git reset %s <file>...\" 撤出暂存区)"
1209
1210#  译者:注意保持前导空格
1211#: wt-status.c:169 wt-status.c:196
1212msgid "  (use \"git rm --cached <file>...\" to unstage)"
1213msgstr "  (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1214
1215#  译者:注意保持前导空格
1216#: wt-status.c:173
1217msgid "  (use \"git add <file>...\" to mark resolution)"
1218msgstr "  (使用 \"git add <file>...\" 标记解决方案)"
1219
1220#  译者:注意保持前导空格
1221#: wt-status.c:175 wt-status.c:179
1222msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1223msgstr "  (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1224
1225#  译者:注意保持前导空格
1226#: wt-status.c:177
1227msgid "  (use \"git rm <file>...\" to mark resolution)"
1228msgstr "  (使用 \"git rm <file>...\" 标记解决方案)"
1229
1230#: wt-status.c:188
1231msgid "Changes to be committed:"
1232msgstr "要提交的变更:"
1233
1234#: wt-status.c:206
1235msgid "Changes not staged for commit:"
1236msgstr "尚未暂存以备提交的变更:"
1237
1238#  译者:注意保持前导空格
1239#: wt-status.c:210
1240msgid "  (use \"git add <file>...\" to update what will be committed)"
1241msgstr "  (使用 \"git add <file>...\" 更新要提交的内容)"
1242
1243#  译者:注意保持前导空格
1244#: wt-status.c:212
1245msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1246msgstr "  (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1247
1248#  译者:注意保持前导空格
1249#: wt-status.c:213
1250msgid ""
1251"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1252msgstr "  (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1253
1254#  译者:注意保持前导空格
1255#: wt-status.c:215
1256msgid "  (commit or discard the untracked or modified content in submodules)"
1257msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
1258
1259#  译者:注意保持前导空格
1260#: wt-status.c:227
1261#, c-format
1262msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1263msgstr "  (使用 \"git %s <file>...\" 以包含要提交的内容)"
1264
1265#: wt-status.c:244
1266msgid "bug"
1267msgstr "bug"
1268
1269#: wt-status.c:249
1270msgid "both deleted:"
1271msgstr "双方删除:"
1272
1273#: wt-status.c:250
1274msgid "added by us:"
1275msgstr "由我们添加:"
1276
1277#: wt-status.c:251
1278msgid "deleted by them:"
1279msgstr "由他们删除:"
1280
1281#: wt-status.c:252
1282msgid "added by them:"
1283msgstr "由他们添加:"
1284
1285#: wt-status.c:253
1286msgid "deleted by us:"
1287msgstr "由我们删除:"
1288
1289#: wt-status.c:254
1290msgid "both added:"
1291msgstr "双方添加:"
1292
1293#: wt-status.c:255
1294msgid "both modified:"
1295msgstr "双方修改:"
1296
1297#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1298#: wt-status.c:285
1299msgid "new commits, "
1300msgstr "新提交, "
1301
1302#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1303#: wt-status.c:287
1304msgid "modified content, "
1305msgstr "修改的内容, "
1306
1307#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1308#: wt-status.c:289
1309msgid "untracked content, "
1310msgstr "未跟踪的内容, "
1311
1312#  译者:为保证在输出中对齐,注意调整句中空格!
1313#: wt-status.c:306
1314#, c-format
1315msgid "new file:   %s"
1316msgstr "新文件:    %s"
1317
1318#  译者:为保证在输出中对齐,注意调整句中空格!
1319#: wt-status.c:309
1320#, c-format
1321msgid "copied:     %s -> %s"
1322msgstr "拷贝:      %s -> %s"
1323
1324#  译者:为保证在输出中对齐,注意调整句中空格!
1325#: wt-status.c:312
1326#, c-format
1327msgid "deleted:    %s"
1328msgstr "删除:      %s"
1329
1330#  译者:为保证在输出中对齐,注意调整句中空格!
1331#: wt-status.c:315
1332#, c-format
1333msgid "modified:   %s"
1334msgstr "修改:      %s"
1335
1336#  译者:为保证在输出中对齐,注意调整句中空格!
1337#: wt-status.c:318
1338#, c-format
1339msgid "renamed:    %s -> %s"
1340msgstr "重命名:    %s -> %s"
1341
1342#  译者:为保证在输出中对齐,注意调整句中空格!
1343#: wt-status.c:321
1344#, c-format
1345msgid "typechange: %s"
1346msgstr "类型变更:  %s"
1347
1348#  译者:为保证在输出中对齐,注意调整句中空格!
1349#: wt-status.c:324
1350#, c-format
1351msgid "unknown:    %s"
1352msgstr "未知:      %s"
1353
1354#  译者:为保证在输出中对齐,注意调整句中空格!
1355#: wt-status.c:327
1356#, c-format
1357msgid "unmerged:   %s"
1358msgstr "未合并:    %s"
1359
1360#: wt-status.c:330
1361#, c-format
1362msgid "bug: unhandled diff status %c"
1363msgstr "bug:未处理的差异状态 %c"
1364
1365#: wt-status.c:803
1366msgid "You have unmerged paths."
1367msgstr "您有尚未合并的路径。"
1368
1369#  译者:注意保持前导空格
1370#: wt-status.c:806 wt-status.c:958
1371msgid "  (fix conflicts and run \"git commit\")"
1372msgstr "  (解决冲突并运行 \"git commit\")"
1373
1374#: wt-status.c:809
1375msgid "All conflicts fixed but you are still merging."
1376msgstr "所有冲突已解决但您仍处于合并中。"
1377
1378#  译者:注意保持前导空格
1379#: wt-status.c:812
1380msgid "  (use \"git commit\" to conclude merge)"
1381msgstr "  (使用 \"git commit\" 结束合并)"
1382
1383#: wt-status.c:822
1384msgid "You are in the middle of an am session."
1385msgstr "您正处于一个 am 过程中。"
1386
1387#: wt-status.c:825
1388msgid "The current patch is empty."
1389msgstr "当前的补丁为空。"
1390
1391#  译者:注意保持前导空格
1392#: wt-status.c:829
1393msgid "  (fix conflicts and then run \"git am --resolved\")"
1394msgstr "  (解决冲突,然后运行 \"git am --resolved\")"
1395
1396#  译者:注意保持前导空格
1397#: wt-status.c:831
1398msgid "  (use \"git am --skip\" to skip this patch)"
1399msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
1400
1401#  译者:注意保持前导空格
1402#: wt-status.c:833
1403msgid "  (use \"git am --abort\" to restore the original branch)"
1404msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
1405
1406#: wt-status.c:893 wt-status.c:910
1407#, c-format
1408msgid "You are currently rebasing branch '%s' on '%s'."
1409msgstr "您正在将分支 '%s' 变基到 '%s'。"
1410
1411#: wt-status.c:898 wt-status.c:915
1412msgid "You are currently rebasing."
1413msgstr "您正在变基。"
1414
1415#  译者:注意保持前导空格
1416#: wt-status.c:901
1417msgid "  (fix conflicts and then run \"git rebase --continue\")"
1418msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
1419
1420#  译者:注意保持前导空格
1421#: wt-status.c:903
1422msgid "  (use \"git rebase --skip\" to skip this patch)"
1423msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
1424
1425#  译者:注意保持前导空格
1426#: wt-status.c:905
1427msgid "  (use \"git rebase --abort\" to check out the original branch)"
1428msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
1429
1430#  译者:注意保持前导空格
1431#: wt-status.c:918
1432msgid "  (all conflicts fixed: run \"git rebase --continue\")"
1433msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
1434
1435#: wt-status.c:922
1436#, c-format
1437msgid ""
1438"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1439msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1440
1441#: wt-status.c:927
1442msgid "You are currently splitting a commit during a rebase."
1443msgstr "您正在变基过程中拆分一个提交。"
1444
1445#  译者:注意保持前导空格
1446#: wt-status.c:930
1447msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
1448msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1449
1450#: wt-status.c:934
1451#, c-format
1452msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1453msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1454
1455#: wt-status.c:939
1456msgid "You are currently editing a commit during a rebase."
1457msgstr "您正在变基过程中编辑一个提交。"
1458
1459#  译者:注意保持前导空格
1460#: wt-status.c:942
1461msgid "  (use \"git commit --amend\" to amend the current commit)"
1462msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
1463
1464#  译者:注意保持前导空格
1465#: wt-status.c:944
1466msgid ""
1467"  (use \"git rebase --continue\" once you are satisfied with your changes)"
1468msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
1469
1470#: wt-status.c:954
1471msgid "You are currently cherry-picking."
1472msgstr "您正在做拣选操作。"
1473
1474#  译者:注意保持前导空格
1475#: wt-status.c:961
1476msgid "  (all conflicts fixed: run \"git commit\")"
1477msgstr "  (解决所有冲突后,执行 \"git commit\")"
1478
1479#: wt-status.c:970
1480#, c-format
1481msgid "You are currently reverting commit %s."
1482msgstr "您正在反转提交 %s 。"
1483
1484#  译者:注意保持前导空格
1485#: wt-status.c:975
1486msgid "  (fix conflicts and run \"git revert --continue\")"
1487msgstr "  (解决冲突并运行 \"git revert --continue\")"
1488
1489#  译者:注意保持前导空格
1490#: wt-status.c:978
1491msgid "  (all conflicts fixed: run \"git revert --continue\")"
1492msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
1493
1494#  译者:注意保持前导空格
1495#: wt-status.c:980
1496msgid "  (use \"git revert --abort\" to cancel the revert operation)"
1497msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
1498
1499#: wt-status.c:991
1500#, c-format
1501msgid "You are currently bisecting, started from branch '%s'."
1502msgstr "您正在从分支 '%s' 开始做二分查找。"
1503
1504#: wt-status.c:995
1505msgid "You are currently bisecting."
1506msgstr "您正在做二分查找。"
1507
1508#  译者:注意保持前导空格
1509#: wt-status.c:998
1510msgid "  (use \"git bisect reset\" to get back to the original branch)"
1511msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
1512
1513#: wt-status.c:1173
1514msgid "On branch "
1515msgstr "位于分支 "
1516
1517#: wt-status.c:1184
1518msgid "HEAD detached at "
1519msgstr "头指针分离于 "
1520
1521#: wt-status.c:1186
1522msgid "HEAD detached from "
1523msgstr "头指针分离自 "
1524
1525#: wt-status.c:1189
1526msgid "Not currently on any branch."
1527msgstr "当前不在任何分支上。"
1528
1529#: wt-status.c:1206
1530msgid "Initial commit"
1531msgstr "初始提交"
1532
1533#: wt-status.c:1220
1534msgid "Untracked files"
1535msgstr "未跟踪的文件"
1536
1537#: wt-status.c:1222
1538msgid "Ignored files"
1539msgstr "忽略的文件"
1540
1541#: wt-status.c:1226
1542#, c-format
1543msgid ""
1544"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1545"may speed it up, but you have to be careful not to forget to add\n"
1546"new files yourself (see 'git help status')."
1547msgstr ""
1548"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1549"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1550
1551#: wt-status.c:1232
1552#, c-format
1553msgid "Untracked files not listed%s"
1554msgstr "未跟踪的文件没有列出%s"
1555
1556#  译者:中文字符串拼接,可删除前导空格
1557#: wt-status.c:1234
1558msgid " (use -u option to show untracked files)"
1559msgstr "(使用 -u 参数显示未跟踪的文件)"
1560
1561#: wt-status.c:1240
1562msgid "No changes"
1563msgstr "没有修改"
1564
1565#: wt-status.c:1245
1566#, c-format
1567msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1568msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1569
1570#: wt-status.c:1248
1571#, c-format
1572msgid "no changes added to commit\n"
1573msgstr "修改尚未加入提交\n"
1574
1575#: wt-status.c:1251
1576#, c-format
1577msgid ""
1578"nothing added to commit but untracked files present (use \"git add\" to "
1579"track)\n"
1580msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1581
1582#: wt-status.c:1254
1583#, c-format
1584msgid "nothing added to commit but untracked files present\n"
1585msgstr "提交为空,但是存在尚未跟踪的文件\n"
1586
1587#  译者:中文字符串拼接,可删除前导空格
1588#: wt-status.c:1257
1589#, c-format
1590msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1591msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1592
1593#: wt-status.c:1260 wt-status.c:1265
1594#, c-format
1595msgid "nothing to commit\n"
1596msgstr "无文件要提交\n"
1597
1598#  译者:中文字符串拼接,可删除前导空格
1599#: wt-status.c:1263
1600#, c-format
1601msgid "nothing to commit (use -u to show untracked files)\n"
1602msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1603
1604#  译者:中文字符串拼接,可删除前导空格
1605#: wt-status.c:1267
1606#, c-format
1607msgid "nothing to commit, working directory clean\n"
1608msgstr "无文件要提交,干净的工作区\n"
1609
1610#: wt-status.c:1375
1611msgid "HEAD (no branch)"
1612msgstr "HEAD(非分支)"
1613
1614#  译者:注意保持句尾空格
1615#: wt-status.c:1381
1616msgid "Initial commit on "
1617msgstr "初始提交于 "
1618
1619#  译者:注意保持句尾空格
1620#: wt-status.c:1396
1621msgid "behind "
1622msgstr "落后 "
1623
1624#  译者:注意保持句尾空格
1625#: wt-status.c:1399 wt-status.c:1402
1626msgid "ahead "
1627msgstr "领先 "
1628
1629#  译者:注意保持句尾空格
1630#: wt-status.c:1404
1631msgid ", behind "
1632msgstr ",落后 "
1633
1634#: compat/precompose_utf8.c:58 builtin/clone.c:352
1635#, c-format
1636msgid "failed to unlink '%s'"
1637msgstr "无法删除 '%s'"
1638
1639#: builtin/add.c:20
1640msgid "git add [options] [--] <pathspec>..."
1641msgstr "git add [选项] [--] <路径匹配>..."
1642
1643#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1644#.
1645#. * To be consistent with "git add -p" and most Git
1646#. * commands, we should default to being tree-wide, but
1647#. * this is not the original behavior and can't be
1648#. * changed until users trained themselves not to type
1649#. * "git add -u" or "git add -A". For now, we warn and
1650#. * keep the old behavior. Later, the behavior can be changed
1651#. * to tree-wide, keeping the warning for a while, and
1652#. * eventually we can drop the warning.
1653#.
1654#: builtin/add.c:58
1655#, c-format
1656msgid ""
1657"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1658"subdirectory of the tree will change in Git 2.0 and should not be used "
1659"anymore.\n"
1660"To add content for the whole tree, run:\n"
1661"\n"
1662"  git add %s :/\n"
1663"  (or git add %s :/)\n"
1664"\n"
1665"To restrict the command to the current directory, run:\n"
1666"\n"
1667"  git add %s .\n"
1668"  (or git add %s .)\n"
1669"\n"
1670"With the current Git version, the command is restricted to the current "
1671"directory.\n"
1672msgstr ""
1673"在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
1674"'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
1675"如果要添加整个目录树的内容,执行:\n"
1676"\n"
1677"  git add %s :/\n"
1678"  (或 git add %s :/)\n"
1679"\n"
1680"如果要限制该命令只作用于当前目录,执行:\n"
1681"\n"
1682"  git add %s .\n"
1683"  (或 git add %s .)\n"
1684"\n"
1685"对于当前版本的 Git,这条命令只作用于当前目录。\n"
1686
1687#: builtin/add.c:100
1688#, c-format
1689msgid ""
1690"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1691"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1692"Paths like '%s' that are\n"
1693"removed from your working tree are ignored with this version of Git.\n"
1694"\n"
1695"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1696"  ignores paths you removed from your working tree.\n"
1697"\n"
1698"* 'git add --all <pathspec>' will let you also record the removals.\n"
1699"\n"
1700"Run 'git status' to check the paths you removed from your working tree.\n"
1701msgstr ""
1702"您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
1703"针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
1704"像本地工作区移除的路径 '%s'\n"
1705"在此版本的 Git 中被忽略。\n"
1706"\n"
1707"* 'git add --ignore-removal <pathspec>',是当前版本的默认操作,\n"
1708"  忽略您本地工作区中移除的文件。\n"
1709"\n"
1710"* 'git add --all <pathspec>' 将让您同时对删除操作进行记录。\n"
1711"\n"
1712"运行 'git status' 来检查您本地工作区中移除的路径。\n"
1713
1714#: builtin/add.c:144
1715#, c-format
1716msgid "unexpected diff status %c"
1717msgstr "意外的差异状态 %c"
1718
1719#: builtin/add.c:149 builtin/commit.c:233
1720msgid "updating files failed"
1721msgstr "更新文件失败"
1722
1723#: builtin/add.c:163
1724#, c-format
1725msgid "remove '%s'\n"
1726msgstr "删除 '%s'\n"
1727
1728#: builtin/add.c:253
1729msgid "Unstaged changes after refreshing the index:"
1730msgstr "刷新索引之后尚未被暂存的变更:"
1731
1732#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275
1733#, c-format
1734msgid "pathspec '%s' did not match any files"
1735msgstr "路径 '%s' 未匹配任何文件"
1736
1737#: builtin/add.c:339
1738msgid "Could not read the index"
1739msgstr "不能读取索引"
1740
1741#: builtin/add.c:349
1742#, c-format
1743msgid "Could not open '%s' for writing."
1744msgstr "不能打开 '%s' 以写入。"
1745
1746#: builtin/add.c:353
1747msgid "Could not write patch"
1748msgstr "不能生成补丁"
1749
1750#: builtin/add.c:358
1751#, c-format
1752msgid "Could not stat '%s'"
1753msgstr "不能查看文件状态 '%s'"
1754
1755#: builtin/add.c:360
1756msgid "Empty patch. Aborted."
1757msgstr "空补丁。异常终止。"
1758
1759#: builtin/add.c:366
1760#, c-format
1761msgid "Could not apply '%s'"
1762msgstr "不能应用 '%s'"
1763
1764#: builtin/add.c:376
1765msgid "The following paths are ignored by one of your .gitignore files:\n"
1766msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1767
1768#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1769#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1770#: builtin/rm.c:206
1771msgid "dry run"
1772msgstr "演习"
1773
1774#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19
1775#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
1776#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112
1777msgid "be verbose"
1778msgstr "冗长输出"
1779
1780#: builtin/add.c:396
1781msgid "interactive picking"
1782msgstr "交互式拣选"
1783
1784#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258
1785msgid "select hunks interactively"
1786msgstr "交互式挑选数据块"
1787
1788#: builtin/add.c:398
1789msgid "edit current diff and apply"
1790msgstr "编辑当前差异并应用"
1791
1792#: builtin/add.c:399
1793msgid "allow adding otherwise ignored files"
1794msgstr "允许添加忽略的文件"
1795
1796#: builtin/add.c:400
1797msgid "update tracked files"
1798msgstr "更新已跟踪的文件"
1799
1800#: builtin/add.c:401
1801msgid "record only the fact that the path will be added later"
1802msgstr "只记录,该路径稍后再添加"
1803
1804#: builtin/add.c:402
1805msgid "add changes from all tracked and untracked files"
1806msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1807
1808#. takes no arguments
1809#: builtin/add.c:405
1810msgid "ignore paths removed in the working tree (same as --no-all)"
1811msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
1812
1813#: builtin/add.c:407
1814msgid "don't add, only refresh the index"
1815msgstr "不添加,只刷新索引"
1816
1817#: builtin/add.c:408
1818msgid "just skip files which cannot be added because of errors"
1819msgstr "跳过因出错不能添加的文件"
1820
1821#: builtin/add.c:409
1822msgid "check if - even missing - files are ignored in dry run"
1823msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1824
1825#: builtin/add.c:431
1826#, c-format
1827msgid "Use -f if you really want to add them.\n"
1828msgstr "使用 -f 参数如果您确实要添加它们。\n"
1829
1830#: builtin/add.c:432
1831msgid "no files added"
1832msgstr "没有文件被添加"
1833
1834#: builtin/add.c:438
1835msgid "adding files failed"
1836msgstr "添加文件失败"
1837
1838#: builtin/add.c:477
1839msgid "-A and -u are mutually incompatible"
1840msgstr "-A 和 -u 选项互斥"
1841
1842#: builtin/add.c:495
1843msgid "Option --ignore-missing can only be used together with --dry-run"
1844msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
1845
1846#: builtin/add.c:525
1847#, c-format
1848msgid "Nothing specified, nothing added.\n"
1849msgstr "没有指定文件,也没有文件被添加。\n"
1850
1851#: builtin/add.c:526
1852#, c-format
1853msgid "Maybe you wanted to say 'git add .'?\n"
1854msgstr "也许您想要执行 'git add .'?\n"
1855
1856#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204
1857#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
1858msgid "index file corrupt"
1859msgstr "索引文件损坏"
1860
1861#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
1862msgid "Unable to write new index file"
1863msgstr "无法写入新索引文件"
1864
1865#: builtin/apply.c:57
1866msgid "git apply [options] [<patch>...]"
1867msgstr "git apply [选项] [<补丁>...]"
1868
1869#: builtin/apply.c:110
1870#, c-format
1871msgid "unrecognized whitespace option '%s'"
1872msgstr "未能识别的空白字符选项 '%s'"
1873
1874#: builtin/apply.c:125
1875#, c-format
1876msgid "unrecognized whitespace ignore option '%s'"
1877msgstr "未能识别的空白字符忽略选项 '%s'"
1878
1879#: builtin/apply.c:823
1880#, c-format
1881msgid "Cannot prepare timestamp regexp %s"
1882msgstr "无法准备时间戳正则表达式 %s"
1883
1884#: builtin/apply.c:832
1885#, c-format
1886msgid "regexec returned %d for input: %s"
1887msgstr "regexec 返回 %d,输入为:%s"
1888
1889#: builtin/apply.c:913
1890#, c-format
1891msgid "unable to find filename in patch at line %d"
1892msgstr "不能在补丁的第 %d 行找到文件名"
1893
1894#: builtin/apply.c:945
1895#, c-format
1896msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1897msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
1898
1899#: builtin/apply.c:949
1900#, c-format
1901msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1902msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1903
1904#: builtin/apply.c:950
1905#, c-format
1906msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1907msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1908
1909#: builtin/apply.c:957
1910#, c-format
1911msgid "git apply: bad git-diff - expected /dev/null on line %d"
1912msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
1913
1914#: builtin/apply.c:1422
1915#, c-format
1916msgid "recount: unexpected line: %.*s"
1917msgstr "recount:意外的行:%.*s"
1918
1919#: builtin/apply.c:1479
1920#, c-format
1921msgid "patch fragment without header at line %d: %.*s"
1922msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1923
1924#: builtin/apply.c:1496
1925#, c-format
1926msgid ""
1927"git diff header lacks filename information when removing %d leading pathname "
1928"component (line %d)"
1929msgid_plural ""
1930"git diff header lacks filename information when removing %d leading pathname "
1931"components (line %d)"
1932msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1933msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1934
1935#: builtin/apply.c:1656
1936msgid "new file depends on old contents"
1937msgstr "新文件依赖旧内容"
1938
1939#: builtin/apply.c:1658
1940msgid "deleted file still has contents"
1941msgstr "删除的文件仍有内容"
1942
1943#: builtin/apply.c:1684
1944#, c-format
1945msgid "corrupt patch at line %d"
1946msgstr "补丁在第 %d 行损坏"
1947
1948#: builtin/apply.c:1720
1949#, c-format
1950msgid "new file %s depends on old contents"
1951msgstr "新文件 %s 依赖旧内容"
1952
1953#: builtin/apply.c:1722
1954#, c-format
1955msgid "deleted file %s still has contents"
1956msgstr "删除的文件 %s 仍有内容"
1957
1958#: builtin/apply.c:1725
1959#, c-format
1960msgid "** warning: file %s becomes empty but is not deleted"
1961msgstr "** 警告:文件 %s 成为空文件但并未删除"
1962
1963#: builtin/apply.c:1871
1964#, c-format
1965msgid "corrupt binary patch at line %d: %.*s"
1966msgstr "二进制补丁在第 %d 行损坏:%.*s"
1967
1968#. there has to be one hunk (forward hunk)
1969#: builtin/apply.c:1900
1970#, c-format
1971msgid "unrecognized binary patch at line %d"
1972msgstr "未能识别的二进制补丁位于第 %d 行"
1973
1974#: builtin/apply.c:1986
1975#, c-format
1976msgid "patch with only garbage at line %d"
1977msgstr "补丁文件的第 %d 行只有垃圾数据"
1978
1979#: builtin/apply.c:2076
1980#, c-format
1981msgid "unable to read symlink %s"
1982msgstr "无法读取符号链接 %s"
1983
1984#: builtin/apply.c:2080
1985#, c-format
1986msgid "unable to open or read %s"
1987msgstr "不能打开或读取 %s"
1988
1989#: builtin/apply.c:2688
1990#, c-format
1991msgid "invalid start of line: '%c'"
1992msgstr "无效的行首字符:'%c'"
1993
1994#: builtin/apply.c:2806
1995#, c-format
1996msgid "Hunk #%d succeeded at %d (offset %d line)."
1997msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1998msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1999msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2000
2001#: builtin/apply.c:2818
2002#, c-format
2003msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2004msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2005
2006#: builtin/apply.c:2824
2007#, c-format
2008msgid ""
2009"while searching for:\n"
2010"%.*s"
2011msgstr ""
2012"当查询:\n"
2013"%.*s"
2014
2015#: builtin/apply.c:2843
2016#, c-format
2017msgid "missing binary patch data for '%s'"
2018msgstr "缺失 '%s' 的二进制补丁数据"
2019
2020#: builtin/apply.c:2946
2021#, c-format
2022msgid "binary patch does not apply to '%s'"
2023msgstr "二进制补丁未应用到 '%s'"
2024
2025#: builtin/apply.c:2952
2026#, c-format
2027msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2028msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2029
2030#: builtin/apply.c:2973
2031#, c-format
2032msgid "patch failed: %s:%ld"
2033msgstr "打补丁失败:%s:%ld"
2034
2035#: builtin/apply.c:3095
2036#, c-format
2037msgid "cannot checkout %s"
2038msgstr "不能检出 %s"
2039
2040#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193
2041#, c-format
2042msgid "read of %s failed"
2043msgstr "读取 %s 失败"
2044
2045#: builtin/apply.c:3173 builtin/apply.c:3395
2046#, c-format
2047msgid "path %s has been renamed/deleted"
2048msgstr "路径 %s 已经被重命名/删除"
2049
2050#: builtin/apply.c:3254 builtin/apply.c:3409
2051#, c-format
2052msgid "%s: does not exist in index"
2053msgstr "%s:不存在于索引中"
2054
2055#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423
2056#, c-format
2057msgid "%s: %s"
2058msgstr "%s:%s"
2059
2060#: builtin/apply.c:3263 builtin/apply.c:3417
2061#, c-format
2062msgid "%s: does not match index"
2063msgstr "%s:和索引不匹配"
2064
2065#: builtin/apply.c:3365
2066msgid "removal patch leaves file contents"
2067msgstr "移除补丁仍留下了文件内容"
2068
2069#: builtin/apply.c:3434
2070#, c-format
2071msgid "%s: wrong type"
2072msgstr "%s:错误类型"
2073
2074#: builtin/apply.c:3436
2075#, c-format
2076msgid "%s has type %o, expected %o"
2077msgstr "%s 的类型是 %o,应为 %o"
2078
2079#: builtin/apply.c:3537
2080#, c-format
2081msgid "%s: already exists in index"
2082msgstr "%s:已经存在于索引中"
2083
2084#: builtin/apply.c:3540
2085#, c-format
2086msgid "%s: already exists in working directory"
2087msgstr "%s:已经存在于工作区中"
2088
2089#: builtin/apply.c:3560
2090#, c-format
2091msgid "new mode (%o) of %s does not match old mode (%o)"
2092msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2093
2094#: builtin/apply.c:3565
2095#, c-format
2096msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2097msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2098
2099#: builtin/apply.c:3573
2100#, c-format
2101msgid "%s: patch does not apply"
2102msgstr "%s:补丁未应用"
2103
2104#: builtin/apply.c:3586
2105#, c-format
2106msgid "Checking patch %s..."
2107msgstr "检查补丁 %s..."
2108
2109#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124
2110#, c-format
2111msgid "make_cache_entry failed for path '%s'"
2112msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2113
2114#: builtin/apply.c:3822
2115#, c-format
2116msgid "unable to remove %s from index"
2117msgstr "不能从索引中移除 %s"
2118
2119#: builtin/apply.c:3850
2120#, c-format
2121msgid "corrupt patch for subproject %s"
2122msgstr "子项目 %s 损坏的补丁"
2123
2124#: builtin/apply.c:3854
2125#, c-format
2126msgid "unable to stat newly created file '%s'"
2127msgstr "不能枚举新建文件 '%s' 的状态"
2128
2129#: builtin/apply.c:3859
2130#, c-format
2131msgid "unable to create backing store for newly created file %s"
2132msgstr "不能为新建文件 %s 创建后端存储"
2133
2134#: builtin/apply.c:3862 builtin/apply.c:3970
2135#, c-format
2136msgid "unable to add cache entry for %s"
2137msgstr "无法为 %s 添加缓存条目"
2138
2139#: builtin/apply.c:3895
2140#, c-format
2141msgid "closing file '%s'"
2142msgstr "关闭文件 '%s'"
2143
2144#: builtin/apply.c:3944
2145#, c-format
2146msgid "unable to write file '%s' mode %o"
2147msgstr "不能写文件 '%s' 权限 %o"
2148
2149#: builtin/apply.c:4031
2150#, c-format
2151msgid "Applied patch %s cleanly."
2152msgstr "成功应用补丁 %s。"
2153
2154#: builtin/apply.c:4039
2155msgid "internal error"
2156msgstr "内部错误"
2157
2158#. Say this even without --verbose
2159#: builtin/apply.c:4042
2160#, c-format
2161msgid "Applying patch %%s with %d reject..."
2162msgid_plural "Applying patch %%s with %d rejects..."
2163msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2164msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2165
2166#: builtin/apply.c:4052
2167#, c-format
2168msgid "truncating .rej filename to %.*s.rej"
2169msgstr "截短 .rej 文件名为 %.*s.rej"
2170
2171#: builtin/apply.c:4073
2172#, c-format
2173msgid "Hunk #%d applied cleanly."
2174msgstr "第 #%d 个片段成功应用。"
2175
2176#: builtin/apply.c:4076
2177#, c-format
2178msgid "Rejected hunk #%d."
2179msgstr "拒绝第 #%d 个片段。"
2180
2181#: builtin/apply.c:4226
2182msgid "unrecognized input"
2183msgstr "未能识别的输入"
2184
2185#: builtin/apply.c:4237
2186msgid "unable to read index file"
2187msgstr "无法读取索引文件"
2188
2189#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92
2190#: builtin/fetch.c:63
2191msgid "path"
2192msgstr "路径"
2193
2194#: builtin/apply.c:4357
2195msgid "don't apply changes matching the given path"
2196msgstr "不要应用与给出路径向匹配的变更"
2197
2198#: builtin/apply.c:4360
2199msgid "apply changes matching the given path"
2200msgstr "应用与给出路径向匹配的变更"
2201
2202#: builtin/apply.c:4362
2203msgid "num"
2204msgstr "数字"
2205
2206#: builtin/apply.c:4363
2207msgid "remove <num> leading slashes from traditional diff paths"
2208msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2209
2210#: builtin/apply.c:4366
2211msgid "ignore additions made by the patch"
2212msgstr "忽略补丁中的添加的文件"
2213
2214#: builtin/apply.c:4368
2215msgid "instead of applying the patch, output diffstat for the input"
2216msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2217
2218#: builtin/apply.c:4372
2219msgid "show number of added and deleted lines in decimal notation"
2220msgstr "以十进制数显示添加和删除的行数"
2221
2222#: builtin/apply.c:4374
2223msgid "instead of applying the patch, output a summary for the input"
2224msgstr "不应用补丁,而是显示输入的概要"
2225
2226#: builtin/apply.c:4376
2227msgid "instead of applying the patch, see if the patch is applicable"
2228msgstr "不应用补丁,而是查看补丁是否可应用"
2229
2230#: builtin/apply.c:4378
2231msgid "make sure the patch is applicable to the current index"
2232msgstr "确认补丁可以应用到当前索引"
2233
2234#: builtin/apply.c:4380
2235msgid "apply a patch without touching the working tree"
2236msgstr "应用补丁而不修改工作区"
2237
2238#: builtin/apply.c:4382
2239msgid "also apply the patch (use with --stat/--summary/--check)"
2240msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2241
2242#: builtin/apply.c:4384
2243msgid "attempt three-way merge if a patch does not apply"
2244msgstr "如果一个补丁不能应用则尝试三路合并"
2245
2246#: builtin/apply.c:4386
2247msgid "build a temporary index based on embedded index information"
2248msgstr "创建一个临时索引基于嵌入的索引信息"
2249
2250#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456
2251msgid "paths are separated with NUL character"
2252msgstr "路径以 NUL 字符分隔"
2253
2254#: builtin/apply.c:4391
2255msgid "ensure at least <n> lines of context match"
2256msgstr "确保至少匹配 <n> 行上下文"
2257
2258#: builtin/apply.c:4392
2259msgid "action"
2260msgstr "动作"
2261
2262#: builtin/apply.c:4393
2263msgid "detect new or modified lines that have whitespace errors"
2264msgstr "检查新增和修改的行中间的空白字符滥用"
2265
2266#: builtin/apply.c:4396 builtin/apply.c:4399
2267msgid "ignore changes in whitespace when finding context"
2268msgstr "查找上下文时忽略空白字符的变更"
2269
2270#: builtin/apply.c:4402
2271msgid "apply the patch in reverse"
2272msgstr "反向应用补丁"
2273
2274#: builtin/apply.c:4404
2275msgid "don't expect at least one line of context"
2276msgstr "无需至少一行上下文"
2277
2278#: builtin/apply.c:4406
2279msgid "leave the rejected hunks in corresponding *.rej files"
2280msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2281
2282#: builtin/apply.c:4408
2283msgid "allow overlapping hunks"
2284msgstr "允许重叠的补丁片段"
2285
2286#: builtin/apply.c:4411
2287msgid "tolerate incorrectly detected missing new-line at the end of file"
2288msgstr "允许不正确的文件末尾换行符"
2289
2290#: builtin/apply.c:4414
2291msgid "do not trust the line counts in the hunk headers"
2292msgstr "不信任补丁片段的头信息中的行号"
2293
2294#: builtin/apply.c:4416
2295msgid "root"
2296msgstr "根目录"
2297
2298#: builtin/apply.c:4417
2299msgid "prepend <root> to all filenames"
2300msgstr "为所有文件名前添加 <根目录>"
2301
2302#: builtin/apply.c:4439
2303msgid "--3way outside a repository"
2304msgstr "--3way 在一个版本库之外"
2305
2306#: builtin/apply.c:4447
2307msgid "--index outside a repository"
2308msgstr "--index 在一个版本库之外"
2309
2310#: builtin/apply.c:4450
2311msgid "--cached outside a repository"
2312msgstr "--cached 在一个版本库之外"
2313
2314#: builtin/apply.c:4466
2315#, c-format
2316msgid "can't open patch '%s'"
2317msgstr "不能打开补丁 '%s'"
2318
2319#: builtin/apply.c:4480
2320#, c-format
2321msgid "squelched %d whitespace error"
2322msgid_plural "squelched %d whitespace errors"
2323msgstr[0] "抑制下仍有 %d 个空白字符误用"
2324msgstr[1] "抑制下仍有 %d 个空白字符误用"
2325
2326#: builtin/apply.c:4486 builtin/apply.c:4496
2327#, c-format
2328msgid "%d line adds whitespace errors."
2329msgid_plural "%d lines add whitespace errors."
2330msgstr[0] "%d 行有空白字符误用。"
2331msgstr[1] "%d 行有空白字符误用。"
2332
2333#: builtin/archive.c:17
2334#, c-format
2335msgid "could not create archive file '%s'"
2336msgstr "不能创建归档文件 '%s'"
2337
2338#: builtin/archive.c:20
2339msgid "could not redirect output"
2340msgstr "不能重定向输出"
2341
2342#: builtin/archive.c:37
2343msgid "git archive: Remote with no URL"
2344msgstr "git archive:未提供远程URL"
2345
2346#: builtin/archive.c:58
2347msgid "git archive: expected ACK/NAK, got EOF"
2348msgstr "git archive:应为ACK/NACK,却得到EOF"
2349
2350#: builtin/archive.c:61
2351#, c-format
2352msgid "git archive: NACK %s"
2353msgstr "git archive:NACK %s"
2354
2355#: builtin/archive.c:63
2356#, c-format
2357msgid "remote error: %s"
2358msgstr "远程错误:%s"
2359
2360#: builtin/archive.c:64
2361msgid "git archive: protocol error"
2362msgstr "git archive:协议错误"
2363
2364#: builtin/archive.c:68
2365msgid "git archive: expected a flush"
2366msgstr "git archive:应为刷新"
2367
2368#: builtin/bisect--helper.c:7
2369msgid "git bisect--helper --next-all [--no-checkout]"
2370msgstr "git bisect--helper --next-all [--no-checkout]"
2371
2372#: builtin/bisect--helper.c:17
2373msgid "perform 'git bisect next'"
2374msgstr "执行 'git bisect next'"
2375
2376#: builtin/bisect--helper.c:19
2377msgid "update BISECT_HEAD instead of checking out the current commit"
2378msgstr "更新 BISECT_HEAD 而非检出当前提交"
2379
2380#: builtin/blame.c:25
2381msgid "git blame [options] [rev-opts] [rev] [--] file"
2382msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2383
2384#: builtin/blame.c:30
2385msgid "[rev-opts] are documented in git-rev-list(1)"
2386msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2387
2388#: builtin/blame.c:2355
2389msgid "Show blame entries as we find them, incrementally"
2390msgstr "增量式地显示发现的 blame 条目"
2391
2392#: builtin/blame.c:2356
2393msgid "Show blank SHA-1 for boundary commits (Default: off)"
2394msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2395
2396#: builtin/blame.c:2357
2397msgid "Do not treat root commits as boundaries (Default: off)"
2398msgstr "不把根提交作为边界(默认:关闭)"
2399
2400#: builtin/blame.c:2358
2401msgid "Show work cost statistics"
2402msgstr "显示命令消耗统计"
2403
2404#: builtin/blame.c:2359
2405msgid "Show output score for blame entries"
2406msgstr "显示判断 blame 条目位移的得分诊断信息"
2407
2408#: builtin/blame.c:2360
2409msgid "Show original filename (Default: auto)"
2410msgstr "显示原始文件名(默认:自动)"
2411
2412#: builtin/blame.c:2361
2413msgid "Show original linenumber (Default: off)"
2414msgstr "显示原始的行号(默认:关闭)"
2415
2416#: builtin/blame.c:2362
2417msgid "Show in a format designed for machine consumption"
2418msgstr "显示为一个适合机器读取的格式"
2419
2420#: builtin/blame.c:2363
2421msgid "Show porcelain format with per-line commit information"
2422msgstr "为每一行显示机器适用的提交信息"
2423
2424#: builtin/blame.c:2364
2425msgid "Use the same output mode as git-annotate (Default: off)"
2426msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2427
2428#: builtin/blame.c:2365
2429msgid "Show raw timestamp (Default: off)"
2430msgstr "显示原始时间戳(默认:关闭)"
2431
2432#: builtin/blame.c:2366
2433msgid "Show long commit SHA1 (Default: off)"
2434msgstr "显示长的SHA1提交号(默认:关闭)"
2435
2436#: builtin/blame.c:2367
2437msgid "Suppress author name and timestamp (Default: off)"
2438msgstr "隐藏作者名字和时间戳(默认:关闭)"
2439
2440#: builtin/blame.c:2368
2441msgid "Show author email instead of name (Default: off)"
2442msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2443
2444#: builtin/blame.c:2369
2445msgid "Ignore whitespace differences"
2446msgstr "忽略空白差异"
2447
2448#: builtin/blame.c:2370
2449msgid "Spend extra cycles to find better match"
2450msgstr "花费额外的循环来找到更好的匹配"
2451
2452#: builtin/blame.c:2371
2453msgid "Use revisions from <file> instead of calling git-rev-list"
2454msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2455
2456#: builtin/blame.c:2372
2457msgid "Use <file>'s contents as the final image"
2458msgstr "使用 <file> 的内容作为最终的图片"
2459
2460#: builtin/blame.c:2373 builtin/blame.c:2374
2461msgid "score"
2462msgstr "得分"
2463
2464#: builtin/blame.c:2373
2465msgid "Find line copies within and across files"
2466msgstr "找到文件内及跨文件的行拷贝"
2467
2468#: builtin/blame.c:2374
2469msgid "Find line movements within and across files"
2470msgstr "找到文件内及跨文件的行移动"
2471
2472#: builtin/blame.c:2375
2473msgid "n,m"
2474msgstr "n,m"
2475
2476#: builtin/blame.c:2375
2477msgid "Process only line range n,m, counting from 1"
2478msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2479
2480#: builtin/branch.c:24
2481msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2482msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2483
2484#: builtin/branch.c:25
2485msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2486msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2487
2488#: builtin/branch.c:26
2489msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2490msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2491
2492#: builtin/branch.c:27
2493msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2494msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2495
2496#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2497#: builtin/branch.c:150
2498#, c-format
2499msgid ""
2500"deleting branch '%s' that has been merged to\n"
2501"         '%s', but not yet merged to HEAD."
2502msgstr ""
2503"将要删除的分支 '%s' 已经被合并到\n"
2504"         '%s',但未合并到 HEAD。"
2505
2506#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2507#: builtin/branch.c:154
2508#, c-format
2509msgid ""
2510"not deleting branch '%s' that is not yet merged to\n"
2511"         '%s', even though it is merged to HEAD."
2512msgstr ""
2513"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2514"         然而却尚未被合并到分支 '%s' 。"
2515
2516#: builtin/branch.c:168
2517#, c-format
2518msgid "Couldn't look up commit object for '%s'"
2519msgstr "无法查询 '%s' 指向的提交对象"
2520
2521#: builtin/branch.c:172
2522#, c-format
2523msgid ""
2524"The branch '%s' is not fully merged.\n"
2525"If you are sure you want to delete it, run 'git branch -D %s'."
2526msgstr ""
2527"分支 '%s' 没有完全合并。\n"
2528"如果您确认要删除它,执行 'git branch -D %s'。"
2529
2530#: builtin/branch.c:185
2531msgid "Update of config-file failed"
2532msgstr "无法更新 config 文件"
2533
2534#: builtin/branch.c:213
2535msgid "cannot use -a with -d"
2536msgstr "不能将 -a 和 -d 同时使用"
2537
2538#: builtin/branch.c:219
2539msgid "Couldn't look up commit object for HEAD"
2540msgstr "无法查询 HEAD 指向的提交对象"
2541
2542#: builtin/branch.c:227
2543#, c-format
2544msgid "Cannot delete the branch '%s' which you are currently on."
2545msgstr "无法删除您当前所在的分支 '%s'。"
2546
2547#: builtin/branch.c:240
2548#, c-format
2549msgid "remote branch '%s' not found."
2550msgstr "远程分支 '%s' 未发现。"
2551
2552#: builtin/branch.c:241
2553#, c-format
2554msgid "branch '%s' not found."
2555msgstr "分支 '%s' 未发现。"
2556
2557#: builtin/branch.c:255
2558#, c-format
2559msgid "Error deleting remote branch '%s'"
2560msgstr "删除远程分支 '%s' 时出错"
2561
2562#: builtin/branch.c:256
2563#, c-format
2564msgid "Error deleting branch '%s'"
2565msgstr "删除分支 '%s' 时出错"
2566
2567#: builtin/branch.c:263
2568#, c-format
2569msgid "Deleted remote branch %s (was %s).\n"
2570msgstr "已删除远程分支 %s(曾为 %s)。\n"
2571
2572#: builtin/branch.c:264
2573#, c-format
2574msgid "Deleted branch %s (was %s).\n"
2575msgstr "已删除分支 %s(曾为 %s)。\n"
2576
2577#: builtin/branch.c:366
2578#, c-format
2579msgid "branch '%s' does not point at a commit"
2580msgstr "分支 '%s' 未指向一个提交"
2581
2582#: builtin/branch.c:453
2583#, c-format
2584msgid "[%s: behind %d]"
2585msgstr "[%s:落后 %d]"
2586
2587#: builtin/branch.c:455
2588#, c-format
2589msgid "[behind %d]"
2590msgstr "[落后 %d]"
2591
2592#: builtin/branch.c:459
2593#, c-format
2594msgid "[%s: ahead %d]"
2595msgstr "[%s:领先 %d]"
2596
2597#: builtin/branch.c:461
2598#, c-format
2599msgid "[ahead %d]"
2600msgstr "[领先 %d]"
2601
2602#: builtin/branch.c:464
2603#, c-format
2604msgid "[%s: ahead %d, behind %d]"
2605msgstr "[%s:领先 %d,落后 %d]"
2606
2607#: builtin/branch.c:467
2608#, c-format
2609msgid "[ahead %d, behind %d]"
2610msgstr "[领先 %d,落后 %d]"
2611
2612#: builtin/branch.c:490
2613msgid " **** invalid ref ****"
2614msgstr " **** 无效引用 ****"
2615
2616#: builtin/branch.c:582
2617#, c-format
2618msgid "(no branch, rebasing %s)"
2619msgstr "(非分支,正变基 %s)"
2620
2621#: builtin/branch.c:585
2622#, c-format
2623msgid "(no branch, bisect started on %s)"
2624msgstr "(非分支,二分查找开始于 %s)"
2625
2626#: builtin/branch.c:588
2627#, c-format
2628msgid "(detached from %s)"
2629msgstr "(分离自 %s)"
2630
2631#: builtin/branch.c:591
2632msgid "(no branch)"
2633msgstr "(非分支)"
2634
2635#: builtin/branch.c:637
2636#, c-format
2637msgid "object '%s' does not point to a commit"
2638msgstr "对象 '%s' 没有指向一个提交"
2639
2640#: builtin/branch.c:669
2641msgid "some refs could not be read"
2642msgstr "一些引用不能读取"
2643
2644#: builtin/branch.c:682
2645msgid "cannot rename the current branch while not on any."
2646msgstr "无法重命名当前分支因为不处于任何分支上。"
2647
2648#: builtin/branch.c:692
2649#, c-format
2650msgid "Invalid branch name: '%s'"
2651msgstr "无效的分支名:'%s'"
2652
2653#: builtin/branch.c:707
2654msgid "Branch rename failed"
2655msgstr "分支重命名失败"
2656
2657#: builtin/branch.c:711
2658#, c-format
2659msgid "Renamed a misnamed branch '%s' away"
2660msgstr "重命名掉一个错误命名的旧分支 '%s'"
2661
2662#: builtin/branch.c:715
2663#, c-format
2664msgid "Branch renamed to %s, but HEAD is not updated!"
2665msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2666
2667#: builtin/branch.c:722
2668msgid "Branch is renamed, but update of config-file failed"
2669msgstr "分支被重命名,但更新 config 文件失败"
2670
2671#: builtin/branch.c:737
2672#, c-format
2673msgid "malformed object name %s"
2674msgstr "非法的对象名 %s"
2675
2676#: builtin/branch.c:761
2677#, c-format
2678msgid "could not write branch description template: %s"
2679msgstr "不能写分支描述模版:%s"
2680
2681#: builtin/branch.c:791
2682msgid "Generic options"
2683msgstr "通用选项"
2684
2685#: builtin/branch.c:793
2686msgid "show hash and subject, give twice for upstream branch"
2687msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2688
2689#: builtin/branch.c:794
2690msgid "suppress informational messages"
2691msgstr "不显示信息"
2692
2693#: builtin/branch.c:795
2694msgid "set up tracking mode (see git-pull(1))"
2695msgstr "设置跟踪模式(参见 git-pull(1))"
2696
2697#: builtin/branch.c:797
2698msgid "change upstream info"
2699msgstr "改变上游信息"
2700
2701#: builtin/branch.c:801
2702msgid "use colored output"
2703msgstr "使用彩色输出"
2704
2705#: builtin/branch.c:802
2706msgid "act on remote-tracking branches"
2707msgstr "作用于远程跟踪分支"
2708
2709#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
2710#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369
2711#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
2712msgid "commit"
2713msgstr "提交"
2714
2715#: builtin/branch.c:806 builtin/branch.c:812
2716msgid "print only branches that contain the commit"
2717msgstr "只打印包含该提交的分支"
2718
2719#: builtin/branch.c:818
2720msgid "Specific git-branch actions:"
2721msgstr "具体的 git-branch 动作:"
2722
2723#: builtin/branch.c:819
2724msgid "list both remote-tracking and local branches"
2725msgstr "列出远程跟踪及本地分支"
2726
2727#: builtin/branch.c:821
2728msgid "delete fully merged branch"
2729msgstr "删除完全合并的分支"
2730
2731#: builtin/branch.c:822
2732msgid "delete branch (even if not merged)"
2733msgstr "删除分支(即使没有合并)"
2734
2735#: builtin/branch.c:823
2736msgid "move/rename a branch and its reflog"
2737msgstr "移动/重命名一个分支,以及它的引用日志"
2738
2739#: builtin/branch.c:824
2740msgid "move/rename a branch, even if target exists"
2741msgstr "移动/重命名一个分支,即使目标已存在"
2742
2743#: builtin/branch.c:825
2744msgid "list branch names"
2745msgstr "列出分支名"
2746
2747#: builtin/branch.c:826
2748msgid "create the branch's reflog"
2749msgstr "创建分支的引用日志"
2750
2751#: builtin/branch.c:828
2752msgid "edit the description for the branch"
2753msgstr "标记分支的描述"
2754
2755#: builtin/branch.c:829
2756msgid "force creation (when already exists)"
2757msgstr "强制创建(当已经存在)"
2758
2759#: builtin/branch.c:832
2760msgid "print only not merged branches"
2761msgstr "只打印没有合并的分支"
2762
2763#: builtin/branch.c:838
2764msgid "print only merged branches"
2765msgstr "只打印合并的分支"
2766
2767#: builtin/branch.c:842
2768msgid "list branches in columns"
2769msgstr "以列的方式显示分支"
2770
2771#: builtin/branch.c:855
2772msgid "Failed to resolve HEAD as a valid ref."
2773msgstr "无法将 HEAD 解析为有效引用。"
2774
2775#: builtin/branch.c:860 builtin/clone.c:619
2776msgid "HEAD not found below refs/heads!"
2777msgstr "HEAD 没有位于 /refs/heads 之下!"
2778
2779#: builtin/branch.c:883
2780msgid "--column and --verbose are incompatible"
2781msgstr "--column 和 --verbose 不兼容"
2782
2783#: builtin/branch.c:889 builtin/branch.c:928
2784msgid "branch name required"
2785msgstr "必须提供分支名"
2786
2787#: builtin/branch.c:904
2788msgid "Cannot give description to detached HEAD"
2789msgstr "不能向分离头指针提供描述"
2790
2791#: builtin/branch.c:909
2792msgid "cannot edit description of more than one branch"
2793msgstr "不能为一个以上的分支编辑描述"
2794
2795#: builtin/branch.c:916
2796#, c-format
2797msgid "No commit on branch '%s' yet."
2798msgstr "分支 '%s' 尚无提交。"
2799
2800#: builtin/branch.c:919
2801#, c-format
2802msgid "No branch named '%s'."
2803msgstr "没有分支 '%s'。"
2804
2805#: builtin/branch.c:934
2806msgid "too many branches for a rename operation"
2807msgstr "为重命名操作提供了太多的分支名"
2808
2809#: builtin/branch.c:939
2810msgid "too many branches to set new upstream"
2811msgstr "为设置新上游提供了太多的分支名"
2812
2813#: builtin/branch.c:943
2814#, c-format
2815msgid ""
2816"could not set upstream of HEAD to %s when it does not point to any branch."
2817msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
2818
2819#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
2820#, c-format
2821msgid "no such branch '%s'"
2822msgstr "没有此分支 '%s'"
2823
2824#: builtin/branch.c:950
2825#, c-format
2826msgid "branch '%s' does not exist"
2827msgstr "分支 '%s' 不存在"
2828
2829#: builtin/branch.c:962
2830msgid "too many branches to unset upstream"
2831msgstr "为取消上游设置操作提供了太多的分支名"
2832
2833#: builtin/branch.c:966
2834msgid "could not unset upstream of HEAD when it does not point to any branch."
2835msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
2836
2837#: builtin/branch.c:972
2838#, c-format
2839msgid "Branch '%s' has no upstream information"
2840msgstr "分支 '%s' 没有上游信息"
2841
2842#: builtin/branch.c:987
2843msgid "it does not make sense to create 'HEAD' manually"
2844msgstr "手工创建 'HEAD' 没有意义"
2845
2846#: builtin/branch.c:993
2847msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2848msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2849
2850#: builtin/branch.c:996
2851#, c-format
2852msgid ""
2853"The --set-upstream flag is deprecated and will be removed. Consider using --"
2854"track or --set-upstream-to\n"
2855msgstr ""
2856"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
2857
2858#: builtin/branch.c:1013
2859#, c-format
2860msgid ""
2861"\n"
2862"If you wanted to make '%s' track '%s', do this:\n"
2863"\n"
2864msgstr ""
2865"\n"
2866"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2867"\n"
2868
2869#: builtin/branch.c:1014
2870#, c-format
2871msgid "    git branch -d %s\n"
2872msgstr "    git branch -d %s\n"
2873
2874#: builtin/branch.c:1015
2875#, c-format
2876msgid "    git branch --set-upstream-to %s\n"
2877msgstr "    git branch --set-upstream-to %s\n"
2878
2879#: builtin/bundle.c:47
2880#, c-format
2881msgid "%s is okay\n"
2882msgstr "%s 可以\n"
2883
2884#: builtin/bundle.c:56
2885msgid "Need a repository to create a bundle."
2886msgstr "需要一个版本库来创建包。"
2887
2888#: builtin/bundle.c:60
2889msgid "Need a repository to unbundle."
2890msgstr "需要一个版本库来解包。"
2891
2892#: builtin/cat-file.c:176
2893msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2894msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2895
2896#: builtin/cat-file.c:177
2897msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2898msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2899
2900#: builtin/cat-file.c:195
2901msgid "<type> can be one of: blob, tree, commit, tag"
2902msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
2903
2904#: builtin/cat-file.c:196
2905msgid "show object type"
2906msgstr "显示对象类型"
2907
2908#: builtin/cat-file.c:197
2909msgid "show object size"
2910msgstr "显示对象大小"
2911
2912#: builtin/cat-file.c:199
2913msgid "exit with zero when there's no error"
2914msgstr "当没有错误时退出并返回零"
2915
2916#: builtin/cat-file.c:200
2917msgid "pretty-print object's content"
2918msgstr "美观地打印对象的内容"
2919
2920#: builtin/cat-file.c:202
2921msgid "for blob objects, run textconv on object's content"
2922msgstr "对于数据(blob)对象,对其内容执行 textconv"
2923
2924#: builtin/cat-file.c:204
2925msgid "show info and content of objects fed from the standard input"
2926msgstr "显示从标准输入提供的对象的信息和内容"
2927
2928#: builtin/cat-file.c:207
2929msgid "show info about objects fed from the standard input"
2930msgstr "显示从标准输入提供的对象的信息"
2931
2932#: builtin/check-attr.c:11
2933msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2934msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
2935
2936#: builtin/check-attr.c:12
2937msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2938msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
2939
2940#: builtin/check-attr.c:19
2941msgid "report all attributes set on file"
2942msgstr "报告设置在文件上的所有属性"
2943
2944#: builtin/check-attr.c:20
2945msgid "use .gitattributes only from the index"
2946msgstr "只使用索引中的 .gitattributes"
2947
2948#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2949msgid "read file names from stdin"
2950msgstr "从标准输入读出文件名"
2951
2952#: builtin/check-attr.c:23 builtin/check-ignore.c:24
2953msgid "input paths are terminated by a null character"
2954msgstr "输入路径以null字符终止"
2955
2956#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177
2957msgid "suppress progress reporting"
2958msgstr "不显示进度报告"
2959
2960#: builtin/check-ignore.c:146
2961msgid "cannot specify pathnames with --stdin"
2962msgstr "不能同时提供路径及 --stdin 参数"
2963
2964#: builtin/check-ignore.c:149
2965msgid "-z only makes sense with --stdin"
2966msgstr "-z 需要和 --stdin 参数共用才有意义"
2967
2968#: builtin/check-ignore.c:151
2969msgid "no path specified"
2970msgstr "未指定路径"
2971
2972#: builtin/check-ignore.c:155
2973msgid "--quiet is only valid with a single pathname"
2974msgstr "参数 --quiet 只在提供一个路径名时有效"
2975
2976#: builtin/check-ignore.c:157
2977msgid "cannot have both --quiet and --verbose"
2978msgstr "不能同时提供 --quiet 和 --verbose 参数"
2979
2980#: builtin/checkout-index.c:126
2981msgid "git checkout-index [options] [--] [<file>...]"
2982msgstr "git checkout-index [选项] [--] [<文件>...]"
2983
2984#: builtin/checkout-index.c:187
2985msgid "check out all files in the index"
2986msgstr "检出索引区的所有文件"
2987
2988#: builtin/checkout-index.c:188
2989msgid "force overwrite of existing files"
2990msgstr "强制覆盖现有的文件"
2991
2992#: builtin/checkout-index.c:190
2993msgid "no warning for existing files and files not in index"
2994msgstr "存在或不在索引中的文件都没有警告"
2995
2996#: builtin/checkout-index.c:192
2997msgid "don't checkout new files"
2998msgstr "不检出新文件"
2999
3000#: builtin/checkout-index.c:194
3001msgid "update stat information in the index file"
3002msgstr "更新索引中文件的状态信息"
3003
3004#: builtin/checkout-index.c:200
3005msgid "read list of paths from the standard input"
3006msgstr "从标准输入读取路径列表"
3007
3008#: builtin/checkout-index.c:202
3009msgid "write the content to temporary files"
3010msgstr "将内容写入临时文件"
3011
3012#: builtin/checkout-index.c:203 builtin/column.c:30
3013msgid "string"
3014msgstr "字符串"
3015
3016#: builtin/checkout-index.c:204
3017msgid "when creating files, prepend <string>"
3018msgstr "在创建文件时,在前面加上<字符串>"
3019
3020#: builtin/checkout-index.c:207
3021msgid "copy out the files from named stage"
3022msgstr "从指定暂存区中拷出文件"
3023
3024#: builtin/checkout.c:25
3025msgid "git checkout [options] <branch>"
3026msgstr "git checkout [选项] <分支>"
3027
3028#: builtin/checkout.c:26
3029msgid "git checkout [options] [<branch>] -- <file>..."
3030msgstr "git checkout [选项] [<分支>] -- <文件>..."
3031
3032#: builtin/checkout.c:117 builtin/checkout.c:150
3033#, c-format
3034msgid "path '%s' does not have our version"
3035msgstr "路径 '%s' 没有我们的版本"
3036
3037#: builtin/checkout.c:119 builtin/checkout.c:152
3038#, c-format
3039msgid "path '%s' does not have their version"
3040msgstr "路径 '%s' 没有他们的版本"
3041
3042#: builtin/checkout.c:135
3043#, c-format
3044msgid "path '%s' does not have all necessary versions"
3045msgstr "路径 '%s' 没有全部必须的版本"
3046
3047#: builtin/checkout.c:179
3048#, c-format
3049msgid "path '%s' does not have necessary versions"
3050msgstr "路径 '%s' 没有必须的版本"
3051
3052#: builtin/checkout.c:196
3053#, c-format
3054msgid "path '%s': cannot merge"
3055msgstr "path '%s':无法合并"
3056
3057#: builtin/checkout.c:213
3058#, c-format
3059msgid "Unable to add merge result for '%s'"
3060msgstr "无法为 '%s' 添加合并结果"
3061
3062#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
3063#: builtin/checkout.c:246
3064#, c-format
3065msgid "'%s' cannot be used with updating paths"
3066msgstr "'%s' 不能在更新路径时使用"
3067
3068#: builtin/checkout.c:249 builtin/checkout.c:252
3069#, c-format
3070msgid "'%s' cannot be used with %s"
3071msgstr "'%s' 不能和 %s 同时使用"
3072
3073#: builtin/checkout.c:255
3074#, c-format
3075msgid "Cannot update paths and switch to branch '%s' at the same time."
3076msgstr "不能同时更新路径并切换到分支'%s'。"
3077
3078#: builtin/checkout.c:266 builtin/checkout.c:458
3079msgid "corrupt index file"
3080msgstr "损坏的索引文件"
3081
3082#: builtin/checkout.c:329 builtin/checkout.c:336
3083#, c-format
3084msgid "path '%s' is unmerged"
3085msgstr "路径 '%s' 未合并"
3086
3087#: builtin/checkout.c:480
3088msgid "you need to resolve your current index first"
3089msgstr "您需要先解决当前索引的冲突"
3090
3091#: builtin/checkout.c:601
3092#, c-format
3093msgid "Can not do reflog for '%s'\n"
3094msgstr "不能对 '%s' 执行 reflog 操作\n"
3095
3096#: builtin/checkout.c:634
3097msgid "HEAD is now at"
3098msgstr "HEAD 目前位于"
3099
3100#: builtin/checkout.c:641
3101#, c-format
3102msgid "Reset branch '%s'\n"
3103msgstr "重置分支 '%s'\n"
3104
3105#: builtin/checkout.c:644
3106#, c-format
3107msgid "Already on '%s'\n"
3108msgstr "已经位于 '%s'\n"
3109
3110#: builtin/checkout.c:648
3111#, c-format
3112msgid "Switched to and reset branch '%s'\n"
3113msgstr "切换并重置分支 '%s'\n"
3114
3115#: builtin/checkout.c:650 builtin/checkout.c:987
3116#, c-format
3117msgid "Switched to a new branch '%s'\n"
3118msgstr "切换到一个新分支 '%s'\n"
3119
3120#: builtin/checkout.c:652
3121#, c-format
3122msgid "Switched to branch '%s'\n"
3123msgstr "切换到分支 '%s'\n"
3124
3125#  译者:注意保持前导空格
3126#: builtin/checkout.c:708
3127#, c-format
3128msgid " ... and %d more.\n"
3129msgstr " ... 及其它 %d 个。\n"
3130
3131#. The singular version
3132#: builtin/checkout.c:714
3133#, c-format
3134msgid ""
3135"Warning: you are leaving %d commit behind, not connected to\n"
3136"any of your branches:\n"
3137"\n"
3138"%s\n"
3139msgid_plural ""
3140"Warning: you are leaving %d commits behind, not connected to\n"
3141"any of your branches:\n"
3142"\n"
3143"%s\n"
3144msgstr[0] ""
3145"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3146"\n"
3147"%s\n"
3148msgstr[1] ""
3149"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3150"\n"
3151"%s\n"
3152
3153#: builtin/checkout.c:732
3154#, c-format
3155msgid ""
3156"If you want to keep them by creating a new branch, this may be a good time\n"
3157"to do so with:\n"
3158"\n"
3159" git branch new_branch_name %s\n"
3160"\n"
3161msgstr ""
3162"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3163"如下操作:\n"
3164"\n"
3165" git branch new_branch_name %s\n"
3166"\n"
3167
3168#: builtin/checkout.c:762
3169msgid "internal error in revision walk"
3170msgstr "在版本遍历时遇到内部错误"
3171
3172#: builtin/checkout.c:766
3173msgid "Previous HEAD position was"
3174msgstr "之前的 HEAD 位置是"
3175
3176#: builtin/checkout.c:793 builtin/checkout.c:982
3177msgid "You are on a branch yet to be born"
3178msgstr "您位于一个尚未初始化的分支"
3179
3180#. case (1)
3181#: builtin/checkout.c:918
3182#, c-format
3183msgid "invalid reference: %s"
3184msgstr "无效引用:%s"
3185
3186#. case (1): want a tree
3187#: builtin/checkout.c:957
3188#, c-format
3189msgid "reference is not a tree: %s"
3190msgstr "引用不是一个树:%s"
3191
3192#: builtin/checkout.c:996
3193msgid "paths cannot be used with switching branches"
3194msgstr "路径不能和切换分支同时使用"
3195
3196#: builtin/checkout.c:999 builtin/checkout.c:1003
3197#, c-format
3198msgid "'%s' cannot be used with switching branches"
3199msgstr "'%s' 不能和切换分支同时使用"
3200
3201#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015
3202#: builtin/checkout.c:1018
3203#, c-format
3204msgid "'%s' cannot be used with '%s'"
3205msgstr "'%s' 不能和 '%s' 同时使用"
3206
3207#: builtin/checkout.c:1023
3208#, c-format
3209msgid "Cannot switch branch to a non-commit '%s'"
3210msgstr "不能切换分支到一个非提交 '%s'"
3211
3212#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90
3213#: builtin/remote.c:169 builtin/remote.c:171
3214msgid "branch"
3215msgstr "分支"
3216
3217#: builtin/checkout.c:1046
3218msgid "create and checkout a new branch"
3219msgstr "创建并检出一个新的分支"
3220
3221#: builtin/checkout.c:1048
3222msgid "create/reset and checkout a branch"
3223msgstr "创建/重置并检出一个分支"
3224
3225#: builtin/checkout.c:1049
3226msgid "create reflog for new branch"
3227msgstr "为新的分支创建引用日志"
3228
3229#: builtin/checkout.c:1050
3230msgid "detach the HEAD at named commit"
3231msgstr "成为指向该提交的分离头指针"
3232
3233#: builtin/checkout.c:1051
3234msgid "set upstream info for new branch"
3235msgstr "为新的分支设置上游信息"
3236
3237#: builtin/checkout.c:1053
3238msgid "new branch"
3239msgstr "新分支"
3240
3241#: builtin/checkout.c:1053
3242msgid "new unparented branch"
3243msgstr "新的没有父提交的分支"
3244
3245#: builtin/checkout.c:1054
3246msgid "checkout our version for unmerged files"
3247msgstr "对尚未合并的文件检出我们的版本"
3248
3249#: builtin/checkout.c:1056
3250msgid "checkout their version for unmerged files"
3251msgstr "对尚未合并的文件检出他们的版本"
3252
3253#: builtin/checkout.c:1058
3254msgid "force checkout (throw away local modifications)"
3255msgstr "强制检出(丢弃本地修改)"
3256
3257#: builtin/checkout.c:1059
3258msgid "perform a 3-way merge with the new branch"
3259msgstr "和新的分支执行三路合并"
3260
3261#: builtin/checkout.c:1060 builtin/merge.c:217
3262msgid "update ignored files (default)"
3263msgstr "更新忽略的文件(默认)"
3264
3265#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245
3266msgid "style"
3267msgstr "风格"
3268
3269#: builtin/checkout.c:1062
3270msgid "conflict style (merge or diff3)"
3271msgstr "冲突输出风格(merge 或 diff3)"
3272
3273#: builtin/checkout.c:1065
3274msgid "do not limit pathspecs to sparse entries only"
3275msgstr "对路径不做稀疏检出的限制"
3276
3277#: builtin/checkout.c:1067
3278msgid "second guess 'git checkout no-such-branch'"
3279msgstr "再者猜测'git checkout no-such-branch'"
3280
3281#: builtin/checkout.c:1091
3282msgid "-b, -B and --orphan are mutually exclusive"
3283msgstr "-b、-B 和 --orphan 是互斥的"
3284
3285#: builtin/checkout.c:1108
3286msgid "--track needs a branch name"
3287msgstr "--track 需要一个分支名"
3288
3289#: builtin/checkout.c:1115
3290msgid "Missing branch name; try -b"
3291msgstr "缺少分支名;尝试 -b"
3292
3293#: builtin/checkout.c:1150
3294msgid "invalid path specification"
3295msgstr "无效的路径规格"
3296
3297#: builtin/checkout.c:1157
3298#, c-format
3299msgid ""
3300"Cannot update paths and switch to branch '%s' at the same time.\n"
3301"Did you intend to checkout '%s' which can not be resolved as commit?"
3302msgstr ""
3303"不能同时更新路径并切换到分支'%s'。\n"
3304"您是想要检出 '%s' 但其未能解析为提交么?"
3305
3306#: builtin/checkout.c:1162
3307#, c-format
3308msgid "git checkout: --detach does not take a path argument '%s'"
3309msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3310
3311#: builtin/checkout.c:1166
3312msgid ""
3313"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3314"checking out of the index."
3315msgstr ""
3316"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3317
3318#: builtin/clean.c:20
3319msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3320msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3321
3322#: builtin/clean.c:24
3323#, c-format
3324msgid "Removing %s\n"
3325msgstr "正删除 %s\n"
3326
3327#: builtin/clean.c:25
3328#, c-format
3329msgid "Would remove %s\n"
3330msgstr "将删除 %s\n"
3331
3332#: builtin/clean.c:26
3333#, c-format
3334msgid "Skipping repository %s\n"
3335msgstr "忽略版本库 %s\n"
3336
3337#: builtin/clean.c:27
3338#, c-format
3339msgid "Would skip repository %s\n"
3340msgstr "将忽略版本库 %s\n"
3341
3342#: builtin/clean.c:28
3343#, c-format
3344msgid "failed to remove %s"
3345msgstr "无法删除 %s"
3346
3347#: builtin/clean.c:160
3348msgid "do not print names of files removed"
3349msgstr "不打印删除文件的名称"
3350
3351#: builtin/clean.c:162
3352msgid "force"
3353msgstr "强制"
3354
3355#: builtin/clean.c:164
3356msgid "remove whole directories"
3357msgstr "删除整个目录"
3358
3359#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
3360#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182
3361msgid "pattern"
3362msgstr "模式"
3363
3364#: builtin/clean.c:166
3365msgid "add <pattern> to ignore rules"
3366msgstr "添加<模式>到忽略规则"
3367
3368#: builtin/clean.c:167
3369msgid "remove ignored files, too"
3370msgstr "也删除忽略的文件"
3371
3372#: builtin/clean.c:169
3373msgid "remove only ignored files"
3374msgstr "只删除忽略的文件"
3375
3376#: builtin/clean.c:187
3377msgid "-x and -X cannot be used together"
3378msgstr "-x 和 -X 不能同时使用"
3379
3380#: builtin/clean.c:191
3381msgid ""
3382"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3383msgstr ""
3384"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3385
3386#: builtin/clean.c:194
3387msgid ""
3388"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3389"clean"
3390msgstr ""
3391"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3392
3393#: builtin/clone.c:37
3394msgid "git clone [options] [--] <repo> [<dir>]"
3395msgstr "git clone [选项] [--] <版本库> [<路径>]"
3396
3397#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214
3398#: builtin/push.c:436
3399msgid "force progress reporting"
3400msgstr "强制显示进度报告"
3401
3402#: builtin/clone.c:67
3403msgid "don't create a checkout"
3404msgstr "不创建一个检出"
3405
3406#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
3407msgid "create a bare repository"
3408msgstr "创建一个裸版本库"
3409
3410#: builtin/clone.c:73
3411msgid "create a mirror repository (implies bare)"
3412msgstr "创建一个镜像版本库(也是裸版本库)"
3413
3414#: builtin/clone.c:75
3415msgid "to clone from a local repository"
3416msgstr "从本地版本库克隆"
3417
3418#: builtin/clone.c:77
3419msgid "don't use local hardlinks, always copy"
3420msgstr "不使用本地硬链接,始终复制"
3421
3422#: builtin/clone.c:79
3423msgid "setup as shared repository"
3424msgstr "设置为共享版本库"
3425
3426#: builtin/clone.c:81 builtin/clone.c:83
3427msgid "initialize submodules in the clone"
3428msgstr "在克隆时初始化子模组"
3429
3430#: builtin/clone.c:84 builtin/init-db.c:485
3431msgid "template-directory"
3432msgstr "模板目录"
3433
3434#: builtin/clone.c:85 builtin/init-db.c:486
3435msgid "directory from which templates will be used"
3436msgstr "模板目录将被使用"
3437
3438#: builtin/clone.c:87
3439msgid "reference repository"
3440msgstr "引用版本库"
3441
3442#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3443msgid "name"
3444msgstr "名称"
3445
3446#: builtin/clone.c:89
3447msgid "use <name> instead of 'origin' to track upstream"
3448msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3449
3450#: builtin/clone.c:91
3451msgid "checkout <branch> instead of the remote's HEAD"
3452msgstr "检出<分支>而不是远程HEAD"
3453
3454#: builtin/clone.c:93
3455msgid "path to git-upload-pack on the remote"
3456msgstr "远程 git-upload-pack 路径"
3457
3458#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662
3459msgid "depth"
3460msgstr "深度"
3461
3462#: builtin/clone.c:95
3463msgid "create a shallow clone of that depth"
3464msgstr "创建一个指定深度的浅克隆"
3465
3466#: builtin/clone.c:97
3467msgid "clone only one branch, HEAD or --branch"
3468msgstr "只克隆一个分支、HEAD 或 --branch"
3469
3470#: builtin/clone.c:98 builtin/init-db.c:494
3471msgid "gitdir"
3472msgstr "git目录"
3473
3474#: builtin/clone.c:99 builtin/init-db.c:495
3475msgid "separate git dir from working tree"
3476msgstr "git目录和工作区分离"
3477
3478#: builtin/clone.c:100
3479msgid "key=value"
3480msgstr "key=value"
3481
3482#: builtin/clone.c:101
3483msgid "set config inside the new repository"
3484msgstr "在新版本库中设置配置信息"
3485
3486#: builtin/clone.c:254
3487#, c-format
3488msgid "reference repository '%s' is not a local repository."
3489msgstr "引用版本库 '%s' 不是一个本地版本库。"
3490
3491#: builtin/clone.c:317
3492#, c-format
3493msgid "failed to create directory '%s'"
3494msgstr "无法创建目录 '%s'"
3495
3496#: builtin/clone.c:319 builtin/diff.c:77
3497#, c-format
3498msgid "failed to stat '%s'"
3499msgstr "无法枚举 '%s' 状态"
3500
3501#: builtin/clone.c:321
3502#, c-format
3503msgid "%s exists and is not a directory"
3504msgstr "%s 存在且不是一个目录"
3505
3506#: builtin/clone.c:335
3507#, c-format
3508msgid "failed to stat %s\n"
3509msgstr "无法枚举 %s 状态\n"
3510
3511#: builtin/clone.c:357
3512#, c-format
3513msgid "failed to create link '%s'"
3514msgstr "无法创建链接 '%s'"
3515
3516#: builtin/clone.c:361
3517#, c-format
3518msgid "failed to copy file to '%s'"
3519msgstr "无法拷贝文件至 '%s'"
3520
3521#: builtin/clone.c:384
3522#, c-format
3523msgid "done.\n"
3524msgstr "完成。\n"
3525
3526#: builtin/clone.c:397
3527msgid ""
3528"Clone succeeded, but checkout failed.\n"
3529"You can inspect what was checked out with 'git status'\n"
3530"and retry the checkout with 'git checkout -f HEAD'\n"
3531msgstr ""
3532"克隆成功,但是检出失败。\n"
3533"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3534"'git checkout -f HEAD' 重试\n"
3535
3536#: builtin/clone.c:476
3537#, c-format
3538msgid "Could not find remote branch %s to clone."
3539msgstr "不能发现要克隆的远程分支 %s。"
3540
3541#: builtin/clone.c:550
3542msgid "remote did not send all necessary objects"
3543msgstr "远程没有发送所有必须的对象"
3544
3545#: builtin/clone.c:610
3546msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3547msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3548
3549#: builtin/clone.c:641
3550msgid "unable to checkout working tree"
3551msgstr "不能检出工作区"
3552
3553#: builtin/clone.c:749
3554msgid "Too many arguments."
3555msgstr "太多参数。"
3556
3557#: builtin/clone.c:753
3558msgid "You must specify a repository to clone."
3559msgstr "您必须指定一个版本库来克隆。"
3560
3561#: builtin/clone.c:764
3562#, c-format
3563msgid "--bare and --origin %s options are incompatible."
3564msgstr "--bare 和 --origin %s 选项不兼容。"
3565
3566#: builtin/clone.c:767
3567msgid "--bare and --separate-git-dir are incompatible."
3568msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3569
3570#: builtin/clone.c:780
3571#, c-format
3572msgid "repository '%s' does not exist"
3573msgstr "版本库 '%s' 不存在"
3574
3575#: builtin/clone.c:785
3576msgid "--depth is ignored in local clones; use file:// instead."
3577msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3578
3579#: builtin/clone.c:795
3580#, c-format
3581msgid "destination path '%s' already exists and is not an empty directory."
3582msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3583
3584#: builtin/clone.c:805
3585#, c-format
3586msgid "working tree '%s' already exists."
3587msgstr "工作区 '%s' 已经存在。"
3588
3589#: builtin/clone.c:818 builtin/clone.c:830
3590#, c-format
3591msgid "could not create leading directories of '%s'"
3592msgstr "不能为 '%s' 创建先导目录"
3593
3594#: builtin/clone.c:821
3595#, c-format
3596msgid "could not create work tree dir '%s'."
3597msgstr "不能为 '%s' 创建工作区目录。"
3598
3599#: builtin/clone.c:840
3600#, c-format
3601msgid "Cloning into bare repository '%s'...\n"
3602msgstr "克隆到裸版本库 '%s'...\n"
3603
3604#: builtin/clone.c:842
3605#, c-format
3606msgid "Cloning into '%s'...\n"
3607msgstr "正克隆到 '%s'...\n"
3608
3609#: builtin/clone.c:877
3610#, c-format
3611msgid "Don't know how to clone %s"
3612msgstr "不知道如何克隆 %s"
3613
3614#: builtin/clone.c:926
3615#, c-format
3616msgid "Remote branch %s not found in upstream %s"
3617msgstr "远程分支 %s 在上游 %s 未发现"
3618
3619#: builtin/clone.c:933
3620msgid "You appear to have cloned an empty repository."
3621msgstr "您似乎克隆了一个空版本库。"
3622
3623#: builtin/column.c:9
3624msgid "git column [options]"
3625msgstr "git column [选项]"
3626
3627#: builtin/column.c:26
3628msgid "lookup config vars"
3629msgstr "查找配置变量"
3630
3631#: builtin/column.c:27 builtin/column.c:28
3632msgid "layout to use"
3633msgstr "要使用的布局"
3634
3635#: builtin/column.c:29
3636msgid "Maximum width"
3637msgstr "最大宽度"
3638
3639#: builtin/column.c:30
3640msgid "Padding space on left border"
3641msgstr "左边框的填充空间"
3642
3643#: builtin/column.c:31
3644msgid "Padding space on right border"
3645msgstr "右边框的填充空间"
3646
3647#: builtin/column.c:32
3648msgid "Padding space between columns"
3649msgstr "两列之间的填充空间"
3650
3651#: builtin/column.c:51
3652msgid "--command must be the first argument"
3653msgstr "--command 必须是第一个参数"
3654
3655#: builtin/commit.c:34
3656msgid "git commit [options] [--] <pathspec>..."
3657msgstr "git commit [选项] [--] <路径匹配>..."
3658
3659#: builtin/commit.c:39
3660msgid "git status [options] [--] <pathspec>..."
3661msgstr "git status [选项] [--] <路径匹配>..."
3662
3663#: builtin/commit.c:44
3664msgid ""
3665"Your name and email address were configured automatically based\n"
3666"on your username and hostname. Please check that they are accurate.\n"
3667"You can suppress this message by setting them explicitly:\n"
3668"\n"
3669"    git config --global user.name \"Your Name\"\n"
3670"    git config --global user.email you@example.com\n"
3671"\n"
3672"After doing this, you may fix the identity used for this commit with:\n"
3673"\n"
3674"    git commit --amend --reset-author\n"
3675msgstr ""
3676"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3677"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
3678"\n"
3679"    git config --global user.name \"Your Name\"\n"
3680"    git config --global user.email you@example.com\n"
3681"\n"
3682"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3683"\n"
3684"    git commit --amend --reset-author\n"
3685
3686#: builtin/commit.c:56
3687msgid ""
3688"You asked to amend the most recent commit, but doing so would make\n"
3689"it empty. You can repeat your command with --allow-empty, or you can\n"
3690"remove the commit entirely with \"git reset HEAD^\".\n"
3691msgstr ""
3692"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3693"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
3694
3695#: builtin/commit.c:61
3696msgid ""
3697"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3698"If you wish to commit it anyway, use:\n"
3699"\n"
3700"    git commit --allow-empty\n"
3701"\n"
3702"Otherwise, please use 'git reset'\n"
3703msgstr ""
3704"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3705"也要提交,使用命令:\n"
3706"\n"
3707"    git commit --allow-empty\n"
3708"\n"
3709"否则,请使用命令 'git reset'\n"
3710
3711#: builtin/commit.c:260
3712msgid "failed to unpack HEAD tree object"
3713msgstr "无法解包 HEAD 树对象"
3714
3715#: builtin/commit.c:302
3716msgid "unable to create temporary index"
3717msgstr "不能创建临时索引"
3718
3719#: builtin/commit.c:308
3720msgid "interactive add failed"
3721msgstr "交互式添加失败"
3722
3723#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412
3724msgid "unable to write new_index file"
3725msgstr "无法写 new_index 文件"
3726
3727#: builtin/commit.c:393
3728msgid "cannot do a partial commit during a merge."
3729msgstr "在合并过程中不能做部分提交。"
3730
3731#: builtin/commit.c:395
3732msgid "cannot do a partial commit during a cherry-pick."
3733msgstr "在拣选过程中不能做部分提交。"
3734
3735#: builtin/commit.c:405
3736msgid "cannot read the index"
3737msgstr "无法读取索引"
3738
3739#: builtin/commit.c:425
3740msgid "unable to write temporary index file"
3741msgstr "无法写临时索引文件"
3742
3743#: builtin/commit.c:513 builtin/commit.c:519
3744#, c-format
3745msgid "invalid commit: %s"
3746msgstr "无效的提交:%s"
3747
3748#: builtin/commit.c:542
3749msgid "malformed --author parameter"
3750msgstr "非法的 --author 参数"
3751
3752#: builtin/commit.c:562
3753#, c-format
3754msgid "Malformed ident string: '%s'"
3755msgstr "非法的身份字符串:'%s'"
3756
3757#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956
3758#, c-format
3759msgid "could not lookup commit %s"
3760msgstr "不能查询提交 %s"
3761
3762#: builtin/commit.c:612 builtin/shortlog.c:270
3763#, c-format
3764msgid "(reading log message from standard input)\n"
3765msgstr "(正从标准输入中读取日志信息)\n"
3766
3767#: builtin/commit.c:614
3768msgid "could not read log from standard input"
3769msgstr "不能从标准输入中读取日志信息"
3770
3771#: builtin/commit.c:618
3772#, c-format
3773msgid "could not read log file '%s'"
3774msgstr "不能读取日志文件 '%s'"
3775
3776#: builtin/commit.c:624
3777msgid "commit has empty message"
3778msgstr "提交说明为空"
3779
3780#: builtin/commit.c:640
3781msgid "could not read MERGE_MSG"
3782msgstr "不能读取 MERGE_MSG"
3783
3784#: builtin/commit.c:644
3785msgid "could not read SQUASH_MSG"
3786msgstr "不能读取 SQUASH_MSG"
3787
3788#: builtin/commit.c:648
3789#, c-format
3790msgid "could not read '%s'"
3791msgstr "不能读取 '%s'"
3792
3793#: builtin/commit.c:709
3794msgid "could not write commit template"
3795msgstr "不能写提交模版"
3796
3797#: builtin/commit.c:720
3798#, c-format
3799msgid ""
3800"\n"
3801"It looks like you may be committing a merge.\n"
3802"If this is not correct, please remove the file\n"
3803"\t%s\n"
3804"and try again.\n"
3805msgstr ""
3806"\n"
3807"似乎您正在做一个合并提交。如果不对,请删除文件\n"
3808"\t%s\n"
3809"然后重试。\n"
3810
3811#: builtin/commit.c:725
3812#, c-format
3813msgid ""
3814"\n"
3815"It looks like you may be committing a cherry-pick.\n"
3816"If this is not correct, please remove the file\n"
3817"\t%s\n"
3818"and try again.\n"
3819msgstr ""
3820"\n"
3821"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
3822"\t%s\n"
3823"然后重试。\n"
3824
3825#: builtin/commit.c:737
3826#, c-format
3827msgid ""
3828"Please enter the commit message for your changes. Lines starting\n"
3829"with '%c' will be ignored, and an empty message aborts the commit.\n"
3830msgstr ""
3831"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
3832"说明将会终止提交。\n"
3833
3834#: builtin/commit.c:742
3835#, c-format
3836msgid ""
3837"Please enter the commit message for your changes. Lines starting\n"
3838"with '%c' will be kept; you may remove them yourself if you want to.\n"
3839"An empty message aborts the commit.\n"
3840msgstr ""
3841"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3842"也可以删除它们。一个空的提交说明将会终止提交。\n"
3843
3844#  译者:为保证在输出中对齐,注意调整句中空格!
3845#: builtin/commit.c:755
3846#, c-format
3847msgid "%sAuthor:    %s"
3848msgstr "%s作者:     %s"
3849
3850#  译者:为保证在输出中对齐,注意调整句中空格!
3851#: builtin/commit.c:762
3852#, c-format
3853msgid "%sCommitter: %s"
3854msgstr "%s提交者:   %s"
3855
3856#: builtin/commit.c:782
3857msgid "Cannot read index"
3858msgstr "无法读取索引"
3859
3860#: builtin/commit.c:819
3861msgid "Error building trees"
3862msgstr "无法创建树对象"
3863
3864#: builtin/commit.c:834 builtin/tag.c:359
3865#, c-format
3866msgid "Please supply the message using either -m or -F option.\n"
3867msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
3868
3869#: builtin/commit.c:931
3870#, c-format
3871msgid "No existing author found with '%s'"
3872msgstr "没有找到匹配 '%s' 的作者"
3873
3874#: builtin/commit.c:946 builtin/commit.c:1140
3875#, c-format
3876msgid "Invalid untracked files mode '%s'"
3877msgstr "无效的未追踪文件参数 '%s'"
3878
3879#: builtin/commit.c:976
3880msgid "Using both --reset-author and --author does not make sense"
3881msgstr "同时使用 --reset-author 和 --author 没有意义"
3882
3883#: builtin/commit.c:987
3884msgid "You have nothing to amend."
3885msgstr "您没有可修补的提交。"
3886
3887#: builtin/commit.c:990
3888msgid "You are in the middle of a merge -- cannot amend."
3889msgstr "您正处于一个合并过程中 -- 无法修补提交。"
3890
3891#: builtin/commit.c:992
3892msgid "You are in the middle of a cherry-pick -- cannot amend."
3893msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
3894
3895#: builtin/commit.c:995
3896msgid "Options --squash and --fixup cannot be used together"
3897msgstr "选项 --squash 和 --fixup 不能同时使用"
3898
3899#: builtin/commit.c:1005
3900msgid "Only one of -c/-C/-F/--fixup can be used."
3901msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3902
3903#: builtin/commit.c:1007
3904msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3905msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
3906
3907#: builtin/commit.c:1015
3908msgid "--reset-author can be used only with -C, -c or --amend."
3909msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
3910
3911#: builtin/commit.c:1032
3912msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3913msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3914
3915#: builtin/commit.c:1034
3916msgid "No paths with --include/--only does not make sense."
3917msgstr "参数 --include/--only 不跟路径没有意义。"
3918
3919#: builtin/commit.c:1036
3920msgid "Clever... amending the last one with dirty index."
3921msgstr "聪明... 在索引不干净下修补最后的提交。"
3922
3923#: builtin/commit.c:1038
3924msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3925msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
3926
3927#: builtin/commit.c:1048 builtin/tag.c:575
3928#, c-format
3929msgid "Invalid cleanup mode %s"
3930msgstr "无效的清理模式 %s"
3931
3932#: builtin/commit.c:1053
3933msgid "Paths with -a does not make sense."
3934msgstr "路径和 -a 选项同时使用没有意义。"
3935
3936#: builtin/commit.c:1059 builtin/commit.c:1194
3937msgid "--long and -z are incompatible"
3938msgstr "--long 和 -z 选项不兼容"
3939
3940#: builtin/commit.c:1154 builtin/commit.c:1390
3941msgid "show status concisely"
3942msgstr "以简洁的格式显示状态"
3943
3944#: builtin/commit.c:1156 builtin/commit.c:1392
3945msgid "show branch information"
3946msgstr "显示分支信息"
3947
3948#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426
3949msgid "machine-readable output"
3950msgstr "机器可读的输出"
3951
3952#: builtin/commit.c:1161 builtin/commit.c:1396
3953msgid "show status in long format (default)"
3954msgstr "以长格式显示状态(默认)"
3955
3956#: builtin/commit.c:1164 builtin/commit.c:1399
3957msgid "terminate entries with NUL"
3958msgstr "条目以NUL字符结尾"
3959
3960#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659
3961#: builtin/fast-export.c:662 builtin/tag.c:459
3962msgid "mode"
3963msgstr "模式"
3964
3965#: builtin/commit.c:1167 builtin/commit.c:1402
3966msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3967msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
3968
3969#: builtin/commit.c:1170
3970msgid "show ignored files"
3971msgstr "显示忽略的文件"
3972
3973#: builtin/commit.c:1171 parse-options.h:151
3974msgid "when"
3975msgstr "何时"
3976
3977#: builtin/commit.c:1172
3978msgid ""
3979"ignore changes to submodules, optional when: all, dirty, untracked. "
3980"(Default: all)"
3981msgstr ""
3982"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
3983
3984#: builtin/commit.c:1174
3985msgid "list untracked files in columns"
3986msgstr "以列的方式显示未跟踪的文件"
3987
3988#: builtin/commit.c:1248
3989msgid "couldn't look up newly created commit"
3990msgstr "无法找到新创建的提交"
3991
3992#: builtin/commit.c:1250
3993msgid "could not parse newly created commit"
3994msgstr "不能解析新创建的提交"
3995
3996#: builtin/commit.c:1291
3997msgid "detached HEAD"
3998msgstr "分离头指针"
3999
4000#  译者:中文字符串拼接,可删除前导空格
4001#: builtin/commit.c:1293
4002msgid " (root-commit)"
4003msgstr "(根提交)"
4004
4005#: builtin/commit.c:1360
4006msgid "suppress summary after successful commit"
4007msgstr "提交成功后不显示概述信息"
4008
4009#: builtin/commit.c:1361
4010msgid "show diff in commit message template"
4011msgstr "在提交说明模板里显示差异"
4012
4013#: builtin/commit.c:1363
4014msgid "Commit message options"
4015msgstr "提交说明选项"
4016
4017#: builtin/commit.c:1364 builtin/tag.c:457
4018msgid "read message from file"
4019msgstr "从文件中读取提交说明"
4020
4021#: builtin/commit.c:1365
4022msgid "author"
4023msgstr "作者"
4024
4025#: builtin/commit.c:1365
4026msgid "override author for commit"
4027msgstr "提交时覆盖作者"
4028
4029#: builtin/commit.c:1366 builtin/gc.c:178
4030msgid "date"
4031msgstr "日期"
4032
4033#: builtin/commit.c:1366
4034msgid "override date for commit"
4035msgstr "提交时覆盖日期"
4036
4037#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533
4038#: builtin/notes.c:690 builtin/tag.c:455
4039msgid "message"
4040msgstr "说明"
4041
4042#: builtin/commit.c:1367
4043msgid "commit message"
4044msgstr "提交说明"
4045
4046#: builtin/commit.c:1368
4047msgid "reuse and edit message from specified commit"
4048msgstr "重用并编辑指定提交的提交说明"
4049
4050#: builtin/commit.c:1369
4051msgid "reuse message from specified commit"
4052msgstr "重用指定提交的提交说明"
4053
4054#: builtin/commit.c:1370
4055msgid "use autosquash formatted message to fixup specified commit"
4056msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4057
4058#: builtin/commit.c:1371
4059msgid "use autosquash formatted message to squash specified commit"
4060msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4061
4062#: builtin/commit.c:1372
4063msgid "the commit is authored by me now (used with -C/-c/--amend)"
4064msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4065
4066#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109
4067msgid "add Signed-off-by:"
4068msgstr "添加 Signed-off-by: 签名"
4069
4070#: builtin/commit.c:1374
4071msgid "use specified template file"
4072msgstr "使用指定的模板文件"
4073
4074#: builtin/commit.c:1375
4075msgid "force edit of commit"
4076msgstr "强制编辑提交"
4077
4078#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4079#: builtin/commit.c:1376
4080msgid "default"
4081msgstr "default"
4082
4083#: builtin/commit.c:1376 builtin/tag.c:460
4084msgid "how to strip spaces and #comments from message"
4085msgstr "设置如何删除提交说明里的空格和#注释"
4086
4087#: builtin/commit.c:1377
4088msgid "include status in commit message template"
4089msgstr "在提交说明模板里包含状态信息"
4090
4091#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461
4092msgid "key id"
4093msgstr "key id"
4094
4095#: builtin/commit.c:1379 builtin/merge.c:216
4096msgid "GPG sign commit"
4097msgstr "GPG 提交签名"
4098
4099#. end commit message options
4100#: builtin/commit.c:1382
4101msgid "Commit contents options"
4102msgstr "提交内容选项"
4103
4104#: builtin/commit.c:1383
4105msgid "commit all changed files"
4106msgstr "提交所有改动的文件"
4107
4108#: builtin/commit.c:1384
4109msgid "add specified files to index for commit"
4110msgstr "添加指定的文件到索引区等待提交"
4111
4112#: builtin/commit.c:1385
4113msgid "interactively add files"
4114msgstr "交互式添加文件"
4115
4116#: builtin/commit.c:1386
4117msgid "interactively add changes"
4118msgstr "交互式添加变更"
4119
4120#: builtin/commit.c:1387
4121msgid "commit only specified files"
4122msgstr "只提交指定的文件"
4123
4124#: builtin/commit.c:1388
4125msgid "bypass pre-commit hook"
4126msgstr "绕过 pre-commit 钩子"
4127
4128#: builtin/commit.c:1389
4129msgid "show what would be committed"
4130msgstr "显示将要提交的内容"
4131
4132#: builtin/commit.c:1400
4133msgid "amend previous commit"
4134msgstr "修改先前的提交"
4135
4136#: builtin/commit.c:1401
4137msgid "bypass post-rewrite hook"
4138msgstr "绕过 post-rewrite 钩子"
4139
4140#: builtin/commit.c:1406
4141msgid "ok to record an empty change"
4142msgstr "允许一个空提交"
4143
4144#: builtin/commit.c:1409
4145msgid "ok to record a change with an empty message"
4146msgstr "允许空的提交说明"
4147
4148#: builtin/commit.c:1441
4149msgid "could not parse HEAD commit"
4150msgstr "不能解析 HEAD 提交"
4151
4152#: builtin/commit.c:1479 builtin/merge.c:510
4153#, c-format
4154msgid "could not open '%s' for reading"
4155msgstr "不能为读入打开 '%s'"
4156
4157#: builtin/commit.c:1486
4158#, c-format
4159msgid "Corrupt MERGE_HEAD file (%s)"
4160msgstr "损坏的 MERGE_HEAD 文件(%s)"
4161
4162#: builtin/commit.c:1493
4163msgid "could not read MERGE_MODE"
4164msgstr "不能读取 MERGE_MODE"
4165
4166#: builtin/commit.c:1512
4167#, c-format
4168msgid "could not read commit message: %s"
4169msgstr "不能读取提交说明:%s"
4170
4171#: builtin/commit.c:1526
4172#, c-format
4173msgid "Aborting commit; you did not edit the message.\n"
4174msgstr "终止提交;您未更改来自模版的提交说明。\n"
4175
4176#: builtin/commit.c:1531
4177#, c-format
4178msgid "Aborting commit due to empty commit message.\n"
4179msgstr "终止提交因为提交说明为空。\n"
4180
4181#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872
4182msgid "failed to write commit object"
4183msgstr "无法写提交对象"
4184
4185#: builtin/commit.c:1567
4186msgid "cannot lock HEAD ref"
4187msgstr "无法锁定 HEAD 引用"
4188
4189#: builtin/commit.c:1571
4190msgid "cannot update HEAD ref"
4191msgstr "无法更新 HEAD 引用"
4192
4193#: builtin/commit.c:1582
4194msgid ""
4195"Repository has been updated, but unable to write\n"
4196"new_index file. Check that disk is not full or quota is\n"
4197"not exceeded, and then \"git reset HEAD\" to recover."
4198msgstr ""
4199"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4200"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4201
4202#: builtin/config.c:7
4203msgid "git config [options]"
4204msgstr "git config [选项]"
4205
4206#: builtin/config.c:51
4207msgid "Config file location"
4208msgstr "配置文件位置"
4209
4210#: builtin/config.c:52
4211msgid "use global config file"
4212msgstr "使用全局配置文件"
4213
4214#: builtin/config.c:53
4215msgid "use system config file"
4216msgstr "使用系统级配置文件"
4217
4218#: builtin/config.c:54
4219msgid "use repository config file"
4220msgstr "使用版本库级配置文件"
4221
4222#: builtin/config.c:55
4223msgid "use given config file"
4224msgstr "使用指定的配置文件"
4225
4226#: builtin/config.c:56
4227msgid "Action"
4228msgstr "操作"
4229
4230#: builtin/config.c:57
4231msgid "get value: name [value-regex]"
4232msgstr "获取值:name [value-regex]"
4233
4234#: builtin/config.c:58
4235msgid "get all values: key [value-regex]"
4236msgstr "获得所有的值:key [value-regex]"
4237
4238#: builtin/config.c:59
4239msgid "get values for regexp: name-regex [value-regex]"
4240msgstr "根据正则表达式获得值:name-regex [value-regex]"
4241
4242#: builtin/config.c:60
4243msgid "replace all matching variables: name value [value_regex]"
4244msgstr "替换所有匹配的变量:name value [value_regex]"
4245
4246#: builtin/config.c:61
4247msgid "add a new variable: name value"
4248msgstr "添加一个新的变量:name value"
4249
4250#: builtin/config.c:62
4251msgid "remove a variable: name [value-regex]"
4252msgstr "删除一个变量:name [value-regex]"
4253
4254#: builtin/config.c:63
4255msgid "remove all matches: name [value-regex]"
4256msgstr "删除所有匹配项:name [value-regex]"
4257
4258#: builtin/config.c:64
4259msgid "rename section: old-name new-name"
4260msgstr "重命名小节:old-name new-name"
4261
4262#: builtin/config.c:65
4263msgid "remove a section: name"
4264msgstr "删除一个小节:name"
4265
4266#: builtin/config.c:66
4267msgid "list all"
4268msgstr "列出所有"
4269
4270#: builtin/config.c:67
4271msgid "open an editor"
4272msgstr "打开一个编辑器"
4273
4274#: builtin/config.c:68 builtin/config.c:69
4275msgid "slot"
4276msgstr "slot"
4277
4278#: builtin/config.c:68
4279msgid "find the color configured: [default]"
4280msgstr "找到配置的颜色:[默认]"
4281
4282#: builtin/config.c:69
4283msgid "find the color setting: [stdout-is-tty]"
4284msgstr "找到颜色设置:[stdout-is-tty]"
4285
4286#: builtin/config.c:70
4287msgid "Type"
4288msgstr "类型"
4289
4290#: builtin/config.c:71
4291msgid "value is \"true\" or \"false\""
4292msgstr "值是 \"true\" 或 \"false\""
4293
4294#: builtin/config.c:72
4295msgid "value is decimal number"
4296msgstr "值是十进制数"
4297
4298#: builtin/config.c:73
4299msgid "value is --bool or --int"
4300msgstr "值是 --bool or --int"
4301
4302#: builtin/config.c:74
4303msgid "value is a path (file or directory name)"
4304msgstr "值是一个路径(文件或目录名)"
4305
4306#: builtin/config.c:75
4307msgid "Other"
4308msgstr "其它"
4309
4310#: builtin/config.c:76
4311msgid "terminate values with NUL byte"
4312msgstr "终止值是NUL字节"
4313
4314#: builtin/config.c:77
4315msgid "respect include directives on lookup"
4316msgstr "查询时参照 include 指令递归查找"
4317
4318#: builtin/count-objects.c:82
4319msgid "git count-objects [-v] [-H | --human-readable]"
4320msgstr "git count-objects [-v] [-H | --human-readable]"
4321
4322#: builtin/count-objects.c:97
4323msgid "print sizes in human readable format"
4324msgstr "以用户可读的格式显示大小"
4325
4326#: builtin/describe.c:15
4327msgid "git describe [options] <committish>*"
4328msgstr "git describe [选项] <提交号>*"
4329
4330#: builtin/describe.c:16
4331msgid "git describe [options] --dirty"
4332msgstr "git describe [选项] --dirty"
4333
4334#: builtin/describe.c:233
4335#, c-format
4336msgid "annotated tag %s not available"
4337msgstr "注释 tag %s 无效"
4338
4339#: builtin/describe.c:237
4340#, c-format
4341msgid "annotated tag %s has no embedded name"
4342msgstr "注释 tag %s 没有嵌入名称"
4343
4344#: builtin/describe.c:239
4345#, c-format
4346msgid "tag '%s' is really '%s' here"
4347msgstr "tag '%s' 的确是在 '%s'"
4348
4349#: builtin/describe.c:266
4350#, c-format
4351msgid "Not a valid object name %s"
4352msgstr "不是一个有效的对象名 %s"
4353
4354#: builtin/describe.c:269
4355#, c-format
4356msgid "%s is not a valid '%s' object"
4357msgstr "%s 不是一个有效的 '%s' 对象"
4358
4359#: builtin/describe.c:286
4360#, c-format
4361msgid "no tag exactly matches '%s'"
4362msgstr "没有 tag 准确匹配 '%s'"
4363
4364#: builtin/describe.c:288
4365#, c-format
4366msgid "searching to describe %s\n"
4367msgstr "搜索描述 %s\n"
4368
4369#: builtin/describe.c:328
4370#, c-format
4371msgid "finished search at %s\n"
4372msgstr "完成搜索 %s\n"
4373
4374#: builtin/describe.c:352
4375#, c-format
4376msgid ""
4377"No annotated tags can describe '%s'.\n"
4378"However, there were unannotated tags: try --tags."
4379msgstr ""
4380"没有注释 tag 能描述 '%s'。\n"
4381"然而,有非注释 tag:尝试 --tags。"
4382
4383#: builtin/describe.c:356
4384#, c-format
4385msgid ""
4386"No tags can describe '%s'.\n"
4387"Try --always, or create some tags."
4388msgstr ""
4389"没有注释 tag 能描述 '%s'。\n"
4390"尝试 --always,或者创建一些 tag。"
4391
4392#: builtin/describe.c:377
4393#, c-format
4394msgid "traversed %lu commits\n"
4395msgstr "已遍历 %lu 个提交\n"
4396
4397#: builtin/describe.c:380
4398#, c-format
4399msgid ""
4400"more than %i tags found; listed %i most recent\n"
4401"gave up search at %s\n"
4402msgstr ""
4403"发现多于 %i 个 tag,列出最近的 %i 个\n"
4404"在 %s 放弃搜索\n"
4405
4406#: builtin/describe.c:402
4407msgid "find the tag that comes after the commit"
4408msgstr "寻找提交之后的 tag(用于描述提交)"
4409
4410#: builtin/describe.c:403
4411msgid "debug search strategy on stderr"
4412msgstr "在标准错误上调试搜索策略"
4413
4414#: builtin/describe.c:404
4415msgid "use any ref"
4416msgstr "使用任意引用"
4417
4418#: builtin/describe.c:405
4419msgid "use any tag, even unannotated"
4420msgstr "使用任意 tag,即使未带注解"
4421
4422#: builtin/describe.c:406
4423msgid "always use long format"
4424msgstr "始终使用长提交号格式"
4425
4426#: builtin/describe.c:409
4427msgid "only output exact matches"
4428msgstr "只输出精确匹配"
4429
4430#: builtin/describe.c:411
4431msgid "consider <n> most recent tags (default: 10)"
4432msgstr "考虑最近 <n> 个 tags(默认:10)"
4433
4434#: builtin/describe.c:413
4435msgid "only consider tags matching <pattern>"
4436msgstr "只考虑匹配 <模式> 的 tags"
4437
4438#: builtin/describe.c:415 builtin/name-rev.c:238
4439msgid "show abbreviated commit object as fallback"
4440msgstr "显示简写的提交号作为后备"
4441
4442#: builtin/describe.c:416
4443msgid "mark"
4444msgstr "标记"
4445
4446#: builtin/describe.c:417
4447msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4448msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4449
4450#: builtin/describe.c:435
4451msgid "--long is incompatible with --abbrev=0"
4452msgstr "--long 与 --abbrev=0 不兼容"
4453
4454#: builtin/describe.c:461
4455msgid "No names found, cannot describe anything."
4456msgstr "没有发现名称,无法描述任何东西。"
4457
4458#: builtin/describe.c:481
4459msgid "--dirty is incompatible with committishes"
4460msgstr "--dirty 不能与提交同时使用"
4461
4462#: builtin/diff.c:79
4463#, c-format
4464msgid "'%s': not a regular file or symlink"
4465msgstr "'%s':不是一个正规文件或符号链接"
4466
4467#: builtin/diff.c:228
4468#, c-format
4469msgid "invalid option: %s"
4470msgstr "无效选项:%s"
4471
4472#: builtin/diff.c:305
4473msgid "Not a git repository"
4474msgstr "不是一个 git 版本库"
4475
4476#: builtin/diff.c:348
4477#, c-format
4478msgid "invalid object '%s' given."
4479msgstr "提供了无效对象 '%s'。"
4480
4481#: builtin/diff.c:353
4482#, c-format
4483msgid "more than %d trees given: '%s'"
4484msgstr "提供了超过 %d 个树对象:'%s'"
4485
4486#: builtin/diff.c:363
4487#, c-format
4488msgid "more than two blobs given: '%s'"
4489msgstr "提供了超过两个数据(blob)对象:'%s'"
4490
4491#: builtin/diff.c:371
4492#, c-format
4493msgid "unhandled object '%s' given."
4494msgstr "提供了无法处理的对象 '%s'。"
4495
4496#: builtin/fast-export.c:22
4497msgid "git fast-export [rev-list-opts]"
4498msgstr "git fast-export [rev-list-opts]"
4499
4500#: builtin/fast-export.c:658
4501msgid "show progress after <n> objects"
4502msgstr "在 <n> 个对象之后显示进度"
4503
4504#: builtin/fast-export.c:660
4505msgid "select handling of signed tags"
4506msgstr "选择如何处理签名 tags"
4507
4508#: builtin/fast-export.c:663
4509msgid "select handling of tags that tag filtered objects"
4510msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4511
4512#: builtin/fast-export.c:666
4513msgid "Dump marks to this file"
4514msgstr "把标记存储到这个文件"
4515
4516#: builtin/fast-export.c:668
4517msgid "Import marks from this file"
4518msgstr "从这个文件导入标记"
4519
4520#: builtin/fast-export.c:670
4521msgid "Fake a tagger when tags lack one"
4522msgstr "当 tags 缺少标记者字段时,假装提供一个"
4523
4524#: builtin/fast-export.c:672
4525msgid "Output full tree for each commit"
4526msgstr "每次提交都输出整个树"
4527
4528#: builtin/fast-export.c:674
4529msgid "Use the done feature to terminate the stream"
4530msgstr "使用 done 功能来终止流"
4531
4532#: builtin/fast-export.c:675
4533msgid "Skip output of blob data"
4534msgstr "跳过数据对象的输出"
4535
4536#: builtin/fetch.c:20
4537msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4538msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
4539
4540#: builtin/fetch.c:21
4541msgid "git fetch [<options>] <group>"
4542msgstr "git fetch [<选项>] <组>"
4543
4544#: builtin/fetch.c:22
4545msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4546msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4547
4548#: builtin/fetch.c:23
4549msgid "git fetch --all [<options>]"
4550msgstr "git fetch --all [<选项>]"
4551
4552#: builtin/fetch.c:60
4553msgid "fetch from all remotes"
4554msgstr "从所有的远程抓取"
4555
4556#: builtin/fetch.c:62
4557msgid "append to .git/FETCH_HEAD instead of overwriting"
4558msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4559
4560#: builtin/fetch.c:64
4561msgid "path to upload pack on remote end"
4562msgstr "上传包到远程的路径"
4563
4564#: builtin/fetch.c:65
4565msgid "force overwrite of local branch"
4566msgstr "强制覆盖本地分支"
4567
4568#: builtin/fetch.c:67
4569msgid "fetch from multiple remotes"
4570msgstr "从多个远程抓取"
4571
4572#: builtin/fetch.c:69
4573msgid "fetch all tags and associated objects"
4574msgstr "抓取所有的 tags 和关联对象"
4575
4576#: builtin/fetch.c:71
4577msgid "do not fetch all tags (--no-tags)"
4578msgstr "不抓取任何 tags (--no-tags)"
4579
4580#: builtin/fetch.c:73
4581msgid "prune remote-tracking branches no longer on remote"
4582msgstr "清除远程已经不存在的分支的跟踪分支"
4583
4584#  译者:可选值,不能翻译
4585#: builtin/fetch.c:74
4586msgid "on-demand"
4587msgstr "on-demand"
4588
4589#: builtin/fetch.c:75
4590msgid "control recursive fetching of submodules"
4591msgstr "控制子模组的递归抓取"
4592
4593#: builtin/fetch.c:79
4594msgid "keep downloaded pack"
4595msgstr "保持下载包"
4596
4597#: builtin/fetch.c:81
4598msgid "allow updating of HEAD ref"
4599msgstr "允许更新 HEAD 引用"
4600
4601#: builtin/fetch.c:84
4602msgid "deepen history of shallow clone"
4603msgstr "深化浅克隆的历史"
4604
4605#: builtin/fetch.c:86
4606msgid "convert to a complete repository"
4607msgstr "转换为一个完整的版本库"
4608
4609#: builtin/fetch.c:88 builtin/log.c:1130
4610msgid "dir"
4611msgstr "目录"
4612
4613#: builtin/fetch.c:89
4614msgid "prepend this to submodule path output"
4615msgstr "在子模组路径输出的前面加上此目录"
4616
4617#: builtin/fetch.c:92
4618msgid "default mode for recursion"
4619msgstr "递归的默认模式"
4620
4621#: builtin/fetch.c:204
4622msgid "Couldn't find remote ref HEAD"
4623msgstr "无法发现远程 HEAD 引用"
4624
4625#: builtin/fetch.c:257
4626#, c-format
4627msgid "object %s not found"
4628msgstr "对象 %s 未发现"
4629
4630#: builtin/fetch.c:262
4631msgid "[up to date]"
4632msgstr "[最新]"
4633
4634#: builtin/fetch.c:276
4635#, c-format
4636msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
4637msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
4638
4639#: builtin/fetch.c:277 builtin/fetch.c:363
4640msgid "[rejected]"
4641msgstr "[已拒绝]"
4642
4643#: builtin/fetch.c:288
4644msgid "[tag update]"
4645msgstr "[tag更新]"
4646
4647#  译者:注意保持前导空格
4648#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4649msgid "  (unable to update local ref)"
4650msgstr "  (不能更新本地引用)"
4651
4652#: builtin/fetch.c:308
4653msgid "[new tag]"
4654msgstr "[新tag]"
4655
4656#: builtin/fetch.c:311
4657msgid "[new branch]"
4658msgstr "[新分支]"
4659
4660#: builtin/fetch.c:314
4661msgid "[new ref]"
4662msgstr "[新引用]"
4663
4664#: builtin/fetch.c:359
4665msgid "unable to update local ref"
4666msgstr "不能更新本地引用"
4667
4668#: builtin/fetch.c:359
4669msgid "forced update"
4670msgstr "强制更新"
4671
4672#: builtin/fetch.c:365
4673msgid "(non-fast-forward)"
4674msgstr "(非快进式)"
4675
4676#: builtin/fetch.c:396 builtin/fetch.c:688
4677#, c-format
4678msgid "cannot open %s: %s\n"
4679msgstr "无法打开 %s:%s\n"
4680
4681#: builtin/fetch.c:405
4682#, c-format
4683msgid "%s did not send all necessary objects\n"
4684msgstr "%s 未发送所有必须的对象\n"
4685
4686#: builtin/fetch.c:491
4687#, c-format
4688msgid "From %.*s\n"
4689msgstr "来自 %.*s\n"
4690
4691#: builtin/fetch.c:502
4692#, c-format
4693msgid ""
4694"some local refs could not be updated; try running\n"
4695" 'git remote prune %s' to remove any old, conflicting branches"
4696msgstr ""
4697"一些本地引用不能被更新;尝试运行\n"
4698" 'git remote prune %s' 来删除旧的、有冲突的分支"
4699
4700#  译者:注意保持前导空格
4701#: builtin/fetch.c:552
4702#, c-format
4703msgid "   (%s will become dangling)"
4704msgstr "   (%s 将成为摇摆状态)"
4705
4706#  译者:注意保持前导空格
4707#: builtin/fetch.c:553
4708#, c-format
4709msgid "   (%s has become dangling)"
4710msgstr "   (%s 已成为摇摆状态)"
4711
4712#: builtin/fetch.c:560
4713msgid "[deleted]"
4714msgstr "[已删除]"
4715
4716#: builtin/fetch.c:561 builtin/remote.c:1055
4717msgid "(none)"
4718msgstr "(无)"
4719
4720#: builtin/fetch.c:678
4721#, c-format
4722msgid "Refusing to fetch into current branch %s of non-bare repository"
4723msgstr "拒绝获取到非裸版本库的当前分支 %s"
4724
4725#: builtin/fetch.c:712
4726#, c-format
4727msgid "Don't know how to fetch from %s"
4728msgstr "不知道如何从 %s 获取"
4729
4730#: builtin/fetch.c:789
4731#, c-format
4732msgid "Option \"%s\" value \"%s\" is not valid for %s"
4733msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4734
4735#: builtin/fetch.c:792
4736#, c-format
4737msgid "Option \"%s\" is ignored for %s\n"
4738msgstr "选项 \"%s\" 为 %s 所忽略\n"
4739
4740#: builtin/fetch.c:894
4741#, c-format
4742msgid "Fetching %s\n"
4743msgstr "正在获取 %s\n"
4744
4745#: builtin/fetch.c:896 builtin/remote.c:100
4746#, c-format
4747msgid "Could not fetch %s"
4748msgstr "不能获取 %s"
4749
4750#: builtin/fetch.c:915
4751msgid ""
4752"No remote repository specified.  Please, specify either a URL or a\n"
4753"remote name from which new revisions should be fetched."
4754msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
4755
4756#: builtin/fetch.c:935
4757msgid "You need to specify a tag name."
4758msgstr "您需要指定一个 tag 名称。"
4759
4760#: builtin/fetch.c:981
4761msgid "--depth and --unshallow cannot be used together"
4762msgstr "--depth 和 --unshallow 不能同时使用"
4763
4764#: builtin/fetch.c:983
4765msgid "--unshallow on a complete repository does not make sense"
4766msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4767
4768#: builtin/fetch.c:1002
4769msgid "fetch --all does not take a repository argument"
4770msgstr "fetch --all 不能带一个版本库参数"
4771
4772#: builtin/fetch.c:1004
4773msgid "fetch --all does not make sense with refspecs"
4774msgstr "fetch --all 带引用表达式没有任何意义"
4775
4776#: builtin/fetch.c:1015
4777#, c-format
4778msgid "No such remote or remote group: %s"
4779msgstr "没有这样的远程或远程组:%s"
4780
4781#: builtin/fetch.c:1023
4782msgid "Fetching a group and specifying refspecs does not make sense"
4783msgstr "获取组并指定引用表达式没有意义"
4784
4785#: builtin/fmt-merge-msg.c:13
4786msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4787msgstr ""
4788"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4789
4790#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701
4791#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175
4792#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4793msgid "n"
4794msgstr "n"
4795
4796#: builtin/fmt-merge-msg.c:664
4797msgid "populate log with at most <n> entries from shortlog"
4798msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
4799
4800#: builtin/fmt-merge-msg.c:667
4801msgid "alias for --log (deprecated)"
4802msgstr "参数 --log 的别名(已弃用)"
4803
4804#: builtin/fmt-merge-msg.c:670
4805msgid "text"
4806msgstr "文本"
4807
4808#: builtin/fmt-merge-msg.c:671
4809msgid "use <text> as start of message"
4810msgstr "使用 <文本> 作为提交说明的开始"
4811
4812#: builtin/fmt-merge-msg.c:672
4813msgid "file to read from"
4814msgstr "从文件中读取"
4815
4816#: builtin/for-each-ref.c:979
4817msgid "git for-each-ref [options] [<pattern>]"
4818msgstr "git for-each-ref [选项] [<模式>]"
4819
4820#: builtin/for-each-ref.c:994
4821msgid "quote placeholders suitably for shells"
4822msgstr "引用占位符适用于 shells"
4823
4824#: builtin/for-each-ref.c:996
4825msgid "quote placeholders suitably for perl"
4826msgstr "引用占位符适用于 perl"
4827
4828#: builtin/for-each-ref.c:998
4829msgid "quote placeholders suitably for python"
4830msgstr "引用占位符适用于 python"
4831
4832#: builtin/for-each-ref.c:1000
4833msgid "quote placeholders suitably for tcl"
4834msgstr "引用占位符适用于 tcl"
4835
4836#: builtin/for-each-ref.c:1003
4837msgid "show only <n> matched refs"
4838msgstr "只显示 <n> 个匹配的引用"
4839
4840#: builtin/for-each-ref.c:1004
4841msgid "format"
4842msgstr "格式"
4843
4844#: builtin/for-each-ref.c:1004
4845msgid "format to use for the output"
4846msgstr "输出格式"
4847
4848#: builtin/for-each-ref.c:1005
4849msgid "key"
4850msgstr "key"
4851
4852#: builtin/for-each-ref.c:1006
4853msgid "field name to sort on"
4854msgstr "排序的字段名"
4855
4856#: builtin/fsck.c:608
4857msgid "git fsck [options] [<object>...]"
4858msgstr "git fsck [选项] [<对象>...]"
4859
4860#: builtin/fsck.c:614
4861msgid "show unreachable objects"
4862msgstr "显示不可达的对象"
4863
4864#: builtin/fsck.c:615
4865msgid "show dangling objects"
4866msgstr "显示摇摆的对象"
4867
4868#: builtin/fsck.c:616
4869msgid "report tags"
4870msgstr "报告 tags"
4871
4872#: builtin/fsck.c:617
4873msgid "report root nodes"
4874msgstr "报告根节点"
4875
4876#: builtin/fsck.c:618
4877msgid "make index objects head nodes"
4878msgstr "将索引亦作为检查的头节点"
4879
4880#: builtin/fsck.c:619
4881msgid "make reflogs head nodes (default)"
4882msgstr "将引用日志作为检查的头节点(默认)"
4883
4884#: builtin/fsck.c:620
4885msgid "also consider packs and alternate objects"
4886msgstr "也考虑包和备用对象"
4887
4888#: builtin/fsck.c:621
4889msgid "enable more strict checking"
4890msgstr "启用更严格的检查"
4891
4892#: builtin/fsck.c:623
4893msgid "write dangling objects in .git/lost-found"
4894msgstr "将摇摆对象写入 .git/lost-found 中"
4895
4896#: builtin/fsck.c:624 builtin/prune.c:134
4897msgid "show progress"
4898msgstr "显示进度"
4899
4900#: builtin/gc.c:22
4901msgid "git gc [options]"
4902msgstr "git gc [选项]"
4903
4904#: builtin/gc.c:63
4905#, c-format
4906msgid "Invalid %s: '%s'"
4907msgstr "无效的 %s:'%s'"
4908
4909#: builtin/gc.c:90
4910#, c-format
4911msgid "insanely long object directory %.*s"
4912msgstr "不正常的长对象目录 %.*s"
4913
4914#: builtin/gc.c:179
4915msgid "prune unreferenced objects"
4916msgstr "清除未引用的对象"
4917
4918#: builtin/gc.c:181
4919msgid "be more thorough (increased runtime)"
4920msgstr "更彻底(增加运行时间)"
4921
4922#: builtin/gc.c:182
4923msgid "enable auto-gc mode"
4924msgstr "启用自动垃圾回收模式"
4925
4926#: builtin/gc.c:222
4927#, c-format
4928msgid ""
4929"Auto packing the repository for optimum performance. You may also\n"
4930"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4931msgstr ""
4932"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4933"参见 \"git help gc\" 以获取更多信息。\n"
4934
4935#: builtin/gc.c:249
4936msgid ""
4937"There are too many unreachable loose objects; run 'git prune' to remove them."
4938msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
4939
4940#: builtin/grep.c:22
4941msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4942msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
4943
4944#: builtin/grep.c:217
4945#, c-format
4946msgid "grep: failed to create thread: %s"
4947msgstr "grep:无法创建线程:%s"
4948
4949#: builtin/grep.c:365
4950#, c-format
4951msgid "Failed to chdir: %s"
4952msgstr "无法切换目录:%s"
4953
4954#: builtin/grep.c:443 builtin/grep.c:478
4955#, c-format
4956msgid "unable to read tree (%s)"
4957msgstr "无法读取树(%s)"
4958
4959#: builtin/grep.c:493
4960#, c-format
4961msgid "unable to grep from object of type %s"
4962msgstr "无法抓取来自于 %s 类型的对象"
4963
4964#: builtin/grep.c:551
4965#, c-format
4966msgid "switch `%c' expects a numerical value"
4967msgstr "开关 `%c' 期望一个数字值"
4968
4969#: builtin/grep.c:568
4970#, c-format
4971msgid "cannot open '%s'"
4972msgstr "不能打开 '%s'"
4973
4974#: builtin/grep.c:643
4975msgid "search in index instead of in the work tree"
4976msgstr "在索引区搜索而不是在工作区"
4977
4978#: builtin/grep.c:645
4979msgid "find in contents not managed by git"
4980msgstr "在未被 git 管理的内容中查找"
4981
4982#  译者:中文字符串拼接,可删除前导空格
4983#: builtin/grep.c:647
4984msgid "search in both tracked and untracked files"
4985msgstr "在跟踪和未跟踪的文件中搜索"
4986
4987#: builtin/grep.c:649
4988msgid "search also in ignored files"
4989msgstr "也在忽略的文件中搜索"
4990
4991#: builtin/grep.c:652
4992msgid "show non-matching lines"
4993msgstr "显示未匹配的行"
4994
4995#: builtin/grep.c:654
4996msgid "case insensitive matching"
4997msgstr "不区分大小写匹配"
4998
4999#: builtin/grep.c:656
5000msgid "match patterns only at word boundaries"
5001msgstr "只在单词边界匹配模式"
5002
5003#: builtin/grep.c:658
5004msgid "process binary files as text"
5005msgstr "把二进制文件当做文本处理"
5006
5007#: builtin/grep.c:660
5008msgid "don't match patterns in binary files"
5009msgstr "不在二进制文件中匹配模式"
5010
5011#: builtin/grep.c:663
5012msgid "descend at most <depth> levels"
5013msgstr "最多以指定的深度向下寻找"
5014
5015#: builtin/grep.c:667
5016msgid "use extended POSIX regular expressions"
5017msgstr "使用扩展的 POSIX 正则表达式"
5018
5019#: builtin/grep.c:670
5020msgid "use basic POSIX regular expressions (default)"
5021msgstr "使用基本的 POSIX 正则表达式(默认)"
5022
5023#: builtin/grep.c:673
5024msgid "interpret patterns as fixed strings"
5025msgstr "把模式解析为固定的字符串"
5026
5027#: builtin/grep.c:676
5028msgid "use Perl-compatible regular expressions"
5029msgstr "使用 Perl 兼容的正则表达式"
5030
5031#: builtin/grep.c:679
5032msgid "show line numbers"
5033msgstr "显示行号"
5034
5035#: builtin/grep.c:680
5036msgid "don't show filenames"
5037msgstr "不显示文件名"
5038
5039#: builtin/grep.c:681
5040msgid "show filenames"
5041msgstr "显示文件名"
5042
5043#: builtin/grep.c:683
5044msgid "show filenames relative to top directory"
5045msgstr "显示相对于顶级目录的文件名"
5046
5047#: builtin/grep.c:685
5048msgid "show only filenames instead of matching lines"
5049msgstr "只显示文件名而不显示匹配的行"
5050
5051#: builtin/grep.c:687
5052msgid "synonym for --files-with-matches"
5053msgstr "和 --files-with-matches 同义"
5054
5055#: builtin/grep.c:690
5056msgid "show only the names of files without match"
5057msgstr "只显示未匹配的文件名"
5058
5059#: builtin/grep.c:692
5060msgid "print NUL after filenames"
5061msgstr "在文件名后输出 NUL 字符"
5062
5063#: builtin/grep.c:694
5064msgid "show the number of matches instead of matching lines"
5065msgstr "显示总匹配行数,而不显示匹配的行"
5066
5067#: builtin/grep.c:695
5068msgid "highlight matches"
5069msgstr "高亮显示匹配项"
5070
5071#: builtin/grep.c:697
5072msgid "print empty line between matches from different files"
5073msgstr "在不同文件的匹配项之间打印空行"
5074
5075#: builtin/grep.c:699
5076msgid "show filename only once above matches from same file"
5077msgstr "只在同一文件的匹配项的上面显示一次文件名"
5078
5079#: builtin/grep.c:702
5080msgid "show <n> context lines before and after matches"
5081msgstr "显示匹配项前后的 <n> 行上下文"
5082
5083#: builtin/grep.c:705
5084msgid "show <n> context lines before matches"
5085msgstr "显示匹配项前 <n> 行上下文"
5086
5087#: builtin/grep.c:707
5088msgid "show <n> context lines after matches"
5089msgstr "显示匹配项后 <n> 行上下文"
5090
5091#: builtin/grep.c:708
5092msgid "shortcut for -C NUM"
5093msgstr "快捷键 -C 数字"
5094
5095#: builtin/grep.c:711
5096msgid "show a line with the function name before matches"
5097msgstr "在匹配的前面显示一行函数名"
5098
5099#: builtin/grep.c:713
5100msgid "show the surrounding function"
5101msgstr "显示所在函数的前后内容"
5102
5103#: builtin/grep.c:716
5104msgid "read patterns from file"
5105msgstr "从文件读取模式"
5106
5107#: builtin/grep.c:718
5108msgid "match <pattern>"
5109msgstr "匹配 <模式>"
5110
5111#: builtin/grep.c:720
5112msgid "combine patterns specified with -e"
5113msgstr "组合用 -e 参数设定的模式"
5114
5115#: builtin/grep.c:732
5116msgid "indicate hit with exit status without output"
5117msgstr "不输出,而用退出码标识命中状态"
5118
5119#: builtin/grep.c:734
5120msgid "show only matches from files that match all patterns"
5121msgstr "只显示匹配所有模式的文件中的匹配"
5122
5123#: builtin/grep.c:736
5124msgid "show parse tree for grep expression"
5125msgstr "显示 grep 表达式的解析树"
5126
5127#: builtin/grep.c:740
5128msgid "pager"
5129msgstr "分页"
5130
5131#: builtin/grep.c:740
5132msgid "show matching files in the pager"
5133msgstr "分页显示匹配的文件"
5134
5135#: builtin/grep.c:743
5136msgid "allow calling of grep(1) (ignored by this build)"
5137msgstr "允许调用 grep(1)(本次构建忽略)"
5138
5139#: builtin/grep.c:744 builtin/show-ref.c:184
5140msgid "show usage"
5141msgstr "显示用法"
5142
5143#: builtin/grep.c:811
5144msgid "no pattern given."
5145msgstr "未提供模式匹配。"
5146
5147#: builtin/grep.c:866
5148msgid "--open-files-in-pager only works on the worktree"
5149msgstr "--open-files-in-pager 仅用于工作区"
5150
5151#: builtin/grep.c:889
5152msgid "--cached or --untracked cannot be used with --no-index."
5153msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5154
5155#: builtin/grep.c:894
5156msgid "--no-index or --untracked cannot be used with revs."
5157msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5158
5159#: builtin/grep.c:897
5160msgid "--[no-]exclude-standard cannot be used for tracked contents."
5161msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5162
5163#: builtin/grep.c:905
5164msgid "both --cached and trees are given."
5165msgstr "同时给出了 --cached 和树对象。"
5166
5167#: builtin/hash-object.c:60
5168msgid ""
5169"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5170"<file>..."
5171msgstr ""
5172"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5173"<文件>..."
5174
5175#: builtin/hash-object.c:61
5176msgid "git hash-object  --stdin-paths < <list-of-paths>"
5177msgstr "git hash-object  --stdin-paths < <路径列表>"
5178
5179#: builtin/hash-object.c:72
5180msgid "type"
5181msgstr "类型"
5182
5183#: builtin/hash-object.c:72
5184msgid "object type"
5185msgstr "对象类型"
5186
5187#: builtin/hash-object.c:73
5188msgid "write the object into the object database"
5189msgstr "将对象写入对象数据库"
5190
5191#: builtin/hash-object.c:74
5192msgid "read the object from stdin"
5193msgstr "从标准输入读取对象"
5194
5195#: builtin/hash-object.c:76
5196msgid "store file as is without filters"
5197msgstr "原样存储文件不使用过滤器"
5198
5199#: builtin/hash-object.c:77
5200msgid "process file as it were from this path"
5201msgstr "处理文件并假设其来自于此路径"
5202
5203#: builtin/help.c:43
5204msgid "print all available commands"
5205msgstr "打印所有可用的命令"
5206
5207#: builtin/help.c:44
5208msgid "print list of useful guides"
5209msgstr "显示有用的指南列表"
5210
5211#: builtin/help.c:45
5212msgid "show man page"
5213msgstr "显示 man 手册"
5214
5215#: builtin/help.c:46
5216msgid "show manual in web browser"
5217msgstr "在 web 浏览器中显示手册"
5218
5219#: builtin/help.c:48
5220msgid "show info page"
5221msgstr "显示 info 手册"
5222
5223#: builtin/help.c:54
5224msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5225msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5226
5227#: builtin/help.c:66
5228#, c-format
5229msgid "unrecognized help format '%s'"
5230msgstr "未能识别的帮助格式 '%s'"
5231
5232#: builtin/help.c:94
5233msgid "Failed to start emacsclient."
5234msgstr "无法启动 emacsclient。"
5235
5236#: builtin/help.c:107
5237msgid "Failed to parse emacsclient version."
5238msgstr "无法解析 emacsclient 版本。"
5239
5240#: builtin/help.c:115
5241#, c-format
5242msgid "emacsclient version '%d' too old (< 22)."
5243msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5244
5245#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178
5246#, c-format
5247msgid "failed to exec '%s': %s"
5248msgstr "无法执行 '%s':%s"
5249
5250#: builtin/help.c:218
5251#, c-format
5252msgid ""
5253"'%s': path for unsupported man viewer.\n"
5254"Please consider using 'man.<tool>.cmd' instead."
5255msgstr ""
5256"'%s':不支持的 man 手册查看器的路径。\n"
5257"请使用 'man.<tool>.cmd'。"
5258
5259#: builtin/help.c:230
5260#, c-format
5261msgid ""
5262"'%s': cmd for supported man viewer.\n"
5263"Please consider using 'man.<tool>.path' instead."
5264msgstr ""
5265"'%s': 支持的 man 手册查看器命令。\n"
5266"请使用 'man.<tool>.path'。"
5267
5268#: builtin/help.c:351
5269#, c-format
5270msgid "'%s': unknown man viewer."
5271msgstr "'%s':未知的 man 查看器。"
5272
5273#: builtin/help.c:368
5274msgid "no man viewer handled the request"
5275msgstr "没有 man 查看器处理此请求"
5276
5277#: builtin/help.c:376
5278msgid "no info viewer handled the request"
5279msgstr "没有 info 查看器处理此请求"
5280
5281#: builtin/help.c:422
5282msgid "Defining attributes per path"
5283msgstr "定义路径的属性"
5284
5285#: builtin/help.c:423
5286msgid "A Git glossary"
5287msgstr "Git 词汇表"
5288
5289#: builtin/help.c:424
5290msgid "Specifies intentionally untracked files to ignore"
5291msgstr "忽略指定的未跟踪文件"
5292
5293#: builtin/help.c:425
5294msgid "Defining submodule properties"
5295msgstr "定义子模组属性"
5296
5297#: builtin/help.c:426
5298msgid "Specifying revisions and ranges for Git"
5299msgstr "指定 Git 的版本和版本范围"
5300
5301#: builtin/help.c:427
5302msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5303msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5304
5305#: builtin/help.c:428
5306msgid "An overview of recommended workflows with Git"
5307msgstr "Git 推荐的工作流概览"
5308
5309#: builtin/help.c:440
5310msgid "The common Git guides are:\n"
5311msgstr "最常用的 Git 向导有:\n"
5312
5313#: builtin/help.c:462 builtin/help.c:478
5314#, c-format
5315msgid "usage: %s%s"
5316msgstr "用法:%s%s"
5317
5318#: builtin/help.c:494
5319#, c-format
5320msgid "`git %s' is aliased to `%s'"
5321msgstr "`git %s' 是 `%s' 的别名"
5322
5323#: builtin/index-pack.c:182
5324#, c-format
5325msgid "object type mismatch at %s"
5326msgstr "%s 的对象类型不匹配"
5327
5328#: builtin/index-pack.c:202
5329msgid "object of unexpected type"
5330msgstr "意外的类型的对象"
5331
5332#: builtin/index-pack.c:239
5333#, c-format
5334msgid "cannot fill %d byte"
5335msgid_plural "cannot fill %d bytes"
5336msgstr[0] "无法填充 %d 字节"
5337msgstr[1] "无法填充 %d 字节"
5338
5339#: builtin/index-pack.c:249
5340msgid "early EOF"
5341msgstr "过早的文件结束符(EOF)"
5342
5343#: builtin/index-pack.c:250
5344msgid "read error on input"
5345msgstr "输入上的读错误"
5346
5347#: builtin/index-pack.c:262
5348msgid "used more bytes than were available"
5349msgstr "用掉了超过可用的字节"
5350
5351#: builtin/index-pack.c:269
5352msgid "pack too large for current definition of off_t"
5353msgstr "包太大超过了当前 off_t 的定义"
5354
5355#: builtin/index-pack.c:285
5356#, c-format
5357msgid "unable to create '%s'"
5358msgstr "不能创建 '%s'"
5359
5360#: builtin/index-pack.c:290
5361#, c-format
5362msgid "cannot open packfile '%s'"
5363msgstr "无法打开包文件 '%s'"
5364
5365#: builtin/index-pack.c:304
5366msgid "pack signature mismatch"
5367msgstr "包签名不匹配"
5368
5369#: builtin/index-pack.c:306
5370#, c-format
5371msgid "pack version %<PRIu32> unsupported"
5372msgstr "不支持包版本 %<PRIu32>"
5373
5374#: builtin/index-pack.c:324
5375#, c-format
5376msgid "pack has bad object at offset %lu: %s"
5377msgstr "包中有错误的对象位于 %lu:%s"
5378
5379#: builtin/index-pack.c:446
5380#, c-format
5381msgid "inflate returned %d"
5382msgstr "解压缩返回 %d"
5383
5384#: builtin/index-pack.c:495
5385msgid "offset value overflow for delta base object"
5386msgstr "偏移值覆盖了 delta 基准对象"
5387
5388#: builtin/index-pack.c:503
5389msgid "delta base offset is out of bound"
5390msgstr "delta 基准偏移越界"
5391
5392#: builtin/index-pack.c:511
5393#, c-format
5394msgid "unknown object type %d"
5395msgstr "未知对象类型 %d"
5396
5397#: builtin/index-pack.c:542
5398msgid "cannot pread pack file"
5399msgstr "无法读取包文件"
5400
5401#: builtin/index-pack.c:544
5402#, c-format
5403msgid "premature end of pack file, %lu byte missing"
5404msgid_plural "premature end of pack file, %lu bytes missing"
5405msgstr[0] "包文件过早结束,缺少 %lu 字节"
5406msgstr[1] "包文件过早结束,缺少 %lu 字节"
5407
5408#: builtin/index-pack.c:570
5409msgid "serious inflate inconsistency"
5410msgstr "解压缩严重的不一致"
5411
5412#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690
5413#: builtin/index-pack.c:724 builtin/index-pack.c:733
5414#, c-format
5415msgid "SHA1 COLLISION FOUND WITH %s !"
5416msgstr "发现 %s 出现 SHA1 冲突!"
5417
5418#: builtin/index-pack.c:664 builtin/pack-objects.c:170
5419#: builtin/pack-objects.c:262
5420#, c-format
5421msgid "unable to read %s"
5422msgstr "不能读 %s"
5423
5424#: builtin/index-pack.c:730
5425#, c-format
5426msgid "cannot read existing object %s"
5427msgstr "不能读取现存对象 %s"
5428
5429#: builtin/index-pack.c:744
5430#, c-format
5431msgid "invalid blob object %s"
5432msgstr "无效的数据(blob)对象 %s"
5433
5434#: builtin/index-pack.c:759
5435#, c-format
5436msgid "invalid %s"
5437msgstr "无效的 %s"
5438
5439#: builtin/index-pack.c:761
5440msgid "Error in object"
5441msgstr "对象中出错"
5442
5443#: builtin/index-pack.c:763
5444#, c-format
5445msgid "Not all child objects of %s are reachable"
5446msgstr "%s 的所有子对象并非都可达"
5447
5448#: builtin/index-pack.c:833 builtin/index-pack.c:863
5449msgid "failed to apply delta"
5450msgstr "无法应用 delta"
5451
5452#: builtin/index-pack.c:1004
5453msgid "Receiving objects"
5454msgstr "接收对象中"
5455
5456#: builtin/index-pack.c:1004
5457msgid "Indexing objects"
5458msgstr "索引对象中"
5459
5460#: builtin/index-pack.c:1030
5461msgid "pack is corrupted (SHA1 mismatch)"
5462msgstr "包冲突(SHA1 不匹配)"
5463
5464#: builtin/index-pack.c:1035
5465msgid "cannot fstat packfile"
5466msgstr "不能枚举包文件状态"
5467
5468#: builtin/index-pack.c:1038
5469msgid "pack has junk at the end"
5470msgstr "包的结尾有垃圾数据"
5471
5472#: builtin/index-pack.c:1049
5473msgid "confusion beyond insanity in parse_pack_objects()"
5474msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5475
5476#: builtin/index-pack.c:1072
5477msgid "Resolving deltas"
5478msgstr "处理 delta 中"
5479
5480#: builtin/index-pack.c:1082
5481#, c-format
5482msgid "unable to create thread: %s"
5483msgstr "不能创建线程:%s"
5484
5485#: builtin/index-pack.c:1124
5486msgid "confusion beyond insanity"
5487msgstr "不可理喻"
5488
5489#: builtin/index-pack.c:1132
5490#, c-format
5491msgid "completed with %d local objects"
5492msgstr "完成 %d 个本地对象"
5493
5494#: builtin/index-pack.c:1142
5495#, c-format
5496msgid "Unexpected tail checksum for %s (disk corruption?)"
5497msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5498
5499#: builtin/index-pack.c:1146
5500#, c-format
5501msgid "pack has %d unresolved delta"
5502msgid_plural "pack has %d unresolved deltas"
5503msgstr[0] "包有 %d 个未解决的 delta"
5504msgstr[1] "包有 %d 个未解决的 delta"
5505
5506#: builtin/index-pack.c:1171
5507#, c-format
5508msgid "unable to deflate appended object (%d)"
5509msgstr "不能压缩附加对象(%d)"
5510
5511#: builtin/index-pack.c:1250
5512#, c-format
5513msgid "local object %s is corrupt"
5514msgstr "本地对象 %s 已损坏"
5515
5516#: builtin/index-pack.c:1274
5517msgid "error while closing pack file"
5518msgstr "关闭包文件时出错"
5519
5520#: builtin/index-pack.c:1287
5521#, c-format
5522msgid "cannot write keep file '%s'"
5523msgstr "无法写保留文件 '%s'"
5524
5525#: builtin/index-pack.c:1295
5526#, c-format
5527msgid "cannot close written keep file '%s'"
5528msgstr "无法关闭保留文件 '%s'"
5529
5530#: builtin/index-pack.c:1308
5531msgid "cannot store pack file"
5532msgstr "无法存储包文件"
5533
5534#: builtin/index-pack.c:1319
5535msgid "cannot store index file"
5536msgstr "无法存储索引文件"
5537
5538#: builtin/index-pack.c:1352
5539#, c-format
5540msgid "bad pack.indexversion=%<PRIu32>"
5541msgstr "坏的 pack.indexversion=%<PRIu32>"
5542
5543#: builtin/index-pack.c:1358
5544#, c-format
5545msgid "invalid number of threads specified (%d)"
5546msgstr "指定的线程数无效(%d)"
5547
5548#: builtin/index-pack.c:1362 builtin/index-pack.c:1535
5549#, c-format
5550msgid "no threads support, ignoring %s"
5551msgstr "没有线程支持,忽略 %s"
5552
5553#: builtin/index-pack.c:1420
5554#, c-format
5555msgid "Cannot open existing pack file '%s'"
5556msgstr "无法打开现存包文件 '%s'"
5557
5558#: builtin/index-pack.c:1422
5559#, c-format
5560msgid "Cannot open existing pack idx file for '%s'"
5561msgstr "无法为 %s 打开包索引文件"
5562
5563#: builtin/index-pack.c:1469
5564#, c-format
5565msgid "non delta: %d object"
5566msgid_plural "non delta: %d objects"
5567msgstr[0] "非 delta:%d 个对象"
5568msgstr[1] "非 delta:%d 个对象"
5569
5570#: builtin/index-pack.c:1476
5571#, c-format
5572msgid "chain length = %d: %lu object"
5573msgid_plural "chain length = %d: %lu objects"
5574msgstr[0] "链长 = %d: %lu 对象"
5575msgstr[1] "链长 = %d: %lu 对象"
5576
5577#: builtin/index-pack.c:1503
5578msgid "Cannot come back to cwd"
5579msgstr "无法返回当前工作目录"
5580
5581#: builtin/index-pack.c:1547 builtin/index-pack.c:1550
5582#: builtin/index-pack.c:1562 builtin/index-pack.c:1566
5583#, c-format
5584msgid "bad %s"
5585msgstr "错误选项 %s"
5586
5587#: builtin/index-pack.c:1580
5588msgid "--fix-thin cannot be used without --stdin"
5589msgstr "--fix-thin 不能和 --stdin 同时使用"
5590
5591#: builtin/index-pack.c:1584 builtin/index-pack.c:1594
5592#, c-format
5593msgid "packfile name '%s' does not end with '.pack'"
5594msgstr "包名 '%s' 没有以 '.pack' 结尾"
5595
5596#: builtin/index-pack.c:1603
5597msgid "--verify with no packfile name given"
5598msgstr "--verify 没有提供包名参数"
5599
5600#: builtin/init-db.c:35
5601#, c-format
5602msgid "Could not make %s writable by group"
5603msgstr "不能设置 %s 为组可写"
5604
5605#: builtin/init-db.c:62
5606#, c-format
5607msgid "insanely long template name %s"
5608msgstr "太长的模版名 %s"
5609
5610#: builtin/init-db.c:67
5611#, c-format
5612msgid "cannot stat '%s'"
5613msgstr "不能枚举 '%s' 状态"
5614
5615#: builtin/init-db.c:73
5616#, c-format
5617msgid "cannot stat template '%s'"
5618msgstr "不能枚举模版 '%s' 状态"
5619
5620#: builtin/init-db.c:80
5621#, c-format
5622msgid "cannot opendir '%s'"
5623msgstr "不能打开目录 '%s'"
5624
5625#: builtin/init-db.c:97
5626#, c-format
5627msgid "cannot readlink '%s'"
5628msgstr "不能读取链接 '%s'"
5629
5630#: builtin/init-db.c:99
5631#, c-format
5632msgid "insanely long symlink %s"
5633msgstr "太长的符号链接 %s"
5634
5635#: builtin/init-db.c:102
5636#, c-format
5637msgid "cannot symlink '%s' '%s'"
5638msgstr "不能自 '%s' 到 '%s' 创建符号链接"
5639
5640#: builtin/init-db.c:106
5641#, c-format
5642msgid "cannot copy '%s' to '%s'"
5643msgstr "不能拷贝 '%s' 至 '%s'"
5644
5645#: builtin/init-db.c:110
5646#, c-format
5647msgid "ignoring template %s"
5648msgstr "忽略模版 %s"
5649
5650#: builtin/init-db.c:133
5651#, c-format
5652msgid "insanely long template path %s"
5653msgstr "太长的模版路径 %s"
5654
5655#: builtin/init-db.c:141
5656#, c-format
5657msgid "templates not found %s"
5658msgstr "模版未找到 %s"
5659
5660#: builtin/init-db.c:154
5661#, c-format
5662msgid "not copying templates of a wrong format version %d from '%s'"
5663msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
5664
5665#: builtin/init-db.c:192
5666#, c-format
5667msgid "insane git directory %s"
5668msgstr "不正常的 git 目录 %s"
5669
5670#: builtin/init-db.c:323 builtin/init-db.c:326
5671#, c-format
5672msgid "%s already exists"
5673msgstr "%s 已经存在"
5674
5675#: builtin/init-db.c:355
5676#, c-format
5677msgid "unable to handle file type %d"
5678msgstr "不能处理 %d 类型的文件"
5679
5680#: builtin/init-db.c:358
5681#, c-format
5682msgid "unable to move %s to %s"
5683msgstr "不能移动 %s 至 %s"
5684
5685#: builtin/init-db.c:363
5686#, c-format
5687msgid "Could not create git link %s"
5688msgstr "不能创建 git link %s"
5689
5690#.
5691#. * TRANSLATORS: The first '%s' is either "Reinitialized
5692#. * existing" or "Initialized empty", the second " shared" or
5693#. * "", and the last '%s%s' is the verbatim directory name.
5694#.
5695#: builtin/init-db.c:420
5696#, c-format
5697msgid "%s%s Git repository in %s%s\n"
5698msgstr "%s%s Git 版本库于 %s%s\n"
5699
5700#: builtin/init-db.c:421
5701msgid "Reinitialized existing"
5702msgstr "重新初始化现存的"
5703
5704#: builtin/init-db.c:421
5705msgid "Initialized empty"
5706msgstr "初始化空的"
5707
5708#  译者:中文字符串拼接,可删除前导空格
5709#: builtin/init-db.c:422
5710msgid " shared"
5711msgstr "共享"
5712
5713#: builtin/init-db.c:441
5714msgid "cannot tell cwd"
5715msgstr "无法获知当前路径"
5716
5717#: builtin/init-db.c:467
5718msgid ""
5719"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5720"shared[=<permissions>]] [directory]"
5721msgstr ""
5722"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5723"[目录]"
5724
5725#: builtin/init-db.c:490
5726msgid "permissions"
5727msgstr "权限"
5728
5729#: builtin/init-db.c:491
5730msgid "specify that the git repository is to be shared amongst several users"
5731msgstr "指定 git 版本库是多个用户之间共享的"
5732
5733#: builtin/init-db.c:493 builtin/prune-packed.c:77
5734msgid "be quiet"
5735msgstr "保持安静"
5736
5737#: builtin/init-db.c:522 builtin/init-db.c:529
5738#, c-format
5739msgid "cannot mkdir %s"
5740msgstr "不能创建目录 %s"
5741
5742#: builtin/init-db.c:533
5743#, c-format
5744msgid "cannot chdir to %s"
5745msgstr "不能切换目录到 %s"
5746
5747#: builtin/init-db.c:555
5748#, c-format
5749msgid ""
5750"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5751"dir=<directory>)"
5752msgstr ""
5753"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5754"dir=<directory>)"
5755
5756#: builtin/init-db.c:579
5757msgid "Cannot access current working directory"
5758msgstr "不能访问当前工作目录"
5759
5760#: builtin/init-db.c:586
5761#, c-format
5762msgid "Cannot access work tree '%s'"
5763msgstr "不能访问工作区 '%s'"
5764
5765#: builtin/log.c:40
5766msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
5767msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
5768
5769#: builtin/log.c:41
5770msgid "   or: git show [options] <object>..."
5771msgstr "   或者:git show [选项] <对象>..."
5772
5773#: builtin/log.c:103
5774msgid "suppress diff output"
5775msgstr "不显示差异输出"
5776
5777#: builtin/log.c:104
5778msgid "show source"
5779msgstr "显示源"
5780
5781#: builtin/log.c:105
5782msgid "Use mail map file"
5783msgstr "使用邮件映射文件"
5784
5785#: builtin/log.c:106
5786msgid "decorate options"
5787msgstr "修饰选项"
5788
5789#: builtin/log.c:199
5790#, c-format
5791msgid "Final output: %d %s\n"
5792msgstr "最终输出:%d %s\n"
5793
5794#: builtin/log.c:422 builtin/log.c:514
5795#, c-format
5796msgid "Could not read object %s"
5797msgstr "不能读取对象 %s"
5798
5799#: builtin/log.c:538
5800#, c-format
5801msgid "Unknown type: %d"
5802msgstr "未知类型:%d"
5803
5804#: builtin/log.c:638
5805msgid "format.headers without value"
5806msgstr "format.headers 没有值"
5807
5808#: builtin/log.c:720
5809msgid "name of output directory is too long"
5810msgstr "输出目录名太长"
5811
5812#: builtin/log.c:736
5813#, c-format
5814msgid "Cannot open patch file %s"
5815msgstr "无法打开补丁文件 %s"
5816
5817#: builtin/log.c:750
5818msgid "Need exactly one range."
5819msgstr "只需要一个范围。"
5820
5821#: builtin/log.c:758
5822msgid "Not a range."
5823msgstr "不是一个范围。"
5824
5825#: builtin/log.c:860
5826msgid "Cover letter needs email format"
5827msgstr "信封需要邮件地址格式"
5828
5829#: builtin/log.c:936
5830#, c-format
5831msgid "insane in-reply-to: %s"
5832msgstr "不正常的 in-reply-to:%s"
5833
5834#: builtin/log.c:964
5835msgid "git format-patch [options] [<since> | <revision range>]"
5836msgstr "git format-patch [选项] [<从> | <修订集范围>]"
5837
5838#: builtin/log.c:1009
5839msgid "Two output directories?"
5840msgstr "两个输出目录?"
5841
5842#: builtin/log.c:1108
5843msgid "use [PATCH n/m] even with a single patch"
5844msgstr "使用 [PATCH n/m],即使只有一个补丁"
5845
5846#: builtin/log.c:1111
5847msgid "use [PATCH] even with multiple patches"
5848msgstr "使用 [PATCH],即使有多个补丁"
5849
5850#: builtin/log.c:1115
5851msgid "print patches to standard out"
5852msgstr "打印补丁到标准输出"
5853
5854#: builtin/log.c:1117
5855msgid "generate a cover letter"
5856msgstr "生成一封附信"
5857
5858#: builtin/log.c:1119
5859msgid "use simple number sequence for output file names"
5860msgstr "使用简单的数字序列作为输出文件名"
5861
5862#: builtin/log.c:1120
5863msgid "sfx"
5864msgstr "后缀"
5865
5866#: builtin/log.c:1121
5867msgid "use <sfx> instead of '.patch'"
5868msgstr "使用 <后缀> 代替 '.patch'"
5869
5870#: builtin/log.c:1123
5871msgid "start numbering patches at <n> instead of 1"
5872msgstr "补丁以 <n> 开始编号,而不是1"
5873
5874#: builtin/log.c:1125
5875msgid "mark the series as Nth re-roll"
5876msgstr "标记补丁系列是第几次重制"
5877
5878#: builtin/log.c:1127
5879msgid "Use [<prefix>] instead of [PATCH]"
5880msgstr "使用 [<前缀>] 代替 [PATCH]"
5881
5882#: builtin/log.c:1130
5883msgid "store resulting files in <dir>"
5884msgstr "把结果文件存储在 <dir>"
5885
5886#: builtin/log.c:1133
5887msgid "don't strip/add [PATCH]"
5888msgstr "不删除/添加 [PATCH]"
5889
5890#: builtin/log.c:1136
5891msgid "don't output binary diffs"
5892msgstr "不输出二进制差异"
5893
5894#: builtin/log.c:1138
5895msgid "don't include a patch matching a commit upstream"
5896msgstr "不包含已在上游提交中的补丁"
5897
5898#: builtin/log.c:1140
5899msgid "show patch format instead of default (patch + stat)"
5900msgstr "显示纯补丁格式而非默认的(补丁+状态)"
5901
5902#: builtin/log.c:1142
5903msgid "Messaging"
5904msgstr "邮件发送"
5905
5906#: builtin/log.c:1143
5907msgid "header"
5908msgstr "header"
5909
5910#: builtin/log.c:1144
5911msgid "add email header"
5912msgstr "添加邮件头"
5913
5914#: builtin/log.c:1145 builtin/log.c:1147
5915msgid "email"
5916msgstr "邮件地址"
5917
5918#: builtin/log.c:1145
5919msgid "add To: header"
5920msgstr "添加收件人"
5921
5922#: builtin/log.c:1147
5923msgid "add Cc: header"
5924msgstr "添加抄送"
5925
5926#: builtin/log.c:1149
5927msgid "message-id"
5928msgstr "message-id"
5929
5930#: builtin/log.c:1150
5931msgid "make first mail a reply to <message-id>"
5932msgstr "使第一封邮件作为对 <message-id> 的回复"
5933
5934#: builtin/log.c:1151 builtin/log.c:1154
5935msgid "boundary"
5936msgstr "边界"
5937
5938#: builtin/log.c:1152
5939msgid "attach the patch"
5940msgstr "附件方式添加补丁"
5941
5942#: builtin/log.c:1155
5943msgid "inline the patch"
5944msgstr "内联显示补丁"
5945
5946#: builtin/log.c:1159
5947msgid "enable message threading, styles: shallow, deep"
5948msgstr "启用邮件线索,风格:浅,深"
5949
5950#: builtin/log.c:1161
5951msgid "signature"
5952msgstr "签名"
5953
5954#: builtin/log.c:1162
5955msgid "add a signature"
5956msgstr "添加一个签名"
5957
5958#: builtin/log.c:1164
5959msgid "don't print the patch filenames"
5960msgstr "不要打印补丁文件名"
5961
5962#: builtin/log.c:1248
5963msgid "-n and -k are mutually exclusive."
5964msgstr "-n 和 -k 互斥。"
5965
5966#: builtin/log.c:1250
5967msgid "--subject-prefix and -k are mutually exclusive."
5968msgstr "--subject-prefix 和 -k 互斥。"
5969
5970#: builtin/log.c:1258
5971msgid "--name-only does not make sense"
5972msgstr "--name-only 无意义"
5973
5974#: builtin/log.c:1260
5975msgid "--name-status does not make sense"
5976msgstr "--name-status 无意义"
5977
5978#: builtin/log.c:1262
5979msgid "--check does not make sense"
5980msgstr "--check 无意义"
5981
5982#: builtin/log.c:1285
5983msgid "standard output, or directory, which one?"
5984msgstr "标准输出或目录,哪一个?"
5985
5986#: builtin/log.c:1287
5987#, c-format
5988msgid "Could not create directory '%s'"
5989msgstr "不能创建目录 '%s'"
5990
5991#: builtin/log.c:1435
5992msgid "Failed to create output files"
5993msgstr "无法创建输出文件"
5994
5995#: builtin/log.c:1484
5996msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5997msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
5998
5999#: builtin/log.c:1539
6000#, c-format
6001msgid ""
6002"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6003msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
6004
6005#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566
6006#, c-format
6007msgid "Unknown commit %s"
6008msgstr "未知提交 %s"
6009
6010#: builtin/ls-files.c:402
6011msgid "git ls-files [options] [<file>...]"
6012msgstr "git ls-files [选项] [<文件>...]"
6013
6014#: builtin/ls-files.c:459
6015msgid "identify the file status with tags"
6016msgstr "用标签标识文件的状态"
6017
6018#: builtin/ls-files.c:461
6019msgid "use lowercase letters for 'assume unchanged' files"
6020msgstr "使用小写字母表示 '假设未改变的' 文件"
6021
6022#: builtin/ls-files.c:463
6023msgid "show cached files in the output (default)"
6024msgstr "显示缓存的文件(默认)"
6025
6026#: builtin/ls-files.c:465
6027msgid "show deleted files in the output"
6028msgstr "显示已删除的文件"
6029
6030#: builtin/ls-files.c:467
6031msgid "show modified files in the output"
6032msgstr "显示已修改的文件"
6033
6034#: builtin/ls-files.c:469
6035msgid "show other files in the output"
6036msgstr "显示其它文件"
6037
6038#: builtin/ls-files.c:471
6039msgid "show ignored files in the output"
6040msgstr "显示忽略的文件"
6041
6042#: builtin/ls-files.c:474
6043msgid "show staged contents' object name in the output"
6044msgstr "显示暂存区内容的对象名称"
6045
6046#: builtin/ls-files.c:476
6047msgid "show files on the filesystem that need to be removed"
6048msgstr "显示文件系统需要删除的文件"
6049
6050#: builtin/ls-files.c:478
6051msgid "show 'other' directories' name only"
6052msgstr "只显示“其他”目录的名称"
6053
6054#: builtin/ls-files.c:481
6055msgid "don't show empty directories"
6056msgstr "不显示空目录"
6057
6058#: builtin/ls-files.c:484
6059msgid "show unmerged files in the output"
6060msgstr "显示未合并的文件"
6061
6062#: builtin/ls-files.c:486
6063msgid "show resolve-undo information"
6064msgstr "显示 resolve-undo 信息"
6065
6066#: builtin/ls-files.c:488
6067msgid "skip files matching pattern"
6068msgstr "匹配排除文件的模式"
6069
6070#: builtin/ls-files.c:491
6071msgid "exclude patterns are read from <file>"
6072msgstr "从 <文件> 中读取排除模式"
6073
6074#: builtin/ls-files.c:494
6075msgid "read additional per-directory exclude patterns in <file>"
6076msgstr "从 <文件> 读取额外的每个目录的排除模式"
6077
6078#: builtin/ls-files.c:496
6079msgid "add the standard git exclusions"
6080msgstr "添加标准的 git 排除"
6081
6082#: builtin/ls-files.c:499
6083msgid "make the output relative to the project top directory"
6084msgstr "显示相对于顶级目录的文件名"
6085
6086#: builtin/ls-files.c:502
6087msgid "if any <file> is not in the index, treat this as an error"
6088msgstr "如果任何 <文件> 都不在索引区,视为错误"
6089
6090#: builtin/ls-files.c:503
6091msgid "tree-ish"
6092msgstr "树或提交"
6093
6094#: builtin/ls-files.c:504
6095msgid "pretend that paths removed since <tree-ish> are still present"
6096msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6097
6098#: builtin/ls-files.c:506
6099msgid "show debugging data"
6100msgstr "显示调试数据"
6101
6102#: builtin/ls-tree.c:27
6103msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6104msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6105
6106#: builtin/ls-tree.c:125
6107msgid "only show trees"
6108msgstr "只显示树"
6109
6110#: builtin/ls-tree.c:127
6111msgid "recurse into subtrees"
6112msgstr "递归到子树"
6113
6114#: builtin/ls-tree.c:129
6115msgid "show trees when recursing"
6116msgstr "当递归时显示树"
6117
6118#: builtin/ls-tree.c:132
6119msgid "terminate entries with NUL byte"
6120msgstr "条目以NUL字符终止"
6121
6122#: builtin/ls-tree.c:133
6123msgid "include object size"
6124msgstr "包括对象大小"
6125
6126#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
6127msgid "list only filenames"
6128msgstr "只列出文件名"
6129
6130#: builtin/ls-tree.c:140
6131msgid "use full path names"
6132msgstr "使用文件的全路径"
6133
6134#: builtin/ls-tree.c:142
6135msgid "list entire tree; not just current directory (implies --full-name)"
6136msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6137
6138#: builtin/merge.c:43
6139msgid "git merge [options] [<commit>...]"
6140msgstr "git merge [选项] [<提交>...]"
6141
6142#: builtin/merge.c:44
6143msgid "git merge [options] <msg> HEAD <commit>"
6144msgstr "git merge [选项] <说明> HEAD <提交>"
6145
6146#: builtin/merge.c:45
6147msgid "git merge --abort"
6148msgstr "git merge --abort"
6149
6150#: builtin/merge.c:90
6151msgid "switch `m' requires a value"
6152msgstr "开关 `m' 需要一个值"
6153
6154#: builtin/merge.c:127
6155#, c-format
6156msgid "Could not find merge strategy '%s'.\n"
6157msgstr "不能找到合并策略 '%s'。\n"
6158
6159#: builtin/merge.c:128
6160#, c-format
6161msgid "Available strategies are:"
6162msgstr "可用的策略有:"
6163
6164#: builtin/merge.c:133
6165#, c-format
6166msgid "Available custom strategies are:"
6167msgstr "可用的自定义策略有:"
6168
6169#: builtin/merge.c:183
6170msgid "do not show a diffstat at the end of the merge"
6171msgstr "在合并的最后不显示差异统计"
6172
6173#: builtin/merge.c:186
6174msgid "show a diffstat at the end of the merge"
6175msgstr "在合并的最后显示差异统计"
6176
6177#: builtin/merge.c:187
6178msgid "(synonym to --stat)"
6179msgstr "(和 --stat 同义)"
6180
6181#: builtin/merge.c:189
6182msgid "add (at most <n>) entries from shortlog to merge commit message"
6183msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6184
6185#: builtin/merge.c:192
6186msgid "create a single commit instead of doing a merge"
6187msgstr "创建一个单独的提交而不是做一次合并"
6188
6189#: builtin/merge.c:194
6190msgid "perform a commit if the merge succeeds (default)"
6191msgstr "如果合并成功,执行一次提交(默认)"
6192
6193#: builtin/merge.c:196
6194msgid "edit message before committing"
6195msgstr "在提交前编辑提交说明"
6196
6197#: builtin/merge.c:198
6198msgid "allow fast-forward (default)"
6199msgstr "允许快进(默认)"
6200
6201#: builtin/merge.c:200
6202msgid "abort if fast-forward is not possible"
6203msgstr "如果不能快进就放弃合并"
6204
6205#: builtin/merge.c:203
6206msgid "Verify that the named commit has a valid GPG signature"
6207msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6208
6209#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112
6210msgid "strategy"
6211msgstr "策略"
6212
6213#: builtin/merge.c:205
6214msgid "merge strategy to use"
6215msgstr "要使用的合并策略"
6216
6217#: builtin/merge.c:206
6218msgid "option=value"
6219msgstr "option=value"
6220
6221#: builtin/merge.c:207
6222msgid "option for selected merge strategy"
6223msgstr "所选的合并策略的选项"
6224
6225#: builtin/merge.c:209
6226msgid "merge commit message (for a non-fast-forward merge)"
6227msgstr "合并的提交说明(针对非快进式合并)"
6228
6229#: builtin/merge.c:213
6230msgid "abort the current in-progress merge"
6231msgstr "放弃当前正在进行的合并"
6232
6233#: builtin/merge.c:242
6234msgid "could not run stash."
6235msgstr "不能进行进度保存。"
6236
6237#: builtin/merge.c:247
6238msgid "stash failed"
6239msgstr "进度保存失败"
6240
6241#: builtin/merge.c:252
6242#, c-format
6243msgid "not a valid object: %s"
6244msgstr "不是一个有效对象:%s"
6245
6246#: builtin/merge.c:271 builtin/merge.c:288
6247msgid "read-tree failed"
6248msgstr "读取树失败"
6249
6250#  译者:注意保持前导空格
6251#: builtin/merge.c:318
6252msgid " (nothing to squash)"
6253msgstr " (无可压缩)"
6254
6255#: builtin/merge.c:331
6256#, c-format
6257msgid "Squash commit -- not updating HEAD\n"
6258msgstr "压缩提交 -- 未更新 HEAD\n"
6259
6260#: builtin/merge.c:363
6261msgid "Writing SQUASH_MSG"
6262msgstr "写入 SQUASH_MSG"
6263
6264#: builtin/merge.c:365
6265msgid "Finishing SQUASH_MSG"
6266msgstr "完成 SQUASH_MSG"
6267
6268#: builtin/merge.c:388
6269#, c-format
6270msgid "No merge message -- not updating HEAD\n"
6271msgstr "无合并信息 -- 未更新 HEAD\n"
6272
6273#: builtin/merge.c:438
6274#, c-format
6275msgid "'%s' does not point to a commit"
6276msgstr "'%s' 没有指向一个提交"
6277
6278#: builtin/merge.c:550
6279#, c-format
6280msgid "Bad branch.%s.mergeoptions string: %s"
6281msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6282
6283#: builtin/merge.c:643
6284msgid "git write-tree failed to write a tree"
6285msgstr "git write-tree 无法写入一树对象"
6286
6287#: builtin/merge.c:671
6288msgid "Not handling anything other than two heads merge."
6289msgstr "不能处理两个头合并之外的任何操作。"
6290
6291#: builtin/merge.c:685
6292#, c-format
6293msgid "Unknown option for merge-recursive: -X%s"
6294msgstr "merge-recursive 的未知选项:-X%s"
6295
6296#: builtin/merge.c:699
6297#, c-format
6298msgid "unable to write %s"
6299msgstr "不能写 %s"
6300
6301#: builtin/merge.c:788
6302#, c-format
6303msgid "Could not read from '%s'"
6304msgstr "不能从 '%s' 读取"
6305
6306#: builtin/merge.c:797
6307#, c-format
6308msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6309msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6310
6311#: builtin/merge.c:803
6312#, c-format
6313msgid ""
6314"Please enter a commit message to explain why this merge is necessary,\n"
6315"especially if it merges an updated upstream into a topic branch.\n"
6316"\n"
6317"Lines starting with '%c' will be ignored, and an empty message aborts\n"
6318"the commit.\n"
6319msgstr ""
6320"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6321"合并到主题分支。\n"
6322"\n"
6323"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6324
6325#: builtin/merge.c:827
6326msgid "Empty commit message."
6327msgstr "空提交信息。"
6328
6329#: builtin/merge.c:839
6330#, c-format
6331msgid "Wonderful.\n"
6332msgstr "太棒了。\n"
6333
6334#: builtin/merge.c:904
6335#, c-format
6336msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6337msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6338
6339#: builtin/merge.c:920
6340#, c-format
6341msgid "'%s' is not a commit"
6342msgstr "'%s' 不是一个提交"
6343
6344#: builtin/merge.c:961
6345msgid "No current branch."
6346msgstr "没有当前分支。"
6347
6348#: builtin/merge.c:963
6349msgid "No remote for the current branch."
6350msgstr "当前分支没有对应的远程版本库。"
6351
6352#: builtin/merge.c:965
6353msgid "No default upstream defined for the current branch."
6354msgstr "当前分支没有定义默认的上游分支。"
6355
6356#: builtin/merge.c:970
6357#, c-format
6358msgid "No remote tracking branch for %s from %s"
6359msgstr "%s 没有来自 %s 的远程跟踪分支"
6360
6361#: builtin/merge.c:1057 builtin/merge.c:1214
6362#, c-format
6363msgid "%s - not something we can merge"
6364msgstr "%s - 不能被合并"
6365
6366#: builtin/merge.c:1125
6367msgid "There is no merge to abort (MERGE_HEAD missing)."
6368msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6369
6370#: builtin/merge.c:1141 git-pull.sh:31
6371msgid ""
6372"You have not concluded your merge (MERGE_HEAD exists).\n"
6373"Please, commit your changes before you can merge."
6374msgstr ""
6375"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6376"请在合并前先提交您的修改。"
6377
6378#: builtin/merge.c:1144 git-pull.sh:34
6379msgid "You have not concluded your merge (MERGE_HEAD exists)."
6380msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6381
6382#: builtin/merge.c:1148
6383msgid ""
6384"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6385"Please, commit your changes before you can merge."
6386msgstr ""
6387"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6388"请在合并前先提交您的修改。"
6389
6390#: builtin/merge.c:1151
6391msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6392msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6393
6394#: builtin/merge.c:1160
6395msgid "You cannot combine --squash with --no-ff."
6396msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6397
6398#: builtin/merge.c:1165
6399msgid "You cannot combine --no-ff with --ff-only."
6400msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
6401
6402#: builtin/merge.c:1172
6403msgid "No commit specified and merge.defaultToUpstream not set."
6404msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6405
6406#: builtin/merge.c:1204
6407msgid "Can merge only exactly one commit into empty head"
6408msgstr "只能将一个提交合并到空分支上"
6409
6410#: builtin/merge.c:1207
6411msgid "Squash commit into empty head not supported yet"
6412msgstr "尚不支持到空分支的压缩提交"
6413
6414#: builtin/merge.c:1209
6415msgid "Non-fast-forward commit does not make sense into an empty head"
6416msgstr "到空分支的非快进式提交没有意义"
6417
6418#: builtin/merge.c:1265
6419#, c-format
6420msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6421msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6422
6423#: builtin/merge.c:1268
6424#, c-format
6425msgid "Commit %s has a bad GPG signature allegedly by %s."
6426msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6427
6428#. 'N'
6429#: builtin/merge.c:1271
6430#, c-format
6431msgid "Commit %s does not have a GPG signature."
6432msgstr "提交 %s 没有一个 GPG 签名。"
6433
6434#: builtin/merge.c:1274
6435#, c-format
6436msgid "Commit %s has a good GPG signature by %s\n"
6437msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6438
6439#: builtin/merge.c:1358
6440#, c-format
6441msgid "Updating %s..%s\n"
6442msgstr "更新 %s..%s\n"
6443
6444#: builtin/merge.c:1397
6445#, c-format
6446msgid "Trying really trivial in-index merge...\n"
6447msgstr "尝试非常小的索引内合并...\n"
6448
6449#: builtin/merge.c:1404
6450#, c-format
6451msgid "Nope.\n"
6452msgstr "无。\n"
6453
6454#: builtin/merge.c:1436
6455msgid "Not possible to fast-forward, aborting."
6456msgstr "无法快进,终止。"
6457
6458#: builtin/merge.c:1459 builtin/merge.c:1538
6459#, c-format
6460msgid "Rewinding the tree to pristine...\n"
6461msgstr "将树回滚至原始状态...\n"
6462
6463#: builtin/merge.c:1463
6464#, c-format
6465msgid "Trying merge strategy %s...\n"
6466msgstr "尝试合并策略 %s...\n"
6467
6468#: builtin/merge.c:1529
6469#, c-format
6470msgid "No merge strategy handled the merge.\n"
6471msgstr "没有合并策略处理此合并。\n"
6472
6473#: builtin/merge.c:1531
6474#, c-format
6475msgid "Merge with strategy %s failed.\n"
6476msgstr "使用策略 %s 合并失败。\n"
6477
6478#: builtin/merge.c:1540
6479#, c-format
6480msgid "Using the %s to prepare resolving by hand.\n"
6481msgstr "使用 %s 以准备手工解决。\n"
6482
6483#: builtin/merge.c:1552
6484#, c-format
6485msgid "Automatic merge went well; stopped before committing as requested\n"
6486msgstr "自动合并进展顺利,按要求在提交前停止\n"
6487
6488#: builtin/merge-base.c:26
6489msgid "git merge-base [-a|--all] <commit> <commit>..."
6490msgstr "git merge-base [-a|--all] <提交> <提交>..."
6491
6492#: builtin/merge-base.c:27
6493msgid "git merge-base [-a|--all] --octopus <commit>..."
6494msgstr "git merge-base [-a|--all] --octopus <提交>..."
6495
6496#: builtin/merge-base.c:28
6497msgid "git merge-base --independent <commit>..."
6498msgstr "git merge-base --independent <提交>..."
6499
6500#: builtin/merge-base.c:29
6501msgid "git merge-base --is-ancestor <commit> <commit>"
6502msgstr "git merge-base --is-ancestor <提交> <提交>"
6503
6504#: builtin/merge-base.c:98
6505msgid "output all common ancestors"
6506msgstr "输出所有共同的祖先"
6507
6508#: builtin/merge-base.c:99
6509msgid "find ancestors for a single n-way merge"
6510msgstr "查找一个多路合并的祖先提交"
6511
6512#: builtin/merge-base.c:100
6513msgid "list revs not reachable from others"
6514msgstr "显示不能被其他访问到的版本"
6515
6516#: builtin/merge-base.c:102
6517msgid "is the first one ancestor of the other?"
6518msgstr "第一个是其他的祖先提交么?"
6519
6520#: builtin/merge-file.c:8
6521msgid ""
6522"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6523"file2"
6524msgstr ""
6525"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6526
6527#: builtin/merge-file.c:33
6528msgid "send results to standard output"
6529msgstr "将结果发送到标准输出"
6530
6531#: builtin/merge-file.c:34
6532msgid "use a diff3 based merge"
6533msgstr "使用基于 diff3 的合并"
6534
6535#: builtin/merge-file.c:35
6536msgid "for conflicts, use our version"
6537msgstr "如果冲突,使用我们的版本"
6538
6539#: builtin/merge-file.c:37
6540msgid "for conflicts, use their version"
6541msgstr "如果冲突,使用他们的版本"
6542
6543#: builtin/merge-file.c:39
6544msgid "for conflicts, use a union version"
6545msgstr "如果冲突,使用联合版本"
6546
6547#: builtin/merge-file.c:42
6548msgid "for conflicts, use this marker size"
6549msgstr "如果冲突,使用指定长度的标记"
6550
6551#: builtin/merge-file.c:43
6552msgid "do not warn about conflicts"
6553msgstr "不要警告冲突"
6554
6555#: builtin/merge-file.c:45
6556msgid "set labels for file1/orig_file/file2"
6557msgstr "为 file1/orig_file/file2 设置标签"
6558
6559#: builtin/mktree.c:67
6560msgid "git mktree [-z] [--missing] [--batch]"
6561msgstr "git mktree [-z] [--missing] [--batch]"
6562
6563#: builtin/mktree.c:153
6564msgid "input is NUL terminated"
6565msgstr "输入以 NUL 字符终止"
6566
6567#: builtin/mktree.c:154 builtin/write-tree.c:24
6568msgid "allow missing objects"
6569msgstr "允许丢失的对象"
6570
6571#: builtin/mktree.c:155
6572msgid "allow creation of more than one tree"
6573msgstr "允许创建一个以上的树"
6574
6575#: builtin/mv.c:14
6576msgid "git mv [options] <source>... <destination>"
6577msgstr "git mv [选项] <源>... <目标>"
6578
6579#: builtin/mv.c:64
6580msgid "force move/rename even if target exists"
6581msgstr "强制移动/重命令,即使目标存在"
6582
6583#: builtin/mv.c:65
6584msgid "skip move/rename errors"
6585msgstr "跳过移动/重命名错误"
6586
6587#: builtin/mv.c:108
6588#, c-format
6589msgid "Checking rename of '%s' to '%s'\n"
6590msgstr "检查 '%s' 到 '%s' 的重命名\n"
6591
6592#: builtin/mv.c:112
6593msgid "bad source"
6594msgstr "坏的源"
6595
6596#: builtin/mv.c:115
6597msgid "can not move directory into itself"
6598msgstr "不能将目录移动到自身"
6599
6600#: builtin/mv.c:118
6601msgid "cannot move directory over file"
6602msgstr "不能将目录移动到文件"
6603
6604#: builtin/mv.c:128
6605#, c-format
6606msgid "Huh? %.*s is in index?"
6607msgstr "嗯?%.*s 在索引中?"
6608
6609#: builtin/mv.c:140
6610msgid "source directory is empty"
6611msgstr "源目录为空"
6612
6613#: builtin/mv.c:171
6614msgid "not under version control"
6615msgstr "不在版本控制之下"
6616
6617#: builtin/mv.c:173
6618msgid "destination exists"
6619msgstr "目标已存在"
6620
6621#: builtin/mv.c:181
6622#, c-format
6623msgid "overwriting '%s'"
6624msgstr "覆盖 '%s'"
6625
6626#: builtin/mv.c:184
6627msgid "Cannot overwrite"
6628msgstr "不能覆盖"
6629
6630#: builtin/mv.c:187
6631msgid "multiple sources for the same target"
6632msgstr "同一目标具有多个源"
6633
6634#: builtin/mv.c:202
6635#, c-format
6636msgid "%s, source=%s, destination=%s"
6637msgstr "%s,源=%s,目标=%s"
6638
6639#: builtin/mv.c:212
6640#, c-format
6641msgid "Renaming %s to %s\n"
6642msgstr "重命名 %s 至 %s\n"
6643
6644#: builtin/mv.c:215 builtin/remote.c:731
6645#, c-format
6646msgid "renaming '%s' failed"
6647msgstr "重命名 '%s' 失败"
6648
6649#: builtin/name-rev.c:175
6650msgid "git name-rev [options] <commit>..."
6651msgstr "git name-rev [选项] <提交>..."
6652
6653#: builtin/name-rev.c:176
6654msgid "git name-rev [options] --all"
6655msgstr "git name-rev [选项] --all"
6656
6657#: builtin/name-rev.c:177
6658msgid "git name-rev [options] --stdin"
6659msgstr "git name-rev [选项] --stdin"
6660
6661#: builtin/name-rev.c:229
6662msgid "print only names (no SHA-1)"
6663msgstr "只打印名称(无 SHA-1)"
6664
6665#: builtin/name-rev.c:230
6666msgid "only use tags to name the commits"
6667msgstr "只使用 tags 来命名提交"
6668
6669#: builtin/name-rev.c:232
6670msgid "only use refs matching <pattern>"
6671msgstr "只使用和 <模式> 相匹配的引用"
6672
6673#: builtin/name-rev.c:234
6674msgid "list all commits reachable from all refs"
6675msgstr "列出可以从所有引用访问的提交"
6676
6677#: builtin/name-rev.c:235
6678msgid "read from stdin"
6679msgstr "从标准输入读取"
6680
6681#: builtin/name-rev.c:236
6682msgid "allow to print `undefined` names"
6683msgstr "允许打印 `未定义` 的名称"
6684
6685#: builtin/notes.c:26
6686msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6687msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
6688
6689#: builtin/notes.c:27
6690msgid ""
6691"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6692"<object>] [<object>]"
6693msgstr ""
6694"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6695"象>] [<对象>]"
6696
6697#: builtin/notes.c:28
6698msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6699msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
6700
6701#: builtin/notes.c:29
6702msgid ""
6703"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6704"<object>] [<object>]"
6705msgstr ""
6706"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6707">] [<对象>]"
6708
6709#: builtin/notes.c:30
6710msgid "git notes [--ref <notes_ref>] edit [<object>]"
6711msgstr "git notes [--ref <注解引用>] edit [<对象>]"
6712
6713#: builtin/notes.c:31
6714msgid "git notes [--ref <notes_ref>] show [<object>]"
6715msgstr "git notes [--ref <注解引用>] show [<对象>]"
6716
6717#: builtin/notes.c:32
6718msgid ""
6719"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6720msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
6721
6722#: builtin/notes.c:33
6723msgid "git notes merge --commit [-v | -q]"
6724msgstr "git notes merge --commit [-v | -q]"
6725
6726#: builtin/notes.c:34
6727msgid "git notes merge --abort [-v | -q]"
6728msgstr "git notes merge --abort [-v | -q]"
6729
6730#: builtin/notes.c:35
6731msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6732msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
6733
6734#: builtin/notes.c:36
6735msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6736msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
6737
6738#: builtin/notes.c:37
6739msgid "git notes [--ref <notes_ref>] get-ref"
6740msgstr "git notes [--ref <注解引用>] get-ref"
6741
6742#: builtin/notes.c:42
6743msgid "git notes [list [<object>]]"
6744msgstr "git notes [list [<对象>]]"
6745
6746#: builtin/notes.c:47
6747msgid "git notes add [<options>] [<object>]"
6748msgstr "git notes add [<选项>] [<对象>]"
6749
6750#: builtin/notes.c:52
6751msgid "git notes copy [<options>] <from-object> <to-object>"
6752msgstr "git notes copy [<选项>] <源对象> <目标对象>"
6753
6754#: builtin/notes.c:53
6755msgid "git notes copy --stdin [<from-object> <to-object>]..."
6756msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
6757
6758#: builtin/notes.c:58
6759msgid "git notes append [<options>] [<object>]"
6760msgstr "git notes append [<选项>] [<对象>]"
6761
6762#: builtin/notes.c:63
6763msgid "git notes edit [<object>]"
6764msgstr "git notes edit [<对象>]"
6765
6766#: builtin/notes.c:68
6767msgid "git notes show [<object>]"
6768msgstr "git notes show [<对象>]"
6769
6770#: builtin/notes.c:73
6771msgid "git notes merge [<options>] <notes_ref>"
6772msgstr "git notes merge [<选项>] <注解引用>"
6773
6774#: builtin/notes.c:74
6775msgid "git notes merge --commit [<options>]"
6776msgstr "git notes merge --commit [<选项>]"
6777
6778#: builtin/notes.c:75
6779msgid "git notes merge --abort [<options>]"
6780msgstr "git notes merge --abort [<选项>]"
6781
6782#: builtin/notes.c:80
6783msgid "git notes remove [<object>]"
6784msgstr "git notes remove [<对象>]"
6785
6786#: builtin/notes.c:85
6787msgid "git notes prune [<options>]"
6788msgstr "git notes prune [<选项>]"
6789
6790#: builtin/notes.c:90
6791msgid "git notes get-ref"
6792msgstr "git notes get-ref"
6793
6794#: builtin/notes.c:139
6795#, c-format
6796msgid "unable to start 'show' for object '%s'"
6797msgstr "不能为对象 '%s' 开始 'show'"
6798
6799#: builtin/notes.c:143
6800msgid "could not read 'show' output"
6801msgstr "不能读取 'show' 的输出"
6802
6803#: builtin/notes.c:151
6804#, c-format
6805msgid "failed to finish 'show' for object '%s'"
6806msgstr "无法为对象 '%s' 完成 'show'"
6807
6808#: builtin/notes.c:169 builtin/tag.c:341
6809#, c-format
6810msgid "could not create file '%s'"
6811msgstr "不能创建文件 '%s'"
6812
6813#: builtin/notes.c:188
6814msgid "Please supply the note contents using either -m or -F option"
6815msgstr "请通过 -m 或 -F 选项为注解提供内容"
6816
6817#: builtin/notes.c:209 builtin/notes.c:972
6818#, c-format
6819msgid "Removing note for object %s\n"
6820msgstr "删除对象 %s 的注解\n"
6821
6822#: builtin/notes.c:214
6823msgid "unable to write note object"
6824msgstr "不能写注解对象"
6825
6826#: builtin/notes.c:216
6827#, c-format
6828msgid "The note contents has been left in %s"
6829msgstr "注解内容被留在文件 %s 中"
6830
6831#: builtin/notes.c:250 builtin/tag.c:540
6832#, c-format
6833msgid "cannot read '%s'"
6834msgstr "不能读取 '%s'"
6835
6836#: builtin/notes.c:252 builtin/tag.c:543
6837#, c-format
6838msgid "could not open or read '%s'"
6839msgstr "不能打开或读取 '%s'"
6840
6841#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6842#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6843#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6844#: builtin/notes.c:967 builtin/tag.c:556
6845#, c-format
6846msgid "Failed to resolve '%s' as a valid ref."
6847msgstr "无法解析 '%s' 为一个有效引用。"
6848
6849#: builtin/notes.c:274
6850#, c-format
6851msgid "Failed to read object '%s'."
6852msgstr "无法读取对象 '%s'。"
6853
6854#: builtin/notes.c:298
6855msgid "Cannot commit uninitialized/unreferenced notes tree"
6856msgstr "不能提交未初始化/未引用的注解树"
6857
6858#: builtin/notes.c:339
6859#, c-format
6860msgid "Bad notes.rewriteMode value: '%s'"
6861msgstr "坏的 notes.rewriteMode 值:'%s'"
6862
6863#: builtin/notes.c:349
6864#, c-format
6865msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6866msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6867
6868#. TRANSLATORS: The first %s is the name of the
6869#. environment variable, the second %s is its value
6870#: builtin/notes.c:376
6871#, c-format
6872msgid "Bad %s value: '%s'"
6873msgstr "坏的 %s 值:'%s'"
6874
6875#: builtin/notes.c:440
6876#, c-format
6877msgid "Malformed input line: '%s'."
6878msgstr "非法的输入行:'%s'。"
6879
6880#: builtin/notes.c:455
6881#, c-format
6882msgid "Failed to copy notes from '%s' to '%s'"
6883msgstr "无法从 '%s' 到 '%s' 拷贝注解"
6884
6885#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6886#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6887#: builtin/notes.c:1032
6888msgid "too many parameters"
6889msgstr "参数太多"
6890
6891#: builtin/notes.c:512 builtin/notes.c:771
6892#, c-format
6893msgid "No note found for object %s."
6894msgstr "未发现对象 %s 的注解。"
6895
6896#: builtin/notes.c:534 builtin/notes.c:691
6897msgid "note contents as a string"
6898msgstr "注解内容作为一个字符串"
6899
6900#: builtin/notes.c:537 builtin/notes.c:694
6901msgid "note contents in a file"
6902msgstr "注解内容到一个文件中"
6903
6904#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6905#: builtin/notes.c:699 builtin/tag.c:474
6906msgid "object"
6907msgstr "对象"
6908
6909#: builtin/notes.c:540 builtin/notes.c:697
6910msgid "reuse and edit specified note object"
6911msgstr "重用和编辑指定的注解对象"
6912
6913#: builtin/notes.c:543 builtin/notes.c:700
6914msgid "reuse specified note object"
6915msgstr "重用指定的注解对象"
6916
6917#: builtin/notes.c:545 builtin/notes.c:613
6918msgid "replace existing notes"
6919msgstr "替换已存在的注解"
6920
6921#: builtin/notes.c:579
6922#, c-format
6923msgid ""
6924"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6925"existing notes"
6926msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6927
6928#: builtin/notes.c:584 builtin/notes.c:661
6929#, c-format
6930msgid "Overwriting existing notes for object %s\n"
6931msgstr "覆盖对象 %s 现存注解\n"
6932
6933#: builtin/notes.c:614
6934msgid "read objects from stdin"
6935msgstr "从标准输入读取对象"
6936
6937#: builtin/notes.c:616
6938msgid "load rewriting config for <command> (implies --stdin)"
6939msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
6940
6941#: builtin/notes.c:634
6942msgid "too few parameters"
6943msgstr "参数太少"
6944
6945#: builtin/notes.c:655
6946#, c-format
6947msgid ""
6948"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6949"existing notes"
6950msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6951
6952#: builtin/notes.c:667
6953#, c-format
6954msgid "Missing notes on source object %s. Cannot copy."
6955msgstr "源对象 %s 缺少注解。不能拷贝。"
6956
6957#: builtin/notes.c:716
6958#, c-format
6959msgid ""
6960"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6961"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6962msgstr ""
6963"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6964"请换用 'git notes add -f -m/-F/-c/-C'。\n"
6965
6966#: builtin/notes.c:863
6967msgid "General options"
6968msgstr "通用选项"
6969
6970#: builtin/notes.c:865
6971msgid "Merge options"
6972msgstr "合并选项"
6973
6974#: builtin/notes.c:867
6975msgid ""
6976"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6977"cat_sort_uniq)"
6978msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
6979
6980#: builtin/notes.c:869
6981msgid "Committing unmerged notes"
6982msgstr "提交未合并的注解"
6983
6984#: builtin/notes.c:871
6985msgid "finalize notes merge by committing unmerged notes"
6986msgstr "通过提交未合并的注解来完成注解合并"
6987
6988#: builtin/notes.c:873
6989msgid "Aborting notes merge resolution"
6990msgstr "中止注解合并的方案"
6991
6992#: builtin/notes.c:875
6993msgid "abort notes merge"
6994msgstr "中止注解合并"
6995
6996#: builtin/notes.c:970
6997#, c-format
6998msgid "Object %s has no note\n"
6999msgstr "对象 %s 没有注解\n"
7000
7001#: builtin/notes.c:982
7002msgid "attempt to remove non-existent note is not an error"
7003msgstr "尝试删除不存在的注解不是一个错误"
7004
7005#: builtin/notes.c:985
7006msgid "read object names from the standard input"
7007msgstr "从标准输入读取对象名称"
7008
7009#: builtin/notes.c:1066
7010msgid "notes_ref"
7011msgstr "注解引用"
7012
7013#: builtin/notes.c:1067
7014msgid "use notes from <notes_ref>"
7015msgstr "从 <注解引用> 使用注解"
7016
7017#: builtin/notes.c:1102 builtin/remote.c:1598
7018#, c-format
7019msgid "Unknown subcommand: %s"
7020msgstr "未知子命令:%s"
7021
7022#: builtin/pack-objects.c:23
7023msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7024msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7025
7026#: builtin/pack-objects.c:24
7027msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7028msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7029
7030#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
7031#, c-format
7032msgid "deflate error (%d)"
7033msgstr "压缩错误 (%d)"
7034
7035#: builtin/pack-objects.c:2397
7036#, c-format
7037msgid "unsupported index version %s"
7038msgstr "不支持的索引版本 %s"
7039
7040#: builtin/pack-objects.c:2401
7041#, c-format
7042msgid "bad index version '%s'"
7043msgstr "坏的索引版本 '%s'"
7044
7045#: builtin/pack-objects.c:2424
7046#, c-format
7047msgid "option %s does not accept negative form"
7048msgstr "选项 %s 不接受否定格式"
7049
7050#: builtin/pack-objects.c:2428
7051#, c-format
7052msgid "unable to parse value '%s' for option %s"
7053msgstr "不能解析选项 %1$s 的值 '%2$s'"
7054
7055#: builtin/pack-objects.c:2447
7056msgid "do not show progress meter"
7057msgstr "不显示进度表"
7058
7059#: builtin/pack-objects.c:2449
7060msgid "show progress meter"
7061msgstr "显示进度表"
7062
7063#: builtin/pack-objects.c:2451
7064msgid "show progress meter during object writing phase"
7065msgstr "在对象写入阶段显示进度表"
7066
7067#: builtin/pack-objects.c:2454
7068msgid "similar to --all-progress when progress meter is shown"
7069msgstr "当进度表显示时类似于 --all-progress"
7070
7071#: builtin/pack-objects.c:2455
7072msgid "version[,offset]"
7073msgstr "版本[,偏移]"
7074
7075#: builtin/pack-objects.c:2456
7076msgid "write the pack index file in the specified idx format version"
7077msgstr "用指定的 idx 格式版本来写包索引文件"
7078
7079#: builtin/pack-objects.c:2459
7080msgid "maximum size of each output pack file"
7081msgstr "每个输出包的最大尺寸"
7082
7083#: builtin/pack-objects.c:2461
7084msgid "ignore borrowed objects from alternate object store"
7085msgstr "忽略从替代对象存储里借用对象"
7086
7087#: builtin/pack-objects.c:2463
7088msgid "ignore packed objects"
7089msgstr "忽略包对象"
7090
7091#: builtin/pack-objects.c:2465
7092msgid "limit pack window by objects"
7093msgstr "限制打包窗口的对象数"
7094
7095#: builtin/pack-objects.c:2467
7096msgid "limit pack window by memory in addition to object limit"
7097msgstr "除对象数量限制外设置打包窗口的内存限制"
7098
7099#: builtin/pack-objects.c:2469
7100msgid "maximum length of delta chain allowed in the resulting pack"
7101msgstr "打包允许的 delta 链的最大长度"
7102
7103#: builtin/pack-objects.c:2471
7104msgid "reuse existing deltas"
7105msgstr "重用已存在的 deltas"
7106
7107#: builtin/pack-objects.c:2473
7108msgid "reuse existing objects"
7109msgstr "重用已存在的对象"
7110
7111#: builtin/pack-objects.c:2475
7112msgid "use OFS_DELTA objects"
7113msgstr "使用 OFS_DELTA 对象"
7114
7115#: builtin/pack-objects.c:2477
7116msgid "use threads when searching for best delta matches"
7117msgstr "使用线程查询最佳 delta 匹配"
7118
7119#: builtin/pack-objects.c:2479
7120msgid "do not create an empty pack output"
7121msgstr "不创建空的包输出"
7122
7123#: builtin/pack-objects.c:2481
7124msgid "read revision arguments from standard input"
7125msgstr "从标准输入读取修订号参数"
7126
7127#: builtin/pack-objects.c:2483
7128msgid "limit the objects to those that are not yet packed"
7129msgstr "限制那些尚未打包的对象"
7130
7131#: builtin/pack-objects.c:2486
7132msgid "include objects reachable from any reference"
7133msgstr "包括可以从任何引用访问到的对象"
7134
7135#: builtin/pack-objects.c:2489
7136msgid "include objects referred by reflog entries"
7137msgstr "包括被引用日志引用到的对象"
7138
7139#: builtin/pack-objects.c:2492
7140msgid "output pack to stdout"
7141msgstr "输出包到标准输出"
7142
7143#: builtin/pack-objects.c:2494
7144msgid "include tag objects that refer to objects to be packed"
7145msgstr "包括引用了打包对象的 tag"
7146
7147#: builtin/pack-objects.c:2496
7148msgid "keep unreachable objects"
7149msgstr "维持不可达的对象"
7150
7151#: builtin/pack-objects.c:2497 parse-options.h:141
7152msgid "time"
7153msgstr "时间"
7154
7155#: builtin/pack-objects.c:2498
7156msgid "unpack unreachable objects newer than <time>"
7157msgstr "将比给定 <时间> 新的无法访问的对象解包"
7158
7159#: builtin/pack-objects.c:2501
7160msgid "create thin packs"
7161msgstr "创建精简包"
7162
7163#: builtin/pack-objects.c:2503
7164msgid "ignore packs that have companion .keep file"
7165msgstr "忽略配有 .keep 文件的包"
7166
7167#: builtin/pack-objects.c:2505
7168msgid "pack compression level"
7169msgstr "打包压缩级别"
7170
7171#: builtin/pack-objects.c:2507
7172msgid "do not hide commits by grafts"
7173msgstr "不隐藏移植覆盖的提交"
7174
7175#: builtin/pack-refs.c:6
7176msgid "git pack-refs [options]"
7177msgstr "git pack-refs [选项]"
7178
7179#: builtin/pack-refs.c:14
7180msgid "pack everything"
7181msgstr "打包一切"
7182
7183#: builtin/pack-refs.c:15
7184msgid "prune loose refs (default)"
7185msgstr "清除松散的引用(默认)"
7186
7187#: builtin/prune-packed.c:7
7188msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7189msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7190
7191#: builtin/prune.c:12
7192msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7193msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7194
7195#: builtin/prune.c:132
7196msgid "do not remove, show only"
7197msgstr "不删除,只显示"
7198
7199#: builtin/prune.c:133
7200msgid "report pruned objects"
7201msgstr "报告清除的对象"
7202
7203#: builtin/prune.c:136
7204msgid "expire objects older than <time>"
7205msgstr "使早于给定时间的对象过期"
7206
7207#: builtin/push.c:14
7208msgid "git push [<options>] [<repository> [<refspec>...]]"
7209msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7210
7211#: builtin/push.c:45
7212msgid "tag shorthand without <tag>"
7213msgstr "tag 简写没有跟 <tag> 参数"
7214
7215#: builtin/push.c:64
7216msgid "--delete only accepts plain target ref names"
7217msgstr "--delete 只接受简单的目标引用名"
7218
7219#: builtin/push.c:99
7220msgid ""
7221"\n"
7222"To choose either option permanently, see push.default in 'git help config'."
7223msgstr ""
7224"\n"
7225"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7226
7227#: builtin/push.c:102
7228#, c-format
7229msgid ""
7230"The upstream branch of your current branch does not match\n"
7231"the name of your current branch.  To push to the upstream branch\n"
7232"on the remote, use\n"
7233"\n"
7234"    git push %s HEAD:%s\n"
7235"\n"
7236"To push to the branch of the same name on the remote, use\n"
7237"\n"
7238"    git push %s %s\n"
7239"%s"
7240msgstr ""
7241"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7242"上游分支,使用\n"
7243"\n"
7244"    git push %s HEAD:%s\n"
7245"\n"
7246"为推送至远程同名分支,使用\n"
7247"\n"
7248"    git push %s %s\n"
7249"%s"
7250
7251#: builtin/push.c:121
7252#, c-format
7253msgid ""
7254"You are not currently on a branch.\n"
7255"To push the history leading to the current (detached HEAD)\n"
7256"state now, use\n"
7257"\n"
7258"    git push %s HEAD:<name-of-remote-branch>\n"
7259msgstr ""
7260"您当前不在一个分支上。\n"
7261"现在为推送当前(分离头指针)的历史,使用\n"
7262"\n"
7263"    git push %s HEAD:<name-of-remote-branch>\n"
7264
7265#: builtin/push.c:128
7266#, c-format
7267msgid ""
7268"The current branch %s has no upstream branch.\n"
7269"To push the current branch and set the remote as upstream, use\n"
7270"\n"
7271"    git push --set-upstream %s %s\n"
7272msgstr ""
7273"当前分支 %s 没有对应的上游分支。\n"
7274"为推送当前分支并建立与远程上游的跟踪,使用\n"
7275"\n"
7276"    git push --set-upstream %s %s\n"
7277
7278#: builtin/push.c:136
7279#, c-format
7280msgid "The current branch %s has multiple upstream branches, refusing to push."
7281msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7282
7283#: builtin/push.c:139
7284#, c-format
7285msgid ""
7286"You are pushing to remote '%s', which is not the upstream of\n"
7287"your current branch '%s', without telling me what to push\n"
7288"to update which remote branch."
7289msgstr ""
7290"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7291"而没有告诉我要推送什么、更新哪个远程分支。"
7292
7293#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7294#: builtin/push.c:151
7295msgid ""
7296"push.default is unset; its implicit value is changing in\n"
7297"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7298"and maintain the current behavior after the default changes, use:\n"
7299"\n"
7300"  git config --global push.default matching\n"
7301"\n"
7302"To squelch this message and adopt the new behavior now, use:\n"
7303"\n"
7304"  git config --global push.default simple\n"
7305"\n"
7306"See 'git help config' and search for 'push.default' for further "
7307"information.\n"
7308"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7309"'current' instead of 'simple' if you sometimes use older versions of Git)"
7310msgstr ""
7311"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
7312"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
7313"进行如下设置:\n"
7314"\n"
7315"  git config --global push.default matching\n"
7316"\n"
7317"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7318"\n"
7319"  git config --global push.default simple\n"
7320"\n"
7321"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7322"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7323"为保持兼容,请用 'current' 代替 'simple' 模式)"
7324
7325#: builtin/push.c:199
7326msgid ""
7327"You didn't specify any refspecs to push, and push.default is \"nothing\"."
7328msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
7329
7330#: builtin/push.c:206
7331msgid ""
7332"Updates were rejected because the tip of your current branch is behind\n"
7333"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7334"before pushing again.\n"
7335"See the 'Note about fast-forwards' in 'git push --help' for details."
7336msgstr ""
7337"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7338"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
7339"'git push --help' 中的 'Note about fast-forwards' 小节。"
7340
7341#: builtin/push.c:212
7342msgid ""
7343"Updates were rejected because a pushed branch tip is behind its remote\n"
7344"counterpart. If you did not intend to push that branch, you may want to\n"
7345"specify branches to push or set the 'push.default' configuration variable\n"
7346"to 'simple', 'current' or 'upstream' to push only the current branch."
7347msgstr ""
7348"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7349"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7350"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7351"以便只推送当前分支。"
7352
7353#: builtin/push.c:218
7354msgid ""
7355"Updates were rejected because a pushed branch tip is behind its remote\n"
7356"counterpart. Check out this branch and merge the remote changes\n"
7357"(e.g. 'git pull') before pushing again.\n"
7358"See the 'Note about fast-forwards' in 'git push --help' for details."
7359msgstr ""
7360"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7361"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7362"'git push --help' 中的 'Note about fast-forwards' 小节。"
7363
7364#: builtin/push.c:224
7365msgid ""
7366"Updates were rejected because the remote contains work that you do\n"
7367"not have locally. This is usually caused by another repository pushing\n"
7368"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7369"'git pull') before pushing again.\n"
7370"See the 'Note about fast-forwards' in 'git push --help' for details."
7371msgstr ""
7372"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7373"一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7374"(如 'git pull')。\n"
7375"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7376
7377#: builtin/push.c:231
7378msgid "Updates were rejected because the tag already exists in the remote."
7379msgstr "更新被拒绝因为 tag 在远程已经存在。"
7380
7381#: builtin/push.c:234
7382msgid ""
7383"You cannot update a remote ref that points at a non-commit object,\n"
7384"or update a remote ref to make it point at a non-commit object,\n"
7385"without using the '--force' option.\n"
7386msgstr ""
7387"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7388"也不能更新远程引用让其指向一个非提交对象。\n"
7389
7390#: builtin/push.c:294
7391#, c-format
7392msgid "Pushing to %s\n"
7393msgstr "推送到 %s\n"
7394
7395#: builtin/push.c:298
7396#, c-format
7397msgid "failed to push some refs to '%s'"
7398msgstr "无法推送一些引用到 '%s'"
7399
7400#: builtin/push.c:331
7401#, c-format
7402msgid "bad repository '%s'"
7403msgstr "坏的版本库 '%s'"
7404
7405#: builtin/push.c:332
7406msgid ""
7407"No configured push destination.\n"
7408"Either specify the URL from the command-line or configure a remote "
7409"repository using\n"
7410"\n"
7411"    git remote add <name> <url>\n"
7412"\n"
7413"and then push using the remote name\n"
7414"\n"
7415"    git push <name>\n"
7416msgstr ""
7417"没有配置推送目标。\n"
7418"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7419"\n"
7420"    git remote add <name> <url>\n"
7421"\n"
7422"然后使用该远程版本库名执行推送\n"
7423"\n"
7424"    git push <name>\n"
7425
7426#: builtin/push.c:347
7427msgid "--all and --tags are incompatible"
7428msgstr "--all 和 --tags 不兼容"
7429
7430#: builtin/push.c:348
7431msgid "--all can't be combined with refspecs"
7432msgstr "--all 不能和引用表达式同时使用"
7433
7434#: builtin/push.c:353
7435msgid "--mirror and --tags are incompatible"
7436msgstr "--mirror 和 --tags 不兼容"
7437
7438#: builtin/push.c:354
7439msgid "--mirror can't be combined with refspecs"
7440msgstr "--mirror 不能和引用表达式同时使用"
7441
7442#: builtin/push.c:359
7443msgid "--all and --mirror are incompatible"
7444msgstr "--all 和 --mirror 不兼容"
7445
7446#: builtin/push.c:419
7447msgid "repository"
7448msgstr "版本库"
7449
7450#: builtin/push.c:420
7451msgid "push all refs"
7452msgstr "推送所有引用"
7453
7454#: builtin/push.c:421
7455msgid "mirror all refs"
7456msgstr "镜像所有引用"
7457
7458#: builtin/push.c:423
7459msgid "delete refs"
7460msgstr "删除引用"
7461
7462#: builtin/push.c:424
7463msgid "push tags (can't be used with --all or --mirror)"
7464msgstr "推送 tags(不能使用 --all or --mirror)"
7465
7466#: builtin/push.c:427
7467msgid "force updates"
7468msgstr "强制更新"
7469
7470#: builtin/push.c:428
7471msgid "check"
7472msgstr "检查"
7473
7474#: builtin/push.c:429
7475msgid "control recursive pushing of submodules"
7476msgstr "控制子模组的递归推送"
7477
7478#: builtin/push.c:431
7479msgid "use thin pack"
7480msgstr "使用精简打包"
7481
7482#: builtin/push.c:432 builtin/push.c:433
7483msgid "receive pack program"
7484msgstr "接收包程序"
7485
7486#: builtin/push.c:434
7487msgid "set upstream for git pull/status"
7488msgstr "设置 git pull/status 的上游"
7489
7490#: builtin/push.c:437
7491msgid "prune locally removed refs"
7492msgstr "清除本地删除的引用"
7493
7494#: builtin/push.c:439
7495msgid "bypass pre-push hook"
7496msgstr "绕过 pre-push 钩子"
7497
7498#: builtin/push.c:440
7499msgid "push missing but relevant tags"
7500msgstr "推送缺失的有关的 tags"
7501
7502#: builtin/push.c:450
7503msgid "--delete is incompatible with --all, --mirror and --tags"
7504msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7505
7506#: builtin/push.c:452
7507msgid "--delete doesn't make sense without any refs"
7508msgstr "--delete 未接任何引用没有意义"
7509
7510#: builtin/read-tree.c:36
7511msgid ""
7512"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7513"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7514"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7515msgstr ""
7516"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7517"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7518"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7519
7520#: builtin/read-tree.c:108
7521msgid "write resulting index to <file>"
7522msgstr "将索引结果写入 <file>"
7523
7524#: builtin/read-tree.c:111
7525msgid "only empty the index"
7526msgstr "只是清空索引"
7527
7528#: builtin/read-tree.c:113
7529msgid "Merging"
7530msgstr "合并"
7531
7532#: builtin/read-tree.c:115
7533msgid "perform a merge in addition to a read"
7534msgstr "读取之余再执行一个合并"
7535
7536#: builtin/read-tree.c:117
7537msgid "3-way merge if no file level merging required"
7538msgstr "如果没有文件级合并需要,执行三路合并"
7539
7540#: builtin/read-tree.c:119
7541msgid "3-way merge in presence of adds and removes"
7542msgstr "存在添加和删除时,也执行三路合并"
7543
7544#: builtin/read-tree.c:121
7545msgid "same as -m, but discard unmerged entries"
7546msgstr "类似于 -m,但丢弃未合并的条目"
7547
7548#: builtin/read-tree.c:122
7549msgid "<subdirectory>/"
7550msgstr "<子目录>/"
7551
7552#: builtin/read-tree.c:123
7553msgid "read the tree into the index under <subdirectory>/"
7554msgstr "读取树对象到索引的 <子目录>/ 下"
7555
7556#: builtin/read-tree.c:126
7557msgid "update working tree with merge result"
7558msgstr "用合并的结果更新工作区"
7559
7560#: builtin/read-tree.c:128
7561msgid "gitignore"
7562msgstr "gitignore"
7563
7564#: builtin/read-tree.c:129
7565msgid "allow explicitly ignored files to be overwritten"
7566msgstr "允许忽略文件中设定的文件可以被覆盖"
7567
7568#: builtin/read-tree.c:132
7569msgid "don't check the working tree after merging"
7570msgstr "合并后不检查工作区"
7571
7572#: builtin/read-tree.c:133
7573msgid "don't update the index or the work tree"
7574msgstr "不更新索引区和工作区"
7575
7576#: builtin/read-tree.c:135
7577msgid "skip applying sparse checkout filter"
7578msgstr "跳过应用稀疏检出过滤器"
7579
7580#: builtin/read-tree.c:137
7581msgid "debug unpack-trees"
7582msgstr "调试 unpack-trees"
7583
7584#: builtin/remote.c:11
7585msgid "git remote [-v | --verbose]"
7586msgstr "git remote [-v | --verbose]"
7587
7588#: builtin/remote.c:12
7589msgid ""
7590"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7591"mirror=<fetch|push>] <name> <url>"
7592msgstr ""
7593"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7594"mirror=<fetch|push>] <名称> <url>"
7595
7596#: builtin/remote.c:13 builtin/remote.c:32
7597msgid "git remote rename <old> <new>"
7598msgstr "git remote rename <旧名称> <新名称>"
7599
7600#: builtin/remote.c:14 builtin/remote.c:37
7601msgid "git remote remove <name>"
7602msgstr "git remote remove <名称>"
7603
7604#: builtin/remote.c:15 builtin/remote.c:42
7605msgid "git remote set-head <name> (-a | -d | <branch>)"
7606msgstr "git remote set-head <名称> (-a | -d | <分支>)"
7607
7608#: builtin/remote.c:16
7609msgid "git remote [-v | --verbose] show [-n] <name>"
7610msgstr "git remote [-v | --verbose] show [-n] <名称>"
7611
7612#: builtin/remote.c:17
7613msgid "git remote prune [-n | --dry-run] <name>"
7614msgstr "git remote prune [-n | --dry-run] <名称>"
7615
7616#: builtin/remote.c:18
7617msgid ""
7618"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7619msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
7620
7621#: builtin/remote.c:19
7622msgid "git remote set-branches [--add] <name> <branch>..."
7623msgstr "git remote set-branches [--add] <名称> <分支>..."
7624
7625#: builtin/remote.c:20 builtin/remote.c:68
7626msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7627msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
7628
7629#: builtin/remote.c:21 builtin/remote.c:69
7630msgid "git remote set-url --add <name> <newurl>"
7631msgstr "git remote set-url --add <名称> <新的地址>"
7632
7633#: builtin/remote.c:22 builtin/remote.c:70
7634msgid "git remote set-url --delete <name> <url>"
7635msgstr "git remote set-url --delete <名称> <地址>"
7636
7637#: builtin/remote.c:27
7638msgid "git remote add [<options>] <name> <url>"
7639msgstr "git remote add [<选项>] <名称> <地址>"
7640
7641#: builtin/remote.c:47
7642msgid "git remote set-branches <name> <branch>..."
7643msgstr "git remote set-branches <名称> <分支>..."
7644
7645#: builtin/remote.c:48
7646msgid "git remote set-branches --add <name> <branch>..."
7647msgstr "git remote set-branches --add <名称> <分支>..."
7648
7649#: builtin/remote.c:53
7650msgid "git remote show [<options>] <name>"
7651msgstr "git remote show [<选项>] <名称>"
7652
7653#: builtin/remote.c:58
7654msgid "git remote prune [<options>] <name>"
7655msgstr "git remote prune [<选项>] <名称>"
7656
7657#: builtin/remote.c:63
7658msgid "git remote update [<options>] [<group> | <remote>]..."
7659msgstr "git remote update [<选项>] [<组> | <远程>]..."
7660
7661#: builtin/remote.c:98
7662#, c-format
7663msgid "Updating %s"
7664msgstr "更新 %s 中"
7665
7666#: builtin/remote.c:130
7667msgid ""
7668"--mirror is dangerous and deprecated; please\n"
7669"\t use --mirror=fetch or --mirror=push instead"
7670msgstr ""
7671"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7672"\t 或 --mirror=push"
7673
7674#: builtin/remote.c:147
7675#, c-format
7676msgid "unknown mirror argument: %s"
7677msgstr "未知的镜像参数:%s"
7678
7679#: builtin/remote.c:163
7680msgid "fetch the remote branches"
7681msgstr "抓取远程的分支"
7682
7683#: builtin/remote.c:165
7684msgid "import all tags and associated objects when fetching"
7685msgstr "抓取时导入所有的 tags 和关联对象"
7686
7687#: builtin/remote.c:168
7688msgid "or do not fetch any tag at all (--no-tags)"
7689msgstr "或不抓取任何 tag(--no-tags)"
7690
7691#: builtin/remote.c:170
7692msgid "branch(es) to track"
7693msgstr "跟踪的分支"
7694
7695#: builtin/remote.c:171
7696msgid "master branch"
7697msgstr "主线分支"
7698
7699#: builtin/remote.c:172
7700msgid "push|fetch"
7701msgstr "push|fetch"
7702
7703#: builtin/remote.c:173
7704msgid "set up remote as a mirror to push to or fetch from"
7705msgstr "把远程设置为用以推送或抓取的镜像"
7706
7707#: builtin/remote.c:185
7708msgid "specifying a master branch makes no sense with --mirror"
7709msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
7710
7711#: builtin/remote.c:187
7712msgid "specifying branches to track makes sense only with fetch mirrors"
7713msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
7714
7715#: builtin/remote.c:195 builtin/remote.c:646
7716#, c-format
7717msgid "remote %s already exists."
7718msgstr "远程 %s 已经存在。"
7719
7720#: builtin/remote.c:199 builtin/remote.c:650
7721#, c-format
7722msgid "'%s' is not a valid remote name"
7723msgstr "'%s' 不是一个有效的远程名称"
7724
7725#: builtin/remote.c:243
7726#, c-format
7727msgid "Could not setup master '%s'"
7728msgstr "无法设置 master '%s'"
7729
7730#: builtin/remote.c:299
7731#, c-format
7732msgid "more than one %s"
7733msgstr "多于一个 %s"
7734
7735#: builtin/remote.c:339
7736#, c-format
7737msgid "Could not get fetch map for refspec %s"
7738msgstr "无法得到引用表达式 %s 的获取列表"
7739
7740#: builtin/remote.c:440 builtin/remote.c:448
7741msgid "(matching)"
7742msgstr "(匹配)"
7743
7744#: builtin/remote.c:452
7745msgid "(delete)"
7746msgstr "(删除)"
7747
7748#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7749#, c-format
7750msgid "Could not append '%s' to '%s'"
7751msgstr "不能添加 '%s' 至 '%s'"
7752
7753#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7754#, c-format
7755msgid "No such remote: %s"
7756msgstr "没有这样的远程:%s"
7757
7758#: builtin/remote.c:656
7759#, c-format
7760msgid "Could not rename config section '%s' to '%s'"
7761msgstr "不能重命名配置小节 '%s' 到 '%s'"
7762
7763#: builtin/remote.c:662 builtin/remote.c:799
7764#, c-format
7765msgid "Could not remove config section '%s'"
7766msgstr "不能移除配置小节 '%s'"
7767
7768#: builtin/remote.c:677
7769#, c-format
7770msgid ""
7771"Not updating non-default fetch refspec\n"
7772"\t%s\n"
7773"\tPlease update the configuration manually if necessary."
7774msgstr ""
7775"没有更新非默认的获取引用表达式\n"
7776"\t%s\n"
7777"\t如果必要请手动更新配置。"
7778
7779#: builtin/remote.c:683
7780#, c-format
7781msgid "Could not append '%s'"
7782msgstr "不能追加 '%s'"
7783
7784#: builtin/remote.c:694
7785#, c-format
7786msgid "Could not set '%s'"
7787msgstr "不能设置 '%s'"
7788
7789#: builtin/remote.c:716
7790#, c-format
7791msgid "deleting '%s' failed"
7792msgstr "删除 '%s' 失败"
7793
7794#: builtin/remote.c:750
7795#, c-format
7796msgid "creating '%s' failed"
7797msgstr "创建 '%s' 失败"
7798
7799#: builtin/remote.c:764
7800#, c-format
7801msgid "Could not remove branch %s"
7802msgstr "无法移除分支 %s"
7803
7804#: builtin/remote.c:834
7805msgid ""
7806"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7807"to delete it, use:"
7808msgid_plural ""
7809"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7810"to delete them, use:"
7811msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7812msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
7813
7814#: builtin/remote.c:943
7815#, c-format
7816msgid " new (next fetch will store in remotes/%s)"
7817msgstr " 新的(下一次获取将存储于 remotes/%s)"
7818
7819#: builtin/remote.c:946
7820msgid " tracked"
7821msgstr " 已跟踪"
7822
7823#: builtin/remote.c:948
7824msgid " stale (use 'git remote prune' to remove)"
7825msgstr " 过时(使用 'git remote prune' 来移除)"
7826
7827#: builtin/remote.c:950
7828msgid " ???"
7829msgstr " ???"
7830
7831#: builtin/remote.c:991
7832#, c-format
7833msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7834msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
7835
7836#: builtin/remote.c:998
7837#, c-format
7838msgid "rebases onto remote %s"
7839msgstr "变基到远程 %s"
7840
7841#: builtin/remote.c:1001
7842#, c-format
7843msgid " merges with remote %s"
7844msgstr " 与远程 %s 合并"
7845
7846#: builtin/remote.c:1002
7847msgid "    and with remote"
7848msgstr "    且有远程"
7849
7850#: builtin/remote.c:1004
7851#, c-format
7852msgid "merges with remote %s"
7853msgstr "与远程 %s 合并"
7854
7855#: builtin/remote.c:1005
7856msgid "   and with remote"
7857msgstr "   且有远程"
7858
7859#: builtin/remote.c:1051
7860msgid "create"
7861msgstr "创建"
7862
7863#: builtin/remote.c:1054
7864msgid "delete"
7865msgstr "删除"
7866
7867#: builtin/remote.c:1058
7868msgid "up to date"
7869msgstr "最新"
7870
7871#: builtin/remote.c:1061
7872msgid "fast-forwardable"
7873msgstr "可快进"
7874
7875#: builtin/remote.c:1064
7876msgid "local out of date"
7877msgstr "本地已过时"
7878
7879#: builtin/remote.c:1071
7880#, c-format
7881msgid "    %-*s forces to %-*s (%s)"
7882msgstr "    %-*s 强制推送至 %-*s (%s)"
7883
7884#: builtin/remote.c:1074
7885#, c-format
7886msgid "    %-*s pushes to %-*s (%s)"
7887msgstr "    %-*s 推送至 %-*s (%s)"
7888
7889#: builtin/remote.c:1078
7890#, c-format
7891msgid "    %-*s forces to %s"
7892msgstr "    %-*s 强制推送至 %s"
7893
7894#: builtin/remote.c:1081
7895#, c-format
7896msgid "    %-*s pushes to %s"
7897msgstr "    %-*s 推送至 %s"
7898
7899#: builtin/remote.c:1091
7900msgid "do not query remotes"
7901msgstr "不查询远程"
7902
7903#: builtin/remote.c:1118
7904#, c-format
7905msgid "* remote %s"
7906msgstr "* 远程 %s"
7907
7908#: builtin/remote.c:1119
7909#, c-format
7910msgid "  Fetch URL: %s"
7911msgstr "  获取地址:%s"
7912
7913#: builtin/remote.c:1120 builtin/remote.c:1285
7914msgid "(no URL)"
7915msgstr "(无 URL)"
7916
7917#: builtin/remote.c:1129 builtin/remote.c:1131
7918#, c-format
7919msgid "  Push  URL: %s"
7920msgstr "  推送地址:%s"
7921
7922#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7923#, c-format
7924msgid "  HEAD branch: %s"
7925msgstr "  HEAD分支:%s"
7926
7927#: builtin/remote.c:1139
7928#, c-format
7929msgid ""
7930"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7931msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
7932
7933#: builtin/remote.c:1151
7934#, c-format
7935msgid "  Remote branch:%s"
7936msgid_plural "  Remote branches:%s"
7937msgstr[0] "  远程分支:%s"
7938msgstr[1] "  远程分支:%s"
7939
7940#  译者:中文字符串拼接,可删除前导空格
7941#: builtin/remote.c:1154 builtin/remote.c:1181
7942msgid " (status not queried)"
7943msgstr "(状态未查询)"
7944
7945#: builtin/remote.c:1163
7946msgid "  Local branch configured for 'git pull':"
7947msgid_plural "  Local branches configured for 'git pull':"
7948msgstr[0] "  为 'git pull' 配置的本地分支:"
7949msgstr[1] "  为 'git pull' 配置的本地分支:"
7950
7951#: builtin/remote.c:1171
7952msgid "  Local refs will be mirrored by 'git push'"
7953msgstr "  本地引用将在 'git push' 时被镜像"
7954
7955#: builtin/remote.c:1178
7956#, c-format
7957msgid "  Local ref configured for 'git push'%s:"
7958msgid_plural "  Local refs configured for 'git push'%s:"
7959msgstr[0] "  为 'git push' 配置的本地引用%s:"
7960msgstr[1] "  为 'git push' 配置的本地引用%s:"
7961
7962#: builtin/remote.c:1199
7963msgid "set refs/remotes/<name>/HEAD according to remote"
7964msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
7965
7966#: builtin/remote.c:1201
7967msgid "delete refs/remotes/<name>/HEAD"
7968msgstr "删除 refs/remotes/<名称>/HEAD"
7969
7970#: builtin/remote.c:1216
7971msgid "Cannot determine remote HEAD"
7972msgstr "无法确定远程 HEAD"
7973
7974#: builtin/remote.c:1218
7975msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7976msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
7977
7978#: builtin/remote.c:1228
7979#, c-format
7980msgid "Could not delete %s"
7981msgstr "无法删除 %s"
7982
7983#: builtin/remote.c:1236
7984#, c-format
7985msgid "Not a valid ref: %s"
7986msgstr "不是一个有效引用:%s"
7987
7988#: builtin/remote.c:1238
7989#, c-format
7990msgid "Could not setup %s"
7991msgstr "不能设置 %s"
7992
7993#  译者:注意保持前导空格
7994#: builtin/remote.c:1274
7995#, c-format
7996msgid " %s will become dangling!"
7997msgstr " %s 将成为摇摆状态!"
7998
7999#  译者:注意保持前导空格
8000#: builtin/remote.c:1275
8001#, c-format
8002msgid " %s has become dangling!"
8003msgstr " %s 已成为摇摆状态!"
8004
8005#: builtin/remote.c:1281
8006#, c-format
8007msgid "Pruning %s"
8008msgstr "修剪 %s"
8009
8010#: builtin/remote.c:1282
8011#, c-format
8012msgid "URL: %s"
8013msgstr "URL:%s"
8014
8015#: builtin/remote.c:1295
8016#, c-format
8017msgid " * [would prune] %s"
8018msgstr " * [将删除] %s"
8019
8020#: builtin/remote.c:1298
8021#, c-format
8022msgid " * [pruned] %s"
8023msgstr " * [已删除] %s"
8024
8025#: builtin/remote.c:1321
8026msgid "prune remotes after fetching"
8027msgstr "抓取后清除远程"
8028
8029#: builtin/remote.c:1387 builtin/remote.c:1461
8030#, c-format
8031msgid "No such remote '%s'"
8032msgstr "没有此远程 '%s'"
8033
8034#: builtin/remote.c:1407
8035msgid "add branch"
8036msgstr "添加分支"
8037
8038#: builtin/remote.c:1414
8039msgid "no remote specified"
8040msgstr "未指定远程"
8041
8042#: builtin/remote.c:1436
8043msgid "manipulate push URLs"
8044msgstr "操作推送 URLS"
8045
8046#: builtin/remote.c:1438
8047msgid "add URL"
8048msgstr "添加 URL"
8049
8050#: builtin/remote.c:1440
8051msgid "delete URLs"
8052msgstr "删除 URLS"
8053
8054#: builtin/remote.c:1447
8055msgid "--add --delete doesn't make sense"
8056msgstr "--add --delete 无意义"
8057
8058#: builtin/remote.c:1487
8059#, c-format
8060msgid "Invalid old URL pattern: %s"
8061msgstr "无效的旧URL匹配模版:%s"
8062
8063#: builtin/remote.c:1495
8064#, c-format
8065msgid "No such URL found: %s"
8066msgstr "未找到此URL:%s"
8067
8068#: builtin/remote.c:1497
8069msgid "Will not delete all non-push URLs"
8070msgstr "将不会删除所有非推送URL地址"
8071
8072#: builtin/remote.c:1569
8073msgid "be verbose; must be placed before a subcommand"
8074msgstr "冗长输出;必须置于子命令之前"
8075
8076#: builtin/replace.c:17
8077msgid "git replace [-f] <object> <replacement>"
8078msgstr "git replace [-f] <对象> <替换物>"
8079
8080#: builtin/replace.c:18
8081msgid "git replace -d <object>..."
8082msgstr "git replace -d <对象>..."
8083
8084#: builtin/replace.c:19
8085msgid "git replace -l [<pattern>]"
8086msgstr "git replace -l [<模式>]"
8087
8088#: builtin/replace.c:121
8089msgid "list replace refs"
8090msgstr "列出替换的引用"
8091
8092#: builtin/replace.c:122
8093msgid "delete replace refs"
8094msgstr "删除替换的引用"
8095
8096#: builtin/replace.c:123
8097msgid "replace the ref if it exists"
8098msgstr "如果存在则替换引用"
8099
8100#: builtin/rerere.c:11
8101msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8102msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8103
8104#: builtin/rerere.c:56
8105msgid "register clean resolutions in index"
8106msgstr "在索引中注册干净的解决方案"
8107
8108#: builtin/reset.c:25
8109msgid ""
8110"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8111msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8112
8113#: builtin/reset.c:26
8114msgid "git reset [-q] <tree-ish> [--] <paths>..."
8115msgstr "git reset [-q] <树或提交> [--] <路径>..."
8116
8117#: builtin/reset.c:27
8118msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8119msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8120
8121#: builtin/reset.c:33
8122msgid "mixed"
8123msgstr "混杂"
8124
8125#: builtin/reset.c:33
8126msgid "soft"
8127msgstr "软性"
8128
8129#: builtin/reset.c:33
8130msgid "hard"
8131msgstr "硬性"
8132
8133#: builtin/reset.c:33
8134msgid "merge"
8135msgstr "合并"
8136
8137#: builtin/reset.c:33
8138msgid "keep"
8139msgstr "保持"
8140
8141#: builtin/reset.c:73
8142msgid "You do not have a valid HEAD."
8143msgstr "您没有一个有效的 HEAD。"
8144
8145#: builtin/reset.c:75
8146msgid "Failed to find tree of HEAD."
8147msgstr "无法找到 HEAD 指向的树。"
8148
8149#: builtin/reset.c:81
8150#, c-format
8151msgid "Failed to find tree of %s."
8152msgstr "无法找到 %s 指向的树。"
8153
8154#: builtin/reset.c:98
8155#, c-format
8156msgid "HEAD is now at %s"
8157msgstr "HEAD 现在位于 %s"
8158
8159#  译者:汉字之间无空格,故删除%s前后空格
8160#: builtin/reset.c:169
8161#, c-format
8162msgid "Cannot do a %s reset in the middle of a merge."
8163msgstr "在合并过程中不能做%s重置操作。"
8164
8165#: builtin/reset.c:248
8166msgid "be quiet, only report errors"
8167msgstr "安静模式,只报告错误"
8168
8169#: builtin/reset.c:250
8170msgid "reset HEAD and index"
8171msgstr "重置 HEAD 和索引"
8172
8173#: builtin/reset.c:251
8174msgid "reset only HEAD"
8175msgstr "只重置 HEAD"
8176
8177#: builtin/reset.c:253 builtin/reset.c:255
8178msgid "reset HEAD, index and working tree"
8179msgstr "重置 HEAD、索引和工作区"
8180
8181#: builtin/reset.c:257
8182msgid "reset HEAD but keep local changes"
8183msgstr "重置 HEAD 但保存本地变更"
8184
8185#: builtin/reset.c:275
8186#, c-format
8187msgid "Failed to resolve '%s' as a valid revision."
8188msgstr "无法将 '%s' 解析为一个有效的版本。"
8189
8190#: builtin/reset.c:278 builtin/reset.c:286
8191#, c-format
8192msgid "Could not parse object '%s'."
8193msgstr "不能解析对象 '%s'。"
8194
8195#: builtin/reset.c:283
8196#, c-format
8197msgid "Failed to resolve '%s' as a valid tree."
8198msgstr "无法将 '%s' 解析为一个有效的树对象。"
8199
8200#: builtin/reset.c:292
8201msgid "--patch is incompatible with --{hard,mixed,soft}"
8202msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8203
8204#: builtin/reset.c:301
8205msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8206msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8207
8208#  译者:汉字之间无空格,故删除%s前后空格
8209#: builtin/reset.c:303
8210#, c-format
8211msgid "Cannot do %s reset with paths."
8212msgstr "不能带路径进行%s重置。"
8213
8214#  译者:汉字之间无空格,故删除%s前后空格
8215#: builtin/reset.c:313
8216#, c-format
8217msgid "%s reset is not allowed in a bare repository"
8218msgstr "不能对裸版本库进行%s重置"
8219
8220#: builtin/reset.c:333
8221#, c-format
8222msgid "Could not reset index file to revision '%s'."
8223msgstr "不能重置索引文件至版本 '%s'。"
8224
8225#: builtin/reset.c:339
8226msgid "Unstaged changes after reset:"
8227msgstr "重置后撤出暂存区的变更:"
8228
8229#: builtin/reset.c:344
8230msgid "Could not write new index file."
8231msgstr "不能写入新的索引文件。"
8232
8233#: builtin/rev-parse.c:339
8234msgid "git rev-parse --parseopt [options] -- [<args>...]"
8235msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8236
8237#: builtin/rev-parse.c:344
8238msgid "keep the `--` passed as an arg"
8239msgstr "保持 `--` 作为一个参数传递"
8240
8241#: builtin/rev-parse.c:346
8242msgid "stop parsing after the first non-option argument"
8243msgstr "遇到第一个非选项参数后停止解析"
8244
8245#: builtin/rev-parse.c:464
8246msgid ""
8247"git rev-parse --parseopt [options] -- [<args>...]\n"
8248"   or: git rev-parse --sq-quote [<arg>...]\n"
8249"   or: git rev-parse [options] [<arg>...]\n"
8250"\n"
8251"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8252msgstr ""
8253"git rev-parse --parseopt [选项] -- [<参数>...]\n"
8254"   或者:git rev-parse --sq-quote [<选项>...]\n"
8255"   或者:git rev-parse [options] [<选项>...]\n"
8256"\n"
8257"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8258
8259#: builtin/revert.c:22
8260msgid "git revert [options] <commit-ish>..."
8261msgstr "git revert [选项] <提交号>..."
8262
8263#: builtin/revert.c:23
8264msgid "git revert <subcommand>"
8265msgstr "git revert <子命令>"
8266
8267#: builtin/revert.c:28
8268msgid "git cherry-pick [options] <commit-ish>..."
8269msgstr "git cherry-pick [选项] <提交号>..."
8270
8271#: builtin/revert.c:29
8272msgid "git cherry-pick <subcommand>"
8273msgstr "git cherry-pick <子命令>"
8274
8275#: builtin/revert.c:70 builtin/revert.c:92
8276#, c-format
8277msgid "%s: %s cannot be used with %s"
8278msgstr "%s:%s 不能和 %s 同时使用"
8279
8280#: builtin/revert.c:103
8281msgid "end revert or cherry-pick sequence"
8282msgstr "终止反转或拣选操作"
8283
8284#: builtin/revert.c:104
8285msgid "resume revert or cherry-pick sequence"
8286msgstr "继续反转或拣选操作"
8287
8288#: builtin/revert.c:105
8289msgid "cancel revert or cherry-pick sequence"
8290msgstr "取消反转或拣选操作"
8291
8292#: builtin/revert.c:106
8293msgid "don't automatically commit"
8294msgstr "不要自动提交"
8295
8296#: builtin/revert.c:107
8297msgid "edit the commit message"
8298msgstr "编辑提交说明"
8299
8300#: builtin/revert.c:110
8301msgid "parent number"
8302msgstr "父编号"
8303
8304#: builtin/revert.c:112
8305msgid "merge strategy"
8306msgstr "合并策略"
8307
8308#: builtin/revert.c:113
8309msgid "option"
8310msgstr "选项"
8311
8312#: builtin/revert.c:114
8313msgid "option for merge strategy"
8314msgstr "合并策略的选项"
8315
8316#: builtin/revert.c:125
8317msgid "append commit name"
8318msgstr "追加提交名称"
8319
8320#: builtin/revert.c:126
8321msgid "allow fast-forward"
8322msgstr "允许快进式"
8323
8324#: builtin/revert.c:127
8325msgid "preserve initially empty commits"
8326msgstr "保留初始化的空提交"
8327
8328#: builtin/revert.c:128
8329msgid "allow commits with empty messages"
8330msgstr "允许提交说明为空"
8331
8332#: builtin/revert.c:129
8333msgid "keep redundant, empty commits"
8334msgstr "保持多余的、空的提交"
8335
8336#: builtin/revert.c:133
8337msgid "program error"
8338msgstr "程序错误"
8339
8340#: builtin/revert.c:223
8341msgid "revert failed"
8342msgstr "还原失败"
8343
8344#: builtin/revert.c:238
8345msgid "cherry-pick failed"
8346msgstr "拣选失败"
8347
8348#: builtin/rm.c:15
8349msgid "git rm [options] [--] <file>..."
8350msgstr "git rm [选项] [--] <文件>..."
8351
8352#: builtin/rm.c:64 builtin/rm.c:186
8353#, c-format
8354msgid ""
8355"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8356"(use 'rm -rf' if you really want to remove it including all of its history)"
8357msgstr ""
8358"子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8359"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8360
8361#: builtin/rm.c:174
8362#, c-format
8363msgid ""
8364"'%s' has staged content different from both the file and the HEAD\n"
8365"(use -f to force removal)"
8366msgstr ""
8367"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
8368"(使用 -f 强制删除)"
8369
8370#: builtin/rm.c:180
8371#, c-format
8372msgid ""
8373"'%s' has changes staged in the index\n"
8374"(use --cached to keep the file, or -f to force removal)"
8375msgstr ""
8376"'%s' 有变更已暂存至索引中\n"
8377"(使用 --cached 保存文件,或用 -f 强制删除)"
8378
8379#: builtin/rm.c:191
8380#, c-format
8381msgid ""
8382"'%s' has local modifications\n"
8383"(use --cached to keep the file, or -f to force removal)"
8384msgstr ""
8385"'%s' 有本地修改\n"
8386"(使用 --cached 保存文件,或用 -f 强制删除)"
8387
8388#: builtin/rm.c:207
8389msgid "do not list removed files"
8390msgstr "不列出删除的文件"
8391
8392#: builtin/rm.c:208
8393msgid "only remove from the index"
8394msgstr "只从索引区删除"
8395
8396#: builtin/rm.c:209
8397msgid "override the up-to-date check"
8398msgstr "忽略文件更新状态检查"
8399
8400#: builtin/rm.c:210
8401msgid "allow recursive removal"
8402msgstr "允许递归删除"
8403
8404#: builtin/rm.c:212
8405msgid "exit with a zero status even if nothing matched"
8406msgstr "即使没有匹配,也以零状态退出"
8407
8408#: builtin/rm.c:283
8409#, c-format
8410msgid "not removing '%s' recursively without -r"
8411msgstr "未提供 -r 选项不会递归删除 '%s'"
8412
8413#: builtin/rm.c:322
8414#, c-format
8415msgid "git rm: unable to remove %s"
8416msgstr "git rm:不能删除 %s"
8417
8418#: builtin/shortlog.c:13
8419msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8420msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
8421
8422#: builtin/shortlog.c:131
8423#, c-format
8424msgid "Missing author: %s"
8425msgstr "缺少作者:%s"
8426
8427#: builtin/shortlog.c:227
8428msgid "sort output according to the number of commits per author"
8429msgstr "根据每个作者的提交数量排序"
8430
8431#: builtin/shortlog.c:229
8432msgid "Suppress commit descriptions, only provides commit count"
8433msgstr "隐藏提交说明,只提供提交数量"
8434
8435#: builtin/shortlog.c:231
8436msgid "Show the email address of each author"
8437msgstr "显示每个作者的电子邮件地址"
8438
8439#: builtin/shortlog.c:232
8440msgid "w[,i1[,i2]]"
8441msgstr "w[,i1[,i2]]"
8442
8443#: builtin/shortlog.c:233
8444msgid "Linewrap output"
8445msgstr "折行输出"
8446
8447#: builtin/show-branch.c:9
8448msgid ""
8449"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8450"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8451"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8452"<glob>)...]"
8453msgstr ""
8454"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8455"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8456"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8457"<glob>)...]"
8458
8459#: builtin/show-branch.c:10
8460msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8461msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8462
8463#: builtin/show-branch.c:650
8464msgid "show remote-tracking and local branches"
8465msgstr "显示远程跟踪的和本地的分支"
8466
8467#: builtin/show-branch.c:652
8468msgid "show remote-tracking branches"
8469msgstr "显示远程跟踪的分支"
8470
8471#: builtin/show-branch.c:654
8472msgid "color '*!+-' corresponding to the branch"
8473msgstr "着色 '*!+-' 到相应的分支"
8474
8475#: builtin/show-branch.c:656
8476msgid "show <n> more commits after the common ancestor"
8477msgstr "显示共同祖先后的 <n> 个提交"
8478
8479#: builtin/show-branch.c:658
8480msgid "synonym to more=-1"
8481msgstr "和 more=-1 同义"
8482
8483#: builtin/show-branch.c:659
8484msgid "suppress naming strings"
8485msgstr "不显示字符串命名"
8486
8487#: builtin/show-branch.c:661
8488msgid "include the current branch"
8489msgstr "包括当前分支"
8490
8491#: builtin/show-branch.c:663
8492msgid "name commits with their object names"
8493msgstr "以对象名字命名提交"
8494
8495#: builtin/show-branch.c:665
8496msgid "show possible merge bases"
8497msgstr "显示可能合并的基线"
8498
8499#: builtin/show-branch.c:667
8500msgid "show refs unreachable from any other ref"
8501msgstr "显示没有任何引用的的引用"
8502
8503#: builtin/show-branch.c:669
8504msgid "show commits in topological order"
8505msgstr "以拓扑顺序显示提交"
8506
8507#: builtin/show-branch.c:671
8508msgid "show only commits not on the first branch"
8509msgstr "只显示不在第一个分支上的提交"
8510
8511#: builtin/show-branch.c:673
8512msgid "show merges reachable from only one tip"
8513msgstr "显示仅一个分支可访问的合并提交"
8514
8515#: builtin/show-branch.c:675
8516msgid "show commits where no parent comes before its children"
8517msgstr "显示提交时以时间为序且父提交不能领先子提交"
8518
8519#: builtin/show-branch.c:677
8520msgid "<n>[,<base>]"
8521msgstr "<n>[,<base>]"
8522
8523#: builtin/show-branch.c:678
8524msgid "show <n> most recent ref-log entries starting at base"
8525msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
8526
8527#: builtin/show-ref.c:10
8528msgid ""
8529"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8530"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8531msgstr ""
8532"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8533"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8534
8535#: builtin/show-ref.c:11
8536msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8537msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
8538
8539#: builtin/show-ref.c:165
8540msgid "only show tags (can be combined with heads)"
8541msgstr "只显示 tags(可以和头共用)"
8542
8543#: builtin/show-ref.c:166
8544msgid "only show heads (can be combined with tags)"
8545msgstr "只显示头(可以和 tags 共用)"
8546
8547#: builtin/show-ref.c:167
8548msgid "stricter reference checking, requires exact ref path"
8549msgstr "更严格的引用检测,需要精确的引用路径"
8550
8551#: builtin/show-ref.c:170 builtin/show-ref.c:172
8552msgid "show the HEAD reference"
8553msgstr "显示 HEAD 引用"
8554
8555#: builtin/show-ref.c:174
8556msgid "dereference tags into object IDs"
8557msgstr "转换 tags 到对象ID"
8558
8559#: builtin/show-ref.c:176
8560msgid "only show SHA1 hash using <n> digits"
8561msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
8562
8563#: builtin/show-ref.c:180
8564msgid "do not print results to stdout (useful with --verify)"
8565msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
8566
8567#: builtin/show-ref.c:182
8568msgid "show refs from stdin that aren't in local repository"
8569msgstr "显示从标准输入中读入的不在本地版本库中的引用"
8570
8571#: builtin/symbolic-ref.c:7
8572msgid "git symbolic-ref [options] name [ref]"
8573msgstr "git symbolic-ref [选项] 名称 [引用]"
8574
8575#: builtin/symbolic-ref.c:8
8576msgid "git symbolic-ref -d [-q] name"
8577msgstr "git symbolic-ref -d [-q] 名称"
8578
8579#: builtin/symbolic-ref.c:40
8580msgid "suppress error message for non-symbolic (detached) refs"
8581msgstr "不显示非符号(分离的)引用的错误信息"
8582
8583#: builtin/symbolic-ref.c:41
8584msgid "delete symbolic ref"
8585msgstr "删除符号引用"
8586
8587#: builtin/symbolic-ref.c:42
8588msgid "shorten ref output"
8589msgstr "简短的引用输出"
8590
8591#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8592msgid "reason"
8593msgstr "原因"
8594
8595#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8596msgid "reason of the update"
8597msgstr "更新的原因"
8598
8599#: builtin/tag.c:22
8600msgid ""
8601"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8602msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
8603
8604#: builtin/tag.c:23
8605msgid "git tag -d <tagname>..."
8606msgstr "git tag -d <标签名>..."
8607
8608#: builtin/tag.c:24
8609msgid ""
8610"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8611"\t\t[<pattern>...]"
8612msgstr ""
8613"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8614"\t\t[<模式>...]"
8615
8616#: builtin/tag.c:26
8617msgid "git tag -v <tagname>..."
8618msgstr "git tag -v <标签名>..."
8619
8620#: builtin/tag.c:60
8621#, c-format
8622msgid "malformed object at '%s'"
8623msgstr "非法的对象于 '%s'"
8624
8625#: builtin/tag.c:207
8626#, c-format
8627msgid "tag name too long: %.*s..."
8628msgstr "tag 名字太长:%.*s..."
8629
8630#: builtin/tag.c:212
8631#, c-format
8632msgid "tag '%s' not found."
8633msgstr "tag '%s' 未发现。"
8634
8635#: builtin/tag.c:227
8636#, c-format
8637msgid "Deleted tag '%s' (was %s)\n"
8638msgstr "已删除 tag '%s'(曾为 %s)\n"
8639
8640#: builtin/tag.c:239
8641#, c-format
8642msgid "could not verify the tag '%s'"
8643msgstr "不能校验 tag '%s'"
8644
8645#: builtin/tag.c:249
8646#, c-format
8647msgid ""
8648"\n"
8649"Write a tag message\n"
8650"Lines starting with '%c' will be ignored.\n"
8651msgstr ""
8652"\n"
8653"输入一个 tag 说明\n"
8654"以 '%c' 开头的行将被忽略。\n"
8655
8656#: builtin/tag.c:253
8657#, c-format
8658msgid ""
8659"\n"
8660"Write a tag message\n"
8661"Lines starting with '%c' will be kept; you may remove them yourself if you "
8662"want to.\n"
8663msgstr ""
8664"\n"
8665"输入一个 tag 说明\n"
8666"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
8667
8668#: builtin/tag.c:292
8669msgid "unable to sign the tag"
8670msgstr "无法签署 tag"
8671
8672#: builtin/tag.c:294
8673msgid "unable to write tag file"
8674msgstr "无法写 tag 文件"
8675
8676#: builtin/tag.c:319
8677msgid "bad object type."
8678msgstr "坏的对象类型。"
8679
8680#: builtin/tag.c:332
8681msgid "tag header too big."
8682msgstr "tag 头信息太大。"
8683
8684#: builtin/tag.c:368
8685msgid "no tag message?"
8686msgstr "无 tag 说明?"
8687
8688#: builtin/tag.c:374
8689#, c-format
8690msgid "The tag message has been left in %s\n"
8691msgstr "tag 说明被保留在 %s\n"
8692
8693#: builtin/tag.c:423
8694msgid "switch 'points-at' requires an object"
8695msgstr "开关 'points-at' 需要一个对象"
8696
8697#: builtin/tag.c:425
8698#, c-format
8699msgid "malformed object name '%s'"
8700msgstr "非法的对象名 '%s'"
8701
8702#: builtin/tag.c:445
8703msgid "list tag names"
8704msgstr "列出tag名称"
8705
8706#: builtin/tag.c:447
8707msgid "print <n> lines of each tag message"
8708msgstr "每个 tag 信息打印 <n> 行"
8709
8710#: builtin/tag.c:449
8711msgid "delete tags"
8712msgstr "删除 tags"
8713
8714#: builtin/tag.c:450
8715msgid "verify tags"
8716msgstr "验证 tags"
8717
8718#: builtin/tag.c:452
8719msgid "Tag creation options"
8720msgstr "Tag 创建选项"
8721
8722#: builtin/tag.c:454
8723msgid "annotated tag, needs a message"
8724msgstr "注解 tag,需要一个说明"
8725
8726#: builtin/tag.c:456
8727msgid "tag message"
8728msgstr "tag 说明"
8729
8730#: builtin/tag.c:458
8731msgid "annotated and GPG-signed tag"
8732msgstr "注解并 GPG 签名的 tag"
8733
8734#: builtin/tag.c:462
8735msgid "use another key to sign the tag"
8736msgstr "使用另外的私钥签名 tag"
8737
8738#: builtin/tag.c:463
8739msgid "replace the tag if exists"
8740msgstr "如果存在,替换现有的 tag"
8741
8742#: builtin/tag.c:464
8743msgid "show tag list in columns"
8744msgstr "以列的方式显示 tag"
8745
8746#: builtin/tag.c:466
8747msgid "Tag listing options"
8748msgstr "Tag 列表选项"
8749
8750#: builtin/tag.c:469
8751msgid "print only tags that contain the commit"
8752msgstr "只打印包含提交的tags"
8753
8754#: builtin/tag.c:475
8755msgid "print only tags of the object"
8756msgstr "只打印tags对象"
8757
8758#: builtin/tag.c:504
8759msgid "--column and -n are incompatible"
8760msgstr "--column 和 -n 不兼容"
8761
8762#: builtin/tag.c:521
8763msgid "-n option is only allowed with -l."
8764msgstr "-n 选项只允许和 -l 同时使用。"
8765
8766#: builtin/tag.c:523
8767msgid "--contains option is only allowed with -l."
8768msgstr "--contains 选项只允许和 -l 同时使用。"
8769
8770#: builtin/tag.c:525
8771msgid "--points-at option is only allowed with -l."
8772msgstr "--points-at 选项只允许和 -l 同时使用。"
8773
8774#: builtin/tag.c:533
8775msgid "only one -F or -m option is allowed."
8776msgstr "只允许一个 -F 或 -m 选项。"
8777
8778#: builtin/tag.c:553
8779msgid "too many params"
8780msgstr "太多参数"
8781
8782#: builtin/tag.c:559
8783#, c-format
8784msgid "'%s' is not a valid tag name."
8785msgstr "'%s' 不是一个有效的tag名称。"
8786
8787#: builtin/tag.c:564
8788#, c-format
8789msgid "tag '%s' already exists"
8790msgstr "tag '%s' 已存在"
8791
8792#: builtin/tag.c:582
8793#, c-format
8794msgid "%s: cannot lock the ref"
8795msgstr "%s:不能锁定引用"
8796
8797#: builtin/tag.c:584
8798#, c-format
8799msgid "%s: cannot update the ref"
8800msgstr "%s:不能更新引用"
8801
8802#: builtin/tag.c:586
8803#, c-format
8804msgid "Updated tag '%s' (was %s)\n"
8805msgstr "已更新tag '%s'(曾为 %s)\n"
8806
8807#: builtin/update-index.c:401
8808msgid "git update-index [options] [--] [<file>...]"
8809msgstr "git update-index [选项] [--] [<文件>...]"
8810
8811#: builtin/update-index.c:718
8812msgid "continue refresh even when index needs update"
8813msgstr "当索引需要更新时继续刷新"
8814
8815#: builtin/update-index.c:721
8816msgid "refresh: ignore submodules"
8817msgstr "刷新:忽略子模组"
8818
8819#: builtin/update-index.c:724
8820msgid "do not ignore new files"
8821msgstr "不忽略新的文件"
8822
8823#: builtin/update-index.c:726
8824msgid "let files replace directories and vice-versa"
8825msgstr "让文件替换目录(反之亦然)"
8826
8827#: builtin/update-index.c:728
8828msgid "notice files missing from worktree"
8829msgstr "通知文件从工作区丢失"
8830
8831#: builtin/update-index.c:730
8832msgid "refresh even if index contains unmerged entries"
8833msgstr "即使索引区包含未合并的条目也执行刷新"
8834
8835#: builtin/update-index.c:733
8836msgid "refresh stat information"
8837msgstr "刷新统计信息"
8838
8839#: builtin/update-index.c:737
8840msgid "like --refresh, but ignore assume-unchanged setting"
8841msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
8842
8843#: builtin/update-index.c:741
8844msgid "<mode> <object> <path>"
8845msgstr "<mode> <object> <path>"
8846
8847#: builtin/update-index.c:742
8848msgid "add the specified entry to the index"
8849msgstr "添加指定的条目到索引区"
8850
8851#: builtin/update-index.c:746
8852msgid "(+/-)x"
8853msgstr "(+/-)x"
8854
8855#: builtin/update-index.c:747
8856msgid "override the executable bit of the listed files"
8857msgstr "覆盖列表里文件的可执行位"
8858
8859#: builtin/update-index.c:751
8860msgid "mark files as \"not changing\""
8861msgstr "把文件标记为 \"没有变更\""
8862
8863#: builtin/update-index.c:754
8864msgid "clear assumed-unchanged bit"
8865msgstr "清除 assumed-unchanged 位"
8866
8867#: builtin/update-index.c:757
8868msgid "mark files as \"index-only\""
8869msgstr "把文件标记为 \"仅索引\""
8870
8871#: builtin/update-index.c:760
8872msgid "clear skip-worktree bit"
8873msgstr "清除 skip-worktree 位"
8874
8875#: builtin/update-index.c:763
8876msgid "add to index only; do not add content to object database"
8877msgstr "只添加到索引区;不添加对象到对象库"
8878
8879#: builtin/update-index.c:765
8880msgid "remove named paths even if present in worktree"
8881msgstr "即使存在工作区里,也删除路径"
8882
8883#: builtin/update-index.c:767
8884msgid "with --stdin: input lines are terminated by null bytes"
8885msgstr "携带 --stdin:输入的行以 null 字符终止"
8886
8887#: builtin/update-index.c:769
8888msgid "read list of paths to be updated from standard input"
8889msgstr "从标准输入中读取需要更新的路径列表"
8890
8891#: builtin/update-index.c:773
8892msgid "add entries from standard input to the index"
8893msgstr "从标准输入添加条目到索引区"
8894
8895#: builtin/update-index.c:777
8896msgid "repopulate stages #2 and #3 for the listed paths"
8897msgstr "为指定文件重新生成第2和第3暂存区"
8898
8899#: builtin/update-index.c:781
8900msgid "only update entries that differ from HEAD"
8901msgstr "只更新与 HEAD 不同的条目"
8902
8903#: builtin/update-index.c:785
8904msgid "ignore files missing from worktree"
8905msgstr "忽略工作区丢失的文件"
8906
8907#: builtin/update-index.c:788
8908msgid "report actions to standard output"
8909msgstr "在标准输出显示操作"
8910
8911#: builtin/update-index.c:790
8912msgid "(for porcelains) forget saved unresolved conflicts"
8913msgstr "(for porcelains) 忘记保存的未解决的冲突"
8914
8915#: builtin/update-index.c:794
8916msgid "write index in this format"
8917msgstr "以这种格式写入索引区"
8918
8919#: builtin/update-ref.c:7
8920msgid "git update-ref [options] -d <refname> [<oldval>]"
8921msgstr "git update-ref [options] -d <引用名> [<旧值>]"
8922
8923#: builtin/update-ref.c:8
8924msgid "git update-ref [options]    <refname> <newval> [<oldval>]"
8925msgstr "git update-ref [options]    <引用名> <新值> [<旧值>]"
8926
8927#: builtin/update-ref.c:19
8928msgid "delete the reference"
8929msgstr "删除引用"
8930
8931#: builtin/update-ref.c:21
8932msgid "update <refname> not the one it points to"
8933msgstr "更新 <引用名> 本身而不是它指向的引用"
8934
8935#: builtin/update-server-info.c:6
8936msgid "git update-server-info [--force]"
8937msgstr "git update-server-info [--force]"
8938
8939#: builtin/update-server-info.c:14
8940msgid "update the info files from scratch"
8941msgstr "从头开始更新文件信息"
8942
8943#: builtin/verify-pack.c:56
8944msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8945msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8946
8947#: builtin/verify-pack.c:66
8948msgid "verbose"
8949msgstr "冗长输出"
8950
8951#: builtin/verify-pack.c:68
8952msgid "show statistics only"
8953msgstr "只显示统计"
8954
8955#: builtin/verify-tag.c:17
8956msgid "git verify-tag [-v|--verbose] <tag>..."
8957msgstr "git verify-tag [-v|--verbose] <tag>..."
8958
8959#: builtin/verify-tag.c:73
8960msgid "print tag contents"
8961msgstr "打印 tag 内容"
8962
8963#: builtin/write-tree.c:13
8964msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8965msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
8966
8967#: builtin/write-tree.c:26
8968msgid "<prefix>/"
8969msgstr "<前缀>/"
8970
8971#: builtin/write-tree.c:27
8972msgid "write tree object for a subdirectory <prefix>"
8973msgstr "将 <前缀> 子目录内容写到一个树对象"
8974
8975#: builtin/write-tree.c:30
8976msgid "only useful for debugging"
8977msgstr "只对调试有用"
8978
8979#: git.c:16
8980msgid ""
8981"'git help -a' and 'git help -g' lists available subcommands and some\n"
8982"concept guides. See 'git help <command>' or 'git help <concept>'\n"
8983"to read about a specific subcommand or concept."
8984msgstr ""
8985"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
8986"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
8987
8988#: parse-options.h:156
8989msgid "no-op (backward compatibility)"
8990msgstr "空操作(向后兼容)"
8991
8992#: parse-options.h:232
8993msgid "be more verbose"
8994msgstr "更加详细"
8995
8996#: parse-options.h:234
8997msgid "be more quiet"
8998msgstr "更加安静"
8999
9000#: parse-options.h:240
9001msgid "use <n> digits to display SHA-1s"
9002msgstr "用 <n> 位数字显示 SHA-1 哈希值"
9003
9004#: common-cmds.h:8
9005msgid "Add file contents to the index"
9006msgstr "添加文件内容至索引"
9007
9008#: common-cmds.h:9
9009msgid "Find by binary search the change that introduced a bug"
9010msgstr "通过二分查找定位引入 bug 的变更"
9011
9012#: common-cmds.h:10
9013msgid "List, create, or delete branches"
9014msgstr "列出、创建或删除分支"
9015
9016#: common-cmds.h:11
9017msgid "Checkout a branch or paths to the working tree"
9018msgstr "检出一个分支或路径到工作区"
9019
9020#: common-cmds.h:12
9021msgid "Clone a repository into a new directory"
9022msgstr "克隆一个版本库到一个新目录"
9023
9024#: common-cmds.h:13
9025msgid "Record changes to the repository"
9026msgstr "记录变更到版本库"
9027
9028#: common-cmds.h:14
9029msgid "Show changes between commits, commit and working tree, etc"
9030msgstr "显示提交之间、提交和工作区之间等的差异"
9031
9032#: common-cmds.h:15
9033msgid "Download objects and refs from another repository"
9034msgstr "从另外一个版本库下载对象和引用"
9035
9036#: common-cmds.h:16
9037msgid "Print lines matching a pattern"
9038msgstr "输出和模式匹配的行"
9039
9040#: common-cmds.h:17
9041msgid "Create an empty Git repository or reinitialize an existing one"
9042msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9043
9044#: common-cmds.h:18
9045msgid "Show commit logs"
9046msgstr "显示提交日志"
9047
9048#: common-cmds.h:19
9049msgid "Join two or more development histories together"
9050msgstr "合并两个或更多开发历史"
9051
9052#: common-cmds.h:20
9053msgid "Move or rename a file, a directory, or a symlink"
9054msgstr "移动或重命名一个文件、目录或符号链接"
9055
9056#: common-cmds.h:21
9057msgid "Fetch from and merge with another repository or a local branch"
9058msgstr "获取并合并另外的版本库或一个本地分支"
9059
9060#: common-cmds.h:22
9061msgid "Update remote refs along with associated objects"
9062msgstr "更新远程引用和相关的对象"
9063
9064#: common-cmds.h:23
9065msgid "Forward-port local commits to the updated upstream head"
9066msgstr "本地提交转移至更新后的上游分支中"
9067
9068#: common-cmds.h:24
9069msgid "Reset current HEAD to the specified state"
9070msgstr "重置当前HEAD到指定状态"
9071
9072#: common-cmds.h:25
9073msgid "Remove files from the working tree and from the index"
9074msgstr "从工作区和索引中删除文件"
9075
9076#: common-cmds.h:26
9077msgid "Show various types of objects"
9078msgstr "显示各种类型的对象"
9079
9080#: common-cmds.h:27
9081msgid "Show the working tree status"
9082msgstr "显示工作区状态"
9083
9084#: common-cmds.h:28
9085msgid "Create, list, delete or verify a tag object signed with GPG"
9086msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
9087
9088#: git-am.sh:50
9089msgid "You need to set your committer info first"
9090msgstr "您需要先设置你的提交者信息"
9091
9092#: git-am.sh:95
9093msgid ""
9094"You seem to have moved HEAD since the last 'am' failure.\n"
9095"Not rewinding to ORIG_HEAD"
9096msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9097
9098#: git-am.sh:105
9099#, sh-format
9100msgid ""
9101"When you have resolved this problem, run \"$cmdline --resolved\".\n"
9102"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9103"To restore the original branch and stop patching, run \"$cmdline --abort\"."
9104msgstr ""
9105"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
9106"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9107"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9108
9109#: git-am.sh:121
9110msgid "Cannot fall back to three-way merge."
9111msgstr "无法求助于三路合并。"
9112
9113#: git-am.sh:137
9114msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9115msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
9116
9117#: git-am.sh:139
9118msgid "Using index info to reconstruct a base tree..."
9119msgstr "使用索引来重建一个(三路合并的)基础目录树..."
9120
9121#: git-am.sh:154
9122msgid ""
9123"Did you hand edit your patch?\n"
9124"It does not apply to blobs recorded in its index."
9125msgstr ""
9126"您是否曾手动编辑过您的补丁?\n"
9127"无法应用补丁到索引中的数据(blob)对象上。"
9128
9129#: git-am.sh:163
9130msgid "Falling back to patching base and 3-way merge..."
9131msgstr "转而在基础版本上打补丁及进行三路合并..."
9132
9133#: git-am.sh:179
9134msgid "Failed to merge in the changes."
9135msgstr "无法合并变更。"
9136
9137#: git-am.sh:274
9138msgid "Only one StGIT patch series can be applied at once"
9139msgstr "一次只能有一个 StGIT 补丁队列被应用"
9140
9141#: git-am.sh:361
9142#, sh-format
9143msgid "Patch format $patch_format is not supported."
9144msgstr "不支持 $patch_format 补丁格式。"
9145
9146#: git-am.sh:363
9147msgid "Patch format detection failed."
9148msgstr "补丁格式检测失败。"
9149
9150#: git-am.sh:389
9151msgid ""
9152"The -b/--binary option has been a no-op for long time, and\n"
9153"it will be removed. Please do not use it anymore."
9154msgstr ""
9155"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9156"请不要再使用它了。"
9157
9158#: git-am.sh:477
9159#, sh-format
9160msgid "previous rebase directory $dotest still exists but mbox given."
9161msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
9162
9163#: git-am.sh:482
9164msgid "Please make up your mind. --skip or --abort?"
9165msgstr "请下决心。--skip 或是 --abort ?"
9166
9167#: git-am.sh:509
9168msgid "Resolve operation not in progress, we are not resuming."
9169msgstr "解决操作未进行,我们不会继续。"
9170
9171#: git-am.sh:575
9172#, sh-format
9173msgid "Dirty index: cannot apply patches (dirty: $files)"
9174msgstr "脏的索引:不能应用补丁(脏文件:$files)"
9175
9176#: git-am.sh:679
9177#, sh-format
9178msgid ""
9179"Patch is empty.  Was it split wrong?\n"
9180"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9181"To restore the original branch and stop patching run \"$cmdline --abort\"."
9182msgstr ""
9183"补丁为空。是不是切分错误?\n"
9184"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9185"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9186
9187#: git-am.sh:706
9188msgid "Patch does not have a valid e-mail address."
9189msgstr "补丁中没有一个有效的邮件地址。"
9190
9191#: git-am.sh:753
9192msgid "cannot be interactive without stdin connected to a terminal."
9193msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9194
9195#: git-am.sh:757
9196msgid "Commit Body is:"
9197msgstr "提交内容为:"
9198
9199#  译者:注意保持句尾空格
9200#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9201#. in your translation. The program will only accept English
9202#. input at this point.
9203#: git-am.sh:764
9204msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9205msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9206
9207#: git-am.sh:800
9208#, sh-format
9209msgid "Applying: $FIRSTLINE"
9210msgstr "正应用:$FIRSTLINE"
9211
9212#: git-am.sh:821
9213msgid ""
9214"No changes - did you forget to use 'git add'?\n"
9215"If there is nothing left to stage, chances are that something else\n"
9216"already introduced the same changes; you might want to skip this patch."
9217msgstr ""
9218"没有变更 —— 您是不是忘了执行 'git add'?\n"
9219"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9220"您也许想要跳过这个补丁。"
9221
9222#: git-am.sh:829
9223msgid ""
9224"You still have unmerged paths in your index\n"
9225"did you forget to use 'git add'?"
9226msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9227
9228#: git-am.sh:845
9229msgid "No changes -- Patch already applied."
9230msgstr "没有变更 —— 补丁已经应用过。"
9231
9232#: git-am.sh:855
9233#, sh-format
9234msgid "Patch failed at $msgnum $FIRSTLINE"
9235msgstr "补丁失败于 $msgnum $FIRSTLINE"
9236
9237#: git-am.sh:858
9238#, sh-format
9239msgid ""
9240"The copy of the patch that failed is found in:\n"
9241"   $dotest/patch"
9242msgstr ""
9243"失败的补丁文件副本位于:\n"
9244"   $dotest/patch"
9245
9246#: git-am.sh:876
9247msgid "applying to an empty history"
9248msgstr "正应用到一个空历史上"
9249
9250#: git-bisect.sh:48
9251msgid "You need to start by \"git bisect start\""
9252msgstr "您需要执行 \"git bisect start\" 来开始"
9253
9254#  译者:注意保持句尾空格
9255#. TRANSLATORS: Make sure to include [Y] and [n] in your
9256#. translation. The program will only accept English input
9257#. at this point.
9258#: git-bisect.sh:54
9259msgid "Do you want me to do it for you [Y/n]? "
9260msgstr "您想让我为您这样做么[Y/n]? "
9261
9262#: git-bisect.sh:95
9263#, sh-format
9264msgid "unrecognised option: '$arg'"
9265msgstr "未能识别的选项:'$arg'"
9266
9267#: git-bisect.sh:99
9268#, sh-format
9269msgid "'$arg' does not appear to be a valid revision"
9270msgstr "'$arg' 看起来不像是一个有效的版本"
9271
9272#: git-bisect.sh:117
9273msgid "Bad HEAD - I need a HEAD"
9274msgstr "坏的 HEAD - 我需要一个 HEAD"
9275
9276#: git-bisect.sh:130
9277#, sh-format
9278msgid ""
9279"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9280msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9281
9282#: git-bisect.sh:140
9283msgid "won't bisect on seeked tree"
9284msgstr "不会在已查找过的树上二分查找"
9285
9286#: git-bisect.sh:144
9287msgid "Bad HEAD - strange symbolic ref"
9288msgstr "坏的 HEAD - 奇怪的符号引用"
9289
9290#: git-bisect.sh:189
9291#, sh-format
9292msgid "Bad bisect_write argument: $state"
9293msgstr "坏的 bisect_write 参数:$state"
9294
9295#: git-bisect.sh:218
9296#, sh-format
9297msgid "Bad rev input: $arg"
9298msgstr "输入坏的版本:$arg"
9299
9300#: git-bisect.sh:232
9301msgid "Please call 'bisect_state' with at least one argument."
9302msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9303
9304#: git-bisect.sh:244
9305#, sh-format
9306msgid "Bad rev input: $rev"
9307msgstr "输入坏的版本:$rev"
9308
9309#: git-bisect.sh:250
9310msgid "'git bisect bad' can take only one argument."
9311msgstr "'git bisect bad' 只能带一个参数。"
9312
9313#. have bad but not good.  we could bisect although
9314#. this is less optimum.
9315#: git-bisect.sh:273
9316msgid "Warning: bisecting only with a bad commit."
9317msgstr "警告:在仅有一个坏提交下进行二分查找。"
9318
9319#  译者:注意保持句尾空格
9320#. TRANSLATORS: Make sure to include [Y] and [n] in your
9321#. translation. The program will only accept English input
9322#. at this point.
9323#: git-bisect.sh:279
9324msgid "Are you sure [Y/n]? "
9325msgstr "您确认么[Y/n]? "
9326
9327#: git-bisect.sh:289
9328msgid ""
9329"You need to give me at least one good and one bad revisions.\n"
9330"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9331msgstr ""
9332"您需要给我至少一个好版本和一个坏版本。\n"
9333"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9334
9335#: git-bisect.sh:292
9336msgid ""
9337"You need to start by \"git bisect start\".\n"
9338"You then need to give me at least one good and one bad revisions.\n"
9339"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9340msgstr ""
9341"您需要执行 \"git bisect start\" 来开始。\n"
9342"然后需要提供我至少一个好版本和一个坏版本。\n"
9343"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9344
9345#: git-bisect.sh:363 git-bisect.sh:490
9346msgid "We are not bisecting."
9347msgstr "我们没有在二分查找。"
9348
9349#: git-bisect.sh:370
9350#, sh-format
9351msgid "'$invalid' is not a valid commit"
9352msgstr "'$invalid' 不是一个有效的提交"
9353
9354#: git-bisect.sh:379
9355#, sh-format
9356msgid ""
9357"Could not check out original HEAD '$branch'.\n"
9358"Try 'git bisect reset <commit>'."
9359msgstr ""
9360"不能检出原始 HEAD '$branch'。\n"
9361"尝试 'git bisect reset <提交>'。"
9362
9363#: git-bisect.sh:406
9364msgid "No logfile given"
9365msgstr "未提供日志文件"
9366
9367#: git-bisect.sh:407
9368#, sh-format
9369msgid "cannot read $file for replaying"
9370msgstr "不能读取 $file 来重放"
9371
9372#: git-bisect.sh:424
9373msgid "?? what are you talking about?"
9374msgstr "?? 您在说什么?"
9375
9376#: git-bisect.sh:436
9377#, sh-format
9378msgid "running $command"
9379msgstr "运行 $command"
9380
9381#: git-bisect.sh:443
9382#, sh-format
9383msgid ""
9384"bisect run failed:\n"
9385"exit code $res from '$command' is < 0 or >= 128"
9386msgstr ""
9387"二分查找运行失败:\n"
9388"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
9389
9390#: git-bisect.sh:469
9391msgid "bisect run cannot continue any more"
9392msgstr "二分查找不能继续运行"
9393
9394#: git-bisect.sh:475
9395#, sh-format
9396msgid ""
9397"bisect run failed:\n"
9398"'bisect_state $state' exited with error code $res"
9399msgstr ""
9400"二分查找运行失败:\n"
9401"'bisect_state $state' 退出码为 $res"
9402
9403#: git-bisect.sh:482
9404msgid "bisect run success"
9405msgstr "二分查找运行成功"
9406
9407#: git-pull.sh:21
9408msgid ""
9409"Pull is not possible because you have unmerged files.\n"
9410"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9411"as appropriate to mark resolution, or use 'git commit -a'."
9412msgstr ""
9413"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
9414"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
9415"或者使用 'git commit -a'。"
9416
9417#: git-pull.sh:25
9418msgid "Pull is not possible because you have unmerged files."
9419msgstr "Pull 不可用,因为您尚有未合并的文件。"
9420
9421#: git-pull.sh:203
9422msgid "updating an unborn branch with changes added to the index"
9423msgstr "更新尚未诞生的分支,变更添加至索引"
9424
9425#. The fetch involved updating the current branch.
9426#. The working tree and the index file is still based on the
9427#. $orig_head commit, but we are merging into $curr_head.
9428#. First update the working tree to match $curr_head.
9429#: git-pull.sh:235
9430#, sh-format
9431msgid ""
9432"Warning: fetch updated the current branch head.\n"
9433"Warning: fast-forwarding your working tree from\n"
9434"Warning: commit $orig_head."
9435msgstr ""
9436"警告:fetch 更新了当前的分支。您的工作区\n"
9437"警告:从原提交 $orig_head 快进。"
9438
9439#: git-pull.sh:260
9440msgid "Cannot merge multiple branches into empty head"
9441msgstr "无法将多个分支合并到空分支"
9442
9443#: git-pull.sh:264
9444msgid "Cannot rebase onto multiple branches"
9445msgstr "无法变基到多个分支"
9446
9447#: git-rebase.sh:53
9448msgid ""
9449"When you have resolved this problem, run \"git rebase --continue\".\n"
9450"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9451"To check out the original branch and stop rebasing, run \"git rebase --abort"
9452"\"."
9453msgstr ""
9454"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9455"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9456"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9457
9458#: git-rebase.sh:160
9459msgid "The pre-rebase hook refused to rebase."
9460msgstr "钩子 pre-rebase 拒绝变基。"
9461
9462#: git-rebase.sh:165
9463msgid "It looks like git-am is in progress. Cannot rebase."
9464msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9465
9466#: git-rebase.sh:296
9467msgid "The --exec option must be used with the --interactive option"
9468msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9469
9470#: git-rebase.sh:301
9471msgid "No rebase in progress?"
9472msgstr "没有正在进行的变基?"
9473
9474#: git-rebase.sh:312
9475msgid "The --edit-todo action can only be used during interactive rebase."
9476msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9477
9478#: git-rebase.sh:319
9479msgid "Cannot read HEAD"
9480msgstr "不能读取 HEAD"
9481
9482#: git-rebase.sh:322
9483msgid ""
9484"You must edit all merge conflicts and then\n"
9485"mark them as resolved using git add"
9486msgstr ""
9487"您必须编辑所有的合并冲突,然后通过 git add\n"
9488"命令将它们标记为已解决"
9489
9490#: git-rebase.sh:340
9491#, sh-format
9492msgid "Could not move back to $head_name"
9493msgstr "无法移回 $head_name"
9494
9495#: git-rebase.sh:359
9496#, sh-format
9497msgid ""
9498"It seems that there is already a $state_dir_base directory, and\n"
9499"I wonder if you are in the middle of another rebase.  If that is the\n"
9500"case, please try\n"
9501"\t$cmd_live_rebase\n"
9502"If that is not the case, please\n"
9503"\t$cmd_clear_stale_rebase\n"
9504"and run me again.  I am stopping in case you still have something\n"
9505"valuable there."
9506msgstr ""
9507"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9508"如果是这样,请尝试执行\n"
9509"\t$cmd_live_rebase\n"
9510"如果不是这样,请执行\n"
9511"\t$cmd_clear_stale_rebase\n"
9512"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9513
9514#: git-rebase.sh:404
9515#, sh-format
9516msgid "invalid upstream $upstream_name"
9517msgstr "无效的上游 $upstream_name"
9518
9519#: git-rebase.sh:428
9520#, sh-format
9521msgid "$onto_name: there are more than one merge bases"
9522msgstr "$onto_name: 有一个以上的合并基准"
9523
9524#: git-rebase.sh:431 git-rebase.sh:435
9525#, sh-format
9526msgid "$onto_name: there is no merge base"
9527msgstr "$onto_name: 没有合并基准"
9528
9529#: git-rebase.sh:440
9530#, sh-format
9531msgid "Does not point to a valid commit: $onto_name"
9532msgstr "没有指向一个有效的提交:$onto_name"
9533
9534#: git-rebase.sh:463
9535#, sh-format
9536msgid "fatal: no such branch: $branch_name"
9537msgstr "严重错误:无此分支:$branch_name"
9538
9539#: git-rebase.sh:483
9540msgid "Please commit or stash them."
9541msgstr "请提交或为它们保存进度。"
9542
9543#: git-rebase.sh:501
9544#, sh-format
9545msgid "Current branch $branch_name is up to date."
9546msgstr "当前分支 $branch_name 是最新的。"
9547
9548#: git-rebase.sh:504
9549#, sh-format
9550msgid "Current branch $branch_name is up to date, rebase forced."
9551msgstr "当前分支 $branch_name 是最新的,强制变基。"
9552
9553#: git-rebase.sh:515
9554#, sh-format
9555msgid "Changes from $mb to $onto:"
9556msgstr "变更从 $mb 到 $onto:"
9557
9558#. Detach HEAD and reset the tree
9559#: git-rebase.sh:524
9560msgid "First, rewinding head to replay your work on top of it..."
9561msgstr "首先,重置头指针以便在上面重放您的工作..."
9562
9563#: git-rebase.sh:532
9564#, sh-format
9565msgid "Fast-forwarded $branch_name to $onto_name."
9566msgstr "快进 $branch_name 至 $onto_name。"
9567
9568#: git-stash.sh:51
9569msgid "git stash clear with parameters is unimplemented"
9570msgstr "git stash clear 不支持参数"
9571
9572#: git-stash.sh:74
9573msgid "You do not have the initial commit yet"
9574msgstr "您尚未建立初始提交"
9575
9576#: git-stash.sh:89
9577msgid "Cannot save the current index state"
9578msgstr "无法保存当前索引状态"
9579
9580#: git-stash.sh:123 git-stash.sh:136
9581msgid "Cannot save the current worktree state"
9582msgstr "无法保存当前工作区状态"
9583
9584#: git-stash.sh:140
9585msgid "No changes selected"
9586msgstr "没有选择变更"
9587
9588#: git-stash.sh:143
9589msgid "Cannot remove temporary index (can't happen)"
9590msgstr "无法删除临时索引(不应发生)"
9591
9592#: git-stash.sh:156
9593msgid "Cannot record working tree state"
9594msgstr "不能记录工作区状态"
9595
9596#. TRANSLATORS: $option is an invalid option, like
9597#. `--blah-blah'. The 7 spaces at the beginning of the
9598#. second line correspond to "error: ". So you should line
9599#. up the second line with however many characters the
9600#. translation of "error: " takes in your language. E.g. in
9601#. English this is:
9602#.
9603#. $ git stash save --blah-blah 2>&1 | head -n 2
9604#. error: unknown option for 'stash save': --blah-blah
9605#. To provide a message, use git stash save -- '--blah-blah'
9606#: git-stash.sh:202
9607#, sh-format
9608msgid ""
9609"error: unknown option for 'stash save': $option\n"
9610"       To provide a message, use git stash save -- '$option'"
9611msgstr ""
9612"错误:'stash save' 的未知选项:$option\n"
9613"      要提供一个描述信息,使用 git stash save -- '$option'"
9614
9615#: git-stash.sh:223
9616msgid "No local changes to save"
9617msgstr "没有要保存的本地修改"
9618
9619#: git-stash.sh:227
9620msgid "Cannot initialize stash"
9621msgstr "无法初始化 stash"
9622
9623#: git-stash.sh:235
9624msgid "Cannot save the current status"
9625msgstr "无法保存当前状态"
9626
9627#: git-stash.sh:253
9628msgid "Cannot remove worktree changes"
9629msgstr "无法删除工作区变更"
9630
9631#: git-stash.sh:352
9632msgid "No stash found."
9633msgstr "未发现 stash。"
9634
9635#: git-stash.sh:359
9636#, sh-format
9637msgid "Too many revisions specified: $REV"
9638msgstr "指定了太多的版本:$REV"
9639
9640#: git-stash.sh:365
9641#, sh-format
9642msgid "$reference is not valid reference"
9643msgstr "$reference 不是有效的引用"
9644
9645#: git-stash.sh:393
9646#, sh-format
9647msgid "'$args' is not a stash-like commit"
9648msgstr "'$args' 不是 stash 样提交"
9649
9650#: git-stash.sh:404
9651#, sh-format
9652msgid "'$args' is not a stash reference"
9653msgstr "'$args' 不是一个 stash 引用"
9654
9655#: git-stash.sh:412
9656msgid "unable to refresh index"
9657msgstr "无法刷新索引"
9658
9659#: git-stash.sh:416
9660msgid "Cannot apply a stash in the middle of a merge"
9661msgstr "无法在合并过程中恢复进度"
9662
9663#: git-stash.sh:424
9664msgid "Conflicts in index. Try without --index."
9665msgstr "索引中有冲突。尝试不使用 --index。"
9666
9667#: git-stash.sh:426
9668msgid "Could not save index tree"
9669msgstr "不能保存索引树"
9670
9671#: git-stash.sh:460
9672msgid "Cannot unstage modified files"
9673msgstr "无法还原修改的文件"
9674
9675#: git-stash.sh:475
9676msgid "Index was not unstashed."
9677msgstr "索引的进度没有被恢复。"
9678
9679#: git-stash.sh:492
9680#, sh-format
9681msgid "Dropped ${REV} ($s)"
9682msgstr "丢弃了 ${REV} ($s)"
9683
9684#: git-stash.sh:493
9685#, sh-format
9686msgid "${REV}: Could not drop stash entry"
9687msgstr "${REV}:不能丢弃进度条目"
9688
9689#: git-stash.sh:500
9690msgid "No branch name specified"
9691msgstr "未指定分支名"
9692
9693#: git-stash.sh:571
9694msgid "(To restore them type \"git stash apply\")"
9695msgstr "(为恢复数据输入 \"git stash apply\")"
9696
9697#: git-submodule.sh:91
9698#, sh-format
9699msgid "cannot strip one component off url '$remoteurl'"
9700msgstr "无法从 url '$remoteurl' 剥离一个组件"
9701
9702#: git-submodule.sh:196
9703#, sh-format
9704msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9705msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
9706
9707#: git-submodule.sh:239
9708#, sh-format
9709msgid "Clone of '$url' into submodule path '$sm_path' failed"
9710msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
9711
9712#: git-submodule.sh:251
9713#, sh-format
9714msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9715msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
9716
9717#: git-submodule.sh:349
9718#, sh-format
9719msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9720msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9721
9722#: git-submodule.sh:366
9723#, sh-format
9724msgid "'$sm_path' already exists in the index"
9725msgstr "'$sm_path' 已经存在于索引中"
9726
9727#: git-submodule.sh:370
9728#, sh-format
9729msgid ""
9730"The following path is ignored by one of your .gitignore files:\n"
9731"$sm_path\n"
9732"Use -f if you really want to add it."
9733msgstr ""
9734"以下路径被您的一个 .gitignore 文件所忽略:\n"
9735"$sm_path\n"
9736"如果您确实想添加它,使用 -f 参数。"
9737
9738#: git-submodule.sh:388
9739#, sh-format
9740msgid "Adding existing repo at '$sm_path' to the index"
9741msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9742
9743#: git-submodule.sh:390
9744#, sh-format
9745msgid "'$sm_path' already exists and is not a valid git repo"
9746msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
9747
9748#: git-submodule.sh:398
9749#, sh-format
9750msgid "A git directory for '$sm_name' is found locally with remote(s):"
9751msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9752
9753#: git-submodule.sh:400
9754#, sh-format
9755msgid ""
9756"If you want to reuse this local git directory instead of cloning again from"
9757msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9758
9759#: git-submodule.sh:402
9760#, sh-format
9761msgid ""
9762"use the '--force' option. If the local git directory is not the correct repo"
9763msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9764
9765#: git-submodule.sh:403
9766#, sh-format
9767msgid ""
9768"or you are unsure what this means choose another name with the '--name' "
9769"option."
9770msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9771
9772#: git-submodule.sh:405
9773#, sh-format
9774msgid "Reactivating local git directory for submodule '$sm_name'."
9775msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9776
9777#: git-submodule.sh:417
9778#, sh-format
9779msgid "Unable to checkout submodule '$sm_path'"
9780msgstr "不能检出子模组 '$sm_path'"
9781
9782#: git-submodule.sh:422
9783#, sh-format
9784msgid "Failed to add submodule '$sm_path'"
9785msgstr "无法添加子模组 '$sm_path'"
9786
9787#: git-submodule.sh:431
9788#, sh-format
9789msgid "Failed to register submodule '$sm_path'"
9790msgstr "无法注册子模组 '$sm_path'"
9791
9792#: git-submodule.sh:474
9793#, sh-format
9794msgid "Entering '$prefix$sm_path'"
9795msgstr "正在进入 '$prefix$sm_path'"
9796
9797#: git-submodule.sh:488
9798#, sh-format
9799msgid "Stopping at '$sm_path'; script returned non-zero status."
9800msgstr "停止于 '$sm_path',脚本返回非零值。"
9801
9802#: git-submodule.sh:532
9803#, sh-format
9804msgid "No url found for submodule path '$sm_path' in .gitmodules"
9805msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
9806
9807#: git-submodule.sh:541
9808#, sh-format
9809msgid "Failed to register url for submodule path '$sm_path'"
9810msgstr "无法为子模组路径 '$sm_path' 注册 url"
9811
9812#: git-submodule.sh:543
9813#, sh-format
9814msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9815msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
9816
9817#: git-submodule.sh:551
9818#, sh-format
9819msgid "Failed to register update mode for submodule path '$sm_path'"
9820msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9821
9822#: git-submodule.sh:588
9823#, sh-format
9824msgid "Use '.' if you really want to deinitialize all submodules"
9825msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
9826
9827#: git-submodule.sh:603
9828#, sh-format
9829msgid "Submodule work tree '$sm_path' contains a .git directory"
9830msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录"
9831
9832#: git-submodule.sh:604
9833#, sh-format
9834msgid ""
9835"(use 'rm -rf' if you really want to remove it including all of its history)"
9836msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9837
9838#: git-submodule.sh:610
9839#, sh-format
9840msgid ""
9841"Submodule work tree '$sm_path' contains local modifications; use '-f' to "
9842"discard them"
9843msgstr "子模组工作区 '$sm_path' 包含本地修改;使用 '-f' 丢弃它们"
9844
9845#: git-submodule.sh:613
9846#, sh-format
9847msgid "Cleared directory '$sm_path'"
9848msgstr "已清除目录 '$sm_path'"
9849
9850#: git-submodule.sh:614
9851#, sh-format
9852msgid "Could not remove submodule work tree '$sm_path'"
9853msgstr "无法移除子模组工作区 '$sm_path'"
9854
9855#: git-submodule.sh:617
9856#, sh-format
9857msgid "Could not create empty submodule directory '$sm_path'"
9858msgstr "不能创建空的子模组目录 '$sm_path'"
9859
9860#: git-submodule.sh:626
9861#, sh-format
9862msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
9863msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册"
9864
9865#: git-submodule.sh:731
9866#, sh-format
9867msgid ""
9868"Submodule path '$prefix$sm_path' not initialized\n"
9869"Maybe you want to use 'update --init'?"
9870msgstr ""
9871"子模组路径 '$prefix$sm_path' 没有初始化\n"
9872"也许您想用 'update --init'?"
9873
9874#: git-submodule.sh:744
9875#, sh-format
9876msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
9877msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本"
9878
9879#: git-submodule.sh:753
9880#, sh-format
9881msgid "Unable to fetch in submodule path '$sm_path'"
9882msgstr "无法在子模组路径 '$sm_path' 中获取"
9883
9884#: git-submodule.sh:777
9885#, sh-format
9886msgid "Unable to fetch in submodule path '$prefix$sm_path'"
9887msgstr "无法在子模组路径 '$prefix$sm_path' 中获取"
9888
9889#: git-submodule.sh:791
9890#, sh-format
9891msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
9892msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'"
9893
9894#: git-submodule.sh:792
9895#, sh-format
9896msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
9897msgstr "子模组路径 '$prefix$sm_path':变基至 '$sha1'"
9898
9899#: git-submodule.sh:797
9900#, sh-format
9901msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
9902msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中"
9903
9904#: git-submodule.sh:798
9905#, sh-format
9906msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
9907msgstr "子模组路径 '$prefix$sm_path':已合并入 '$sha1'"
9908
9909#: git-submodule.sh:803
9910#, sh-format
9911msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
9912msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'"
9913
9914#: git-submodule.sh:804
9915#, sh-format
9916msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
9917msgstr "子模组路径 '$prefix$sm_path':检出 '$sha1'"
9918
9919#: git-submodule.sh:831
9920#, sh-format
9921msgid "Failed to recurse into submodule path '$prefix$sm_path'"
9922msgstr "无法递归进子模组路径 '$prefix$sm_path'"
9923
9924#: git-submodule.sh:939
9925msgid "The --cached option cannot be used with the --files option"
9926msgstr "选项 --cached 不能和选项 --files 同时使用"
9927
9928#. unexpected type
9929#: git-submodule.sh:979
9930#, sh-format
9931msgid "unexpected mode $mod_dst"
9932msgstr "意外的模式 $mod_dst"
9933
9934#  译者:注意保持前导空格
9935#: git-submodule.sh:997
9936#, sh-format
9937msgid "  Warn: $name doesn't contain commit $sha1_src"
9938msgstr "  警告:$name 未包含提交 $sha1_src"
9939
9940#  译者:注意保持前导空格
9941#: git-submodule.sh:1000
9942#, sh-format
9943msgid "  Warn: $name doesn't contain commit $sha1_dst"
9944msgstr "  警告:$name 未包含提交 $sha1_dst"
9945
9946#  译者:注意保持前导空格
9947#: git-submodule.sh:1003
9948#, sh-format
9949msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9950msgstr "  警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9951
9952#: git-submodule.sh:1028
9953msgid "blob"
9954msgstr "数据对象"
9955
9956#: git-submodule.sh:1066
9957msgid "Submodules changed but not updated:"
9958msgstr "子模组已修改但尚未更新:"
9959
9960#: git-submodule.sh:1068
9961msgid "Submodule changes to be committed:"
9962msgstr "要提交的子模组变更:"
9963
9964#: git-submodule.sh:1153
9965#, sh-format
9966msgid "Failed to recurse into submodule path '$sm_path'"
9967msgstr "无法递归进子模组路径 '$sm_path'"
9968
9969#: git-submodule.sh:1216
9970#, sh-format
9971msgid "Synchronizing submodule url for '$prefix$sm_path'"
9972msgstr "为 '$prefix$sm_path' 同步子模组 url"
9973
9974#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
9975#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
9976
9977#~ msgid "See 'git help <command>' for more information on a specific command."
9978#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
9979
9980#~ msgid "BUG: impossible combination of %d and %p"
9981#~ msgstr "BUG: 无法组合 %d 和 %p"
9982
9983#  译者:以下三条实际为一个段落
9984#~ msgid "It took %.2f seconds to enumerate untracked files.  'status -uno'"
9985#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
9986
9987#  译者:为对齐,下面两句内容有调整
9988#~ msgid "may speed it up, but you have to be careful not to forget to add"
9989#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
9990
9991#~ msgid "new files yourself (see 'git help status')."
9992#~ msgstr "(参见 'git help status')。"
9993
9994#, fuzzy
9995#~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'"
9996#~ msgstr "为 '$prefix$sm_path' 同步子模组 url"
9997
9998#~ msgid "use any ref in .git/refs"
9999#~ msgstr "使用 .git/refs 里的任意引用"
10000
10001#~ msgid "use any tag in .git/refs/tags"
10002#~ msgstr "使用 .git/refs/tags 里的任意 tag"
10003
10004#~ msgid "bad object %s"
10005#~ msgstr "坏对象 %s"
10006
10007#~ msgid "bogus committer info %s"
10008#~ msgstr "虚假的提交者信息 %s"
10009
10010#~ msgid "can't fdopen 'show' output fd"
10011#~ msgstr "不能打开 'show' 输出文件句柄"
10012
10013#~ msgid "failed to close pipe to 'show' for object '%s'"
10014#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
10015
10016#~ msgid " 0 files changed"
10017#~ msgstr " 0 个文件被修改"
10018
10019#~ msgid " %d file changed"
10020#~ msgid_plural " %d files changed"
10021#~ msgstr[0] " %d 个文件被修改"
10022#~ msgstr[1] " %d 个文件被修改"
10023
10024#~ msgid ", %d insertion(+)"
10025#~ msgid_plural ", %d insertions(+)"
10026#~ msgstr[0] ",插入 %d 行(+)"
10027#~ msgstr[1] ",插入 %d 行(+)"
10028
10029#~ msgid ", %d deletion(-)"
10030#~ msgid_plural ", %d deletions(-)"
10031#~ msgstr[0] ",删除 %d 行(-)"
10032#~ msgstr[1] ",删除 %d 行(-)"
10033
10034#~ msgid "You do not have a valid HEAD"
10035#~ msgstr "您没有一个有效的 HEAD"
10036
10037#~ msgid "oops"
10038#~ msgstr "哎哟"
10039
10040#~ msgid "Would not remove %s\n"
10041#~ msgstr "不会删除 %s\n"
10042
10043#~ msgid "Not removing %s\n"
10044#~ msgstr "未删除 %s\n"
10045
10046#~ msgid "Auto packing the repository for optimum performance.\n"
10047#~ msgstr "自动打包版本库以求最佳性能。\n"
10048
10049#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
10050#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
10051
10052#~ msgid "Could not read index"
10053#~ msgstr "不能读取索引"
10054
10055#  译者:中文字符串拼接,可删除前导空格
10056#~ msgid " (use \"git add\" to track)"
10057#~ msgstr "(使用 \"git add\" 建立跟踪)"
10058
10059#~ msgid "-B cannot be used with -b"
10060#~ msgstr "-B 不能和 -b 同时使用"
10061
10062#~ msgid "--patch is incompatible with all other options"
10063#~ msgstr "--patch 选项和其他选项不兼容"
10064
10065#~ msgid "--detach cannot be used with -b/-B/--orphan"
10066#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
10067
10068#~ msgid "--detach cannot be used with -t"
10069#~ msgstr "--detach 不能和 -t 同时使用"
10070
10071#~ msgid "--orphan and -b|-B are mutually exclusive"
10072#~ msgstr "--orphan 和 -b|-B 互斥"
10073
10074#~ msgid "--orphan cannot be used with -t"
10075#~ msgstr "--orphan 不能和 -t 同时使用"
10076
10077#~ msgid "git checkout: -f and -m are incompatible"
10078#~ msgstr "git checkout:-f 和 -m 不兼容"
10079
10080#~ msgid ""
10081#~ "git checkout: updating paths is incompatible with switching branches."
10082#~ msgstr "git checkout:更新路径和切换分支不兼容。"
10083
10084#~ msgid "diff setup failed"
10085#~ msgstr "diff 设置失败"
10086
10087#~ msgid "merge-recursive: disk full?"
10088#~ msgstr "merge-recursive:磁盘已满?"
10089
10090#~ msgid "diff_setup_done failed"
10091#~ msgstr "diff_setup_done 失败"