po / zh_CN.poon commit Merge branch 'wk/user-manual' (3ca26e8)
   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-02-14 14:46+0800\n"
  16"PO-Revision-Date: 2013-02-14 17:43+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:49
  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:79
  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:1115
  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:91 builtin/blame.c:2366
  80#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653
  81#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77
  82#: builtin/ls-files.c:497 builtin/ls-files.c:500 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:92
  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:93 builtin/clone.c:85
 116msgid "repo"
 117msgstr "版本库"
 118
 119#: archive.c:346 builtin/archive.c:94
 120msgid "retrieve the archive from remote repository <repo>"
 121msgstr "从远程版本库(<版本库>)提取归档文件"
 122
 123#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615
 124msgid "command"
 125msgstr "命令"
 126
 127#: archive.c:348 builtin/archive.c:96
 128msgid "path to the remote git-upload-archive command"
 129msgstr "远程 git-upload-archive 命令的路径"
 130
 131#: attr.c:259
 132msgid ""
 133"Negative patterns are forbidden in git attributes\n"
 134"Use '\\!' for literal leading exclamation."
 135msgstr ""
 136"在 git attributes 中不允许使用负值模版\n"
 137"当字符串确实要以感叹号开始时,使用 '\\!'。"
 138
 139#: bundle.c:36
 140#, c-format
 141msgid "'%s' does not look like a v2 bundle file"
 142msgstr "'%s' 不像是一个 v2 版本的包文件"
 143
 144#: bundle.c:63
 145#, c-format
 146msgid "unrecognized header: %s%s (%d)"
 147msgstr "未能识别的包头:%s%s (%d)"
 148
 149#: bundle.c:89 builtin/commit.c:674
 150#, c-format
 151msgid "could not open '%s'"
 152msgstr "不能打开 '%s'"
 153
 154#: bundle.c:140
 155msgid "Repository lacks these prerequisite commits:"
 156msgstr "版本库缺少这些必备的提交:"
 157
 158#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299
 159#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
 160#: builtin/shortlog.c:157
 161msgid "revision walk setup failed"
 162msgstr "版本遍历设置失败"
 163
 164#: bundle.c:186
 165#, c-format
 166msgid "The bundle contains %d ref"
 167msgid_plural "The bundle contains %d refs"
 168msgstr[0] "这个包中含有 %d 个引用"
 169msgstr[1] "这个包中含有 %d 个引用"
 170
 171#: bundle.c:192
 172msgid "The bundle records a complete history."
 173msgstr "这个包记录一个完整历史。"
 174
 175#: bundle.c:195
 176#, c-format
 177msgid "The bundle requires this ref"
 178msgid_plural "The bundle requires these %d refs"
 179msgstr[0] "这个包需要这个引用"
 180msgstr[1] "这个包需要 %d 个这些引用"
 181
 182#: bundle.c:294
 183msgid "rev-list died"
 184msgstr "rev-list 终止"
 185
 186#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260
 187#, c-format
 188msgid "unrecognized argument: %s"
 189msgstr "未能识别的参数:%s"
 190
 191#: bundle.c:335
 192#, c-format
 193msgid "ref '%s' is excluded by the rev-list options"
 194msgstr "引用 '%s' 被 rev-list 选项排除"
 195
 196#: bundle.c:380
 197msgid "Refusing to create empty bundle."
 198msgstr "不能创建空包。"
 199
 200#: bundle.c:398
 201msgid "Could not spawn pack-objects"
 202msgstr "不能生成 pack-objects 进程"
 203
 204#: bundle.c:416
 205msgid "pack-objects died"
 206msgstr "pack-objects 终止"
 207
 208#: bundle.c:419
 209#, c-format
 210msgid "cannot create '%s'"
 211msgstr "不能创建 '%s'"
 212
 213#: bundle.c:441
 214msgid "index-pack died"
 215msgstr "index-pack 终止"
 216
 217#: commit.c:50
 218#, c-format
 219msgid "could not parse %s"
 220msgstr "不能解析 %s"
 221
 222#: commit.c:52
 223#, c-format
 224msgid "%s %s is not a commit!"
 225msgstr "%s %s 不是一个提交!"
 226
 227#: compat/obstack.c:406 compat/obstack.c:408
 228msgid "memory exhausted"
 229msgstr "内存耗尽"
 230
 231#: connected.c:39
 232msgid "Could not run 'git rev-list'"
 233msgstr "不能执行 'git rev-list'"
 234
 235#: connected.c:48
 236#, c-format
 237msgid "failed write to rev-list: %s"
 238msgstr "无法写入 rev-list:%s"
 239
 240#: connected.c:56
 241#, c-format
 242msgid "failed to close rev-list's stdin: %s"
 243msgstr "无法关闭 rev-list 的标准输入:%s"
 244
 245#: date.c:95
 246msgid "in the future"
 247msgstr "在将来"
 248
 249#: date.c:101
 250#, c-format
 251msgid "%lu second ago"
 252msgid_plural "%lu seconds ago"
 253msgstr[0] "%lu 秒钟之前"
 254msgstr[1] "%lu 秒钟之前"
 255
 256#: date.c:108
 257#, c-format
 258msgid "%lu minute ago"
 259msgid_plural "%lu minutes ago"
 260msgstr[0] "%lu 分钟之前"
 261msgstr[1] "%lu 分钟之前"
 262
 263#: date.c:115
 264#, c-format
 265msgid "%lu hour ago"
 266msgid_plural "%lu hours ago"
 267msgstr[0] "%lu 小时之前"
 268msgstr[1] "%lu 小时之前"
 269
 270#: date.c:122
 271#, c-format
 272msgid "%lu day ago"
 273msgid_plural "%lu days ago"
 274msgstr[0] "%lu 天之前"
 275msgstr[1] "%lu 天之前"
 276
 277#: date.c:128
 278#, c-format
 279msgid "%lu week ago"
 280msgid_plural "%lu weeks ago"
 281msgstr[0] "%lu 周之前"
 282msgstr[1] "%lu 周之前"
 283
 284#: date.c:135
 285#, c-format
 286msgid "%lu month ago"
 287msgid_plural "%lu months ago"
 288msgstr[0] "%lu 个月之前"
 289msgstr[1] "%lu 个月之前"
 290
 291#: date.c:146
 292#, c-format
 293msgid "%lu year"
 294msgid_plural "%lu years"
 295msgstr[0] "%lu 年"
 296msgstr[1] "%lu 年"
 297
 298#: date.c:149
 299#, c-format
 300msgid "%s, %lu month ago"
 301msgid_plural "%s, %lu months ago"
 302msgstr[0] "%s,%lu 个月之前"
 303msgstr[1] "%s,%lu 个月之前"
 304
 305#: date.c:154 date.c:159
 306#, c-format
 307msgid "%lu year ago"
 308msgid_plural "%lu years ago"
 309msgstr[0] "%lu 年前"
 310msgstr[1] "%lu 年前"
 311
 312#  译者:注意保持前导空格
 313#: diff.c:111
 314#, c-format
 315msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 316msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 317
 318#  译者:注意保持前导空格
 319#: diff.c:116
 320#, c-format
 321msgid "  Unknown dirstat parameter '%s'\n"
 322msgstr "  未知的 dirstat 参数 '%s'\n"
 323
 324#: diff.c:194
 325#, c-format
 326msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 327msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 328
 329#: diff.c:237
 330#, c-format
 331msgid ""
 332"Found errors in 'diff.dirstat' config variable:\n"
 333"%s"
 334msgstr ""
 335"发现配置变量 'diff.dirstat' 中的错误:\n"
 336"%s"
 337
 338#: diff.c:3494
 339#, c-format
 340msgid ""
 341"Failed to parse --dirstat/-X option parameter:\n"
 342"%s"
 343msgstr ""
 344"无法解析 --dirstat/-X 选项的参数:\n"
 345"%s"
 346
 347#: diff.c:3508
 348#, c-format
 349msgid "Failed to parse --submodule option parameter: '%s'"
 350msgstr "无法解析 --submodule 选项的参数:'%s'"
 351
 352#: gpg-interface.c:59 gpg-interface.c:127
 353msgid "could not run gpg."
 354msgstr "不能执行 gpg。"
 355
 356#: gpg-interface.c:71
 357msgid "gpg did not accept the data"
 358msgstr "gpg 没有接受数据"
 359
 360#: gpg-interface.c:82
 361msgid "gpg failed to sign the data"
 362msgstr "gpg 无法为数据签名"
 363
 364#: gpg-interface.c:112
 365#, c-format
 366msgid "could not create temporary file '%s': %s"
 367msgstr "不能创建临时文件 '%s':%s"
 368
 369#: gpg-interface.c:115
 370#, c-format
 371msgid "failed writing detached signature to '%s': %s"
 372msgstr "无法将分离式签名写入 '%s':%s"
 373
 374#: grep.c:1622
 375#, c-format
 376msgid "'%s': unable to read %s"
 377msgstr "'%s':无法读取 %s"
 378
 379#: grep.c:1639
 380#, c-format
 381msgid "'%s': %s"
 382msgstr "'%s':%s"
 383
 384#: grep.c:1650
 385#, c-format
 386msgid "'%s': short read %s"
 387msgstr "'%s':读取不完整 %s"
 388
 389#: help.c:212
 390#, c-format
 391msgid "available git commands in '%s'"
 392msgstr "在 '%s' 下可用的 git 命令"
 393
 394#: help.c:219
 395msgid "git commands available from elsewhere on your $PATH"
 396msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 397
 398#: help.c:235
 399msgid "The most commonly used git commands are:"
 400msgstr "最常用的 git 命令有:"
 401
 402#: help.c:292
 403#, c-format
 404msgid ""
 405"'%s' appears to be a git command, but we were not\n"
 406"able to execute it. Maybe git-%s is broken?"
 407msgstr ""
 408"'%s' 像是一个 git 命令,但却无法运行。\n"
 409"可能是 git-%s 受损?"
 410
 411#: help.c:349
 412msgid "Uh oh. Your system reports no Git commands at all."
 413msgstr "唉呀,您的系统中未发现 Git 命令。"
 414
 415#: help.c:371
 416#, c-format
 417msgid ""
 418"WARNING: You called a Git command named '%s', which does not exist.\n"
 419"Continuing under the assumption that you meant '%s'"
 420msgstr ""
 421"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 422"是 '%s'"
 423
 424#: help.c:376
 425#, c-format
 426msgid "in %0.1f seconds automatically..."
 427msgstr "在 %0.1f 秒钟后自动运行..."
 428
 429#: help.c:383
 430#, c-format
 431msgid "git: '%s' is not a git command. See 'git --help'."
 432msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
 433
 434#: help.c:387
 435msgid ""
 436"\n"
 437"Did you mean this?"
 438msgid_plural ""
 439"\n"
 440"Did you mean one of these?"
 441msgstr[0] ""
 442"\n"
 443"您指的是这个么?"
 444msgstr[1] ""
 445"\n"
 446"您指的是这其中的某一个么?"
 447
 448#: merge.c:56
 449msgid "failed to read the cache"
 450msgstr "无法读取缓存"
 451
 452#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
 453#: builtin/clone.c:586
 454msgid "unable to write new index file"
 455msgstr "无法写新的索引文件"
 456
 457#: merge-recursive.c:190
 458#, c-format
 459msgid "(bad commit)\n"
 460msgstr "(坏提交)\n"
 461
 462#: merge-recursive.c:206
 463#, c-format
 464msgid "addinfo_cache failed for path '%s'"
 465msgstr "为路径 '%s' addinfo_cache 失败"
 466
 467#: merge-recursive.c:268
 468msgid "error building trees"
 469msgstr "无法创建树"
 470
 471#: merge-recursive.c:672
 472#, c-format
 473msgid "failed to create path '%s'%s"
 474msgstr "无法创建路径 '%s'%s"
 475
 476#: merge-recursive.c:683
 477#, c-format
 478msgid "Removing %s to make room for subdirectory\n"
 479msgstr "删除 %s 以便为子目录留出空间\n"
 480
 481#. something else exists
 482#. .. but not some other error (who really cares what?)
 483#: merge-recursive.c:697 merge-recursive.c:718
 484msgid ": perhaps a D/F conflict?"
 485msgstr ":可能是一个目录/文件冲突?"
 486
 487#: merge-recursive.c:708
 488#, c-format
 489msgid "refusing to lose untracked file at '%s'"
 490msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 491
 492#: merge-recursive.c:748
 493#, c-format
 494msgid "cannot read object %s '%s'"
 495msgstr "不能读取对象 %s '%s'"
 496
 497#: merge-recursive.c:750
 498#, c-format
 499msgid "blob expected for %s '%s'"
 500msgstr "%s '%s' 应为数据(blob)对象"
 501
 502#: merge-recursive.c:773 builtin/clone.c:302
 503#, c-format
 504msgid "failed to open '%s'"
 505msgstr "无法打开 '%s'"
 506
 507#: merge-recursive.c:781
 508#, c-format
 509msgid "failed to symlink '%s'"
 510msgstr "无法创建符号链接 '%s'"
 511
 512#: merge-recursive.c:784
 513#, c-format
 514msgid "do not know what to do with %06o %s '%s'"
 515msgstr "不知道如何处理 %06o %s '%s'"
 516
 517#: merge-recursive.c:922
 518msgid "Failed to execute internal merge"
 519msgstr "无法执行内部合并"
 520
 521#: merge-recursive.c:926
 522#, c-format
 523msgid "Unable to add %s to database"
 524msgstr "不能添加 %s 至对象库"
 525
 526#: merge-recursive.c:942
 527msgid "unsupported object type in the tree"
 528msgstr "在树中有不支持的对象类型"
 529
 530#: merge-recursive.c:1021 merge-recursive.c:1035
 531#, c-format
 532msgid ""
 533"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 534"in tree."
 535msgstr ""
 536"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 537"的版本被保留。"
 538
 539#: merge-recursive.c:1027 merge-recursive.c:1040
 540#, c-format
 541msgid ""
 542"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 543"in tree at %s."
 544msgstr ""
 545"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 546"的版本保留于 %8$s 中。"
 547
 548#: merge-recursive.c:1081
 549msgid "rename"
 550msgstr "重命名"
 551
 552#: merge-recursive.c:1081
 553msgid "renamed"
 554msgstr "重命名"
 555
 556#: merge-recursive.c:1137
 557#, c-format
 558msgid "%s is a directory in %s adding as %s instead"
 559msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 560
 561#: merge-recursive.c:1159
 562#, c-format
 563msgid ""
 564"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 565"\"->\"%s\" in \"%s\"%s"
 566msgstr ""
 567"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
 568"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 569
 570#: merge-recursive.c:1164
 571msgid " (left unresolved)"
 572msgstr "(留下未解决)"
 573
 574#: merge-recursive.c:1218
 575#, c-format
 576msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 577msgstr ""
 578"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
 579"%5$s"
 580
 581#: merge-recursive.c:1248
 582#, c-format
 583msgid "Renaming %s to %s and %s to %s instead"
 584msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
 585
 586#: merge-recursive.c:1447
 587#, c-format
 588msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 589msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 590
 591#: merge-recursive.c:1457
 592#, c-format
 593msgid "Adding merged %s"
 594msgstr "添加合并后的 %s"
 595
 596#: merge-recursive.c:1462 merge-recursive.c:1660
 597#, c-format
 598msgid "Adding as %s instead"
 599msgstr "而是以 %s 为名添加"
 600
 601#: merge-recursive.c:1513
 602#, c-format
 603msgid "cannot read object %s"
 604msgstr "不能读取对象 %s"
 605
 606#: merge-recursive.c:1516
 607#, c-format
 608msgid "object %s is not a blob"
 609msgstr "对象 %s 不是一个数据(blob)对象"
 610
 611#: merge-recursive.c:1564
 612msgid "modify"
 613msgstr "修改"
 614
 615#: merge-recursive.c:1564
 616msgid "modified"
 617msgstr "修改"
 618
 619#: merge-recursive.c:1574
 620msgid "content"
 621msgstr "内容"
 622
 623#: merge-recursive.c:1581
 624msgid "add/add"
 625msgstr "添加/添加"
 626
 627#: merge-recursive.c:1615
 628#, c-format
 629msgid "Skipped %s (merged same as existing)"
 630msgstr "略过 %s(已经做过相同合并)"
 631
 632#: merge-recursive.c:1629
 633#, c-format
 634msgid "Auto-merging %s"
 635msgstr "自动合并 %s"
 636
 637#: merge-recursive.c:1633 git-submodule.sh:942
 638msgid "submodule"
 639msgstr "子模组"
 640
 641#: merge-recursive.c:1634
 642#, c-format
 643msgid "CONFLICT (%s): Merge conflict in %s"
 644msgstr "冲突(%s):合并冲突于 %s"
 645
 646#: merge-recursive.c:1724
 647#, c-format
 648msgid "Removing %s"
 649msgstr "删除 %s"
 650
 651#: merge-recursive.c:1749
 652msgid "file/directory"
 653msgstr "文件/目录"
 654
 655#: merge-recursive.c:1755
 656msgid "directory/file"
 657msgstr "目录/文件"
 658
 659#: merge-recursive.c:1760
 660#, c-format
 661msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 662msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 663
 664#: merge-recursive.c:1770
 665#, c-format
 666msgid "Adding %s"
 667msgstr "添加 %s"
 668
 669#: merge-recursive.c:1787
 670msgid "Fatal merge failure, shouldn't happen."
 671msgstr "严重的合并错误,不应发生。"
 672
 673#: merge-recursive.c:1806
 674msgid "Already up-to-date!"
 675msgstr "已经是最新的!"
 676
 677#: merge-recursive.c:1815
 678#, c-format
 679msgid "merging of trees %s and %s failed"
 680msgstr "无法合并树 %s 和 %s"
 681
 682#: merge-recursive.c:1845
 683#, c-format
 684msgid "Unprocessed path??? %s"
 685msgstr "未处理的路径??? %s"
 686
 687#: merge-recursive.c:1890
 688msgid "Merging:"
 689msgstr "合并:"
 690
 691#: merge-recursive.c:1903
 692#, c-format
 693msgid "found %u common ancestor:"
 694msgid_plural "found %u common ancestors:"
 695msgstr[0] "发现 %u 个共同祖先:"
 696msgstr[1] "发现 %u 个共同祖先:"
 697
 698#: merge-recursive.c:1940
 699msgid "merge returned no commit"
 700msgstr "合并未返回提交"
 701
 702#: merge-recursive.c:1997
 703#, c-format
 704msgid "Could not parse object '%s'"
 705msgstr "不能解析对象 '%s'"
 706
 707#: merge-recursive.c:2009 builtin/merge.c:643
 708msgid "Unable to write index."
 709msgstr "不能写入索引。"
 710
 711#: parse-options.c:485
 712msgid "..."
 713msgstr "..."
 714
 715#: parse-options.c:503
 716#, c-format
 717msgid "usage: %s"
 718msgstr "用法:%s"
 719
 720#. TRANSLATORS: the colon here should align with the
 721#. one in "usage: %s" translation
 722#: parse-options.c:507
 723#, c-format
 724msgid "   or: %s"
 725msgstr "  或:%s"
 726
 727#  译者:为保证在输出中对齐,注意调整句中空格!
 728#: parse-options.c:510
 729#, c-format
 730msgid "    %s"
 731msgstr "    %s"
 732
 733#: pathspec.c:83
 734#, c-format
 735msgid "Path '%s' is in submodule '%.*s'"
 736msgstr "路径 '%s' 属于模组 '%.*s'"
 737
 738#: pathspec.c:99
 739#, c-format
 740msgid "'%s' is beyond a symbolic link"
 741msgstr "'%s' 位于符号链接中"
 742
 743#: remote.c:1653
 744#, c-format
 745msgid "Your branch is ahead of '%s' by %d commit.\n"
 746msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 747msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 748msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
 749
 750#: remote.c:1659
 751msgid "  (use \"git push\" to publish your local commits)\n"
 752msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
 753
 754#: remote.c:1662
 755#, c-format
 756msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 757msgid_plural ""
 758"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 759msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
 760msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
 761
 762#  译者:注意保持前导空格
 763#: remote.c:1670
 764msgid "  (use \"git pull\" to update your local branch)\n"
 765msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
 766
 767#: remote.c:1673
 768#, c-format
 769msgid ""
 770"Your branch and '%s' have diverged,\n"
 771"and have %d and %d different commit each, respectively.\n"
 772msgid_plural ""
 773"Your branch and '%s' have diverged,\n"
 774"and have %d and %d different commits each, respectively.\n"
 775msgstr[0] ""
 776"您的分支和 '%s' 出现了偏离,\n"
 777"并且分别有 %d 和 %d 处不同的提交。\n"
 778msgstr[1] ""
 779"您的分支和 '%s' 出现了偏离,\n"
 780"并且分别有 %d 和 %d 处不同的提交。\n"
 781
 782#  译者:注意保持前导空格
 783#: remote.c:1683
 784msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 785msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
 786
 787#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
 788#: builtin/merge.c:994
 789#, c-format
 790msgid "Could not open '%s' for writing"
 791msgstr "不能为写入打开 '%s'"
 792
 793#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
 794#: builtin/merge.c:999
 795#, c-format
 796msgid "Could not write to '%s'"
 797msgstr "不能写入 '%s'"
 798
 799#: sequencer.c:146
 800msgid ""
 801"after resolving the conflicts, mark the corrected paths\n"
 802"with 'git add <paths>' or 'git rm <paths>'"
 803msgstr ""
 804"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
 805"命令标记修正后的文件"
 806
 807#: sequencer.c:149
 808msgid ""
 809"after resolving the conflicts, mark the corrected paths\n"
 810"with 'git add <paths>' or 'git rm <paths>'\n"
 811"and commit the result with 'git commit'"
 812msgstr ""
 813"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
 814"对修正后的文件做标记,然后用 'git commit' 提交"
 815
 816#: sequencer.c:162 sequencer.c:774 sequencer.c:857
 817#, c-format
 818msgid "Could not write to %s"
 819msgstr "不能写入 %s"
 820
 821#: sequencer.c:165
 822#, c-format
 823msgid "Error wrapping up %s"
 824msgstr "错误收尾 %s"
 825
 826#: sequencer.c:180
 827msgid "Your local changes would be overwritten by cherry-pick."
 828msgstr "您的本地修改将被拣选操作覆盖。"
 829
 830#: sequencer.c:182
 831msgid "Your local changes would be overwritten by revert."
 832msgstr "您的本地修改将被还原操作覆盖。"
 833
 834#: sequencer.c:185
 835msgid "Commit your changes or stash them to proceed."
 836msgstr "提交您的修改或保存进度后再继续。"
 837
 838#. TRANSLATORS: %s will be "revert" or "cherry-pick"
 839#: sequencer.c:236
 840#, c-format
 841msgid "%s: Unable to write new index file"
 842msgstr "%s:无法写入新索引文件"
 843
 844#: sequencer.c:267
 845msgid "Could not resolve HEAD commit\n"
 846msgstr "不能解析 HEAD 提交\n"
 847
 848#: sequencer.c:288
 849msgid "Unable to update cache tree\n"
 850msgstr "不能更新缓存\n"
 851
 852#: sequencer.c:333
 853#, c-format
 854msgid "Could not parse commit %s\n"
 855msgstr "不能解析提交 %s\n"
 856
 857#: sequencer.c:338
 858#, c-format
 859msgid "Could not parse parent commit %s\n"
 860msgstr "不能解析父提交 %s\n"
 861
 862#: sequencer.c:404
 863msgid "Your index file is unmerged."
 864msgstr "您的索引文件未完成合并。"
 865
 866#: sequencer.c:423
 867#, c-format
 868msgid "Commit %s is a merge but no -m option was given."
 869msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 870
 871#: sequencer.c:431
 872#, c-format
 873msgid "Commit %s does not have parent %d"
 874msgstr "提交 %s 没有父提交 %d"
 875
 876#: sequencer.c:435
 877#, c-format
 878msgid "Mainline was specified but commit %s is not a merge."
 879msgstr "指定了主线但提交 %s 不是一个合并。"
 880
 881#. TRANSLATORS: The first %s will be "revert" or
 882#. "cherry-pick", the second %s a SHA1
 883#: sequencer.c:448
 884#, c-format
 885msgid "%s: cannot parse parent commit %s"
 886msgstr "%s:不能解析父提交 %s"
 887
 888#: sequencer.c:452
 889#, c-format
 890msgid "Cannot get commit message for %s"
 891msgstr "不能得到 %s 的提交说明"
 892
 893#: sequencer.c:536
 894#, c-format
 895msgid "could not revert %s... %s"
 896msgstr "不能还原 %s... %s"
 897
 898#: sequencer.c:537
 899#, c-format
 900msgid "could not apply %s... %s"
 901msgstr "不能应用 %s... %s"
 902
 903#: sequencer.c:569
 904msgid "empty commit set passed"
 905msgstr "提供了空的提交集"
 906
 907#: sequencer.c:577
 908#, c-format
 909msgid "git %s: failed to read the index"
 910msgstr "git %s:无法读取索引"
 911
 912#: sequencer.c:582
 913#, c-format
 914msgid "git %s: failed to refresh the index"
 915msgstr "git %s:无法刷新索引"
 916
 917#: sequencer.c:640
 918#, c-format
 919msgid "Cannot %s during a %s"
 920msgstr "无法 %s 在一个 %s 过程中"
 921
 922#: sequencer.c:662
 923#, c-format
 924msgid "Could not parse line %d."
 925msgstr "不能解析第 %d 行。"
 926
 927#: sequencer.c:667
 928msgid "No commits parsed."
 929msgstr "没有提交被解析。"
 930
 931#: sequencer.c:680
 932#, c-format
 933msgid "Could not open %s"
 934msgstr "不能打开 %s"
 935
 936#: sequencer.c:684
 937#, c-format
 938msgid "Could not read %s."
 939msgstr "不能读取 %s。"
 940
 941#: sequencer.c:691
 942#, c-format
 943msgid "Unusable instruction sheet: %s"
 944msgstr "无用的指令表单:%s"
 945
 946#: sequencer.c:719
 947#, c-format
 948msgid "Invalid key: %s"
 949msgstr "无效键名:%s"
 950
 951#: sequencer.c:722
 952#, c-format
 953msgid "Invalid value for %s: %s"
 954msgstr "%s 的值无效:%s"
 955
 956#: sequencer.c:734
 957#, c-format
 958msgid "Malformed options sheet: %s"
 959msgstr "非法的选项表单:%s"
 960
 961#: sequencer.c:755
 962msgid "a cherry-pick or revert is already in progress"
 963msgstr "一个拣选或还原操作已在进行"
 964
 965#: sequencer.c:756
 966msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 967msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 968
 969#: sequencer.c:760
 970#, c-format
 971msgid "Could not create sequencer directory %s"
 972msgstr "不能创建序列目录 %s"
 973
 974#: sequencer.c:776 sequencer.c:861
 975#, c-format
 976msgid "Error wrapping up %s."
 977msgstr "错误收尾 %s。"
 978
 979#: sequencer.c:795 sequencer.c:929
 980msgid "no cherry-pick or revert in progress"
 981msgstr "拣选或还原操作并未进行"
 982
 983#: sequencer.c:797
 984msgid "cannot resolve HEAD"
 985msgstr "不能解析 HEAD"
 986
 987#: sequencer.c:799
 988msgid "cannot abort from a branch yet to be born"
 989msgstr "不能从尚未建立的分支终止"
 990
 991#: sequencer.c:821 builtin/apply.c:4020
 992#, c-format
 993msgid "cannot open %s: %s"
 994msgstr "不能打开 %s:%s"
 995
 996#: sequencer.c:824
 997#, c-format
 998msgid "cannot read %s: %s"
 999msgstr "不能读取 %s:%s"
1000
1001#: sequencer.c:825
1002msgid "unexpected end of file"
1003msgstr "意外的文件结束"
1004
1005#: sequencer.c:831
1006#, c-format
1007msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1008msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1009
1010#: sequencer.c:854
1011#, c-format
1012msgid "Could not format %s."
1013msgstr "不能格式化 %s。"
1014
1015#: sequencer.c:1016
1016msgid "Can't revert as initial commit"
1017msgstr "不能作为初始提交还原"
1018
1019#: sequencer.c:1017
1020msgid "Can't cherry-pick into empty head"
1021msgstr "不能拣选到空分支"
1022
1023#: sha1_name.c:1044
1024msgid "HEAD does not point to a branch"
1025msgstr "HEAD 没有指向一个分支"
1026
1027#: sha1_name.c:1047
1028#, c-format
1029msgid "No such branch: '%s'"
1030msgstr "没有此分支:'%s'"
1031
1032#: sha1_name.c:1049
1033#, c-format
1034msgid "No upstream configured for branch '%s'"
1035msgstr "尚未给分支 '%s' 设置上游"
1036
1037#: sha1_name.c:1052
1038#, c-format
1039msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1040msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1041
1042#: wrapper.c:408
1043#, c-format
1044msgid "unable to access '%s': %s"
1045msgstr "不能访问 '%s':%s"
1046
1047#: wrapper.c:423
1048#, c-format
1049msgid "unable to access '%s'"
1050msgstr "不能访问 '%s'"
1051
1052#: wrapper.c:434
1053#, c-format
1054msgid "unable to look up current user in the passwd file: %s"
1055msgstr "无法在口令文件中查询到当前用户:%s"
1056
1057#: wrapper.c:435
1058msgid "no such user"
1059msgstr "无此用户"
1060
1061#: wt-status.c:140
1062msgid "Unmerged paths:"
1063msgstr "未合并的路径:"
1064
1065#  译者:注意保持前导空格
1066#: wt-status.c:167 wt-status.c:194
1067#, c-format
1068msgid "  (use \"git reset %s <file>...\" to unstage)"
1069msgstr "  (使用 \"git reset %s <file>...\" 撤出暂存区)"
1070
1071#  译者:注意保持前导空格
1072#: wt-status.c:169 wt-status.c:196
1073msgid "  (use \"git rm --cached <file>...\" to unstage)"
1074msgstr "  (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1075
1076#  译者:注意保持前导空格
1077#: wt-status.c:173
1078msgid "  (use \"git add <file>...\" to mark resolution)"
1079msgstr "  (使用 \"git add <file>...\" 标记解决方案)"
1080
1081#  译者:注意保持前导空格
1082#: wt-status.c:175 wt-status.c:179
1083msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1084msgstr "  (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1085
1086#  译者:注意保持前导空格
1087#: wt-status.c:177
1088msgid "  (use \"git rm <file>...\" to mark resolution)"
1089msgstr "  (使用 \"git rm <file>...\" 标记解决方案)"
1090
1091#: wt-status.c:188
1092msgid "Changes to be committed:"
1093msgstr "要提交的变更:"
1094
1095#: wt-status.c:206
1096msgid "Changes not staged for commit:"
1097msgstr "尚未暂存以备提交的变更:"
1098
1099#  译者:注意保持前导空格
1100#: wt-status.c:210
1101msgid "  (use \"git add <file>...\" to update what will be committed)"
1102msgstr "  (使用 \"git add <file>...\" 更新要提交的内容)"
1103
1104#  译者:注意保持前导空格
1105#: wt-status.c:212
1106msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1107msgstr "  (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1108
1109#  译者:注意保持前导空格
1110#: wt-status.c:213
1111msgid ""
1112"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1113msgstr "  (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1114
1115#  译者:注意保持前导空格
1116#: wt-status.c:215
1117msgid "  (commit or discard the untracked or modified content in submodules)"
1118msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
1119
1120#  译者:注意保持前导空格
1121#: wt-status.c:227
1122#, c-format
1123msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1124msgstr "  (使用 \"git %s <file>...\" 以包含要提交的内容)"
1125
1126#: wt-status.c:244
1127msgid "bug"
1128msgstr "bug"
1129
1130#: wt-status.c:249
1131msgid "both deleted:"
1132msgstr "双方删除:"
1133
1134#: wt-status.c:250
1135msgid "added by us:"
1136msgstr "由我们添加:"
1137
1138#: wt-status.c:251
1139msgid "deleted by them:"
1140msgstr "由他们删除:"
1141
1142#: wt-status.c:252
1143msgid "added by them:"
1144msgstr "由他们添加:"
1145
1146#: wt-status.c:253
1147msgid "deleted by us:"
1148msgstr "由我们删除:"
1149
1150#: wt-status.c:254
1151msgid "both added:"
1152msgstr "双方添加:"
1153
1154#: wt-status.c:255
1155msgid "both modified:"
1156msgstr "双方修改:"
1157
1158#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1159#: wt-status.c:285
1160msgid "new commits, "
1161msgstr "新提交, "
1162
1163#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1164#: wt-status.c:287
1165msgid "modified content, "
1166msgstr "修改的内容, "
1167
1168#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1169#: wt-status.c:289
1170msgid "untracked content, "
1171msgstr "未跟踪的内容, "
1172
1173#  译者:为保证在输出中对齐,注意调整句中空格!
1174#: wt-status.c:303
1175#, c-format
1176msgid "new file:   %s"
1177msgstr "新文件:    %s"
1178
1179#  译者:为保证在输出中对齐,注意调整句中空格!
1180#: wt-status.c:306
1181#, c-format
1182msgid "copied:     %s -> %s"
1183msgstr "拷贝:      %s -> %s"
1184
1185#  译者:为保证在输出中对齐,注意调整句中空格!
1186#: wt-status.c:309
1187#, c-format
1188msgid "deleted:    %s"
1189msgstr "删除:      %s"
1190
1191#  译者:为保证在输出中对齐,注意调整句中空格!
1192#: wt-status.c:312
1193#, c-format
1194msgid "modified:   %s"
1195msgstr "修改:      %s"
1196
1197#  译者:为保证在输出中对齐,注意调整句中空格!
1198#: wt-status.c:315
1199#, c-format
1200msgid "renamed:    %s -> %s"
1201msgstr "重命名:    %s -> %s"
1202
1203#  译者:为保证在输出中对齐,注意调整句中空格!
1204#: wt-status.c:318
1205#, c-format
1206msgid "typechange: %s"
1207msgstr "类型变更:  %s"
1208
1209#  译者:为保证在输出中对齐,注意调整句中空格!
1210#: wt-status.c:321
1211#, c-format
1212msgid "unknown:    %s"
1213msgstr "未知:      %s"
1214
1215#  译者:为保证在输出中对齐,注意调整句中空格!
1216#: wt-status.c:324
1217#, c-format
1218msgid "unmerged:   %s"
1219msgstr "未合并:    %s"
1220
1221#: wt-status.c:327
1222#, c-format
1223msgid "bug: unhandled diff status %c"
1224msgstr "bug:未处理的差异状态 %c"
1225
1226#: wt-status.c:789
1227msgid "You have unmerged paths."
1228msgstr "您有尚未合并的路径。"
1229
1230#  译者:注意保持前导空格
1231#: wt-status.c:792 wt-status.c:916
1232msgid "  (fix conflicts and run \"git commit\")"
1233msgstr "  (解决冲突并运行 \"git commit\")"
1234
1235#: wt-status.c:795
1236msgid "All conflicts fixed but you are still merging."
1237msgstr "所有冲突已解决但您仍处于合并中。"
1238
1239#  译者:注意保持前导空格
1240#: wt-status.c:798
1241msgid "  (use \"git commit\" to conclude merge)"
1242msgstr "  (使用 \"git commit\" 结束合并)"
1243
1244#: wt-status.c:808
1245msgid "You are in the middle of an am session."
1246msgstr "您正处于一个 am 过程中。"
1247
1248#: wt-status.c:811
1249msgid "The current patch is empty."
1250msgstr "当前的补丁为空。"
1251
1252#  译者:注意保持前导空格
1253#: wt-status.c:815
1254msgid "  (fix conflicts and then run \"git am --resolved\")"
1255msgstr "  (解决冲突,然后运行 \"git am --resolved\")"
1256
1257#  译者:注意保持前导空格
1258#: wt-status.c:817
1259msgid "  (use \"git am --skip\" to skip this patch)"
1260msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
1261
1262#  译者:注意保持前导空格
1263#: wt-status.c:819
1264msgid "  (use \"git am --abort\" to restore the original branch)"
1265msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
1266
1267#: wt-status.c:877 wt-status.c:887
1268msgid "You are currently rebasing."
1269msgstr "您正在变基。"
1270
1271#  译者:注意保持前导空格
1272#: wt-status.c:880
1273msgid "  (fix conflicts and then run \"git rebase --continue\")"
1274msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
1275
1276#  译者:注意保持前导空格
1277#: wt-status.c:882
1278msgid "  (use \"git rebase --skip\" to skip this patch)"
1279msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
1280
1281#  译者:注意保持前导空格
1282#: wt-status.c:884
1283msgid "  (use \"git rebase --abort\" to check out the original branch)"
1284msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
1285
1286#  译者:注意保持前导空格
1287#: wt-status.c:890
1288msgid "  (all conflicts fixed: run \"git rebase --continue\")"
1289msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
1290
1291#: wt-status.c:892
1292msgid "You are currently splitting a commit during a rebase."
1293msgstr "您正在变基过程中拆分一个提交。"
1294
1295#  译者:注意保持前导空格
1296#: wt-status.c:895
1297msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
1298msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1299
1300#: wt-status.c:897
1301msgid "You are currently editing a commit during a rebase."
1302msgstr "您正在变基过程中编辑一个提交。"
1303
1304#  译者:注意保持前导空格
1305#: wt-status.c:900
1306msgid "  (use \"git commit --amend\" to amend the current commit)"
1307msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
1308
1309#  译者:注意保持前导空格
1310#: wt-status.c:902
1311msgid ""
1312"  (use \"git rebase --continue\" once you are satisfied with your changes)"
1313msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
1314
1315#: wt-status.c:912
1316msgid "You are currently cherry-picking."
1317msgstr "您正在做拣选操作。"
1318
1319#  译者:注意保持前导空格
1320#: wt-status.c:919
1321msgid "  (all conflicts fixed: run \"git commit\")"
1322msgstr "  (解决所有冲突后,执行 \"git commit\")"
1323
1324#: wt-status.c:928
1325msgid "You are currently bisecting."
1326msgstr "您正在做二分查找。"
1327
1328#  译者:注意保持前导空格
1329#: wt-status.c:931
1330msgid "  (use \"git bisect reset\" to get back to the original branch)"
1331msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
1332
1333#: wt-status.c:982
1334msgid "On branch "
1335msgstr "位于分支 "
1336
1337#: wt-status.c:989
1338msgid "Not currently on any branch."
1339msgstr "当前不在任何分支上。"
1340
1341#: wt-status.c:1001
1342msgid "Initial commit"
1343msgstr "初始提交"
1344
1345#: wt-status.c:1015
1346msgid "Untracked files"
1347msgstr "未跟踪的文件"
1348
1349#: wt-status.c:1017
1350msgid "Ignored files"
1351msgstr "忽略的文件"
1352
1353#: wt-status.c:1019
1354#, c-format
1355msgid "Untracked files not listed%s"
1356msgstr "未跟踪的文件没有列出%s"
1357
1358#  译者:中文字符串拼接,可删除前导空格
1359#: wt-status.c:1021
1360msgid " (use -u option to show untracked files)"
1361msgstr "(使用 -u 参数显示未跟踪的文件)"
1362
1363#: wt-status.c:1027
1364msgid "No changes"
1365msgstr "没有修改"
1366
1367#  译者:中文字符串拼接,可删除前导空格
1368#: wt-status.c:1032
1369#, c-format
1370msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1371msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1372
1373#: wt-status.c:1035
1374#, c-format
1375msgid "no changes added to commit\n"
1376msgstr "修改尚未加入提交\n"
1377
1378#: wt-status.c:1038
1379#, c-format
1380msgid ""
1381"nothing added to commit but untracked files present (use \"git add\" to "
1382"track)\n"
1383msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1384
1385#: wt-status.c:1041
1386#, c-format
1387msgid "nothing added to commit but untracked files present\n"
1388msgstr "提交为空,但是存在尚未跟踪的文件\n"
1389
1390#  译者:中文字符串拼接,可删除前导空格
1391#: wt-status.c:1044
1392#, c-format
1393msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1394msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1395
1396#: wt-status.c:1047 wt-status.c:1052
1397#, c-format
1398msgid "nothing to commit\n"
1399msgstr "无文件要提交\n"
1400
1401#  译者:中文字符串拼接,可删除前导空格
1402#: wt-status.c:1050
1403#, c-format
1404msgid "nothing to commit (use -u to show untracked files)\n"
1405msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1406
1407#  译者:中文字符串拼接,可删除前导空格
1408#: wt-status.c:1054
1409#, c-format
1410msgid "nothing to commit, working directory clean\n"
1411msgstr "无文件要提交,干净的工作区\n"
1412
1413#: wt-status.c:1162
1414msgid "HEAD (no branch)"
1415msgstr "HEAD(非分支)"
1416
1417#  译者:注意保持句尾空格
1418#: wt-status.c:1168
1419msgid "Initial commit on "
1420msgstr "初始提交于 "
1421
1422#  译者:注意保持句尾空格
1423#: wt-status.c:1183
1424msgid "behind "
1425msgstr "落后 "
1426
1427#  译者:注意保持句尾空格
1428#: wt-status.c:1186 wt-status.c:1189
1429msgid "ahead "
1430msgstr "领先 "
1431
1432#  译者:注意保持句尾空格
1433#: wt-status.c:1191
1434msgid ", behind "
1435msgstr ",落后 "
1436
1437#: compat/precompose_utf8.c:58 builtin/clone.c:341
1438#, c-format
1439msgid "failed to unlink '%s'"
1440msgstr "无法删除 '%s'"
1441
1442#: builtin/add.c:20
1443msgid "git add [options] [--] <pathspec>..."
1444msgstr "git add [选项] [--] <路径匹配>..."
1445
1446#: builtin/add.c:63
1447#, c-format
1448msgid "unexpected diff status %c"
1449msgstr "意外的差异状态 %c"
1450
1451#: builtin/add.c:68 builtin/commit.c:231
1452msgid "updating files failed"
1453msgstr "更新文件失败"
1454
1455#: builtin/add.c:78
1456#, c-format
1457msgid "remove '%s'\n"
1458msgstr "删除 '%s'\n"
1459
1460#: builtin/add.c:148
1461msgid "Unstaged changes after refreshing the index:"
1462msgstr "刷新索引之后尚未被暂存的变更:"
1463
1464#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
1465#, c-format
1466msgid "pathspec '%s' did not match any files"
1467msgstr "路径 '%s' 未匹配任何文件"
1468
1469#: builtin/add.c:234
1470msgid "Could not read the index"
1471msgstr "不能读取索引"
1472
1473#: builtin/add.c:244
1474#, c-format
1475msgid "Could not open '%s' for writing."
1476msgstr "不能打开 '%s' 以写入。"
1477
1478#: builtin/add.c:248
1479msgid "Could not write patch"
1480msgstr "不能生成补丁"
1481
1482#: builtin/add.c:253
1483#, c-format
1484msgid "Could not stat '%s'"
1485msgstr "不能查看文件状态 '%s'"
1486
1487#: builtin/add.c:255
1488msgid "Empty patch. Aborted."
1489msgstr "空补丁。异常终止。"
1490
1491#: builtin/add.c:261
1492#, c-format
1493msgid "Could not apply '%s'"
1494msgstr "不能应用 '%s'"
1495
1496#: builtin/add.c:271
1497msgid "The following paths are ignored by one of your .gitignore files:\n"
1498msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1499
1500#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1501#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1502#: builtin/rm.c:206
1503msgid "dry run"
1504msgstr "演习"
1505
1506#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19
1507#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
1508#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
1509msgid "be verbose"
1510msgstr "冗长输出"
1511
1512#: builtin/add.c:280
1513msgid "interactive picking"
1514msgstr "交互式拣选"
1515
1516#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
1517msgid "select hunks interactively"
1518msgstr "交互式挑选数据块"
1519
1520#: builtin/add.c:282
1521msgid "edit current diff and apply"
1522msgstr "编辑当前差异并应用"
1523
1524#: builtin/add.c:283
1525msgid "allow adding otherwise ignored files"
1526msgstr "允许添加忽略的文件"
1527
1528#: builtin/add.c:284
1529msgid "update tracked files"
1530msgstr "更新已跟踪的文件"
1531
1532#: builtin/add.c:285
1533msgid "record only the fact that the path will be added later"
1534msgstr "只记录,该路径稍后再添加"
1535
1536#: builtin/add.c:286
1537msgid "add changes from all tracked and untracked files"
1538msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1539
1540#: builtin/add.c:287
1541msgid "don't add, only refresh the index"
1542msgstr "不添加,只刷新索引"
1543
1544#: builtin/add.c:288
1545msgid "just skip files which cannot be added because of errors"
1546msgstr "跳过因出错不能添加的文件"
1547
1548#: builtin/add.c:289
1549msgid "check if - even missing - files are ignored in dry run"
1550msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1551
1552#: builtin/add.c:311
1553#, c-format
1554msgid "Use -f if you really want to add them.\n"
1555msgstr "使用 -f 参数如果您确实要添加它们。\n"
1556
1557#: builtin/add.c:312
1558msgid "no files added"
1559msgstr "没有文件被添加"
1560
1561#: builtin/add.c:318
1562msgid "adding files failed"
1563msgstr "添加文件失败"
1564
1565#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1566#.
1567#. * To be consistent with "git add -p" and most Git
1568#. * commands, we should default to being tree-wide, but
1569#. * this is not the original behavior and can't be
1570#. * changed until users trained themselves not to type
1571#. * "git add -u" or "git add -A". For now, we warn and
1572#. * keep the old behavior. Later, this warning can be
1573#. * turned into a die(...), and eventually we may
1574#. * reallow the command with a new behavior.
1575#.
1576#: builtin/add.c:335
1577#, c-format
1578msgid ""
1579"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1580"subdirectory of the tree will change in Git 2.0 and should not be used "
1581"anymore.\n"
1582"To add content for the whole tree, run:\n"
1583"\n"
1584"  git add %s :/\n"
1585"  (or git add %s :/)\n"
1586"\n"
1587"To restrict the command to the current directory, run:\n"
1588"\n"
1589"  git add %s .\n"
1590"  (or git add %s .)\n"
1591"\n"
1592"With the current Git version, the command is restricted to the current "
1593"directory."
1594msgstr ""
1595"在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1596"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1597"如果要添加整个目录树的内容,执行:\n"
1598"\n"
1599"  git add %s :/\n"
1600"  (或 git add %s :/)\n"
1601"\n"
1602"如果要限制该命令只作用于当前目录,执行:\n"
1603"\n"
1604"  git add %s .\n"
1605"  (或 git add %s .)\n"
1606"\n"
1607"对于当前版本的 Git,这条命令只作用于当前目录。"
1608
1609#: builtin/add.c:381
1610msgid "-A and -u are mutually incompatible"
1611msgstr "-A 和 -u 选项互斥"
1612
1613#: builtin/add.c:383
1614msgid "Option --ignore-missing can only be used together with --dry-run"
1615msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
1616
1617#: builtin/add.c:414
1618#, c-format
1619msgid "Nothing specified, nothing added.\n"
1620msgstr "没有指定文件,也没有文件被添加。\n"
1621
1622#: builtin/add.c:415
1623#, c-format
1624msgid "Maybe you wanted to say 'git add .'?\n"
1625msgstr "也许您想要执行 'git add .'?\n"
1626
1627#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1628#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
1629msgid "index file corrupt"
1630msgstr "索引文件损坏"
1631
1632#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370
1633msgid "Unable to write new index file"
1634msgstr "无法写入新索引文件"
1635
1636#: builtin/apply.c:57
1637msgid "git apply [options] [<patch>...]"
1638msgstr "git apply [选项] [<补丁>...]"
1639
1640#: builtin/apply.c:110
1641#, c-format
1642msgid "unrecognized whitespace option '%s'"
1643msgstr "未能识别的空白字符选项 '%s'"
1644
1645#: builtin/apply.c:125
1646#, c-format
1647msgid "unrecognized whitespace ignore option '%s'"
1648msgstr "未能识别的空白字符忽略选项 '%s'"
1649
1650#: builtin/apply.c:823
1651#, c-format
1652msgid "Cannot prepare timestamp regexp %s"
1653msgstr "无法准备时间戳正则表达式 %s"
1654
1655#: builtin/apply.c:832
1656#, c-format
1657msgid "regexec returned %d for input: %s"
1658msgstr "regexec 返回 %d,输入为:%s"
1659
1660#: builtin/apply.c:913
1661#, c-format
1662msgid "unable to find filename in patch at line %d"
1663msgstr "不能在补丁的第 %d 行找到文件名"
1664
1665#: builtin/apply.c:945
1666#, c-format
1667msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1668msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
1669
1670#: builtin/apply.c:949
1671#, c-format
1672msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1673msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1674
1675#: builtin/apply.c:950
1676#, c-format
1677msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1678msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1679
1680#: builtin/apply.c:957
1681#, c-format
1682msgid "git apply: bad git-diff - expected /dev/null on line %d"
1683msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
1684
1685#: builtin/apply.c:1422
1686#, c-format
1687msgid "recount: unexpected line: %.*s"
1688msgstr "recount:意外的行:%.*s"
1689
1690#: builtin/apply.c:1479
1691#, c-format
1692msgid "patch fragment without header at line %d: %.*s"
1693msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1694
1695#: builtin/apply.c:1496
1696#, c-format
1697msgid ""
1698"git diff header lacks filename information when removing %d leading pathname "
1699"component (line %d)"
1700msgid_plural ""
1701"git diff header lacks filename information when removing %d leading pathname "
1702"components (line %d)"
1703msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1704msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1705
1706#: builtin/apply.c:1656
1707msgid "new file depends on old contents"
1708msgstr "新文件依赖旧内容"
1709
1710#: builtin/apply.c:1658
1711msgid "deleted file still has contents"
1712msgstr "删除的文件仍有内容"
1713
1714#: builtin/apply.c:1684
1715#, c-format
1716msgid "corrupt patch at line %d"
1717msgstr "补丁在第 %d 行损坏"
1718
1719#: builtin/apply.c:1720
1720#, c-format
1721msgid "new file %s depends on old contents"
1722msgstr "新文件 %s 依赖旧内容"
1723
1724#: builtin/apply.c:1722
1725#, c-format
1726msgid "deleted file %s still has contents"
1727msgstr "删除的文件 %s 仍有内容"
1728
1729#: builtin/apply.c:1725
1730#, c-format
1731msgid "** warning: file %s becomes empty but is not deleted"
1732msgstr "** 警告:文件 %s 成为空文件但并未删除"
1733
1734#: builtin/apply.c:1871
1735#, c-format
1736msgid "corrupt binary patch at line %d: %.*s"
1737msgstr "二进制补丁在第 %d 行损坏:%.*s"
1738
1739#. there has to be one hunk (forward hunk)
1740#: builtin/apply.c:1900
1741#, c-format
1742msgid "unrecognized binary patch at line %d"
1743msgstr "未能识别的二进制补丁位于第 %d 行"
1744
1745#: builtin/apply.c:1986
1746#, c-format
1747msgid "patch with only garbage at line %d"
1748msgstr "补丁文件的第 %d 行只有垃圾数据"
1749
1750#: builtin/apply.c:2076
1751#, c-format
1752msgid "unable to read symlink %s"
1753msgstr "无法读取符号链接 %s"
1754
1755#: builtin/apply.c:2080
1756#, c-format
1757msgid "unable to open or read %s"
1758msgstr "不能打开或读取 %s"
1759
1760#: builtin/apply.c:2684
1761#, c-format
1762msgid "invalid start of line: '%c'"
1763msgstr "无效的行首字符:'%c'"
1764
1765#: builtin/apply.c:2802
1766#, c-format
1767msgid "Hunk #%d succeeded at %d (offset %d line)."
1768msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1769msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1770msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1771
1772#: builtin/apply.c:2814
1773#, c-format
1774msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1775msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1776
1777#: builtin/apply.c:2820
1778#, c-format
1779msgid ""
1780"while searching for:\n"
1781"%.*s"
1782msgstr ""
1783"当查询:\n"
1784"%.*s"
1785
1786#: builtin/apply.c:2839
1787#, c-format
1788msgid "missing binary patch data for '%s'"
1789msgstr "缺失 '%s' 的二进制补丁数据"
1790
1791#: builtin/apply.c:2942
1792#, c-format
1793msgid "binary patch does not apply to '%s'"
1794msgstr "二进制补丁未应用到 '%s'"
1795
1796#: builtin/apply.c:2948
1797#, c-format
1798msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1799msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1800
1801#: builtin/apply.c:2969
1802#, c-format
1803msgid "patch failed: %s:%ld"
1804msgstr "打补丁失败:%s:%ld"
1805
1806#: builtin/apply.c:3091
1807#, c-format
1808msgid "cannot checkout %s"
1809msgstr "不能检出 %s"
1810
1811#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
1812#, c-format
1813msgid "read of %s failed"
1814msgstr "读取 %s 失败"
1815
1816#: builtin/apply.c:3169 builtin/apply.c:3391
1817#, c-format
1818msgid "path %s has been renamed/deleted"
1819msgstr "路径 %s 已经被重命名/删除"
1820
1821#: builtin/apply.c:3250 builtin/apply.c:3405
1822#, c-format
1823msgid "%s: does not exist in index"
1824msgstr "%s:不存在于索引中"
1825
1826#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
1827#, c-format
1828msgid "%s: %s"
1829msgstr "%s:%s"
1830
1831#: builtin/apply.c:3259 builtin/apply.c:3413
1832#, c-format
1833msgid "%s: does not match index"
1834msgstr "%s:和索引不匹配"
1835
1836#: builtin/apply.c:3361
1837msgid "removal patch leaves file contents"
1838msgstr "移除补丁仍留下了文件内容"
1839
1840#: builtin/apply.c:3430
1841#, c-format
1842msgid "%s: wrong type"
1843msgstr "%s:错误类型"
1844
1845#: builtin/apply.c:3432
1846#, c-format
1847msgid "%s has type %o, expected %o"
1848msgstr "%s 的类型是 %o,应为 %o"
1849
1850#: builtin/apply.c:3533
1851#, c-format
1852msgid "%s: already exists in index"
1853msgstr "%s:已经存在于索引中"
1854
1855#: builtin/apply.c:3536
1856#, c-format
1857msgid "%s: already exists in working directory"
1858msgstr "%s:已经存在于工作区中"
1859
1860#: builtin/apply.c:3556
1861#, c-format
1862msgid "new mode (%o) of %s does not match old mode (%o)"
1863msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1864
1865#: builtin/apply.c:3561
1866#, c-format
1867msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1868msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1869
1870#: builtin/apply.c:3569
1871#, c-format
1872msgid "%s: patch does not apply"
1873msgstr "%s:补丁未应用"
1874
1875#: builtin/apply.c:3582
1876#, c-format
1877msgid "Checking patch %s..."
1878msgstr "检查补丁 %s..."
1879
1880#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124
1881#, c-format
1882msgid "make_cache_entry failed for path '%s'"
1883msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1884
1885#: builtin/apply.c:3782
1886#, c-format
1887msgid "unable to remove %s from index"
1888msgstr "不能从索引中移除 %s"
1889
1890#: builtin/apply.c:3810
1891#, c-format
1892msgid "corrupt patch for subproject %s"
1893msgstr "子项目 %s 损坏的补丁"
1894
1895#: builtin/apply.c:3814
1896#, c-format
1897msgid "unable to stat newly created file '%s'"
1898msgstr "不能枚举新建文件 '%s' 的状态"
1899
1900#: builtin/apply.c:3819
1901#, c-format
1902msgid "unable to create backing store for newly created file %s"
1903msgstr "不能为新建文件 %s 创建后端存储"
1904
1905#: builtin/apply.c:3822 builtin/apply.c:3930
1906#, c-format
1907msgid "unable to add cache entry for %s"
1908msgstr "无法为 %s 添加缓存条目"
1909
1910#: builtin/apply.c:3855
1911#, c-format
1912msgid "closing file '%s'"
1913msgstr "关闭文件 '%s'"
1914
1915#: builtin/apply.c:3904
1916#, c-format
1917msgid "unable to write file '%s' mode %o"
1918msgstr "不能写文件 '%s' 权限 %o"
1919
1920#: builtin/apply.c:3991
1921#, c-format
1922msgid "Applied patch %s cleanly."
1923msgstr "成功应用补丁 %s。"
1924
1925#: builtin/apply.c:3999
1926msgid "internal error"
1927msgstr "内部错误"
1928
1929#. Say this even without --verbose
1930#: builtin/apply.c:4002
1931#, c-format
1932msgid "Applying patch %%s with %d reject..."
1933msgid_plural "Applying patch %%s with %d rejects..."
1934msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1935msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1936
1937#: builtin/apply.c:4012
1938#, c-format
1939msgid "truncating .rej filename to %.*s.rej"
1940msgstr "截短 .rej 文件名为 %.*s.rej"
1941
1942#: builtin/apply.c:4033
1943#, c-format
1944msgid "Hunk #%d applied cleanly."
1945msgstr "第 #%d 个片段成功应用。"
1946
1947#: builtin/apply.c:4036
1948#, c-format
1949msgid "Rejected hunk #%d."
1950msgstr "拒绝第 #%d 个片段。"
1951
1952#: builtin/apply.c:4186
1953msgid "unrecognized input"
1954msgstr "未能识别的输入"
1955
1956#: builtin/apply.c:4197
1957msgid "unable to read index file"
1958msgstr "无法读取索引文件"
1959
1960#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91
1961#: builtin/fetch.c:63
1962msgid "path"
1963msgstr "路径"
1964
1965#: builtin/apply.c:4317
1966msgid "don't apply changes matching the given path"
1967msgstr "不要应用与给出路径向匹配的变更"
1968
1969#: builtin/apply.c:4320
1970msgid "apply changes matching the given path"
1971msgstr "应用与给出路径向匹配的变更"
1972
1973#: builtin/apply.c:4322
1974msgid "num"
1975msgstr "数字"
1976
1977#: builtin/apply.c:4323
1978msgid "remove <num> leading slashes from traditional diff paths"
1979msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1980
1981#: builtin/apply.c:4326
1982msgid "ignore additions made by the patch"
1983msgstr "忽略补丁中的添加的文件"
1984
1985#: builtin/apply.c:4328
1986msgid "instead of applying the patch, output diffstat for the input"
1987msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1988
1989#: builtin/apply.c:4332
1990msgid "show number of added and deleted lines in decimal notation"
1991msgstr "以十进制数显示添加和删除的行数"
1992
1993#: builtin/apply.c:4334
1994msgid "instead of applying the patch, output a summary for the input"
1995msgstr "不应用补丁,而是显示输入的概要"
1996
1997#: builtin/apply.c:4336
1998msgid "instead of applying the patch, see if the patch is applicable"
1999msgstr "不应用补丁,而是查看补丁是否可应用"
2000
2001#: builtin/apply.c:4338
2002msgid "make sure the patch is applicable to the current index"
2003msgstr "确认补丁可以应用到当前索引"
2004
2005#: builtin/apply.c:4340
2006msgid "apply a patch without touching the working tree"
2007msgstr "应用补丁而不修改工作区"
2008
2009#: builtin/apply.c:4342
2010msgid "also apply the patch (use with --stat/--summary/--check)"
2011msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2012
2013#: builtin/apply.c:4344
2014msgid "attempt three-way merge if a patch does not apply"
2015msgstr "如果一个补丁不能应用则尝试三路合并"
2016
2017#: builtin/apply.c:4346
2018msgid "build a temporary index based on embedded index information"
2019msgstr "创建一个临时索引基于嵌入的索引信息"
2020
2021#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463
2022msgid "paths are separated with NUL character"
2023msgstr "路径以 NUL 字符分隔"
2024
2025#: builtin/apply.c:4351
2026msgid "ensure at least <n> lines of context match"
2027msgstr "确保至少匹配 <n> 行上下文"
2028
2029#: builtin/apply.c:4352
2030msgid "action"
2031msgstr "动作"
2032
2033#: builtin/apply.c:4353
2034msgid "detect new or modified lines that have whitespace errors"
2035msgstr "检查新增和修改的行中间的空白字符滥用"
2036
2037#: builtin/apply.c:4356 builtin/apply.c:4359
2038msgid "ignore changes in whitespace when finding context"
2039msgstr "查找上下文时忽略空白字符的变更"
2040
2041#: builtin/apply.c:4362
2042msgid "apply the patch in reverse"
2043msgstr "反向应用补丁"
2044
2045#: builtin/apply.c:4364
2046msgid "don't expect at least one line of context"
2047msgstr "无需至少一行上下文"
2048
2049#: builtin/apply.c:4366
2050msgid "leave the rejected hunks in corresponding *.rej files"
2051msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2052
2053#: builtin/apply.c:4368
2054msgid "allow overlapping hunks"
2055msgstr "允许重叠的补丁片段"
2056
2057#: builtin/apply.c:4371
2058msgid "tolerate incorrectly detected missing new-line at the end of file"
2059msgstr "允许不正确的文件末尾换行符"
2060
2061#: builtin/apply.c:4374
2062msgid "do not trust the line counts in the hunk headers"
2063msgstr "不信任补丁片段的头信息中的行号"
2064
2065#: builtin/apply.c:4376
2066msgid "root"
2067msgstr "根目录"
2068
2069#: builtin/apply.c:4377
2070msgid "prepend <root> to all filenames"
2071msgstr "为所有文件名前添加 <根目录>"
2072
2073#: builtin/apply.c:4399
2074msgid "--3way outside a repository"
2075msgstr "--3way 在一个版本库之外"
2076
2077#: builtin/apply.c:4407
2078msgid "--index outside a repository"
2079msgstr "--index 在一个版本库之外"
2080
2081#: builtin/apply.c:4410
2082msgid "--cached outside a repository"
2083msgstr "--cached 在一个版本库之外"
2084
2085#: builtin/apply.c:4426
2086#, c-format
2087msgid "can't open patch '%s'"
2088msgstr "不能打开补丁 '%s'"
2089
2090#: builtin/apply.c:4440
2091#, c-format
2092msgid "squelched %d whitespace error"
2093msgid_plural "squelched %d whitespace errors"
2094msgstr[0] "抑制下仍有 %d 个空白字符误用"
2095msgstr[1] "抑制下仍有 %d 个空白字符误用"
2096
2097#: builtin/apply.c:4446 builtin/apply.c:4456
2098#, c-format
2099msgid "%d line adds whitespace errors."
2100msgid_plural "%d lines add whitespace errors."
2101msgstr[0] "%d 行有空白字符误用。"
2102msgstr[1] "%d 行有空白字符误用。"
2103
2104#: builtin/archive.c:17
2105#, c-format
2106msgid "could not create archive file '%s'"
2107msgstr "不能创建归档文件 '%s'"
2108
2109#: builtin/archive.c:20
2110msgid "could not redirect output"
2111msgstr "不能重定向输出"
2112
2113#: builtin/archive.c:37
2114msgid "git archive: Remote with no URL"
2115msgstr "git archive:未提供远程URL"
2116
2117#: builtin/archive.c:58
2118msgid "git archive: expected ACK/NAK, got EOF"
2119msgstr "git archive:应为ACK/NACK,却得到EOF"
2120
2121#: builtin/archive.c:63
2122#, c-format
2123msgid "git archive: NACK %s"
2124msgstr "git archive:NACK %s"
2125
2126#: builtin/archive.c:65
2127#, c-format
2128msgid "remote error: %s"
2129msgstr "远程错误:%s"
2130
2131#: builtin/archive.c:66
2132msgid "git archive: protocol error"
2133msgstr "git archive:协议错误"
2134
2135#: builtin/archive.c:71
2136msgid "git archive: expected a flush"
2137msgstr "git archive:应为刷新"
2138
2139#: builtin/bisect--helper.c:7
2140msgid "git bisect--helper --next-all [--no-checkout]"
2141msgstr "git bisect--helper --next-all [--no-checkout]"
2142
2143#: builtin/bisect--helper.c:17
2144msgid "perform 'git bisect next'"
2145msgstr "执行 'git bisect next'"
2146
2147#: builtin/bisect--helper.c:19
2148msgid "update BISECT_HEAD instead of checking out the current commit"
2149msgstr "更新 BISECT_HEAD 而非检出当前提交"
2150
2151#: builtin/blame.c:25
2152msgid "git blame [options] [rev-opts] [rev] [--] file"
2153msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2154
2155#: builtin/blame.c:30 builtin/shortlog.c:15
2156msgid "[rev-opts] are documented in git-rev-list(1)"
2157msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2158
2159#: builtin/blame.c:2350
2160msgid "Show blame entries as we find them, incrementally"
2161msgstr "增量式地显示发现的 blame 条目"
2162
2163#: builtin/blame.c:2351
2164msgid "Show blank SHA-1 for boundary commits (Default: off)"
2165msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2166
2167#: builtin/blame.c:2352
2168msgid "Do not treat root commits as boundaries (Default: off)"
2169msgstr "不把根提交作为边界(默认:关闭)"
2170
2171#: builtin/blame.c:2353
2172msgid "Show work cost statistics"
2173msgstr "显示命令消耗统计"
2174
2175#: builtin/blame.c:2354
2176msgid "Show output score for blame entries"
2177msgstr "显示判断 blame 条目位移的得分诊断信息"
2178
2179#: builtin/blame.c:2355
2180msgid "Show original filename (Default: auto)"
2181msgstr "显示原始文件名(默认:自动)"
2182
2183#: builtin/blame.c:2356
2184msgid "Show original linenumber (Default: off)"
2185msgstr "显示原始的行号(默认:关闭)"
2186
2187#: builtin/blame.c:2357
2188msgid "Show in a format designed for machine consumption"
2189msgstr "显示为一个适合机器读取的格式"
2190
2191#: builtin/blame.c:2358
2192msgid "Show porcelain format with per-line commit information"
2193msgstr "为每一行显示机器适用的提交信息"
2194
2195#: builtin/blame.c:2359
2196msgid "Use the same output mode as git-annotate (Default: off)"
2197msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2198
2199#: builtin/blame.c:2360
2200msgid "Show raw timestamp (Default: off)"
2201msgstr "显示原始时间戳(默认:关闭)"
2202
2203#: builtin/blame.c:2361
2204msgid "Show long commit SHA1 (Default: off)"
2205msgstr "显示长的SHA1提交号(默认:关闭)"
2206
2207#: builtin/blame.c:2362
2208msgid "Suppress author name and timestamp (Default: off)"
2209msgstr "隐藏作者名字和时间戳(默认:关闭)"
2210
2211#: builtin/blame.c:2363
2212msgid "Show author email instead of name (Default: off)"
2213msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2214
2215#: builtin/blame.c:2364
2216msgid "Ignore whitespace differences"
2217msgstr "忽略空白差异"
2218
2219#: builtin/blame.c:2365
2220msgid "Spend extra cycles to find better match"
2221msgstr "花费额外的循环来找到更好的匹配"
2222
2223#: builtin/blame.c:2366
2224msgid "Use revisions from <file> instead of calling git-rev-list"
2225msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2226
2227#: builtin/blame.c:2367
2228msgid "Use <file>'s contents as the final image"
2229msgstr "使用 <file> 的内容作为最终的图片"
2230
2231#: builtin/blame.c:2368 builtin/blame.c:2369
2232msgid "score"
2233msgstr "得分"
2234
2235#: builtin/blame.c:2368
2236msgid "Find line copies within and across files"
2237msgstr "找到文件内及跨文件的行拷贝"
2238
2239#: builtin/blame.c:2369
2240msgid "Find line movements within and across files"
2241msgstr "找到文件内及跨文件的行移动"
2242
2243#: builtin/blame.c:2370
2244msgid "n,m"
2245msgstr "n,m"
2246
2247#: builtin/blame.c:2370
2248msgid "Process only line range n,m, counting from 1"
2249msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2250
2251#: builtin/branch.c:23
2252msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2253msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2254
2255#: builtin/branch.c:24
2256msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2257msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2258
2259#: builtin/branch.c:25
2260msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2261msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2262
2263#: builtin/branch.c:26
2264msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2265msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2266
2267#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2268#: builtin/branch.c:145
2269#, c-format
2270msgid ""
2271"deleting branch '%s' that has been merged to\n"
2272"         '%s', but not yet merged to HEAD."
2273msgstr ""
2274"将要删除的分支 '%s' 已经被合并到\n"
2275"         '%s',但未合并到 HEAD。"
2276
2277#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2278#: builtin/branch.c:149
2279#, c-format
2280msgid ""
2281"not deleting branch '%s' that is not yet merged to\n"
2282"         '%s', even though it is merged to HEAD."
2283msgstr ""
2284"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2285"         然而却尚未被合并到分支 '%s' 。"
2286
2287#: builtin/branch.c:163
2288#, c-format
2289msgid "Couldn't look up commit object for '%s'"
2290msgstr "无法查询 '%s' 指向的提交对象"
2291
2292#: builtin/branch.c:167
2293#, c-format
2294msgid ""
2295"The branch '%s' is not fully merged.\n"
2296"If you are sure you want to delete it, run 'git branch -D %s'."
2297msgstr ""
2298"分支 '%s' 没有完全合并。\n"
2299"如果您确认要删除它,执行 'git branch -D %s'。"
2300
2301#: builtin/branch.c:180
2302msgid "Update of config-file failed"
2303msgstr "无法更新 config 文件"
2304
2305#: builtin/branch.c:208
2306msgid "cannot use -a with -d"
2307msgstr "不能将 -a 和 -d 同时使用"
2308
2309#: builtin/branch.c:214
2310msgid "Couldn't look up commit object for HEAD"
2311msgstr "无法查询 HEAD 指向的提交对象"
2312
2313#: builtin/branch.c:222
2314#, c-format
2315msgid "Cannot delete the branch '%s' which you are currently on."
2316msgstr "无法删除您当前所在的分支 '%s'。"
2317
2318#: builtin/branch.c:235
2319#, c-format
2320msgid "remote branch '%s' not found."
2321msgstr "远程分支 '%s' 未发现。"
2322
2323#: builtin/branch.c:236
2324#, c-format
2325msgid "branch '%s' not found."
2326msgstr "分支 '%s' 未发现。"
2327
2328#: builtin/branch.c:250
2329#, c-format
2330msgid "Error deleting remote branch '%s'"
2331msgstr "删除远程分支 '%s' 时出错"
2332
2333#: builtin/branch.c:251
2334#, c-format
2335msgid "Error deleting branch '%s'"
2336msgstr "删除分支 '%s' 时出错"
2337
2338#: builtin/branch.c:258
2339#, c-format
2340msgid "Deleted remote branch %s (was %s).\n"
2341msgstr "已删除远程分支 %s(曾为 %s)。\n"
2342
2343#: builtin/branch.c:259
2344#, c-format
2345msgid "Deleted branch %s (was %s).\n"
2346msgstr "已删除分支 %s(曾为 %s)。\n"
2347
2348#: builtin/branch.c:361
2349#, c-format
2350msgid "branch '%s' does not point at a commit"
2351msgstr "分支 '%s' 未指向一个提交"
2352
2353#: builtin/branch.c:433
2354#, c-format
2355msgid "[%s: behind %d]"
2356msgstr "[%s:落后 %d]"
2357
2358#: builtin/branch.c:435
2359#, c-format
2360msgid "[behind %d]"
2361msgstr "[落后 %d]"
2362
2363#: builtin/branch.c:439
2364#, c-format
2365msgid "[%s: ahead %d]"
2366msgstr "[%s:领先 %d]"
2367
2368#: builtin/branch.c:441
2369#, c-format
2370msgid "[ahead %d]"
2371msgstr "[领先 %d]"
2372
2373#: builtin/branch.c:444
2374#, c-format
2375msgid "[%s: ahead %d, behind %d]"
2376msgstr "[%s:领先 %d,落后 %d]"
2377
2378#: builtin/branch.c:447
2379#, c-format
2380msgid "[ahead %d, behind %d]"
2381msgstr "[领先 %d,落后 %d]"
2382
2383#: builtin/branch.c:469
2384msgid " **** invalid ref ****"
2385msgstr " **** 无效引用 ****"
2386
2387#: builtin/branch.c:560
2388msgid "(no branch)"
2389msgstr "(非分支)"
2390
2391#: builtin/branch.c:593
2392#, c-format
2393msgid "object '%s' does not point to a commit"
2394msgstr "对象 '%s' 没有指向一个提交"
2395
2396#: builtin/branch.c:625
2397msgid "some refs could not be read"
2398msgstr "一些引用不能读取"
2399
2400#: builtin/branch.c:638
2401msgid "cannot rename the current branch while not on any."
2402msgstr "无法重命名当前分支因为不处于任何分支上。"
2403
2404#: builtin/branch.c:648
2405#, c-format
2406msgid "Invalid branch name: '%s'"
2407msgstr "无效的分支名:'%s'"
2408
2409#: builtin/branch.c:663
2410msgid "Branch rename failed"
2411msgstr "分支重命名失败"
2412
2413#: builtin/branch.c:667
2414#, c-format
2415msgid "Renamed a misnamed branch '%s' away"
2416msgstr "重命名掉一个错误命名的旧分支 '%s'"
2417
2418#: builtin/branch.c:671
2419#, c-format
2420msgid "Branch renamed to %s, but HEAD is not updated!"
2421msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2422
2423#: builtin/branch.c:678
2424msgid "Branch is renamed, but update of config-file failed"
2425msgstr "分支被重命名,但更新 config 文件失败"
2426
2427#: builtin/branch.c:693
2428#, c-format
2429msgid "malformed object name %s"
2430msgstr "非法的对象名 %s"
2431
2432#: builtin/branch.c:717
2433#, c-format
2434msgid "could not write branch description template: %s"
2435msgstr "不能写分支描述模版:%s"
2436
2437#: builtin/branch.c:747
2438msgid "Generic options"
2439msgstr "通用选项"
2440
2441#: builtin/branch.c:749
2442msgid "show hash and subject, give twice for upstream branch"
2443msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2444
2445#: builtin/branch.c:750
2446msgid "suppress informational messages"
2447msgstr "不显示信息"
2448
2449#: builtin/branch.c:751
2450msgid "set up tracking mode (see git-pull(1))"
2451msgstr "设置跟踪模式(参见 git-pull(1))"
2452
2453#: builtin/branch.c:753
2454msgid "change upstream info"
2455msgstr "改变上游信息"
2456
2457#: builtin/branch.c:757
2458msgid "use colored output"
2459msgstr "使用彩色输出"
2460
2461#: builtin/branch.c:758
2462msgid "act on remote-tracking branches"
2463msgstr "作用于远程跟踪分支"
2464
2465#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2466#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
2467#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
2468msgid "commit"
2469msgstr "提交"
2470
2471#: builtin/branch.c:762 builtin/branch.c:768
2472msgid "print only branches that contain the commit"
2473msgstr "只打印包含该提交的分支"
2474
2475#: builtin/branch.c:774
2476msgid "Specific git-branch actions:"
2477msgstr "具体的 git-branch 动作:"
2478
2479#: builtin/branch.c:775
2480msgid "list both remote-tracking and local branches"
2481msgstr "列出远程跟踪及本地分支"
2482
2483#: builtin/branch.c:777
2484msgid "delete fully merged branch"
2485msgstr "删除完全合并的分支"
2486
2487#: builtin/branch.c:778
2488msgid "delete branch (even if not merged)"
2489msgstr "删除分支(即使没有合并)"
2490
2491#: builtin/branch.c:779
2492msgid "move/rename a branch and its reflog"
2493msgstr "移动/重命名一个分支,以及它的引用日志"
2494
2495#: builtin/branch.c:780
2496msgid "move/rename a branch, even if target exists"
2497msgstr "移动/重命名一个分支,即使目标已存在"
2498
2499#: builtin/branch.c:781
2500msgid "list branch names"
2501msgstr "列出分支名"
2502
2503#: builtin/branch.c:782
2504msgid "create the branch's reflog"
2505msgstr "创建分支的引用日志"
2506
2507#: builtin/branch.c:784
2508msgid "edit the description for the branch"
2509msgstr "标记分支的描述"
2510
2511#: builtin/branch.c:785
2512msgid "force creation (when already exists)"
2513msgstr "强制创建(当已经存在)"
2514
2515#: builtin/branch.c:788
2516msgid "print only not merged branches"
2517msgstr "只打印没有合并的分支"
2518
2519#: builtin/branch.c:794
2520msgid "print only merged branches"
2521msgstr "只打印合并的分支"
2522
2523#: builtin/branch.c:798
2524msgid "list branches in columns"
2525msgstr "以列的方式显示分支"
2526
2527#: builtin/branch.c:811
2528msgid "Failed to resolve HEAD as a valid ref."
2529msgstr "无法将 HEAD 解析为有效引用。"
2530
2531#: builtin/branch.c:816 builtin/clone.c:561
2532msgid "HEAD not found below refs/heads!"
2533msgstr "HEAD 没有位于 /refs/heads 之下!"
2534
2535#: builtin/branch.c:839
2536msgid "--column and --verbose are incompatible"
2537msgstr "--column 和 --verbose 不兼容"
2538
2539#: builtin/branch.c:845
2540msgid "branch name required"
2541msgstr "必须提供分支名"
2542
2543#: builtin/branch.c:860
2544msgid "Cannot give description to detached HEAD"
2545msgstr "不能向分离头指针提供描述"
2546
2547#: builtin/branch.c:865
2548msgid "cannot edit description of more than one branch"
2549msgstr "不能为一个以上的分支编辑描述"
2550
2551#: builtin/branch.c:872
2552#, c-format
2553msgid "No commit on branch '%s' yet."
2554msgstr "分支 '%s' 尚无提交。"
2555
2556#: builtin/branch.c:875
2557#, c-format
2558msgid "No branch named '%s'."
2559msgstr "没有分支 '%s'。"
2560
2561#: builtin/branch.c:888
2562msgid "too many branches for a rename operation"
2563msgstr "为重命名操作提供了太多的分支名"
2564
2565#: builtin/branch.c:893
2566#, c-format
2567msgid "branch '%s' does not exist"
2568msgstr "分支 '%s' 不存在"
2569
2570#: builtin/branch.c:905
2571#, c-format
2572msgid "Branch '%s' has no upstream information"
2573msgstr "分支 '%s' 没有上游信息"
2574
2575#: builtin/branch.c:920
2576msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2577msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2578
2579#: builtin/branch.c:923
2580#, c-format
2581msgid ""
2582"The --set-upstream flag is deprecated and will be removed. Consider using --"
2583"track or --set-upstream-to\n"
2584msgstr ""
2585"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
2586
2587#: builtin/branch.c:940
2588#, c-format
2589msgid ""
2590"\n"
2591"If you wanted to make '%s' track '%s', do this:\n"
2592"\n"
2593msgstr ""
2594"\n"
2595"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2596"\n"
2597
2598#: builtin/branch.c:941
2599#, c-format
2600msgid "    git branch -d %s\n"
2601msgstr "    git branch -d %s\n"
2602
2603#: builtin/branch.c:942
2604#, c-format
2605msgid "    git branch --set-upstream-to %s\n"
2606msgstr "    git branch --set-upstream-to %s\n"
2607
2608#: builtin/bundle.c:47
2609#, c-format
2610msgid "%s is okay\n"
2611msgstr "%s 可以\n"
2612
2613#: builtin/bundle.c:56
2614msgid "Need a repository to create a bundle."
2615msgstr "需要一个版本库来创建包。"
2616
2617#: builtin/bundle.c:60
2618msgid "Need a repository to unbundle."
2619msgstr "需要一个版本库来解包。"
2620
2621#: builtin/cat-file.c:247
2622msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2623msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2624
2625#: builtin/cat-file.c:248
2626msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2627msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2628
2629#: builtin/cat-file.c:266
2630msgid "<type> can be one of: blob, tree, commit, tag"
2631msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
2632
2633#: builtin/cat-file.c:267
2634msgid "show object type"
2635msgstr "显示对象类型"
2636
2637#: builtin/cat-file.c:268
2638msgid "show object size"
2639msgstr "显示对象大小"
2640
2641#: builtin/cat-file.c:270
2642msgid "exit with zero when there's no error"
2643msgstr "当没有错误时退出并返回零"
2644
2645#: builtin/cat-file.c:271
2646msgid "pretty-print object's content"
2647msgstr "美观地打印对象的内容"
2648
2649#: builtin/cat-file.c:273
2650msgid "for blob objects, run textconv on object's content"
2651msgstr "对于数据(blob)对象,对其内容执行 textconv"
2652
2653#: builtin/cat-file.c:275
2654msgid "show info and content of objects fed from the standard input"
2655msgstr "显示从标准输入提供的对象的信息和内容"
2656
2657#: builtin/cat-file.c:278
2658msgid "show info about objects fed from the standard input"
2659msgstr "显示从标准输入提供的对象的信息"
2660
2661#: builtin/check-attr.c:11
2662msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2663msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
2664
2665#: builtin/check-attr.c:12
2666msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2667msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
2668
2669#: builtin/check-attr.c:19
2670msgid "report all attributes set on file"
2671msgstr "报告设置在文件上的所有属性"
2672
2673#: builtin/check-attr.c:20
2674msgid "use .gitattributes only from the index"
2675msgstr "只使用索引中的 .gitattributes"
2676
2677#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2678msgid "read file names from stdin"
2679msgstr "从标准输入读出文件名"
2680
2681#: builtin/check-attr.c:23 builtin/check-ignore.c:24
2682msgid "input paths are terminated by a null character"
2683msgstr "输入路径以null字符终止"
2684
2685#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
2686msgid "suppress progress reporting"
2687msgstr "不显示进度报告"
2688
2689#: builtin/check-ignore.c:151
2690msgid "cannot specify pathnames with --stdin"
2691msgstr "不能同时提供路径及 --stdin 参数"
2692
2693#: builtin/check-ignore.c:154
2694msgid "-z only makes sense with --stdin"
2695msgstr "-z 需要和 --stdin 参数共用才有意义"
2696
2697#: builtin/check-ignore.c:156
2698msgid "no path specified"
2699msgstr "未指定路径"
2700
2701#: builtin/check-ignore.c:160
2702msgid "--quiet is only valid with a single pathname"
2703msgstr "参数 --quiet 只在提供一个路径名时有效"
2704
2705#: builtin/check-ignore.c:162
2706msgid "cannot have both --quiet and --verbose"
2707msgstr "不能同时提供 --quiet 和 --verbose 参数"
2708
2709#: builtin/checkout-index.c:126
2710msgid "git checkout-index [options] [--] [<file>...]"
2711msgstr "git checkout-index [选项] [--] [<文件>...]"
2712
2713#: builtin/checkout-index.c:187
2714msgid "check out all files in the index"
2715msgstr "检出索引区的所有文件"
2716
2717#: builtin/checkout-index.c:188
2718msgid "force overwrite of existing files"
2719msgstr "强制覆盖现有的文件"
2720
2721#: builtin/checkout-index.c:190
2722msgid "no warning for existing files and files not in index"
2723msgstr "存在或不在索引中的文件都没有警告"
2724
2725#: builtin/checkout-index.c:192
2726msgid "don't checkout new files"
2727msgstr "不检出新文件"
2728
2729#: builtin/checkout-index.c:194
2730msgid "update stat information in the index file"
2731msgstr "更新索引中文件的状态信息"
2732
2733#: builtin/checkout-index.c:200
2734msgid "read list of paths from the standard input"
2735msgstr "从标准输入读取路径列表"
2736
2737#: builtin/checkout-index.c:202
2738msgid "write the content to temporary files"
2739msgstr "将内容写入临时文件"
2740
2741#: builtin/checkout-index.c:203 builtin/column.c:30
2742msgid "string"
2743msgstr "字符串"
2744
2745#: builtin/checkout-index.c:204
2746msgid "when creating files, prepend <string>"
2747msgstr "在创建文件时,在前面加上<字符串>"
2748
2749#: builtin/checkout-index.c:207
2750msgid "copy out the files from named stage"
2751msgstr "从指定暂存区中拷出文件"
2752
2753#: builtin/checkout.c:25
2754msgid "git checkout [options] <branch>"
2755msgstr "git checkout [选项] <分支>"
2756
2757#: builtin/checkout.c:26
2758msgid "git checkout [options] [<branch>] -- <file>..."
2759msgstr "git checkout [选项] [<分支>] -- <文件>..."
2760
2761#: builtin/checkout.c:116 builtin/checkout.c:149
2762#, c-format
2763msgid "path '%s' does not have our version"
2764msgstr "路径 '%s' 没有我们的版本"
2765
2766#: builtin/checkout.c:118 builtin/checkout.c:151
2767#, c-format
2768msgid "path '%s' does not have their version"
2769msgstr "路径 '%s' 没有他们的版本"
2770
2771#: builtin/checkout.c:134
2772#, c-format
2773msgid "path '%s' does not have all necessary versions"
2774msgstr "路径 '%s' 没有全部必须的版本"
2775
2776#: builtin/checkout.c:178
2777#, c-format
2778msgid "path '%s' does not have necessary versions"
2779msgstr "路径 '%s' 没有必须的版本"
2780
2781#: builtin/checkout.c:195
2782#, c-format
2783msgid "path '%s': cannot merge"
2784msgstr "path '%s':无法合并"
2785
2786#: builtin/checkout.c:212
2787#, c-format
2788msgid "Unable to add merge result for '%s'"
2789msgstr "无法为 '%s' 添加合并结果"
2790
2791#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2792#: builtin/checkout.c:245
2793#, c-format
2794msgid "'%s' cannot be used with updating paths"
2795msgstr "'%s' 不能在更新路径时使用"
2796
2797#: builtin/checkout.c:248 builtin/checkout.c:251
2798#, c-format
2799msgid "'%s' cannot be used with %s"
2800msgstr "'%s' 不能和 %s 同时使用"
2801
2802#: builtin/checkout.c:254
2803#, c-format
2804msgid "Cannot update paths and switch to branch '%s' at the same time."
2805msgstr "不能同时更新路径并切换到分支'%s'。"
2806
2807#: builtin/checkout.c:265 builtin/checkout.c:426
2808msgid "corrupt index file"
2809msgstr "损坏的索引文件"
2810
2811#: builtin/checkout.c:295 builtin/checkout.c:302
2812#, c-format
2813msgid "path '%s' is unmerged"
2814msgstr "路径 '%s' 未合并"
2815
2816#: builtin/checkout.c:448
2817msgid "you need to resolve your current index first"
2818msgstr "您需要先解决当前索引的冲突"
2819
2820#: builtin/checkout.c:569
2821#, c-format
2822msgid "Can not do reflog for '%s'\n"
2823msgstr "不能对 '%s' 执行 reflog 操作\n"
2824
2825#: builtin/checkout.c:602
2826msgid "HEAD is now at"
2827msgstr "HEAD 目前位于"
2828
2829#: builtin/checkout.c:609
2830#, c-format
2831msgid "Reset branch '%s'\n"
2832msgstr "重置分支 '%s'\n"
2833
2834#: builtin/checkout.c:612
2835#, c-format
2836msgid "Already on '%s'\n"
2837msgstr "已经位于 '%s'\n"
2838
2839#: builtin/checkout.c:616
2840#, c-format
2841msgid "Switched to and reset branch '%s'\n"
2842msgstr "切换并重置分支 '%s'\n"
2843
2844#: builtin/checkout.c:618 builtin/checkout.c:955
2845#, c-format
2846msgid "Switched to a new branch '%s'\n"
2847msgstr "切换到一个新分支 '%s'\n"
2848
2849#: builtin/checkout.c:620
2850#, c-format
2851msgid "Switched to branch '%s'\n"
2852msgstr "切换到分支 '%s'\n"
2853
2854#  译者:注意保持前导空格
2855#: builtin/checkout.c:676
2856#, c-format
2857msgid " ... and %d more.\n"
2858msgstr " ... 及其它 %d 个。\n"
2859
2860#. The singular version
2861#: builtin/checkout.c:682
2862#, c-format
2863msgid ""
2864"Warning: you are leaving %d commit behind, not connected to\n"
2865"any of your branches:\n"
2866"\n"
2867"%s\n"
2868msgid_plural ""
2869"Warning: you are leaving %d commits behind, not connected to\n"
2870"any of your branches:\n"
2871"\n"
2872"%s\n"
2873msgstr[0] ""
2874"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2875"\n"
2876"%s\n"
2877msgstr[1] ""
2878"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2879"\n"
2880"%s\n"
2881
2882#: builtin/checkout.c:700
2883#, c-format
2884msgid ""
2885"If you want to keep them by creating a new branch, this may be a good time\n"
2886"to do so with:\n"
2887"\n"
2888" git branch new_branch_name %s\n"
2889"\n"
2890msgstr ""
2891"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2892"如下操作:\n"
2893"\n"
2894" git branch new_branch_name %s\n"
2895"\n"
2896
2897#: builtin/checkout.c:730
2898msgid "internal error in revision walk"
2899msgstr "在版本遍历时遇到内部错误"
2900
2901#: builtin/checkout.c:734
2902msgid "Previous HEAD position was"
2903msgstr "之前的 HEAD 位置是"
2904
2905#: builtin/checkout.c:761 builtin/checkout.c:950
2906msgid "You are on a branch yet to be born"
2907msgstr "您位于一个尚未初始化的分支"
2908
2909#. case (1)
2910#: builtin/checkout.c:886
2911#, c-format
2912msgid "invalid reference: %s"
2913msgstr "无效引用:%s"
2914
2915#. case (1): want a tree
2916#: builtin/checkout.c:925
2917#, c-format
2918msgid "reference is not a tree: %s"
2919msgstr "引用不是一个树:%s"
2920
2921#: builtin/checkout.c:964
2922msgid "paths cannot be used with switching branches"
2923msgstr "路径不能和切换分支同时使用"
2924
2925#: builtin/checkout.c:967 builtin/checkout.c:971
2926#, c-format
2927msgid "'%s' cannot be used with switching branches"
2928msgstr "'%s' 不能和切换分支同时使用"
2929
2930#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2931#: builtin/checkout.c:986
2932#, c-format
2933msgid "'%s' cannot be used with '%s'"
2934msgstr "'%s' 不能和 '%s' 同时使用"
2935
2936#: builtin/checkout.c:991
2937#, c-format
2938msgid "Cannot switch branch to a non-commit '%s'"
2939msgstr "不能切换分支到一个非提交 '%s'"
2940
2941#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2942#: builtin/remote.c:169 builtin/remote.c:171
2943msgid "branch"
2944msgstr "分支"
2945
2946#: builtin/checkout.c:1014
2947msgid "create and checkout a new branch"
2948msgstr "创建并检出一个新的分支"
2949
2950#: builtin/checkout.c:1016
2951msgid "create/reset and checkout a branch"
2952msgstr "创建/重置并检出一个分支"
2953
2954#: builtin/checkout.c:1017
2955msgid "create reflog for new branch"
2956msgstr "为新的分支创建引用日志"
2957
2958#: builtin/checkout.c:1018
2959msgid "detach the HEAD at named commit"
2960msgstr "成为指向该提交的分离头指针"
2961
2962#: builtin/checkout.c:1019
2963msgid "set upstream info for new branch"
2964msgstr "为新的分支设置上游信息"
2965
2966#: builtin/checkout.c:1021
2967msgid "new branch"
2968msgstr "新分支"
2969
2970#: builtin/checkout.c:1021
2971msgid "new unparented branch"
2972msgstr "新的没有父提交的分支"
2973
2974#: builtin/checkout.c:1022
2975msgid "checkout our version for unmerged files"
2976msgstr "对尚未合并的文件检出我们的版本"
2977
2978#: builtin/checkout.c:1024
2979msgid "checkout their version for unmerged files"
2980msgstr "对尚未合并的文件检出他们的版本"
2981
2982#: builtin/checkout.c:1026
2983msgid "force checkout (throw away local modifications)"
2984msgstr "强制检出(丢弃本地修改)"
2985
2986#: builtin/checkout.c:1027
2987msgid "perform a 3-way merge with the new branch"
2988msgstr "和新的分支执行三路合并"
2989
2990#: builtin/checkout.c:1028 builtin/merge.c:215
2991msgid "update ignored files (default)"
2992msgstr "更新忽略的文件(默认)"
2993
2994#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
2995msgid "style"
2996msgstr "风格"
2997
2998#: builtin/checkout.c:1030
2999msgid "conflict style (merge or diff3)"
3000msgstr "冲突输出风格(merge 或 diff3)"
3001
3002#: builtin/checkout.c:1033
3003msgid "second guess 'git checkout no-such-branch'"
3004msgstr "再者猜测'git checkout no-such-branch'"
3005
3006#: builtin/checkout.c:1057
3007msgid "-b, -B and --orphan are mutually exclusive"
3008msgstr "-b、-B 和 --orphan 是互斥的"
3009
3010#: builtin/checkout.c:1074
3011msgid "--track needs a branch name"
3012msgstr "--track 需要一个分支名"
3013
3014#: builtin/checkout.c:1081
3015msgid "Missing branch name; try -b"
3016msgstr "缺少分支名;尝试 -b"
3017
3018#: builtin/checkout.c:1116
3019msgid "invalid path specification"
3020msgstr "无效的路径规格"
3021
3022#: builtin/checkout.c:1123
3023#, c-format
3024msgid ""
3025"Cannot update paths and switch to branch '%s' at the same time.\n"
3026"Did you intend to checkout '%s' which can not be resolved as commit?"
3027msgstr ""
3028"不能同时更新路径并切换到分支'%s'。\n"
3029"您是想要检出 '%s' 但其未能解析为提交么?"
3030
3031#: builtin/checkout.c:1128
3032#, c-format
3033msgid "git checkout: --detach does not take a path argument '%s'"
3034msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3035
3036#: builtin/checkout.c:1132
3037msgid ""
3038"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3039"checking out of the index."
3040msgstr ""
3041"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3042
3043#: builtin/clean.c:20
3044msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3045msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3046
3047#: builtin/clean.c:24
3048#, c-format
3049msgid "Removing %s\n"
3050msgstr "正删除 %s\n"
3051
3052#: builtin/clean.c:25
3053#, c-format
3054msgid "Would remove %s\n"
3055msgstr "将删除 %s\n"
3056
3057#: builtin/clean.c:26
3058#, c-format
3059msgid "Skipping repository %s\n"
3060msgstr "忽略版本库 %s\n"
3061
3062#: builtin/clean.c:27
3063#, c-format
3064msgid "Would skip repository %s\n"
3065msgstr "将忽略版本库 %s\n"
3066
3067#: builtin/clean.c:28
3068#, c-format
3069msgid "failed to remove %s"
3070msgstr "无法删除 %s"
3071
3072#: builtin/clean.c:160
3073msgid "do not print names of files removed"
3074msgstr "不打印删除文件的名称"
3075
3076#: builtin/clean.c:162
3077msgid "force"
3078msgstr "强制"
3079
3080#: builtin/clean.c:164
3081msgid "remove whole directories"
3082msgstr "删除整个目录"
3083
3084#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
3085#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
3086msgid "pattern"
3087msgstr "模式"
3088
3089#: builtin/clean.c:166
3090msgid "add <pattern> to ignore rules"
3091msgstr "添加<模式>到忽略规则"
3092
3093#: builtin/clean.c:167
3094msgid "remove ignored files, too"
3095msgstr "也删除忽略的文件"
3096
3097#: builtin/clean.c:169
3098msgid "remove only ignored files"
3099msgstr "只删除忽略的文件"
3100
3101#: builtin/clean.c:187
3102msgid "-x and -X cannot be used together"
3103msgstr "-x 和 -X 不能同时使用"
3104
3105#: builtin/clean.c:191
3106msgid ""
3107"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3108msgstr ""
3109"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3110
3111#: builtin/clean.c:194
3112msgid ""
3113"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3114"clean"
3115msgstr ""
3116"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3117
3118#: builtin/clone.c:36
3119msgid "git clone [options] [--] <repo> [<dir>]"
3120msgstr "git clone [选项] [--] <版本库> [<路径>]"
3121
3122#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
3123#: builtin/push.c:436
3124msgid "force progress reporting"
3125msgstr "强制显示进度报告"
3126
3127#: builtin/clone.c:66
3128msgid "don't create a checkout"
3129msgstr "不创建一个检出"
3130
3131#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3132msgid "create a bare repository"
3133msgstr "创建一个裸版本库"
3134
3135#: builtin/clone.c:72
3136msgid "create a mirror repository (implies bare)"
3137msgstr "创建一个镜像版本库(也是裸版本库)"
3138
3139#: builtin/clone.c:74
3140msgid "to clone from a local repository"
3141msgstr "从本地版本库克隆"
3142
3143#: builtin/clone.c:76
3144msgid "don't use local hardlinks, always copy"
3145msgstr "不使用本地硬链接,始终复制"
3146
3147#: builtin/clone.c:78
3148msgid "setup as shared repository"
3149msgstr "设置为共享版本库"
3150
3151#: builtin/clone.c:80 builtin/clone.c:82
3152msgid "initialize submodules in the clone"
3153msgstr "在克隆时初始化子模组"
3154
3155#: builtin/clone.c:83 builtin/init-db.c:485
3156msgid "template-directory"
3157msgstr "模板目录"
3158
3159#: builtin/clone.c:84 builtin/init-db.c:486
3160msgid "directory from which templates will be used"
3161msgstr "模板目录将被使用"
3162
3163#: builtin/clone.c:86
3164msgid "reference repository"
3165msgstr "引用版本库"
3166
3167#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
3168msgid "name"
3169msgstr "名称"
3170
3171#: builtin/clone.c:88
3172msgid "use <name> instead of 'origin' to track upstream"
3173msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3174
3175#: builtin/clone.c:90
3176msgid "checkout <branch> instead of the remote's HEAD"
3177msgstr "检出<分支>而不是远程HEAD"
3178
3179#: builtin/clone.c:92
3180msgid "path to git-upload-pack on the remote"
3181msgstr "远程 git-upload-pack 路径"
3182
3183#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
3184msgid "depth"
3185msgstr "深度"
3186
3187#: builtin/clone.c:94
3188msgid "create a shallow clone of that depth"
3189msgstr "创建一个指定深度的浅克隆"
3190
3191#: builtin/clone.c:96
3192msgid "clone only one branch, HEAD or --branch"
3193msgstr "只克隆一个分支、HEAD 或 --branch"
3194
3195#: builtin/clone.c:97 builtin/init-db.c:494
3196msgid "gitdir"
3197msgstr "git目录"
3198
3199#: builtin/clone.c:98 builtin/init-db.c:495
3200msgid "separate git dir from working tree"
3201msgstr "git目录和工作区分离"
3202
3203#: builtin/clone.c:99
3204msgid "key=value"
3205msgstr "key=value"
3206
3207#: builtin/clone.c:100
3208msgid "set config inside the new repository"
3209msgstr "在新版本库中设置配置信息"
3210
3211#: builtin/clone.c:243
3212#, c-format
3213msgid "reference repository '%s' is not a local directory."
3214msgstr "引用版本库 '%s' 不是一个本地目录。"
3215
3216#: builtin/clone.c:306
3217#, c-format
3218msgid "failed to create directory '%s'"
3219msgstr "无法创建目录 '%s'"
3220
3221#: builtin/clone.c:308 builtin/diff.c:77
3222#, c-format
3223msgid "failed to stat '%s'"
3224msgstr "无法枚举 '%s' 状态"
3225
3226#: builtin/clone.c:310
3227#, c-format
3228msgid "%s exists and is not a directory"
3229msgstr "%s 存在且不是一个目录"
3230
3231#: builtin/clone.c:324
3232#, c-format
3233msgid "failed to stat %s\n"
3234msgstr "无法枚举 %s 状态\n"
3235
3236#: builtin/clone.c:346
3237#, c-format
3238msgid "failed to create link '%s'"
3239msgstr "无法创建链接 '%s'"
3240
3241#: builtin/clone.c:350
3242#, c-format
3243msgid "failed to copy file to '%s'"
3244msgstr "无法拷贝文件至 '%s'"
3245
3246#: builtin/clone.c:373
3247#, c-format
3248msgid "done.\n"
3249msgstr "完成。\n"
3250
3251#: builtin/clone.c:443
3252#, c-format
3253msgid "Could not find remote branch %s to clone."
3254msgstr "不能发现要克隆的远程分支 %s。"
3255
3256#: builtin/clone.c:552
3257msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3258msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3259
3260#: builtin/clone.c:690
3261msgid "Too many arguments."
3262msgstr "太多参数。"
3263
3264#: builtin/clone.c:694
3265msgid "You must specify a repository to clone."
3266msgstr "您必须指定一个版本库来克隆。"
3267
3268#: builtin/clone.c:705
3269#, c-format
3270msgid "--bare and --origin %s options are incompatible."
3271msgstr "--bare 和 --origin %s 选项不兼容。"
3272
3273#: builtin/clone.c:708
3274msgid "--bare and --separate-git-dir are incompatible."
3275msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3276
3277#: builtin/clone.c:721
3278#, c-format
3279msgid "repository '%s' does not exist"
3280msgstr "版本库 '%s' 不存在"
3281
3282#: builtin/clone.c:726
3283msgid "--depth is ignored in local clones; use file:// instead."
3284msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3285
3286#: builtin/clone.c:736
3287#, c-format
3288msgid "destination path '%s' already exists and is not an empty directory."
3289msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3290
3291#: builtin/clone.c:746
3292#, c-format
3293msgid "working tree '%s' already exists."
3294msgstr "工作区 '%s' 已经存在。"
3295
3296#: builtin/clone.c:759 builtin/clone.c:771
3297#, c-format
3298msgid "could not create leading directories of '%s'"
3299msgstr "不能为 '%s' 创建先导目录"
3300
3301#: builtin/clone.c:762
3302#, c-format
3303msgid "could not create work tree dir '%s'."
3304msgstr "不能为 '%s' 创建工作区目录。"
3305
3306#: builtin/clone.c:781
3307#, c-format
3308msgid "Cloning into bare repository '%s'...\n"
3309msgstr "克隆到裸版本库 '%s'...\n"
3310
3311#: builtin/clone.c:783
3312#, c-format
3313msgid "Cloning into '%s'...\n"
3314msgstr "正克隆到 '%s'...\n"
3315
3316#: builtin/clone.c:818
3317#, c-format
3318msgid "Don't know how to clone %s"
3319msgstr "不知道如何克隆 %s"
3320
3321#: builtin/clone.c:867
3322#, c-format
3323msgid "Remote branch %s not found in upstream %s"
3324msgstr "远程分支 %s 在上游 %s 未发现"
3325
3326#: builtin/clone.c:874
3327msgid "You appear to have cloned an empty repository."
3328msgstr "您似乎克隆了一个空版本库。"
3329
3330#: builtin/column.c:9
3331msgid "git column [options]"
3332msgstr "git column [选项]"
3333
3334#: builtin/column.c:26
3335msgid "lookup config vars"
3336msgstr "查找配置变量"
3337
3338#: builtin/column.c:27 builtin/column.c:28
3339msgid "layout to use"
3340msgstr "要使用的布局"
3341
3342#: builtin/column.c:29
3343msgid "Maximum width"
3344msgstr "最大宽度"
3345
3346#: builtin/column.c:30
3347msgid "Padding space on left border"
3348msgstr "左边框的填充空间"
3349
3350#: builtin/column.c:31
3351msgid "Padding space on right border"
3352msgstr "右边框的填充空间"
3353
3354#: builtin/column.c:32
3355msgid "Padding space between columns"
3356msgstr "两列之间的填充空间"
3357
3358#: builtin/column.c:51
3359msgid "--command must be the first argument"
3360msgstr "--command 必须是第一个参数"
3361
3362#: builtin/commit.c:34
3363msgid "git commit [options] [--] <pathspec>..."
3364msgstr "git commit [选项] [--] <路径匹配>..."
3365
3366#: builtin/commit.c:39
3367msgid "git status [options] [--] <pathspec>..."
3368msgstr "git status [选项] [--] <路径匹配>..."
3369
3370#: builtin/commit.c:44
3371msgid ""
3372"Your name and email address were configured automatically based\n"
3373"on your username and hostname. Please check that they are accurate.\n"
3374"You can suppress this message by setting them explicitly:\n"
3375"\n"
3376"    git config --global user.name \"Your Name\"\n"
3377"    git config --global user.email you@example.com\n"
3378"\n"
3379"After doing this, you may fix the identity used for this commit with:\n"
3380"\n"
3381"    git commit --amend --reset-author\n"
3382msgstr ""
3383"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3384"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
3385"\n"
3386"    git config --global user.name \"Your Name\"\n"
3387"    git config --global user.email you@example.com\n"
3388"\n"
3389"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3390"\n"
3391"    git commit --amend --reset-author\n"
3392
3393#: builtin/commit.c:56
3394msgid ""
3395"You asked to amend the most recent commit, but doing so would make\n"
3396"it empty. You can repeat your command with --allow-empty, or you can\n"
3397"remove the commit entirely with \"git reset HEAD^\".\n"
3398msgstr ""
3399"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3400"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
3401
3402#: builtin/commit.c:61
3403msgid ""
3404"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3405"If you wish to commit it anyway, use:\n"
3406"\n"
3407"    git commit --allow-empty\n"
3408"\n"
3409"Otherwise, please use 'git reset'\n"
3410msgstr ""
3411"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3412"也要提交,使用命令:\n"
3413"\n"
3414"    git commit --allow-empty\n"
3415"\n"
3416"否则,请使用命令 'git reset'\n"
3417
3418#: builtin/commit.c:258
3419msgid "failed to unpack HEAD tree object"
3420msgstr "无法解包 HEAD 树对象"
3421
3422#: builtin/commit.c:300
3423msgid "unable to create temporary index"
3424msgstr "不能创建临时索引"
3425
3426#: builtin/commit.c:306
3427msgid "interactive add failed"
3428msgstr "交互式添加失败"
3429
3430#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3431msgid "unable to write new_index file"
3432msgstr "无法写 new_index 文件"
3433
3434#: builtin/commit.c:391
3435msgid "cannot do a partial commit during a merge."
3436msgstr "在合并过程中不能做部分提交。"
3437
3438#: builtin/commit.c:393
3439msgid "cannot do a partial commit during a cherry-pick."
3440msgstr "在拣选过程中不能做部分提交。"
3441
3442#: builtin/commit.c:403
3443msgid "cannot read the index"
3444msgstr "无法读取索引"
3445
3446#: builtin/commit.c:423
3447msgid "unable to write temporary index file"
3448msgstr "无法写临时索引文件"
3449
3450#: builtin/commit.c:511 builtin/commit.c:517
3451#, c-format
3452msgid "invalid commit: %s"
3453msgstr "无效的提交:%s"
3454
3455#: builtin/commit.c:540
3456msgid "malformed --author parameter"
3457msgstr "非法的 --author 参数"
3458
3459#: builtin/commit.c:560
3460#, c-format
3461msgid "Malformed ident string: '%s'"
3462msgstr "非法的身份字符串:'%s'"
3463
3464#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3465#, c-format
3466msgid "could not lookup commit %s"
3467msgstr "不能查询提交 %s"
3468
3469#: builtin/commit.c:610 builtin/shortlog.c:272
3470#, c-format
3471msgid "(reading log message from standard input)\n"
3472msgstr "(正从标准输入中读取日志信息)\n"
3473
3474#: builtin/commit.c:612
3475msgid "could not read log from standard input"
3476msgstr "不能从标准输入中读取日志信息"
3477
3478#: builtin/commit.c:616
3479#, c-format
3480msgid "could not read log file '%s'"
3481msgstr "不能读取日志文件 '%s'"
3482
3483#: builtin/commit.c:622
3484msgid "commit has empty message"
3485msgstr "提交说明为空"
3486
3487#: builtin/commit.c:638
3488msgid "could not read MERGE_MSG"
3489msgstr "不能读取 MERGE_MSG"
3490
3491#: builtin/commit.c:642
3492msgid "could not read SQUASH_MSG"
3493msgstr "不能读取 SQUASH_MSG"
3494
3495#: builtin/commit.c:646
3496#, c-format
3497msgid "could not read '%s'"
3498msgstr "不能读取 '%s'"
3499
3500#: builtin/commit.c:707
3501msgid "could not write commit template"
3502msgstr "不能写提交模版"
3503
3504#: builtin/commit.c:718
3505#, c-format
3506msgid ""
3507"\n"
3508"It looks like you may be committing a merge.\n"
3509"If this is not correct, please remove the file\n"
3510"\t%s\n"
3511"and try again.\n"
3512msgstr ""
3513"\n"
3514"似乎您正在做一个合并提交。如果不对,请删除文件\n"
3515"\t%s\n"
3516"然后重试。\n"
3517
3518#: builtin/commit.c:723
3519#, c-format
3520msgid ""
3521"\n"
3522"It looks like you may be committing a cherry-pick.\n"
3523"If this is not correct, please remove the file\n"
3524"\t%s\n"
3525"and try again.\n"
3526msgstr ""
3527"\n"
3528"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
3529"\t%s\n"
3530"然后重试。\n"
3531
3532#: builtin/commit.c:735
3533#, c-format
3534msgid ""
3535"Please enter the commit message for your changes. Lines starting\n"
3536"with '%c' will be ignored, and an empty message aborts the commit.\n"
3537msgstr ""
3538"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
3539"说明将会终止提交。\n"
3540
3541#: builtin/commit.c:740
3542#, c-format
3543msgid ""
3544"Please enter the commit message for your changes. Lines starting\n"
3545"with '%c' will be kept; you may remove them yourself if you want to.\n"
3546"An empty message aborts the commit.\n"
3547msgstr ""
3548"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3549"也可以删除它们。一个空的提交说明将会终止提交。\n"
3550
3551#  译者:为保证在输出中对齐,注意调整句中空格!
3552#: builtin/commit.c:753
3553#, c-format
3554msgid "%sAuthor:    %s"
3555msgstr "%s作者:     %s"
3556
3557#  译者:为保证在输出中对齐,注意调整句中空格!
3558#: builtin/commit.c:760
3559#, c-format
3560msgid "%sCommitter: %s"
3561msgstr "%s提交者:   %s"
3562
3563#: builtin/commit.c:780
3564msgid "Cannot read index"
3565msgstr "无法读取索引"
3566
3567#: builtin/commit.c:817
3568msgid "Error building trees"
3569msgstr "无法创建树对象"
3570
3571#: builtin/commit.c:832 builtin/tag.c:359
3572#, c-format
3573msgid "Please supply the message using either -m or -F option.\n"
3574msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
3575
3576#: builtin/commit.c:929
3577#, c-format
3578msgid "No existing author found with '%s'"
3579msgstr "没有找到匹配 '%s' 的作者"
3580
3581#: builtin/commit.c:944 builtin/commit.c:1138
3582#, c-format
3583msgid "Invalid untracked files mode '%s'"
3584msgstr "无效的未追踪文件参数 '%s'"
3585
3586#: builtin/commit.c:974
3587msgid "Using both --reset-author and --author does not make sense"
3588msgstr "同时使用 --reset-author 和 --author 没有意义"
3589
3590#: builtin/commit.c:985
3591msgid "You have nothing to amend."
3592msgstr "您没有可修补的提交。"
3593
3594#: builtin/commit.c:988
3595msgid "You are in the middle of a merge -- cannot amend."
3596msgstr "您正处于一个合并过程中 -- 无法修补提交。"
3597
3598#: builtin/commit.c:990
3599msgid "You are in the middle of a cherry-pick -- cannot amend."
3600msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
3601
3602#: builtin/commit.c:993
3603msgid "Options --squash and --fixup cannot be used together"
3604msgstr "选项 --squash 和 --fixup 不能同时使用"
3605
3606#: builtin/commit.c:1003
3607msgid "Only one of -c/-C/-F/--fixup can be used."
3608msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3609
3610#: builtin/commit.c:1005
3611msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3612msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
3613
3614#: builtin/commit.c:1013
3615msgid "--reset-author can be used only with -C, -c or --amend."
3616msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
3617
3618#: builtin/commit.c:1030
3619msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3620msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3621
3622#: builtin/commit.c:1032
3623msgid "No paths with --include/--only does not make sense."
3624msgstr "参数 --include/--only 不跟路径没有意义。"
3625
3626#: builtin/commit.c:1034
3627msgid "Clever... amending the last one with dirty index."
3628msgstr "聪明... 在索引不干净下修补最后的提交。"
3629
3630#: builtin/commit.c:1036
3631msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3632msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
3633
3634#: builtin/commit.c:1046 builtin/tag.c:575
3635#, c-format
3636msgid "Invalid cleanup mode %s"
3637msgstr "无效的清理模式 %s"
3638
3639#: builtin/commit.c:1051
3640msgid "Paths with -a does not make sense."
3641msgstr "路径和 -a 选项同时使用没有意义。"
3642
3643#: builtin/commit.c:1057 builtin/commit.c:1192
3644msgid "--long and -z are incompatible"
3645msgstr "--long 和 -z 选项不兼容"
3646
3647#: builtin/commit.c:1152 builtin/commit.c:1388
3648msgid "show status concisely"
3649msgstr "以简洁的格式显示状态"
3650
3651#: builtin/commit.c:1154 builtin/commit.c:1390
3652msgid "show branch information"
3653msgstr "显示分支信息"
3654
3655#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
3656msgid "machine-readable output"
3657msgstr "机器可读的输出"
3658
3659#: builtin/commit.c:1159 builtin/commit.c:1394
3660msgid "show status in long format (default)"
3661msgstr "以长格式显示状态(默认)"
3662
3663#: builtin/commit.c:1162 builtin/commit.c:1397
3664msgid "terminate entries with NUL"
3665msgstr "条目以NUL字符结尾"
3666
3667#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
3668#: builtin/fast-export.c:650 builtin/tag.c:459
3669msgid "mode"
3670msgstr "模式"
3671
3672#: builtin/commit.c:1165 builtin/commit.c:1400
3673msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3674msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
3675
3676#: builtin/commit.c:1168
3677msgid "show ignored files"
3678msgstr "显示忽略的文件"
3679
3680#: builtin/commit.c:1169 parse-options.h:151
3681msgid "when"
3682msgstr "何时"
3683
3684#: builtin/commit.c:1170
3685msgid ""
3686"ignore changes to submodules, optional when: all, dirty, untracked. "
3687"(Default: all)"
3688msgstr ""
3689"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
3690
3691#: builtin/commit.c:1172
3692msgid "list untracked files in columns"
3693msgstr "以列的方式显示未跟踪的文件"
3694
3695#: builtin/commit.c:1246
3696msgid "couldn't look up newly created commit"
3697msgstr "无法找到新创建的提交"
3698
3699#: builtin/commit.c:1248
3700msgid "could not parse newly created commit"
3701msgstr "不能解析新创建的提交"
3702
3703#: builtin/commit.c:1289
3704msgid "detached HEAD"
3705msgstr "分离头指针"
3706
3707#  译者:中文字符串拼接,可删除前导空格
3708#: builtin/commit.c:1291
3709msgid " (root-commit)"
3710msgstr "(根提交)"
3711
3712#: builtin/commit.c:1358
3713msgid "suppress summary after successful commit"
3714msgstr "提交成功后不显示概述信息"
3715
3716#: builtin/commit.c:1359
3717msgid "show diff in commit message template"
3718msgstr "在提交说明模板里显示差异"
3719
3720#: builtin/commit.c:1361
3721msgid "Commit message options"
3722msgstr "提交说明选项"
3723
3724#: builtin/commit.c:1362 builtin/tag.c:457
3725msgid "read message from file"
3726msgstr "从文件中读取提交说明"
3727
3728#: builtin/commit.c:1363
3729msgid "author"
3730msgstr "作者"
3731
3732#: builtin/commit.c:1363
3733msgid "override author for commit"
3734msgstr "提交时覆盖作者"
3735
3736#: builtin/commit.c:1364 builtin/gc.c:178
3737msgid "date"
3738msgstr "日期"
3739
3740#: builtin/commit.c:1364
3741msgid "override date for commit"
3742msgstr "提交时覆盖日期"
3743
3744#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
3745#: builtin/notes.c:690 builtin/tag.c:455
3746msgid "message"
3747msgstr "说明"
3748
3749#: builtin/commit.c:1365
3750msgid "commit message"
3751msgstr "提交说明"
3752
3753#: builtin/commit.c:1366
3754msgid "reuse and edit message from specified commit"
3755msgstr "重用并编辑指定提交的提交说明"
3756
3757#: builtin/commit.c:1367
3758msgid "reuse message from specified commit"
3759msgstr "重用指定提交的提交说明"
3760
3761#: builtin/commit.c:1368
3762msgid "use autosquash formatted message to fixup specified commit"
3763msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
3764
3765#: builtin/commit.c:1369
3766msgid "use autosquash formatted message to squash specified commit"
3767msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
3768
3769#: builtin/commit.c:1370
3770msgid "the commit is authored by me now (used with -C/-c/--amend)"
3771msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
3772
3773#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
3774msgid "add Signed-off-by:"
3775msgstr "添加 Signed-off-by: 签名"
3776
3777#: builtin/commit.c:1372
3778msgid "use specified template file"
3779msgstr "使用指定的模板文件"
3780
3781#: builtin/commit.c:1373
3782msgid "force edit of commit"
3783msgstr "强制编辑提交"
3784
3785#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
3786#: builtin/commit.c:1374
3787msgid "default"
3788msgstr "default"
3789
3790#: builtin/commit.c:1374 builtin/tag.c:460
3791msgid "how to strip spaces and #comments from message"
3792msgstr "设置如何删除提交说明里的空格和#注释"
3793
3794#: builtin/commit.c:1375
3795msgid "include status in commit message template"
3796msgstr "在提交说明模板里包含状态信息"
3797
3798#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
3799msgid "key id"
3800msgstr "key id"
3801
3802#: builtin/commit.c:1377 builtin/merge.c:214
3803msgid "GPG sign commit"
3804msgstr "GPG 提交签名"
3805
3806#. end commit message options
3807#: builtin/commit.c:1380
3808msgid "Commit contents options"
3809msgstr "提交内容选项"
3810
3811#: builtin/commit.c:1381
3812msgid "commit all changed files"
3813msgstr "提交所有改动的文件"
3814
3815#: builtin/commit.c:1382
3816msgid "add specified files to index for commit"
3817msgstr "添加指定的文件到索引区等待提交"
3818
3819#: builtin/commit.c:1383
3820msgid "interactively add files"
3821msgstr "交互式添加文件"
3822
3823#: builtin/commit.c:1384
3824msgid "interactively add changes"
3825msgstr "交互式添加变更"
3826
3827#: builtin/commit.c:1385
3828msgid "commit only specified files"
3829msgstr "只提交指定的文件"
3830
3831#: builtin/commit.c:1386
3832msgid "bypass pre-commit hook"
3833msgstr "绕过 pre-commit 钩子"
3834
3835#: builtin/commit.c:1387
3836msgid "show what would be committed"
3837msgstr "显示将要提交的内容"
3838
3839#: builtin/commit.c:1398
3840msgid "amend previous commit"
3841msgstr "修改先前的提交"
3842
3843#: builtin/commit.c:1399
3844msgid "bypass post-rewrite hook"
3845msgstr "绕过 post-rewrite 钩子"
3846
3847#: builtin/commit.c:1404
3848msgid "ok to record an empty change"
3849msgstr "允许一个空提交"
3850
3851#: builtin/commit.c:1407
3852msgid "ok to record a change with an empty message"
3853msgstr "允许空的提交说明"
3854
3855#: builtin/commit.c:1439
3856msgid "could not parse HEAD commit"
3857msgstr "不能解析 HEAD 提交"
3858
3859#: builtin/commit.c:1477 builtin/merge.c:508
3860#, c-format
3861msgid "could not open '%s' for reading"
3862msgstr "不能为读入打开 '%s'"
3863
3864#: builtin/commit.c:1484
3865#, c-format
3866msgid "Corrupt MERGE_HEAD file (%s)"
3867msgstr "损坏的 MERGE_HEAD 文件(%s)"
3868
3869#: builtin/commit.c:1491
3870msgid "could not read MERGE_MODE"
3871msgstr "不能读取 MERGE_MODE"
3872
3873#: builtin/commit.c:1510
3874#, c-format
3875msgid "could not read commit message: %s"
3876msgstr "不能读取提交说明:%s"
3877
3878#: builtin/commit.c:1524
3879#, c-format
3880msgid "Aborting commit; you did not edit the message.\n"
3881msgstr "终止提交;您未更改来自模版的提交说明。\n"
3882
3883#: builtin/commit.c:1529
3884#, c-format
3885msgid "Aborting commit due to empty commit message.\n"
3886msgstr "终止提交因为提交说明为空。\n"
3887
3888#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
3889msgid "failed to write commit object"
3890msgstr "无法写提交对象"
3891
3892#: builtin/commit.c:1565
3893msgid "cannot lock HEAD ref"
3894msgstr "无法锁定 HEAD 引用"
3895
3896#: builtin/commit.c:1569
3897msgid "cannot update HEAD ref"
3898msgstr "无法更新 HEAD 引用"
3899
3900#: builtin/commit.c:1580
3901msgid ""
3902"Repository has been updated, but unable to write\n"
3903"new_index file. Check that disk is not full or quota is\n"
3904"not exceeded, and then \"git reset HEAD\" to recover."
3905msgstr ""
3906"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
3907"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
3908
3909#: builtin/config.c:7
3910msgid "git config [options]"
3911msgstr "git config [选项]"
3912
3913#: builtin/config.c:51
3914msgid "Config file location"
3915msgstr "配置文件位置"
3916
3917#: builtin/config.c:52
3918msgid "use global config file"
3919msgstr "使用全局配置文件"
3920
3921#: builtin/config.c:53
3922msgid "use system config file"
3923msgstr "使用系统级配置文件"
3924
3925#: builtin/config.c:54
3926msgid "use repository config file"
3927msgstr "使用版本库级配置文件"
3928
3929#: builtin/config.c:55
3930msgid "use given config file"
3931msgstr "使用指定的配置文件"
3932
3933#: builtin/config.c:56
3934msgid "Action"
3935msgstr "操作"
3936
3937#: builtin/config.c:57
3938msgid "get value: name [value-regex]"
3939msgstr "获取值:name [value-regex]"
3940
3941#: builtin/config.c:58
3942msgid "get all values: key [value-regex]"
3943msgstr "获得所有的值:key [value-regex]"
3944
3945#: builtin/config.c:59
3946msgid "get values for regexp: name-regex [value-regex]"
3947msgstr "根据正则表达式获得值:name-regex [value-regex]"
3948
3949#: builtin/config.c:60
3950msgid "replace all matching variables: name value [value_regex]"
3951msgstr "替换所有匹配的变量:name value [value_regex]"
3952
3953#: builtin/config.c:61
3954msgid "add a new variable: name value"
3955msgstr "添加一个新的变量:name value"
3956
3957#: builtin/config.c:62
3958msgid "remove a variable: name [value-regex]"
3959msgstr "删除一个变量:name [value-regex]"
3960
3961#: builtin/config.c:63
3962msgid "remove all matches: name [value-regex]"
3963msgstr "删除所有匹配项:name [value-regex]"
3964
3965#: builtin/config.c:64
3966msgid "rename section: old-name new-name"
3967msgstr "重命名小节:old-name new-name"
3968
3969#: builtin/config.c:65
3970msgid "remove a section: name"
3971msgstr "删除一个小节:name"
3972
3973#: builtin/config.c:66
3974msgid "list all"
3975msgstr "列出所有"
3976
3977#: builtin/config.c:67
3978msgid "open an editor"
3979msgstr "打开一个编辑器"
3980
3981#: builtin/config.c:68 builtin/config.c:69
3982msgid "slot"
3983msgstr "slot"
3984
3985#: builtin/config.c:68
3986msgid "find the color configured: [default]"
3987msgstr "找到配置的颜色:[默认]"
3988
3989#: builtin/config.c:69
3990msgid "find the color setting: [stdout-is-tty]"
3991msgstr "找到颜色设置:[stdout-is-tty]"
3992
3993#: builtin/config.c:70
3994msgid "Type"
3995msgstr "类型"
3996
3997#: builtin/config.c:71
3998msgid "value is \"true\" or \"false\""
3999msgstr "值是 \"true\" 或 \"false\""
4000
4001#: builtin/config.c:72
4002msgid "value is decimal number"
4003msgstr "值是十进制数"
4004
4005#: builtin/config.c:73
4006msgid "value is --bool or --int"
4007msgstr "值是 --bool or --int"
4008
4009#: builtin/config.c:74
4010msgid "value is a path (file or directory name)"
4011msgstr "值是一个路径(文件或目录名)"
4012
4013#: builtin/config.c:75
4014msgid "Other"
4015msgstr "其它"
4016
4017#: builtin/config.c:76
4018msgid "terminate values with NUL byte"
4019msgstr "终止值是NUL字节"
4020
4021#: builtin/config.c:77
4022msgid "respect include directives on lookup"
4023msgstr "查询时参照 include 指令递归查找"
4024
4025#: builtin/count-objects.c:69
4026msgid "git count-objects [-v]"
4027msgstr "git count-objects [-v]"
4028
4029#: builtin/describe.c:15
4030msgid "git describe [options] <committish>*"
4031msgstr "git describe [选项] <提交号>*"
4032
4033#: builtin/describe.c:16
4034msgid "git describe [options] --dirty"
4035msgstr "git describe [选项] --dirty"
4036
4037#: builtin/describe.c:234
4038#, c-format
4039msgid "annotated tag %s not available"
4040msgstr "注释 tag %s 无效"
4041
4042#: builtin/describe.c:238
4043#, c-format
4044msgid "annotated tag %s has no embedded name"
4045msgstr "注释 tag %s 没有嵌入名称"
4046
4047#: builtin/describe.c:240
4048#, c-format
4049msgid "tag '%s' is really '%s' here"
4050msgstr "tag '%s' 的确是在 '%s'"
4051
4052#: builtin/describe.c:267
4053#, c-format
4054msgid "Not a valid object name %s"
4055msgstr "不是一个有效的对象名 %s"
4056
4057#: builtin/describe.c:270
4058#, c-format
4059msgid "%s is not a valid '%s' object"
4060msgstr "%s 不是一个有效的 '%s' 对象"
4061
4062#: builtin/describe.c:287
4063#, c-format
4064msgid "no tag exactly matches '%s'"
4065msgstr "没有 tag 准确匹配 '%s'"
4066
4067#: builtin/describe.c:289
4068#, c-format
4069msgid "searching to describe %s\n"
4070msgstr "搜索描述 %s\n"
4071
4072#: builtin/describe.c:329
4073#, c-format
4074msgid "finished search at %s\n"
4075msgstr "完成搜索 %s\n"
4076
4077#: builtin/describe.c:353
4078#, c-format
4079msgid ""
4080"No annotated tags can describe '%s'.\n"
4081"However, there were unannotated tags: try --tags."
4082msgstr ""
4083"没有注释 tag 能描述 '%s'。\n"
4084"然而,有非注释 tag:尝试 --tags。"
4085
4086#: builtin/describe.c:357
4087#, c-format
4088msgid ""
4089"No tags can describe '%s'.\n"
4090"Try --always, or create some tags."
4091msgstr ""
4092"没有注释 tag 能描述 '%s'。\n"
4093"尝试 --always,或者创建一些 tag。"
4094
4095#: builtin/describe.c:378
4096#, c-format
4097msgid "traversed %lu commits\n"
4098msgstr "已遍历 %lu 个提交\n"
4099
4100#: builtin/describe.c:381
4101#, c-format
4102msgid ""
4103"more than %i tags found; listed %i most recent\n"
4104"gave up search at %s\n"
4105msgstr ""
4106"发现多于 %i 个 tag,列出最近的 %i 个\n"
4107"在 %s 放弃搜索\n"
4108
4109#: builtin/describe.c:403
4110msgid "find the tag that comes after the commit"
4111msgstr "寻找提交之后的 tag(用于描述提交)"
4112
4113#: builtin/describe.c:404
4114msgid "debug search strategy on stderr"
4115msgstr "在标准错误上调试搜索策略"
4116
4117#: builtin/describe.c:405
4118msgid "use any ref in .git/refs"
4119msgstr "使用 .git/refs 里的任意引用"
4120
4121#: builtin/describe.c:406
4122msgid "use any tag in .git/refs/tags"
4123msgstr "使用 .git/refs/tags 里的任意 tag"
4124
4125#: builtin/describe.c:407
4126msgid "always use long format"
4127msgstr "始终使用长提交号格式"
4128
4129#: builtin/describe.c:410
4130msgid "only output exact matches"
4131msgstr "只输出精确匹配"
4132
4133#: builtin/describe.c:412
4134msgid "consider <n> most recent tags (default: 10)"
4135msgstr "考虑最近 <n> 个 tags(默认:10)"
4136
4137#: builtin/describe.c:414
4138msgid "only consider tags matching <pattern>"
4139msgstr "只考虑匹配 <模式> 的 tags"
4140
4141#: builtin/describe.c:416 builtin/name-rev.c:238
4142msgid "show abbreviated commit object as fallback"
4143msgstr "显示简写的提交号作为后备"
4144
4145#: builtin/describe.c:417
4146msgid "mark"
4147msgstr "标记"
4148
4149#: builtin/describe.c:418
4150msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4151msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4152
4153#: builtin/describe.c:436
4154msgid "--long is incompatible with --abbrev=0"
4155msgstr "--long 与 --abbrev=0 不兼容"
4156
4157#: builtin/describe.c:462
4158msgid "No names found, cannot describe anything."
4159msgstr "没有发现名称,无法描述任何东西。"
4160
4161#: builtin/describe.c:482
4162msgid "--dirty is incompatible with committishes"
4163msgstr "--dirty 不能与提交同时使用"
4164
4165#: builtin/diff.c:79
4166#, c-format
4167msgid "'%s': not a regular file or symlink"
4168msgstr "'%s':不是一个正规文件或符号链接"
4169
4170#: builtin/diff.c:228
4171#, c-format
4172msgid "invalid option: %s"
4173msgstr "无效选项:%s"
4174
4175#: builtin/diff.c:305
4176msgid "Not a git repository"
4177msgstr "不是一个 git 版本库"
4178
4179#: builtin/diff.c:348
4180#, c-format
4181msgid "invalid object '%s' given."
4182msgstr "提供了无效对象 '%s'。"
4183
4184#: builtin/diff.c:353
4185#, c-format
4186msgid "more than %d trees given: '%s'"
4187msgstr "提供了超过 %d 个树对象:'%s'"
4188
4189#: builtin/diff.c:363
4190#, c-format
4191msgid "more than two blobs given: '%s'"
4192msgstr "提供了超过两个数据(blob)对象:'%s'"
4193
4194#: builtin/diff.c:371
4195#, c-format
4196msgid "unhandled object '%s' given."
4197msgstr "提供了无法处理的对象 '%s'。"
4198
4199#: builtin/fast-export.c:22
4200msgid "git fast-export [rev-list-opts]"
4201msgstr "git fast-export [rev-list-opts]"
4202
4203#: builtin/fast-export.c:646
4204msgid "show progress after <n> objects"
4205msgstr "在 <n> 个对象之后显示进度"
4206
4207#: builtin/fast-export.c:648
4208msgid "select handling of signed tags"
4209msgstr "选择如何处理签名 tags"
4210
4211#: builtin/fast-export.c:651
4212msgid "select handling of tags that tag filtered objects"
4213msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4214
4215#: builtin/fast-export.c:654
4216msgid "Dump marks to this file"
4217msgstr "把标记存储到这个文件"
4218
4219#: builtin/fast-export.c:656
4220msgid "Import marks from this file"
4221msgstr "从这个文件导入标记"
4222
4223#: builtin/fast-export.c:658
4224msgid "Fake a tagger when tags lack one"
4225msgstr "当 tags 缺少标记者字段时,假装提供一个"
4226
4227#: builtin/fast-export.c:660
4228msgid "Output full tree for each commit"
4229msgstr "每次提交都输出整个树"
4230
4231#: builtin/fast-export.c:662
4232msgid "Use the done feature to terminate the stream"
4233msgstr "使用 done 功能来终止流"
4234
4235#: builtin/fast-export.c:663
4236msgid "Skip output of blob data"
4237msgstr "跳过数据对象的输出"
4238
4239#: builtin/fetch.c:20
4240msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4241msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
4242
4243#: builtin/fetch.c:21
4244msgid "git fetch [<options>] <group>"
4245msgstr "git fetch [<选项>] <组>"
4246
4247#: builtin/fetch.c:22
4248msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4249msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4250
4251#: builtin/fetch.c:23
4252msgid "git fetch --all [<options>]"
4253msgstr "git fetch --all [<选项>]"
4254
4255#: builtin/fetch.c:60
4256msgid "fetch from all remotes"
4257msgstr "从所有的远程抓取"
4258
4259#: builtin/fetch.c:62
4260msgid "append to .git/FETCH_HEAD instead of overwriting"
4261msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4262
4263#: builtin/fetch.c:64
4264msgid "path to upload pack on remote end"
4265msgstr "上传包到远程的路径"
4266
4267#: builtin/fetch.c:65
4268msgid "force overwrite of local branch"
4269msgstr "强制覆盖本地分支"
4270
4271#: builtin/fetch.c:67
4272msgid "fetch from multiple remotes"
4273msgstr "从多个远程抓取"
4274
4275#: builtin/fetch.c:69
4276msgid "fetch all tags and associated objects"
4277msgstr "抓取所有的 tags 和关联对象"
4278
4279#: builtin/fetch.c:71
4280msgid "do not fetch all tags (--no-tags)"
4281msgstr "不抓取任何 tags (--no-tags)"
4282
4283#: builtin/fetch.c:73
4284msgid "prune remote-tracking branches no longer on remote"
4285msgstr "清除远程已经不存在的分支的跟踪分支"
4286
4287#  译者:可选值,不能翻译
4288#: builtin/fetch.c:74
4289msgid "on-demand"
4290msgstr "on-demand"
4291
4292#: builtin/fetch.c:75
4293msgid "control recursive fetching of submodules"
4294msgstr "控制子模组的递归抓取"
4295
4296#: builtin/fetch.c:79
4297msgid "keep downloaded pack"
4298msgstr "保持下载包"
4299
4300#: builtin/fetch.c:81
4301msgid "allow updating of HEAD ref"
4302msgstr "允许更新 HEAD 引用"
4303
4304#: builtin/fetch.c:84
4305msgid "deepen history of shallow clone"
4306msgstr "深化浅克隆的历史"
4307
4308#: builtin/fetch.c:86
4309msgid "convert to a complete repository"
4310msgstr "转换为一个完整的版本库"
4311
4312#: builtin/fetch.c:88 builtin/log.c:1119
4313msgid "dir"
4314msgstr "目录"
4315
4316#: builtin/fetch.c:89
4317msgid "prepend this to submodule path output"
4318msgstr "在子模组路径输出的前面加上此目录"
4319
4320#: builtin/fetch.c:92
4321msgid "default mode for recursion"
4322msgstr "递归的默认模式"
4323
4324#: builtin/fetch.c:204
4325msgid "Couldn't find remote ref HEAD"
4326msgstr "无法发现远程 HEAD 引用"
4327
4328#: builtin/fetch.c:257
4329#, c-format
4330msgid "object %s not found"
4331msgstr "对象 %s 未发现"
4332
4333#: builtin/fetch.c:262
4334msgid "[up to date]"
4335msgstr "[最新]"
4336
4337#: builtin/fetch.c:276
4338#, c-format
4339msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
4340msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
4341
4342#: builtin/fetch.c:277 builtin/fetch.c:363
4343msgid "[rejected]"
4344msgstr "[已拒绝]"
4345
4346#: builtin/fetch.c:288
4347msgid "[tag update]"
4348msgstr "[tag更新]"
4349
4350#  译者:注意保持前导空格
4351#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4352msgid "  (unable to update local ref)"
4353msgstr "  (不能更新本地引用)"
4354
4355#: builtin/fetch.c:308
4356msgid "[new tag]"
4357msgstr "[新tag]"
4358
4359#: builtin/fetch.c:311
4360msgid "[new branch]"
4361msgstr "[新分支]"
4362
4363#: builtin/fetch.c:314
4364msgid "[new ref]"
4365msgstr "[新引用]"
4366
4367#: builtin/fetch.c:359
4368msgid "unable to update local ref"
4369msgstr "不能更新本地引用"
4370
4371#: builtin/fetch.c:359
4372msgid "forced update"
4373msgstr "强制更新"
4374
4375#: builtin/fetch.c:365
4376msgid "(non-fast-forward)"
4377msgstr "(非快进式)"
4378
4379#: builtin/fetch.c:396 builtin/fetch.c:688
4380#, c-format
4381msgid "cannot open %s: %s\n"
4382msgstr "无法打开 %s:%s\n"
4383
4384#: builtin/fetch.c:405
4385#, c-format
4386msgid "%s did not send all necessary objects\n"
4387msgstr "%s 未发送所有必须的对象\n"
4388
4389#: builtin/fetch.c:491
4390#, c-format
4391msgid "From %.*s\n"
4392msgstr "来自 %.*s\n"
4393
4394#: builtin/fetch.c:502
4395#, c-format
4396msgid ""
4397"some local refs could not be updated; try running\n"
4398" 'git remote prune %s' to remove any old, conflicting branches"
4399msgstr ""
4400"一些本地引用不能被更新;尝试运行\n"
4401" 'git remote prune %s' 来删除旧的、有冲突的分支"
4402
4403#  译者:注意保持前导空格
4404#: builtin/fetch.c:552
4405#, c-format
4406msgid "   (%s will become dangling)"
4407msgstr "   (%s 将成为摇摆状态)"
4408
4409#  译者:注意保持前导空格
4410#: builtin/fetch.c:553
4411#, c-format
4412msgid "   (%s has become dangling)"
4413msgstr "   (%s 已成为摇摆状态)"
4414
4415#: builtin/fetch.c:560
4416msgid "[deleted]"
4417msgstr "[已删除]"
4418
4419#: builtin/fetch.c:561 builtin/remote.c:1055
4420msgid "(none)"
4421msgstr "(无)"
4422
4423#: builtin/fetch.c:678
4424#, c-format
4425msgid "Refusing to fetch into current branch %s of non-bare repository"
4426msgstr "拒绝获取到非裸版本库的当前分支 %s"
4427
4428#: builtin/fetch.c:712
4429#, c-format
4430msgid "Don't know how to fetch from %s"
4431msgstr "不知道如何从 %s 获取"
4432
4433#: builtin/fetch.c:789
4434#, c-format
4435msgid "Option \"%s\" value \"%s\" is not valid for %s"
4436msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4437
4438#: builtin/fetch.c:792
4439#, c-format
4440msgid "Option \"%s\" is ignored for %s\n"
4441msgstr "选项 \"%s\" 为 %s 所忽略\n"
4442
4443#: builtin/fetch.c:894
4444#, c-format
4445msgid "Fetching %s\n"
4446msgstr "正在获取 %s\n"
4447
4448#: builtin/fetch.c:896 builtin/remote.c:100
4449#, c-format
4450msgid "Could not fetch %s"
4451msgstr "不能获取 %s"
4452
4453#: builtin/fetch.c:915
4454msgid ""
4455"No remote repository specified.  Please, specify either a URL or a\n"
4456"remote name from which new revisions should be fetched."
4457msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
4458
4459#: builtin/fetch.c:935
4460msgid "You need to specify a tag name."
4461msgstr "您需要指定一个 tag 名称。"
4462
4463#: builtin/fetch.c:981
4464msgid "--depth and --unshallow cannot be used together"
4465msgstr "--depth 和 --unshallow 不能同时使用"
4466
4467#: builtin/fetch.c:983
4468msgid "--unshallow on a complete repository does not make sense"
4469msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4470
4471#: builtin/fetch.c:1002
4472msgid "fetch --all does not take a repository argument"
4473msgstr "fetch --all 不能带一个版本库参数"
4474
4475#: builtin/fetch.c:1004
4476msgid "fetch --all does not make sense with refspecs"
4477msgstr "fetch --all 带引用表达式没有任何意义"
4478
4479#: builtin/fetch.c:1015
4480#, c-format
4481msgid "No such remote or remote group: %s"
4482msgstr "没有这样的远程或远程组:%s"
4483
4484#: builtin/fetch.c:1023
4485msgid "Fetching a group and specifying refspecs does not make sense"
4486msgstr "获取组并指定引用表达式没有意义"
4487
4488#: builtin/fmt-merge-msg.c:13
4489msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4490msgstr ""
4491"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4492
4493#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4494#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4495#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4496msgid "n"
4497msgstr "n"
4498
4499#: builtin/fmt-merge-msg.c:660
4500msgid "populate log with at most <n> entries from shortlog"
4501msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
4502
4503#: builtin/fmt-merge-msg.c:663
4504msgid "alias for --log (deprecated)"
4505msgstr "参数 --log 的别名(已弃用)"
4506
4507#: builtin/fmt-merge-msg.c:666
4508msgid "text"
4509msgstr "文本"
4510
4511#: builtin/fmt-merge-msg.c:667
4512msgid "use <text> as start of message"
4513msgstr "使用 <文本> 作为提交说明的开始"
4514
4515#: builtin/fmt-merge-msg.c:668
4516msgid "file to read from"
4517msgstr "从文件中读取"
4518
4519#: builtin/for-each-ref.c:979
4520msgid "git for-each-ref [options] [<pattern>]"
4521msgstr "git for-each-ref [选项] [<模式>]"
4522
4523#: builtin/for-each-ref.c:994
4524msgid "quote placeholders suitably for shells"
4525msgstr "引用占位符适用于 shells"
4526
4527#: builtin/for-each-ref.c:996
4528msgid "quote placeholders suitably for perl"
4529msgstr "引用占位符适用于 perl"
4530
4531#: builtin/for-each-ref.c:998
4532msgid "quote placeholders suitably for python"
4533msgstr "引用占位符适用于 python"
4534
4535#: builtin/for-each-ref.c:1000
4536msgid "quote placeholders suitably for tcl"
4537msgstr "引用占位符适用于 tcl"
4538
4539#: builtin/for-each-ref.c:1003
4540msgid "show only <n> matched refs"
4541msgstr "只显示 <n> 个匹配的引用"
4542
4543#: builtin/for-each-ref.c:1004
4544msgid "format"
4545msgstr "格式"
4546
4547#: builtin/for-each-ref.c:1004
4548msgid "format to use for the output"
4549msgstr "输出格式"
4550
4551#: builtin/for-each-ref.c:1005
4552msgid "key"
4553msgstr "key"
4554
4555#: builtin/for-each-ref.c:1006
4556msgid "field name to sort on"
4557msgstr "排序的字段名"
4558
4559#: builtin/fsck.c:608
4560msgid "git fsck [options] [<object>...]"
4561msgstr "git fsck [选项] [<对象>...]"
4562
4563#: builtin/fsck.c:614
4564msgid "show unreachable objects"
4565msgstr "显示不可达的对象"
4566
4567#: builtin/fsck.c:615
4568msgid "show dangling objects"
4569msgstr "显示摇摆的对象"
4570
4571#: builtin/fsck.c:616
4572msgid "report tags"
4573msgstr "报告 tags"
4574
4575#: builtin/fsck.c:617
4576msgid "report root nodes"
4577msgstr "报告根节点"
4578
4579#: builtin/fsck.c:618
4580msgid "make index objects head nodes"
4581msgstr "将索引亦作为检查的头节点"
4582
4583#: builtin/fsck.c:619
4584msgid "make reflogs head nodes (default)"
4585msgstr "将引用日志作为检查的头节点(默认)"
4586
4587#: builtin/fsck.c:620
4588msgid "also consider packs and alternate objects"
4589msgstr "也考虑包和备用对象"
4590
4591#: builtin/fsck.c:621
4592msgid "enable more strict checking"
4593msgstr "启用更严格的检查"
4594
4595#: builtin/fsck.c:623
4596msgid "write dangling objects in .git/lost-found"
4597msgstr "将摇摆对象写入 .git/lost-found 中"
4598
4599#: builtin/fsck.c:624 builtin/prune.c:134
4600msgid "show progress"
4601msgstr "显示进度"
4602
4603#: builtin/gc.c:22
4604msgid "git gc [options]"
4605msgstr "git gc [选项]"
4606
4607#: builtin/gc.c:63
4608#, c-format
4609msgid "Invalid %s: '%s'"
4610msgstr "无效的 %s:'%s'"
4611
4612#: builtin/gc.c:90
4613#, c-format
4614msgid "insanely long object directory %.*s"
4615msgstr "不正常的长对象目录 %.*s"
4616
4617#: builtin/gc.c:179
4618msgid "prune unreferenced objects"
4619msgstr "清除未引用的对象"
4620
4621#: builtin/gc.c:181
4622msgid "be more thorough (increased runtime)"
4623msgstr "更彻底(增加运行时间)"
4624
4625#: builtin/gc.c:182
4626msgid "enable auto-gc mode"
4627msgstr "启用自动垃圾回收模式"
4628
4629#: builtin/gc.c:222
4630#, c-format
4631msgid ""
4632"Auto packing the repository for optimum performance. You may also\n"
4633"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4634msgstr ""
4635"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4636"参见 \"git help gc\" 以获取更多信息。\n"
4637
4638#: builtin/gc.c:249
4639msgid ""
4640"There are too many unreachable loose objects; run 'git prune' to remove them."
4641msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
4642
4643#: builtin/grep.c:22
4644msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4645msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
4646
4647#: builtin/grep.c:217
4648#, c-format
4649msgid "grep: failed to create thread: %s"
4650msgstr "grep:无法创建线程:%s"
4651
4652#: builtin/grep.c:365
4653#, c-format
4654msgid "Failed to chdir: %s"
4655msgstr "无法切换目录:%s"
4656
4657#: builtin/grep.c:443 builtin/grep.c:478
4658#, c-format
4659msgid "unable to read tree (%s)"
4660msgstr "无法读取树(%s)"
4661
4662#: builtin/grep.c:493
4663#, c-format
4664msgid "unable to grep from object of type %s"
4665msgstr "无法抓取来自于 %s 类型的对象"
4666
4667#: builtin/grep.c:551
4668#, c-format
4669msgid "switch `%c' expects a numerical value"
4670msgstr "开关 `%c' 期望一个数字值"
4671
4672#: builtin/grep.c:568
4673#, c-format
4674msgid "cannot open '%s'"
4675msgstr "不能打开 '%s'"
4676
4677#: builtin/grep.c:643
4678msgid "search in index instead of in the work tree"
4679msgstr "在索引区搜索而不是在工作区"
4680
4681#: builtin/grep.c:645
4682msgid "find in contents not managed by git"
4683msgstr "在未被 git 管理的内容中查找"
4684
4685#  译者:中文字符串拼接,可删除前导空格
4686#: builtin/grep.c:647
4687msgid "search in both tracked and untracked files"
4688msgstr "在跟踪和未跟踪的文件中搜索"
4689
4690#: builtin/grep.c:649
4691msgid "search also in ignored files"
4692msgstr "也在忽略的文件中搜索"
4693
4694#: builtin/grep.c:652
4695msgid "show non-matching lines"
4696msgstr "显示未匹配的行"
4697
4698#: builtin/grep.c:654
4699msgid "case insensitive matching"
4700msgstr "不区分大小写匹配"
4701
4702#: builtin/grep.c:656
4703msgid "match patterns only at word boundaries"
4704msgstr "只在单词边界匹配模式"
4705
4706#: builtin/grep.c:658
4707msgid "process binary files as text"
4708msgstr "把二进制文件当做文本处理"
4709
4710#: builtin/grep.c:660
4711msgid "don't match patterns in binary files"
4712msgstr "不在二进制文件中匹配模式"
4713
4714#: builtin/grep.c:663
4715msgid "descend at most <depth> levels"
4716msgstr "最多以指定的深度向下寻找"
4717
4718#: builtin/grep.c:667
4719msgid "use extended POSIX regular expressions"
4720msgstr "使用扩展的 POSIX 正则表达式"
4721
4722#: builtin/grep.c:670
4723msgid "use basic POSIX regular expressions (default)"
4724msgstr "使用基本的 POSIX 正则表达式(默认)"
4725
4726#: builtin/grep.c:673
4727msgid "interpret patterns as fixed strings"
4728msgstr "把模式解析为固定的字符串"
4729
4730#: builtin/grep.c:676
4731msgid "use Perl-compatible regular expressions"
4732msgstr "使用 Perl 兼容的正则表达式"
4733
4734#: builtin/grep.c:679
4735msgid "show line numbers"
4736msgstr "显示行号"
4737
4738#: builtin/grep.c:680
4739msgid "don't show filenames"
4740msgstr "不显示文件名"
4741
4742#: builtin/grep.c:681
4743msgid "show filenames"
4744msgstr "显示文件名"
4745
4746#: builtin/grep.c:683
4747msgid "show filenames relative to top directory"
4748msgstr "显示相对于顶级目录的文件名"
4749
4750#: builtin/grep.c:685
4751msgid "show only filenames instead of matching lines"
4752msgstr "只显示文件名而不显示匹配的行"
4753
4754#: builtin/grep.c:687
4755msgid "synonym for --files-with-matches"
4756msgstr "和 --files-with-matches 同义"
4757
4758#: builtin/grep.c:690
4759msgid "show only the names of files without match"
4760msgstr "只显示未匹配的文件名"
4761
4762#: builtin/grep.c:692
4763msgid "print NUL after filenames"
4764msgstr "在文件名后输出 NUL 字符"
4765
4766#: builtin/grep.c:694
4767msgid "show the number of matches instead of matching lines"
4768msgstr "显示总匹配行数,而不显示匹配的行"
4769
4770#: builtin/grep.c:695
4771msgid "highlight matches"
4772msgstr "高亮显示匹配项"
4773
4774#: builtin/grep.c:697
4775msgid "print empty line between matches from different files"
4776msgstr "在不同文件的匹配项之间打印空行"
4777
4778#: builtin/grep.c:699
4779msgid "show filename only once above matches from same file"
4780msgstr "只在同一文件的匹配项的上面显示一次文件名"
4781
4782#: builtin/grep.c:702
4783msgid "show <n> context lines before and after matches"
4784msgstr "显示匹配项前后的 <n> 行上下文"
4785
4786#: builtin/grep.c:705
4787msgid "show <n> context lines before matches"
4788msgstr "显示匹配项前 <n> 行上下文"
4789
4790#: builtin/grep.c:707
4791msgid "show <n> context lines after matches"
4792msgstr "显示匹配项后 <n> 行上下文"
4793
4794#: builtin/grep.c:708
4795msgid "shortcut for -C NUM"
4796msgstr "快捷键 -C 数字"
4797
4798#: builtin/grep.c:711
4799msgid "show a line with the function name before matches"
4800msgstr "在匹配的前面显示一行函数名"
4801
4802#: builtin/grep.c:713
4803msgid "show the surrounding function"
4804msgstr "显示所在函数的前后内容"
4805
4806#: builtin/grep.c:716
4807msgid "read patterns from file"
4808msgstr "从文件读取模式"
4809
4810#: builtin/grep.c:718
4811msgid "match <pattern>"
4812msgstr "匹配 <模式>"
4813
4814#: builtin/grep.c:720
4815msgid "combine patterns specified with -e"
4816msgstr "组合用 -e 参数设定的模式"
4817
4818#: builtin/grep.c:732
4819msgid "indicate hit with exit status without output"
4820msgstr "不输出,而用退出码标识命中状态"
4821
4822#: builtin/grep.c:734
4823msgid "show only matches from files that match all patterns"
4824msgstr "只显示匹配所有模式的文件中的匹配"
4825
4826#: builtin/grep.c:736
4827msgid "show parse tree for grep expression"
4828msgstr "显示 grep 表达式的解析树"
4829
4830#: builtin/grep.c:740
4831msgid "pager"
4832msgstr "分页"
4833
4834#: builtin/grep.c:740
4835msgid "show matching files in the pager"
4836msgstr "分页显示匹配的文件"
4837
4838#: builtin/grep.c:743
4839msgid "allow calling of grep(1) (ignored by this build)"
4840msgstr "允许调用 grep(1)(本次构建忽略)"
4841
4842#: builtin/grep.c:744 builtin/show-ref.c:184
4843msgid "show usage"
4844msgstr "显示用法"
4845
4846#: builtin/grep.c:811
4847msgid "no pattern given."
4848msgstr "未提供模式匹配。"
4849
4850#: builtin/grep.c:825
4851#, c-format
4852msgid "bad object %s"
4853msgstr "坏对象 %s"
4854
4855#: builtin/grep.c:868
4856msgid "--open-files-in-pager only works on the worktree"
4857msgstr "--open-files-in-pager 仅用于工作区"
4858
4859#: builtin/grep.c:891
4860msgid "--cached or --untracked cannot be used with --no-index."
4861msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
4862
4863#: builtin/grep.c:896
4864msgid "--no-index or --untracked cannot be used with revs."
4865msgstr "--no-index 或 --untracked 不能和版本同时使用。"
4866
4867#: builtin/grep.c:899
4868msgid "--[no-]exclude-standard cannot be used for tracked contents."
4869msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
4870
4871#: builtin/grep.c:907
4872msgid "both --cached and trees are given."
4873msgstr "同时给出了 --cached 和树对象。"
4874
4875#: builtin/hash-object.c:60
4876msgid ""
4877"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4878"<file>..."
4879msgstr ""
4880"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
4881"<文件>..."
4882
4883#: builtin/hash-object.c:61
4884msgid "git hash-object  --stdin-paths < <list-of-paths>"
4885msgstr "git hash-object  --stdin-paths < <路径列表>"
4886
4887#: builtin/hash-object.c:72
4888msgid "type"
4889msgstr "类型"
4890
4891#: builtin/hash-object.c:72
4892msgid "object type"
4893msgstr "对象类型"
4894
4895#: builtin/hash-object.c:73
4896msgid "write the object into the object database"
4897msgstr "将对象写入对象数据库"
4898
4899#: builtin/hash-object.c:74
4900msgid "read the object from stdin"
4901msgstr "从标准输入读取对象"
4902
4903#: builtin/hash-object.c:76
4904msgid "store file as is without filters"
4905msgstr "原样存储文件不使用过滤器"
4906
4907#: builtin/hash-object.c:77
4908msgid "process file as it were from this path"
4909msgstr "处理文件并假设其来自于此路径"
4910
4911#: builtin/help.c:42
4912msgid "print all available commands"
4913msgstr "打印所有可用的命令"
4914
4915#: builtin/help.c:43
4916msgid "show man page"
4917msgstr "显示 man 手册"
4918
4919#: builtin/help.c:44
4920msgid "show manual in web browser"
4921msgstr "在 web 浏览器中显示手册"
4922
4923#: builtin/help.c:46
4924msgid "show info page"
4925msgstr "显示 info 手册"
4926
4927#: builtin/help.c:52
4928msgid "git help [--all] [--man|--web|--info] [command]"
4929msgstr "git help [--all] [--man|--web|--info] [命令]"
4930
4931#: builtin/help.c:64
4932#, c-format
4933msgid "unrecognized help format '%s'"
4934msgstr "未能识别的帮助格式 '%s'"
4935
4936#: builtin/help.c:92
4937msgid "Failed to start emacsclient."
4938msgstr "无法启动 emacsclient。"
4939
4940#: builtin/help.c:105
4941msgid "Failed to parse emacsclient version."
4942msgstr "无法解析 emacsclient 版本。"
4943
4944#: builtin/help.c:113
4945#, c-format
4946msgid "emacsclient version '%d' too old (< 22)."
4947msgstr "emacsclient 版本 '%d' 太老(< 22)。"
4948
4949#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
4950#, c-format
4951msgid "failed to exec '%s': %s"
4952msgstr "无法执行 '%s':%s"
4953
4954#: builtin/help.c:216
4955#, c-format
4956msgid ""
4957"'%s': path for unsupported man viewer.\n"
4958"Please consider using 'man.<tool>.cmd' instead."
4959msgstr ""
4960"'%s':不支持的 man 手册查看器的路径。\n"
4961"请使用 'man.<tool>.cmd'。"
4962
4963#: builtin/help.c:228
4964#, c-format
4965msgid ""
4966"'%s': cmd for supported man viewer.\n"
4967"Please consider using 'man.<tool>.path' instead."
4968msgstr ""
4969"'%s': 支持的 man 手册查看器命令。\n"
4970"请使用 'man.<tool>.path'。"
4971
4972#: builtin/help.c:349
4973#, c-format
4974msgid "'%s': unknown man viewer."
4975msgstr "'%s':未知的 man 查看器。"
4976
4977#: builtin/help.c:366
4978msgid "no man viewer handled the request"
4979msgstr "没有 man 查看器处理此请求"
4980
4981#: builtin/help.c:374
4982msgid "no info viewer handled the request"
4983msgstr "没有 info 查看器处理此请求"
4984
4985#: builtin/help.c:429 builtin/help.c:436
4986#, c-format
4987msgid "usage: %s%s"
4988msgstr "用法:%s%s"
4989
4990#: builtin/help.c:452
4991#, c-format
4992msgid "`git %s' is aliased to `%s'"
4993msgstr "`git %s' 是 `%s' 的别名"
4994
4995#: builtin/index-pack.c:170
4996#, c-format
4997msgid "object type mismatch at %s"
4998msgstr "%s 的对象类型不匹配"
4999
5000#: builtin/index-pack.c:190
5001msgid "object of unexpected type"
5002msgstr "意外的类型的对象"
5003
5004#: builtin/index-pack.c:227
5005#, c-format
5006msgid "cannot fill %d byte"
5007msgid_plural "cannot fill %d bytes"
5008msgstr[0] "无法填充 %d 字节"
5009msgstr[1] "无法填充 %d 字节"
5010
5011#: builtin/index-pack.c:237
5012msgid "early EOF"
5013msgstr "过早的文件结束符(EOF)"
5014
5015#: builtin/index-pack.c:238
5016msgid "read error on input"
5017msgstr "输入上的读错误"
5018
5019#: builtin/index-pack.c:250
5020msgid "used more bytes than were available"
5021msgstr "用掉了超过可用的字节"
5022
5023#: builtin/index-pack.c:257
5024msgid "pack too large for current definition of off_t"
5025msgstr "包太大超过了当前 off_t 的定义"
5026
5027#: builtin/index-pack.c:273
5028#, c-format
5029msgid "unable to create '%s'"
5030msgstr "不能创建 '%s'"
5031
5032#: builtin/index-pack.c:278
5033#, c-format
5034msgid "cannot open packfile '%s'"
5035msgstr "无法打开包文件 '%s'"
5036
5037#: builtin/index-pack.c:292
5038msgid "pack signature mismatch"
5039msgstr "包签名不匹配"
5040
5041#: builtin/index-pack.c:294
5042#, c-format
5043msgid "pack version %<PRIu32> unsupported"
5044msgstr "不支持包版本 %<PRIu32>"
5045
5046#: builtin/index-pack.c:312
5047#, c-format
5048msgid "pack has bad object at offset %lu: %s"
5049msgstr "包中有错误的对象位于 %lu:%s"
5050
5051#: builtin/index-pack.c:434
5052#, c-format
5053msgid "inflate returned %d"
5054msgstr "解压缩返回 %d"
5055
5056#: builtin/index-pack.c:483
5057msgid "offset value overflow for delta base object"
5058msgstr "偏移值覆盖了 delta 基准对象"
5059
5060#: builtin/index-pack.c:491
5061msgid "delta base offset is out of bound"
5062msgstr "delta 基准偏移越界"
5063
5064#: builtin/index-pack.c:499
5065#, c-format
5066msgid "unknown object type %d"
5067msgstr "未知对象类型 %d"
5068
5069#: builtin/index-pack.c:530
5070msgid "cannot pread pack file"
5071msgstr "无法读取包文件"
5072
5073#: builtin/index-pack.c:532
5074#, c-format
5075msgid "premature end of pack file, %lu byte missing"
5076msgid_plural "premature end of pack file, %lu bytes missing"
5077msgstr[0] "包文件过早结束,缺少 %lu 字节"
5078msgstr[1] "包文件过早结束,缺少 %lu 字节"
5079
5080#: builtin/index-pack.c:558
5081msgid "serious inflate inconsistency"
5082msgstr "解压缩严重的不一致"
5083
5084#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
5085#: builtin/index-pack.c:712 builtin/index-pack.c:721
5086#, c-format
5087msgid "SHA1 COLLISION FOUND WITH %s !"
5088msgstr "发现 %s 出现 SHA1 冲突!"
5089
5090#: builtin/index-pack.c:652 builtin/pack-objects.c:170
5091#: builtin/pack-objects.c:262
5092#, c-format
5093msgid "unable to read %s"
5094msgstr "不能读 %s"
5095
5096#: builtin/index-pack.c:718
5097#, c-format
5098msgid "cannot read existing object %s"
5099msgstr "不能读取现存对象 %s"
5100
5101#: builtin/index-pack.c:732
5102#, c-format
5103msgid "invalid blob object %s"
5104msgstr "无效的数据(blob)对象 %s"
5105
5106#: builtin/index-pack.c:747
5107#, c-format
5108msgid "invalid %s"
5109msgstr "无效的 %s"
5110
5111#: builtin/index-pack.c:749
5112msgid "Error in object"
5113msgstr "对象中出错"
5114
5115#: builtin/index-pack.c:751
5116#, c-format
5117msgid "Not all child objects of %s are reachable"
5118msgstr "%s 的所有子对象并非都可达"
5119
5120#: builtin/index-pack.c:821 builtin/index-pack.c:847
5121msgid "failed to apply delta"
5122msgstr "无法应用 delta"
5123
5124#: builtin/index-pack.c:986
5125msgid "Receiving objects"
5126msgstr "接收对象中"
5127
5128#: builtin/index-pack.c:986
5129msgid "Indexing objects"
5130msgstr "索引对象中"
5131
5132#: builtin/index-pack.c:1012
5133msgid "pack is corrupted (SHA1 mismatch)"
5134msgstr "包冲突(SHA1 不匹配)"
5135
5136#: builtin/index-pack.c:1017
5137msgid "cannot fstat packfile"
5138msgstr "不能枚举包文件状态"
5139
5140#: builtin/index-pack.c:1020
5141msgid "pack has junk at the end"
5142msgstr "包的结尾有垃圾数据"
5143
5144#: builtin/index-pack.c:1031
5145msgid "confusion beyond insanity in parse_pack_objects()"
5146msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5147
5148#: builtin/index-pack.c:1054
5149msgid "Resolving deltas"
5150msgstr "处理 delta 中"
5151
5152#: builtin/index-pack.c:1064
5153#, c-format
5154msgid "unable to create thread: %s"
5155msgstr "不能创建线程:%s"
5156
5157#: builtin/index-pack.c:1106
5158msgid "confusion beyond insanity"
5159msgstr "不可理喻"
5160
5161#: builtin/index-pack.c:1112
5162#, c-format
5163msgid "completed with %d local objects"
5164msgstr "完成 %d 个本地对象"
5165
5166#: builtin/index-pack.c:1121
5167#, c-format
5168msgid "Unexpected tail checksum for %s (disk corruption?)"
5169msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5170
5171#: builtin/index-pack.c:1125
5172#, c-format
5173msgid "pack has %d unresolved delta"
5174msgid_plural "pack has %d unresolved deltas"
5175msgstr[0] "包有 %d 个未解决的 delta"
5176msgstr[1] "包有 %d 个未解决的 delta"
5177
5178#: builtin/index-pack.c:1150
5179#, c-format
5180msgid "unable to deflate appended object (%d)"
5181msgstr "不能压缩附加对象(%d)"
5182
5183#: builtin/index-pack.c:1229
5184#, c-format
5185msgid "local object %s is corrupt"
5186msgstr "本地对象 %s 已损坏"
5187
5188#: builtin/index-pack.c:1253
5189msgid "error while closing pack file"
5190msgstr "关闭包文件时出错"
5191
5192#: builtin/index-pack.c:1266
5193#, c-format
5194msgid "cannot write keep file '%s'"
5195msgstr "无法写保留文件 '%s'"
5196
5197#: builtin/index-pack.c:1274
5198#, c-format
5199msgid "cannot close written keep file '%s'"
5200msgstr "无法关闭保留文件 '%s'"
5201
5202#: builtin/index-pack.c:1287
5203msgid "cannot store pack file"
5204msgstr "无法存储包文件"
5205
5206#: builtin/index-pack.c:1298
5207msgid "cannot store index file"
5208msgstr "无法存储索引文件"
5209
5210#: builtin/index-pack.c:1331
5211#, c-format
5212msgid "bad pack.indexversion=%<PRIu32>"
5213msgstr "坏的 pack.indexversion=%<PRIu32>"
5214
5215#: builtin/index-pack.c:1337
5216#, c-format
5217msgid "invalid number of threads specified (%d)"
5218msgstr "指定的线程数无效(%d)"
5219
5220#: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5221#, c-format
5222msgid "no threads support, ignoring %s"
5223msgstr "没有线程支持,忽略 %s"
5224
5225#: builtin/index-pack.c:1399
5226#, c-format
5227msgid "Cannot open existing pack file '%s'"
5228msgstr "无法打开现存包文件 '%s'"
5229
5230#: builtin/index-pack.c:1401
5231#, c-format
5232msgid "Cannot open existing pack idx file for '%s'"
5233msgstr "无法为 %s 打开包索引文件"
5234
5235#: builtin/index-pack.c:1448
5236#, c-format
5237msgid "non delta: %d object"
5238msgid_plural "non delta: %d objects"
5239msgstr[0] "非 delta:%d 个对象"
5240msgstr[1] "非 delta:%d 个对象"
5241
5242#: builtin/index-pack.c:1455
5243#, c-format
5244msgid "chain length = %d: %lu object"
5245msgid_plural "chain length = %d: %lu objects"
5246msgstr[0] "链长 = %d: %lu 对象"
5247msgstr[1] "链长 = %d: %lu 对象"
5248
5249#: builtin/index-pack.c:1482
5250msgid "Cannot come back to cwd"
5251msgstr "无法返回当前工作目录"
5252
5253#: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5254#: builtin/index-pack.c:1541 builtin/index-pack.c:1545
5255#, c-format
5256msgid "bad %s"
5257msgstr "错误选项 %s"
5258
5259#: builtin/index-pack.c:1559
5260msgid "--fix-thin cannot be used without --stdin"
5261msgstr "--fix-thin 不能和 --stdin 同时使用"
5262
5263#: builtin/index-pack.c:1563 builtin/index-pack.c:1573
5264#, c-format
5265msgid "packfile name '%s' does not end with '.pack'"
5266msgstr "包名 '%s' 没有以 '.pack' 结尾"
5267
5268#: builtin/index-pack.c:1582
5269msgid "--verify with no packfile name given"
5270msgstr "--verify 没有提供包名参数"
5271
5272#: builtin/init-db.c:35
5273#, c-format
5274msgid "Could not make %s writable by group"
5275msgstr "不能设置 %s 为组可写"
5276
5277#: builtin/init-db.c:62
5278#, c-format
5279msgid "insanely long template name %s"
5280msgstr "太长的模版名 %s"
5281
5282#: builtin/init-db.c:67
5283#, c-format
5284msgid "cannot stat '%s'"
5285msgstr "不能枚举 '%s' 状态"
5286
5287#: builtin/init-db.c:73
5288#, c-format
5289msgid "cannot stat template '%s'"
5290msgstr "不能枚举模版 '%s' 状态"
5291
5292#: builtin/init-db.c:80
5293#, c-format
5294msgid "cannot opendir '%s'"
5295msgstr "不能打开目录 '%s'"
5296
5297#: builtin/init-db.c:97
5298#, c-format
5299msgid "cannot readlink '%s'"
5300msgstr "不能读取链接 '%s'"
5301
5302#: builtin/init-db.c:99
5303#, c-format
5304msgid "insanely long symlink %s"
5305msgstr "太长的符号链接 %s"
5306
5307#: builtin/init-db.c:102
5308#, c-format
5309msgid "cannot symlink '%s' '%s'"
5310msgstr "不能自 '%s' 到 '%s' 创建符号链接"
5311
5312#: builtin/init-db.c:106
5313#, c-format
5314msgid "cannot copy '%s' to '%s'"
5315msgstr "不能拷贝 '%s' 至 '%s'"
5316
5317#: builtin/init-db.c:110
5318#, c-format
5319msgid "ignoring template %s"
5320msgstr "忽略模版 %s"
5321
5322#: builtin/init-db.c:133
5323#, c-format
5324msgid "insanely long template path %s"
5325msgstr "太长的模版路径 %s"
5326
5327#: builtin/init-db.c:141
5328#, c-format
5329msgid "templates not found %s"
5330msgstr "模版未找到 %s"
5331
5332#: builtin/init-db.c:154
5333#, c-format
5334msgid "not copying templates of a wrong format version %d from '%s'"
5335msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
5336
5337#: builtin/init-db.c:192
5338#, c-format
5339msgid "insane git directory %s"
5340msgstr "不正常的 git 目录 %s"
5341
5342#: builtin/init-db.c:323 builtin/init-db.c:326
5343#, c-format
5344msgid "%s already exists"
5345msgstr "%s 已经存在"
5346
5347#: builtin/init-db.c:355
5348#, c-format
5349msgid "unable to handle file type %d"
5350msgstr "不能处理 %d 类型的文件"
5351
5352#: builtin/init-db.c:358
5353#, c-format
5354msgid "unable to move %s to %s"
5355msgstr "不能移动 %s 至 %s"
5356
5357#: builtin/init-db.c:363
5358#, c-format
5359msgid "Could not create git link %s"
5360msgstr "不能创建 git link %s"
5361
5362#.
5363#. * TRANSLATORS: The first '%s' is either "Reinitialized
5364#. * existing" or "Initialized empty", the second " shared" or
5365#. * "", and the last '%s%s' is the verbatim directory name.
5366#.
5367#: builtin/init-db.c:420
5368#, c-format
5369msgid "%s%s Git repository in %s%s\n"
5370msgstr "%s%s Git 版本库于 %s%s\n"
5371
5372#: builtin/init-db.c:421
5373msgid "Reinitialized existing"
5374msgstr "重新初始化现存的"
5375
5376#: builtin/init-db.c:421
5377msgid "Initialized empty"
5378msgstr "初始化空的"
5379
5380#  译者:中文字符串拼接,可删除前导空格
5381#: builtin/init-db.c:422
5382msgid " shared"
5383msgstr "共享"
5384
5385#: builtin/init-db.c:441
5386msgid "cannot tell cwd"
5387msgstr "无法获知当前路径"
5388
5389#: builtin/init-db.c:467
5390msgid ""
5391"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5392"shared[=<permissions>]] [directory]"
5393msgstr ""
5394"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5395"[目录]"
5396
5397#: builtin/init-db.c:490
5398msgid "permissions"
5399msgstr "权限"
5400
5401#: builtin/init-db.c:491
5402msgid "specify that the git repository is to be shared amongst several users"
5403msgstr "指定 git 版本库是多个用户之间共享的"
5404
5405#: builtin/init-db.c:493 builtin/prune-packed.c:77
5406msgid "be quiet"
5407msgstr "保持安静"
5408
5409#: builtin/init-db.c:522 builtin/init-db.c:529
5410#, c-format
5411msgid "cannot mkdir %s"
5412msgstr "不能创建目录 %s"
5413
5414#: builtin/init-db.c:533
5415#, c-format
5416msgid "cannot chdir to %s"
5417msgstr "不能切换目录到 %s"
5418
5419#: builtin/init-db.c:555
5420#, c-format
5421msgid ""
5422"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5423"dir=<directory>)"
5424msgstr ""
5425"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5426"dir=<directory>)"
5427
5428#: builtin/init-db.c:579
5429msgid "Cannot access current working directory"
5430msgstr "不能访问当前工作目录"
5431
5432#: builtin/init-db.c:586
5433#, c-format
5434msgid "Cannot access work tree '%s'"
5435msgstr "不能访问工作区 '%s'"
5436
5437#: builtin/log.c:39
5438msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5439msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
5440
5441#: builtin/log.c:40
5442msgid "   or: git show [options] <object>..."
5443msgstr "   或者:git show [选项] <对象>..."
5444
5445#: builtin/log.c:102
5446msgid "suppress diff output"
5447msgstr "不显示差异输出"
5448
5449#: builtin/log.c:103
5450msgid "show source"
5451msgstr "显示源"
5452
5453#: builtin/log.c:104
5454msgid "Use mail map file"
5455msgstr "使用邮件映射文件"
5456
5457#: builtin/log.c:105
5458msgid "decorate options"
5459msgstr "修饰选项"
5460
5461#: builtin/log.c:198
5462#, c-format
5463msgid "Final output: %d %s\n"
5464msgstr "最终输出:%d %s\n"
5465
5466#: builtin/log.c:419 builtin/log.c:511
5467#, c-format
5468msgid "Could not read object %s"
5469msgstr "不能读取对象 %s"
5470
5471#: builtin/log.c:535
5472#, c-format
5473msgid "Unknown type: %d"
5474msgstr "未知类型:%d"
5475
5476#: builtin/log.c:627
5477msgid "format.headers without value"
5478msgstr "format.headers 没有值"
5479
5480#: builtin/log.c:701
5481msgid "name of output directory is too long"
5482msgstr "输出目录名太长"
5483
5484#: builtin/log.c:717
5485#, c-format
5486msgid "Cannot open patch file %s"
5487msgstr "无法打开补丁文件 %s"
5488
5489#: builtin/log.c:731
5490msgid "Need exactly one range."
5491msgstr "只需要一个范围。"
5492
5493#: builtin/log.c:739
5494msgid "Not a range."
5495msgstr "不是一个范围。"
5496
5497#: builtin/log.c:812
5498msgid "Cover letter needs email format"
5499msgstr "信封需要邮件地址格式"
5500
5501#: builtin/log.c:885
5502#, c-format
5503msgid "insane in-reply-to: %s"
5504msgstr "不正常的 in-reply-to:%s"
5505
5506#: builtin/log.c:913
5507msgid "git format-patch [options] [<since> | <revision range>]"
5508msgstr "git format-patch [选项] [<从> | <修订集范围>]"
5509
5510#: builtin/log.c:958
5511msgid "Two output directories?"
5512msgstr "两个输出目录?"
5513
5514#: builtin/log.c:1097
5515msgid "use [PATCH n/m] even with a single patch"
5516msgstr "使用 [PATCH n/m],即使只有一个补丁"
5517
5518#: builtin/log.c:1100
5519msgid "use [PATCH] even with multiple patches"
5520msgstr "使用 [PATCH],即使有多个补丁"
5521
5522#: builtin/log.c:1104
5523msgid "print patches to standard out"
5524msgstr "打印补丁到标准输出"
5525
5526#: builtin/log.c:1106
5527msgid "generate a cover letter"
5528msgstr "生成一封附信"
5529
5530#: builtin/log.c:1108
5531msgid "use simple number sequence for output file names"
5532msgstr "使用简单的数字序列作为输出文件名"
5533
5534#: builtin/log.c:1109
5535msgid "sfx"
5536msgstr "后缀"
5537
5538#: builtin/log.c:1110
5539msgid "use <sfx> instead of '.patch'"
5540msgstr "使用 <后缀> 代替 '.patch'"
5541
5542#: builtin/log.c:1112
5543msgid "start numbering patches at <n> instead of 1"
5544msgstr "补丁以 <n> 开始编号,而不是1"
5545
5546#: builtin/log.c:1114
5547msgid "mark the series as Nth re-roll"
5548msgstr "标记补丁系列是第几次重制"
5549
5550#: builtin/log.c:1116
5551msgid "Use [<prefix>] instead of [PATCH]"
5552msgstr "使用 [<前缀>] 代替 [PATCH]"
5553
5554#: builtin/log.c:1119
5555msgid "store resulting files in <dir>"
5556msgstr "把结果文件存储在 <dir>"
5557
5558#: builtin/log.c:1122
5559msgid "don't strip/add [PATCH]"
5560msgstr "不删除/添加 [PATCH]"
5561
5562#: builtin/log.c:1125
5563msgid "don't output binary diffs"
5564msgstr "不输出二进制差异"
5565
5566#: builtin/log.c:1127
5567msgid "don't include a patch matching a commit upstream"
5568msgstr "不包含已在上游提交中的补丁"
5569
5570#: builtin/log.c:1129
5571msgid "show patch format instead of default (patch + stat)"
5572msgstr "显示纯补丁格式而非默认的(补丁+状态)"
5573
5574#: builtin/log.c:1131
5575msgid "Messaging"
5576msgstr "邮件发送"
5577
5578#: builtin/log.c:1132
5579msgid "header"
5580msgstr "header"
5581
5582#: builtin/log.c:1133
5583msgid "add email header"
5584msgstr "添加邮件头"
5585
5586#: builtin/log.c:1134 builtin/log.c:1136
5587msgid "email"
5588msgstr "邮件地址"
5589
5590#: builtin/log.c:1134
5591msgid "add To: header"
5592msgstr "添加收件人"
5593
5594#: builtin/log.c:1136
5595msgid "add Cc: header"
5596msgstr "添加抄送"
5597
5598#: builtin/log.c:1138
5599msgid "message-id"
5600msgstr "message-id"
5601
5602#: builtin/log.c:1139
5603msgid "make first mail a reply to <message-id>"
5604msgstr "使第一封邮件作为对 <message-id> 的回复"
5605
5606#: builtin/log.c:1140 builtin/log.c:1143
5607msgid "boundary"
5608msgstr "边界"
5609
5610#: builtin/log.c:1141
5611msgid "attach the patch"
5612msgstr "附件方式添加补丁"
5613
5614#: builtin/log.c:1144
5615msgid "inline the patch"
5616msgstr "内联显示补丁"
5617
5618#: builtin/log.c:1148
5619msgid "enable message threading, styles: shallow, deep"
5620msgstr "启用邮件线索,风格:浅,深"
5621
5622#: builtin/log.c:1150
5623msgid "signature"
5624msgstr "签名"
5625
5626#: builtin/log.c:1151
5627msgid "add a signature"
5628msgstr "添加一个签名"
5629
5630#: builtin/log.c:1153
5631msgid "don't print the patch filenames"
5632msgstr "不要打印补丁文件名"
5633
5634#: builtin/log.c:1202
5635#, c-format
5636msgid "bogus committer info %s"
5637msgstr "虚假的提交者信息 %s"
5638
5639#: builtin/log.c:1247
5640msgid "-n and -k are mutually exclusive."
5641msgstr "-n 和 -k 互斥。"
5642
5643#: builtin/log.c:1249
5644msgid "--subject-prefix and -k are mutually exclusive."
5645msgstr "--subject-prefix 和 -k 互斥。"
5646
5647#: builtin/log.c:1257
5648msgid "--name-only does not make sense"
5649msgstr "--name-only 无意义"
5650
5651#: builtin/log.c:1259
5652msgid "--name-status does not make sense"
5653msgstr "--name-status 无意义"
5654
5655#: builtin/log.c:1261
5656msgid "--check does not make sense"
5657msgstr "--check 无意义"
5658
5659#: builtin/log.c:1284
5660msgid "standard output, or directory, which one?"
5661msgstr "标准输出或目录,哪一个?"
5662
5663#: builtin/log.c:1286
5664#, c-format
5665msgid "Could not create directory '%s'"
5666msgstr "不能创建目录 '%s'"
5667
5668#: builtin/log.c:1439
5669msgid "Failed to create output files"
5670msgstr "无法创建输出文件"
5671
5672#: builtin/log.c:1488
5673msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5674msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
5675
5676#: builtin/log.c:1543
5677#, c-format
5678msgid ""
5679"Could not find a tracked remote branch, please specify <upstream> manually.\n"
5680msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
5681
5682#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
5683#, c-format
5684msgid "Unknown commit %s"
5685msgstr "未知提交 %s"
5686
5687#: builtin/ls-files.c:409
5688msgid "git ls-files [options] [<file>...]"
5689msgstr "git ls-files [选项] [<文件>...]"
5690
5691#: builtin/ls-files.c:466
5692msgid "identify the file status with tags"
5693msgstr "用标签标识文件的状态"
5694
5695#: builtin/ls-files.c:468
5696msgid "use lowercase letters for 'assume unchanged' files"
5697msgstr "使用小写字母表示 '假设未改变的' 文件"
5698
5699#: builtin/ls-files.c:470
5700msgid "show cached files in the output (default)"
5701msgstr "显示缓存的文件(默认)"
5702
5703#: builtin/ls-files.c:472
5704msgid "show deleted files in the output"
5705msgstr "显示已删除的文件"
5706
5707#: builtin/ls-files.c:474
5708msgid "show modified files in the output"
5709msgstr "显示已修改的文件"
5710
5711#: builtin/ls-files.c:476
5712msgid "show other files in the output"
5713msgstr "显示其它文件"
5714
5715#: builtin/ls-files.c:478
5716msgid "show ignored files in the output"
5717msgstr "显示忽略的文件"
5718
5719#: builtin/ls-files.c:481
5720msgid "show staged contents' object name in the output"
5721msgstr "显示暂存区内容的对象名称"
5722
5723#: builtin/ls-files.c:483
5724msgid "show files on the filesystem that need to be removed"
5725msgstr "显示文件系统需要删除的文件"
5726
5727#: builtin/ls-files.c:485
5728msgid "show 'other' directories' name only"
5729msgstr "只显示“其他”目录的名称"
5730
5731#: builtin/ls-files.c:488
5732msgid "don't show empty directories"
5733msgstr "不显示空目录"
5734
5735#: builtin/ls-files.c:491
5736msgid "show unmerged files in the output"
5737msgstr "显示未合并的文件"
5738
5739#: builtin/ls-files.c:493
5740msgid "show resolve-undo information"
5741msgstr "显示 resolve-undo 信息"
5742
5743#: builtin/ls-files.c:495
5744msgid "skip files matching pattern"
5745msgstr "匹配排除文件的模式"
5746
5747#: builtin/ls-files.c:498
5748msgid "exclude patterns are read from <file>"
5749msgstr "从 <文件> 中读取排除模式"
5750
5751#: builtin/ls-files.c:501
5752msgid "read additional per-directory exclude patterns in <file>"
5753msgstr "从 <文件> 读取额外的每个目录的排除模式"
5754
5755#: builtin/ls-files.c:503
5756msgid "add the standard git exclusions"
5757msgstr "添加标准的 git 排除"
5758
5759#: builtin/ls-files.c:506
5760msgid "make the output relative to the project top directory"
5761msgstr "显示相对于顶级目录的文件名"
5762
5763#: builtin/ls-files.c:509
5764msgid "if any <file> is not in the index, treat this as an error"
5765msgstr "如果任何 <文件> 都不在索引区,视为错误"
5766
5767#: builtin/ls-files.c:510
5768msgid "tree-ish"
5769msgstr "树或提交"
5770
5771#: builtin/ls-files.c:511
5772msgid "pretend that paths removed since <tree-ish> are still present"
5773msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
5774
5775#: builtin/ls-files.c:513
5776msgid "show debugging data"
5777msgstr "显示调试数据"
5778
5779#: builtin/ls-tree.c:27
5780msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5781msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
5782
5783#: builtin/ls-tree.c:125
5784msgid "only show trees"
5785msgstr "只显示树"
5786
5787#: builtin/ls-tree.c:127
5788msgid "recurse into subtrees"
5789msgstr "递归到子树"
5790
5791#: builtin/ls-tree.c:129
5792msgid "show trees when recursing"
5793msgstr "当递归时显示树"
5794
5795#: builtin/ls-tree.c:132
5796msgid "terminate entries with NUL byte"
5797msgstr "条目以NUL字符终止"
5798
5799#: builtin/ls-tree.c:133
5800msgid "include object size"
5801msgstr "包括对象大小"
5802
5803#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5804msgid "list only filenames"
5805msgstr "只列出文件名"
5806
5807#: builtin/ls-tree.c:140
5808msgid "use full path names"
5809msgstr "使用文件的全路径"
5810
5811#: builtin/ls-tree.c:142
5812msgid "list entire tree; not just current directory (implies --full-name)"
5813msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
5814
5815#: builtin/merge.c:43
5816msgid "git merge [options] [<commit>...]"
5817msgstr "git merge [选项] [<提交>...]"
5818
5819#: builtin/merge.c:44
5820msgid "git merge [options] <msg> HEAD <commit>"
5821msgstr "git merge [选项] <说明> HEAD <提交>"
5822
5823#: builtin/merge.c:45
5824msgid "git merge --abort"
5825msgstr "git merge --abort"
5826
5827#: builtin/merge.c:90
5828msgid "switch `m' requires a value"
5829msgstr "开关 `m' 需要一个值"
5830
5831#: builtin/merge.c:127
5832#, c-format
5833msgid "Could not find merge strategy '%s'.\n"
5834msgstr "不能找到合并策略 '%s'。\n"
5835
5836#: builtin/merge.c:128
5837#, c-format
5838msgid "Available strategies are:"
5839msgstr "可用的策略有:"
5840
5841#: builtin/merge.c:133
5842#, c-format
5843msgid "Available custom strategies are:"
5844msgstr "可用的自定义策略有:"
5845
5846#: builtin/merge.c:183
5847msgid "do not show a diffstat at the end of the merge"
5848msgstr "在合并的最后不显示差异统计"
5849
5850#: builtin/merge.c:186
5851msgid "show a diffstat at the end of the merge"
5852msgstr "在合并的最后显示差异统计"
5853
5854#: builtin/merge.c:187
5855msgid "(synonym to --stat)"
5856msgstr "(和 --stat 同义)"
5857
5858#: builtin/merge.c:189
5859msgid "add (at most <n>) entries from shortlog to merge commit message"
5860msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
5861
5862#: builtin/merge.c:192
5863msgid "create a single commit instead of doing a merge"
5864msgstr "创建一个单独的提交而不是做一次合并"
5865
5866#: builtin/merge.c:194
5867msgid "perform a commit if the merge succeeds (default)"
5868msgstr "如果合并成功,执行一次提交(默认)"
5869
5870#: builtin/merge.c:196
5871msgid "edit message before committing"
5872msgstr "在提交前编辑提交说明"
5873
5874#: builtin/merge.c:198
5875msgid "allow fast-forward (default)"
5876msgstr "允许快进(默认)"
5877
5878#: builtin/merge.c:200
5879msgid "abort if fast-forward is not possible"
5880msgstr "如果不能快进就放弃合并"
5881
5882#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112
5883msgid "strategy"
5884msgstr "策略"
5885
5886#: builtin/merge.c:203
5887msgid "merge strategy to use"
5888msgstr "要使用的合并策略"
5889
5890#: builtin/merge.c:204
5891msgid "option=value"
5892msgstr "option=value"
5893
5894#: builtin/merge.c:205
5895msgid "option for selected merge strategy"
5896msgstr "所选的合并策略的选项"
5897
5898#: builtin/merge.c:207
5899msgid "merge commit message (for a non-fast-forward merge)"
5900msgstr "合并的提交说明(针对非快进式合并)"
5901
5902#: builtin/merge.c:211
5903msgid "abort the current in-progress merge"
5904msgstr "放弃当前正在进行的合并"
5905
5906#: builtin/merge.c:240
5907msgid "could not run stash."
5908msgstr "不能进行进度保存。"
5909
5910#: builtin/merge.c:245
5911msgid "stash failed"
5912msgstr "进度保存失败"
5913
5914#: builtin/merge.c:250
5915#, c-format
5916msgid "not a valid object: %s"
5917msgstr "不是一个有效对象:%s"
5918
5919#: builtin/merge.c:269 builtin/merge.c:286
5920msgid "read-tree failed"
5921msgstr "读取树失败"
5922
5923#  译者:注意保持前导空格
5924#: builtin/merge.c:316
5925msgid " (nothing to squash)"
5926msgstr " (无可压缩)"
5927
5928#: builtin/merge.c:329
5929#, c-format
5930msgid "Squash commit -- not updating HEAD\n"
5931msgstr "压缩提交 -- 未更新 HEAD\n"
5932
5933#: builtin/merge.c:361
5934msgid "Writing SQUASH_MSG"
5935msgstr "写入 SQUASH_MSG"
5936
5937#: builtin/merge.c:363
5938msgid "Finishing SQUASH_MSG"
5939msgstr "完成 SQUASH_MSG"
5940
5941#: builtin/merge.c:386
5942#, c-format
5943msgid "No merge message -- not updating HEAD\n"
5944msgstr "无合并信息 -- 未更新 HEAD\n"
5945
5946#: builtin/merge.c:436
5947#, c-format
5948msgid "'%s' does not point to a commit"
5949msgstr "'%s' 没有指向一个提交"
5950
5951#: builtin/merge.c:535
5952#, c-format
5953msgid "Bad branch.%s.mergeoptions string: %s"
5954msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
5955
5956#: builtin/merge.c:628
5957msgid "git write-tree failed to write a tree"
5958msgstr "git write-tree 无法写入一树对象"
5959
5960#: builtin/merge.c:656
5961msgid "Not handling anything other than two heads merge."
5962msgstr "不能处理两个头合并之外的任何操作。"
5963
5964#: builtin/merge.c:670
5965#, c-format
5966msgid "Unknown option for merge-recursive: -X%s"
5967msgstr "merge-recursive 的未知选项:-X%s"
5968
5969#: builtin/merge.c:684
5970#, c-format
5971msgid "unable to write %s"
5972msgstr "不能写 %s"
5973
5974#: builtin/merge.c:773
5975#, c-format
5976msgid "Could not read from '%s'"
5977msgstr "不能从 '%s' 读取"
5978
5979#: builtin/merge.c:782
5980#, c-format
5981msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5982msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
5983
5984#: builtin/merge.c:788
5985#, c-format
5986msgid ""
5987"Please enter a commit message to explain why this merge is necessary,\n"
5988"especially if it merges an updated upstream into a topic branch.\n"
5989"\n"
5990"Lines starting with '%c' will be ignored, and an empty message aborts\n"
5991"the commit.\n"
5992msgstr ""
5993"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
5994"合并到主题分支。\n"
5995"\n"
5996"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
5997
5998#: builtin/merge.c:812
5999msgid "Empty commit message."
6000msgstr "空提交信息。"
6001
6002#: builtin/merge.c:824
6003#, c-format
6004msgid "Wonderful.\n"
6005msgstr "太棒了。\n"
6006
6007#: builtin/merge.c:889
6008#, c-format
6009msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6010msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6011
6012#: builtin/merge.c:905
6013#, c-format
6014msgid "'%s' is not a commit"
6015msgstr "'%s' 不是一个提交"
6016
6017#: builtin/merge.c:946
6018msgid "No current branch."
6019msgstr "没有当前分支。"
6020
6021#: builtin/merge.c:948
6022msgid "No remote for the current branch."
6023msgstr "当前分支没有对应的远程版本库。"
6024
6025#: builtin/merge.c:950
6026msgid "No default upstream defined for the current branch."
6027msgstr "当前分支没有定义默认的上游分支。"
6028
6029#: builtin/merge.c:955
6030#, c-format
6031msgid "No remote tracking branch for %s from %s"
6032msgstr "%s 没有来自 %s 的远程跟踪分支"
6033
6034#: builtin/merge.c:1042 builtin/merge.c:1199
6035#, c-format
6036msgid "%s - not something we can merge"
6037msgstr "%s - 不能被合并"
6038
6039#: builtin/merge.c:1110
6040msgid "There is no merge to abort (MERGE_HEAD missing)."
6041msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6042
6043#: builtin/merge.c:1126 git-pull.sh:31
6044msgid ""
6045"You have not concluded your merge (MERGE_HEAD exists).\n"
6046"Please, commit your changes before you can merge."
6047msgstr ""
6048"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6049"请在合并前先提交您的修改。"
6050
6051#: builtin/merge.c:1129 git-pull.sh:34
6052msgid "You have not concluded your merge (MERGE_HEAD exists)."
6053msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6054
6055#: builtin/merge.c:1133
6056msgid ""
6057"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6058"Please, commit your changes before you can merge."
6059msgstr ""
6060"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6061"请在合并前先提交您的修改。"
6062
6063#: builtin/merge.c:1136
6064msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6065msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6066
6067#: builtin/merge.c:1145
6068msgid "You cannot combine --squash with --no-ff."
6069msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6070
6071#: builtin/merge.c:1150
6072msgid "You cannot combine --no-ff with --ff-only."
6073msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
6074
6075#: builtin/merge.c:1157
6076msgid "No commit specified and merge.defaultToUpstream not set."
6077msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6078
6079#: builtin/merge.c:1189
6080msgid "Can merge only exactly one commit into empty head"
6081msgstr "只能将一个提交合并到空分支上"
6082
6083#: builtin/merge.c:1192
6084msgid "Squash commit into empty head not supported yet"
6085msgstr "尚不支持到空分支的压缩提交"
6086
6087#: builtin/merge.c:1194
6088msgid "Non-fast-forward commit does not make sense into an empty head"
6089msgstr "到空分支的非快进式提交没有意义"
6090
6091#: builtin/merge.c:1310
6092#, c-format
6093msgid "Updating %s..%s\n"
6094msgstr "更新 %s..%s\n"
6095
6096#: builtin/merge.c:1349
6097#, c-format
6098msgid "Trying really trivial in-index merge...\n"
6099msgstr "尝试非常小的索引内合并...\n"
6100
6101#: builtin/merge.c:1356
6102#, c-format
6103msgid "Nope.\n"
6104msgstr "无。\n"
6105
6106#: builtin/merge.c:1388
6107msgid "Not possible to fast-forward, aborting."
6108msgstr "无法快进,终止。"
6109
6110#: builtin/merge.c:1411 builtin/merge.c:1490
6111#, c-format
6112msgid "Rewinding the tree to pristine...\n"
6113msgstr "将树回滚至原始状态...\n"
6114
6115#: builtin/merge.c:1415
6116#, c-format
6117msgid "Trying merge strategy %s...\n"
6118msgstr "尝试合并策略 %s...\n"
6119
6120#: builtin/merge.c:1481
6121#, c-format
6122msgid "No merge strategy handled the merge.\n"
6123msgstr "没有合并策略处理此合并。\n"
6124
6125#: builtin/merge.c:1483
6126#, c-format
6127msgid "Merge with strategy %s failed.\n"
6128msgstr "使用策略 %s 合并失败。\n"
6129
6130#: builtin/merge.c:1492
6131#, c-format
6132msgid "Using the %s to prepare resolving by hand.\n"
6133msgstr "使用 %s 以准备手工解决。\n"
6134
6135#: builtin/merge.c:1504
6136#, c-format
6137msgid "Automatic merge went well; stopped before committing as requested\n"
6138msgstr "自动合并进展顺利,按要求在提交前停止\n"
6139
6140#: builtin/merge-base.c:26
6141msgid "git merge-base [-a|--all] <commit> <commit>..."
6142msgstr "git merge-base [-a|--all] <提交> <提交>..."
6143
6144#: builtin/merge-base.c:27
6145msgid "git merge-base [-a|--all] --octopus <commit>..."
6146msgstr "git merge-base [-a|--all] --octopus <提交>..."
6147
6148#: builtin/merge-base.c:28
6149msgid "git merge-base --independent <commit>..."
6150msgstr "git merge-base --independent <提交>..."
6151
6152#: builtin/merge-base.c:29
6153msgid "git merge-base --is-ancestor <commit> <commit>"
6154msgstr "git merge-base --is-ancestor <提交> <提交>"
6155
6156#: builtin/merge-base.c:98
6157msgid "output all common ancestors"
6158msgstr "输出所有共同的祖先"
6159
6160#: builtin/merge-base.c:99
6161msgid "find ancestors for a single n-way merge"
6162msgstr "查找一个多路合并的祖先提交"
6163
6164#: builtin/merge-base.c:100
6165msgid "list revs not reachable from others"
6166msgstr "显示不能被其他访问到的版本"
6167
6168#: builtin/merge-base.c:102
6169msgid "is the first one ancestor of the other?"
6170msgstr "第一个是其他的祖先提交么?"
6171
6172#: builtin/merge-file.c:8
6173msgid ""
6174"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6175"file2"
6176msgstr ""
6177"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6178
6179#: builtin/merge-file.c:33
6180msgid "send results to standard output"
6181msgstr "将结果发送到标准输出"
6182
6183#: builtin/merge-file.c:34
6184msgid "use a diff3 based merge"
6185msgstr "使用基于 diff3 的合并"
6186
6187#: builtin/merge-file.c:35
6188msgid "for conflicts, use our version"
6189msgstr "如果冲突,使用我们的版本"
6190
6191#: builtin/merge-file.c:37
6192msgid "for conflicts, use their version"
6193msgstr "如果冲突,使用他们的版本"
6194
6195#: builtin/merge-file.c:39
6196msgid "for conflicts, use a union version"
6197msgstr "如果冲突,使用联合版本"
6198
6199#: builtin/merge-file.c:42
6200msgid "for conflicts, use this marker size"
6201msgstr "如果冲突,使用指定长度的标记"
6202
6203#: builtin/merge-file.c:43
6204msgid "do not warn about conflicts"
6205msgstr "不要警告冲突"
6206
6207#: builtin/merge-file.c:45
6208msgid "set labels for file1/orig_file/file2"
6209msgstr "为 file1/orig_file/file2 设置标签"
6210
6211#: builtin/mktree.c:67
6212msgid "git mktree [-z] [--missing] [--batch]"
6213msgstr "git mktree [-z] [--missing] [--batch]"
6214
6215#: builtin/mktree.c:153
6216msgid "input is NUL terminated"
6217msgstr "输入以 NUL 字符终止"
6218
6219#: builtin/mktree.c:154 builtin/write-tree.c:24
6220msgid "allow missing objects"
6221msgstr "允许丢失的对象"
6222
6223#: builtin/mktree.c:155
6224msgid "allow creation of more than one tree"
6225msgstr "允许创建一个以上的树"
6226
6227#: builtin/mv.c:14
6228msgid "git mv [options] <source>... <destination>"
6229msgstr "git mv [选项] <源>... <目标>"
6230
6231#: builtin/mv.c:64
6232msgid "force move/rename even if target exists"
6233msgstr "强制移动/重命令,即使目标存在"
6234
6235#: builtin/mv.c:65
6236msgid "skip move/rename errors"
6237msgstr "跳过移动/重命名错误"
6238
6239#: builtin/mv.c:108
6240#, c-format
6241msgid "Checking rename of '%s' to '%s'\n"
6242msgstr "检查 '%s' 到 '%s' 的重命名\n"
6243
6244#: builtin/mv.c:112
6245msgid "bad source"
6246msgstr "坏的源"
6247
6248#: builtin/mv.c:115
6249msgid "can not move directory into itself"
6250msgstr "不能将目录移动到自身"
6251
6252#: builtin/mv.c:118
6253msgid "cannot move directory over file"
6254msgstr "不能将目录移动到文件"
6255
6256#: builtin/mv.c:128
6257#, c-format
6258msgid "Huh? %.*s is in index?"
6259msgstr "嗯?%.*s 在索引中?"
6260
6261#: builtin/mv.c:140
6262msgid "source directory is empty"
6263msgstr "源目录为空"
6264
6265#: builtin/mv.c:171
6266msgid "not under version control"
6267msgstr "不在版本控制之下"
6268
6269#: builtin/mv.c:173
6270msgid "destination exists"
6271msgstr "目标已存在"
6272
6273#: builtin/mv.c:181
6274#, c-format
6275msgid "overwriting '%s'"
6276msgstr "覆盖 '%s'"
6277
6278#: builtin/mv.c:184
6279msgid "Cannot overwrite"
6280msgstr "不能覆盖"
6281
6282#: builtin/mv.c:187
6283msgid "multiple sources for the same target"
6284msgstr "同一目标具有多个源"
6285
6286#: builtin/mv.c:202
6287#, c-format
6288msgid "%s, source=%s, destination=%s"
6289msgstr "%s,源=%s,目标=%s"
6290
6291#: builtin/mv.c:212
6292#, c-format
6293msgid "Renaming %s to %s\n"
6294msgstr "重命名 %s 至 %s\n"
6295
6296#: builtin/mv.c:215 builtin/remote.c:731
6297#, c-format
6298msgid "renaming '%s' failed"
6299msgstr "重命名 '%s' 失败"
6300
6301#: builtin/name-rev.c:175
6302msgid "git name-rev [options] <commit>..."
6303msgstr "git name-rev [选项] <提交>..."
6304
6305#: builtin/name-rev.c:176
6306msgid "git name-rev [options] --all"
6307msgstr "git name-rev [选项] --all"
6308
6309#: builtin/name-rev.c:177
6310msgid "git name-rev [options] --stdin"
6311msgstr "git name-rev [选项] --stdin"
6312
6313#: builtin/name-rev.c:229
6314msgid "print only names (no SHA-1)"
6315msgstr "只打印名称(无 SHA-1)"
6316
6317#: builtin/name-rev.c:230
6318msgid "only use tags to name the commits"
6319msgstr "只使用 tags 来命名提交"
6320
6321#: builtin/name-rev.c:232
6322msgid "only use refs matching <pattern>"
6323msgstr "只使用和 <模式> 相匹配的引用"
6324
6325#: builtin/name-rev.c:234
6326msgid "list all commits reachable from all refs"
6327msgstr "列出可以从所有引用访问的提交"
6328
6329#: builtin/name-rev.c:235
6330msgid "read from stdin"
6331msgstr "从标准输入读取"
6332
6333#: builtin/name-rev.c:236
6334msgid "allow to print `undefined` names"
6335msgstr "允许打印 `未定义` 的名称"
6336
6337#: builtin/notes.c:26
6338msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6339msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
6340
6341#: builtin/notes.c:27
6342msgid ""
6343"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6344"<object>] [<object>]"
6345msgstr ""
6346"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6347"象>] [<对象>]"
6348
6349#: builtin/notes.c:28
6350msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6351msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
6352
6353#: builtin/notes.c:29
6354msgid ""
6355"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6356"<object>] [<object>]"
6357msgstr ""
6358"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6359">] [<对象>]"
6360
6361#: builtin/notes.c:30
6362msgid "git notes [--ref <notes_ref>] edit [<object>]"
6363msgstr "git notes [--ref <注解引用>] edit [<对象>]"
6364
6365#: builtin/notes.c:31
6366msgid "git notes [--ref <notes_ref>] show [<object>]"
6367msgstr "git notes [--ref <注解引用>] show [<对象>]"
6368
6369#: builtin/notes.c:32
6370msgid ""
6371"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6372msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
6373
6374#: builtin/notes.c:33
6375msgid "git notes merge --commit [-v | -q]"
6376msgstr "git notes merge --commit [-v | -q]"
6377
6378#: builtin/notes.c:34
6379msgid "git notes merge --abort [-v | -q]"
6380msgstr "git notes merge --abort [-v | -q]"
6381
6382#: builtin/notes.c:35
6383msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6384msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
6385
6386#: builtin/notes.c:36
6387msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6388msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
6389
6390#: builtin/notes.c:37
6391msgid "git notes [--ref <notes_ref>] get-ref"
6392msgstr "git notes [--ref <注解引用>] get-ref"
6393
6394#: builtin/notes.c:42
6395msgid "git notes [list [<object>]]"
6396msgstr "git notes [list [<对象>]]"
6397
6398#: builtin/notes.c:47
6399msgid "git notes add [<options>] [<object>]"
6400msgstr "git notes add [<选项>] [<对象>]"
6401
6402#: builtin/notes.c:52
6403msgid "git notes copy [<options>] <from-object> <to-object>"
6404msgstr "git notes copy [<选项>] <源对象> <目标对象>"
6405
6406#: builtin/notes.c:53
6407msgid "git notes copy --stdin [<from-object> <to-object>]..."
6408msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
6409
6410#: builtin/notes.c:58
6411msgid "git notes append [<options>] [<object>]"
6412msgstr "git notes append [<选项>] [<对象>]"
6413
6414#: builtin/notes.c:63
6415msgid "git notes edit [<object>]"
6416msgstr "git notes edit [<对象>]"
6417
6418#: builtin/notes.c:68
6419msgid "git notes show [<object>]"
6420msgstr "git notes show [<对象>]"
6421
6422#: builtin/notes.c:73
6423msgid "git notes merge [<options>] <notes_ref>"
6424msgstr "git notes merge [<选项>] <注解引用>"
6425
6426#: builtin/notes.c:74
6427msgid "git notes merge --commit [<options>]"
6428msgstr "git notes merge --commit [<选项>]"
6429
6430#: builtin/notes.c:75
6431msgid "git notes merge --abort [<options>]"
6432msgstr "git notes merge --abort [<选项>]"
6433
6434#: builtin/notes.c:80
6435msgid "git notes remove [<object>]"
6436msgstr "git notes remove [<对象>]"
6437
6438#: builtin/notes.c:85
6439msgid "git notes prune [<options>]"
6440msgstr "git notes prune [<选项>]"
6441
6442#: builtin/notes.c:90
6443msgid "git notes get-ref"
6444msgstr "git notes get-ref"
6445
6446#: builtin/notes.c:139
6447#, c-format
6448msgid "unable to start 'show' for object '%s'"
6449msgstr "不能为对象 '%s' 开始 'show'"
6450
6451#: builtin/notes.c:143
6452msgid "could not read 'show' output"
6453msgstr "不能读取 'show' 的输出"
6454
6455#: builtin/notes.c:151
6456#, c-format
6457msgid "failed to finish 'show' for object '%s'"
6458msgstr "无法为对象 '%s' 完成 'show'"
6459
6460#: builtin/notes.c:169 builtin/tag.c:341
6461#, c-format
6462msgid "could not create file '%s'"
6463msgstr "不能创建文件 '%s'"
6464
6465#: builtin/notes.c:188
6466msgid "Please supply the note contents using either -m or -F option"
6467msgstr "请通过 -m 或 -F 选项为注解提供内容"
6468
6469#: builtin/notes.c:209 builtin/notes.c:972
6470#, c-format
6471msgid "Removing note for object %s\n"
6472msgstr "删除对象 %s 的注解\n"
6473
6474#: builtin/notes.c:214
6475msgid "unable to write note object"
6476msgstr "不能写注解对象"
6477
6478#: builtin/notes.c:216
6479#, c-format
6480msgid "The note contents has been left in %s"
6481msgstr "注解内容被留在文件 %s 中"
6482
6483#: builtin/notes.c:250 builtin/tag.c:540
6484#, c-format
6485msgid "cannot read '%s'"
6486msgstr "不能读取 '%s'"
6487
6488#: builtin/notes.c:252 builtin/tag.c:543
6489#, c-format
6490msgid "could not open or read '%s'"
6491msgstr "不能打开或读取 '%s'"
6492
6493#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6494#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6495#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6496#: builtin/notes.c:967 builtin/tag.c:556
6497#, c-format
6498msgid "Failed to resolve '%s' as a valid ref."
6499msgstr "无法解析 '%s' 为一个有效引用。"
6500
6501#: builtin/notes.c:274
6502#, c-format
6503msgid "Failed to read object '%s'."
6504msgstr "无法读取对象 '%s'。"
6505
6506#: builtin/notes.c:298
6507msgid "Cannot commit uninitialized/unreferenced notes tree"
6508msgstr "不能提交未初始化/未引用的注解树"
6509
6510#: builtin/notes.c:339
6511#, c-format
6512msgid "Bad notes.rewriteMode value: '%s'"
6513msgstr "坏的 notes.rewriteMode 值:'%s'"
6514
6515#: builtin/notes.c:349
6516#, c-format
6517msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6518msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6519
6520#. TRANSLATORS: The first %s is the name of the
6521#. environment variable, the second %s is its value
6522#: builtin/notes.c:376
6523#, c-format
6524msgid "Bad %s value: '%s'"
6525msgstr "坏的 %s 值:'%s'"
6526
6527#: builtin/notes.c:440
6528#, c-format
6529msgid "Malformed input line: '%s'."
6530msgstr "非法的输入行:'%s'。"
6531
6532#: builtin/notes.c:455
6533#, c-format
6534msgid "Failed to copy notes from '%s' to '%s'"
6535msgstr "无法从 '%s' 到 '%s' 拷贝注解"
6536
6537#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6538#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6539#: builtin/notes.c:1032
6540msgid "too many parameters"
6541msgstr "参数太多"
6542
6543#: builtin/notes.c:512 builtin/notes.c:771
6544#, c-format
6545msgid "No note found for object %s."
6546msgstr "未发现对象 %s 的注解。"
6547
6548#: builtin/notes.c:534 builtin/notes.c:691
6549msgid "note contents as a string"
6550msgstr "注解内容作为一个字符串"
6551
6552#: builtin/notes.c:537 builtin/notes.c:694
6553msgid "note contents in a file"
6554msgstr "注解内容到一个文件中"
6555
6556#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6557#: builtin/notes.c:699 builtin/tag.c:474
6558msgid "object"
6559msgstr "对象"
6560
6561#: builtin/notes.c:540 builtin/notes.c:697
6562msgid "reuse and edit specified note object"
6563msgstr "重用和编辑指定的注解对象"
6564
6565#: builtin/notes.c:543 builtin/notes.c:700
6566msgid "reuse specified note object"
6567msgstr "重用指定的注解对象"
6568
6569#: builtin/notes.c:545 builtin/notes.c:613
6570msgid "replace existing notes"
6571msgstr "替换已存在的注解"
6572
6573#: builtin/notes.c:579
6574#, c-format
6575msgid ""
6576"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6577"existing notes"
6578msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6579
6580#: builtin/notes.c:584 builtin/notes.c:661
6581#, c-format
6582msgid "Overwriting existing notes for object %s\n"
6583msgstr "覆盖对象 %s 现存注解\n"
6584
6585#: builtin/notes.c:614
6586msgid "read objects from stdin"
6587msgstr "从标准输入读取对象"
6588
6589#: builtin/notes.c:616
6590msgid "load rewriting config for <command> (implies --stdin)"
6591msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
6592
6593#: builtin/notes.c:634
6594msgid "too few parameters"
6595msgstr "参数太少"
6596
6597#: builtin/notes.c:655
6598#, c-format
6599msgid ""
6600"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6601"existing notes"
6602msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6603
6604#: builtin/notes.c:667
6605#, c-format
6606msgid "Missing notes on source object %s. Cannot copy."
6607msgstr "源对象 %s 缺少注解。不能拷贝。"
6608
6609#: builtin/notes.c:716
6610#, c-format
6611msgid ""
6612"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6613"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6614msgstr ""
6615"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6616"请换用 'git notes add -f -m/-F/-c/-C'。\n"
6617
6618#: builtin/notes.c:863
6619msgid "General options"
6620msgstr "通用选项"
6621
6622#: builtin/notes.c:865
6623msgid "Merge options"
6624msgstr "合并选项"
6625
6626#: builtin/notes.c:867
6627msgid ""
6628"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6629"cat_sort_uniq)"
6630msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
6631
6632#: builtin/notes.c:869
6633msgid "Committing unmerged notes"
6634msgstr "提交未合并的注解"
6635
6636#: builtin/notes.c:871
6637msgid "finalize notes merge by committing unmerged notes"
6638msgstr "通过提交未合并的注解来完成注解合并"
6639
6640#: builtin/notes.c:873
6641msgid "Aborting notes merge resolution"
6642msgstr "中止注解合并的方案"
6643
6644#: builtin/notes.c:875
6645msgid "abort notes merge"
6646msgstr "中止注解合并"
6647
6648#: builtin/notes.c:970
6649#, c-format
6650msgid "Object %s has no note\n"
6651msgstr "对象 %s 没有注解\n"
6652
6653#: builtin/notes.c:982
6654msgid "attempt to remove non-existent note is not an error"
6655msgstr "尝试删除不存在的注解不是一个错误"
6656
6657#: builtin/notes.c:985
6658msgid "read object names from the standard input"
6659msgstr "从标准输入读取对象名称"
6660
6661#: builtin/notes.c:1066
6662msgid "notes_ref"
6663msgstr "注解引用"
6664
6665#: builtin/notes.c:1067
6666msgid "use notes from <notes_ref>"
6667msgstr "从 <注解引用> 使用注解"
6668
6669#: builtin/notes.c:1102 builtin/remote.c:1598
6670#, c-format
6671msgid "Unknown subcommand: %s"
6672msgstr "未知子命令:%s"
6673
6674#: builtin/pack-objects.c:23
6675msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6676msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
6677
6678#: builtin/pack-objects.c:24
6679msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6680msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
6681
6682#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6683#, c-format
6684msgid "deflate error (%d)"
6685msgstr "压缩错误 (%d)"
6686
6687#: builtin/pack-objects.c:2397
6688#, c-format
6689msgid "unsupported index version %s"
6690msgstr "不支持的索引版本 %s"
6691
6692#: builtin/pack-objects.c:2401
6693#, c-format
6694msgid "bad index version '%s'"
6695msgstr "坏的索引版本 '%s'"
6696
6697#: builtin/pack-objects.c:2424
6698#, c-format
6699msgid "option %s does not accept negative form"
6700msgstr "选项 %s 不接受否定格式"
6701
6702#: builtin/pack-objects.c:2428
6703#, c-format
6704msgid "unable to parse value '%s' for option %s"
6705msgstr "不能解析选项 %1$s 的值 '%2$s'"
6706
6707#: builtin/pack-objects.c:2447
6708msgid "do not show progress meter"
6709msgstr "不显示进度表"
6710
6711#: builtin/pack-objects.c:2449
6712msgid "show progress meter"
6713msgstr "显示进度表"
6714
6715#: builtin/pack-objects.c:2451
6716msgid "show progress meter during object writing phase"
6717msgstr "在对象写入阶段显示进度表"
6718
6719#: builtin/pack-objects.c:2454
6720msgid "similar to --all-progress when progress meter is shown"
6721msgstr "当进度表显示时类似于 --all-progress"
6722
6723#: builtin/pack-objects.c:2455
6724msgid "version[,offset]"
6725msgstr "版本[,偏移]"
6726
6727#: builtin/pack-objects.c:2456
6728msgid "write the pack index file in the specified idx format version"
6729msgstr "用指定的 idx 格式版本来写包索引文件"
6730
6731#: builtin/pack-objects.c:2459
6732msgid "maximum size of each output pack file"
6733msgstr "每个输出包的最大尺寸"
6734
6735#: builtin/pack-objects.c:2461
6736msgid "ignore borrowed objects from alternate object store"
6737msgstr "忽略从替代对象存储里借用对象"
6738
6739#: builtin/pack-objects.c:2463
6740msgid "ignore packed objects"
6741msgstr "忽略包对象"
6742
6743#: builtin/pack-objects.c:2465
6744msgid "limit pack window by objects"
6745msgstr "限制打包窗口的对象数"
6746
6747#: builtin/pack-objects.c:2467
6748msgid "limit pack window by memory in addition to object limit"
6749msgstr "除对象数量限制外设置打包窗口的内存限制"
6750
6751#: builtin/pack-objects.c:2469
6752msgid "maximum length of delta chain allowed in the resulting pack"
6753msgstr "打包允许的 delta 链的最大长度"
6754
6755#: builtin/pack-objects.c:2471
6756msgid "reuse existing deltas"
6757msgstr "重用已存在的 deltas"
6758
6759#: builtin/pack-objects.c:2473
6760msgid "reuse existing objects"
6761msgstr "重用已存在的对象"
6762
6763#: builtin/pack-objects.c:2475
6764msgid "use OFS_DELTA objects"
6765msgstr "使用 OFS_DELTA 对象"
6766
6767#: builtin/pack-objects.c:2477
6768msgid "use threads when searching for best delta matches"
6769msgstr "使用线程查询最佳 delta 匹配"
6770
6771#: builtin/pack-objects.c:2479
6772msgid "do not create an empty pack output"
6773msgstr "不创建空的包输出"
6774
6775#: builtin/pack-objects.c:2481
6776msgid "read revision arguments from standard input"
6777msgstr "从标准输入读取修订号参数"
6778
6779#: builtin/pack-objects.c:2483
6780msgid "limit the objects to those that are not yet packed"
6781msgstr "限制那些尚未打包的对象"
6782
6783#: builtin/pack-objects.c:2486
6784msgid "include objects reachable from any reference"
6785msgstr "包括可以从任何引用访问到的对象"
6786
6787#: builtin/pack-objects.c:2489
6788msgid "include objects referred by reflog entries"
6789msgstr "包括被引用日志引用到的对象"
6790
6791#: builtin/pack-objects.c:2492
6792msgid "output pack to stdout"
6793msgstr "输出包到标准输出"
6794
6795#: builtin/pack-objects.c:2494
6796msgid "include tag objects that refer to objects to be packed"
6797msgstr "包括引用了打包对象的 tag"
6798
6799#: builtin/pack-objects.c:2496
6800msgid "keep unreachable objects"
6801msgstr "维持不可达的对象"
6802
6803#: builtin/pack-objects.c:2497 parse-options.h:141
6804msgid "time"
6805msgstr "时间"
6806
6807#: builtin/pack-objects.c:2498
6808msgid "unpack unreachable objects newer than <time>"
6809msgstr "将比给定 <时间> 新的无法访问的对象解包"
6810
6811#: builtin/pack-objects.c:2501
6812msgid "create thin packs"
6813msgstr "创建精简包"
6814
6815#: builtin/pack-objects.c:2503
6816msgid "ignore packs that have companion .keep file"
6817msgstr "忽略配有 .keep 文件的包"
6818
6819#: builtin/pack-objects.c:2505
6820msgid "pack compression level"
6821msgstr "打包压缩级别"
6822
6823#: builtin/pack-objects.c:2507
6824msgid "do not hide commits by grafts"
6825msgstr "不隐藏移植覆盖的提交"
6826
6827#: builtin/pack-refs.c:6
6828msgid "git pack-refs [options]"
6829msgstr "git pack-refs [选项]"
6830
6831#: builtin/pack-refs.c:14
6832msgid "pack everything"
6833msgstr "打包一切"
6834
6835#: builtin/pack-refs.c:15
6836msgid "prune loose refs (default)"
6837msgstr "清除松散的引用(默认)"
6838
6839#: builtin/prune-packed.c:7
6840msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6841msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6842
6843#: builtin/prune.c:12
6844msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6845msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
6846
6847#: builtin/prune.c:132
6848msgid "do not remove, show only"
6849msgstr "不删除,只显示"
6850
6851#: builtin/prune.c:133
6852msgid "report pruned objects"
6853msgstr "报告清除的对象"
6854
6855#: builtin/prune.c:136
6856msgid "expire objects older than <time>"
6857msgstr "使早于给定时间的对象过期"
6858
6859#: builtin/push.c:14
6860msgid "git push [<options>] [<repository> [<refspec>...]]"
6861msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
6862
6863#: builtin/push.c:45
6864msgid "tag shorthand without <tag>"
6865msgstr "tag 简写没有跟 <tag> 参数"
6866
6867#: builtin/push.c:64
6868msgid "--delete only accepts plain target ref names"
6869msgstr "--delete 只接受简单的目标引用名"
6870
6871#: builtin/push.c:99
6872msgid ""
6873"\n"
6874"To choose either option permanently, see push.default in 'git help config'."
6875msgstr ""
6876"\n"
6877"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
6878
6879#: builtin/push.c:102
6880#, c-format
6881msgid ""
6882"The upstream branch of your current branch does not match\n"
6883"the name of your current branch.  To push to the upstream branch\n"
6884"on the remote, use\n"
6885"\n"
6886"    git push %s HEAD:%s\n"
6887"\n"
6888"To push to the branch of the same name on the remote, use\n"
6889"\n"
6890"    git push %s %s\n"
6891"%s"
6892msgstr ""
6893"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
6894"上游分支,使用\n"
6895"\n"
6896"    git push %s HEAD:%s\n"
6897"\n"
6898"为推送至远程同名分支,使用\n"
6899"\n"
6900"    git push %s %s\n"
6901"%s"
6902
6903#: builtin/push.c:121
6904#, c-format
6905msgid ""
6906"You are not currently on a branch.\n"
6907"To push the history leading to the current (detached HEAD)\n"
6908"state now, use\n"
6909"\n"
6910"    git push %s HEAD:<name-of-remote-branch>\n"
6911msgstr ""
6912"您当前不在一个分支上。\n"
6913"现在为推送当前(分离头指针)的历史,使用\n"
6914"\n"
6915"    git push %s HEAD:<name-of-remote-branch>\n"
6916
6917#: builtin/push.c:128
6918#, c-format
6919msgid ""
6920"The current branch %s has no upstream branch.\n"
6921"To push the current branch and set the remote as upstream, use\n"
6922"\n"
6923"    git push --set-upstream %s %s\n"
6924msgstr ""
6925"当前分支 %s 没有对应的上游分支。\n"
6926"为推送当前分支并建立与远程上游的跟踪,使用\n"
6927"\n"
6928"    git push --set-upstream %s %s\n"
6929
6930#: builtin/push.c:136
6931#, c-format
6932msgid "The current branch %s has multiple upstream branches, refusing to push."
6933msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
6934
6935#: builtin/push.c:139
6936#, c-format
6937msgid ""
6938"You are pushing to remote '%s', which is not the upstream of\n"
6939"your current branch '%s', without telling me what to push\n"
6940"to update which remote branch."
6941msgstr ""
6942"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
6943"而没有告诉我要推送什么、更新哪个远程分支。"
6944
6945#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6946#: builtin/push.c:151
6947msgid ""
6948"push.default is unset; its implicit value is changing in\n"
6949"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6950"and maintain the current behavior after the default changes, use:\n"
6951"\n"
6952"  git config --global push.default matching\n"
6953"\n"
6954"To squelch this message and adopt the new behavior now, use:\n"
6955"\n"
6956"  git config --global push.default simple\n"
6957"\n"
6958"See 'git help config' and search for 'push.default' for further "
6959"information.\n"
6960"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6961"'current' instead of 'simple' if you sometimes use older versions of Git)"
6962msgstr ""
6963"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
6964"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
6965"进行如下设置:\n"
6966"\n"
6967"  git config --global push.default matching\n"
6968"\n"
6969"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
6970"\n"
6971"  git config --global push.default simple\n"
6972"\n"
6973"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
6974"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
6975"为保持兼容,请用 'current' 代替 'simple' 模式)"
6976
6977#: builtin/push.c:199
6978msgid ""
6979"You didn't specify any refspecs to push, and push.default is \"nothing\"."
6980msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
6981
6982#: builtin/push.c:206
6983msgid ""
6984"Updates were rejected because the tip of your current branch is behind\n"
6985"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6986"before pushing again.\n"
6987"See the 'Note about fast-forwards' in 'git push --help' for details."
6988msgstr ""
6989"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
6990"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
6991"'git push --help' 中的 'Note about fast-forwards' 小节。"
6992
6993#: builtin/push.c:212
6994msgid ""
6995"Updates were rejected because a pushed branch tip is behind its remote\n"
6996"counterpart. If you did not intend to push that branch, you may want to\n"
6997"specify branches to push or set the 'push.default' configuration variable\n"
6998"to 'simple', 'current' or 'upstream' to push only the current branch."
6999msgstr ""
7000"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7001"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7002"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7003"以便只推送当前分支。"
7004
7005#: builtin/push.c:218
7006msgid ""
7007"Updates were rejected because a pushed branch tip is behind its remote\n"
7008"counterpart. Check out this branch and merge the remote changes\n"
7009"(e.g. 'git pull') before pushing again.\n"
7010"See the 'Note about fast-forwards' in 'git push --help' for details."
7011msgstr ""
7012"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7013"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7014"'git push --help' 中的 'Note about fast-forwards' 小节。"
7015
7016#: builtin/push.c:224
7017msgid ""
7018"Updates were rejected because the remote contains work that you do\n"
7019"not have locally. This is usually caused by another repository pushing\n"
7020"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7021"'git pull') before pushing again.\n"
7022"See the 'Note about fast-forwards' in 'git push --help' for details."
7023msgstr ""
7024"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7025"一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7026"(如 'git pull')。\n"
7027"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7028
7029#: builtin/push.c:231
7030msgid "Updates were rejected because the tag already exists in the remote."
7031msgstr "更新被拒绝因为 tag 在远程已经存在。"
7032
7033#: builtin/push.c:234
7034msgid ""
7035"You cannot update a remote ref that points at a non-commit object,\n"
7036"or update a remote ref to make it point at a non-commit object,\n"
7037"without using the '--force' option.\n"
7038msgstr ""
7039"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7040"也不能更新远程引用让其指向一个非提交对象。\n"
7041
7042#: builtin/push.c:294
7043#, c-format
7044msgid "Pushing to %s\n"
7045msgstr "推送到 %s\n"
7046
7047#: builtin/push.c:298
7048#, c-format
7049msgid "failed to push some refs to '%s'"
7050msgstr "无法推送一些引用到 '%s'"
7051
7052#: builtin/push.c:331
7053#, c-format
7054msgid "bad repository '%s'"
7055msgstr "坏的版本库 '%s'"
7056
7057#: builtin/push.c:332
7058msgid ""
7059"No configured push destination.\n"
7060"Either specify the URL from the command-line or configure a remote "
7061"repository using\n"
7062"\n"
7063"    git remote add <name> <url>\n"
7064"\n"
7065"and then push using the remote name\n"
7066"\n"
7067"    git push <name>\n"
7068msgstr ""
7069"没有配置推送目标。\n"
7070"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7071"\n"
7072"    git remote add <name> <url>\n"
7073"\n"
7074"然后使用该远程版本库名执行推送\n"
7075"\n"
7076"    git push <name>\n"
7077
7078#: builtin/push.c:347
7079msgid "--all and --tags are incompatible"
7080msgstr "--all 和 --tags 不兼容"
7081
7082#: builtin/push.c:348
7083msgid "--all can't be combined with refspecs"
7084msgstr "--all 不能和引用表达式同时使用"
7085
7086#: builtin/push.c:353
7087msgid "--mirror and --tags are incompatible"
7088msgstr "--mirror 和 --tags 不兼容"
7089
7090#: builtin/push.c:354
7091msgid "--mirror can't be combined with refspecs"
7092msgstr "--mirror 不能和引用表达式同时使用"
7093
7094#: builtin/push.c:359
7095msgid "--all and --mirror are incompatible"
7096msgstr "--all 和 --mirror 不兼容"
7097
7098#: builtin/push.c:419
7099msgid "repository"
7100msgstr "版本库"
7101
7102#: builtin/push.c:420
7103msgid "push all refs"
7104msgstr "推送所有引用"
7105
7106#: builtin/push.c:421
7107msgid "mirror all refs"
7108msgstr "镜像所有引用"
7109
7110#: builtin/push.c:423
7111msgid "delete refs"
7112msgstr "删除引用"
7113
7114#: builtin/push.c:424
7115msgid "push tags (can't be used with --all or --mirror)"
7116msgstr "推送 tags(不能使用 --all or --mirror)"
7117
7118#: builtin/push.c:427
7119msgid "force updates"
7120msgstr "强制更新"
7121
7122#: builtin/push.c:428
7123msgid "check"
7124msgstr "检查"
7125
7126#: builtin/push.c:429
7127msgid "control recursive pushing of submodules"
7128msgstr "控制子模组的递归推送"
7129
7130#: builtin/push.c:431
7131msgid "use thin pack"
7132msgstr "使用精简打包"
7133
7134#: builtin/push.c:432 builtin/push.c:433
7135msgid "receive pack program"
7136msgstr "接收包程序"
7137
7138#: builtin/push.c:434
7139msgid "set upstream for git pull/status"
7140msgstr "设置 git pull/status 的上游"
7141
7142#: builtin/push.c:437
7143msgid "prune locally removed refs"
7144msgstr "清除本地删除的引用"
7145
7146#: builtin/push.c:439
7147msgid "bypass pre-push hook"
7148msgstr "绕过 pre-push 钩子"
7149
7150#: builtin/push.c:448
7151msgid "--delete is incompatible with --all, --mirror and --tags"
7152msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7153
7154#: builtin/push.c:450
7155msgid "--delete doesn't make sense without any refs"
7156msgstr "--delete 未接任何引用没有意义"
7157
7158#: builtin/read-tree.c:36
7159msgid ""
7160"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7161"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7162"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7163msgstr ""
7164"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7165"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7166"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7167
7168#: builtin/read-tree.c:108
7169msgid "write resulting index to <file>"
7170msgstr "将索引结果写入 <file>"
7171
7172#: builtin/read-tree.c:111
7173msgid "only empty the index"
7174msgstr "只是清空索引"
7175
7176#: builtin/read-tree.c:113
7177msgid "Merging"
7178msgstr "合并"
7179
7180#: builtin/read-tree.c:115
7181msgid "perform a merge in addition to a read"
7182msgstr "读取之余再执行一个合并"
7183
7184#: builtin/read-tree.c:117
7185msgid "3-way merge if no file level merging required"
7186msgstr "如果没有文件级合并需要,执行三路合并"
7187
7188#: builtin/read-tree.c:119
7189msgid "3-way merge in presence of adds and removes"
7190msgstr "存在添加和删除时,也执行三路合并"
7191
7192#: builtin/read-tree.c:121
7193msgid "same as -m, but discard unmerged entries"
7194msgstr "类似于 -m,但丢弃未合并的条目"
7195
7196#: builtin/read-tree.c:122
7197msgid "<subdirectory>/"
7198msgstr "<子目录>/"
7199
7200#: builtin/read-tree.c:123
7201msgid "read the tree into the index under <subdirectory>/"
7202msgstr "读取树对象到索引的 <子目录>/ 下"
7203
7204#: builtin/read-tree.c:126
7205msgid "update working tree with merge result"
7206msgstr "用合并的结果更新工作区"
7207
7208#: builtin/read-tree.c:128
7209msgid "gitignore"
7210msgstr "gitignore"
7211
7212#: builtin/read-tree.c:129
7213msgid "allow explicitly ignored files to be overwritten"
7214msgstr "允许忽略文件中设定的文件可以被覆盖"
7215
7216#: builtin/read-tree.c:132
7217msgid "don't check the working tree after merging"
7218msgstr "合并后不检查工作区"
7219
7220#: builtin/read-tree.c:133
7221msgid "don't update the index or the work tree"
7222msgstr "不更新索引区和工作区"
7223
7224#: builtin/read-tree.c:135
7225msgid "skip applying sparse checkout filter"
7226msgstr "跳过应用稀疏检出过滤器"
7227
7228#: builtin/read-tree.c:137
7229msgid "debug unpack-trees"
7230msgstr "调试 unpack-trees"
7231
7232#: builtin/remote.c:11
7233msgid "git remote [-v | --verbose]"
7234msgstr "git remote [-v | --verbose]"
7235
7236#: builtin/remote.c:12
7237msgid ""
7238"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7239"mirror=<fetch|push>] <name> <url>"
7240msgstr ""
7241"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7242"mirror=<fetch|push>] <名称> <url>"
7243
7244#: builtin/remote.c:13 builtin/remote.c:32
7245msgid "git remote rename <old> <new>"
7246msgstr "git remote rename <旧名称> <新名称>"
7247
7248#: builtin/remote.c:14 builtin/remote.c:37
7249msgid "git remote remove <name>"
7250msgstr "git remote remove <名称>"
7251
7252#: builtin/remote.c:15 builtin/remote.c:42
7253msgid "git remote set-head <name> (-a | -d | <branch>)"
7254msgstr "git remote set-head <名称> (-a | -d | <分支>)"
7255
7256#: builtin/remote.c:16
7257msgid "git remote [-v | --verbose] show [-n] <name>"
7258msgstr "git remote [-v | --verbose] show [-n] <名称>"
7259
7260#: builtin/remote.c:17
7261msgid "git remote prune [-n | --dry-run] <name>"
7262msgstr "git remote prune [-n | --dry-run] <名称>"
7263
7264#: builtin/remote.c:18
7265msgid ""
7266"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7267msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
7268
7269#: builtin/remote.c:19
7270msgid "git remote set-branches [--add] <name> <branch>..."
7271msgstr "git remote set-branches [--add] <名称> <分支>..."
7272
7273#: builtin/remote.c:20 builtin/remote.c:68
7274msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7275msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
7276
7277#: builtin/remote.c:21 builtin/remote.c:69
7278msgid "git remote set-url --add <name> <newurl>"
7279msgstr "git remote set-url --add <名称> <新的地址>"
7280
7281#: builtin/remote.c:22 builtin/remote.c:70
7282msgid "git remote set-url --delete <name> <url>"
7283msgstr "git remote set-url --delete <名称> <地址>"
7284
7285#: builtin/remote.c:27
7286msgid "git remote add [<options>] <name> <url>"
7287msgstr "git remote add [<选项>] <名称> <地址>"
7288
7289#: builtin/remote.c:47
7290msgid "git remote set-branches <name> <branch>..."
7291msgstr "git remote set-branches <名称> <分支>..."
7292
7293#: builtin/remote.c:48
7294msgid "git remote set-branches --add <name> <branch>..."
7295msgstr "git remote set-branches --add <名称> <分支>..."
7296
7297#: builtin/remote.c:53
7298msgid "git remote show [<options>] <name>"
7299msgstr "git remote show [<选项>] <名称>"
7300
7301#: builtin/remote.c:58
7302msgid "git remote prune [<options>] <name>"
7303msgstr "git remote prune [<选项>] <名称>"
7304
7305#: builtin/remote.c:63
7306msgid "git remote update [<options>] [<group> | <remote>]..."
7307msgstr "git remote update [<选项>] [<组> | <远程>]..."
7308
7309#: builtin/remote.c:98
7310#, c-format
7311msgid "Updating %s"
7312msgstr "更新 %s 中"
7313
7314#: builtin/remote.c:130
7315msgid ""
7316"--mirror is dangerous and deprecated; please\n"
7317"\t use --mirror=fetch or --mirror=push instead"
7318msgstr ""
7319"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7320"\t 或 --mirror=push"
7321
7322#: builtin/remote.c:147
7323#, c-format
7324msgid "unknown mirror argument: %s"
7325msgstr "未知的镜像参数:%s"
7326
7327#: builtin/remote.c:163
7328msgid "fetch the remote branches"
7329msgstr "抓取远程的分支"
7330
7331#: builtin/remote.c:165
7332msgid "import all tags and associated objects when fetching"
7333msgstr "抓取时导入所有的 tags 和关联对象"
7334
7335#: builtin/remote.c:168
7336msgid "or do not fetch any tag at all (--no-tags)"
7337msgstr "或不抓取任何 tag(--no-tags)"
7338
7339#: builtin/remote.c:170
7340msgid "branch(es) to track"
7341msgstr "跟踪的分支"
7342
7343#: builtin/remote.c:171
7344msgid "master branch"
7345msgstr "主线分支"
7346
7347#: builtin/remote.c:172
7348msgid "push|fetch"
7349msgstr "push|fetch"
7350
7351#: builtin/remote.c:173
7352msgid "set up remote as a mirror to push to or fetch from"
7353msgstr "把远程设置为用以推送或抓取的镜像"
7354
7355#: builtin/remote.c:185
7356msgid "specifying a master branch makes no sense with --mirror"
7357msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
7358
7359#: builtin/remote.c:187
7360msgid "specifying branches to track makes sense only with fetch mirrors"
7361msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
7362
7363#: builtin/remote.c:195 builtin/remote.c:646
7364#, c-format
7365msgid "remote %s already exists."
7366msgstr "远程 %s 已经存在。"
7367
7368#: builtin/remote.c:199 builtin/remote.c:650
7369#, c-format
7370msgid "'%s' is not a valid remote name"
7371msgstr "'%s' 不是一个有效的远程名称"
7372
7373#: builtin/remote.c:243
7374#, c-format
7375msgid "Could not setup master '%s'"
7376msgstr "无法设置 master '%s'"
7377
7378#: builtin/remote.c:299
7379#, c-format
7380msgid "more than one %s"
7381msgstr "多于一个 %s"
7382
7383#: builtin/remote.c:339
7384#, c-format
7385msgid "Could not get fetch map for refspec %s"
7386msgstr "无法得到引用表达式 %s 的获取列表"
7387
7388#: builtin/remote.c:440 builtin/remote.c:448
7389msgid "(matching)"
7390msgstr "(匹配)"
7391
7392#: builtin/remote.c:452
7393msgid "(delete)"
7394msgstr "(删除)"
7395
7396#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7397#, c-format
7398msgid "Could not append '%s' to '%s'"
7399msgstr "不能添加 '%s' 至 '%s'"
7400
7401#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7402#, c-format
7403msgid "No such remote: %s"
7404msgstr "没有这样的远程:%s"
7405
7406#: builtin/remote.c:656
7407#, c-format
7408msgid "Could not rename config section '%s' to '%s'"
7409msgstr "不能重命名配置小节 '%s' 到 '%s'"
7410
7411#: builtin/remote.c:662 builtin/remote.c:799
7412#, c-format
7413msgid "Could not remove config section '%s'"
7414msgstr "不能移除配置小节 '%s'"
7415
7416#: builtin/remote.c:677
7417#, c-format
7418msgid ""
7419"Not updating non-default fetch refspec\n"
7420"\t%s\n"
7421"\tPlease update the configuration manually if necessary."
7422msgstr ""
7423"没有更新非默认的获取引用表达式\n"
7424"\t%s\n"
7425"\t如果必要请手动更新配置。"
7426
7427#: builtin/remote.c:683
7428#, c-format
7429msgid "Could not append '%s'"
7430msgstr "不能追加 '%s'"
7431
7432#: builtin/remote.c:694
7433#, c-format
7434msgid "Could not set '%s'"
7435msgstr "不能设置 '%s'"
7436
7437#: builtin/remote.c:716
7438#, c-format
7439msgid "deleting '%s' failed"
7440msgstr "删除 '%s' 失败"
7441
7442#: builtin/remote.c:750
7443#, c-format
7444msgid "creating '%s' failed"
7445msgstr "创建 '%s' 失败"
7446
7447#: builtin/remote.c:764
7448#, c-format
7449msgid "Could not remove branch %s"
7450msgstr "无法移除分支 %s"
7451
7452#: builtin/remote.c:834
7453msgid ""
7454"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7455"to delete it, use:"
7456msgid_plural ""
7457"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7458"to delete them, use:"
7459msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7460msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
7461
7462#: builtin/remote.c:943
7463#, c-format
7464msgid " new (next fetch will store in remotes/%s)"
7465msgstr " 新的(下一次获取将存储于 remotes/%s)"
7466
7467#: builtin/remote.c:946
7468msgid " tracked"
7469msgstr " 已跟踪"
7470
7471#: builtin/remote.c:948
7472msgid " stale (use 'git remote prune' to remove)"
7473msgstr " 过时(使用 'git remote prune' 来移除)"
7474
7475#: builtin/remote.c:950
7476msgid " ???"
7477msgstr " ???"
7478
7479#: builtin/remote.c:991
7480#, c-format
7481msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7482msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
7483
7484#: builtin/remote.c:998
7485#, c-format
7486msgid "rebases onto remote %s"
7487msgstr "变基到远程 %s"
7488
7489#: builtin/remote.c:1001
7490#, c-format
7491msgid " merges with remote %s"
7492msgstr " 与远程 %s 合并"
7493
7494#: builtin/remote.c:1002
7495msgid "    and with remote"
7496msgstr "    且有远程"
7497
7498#: builtin/remote.c:1004
7499#, c-format
7500msgid "merges with remote %s"
7501msgstr "与远程 %s 合并"
7502
7503#: builtin/remote.c:1005
7504msgid "   and with remote"
7505msgstr "   且有远程"
7506
7507#: builtin/remote.c:1051
7508msgid "create"
7509msgstr "创建"
7510
7511#: builtin/remote.c:1054
7512msgid "delete"
7513msgstr "删除"
7514
7515#: builtin/remote.c:1058
7516msgid "up to date"
7517msgstr "最新"
7518
7519#: builtin/remote.c:1061
7520msgid "fast-forwardable"
7521msgstr "可快进"
7522
7523#: builtin/remote.c:1064
7524msgid "local out of date"
7525msgstr "本地已过时"
7526
7527#: builtin/remote.c:1071
7528#, c-format
7529msgid "    %-*s forces to %-*s (%s)"
7530msgstr "    %-*s 强制推送至 %-*s (%s)"
7531
7532#: builtin/remote.c:1074
7533#, c-format
7534msgid "    %-*s pushes to %-*s (%s)"
7535msgstr "    %-*s 推送至 %-*s (%s)"
7536
7537#: builtin/remote.c:1078
7538#, c-format
7539msgid "    %-*s forces to %s"
7540msgstr "    %-*s 强制推送至 %s"
7541
7542#: builtin/remote.c:1081
7543#, c-format
7544msgid "    %-*s pushes to %s"
7545msgstr "    %-*s 推送至 %s"
7546
7547#: builtin/remote.c:1091
7548msgid "do not query remotes"
7549msgstr "不查询远程"
7550
7551#: builtin/remote.c:1118
7552#, c-format
7553msgid "* remote %s"
7554msgstr "* 远程 %s"
7555
7556#: builtin/remote.c:1119
7557#, c-format
7558msgid "  Fetch URL: %s"
7559msgstr "  获取地址:%s"
7560
7561#: builtin/remote.c:1120 builtin/remote.c:1285
7562msgid "(no URL)"
7563msgstr "(无 URL)"
7564
7565#: builtin/remote.c:1129 builtin/remote.c:1131
7566#, c-format
7567msgid "  Push  URL: %s"
7568msgstr "  推送地址:%s"
7569
7570#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7571#, c-format
7572msgid "  HEAD branch: %s"
7573msgstr "  HEAD分支:%s"
7574
7575#: builtin/remote.c:1139
7576#, c-format
7577msgid ""
7578"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7579msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
7580
7581#: builtin/remote.c:1151
7582#, c-format
7583msgid "  Remote branch:%s"
7584msgid_plural "  Remote branches:%s"
7585msgstr[0] "  远程分支:%s"
7586msgstr[1] "  远程分支:%s"
7587
7588#  译者:中文字符串拼接,可删除前导空格
7589#: builtin/remote.c:1154 builtin/remote.c:1181
7590msgid " (status not queried)"
7591msgstr "(状态未查询)"
7592
7593#: builtin/remote.c:1163
7594msgid "  Local branch configured for 'git pull':"
7595msgid_plural "  Local branches configured for 'git pull':"
7596msgstr[0] "  为 'git pull' 配置的本地分支:"
7597msgstr[1] "  为 'git pull' 配置的本地分支:"
7598
7599#: builtin/remote.c:1171
7600msgid "  Local refs will be mirrored by 'git push'"
7601msgstr "  本地引用将在 'git push' 时被镜像"
7602
7603#: builtin/remote.c:1178
7604#, c-format
7605msgid "  Local ref configured for 'git push'%s:"
7606msgid_plural "  Local refs configured for 'git push'%s:"
7607msgstr[0] "  为 'git push' 配置的本地引用%s:"
7608msgstr[1] "  为 'git push' 配置的本地引用%s:"
7609
7610#: builtin/remote.c:1199
7611msgid "set refs/remotes/<name>/HEAD according to remote"
7612msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
7613
7614#: builtin/remote.c:1201
7615msgid "delete refs/remotes/<name>/HEAD"
7616msgstr "删除 refs/remotes/<名称>/HEAD"
7617
7618#: builtin/remote.c:1216
7619msgid "Cannot determine remote HEAD"
7620msgstr "无法确定远程 HEAD"
7621
7622#: builtin/remote.c:1218
7623msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7624msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
7625
7626#: builtin/remote.c:1228
7627#, c-format
7628msgid "Could not delete %s"
7629msgstr "无法删除 %s"
7630
7631#: builtin/remote.c:1236
7632#, c-format
7633msgid "Not a valid ref: %s"
7634msgstr "不是一个有效引用:%s"
7635
7636#: builtin/remote.c:1238
7637#, c-format
7638msgid "Could not setup %s"
7639msgstr "不能设置 %s"
7640
7641#  译者:注意保持前导空格
7642#: builtin/remote.c:1274
7643#, c-format
7644msgid " %s will become dangling!"
7645msgstr " %s 将成为摇摆状态!"
7646
7647#  译者:注意保持前导空格
7648#: builtin/remote.c:1275
7649#, c-format
7650msgid " %s has become dangling!"
7651msgstr " %s 已成为摇摆状态!"
7652
7653#: builtin/remote.c:1281
7654#, c-format
7655msgid "Pruning %s"
7656msgstr "修剪 %s"
7657
7658#: builtin/remote.c:1282
7659#, c-format
7660msgid "URL: %s"
7661msgstr "URL:%s"
7662
7663#: builtin/remote.c:1295
7664#, c-format
7665msgid " * [would prune] %s"
7666msgstr " * [将删除] %s"
7667
7668#: builtin/remote.c:1298
7669#, c-format
7670msgid " * [pruned] %s"
7671msgstr " * [已删除] %s"
7672
7673#: builtin/remote.c:1321
7674msgid "prune remotes after fetching"
7675msgstr "抓取后清除远程"
7676
7677#: builtin/remote.c:1387 builtin/remote.c:1461
7678#, c-format
7679msgid "No such remote '%s'"
7680msgstr "没有此远程 '%s'"
7681
7682#: builtin/remote.c:1407
7683msgid "add branch"
7684msgstr "添加分支"
7685
7686#: builtin/remote.c:1414
7687msgid "no remote specified"
7688msgstr "未指定远程"
7689
7690#: builtin/remote.c:1436
7691msgid "manipulate push URLs"
7692msgstr "操作推送 URLS"
7693
7694#: builtin/remote.c:1438
7695msgid "add URL"
7696msgstr "添加 URL"
7697
7698#: builtin/remote.c:1440
7699msgid "delete URLs"
7700msgstr "删除 URLS"
7701
7702#: builtin/remote.c:1447
7703msgid "--add --delete doesn't make sense"
7704msgstr "--add --delete 无意义"
7705
7706#: builtin/remote.c:1487
7707#, c-format
7708msgid "Invalid old URL pattern: %s"
7709msgstr "无效的旧URL匹配模版:%s"
7710
7711#: builtin/remote.c:1495
7712#, c-format
7713msgid "No such URL found: %s"
7714msgstr "未找到此URL:%s"
7715
7716#: builtin/remote.c:1497
7717msgid "Will not delete all non-push URLs"
7718msgstr "将不会删除所有非推送URL地址"
7719
7720#: builtin/remote.c:1569
7721msgid "be verbose; must be placed before a subcommand"
7722msgstr "冗长输出;必须置于子命令之前"
7723
7724#: builtin/replace.c:17
7725msgid "git replace [-f] <object> <replacement>"
7726msgstr "git replace [-f] <对象> <替换物>"
7727
7728#: builtin/replace.c:18
7729msgid "git replace -d <object>..."
7730msgstr "git replace -d <对象>..."
7731
7732#: builtin/replace.c:19
7733msgid "git replace -l [<pattern>]"
7734msgstr "git replace -l [<模式>]"
7735
7736#: builtin/replace.c:121
7737msgid "list replace refs"
7738msgstr "列出替换的引用"
7739
7740#: builtin/replace.c:122
7741msgid "delete replace refs"
7742msgstr "删除替换的引用"
7743
7744#: builtin/replace.c:123
7745msgid "replace the ref if it exists"
7746msgstr "如果存在则替换引用"
7747
7748#: builtin/rerere.c:11
7749msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7750msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
7751
7752#: builtin/rerere.c:56
7753msgid "register clean resolutions in index"
7754msgstr "在索引中注册干净的解决方案"
7755
7756#: builtin/reset.c:25
7757msgid ""
7758"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7759msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
7760
7761#: builtin/reset.c:26
7762msgid "git reset [-q] <tree-ish> [--] <paths>..."
7763msgstr "git reset [-q] <树或提交> [--] <路径>..."
7764
7765#: builtin/reset.c:27
7766msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7767msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
7768
7769#: builtin/reset.c:33
7770msgid "mixed"
7771msgstr "混杂"
7772
7773#: builtin/reset.c:33
7774msgid "soft"
7775msgstr "软性"
7776
7777#: builtin/reset.c:33
7778msgid "hard"
7779msgstr "硬性"
7780
7781#: builtin/reset.c:33
7782msgid "merge"
7783msgstr "合并"
7784
7785#: builtin/reset.c:33
7786msgid "keep"
7787msgstr "保持"
7788
7789#: builtin/reset.c:73
7790msgid "You do not have a valid HEAD."
7791msgstr "您没有一个有效的 HEAD。"
7792
7793#: builtin/reset.c:75
7794msgid "Failed to find tree of HEAD."
7795msgstr "无法找到 HEAD 指向的树。"
7796
7797#: builtin/reset.c:81
7798#, c-format
7799msgid "Failed to find tree of %s."
7800msgstr "无法找到 %s 指向的树。"
7801
7802#: builtin/reset.c:98
7803#, c-format
7804msgid "HEAD is now at %s"
7805msgstr "HEAD 现在位于 %s"
7806
7807#  译者:汉字之间无空格,故删除%s前后空格
7808#: builtin/reset.c:169
7809#, c-format
7810msgid "Cannot do a %s reset in the middle of a merge."
7811msgstr "在合并过程中不能做%s重置操作。"
7812
7813#: builtin/reset.c:248
7814msgid "be quiet, only report errors"
7815msgstr "安静模式,只报告错误"
7816
7817#: builtin/reset.c:250
7818msgid "reset HEAD and index"
7819msgstr "重置 HEAD 和索引"
7820
7821#: builtin/reset.c:251
7822msgid "reset only HEAD"
7823msgstr "只重置 HEAD"
7824
7825#: builtin/reset.c:253 builtin/reset.c:255
7826msgid "reset HEAD, index and working tree"
7827msgstr "重置 HEAD、索引和工作区"
7828
7829#: builtin/reset.c:257
7830msgid "reset HEAD but keep local changes"
7831msgstr "重置 HEAD 但保存本地变更"
7832
7833#: builtin/reset.c:275
7834#, c-format
7835msgid "Failed to resolve '%s' as a valid revision."
7836msgstr "无法将 '%s' 解析为一个有效的版本。"
7837
7838#: builtin/reset.c:278 builtin/reset.c:286
7839#, c-format
7840msgid "Could not parse object '%s'."
7841msgstr "不能解析对象 '%s'。"
7842
7843#: builtin/reset.c:283
7844#, c-format
7845msgid "Failed to resolve '%s' as a valid tree."
7846msgstr "无法将 '%s' 解析为一个有效的树对象。"
7847
7848#: builtin/reset.c:292
7849msgid "--patch is incompatible with --{hard,mixed,soft}"
7850msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
7851
7852#: builtin/reset.c:301
7853msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7854msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
7855
7856#  译者:汉字之间无空格,故删除%s前后空格
7857#: builtin/reset.c:303
7858#, c-format
7859msgid "Cannot do %s reset with paths."
7860msgstr "不能带路径进行%s重置。"
7861
7862#  译者:汉字之间无空格,故删除%s前后空格
7863#: builtin/reset.c:313
7864#, c-format
7865msgid "%s reset is not allowed in a bare repository"
7866msgstr "不能对裸版本库进行%s重置"
7867
7868#: builtin/reset.c:333
7869#, c-format
7870msgid "Could not reset index file to revision '%s'."
7871msgstr "不能重置索引文件至版本 '%s'。"
7872
7873#: builtin/reset.c:339
7874msgid "Unstaged changes after reset:"
7875msgstr "重置后撤出暂存区的变更:"
7876
7877#: builtin/reset.c:344
7878msgid "Could not write new index file."
7879msgstr "不能写入新的索引文件。"
7880
7881#: builtin/rev-parse.c:339
7882msgid "git rev-parse --parseopt [options] -- [<args>...]"
7883msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
7884
7885#: builtin/rev-parse.c:344
7886msgid "keep the `--` passed as an arg"
7887msgstr "保持 `--` 作为一个参数传递"
7888
7889#: builtin/rev-parse.c:346
7890msgid "stop parsing after the first non-option argument"
7891msgstr "遇到第一个非选项参数后停止解析"
7892
7893#: builtin/rev-parse.c:464
7894msgid ""
7895"git rev-parse --parseopt [options] -- [<args>...]\n"
7896"   or: git rev-parse --sq-quote [<arg>...]\n"
7897"   or: git rev-parse [options] [<arg>...]\n"
7898"\n"
7899"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7900msgstr ""
7901"git rev-parse --parseopt [选项] -- [<参数>...]\n"
7902"   或者:git rev-parse --sq-quote [<选项>...]\n"
7903"   或者:git rev-parse [options] [<选项>...]\n"
7904"\n"
7905"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
7906
7907#: builtin/revert.c:22
7908msgid "git revert [options] <commit-ish>"
7909msgstr "git revert [选项] <提交号>"
7910
7911#: builtin/revert.c:23
7912msgid "git revert <subcommand>"
7913msgstr "git revert <子命令>"
7914
7915#: builtin/revert.c:28
7916msgid "git cherry-pick [options] <commit-ish>"
7917msgstr "git cherry-pick [选项] <提交号>"
7918
7919#: builtin/revert.c:29
7920msgid "git cherry-pick <subcommand>"
7921msgstr "git cherry-pick <子命令>"
7922
7923#: builtin/revert.c:70 builtin/revert.c:92
7924#, c-format
7925msgid "%s: %s cannot be used with %s"
7926msgstr "%s:%s 不能和 %s 同时使用"
7927
7928#: builtin/revert.c:103
7929msgid "end revert or cherry-pick sequence"
7930msgstr "终止反转或拣选操作"
7931
7932#: builtin/revert.c:104
7933msgid "resume revert or cherry-pick sequence"
7934msgstr "继续反转或拣选操作"
7935
7936#: builtin/revert.c:105
7937msgid "cancel revert or cherry-pick sequence"
7938msgstr "取消反转或拣选操作"
7939
7940#: builtin/revert.c:106
7941msgid "don't automatically commit"
7942msgstr "不要自动提交"
7943
7944#: builtin/revert.c:107
7945msgid "edit the commit message"
7946msgstr "编辑提交说明"
7947
7948#: builtin/revert.c:110
7949msgid "parent number"
7950msgstr "父编号"
7951
7952#: builtin/revert.c:112
7953msgid "merge strategy"
7954msgstr "合并策略"
7955
7956#: builtin/revert.c:113
7957msgid "option"
7958msgstr "选项"
7959
7960#: builtin/revert.c:114
7961msgid "option for merge strategy"
7962msgstr "合并策略的选项"
7963
7964#: builtin/revert.c:125
7965msgid "append commit name"
7966msgstr "追加提交名称"
7967
7968#: builtin/revert.c:126
7969msgid "allow fast-forward"
7970msgstr "允许快进式"
7971
7972#: builtin/revert.c:127
7973msgid "preserve initially empty commits"
7974msgstr "保留初始化的空提交"
7975
7976#: builtin/revert.c:128
7977msgid "allow commits with empty messages"
7978msgstr "允许提交说明为空"
7979
7980#: builtin/revert.c:129
7981msgid "keep redundant, empty commits"
7982msgstr "保持多余的、空的提交"
7983
7984#: builtin/revert.c:133
7985msgid "program error"
7986msgstr "程序错误"
7987
7988#: builtin/revert.c:223
7989msgid "revert failed"
7990msgstr "还原失败"
7991
7992#: builtin/revert.c:238
7993msgid "cherry-pick failed"
7994msgstr "拣选失败"
7995
7996#: builtin/rm.c:15
7997msgid "git rm [options] [--] <file>..."
7998msgstr "git rm [选项] [--] <文件>..."
7999
8000#: builtin/rm.c:64 builtin/rm.c:186
8001#, c-format
8002msgid ""
8003"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8004"(use 'rm -rf' if you really want to remove it including all of its history)"
8005msgstr ""
8006"子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8007"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8008
8009#: builtin/rm.c:174
8010#, c-format
8011msgid ""
8012"'%s' has staged content different from both the file and the HEAD\n"
8013"(use -f to force removal)"
8014msgstr ""
8015"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
8016"(使用 -f 强制删除)"
8017
8018#: builtin/rm.c:180
8019#, c-format
8020msgid ""
8021"'%s' has changes staged in the index\n"
8022"(use --cached to keep the file, or -f to force removal)"
8023msgstr ""
8024"'%s' 有变更已暂存至索引中\n"
8025"(使用 --cached 保存文件,或用 -f 强制删除)"
8026
8027#: builtin/rm.c:191
8028#, c-format
8029msgid ""
8030"'%s' has local modifications\n"
8031"(use --cached to keep the file, or -f to force removal)"
8032msgstr ""
8033"'%s' 有本地修改\n"
8034"(使用 --cached 保存文件,或用 -f 强制删除)"
8035
8036#: builtin/rm.c:207
8037msgid "do not list removed files"
8038msgstr "不列出删除的文件"
8039
8040#: builtin/rm.c:208
8041msgid "only remove from the index"
8042msgstr "只从索引区删除"
8043
8044#: builtin/rm.c:209
8045msgid "override the up-to-date check"
8046msgstr "忽略文件更新状态检查"
8047
8048#: builtin/rm.c:210
8049msgid "allow recursive removal"
8050msgstr "允许递归删除"
8051
8052#: builtin/rm.c:212
8053msgid "exit with a zero status even if nothing matched"
8054msgstr "即使没有匹配,也以零状态退出"
8055
8056#: builtin/rm.c:283
8057#, c-format
8058msgid "not removing '%s' recursively without -r"
8059msgstr "未提供 -r 选项不会递归删除 '%s'"
8060
8061#: builtin/rm.c:322
8062#, c-format
8063msgid "git rm: unable to remove %s"
8064msgstr "git rm:不能删除 %s"
8065
8066#: builtin/shortlog.c:13
8067msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
8068msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
8069
8070#: builtin/shortlog.c:133
8071#, c-format
8072msgid "Missing author: %s"
8073msgstr "缺少作者:%s"
8074
8075#: builtin/shortlog.c:229
8076msgid "sort output according to the number of commits per author"
8077msgstr "根据每个作者的提交数量排序"
8078
8079#: builtin/shortlog.c:231
8080msgid "Suppress commit descriptions, only provides commit count"
8081msgstr "隐藏提交说明,只提供提交数量"
8082
8083#: builtin/shortlog.c:233
8084msgid "Show the email address of each author"
8085msgstr "显示每个作者的电子邮件地址"
8086
8087#: builtin/shortlog.c:234
8088msgid "w[,i1[,i2]]"
8089msgstr "w[,i1[,i2]]"
8090
8091#: builtin/shortlog.c:235
8092msgid "Linewrap output"
8093msgstr "折行输出"
8094
8095#: builtin/show-branch.c:9
8096msgid ""
8097"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8098"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8099"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8100"<glob>)...]"
8101msgstr ""
8102"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8103"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8104"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8105"<glob>)...]"
8106
8107#: builtin/show-branch.c:10
8108msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8109msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8110
8111#: builtin/show-branch.c:651
8112msgid "show remote-tracking and local branches"
8113msgstr "显示远程跟踪的和本地的分支"
8114
8115#: builtin/show-branch.c:653
8116msgid "show remote-tracking branches"
8117msgstr "显示远程跟踪的分支"
8118
8119#: builtin/show-branch.c:655
8120msgid "color '*!+-' corresponding to the branch"
8121msgstr "着色 '*!+-' 到相应的分支"
8122
8123#: builtin/show-branch.c:657
8124msgid "show <n> more commits after the common ancestor"
8125msgstr "显示共同祖先后的 <n> 个提交"
8126
8127#: builtin/show-branch.c:659
8128msgid "synonym to more=-1"
8129msgstr "和 more=-1 同义"
8130
8131#: builtin/show-branch.c:660
8132msgid "suppress naming strings"
8133msgstr "不显示字符串命名"
8134
8135#: builtin/show-branch.c:662
8136msgid "include the current branch"
8137msgstr "包括当前分支"
8138
8139#: builtin/show-branch.c:664
8140msgid "name commits with their object names"
8141msgstr "以对象名字命名提交"
8142
8143#: builtin/show-branch.c:666
8144msgid "show possible merge bases"
8145msgstr "显示可能合并的基线"
8146
8147#: builtin/show-branch.c:668
8148msgid "show refs unreachable from any other ref"
8149msgstr "显示没有任何引用的的引用"
8150
8151#: builtin/show-branch.c:670
8152msgid "show commits in topological order"
8153msgstr "以拓扑顺序显示提交"
8154
8155#: builtin/show-branch.c:672
8156msgid "show only commits not on the first branch"
8157msgstr "只显示不在第一个分支上的提交"
8158
8159#: builtin/show-branch.c:674
8160msgid "show merges reachable from only one tip"
8161msgstr "显示仅一个分支可访问的合并提交"
8162
8163#: builtin/show-branch.c:676
8164msgid "show commits where no parent comes before its children"
8165msgstr "显示提交时以时间为序且父提交不能领先子提交"
8166
8167#: builtin/show-branch.c:678
8168msgid "<n>[,<base>]"
8169msgstr "<n>[,<base>]"
8170
8171#: builtin/show-branch.c:679
8172msgid "show <n> most recent ref-log entries starting at base"
8173msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
8174
8175#: builtin/show-ref.c:10
8176msgid ""
8177"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8178"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8179msgstr ""
8180"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8181"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8182
8183#: builtin/show-ref.c:11
8184msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8185msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
8186
8187#: builtin/show-ref.c:165
8188msgid "only show tags (can be combined with heads)"
8189msgstr "只显示 tags(可以和头共用)"
8190
8191#: builtin/show-ref.c:166
8192msgid "only show heads (can be combined with tags)"
8193msgstr "只显示头(可以和 tags 共用)"
8194
8195#: builtin/show-ref.c:167
8196msgid "stricter reference checking, requires exact ref path"
8197msgstr "更严格的引用检测,需要精确的引用路径"
8198
8199#: builtin/show-ref.c:170 builtin/show-ref.c:172
8200msgid "show the HEAD reference"
8201msgstr "显示 HEAD 引用"
8202
8203#: builtin/show-ref.c:174
8204msgid "dereference tags into object IDs"
8205msgstr "转换 tags 到对象ID"
8206
8207#: builtin/show-ref.c:176
8208msgid "only show SHA1 hash using <n> digits"
8209msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
8210
8211#: builtin/show-ref.c:180
8212msgid "do not print results to stdout (useful with --verify)"
8213msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
8214
8215#: builtin/show-ref.c:182
8216msgid "show refs from stdin that aren't in local repository"
8217msgstr "显示从标准输入中读入的不在本地版本库中的引用"
8218
8219#: builtin/symbolic-ref.c:7
8220msgid "git symbolic-ref [options] name [ref]"
8221msgstr "git symbolic-ref [选项] 名称 [引用]"
8222
8223#: builtin/symbolic-ref.c:8
8224msgid "git symbolic-ref -d [-q] name"
8225msgstr "git symbolic-ref -d [-q] 名称"
8226
8227#: builtin/symbolic-ref.c:40
8228msgid "suppress error message for non-symbolic (detached) refs"
8229msgstr "不显示非符号(分离的)引用的错误信息"
8230
8231#: builtin/symbolic-ref.c:41
8232msgid "delete symbolic ref"
8233msgstr "删除符号引用"
8234
8235#: builtin/symbolic-ref.c:42
8236msgid "shorten ref output"
8237msgstr "简短的引用输出"
8238
8239#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8240msgid "reason"
8241msgstr "原因"
8242
8243#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8244msgid "reason of the update"
8245msgstr "更新的原因"
8246
8247#: builtin/tag.c:22
8248msgid ""
8249"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8250msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
8251
8252#: builtin/tag.c:23
8253msgid "git tag -d <tagname>..."
8254msgstr "git tag -d <标签名>..."
8255
8256#: builtin/tag.c:24
8257msgid ""
8258"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8259"\t\t[<pattern>...]"
8260msgstr ""
8261"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8262"\t\t[<模式>...]"
8263
8264#: builtin/tag.c:26
8265msgid "git tag -v <tagname>..."
8266msgstr "git tag -v <标签名>..."
8267
8268#: builtin/tag.c:60
8269#, c-format
8270msgid "malformed object at '%s'"
8271msgstr "非法的对象于 '%s'"
8272
8273#: builtin/tag.c:207
8274#, c-format
8275msgid "tag name too long: %.*s..."
8276msgstr "tag 名字太长:%.*s..."
8277
8278#: builtin/tag.c:212
8279#, c-format
8280msgid "tag '%s' not found."
8281msgstr "tag '%s' 未发现。"
8282
8283#: builtin/tag.c:227
8284#, c-format
8285msgid "Deleted tag '%s' (was %s)\n"
8286msgstr "已删除 tag '%s'(曾为 %s)\n"
8287
8288#: builtin/tag.c:239
8289#, c-format
8290msgid "could not verify the tag '%s'"
8291msgstr "不能校验 tag '%s'"
8292
8293#: builtin/tag.c:249
8294#, c-format
8295msgid ""
8296"\n"
8297"Write a tag message\n"
8298"Lines starting with '%c' will be ignored.\n"
8299msgstr ""
8300"\n"
8301"输入一个 tag 说明\n"
8302"以 '%c' 开头的行将被忽略。\n"
8303
8304#: builtin/tag.c:253
8305#, c-format
8306msgid ""
8307"\n"
8308"Write a tag message\n"
8309"Lines starting with '%c' will be kept; you may remove them yourself if you "
8310"want to.\n"
8311msgstr ""
8312"\n"
8313"输入一个 tag 说明\n"
8314"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
8315
8316#: builtin/tag.c:292
8317msgid "unable to sign the tag"
8318msgstr "无法签署 tag"
8319
8320#: builtin/tag.c:294
8321msgid "unable to write tag file"
8322msgstr "无法写 tag 文件"
8323
8324#: builtin/tag.c:319
8325msgid "bad object type."
8326msgstr "坏的对象类型。"
8327
8328#: builtin/tag.c:332
8329msgid "tag header too big."
8330msgstr "tag 头信息太大。"
8331
8332#: builtin/tag.c:368
8333msgid "no tag message?"
8334msgstr "无 tag 说明?"
8335
8336#: builtin/tag.c:374
8337#, c-format
8338msgid "The tag message has been left in %s\n"
8339msgstr "tag 说明被保留在 %s\n"
8340
8341#: builtin/tag.c:423
8342msgid "switch 'points-at' requires an object"
8343msgstr "开关 'points-at' 需要一个对象"
8344
8345#: builtin/tag.c:425
8346#, c-format
8347msgid "malformed object name '%s'"
8348msgstr "非法的对象名 '%s'"
8349
8350#: builtin/tag.c:445
8351msgid "list tag names"
8352msgstr "列出tag名称"
8353
8354#: builtin/tag.c:447
8355msgid "print <n> lines of each tag message"
8356msgstr "每个 tag 信息打印 <n> 行"
8357
8358#: builtin/tag.c:449
8359msgid "delete tags"
8360msgstr "删除 tags"
8361
8362#: builtin/tag.c:450
8363msgid "verify tags"
8364msgstr "验证 tags"
8365
8366#: builtin/tag.c:452
8367msgid "Tag creation options"
8368msgstr "Tag 创建选项"
8369
8370#: builtin/tag.c:454
8371msgid "annotated tag, needs a message"
8372msgstr "注解 tag,需要一个说明"
8373
8374#: builtin/tag.c:456
8375msgid "tag message"
8376msgstr "tag 说明"
8377
8378#: builtin/tag.c:458
8379msgid "annotated and GPG-signed tag"
8380msgstr "注解并 GPG 签名的 tag"
8381
8382#: builtin/tag.c:462
8383msgid "use another key to sign the tag"
8384msgstr "使用另外的私钥签名 tag"
8385
8386#: builtin/tag.c:463
8387msgid "replace the tag if exists"
8388msgstr "如果存在,替换现有的 tag"
8389
8390#: builtin/tag.c:464
8391msgid "show tag list in columns"
8392msgstr "以列的方式显示 tag"
8393
8394#: builtin/tag.c:466
8395msgid "Tag listing options"
8396msgstr "Tag 列表选项"
8397
8398#: builtin/tag.c:469
8399msgid "print only tags that contain the commit"
8400msgstr "只打印包含提交的tags"
8401
8402#: builtin/tag.c:475
8403msgid "print only tags of the object"
8404msgstr "只打印tags对象"
8405
8406#: builtin/tag.c:504
8407msgid "--column and -n are incompatible"
8408msgstr "--column 和 -n 不兼容"
8409
8410#: builtin/tag.c:521
8411msgid "-n option is only allowed with -l."
8412msgstr "-n 选项只允许和 -l 同时使用。"
8413
8414#: builtin/tag.c:523
8415msgid "--contains option is only allowed with -l."
8416msgstr "--contains 选项只允许和 -l 同时使用。"
8417
8418#: builtin/tag.c:525
8419msgid "--points-at option is only allowed with -l."
8420msgstr "--points-at 选项只允许和 -l 同时使用。"
8421
8422#: builtin/tag.c:533
8423msgid "only one -F or -m option is allowed."
8424msgstr "只允许一个 -F 或 -m 选项。"
8425
8426#: builtin/tag.c:553
8427msgid "too many params"
8428msgstr "太多参数"
8429
8430#: builtin/tag.c:559
8431#, c-format
8432msgid "'%s' is not a valid tag name."
8433msgstr "'%s' 不是一个有效的tag名称。"
8434
8435#: builtin/tag.c:564
8436#, c-format
8437msgid "tag '%s' already exists"
8438msgstr "tag '%s' 已存在"
8439
8440#: builtin/tag.c:582
8441#, c-format
8442msgid "%s: cannot lock the ref"
8443msgstr "%s:不能锁定引用"
8444
8445#: builtin/tag.c:584
8446#, c-format
8447msgid "%s: cannot update the ref"
8448msgstr "%s:不能更新引用"
8449
8450#: builtin/tag.c:586
8451#, c-format
8452msgid "Updated tag '%s' (was %s)\n"
8453msgstr "已更新tag '%s'(曾为 %s)\n"
8454
8455#: builtin/update-index.c:401
8456msgid "git update-index [options] [--] [<file>...]"
8457msgstr "git update-index [选项] [--] [<文件>...]"
8458
8459#: builtin/update-index.c:718
8460msgid "continue refresh even when index needs update"
8461msgstr "当索引需要更新时继续刷新"
8462
8463#: builtin/update-index.c:721
8464msgid "refresh: ignore submodules"
8465msgstr "刷新:忽略子模组"
8466
8467#: builtin/update-index.c:724
8468msgid "do not ignore new files"
8469msgstr "不忽略新的文件"
8470
8471#: builtin/update-index.c:726
8472msgid "let files replace directories and vice-versa"
8473msgstr "让文件替换目录(反之亦然)"
8474
8475#: builtin/update-index.c:728
8476msgid "notice files missing from worktree"
8477msgstr "通知文件从工作区丢失"
8478
8479#: builtin/update-index.c:730
8480msgid "refresh even if index contains unmerged entries"
8481msgstr "即使索引区包含未合并的条目也执行刷新"
8482
8483#: builtin/update-index.c:733
8484msgid "refresh stat information"
8485msgstr "刷新统计信息"
8486
8487#: builtin/update-index.c:737
8488msgid "like --refresh, but ignore assume-unchanged setting"
8489msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
8490
8491#: builtin/update-index.c:741
8492msgid "<mode> <object> <path>"
8493msgstr "<mode> <object> <path>"
8494
8495#: builtin/update-index.c:742
8496msgid "add the specified entry to the index"
8497msgstr "添加指定的条目到索引区"
8498
8499#: builtin/update-index.c:746
8500msgid "(+/-)x"
8501msgstr "(+/-)x"
8502
8503#: builtin/update-index.c:747
8504msgid "override the executable bit of the listed files"
8505msgstr "覆盖列表里文件的可执行位"
8506
8507#: builtin/update-index.c:751
8508msgid "mark files as \"not changing\""
8509msgstr "把文件标记为 \"没有变更\""
8510
8511#: builtin/update-index.c:754
8512msgid "clear assumed-unchanged bit"
8513msgstr "清除 assumed-unchanged 位"
8514
8515#: builtin/update-index.c:757
8516msgid "mark files as \"index-only\""
8517msgstr "把文件标记为 \"仅索引\""
8518
8519#: builtin/update-index.c:760
8520msgid "clear skip-worktree bit"
8521msgstr "清除 skip-worktree 位"
8522
8523#: builtin/update-index.c:763
8524msgid "add to index only; do not add content to object database"
8525msgstr "只添加到索引区;不添加对象到对象库"
8526
8527#: builtin/update-index.c:765
8528msgid "remove named paths even if present in worktree"
8529msgstr "即使存在工作区里,也删除路径"
8530
8531#: builtin/update-index.c:767
8532msgid "with --stdin: input lines are terminated by null bytes"
8533msgstr "携带 --stdin:输入的行以 null 字符终止"
8534
8535#: builtin/update-index.c:769
8536msgid "read list of paths to be updated from standard input"
8537msgstr "从标准输入中读取需要更新的路径列表"
8538
8539#: builtin/update-index.c:773
8540msgid "add entries from standard input to the index"
8541msgstr "从标准输入添加条目到索引区"
8542
8543#: builtin/update-index.c:777
8544msgid "repopulate stages #2 and #3 for the listed paths"
8545msgstr "为指定文件重新生成第2和第3暂存区"
8546
8547#: builtin/update-index.c:781
8548msgid "only update entries that differ from HEAD"
8549msgstr "只更新与 HEAD 不同的条目"
8550
8551#: builtin/update-index.c:785
8552msgid "ignore files missing from worktree"
8553msgstr "忽略工作区丢失的文件"
8554
8555#: builtin/update-index.c:788
8556msgid "report actions to standard output"
8557msgstr "在标准输出显示操作"
8558
8559#: builtin/update-index.c:790
8560msgid "(for porcelains) forget saved unresolved conflicts"
8561msgstr "(for porcelains) 忘记保存的未解决的冲突"
8562
8563#: builtin/update-index.c:794
8564msgid "write index in this format"
8565msgstr "以这种格式写入索引区"
8566
8567#: builtin/update-ref.c:7
8568msgid "git update-ref [options] -d <refname> [<oldval>]"
8569msgstr "git update-ref [options] -d <引用名> [<旧值>]"
8570
8571#: builtin/update-ref.c:8
8572msgid "git update-ref [options]    <refname> <newval> [<oldval>]"
8573msgstr "git update-ref [options]    <引用名> <新值> [<旧值>]"
8574
8575#: builtin/update-ref.c:19
8576msgid "delete the reference"
8577msgstr "删除引用"
8578
8579#: builtin/update-ref.c:21
8580msgid "update <refname> not the one it points to"
8581msgstr "更新 <引用名> 本身而不是它指向的引用"
8582
8583#: builtin/update-server-info.c:6
8584msgid "git update-server-info [--force]"
8585msgstr "git update-server-info [--force]"
8586
8587#: builtin/update-server-info.c:14
8588msgid "update the info files from scratch"
8589msgstr "从头开始更新文件信息"
8590
8591#: builtin/verify-pack.c:56
8592msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8593msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8594
8595#: builtin/verify-pack.c:66
8596msgid "verbose"
8597msgstr "冗长输出"
8598
8599#: builtin/verify-pack.c:68
8600msgid "show statistics only"
8601msgstr "只显示统计"
8602
8603#: builtin/verify-tag.c:17
8604msgid "git verify-tag [-v|--verbose] <tag>..."
8605msgstr "git verify-tag [-v|--verbose] <tag>..."
8606
8607#: builtin/verify-tag.c:73
8608msgid "print tag contents"
8609msgstr "打印 tag 内容"
8610
8611#: builtin/write-tree.c:13
8612msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8613msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
8614
8615#: builtin/write-tree.c:26
8616msgid "<prefix>/"
8617msgstr "<前缀>/"
8618
8619#: builtin/write-tree.c:27
8620msgid "write tree object for a subdirectory <prefix>"
8621msgstr "将 <前缀> 子目录内容写到一个树对象"
8622
8623#: builtin/write-tree.c:30
8624msgid "only useful for debugging"
8625msgstr "只对调试有用"
8626
8627#: git.c:16
8628msgid "See 'git help <command>' for more information on a specific command."
8629msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8630
8631#: parse-options.h:156
8632msgid "no-op (backward compatibility)"
8633msgstr "空操作(向后兼容)"
8634
8635#: parse-options.h:232
8636msgid "be more verbose"
8637msgstr "更加详细"
8638
8639#: parse-options.h:234
8640msgid "be more quiet"
8641msgstr "更加安静"
8642
8643#: parse-options.h:240
8644msgid "use <n> digits to display SHA-1s"
8645msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8646
8647#: common-cmds.h:8
8648msgid "Add file contents to the index"
8649msgstr "添加文件内容至索引"
8650
8651#: common-cmds.h:9
8652msgid "Find by binary search the change that introduced a bug"
8653msgstr "通过二分查找定位引入 bug 的变更"
8654
8655#: common-cmds.h:10
8656msgid "List, create, or delete branches"
8657msgstr "列出、创建或删除分支"
8658
8659#: common-cmds.h:11
8660msgid "Checkout a branch or paths to the working tree"
8661msgstr "检出一个分支或路径到工作区"
8662
8663#: common-cmds.h:12
8664msgid "Clone a repository into a new directory"
8665msgstr "克隆一个版本库到一个新目录"
8666
8667#: common-cmds.h:13
8668msgid "Record changes to the repository"
8669msgstr "记录变更到版本库"
8670
8671#: common-cmds.h:14
8672msgid "Show changes between commits, commit and working tree, etc"
8673msgstr "显示提交之间、提交和工作区之间等的差异"
8674
8675#: common-cmds.h:15
8676msgid "Download objects and refs from another repository"
8677msgstr "从另外一个版本库下载对象和引用"
8678
8679#: common-cmds.h:16
8680msgid "Print lines matching a pattern"
8681msgstr "输出和模式匹配的行"
8682
8683#: common-cmds.h:17
8684msgid "Create an empty Git repository or reinitialize an existing one"
8685msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8686
8687#: common-cmds.h:18
8688msgid "Show commit logs"
8689msgstr "显示提交日志"
8690
8691#: common-cmds.h:19
8692msgid "Join two or more development histories together"
8693msgstr "合并两个或更多开发历史"
8694
8695#: common-cmds.h:20
8696msgid "Move or rename a file, a directory, or a symlink"
8697msgstr "移动或重命名一个文件、目录或符号链接"
8698
8699#: common-cmds.h:21
8700msgid "Fetch from and merge with another repository or a local branch"
8701msgstr "获取并合并另外的版本库或一个本地分支"
8702
8703#: common-cmds.h:22
8704msgid "Update remote refs along with associated objects"
8705msgstr "更新远程引用和相关的对象"
8706
8707#: common-cmds.h:23
8708msgid "Forward-port local commits to the updated upstream head"
8709msgstr "本地提交转移至更新后的上游分支中"
8710
8711#: common-cmds.h:24
8712msgid "Reset current HEAD to the specified state"
8713msgstr "重置当前HEAD到指定状态"
8714
8715#: common-cmds.h:25
8716msgid "Remove files from the working tree and from the index"
8717msgstr "从工作区和索引中删除文件"
8718
8719#: common-cmds.h:26
8720msgid "Show various types of objects"
8721msgstr "显示各种类型的对象"
8722
8723#: common-cmds.h:27
8724msgid "Show the working tree status"
8725msgstr "显示工作区状态"
8726
8727#: common-cmds.h:28
8728msgid "Create, list, delete or verify a tag object signed with GPG"
8729msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8730
8731#: git-am.sh:50
8732msgid "You need to set your committer info first"
8733msgstr "您需要先设置你的提交者信息"
8734
8735#: git-am.sh:95
8736msgid ""
8737"You seem to have moved HEAD since the last 'am' failure.\n"
8738"Not rewinding to ORIG_HEAD"
8739msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8740
8741#: git-am.sh:105
8742#, sh-format
8743msgid ""
8744"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8745"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8746"To restore the original branch and stop patching, run \"$cmdline --abort\"."
8747msgstr ""
8748"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8749"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8750"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8751
8752#: git-am.sh:121
8753msgid "Cannot fall back to three-way merge."
8754msgstr "无法求助于三路合并。"
8755
8756#: git-am.sh:137
8757msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8758msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
8759
8760#: git-am.sh:139
8761msgid "Using index info to reconstruct a base tree..."
8762msgstr "更新索引信息以重建基树..."
8763
8764#: git-am.sh:154
8765msgid ""
8766"Did you hand edit your patch?\n"
8767"It does not apply to blobs recorded in its index."
8768msgstr ""
8769"您是否曾手动编辑过您的补丁?\n"
8770"无法应用补丁到索引中的数据(blob)对象上。"
8771
8772#: git-am.sh:163
8773msgid "Falling back to patching base and 3-way merge..."
8774msgstr "转而在基础版本上打补丁及进行三路合并..."
8775
8776#: git-am.sh:179
8777msgid "Failed to merge in the changes."
8778msgstr "无法合并变更。"
8779
8780#: git-am.sh:274
8781msgid "Only one StGIT patch series can be applied at once"
8782msgstr "一次只能有一个 StGIT 补丁队列被应用"
8783
8784#: git-am.sh:361
8785#, sh-format
8786msgid "Patch format $patch_format is not supported."
8787msgstr "不支持 $patch_format 补丁格式。"
8788
8789#: git-am.sh:363
8790msgid "Patch format detection failed."
8791msgstr "补丁格式检测失败。"
8792
8793#: git-am.sh:389
8794msgid ""
8795"The -b/--binary option has been a no-op for long time, and\n"
8796"it will be removed. Please do not use it anymore."
8797msgstr ""
8798"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8799"请不要再使用它了。"
8800
8801#: git-am.sh:477
8802#, sh-format
8803msgid "previous rebase directory $dotest still exists but mbox given."
8804msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8805
8806#: git-am.sh:482
8807msgid "Please make up your mind. --skip or --abort?"
8808msgstr "请下决心。--skip 或是 --abort ?"
8809
8810#: git-am.sh:509
8811msgid "Resolve operation not in progress, we are not resuming."
8812msgstr "解决操作未进行,我们不会继续。"
8813
8814#: git-am.sh:575
8815#, sh-format
8816msgid "Dirty index: cannot apply patches (dirty: $files)"
8817msgstr "脏的索引:不能应用补丁(脏文件:$files)"
8818
8819#: git-am.sh:679
8820#, sh-format
8821msgid ""
8822"Patch is empty.  Was it split wrong?\n"
8823"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8824"To restore the original branch and stop patching run \"$cmdline --abort\"."
8825msgstr ""
8826"补丁为空。是不是切分错误?\n"
8827"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
8828"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8829
8830#: git-am.sh:706
8831msgid "Patch does not have a valid e-mail address."
8832msgstr "补丁中没有一个有效的邮件地址。"
8833
8834#: git-am.sh:753
8835msgid "cannot be interactive without stdin connected to a terminal."
8836msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8837
8838#: git-am.sh:757
8839msgid "Commit Body is:"
8840msgstr "提交内容为:"
8841
8842#  译者:注意保持句尾空格
8843#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8844#. in your translation. The program will only accept English
8845#. input at this point.
8846#: git-am.sh:764
8847msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8848msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8849
8850#: git-am.sh:800
8851#, sh-format
8852msgid "Applying: $FIRSTLINE"
8853msgstr "正应用:$FIRSTLINE"
8854
8855#: git-am.sh:821
8856msgid ""
8857"No changes - did you forget to use 'git add'?\n"
8858"If there is nothing left to stage, chances are that something else\n"
8859"already introduced the same changes; you might want to skip this patch."
8860msgstr ""
8861"没有变更 —— 您是不是忘了执行 'git add'?\n"
8862"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8863"您也许想要跳过这个补丁。"
8864
8865#: git-am.sh:829
8866msgid ""
8867"You still have unmerged paths in your index\n"
8868"did you forget to use 'git add'?"
8869msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
8870
8871#: git-am.sh:845
8872msgid "No changes -- Patch already applied."
8873msgstr "没有变更 -- 补丁已经应用过。"
8874
8875#: git-am.sh:855
8876#, sh-format
8877msgid "Patch failed at $msgnum $FIRSTLINE"
8878msgstr "补丁失败于 $msgnum $FIRSTLINE"
8879
8880#: git-am.sh:858
8881#, sh-format
8882msgid ""
8883"The copy of the patch that failed is found in:\n"
8884"   $dotest/patch"
8885msgstr ""
8886"失败的补丁文件副本位于:\n"
8887"   $dotest/patch"
8888
8889#: git-am.sh:876
8890msgid "applying to an empty history"
8891msgstr "正应用到一个空历史上"
8892
8893#: git-bisect.sh:48
8894msgid "You need to start by \"git bisect start\""
8895msgstr "您需要执行 \"git bisect start\" 来开始"
8896
8897#  译者:注意保持句尾空格
8898#. TRANSLATORS: Make sure to include [Y] and [n] in your
8899#. translation. The program will only accept English input
8900#. at this point.
8901#: git-bisect.sh:54
8902msgid "Do you want me to do it for you [Y/n]? "
8903msgstr "您想让我为您这样做么[Y/n]? "
8904
8905#: git-bisect.sh:95
8906#, sh-format
8907msgid "unrecognised option: '$arg'"
8908msgstr "未能识别的选项:'$arg'"
8909
8910#: git-bisect.sh:99
8911#, sh-format
8912msgid "'$arg' does not appear to be a valid revision"
8913msgstr "'$arg' 看起来不像是一个有效的版本"
8914
8915#: git-bisect.sh:117
8916msgid "Bad HEAD - I need a HEAD"
8917msgstr "坏的 HEAD - 我需要一个 HEAD"
8918
8919#: git-bisect.sh:130
8920#, sh-format
8921msgid ""
8922"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8923msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
8924
8925#: git-bisect.sh:140
8926msgid "won't bisect on seeked tree"
8927msgstr "不会在已查找过的树上二分查找"
8928
8929#: git-bisect.sh:144
8930msgid "Bad HEAD - strange symbolic ref"
8931msgstr "坏的 HEAD - 奇怪的符号引用"
8932
8933#: git-bisect.sh:189
8934#, sh-format
8935msgid "Bad bisect_write argument: $state"
8936msgstr "坏的 bisect_write 参数:$state"
8937
8938#: git-bisect.sh:218
8939#, sh-format
8940msgid "Bad rev input: $arg"
8941msgstr "输入坏的版本:$arg"
8942
8943#: git-bisect.sh:232
8944msgid "Please call 'bisect_state' with at least one argument."
8945msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
8946
8947#: git-bisect.sh:244
8948#, sh-format
8949msgid "Bad rev input: $rev"
8950msgstr "输入坏的版本:$rev"
8951
8952#: git-bisect.sh:250
8953msgid "'git bisect bad' can take only one argument."
8954msgstr "'git bisect bad' 只能带一个参数。"
8955
8956#. have bad but not good.  we could bisect although
8957#. this is less optimum.
8958#: git-bisect.sh:273
8959msgid "Warning: bisecting only with a bad commit."
8960msgstr "警告:在仅有一个坏提交下进行二分查找。"
8961
8962#  译者:注意保持句尾空格
8963#. TRANSLATORS: Make sure to include [Y] and [n] in your
8964#. translation. The program will only accept English input
8965#. at this point.
8966#: git-bisect.sh:279
8967msgid "Are you sure [Y/n]? "
8968msgstr "您确认么[Y/n]? "
8969
8970#: git-bisect.sh:289
8971msgid ""
8972"You need to give me at least one good and one bad revisions.\n"
8973"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8974msgstr ""
8975"您需要给我至少一个好版本和一个坏版本。\n"
8976"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8977
8978#: git-bisect.sh:292
8979msgid ""
8980"You need to start by \"git bisect start\".\n"
8981"You then need to give me at least one good and one bad revisions.\n"
8982"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8983msgstr ""
8984"您需要执行 \"git bisect start\" 来开始。\n"
8985"然后需要提供我至少一个好版本和一个坏版本。\n"
8986"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8987
8988#: git-bisect.sh:347 git-bisect.sh:474
8989msgid "We are not bisecting."
8990msgstr "我们没有在二分查找。"
8991
8992#: git-bisect.sh:354
8993#, sh-format
8994msgid "'$invalid' is not a valid commit"
8995msgstr "'$invalid' 不是一个有效的提交"
8996
8997#: git-bisect.sh:363
8998#, sh-format
8999msgid ""
9000"Could not check out original HEAD '$branch'.\n"
9001"Try 'git bisect reset <commit>'."
9002msgstr ""
9003"不能检出原始 HEAD '$branch'。\n"
9004"尝试 'git bisect reset <提交>'。"
9005
9006#: git-bisect.sh:390
9007msgid "No logfile given"
9008msgstr "未提供日志文件"
9009
9010#: git-bisect.sh:391
9011#, sh-format
9012msgid "cannot read $file for replaying"
9013msgstr "不能读取 $file 来重放"
9014
9015#: git-bisect.sh:408
9016msgid "?? what are you talking about?"
9017msgstr "?? 您在说什么?"
9018
9019#: git-bisect.sh:420
9020#, sh-format
9021msgid "running $command"
9022msgstr "运行 $command"
9023
9024#: git-bisect.sh:427
9025#, sh-format
9026msgid ""
9027"bisect run failed:\n"
9028"exit code $res from '$command' is < 0 or >= 128"
9029msgstr ""
9030"二分查找运行失败:\n"
9031"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
9032
9033#: git-bisect.sh:453
9034msgid "bisect run cannot continue any more"
9035msgstr "二分查找不能继续运行"
9036
9037#: git-bisect.sh:459
9038#, sh-format
9039msgid ""
9040"bisect run failed:\n"
9041"'bisect_state $state' exited with error code $res"
9042msgstr ""
9043"二分查找运行失败:\n"
9044"'bisect_state $state' 退出码为 $res"
9045
9046#: git-bisect.sh:466
9047msgid "bisect run success"
9048msgstr "二分查找运行成功"
9049
9050#: git-pull.sh:21
9051msgid ""
9052"Pull is not possible because you have unmerged files.\n"
9053"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9054"as appropriate to mark resolution, or use 'git commit -a'."
9055msgstr ""
9056"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
9057"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
9058"或者使用 'git commit -a'。"
9059
9060#: git-pull.sh:25
9061msgid "Pull is not possible because you have unmerged files."
9062msgstr "Pull 不可用,因为您尚有未合并的文件。"
9063
9064#: git-pull.sh:197
9065msgid "updating an unborn branch with changes added to the index"
9066msgstr "更新尚未诞生的分支,变更添加至索引"
9067
9068#. The fetch involved updating the current branch.
9069#. The working tree and the index file is still based on the
9070#. $orig_head commit, but we are merging into $curr_head.
9071#. First update the working tree to match $curr_head.
9072#: git-pull.sh:229
9073#, sh-format
9074msgid ""
9075"Warning: fetch updated the current branch head.\n"
9076"Warning: fast-forwarding your working tree from\n"
9077"Warning: commit $orig_head."
9078msgstr ""
9079"警告:fetch 更新了当前的分支。您的工作区\n"
9080"警告:从原提交 $orig_head 快进。"
9081
9082#: git-pull.sh:254
9083msgid "Cannot merge multiple branches into empty head"
9084msgstr "无法将多个分支合并到空分支"
9085
9086#: git-pull.sh:258
9087msgid "Cannot rebase onto multiple branches"
9088msgstr "无法变基到多个分支"
9089
9090#: git-rebase.sh:53
9091msgid ""
9092"When you have resolved this problem, run \"git rebase --continue\".\n"
9093"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9094"To check out the original branch and stop rebasing, run \"git rebase --abort"
9095"\"."
9096msgstr ""
9097"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9098"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9099"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9100
9101#: git-rebase.sh:160
9102msgid "The pre-rebase hook refused to rebase."
9103msgstr "钩子 pre-rebase 拒绝变基。"
9104
9105#: git-rebase.sh:165
9106msgid "It looks like git-am is in progress. Cannot rebase."
9107msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9108
9109#: git-rebase.sh:296
9110msgid "The --exec option must be used with the --interactive option"
9111msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9112
9113#: git-rebase.sh:301
9114msgid "No rebase in progress?"
9115msgstr "没有正在进行的变基?"
9116
9117#: git-rebase.sh:312
9118msgid "The --edit-todo action can only be used during interactive rebase."
9119msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9120
9121#: git-rebase.sh:319
9122msgid "Cannot read HEAD"
9123msgstr "不能读取 HEAD"
9124
9125#: git-rebase.sh:322
9126msgid ""
9127"You must edit all merge conflicts and then\n"
9128"mark them as resolved using git add"
9129msgstr ""
9130"您必须编辑所有的合并冲突,然后通过 git add\n"
9131"命令将它们标记为已解决"
9132
9133#: git-rebase.sh:340
9134#, sh-format
9135msgid "Could not move back to $head_name"
9136msgstr "无法移回 $head_name"
9137
9138#: git-rebase.sh:359
9139#, sh-format
9140msgid ""
9141"It seems that there is already a $state_dir_base directory, and\n"
9142"I wonder if you are in the middle of another rebase.  If that is the\n"
9143"case, please try\n"
9144"\t$cmd_live_rebase\n"
9145"If that is not the case, please\n"
9146"\t$cmd_clear_stale_rebase\n"
9147"and run me again.  I am stopping in case you still have something\n"
9148"valuable there."
9149msgstr ""
9150"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9151"如果是这样,请尝试执行\n"
9152"\t$cmd_live_rebase\n"
9153"如果不是这样,请执行\n"
9154"\t$cmd_clear_stale_rebase\n"
9155"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9156
9157#: git-rebase.sh:404
9158#, sh-format
9159msgid "invalid upstream $upstream_name"
9160msgstr "无效的上游 $upstream_name"
9161
9162#: git-rebase.sh:428
9163#, sh-format
9164msgid "$onto_name: there are more than one merge bases"
9165msgstr "$onto_name: 有一个以上的合并基准"
9166
9167#: git-rebase.sh:431 git-rebase.sh:435
9168#, sh-format
9169msgid "$onto_name: there is no merge base"
9170msgstr "$onto_name: 没有合并基准"
9171
9172#: git-rebase.sh:440
9173#, sh-format
9174msgid "Does not point to a valid commit: $onto_name"
9175msgstr "没有指向一个有效的提交:$onto_name"
9176
9177#: git-rebase.sh:463
9178#, sh-format
9179msgid "fatal: no such branch: $branch_name"
9180msgstr "严重错误:无此分支:$branch_name"
9181
9182#: git-rebase.sh:483
9183msgid "Please commit or stash them."
9184msgstr "请提交或为它们保存进度。"
9185
9186#: git-rebase.sh:501
9187#, sh-format
9188msgid "Current branch $branch_name is up to date."
9189msgstr "当前分支 $branch_name 是最新的。"
9190
9191#: git-rebase.sh:504
9192#, sh-format
9193msgid "Current branch $branch_name is up to date, rebase forced."
9194msgstr "当前分支 $branch_name 是最新的,强制变基。"
9195
9196#: git-rebase.sh:515
9197#, sh-format
9198msgid "Changes from $mb to $onto:"
9199msgstr "变更从 $mb 到 $onto:"
9200
9201#. Detach HEAD and reset the tree
9202#: git-rebase.sh:524
9203msgid "First, rewinding head to replay your work on top of it..."
9204msgstr "首先,重置头指针以便在上面重放您的工作..."
9205
9206#: git-rebase.sh:532
9207#, sh-format
9208msgid "Fast-forwarded $branch_name to $onto_name."
9209msgstr "快进 $branch_name 至 $onto_name。"
9210
9211#: git-stash.sh:51
9212msgid "git stash clear with parameters is unimplemented"
9213msgstr "git stash clear 不支持参数"
9214
9215#: git-stash.sh:74
9216msgid "You do not have the initial commit yet"
9217msgstr "您尚未建立初始提交"
9218
9219#: git-stash.sh:89
9220msgid "Cannot save the current index state"
9221msgstr "无法保存当前索引状态"
9222
9223#: git-stash.sh:123 git-stash.sh:136
9224msgid "Cannot save the current worktree state"
9225msgstr "无法保存当前工作区状态"
9226
9227#: git-stash.sh:140
9228msgid "No changes selected"
9229msgstr "没有选择变更"
9230
9231#: git-stash.sh:143
9232msgid "Cannot remove temporary index (can't happen)"
9233msgstr "无法删除临时索引(不应发生)"
9234
9235#: git-stash.sh:156
9236msgid "Cannot record working tree state"
9237msgstr "不能记录工作区状态"
9238
9239#. TRANSLATORS: $option is an invalid option, like
9240#. `--blah-blah'. The 7 spaces at the beginning of the
9241#. second line correspond to "error: ". So you should line
9242#. up the second line with however many characters the
9243#. translation of "error: " takes in your language. E.g. in
9244#. English this is:
9245#.
9246#. $ git stash save --blah-blah 2>&1 | head -n 2
9247#. error: unknown option for 'stash save': --blah-blah
9248#. To provide a message, use git stash save -- '--blah-blah'
9249#: git-stash.sh:202
9250#, sh-format
9251msgid ""
9252"error: unknown option for 'stash save': $option\n"
9253"       To provide a message, use git stash save -- '$option'"
9254msgstr ""
9255"错误:'stash save' 的未知选项:$option\n"
9256"      要提供一个描述信息,使用 git stash save -- '$option'"
9257
9258#: git-stash.sh:223
9259msgid "No local changes to save"
9260msgstr "没有要保存的本地修改"
9261
9262#: git-stash.sh:227
9263msgid "Cannot initialize stash"
9264msgstr "无法初始化 stash"
9265
9266#: git-stash.sh:235
9267msgid "Cannot save the current status"
9268msgstr "无法保存当前状态"
9269
9270#: git-stash.sh:253
9271msgid "Cannot remove worktree changes"
9272msgstr "无法删除工作区变更"
9273
9274#: git-stash.sh:352
9275msgid "No stash found."
9276msgstr "未发现 stash。"
9277
9278#: git-stash.sh:359
9279#, sh-format
9280msgid "Too many revisions specified: $REV"
9281msgstr "指定了太多的版本:$REV"
9282
9283#: git-stash.sh:365
9284#, sh-format
9285msgid "$reference is not valid reference"
9286msgstr "$reference 不是有效的引用"
9287
9288#: git-stash.sh:393
9289#, sh-format
9290msgid "'$args' is not a stash-like commit"
9291msgstr "'$args' 不是 stash 样提交"
9292
9293#: git-stash.sh:404
9294#, sh-format
9295msgid "'$args' is not a stash reference"
9296msgstr "'$args' 不是一个 stash 引用"
9297
9298#: git-stash.sh:412
9299msgid "unable to refresh index"
9300msgstr "无法刷新索引"
9301
9302#: git-stash.sh:416
9303msgid "Cannot apply a stash in the middle of a merge"
9304msgstr "无法在合并过程中恢复进度"
9305
9306#: git-stash.sh:424
9307msgid "Conflicts in index. Try without --index."
9308msgstr "索引中有冲突。尝试不使用 --index。"
9309
9310#: git-stash.sh:426
9311msgid "Could not save index tree"
9312msgstr "不能保存索引树"
9313
9314#: git-stash.sh:460
9315msgid "Cannot unstage modified files"
9316msgstr "无法还原修改的文件"
9317
9318#: git-stash.sh:475
9319msgid "Index was not unstashed."
9320msgstr "索引的进度没有被恢复。"
9321
9322#: git-stash.sh:492
9323#, sh-format
9324msgid "Dropped ${REV} ($s)"
9325msgstr "丢弃了 ${REV} ($s)"
9326
9327#: git-stash.sh:493
9328#, sh-format
9329msgid "${REV}: Could not drop stash entry"
9330msgstr "${REV}:不能丢弃进度条目"
9331
9332#: git-stash.sh:500
9333msgid "No branch name specified"
9334msgstr "未指定分支名"
9335
9336#: git-stash.sh:571
9337msgid "(To restore them type \"git stash apply\")"
9338msgstr "(为恢复数据输入 \"git stash apply\")"
9339
9340#: git-submodule.sh:90
9341#, sh-format
9342msgid "cannot strip one component off url '$remoteurl'"
9343msgstr "无法从 url '$remoteurl' 剥离一个组件"
9344
9345#: git-submodule.sh:195
9346#, sh-format
9347msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9348msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
9349
9350#: git-submodule.sh:238
9351#, sh-format
9352msgid "Clone of '$url' into submodule path '$sm_path' failed"
9353msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
9354
9355#: git-submodule.sh:250
9356#, sh-format
9357msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9358msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
9359
9360#: git-submodule.sh:343
9361#, sh-format
9362msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9363msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9364
9365#: git-submodule.sh:360
9366#, sh-format
9367msgid "'$sm_path' already exists in the index"
9368msgstr "'$sm_path' 已经存在于索引中"
9369
9370#: git-submodule.sh:364
9371#, sh-format
9372msgid ""
9373"The following path is ignored by one of your .gitignore files:\n"
9374"$sm_path\n"
9375"Use -f if you really want to add it."
9376msgstr ""
9377"以下路径被您的一个 .gitignore 文件所忽略:\n"
9378"$sm_path\n"
9379"如果您确实想添加它,使用 -f 参数。"
9380
9381#: git-submodule.sh:382
9382#, sh-format
9383msgid "Adding existing repo at '$sm_path' to the index"
9384msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9385
9386#: git-submodule.sh:384
9387#, sh-format
9388msgid "'$sm_path' already exists and is not a valid git repo"
9389msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
9390
9391#: git-submodule.sh:392
9392#, sh-format
9393msgid "A git directory for '$sm_name' is found locally with remote(s):"
9394msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9395
9396#: git-submodule.sh:394
9397#, sh-format
9398msgid ""
9399"If you want to reuse this local git directory instead of cloning again from"
9400msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9401
9402#: git-submodule.sh:396
9403#, sh-format
9404msgid ""
9405"use the '--force' option. If the local git directory is not the correct repo"
9406msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9407
9408#: git-submodule.sh:397
9409#, sh-format
9410msgid ""
9411"or you are unsure what this means choose another name with the '--name' "
9412"option."
9413msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9414
9415#: git-submodule.sh:399
9416#, sh-format
9417msgid "Reactivating local git directory for submodule '$sm_name'."
9418msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9419
9420#: git-submodule.sh:411
9421#, sh-format
9422msgid "Unable to checkout submodule '$sm_path'"
9423msgstr "不能检出子模组 '$sm_path'"
9424
9425#: git-submodule.sh:416
9426#, sh-format
9427msgid "Failed to add submodule '$sm_path'"
9428msgstr "无法添加子模组 '$sm_path'"
9429
9430#: git-submodule.sh:425
9431#, sh-format
9432msgid "Failed to register submodule '$sm_path'"
9433msgstr "无法注册子模组 '$sm_path'"
9434
9435#: git-submodule.sh:468
9436#, sh-format
9437msgid "Entering '$prefix$sm_path'"
9438msgstr "正在进入 '$prefix$sm_path'"
9439
9440#: git-submodule.sh:482
9441#, sh-format
9442msgid "Stopping at '$sm_path'; script returned non-zero status."
9443msgstr "停止于 '$sm_path',脚本返回非零值。"
9444
9445#: git-submodule.sh:526
9446#, sh-format
9447msgid "No url found for submodule path '$sm_path' in .gitmodules"
9448msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
9449
9450#: git-submodule.sh:535
9451#, sh-format
9452msgid "Failed to register url for submodule path '$sm_path'"
9453msgstr "无法为子模组路径 '$sm_path' 注册 url"
9454
9455#: git-submodule.sh:537
9456#, sh-format
9457msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9458msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
9459
9460#: git-submodule.sh:545
9461#, sh-format
9462msgid "Failed to register update mode for submodule path '$sm_path'"
9463msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9464
9465#: git-submodule.sh:649
9466#, sh-format
9467msgid ""
9468"Submodule path '$sm_path' not initialized\n"
9469"Maybe you want to use 'update --init'?"
9470msgstr ""
9471"子模组路径 '$sm_path' 没有初始化\n"
9472"也许您想用 'update --init'?"
9473
9474#: git-submodule.sh:662
9475#, sh-format
9476msgid "Unable to find current revision in submodule path '$sm_path'"
9477msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
9478
9479#: git-submodule.sh:671 git-submodule.sh:695
9480#, sh-format
9481msgid "Unable to fetch in submodule path '$sm_path'"
9482msgstr "无法在子模组路径 '$sm_path' 中获取"
9483
9484#: git-submodule.sh:709
9485#, sh-format
9486msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9487msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
9488
9489#: git-submodule.sh:710
9490#, sh-format
9491msgid "Submodule path '$sm_path': rebased into '$sha1'"
9492msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
9493
9494#: git-submodule.sh:715
9495#, sh-format
9496msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9497msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
9498
9499#: git-submodule.sh:716
9500#, sh-format
9501msgid "Submodule path '$sm_path': merged in '$sha1'"
9502msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
9503
9504#: git-submodule.sh:721
9505#, sh-format
9506msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9507msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
9508
9509#: git-submodule.sh:722
9510#, sh-format
9511msgid "Submodule path '$sm_path': checked out '$sha1'"
9512msgstr "子模组路径 '$sm_path':检出 '$sha1'"
9513
9514#: git-submodule.sh:744 git-submodule.sh:1066
9515#, sh-format
9516msgid "Failed to recurse into submodule path '$sm_path'"
9517msgstr "无法递归进子模组路径 '$sm_path'"
9518
9519#: git-submodule.sh:852
9520msgid "The --cached option cannot be used with the --files option"
9521msgstr "选项 --cached 不能和选项 --files 同时使用"
9522
9523#. unexpected type
9524#: git-submodule.sh:892
9525#, sh-format
9526msgid "unexpected mode $mod_dst"
9527msgstr "意外的模式 $mod_dst"
9528
9529#  译者:注意保持前导空格
9530#: git-submodule.sh:910
9531#, sh-format
9532msgid "  Warn: $name doesn't contain commit $sha1_src"
9533msgstr "  警告:$name 未包含提交 $sha1_src"
9534
9535#  译者:注意保持前导空格
9536#: git-submodule.sh:913
9537#, sh-format
9538msgid "  Warn: $name doesn't contain commit $sha1_dst"
9539msgstr "  警告:$name 未包含提交 $sha1_dst"
9540
9541#  译者:注意保持前导空格
9542#: git-submodule.sh:916
9543#, sh-format
9544msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9545msgstr "  警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9546
9547#: git-submodule.sh:941
9548msgid "blob"
9549msgstr "数据对象"
9550
9551#: git-submodule.sh:979
9552msgid "Submodules changed but not updated:"
9553msgstr "子模组已修改但尚未更新:"
9554
9555#: git-submodule.sh:981
9556msgid "Submodule changes to be committed:"
9557msgstr "要提交的子模组变更:"
9558
9559#: git-submodule.sh:1129
9560#, sh-format
9561msgid "Synchronizing submodule url for '$prefix$sm_path'"
9562msgstr "为 '$prefix$sm_path' 同步子模组 url"
9563
9564#~ msgid "can't fdopen 'show' output fd"
9565#~ msgstr "不能打开 'show' 输出文件句柄"
9566
9567#~ msgid "failed to close pipe to 'show' for object '%s'"
9568#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9569
9570#~ msgid "-NUM"
9571#~ msgstr "-数字"
9572
9573#~ msgid " 0 files changed"
9574#~ msgstr " 0 个文件被修改"
9575
9576#~ msgid " %d file changed"
9577#~ msgid_plural " %d files changed"
9578#~ msgstr[0] " %d 个文件被修改"
9579#~ msgstr[1] " %d 个文件被修改"
9580
9581#~ msgid ", %d insertion(+)"
9582#~ msgid_plural ", %d insertions(+)"
9583#~ msgstr[0] ",插入 %d 行(+)"
9584#~ msgstr[1] ",插入 %d 行(+)"
9585
9586#~ msgid ", %d deletion(-)"
9587#~ msgid_plural ", %d deletions(-)"
9588#~ msgstr[0] ",删除 %d 行(-)"
9589#~ msgstr[1] ",删除 %d 行(-)"
9590
9591#~ msgid "You do not have a valid HEAD"
9592#~ msgstr "您没有一个有效的 HEAD"
9593
9594#~ msgid "oops"
9595#~ msgstr "哎哟"
9596
9597#~ msgid "Would not remove %s\n"
9598#~ msgstr "不会删除 %s\n"
9599
9600#~ msgid "Not removing %s\n"
9601#~ msgstr "未删除 %s\n"
9602
9603#~ msgid "Auto packing the repository for optimum performance.\n"
9604#~ msgstr "自动打包版本库以求最佳性能。\n"
9605
9606#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9607#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9608
9609#~ msgid "Could not read index"
9610#~ msgstr "不能读取索引"
9611
9612#  译者:中文字符串拼接,可删除前导空格
9613#~ msgid " (use \"git add\" to track)"
9614#~ msgstr "(使用 \"git add\" 建立跟踪)"
9615
9616#~ msgid "-B cannot be used with -b"
9617#~ msgstr "-B 不能和 -b 同时使用"
9618
9619#~ msgid "--patch is incompatible with all other options"
9620#~ msgstr "--patch 选项和其他选项不兼容"
9621
9622#~ msgid "--detach cannot be used with -b/-B/--orphan"
9623#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9624
9625#~ msgid "--detach cannot be used with -t"
9626#~ msgstr "--detach 不能和 -t 同时使用"
9627
9628#~ msgid "--orphan and -b|-B are mutually exclusive"
9629#~ msgstr "--orphan 和 -b|-B 互斥"
9630
9631#~ msgid "--orphan cannot be used with -t"
9632#~ msgstr "--orphan 不能和 -t 同时使用"
9633
9634#~ msgid "git checkout: -f and -m are incompatible"
9635#~ msgstr "git checkout:-f 和 -m 不兼容"
9636
9637#~ msgid ""
9638#~ "git checkout: updating paths is incompatible with switching branches."
9639#~ msgstr "git checkout:更新路径和切换分支不兼容。"
9640
9641#~ msgid "diff setup failed"
9642#~ msgstr "diff 设置失败"
9643
9644#~ msgid "merge-recursive: disk full?"
9645#~ msgstr "merge-recursive:磁盘已满?"
9646
9647#~ msgid "diff_setup_done failed"
9648#~ msgstr "diff_setup_done 失败"