po / zh_CN.poon commit Merge branch 'maint-1.9' into maint-2.0 (76f8611)
   1# Chinese translations for Git package
   2# Git 软件包的简体中文翻译.
   3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
   4# This file is distributed under the same license as the Git package.
   5# Contributers:
   6#   - Jiang Xin <worldhello.net AT gmail.com>
   7#   - Riku <lu.riku AT gmail.com>
   8#   - Zhuang Ya <zhuangya AT me.com>
   9#   - Lian Cheng <rhythm.mail AT gmail.com>
  10#
  11msgid ""
  12msgstr ""
  13"Project-Id-Version: Git\n"
  14"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
  15"POT-Creation-Date: 2014-04-23 12:50+0800\n"
  16"PO-Revision-Date: 2014-04-23 12:53+0800\n"
  17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
  18"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
  19"Language: zh_CN\n"
  20"MIME-Version: 1.0\n"
  21"Content-Type: text/plain; charset=UTF-8\n"
  22"Content-Transfer-Encoding: 8bit\n"
  23"Plural-Forms: nplurals=2; plural=(n != 1);\n"
  24
  25#: advice.c:55
  26#, c-format
  27msgid "hint: %.*s\n"
  28msgstr "提示:%.*s\n"
  29
  30#: advice.c:85
  31msgid ""
  32"Fix them up in the work tree,\n"
  33"and then use 'git add/rm <file>' as\n"
  34"appropriate to mark resolution and make a commit,\n"
  35"or use 'git commit -a'."
  36msgstr ""
  37"请先在工作区改正文件,然后酌情使用\n"
  38"'git add/rm <file>' 标记解决方案,\n"
  39"或使用 'git commit -a'。"
  40
  41#: archive.c:10
  42msgid "git archive [options] <tree-ish> [<path>...]"
  43msgstr "git archive [选项] <树或提交> [<路径>...]"
  44
  45#: archive.c:11
  46msgid "git archive --list"
  47msgstr "git archive --list"
  48
  49#: archive.c:12
  50msgid ""
  51"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
  52msgstr ""
  53"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
  54
  55#: archive.c:13
  56msgid "git archive --remote <repo> [--exec <cmd>] --list"
  57msgstr "git archive --remote <版本库> [--exec <命令>] --list"
  58
  59#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328
  60#, c-format
  61msgid "pathspec '%s' did not match any files"
  62msgstr "路径规则 '%s' 未匹配任何文件"
  63
  64#: archive.c:328
  65msgid "fmt"
  66msgstr "格式"
  67
  68#: archive.c:328
  69msgid "archive format"
  70msgstr "归档格式"
  71
  72#: archive.c:329 builtin/log.c:1193
  73msgid "prefix"
  74msgstr "前缀"
  75
  76#: archive.c:330
  77msgid "prepend prefix to each pathname in the archive"
  78msgstr "为归档中每个路径名加上前缀"
  79
  80#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2265
  81#: builtin/blame.c:2266 builtin/config.c:57 builtin/fast-export.c:680
  82#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77
  83#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
  84#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
  85msgid "file"
  86msgstr "文件"
  87
  88#: archive.c:332 builtin/archive.c:89
  89msgid "write the archive to this file"
  90msgstr "归档写入此文件"
  91
  92#: archive.c:334
  93msgid "read .gitattributes in working directory"
  94msgstr "读取工作区中的 .gitattributes"
  95
  96#: archive.c:335
  97msgid "report archived files on stderr"
  98msgstr "在标准错误上报告归档文件"
  99
 100#: archive.c:336
 101msgid "store only"
 102msgstr "只存储"
 103
 104#: archive.c:337
 105msgid "compress faster"
 106msgstr "压缩速度更快"
 107
 108#: archive.c:345
 109msgid "compress better"
 110msgstr "压缩效果更好"
 111
 112#: archive.c:348
 113msgid "list supported archive formats"
 114msgstr "列出支持的归档格式"
 115
 116#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
 117msgid "repo"
 118msgstr "版本库"
 119
 120#: archive.c:351 builtin/archive.c:91
 121msgid "retrieve the archive from remote repository <repo>"
 122msgstr "从远程版本库(<版本库>)提取归档文件"
 123
 124#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
 125msgid "command"
 126msgstr "命令"
 127
 128#: archive.c:353 builtin/archive.c:93
 129msgid "path to the remote git-upload-archive command"
 130msgstr "远程 git-upload-archive 命令的路径"
 131
 132#: attr.c:259
 133msgid ""
 134"Negative patterns are ignored in git attributes\n"
 135"Use '\\!' for literal leading exclamation."
 136msgstr ""
 137"负值模版在 git attributes 中被忽略\n"
 138"当字符串确实要以感叹号开始时,使用 '\\!'。"
 139
 140#: branch.c:60
 141#, c-format
 142msgid "Not setting branch %s as its own upstream."
 143msgstr "未设置分支 %s 作为它自己的上游。"
 144
 145#: branch.c:83
 146#, c-format
 147msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 148msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 149
 150#: branch.c:84
 151#, c-format
 152msgid "Branch %s set up to track remote branch %s from %s."
 153msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 154
 155#: branch.c:88
 156#, c-format
 157msgid "Branch %s set up to track local branch %s by rebasing."
 158msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 159
 160#: branch.c:89
 161#, c-format
 162msgid "Branch %s set up to track local branch %s."
 163msgstr "分支 %s 设置为跟踪本地分支 %s。"
 164
 165#: branch.c:94
 166#, c-format
 167msgid "Branch %s set up to track remote ref %s by rebasing."
 168msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 169
 170#: branch.c:95
 171#, c-format
 172msgid "Branch %s set up to track remote ref %s."
 173msgstr "分支 %s 设置为跟踪远程引用 %s。"
 174
 175#: branch.c:99
 176#, c-format
 177msgid "Branch %s set up to track local ref %s by rebasing."
 178msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 179
 180#: branch.c:100
 181#, c-format
 182msgid "Branch %s set up to track local ref %s."
 183msgstr "分支 %s 设置为跟踪本地引用 %s。"
 184
 185#: branch.c:133
 186#, c-format
 187msgid "Not tracking: ambiguous information for ref %s"
 188msgstr "未跟踪:引用 %s 有歧义"
 189
 190#: branch.c:178
 191#, c-format
 192msgid "'%s' is not a valid branch name."
 193msgstr "'%s' 不是一个有效的分支名称。"
 194
 195#: branch.c:183
 196#, c-format
 197msgid "A branch named '%s' already exists."
 198msgstr "一个分支名 '%s' 已经存在。"
 199
 200#: branch.c:191
 201msgid "Cannot force update the current branch."
 202msgstr "无法强制更新当前分支。"
 203
 204#: branch.c:211
 205#, c-format
 206msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 207msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
 208
 209#: branch.c:213
 210#, c-format
 211msgid "the requested upstream branch '%s' does not exist"
 212msgstr "请求的上游分支 '%s' 不存在"
 213
 214#: branch.c:215
 215msgid ""
 216"\n"
 217"If you are planning on basing your work on an upstream\n"
 218"branch that already exists at the remote, you may need to\n"
 219"run \"git fetch\" to retrieve it.\n"
 220"\n"
 221"If you are planning to push out a new local branch that\n"
 222"will track its remote counterpart, you may want to use\n"
 223"\"git push -u\" to set the upstream config as you push."
 224msgstr ""
 225"\n"
 226"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
 227"您可能需要执行 \"git fetch\" 来获取分支。\n"
 228"\n"
 229"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
 230"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 231
 232#: branch.c:260
 233#, c-format
 234msgid "Not a valid object name: '%s'."
 235msgstr "不是一个有效的对象名:'%s'。"
 236
 237#: branch.c:280
 238#, c-format
 239msgid "Ambiguous object name: '%s'."
 240msgstr "歧义的对象名:'%s'。"
 241
 242#: branch.c:285
 243#, c-format
 244msgid "Not a valid branch point: '%s'."
 245msgstr "无效的分支点:'%s'。"
 246
 247#: branch.c:291
 248msgid "Failed to lock ref for update"
 249msgstr "无法为更新锁定引用"
 250
 251#: branch.c:309
 252msgid "Failed to write ref"
 253msgstr "不能写引用"
 254
 255#: bundle.c:33
 256#, c-format
 257msgid "'%s' does not look like a v2 bundle file"
 258msgstr "'%s' 不像是一个 v2 版本的包文件"
 259
 260#: bundle.c:60
 261#, c-format
 262msgid "unrecognized header: %s%s (%d)"
 263msgstr "未能识别的包头:%s%s (%d)"
 264
 265#: bundle.c:86 builtin/commit.c:706
 266#, c-format
 267msgid "could not open '%s'"
 268msgstr "不能打开 '%s'"
 269
 270#: bundle.c:138
 271msgid "Repository lacks these prerequisite commits:"
 272msgstr "版本库缺少这些必备的提交:"
 273
 274#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332
 275#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
 276#: builtin/shortlog.c:158
 277msgid "revision walk setup failed"
 278msgstr "版本遍历设置失败"
 279
 280#: bundle.c:184
 281#, c-format
 282msgid "The bundle contains this ref:"
 283msgid_plural "The bundle contains these %d refs:"
 284msgstr[0] "这个包中含有这个引用:"
 285msgstr[1] "这个包中含有 %d 个引用:"
 286
 287#: bundle.c:191
 288msgid "The bundle records a complete history."
 289msgstr "这个包记录一个完整历史。"
 290
 291#: bundle.c:193
 292#, c-format
 293msgid "The bundle requires this ref:"
 294msgid_plural "The bundle requires these %d refs:"
 295msgstr[0] "这个包需要这个引用:"
 296msgstr[1] "这个包需要 %d 个引用:"
 297
 298#: bundle.c:293
 299msgid "rev-list died"
 300msgstr "rev-list 终止"
 301
 302#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261
 303#, c-format
 304msgid "unrecognized argument: %s"
 305msgstr "未能识别的参数:%s"
 306
 307#: bundle.c:334
 308#, c-format
 309msgid "ref '%s' is excluded by the rev-list options"
 310msgstr "引用 '%s' 被 rev-list 选项排除"
 311
 312#: bundle.c:379
 313msgid "Refusing to create empty bundle."
 314msgstr "不能创建空包。"
 315
 316#: bundle.c:395
 317msgid "Could not spawn pack-objects"
 318msgstr "不能生成 pack-objects 进程"
 319
 320#: bundle.c:413
 321msgid "pack-objects died"
 322msgstr "pack-objects 终止"
 323
 324#: bundle.c:416
 325#, c-format
 326msgid "cannot create '%s'"
 327msgstr "不能创建 '%s'"
 328
 329#: bundle.c:438
 330msgid "index-pack died"
 331msgstr "index-pack 终止"
 332
 333#: commit.c:54
 334#, c-format
 335msgid "could not parse %s"
 336msgstr "不能解析 %s"
 337
 338#: commit.c:56
 339#, c-format
 340msgid "%s %s is not a commit!"
 341msgstr "%s %s 不是一个提交!"
 342
 343#: compat/obstack.c:406 compat/obstack.c:408
 344msgid "memory exhausted"
 345msgstr "内存耗尽"
 346
 347#: connected.c:70
 348msgid "Could not run 'git rev-list'"
 349msgstr "不能执行 'git rev-list'"
 350
 351#: connected.c:90
 352#, c-format
 353msgid "failed write to rev-list: %s"
 354msgstr "无法写入 rev-list:%s"
 355
 356#: connected.c:98
 357#, c-format
 358msgid "failed to close rev-list's stdin: %s"
 359msgstr "无法关闭 rev-list 的标准输入:%s"
 360
 361#: date.c:95
 362msgid "in the future"
 363msgstr "在将来"
 364
 365#: date.c:101
 366#, c-format
 367msgid "%lu second ago"
 368msgid_plural "%lu seconds ago"
 369msgstr[0] "%lu 秒钟前"
 370msgstr[1] "%lu 秒钟前"
 371
 372#: date.c:108
 373#, c-format
 374msgid "%lu minute ago"
 375msgid_plural "%lu minutes ago"
 376msgstr[0] "%lu 分钟前"
 377msgstr[1] "%lu 分钟前"
 378
 379#: date.c:115
 380#, c-format
 381msgid "%lu hour ago"
 382msgid_plural "%lu hours ago"
 383msgstr[0] "%lu 小时前"
 384msgstr[1] "%lu 小时前"
 385
 386#: date.c:122
 387#, c-format
 388msgid "%lu day ago"
 389msgid_plural "%lu days ago"
 390msgstr[0] "%lu 天前"
 391msgstr[1] "%lu 天前"
 392
 393#: date.c:128
 394#, c-format
 395msgid "%lu week ago"
 396msgid_plural "%lu weeks ago"
 397msgstr[0] "%lu 周前"
 398msgstr[1] "%lu 周前"
 399
 400#: date.c:135
 401#, c-format
 402msgid "%lu month ago"
 403msgid_plural "%lu months ago"
 404msgstr[0] "%lu 个月前"
 405msgstr[1] "%lu 个月前"
 406
 407#: date.c:146
 408#, c-format
 409msgid "%lu year"
 410msgid_plural "%lu years"
 411msgstr[0] "%lu 年"
 412msgstr[1] "%lu 年"
 413
 414#. TRANSLATORS: "%s" is "<n> years"
 415#: date.c:149
 416#, c-format
 417msgid "%s, %lu month ago"
 418msgid_plural "%s, %lu months ago"
 419msgstr[0] "%s %lu 个月前"
 420msgstr[1] "%s %lu 个月前"
 421
 422#: date.c:154 date.c:159
 423#, c-format
 424msgid "%lu year ago"
 425msgid_plural "%lu years ago"
 426msgstr[0] "%lu 年前"
 427msgstr[1] "%lu 年前"
 428
 429#: diffcore-order.c:24
 430#, c-format
 431msgid "failed to read orderfile '%s'"
 432msgstr "无法读取排序文件 '%s'"
 433
 434#: diffcore-rename.c:517
 435msgid "Performing inexact rename detection"
 436msgstr "正在进行非精确的重命名检测"
 437
 438#  译者:注意保持前导空格
 439#: diff.c:113
 440#, c-format
 441msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 442msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 443
 444#  译者:注意保持前导空格
 445#: diff.c:118
 446#, c-format
 447msgid "  Unknown dirstat parameter '%s'\n"
 448msgstr "  未知的 dirstat 参数 '%s'\n"
 449
 450#: diff.c:213
 451#, c-format
 452msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 453msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 454
 455#: diff.c:263
 456#, c-format
 457msgid ""
 458"Found errors in 'diff.dirstat' config variable:\n"
 459"%s"
 460msgstr ""
 461"发现配置变量 'diff.dirstat' 中的错误:\n"
 462"%s"
 463
 464#: diff.c:3495
 465#, c-format
 466msgid ""
 467"Failed to parse --dirstat/-X option parameter:\n"
 468"%s"
 469msgstr ""
 470"无法解析 --dirstat/-X 选项的参数:\n"
 471"%s"
 472
 473#: diff.c:3509
 474#, c-format
 475msgid "Failed to parse --submodule option parameter: '%s'"
 476msgstr "无法解析 --submodule 选项的参数:'%s'"
 477
 478#: gpg-interface.c:59 gpg-interface.c:131
 479msgid "could not run gpg."
 480msgstr "不能执行 gpg。"
 481
 482#: gpg-interface.c:71
 483msgid "gpg did not accept the data"
 484msgstr "gpg 没有接受数据"
 485
 486#: gpg-interface.c:82
 487msgid "gpg failed to sign the data"
 488msgstr "gpg 无法为数据签名"
 489
 490#: gpg-interface.c:115
 491#, c-format
 492msgid "could not create temporary file '%s': %s"
 493msgstr "不能创建临时文件 '%s':%s"
 494
 495#: gpg-interface.c:118
 496#, c-format
 497msgid "failed writing detached signature to '%s': %s"
 498msgstr "无法将分离式签名写入 '%s':%s"
 499
 500#: grep.c:1698
 501#, c-format
 502msgid "'%s': unable to read %s"
 503msgstr "'%s':无法读取 %s"
 504
 505#: grep.c:1715
 506#, c-format
 507msgid "'%s': %s"
 508msgstr "'%s':%s"
 509
 510#: grep.c:1726
 511#, c-format
 512msgid "'%s': short read %s"
 513msgstr "'%s':读取不完整 %s"
 514
 515#: help.c:209
 516#, c-format
 517msgid "available git commands in '%s'"
 518msgstr "在 '%s' 下可用的 git 命令"
 519
 520#: help.c:216
 521msgid "git commands available from elsewhere on your $PATH"
 522msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 523
 524#: help.c:232
 525msgid "The most commonly used git commands are:"
 526msgstr "最常用的 git 命令有:"
 527
 528#: help.c:289
 529#, c-format
 530msgid ""
 531"'%s' appears to be a git command, but we were not\n"
 532"able to execute it. Maybe git-%s is broken?"
 533msgstr ""
 534"'%s' 像是一个 git 命令,但却无法运行。\n"
 535"可能是 git-%s 受损?"
 536
 537#: help.c:346
 538msgid "Uh oh. Your system reports no Git commands at all."
 539msgstr "唉呀,您的系统中未发现 Git 命令。"
 540
 541#: help.c:368
 542#, c-format
 543msgid ""
 544"WARNING: You called a Git command named '%s', which does not exist.\n"
 545"Continuing under the assumption that you meant '%s'"
 546msgstr ""
 547"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 548"是 '%s'"
 549
 550#: help.c:373
 551#, c-format
 552msgid "in %0.1f seconds automatically..."
 553msgstr "在 %0.1f 秒钟后自动运行..."
 554
 555#: help.c:380
 556#, c-format
 557msgid "git: '%s' is not a git command. See 'git --help'."
 558msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
 559
 560#: help.c:384 help.c:443
 561msgid ""
 562"\n"
 563"Did you mean this?"
 564msgid_plural ""
 565"\n"
 566"Did you mean one of these?"
 567msgstr[0] ""
 568"\n"
 569"您指的是这个么?"
 570msgstr[1] ""
 571"\n"
 572"您指的是这其中的某一个么?"
 573
 574#: help.c:439
 575#, c-format
 576msgid "%s: %s - %s"
 577msgstr "%s:%s - %s"
 578
 579#: merge.c:56
 580msgid "failed to read the cache"
 581msgstr "无法读取缓存"
 582
 583#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558
 584#: builtin/clone.c:661
 585msgid "unable to write new index file"
 586msgstr "无法写新的索引文件"
 587
 588#: merge-recursive.c:190
 589#, c-format
 590msgid "(bad commit)\n"
 591msgstr "(坏提交)\n"
 592
 593#: merge-recursive.c:208
 594#, c-format
 595msgid "addinfo_cache failed for path '%s'"
 596msgstr "为路径 '%s' addinfo_cache 失败"
 597
 598#: merge-recursive.c:271
 599msgid "error building trees"
 600msgstr "无法创建树"
 601
 602#: merge-recursive.c:675
 603#, c-format
 604msgid "failed to create path '%s'%s"
 605msgstr "无法创建路径 '%s'%s"
 606
 607#: merge-recursive.c:686
 608#, c-format
 609msgid "Removing %s to make room for subdirectory\n"
 610msgstr "删除 %s 以便为子目录留出空间\n"
 611
 612#: merge-recursive.c:700 merge-recursive.c:721
 613msgid ": perhaps a D/F conflict?"
 614msgstr ":可能是一个目录/文件冲突?"
 615
 616#: merge-recursive.c:711
 617#, c-format
 618msgid "refusing to lose untracked file at '%s'"
 619msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 620
 621#: merge-recursive.c:751
 622#, c-format
 623msgid "cannot read object %s '%s'"
 624msgstr "不能读取对象 %s '%s'"
 625
 626#: merge-recursive.c:753
 627#, c-format
 628msgid "blob expected for %s '%s'"
 629msgstr "%s '%s' 应为数据(blob)对象"
 630
 631#: merge-recursive.c:776 builtin/clone.c:317
 632#, c-format
 633msgid "failed to open '%s'"
 634msgstr "无法打开 '%s'"
 635
 636#: merge-recursive.c:784
 637#, c-format
 638msgid "failed to symlink '%s'"
 639msgstr "无法创建符号链接 '%s'"
 640
 641#: merge-recursive.c:787
 642#, c-format
 643msgid "do not know what to do with %06o %s '%s'"
 644msgstr "不知道如何处理 %06o %s '%s'"
 645
 646#: merge-recursive.c:925
 647msgid "Failed to execute internal merge"
 648msgstr "无法执行内部合并"
 649
 650#: merge-recursive.c:929
 651#, c-format
 652msgid "Unable to add %s to database"
 653msgstr "不能添加 %s 至对象库"
 654
 655#: merge-recursive.c:945
 656msgid "unsupported object type in the tree"
 657msgstr "在树中有不支持的对象类型"
 658
 659#: merge-recursive.c:1024 merge-recursive.c:1038
 660#, c-format
 661msgid ""
 662"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 663"in tree."
 664msgstr ""
 665"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 666"的版本被保留。"
 667
 668#: merge-recursive.c:1030 merge-recursive.c:1043
 669#, c-format
 670msgid ""
 671"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 672"in tree at %s."
 673msgstr ""
 674"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 675"的版本保留于 %8$s 中。"
 676
 677#: merge-recursive.c:1084
 678msgid "rename"
 679msgstr "重命名"
 680
 681#: merge-recursive.c:1084
 682msgid "renamed"
 683msgstr "重命名"
 684
 685#: merge-recursive.c:1140
 686#, c-format
 687msgid "%s is a directory in %s adding as %s instead"
 688msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 689
 690#: merge-recursive.c:1162
 691#, c-format
 692msgid ""
 693"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 694"\"->\"%s\" in \"%s\"%s"
 695msgstr ""
 696"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
 697"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 698
 699#: merge-recursive.c:1167
 700msgid " (left unresolved)"
 701msgstr "(留下未解决)"
 702
 703#: merge-recursive.c:1221
 704#, c-format
 705msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 706msgstr ""
 707"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
 708"%5$s"
 709
 710#: merge-recursive.c:1251
 711#, c-format
 712msgid "Renaming %s to %s and %s to %s instead"
 713msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
 714
 715#: merge-recursive.c:1450
 716#, c-format
 717msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 718msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 719
 720#: merge-recursive.c:1460
 721#, c-format
 722msgid "Adding merged %s"
 723msgstr "添加合并后的 %s"
 724
 725#: merge-recursive.c:1465 merge-recursive.c:1663
 726#, c-format
 727msgid "Adding as %s instead"
 728msgstr "而是以 %s 为名添加"
 729
 730#: merge-recursive.c:1516
 731#, c-format
 732msgid "cannot read object %s"
 733msgstr "不能读取对象 %s"
 734
 735#: merge-recursive.c:1519
 736#, c-format
 737msgid "object %s is not a blob"
 738msgstr "对象 %s 不是一个数据(blob)对象"
 739
 740#: merge-recursive.c:1567
 741msgid "modify"
 742msgstr "修改"
 743
 744#: merge-recursive.c:1567
 745msgid "modified"
 746msgstr "修改"
 747
 748#: merge-recursive.c:1577
 749msgid "content"
 750msgstr "内容"
 751
 752#: merge-recursive.c:1584
 753msgid "add/add"
 754msgstr "添加/添加"
 755
 756#: merge-recursive.c:1618
 757#, c-format
 758msgid "Skipped %s (merged same as existing)"
 759msgstr "略过 %s(已经做过相同合并)"
 760
 761#: merge-recursive.c:1632
 762#, c-format
 763msgid "Auto-merging %s"
 764msgstr "自动合并 %s"
 765
 766#: merge-recursive.c:1636 git-submodule.sh:1149
 767msgid "submodule"
 768msgstr "子模组"
 769
 770#: merge-recursive.c:1637
 771#, c-format
 772msgid "CONFLICT (%s): Merge conflict in %s"
 773msgstr "冲突(%s):合并冲突于 %s"
 774
 775#: merge-recursive.c:1727
 776#, c-format
 777msgid "Removing %s"
 778msgstr "删除 %s"
 779
 780#: merge-recursive.c:1752
 781msgid "file/directory"
 782msgstr "文件/目录"
 783
 784#: merge-recursive.c:1758
 785msgid "directory/file"
 786msgstr "目录/文件"
 787
 788#: merge-recursive.c:1763
 789#, c-format
 790msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 791msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 792
 793#: merge-recursive.c:1773
 794#, c-format
 795msgid "Adding %s"
 796msgstr "添加 %s"
 797
 798#: merge-recursive.c:1790
 799msgid "Fatal merge failure, shouldn't happen."
 800msgstr "严重的合并错误,不应发生。"
 801
 802#: merge-recursive.c:1809
 803msgid "Already up-to-date!"
 804msgstr "已经是最新的!"
 805
 806#: merge-recursive.c:1818
 807#, c-format
 808msgid "merging of trees %s and %s failed"
 809msgstr "无法合并树 %s 和 %s"
 810
 811#: merge-recursive.c:1848
 812#, c-format
 813msgid "Unprocessed path??? %s"
 814msgstr "未处理的路径??? %s"
 815
 816#: merge-recursive.c:1893
 817msgid "Merging:"
 818msgstr "合并:"
 819
 820#: merge-recursive.c:1906
 821#, c-format
 822msgid "found %u common ancestor:"
 823msgid_plural "found %u common ancestors:"
 824msgstr[0] "发现 %u 个共同祖先:"
 825msgstr[1] "发现 %u 个共同祖先:"
 826
 827#: merge-recursive.c:1943
 828msgid "merge returned no commit"
 829msgstr "合并未返回提交"
 830
 831#: merge-recursive.c:2000
 832#, c-format
 833msgid "Could not parse object '%s'"
 834msgstr "不能解析对象 '%s'"
 835
 836#: merge-recursive.c:2012 builtin/merge.c:668
 837msgid "Unable to write index."
 838msgstr "不能写入索引。"
 839
 840#: notes-utils.c:40
 841msgid "Cannot commit uninitialized/unreferenced notes tree"
 842msgstr "不能提交未初始化/未引用的注解树"
 843
 844#: notes-utils.c:81
 845#, c-format
 846msgid "Bad notes.rewriteMode value: '%s'"
 847msgstr "坏的 notes.rewriteMode 值:'%s'"
 848
 849#: notes-utils.c:91
 850#, c-format
 851msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 852msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
 853
 854#. TRANSLATORS: The first %s is the name of the
 855#. environment variable, the second %s is its value
 856#: notes-utils.c:118
 857#, c-format
 858msgid "Bad %s value: '%s'"
 859msgstr "坏的 %s 值:'%s'"
 860
 861#: object.c:229
 862#, c-format
 863msgid "unable to parse object: %s"
 864msgstr "不能解析对象:%s"
 865
 866#: parse-options.c:532
 867msgid "..."
 868msgstr "..."
 869
 870#: parse-options.c:550
 871#, c-format
 872msgid "usage: %s"
 873msgstr "用法:%s"
 874
 875#. TRANSLATORS: the colon here should align with the
 876#. one in "usage: %s" translation
 877#: parse-options.c:554
 878#, c-format
 879msgid "   or: %s"
 880msgstr "  或:%s"
 881
 882#  译者:为保证在输出中对齐,注意调整句中空格!
 883#: parse-options.c:557
 884#, c-format
 885msgid "    %s"
 886msgstr "    %s"
 887
 888#: parse-options.c:591
 889msgid "-NUM"
 890msgstr "-数字"
 891
 892#: pathspec.c:133
 893msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 894msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
 895
 896#: pathspec.c:143
 897msgid ""
 898"global 'literal' pathspec setting is incompatible with all other global "
 899"pathspec settings"
 900msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
 901
 902#: pathspec.c:177
 903msgid "invalid parameter for pathspec magic 'prefix'"
 904msgstr "路径规则包含无效的神奇前缀"
 905
 906#: pathspec.c:183
 907#, c-format
 908msgid "Invalid pathspec magic '%.*s' in '%s'"
 909msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
 910
 911#: pathspec.c:187
 912#, c-format
 913msgid "Missing ')' at the end of pathspec magic in '%s'"
 914msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
 915
 916#: pathspec.c:205
 917#, c-format
 918msgid "Unimplemented pathspec magic '%c' in '%s'"
 919msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
 920
 921#: pathspec.c:230
 922#, c-format
 923msgid "%s: 'literal' and 'glob' are incompatible"
 924msgstr "%s:'literal' 和 'glob' 不兼容"
 925
 926#: pathspec.c:241
 927#, c-format
 928msgid "%s: '%s' is outside repository"
 929msgstr "%s:'%s' 在版本库之外"
 930
 931#: pathspec.c:291
 932#, c-format
 933msgid "Pathspec '%s' is in submodule '%.*s'"
 934msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
 935
 936#: pathspec.c:353
 937#, c-format
 938msgid "%s: pathspec magic not supported by this command: %s"
 939msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
 940
 941#: pathspec.c:433
 942#, c-format
 943msgid "pathspec '%s' is beyond a symbolic link"
 944msgstr "路径规则 '%s' 位于符号链接中"
 945
 946#: pathspec.c:442
 947msgid ""
 948"There is nothing to exclude from by :(exclude) patterns.\n"
 949"Perhaps you forgot to add either ':/' or '.' ?"
 950msgstr ""
 951"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
 952"添加 ':/' 或 '.' ?"
 953
 954#: progress.c:224
 955msgid "done"
 956msgstr "完成"
 957
 958#: read-cache.c:1238
 959#, c-format
 960msgid ""
 961"index.version set, but the value is invalid.\n"
 962"Using version %i"
 963msgstr ""
 964"设置了 index.version,但是取值无效。\n"
 965"使用版本 %i"
 966
 967#: read-cache.c:1248
 968#, c-format
 969msgid ""
 970"GIT_INDEX_VERSION set, but the value is invalid.\n"
 971"Using version %i"
 972msgstr ""
 973"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
 974"使用版本 %i"
 975
 976#: remote.c:758
 977#, c-format
 978msgid "Cannot fetch both %s and %s to %s"
 979msgstr "不能同时获取 %s 和 %s 至 %s"
 980
 981#: remote.c:762
 982#, c-format
 983msgid "%s usually tracks %s, not %s"
 984msgstr "%s 通常跟踪 %s,而非 %s"
 985
 986#: remote.c:766
 987#, c-format
 988msgid "%s tracks both %s and %s"
 989msgstr "%s 同时跟踪 %s 和 %s"
 990
 991#: remote.c:774
 992msgid "Internal error"
 993msgstr "内部错误"
 994
 995#: remote.c:1948
 996#, c-format
 997msgid "Your branch is based on '%s', but the upstream is gone.\n"
 998msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
 999
1000#: remote.c:1952
1001msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1002msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
1003
1004#: remote.c:1955
1005#, c-format
1006msgid "Your branch is up-to-date with '%s'.\n"
1007msgstr "您的分支与上游分支 '%s' 一致。\n"
1008
1009#: remote.c:1959
1010#, c-format
1011msgid "Your branch is ahead of '%s' by %d commit.\n"
1012msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1013msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1014msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1015
1016#: remote.c:1965
1017msgid "  (use \"git push\" to publish your local commits)\n"
1018msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
1019
1020#: remote.c:1968
1021#, c-format
1022msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1023msgid_plural ""
1024"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1025msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1026msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1027
1028#  译者:注意保持前导空格
1029#: remote.c:1976
1030msgid "  (use \"git pull\" to update your local branch)\n"
1031msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
1032
1033#: remote.c:1979
1034#, c-format
1035msgid ""
1036"Your branch and '%s' have diverged,\n"
1037"and have %d and %d different commit each, respectively.\n"
1038msgid_plural ""
1039"Your branch and '%s' have diverged,\n"
1040"and have %d and %d different commits each, respectively.\n"
1041msgstr[0] ""
1042"您的分支和 '%s' 出现了偏离,\n"
1043"并且分别有 %d 和 %d 处不同的提交。\n"
1044msgstr[1] ""
1045"您的分支和 '%s' 出现了偏离,\n"
1046"并且分别有 %d 和 %d 处不同的提交。\n"
1047
1048#  译者:注意保持前导空格
1049#: remote.c:1989
1050msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1051msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
1052
1053#: run-command.c:80
1054msgid "open /dev/null failed"
1055msgstr "不能打开 /dev/null"
1056
1057#: run-command.c:82
1058#, c-format
1059msgid "dup2(%d,%d) failed"
1060msgstr "不能调用 dup2(%d,%d)"
1061
1062#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899
1063#: builtin/merge.c:1009 builtin/merge.c:1019
1064#, c-format
1065msgid "Could not open '%s' for writing"
1066msgstr "不能为写入打开 '%s'"
1067
1068#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789
1069#: builtin/merge.c:1011 builtin/merge.c:1024
1070#, c-format
1071msgid "Could not write to '%s'"
1072msgstr "不能写入 '%s'"
1073
1074#: sequencer.c:229
1075msgid ""
1076"after resolving the conflicts, mark the corrected paths\n"
1077"with 'git add <paths>' or 'git rm <paths>'"
1078msgstr ""
1079"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1080"命令标记修正后的文件"
1081
1082#: sequencer.c:232
1083msgid ""
1084"after resolving the conflicts, mark the corrected paths\n"
1085"with 'git add <paths>' or 'git rm <paths>'\n"
1086"and commit the result with 'git commit'"
1087msgstr ""
1088"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1089"对修正后的文件做标记,然后用 'git commit' 提交"
1090
1091#: sequencer.c:245 sequencer.c:879 sequencer.c:962
1092#, c-format
1093msgid "Could not write to %s"
1094msgstr "不能写入 %s"
1095
1096#: sequencer.c:248
1097#, c-format
1098msgid "Error wrapping up %s"
1099msgstr "错误收尾 %s"
1100
1101#: sequencer.c:263
1102msgid "Your local changes would be overwritten by cherry-pick."
1103msgstr "您的本地修改将被拣选操作覆盖。"
1104
1105#: sequencer.c:265
1106msgid "Your local changes would be overwritten by revert."
1107msgstr "您的本地修改将被还原操作覆盖。"
1108
1109#: sequencer.c:268
1110msgid "Commit your changes or stash them to proceed."
1111msgstr "提交您的修改或保存进度后再继续。"
1112
1113#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1114#: sequencer.c:325
1115#, c-format
1116msgid "%s: Unable to write new index file"
1117msgstr "%s:无法写入新索引文件"
1118
1119#: sequencer.c:356
1120msgid "Could not resolve HEAD commit\n"
1121msgstr "不能解析 HEAD 提交\n"
1122
1123#: sequencer.c:378
1124msgid "Unable to update cache tree\n"
1125msgstr "不能更新缓存\n"
1126
1127#: sequencer.c:430
1128#, c-format
1129msgid "Could not parse commit %s\n"
1130msgstr "不能解析提交 %s\n"
1131
1132#: sequencer.c:435
1133#, c-format
1134msgid "Could not parse parent commit %s\n"
1135msgstr "不能解析父提交 %s\n"
1136
1137#: sequencer.c:501
1138msgid "Your index file is unmerged."
1139msgstr "您的索引文件未完成合并。"
1140
1141#: sequencer.c:520
1142#, c-format
1143msgid "Commit %s is a merge but no -m option was given."
1144msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1145
1146#: sequencer.c:528
1147#, c-format
1148msgid "Commit %s does not have parent %d"
1149msgstr "提交 %s 没有父提交 %d"
1150
1151#: sequencer.c:532
1152#, c-format
1153msgid "Mainline was specified but commit %s is not a merge."
1154msgstr "指定了主线但提交 %s 不是一个合并。"
1155
1156#. TRANSLATORS: The first %s will be "revert" or
1157#. "cherry-pick", the second %s a SHA1
1158#: sequencer.c:545
1159#, c-format
1160msgid "%s: cannot parse parent commit %s"
1161msgstr "%s:不能解析父提交 %s"
1162
1163#: sequencer.c:549
1164#, c-format
1165msgid "Cannot get commit message for %s"
1166msgstr "不能得到 %s 的提交说明"
1167
1168#: sequencer.c:635
1169#, c-format
1170msgid "could not revert %s... %s"
1171msgstr "不能还原 %s... %s"
1172
1173#: sequencer.c:636
1174#, c-format
1175msgid "could not apply %s... %s"
1176msgstr "不能应用 %s... %s"
1177
1178#: sequencer.c:672
1179msgid "empty commit set passed"
1180msgstr "提供了空的提交集"
1181
1182#: sequencer.c:680
1183#, c-format
1184msgid "git %s: failed to read the index"
1185msgstr "git %s:无法读取索引"
1186
1187#: sequencer.c:685
1188#, c-format
1189msgid "git %s: failed to refresh the index"
1190msgstr "git %s:无法刷新索引"
1191
1192#: sequencer.c:743
1193#, c-format
1194msgid "Cannot %s during a %s"
1195msgstr "无法 %s 在一个 %s 过程中"
1196
1197#: sequencer.c:765
1198#, c-format
1199msgid "Could not parse line %d."
1200msgstr "不能解析第 %d 行。"
1201
1202#: sequencer.c:770
1203msgid "No commits parsed."
1204msgstr "没有提交被解析。"
1205
1206#: sequencer.c:783
1207#, c-format
1208msgid "Could not open %s"
1209msgstr "不能打开 %s"
1210
1211#: sequencer.c:787
1212#, c-format
1213msgid "Could not read %s."
1214msgstr "不能读取 %s。"
1215
1216#: sequencer.c:794
1217#, c-format
1218msgid "Unusable instruction sheet: %s"
1219msgstr "无用的指令表单:%s"
1220
1221#: sequencer.c:824
1222#, c-format
1223msgid "Invalid key: %s"
1224msgstr "无效键名:%s"
1225
1226#: sequencer.c:827
1227#, c-format
1228msgid "Invalid value for %s: %s"
1229msgstr "%s 的值无效:%s"
1230
1231#: sequencer.c:839
1232#, c-format
1233msgid "Malformed options sheet: %s"
1234msgstr "非法的选项表单:%s"
1235
1236#: sequencer.c:860
1237msgid "a cherry-pick or revert is already in progress"
1238msgstr "一个拣选或还原操作已在进行"
1239
1240#: sequencer.c:861
1241msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1242msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1243
1244#: sequencer.c:865
1245#, c-format
1246msgid "Could not create sequencer directory %s"
1247msgstr "不能创建序列目录 %s"
1248
1249#: sequencer.c:881 sequencer.c:966
1250#, c-format
1251msgid "Error wrapping up %s."
1252msgstr "错误收尾 %s。"
1253
1254#: sequencer.c:900 sequencer.c:1036
1255msgid "no cherry-pick or revert in progress"
1256msgstr "拣选或还原操作并未进行"
1257
1258#: sequencer.c:902
1259msgid "cannot resolve HEAD"
1260msgstr "不能解析 HEAD"
1261
1262#: sequencer.c:904
1263msgid "cannot abort from a branch yet to be born"
1264msgstr "不能从尚未建立的分支终止"
1265
1266#: sequencer.c:926 builtin/apply.c:4061
1267#, c-format
1268msgid "cannot open %s: %s"
1269msgstr "不能打开 %s:%s"
1270
1271#: sequencer.c:929
1272#, c-format
1273msgid "cannot read %s: %s"
1274msgstr "不能读取 %s:%s"
1275
1276#: sequencer.c:930
1277msgid "unexpected end of file"
1278msgstr "意外的文件结束"
1279
1280#: sequencer.c:936
1281#, c-format
1282msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1283msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1284
1285#: sequencer.c:959
1286#, c-format
1287msgid "Could not format %s."
1288msgstr "不能格式化 %s。"
1289
1290#: sequencer.c:1104
1291#, c-format
1292msgid "%s: can't cherry-pick a %s"
1293msgstr "%s:不能拣选一个%s"
1294
1295#: sequencer.c:1107
1296#, c-format
1297msgid "%s: bad revision"
1298msgstr "%s:错误的版本"
1299
1300#: sequencer.c:1141
1301msgid "Can't revert as initial commit"
1302msgstr "不能作为初始提交还原"
1303
1304#: sequencer.c:1142
1305msgid "Can't cherry-pick into empty head"
1306msgstr "不能拣选到空分支"
1307
1308#: sha1_name.c:439
1309msgid ""
1310"Git normally never creates a ref that ends with 40 hex characters\n"
1311"because it will be ignored when you just specify 40-hex. These refs\n"
1312"may be created by mistake. For example,\n"
1313"\n"
1314"  git checkout -b $br $(git rev-parse ...)\n"
1315"\n"
1316"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1317"examine these refs and maybe delete them. Turn this message off by\n"
1318"running \"git config advice.objectNameWarning false\""
1319msgstr ""
1320"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1321"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1322"\n"
1323"  git checkout -b $br $(git rev-parse ...)\n"
1324"\n"
1325"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1326"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1327"命令关闭本消息通知。"
1328
1329#: sha1_name.c:1072
1330msgid "HEAD does not point to a branch"
1331msgstr "HEAD 没有指向一个分支"
1332
1333#: sha1_name.c:1075
1334#, c-format
1335msgid "No such branch: '%s'"
1336msgstr "没有此分支:'%s'"
1337
1338#: sha1_name.c:1077
1339#, c-format
1340msgid "No upstream configured for branch '%s'"
1341msgstr "尚未给分支 '%s' 设置上游"
1342
1343#: sha1_name.c:1081
1344#, c-format
1345msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1346msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1347
1348#: submodule.c:64 submodule.c:98
1349msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1350msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1351
1352#: submodule.c:68 submodule.c:102
1353#, c-format
1354msgid "Could not find section in .gitmodules where path=%s"
1355msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1356
1357#: submodule.c:76
1358#, c-format
1359msgid "Could not update .gitmodules entry %s"
1360msgstr "不能更新 .gitmodules 条目 %s"
1361
1362#: submodule.c:109
1363#, c-format
1364msgid "Could not remove .gitmodules entry for %s"
1365msgstr "无法移除 %s 的 .gitmodules 条目"
1366
1367#: submodule.c:120
1368msgid "staging updated .gitmodules failed"
1369msgstr "将更新后 .gitmodules 添加暂存区失败"
1370
1371#: submodule.c:1121 builtin/init-db.c:363
1372#, c-format
1373msgid "Could not create git link %s"
1374msgstr "不能创建 git link %s"
1375
1376#: submodule.c:1132
1377#, c-format
1378msgid "Could not set core.worktree in %s"
1379msgstr "不能在 %s 中设置 core.worktree"
1380
1381#: unpack-trees.c:206
1382msgid "Checking out files"
1383msgstr "正在检出文件"
1384
1385#: urlmatch.c:120
1386msgid "invalid URL scheme name or missing '://' suffix"
1387msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1388
1389#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1390#, c-format
1391msgid "invalid %XX escape sequence"
1392msgstr "无效的 %XX 转义序列"
1393
1394#: urlmatch.c:172
1395msgid "missing host and scheme is not 'file:'"
1396msgstr "缺失主机名且URL方案不是 'file:'"
1397
1398#: urlmatch.c:189
1399msgid "a 'file:' URL may not have a port number"
1400msgstr "一个 'file:' URL 不应该包含端口号"
1401
1402#: urlmatch.c:199
1403msgid "invalid characters in host name"
1404msgstr "主机名中包含无效的字符"
1405
1406#: urlmatch.c:244 urlmatch.c:255
1407msgid "invalid port number"
1408msgstr "无效的端口号"
1409
1410#: urlmatch.c:322
1411msgid "invalid '..' path segment"
1412msgstr "无效的 '..' 路径片段"
1413
1414#: wrapper.c:422
1415#, c-format
1416msgid "unable to access '%s': %s"
1417msgstr "不能访问 '%s':%s"
1418
1419#: wrapper.c:443
1420#, c-format
1421msgid "unable to access '%s'"
1422msgstr "不能访问 '%s'"
1423
1424#: wrapper.c:454
1425#, c-format
1426msgid "unable to look up current user in the passwd file: %s"
1427msgstr "无法在口令文件中查询到当前用户:%s"
1428
1429#: wrapper.c:455
1430msgid "no such user"
1431msgstr "无此用户"
1432
1433#: wt-status.c:150
1434msgid "Unmerged paths:"
1435msgstr "未合并的路径:"
1436
1437#  译者:注意保持前导空格
1438#: wt-status.c:177 wt-status.c:204
1439#, c-format
1440msgid "  (use \"git reset %s <file>...\" to unstage)"
1441msgstr "  (使用 \"git reset %s <file>...\" 撤出暂存区)"
1442
1443#  译者:注意保持前导空格
1444#: wt-status.c:179 wt-status.c:206
1445msgid "  (use \"git rm --cached <file>...\" to unstage)"
1446msgstr "  (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1447
1448#  译者:注意保持前导空格
1449#: wt-status.c:183
1450msgid "  (use \"git add <file>...\" to mark resolution)"
1451msgstr "  (使用 \"git add <file>...\" 标记解决方案)"
1452
1453#  译者:注意保持前导空格
1454#: wt-status.c:185 wt-status.c:189
1455msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1456msgstr "  (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1457
1458#  译者:注意保持前导空格
1459#: wt-status.c:187
1460msgid "  (use \"git rm <file>...\" to mark resolution)"
1461msgstr "  (使用 \"git rm <file>...\" 标记解决方案)"
1462
1463#: wt-status.c:198
1464msgid "Changes to be committed:"
1465msgstr "要提交的变更:"
1466
1467#: wt-status.c:216
1468msgid "Changes not staged for commit:"
1469msgstr "尚未暂存以备提交的变更:"
1470
1471#  译者:注意保持前导空格
1472#: wt-status.c:220
1473msgid "  (use \"git add <file>...\" to update what will be committed)"
1474msgstr "  (使用 \"git add <file>...\" 更新要提交的内容)"
1475
1476#  译者:注意保持前导空格
1477#: wt-status.c:222
1478msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1479msgstr "  (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1480
1481#  译者:注意保持前导空格
1482#: wt-status.c:223
1483msgid ""
1484"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1485msgstr "  (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1486
1487#  译者:注意保持前导空格
1488#: wt-status.c:225
1489msgid "  (commit or discard the untracked or modified content in submodules)"
1490msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
1491
1492#  译者:注意保持前导空格
1493#: wt-status.c:237
1494#, c-format
1495msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1496msgstr "  (使用 \"git %s <file>...\" 以包含要提交的内容)"
1497
1498#: wt-status.c:252
1499msgid "both deleted:"
1500msgstr "双方删除:"
1501
1502#: wt-status.c:254
1503msgid "added by us:"
1504msgstr "由我们添加:"
1505
1506#: wt-status.c:256
1507msgid "deleted by them:"
1508msgstr "由他们删除:"
1509
1510#: wt-status.c:258
1511msgid "added by them:"
1512msgstr "由他们添加:"
1513
1514#: wt-status.c:260
1515msgid "deleted by us:"
1516msgstr "由我们删除:"
1517
1518#: wt-status.c:262
1519msgid "both added:"
1520msgstr "双方添加:"
1521
1522#: wt-status.c:264
1523msgid "both modified:"
1524msgstr "双方修改:"
1525
1526#: wt-status.c:266
1527#, c-format
1528msgid "bug: unhandled unmerged status %x"
1529msgstr "bug:无法处理的未合并状态 %x"
1530
1531#: wt-status.c:274
1532msgid "new file:"
1533msgstr "新文件:"
1534
1535#: wt-status.c:276
1536msgid "copied:"
1537msgstr "拷贝:"
1538
1539#: wt-status.c:278
1540msgid "deleted:"
1541msgstr "删除:"
1542
1543#: wt-status.c:280
1544msgid "modified:"
1545msgstr "修改:"
1546
1547#: wt-status.c:282
1548msgid "renamed:"
1549msgstr "重命名:"
1550
1551#: wt-status.c:284
1552msgid "typechange:"
1553msgstr "类型变更:"
1554
1555#: wt-status.c:286
1556msgid "unknown:"
1557msgstr "未知:"
1558
1559#: wt-status.c:288
1560msgid "unmerged:"
1561msgstr "未合并:"
1562
1563#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1564#: wt-status.c:370
1565msgid "new commits, "
1566msgstr "新提交, "
1567
1568#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1569#: wt-status.c:372
1570msgid "modified content, "
1571msgstr "修改的内容, "
1572
1573#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1574#: wt-status.c:374
1575msgid "untracked content, "
1576msgstr "未跟踪的内容, "
1577
1578#: wt-status.c:391
1579#, c-format
1580msgid "bug: unhandled diff status %c"
1581msgstr "bug:无法处理的差异状态 %c"
1582
1583#: wt-status.c:765
1584msgid "Submodules changed but not updated:"
1585msgstr "子模组已修改但尚未更新:"
1586
1587#: wt-status.c:767
1588msgid "Submodule changes to be committed:"
1589msgstr "要提交的子模组变更:"
1590
1591#: wt-status.c:846
1592msgid ""
1593"Do not touch the line above.\n"
1594"Everything below will be removed."
1595msgstr ""
1596"不要改动上面的一行。\n"
1597"下面的所有内容均将被删除。"
1598
1599#: wt-status.c:937
1600msgid "You have unmerged paths."
1601msgstr "您有尚未合并的路径。"
1602
1603#  译者:注意保持前导空格
1604#: wt-status.c:940
1605msgid "  (fix conflicts and run \"git commit\")"
1606msgstr "  (解决冲突并运行 \"git commit\")"
1607
1608#: wt-status.c:943
1609msgid "All conflicts fixed but you are still merging."
1610msgstr "所有冲突已解决但您仍处于合并中。"
1611
1612#  译者:注意保持前导空格
1613#: wt-status.c:946
1614msgid "  (use \"git commit\" to conclude merge)"
1615msgstr "  (使用 \"git commit\" 结束合并)"
1616
1617#: wt-status.c:956
1618msgid "You are in the middle of an am session."
1619msgstr "您正处于 am 操作过程中。"
1620
1621#: wt-status.c:959
1622msgid "The current patch is empty."
1623msgstr "当前的补丁为空。"
1624
1625#  译者:注意保持前导空格
1626#: wt-status.c:963
1627msgid "  (fix conflicts and then run \"git am --continue\")"
1628msgstr "  (解决冲突,然后运行 \"git am --continue\")"
1629
1630#  译者:注意保持前导空格
1631#: wt-status.c:965
1632msgid "  (use \"git am --skip\" to skip this patch)"
1633msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
1634
1635#  译者:注意保持前导空格
1636#: wt-status.c:967
1637msgid "  (use \"git am --abort\" to restore the original branch)"
1638msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
1639
1640#: wt-status.c:1027 wt-status.c:1044
1641#, c-format
1642msgid "You are currently rebasing branch '%s' on '%s'."
1643msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1644
1645#: wt-status.c:1032 wt-status.c:1049
1646msgid "You are currently rebasing."
1647msgstr "您在执行变基操作。"
1648
1649#  译者:注意保持前导空格
1650#: wt-status.c:1035
1651msgid "  (fix conflicts and then run \"git rebase --continue\")"
1652msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
1653
1654#  译者:注意保持前导空格
1655#: wt-status.c:1037
1656msgid "  (use \"git rebase --skip\" to skip this patch)"
1657msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
1658
1659#  译者:注意保持前导空格
1660#: wt-status.c:1039
1661msgid "  (use \"git rebase --abort\" to check out the original branch)"
1662msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
1663
1664#  译者:注意保持前导空格
1665#: wt-status.c:1052
1666msgid "  (all conflicts fixed: run \"git rebase --continue\")"
1667msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
1668
1669#: wt-status.c:1056
1670#, c-format
1671msgid ""
1672"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1673msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1674
1675#: wt-status.c:1061
1676msgid "You are currently splitting a commit during a rebase."
1677msgstr "您在执行变基操作时拆分提交。"
1678
1679#  译者:注意保持前导空格
1680#: wt-status.c:1064
1681msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
1682msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1683
1684#: wt-status.c:1068
1685#, c-format
1686msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1687msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1688
1689#: wt-status.c:1073
1690msgid "You are currently editing a commit during a rebase."
1691msgstr "您在执行变基操作时编辑提交。"
1692
1693#  译者:注意保持前导空格
1694#: wt-status.c:1076
1695msgid "  (use \"git commit --amend\" to amend the current commit)"
1696msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
1697
1698#  译者:注意保持前导空格
1699#: wt-status.c:1078
1700msgid ""
1701"  (use \"git rebase --continue\" once you are satisfied with your changes)"
1702msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
1703
1704#: wt-status.c:1088
1705#, c-format
1706msgid "You are currently cherry-picking commit %s."
1707msgstr "您在执行拣选提交 %s 的操作。"
1708
1709#  译者:注意保持前导空格
1710#: wt-status.c:1093
1711msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
1712msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
1713
1714#  译者:注意保持前导空格
1715#: wt-status.c:1096
1716msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
1717msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1718
1719#  译者:注意保持前导空格
1720#: wt-status.c:1098
1721msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1722msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1723
1724#: wt-status.c:1107
1725#, c-format
1726msgid "You are currently reverting commit %s."
1727msgstr "您在执行反转提交 %s 的操作。"
1728
1729#  译者:注意保持前导空格
1730#: wt-status.c:1112
1731msgid "  (fix conflicts and run \"git revert --continue\")"
1732msgstr "  (解决冲突并运行 \"git revert --continue\")"
1733
1734#  译者:注意保持前导空格
1735#: wt-status.c:1115
1736msgid "  (all conflicts fixed: run \"git revert --continue\")"
1737msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
1738
1739#  译者:注意保持前导空格
1740#: wt-status.c:1117
1741msgid "  (use \"git revert --abort\" to cancel the revert operation)"
1742msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
1743
1744#: wt-status.c:1128
1745#, c-format
1746msgid "You are currently bisecting, started from branch '%s'."
1747msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1748
1749#: wt-status.c:1132
1750msgid "You are currently bisecting."
1751msgstr "您在执行二分查找操作。"
1752
1753#  译者:注意保持前导空格
1754#: wt-status.c:1135
1755msgid "  (use \"git bisect reset\" to get back to the original branch)"
1756msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
1757
1758#: wt-status.c:1310
1759msgid "On branch "
1760msgstr "位于分支 "
1761
1762#: wt-status.c:1317
1763msgid "rebase in progress; onto "
1764msgstr "变基操作正在进行中;至 "
1765
1766#: wt-status.c:1324
1767msgid "HEAD detached at "
1768msgstr "头指针分离于 "
1769
1770#: wt-status.c:1326
1771msgid "HEAD detached from "
1772msgstr "头指针分离自 "
1773
1774#: wt-status.c:1329
1775msgid "Not currently on any branch."
1776msgstr "当前不在任何分支上。"
1777
1778#: wt-status.c:1346
1779msgid "Initial commit"
1780msgstr "初始提交"
1781
1782#: wt-status.c:1360
1783msgid "Untracked files"
1784msgstr "未跟踪的文件"
1785
1786#: wt-status.c:1362
1787msgid "Ignored files"
1788msgstr "忽略的文件"
1789
1790#: wt-status.c:1366
1791#, c-format
1792msgid ""
1793"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1794"may speed it up, but you have to be careful not to forget to add\n"
1795"new files yourself (see 'git help status')."
1796msgstr ""
1797"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1798"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1799
1800#: wt-status.c:1372
1801#, c-format
1802msgid "Untracked files not listed%s"
1803msgstr "未跟踪的文件没有列出%s"
1804
1805#  译者:中文字符串拼接,可删除前导空格
1806#: wt-status.c:1374
1807msgid " (use -u option to show untracked files)"
1808msgstr "(使用 -u 参数显示未跟踪的文件)"
1809
1810#: wt-status.c:1380
1811msgid "No changes"
1812msgstr "没有修改"
1813
1814#: wt-status.c:1385
1815#, c-format
1816msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1817msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1818
1819#: wt-status.c:1388
1820#, c-format
1821msgid "no changes added to commit\n"
1822msgstr "修改尚未加入提交\n"
1823
1824#: wt-status.c:1391
1825#, c-format
1826msgid ""
1827"nothing added to commit but untracked files present (use \"git add\" to "
1828"track)\n"
1829msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1830
1831#: wt-status.c:1394
1832#, c-format
1833msgid "nothing added to commit but untracked files present\n"
1834msgstr "提交为空,但是存在尚未跟踪的文件\n"
1835
1836#  译者:中文字符串拼接,可删除前导空格
1837#: wt-status.c:1397
1838#, c-format
1839msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1840msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1841
1842#: wt-status.c:1400 wt-status.c:1405
1843#, c-format
1844msgid "nothing to commit\n"
1845msgstr "无文件要提交\n"
1846
1847#  译者:中文字符串拼接,可删除前导空格
1848#: wt-status.c:1403
1849#, c-format
1850msgid "nothing to commit (use -u to show untracked files)\n"
1851msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1852
1853#  译者:中文字符串拼接,可删除前导空格
1854#: wt-status.c:1407
1855#, c-format
1856msgid "nothing to commit, working directory clean\n"
1857msgstr "无文件要提交,干净的工作区\n"
1858
1859#: wt-status.c:1516
1860msgid "HEAD (no branch)"
1861msgstr "HEAD(非分支)"
1862
1863#  译者:注意保持句尾空格
1864#: wt-status.c:1522
1865msgid "Initial commit on "
1866msgstr "初始提交于 "
1867
1868#: wt-status.c:1554
1869msgid "gone"
1870msgstr "丢失"
1871
1872#  译者:注意保持句尾空格
1873#: wt-status.c:1556 wt-status.c:1564
1874msgid "behind "
1875msgstr "落后 "
1876
1877#: compat/precompose_utf8.c:55 builtin/clone.c:356
1878#, c-format
1879msgid "failed to unlink '%s'"
1880msgstr "无法删除 '%s'"
1881
1882#: builtin/add.c:21
1883msgid "git add [options] [--] <pathspec>..."
1884msgstr "git add [选项] [--] <路径规则>..."
1885
1886#: builtin/add.c:64
1887#, c-format
1888msgid "unexpected diff status %c"
1889msgstr "意外的差异状态 %c"
1890
1891#: builtin/add.c:69 builtin/commit.c:261
1892msgid "updating files failed"
1893msgstr "更新文件失败"
1894
1895#: builtin/add.c:79
1896#, c-format
1897msgid "remove '%s'\n"
1898msgstr "删除 '%s'\n"
1899
1900#: builtin/add.c:133
1901msgid "Unstaged changes after refreshing the index:"
1902msgstr "刷新索引之后尚未被暂存的变更:"
1903
1904#: builtin/add.c:193
1905msgid "Could not read the index"
1906msgstr "不能读取索引"
1907
1908#: builtin/add.c:204
1909#, c-format
1910msgid "Could not open '%s' for writing."
1911msgstr "不能打开 '%s' 以写入。"
1912
1913#: builtin/add.c:208
1914msgid "Could not write patch"
1915msgstr "不能生成补丁"
1916
1917#: builtin/add.c:213
1918#, c-format
1919msgid "Could not stat '%s'"
1920msgstr "不能查看文件状态 '%s'"
1921
1922#: builtin/add.c:215
1923msgid "Empty patch. Aborted."
1924msgstr "空补丁。异常终止。"
1925
1926#: builtin/add.c:221
1927#, c-format
1928msgid "Could not apply '%s'"
1929msgstr "不能应用 '%s'"
1930
1931#: builtin/add.c:231
1932msgid "The following paths are ignored by one of your .gitignore files:\n"
1933msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1934
1935#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70
1936#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344
1937#: builtin/rm.c:269
1938msgid "dry run"
1939msgstr "演习"
1940
1941#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19
1942#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612
1943#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
1944msgid "be verbose"
1945msgstr "冗长输出"
1946
1947#: builtin/add.c:251
1948msgid "interactive picking"
1949msgstr "交互式拣选"
1950
1951#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283
1952msgid "select hunks interactively"
1953msgstr "交互式挑选数据块"
1954
1955#: builtin/add.c:253
1956msgid "edit current diff and apply"
1957msgstr "编辑当前差异并应用"
1958
1959#: builtin/add.c:254
1960msgid "allow adding otherwise ignored files"
1961msgstr "允许添加忽略的文件"
1962
1963#: builtin/add.c:255
1964msgid "update tracked files"
1965msgstr "更新已跟踪的文件"
1966
1967#: builtin/add.c:256
1968msgid "record only the fact that the path will be added later"
1969msgstr "只记录,该路径稍后再添加"
1970
1971#: builtin/add.c:257
1972msgid "add changes from all tracked and untracked files"
1973msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1974
1975#: builtin/add.c:260
1976msgid "ignore paths removed in the working tree (same as --no-all)"
1977msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
1978
1979#: builtin/add.c:262
1980msgid "don't add, only refresh the index"
1981msgstr "不添加,只刷新索引"
1982
1983#: builtin/add.c:263
1984msgid "just skip files which cannot be added because of errors"
1985msgstr "跳过因出错不能添加的文件"
1986
1987#: builtin/add.c:264
1988msgid "check if - even missing - files are ignored in dry run"
1989msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1990
1991#: builtin/add.c:286
1992#, c-format
1993msgid "Use -f if you really want to add them.\n"
1994msgstr "使用 -f 参数如果您确实要添加它们。\n"
1995
1996#: builtin/add.c:287
1997msgid "no files added"
1998msgstr "没有文件被添加"
1999
2000#: builtin/add.c:293
2001msgid "adding files failed"
2002msgstr "添加文件失败"
2003
2004#: builtin/add.c:330
2005msgid "-A and -u are mutually incompatible"
2006msgstr "-A 和 -u 选项互斥"
2007
2008#: builtin/add.c:337
2009msgid "Option --ignore-missing can only be used together with --dry-run"
2010msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2011
2012#: builtin/add.c:358
2013#, c-format
2014msgid "Nothing specified, nothing added.\n"
2015msgstr "没有指定文件,也没有文件被添加。\n"
2016
2017#: builtin/add.c:359
2018#, c-format
2019msgid "Maybe you wanted to say 'git add .'?\n"
2020msgstr "也许您想要执行 'git add .'?\n"
2021
2022#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920
2023#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
2024msgid "index file corrupt"
2025msgstr "索引文件损坏"
2026
2027#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432
2028msgid "Unable to write new index file"
2029msgstr "无法写入新索引文件"
2030
2031#: builtin/apply.c:57
2032msgid "git apply [options] [<patch>...]"
2033msgstr "git apply [选项] [<补丁>...]"
2034
2035#: builtin/apply.c:110
2036#, c-format
2037msgid "unrecognized whitespace option '%s'"
2038msgstr "未能识别的空白字符选项 '%s'"
2039
2040#: builtin/apply.c:125
2041#, c-format
2042msgid "unrecognized whitespace ignore option '%s'"
2043msgstr "未能识别的空白字符忽略选项 '%s'"
2044
2045#: builtin/apply.c:823
2046#, c-format
2047msgid "Cannot prepare timestamp regexp %s"
2048msgstr "无法准备时间戳正则表达式 %s"
2049
2050#: builtin/apply.c:832
2051#, c-format
2052msgid "regexec returned %d for input: %s"
2053msgstr "regexec 返回 %d,输入为:%s"
2054
2055#: builtin/apply.c:913
2056#, c-format
2057msgid "unable to find filename in patch at line %d"
2058msgstr "不能在补丁的第 %d 行找到文件名"
2059
2060#: builtin/apply.c:945
2061#, c-format
2062msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2063msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2064
2065#: builtin/apply.c:949
2066#, c-format
2067msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2068msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2069
2070#: builtin/apply.c:950
2071#, c-format
2072msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2073msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2074
2075#: builtin/apply.c:957
2076#, c-format
2077msgid "git apply: bad git-diff - expected /dev/null on line %d"
2078msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2079
2080#: builtin/apply.c:1422
2081#, c-format
2082msgid "recount: unexpected line: %.*s"
2083msgstr "recount:意外的行:%.*s"
2084
2085#: builtin/apply.c:1479
2086#, c-format
2087msgid "patch fragment without header at line %d: %.*s"
2088msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2089
2090#: builtin/apply.c:1496
2091#, c-format
2092msgid ""
2093"git diff header lacks filename information when removing %d leading pathname "
2094"component (line %d)"
2095msgid_plural ""
2096"git diff header lacks filename information when removing %d leading pathname "
2097"components (line %d)"
2098msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2099msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2100
2101#: builtin/apply.c:1656
2102msgid "new file depends on old contents"
2103msgstr "新文件依赖旧内容"
2104
2105#: builtin/apply.c:1658
2106msgid "deleted file still has contents"
2107msgstr "删除的文件仍有内容"
2108
2109#: builtin/apply.c:1684
2110#, c-format
2111msgid "corrupt patch at line %d"
2112msgstr "补丁在第 %d 行损坏"
2113
2114#: builtin/apply.c:1720
2115#, c-format
2116msgid "new file %s depends on old contents"
2117msgstr "新文件 %s 依赖旧内容"
2118
2119#: builtin/apply.c:1722
2120#, c-format
2121msgid "deleted file %s still has contents"
2122msgstr "删除的文件 %s 仍有内容"
2123
2124#: builtin/apply.c:1725
2125#, c-format
2126msgid "** warning: file %s becomes empty but is not deleted"
2127msgstr "** 警告:文件 %s 成为空文件但并未删除"
2128
2129#: builtin/apply.c:1871
2130#, c-format
2131msgid "corrupt binary patch at line %d: %.*s"
2132msgstr "二进制补丁在第 %d 行损坏:%.*s"
2133
2134#: builtin/apply.c:1900
2135#, c-format
2136msgid "unrecognized binary patch at line %d"
2137msgstr "未能识别的二进制补丁位于第 %d 行"
2138
2139#: builtin/apply.c:1986
2140#, c-format
2141msgid "patch with only garbage at line %d"
2142msgstr "补丁文件的第 %d 行只有垃圾数据"
2143
2144#: builtin/apply.c:2076
2145#, c-format
2146msgid "unable to read symlink %s"
2147msgstr "无法读取符号链接 %s"
2148
2149#: builtin/apply.c:2080
2150#, c-format
2151msgid "unable to open or read %s"
2152msgstr "不能打开或读取 %s"
2153
2154#: builtin/apply.c:2688
2155#, c-format
2156msgid "invalid start of line: '%c'"
2157msgstr "无效的行首字符:'%c'"
2158
2159#: builtin/apply.c:2806
2160#, c-format
2161msgid "Hunk #%d succeeded at %d (offset %d line)."
2162msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2163msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2164msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2165
2166#: builtin/apply.c:2818
2167#, c-format
2168msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2169msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2170
2171#: builtin/apply.c:2824
2172#, c-format
2173msgid ""
2174"while searching for:\n"
2175"%.*s"
2176msgstr ""
2177"当查询:\n"
2178"%.*s"
2179
2180#: builtin/apply.c:2843
2181#, c-format
2182msgid "missing binary patch data for '%s'"
2183msgstr "缺失 '%s' 的二进制补丁数据"
2184
2185#: builtin/apply.c:2946
2186#, c-format
2187msgid "binary patch does not apply to '%s'"
2188msgstr "二进制补丁未应用到 '%s'"
2189
2190#: builtin/apply.c:2952
2191#, c-format
2192msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2193msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2194
2195#: builtin/apply.c:2973
2196#, c-format
2197msgid "patch failed: %s:%ld"
2198msgstr "打补丁失败:%s:%ld"
2199
2200#: builtin/apply.c:3095
2201#, c-format
2202msgid "cannot checkout %s"
2203msgstr "不能检出 %s"
2204
2205#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2206#, c-format
2207msgid "read of %s failed"
2208msgstr "读取 %s 失败"
2209
2210#: builtin/apply.c:3174 builtin/apply.c:3396
2211#, c-format
2212msgid "path %s has been renamed/deleted"
2213msgstr "路径 %s 已经被重命名/删除"
2214
2215#: builtin/apply.c:3255 builtin/apply.c:3410
2216#, c-format
2217msgid "%s: does not exist in index"
2218msgstr "%s:不存在于索引中"
2219
2220#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2221#, c-format
2222msgid "%s: %s"
2223msgstr "%s:%s"
2224
2225#: builtin/apply.c:3264 builtin/apply.c:3418
2226#, c-format
2227msgid "%s: does not match index"
2228msgstr "%s:和索引不匹配"
2229
2230#: builtin/apply.c:3366
2231msgid "removal patch leaves file contents"
2232msgstr "移除补丁仍留下了文件内容"
2233
2234#: builtin/apply.c:3435
2235#, c-format
2236msgid "%s: wrong type"
2237msgstr "%s:错误类型"
2238
2239#: builtin/apply.c:3437
2240#, c-format
2241msgid "%s has type %o, expected %o"
2242msgstr "%s 的类型是 %o,应为 %o"
2243
2244#: builtin/apply.c:3538
2245#, c-format
2246msgid "%s: already exists in index"
2247msgstr "%s:已经存在于索引中"
2248
2249#: builtin/apply.c:3541
2250#, c-format
2251msgid "%s: already exists in working directory"
2252msgstr "%s:已经存在于工作区中"
2253
2254#: builtin/apply.c:3561
2255#, c-format
2256msgid "new mode (%o) of %s does not match old mode (%o)"
2257msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2258
2259#: builtin/apply.c:3566
2260#, c-format
2261msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2262msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2263
2264#: builtin/apply.c:3574
2265#, c-format
2266msgid "%s: patch does not apply"
2267msgstr "%s:补丁未应用"
2268
2269#: builtin/apply.c:3587
2270#, c-format
2271msgid "Checking patch %s..."
2272msgstr "检查补丁 %s..."
2273
2274#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
2275#, c-format
2276msgid "make_cache_entry failed for path '%s'"
2277msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2278
2279#: builtin/apply.c:3823
2280#, c-format
2281msgid "unable to remove %s from index"
2282msgstr "不能从索引中移除 %s"
2283
2284#: builtin/apply.c:3851
2285#, c-format
2286msgid "corrupt patch for submodule %s"
2287msgstr "子模组 %s 损坏的补丁"
2288
2289#: builtin/apply.c:3855
2290#, c-format
2291msgid "unable to stat newly created file '%s'"
2292msgstr "不能枚举新建文件 '%s' 的状态"
2293
2294#: builtin/apply.c:3860
2295#, c-format
2296msgid "unable to create backing store for newly created file %s"
2297msgstr "不能为新建文件 %s 创建后端存储"
2298
2299#: builtin/apply.c:3863 builtin/apply.c:3971
2300#, c-format
2301msgid "unable to add cache entry for %s"
2302msgstr "无法为 %s 添加缓存条目"
2303
2304#: builtin/apply.c:3896
2305#, c-format
2306msgid "closing file '%s'"
2307msgstr "关闭文件 '%s'"
2308
2309#: builtin/apply.c:3945
2310#, c-format
2311msgid "unable to write file '%s' mode %o"
2312msgstr "不能写文件 '%s' 权限 %o"
2313
2314#: builtin/apply.c:4032
2315#, c-format
2316msgid "Applied patch %s cleanly."
2317msgstr "成功应用补丁 %s。"
2318
2319#: builtin/apply.c:4040
2320msgid "internal error"
2321msgstr "内部错误"
2322
2323#: builtin/apply.c:4043
2324#, c-format
2325msgid "Applying patch %%s with %d reject..."
2326msgid_plural "Applying patch %%s with %d rejects..."
2327msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2328msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2329
2330#: builtin/apply.c:4053
2331#, c-format
2332msgid "truncating .rej filename to %.*s.rej"
2333msgstr "截短 .rej 文件名为 %.*s.rej"
2334
2335#: builtin/apply.c:4074
2336#, c-format
2337msgid "Hunk #%d applied cleanly."
2338msgstr "第 #%d 个片段成功应用。"
2339
2340#: builtin/apply.c:4077
2341#, c-format
2342msgid "Rejected hunk #%d."
2343msgstr "拒绝第 #%d 个片段。"
2344
2345#: builtin/apply.c:4227
2346msgid "unrecognized input"
2347msgstr "未能识别的输入"
2348
2349#: builtin/apply.c:4238
2350msgid "unable to read index file"
2351msgstr "无法读取索引文件"
2352
2353#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
2354#: builtin/fetch.c:78
2355msgid "path"
2356msgstr "路径"
2357
2358#: builtin/apply.c:4358
2359msgid "don't apply changes matching the given path"
2360msgstr "不要应用与给出路径向匹配的变更"
2361
2362#: builtin/apply.c:4361
2363msgid "apply changes matching the given path"
2364msgstr "应用与给出路径向匹配的变更"
2365
2366#: builtin/apply.c:4363
2367msgid "num"
2368msgstr "数字"
2369
2370#: builtin/apply.c:4364
2371msgid "remove <num> leading slashes from traditional diff paths"
2372msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2373
2374#: builtin/apply.c:4367
2375msgid "ignore additions made by the patch"
2376msgstr "忽略补丁中的添加的文件"
2377
2378#: builtin/apply.c:4369
2379msgid "instead of applying the patch, output diffstat for the input"
2380msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2381
2382#: builtin/apply.c:4373
2383msgid "show number of added and deleted lines in decimal notation"
2384msgstr "以十进制数显示添加和删除的行数"
2385
2386#: builtin/apply.c:4375
2387msgid "instead of applying the patch, output a summary for the input"
2388msgstr "不应用补丁,而是显示输入的概要"
2389
2390#: builtin/apply.c:4377
2391msgid "instead of applying the patch, see if the patch is applicable"
2392msgstr "不应用补丁,而是查看补丁是否可应用"
2393
2394#: builtin/apply.c:4379
2395msgid "make sure the patch is applicable to the current index"
2396msgstr "确认补丁可以应用到当前索引"
2397
2398#: builtin/apply.c:4381
2399msgid "apply a patch without touching the working tree"
2400msgstr "应用补丁而不修改工作区"
2401
2402#: builtin/apply.c:4383
2403msgid "also apply the patch (use with --stat/--summary/--check)"
2404msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2405
2406#: builtin/apply.c:4385
2407msgid "attempt three-way merge if a patch does not apply"
2408msgstr "如果一个补丁不能应用则尝试三路合并"
2409
2410#: builtin/apply.c:4387
2411msgid "build a temporary index based on embedded index information"
2412msgstr "创建一个临时索引基于嵌入的索引信息"
2413
2414#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455
2415msgid "paths are separated with NUL character"
2416msgstr "路径以 NUL 字符分隔"
2417
2418#: builtin/apply.c:4392
2419msgid "ensure at least <n> lines of context match"
2420msgstr "确保至少匹配 <n> 行上下文"
2421
2422#: builtin/apply.c:4393
2423msgid "action"
2424msgstr "动作"
2425
2426#: builtin/apply.c:4394
2427msgid "detect new or modified lines that have whitespace errors"
2428msgstr "检查新增和修改的行中间的空白字符滥用"
2429
2430#: builtin/apply.c:4397 builtin/apply.c:4400
2431msgid "ignore changes in whitespace when finding context"
2432msgstr "查找上下文时忽略空白字符的变更"
2433
2434#: builtin/apply.c:4403
2435msgid "apply the patch in reverse"
2436msgstr "反向应用补丁"
2437
2438#: builtin/apply.c:4405
2439msgid "don't expect at least one line of context"
2440msgstr "无需至少一行上下文"
2441
2442#: builtin/apply.c:4407
2443msgid "leave the rejected hunks in corresponding *.rej files"
2444msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2445
2446#: builtin/apply.c:4409
2447msgid "allow overlapping hunks"
2448msgstr "允许重叠的补丁片段"
2449
2450#: builtin/apply.c:4412
2451msgid "tolerate incorrectly detected missing new-line at the end of file"
2452msgstr "允许不正确的文件末尾换行符"
2453
2454#: builtin/apply.c:4415
2455msgid "do not trust the line counts in the hunk headers"
2456msgstr "不信任补丁片段的头信息中的行号"
2457
2458#: builtin/apply.c:4417
2459msgid "root"
2460msgstr "根目录"
2461
2462#: builtin/apply.c:4418
2463msgid "prepend <root> to all filenames"
2464msgstr "为所有文件名前添加 <根目录>"
2465
2466#: builtin/apply.c:4440
2467msgid "--3way outside a repository"
2468msgstr "--3way 在一个版本库之外"
2469
2470#: builtin/apply.c:4448
2471msgid "--index outside a repository"
2472msgstr "--index 在一个版本库之外"
2473
2474#: builtin/apply.c:4451
2475msgid "--cached outside a repository"
2476msgstr "--cached 在一个版本库之外"
2477
2478#: builtin/apply.c:4467
2479#, c-format
2480msgid "can't open patch '%s'"
2481msgstr "不能打开补丁 '%s'"
2482
2483#: builtin/apply.c:4481
2484#, c-format
2485msgid "squelched %d whitespace error"
2486msgid_plural "squelched %d whitespace errors"
2487msgstr[0] "抑制下仍有 %d 个空白字符误用"
2488msgstr[1] "抑制下仍有 %d 个空白字符误用"
2489
2490#: builtin/apply.c:4487 builtin/apply.c:4497
2491#, c-format
2492msgid "%d line adds whitespace errors."
2493msgid_plural "%d lines add whitespace errors."
2494msgstr[0] "%d 行有空白字符误用。"
2495msgstr[1] "%d 行有空白字符误用。"
2496
2497#: builtin/archive.c:17
2498#, c-format
2499msgid "could not create archive file '%s'"
2500msgstr "不能创建归档文件 '%s'"
2501
2502#: builtin/archive.c:20
2503msgid "could not redirect output"
2504msgstr "不能重定向输出"
2505
2506#: builtin/archive.c:37
2507msgid "git archive: Remote with no URL"
2508msgstr "git archive:未提供远程URL"
2509
2510#: builtin/archive.c:58
2511msgid "git archive: expected ACK/NAK, got EOF"
2512msgstr "git archive:应为ACK/NACK,却得到EOF"
2513
2514#: builtin/archive.c:61
2515#, c-format
2516msgid "git archive: NACK %s"
2517msgstr "git archive:NACK %s"
2518
2519#: builtin/archive.c:63
2520#, c-format
2521msgid "remote error: %s"
2522msgstr "远程错误:%s"
2523
2524#: builtin/archive.c:64
2525msgid "git archive: protocol error"
2526msgstr "git archive:协议错误"
2527
2528#: builtin/archive.c:68
2529msgid "git archive: expected a flush"
2530msgstr "git archive:应为刷新"
2531
2532#: builtin/bisect--helper.c:7
2533msgid "git bisect--helper --next-all [--no-checkout]"
2534msgstr "git bisect--helper --next-all [--no-checkout]"
2535
2536#: builtin/bisect--helper.c:17
2537msgid "perform 'git bisect next'"
2538msgstr "执行 'git bisect next'"
2539
2540#: builtin/bisect--helper.c:19
2541msgid "update BISECT_HEAD instead of checking out the current commit"
2542msgstr "更新 BISECT_HEAD 而非检出当前提交"
2543
2544#: builtin/blame.c:27
2545msgid "git blame [options] [rev-opts] [rev] [--] file"
2546msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2547
2548#: builtin/blame.c:32
2549msgid "[rev-opts] are documented in git-rev-list(1)"
2550msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2551
2552#: builtin/blame.c:2249
2553msgid "Show blame entries as we find them, incrementally"
2554msgstr "增量式地显示发现的 blame 条目"
2555
2556#: builtin/blame.c:2250
2557msgid "Show blank SHA-1 for boundary commits (Default: off)"
2558msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2559
2560#: builtin/blame.c:2251
2561msgid "Do not treat root commits as boundaries (Default: off)"
2562msgstr "不把根提交作为边界(默认:关闭)"
2563
2564#: builtin/blame.c:2252
2565msgid "Show work cost statistics"
2566msgstr "显示命令消耗统计"
2567
2568#: builtin/blame.c:2253
2569msgid "Show output score for blame entries"
2570msgstr "显示判断 blame 条目位移的得分诊断信息"
2571
2572#: builtin/blame.c:2254
2573msgid "Show original filename (Default: auto)"
2574msgstr "显示原始文件名(默认:自动)"
2575
2576#: builtin/blame.c:2255
2577msgid "Show original linenumber (Default: off)"
2578msgstr "显示原始的行号(默认:关闭)"
2579
2580#: builtin/blame.c:2256
2581msgid "Show in a format designed for machine consumption"
2582msgstr "显示为一个适合机器读取的格式"
2583
2584#: builtin/blame.c:2257
2585msgid "Show porcelain format with per-line commit information"
2586msgstr "为每一行显示机器适用的提交信息"
2587
2588#: builtin/blame.c:2258
2589msgid "Use the same output mode as git-annotate (Default: off)"
2590msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2591
2592#: builtin/blame.c:2259
2593msgid "Show raw timestamp (Default: off)"
2594msgstr "显示原始时间戳(默认:关闭)"
2595
2596#: builtin/blame.c:2260
2597msgid "Show long commit SHA1 (Default: off)"
2598msgstr "显示长的SHA1提交号(默认:关闭)"
2599
2600#: builtin/blame.c:2261
2601msgid "Suppress author name and timestamp (Default: off)"
2602msgstr "隐藏作者名字和时间戳(默认:关闭)"
2603
2604#: builtin/blame.c:2262
2605msgid "Show author email instead of name (Default: off)"
2606msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2607
2608#: builtin/blame.c:2263
2609msgid "Ignore whitespace differences"
2610msgstr "忽略空白差异"
2611
2612#: builtin/blame.c:2264
2613msgid "Spend extra cycles to find better match"
2614msgstr "花费额外的循环来找到更好的匹配"
2615
2616#: builtin/blame.c:2265
2617msgid "Use revisions from <file> instead of calling git-rev-list"
2618msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2619
2620#: builtin/blame.c:2266
2621msgid "Use <file>'s contents as the final image"
2622msgstr "使用 <file> 的内容作为最终的图片"
2623
2624#: builtin/blame.c:2267 builtin/blame.c:2268
2625msgid "score"
2626msgstr "得分"
2627
2628#: builtin/blame.c:2267
2629msgid "Find line copies within and across files"
2630msgstr "找到文件内及跨文件的行拷贝"
2631
2632#: builtin/blame.c:2268
2633msgid "Find line movements within and across files"
2634msgstr "找到文件内及跨文件的行移动"
2635
2636#: builtin/blame.c:2269
2637msgid "n,m"
2638msgstr "n,m"
2639
2640#: builtin/blame.c:2269
2641msgid "Process only line range n,m, counting from 1"
2642msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2643
2644#. TRANSLATORS: This string is used to tell us the maximum
2645#. display width for a relative timestamp in "git blame"
2646#. output.  For C locale, "4 years, 11 months ago", which
2647#. takes 22 places, is the longest among various forms of
2648#. relative timestamps, but your language may need more or
2649#. fewer display columns.
2650#: builtin/blame.c:2347
2651msgid "4 years, 11 months ago"
2652msgstr "4 年 11 个月前"
2653
2654#: builtin/branch.c:24
2655msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2656msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2657
2658#: builtin/branch.c:25
2659msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2660msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2661
2662#: builtin/branch.c:26
2663msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2664msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2665
2666#: builtin/branch.c:27
2667msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2668msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2669
2670#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2671#: builtin/branch.c:150
2672#, c-format
2673msgid ""
2674"deleting branch '%s' that has been merged to\n"
2675"         '%s', but not yet merged to HEAD."
2676msgstr ""
2677"将要删除的分支 '%s' 已经被合并到\n"
2678"         '%s',但未合并到 HEAD。"
2679
2680#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2681#: builtin/branch.c:154
2682#, c-format
2683msgid ""
2684"not deleting branch '%s' that is not yet merged to\n"
2685"         '%s', even though it is merged to HEAD."
2686msgstr ""
2687"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2688"         然而却尚未被合并到分支 '%s' 。"
2689
2690#: builtin/branch.c:168
2691#, c-format
2692msgid "Couldn't look up commit object for '%s'"
2693msgstr "无法查询 '%s' 指向的提交对象"
2694
2695#: builtin/branch.c:172
2696#, c-format
2697msgid ""
2698"The branch '%s' is not fully merged.\n"
2699"If you are sure you want to delete it, run 'git branch -D %s'."
2700msgstr ""
2701"分支 '%s' 没有完全合并。\n"
2702"如果您确认要删除它,执行 'git branch -D %s'。"
2703
2704#: builtin/branch.c:185
2705msgid "Update of config-file failed"
2706msgstr "无法更新 config 文件"
2707
2708#: builtin/branch.c:213
2709msgid "cannot use -a with -d"
2710msgstr "不能将 -a 和 -d 同时使用"
2711
2712#: builtin/branch.c:219
2713msgid "Couldn't look up commit object for HEAD"
2714msgstr "无法查询 HEAD 指向的提交对象"
2715
2716#: builtin/branch.c:227
2717#, c-format
2718msgid "Cannot delete the branch '%s' which you are currently on."
2719msgstr "无法删除您当前所在的分支 '%s'。"
2720
2721#: builtin/branch.c:240
2722#, c-format
2723msgid "remote branch '%s' not found."
2724msgstr "远程分支 '%s' 未发现。"
2725
2726#: builtin/branch.c:241
2727#, c-format
2728msgid "branch '%s' not found."
2729msgstr "分支 '%s' 未发现。"
2730
2731#: builtin/branch.c:255
2732#, c-format
2733msgid "Error deleting remote branch '%s'"
2734msgstr "删除远程分支 '%s' 时出错"
2735
2736#: builtin/branch.c:256
2737#, c-format
2738msgid "Error deleting branch '%s'"
2739msgstr "删除分支 '%s' 时出错"
2740
2741#: builtin/branch.c:263
2742#, c-format
2743msgid "Deleted remote branch %s (was %s).\n"
2744msgstr "已删除远程分支 %s(曾为 %s)。\n"
2745
2746#: builtin/branch.c:264
2747#, c-format
2748msgid "Deleted branch %s (was %s).\n"
2749msgstr "已删除分支 %s(曾为 %s)。\n"
2750
2751#: builtin/branch.c:366
2752#, c-format
2753msgid "branch '%s' does not point at a commit"
2754msgstr "分支 '%s' 未指向一个提交"
2755
2756#: builtin/branch.c:454
2757#, c-format
2758msgid "[%s: gone]"
2759msgstr "[%s: 丢失]"
2760
2761#: builtin/branch.c:459
2762#, c-format
2763msgid "[%s]"
2764msgstr "[%s]"
2765
2766#: builtin/branch.c:464
2767#, c-format
2768msgid "[%s: behind %d]"
2769msgstr "[%s:落后 %d]"
2770
2771#: builtin/branch.c:466
2772#, c-format
2773msgid "[behind %d]"
2774msgstr "[落后 %d]"
2775
2776#: builtin/branch.c:470
2777#, c-format
2778msgid "[%s: ahead %d]"
2779msgstr "[%s:领先 %d]"
2780
2781#: builtin/branch.c:472
2782#, c-format
2783msgid "[ahead %d]"
2784msgstr "[领先 %d]"
2785
2786#: builtin/branch.c:475
2787#, c-format
2788msgid "[%s: ahead %d, behind %d]"
2789msgstr "[%s:领先 %d,落后 %d]"
2790
2791#: builtin/branch.c:478
2792#, c-format
2793msgid "[ahead %d, behind %d]"
2794msgstr "[领先 %d,落后 %d]"
2795
2796#: builtin/branch.c:502
2797msgid " **** invalid ref ****"
2798msgstr " **** 无效引用 ****"
2799
2800#: builtin/branch.c:594
2801#, c-format
2802msgid "(no branch, rebasing %s)"
2803msgstr "(非分支,正变基 %s)"
2804
2805#: builtin/branch.c:597
2806#, c-format
2807msgid "(no branch, bisect started on %s)"
2808msgstr "(非分支,二分查找开始于 %s)"
2809
2810#: builtin/branch.c:600
2811#, c-format
2812msgid "(detached from %s)"
2813msgstr "(分离自 %s)"
2814
2815#: builtin/branch.c:603
2816msgid "(no branch)"
2817msgstr "(非分支)"
2818
2819#: builtin/branch.c:649
2820#, c-format
2821msgid "object '%s' does not point to a commit"
2822msgstr "对象 '%s' 没有指向一个提交"
2823
2824#: builtin/branch.c:681
2825msgid "some refs could not be read"
2826msgstr "一些引用不能读取"
2827
2828#: builtin/branch.c:694
2829msgid "cannot rename the current branch while not on any."
2830msgstr "无法重命名当前分支因为不处于任何分支上。"
2831
2832#: builtin/branch.c:704
2833#, c-format
2834msgid "Invalid branch name: '%s'"
2835msgstr "无效的分支名:'%s'"
2836
2837#: builtin/branch.c:719
2838msgid "Branch rename failed"
2839msgstr "分支重命名失败"
2840
2841#: builtin/branch.c:723
2842#, c-format
2843msgid "Renamed a misnamed branch '%s' away"
2844msgstr "重命名掉一个错误命名的旧分支 '%s'"
2845
2846#: builtin/branch.c:727
2847#, c-format
2848msgid "Branch renamed to %s, but HEAD is not updated!"
2849msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2850
2851#: builtin/branch.c:734
2852msgid "Branch is renamed, but update of config-file failed"
2853msgstr "分支被重命名,但更新 config 文件失败"
2854
2855#: builtin/branch.c:749
2856#, c-format
2857msgid "malformed object name %s"
2858msgstr "非法的对象名 %s"
2859
2860#: builtin/branch.c:773
2861#, c-format
2862msgid "could not write branch description template: %s"
2863msgstr "不能写分支描述模版:%s"
2864
2865#: builtin/branch.c:803
2866msgid "Generic options"
2867msgstr "通用选项"
2868
2869#: builtin/branch.c:805
2870msgid "show hash and subject, give twice for upstream branch"
2871msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2872
2873#: builtin/branch.c:806
2874msgid "suppress informational messages"
2875msgstr "不显示信息"
2876
2877#: builtin/branch.c:807
2878msgid "set up tracking mode (see git-pull(1))"
2879msgstr "设置跟踪模式(参见 git-pull(1))"
2880
2881#: builtin/branch.c:809
2882msgid "change upstream info"
2883msgstr "改变上游信息"
2884
2885#: builtin/branch.c:813
2886msgid "use colored output"
2887msgstr "使用彩色输出"
2888
2889#: builtin/branch.c:814
2890msgid "act on remote-tracking branches"
2891msgstr "作用于远程跟踪分支"
2892
2893#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2894#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495
2895#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527
2896#: builtin/tag.c:533
2897msgid "commit"
2898msgstr "提交"
2899
2900#: builtin/branch.c:818 builtin/branch.c:824
2901msgid "print only branches that contain the commit"
2902msgstr "只打印包含该提交的分支"
2903
2904#: builtin/branch.c:830
2905msgid "Specific git-branch actions:"
2906msgstr "具体的 git-branch 动作:"
2907
2908#: builtin/branch.c:831
2909msgid "list both remote-tracking and local branches"
2910msgstr "列出远程跟踪及本地分支"
2911
2912#: builtin/branch.c:833
2913msgid "delete fully merged branch"
2914msgstr "删除完全合并的分支"
2915
2916#: builtin/branch.c:834
2917msgid "delete branch (even if not merged)"
2918msgstr "删除分支(即使没有合并)"
2919
2920#: builtin/branch.c:835
2921msgid "move/rename a branch and its reflog"
2922msgstr "移动/重命名一个分支,以及它的引用日志"
2923
2924#: builtin/branch.c:836
2925msgid "move/rename a branch, even if target exists"
2926msgstr "移动/重命名一个分支,即使目标已存在"
2927
2928#: builtin/branch.c:837
2929msgid "list branch names"
2930msgstr "列出分支名"
2931
2932#: builtin/branch.c:838
2933msgid "create the branch's reflog"
2934msgstr "创建分支的引用日志"
2935
2936#: builtin/branch.c:840
2937msgid "edit the description for the branch"
2938msgstr "标记分支的描述"
2939
2940#: builtin/branch.c:841
2941msgid "force creation (when already exists)"
2942msgstr "强制创建(当已经存在)"
2943
2944#: builtin/branch.c:844
2945msgid "print only not merged branches"
2946msgstr "只打印没有合并的分支"
2947
2948#: builtin/branch.c:850
2949msgid "print only merged branches"
2950msgstr "只打印合并的分支"
2951
2952#: builtin/branch.c:854
2953msgid "list branches in columns"
2954msgstr "以列的方式显示分支"
2955
2956#: builtin/branch.c:867
2957msgid "Failed to resolve HEAD as a valid ref."
2958msgstr "无法将 HEAD 解析为有效引用。"
2959
2960#: builtin/branch.c:872 builtin/clone.c:635
2961msgid "HEAD not found below refs/heads!"
2962msgstr "HEAD 没有位于 /refs/heads 之下!"
2963
2964#: builtin/branch.c:896
2965msgid "--column and --verbose are incompatible"
2966msgstr "--column 和 --verbose 不兼容"
2967
2968#: builtin/branch.c:902 builtin/branch.c:941
2969msgid "branch name required"
2970msgstr "必须提供分支名"
2971
2972#: builtin/branch.c:917
2973msgid "Cannot give description to detached HEAD"
2974msgstr "不能向分离头指针提供描述"
2975
2976#: builtin/branch.c:922
2977msgid "cannot edit description of more than one branch"
2978msgstr "不能为一个以上的分支编辑描述"
2979
2980#: builtin/branch.c:929
2981#, c-format
2982msgid "No commit on branch '%s' yet."
2983msgstr "分支 '%s' 尚无提交。"
2984
2985#: builtin/branch.c:932
2986#, c-format
2987msgid "No branch named '%s'."
2988msgstr "没有分支 '%s'。"
2989
2990#: builtin/branch.c:947
2991msgid "too many branches for a rename operation"
2992msgstr "为重命名操作提供了太多的分支名"
2993
2994#: builtin/branch.c:952
2995msgid "too many branches to set new upstream"
2996msgstr "为设置新上游提供了太多的分支名"
2997
2998#: builtin/branch.c:956
2999#, c-format
3000msgid ""
3001"could not set upstream of HEAD to %s when it does not point to any branch."
3002msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3003
3004#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
3005#, c-format
3006msgid "no such branch '%s'"
3007msgstr "没有此分支 '%s'"
3008
3009#: builtin/branch.c:963
3010#, c-format
3011msgid "branch '%s' does not exist"
3012msgstr "分支 '%s' 不存在"
3013
3014#: builtin/branch.c:975
3015msgid "too many branches to unset upstream"
3016msgstr "为取消上游设置操作提供了太多的分支名"
3017
3018#: builtin/branch.c:979
3019msgid "could not unset upstream of HEAD when it does not point to any branch."
3020msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3021
3022#: builtin/branch.c:985
3023#, c-format
3024msgid "Branch '%s' has no upstream information"
3025msgstr "分支 '%s' 没有上游信息"
3026
3027#: builtin/branch.c:999
3028msgid "it does not make sense to create 'HEAD' manually"
3029msgstr "手工创建 'HEAD' 没有意义"
3030
3031#: builtin/branch.c:1005
3032msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3033msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3034
3035#: builtin/branch.c:1008
3036#, c-format
3037msgid ""
3038"The --set-upstream flag is deprecated and will be removed. Consider using --"
3039"track or --set-upstream-to\n"
3040msgstr ""
3041"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3042
3043#: builtin/branch.c:1025
3044#, c-format
3045msgid ""
3046"\n"
3047"If you wanted to make '%s' track '%s', do this:\n"
3048"\n"
3049msgstr ""
3050"\n"
3051"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3052"\n"
3053
3054#: builtin/branch.c:1026
3055#, c-format
3056msgid "    git branch -d %s\n"
3057msgstr "    git branch -d %s\n"
3058
3059#: builtin/branch.c:1027
3060#, c-format
3061msgid "    git branch --set-upstream-to %s\n"
3062msgstr "    git branch --set-upstream-to %s\n"
3063
3064#: builtin/bundle.c:47
3065#, c-format
3066msgid "%s is okay\n"
3067msgstr "%s 可以\n"
3068
3069#: builtin/bundle.c:56
3070msgid "Need a repository to create a bundle."
3071msgstr "需要一个版本库来创建包。"
3072
3073#: builtin/bundle.c:60
3074msgid "Need a repository to unbundle."
3075msgstr "需要一个版本库来解包。"
3076
3077#: builtin/cat-file.c:331
3078msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3079msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3080
3081#: builtin/cat-file.c:332
3082msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3083msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3084
3085#: builtin/cat-file.c:369
3086msgid "<type> can be one of: blob, tree, commit, tag"
3087msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3088
3089#: builtin/cat-file.c:370
3090msgid "show object type"
3091msgstr "显示对象类型"
3092
3093#: builtin/cat-file.c:371
3094msgid "show object size"
3095msgstr "显示对象大小"
3096
3097#: builtin/cat-file.c:373
3098msgid "exit with zero when there's no error"
3099msgstr "当没有错误时退出并返回零"
3100
3101#: builtin/cat-file.c:374
3102msgid "pretty-print object's content"
3103msgstr "美观地打印对象的内容"
3104
3105#: builtin/cat-file.c:376
3106msgid "for blob objects, run textconv on object's content"
3107msgstr "对于数据(blob)对象,对其内容执行 textconv"
3108
3109#: builtin/cat-file.c:378
3110msgid "show info and content of objects fed from the standard input"
3111msgstr "显示从标准输入提供的对象的信息和内容"
3112
3113#: builtin/cat-file.c:381
3114msgid "show info about objects fed from the standard input"
3115msgstr "显示从标准输入提供的对象的信息"
3116
3117#: builtin/check-attr.c:11
3118msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3119msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3120
3121#: builtin/check-attr.c:12
3122msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3123msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3124
3125#: builtin/check-attr.c:19
3126msgid "report all attributes set on file"
3127msgstr "报告设置在文件上的所有属性"
3128
3129#: builtin/check-attr.c:20
3130msgid "use .gitattributes only from the index"
3131msgstr "只使用索引中的 .gitattributes"
3132
3133#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
3134msgid "read file names from stdin"
3135msgstr "从标准输入读出文件名"
3136
3137#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3138msgid "terminate input and output records by a NUL character"
3139msgstr "输入和输出的记录使用 NUL 字符终结"
3140
3141#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271
3142msgid "suppress progress reporting"
3143msgstr "不显示进度报告"
3144
3145#: builtin/check-ignore.c:26
3146msgid "show non-matching input paths"
3147msgstr "显示未匹配的输入路径"
3148
3149#: builtin/check-ignore.c:28
3150msgid "ignore index when checking"
3151msgstr "检查时忽略索引"
3152
3153#: builtin/check-ignore.c:154
3154msgid "cannot specify pathnames with --stdin"
3155msgstr "不能同时提供路径及 --stdin 参数"
3156
3157#: builtin/check-ignore.c:157
3158msgid "-z only makes sense with --stdin"
3159msgstr "-z 需要和 --stdin 参数共用才有意义"
3160
3161#: builtin/check-ignore.c:159
3162msgid "no path specified"
3163msgstr "未指定路径"
3164
3165#: builtin/check-ignore.c:163
3166msgid "--quiet is only valid with a single pathname"
3167msgstr "参数 --quiet 只在提供一个路径名时有效"
3168
3169#: builtin/check-ignore.c:165
3170msgid "cannot have both --quiet and --verbose"
3171msgstr "不能同时提供 --quiet 和 --verbose 参数"
3172
3173#: builtin/check-ignore.c:168
3174msgid "--non-matching is only valid with --verbose"
3175msgstr "--non-matching 选项只在使用 --verbose 时有效"
3176
3177#: builtin/check-mailmap.c:8
3178msgid "git check-mailmap [options] <contact>..."
3179msgstr "git check-mailmap [选项] <联系地址>..."
3180
3181#: builtin/check-mailmap.c:13
3182msgid "also read contacts from stdin"
3183msgstr "还从标准输入读取联系地址"
3184
3185#: builtin/check-mailmap.c:24
3186#, c-format
3187msgid "unable to parse contact: %s"
3188msgstr "不能解析联系地址:%s"
3189
3190#: builtin/check-mailmap.c:47
3191msgid "no contacts specified"
3192msgstr "未指定联系地址"
3193
3194#: builtin/checkout-index.c:126
3195msgid "git checkout-index [options] [--] [<file>...]"
3196msgstr "git checkout-index [选项] [--] [<文件>...]"
3197
3198#: builtin/checkout-index.c:187
3199msgid "check out all files in the index"
3200msgstr "检出索引区的所有文件"
3201
3202#: builtin/checkout-index.c:188
3203msgid "force overwrite of existing files"
3204msgstr "强制覆盖现有的文件"
3205
3206#: builtin/checkout-index.c:190
3207msgid "no warning for existing files and files not in index"
3208msgstr "存在或不在索引中的文件都没有警告"
3209
3210#: builtin/checkout-index.c:192
3211msgid "don't checkout new files"
3212msgstr "不检出新文件"
3213
3214#: builtin/checkout-index.c:194
3215msgid "update stat information in the index file"
3216msgstr "更新索引中文件的状态信息"
3217
3218#: builtin/checkout-index.c:200
3219msgid "read list of paths from the standard input"
3220msgstr "从标准输入读取路径列表"
3221
3222#: builtin/checkout-index.c:202
3223msgid "write the content to temporary files"
3224msgstr "将内容写入临时文件"
3225
3226#: builtin/checkout-index.c:203 builtin/column.c:30
3227msgid "string"
3228msgstr "字符串"
3229
3230#: builtin/checkout-index.c:204
3231msgid "when creating files, prepend <string>"
3232msgstr "在创建文件时,在前面加上<字符串>"
3233
3234#: builtin/checkout-index.c:207
3235msgid "copy out the files from named stage"
3236msgstr "从指定暂存区中拷出文件"
3237
3238#: builtin/checkout.c:25
3239msgid "git checkout [options] <branch>"
3240msgstr "git checkout [选项] <分支>"
3241
3242#: builtin/checkout.c:26
3243msgid "git checkout [options] [<branch>] -- <file>..."
3244msgstr "git checkout [选项] [<分支>] -- <文件>..."
3245
3246#: builtin/checkout.c:114 builtin/checkout.c:147
3247#, c-format
3248msgid "path '%s' does not have our version"
3249msgstr "路径 '%s' 没有我们的版本"
3250
3251#: builtin/checkout.c:116 builtin/checkout.c:149
3252#, c-format
3253msgid "path '%s' does not have their version"
3254msgstr "路径 '%s' 没有他们的版本"
3255
3256#: builtin/checkout.c:132
3257#, c-format
3258msgid "path '%s' does not have all necessary versions"
3259msgstr "路径 '%s' 没有全部必须的版本"
3260
3261#: builtin/checkout.c:176
3262#, c-format
3263msgid "path '%s' does not have necessary versions"
3264msgstr "路径 '%s' 没有必须的版本"
3265
3266#: builtin/checkout.c:193
3267#, c-format
3268msgid "path '%s': cannot merge"
3269msgstr "path '%s':无法合并"
3270
3271#: builtin/checkout.c:210
3272#, c-format
3273msgid "Unable to add merge result for '%s'"
3274msgstr "无法为 '%s' 添加合并结果"
3275
3276#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
3277#: builtin/checkout.c:241
3278#, c-format
3279msgid "'%s' cannot be used with updating paths"
3280msgstr "'%s' 不能在更新路径时使用"
3281
3282#: builtin/checkout.c:244 builtin/checkout.c:247
3283#, c-format
3284msgid "'%s' cannot be used with %s"
3285msgstr "'%s' 不能和 %s 同时使用"
3286
3287#: builtin/checkout.c:250
3288#, c-format
3289msgid "Cannot update paths and switch to branch '%s' at the same time."
3290msgstr "不能同时更新路径并切换到分支'%s'。"
3291
3292#: builtin/checkout.c:261 builtin/checkout.c:450
3293msgid "corrupt index file"
3294msgstr "损坏的索引文件"
3295
3296#: builtin/checkout.c:321 builtin/checkout.c:328
3297#, c-format
3298msgid "path '%s' is unmerged"
3299msgstr "路径 '%s' 未合并"
3300
3301#: builtin/checkout.c:472
3302msgid "you need to resolve your current index first"
3303msgstr "您需要先解决当前索引的冲突"
3304
3305#: builtin/checkout.c:593
3306#, c-format
3307msgid "Can not do reflog for '%s'\n"
3308msgstr "不能对 '%s' 执行 reflog 操作\n"
3309
3310#: builtin/checkout.c:631
3311msgid "HEAD is now at"
3312msgstr "HEAD 目前位于"
3313
3314#: builtin/checkout.c:638
3315#, c-format
3316msgid "Reset branch '%s'\n"
3317msgstr "重置分支 '%s'\n"
3318
3319#: builtin/checkout.c:641
3320#, c-format
3321msgid "Already on '%s'\n"
3322msgstr "已经位于 '%s'\n"
3323
3324#: builtin/checkout.c:645
3325#, c-format
3326msgid "Switched to and reset branch '%s'\n"
3327msgstr "切换并重置分支 '%s'\n"
3328
3329#: builtin/checkout.c:647 builtin/checkout.c:1032
3330#, c-format
3331msgid "Switched to a new branch '%s'\n"
3332msgstr "切换到一个新分支 '%s'\n"
3333
3334#: builtin/checkout.c:649
3335#, c-format
3336msgid "Switched to branch '%s'\n"
3337msgstr "切换到分支 '%s'\n"
3338
3339#  译者:注意保持前导空格
3340#: builtin/checkout.c:705
3341#, c-format
3342msgid " ... and %d more.\n"
3343msgstr " ... 及其它 %d 个。\n"
3344
3345#: builtin/checkout.c:711
3346#, c-format
3347msgid ""
3348"Warning: you are leaving %d commit behind, not connected to\n"
3349"any of your branches:\n"
3350"\n"
3351"%s\n"
3352msgid_plural ""
3353"Warning: you are leaving %d commits behind, not connected to\n"
3354"any of your branches:\n"
3355"\n"
3356"%s\n"
3357msgstr[0] ""
3358"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3359"\n"
3360"%s\n"
3361msgstr[1] ""
3362"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3363"\n"
3364"%s\n"
3365
3366#: builtin/checkout.c:729
3367#, c-format
3368msgid ""
3369"If you want to keep them by creating a new branch, this may be a good time\n"
3370"to do so with:\n"
3371"\n"
3372" git branch new_branch_name %s\n"
3373"\n"
3374msgstr ""
3375"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3376"如下操作:\n"
3377"\n"
3378" git branch new_branch_name %s\n"
3379"\n"
3380
3381#: builtin/checkout.c:759
3382msgid "internal error in revision walk"
3383msgstr "在版本遍历时遇到内部错误"
3384
3385#: builtin/checkout.c:763
3386msgid "Previous HEAD position was"
3387msgstr "之前的 HEAD 位置是"
3388
3389#: builtin/checkout.c:790 builtin/checkout.c:1027
3390msgid "You are on a branch yet to be born"
3391msgstr "您位于一个尚未初始化的分支"
3392
3393#: builtin/checkout.c:934
3394#, c-format
3395msgid "only one reference expected, %d given."
3396msgstr "只要一个引用,却给出了 %d 个"
3397
3398#: builtin/checkout.c:973
3399#, c-format
3400msgid "invalid reference: %s"
3401msgstr "无效引用:%s"
3402
3403#: builtin/checkout.c:1002
3404#, c-format
3405msgid "reference is not a tree: %s"
3406msgstr "引用不是一个树:%s"
3407
3408#: builtin/checkout.c:1041
3409msgid "paths cannot be used with switching branches"
3410msgstr "路径不能和切换分支同时使用"
3411
3412#: builtin/checkout.c:1044 builtin/checkout.c:1048
3413#, c-format
3414msgid "'%s' cannot be used with switching branches"
3415msgstr "'%s' 不能和切换分支同时使用"
3416
3417#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
3418#: builtin/checkout.c:1063
3419#, c-format
3420msgid "'%s' cannot be used with '%s'"
3421msgstr "'%s' 不能和 '%s' 同时使用"
3422
3423#: builtin/checkout.c:1068
3424#, c-format
3425msgid "Cannot switch branch to a non-commit '%s'"
3426msgstr "不能切换分支到一个非提交 '%s'"
3427
3428#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88
3429#: builtin/remote.c:159 builtin/remote.c:161
3430msgid "branch"
3431msgstr "分支"
3432
3433#: builtin/checkout.c:1091
3434msgid "create and checkout a new branch"
3435msgstr "创建并检出一个新的分支"
3436
3437#: builtin/checkout.c:1093
3438msgid "create/reset and checkout a branch"
3439msgstr "创建/重置并检出一个分支"
3440
3441#: builtin/checkout.c:1094
3442msgid "create reflog for new branch"
3443msgstr "为新的分支创建引用日志"
3444
3445#: builtin/checkout.c:1095
3446msgid "detach the HEAD at named commit"
3447msgstr "成为指向该提交的分离头指针"
3448
3449#: builtin/checkout.c:1096
3450msgid "set upstream info for new branch"
3451msgstr "为新的分支设置上游信息"
3452
3453#: builtin/checkout.c:1098
3454msgid "new-branch"
3455msgstr "新分支"
3456
3457#: builtin/checkout.c:1098
3458msgid "new unparented branch"
3459msgstr "新的没有父提交的分支"
3460
3461#: builtin/checkout.c:1099
3462msgid "checkout our version for unmerged files"
3463msgstr "对尚未合并的文件检出我们的版本"
3464
3465#: builtin/checkout.c:1101
3466msgid "checkout their version for unmerged files"
3467msgstr "对尚未合并的文件检出他们的版本"
3468
3469#: builtin/checkout.c:1103
3470msgid "force checkout (throw away local modifications)"
3471msgstr "强制检出(丢弃本地修改)"
3472
3473#: builtin/checkout.c:1104
3474msgid "perform a 3-way merge with the new branch"
3475msgstr "和新的分支执行三路合并"
3476
3477#: builtin/checkout.c:1105 builtin/merge.c:225
3478msgid "update ignored files (default)"
3479msgstr "更新忽略的文件(默认)"
3480
3481#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245
3482msgid "style"
3483msgstr "风格"
3484
3485#: builtin/checkout.c:1107
3486msgid "conflict style (merge or diff3)"
3487msgstr "冲突输出风格(merge 或 diff3)"
3488
3489#: builtin/checkout.c:1110
3490msgid "do not limit pathspecs to sparse entries only"
3491msgstr "对路径不做稀疏检出的限制"
3492
3493#: builtin/checkout.c:1112
3494msgid "second guess 'git checkout no-such-branch'"
3495msgstr "再者猜测'git checkout no-such-branch'"
3496
3497#: builtin/checkout.c:1135
3498msgid "-b, -B and --orphan are mutually exclusive"
3499msgstr "-b、-B 和 --orphan 是互斥的"
3500
3501#: builtin/checkout.c:1152
3502msgid "--track needs a branch name"
3503msgstr "--track 需要一个分支名"
3504
3505#: builtin/checkout.c:1159
3506msgid "Missing branch name; try -b"
3507msgstr "缺少分支名;尝试 -b"
3508
3509#: builtin/checkout.c:1196
3510msgid "invalid path specification"
3511msgstr "无效的路径规格"
3512
3513#: builtin/checkout.c:1203
3514#, c-format
3515msgid ""
3516"Cannot update paths and switch to branch '%s' at the same time.\n"
3517"Did you intend to checkout '%s' which can not be resolved as commit?"
3518msgstr ""
3519"不能同时更新路径并切换到分支'%s'。\n"
3520"您是想要检出 '%s' 但其未能解析为提交么?"
3521
3522#: builtin/checkout.c:1208
3523#, c-format
3524msgid "git checkout: --detach does not take a path argument '%s'"
3525msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3526
3527#: builtin/checkout.c:1212
3528msgid ""
3529"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3530"checking out of the index."
3531msgstr ""
3532"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3533
3534#: builtin/clean.c:26
3535msgid ""
3536"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3537msgstr ""
3538"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3539
3540#: builtin/clean.c:30
3541#, c-format
3542msgid "Removing %s\n"
3543msgstr "正删除 %s\n"
3544
3545#: builtin/clean.c:31
3546#, c-format
3547msgid "Would remove %s\n"
3548msgstr "将删除 %s\n"
3549
3550#: builtin/clean.c:32
3551#, c-format
3552msgid "Skipping repository %s\n"
3553msgstr "忽略版本库 %s\n"
3554
3555#: builtin/clean.c:33
3556#, c-format
3557msgid "Would skip repository %s\n"
3558msgstr "将忽略版本库 %s\n"
3559
3560#: builtin/clean.c:34
3561#, c-format
3562msgid "failed to remove %s"
3563msgstr "无法删除 %s"
3564
3565#: builtin/clean.c:295
3566msgid ""
3567"Prompt help:\n"
3568"1          - select a numbered item\n"
3569"foo        - select item based on unique prefix\n"
3570"           - (empty) select nothing"
3571msgstr ""
3572"帮助:\n"
3573"1          - 通过编号选择一个选项\n"
3574"foo        - 通过标题选择一个选项\n"
3575"           - (空)什么也不选择"
3576
3577#: builtin/clean.c:299
3578msgid ""
3579"Prompt help:\n"
3580"1          - select a single item\n"
3581"3-5        - select a range of items\n"
3582"2-3,6-9    - select multiple ranges\n"
3583"foo        - select item based on unique prefix\n"
3584"-...       - unselect specified items\n"
3585"*          - choose all items\n"
3586"           - (empty) finish selecting"
3587msgstr ""
3588"帮助:\n"
3589"1          - 选择一个选项\n"
3590"3-5        - 选择一个范围内的所有选项\n"
3591"2-3,6-9    - 选择多个范围内的所有选项\n"
3592"foo        - 通过标题选择一个选项\n"
3593"-...       - 反选特定的选项\n"
3594"*          - 选择所有选项\n"
3595"           - (空)结束选择"
3596
3597#: builtin/clean.c:517
3598#, c-format
3599msgid "Huh (%s)?"
3600msgstr "嗯(%s)?"
3601
3602#: builtin/clean.c:660
3603#, c-format
3604msgid "Input ignore patterns>> "
3605msgstr "输入模版以排除条目>> "
3606
3607#: builtin/clean.c:697
3608#, c-format
3609msgid "WARNING: Cannot find items matched by: %s"
3610msgstr "警告:无法找到和 %s 匹配的条目"
3611
3612#: builtin/clean.c:718
3613msgid "Select items to delete"
3614msgstr "选择要删除的条目"
3615
3616#: builtin/clean.c:758
3617#, c-format
3618msgid "remove %s? "
3619msgstr "删除 %s?"
3620
3621#: builtin/clean.c:783
3622msgid "Bye."
3623msgstr "再见。"
3624
3625#: builtin/clean.c:791
3626msgid ""
3627"clean               - start cleaning\n"
3628"filter by pattern   - exclude items from deletion\n"
3629"select by numbers   - select items to be deleted by numbers\n"
3630"ask each            - confirm each deletion (like \"rm -i\")\n"
3631"quit                - stop cleaning\n"
3632"help                - this screen\n"
3633"?                   - help for prompt selection"
3634msgstr ""
3635"clean               - 开始清理\n"
3636"filter by pattern   - 通过模版排除要删除的条目\n"
3637"select by numbers   - 通过数字选择要删除的条目\n"
3638"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
3639"quit                - 停止删除并退出\n"
3640"help                - 显示本帮助\n"
3641"?                   - 显示如何在提示符下选择的帮助"
3642
3643#: builtin/clean.c:818
3644msgid "*** Commands ***"
3645msgstr "*** 命令 ***"
3646
3647#: builtin/clean.c:819
3648msgid "What now"
3649msgstr "请选择"
3650
3651#: builtin/clean.c:827
3652msgid "Would remove the following item:"
3653msgid_plural "Would remove the following items:"
3654msgstr[0] "将删除如下条目:"
3655msgstr[1] "将删除如下条目:"
3656
3657#: builtin/clean.c:844
3658msgid "No more files to clean, exiting."
3659msgstr "没有要清理的文件,退出。"
3660
3661#: builtin/clean.c:875
3662msgid "do not print names of files removed"
3663msgstr "不打印删除文件的名称"
3664
3665#: builtin/clean.c:877
3666msgid "force"
3667msgstr "强制"
3668
3669#: builtin/clean.c:878
3670msgid "interactive cleaning"
3671msgstr "交互式清除"
3672
3673#: builtin/clean.c:880
3674msgid "remove whole directories"
3675msgstr "删除整个目录"
3676
3677#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716
3678#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185
3679msgid "pattern"
3680msgstr "模式"
3681
3682#: builtin/clean.c:882
3683msgid "add <pattern> to ignore rules"
3684msgstr "添加<模式>到忽略规则"
3685
3686#: builtin/clean.c:883
3687msgid "remove ignored files, too"
3688msgstr "也删除忽略的文件"
3689
3690#: builtin/clean.c:885
3691msgid "remove only ignored files"
3692msgstr "只删除忽略的文件"
3693
3694#: builtin/clean.c:903
3695msgid "-x and -X cannot be used together"
3696msgstr "-x 和 -X 不能同时使用"
3697
3698#: builtin/clean.c:907
3699msgid ""
3700"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3701"clean"
3702msgstr ""
3703"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3704
3705#: builtin/clean.c:910
3706msgid ""
3707"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3708"refusing to clean"
3709msgstr ""
3710"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3711
3712#: builtin/clone.c:36
3713msgid "git clone [options] [--] <repo> [<dir>]"
3714msgstr "git clone [选项] [--] <版本库> [<路径>]"
3715
3716#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
3717#: builtin/push.c:504
3718msgid "force progress reporting"
3719msgstr "强制显示进度报告"
3720
3721#: builtin/clone.c:66
3722msgid "don't create a checkout"
3723msgstr "不创建一个检出"
3724
3725#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
3726msgid "create a bare repository"
3727msgstr "创建一个裸版本库"
3728
3729#: builtin/clone.c:71
3730msgid "create a mirror repository (implies bare)"
3731msgstr "创建一个镜像版本库(也是裸版本库)"
3732
3733#: builtin/clone.c:73
3734msgid "to clone from a local repository"
3735msgstr "从本地版本库克隆"
3736
3737#: builtin/clone.c:75
3738msgid "don't use local hardlinks, always copy"
3739msgstr "不使用本地硬链接,始终复制"
3740
3741#: builtin/clone.c:77
3742msgid "setup as shared repository"
3743msgstr "设置为共享版本库"
3744
3745#: builtin/clone.c:79 builtin/clone.c:81
3746msgid "initialize submodules in the clone"
3747msgstr "在克隆时初始化子模组"
3748
3749#: builtin/clone.c:82 builtin/init-db.c:483
3750msgid "template-directory"
3751msgstr "模板目录"
3752
3753#: builtin/clone.c:83 builtin/init-db.c:484
3754msgid "directory from which templates will be used"
3755msgstr "模板目录将被使用"
3756
3757#: builtin/clone.c:85
3758msgid "reference repository"
3759msgstr "参考版本库"
3760
3761#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3762msgid "name"
3763msgstr "名称"
3764
3765#: builtin/clone.c:87
3766msgid "use <name> instead of 'origin' to track upstream"
3767msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3768
3769#: builtin/clone.c:89
3770msgid "checkout <branch> instead of the remote's HEAD"
3771msgstr "检出<分支>而不是远程HEAD"
3772
3773#: builtin/clone.c:91
3774msgid "path to git-upload-pack on the remote"
3775msgstr "远程 git-upload-pack 路径"
3776
3777#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661
3778msgid "depth"
3779msgstr "深度"
3780
3781#: builtin/clone.c:93
3782msgid "create a shallow clone of that depth"
3783msgstr "创建一个指定深度的浅克隆"
3784
3785#: builtin/clone.c:95
3786msgid "clone only one branch, HEAD or --branch"
3787msgstr "只克隆一个分支、HEAD 或 --branch"
3788
3789#: builtin/clone.c:96 builtin/init-db.c:492
3790msgid "gitdir"
3791msgstr "git目录"
3792
3793#: builtin/clone.c:97 builtin/init-db.c:493
3794msgid "separate git dir from working tree"
3795msgstr "git目录和工作区分离"
3796
3797#: builtin/clone.c:98
3798msgid "key=value"
3799msgstr "key=value"
3800
3801#: builtin/clone.c:99
3802msgid "set config inside the new repository"
3803msgstr "在新版本库中设置配置信息"
3804
3805#: builtin/clone.c:252
3806#, c-format
3807msgid "reference repository '%s' is not a local repository."
3808msgstr "参考版本库 '%s' 不是一个本地版本库。"
3809
3810#: builtin/clone.c:256
3811#, c-format
3812msgid "reference repository '%s' is shallow"
3813msgstr "参考版本库 '%s' 是一个浅克隆"
3814
3815#: builtin/clone.c:259
3816#, c-format
3817msgid "reference repository '%s' is grafted"
3818msgstr "参考版本库 '%s' 已被嫁接"
3819
3820#: builtin/clone.c:321
3821#, c-format
3822msgid "failed to create directory '%s'"
3823msgstr "无法创建目录 '%s'"
3824
3825#: builtin/clone.c:323 builtin/diff.c:83
3826#, c-format
3827msgid "failed to stat '%s'"
3828msgstr "无法枚举 '%s' 状态"
3829
3830#: builtin/clone.c:325
3831#, c-format
3832msgid "%s exists and is not a directory"
3833msgstr "%s 存在且不是一个目录"
3834
3835#: builtin/clone.c:339
3836#, c-format
3837msgid "failed to stat %s\n"
3838msgstr "无法枚举 %s 状态\n"
3839
3840#: builtin/clone.c:361
3841#, c-format
3842msgid "failed to create link '%s'"
3843msgstr "无法创建链接 '%s'"
3844
3845#: builtin/clone.c:365
3846#, c-format
3847msgid "failed to copy file to '%s'"
3848msgstr "无法拷贝文件至 '%s'"
3849
3850#: builtin/clone.c:388 builtin/clone.c:565
3851#, c-format
3852msgid "done.\n"
3853msgstr "完成。\n"
3854
3855#: builtin/clone.c:401
3856msgid ""
3857"Clone succeeded, but checkout failed.\n"
3858"You can inspect what was checked out with 'git status'\n"
3859"and retry the checkout with 'git checkout -f HEAD'\n"
3860msgstr ""
3861"克隆成功,但是检出失败。\n"
3862"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3863"'git checkout -f HEAD' 重试\n"
3864
3865#: builtin/clone.c:480
3866#, c-format
3867msgid "Could not find remote branch %s to clone."
3868msgstr "不能发现要克隆的远程分支 %s。"
3869
3870#: builtin/clone.c:560
3871#, c-format
3872msgid "Checking connectivity... "
3873msgstr "检查连接... "
3874
3875#: builtin/clone.c:563
3876msgid "remote did not send all necessary objects"
3877msgstr "远程没有发送所有必须的对象"
3878
3879#: builtin/clone.c:626
3880msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3881msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3882
3883#: builtin/clone.c:657
3884msgid "unable to checkout working tree"
3885msgstr "不能检出工作区"
3886
3887#: builtin/clone.c:765
3888msgid "Too many arguments."
3889msgstr "太多参数。"
3890
3891#: builtin/clone.c:769
3892msgid "You must specify a repository to clone."
3893msgstr "您必须指定一个版本库来克隆。"
3894
3895#: builtin/clone.c:780
3896#, c-format
3897msgid "--bare and --origin %s options are incompatible."
3898msgstr "--bare 和 --origin %s 选项不兼容。"
3899
3900#: builtin/clone.c:783
3901msgid "--bare and --separate-git-dir are incompatible."
3902msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3903
3904#: builtin/clone.c:796
3905#, c-format
3906msgid "repository '%s' does not exist"
3907msgstr "版本库 '%s' 不存在"
3908
3909#: builtin/clone.c:802
3910msgid "--depth is ignored in local clones; use file:// instead."
3911msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3912
3913#: builtin/clone.c:805
3914msgid "source repository is shallow, ignoring --local"
3915msgstr "源版本库是浅克隆,忽略 --local"
3916
3917#: builtin/clone.c:810
3918msgid "--local is ignored"
3919msgstr "--local 被忽略"
3920
3921#: builtin/clone.c:814 builtin/fetch.c:1119
3922#, c-format
3923msgid "depth %s is not a positive number"
3924msgstr "深度 %s 不是一个正数"
3925
3926#: builtin/clone.c:824
3927#, c-format
3928msgid "destination path '%s' already exists and is not an empty directory."
3929msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3930
3931#: builtin/clone.c:834
3932#, c-format
3933msgid "working tree '%s' already exists."
3934msgstr "工作区 '%s' 已经存在。"
3935
3936#: builtin/clone.c:847 builtin/clone.c:859
3937#, c-format
3938msgid "could not create leading directories of '%s'"
3939msgstr "不能为 '%s' 创建先导目录"
3940
3941#: builtin/clone.c:850
3942#, c-format
3943msgid "could not create work tree dir '%s'."
3944msgstr "不能为 '%s' 创建工作区目录。"
3945
3946#: builtin/clone.c:869
3947#, c-format
3948msgid "Cloning into bare repository '%s'...\n"
3949msgstr "克隆到裸版本库 '%s'...\n"
3950
3951#: builtin/clone.c:871
3952#, c-format
3953msgid "Cloning into '%s'...\n"
3954msgstr "正克隆到 '%s'...\n"
3955
3956#: builtin/clone.c:906
3957#, c-format
3958msgid "Don't know how to clone %s"
3959msgstr "不知道如何克隆 %s"
3960
3961#: builtin/clone.c:957 builtin/clone.c:965
3962#, c-format
3963msgid "Remote branch %s not found in upstream %s"
3964msgstr "远程分支 %s 在上游 %s 未发现"
3965
3966#: builtin/clone.c:968
3967msgid "You appear to have cloned an empty repository."
3968msgstr "您似乎克隆了一个空版本库。"
3969
3970#: builtin/column.c:9
3971msgid "git column [options]"
3972msgstr "git column [选项]"
3973
3974#: builtin/column.c:26
3975msgid "lookup config vars"
3976msgstr "查找配置变量"
3977
3978#: builtin/column.c:27 builtin/column.c:28
3979msgid "layout to use"
3980msgstr "要使用的布局"
3981
3982#: builtin/column.c:29
3983msgid "Maximum width"
3984msgstr "最大宽度"
3985
3986#: builtin/column.c:30
3987msgid "Padding space on left border"
3988msgstr "左边框的填充空间"
3989
3990#: builtin/column.c:31
3991msgid "Padding space on right border"
3992msgstr "右边框的填充空间"
3993
3994#: builtin/column.c:32
3995msgid "Padding space between columns"
3996msgstr "两列之间的填充空间"
3997
3998#: builtin/column.c:51
3999msgid "--command must be the first argument"
4000msgstr "--command 必须是第一个参数"
4001
4002#: builtin/commit.c:36
4003msgid "git commit [options] [--] <pathspec>..."
4004msgstr "git commit [选项] [--] <路径规则>..."
4005
4006#: builtin/commit.c:41
4007msgid "git status [options] [--] <pathspec>..."
4008msgstr "git status [选项] [--] <路径规则>..."
4009
4010#: builtin/commit.c:46
4011msgid ""
4012"Your name and email address were configured automatically based\n"
4013"on your username and hostname. Please check that they are accurate.\n"
4014"You can suppress this message by setting them explicitly:\n"
4015"\n"
4016"    git config --global user.name \"Your Name\"\n"
4017"    git config --global user.email you@example.com\n"
4018"\n"
4019"After doing this, you may fix the identity used for this commit with:\n"
4020"\n"
4021"    git commit --amend --reset-author\n"
4022msgstr ""
4023"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4024"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
4025"\n"
4026"    git config --global user.name \"Your Name\"\n"
4027"    git config --global user.email you@example.com\n"
4028"\n"
4029"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4030"\n"
4031"    git commit --amend --reset-author\n"
4032
4033#: builtin/commit.c:58
4034msgid ""
4035"You asked to amend the most recent commit, but doing so would make\n"
4036"it empty. You can repeat your command with --allow-empty, or you can\n"
4037"remove the commit entirely with \"git reset HEAD^\".\n"
4038msgstr ""
4039"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4040"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4041
4042#: builtin/commit.c:63
4043msgid ""
4044"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4045"If you wish to commit it anyway, use:\n"
4046"\n"
4047"    git commit --allow-empty\n"
4048"\n"
4049msgstr ""
4050"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4051"也要提交,使用命令:\n"
4052"\n"
4053"    git commit --allow-empty\n"
4054"\n"
4055
4056#: builtin/commit.c:70
4057msgid "Otherwise, please use 'git reset'\n"
4058msgstr "否则,请使用命令 'git reset'\n"
4059
4060#: builtin/commit.c:73
4061msgid ""
4062"If you wish to skip this commit, use:\n"
4063"\n"
4064"    git reset\n"
4065"\n"
4066"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4067"the remaining commits.\n"
4068msgstr ""
4069"如果您想跳过这个提交,使用命令:\n"
4070"\n"
4071"    git reset\n"
4072"\n"
4073"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4074"操作。\n"
4075
4076#: builtin/commit.c:288
4077msgid "failed to unpack HEAD tree object"
4078msgstr "无法解包 HEAD 树对象"
4079
4080#: builtin/commit.c:330
4081msgid "unable to create temporary index"
4082msgstr "不能创建临时索引"
4083
4084#: builtin/commit.c:336
4085msgid "interactive add failed"
4086msgstr "交互式添加失败"
4087
4088#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440
4089msgid "unable to write new_index file"
4090msgstr "无法写 new_index 文件"
4091
4092#: builtin/commit.c:421
4093msgid "cannot do a partial commit during a merge."
4094msgstr "在合并过程中不能做部分提交。"
4095
4096#: builtin/commit.c:423
4097msgid "cannot do a partial commit during a cherry-pick."
4098msgstr "在拣选过程中不能做部分提交。"
4099
4100#: builtin/commit.c:433
4101msgid "cannot read the index"
4102msgstr "无法读取索引"
4103
4104#: builtin/commit.c:453
4105msgid "unable to write temporary index file"
4106msgstr "无法写临时索引文件"
4107
4108#: builtin/commit.c:544 builtin/commit.c:550
4109#, c-format
4110msgid "invalid commit: %s"
4111msgstr "无效的提交:%s"
4112
4113#: builtin/commit.c:572
4114msgid "malformed --author parameter"
4115msgstr "非法的 --author 参数"
4116
4117#: builtin/commit.c:592
4118#, c-format
4119msgid "Malformed ident string: '%s'"
4120msgstr "非法的身份字符串:'%s'"
4121
4122#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014
4123#, c-format
4124msgid "could not lookup commit %s"
4125msgstr "不能查询提交 %s"
4126
4127#: builtin/commit.c:641 builtin/shortlog.c:273
4128#, c-format
4129msgid "(reading log message from standard input)\n"
4130msgstr "(正从标准输入中读取日志信息)\n"
4131
4132#: builtin/commit.c:643
4133msgid "could not read log from standard input"
4134msgstr "不能从标准输入中读取日志信息"
4135
4136#: builtin/commit.c:647
4137#, c-format
4138msgid "could not read log file '%s'"
4139msgstr "不能读取日志文件 '%s'"
4140
4141#: builtin/commit.c:654
4142msgid "commit has empty message"
4143msgstr "提交说明为空"
4144
4145#: builtin/commit.c:670
4146msgid "could not read MERGE_MSG"
4147msgstr "不能读取 MERGE_MSG"
4148
4149#: builtin/commit.c:674
4150msgid "could not read SQUASH_MSG"
4151msgstr "不能读取 SQUASH_MSG"
4152
4153#: builtin/commit.c:678
4154#, c-format
4155msgid "could not read '%s'"
4156msgstr "不能读取 '%s'"
4157
4158#: builtin/commit.c:749
4159msgid "could not write commit template"
4160msgstr "不能写提交模版"
4161
4162#: builtin/commit.c:764
4163#, c-format
4164msgid ""
4165"\n"
4166"It looks like you may be committing a merge.\n"
4167"If this is not correct, please remove the file\n"
4168"\t%s\n"
4169"and try again.\n"
4170msgstr ""
4171"\n"
4172"似乎您正在做一个合并提交。如果不对,请删除文件\n"
4173"\t%s\n"
4174"然后重试。\n"
4175
4176#: builtin/commit.c:769
4177#, c-format
4178msgid ""
4179"\n"
4180"It looks like you may be committing a cherry-pick.\n"
4181"If this is not correct, please remove the file\n"
4182"\t%s\n"
4183"and try again.\n"
4184msgstr ""
4185"\n"
4186"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4187"\t%s\n"
4188"然后重试。\n"
4189
4190#: builtin/commit.c:782
4191#, c-format
4192msgid ""
4193"Please enter the commit message for your changes. Lines starting\n"
4194"with '%c' will be ignored, and an empty message aborts the commit.\n"
4195msgstr ""
4196"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4197"说明将会终止提交。\n"
4198
4199#: builtin/commit.c:789
4200#, c-format
4201msgid ""
4202"Please enter the commit message for your changes. Lines starting\n"
4203"with '%c' will be kept; you may remove them yourself if you want to.\n"
4204"An empty message aborts the commit.\n"
4205msgstr ""
4206"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4207"也可以删除它们。一个空的提交说明将会终止提交。\n"
4208
4209#  译者:为保证在输出中对齐,注意调整句中空格!
4210#: builtin/commit.c:802
4211#, c-format
4212msgid "%sAuthor:    %s"
4213msgstr "%s作者:     %s"
4214
4215#  译者:为保证在输出中对齐,注意调整句中空格!
4216#: builtin/commit.c:809
4217#, c-format
4218msgid "%sCommitter: %s"
4219msgstr "%s提交者:   %s"
4220
4221#: builtin/commit.c:829
4222msgid "Cannot read index"
4223msgstr "无法读取索引"
4224
4225#: builtin/commit.c:872
4226msgid "Error building trees"
4227msgstr "无法创建树对象"
4228
4229#: builtin/commit.c:887 builtin/tag.c:391
4230#, c-format
4231msgid "Please supply the message using either -m or -F option.\n"
4232msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4233
4234#: builtin/commit.c:989
4235#, c-format
4236msgid "No existing author found with '%s'"
4237msgstr "没有找到匹配 '%s' 的作者"
4238
4239#: builtin/commit.c:1004 builtin/commit.c:1244
4240#, c-format
4241msgid "Invalid untracked files mode '%s'"
4242msgstr "无效的未追踪文件参数 '%s'"
4243
4244#: builtin/commit.c:1041
4245msgid "--long and -z are incompatible"
4246msgstr "--long 和 -z 选项不兼容"
4247
4248#: builtin/commit.c:1071
4249msgid "Using both --reset-author and --author does not make sense"
4250msgstr "同时使用 --reset-author 和 --author 没有意义"
4251
4252#: builtin/commit.c:1080
4253msgid "You have nothing to amend."
4254msgstr "您没有可修补的提交。"
4255
4256#: builtin/commit.c:1083
4257msgid "You are in the middle of a merge -- cannot amend."
4258msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4259
4260#: builtin/commit.c:1085
4261msgid "You are in the middle of a cherry-pick -- cannot amend."
4262msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4263
4264#: builtin/commit.c:1088
4265msgid "Options --squash and --fixup cannot be used together"
4266msgstr "选项 --squash 和 --fixup 不能同时使用"
4267
4268#: builtin/commit.c:1098
4269msgid "Only one of -c/-C/-F/--fixup can be used."
4270msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4271
4272#: builtin/commit.c:1100
4273msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4274msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4275
4276#: builtin/commit.c:1108
4277msgid "--reset-author can be used only with -C, -c or --amend."
4278msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4279
4280#: builtin/commit.c:1125
4281msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4282msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4283
4284#: builtin/commit.c:1127
4285msgid "No paths with --include/--only does not make sense."
4286msgstr "参数 --include/--only 不跟路径没有意义。"
4287
4288#: builtin/commit.c:1129
4289msgid "Clever... amending the last one with dirty index."
4290msgstr "聪明... 在索引不干净下修补最后的提交。"
4291
4292#: builtin/commit.c:1131
4293msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4294msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4295
4296#: builtin/commit.c:1143 builtin/tag.c:639
4297#, c-format
4298msgid "Invalid cleanup mode %s"
4299msgstr "无效的清理模式 %s"
4300
4301#: builtin/commit.c:1148
4302msgid "Paths with -a does not make sense."
4303msgstr "路径和 -a 选项同时使用没有意义。"
4304
4305#: builtin/commit.c:1258 builtin/commit.c:1516
4306msgid "show status concisely"
4307msgstr "以简洁的格式显示状态"
4308
4309#: builtin/commit.c:1260 builtin/commit.c:1518
4310msgid "show branch information"
4311msgstr "显示分支信息"
4312
4313#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490
4314msgid "machine-readable output"
4315msgstr "机器可读的输出"
4316
4317#: builtin/commit.c:1265 builtin/commit.c:1522
4318msgid "show status in long format (default)"
4319msgstr "以长格式显示状态(默认)"
4320
4321#: builtin/commit.c:1268 builtin/commit.c:1525
4322msgid "terminate entries with NUL"
4323msgstr "条目以NUL字符结尾"
4324
4325#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674
4326#: builtin/fast-export.c:677 builtin/tag.c:514
4327msgid "mode"
4328msgstr "模式"
4329
4330#: builtin/commit.c:1271 builtin/commit.c:1528
4331msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4332msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4333
4334#: builtin/commit.c:1274
4335msgid "show ignored files"
4336msgstr "显示忽略的文件"
4337
4338#: builtin/commit.c:1275 parse-options.h:153
4339msgid "when"
4340msgstr "何时"
4341
4342#: builtin/commit.c:1276
4343msgid ""
4344"ignore changes to submodules, optional when: all, dirty, untracked. "
4345"(Default: all)"
4346msgstr ""
4347"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4348
4349#: builtin/commit.c:1278
4350msgid "list untracked files in columns"
4351msgstr "以列的方式显示未跟踪的文件"
4352
4353#: builtin/commit.c:1347
4354msgid "couldn't look up newly created commit"
4355msgstr "无法找到新创建的提交"
4356
4357#: builtin/commit.c:1349
4358msgid "could not parse newly created commit"
4359msgstr "不能解析新创建的提交"
4360
4361#: builtin/commit.c:1390
4362msgid "detached HEAD"
4363msgstr "分离头指针"
4364
4365#  译者:中文字符串拼接,可删除前导空格
4366#: builtin/commit.c:1392
4367msgid " (root-commit)"
4368msgstr "(根提交)"
4369
4370#: builtin/commit.c:1486
4371msgid "suppress summary after successful commit"
4372msgstr "提交成功后不显示概述信息"
4373
4374#: builtin/commit.c:1487
4375msgid "show diff in commit message template"
4376msgstr "在提交说明模板里显示差异"
4377
4378#: builtin/commit.c:1489
4379msgid "Commit message options"
4380msgstr "提交说明选项"
4381
4382#: builtin/commit.c:1490 builtin/tag.c:512
4383msgid "read message from file"
4384msgstr "从文件中读取提交说明"
4385
4386#: builtin/commit.c:1491
4387msgid "author"
4388msgstr "作者"
4389
4390#: builtin/commit.c:1491
4391msgid "override author for commit"
4392msgstr "提交时覆盖作者"
4393
4394#: builtin/commit.c:1492 builtin/gc.c:272
4395msgid "date"
4396msgstr "日期"
4397
4398#: builtin/commit.c:1492
4399msgid "override date for commit"
4400msgstr "提交时覆盖日期"
4401
4402#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409
4403#: builtin/notes.c:566 builtin/tag.c:510
4404msgid "message"
4405msgstr "说明"
4406
4407#: builtin/commit.c:1493
4408msgid "commit message"
4409msgstr "提交说明"
4410
4411#: builtin/commit.c:1494
4412msgid "reuse and edit message from specified commit"
4413msgstr "重用并编辑指定提交的提交说明"
4414
4415#: builtin/commit.c:1495
4416msgid "reuse message from specified commit"
4417msgstr "重用指定提交的提交说明"
4418
4419#: builtin/commit.c:1496
4420msgid "use autosquash formatted message to fixup specified commit"
4421msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4422
4423#: builtin/commit.c:1497
4424msgid "use autosquash formatted message to squash specified commit"
4425msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4426
4427#: builtin/commit.c:1498
4428msgid "the commit is authored by me now (used with -C/-c/--amend)"
4429msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4430
4431#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86
4432msgid "add Signed-off-by:"
4433msgstr "添加 Signed-off-by: 签名"
4434
4435#: builtin/commit.c:1500
4436msgid "use specified template file"
4437msgstr "使用指定的模板文件"
4438
4439#: builtin/commit.c:1501
4440msgid "force edit of commit"
4441msgstr "强制编辑提交"
4442
4443#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4444#: builtin/commit.c:1502
4445msgid "default"
4446msgstr "default"
4447
4448#: builtin/commit.c:1502 builtin/tag.c:515
4449msgid "how to strip spaces and #comments from message"
4450msgstr "设置如何删除提交说明里的空格和#注释"
4451
4452#: builtin/commit.c:1503
4453msgid "include status in commit message template"
4454msgstr "在提交说明模板里包含状态信息"
4455
4456#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92
4457#: builtin/tag.c:516
4458msgid "key-id"
4459msgstr "key-id"
4460
4461#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93
4462msgid "GPG sign commit"
4463msgstr "GPG 提交签名"
4464
4465#: builtin/commit.c:1508
4466msgid "Commit contents options"
4467msgstr "提交内容选项"
4468
4469#: builtin/commit.c:1509
4470msgid "commit all changed files"
4471msgstr "提交所有改动的文件"
4472
4473#: builtin/commit.c:1510
4474msgid "add specified files to index for commit"
4475msgstr "添加指定的文件到索引区等待提交"
4476
4477#: builtin/commit.c:1511
4478msgid "interactively add files"
4479msgstr "交互式添加文件"
4480
4481#: builtin/commit.c:1512
4482msgid "interactively add changes"
4483msgstr "交互式添加变更"
4484
4485#: builtin/commit.c:1513
4486msgid "commit only specified files"
4487msgstr "只提交指定的文件"
4488
4489#: builtin/commit.c:1514
4490msgid "bypass pre-commit hook"
4491msgstr "绕过 pre-commit 钩子"
4492
4493#: builtin/commit.c:1515
4494msgid "show what would be committed"
4495msgstr "显示将要提交的内容"
4496
4497#: builtin/commit.c:1526
4498msgid "amend previous commit"
4499msgstr "修改先前的提交"
4500
4501#: builtin/commit.c:1527
4502msgid "bypass post-rewrite hook"
4503msgstr "绕过 post-rewrite 钩子"
4504
4505#: builtin/commit.c:1532
4506msgid "ok to record an empty change"
4507msgstr "允许一个空提交"
4508
4509#: builtin/commit.c:1534
4510msgid "ok to record a change with an empty message"
4511msgstr "允许空的提交说明"
4512
4513#: builtin/commit.c:1562
4514msgid "could not parse HEAD commit"
4515msgstr "不能解析 HEAD 提交"
4516
4517#: builtin/commit.c:1601 builtin/merge.c:518
4518#, c-format
4519msgid "could not open '%s' for reading"
4520msgstr "不能为读入打开 '%s'"
4521
4522#: builtin/commit.c:1608
4523#, c-format
4524msgid "Corrupt MERGE_HEAD file (%s)"
4525msgstr "损坏的 MERGE_HEAD 文件(%s)"
4526
4527#: builtin/commit.c:1615
4528msgid "could not read MERGE_MODE"
4529msgstr "不能读取 MERGE_MODE"
4530
4531#: builtin/commit.c:1634
4532#, c-format
4533msgid "could not read commit message: %s"
4534msgstr "不能读取提交说明:%s"
4535
4536#: builtin/commit.c:1645
4537#, c-format
4538msgid "Aborting commit; you did not edit the message.\n"
4539msgstr "终止提交;您未更改来自模版的提交说明。\n"
4540
4541#: builtin/commit.c:1650
4542#, c-format
4543msgid "Aborting commit due to empty commit message.\n"
4544msgstr "终止提交因为提交说明为空。\n"
4545
4546#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882
4547msgid "failed to write commit object"
4548msgstr "无法写提交对象"
4549
4550#: builtin/commit.c:1686
4551msgid "cannot lock HEAD ref"
4552msgstr "无法锁定 HEAD 引用"
4553
4554#: builtin/commit.c:1690
4555msgid "cannot update HEAD ref"
4556msgstr "无法更新 HEAD 引用"
4557
4558#: builtin/commit.c:1701
4559msgid ""
4560"Repository has been updated, but unable to write\n"
4561"new_index file. Check that disk is not full or quota is\n"
4562"not exceeded, and then \"git reset HEAD\" to recover."
4563msgstr ""
4564"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4565"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4566
4567#: builtin/config.c:8
4568msgid "git config [options]"
4569msgstr "git config [选项]"
4570
4571#: builtin/config.c:53
4572msgid "Config file location"
4573msgstr "配置文件位置"
4574
4575#: builtin/config.c:54
4576msgid "use global config file"
4577msgstr "使用全局配置文件"
4578
4579#: builtin/config.c:55
4580msgid "use system config file"
4581msgstr "使用系统级配置文件"
4582
4583#: builtin/config.c:56
4584msgid "use repository config file"
4585msgstr "使用版本库级配置文件"
4586
4587#: builtin/config.c:57
4588msgid "use given config file"
4589msgstr "使用指定的配置文件"
4590
4591#: builtin/config.c:58
4592msgid "blob-id"
4593msgstr "数据对象ID"
4594
4595#: builtin/config.c:58
4596msgid "read config from given blob object"
4597msgstr "从给定的数据对象读取配置"
4598
4599#: builtin/config.c:59
4600msgid "Action"
4601msgstr "操作"
4602
4603#: builtin/config.c:60
4604msgid "get value: name [value-regex]"
4605msgstr "获取值:name [value-regex]"
4606
4607#: builtin/config.c:61
4608msgid "get all values: key [value-regex]"
4609msgstr "获得所有的值:key [value-regex]"
4610
4611#: builtin/config.c:62
4612msgid "get values for regexp: name-regex [value-regex]"
4613msgstr "根据正则表达式获得值:name-regex [value-regex]"
4614
4615#: builtin/config.c:63
4616msgid "get value specific for the URL: section[.var] URL"
4617msgstr "获得 URL 取值:section[.var] URL"
4618
4619#: builtin/config.c:64
4620msgid "replace all matching variables: name value [value_regex]"
4621msgstr "替换所有匹配的变量:name value [value_regex]"
4622
4623#: builtin/config.c:65
4624msgid "add a new variable: name value"
4625msgstr "添加一个新的变量:name value"
4626
4627#: builtin/config.c:66
4628msgid "remove a variable: name [value-regex]"
4629msgstr "删除一个变量:name [value-regex]"
4630
4631#: builtin/config.c:67
4632msgid "remove all matches: name [value-regex]"
4633msgstr "删除所有匹配项:name [value-regex]"
4634
4635#: builtin/config.c:68
4636msgid "rename section: old-name new-name"
4637msgstr "重命名小节:old-name new-name"
4638
4639#: builtin/config.c:69
4640msgid "remove a section: name"
4641msgstr "删除一个小节:name"
4642
4643#: builtin/config.c:70
4644msgid "list all"
4645msgstr "列出所有"
4646
4647#: builtin/config.c:71
4648msgid "open an editor"
4649msgstr "打开一个编辑器"
4650
4651#: builtin/config.c:72 builtin/config.c:73
4652msgid "slot"
4653msgstr "slot"
4654
4655#: builtin/config.c:72
4656msgid "find the color configured: [default]"
4657msgstr "找到配置的颜色:[默认]"
4658
4659#: builtin/config.c:73
4660msgid "find the color setting: [stdout-is-tty]"
4661msgstr "找到颜色设置:[stdout-is-tty]"
4662
4663#: builtin/config.c:74
4664msgid "Type"
4665msgstr "类型"
4666
4667#: builtin/config.c:75
4668msgid "value is \"true\" or \"false\""
4669msgstr "值是 \"true\" 或 \"false\""
4670
4671#: builtin/config.c:76
4672msgid "value is decimal number"
4673msgstr "值是十进制数"
4674
4675#: builtin/config.c:77
4676msgid "value is --bool or --int"
4677msgstr "值是 --bool or --int"
4678
4679#: builtin/config.c:78
4680msgid "value is a path (file or directory name)"
4681msgstr "值是一个路径(文件或目录名)"
4682
4683#: builtin/config.c:79
4684msgid "Other"
4685msgstr "其它"
4686
4687#: builtin/config.c:80
4688msgid "terminate values with NUL byte"
4689msgstr "终止值是NUL字节"
4690
4691#: builtin/config.c:81
4692msgid "respect include directives on lookup"
4693msgstr "查询时参照 include 指令递归查找"
4694
4695#: builtin/count-objects.c:82
4696msgid "git count-objects [-v] [-H | --human-readable]"
4697msgstr "git count-objects [-v] [-H | --human-readable]"
4698
4699#: builtin/count-objects.c:97
4700msgid "print sizes in human readable format"
4701msgstr "以用户可读的格式显示大小"
4702
4703#: builtin/describe.c:16
4704msgid "git describe [options] <commit-ish>*"
4705msgstr "git describe [选项] <提交号>*"
4706
4707#: builtin/describe.c:17
4708msgid "git describe [options] --dirty"
4709msgstr "git describe [选项] --dirty"
4710
4711#: builtin/describe.c:225
4712#, c-format
4713msgid "annotated tag %s not available"
4714msgstr "注释 tag %s 无效"
4715
4716#: builtin/describe.c:229
4717#, c-format
4718msgid "annotated tag %s has no embedded name"
4719msgstr "注释 tag %s 没有嵌入名称"
4720
4721#: builtin/describe.c:231
4722#, c-format
4723msgid "tag '%s' is really '%s' here"
4724msgstr "tag '%s' 的确是在 '%s'"
4725
4726#: builtin/describe.c:258
4727#, c-format
4728msgid "Not a valid object name %s"
4729msgstr "不是一个有效的对象名 %s"
4730
4731#: builtin/describe.c:261
4732#, c-format
4733msgid "%s is not a valid '%s' object"
4734msgstr "%s 不是一个有效的 '%s' 对象"
4735
4736#: builtin/describe.c:278
4737#, c-format
4738msgid "no tag exactly matches '%s'"
4739msgstr "没有 tag 准确匹配 '%s'"
4740
4741#: builtin/describe.c:280
4742#, c-format
4743msgid "searching to describe %s\n"
4744msgstr "搜索描述 %s\n"
4745
4746#: builtin/describe.c:327
4747#, c-format
4748msgid "finished search at %s\n"
4749msgstr "完成搜索 %s\n"
4750
4751#: builtin/describe.c:354
4752#, c-format
4753msgid ""
4754"No annotated tags can describe '%s'.\n"
4755"However, there were unannotated tags: try --tags."
4756msgstr ""
4757"没有注释 tag 能描述 '%s'。\n"
4758"然而,有非注释 tag:尝试 --tags。"
4759
4760#: builtin/describe.c:358
4761#, c-format
4762msgid ""
4763"No tags can describe '%s'.\n"
4764"Try --always, or create some tags."
4765msgstr ""
4766"没有注释 tag 能描述 '%s'。\n"
4767"尝试 --always,或者创建一些 tag。"
4768
4769#: builtin/describe.c:379
4770#, c-format
4771msgid "traversed %lu commits\n"
4772msgstr "已遍历 %lu 个提交\n"
4773
4774#: builtin/describe.c:382
4775#, c-format
4776msgid ""
4777"more than %i tags found; listed %i most recent\n"
4778"gave up search at %s\n"
4779msgstr ""
4780"发现多于 %i 个 tag,列出最近的 %i 个\n"
4781"在 %s 放弃搜索\n"
4782
4783#: builtin/describe.c:404
4784msgid "find the tag that comes after the commit"
4785msgstr "寻找提交之后的 tag(用于描述提交)"
4786
4787#: builtin/describe.c:405
4788msgid "debug search strategy on stderr"
4789msgstr "在标准错误上调试搜索策略"
4790
4791#: builtin/describe.c:406
4792msgid "use any ref"
4793msgstr "使用任意引用"
4794
4795#: builtin/describe.c:407
4796msgid "use any tag, even unannotated"
4797msgstr "使用任意 tag,即使未带注解"
4798
4799#: builtin/describe.c:408
4800msgid "always use long format"
4801msgstr "始终使用长提交号格式"
4802
4803#: builtin/describe.c:409
4804msgid "only follow first parent"
4805msgstr "只跟随第一个父提交"
4806
4807#: builtin/describe.c:412
4808msgid "only output exact matches"
4809msgstr "只输出精确匹配"
4810
4811#: builtin/describe.c:414
4812msgid "consider <n> most recent tags (default: 10)"
4813msgstr "考虑最近 <n> 个 tags(默认:10)"
4814
4815#: builtin/describe.c:416
4816msgid "only consider tags matching <pattern>"
4817msgstr "只考虑匹配 <模式> 的 tags"
4818
4819#: builtin/describe.c:418 builtin/name-rev.c:321
4820msgid "show abbreviated commit object as fallback"
4821msgstr "显示简写的提交号作为后备"
4822
4823#: builtin/describe.c:419
4824msgid "mark"
4825msgstr "标记"
4826
4827#: builtin/describe.c:420
4828msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4829msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4830
4831#: builtin/describe.c:438
4832msgid "--long is incompatible with --abbrev=0"
4833msgstr "--long 与 --abbrev=0 不兼容"
4834
4835#: builtin/describe.c:464
4836msgid "No names found, cannot describe anything."
4837msgstr "没有发现名称,无法描述任何东西。"
4838
4839#: builtin/describe.c:484
4840msgid "--dirty is incompatible with commit-ishes"
4841msgstr "--dirty 不能与提交同时使用"
4842
4843#: builtin/diff.c:85
4844#, c-format
4845msgid "'%s': not a regular file or symlink"
4846msgstr "'%s':不是一个正规文件或符号链接"
4847
4848#: builtin/diff.c:236
4849#, c-format
4850msgid "invalid option: %s"
4851msgstr "无效选项:%s"
4852
4853#: builtin/diff.c:357
4854msgid "Not a git repository"
4855msgstr "不是一个 git 版本库"
4856
4857#: builtin/diff.c:400
4858#, c-format
4859msgid "invalid object '%s' given."
4860msgstr "提供了无效对象 '%s'。"
4861
4862#: builtin/diff.c:409
4863#, c-format
4864msgid "more than two blobs given: '%s'"
4865msgstr "提供了超过两个数据(blob)对象:'%s'"
4866
4867#: builtin/diff.c:416
4868#, c-format
4869msgid "unhandled object '%s' given."
4870msgstr "无法处理的对象 '%s'。"
4871
4872#: builtin/fast-export.c:22
4873msgid "git fast-export [rev-list-opts]"
4874msgstr "git fast-export [rev-list-opts]"
4875
4876#: builtin/fast-export.c:673
4877msgid "show progress after <n> objects"
4878msgstr "在 <n> 个对象之后显示进度"
4879
4880#: builtin/fast-export.c:675
4881msgid "select handling of signed tags"
4882msgstr "选择如何处理签名 tags"
4883
4884#: builtin/fast-export.c:678
4885msgid "select handling of tags that tag filtered objects"
4886msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4887
4888#: builtin/fast-export.c:681
4889msgid "Dump marks to this file"
4890msgstr "把标记存储到这个文件"
4891
4892#: builtin/fast-export.c:683
4893msgid "Import marks from this file"
4894msgstr "从这个文件导入标记"
4895
4896#: builtin/fast-export.c:685
4897msgid "Fake a tagger when tags lack one"
4898msgstr "当 tags 缺少标记者字段时,假装提供一个"
4899
4900#: builtin/fast-export.c:687
4901msgid "Output full tree for each commit"
4902msgstr "每次提交都输出整个树"
4903
4904#: builtin/fast-export.c:689
4905msgid "Use the done feature to terminate the stream"
4906msgstr "使用 done 功能来终止流"
4907
4908#: builtin/fast-export.c:690
4909msgid "Skip output of blob data"
4910msgstr "跳过数据对象的输出"
4911
4912#: builtin/fetch.c:20
4913msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4914msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
4915
4916#: builtin/fetch.c:21
4917msgid "git fetch [<options>] <group>"
4918msgstr "git fetch [<选项>] <组>"
4919
4920#: builtin/fetch.c:22
4921msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4922msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4923
4924#: builtin/fetch.c:23
4925msgid "git fetch --all [<options>]"
4926msgstr "git fetch --all [<选项>]"
4927
4928#: builtin/fetch.c:75
4929msgid "fetch from all remotes"
4930msgstr "从所有的远程抓取"
4931
4932#: builtin/fetch.c:77
4933msgid "append to .git/FETCH_HEAD instead of overwriting"
4934msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4935
4936#: builtin/fetch.c:79
4937msgid "path to upload pack on remote end"
4938msgstr "上传包到远程的路径"
4939
4940#: builtin/fetch.c:80
4941msgid "force overwrite of local branch"
4942msgstr "强制覆盖本地分支"
4943
4944#: builtin/fetch.c:82
4945msgid "fetch from multiple remotes"
4946msgstr "从多个远程抓取"
4947
4948#: builtin/fetch.c:84
4949msgid "fetch all tags and associated objects"
4950msgstr "抓取所有的 tags 和关联对象"
4951
4952#: builtin/fetch.c:86
4953msgid "do not fetch all tags (--no-tags)"
4954msgstr "不抓取任何 tags (--no-tags)"
4955
4956#: builtin/fetch.c:88
4957msgid "prune remote-tracking branches no longer on remote"
4958msgstr "清除远程已经不存在的分支的跟踪分支"
4959
4960#  译者:可选值,不能翻译
4961#: builtin/fetch.c:89
4962msgid "on-demand"
4963msgstr "on-demand"
4964
4965#: builtin/fetch.c:90
4966msgid "control recursive fetching of submodules"
4967msgstr "控制子模组的递归抓取"
4968
4969#: builtin/fetch.c:94
4970msgid "keep downloaded pack"
4971msgstr "保持下载包"
4972
4973#: builtin/fetch.c:96
4974msgid "allow updating of HEAD ref"
4975msgstr "允许更新 HEAD 引用"
4976
4977#: builtin/fetch.c:99
4978msgid "deepen history of shallow clone"
4979msgstr "深化浅克隆的历史"
4980
4981#: builtin/fetch.c:101
4982msgid "convert to a complete repository"
4983msgstr "转换为一个完整的版本库"
4984
4985#: builtin/fetch.c:103 builtin/log.c:1197
4986msgid "dir"
4987msgstr "目录"
4988
4989#: builtin/fetch.c:104
4990msgid "prepend this to submodule path output"
4991msgstr "在子模组路径输出的前面加上此目录"
4992
4993#: builtin/fetch.c:107
4994msgid "default mode for recursion"
4995msgstr "递归的默认模式"
4996
4997#: builtin/fetch.c:109
4998msgid "accept refs that update .git/shallow"
4999msgstr "接受更新 .git/shallow 的引用"
5000
5001#: builtin/fetch.c:347
5002msgid "Couldn't find remote ref HEAD"
5003msgstr "无法发现远程 HEAD 引用"
5004
5005#: builtin/fetch.c:411
5006#, c-format
5007msgid "object %s not found"
5008msgstr "对象 %s 未发现"
5009
5010#: builtin/fetch.c:416
5011msgid "[up to date]"
5012msgstr "[最新]"
5013
5014#: builtin/fetch.c:430
5015#, c-format
5016msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
5017msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
5018
5019#: builtin/fetch.c:431 builtin/fetch.c:517
5020msgid "[rejected]"
5021msgstr "[已拒绝]"
5022
5023#: builtin/fetch.c:442
5024msgid "[tag update]"
5025msgstr "[tag更新]"
5026
5027#  译者:注意保持前导空格
5028#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
5029msgid "  (unable to update local ref)"
5030msgstr "  (不能更新本地引用)"
5031
5032#: builtin/fetch.c:462
5033msgid "[new tag]"
5034msgstr "[新tag]"
5035
5036#: builtin/fetch.c:465
5037msgid "[new branch]"
5038msgstr "[新分支]"
5039
5040#: builtin/fetch.c:468
5041msgid "[new ref]"
5042msgstr "[新引用]"
5043
5044#: builtin/fetch.c:513
5045msgid "unable to update local ref"
5046msgstr "不能更新本地引用"
5047
5048#: builtin/fetch.c:513
5049msgid "forced update"
5050msgstr "强制更新"
5051
5052#: builtin/fetch.c:519
5053msgid "(non-fast-forward)"
5054msgstr "(非快进式)"
5055
5056#: builtin/fetch.c:552 builtin/fetch.c:785
5057#, c-format
5058msgid "cannot open %s: %s\n"
5059msgstr "无法打开 %s:%s\n"
5060
5061#: builtin/fetch.c:561
5062#, c-format
5063msgid "%s did not send all necessary objects\n"
5064msgstr "%s 未发送所有必须的对象\n"
5065
5066#: builtin/fetch.c:579
5067#, c-format
5068msgid "reject %s because shallow roots are not allowed to be updated"
5069msgstr "拒绝 %s 因为浅克隆不允许被更新"
5070
5071#: builtin/fetch.c:667 builtin/fetch.c:750
5072#, c-format
5073msgid "From %.*s\n"
5074msgstr "来自 %.*s\n"
5075
5076#: builtin/fetch.c:678
5077#, c-format
5078msgid ""
5079"some local refs could not be updated; try running\n"
5080" 'git remote prune %s' to remove any old, conflicting branches"
5081msgstr ""
5082"一些本地引用不能被更新;尝试运行\n"
5083" 'git remote prune %s' 来删除旧的、有冲突的分支"
5084
5085#  译者:注意保持前导空格
5086#: builtin/fetch.c:730
5087#, c-format
5088msgid "   (%s will become dangling)"
5089msgstr "   (%s 将成为摇摆状态)"
5090
5091#  译者:注意保持前导空格
5092#: builtin/fetch.c:731
5093#, c-format
5094msgid "   (%s has become dangling)"
5095msgstr "   (%s 已成为摇摆状态)"
5096
5097#: builtin/fetch.c:755
5098msgid "[deleted]"
5099msgstr "[已删除]"
5100
5101#: builtin/fetch.c:756 builtin/remote.c:1050
5102msgid "(none)"
5103msgstr "(无)"
5104
5105#: builtin/fetch.c:775
5106#, c-format
5107msgid "Refusing to fetch into current branch %s of non-bare repository"
5108msgstr "拒绝获取到非裸版本库的当前分支 %s"
5109
5110#: builtin/fetch.c:794
5111#, c-format
5112msgid "Option \"%s\" value \"%s\" is not valid for %s"
5113msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5114
5115#: builtin/fetch.c:797
5116#, c-format
5117msgid "Option \"%s\" is ignored for %s\n"
5118msgstr "选项 \"%s\" 为 %s 所忽略\n"
5119
5120#: builtin/fetch.c:853
5121#, c-format
5122msgid "Don't know how to fetch from %s"
5123msgstr "不知道如何从 %s 获取"
5124
5125#: builtin/fetch.c:1015
5126#, c-format
5127msgid "Fetching %s\n"
5128msgstr "正在获取 %s\n"
5129
5130#: builtin/fetch.c:1017 builtin/remote.c:90
5131#, c-format
5132msgid "Could not fetch %s"
5133msgstr "不能获取 %s"
5134
5135#: builtin/fetch.c:1035
5136msgid ""
5137"No remote repository specified.  Please, specify either a URL or a\n"
5138"remote name from which new revisions should be fetched."
5139msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5140
5141#: builtin/fetch.c:1059
5142msgid "You need to specify a tag name."
5143msgstr "您需要指定一个 tag 名称。"
5144
5145#: builtin/fetch.c:1107
5146msgid "--depth and --unshallow cannot be used together"
5147msgstr "--depth 和 --unshallow 不能同时使用"
5148
5149#: builtin/fetch.c:1109
5150msgid "--unshallow on a complete repository does not make sense"
5151msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5152
5153#: builtin/fetch.c:1132
5154msgid "fetch --all does not take a repository argument"
5155msgstr "fetch --all 不能带一个版本库参数"
5156
5157#: builtin/fetch.c:1134
5158msgid "fetch --all does not make sense with refspecs"
5159msgstr "fetch --all 带引用规则没有任何意义"
5160
5161#: builtin/fetch.c:1145
5162#, c-format
5163msgid "No such remote or remote group: %s"
5164msgstr "没有这样的远程或远程组:%s"
5165
5166#: builtin/fetch.c:1153
5167msgid "Fetching a group and specifying refspecs does not make sense"
5168msgstr "获取组并指定引用规则没有意义"
5169
5170#: builtin/fmt-merge-msg.c:13
5171msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5172msgstr ""
5173"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5174
5175#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
5176#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179
5177#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501
5178#: parse-options.h:132 parse-options.h:239
5179msgid "n"
5180msgstr "n"
5181
5182#: builtin/fmt-merge-msg.c:664
5183msgid "populate log with at most <n> entries from shortlog"
5184msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5185
5186#: builtin/fmt-merge-msg.c:667
5187msgid "alias for --log (deprecated)"
5188msgstr "参数 --log 的别名(已弃用)"
5189
5190#: builtin/fmt-merge-msg.c:670
5191msgid "text"
5192msgstr "文本"
5193
5194#: builtin/fmt-merge-msg.c:671
5195msgid "use <text> as start of message"
5196msgstr "使用 <文本> 作为提交说明的开始"
5197
5198#: builtin/fmt-merge-msg.c:672
5199msgid "file to read from"
5200msgstr "从文件中读取"
5201
5202#: builtin/for-each-ref.c:1063
5203msgid "git for-each-ref [options] [<pattern>]"
5204msgstr "git for-each-ref [选项] [<模式>]"
5205
5206#: builtin/for-each-ref.c:1078
5207msgid "quote placeholders suitably for shells"
5208msgstr "引用占位符适用于 shells"
5209
5210#: builtin/for-each-ref.c:1080
5211msgid "quote placeholders suitably for perl"
5212msgstr "引用占位符适用于 perl"
5213
5214#: builtin/for-each-ref.c:1082
5215msgid "quote placeholders suitably for python"
5216msgstr "引用占位符适用于 python"
5217
5218#: builtin/for-each-ref.c:1084
5219msgid "quote placeholders suitably for tcl"
5220msgstr "引用占位符适用于 tcl"
5221
5222#: builtin/for-each-ref.c:1087
5223msgid "show only <n> matched refs"
5224msgstr "只显示 <n> 个匹配的引用"
5225
5226#: builtin/for-each-ref.c:1088 builtin/replace.c:177
5227msgid "format"
5228msgstr "格式"
5229
5230#: builtin/for-each-ref.c:1088
5231msgid "format to use for the output"
5232msgstr "输出格式"
5233
5234#: builtin/for-each-ref.c:1089
5235msgid "key"
5236msgstr "key"
5237
5238#: builtin/for-each-ref.c:1090
5239msgid "field name to sort on"
5240msgstr "排序的字段名"
5241
5242#: builtin/fsck.c:147 builtin/prune.c:172
5243msgid "Checking connectivity"
5244msgstr "检查连接中"
5245
5246#: builtin/fsck.c:544
5247msgid "Checking object directories"
5248msgstr "检查对象目录中"
5249
5250#: builtin/fsck.c:607
5251msgid "git fsck [options] [<object>...]"
5252msgstr "git fsck [选项] [<对象>...]"
5253
5254#: builtin/fsck.c:613
5255msgid "show unreachable objects"
5256msgstr "显示不可达的对象"
5257
5258#: builtin/fsck.c:614
5259msgid "show dangling objects"
5260msgstr "显示摇摆的对象"
5261
5262#: builtin/fsck.c:615
5263msgid "report tags"
5264msgstr "报告 tags"
5265
5266#: builtin/fsck.c:616
5267msgid "report root nodes"
5268msgstr "报告根节点"
5269
5270#: builtin/fsck.c:617
5271msgid "make index objects head nodes"
5272msgstr "将索引亦作为检查的头节点"
5273
5274#: builtin/fsck.c:618
5275msgid "make reflogs head nodes (default)"
5276msgstr "将引用日志作为检查的头节点(默认)"
5277
5278#: builtin/fsck.c:619
5279msgid "also consider packs and alternate objects"
5280msgstr "也考虑包和备用对象"
5281
5282#: builtin/fsck.c:620
5283msgid "enable more strict checking"
5284msgstr "启用更严格的检查"
5285
5286#: builtin/fsck.c:622
5287msgid "write dangling objects in .git/lost-found"
5288msgstr "将摇摆对象写入 .git/lost-found 中"
5289
5290#: builtin/fsck.c:623 builtin/prune.c:144
5291msgid "show progress"
5292msgstr "显示进度"
5293
5294#: builtin/fsck.c:673
5295msgid "Checking objects"
5296msgstr "检查对象中"
5297
5298#: builtin/gc.c:24
5299msgid "git gc [options]"
5300msgstr "git gc [选项]"
5301
5302#: builtin/gc.c:90
5303#, c-format
5304msgid "Invalid %s: '%s'"
5305msgstr "无效的 %s:'%s'"
5306
5307#: builtin/gc.c:117
5308#, c-format
5309msgid "insanely long object directory %.*s"
5310msgstr "不正常的长对象目录 %.*s"
5311
5312#: builtin/gc.c:273
5313msgid "prune unreferenced objects"
5314msgstr "清除未引用的对象"
5315
5316#: builtin/gc.c:275
5317msgid "be more thorough (increased runtime)"
5318msgstr "更彻底(增加运行时间)"
5319
5320#: builtin/gc.c:276
5321msgid "enable auto-gc mode"
5322msgstr "启用自动垃圾回收模式"
5323
5324#: builtin/gc.c:277
5325msgid "force running gc even if there may be another gc running"
5326msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5327
5328#: builtin/gc.c:318
5329#, c-format
5330msgid "Auto packing the repository in background for optimum performance.\n"
5331msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5332
5333#: builtin/gc.c:320
5334#, c-format
5335msgid "Auto packing the repository for optimum performance.\n"
5336msgstr "自动打包版本库以求最佳性能。\n"
5337
5338#: builtin/gc.c:321
5339#, c-format
5340msgid "See \"git help gc\" for manual housekeeping.\n"
5341msgstr "手工维护参见 \"git help gc\"。\n"
5342
5343#: builtin/gc.c:336
5344#, c-format
5345msgid ""
5346"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5347msgstr ""
5348"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5349
5350#: builtin/gc.c:361
5351msgid ""
5352"There are too many unreachable loose objects; run 'git prune' to remove them."
5353msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5354
5355#: builtin/grep.c:23
5356msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5357msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
5358
5359#: builtin/grep.c:218
5360#, c-format
5361msgid "grep: failed to create thread: %s"
5362msgstr "grep:无法创建线程:%s"
5363
5364#: builtin/grep.c:365
5365#, c-format
5366msgid "Failed to chdir: %s"
5367msgstr "无法切换目录:%s"
5368
5369#: builtin/grep.c:443 builtin/grep.c:478
5370#, c-format
5371msgid "unable to read tree (%s)"
5372msgstr "无法读取树(%s)"
5373
5374#: builtin/grep.c:493
5375#, c-format
5376msgid "unable to grep from object of type %s"
5377msgstr "无法抓取来自于 %s 类型的对象"
5378
5379#: builtin/grep.c:549
5380#, c-format
5381msgid "switch `%c' expects a numerical value"
5382msgstr "开关 `%c' 期望一个数字值"
5383
5384#: builtin/grep.c:566
5385#, c-format
5386msgid "cannot open '%s'"
5387msgstr "不能打开 '%s'"
5388
5389#: builtin/grep.c:640
5390msgid "search in index instead of in the work tree"
5391msgstr "在索引区搜索而不是在工作区"
5392
5393#: builtin/grep.c:642
5394msgid "find in contents not managed by git"
5395msgstr "在未被 git 管理的内容中查找"
5396
5397#  译者:中文字符串拼接,可删除前导空格
5398#: builtin/grep.c:644
5399msgid "search in both tracked and untracked files"
5400msgstr "在跟踪和未跟踪的文件中搜索"
5401
5402#: builtin/grep.c:646
5403msgid "search also in ignored files"
5404msgstr "也在忽略的文件中搜索"
5405
5406#: builtin/grep.c:649
5407msgid "show non-matching lines"
5408msgstr "显示未匹配的行"
5409
5410#: builtin/grep.c:651
5411msgid "case insensitive matching"
5412msgstr "不区分大小写匹配"
5413
5414#: builtin/grep.c:653
5415msgid "match patterns only at word boundaries"
5416msgstr "只在单词边界匹配模式"
5417
5418#: builtin/grep.c:655
5419msgid "process binary files as text"
5420msgstr "把二进制文件当做文本处理"
5421
5422#: builtin/grep.c:657
5423msgid "don't match patterns in binary files"
5424msgstr "不在二进制文件中匹配模式"
5425
5426#: builtin/grep.c:660
5427msgid "process binary files with textconv filters"
5428msgstr "用 textconv 过滤器处理二进制文件"
5429
5430#: builtin/grep.c:662
5431msgid "descend at most <depth> levels"
5432msgstr "最多以指定的深度向下寻找"
5433
5434#: builtin/grep.c:666
5435msgid "use extended POSIX regular expressions"
5436msgstr "使用扩展的 POSIX 正则表达式"
5437
5438#: builtin/grep.c:669
5439msgid "use basic POSIX regular expressions (default)"
5440msgstr "使用基本的 POSIX 正则表达式(默认)"
5441
5442#: builtin/grep.c:672
5443msgid "interpret patterns as fixed strings"
5444msgstr "把模式解析为固定的字符串"
5445
5446#: builtin/grep.c:675
5447msgid "use Perl-compatible regular expressions"
5448msgstr "使用 Perl 兼容的正则表达式"
5449
5450#: builtin/grep.c:678
5451msgid "show line numbers"
5452msgstr "显示行号"
5453
5454#: builtin/grep.c:679
5455msgid "don't show filenames"
5456msgstr "不显示文件名"
5457
5458#: builtin/grep.c:680
5459msgid "show filenames"
5460msgstr "显示文件名"
5461
5462#: builtin/grep.c:682
5463msgid "show filenames relative to top directory"
5464msgstr "显示相对于顶级目录的文件名"
5465
5466#: builtin/grep.c:684
5467msgid "show only filenames instead of matching lines"
5468msgstr "只显示文件名而不显示匹配的行"
5469
5470#: builtin/grep.c:686
5471msgid "synonym for --files-with-matches"
5472msgstr "和 --files-with-matches 同义"
5473
5474#: builtin/grep.c:689
5475msgid "show only the names of files without match"
5476msgstr "只显示未匹配的文件名"
5477
5478#: builtin/grep.c:691
5479msgid "print NUL after filenames"
5480msgstr "在文件名后输出 NUL 字符"
5481
5482#: builtin/grep.c:693
5483msgid "show the number of matches instead of matching lines"
5484msgstr "显示总匹配行数,而不显示匹配的行"
5485
5486#: builtin/grep.c:694
5487msgid "highlight matches"
5488msgstr "高亮显示匹配项"
5489
5490#: builtin/grep.c:696
5491msgid "print empty line between matches from different files"
5492msgstr "在不同文件的匹配项之间打印空行"
5493
5494#: builtin/grep.c:698
5495msgid "show filename only once above matches from same file"
5496msgstr "只在同一文件的匹配项的上面显示一次文件名"
5497
5498#: builtin/grep.c:701
5499msgid "show <n> context lines before and after matches"
5500msgstr "显示匹配项前后的 <n> 行上下文"
5501
5502#: builtin/grep.c:704
5503msgid "show <n> context lines before matches"
5504msgstr "显示匹配项前 <n> 行上下文"
5505
5506#: builtin/grep.c:706
5507msgid "show <n> context lines after matches"
5508msgstr "显示匹配项后 <n> 行上下文"
5509
5510#: builtin/grep.c:707
5511msgid "shortcut for -C NUM"
5512msgstr "快捷键 -C 数字"
5513
5514#: builtin/grep.c:710
5515msgid "show a line with the function name before matches"
5516msgstr "在匹配的前面显示一行函数名"
5517
5518#: builtin/grep.c:712
5519msgid "show the surrounding function"
5520msgstr "显示所在函数的前后内容"
5521
5522#: builtin/grep.c:715
5523msgid "read patterns from file"
5524msgstr "从文件读取模式"
5525
5526#: builtin/grep.c:717
5527msgid "match <pattern>"
5528msgstr "匹配 <模式>"
5529
5530#: builtin/grep.c:719
5531msgid "combine patterns specified with -e"
5532msgstr "组合用 -e 参数设定的模式"
5533
5534#: builtin/grep.c:731
5535msgid "indicate hit with exit status without output"
5536msgstr "不输出,而用退出码标识命中状态"
5537
5538#: builtin/grep.c:733
5539msgid "show only matches from files that match all patterns"
5540msgstr "只显示匹配所有模式的文件中的匹配"
5541
5542#: builtin/grep.c:735
5543msgid "show parse tree for grep expression"
5544msgstr "显示 grep 表达式的解析树"
5545
5546#: builtin/grep.c:739
5547msgid "pager"
5548msgstr "分页"
5549
5550#: builtin/grep.c:739
5551msgid "show matching files in the pager"
5552msgstr "分页显示匹配的文件"
5553
5554#: builtin/grep.c:742
5555msgid "allow calling of grep(1) (ignored by this build)"
5556msgstr "允许调用 grep(1)(本次构建忽略)"
5557
5558#: builtin/grep.c:743 builtin/show-ref.c:187
5559msgid "show usage"
5560msgstr "显示用法"
5561
5562#: builtin/grep.c:810
5563msgid "no pattern given."
5564msgstr "未提供模式匹配。"
5565
5566#: builtin/grep.c:868
5567msgid "--open-files-in-pager only works on the worktree"
5568msgstr "--open-files-in-pager 仅用于工作区"
5569
5570#: builtin/grep.c:891
5571msgid "--cached or --untracked cannot be used with --no-index."
5572msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5573
5574#: builtin/grep.c:896
5575msgid "--no-index or --untracked cannot be used with revs."
5576msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5577
5578#: builtin/grep.c:899
5579msgid "--[no-]exclude-standard cannot be used for tracked contents."
5580msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5581
5582#: builtin/grep.c:907
5583msgid "both --cached and trees are given."
5584msgstr "同时给出了 --cached 和树对象。"
5585
5586#: builtin/hash-object.c:60
5587msgid ""
5588"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5589"<file>..."
5590msgstr ""
5591"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5592"<文件>..."
5593
5594#: builtin/hash-object.c:61
5595msgid "git hash-object  --stdin-paths < <list-of-paths>"
5596msgstr "git hash-object  --stdin-paths < <路径列表>"
5597
5598#: builtin/hash-object.c:72 builtin/tag.c:521
5599msgid "type"
5600msgstr "类型"
5601
5602#: builtin/hash-object.c:72
5603msgid "object type"
5604msgstr "对象类型"
5605
5606#: builtin/hash-object.c:73
5607msgid "write the object into the object database"
5608msgstr "将对象写入对象数据库"
5609
5610#: builtin/hash-object.c:74
5611msgid "read the object from stdin"
5612msgstr "从标准输入读取对象"
5613
5614#: builtin/hash-object.c:76
5615msgid "store file as is without filters"
5616msgstr "原样存储文件不使用过滤器"
5617
5618#: builtin/hash-object.c:77
5619msgid "process file as it were from this path"
5620msgstr "处理文件并假设其来自于此路径"
5621
5622#: builtin/help.c:41
5623msgid "print all available commands"
5624msgstr "打印所有可用的命令"
5625
5626#: builtin/help.c:42
5627msgid "print list of useful guides"
5628msgstr "显示有用的指南列表"
5629
5630#: builtin/help.c:43
5631msgid "show man page"
5632msgstr "显示 man 手册"
5633
5634#: builtin/help.c:44
5635msgid "show manual in web browser"
5636msgstr "在 web 浏览器中显示手册"
5637
5638#: builtin/help.c:46
5639msgid "show info page"
5640msgstr "显示 info 手册"
5641
5642#: builtin/help.c:52
5643msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5644msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5645
5646#: builtin/help.c:64
5647#, c-format
5648msgid "unrecognized help format '%s'"
5649msgstr "未能识别的帮助格式 '%s'"
5650
5651#: builtin/help.c:92
5652msgid "Failed to start emacsclient."
5653msgstr "无法启动 emacsclient。"
5654
5655#: builtin/help.c:105
5656msgid "Failed to parse emacsclient version."
5657msgstr "无法解析 emacsclient 版本。"
5658
5659#: builtin/help.c:113
5660#, c-format
5661msgid "emacsclient version '%d' too old (< 22)."
5662msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5663
5664#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5665#, c-format
5666msgid "failed to exec '%s': %s"
5667msgstr "无法执行 '%s':%s"
5668
5669#: builtin/help.c:216
5670#, c-format
5671msgid ""
5672"'%s': path for unsupported man viewer.\n"
5673"Please consider using 'man.<tool>.cmd' instead."
5674msgstr ""
5675"'%s':不支持的 man 手册查看器的路径。\n"
5676"请使用 'man.<tool>.cmd'。"
5677
5678#: builtin/help.c:228
5679#, c-format
5680msgid ""
5681"'%s': cmd for supported man viewer.\n"
5682"Please consider using 'man.<tool>.path' instead."
5683msgstr ""
5684"'%s': 支持的 man 手册查看器命令。\n"
5685"请使用 'man.<tool>.path'。"
5686
5687#: builtin/help.c:353
5688#, c-format
5689msgid "'%s': unknown man viewer."
5690msgstr "'%s':未知的 man 查看器。"
5691
5692#: builtin/help.c:370
5693msgid "no man viewer handled the request"
5694msgstr "没有 man 查看器处理此请求"
5695
5696#: builtin/help.c:378
5697msgid "no info viewer handled the request"
5698msgstr "没有 info 查看器处理此请求"
5699
5700#: builtin/help.c:424
5701msgid "Defining attributes per path"
5702msgstr "定义路径的属性"
5703
5704#: builtin/help.c:425
5705msgid "A Git glossary"
5706msgstr "Git 词汇表"
5707
5708#: builtin/help.c:426
5709msgid "Specifies intentionally untracked files to ignore"
5710msgstr "忽略指定的未跟踪文件"
5711
5712#: builtin/help.c:427
5713msgid "Defining submodule properties"
5714msgstr "定义子模组属性"
5715
5716#: builtin/help.c:428
5717msgid "Specifying revisions and ranges for Git"
5718msgstr "指定 Git 的版本和版本范围"
5719
5720#: builtin/help.c:429
5721msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5722msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5723
5724#: builtin/help.c:430
5725msgid "An overview of recommended workflows with Git"
5726msgstr "Git 推荐的工作流概览"
5727
5728#: builtin/help.c:442
5729msgid "The common Git guides are:\n"
5730msgstr "最常用的 Git 向导有:\n"
5731
5732#: builtin/help.c:463 builtin/help.c:480
5733#, c-format
5734msgid "usage: %s%s"
5735msgstr "用法:%s%s"
5736
5737#: builtin/help.c:496
5738#, c-format
5739msgid "`git %s' is aliased to `%s'"
5740msgstr "`git %s' 是 `%s' 的别名"
5741
5742#: builtin/index-pack.c:184
5743#, c-format
5744msgid "object type mismatch at %s"
5745msgstr "%s 的对象类型不匹配"
5746
5747#: builtin/index-pack.c:204
5748msgid "object of unexpected type"
5749msgstr "意外的类型的对象"
5750
5751#: builtin/index-pack.c:244
5752#, c-format
5753msgid "cannot fill %d byte"
5754msgid_plural "cannot fill %d bytes"
5755msgstr[0] "无法填充 %d 字节"
5756msgstr[1] "无法填充 %d 字节"
5757
5758#: builtin/index-pack.c:254
5759msgid "early EOF"
5760msgstr "过早的文件结束符(EOF)"
5761
5762#: builtin/index-pack.c:255
5763msgid "read error on input"
5764msgstr "输入上的读错误"
5765
5766#: builtin/index-pack.c:267
5767msgid "used more bytes than were available"
5768msgstr "用掉了超过可用的字节"
5769
5770#: builtin/index-pack.c:274
5771msgid "pack too large for current definition of off_t"
5772msgstr "包太大超过了当前 off_t 的定义"
5773
5774#: builtin/index-pack.c:290
5775#, c-format
5776msgid "unable to create '%s'"
5777msgstr "不能创建 '%s'"
5778
5779#: builtin/index-pack.c:295
5780#, c-format
5781msgid "cannot open packfile '%s'"
5782msgstr "无法打开包文件 '%s'"
5783
5784#: builtin/index-pack.c:309
5785msgid "pack signature mismatch"
5786msgstr "包签名不匹配"
5787
5788#: builtin/index-pack.c:311
5789#, c-format
5790msgid "pack version %<PRIu32> unsupported"
5791msgstr "不支持包版本 %<PRIu32>"
5792
5793#: builtin/index-pack.c:329
5794#, c-format
5795msgid "pack has bad object at offset %lu: %s"
5796msgstr "包中有错误的对象位于 %lu:%s"
5797
5798#: builtin/index-pack.c:451
5799#, c-format
5800msgid "inflate returned %d"
5801msgstr "解压缩返回 %d"
5802
5803#: builtin/index-pack.c:500
5804msgid "offset value overflow for delta base object"
5805msgstr "偏移值覆盖了 delta 基准对象"
5806
5807#: builtin/index-pack.c:508
5808msgid "delta base offset is out of bound"
5809msgstr "delta 基准偏移越界"
5810
5811#: builtin/index-pack.c:516
5812#, c-format
5813msgid "unknown object type %d"
5814msgstr "未知对象类型 %d"
5815
5816#: builtin/index-pack.c:547
5817msgid "cannot pread pack file"
5818msgstr "无法读取包文件"
5819
5820#: builtin/index-pack.c:549
5821#, c-format
5822msgid "premature end of pack file, %lu byte missing"
5823msgid_plural "premature end of pack file, %lu bytes missing"
5824msgstr[0] "包文件过早结束,缺少 %lu 字节"
5825msgstr[1] "包文件过早结束,缺少 %lu 字节"
5826
5827#: builtin/index-pack.c:575
5828msgid "serious inflate inconsistency"
5829msgstr "解压缩严重的不一致"
5830
5831#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5832#: builtin/index-pack.c:729 builtin/index-pack.c:738
5833#, c-format
5834msgid "SHA1 COLLISION FOUND WITH %s !"
5835msgstr "发现 %s 出现 SHA1 冲突!"
5836
5837#: builtin/index-pack.c:669 builtin/pack-objects.c:162
5838#: builtin/pack-objects.c:254
5839#, c-format
5840msgid "unable to read %s"
5841msgstr "不能读 %s"
5842
5843#: builtin/index-pack.c:735
5844#, c-format
5845msgid "cannot read existing object %s"
5846msgstr "不能读取现存对象 %s"
5847
5848#: builtin/index-pack.c:749
5849#, c-format
5850msgid "invalid blob object %s"
5851msgstr "无效的数据(blob)对象 %s"
5852
5853#: builtin/index-pack.c:763
5854#, c-format
5855msgid "invalid %s"
5856msgstr "无效的 %s"
5857
5858#: builtin/index-pack.c:766
5859msgid "Error in object"
5860msgstr "对象中出错"
5861
5862#: builtin/index-pack.c:768
5863#, c-format
5864msgid "Not all child objects of %s are reachable"
5865msgstr "%s 的所有子对象并非都可达"
5866
5867#: builtin/index-pack.c:839 builtin/index-pack.c:869
5868msgid "failed to apply delta"
5869msgstr "无法应用 delta"
5870
5871#: builtin/index-pack.c:1010
5872msgid "Receiving objects"
5873msgstr "接收对象中"
5874
5875#: builtin/index-pack.c:1010
5876msgid "Indexing objects"
5877msgstr "索引对象中"
5878
5879#: builtin/index-pack.c:1036
5880msgid "pack is corrupted (SHA1 mismatch)"
5881msgstr "包冲突(SHA1 不匹配)"
5882
5883#: builtin/index-pack.c:1041
5884msgid "cannot fstat packfile"
5885msgstr "不能枚举包文件状态"
5886
5887#: builtin/index-pack.c:1044
5888msgid "pack has junk at the end"
5889msgstr "包的结尾有垃圾数据"
5890
5891#: builtin/index-pack.c:1055
5892msgid "confusion beyond insanity in parse_pack_objects()"
5893msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5894
5895#: builtin/index-pack.c:1078
5896msgid "Resolving deltas"
5897msgstr "处理 delta 中"
5898
5899#: builtin/index-pack.c:1088
5900#, c-format
5901msgid "unable to create thread: %s"
5902msgstr "不能创建线程:%s"
5903
5904#: builtin/index-pack.c:1130
5905msgid "confusion beyond insanity"
5906msgstr "不可理喻"
5907
5908#: builtin/index-pack.c:1138
5909#, c-format
5910msgid "completed with %d local objects"
5911msgstr "完成 %d 个本地对象"
5912
5913#: builtin/index-pack.c:1148
5914#, c-format
5915msgid "Unexpected tail checksum for %s (disk corruption?)"
5916msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5917
5918#: builtin/index-pack.c:1152
5919#, c-format
5920msgid "pack has %d unresolved delta"
5921msgid_plural "pack has %d unresolved deltas"
5922msgstr[0] "包有 %d 个未解决的 delta"
5923msgstr[1] "包有 %d 个未解决的 delta"
5924
5925#: builtin/index-pack.c:1177
5926#, c-format
5927msgid "unable to deflate appended object (%d)"
5928msgstr "不能压缩附加对象(%d)"
5929
5930#: builtin/index-pack.c:1256
5931#, c-format
5932msgid "local object %s is corrupt"
5933msgstr "本地对象 %s 已损坏"
5934
5935#: builtin/index-pack.c:1280
5936msgid "error while closing pack file"
5937msgstr "关闭包文件时出错"
5938
5939#: builtin/index-pack.c:1293
5940#, c-format
5941msgid "cannot write keep file '%s'"
5942msgstr "无法写保留文件 '%s'"
5943
5944#: builtin/index-pack.c:1301
5945#, c-format
5946msgid "cannot close written keep file '%s'"
5947msgstr "无法关闭保留文件 '%s'"
5948
5949#: builtin/index-pack.c:1314
5950msgid "cannot store pack file"
5951msgstr "无法存储包文件"
5952
5953#: builtin/index-pack.c:1325
5954msgid "cannot store index file"
5955msgstr "无法存储索引文件"
5956
5957#: builtin/index-pack.c:1358
5958#, c-format
5959msgid "bad pack.indexversion=%<PRIu32>"
5960msgstr "坏的 pack.indexversion=%<PRIu32>"
5961
5962#: builtin/index-pack.c:1364
5963#, c-format
5964msgid "invalid number of threads specified (%d)"
5965msgstr "指定的线程数无效(%d)"
5966
5967#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
5968#, c-format
5969msgid "no threads support, ignoring %s"
5970msgstr "没有线程支持,忽略 %s"
5971
5972#: builtin/index-pack.c:1426
5973#, c-format
5974msgid "Cannot open existing pack file '%s'"
5975msgstr "无法打开现存包文件 '%s'"
5976
5977#: builtin/index-pack.c:1428
5978#, c-format
5979msgid "Cannot open existing pack idx file for '%s'"
5980msgstr "无法为 %s 打开包索引文件"
5981
5982#: builtin/index-pack.c:1475
5983#, c-format
5984msgid "non delta: %d object"
5985msgid_plural "non delta: %d objects"
5986msgstr[0] "非 delta:%d 个对象"
5987msgstr[1] "非 delta:%d 个对象"
5988
5989#: builtin/index-pack.c:1482
5990#, c-format
5991msgid "chain length = %d: %lu object"
5992msgid_plural "chain length = %d: %lu objects"
5993msgstr[0] "链长 = %d: %lu 对象"
5994msgstr[1] "链长 = %d: %lu 对象"
5995
5996#: builtin/index-pack.c:1510
5997msgid "Cannot come back to cwd"
5998msgstr "无法返回当前工作目录"
5999
6000#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
6001#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
6002#, c-format
6003msgid "bad %s"
6004msgstr "错误选项 %s"
6005
6006#: builtin/index-pack.c:1591
6007msgid "--fix-thin cannot be used without --stdin"
6008msgstr "--fix-thin 不能和 --stdin 同时使用"
6009
6010#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
6011#, c-format
6012msgid "packfile name '%s' does not end with '.pack'"
6013msgstr "包名 '%s' 没有以 '.pack' 结尾"
6014
6015#: builtin/index-pack.c:1614
6016msgid "--verify with no packfile name given"
6017msgstr "--verify 没有提供包名参数"
6018
6019#: builtin/init-db.c:35
6020#, c-format
6021msgid "Could not make %s writable by group"
6022msgstr "不能设置 %s 为组可写"
6023
6024#: builtin/init-db.c:62
6025#, c-format
6026msgid "insanely long template name %s"
6027msgstr "太长的模版名 %s"
6028
6029#: builtin/init-db.c:67
6030#, c-format
6031msgid "cannot stat '%s'"
6032msgstr "不能枚举 '%s' 状态"
6033
6034#: builtin/init-db.c:73
6035#, c-format
6036msgid "cannot stat template '%s'"
6037msgstr "不能枚举模版 '%s' 状态"
6038
6039#: builtin/init-db.c:80
6040#, c-format
6041msgid "cannot opendir '%s'"
6042msgstr "不能打开目录 '%s'"
6043
6044#: builtin/init-db.c:97
6045#, c-format
6046msgid "cannot readlink '%s'"
6047msgstr "不能读取链接 '%s'"
6048
6049#: builtin/init-db.c:99
6050#, c-format
6051msgid "insanely long symlink %s"
6052msgstr "太长的符号链接 %s"
6053
6054#: builtin/init-db.c:102
6055#, c-format
6056msgid "cannot symlink '%s' '%s'"
6057msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6058
6059#: builtin/init-db.c:106
6060#, c-format
6061msgid "cannot copy '%s' to '%s'"
6062msgstr "不能拷贝 '%s' 至 '%s'"
6063
6064#: builtin/init-db.c:110
6065#, c-format
6066msgid "ignoring template %s"
6067msgstr "忽略模版 %s"
6068
6069#: builtin/init-db.c:133
6070#, c-format
6071msgid "insanely long template path %s"
6072msgstr "太长的模版路径 %s"
6073
6074#: builtin/init-db.c:141
6075#, c-format
6076msgid "templates not found %s"
6077msgstr "模版未找到 %s"
6078
6079#: builtin/init-db.c:154
6080#, c-format
6081msgid "not copying templates of a wrong format version %d from '%s'"
6082msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6083
6084#: builtin/init-db.c:192
6085#, c-format
6086msgid "insane git directory %s"
6087msgstr "不正常的 git 目录 %s"
6088
6089#: builtin/init-db.c:323 builtin/init-db.c:326
6090#, c-format
6091msgid "%s already exists"
6092msgstr "%s 已经存在"
6093
6094#: builtin/init-db.c:355
6095#, c-format
6096msgid "unable to handle file type %d"
6097msgstr "不能处理 %d 类型的文件"
6098
6099#: builtin/init-db.c:358
6100#, c-format
6101msgid "unable to move %s to %s"
6102msgstr "不能移动 %s 至 %s"
6103
6104#. TRANSLATORS: The first '%s' is either "Reinitialized
6105#. existing" or "Initialized empty", the second " shared" or
6106#. "", and the last '%s%s' is the verbatim directory name.
6107#: builtin/init-db.c:418
6108#, c-format
6109msgid "%s%s Git repository in %s%s\n"
6110msgstr "%s%s Git 版本库于 %s%s\n"
6111
6112#: builtin/init-db.c:419
6113msgid "Reinitialized existing"
6114msgstr "重新初始化现存的"
6115
6116#: builtin/init-db.c:419
6117msgid "Initialized empty"
6118msgstr "初始化空的"
6119
6120#  译者:中文字符串拼接,可删除前导空格
6121#: builtin/init-db.c:420
6122msgid " shared"
6123msgstr "共享"
6124
6125#: builtin/init-db.c:439
6126msgid "cannot tell cwd"
6127msgstr "无法获知当前路径"
6128
6129#: builtin/init-db.c:465
6130msgid ""
6131"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6132"shared[=<permissions>]] [directory]"
6133msgstr ""
6134"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6135"[目录]"
6136
6137#: builtin/init-db.c:488
6138msgid "permissions"
6139msgstr "权限"
6140
6141#: builtin/init-db.c:489
6142msgid "specify that the git repository is to be shared amongst several users"
6143msgstr "指定 git 版本库是多个用户之间共享的"
6144
6145#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168
6146msgid "be quiet"
6147msgstr "保持安静"
6148
6149#: builtin/init-db.c:523 builtin/init-db.c:528
6150#, c-format
6151msgid "cannot mkdir %s"
6152msgstr "不能创建目录 %s"
6153
6154#: builtin/init-db.c:532
6155#, c-format
6156msgid "cannot chdir to %s"
6157msgstr "不能切换目录到 %s"
6158
6159#: builtin/init-db.c:554
6160#, c-format
6161msgid ""
6162"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6163"dir=<directory>)"
6164msgstr ""
6165"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6166"dir=<directory>)"
6167
6168#: builtin/init-db.c:578
6169msgid "Cannot access current working directory"
6170msgstr "不能访问当前工作目录"
6171
6172#: builtin/init-db.c:585
6173#, c-format
6174msgid "Cannot access work tree '%s'"
6175msgstr "不能访问工作区 '%s'"
6176
6177#: builtin/log.c:41
6178msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6179msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
6180
6181#: builtin/log.c:42
6182msgid "   or: git show [options] <object>..."
6183msgstr "   或者:git show [选项] <对象>..."
6184
6185#: builtin/log.c:125
6186msgid "suppress diff output"
6187msgstr "不显示差异输出"
6188
6189#: builtin/log.c:126
6190msgid "show source"
6191msgstr "显示源"
6192
6193#: builtin/log.c:127
6194msgid "Use mail map file"
6195msgstr "使用邮件映射文件"
6196
6197#: builtin/log.c:128
6198msgid "decorate options"
6199msgstr "修饰选项"
6200
6201#: builtin/log.c:231
6202#, c-format
6203msgid "Final output: %d %s\n"
6204msgstr "最终输出:%d %s\n"
6205
6206#: builtin/log.c:473 builtin/log.c:565
6207#, c-format
6208msgid "Could not read object %s"
6209msgstr "不能读取对象 %s"
6210
6211#: builtin/log.c:589
6212#, c-format
6213msgid "Unknown type: %d"
6214msgstr "未知类型:%d"
6215
6216#: builtin/log.c:689
6217msgid "format.headers without value"
6218msgstr "format.headers 没有值"
6219
6220#: builtin/log.c:771
6221msgid "name of output directory is too long"
6222msgstr "输出目录名太长"
6223
6224#: builtin/log.c:787
6225#, c-format
6226msgid "Cannot open patch file %s"
6227msgstr "无法打开补丁文件 %s"
6228
6229#: builtin/log.c:801
6230msgid "Need exactly one range."
6231msgstr "只需要一个范围。"
6232
6233#: builtin/log.c:809
6234msgid "Not a range."
6235msgstr "不是一个范围。"
6236
6237#: builtin/log.c:911
6238msgid "Cover letter needs email format"
6239msgstr "信封需要邮件地址格式"
6240
6241#: builtin/log.c:987
6242#, c-format
6243msgid "insane in-reply-to: %s"
6244msgstr "不正常的 in-reply-to:%s"
6245
6246#: builtin/log.c:1015
6247msgid "git format-patch [options] [<since> | <revision range>]"
6248msgstr "git format-patch [选项] [<从> | <修订集范围>]"
6249
6250#: builtin/log.c:1060
6251msgid "Two output directories?"
6252msgstr "两个输出目录?"
6253
6254#: builtin/log.c:1175
6255msgid "use [PATCH n/m] even with a single patch"
6256msgstr "使用 [PATCH n/m],即使只有一个补丁"
6257
6258#: builtin/log.c:1178
6259msgid "use [PATCH] even with multiple patches"
6260msgstr "使用 [PATCH],即使有多个补丁"
6261
6262#: builtin/log.c:1182
6263msgid "print patches to standard out"
6264msgstr "打印补丁到标准输出"
6265
6266#: builtin/log.c:1184
6267msgid "generate a cover letter"
6268msgstr "生成一封附信"
6269
6270#: builtin/log.c:1186
6271msgid "use simple number sequence for output file names"
6272msgstr "使用简单的数字序列作为输出文件名"
6273
6274#: builtin/log.c:1187
6275msgid "sfx"
6276msgstr "后缀"
6277
6278#: builtin/log.c:1188
6279msgid "use <sfx> instead of '.patch'"
6280msgstr "使用 <后缀> 代替 '.patch'"
6281
6282#: builtin/log.c:1190
6283msgid "start numbering patches at <n> instead of 1"
6284msgstr "补丁以 <n> 开始编号,而不是1"
6285
6286#: builtin/log.c:1192
6287msgid "mark the series as Nth re-roll"
6288msgstr "标记补丁系列是第几次重制"
6289
6290#: builtin/log.c:1194
6291msgid "Use [<prefix>] instead of [PATCH]"
6292msgstr "使用 [<前缀>] 代替 [PATCH]"
6293
6294#: builtin/log.c:1197
6295msgid "store resulting files in <dir>"
6296msgstr "把结果文件存储在 <dir>"
6297
6298#: builtin/log.c:1200
6299msgid "don't strip/add [PATCH]"
6300msgstr "不删除/添加 [PATCH]"
6301
6302#: builtin/log.c:1203
6303msgid "don't output binary diffs"
6304msgstr "不输出二进制差异"
6305
6306#: builtin/log.c:1205
6307msgid "don't include a patch matching a commit upstream"
6308msgstr "不包含已在上游提交中的补丁"
6309
6310#: builtin/log.c:1207
6311msgid "show patch format instead of default (patch + stat)"
6312msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6313
6314#: builtin/log.c:1209
6315msgid "Messaging"
6316msgstr "邮件发送"
6317
6318#: builtin/log.c:1210
6319msgid "header"
6320msgstr "header"
6321
6322#: builtin/log.c:1211
6323msgid "add email header"
6324msgstr "添加邮件头"
6325
6326#: builtin/log.c:1212 builtin/log.c:1214
6327msgid "email"
6328msgstr "邮件地址"
6329
6330#: builtin/log.c:1212
6331msgid "add To: header"
6332msgstr "添加收件人"
6333
6334#: builtin/log.c:1214
6335msgid "add Cc: header"
6336msgstr "添加抄送"
6337
6338#: builtin/log.c:1216
6339msgid "ident"
6340msgstr "ident"
6341
6342#: builtin/log.c:1217
6343msgid "set From address to <ident> (or committer ident if absent)"
6344msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6345
6346#: builtin/log.c:1219
6347msgid "message-id"
6348msgstr "message-id"
6349
6350#: builtin/log.c:1220
6351msgid "make first mail a reply to <message-id>"
6352msgstr "使第一封邮件作为对 <message-id> 的回复"
6353
6354#: builtin/log.c:1221 builtin/log.c:1224
6355msgid "boundary"
6356msgstr "边界"
6357
6358#: builtin/log.c:1222
6359msgid "attach the patch"
6360msgstr "附件方式添加补丁"
6361
6362#: builtin/log.c:1225
6363msgid "inline the patch"
6364msgstr "内联显示补丁"
6365
6366#: builtin/log.c:1229
6367msgid "enable message threading, styles: shallow, deep"
6368msgstr "启用邮件线索,风格:浅,深"
6369
6370#: builtin/log.c:1231
6371msgid "signature"
6372msgstr "签名"
6373
6374#: builtin/log.c:1232
6375msgid "add a signature"
6376msgstr "添加一个签名"
6377
6378#: builtin/log.c:1233
6379msgid "don't print the patch filenames"
6380msgstr "不要打印补丁文件名"
6381
6382#: builtin/log.c:1307
6383#, c-format
6384msgid "invalid ident line: %s"
6385msgstr "包含无效的身份标识:%s"
6386
6387#: builtin/log.c:1322
6388msgid "-n and -k are mutually exclusive."
6389msgstr "-n 和 -k 互斥。"
6390
6391#: builtin/log.c:1324
6392msgid "--subject-prefix and -k are mutually exclusive."
6393msgstr "--subject-prefix 和 -k 互斥。"
6394
6395#: builtin/log.c:1332
6396msgid "--name-only does not make sense"
6397msgstr "--name-only 无意义"
6398
6399#: builtin/log.c:1334
6400msgid "--name-status does not make sense"
6401msgstr "--name-status 无意义"
6402
6403#: builtin/log.c:1336
6404msgid "--check does not make sense"
6405msgstr "--check 无意义"
6406
6407#: builtin/log.c:1359
6408msgid "standard output, or directory, which one?"
6409msgstr "标准输出或目录,哪一个?"
6410
6411#: builtin/log.c:1361
6412#, c-format
6413msgid "Could not create directory '%s'"
6414msgstr "不能创建目录 '%s'"
6415
6416#: builtin/log.c:1509
6417msgid "Failed to create output files"
6418msgstr "无法创建输出文件"
6419
6420#: builtin/log.c:1558
6421msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6422msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6423
6424#: builtin/log.c:1613
6425#, c-format
6426msgid ""
6427"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6428msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
6429
6430#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
6431#, c-format
6432msgid "Unknown commit %s"
6433msgstr "未知提交 %s"
6434
6435#: builtin/ls-files.c:401
6436msgid "git ls-files [options] [<file>...]"
6437msgstr "git ls-files [选项] [<文件>...]"
6438
6439#: builtin/ls-files.c:458
6440msgid "identify the file status with tags"
6441msgstr "用标签标识文件的状态"
6442
6443#: builtin/ls-files.c:460
6444msgid "use lowercase letters for 'assume unchanged' files"
6445msgstr "使用小写字母表示 '假设未改变的' 文件"
6446
6447#: builtin/ls-files.c:462
6448msgid "show cached files in the output (default)"
6449msgstr "显示缓存的文件(默认)"
6450
6451#: builtin/ls-files.c:464
6452msgid "show deleted files in the output"
6453msgstr "显示已删除的文件"
6454
6455#: builtin/ls-files.c:466
6456msgid "show modified files in the output"
6457msgstr "显示已修改的文件"
6458
6459#: builtin/ls-files.c:468
6460msgid "show other files in the output"
6461msgstr "显示其它文件"
6462
6463#: builtin/ls-files.c:470
6464msgid "show ignored files in the output"
6465msgstr "显示忽略的文件"
6466
6467#: builtin/ls-files.c:473
6468msgid "show staged contents' object name in the output"
6469msgstr "显示暂存区内容的对象名称"
6470
6471#: builtin/ls-files.c:475
6472msgid "show files on the filesystem that need to be removed"
6473msgstr "显示文件系统需要删除的文件"
6474
6475#: builtin/ls-files.c:477
6476msgid "show 'other' directories' name only"
6477msgstr "只显示“其他”目录的名称"
6478
6479#: builtin/ls-files.c:480
6480msgid "don't show empty directories"
6481msgstr "不显示空目录"
6482
6483#: builtin/ls-files.c:483
6484msgid "show unmerged files in the output"
6485msgstr "显示未合并的文件"
6486
6487#: builtin/ls-files.c:485
6488msgid "show resolve-undo information"
6489msgstr "显示 resolve-undo 信息"
6490
6491#: builtin/ls-files.c:487
6492msgid "skip files matching pattern"
6493msgstr "匹配排除文件的模式"
6494
6495#: builtin/ls-files.c:490
6496msgid "exclude patterns are read from <file>"
6497msgstr "从 <文件> 中读取排除模式"
6498
6499#: builtin/ls-files.c:493
6500msgid "read additional per-directory exclude patterns in <file>"
6501msgstr "从 <文件> 读取额外的每个目录的排除模式"
6502
6503#: builtin/ls-files.c:495
6504msgid "add the standard git exclusions"
6505msgstr "添加标准的 git 排除"
6506
6507#: builtin/ls-files.c:498
6508msgid "make the output relative to the project top directory"
6509msgstr "显示相对于顶级目录的文件名"
6510
6511#: builtin/ls-files.c:501
6512msgid "if any <file> is not in the index, treat this as an error"
6513msgstr "如果任何 <文件> 都不在索引区,视为错误"
6514
6515#: builtin/ls-files.c:502
6516msgid "tree-ish"
6517msgstr "树或提交"
6518
6519#: builtin/ls-files.c:503
6520msgid "pretend that paths removed since <tree-ish> are still present"
6521msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6522
6523#: builtin/ls-files.c:505
6524msgid "show debugging data"
6525msgstr "显示调试数据"
6526
6527#: builtin/ls-tree.c:28
6528msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6529msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6530
6531#: builtin/ls-tree.c:126
6532msgid "only show trees"
6533msgstr "只显示树"
6534
6535#: builtin/ls-tree.c:128
6536msgid "recurse into subtrees"
6537msgstr "递归到子树"
6538
6539#: builtin/ls-tree.c:130
6540msgid "show trees when recursing"
6541msgstr "当递归时显示树"
6542
6543#: builtin/ls-tree.c:133
6544msgid "terminate entries with NUL byte"
6545msgstr "条目以NUL字符终止"
6546
6547#: builtin/ls-tree.c:134
6548msgid "include object size"
6549msgstr "包括对象大小"
6550
6551#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6552msgid "list only filenames"
6553msgstr "只列出文件名"
6554
6555#: builtin/ls-tree.c:141
6556msgid "use full path names"
6557msgstr "使用文件的全路径"
6558
6559#: builtin/ls-tree.c:143
6560msgid "list entire tree; not just current directory (implies --full-name)"
6561msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6562
6563#: builtin/merge.c:43
6564msgid "git merge [options] [<commit>...]"
6565msgstr "git merge [选项] [<提交>...]"
6566
6567#: builtin/merge.c:44
6568msgid "git merge [options] <msg> HEAD <commit>"
6569msgstr "git merge [选项] <说明> HEAD <提交>"
6570
6571#: builtin/merge.c:45
6572msgid "git merge --abort"
6573msgstr "git merge --abort"
6574
6575#: builtin/merge.c:98
6576msgid "switch `m' requires a value"
6577msgstr "开关 `m' 需要一个值"
6578
6579#: builtin/merge.c:135
6580#, c-format
6581msgid "Could not find merge strategy '%s'.\n"
6582msgstr "不能找到合并策略 '%s'。\n"
6583
6584#: builtin/merge.c:136
6585#, c-format
6586msgid "Available strategies are:"
6587msgstr "可用的策略有:"
6588
6589#: builtin/merge.c:141
6590#, c-format
6591msgid "Available custom strategies are:"
6592msgstr "可用的自定义策略有:"
6593
6594#: builtin/merge.c:191
6595msgid "do not show a diffstat at the end of the merge"
6596msgstr "在合并的最后不显示差异统计"
6597
6598#: builtin/merge.c:194
6599msgid "show a diffstat at the end of the merge"
6600msgstr "在合并的最后显示差异统计"
6601
6602#: builtin/merge.c:195
6603msgid "(synonym to --stat)"
6604msgstr "(和 --stat 同义)"
6605
6606#: builtin/merge.c:197
6607msgid "add (at most <n>) entries from shortlog to merge commit message"
6608msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6609
6610#: builtin/merge.c:200
6611msgid "create a single commit instead of doing a merge"
6612msgstr "创建一个单独的提交而不是做一次合并"
6613
6614#: builtin/merge.c:202
6615msgid "perform a commit if the merge succeeds (default)"
6616msgstr "如果合并成功,执行一次提交(默认)"
6617
6618#: builtin/merge.c:204
6619msgid "edit message before committing"
6620msgstr "在提交前编辑提交说明"
6621
6622#: builtin/merge.c:205
6623msgid "allow fast-forward (default)"
6624msgstr "允许快进(默认)"
6625
6626#: builtin/merge.c:207
6627msgid "abort if fast-forward is not possible"
6628msgstr "如果不能快进就放弃合并"
6629
6630#: builtin/merge.c:211
6631msgid "Verify that the named commit has a valid GPG signature"
6632msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6633
6634#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
6635msgid "strategy"
6636msgstr "策略"
6637
6638#: builtin/merge.c:213
6639msgid "merge strategy to use"
6640msgstr "要使用的合并策略"
6641
6642#: builtin/merge.c:214
6643msgid "option=value"
6644msgstr "option=value"
6645
6646#: builtin/merge.c:215
6647msgid "option for selected merge strategy"
6648msgstr "所选的合并策略的选项"
6649
6650#: builtin/merge.c:217
6651msgid "merge commit message (for a non-fast-forward merge)"
6652msgstr "合并的提交说明(针对非快进式合并)"
6653
6654#: builtin/merge.c:221
6655msgid "abort the current in-progress merge"
6656msgstr "放弃当前正在进行的合并"
6657
6658#: builtin/merge.c:250
6659msgid "could not run stash."
6660msgstr "不能进行进度保存。"
6661
6662#: builtin/merge.c:255
6663msgid "stash failed"
6664msgstr "进度保存失败"
6665
6666#: builtin/merge.c:260
6667#, c-format
6668msgid "not a valid object: %s"
6669msgstr "不是一个有效对象:%s"
6670
6671#: builtin/merge.c:279 builtin/merge.c:296
6672msgid "read-tree failed"
6673msgstr "读取树失败"
6674
6675#  译者:注意保持前导空格
6676#: builtin/merge.c:326
6677msgid " (nothing to squash)"
6678msgstr " (无可压缩)"
6679
6680#: builtin/merge.c:339
6681#, c-format
6682msgid "Squash commit -- not updating HEAD\n"
6683msgstr "压缩提交 -- 未更新 HEAD\n"
6684
6685#: builtin/merge.c:371
6686msgid "Writing SQUASH_MSG"
6687msgstr "写入 SQUASH_MSG"
6688
6689#: builtin/merge.c:373
6690msgid "Finishing SQUASH_MSG"
6691msgstr "完成 SQUASH_MSG"
6692
6693#: builtin/merge.c:396
6694#, c-format
6695msgid "No merge message -- not updating HEAD\n"
6696msgstr "无合并信息 -- 未更新 HEAD\n"
6697
6698#: builtin/merge.c:446
6699#, c-format
6700msgid "'%s' does not point to a commit"
6701msgstr "'%s' 没有指向一个提交"
6702
6703#: builtin/merge.c:558
6704#, c-format
6705msgid "Bad branch.%s.mergeoptions string: %s"
6706msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6707
6708#: builtin/merge.c:653
6709msgid "git write-tree failed to write a tree"
6710msgstr "git write-tree 无法写入一树对象"
6711
6712#: builtin/merge.c:681
6713msgid "Not handling anything other than two heads merge."
6714msgstr "不能处理两个头合并之外的任何操作。"
6715
6716#: builtin/merge.c:695
6717#, c-format
6718msgid "Unknown option for merge-recursive: -X%s"
6719msgstr "merge-recursive 的未知选项:-X%s"
6720
6721#: builtin/merge.c:709
6722#, c-format
6723msgid "unable to write %s"
6724msgstr "不能写 %s"
6725
6726#: builtin/merge.c:798
6727#, c-format
6728msgid "Could not read from '%s'"
6729msgstr "不能从 '%s' 读取"
6730
6731#: builtin/merge.c:807
6732#, c-format
6733msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6734msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6735
6736#: builtin/merge.c:813
6737#, c-format
6738msgid ""
6739"Please enter a commit message to explain why this merge is necessary,\n"
6740"especially if it merges an updated upstream into a topic branch.\n"
6741"\n"
6742"Lines starting with '%c' will be ignored, and an empty message aborts\n"
6743"the commit.\n"
6744msgstr ""
6745"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6746"合并到主题分支。\n"
6747"\n"
6748"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6749
6750#: builtin/merge.c:837
6751msgid "Empty commit message."
6752msgstr "空提交信息。"
6753
6754#: builtin/merge.c:849
6755#, c-format
6756msgid "Wonderful.\n"
6757msgstr "太棒了。\n"
6758
6759#: builtin/merge.c:914
6760#, c-format
6761msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6762msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6763
6764#: builtin/merge.c:930
6765#, c-format
6766msgid "'%s' is not a commit"
6767msgstr "'%s' 不是一个提交"
6768
6769#: builtin/merge.c:971
6770msgid "No current branch."
6771msgstr "没有当前分支。"
6772
6773#: builtin/merge.c:973
6774msgid "No remote for the current branch."
6775msgstr "当前分支没有对应的远程版本库。"
6776
6777#: builtin/merge.c:975
6778msgid "No default upstream defined for the current branch."
6779msgstr "当前分支没有定义默认的上游分支。"
6780
6781#: builtin/merge.c:980
6782#, c-format
6783msgid "No remote-tracking branch for %s from %s"
6784msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
6785
6786#: builtin/merge.c:1136
6787msgid "There is no merge to abort (MERGE_HEAD missing)."
6788msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6789
6790#: builtin/merge.c:1152 git-pull.sh:31
6791msgid ""
6792"You have not concluded your merge (MERGE_HEAD exists).\n"
6793"Please, commit your changes before you can merge."
6794msgstr ""
6795"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6796"请在合并前先提交您的修改。"
6797
6798#: builtin/merge.c:1155 git-pull.sh:34
6799msgid "You have not concluded your merge (MERGE_HEAD exists)."
6800msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6801
6802#: builtin/merge.c:1159
6803msgid ""
6804"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6805"Please, commit your changes before you can merge."
6806msgstr ""
6807"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6808"请在合并前先提交您的修改。"
6809
6810#: builtin/merge.c:1162
6811msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6812msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6813
6814#: builtin/merge.c:1171
6815msgid "You cannot combine --squash with --no-ff."
6816msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6817
6818#: builtin/merge.c:1180
6819msgid "No commit specified and merge.defaultToUpstream not set."
6820msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6821
6822#: builtin/merge.c:1212
6823msgid "Can merge only exactly one commit into empty head"
6824msgstr "只能将一个提交合并到空分支上"
6825
6826#: builtin/merge.c:1215
6827msgid "Squash commit into empty head not supported yet"
6828msgstr "尚不支持到空分支的压缩提交"
6829
6830#: builtin/merge.c:1217
6831msgid "Non-fast-forward commit does not make sense into an empty head"
6832msgstr "到空分支的非快进式提交没有意义"
6833
6834#: builtin/merge.c:1222
6835#, c-format
6836msgid "%s - not something we can merge"
6837msgstr "%s - 不能被合并"
6838
6839#: builtin/merge.c:1273
6840#, c-format
6841msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6842msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6843
6844#: builtin/merge.c:1276
6845#, c-format
6846msgid "Commit %s has a bad GPG signature allegedly by %s."
6847msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6848
6849#: builtin/merge.c:1279
6850#, c-format
6851msgid "Commit %s does not have a GPG signature."
6852msgstr "提交 %s 没有一个 GPG 签名。"
6853
6854#: builtin/merge.c:1282
6855#, c-format
6856msgid "Commit %s has a good GPG signature by %s\n"
6857msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6858
6859#: builtin/merge.c:1366
6860#, c-format
6861msgid "Updating %s..%s\n"
6862msgstr "更新 %s..%s\n"
6863
6864#: builtin/merge.c:1405
6865#, c-format
6866msgid "Trying really trivial in-index merge...\n"
6867msgstr "尝试非常小的索引内合并...\n"
6868
6869#: builtin/merge.c:1412
6870#, c-format
6871msgid "Nope.\n"
6872msgstr "无。\n"
6873
6874#: builtin/merge.c:1444
6875msgid "Not possible to fast-forward, aborting."
6876msgstr "无法快进,终止。"
6877
6878#: builtin/merge.c:1467 builtin/merge.c:1546
6879#, c-format
6880msgid "Rewinding the tree to pristine...\n"
6881msgstr "将树回滚至原始状态...\n"
6882
6883#: builtin/merge.c:1471
6884#, c-format
6885msgid "Trying merge strategy %s...\n"
6886msgstr "尝试合并策略 %s...\n"
6887
6888#: builtin/merge.c:1537
6889#, c-format
6890msgid "No merge strategy handled the merge.\n"
6891msgstr "没有合并策略处理此合并。\n"
6892
6893#: builtin/merge.c:1539
6894#, c-format
6895msgid "Merge with strategy %s failed.\n"
6896msgstr "使用策略 %s 合并失败。\n"
6897
6898#: builtin/merge.c:1548
6899#, c-format
6900msgid "Using the %s to prepare resolving by hand.\n"
6901msgstr "使用 %s 以准备手工解决。\n"
6902
6903#: builtin/merge.c:1560
6904#, c-format
6905msgid "Automatic merge went well; stopped before committing as requested\n"
6906msgstr "自动合并进展顺利,按要求在提交前停止\n"
6907
6908#: builtin/merge-base.c:29
6909msgid "git merge-base [-a|--all] <commit> <commit>..."
6910msgstr "git merge-base [-a|--all] <提交> <提交>..."
6911
6912#: builtin/merge-base.c:30
6913msgid "git merge-base [-a|--all] --octopus <commit>..."
6914msgstr "git merge-base [-a|--all] --octopus <提交>..."
6915
6916#: builtin/merge-base.c:31
6917msgid "git merge-base --independent <commit>..."
6918msgstr "git merge-base --independent <提交>..."
6919
6920#: builtin/merge-base.c:32
6921msgid "git merge-base --is-ancestor <commit> <commit>"
6922msgstr "git merge-base --is-ancestor <提交> <提交>"
6923
6924#: builtin/merge-base.c:33
6925msgid "git merge-base --fork-point <ref> [<commit>]"
6926msgstr "git merge-base --fork-point <提交> [<提交>]"
6927
6928#: builtin/merge-base.c:214
6929msgid "output all common ancestors"
6930msgstr "输出所有共同的祖先"
6931
6932#: builtin/merge-base.c:216
6933msgid "find ancestors for a single n-way merge"
6934msgstr "查找一个多路合并的祖先提交"
6935
6936#: builtin/merge-base.c:218
6937msgid "list revs not reachable from others"
6938msgstr "显示不能被其他访问到的版本"
6939
6940#: builtin/merge-base.c:220
6941msgid "is the first one ancestor of the other?"
6942msgstr "第一个是其他的祖先提交么?"
6943
6944#: builtin/merge-base.c:222
6945msgid "find where <commit> forked from reflog of <ref>"
6946msgstr "查找 <commit> 从<引用>日志的何处分支的"
6947
6948#: builtin/merge-file.c:8
6949msgid ""
6950"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6951"file2"
6952msgstr ""
6953"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6954
6955#: builtin/merge-file.c:33
6956msgid "send results to standard output"
6957msgstr "将结果发送到标准输出"
6958
6959#: builtin/merge-file.c:34
6960msgid "use a diff3 based merge"
6961msgstr "使用基于 diff3 的合并"
6962
6963#: builtin/merge-file.c:35
6964msgid "for conflicts, use our version"
6965msgstr "如果冲突,使用我们的版本"
6966
6967#: builtin/merge-file.c:37
6968msgid "for conflicts, use their version"
6969msgstr "如果冲突,使用他们的版本"
6970
6971#: builtin/merge-file.c:39
6972msgid "for conflicts, use a union version"
6973msgstr "如果冲突,使用联合版本"
6974
6975#: builtin/merge-file.c:42
6976msgid "for conflicts, use this marker size"
6977msgstr "如果冲突,使用指定长度的标记"
6978
6979#: builtin/merge-file.c:43
6980msgid "do not warn about conflicts"
6981msgstr "不要警告冲突"
6982
6983#: builtin/merge-file.c:45
6984msgid "set labels for file1/orig_file/file2"
6985msgstr "为 file1/orig_file/file2 设置标签"
6986
6987#: builtin/mktree.c:64
6988msgid "git mktree [-z] [--missing] [--batch]"
6989msgstr "git mktree [-z] [--missing] [--batch]"
6990
6991#: builtin/mktree.c:150
6992msgid "input is NUL terminated"
6993msgstr "输入以 NUL 字符终止"
6994
6995#: builtin/mktree.c:151 builtin/write-tree.c:24
6996msgid "allow missing objects"
6997msgstr "允许丢失的对象"
6998
6999#: builtin/mktree.c:152
7000msgid "allow creation of more than one tree"
7001msgstr "允许创建一个以上的树"
7002
7003#: builtin/mv.c:15
7004msgid "git mv [options] <source>... <destination>"
7005msgstr "git mv [选项] <源>... <目标>"
7006
7007#: builtin/mv.c:71
7008msgid "force move/rename even if target exists"
7009msgstr "强制移动/重命令,即使目标存在"
7010
7011#: builtin/mv.c:72
7012msgid "skip move/rename errors"
7013msgstr "跳过移动/重命名错误"
7014
7015#: builtin/mv.c:122
7016#, c-format
7017msgid "Checking rename of '%s' to '%s'\n"
7018msgstr "检查 '%s' 到 '%s' 的重命名\n"
7019
7020#: builtin/mv.c:126
7021msgid "bad source"
7022msgstr "坏的源"
7023
7024#: builtin/mv.c:129
7025msgid "can not move directory into itself"
7026msgstr "不能将目录移动到自身"
7027
7028#: builtin/mv.c:132
7029msgid "cannot move directory over file"
7030msgstr "不能将目录移动到文件"
7031
7032#: builtin/mv.c:138
7033#, c-format
7034msgid "Huh? Directory %s is in index and no submodule?"
7035msgstr "嗯?目录 %s 在索引中并且不是子模组?"
7036
7037#: builtin/mv.c:140 builtin/rm.c:318
7038msgid "Please, stage your changes to .gitmodules or stash them to proceed"
7039msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7040
7041#: builtin/mv.c:156
7042#, c-format
7043msgid "Huh? %.*s is in index?"
7044msgstr "嗯?%.*s 在索引中?"
7045
7046#: builtin/mv.c:169
7047msgid "source directory is empty"
7048msgstr "源目录为空"
7049
7050#: builtin/mv.c:205
7051msgid "not under version control"
7052msgstr "不在版本控制之下"
7053
7054#: builtin/mv.c:207
7055msgid "destination exists"
7056msgstr "目标已存在"
7057
7058#: builtin/mv.c:215
7059#, c-format
7060msgid "overwriting '%s'"
7061msgstr "覆盖 '%s'"
7062
7063#: builtin/mv.c:218
7064msgid "Cannot overwrite"
7065msgstr "不能覆盖"
7066
7067#: builtin/mv.c:221
7068msgid "multiple sources for the same target"
7069msgstr "同一目标具有多个源"
7070
7071#: builtin/mv.c:223
7072msgid "destination directory does not exist"
7073msgstr "目标目录不存在"
7074
7075#: builtin/mv.c:243
7076#, c-format
7077msgid "%s, source=%s, destination=%s"
7078msgstr "%s,源=%s,目标=%s"
7079
7080#: builtin/mv.c:253
7081#, c-format
7082msgid "Renaming %s to %s\n"
7083msgstr "重命名 %s 至 %s\n"
7084
7085#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355
7086#, c-format
7087msgid "renaming '%s' failed"
7088msgstr "重命名 '%s' 失败"
7089
7090#: builtin/name-rev.c:258
7091msgid "git name-rev [options] <commit>..."
7092msgstr "git name-rev [选项] <提交>..."
7093
7094#: builtin/name-rev.c:259
7095msgid "git name-rev [options] --all"
7096msgstr "git name-rev [选项] --all"
7097
7098#: builtin/name-rev.c:260
7099msgid "git name-rev [options] --stdin"
7100msgstr "git name-rev [选项] --stdin"
7101
7102#: builtin/name-rev.c:312
7103msgid "print only names (no SHA-1)"
7104msgstr "只打印名称(无 SHA-1)"
7105
7106#: builtin/name-rev.c:313
7107msgid "only use tags to name the commits"
7108msgstr "只使用 tags 来命名提交"
7109
7110#: builtin/name-rev.c:315
7111msgid "only use refs matching <pattern>"
7112msgstr "只使用和 <模式> 相匹配的引用"
7113
7114#: builtin/name-rev.c:317
7115msgid "list all commits reachable from all refs"
7116msgstr "列出可以从所有引用访问的提交"
7117
7118#: builtin/name-rev.c:318
7119msgid "read from stdin"
7120msgstr "从标准输入读取"
7121
7122#: builtin/name-rev.c:319
7123msgid "allow to print `undefined` names (default)"
7124msgstr "允许打印 `未定义` 的名称(默认)"
7125
7126#: builtin/name-rev.c:325
7127msgid "dereference tags in the input (internal use)"
7128msgstr "反向解析输入中的 tags(内部使用)"
7129
7130#: builtin/notes.c:24
7131msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7132msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7133
7134#: builtin/notes.c:25
7135msgid ""
7136"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7137"<object>] [<object>]"
7138msgstr ""
7139"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7140"象>] [<对象>]"
7141
7142#: builtin/notes.c:26
7143msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7144msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7145
7146#: builtin/notes.c:27
7147msgid ""
7148"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7149"<object>] [<object>]"
7150msgstr ""
7151"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7152">] [<对象>]"
7153
7154#: builtin/notes.c:28
7155msgid "git notes [--ref <notes_ref>] edit [<object>]"
7156msgstr "git notes [--ref <注解引用>] edit [<对象>]"
7157
7158#: builtin/notes.c:29
7159msgid "git notes [--ref <notes_ref>] show [<object>]"
7160msgstr "git notes [--ref <注解引用>] show [<对象>]"
7161
7162#: builtin/notes.c:30
7163msgid ""
7164"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7165msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7166
7167#: builtin/notes.c:31
7168msgid "git notes merge --commit [-v | -q]"
7169msgstr "git notes merge --commit [-v | -q]"
7170
7171#: builtin/notes.c:32
7172msgid "git notes merge --abort [-v | -q]"
7173msgstr "git notes merge --abort [-v | -q]"
7174
7175#: builtin/notes.c:33
7176msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7177msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7178
7179#: builtin/notes.c:34
7180msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7181msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7182
7183#: builtin/notes.c:35
7184msgid "git notes [--ref <notes_ref>] get-ref"
7185msgstr "git notes [--ref <注解引用>] get-ref"
7186
7187#: builtin/notes.c:40
7188msgid "git notes [list [<object>]]"
7189msgstr "git notes [list [<对象>]]"
7190
7191#: builtin/notes.c:45
7192msgid "git notes add [<options>] [<object>]"
7193msgstr "git notes add [<选项>] [<对象>]"
7194
7195#: builtin/notes.c:50
7196msgid "git notes copy [<options>] <from-object> <to-object>"
7197msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7198
7199#: builtin/notes.c:51
7200msgid "git notes copy --stdin [<from-object> <to-object>]..."
7201msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7202
7203#: builtin/notes.c:56
7204msgid "git notes append [<options>] [<object>]"
7205msgstr "git notes append [<选项>] [<对象>]"
7206
7207#: builtin/notes.c:61
7208msgid "git notes edit [<object>]"
7209msgstr "git notes edit [<对象>]"
7210
7211#: builtin/notes.c:66
7212msgid "git notes show [<object>]"
7213msgstr "git notes show [<对象>]"
7214
7215#: builtin/notes.c:71
7216msgid "git notes merge [<options>] <notes_ref>"
7217msgstr "git notes merge [<选项>] <注解引用>"
7218
7219#: builtin/notes.c:72
7220msgid "git notes merge --commit [<options>]"
7221msgstr "git notes merge --commit [<选项>]"
7222
7223#: builtin/notes.c:73
7224msgid "git notes merge --abort [<options>]"
7225msgstr "git notes merge --abort [<选项>]"
7226
7227#: builtin/notes.c:78
7228msgid "git notes remove [<object>]"
7229msgstr "git notes remove [<对象>]"
7230
7231#: builtin/notes.c:83
7232msgid "git notes prune [<options>]"
7233msgstr "git notes prune [<选项>]"
7234
7235#: builtin/notes.c:88
7236msgid "git notes get-ref"
7237msgstr "git notes get-ref"
7238
7239#: builtin/notes.c:137
7240#, c-format
7241msgid "unable to start 'show' for object '%s'"
7242msgstr "不能为对象 '%s' 开始 'show'"
7243
7244#: builtin/notes.c:141
7245msgid "could not read 'show' output"
7246msgstr "不能读取 'show' 的输出"
7247
7248#: builtin/notes.c:149
7249#, c-format
7250msgid "failed to finish 'show' for object '%s'"
7251msgstr "无法为对象 '%s' 完成 'show'"
7252
7253#: builtin/notes.c:167 builtin/tag.c:373
7254#, c-format
7255msgid "could not create file '%s'"
7256msgstr "不能创建文件 '%s'"
7257
7258#: builtin/notes.c:186
7259msgid "Please supply the note contents using either -m or -F option"
7260msgstr "请通过 -m 或 -F 选项为注解提供内容"
7261
7262#: builtin/notes.c:207 builtin/notes.c:848
7263#, c-format
7264msgid "Removing note for object %s\n"
7265msgstr "删除对象 %s 的注解\n"
7266
7267#: builtin/notes.c:212
7268msgid "unable to write note object"
7269msgstr "不能写注解对象"
7270
7271#: builtin/notes.c:214
7272#, c-format
7273msgid "The note contents has been left in %s"
7274msgstr "注解内容被留在文件 %s 中"
7275
7276#: builtin/notes.c:248 builtin/tag.c:604
7277#, c-format
7278msgid "cannot read '%s'"
7279msgstr "不能读取 '%s'"
7280
7281#: builtin/notes.c:250 builtin/tag.c:607
7282#, c-format
7283msgid "could not open or read '%s'"
7284msgstr "不能打开或读取 '%s'"
7285
7286#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
7287#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
7288#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
7289#: builtin/notes.c:843 builtin/tag.c:620
7290#, c-format
7291msgid "Failed to resolve '%s' as a valid ref."
7292msgstr "无法解析 '%s' 为一个有效引用。"
7293
7294#: builtin/notes.c:272
7295#, c-format
7296msgid "Failed to read object '%s'."
7297msgstr "无法读取对象 '%s'。"
7298
7299#: builtin/notes.c:276
7300#, c-format
7301msgid "Cannot read note data from non-blob object '%s'."
7302msgstr "不能从非数据对象 '%s' 中读取注解数据"
7303
7304#: builtin/notes.c:316
7305#, c-format
7306msgid "Malformed input line: '%s'."
7307msgstr "非法的输入行:'%s'。"
7308
7309#: builtin/notes.c:331
7310#, c-format
7311msgid "Failed to copy notes from '%s' to '%s'"
7312msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7313
7314#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
7315#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
7316#: builtin/notes.c:908
7317msgid "too many parameters"
7318msgstr "参数太多"
7319
7320#: builtin/notes.c:388 builtin/notes.c:647
7321#, c-format
7322msgid "No note found for object %s."
7323msgstr "未发现对象 %s 的注解。"
7324
7325#: builtin/notes.c:410 builtin/notes.c:567
7326msgid "note contents as a string"
7327msgstr "注解内容作为一个字符串"
7328
7329#: builtin/notes.c:413 builtin/notes.c:570
7330msgid "note contents in a file"
7331msgstr "注解内容到一个文件中"
7332
7333#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
7334#: builtin/notes.c:575 builtin/tag.c:539
7335msgid "object"
7336msgstr "对象"
7337
7338#: builtin/notes.c:416 builtin/notes.c:573
7339msgid "reuse and edit specified note object"
7340msgstr "重用和编辑指定的注解对象"
7341
7342#: builtin/notes.c:419 builtin/notes.c:576
7343msgid "reuse specified note object"
7344msgstr "重用指定的注解对象"
7345
7346#: builtin/notes.c:421 builtin/notes.c:489
7347msgid "replace existing notes"
7348msgstr "替换已存在的注解"
7349
7350#: builtin/notes.c:455
7351#, c-format
7352msgid ""
7353"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7354"existing notes"
7355msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7356
7357#: builtin/notes.c:460 builtin/notes.c:537
7358#, c-format
7359msgid "Overwriting existing notes for object %s\n"
7360msgstr "覆盖对象 %s 现存注解\n"
7361
7362#: builtin/notes.c:490
7363msgid "read objects from stdin"
7364msgstr "从标准输入读取对象"
7365
7366#: builtin/notes.c:492
7367msgid "load rewriting config for <command> (implies --stdin)"
7368msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7369
7370#: builtin/notes.c:510
7371msgid "too few parameters"
7372msgstr "参数太少"
7373
7374#: builtin/notes.c:531
7375#, c-format
7376msgid ""
7377"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7378"existing notes"
7379msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7380
7381#: builtin/notes.c:543
7382#, c-format
7383msgid "Missing notes on source object %s. Cannot copy."
7384msgstr "源对象 %s 缺少注解。不能拷贝。"
7385
7386#: builtin/notes.c:592
7387#, c-format
7388msgid ""
7389"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7390"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7391msgstr ""
7392"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7393"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7394
7395#: builtin/notes.c:739
7396msgid "General options"
7397msgstr "通用选项"
7398
7399#: builtin/notes.c:741
7400msgid "Merge options"
7401msgstr "合并选项"
7402
7403#: builtin/notes.c:743
7404msgid ""
7405"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7406"cat_sort_uniq)"
7407msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7408
7409#: builtin/notes.c:745
7410msgid "Committing unmerged notes"
7411msgstr "提交未合并的注解"
7412
7413#: builtin/notes.c:747
7414msgid "finalize notes merge by committing unmerged notes"
7415msgstr "通过提交未合并的注解来完成注解合并"
7416
7417#: builtin/notes.c:749
7418msgid "Aborting notes merge resolution"
7419msgstr "中止注解合并的方案"
7420
7421#: builtin/notes.c:751
7422msgid "abort notes merge"
7423msgstr "中止注解合并"
7424
7425#: builtin/notes.c:846
7426#, c-format
7427msgid "Object %s has no note\n"
7428msgstr "对象 %s 没有注解\n"
7429
7430#: builtin/notes.c:858
7431msgid "attempt to remove non-existent note is not an error"
7432msgstr "尝试删除不存在的注解不是一个错误"
7433
7434#: builtin/notes.c:861
7435msgid "read object names from the standard input"
7436msgstr "从标准输入读取对象名称"
7437
7438#: builtin/notes.c:942
7439msgid "notes-ref"
7440msgstr "注解引用"
7441
7442#: builtin/notes.c:943
7443msgid "use notes from <notes_ref>"
7444msgstr "从 <注解引用> 使用注解"
7445
7446#: builtin/notes.c:978 builtin/remote.c:1593
7447#, c-format
7448msgid "Unknown subcommand: %s"
7449msgstr "未知子命令:%s"
7450
7451#: builtin/pack-objects.c:25
7452msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7453msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7454
7455#: builtin/pack-objects.c:26
7456msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7457msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7458
7459#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7460#, c-format
7461msgid "deflate error (%d)"
7462msgstr "压缩错误 (%d)"
7463
7464#: builtin/pack-objects.c:771
7465msgid "Writing objects"
7466msgstr "写入对象中"
7467
7468#: builtin/pack-objects.c:1012
7469msgid "disabling bitmap writing, as some objects are not being packed"
7470msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7471
7472#: builtin/pack-objects.c:2174
7473msgid "Compressing objects"
7474msgstr "压缩对象中"
7475
7476#: builtin/pack-objects.c:2530
7477#, c-format
7478msgid "unsupported index version %s"
7479msgstr "不支持的索引版本 %s"
7480
7481#: builtin/pack-objects.c:2534
7482#, c-format
7483msgid "bad index version '%s'"
7484msgstr "坏的索引版本 '%s'"
7485
7486#: builtin/pack-objects.c:2557
7487#, c-format
7488msgid "option %s does not accept negative form"
7489msgstr "选项 %s 不接受否定格式"
7490
7491#: builtin/pack-objects.c:2561
7492#, c-format
7493msgid "unable to parse value '%s' for option %s"
7494msgstr "不能解析选项 %1$s 的值 '%2$s'"
7495
7496#: builtin/pack-objects.c:2580
7497msgid "do not show progress meter"
7498msgstr "不显示进度表"
7499
7500#: builtin/pack-objects.c:2582
7501msgid "show progress meter"
7502msgstr "显示进度表"
7503
7504#: builtin/pack-objects.c:2584
7505msgid "show progress meter during object writing phase"
7506msgstr "在对象写入阶段显示进度表"
7507
7508#: builtin/pack-objects.c:2587
7509msgid "similar to --all-progress when progress meter is shown"
7510msgstr "当进度表显示时类似于 --all-progress"
7511
7512#: builtin/pack-objects.c:2588
7513msgid "version[,offset]"
7514msgstr "版本[,偏移]"
7515
7516#: builtin/pack-objects.c:2589
7517msgid "write the pack index file in the specified idx format version"
7518msgstr "用指定的 idx 格式版本来写包索引文件"
7519
7520#: builtin/pack-objects.c:2592
7521msgid "maximum size of each output pack file"
7522msgstr "每个输出包的最大尺寸"
7523
7524#: builtin/pack-objects.c:2594
7525msgid "ignore borrowed objects from alternate object store"
7526msgstr "忽略从替代对象存储里借用对象"
7527
7528#: builtin/pack-objects.c:2596
7529msgid "ignore packed objects"
7530msgstr "忽略包对象"
7531
7532#: builtin/pack-objects.c:2598
7533msgid "limit pack window by objects"
7534msgstr "限制打包窗口的对象数"
7535
7536#: builtin/pack-objects.c:2600
7537msgid "limit pack window by memory in addition to object limit"
7538msgstr "除对象数量限制外设置打包窗口的内存限制"
7539
7540#: builtin/pack-objects.c:2602
7541msgid "maximum length of delta chain allowed in the resulting pack"
7542msgstr "打包允许的 delta 链的最大长度"
7543
7544#: builtin/pack-objects.c:2604
7545msgid "reuse existing deltas"
7546msgstr "重用已存在的 deltas"
7547
7548#: builtin/pack-objects.c:2606
7549msgid "reuse existing objects"
7550msgstr "重用已存在的对象"
7551
7552#: builtin/pack-objects.c:2608
7553msgid "use OFS_DELTA objects"
7554msgstr "使用 OFS_DELTA 对象"
7555
7556#: builtin/pack-objects.c:2610
7557msgid "use threads when searching for best delta matches"
7558msgstr "使用线程查询最佳 delta 匹配"
7559
7560#: builtin/pack-objects.c:2612
7561msgid "do not create an empty pack output"
7562msgstr "不创建空的包输出"
7563
7564#: builtin/pack-objects.c:2614
7565msgid "read revision arguments from standard input"
7566msgstr "从标准输入读取修订号参数"
7567
7568#: builtin/pack-objects.c:2616
7569msgid "limit the objects to those that are not yet packed"
7570msgstr "限制那些尚未打包的对象"
7571
7572#: builtin/pack-objects.c:2619
7573msgid "include objects reachable from any reference"
7574msgstr "包括可以从任何引用访问到的对象"
7575
7576#: builtin/pack-objects.c:2622
7577msgid "include objects referred by reflog entries"
7578msgstr "包括被引用日志引用到的对象"
7579
7580#: builtin/pack-objects.c:2625
7581msgid "output pack to stdout"
7582msgstr "输出包到标准输出"
7583
7584#: builtin/pack-objects.c:2627
7585msgid "include tag objects that refer to objects to be packed"
7586msgstr "包括引用了打包对象的 tag"
7587
7588#: builtin/pack-objects.c:2629
7589msgid "keep unreachable objects"
7590msgstr "维持不可达的对象"
7591
7592#: builtin/pack-objects.c:2630 parse-options.h:140
7593msgid "time"
7594msgstr "时间"
7595
7596#: builtin/pack-objects.c:2631
7597msgid "unpack unreachable objects newer than <time>"
7598msgstr "将比给定 <时间> 新的无法访问的对象解包"
7599
7600#: builtin/pack-objects.c:2634
7601msgid "create thin packs"
7602msgstr "创建精简包"
7603
7604#: builtin/pack-objects.c:2636
7605msgid "ignore packs that have companion .keep file"
7606msgstr "忽略配有 .keep 文件的包"
7607
7608#: builtin/pack-objects.c:2638
7609msgid "pack compression level"
7610msgstr "打包压缩级别"
7611
7612#: builtin/pack-objects.c:2640
7613msgid "do not hide commits by grafts"
7614msgstr "显示被嫁接隐藏的提交"
7615
7616#: builtin/pack-objects.c:2642
7617msgid "use a bitmap index if available to speed up counting objects"
7618msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7619
7620#: builtin/pack-objects.c:2644
7621msgid "write a bitmap index together with the pack index"
7622msgstr "在建立包索引的同时创建 bitmap 索引"
7623
7624#: builtin/pack-objects.c:2723
7625msgid "Counting objects"
7626msgstr "对象计数中"
7627
7628#: builtin/pack-refs.c:6
7629msgid "git pack-refs [options]"
7630msgstr "git pack-refs [选项]"
7631
7632#: builtin/pack-refs.c:14
7633msgid "pack everything"
7634msgstr "打包一切"
7635
7636#: builtin/pack-refs.c:15
7637msgid "prune loose refs (default)"
7638msgstr "清除松散的引用(默认)"
7639
7640#: builtin/prune-packed.c:7
7641msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7642msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7643
7644#: builtin/prune-packed.c:49
7645msgid "Removing duplicate objects"
7646msgstr "正在删除重复对象"
7647
7648#: builtin/prune.c:12
7649msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7650msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7651
7652#: builtin/prune.c:142
7653msgid "do not remove, show only"
7654msgstr "不删除,只显示"
7655
7656#: builtin/prune.c:143
7657msgid "report pruned objects"
7658msgstr "报告清除的对象"
7659
7660#: builtin/prune.c:146
7661msgid "expire objects older than <time>"
7662msgstr "使早于给定时间的对象过期"
7663
7664#: builtin/push.c:14
7665msgid "git push [<options>] [<repository> [<refspec>...]]"
7666msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7667
7668#: builtin/push.c:85
7669msgid "tag shorthand without <tag>"
7670msgstr "tag 简写没有跟 <tag> 参数"
7671
7672#: builtin/push.c:95
7673msgid "--delete only accepts plain target ref names"
7674msgstr "--delete 只接受简单的目标引用名"
7675
7676#: builtin/push.c:140
7677msgid ""
7678"\n"
7679"To choose either option permanently, see push.default in 'git help config'."
7680msgstr ""
7681"\n"
7682"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7683
7684#: builtin/push.c:143
7685#, c-format
7686msgid ""
7687"The upstream branch of your current branch does not match\n"
7688"the name of your current branch.  To push to the upstream branch\n"
7689"on the remote, use\n"
7690"\n"
7691"    git push %s HEAD:%s\n"
7692"\n"
7693"To push to the branch of the same name on the remote, use\n"
7694"\n"
7695"    git push %s %s\n"
7696"%s"
7697msgstr ""
7698"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7699"上游分支,使用\n"
7700"\n"
7701"    git push %s HEAD:%s\n"
7702"\n"
7703"为推送至远程同名分支,使用\n"
7704"\n"
7705"    git push %s %s\n"
7706"%s"
7707
7708#: builtin/push.c:158
7709#, c-format
7710msgid ""
7711"You are not currently on a branch.\n"
7712"To push the history leading to the current (detached HEAD)\n"
7713"state now, use\n"
7714"\n"
7715"    git push %s HEAD:<name-of-remote-branch>\n"
7716msgstr ""
7717"您当前不在一个分支上。\n"
7718"现在为推送当前(分离头指针)的历史,使用\n"
7719"\n"
7720"    git push %s HEAD:<name-of-remote-branch>\n"
7721
7722#: builtin/push.c:172
7723#, c-format
7724msgid ""
7725"The current branch %s has no upstream branch.\n"
7726"To push the current branch and set the remote as upstream, use\n"
7727"\n"
7728"    git push --set-upstream %s %s\n"
7729msgstr ""
7730"当前分支 %s 没有对应的上游分支。\n"
7731"为推送当前分支并建立与远程上游的跟踪,使用\n"
7732"\n"
7733"    git push --set-upstream %s %s\n"
7734
7735#: builtin/push.c:180
7736#, c-format
7737msgid "The current branch %s has multiple upstream branches, refusing to push."
7738msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7739
7740#: builtin/push.c:183
7741#, c-format
7742msgid ""
7743"You are pushing to remote '%s', which is not the upstream of\n"
7744"your current branch '%s', without telling me what to push\n"
7745"to update which remote branch."
7746msgstr ""
7747"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7748"而没有告诉我要推送什么、更新哪个远程分支。"
7749
7750#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7751#: builtin/push.c:206
7752msgid ""
7753"push.default is unset; its implicit value has changed in\n"
7754"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7755"and maintain the traditional behavior, use:\n"
7756"\n"
7757"  git config --global push.default matching\n"
7758"\n"
7759"To squelch this message and adopt the new behavior now, use:\n"
7760"\n"
7761"  git config --global push.default simple\n"
7762"\n"
7763"When push.default is set to 'matching', git will push local branches\n"
7764"to the remote branches that already exist with the same name.\n"
7765"\n"
7766"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
7767"behavior, which only pushes the current branch to the corresponding\n"
7768"remote branch that 'git pull' uses to update the current branch.\n"
7769"\n"
7770"See 'git help config' and search for 'push.default' for further "
7771"information.\n"
7772"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7773"'current' instead of 'simple' if you sometimes use older versions of Git)"
7774msgstr ""
7775"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
7776"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
7777"\n"
7778"  git config --global push.default matching\n"
7779"\n"
7780"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7781"\n"
7782"  git config --global push.default simple\n"
7783"\n"
7784"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
7785"本地分支。\n"
7786"\n"
7787"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
7788"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
7789"\n"
7790"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7791"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7792"为保持兼容,请用 'current' 代替 'simple')"
7793
7794#: builtin/push.c:273
7795msgid ""
7796"You didn't specify any refspecs to push, and push.default is \"nothing\"."
7797msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
7798
7799#: builtin/push.c:280
7800msgid ""
7801"Updates were rejected because the tip of your current branch is behind\n"
7802"its remote counterpart. Integrate the remote changes (e.g.\n"
7803"'git pull ...') before pushing again.\n"
7804"See the 'Note about fast-forwards' in 'git push --help' for details."
7805msgstr ""
7806"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7807"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
7808"'git push --help' 中的 'Note about fast-forwards' 小节。"
7809
7810#: builtin/push.c:286
7811msgid ""
7812"Updates were rejected because a pushed branch tip is behind its remote\n"
7813"counterpart. Check out this branch and integrate the remote changes\n"
7814"(e.g. 'git pull ...') before pushing again.\n"
7815"See the 'Note about fast-forwards' in 'git push --help' for details."
7816msgstr ""
7817"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7818"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
7819"'git push --help' 中的 'Note about fast-forwards' 小节。"
7820
7821#: builtin/push.c:292
7822msgid ""
7823"Updates were rejected because the remote contains work that you do\n"
7824"not have locally. This is usually caused by another repository pushing\n"
7825"to the same ref. You may want to first integrate the remote changes\n"
7826"(e.g., 'git pull ...') before pushing again.\n"
7827"See the 'Note about fast-forwards' in 'git push --help' for details."
7828msgstr ""
7829"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7830"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7831"(如 'git pull ...')。\n"
7832"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7833
7834#: builtin/push.c:299
7835msgid "Updates were rejected because the tag already exists in the remote."
7836msgstr "更新被拒绝因为 tag 在远程已经存在。"
7837
7838#: builtin/push.c:302
7839msgid ""
7840"You cannot update a remote ref that points at a non-commit object,\n"
7841"or update a remote ref to make it point at a non-commit object,\n"
7842"without using the '--force' option.\n"
7843msgstr ""
7844"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7845"也不能更新远程引用让其指向一个非提交对象。\n"
7846
7847#: builtin/push.c:361
7848#, c-format
7849msgid "Pushing to %s\n"
7850msgstr "推送到 %s\n"
7851
7852#: builtin/push.c:365
7853#, c-format
7854msgid "failed to push some refs to '%s'"
7855msgstr "无法推送一些引用到 '%s'"
7856
7857#: builtin/push.c:395
7858#, c-format
7859msgid "bad repository '%s'"
7860msgstr "坏的版本库 '%s'"
7861
7862#: builtin/push.c:396
7863msgid ""
7864"No configured push destination.\n"
7865"Either specify the URL from the command-line or configure a remote "
7866"repository using\n"
7867"\n"
7868"    git remote add <name> <url>\n"
7869"\n"
7870"and then push using the remote name\n"
7871"\n"
7872"    git push <name>\n"
7873msgstr ""
7874"没有配置推送目标。\n"
7875"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7876"\n"
7877"    git remote add <name> <url>\n"
7878"\n"
7879"然后使用该远程版本库名执行推送\n"
7880"\n"
7881"    git push <name>\n"
7882
7883#: builtin/push.c:411
7884msgid "--all and --tags are incompatible"
7885msgstr "--all 和 --tags 不兼容"
7886
7887#: builtin/push.c:412
7888msgid "--all can't be combined with refspecs"
7889msgstr "--all 不能和引用规则同时使用"
7890
7891#: builtin/push.c:417
7892msgid "--mirror and --tags are incompatible"
7893msgstr "--mirror 和 --tags 不兼容"
7894
7895#: builtin/push.c:418
7896msgid "--mirror can't be combined with refspecs"
7897msgstr "--mirror 不能和引用规则同时使用"
7898
7899#: builtin/push.c:423
7900msgid "--all and --mirror are incompatible"
7901msgstr "--all 和 --mirror 不兼容"
7902
7903#: builtin/push.c:483
7904msgid "repository"
7905msgstr "版本库"
7906
7907#: builtin/push.c:484
7908msgid "push all refs"
7909msgstr "推送所有引用"
7910
7911#: builtin/push.c:485
7912msgid "mirror all refs"
7913msgstr "镜像所有引用"
7914
7915#: builtin/push.c:487
7916msgid "delete refs"
7917msgstr "删除引用"
7918
7919#: builtin/push.c:488
7920msgid "push tags (can't be used with --all or --mirror)"
7921msgstr "推送 tags(不能使用 --all or --mirror)"
7922
7923#: builtin/push.c:491
7924msgid "force updates"
7925msgstr "强制更新"
7926
7927#: builtin/push.c:493
7928msgid "refname>:<expect"
7929msgstr "引用名>:<期望值"
7930
7931#: builtin/push.c:494
7932msgid "require old value of ref to be at this value"
7933msgstr "要求引用旧的取值为设定值"
7934
7935#: builtin/push.c:496
7936msgid "check"
7937msgstr "检查"
7938
7939#: builtin/push.c:497
7940msgid "control recursive pushing of submodules"
7941msgstr "控制子模组的递归推送"
7942
7943#: builtin/push.c:499
7944msgid "use thin pack"
7945msgstr "使用精简打包"
7946
7947#: builtin/push.c:500 builtin/push.c:501
7948msgid "receive pack program"
7949msgstr "接收包程序"
7950
7951#: builtin/push.c:502
7952msgid "set upstream for git pull/status"
7953msgstr "设置 git pull/status 的上游"
7954
7955#: builtin/push.c:505
7956msgid "prune locally removed refs"
7957msgstr "清除本地删除的引用"
7958
7959#: builtin/push.c:507
7960msgid "bypass pre-push hook"
7961msgstr "绕过 pre-push 钩子"
7962
7963#: builtin/push.c:508
7964msgid "push missing but relevant tags"
7965msgstr "推送缺失的有关的 tags"
7966
7967#: builtin/push.c:518
7968msgid "--delete is incompatible with --all, --mirror and --tags"
7969msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7970
7971#: builtin/push.c:520
7972msgid "--delete doesn't make sense without any refs"
7973msgstr "--delete 未接任何引用没有意义"
7974
7975#: builtin/read-tree.c:36
7976msgid ""
7977"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7978"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7979"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7980msgstr ""
7981"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7982"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7983"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7984
7985#: builtin/read-tree.c:109
7986msgid "write resulting index to <file>"
7987msgstr "将索引结果写入 <file>"
7988
7989#: builtin/read-tree.c:112
7990msgid "only empty the index"
7991msgstr "只是清空索引"
7992
7993#: builtin/read-tree.c:114
7994msgid "Merging"
7995msgstr "合并"
7996
7997#: builtin/read-tree.c:116
7998msgid "perform a merge in addition to a read"
7999msgstr "读取之余再执行一个合并"
8000
8001#: builtin/read-tree.c:118
8002msgid "3-way merge if no file level merging required"
8003msgstr "如果没有文件级合并需要,执行三路合并"
8004
8005#: builtin/read-tree.c:120
8006msgid "3-way merge in presence of adds and removes"
8007msgstr "存在添加和删除时,也执行三路合并"
8008
8009#: builtin/read-tree.c:122
8010msgid "same as -m, but discard unmerged entries"
8011msgstr "类似于 -m,但丢弃未合并的条目"
8012
8013#: builtin/read-tree.c:123
8014msgid "<subdirectory>/"
8015msgstr "<子目录>/"
8016
8017#: builtin/read-tree.c:124
8018msgid "read the tree into the index under <subdirectory>/"
8019msgstr "读取树对象到索引的 <子目录>/ 下"
8020
8021#: builtin/read-tree.c:127
8022msgid "update working tree with merge result"
8023msgstr "用合并的结果更新工作区"
8024
8025#: builtin/read-tree.c:129
8026msgid "gitignore"
8027msgstr "gitignore"
8028
8029#: builtin/read-tree.c:130
8030msgid "allow explicitly ignored files to be overwritten"
8031msgstr "允许忽略文件中设定的文件可以被覆盖"
8032
8033#: builtin/read-tree.c:133
8034msgid "don't check the working tree after merging"
8035msgstr "合并后不检查工作区"
8036
8037#: builtin/read-tree.c:134
8038msgid "don't update the index or the work tree"
8039msgstr "不更新索引区和工作区"
8040
8041#: builtin/read-tree.c:136
8042msgid "skip applying sparse checkout filter"
8043msgstr "跳过应用稀疏检出过滤器"
8044
8045#: builtin/read-tree.c:138
8046msgid "debug unpack-trees"
8047msgstr "调试 unpack-trees"
8048
8049#: builtin/reflog.c:499
8050#, c-format
8051msgid "%s' for '%s' is not a valid timestamp"
8052msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8053
8054#: builtin/reflog.c:615 builtin/reflog.c:620
8055#, c-format
8056msgid "'%s' is not a valid timestamp"
8057msgstr "'%s' 不是一个有效的时间戳"
8058
8059#: builtin/remote.c:12
8060msgid "git remote [-v | --verbose]"
8061msgstr "git remote [-v | --verbose]"
8062
8063#: builtin/remote.c:13
8064msgid ""
8065"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8066"mirror=<fetch|push>] <name> <url>"
8067msgstr ""
8068"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8069"mirror=<fetch|push>] <名称> <url>"
8070
8071#: builtin/remote.c:14 builtin/remote.c:33
8072msgid "git remote rename <old> <new>"
8073msgstr "git remote rename <旧名称> <新名称>"
8074
8075#: builtin/remote.c:15 builtin/remote.c:38
8076msgid "git remote remove <name>"
8077msgstr "git remote remove <名称>"
8078
8079#: builtin/remote.c:16
8080msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8081msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8082
8083#: builtin/remote.c:17
8084msgid "git remote [-v | --verbose] show [-n] <name>"
8085msgstr "git remote [-v | --verbose] show [-n] <名称>"
8086
8087#: builtin/remote.c:18
8088msgid "git remote prune [-n | --dry-run] <name>"
8089msgstr "git remote prune [-n | --dry-run] <名称>"
8090
8091#: builtin/remote.c:19
8092msgid ""
8093"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8094msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8095
8096#: builtin/remote.c:20
8097msgid "git remote set-branches [--add] <name> <branch>..."
8098msgstr "git remote set-branches [--add] <名称> <分支>..."
8099
8100#: builtin/remote.c:21 builtin/remote.c:69
8101msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8102msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8103
8104#: builtin/remote.c:22 builtin/remote.c:70
8105msgid "git remote set-url --add <name> <newurl>"
8106msgstr "git remote set-url --add <名称> <新的地址>"
8107
8108#: builtin/remote.c:23 builtin/remote.c:71
8109msgid "git remote set-url --delete <name> <url>"
8110msgstr "git remote set-url --delete <名称> <地址>"
8111
8112#: builtin/remote.c:28
8113msgid "git remote add [<options>] <name> <url>"
8114msgstr "git remote add [<选项>] <名称> <地址>"
8115
8116#: builtin/remote.c:43
8117msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8118msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8119
8120#: builtin/remote.c:48
8121msgid "git remote set-branches <name> <branch>..."
8122msgstr "git remote set-branches <名称> <分支>..."
8123
8124#: builtin/remote.c:49
8125msgid "git remote set-branches --add <name> <branch>..."
8126msgstr "git remote set-branches --add <名称> <分支>..."
8127
8128#: builtin/remote.c:54
8129msgid "git remote show [<options>] <name>"
8130msgstr "git remote show [<选项>] <名称>"
8131
8132#: builtin/remote.c:59
8133msgid "git remote prune [<options>] <name>"
8134msgstr "git remote prune [<选项>] <名称>"
8135
8136#: builtin/remote.c:64
8137msgid "git remote update [<options>] [<group> | <remote>]..."
8138msgstr "git remote update [<选项>] [<组> | <远程>]..."
8139
8140#: builtin/remote.c:88
8141#, c-format
8142msgid "Updating %s"
8143msgstr "更新 %s 中"
8144
8145#: builtin/remote.c:120
8146msgid ""
8147"--mirror is dangerous and deprecated; please\n"
8148"\t use --mirror=fetch or --mirror=push instead"
8149msgstr ""
8150"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8151"\t 或 --mirror=push"
8152
8153#: builtin/remote.c:137
8154#, c-format
8155msgid "unknown mirror argument: %s"
8156msgstr "未知的镜像参数:%s"
8157
8158#: builtin/remote.c:153
8159msgid "fetch the remote branches"
8160msgstr "抓取远程的分支"
8161
8162#: builtin/remote.c:155
8163msgid "import all tags and associated objects when fetching"
8164msgstr "抓取时导入所有的 tags 和关联对象"
8165
8166#: builtin/remote.c:158
8167msgid "or do not fetch any tag at all (--no-tags)"
8168msgstr "或不抓取任何 tag(--no-tags)"
8169
8170#: builtin/remote.c:160
8171msgid "branch(es) to track"
8172msgstr "跟踪的分支"
8173
8174#: builtin/remote.c:161
8175msgid "master branch"
8176msgstr "主线分支"
8177
8178#: builtin/remote.c:162
8179msgid "push|fetch"
8180msgstr "push|fetch"
8181
8182#: builtin/remote.c:163
8183msgid "set up remote as a mirror to push to or fetch from"
8184msgstr "把远程设置为用以推送或抓取的镜像"
8185
8186#: builtin/remote.c:175
8187msgid "specifying a master branch makes no sense with --mirror"
8188msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8189
8190#: builtin/remote.c:177
8191msgid "specifying branches to track makes sense only with fetch mirrors"
8192msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8193
8194#: builtin/remote.c:185 builtin/remote.c:641
8195#, c-format
8196msgid "remote %s already exists."
8197msgstr "远程 %s 已经存在。"
8198
8199#: builtin/remote.c:189 builtin/remote.c:645
8200#, c-format
8201msgid "'%s' is not a valid remote name"
8202msgstr "'%s' 不是一个有效的远程名称"
8203
8204#: builtin/remote.c:233
8205#, c-format
8206msgid "Could not setup master '%s'"
8207msgstr "无法设置 master '%s'"
8208
8209#: builtin/remote.c:289
8210#, c-format
8211msgid "more than one %s"
8212msgstr "多于一个 %s"
8213
8214#: builtin/remote.c:334
8215#, c-format
8216msgid "Could not get fetch map for refspec %s"
8217msgstr "无法得到引用规则 %s 的获取列表"
8218
8219#: builtin/remote.c:435 builtin/remote.c:443
8220msgid "(matching)"
8221msgstr "(匹配)"
8222
8223#: builtin/remote.c:447
8224msgid "(delete)"
8225msgstr "(删除)"
8226
8227#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
8228#, c-format
8229msgid "Could not append '%s' to '%s'"
8230msgstr "不能添加 '%s' 至 '%s'"
8231
8232#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
8233#, c-format
8234msgid "No such remote: %s"
8235msgstr "没有这样的远程:%s"
8236
8237#: builtin/remote.c:651
8238#, c-format
8239msgid "Could not rename config section '%s' to '%s'"
8240msgstr "不能重命名配置小节 '%s' 到 '%s'"
8241
8242#: builtin/remote.c:657 builtin/remote.c:794
8243#, c-format
8244msgid "Could not remove config section '%s'"
8245msgstr "不能移除配置小节 '%s'"
8246
8247#: builtin/remote.c:672
8248#, c-format
8249msgid ""
8250"Not updating non-default fetch refspec\n"
8251"\t%s\n"
8252"\tPlease update the configuration manually if necessary."
8253msgstr ""
8254"没有更新非默认的获取引用规则\n"
8255"\t%s\n"
8256"\t如果必要请手动更新配置。"
8257
8258#: builtin/remote.c:678
8259#, c-format
8260msgid "Could not append '%s'"
8261msgstr "不能追加 '%s'"
8262
8263#: builtin/remote.c:689
8264#, c-format
8265msgid "Could not set '%s'"
8266msgstr "不能设置 '%s'"
8267
8268#: builtin/remote.c:711
8269#, c-format
8270msgid "deleting '%s' failed"
8271msgstr "删除 '%s' 失败"
8272
8273#: builtin/remote.c:745
8274#, c-format
8275msgid "creating '%s' failed"
8276msgstr "创建 '%s' 失败"
8277
8278#: builtin/remote.c:759
8279#, c-format
8280msgid "Could not remove branch %s"
8281msgstr "无法移除分支 %s"
8282
8283#: builtin/remote.c:829
8284msgid ""
8285"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8286"to delete it, use:"
8287msgid_plural ""
8288"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8289"to delete them, use:"
8290msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8291msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8292
8293#: builtin/remote.c:938
8294#, c-format
8295msgid " new (next fetch will store in remotes/%s)"
8296msgstr " 新的(下一次获取将存储于 remotes/%s)"
8297
8298#: builtin/remote.c:941
8299msgid " tracked"
8300msgstr " 已跟踪"
8301
8302#: builtin/remote.c:943
8303msgid " stale (use 'git remote prune' to remove)"
8304msgstr " 过时(使用 'git remote prune' 来移除)"
8305
8306#: builtin/remote.c:945
8307msgid " ???"
8308msgstr " ???"
8309
8310#: builtin/remote.c:986
8311#, c-format
8312msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8313msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8314
8315#: builtin/remote.c:993
8316#, c-format
8317msgid "rebases onto remote %s"
8318msgstr "变基到远程 %s"
8319
8320#: builtin/remote.c:996
8321#, c-format
8322msgid " merges with remote %s"
8323msgstr " 与远程 %s 合并"
8324
8325#: builtin/remote.c:997
8326msgid "    and with remote"
8327msgstr "    且有远程"
8328
8329#: builtin/remote.c:999
8330#, c-format
8331msgid "merges with remote %s"
8332msgstr "与远程 %s 合并"
8333
8334#: builtin/remote.c:1000
8335msgid "   and with remote"
8336msgstr "   且有远程"
8337
8338#: builtin/remote.c:1046
8339msgid "create"
8340msgstr "创建"
8341
8342#: builtin/remote.c:1049
8343msgid "delete"
8344msgstr "删除"
8345
8346#: builtin/remote.c:1053
8347msgid "up to date"
8348msgstr "最新"
8349
8350#: builtin/remote.c:1056
8351msgid "fast-forwardable"
8352msgstr "可快进"
8353
8354#: builtin/remote.c:1059
8355msgid "local out of date"
8356msgstr "本地已过时"
8357
8358#: builtin/remote.c:1066
8359#, c-format
8360msgid "    %-*s forces to %-*s (%s)"
8361msgstr "    %-*s 强制推送至 %-*s (%s)"
8362
8363#: builtin/remote.c:1069
8364#, c-format
8365msgid "    %-*s pushes to %-*s (%s)"
8366msgstr "    %-*s 推送至 %-*s (%s)"
8367
8368#: builtin/remote.c:1073
8369#, c-format
8370msgid "    %-*s forces to %s"
8371msgstr "    %-*s 强制推送至 %s"
8372
8373#: builtin/remote.c:1076
8374#, c-format
8375msgid "    %-*s pushes to %s"
8376msgstr "    %-*s 推送至 %s"
8377
8378#: builtin/remote.c:1144
8379msgid "do not query remotes"
8380msgstr "不查询远程"
8381
8382#: builtin/remote.c:1171
8383#, c-format
8384msgid "* remote %s"
8385msgstr "* 远程 %s"
8386
8387#: builtin/remote.c:1172
8388#, c-format
8389msgid "  Fetch URL: %s"
8390msgstr "  获取地址:%s"
8391
8392#: builtin/remote.c:1173 builtin/remote.c:1318
8393msgid "(no URL)"
8394msgstr "(无 URL)"
8395
8396#: builtin/remote.c:1182 builtin/remote.c:1184
8397#, c-format
8398msgid "  Push  URL: %s"
8399msgstr "  推送地址:%s"
8400
8401#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
8402#, c-format
8403msgid "  HEAD branch: %s"
8404msgstr "  HEAD分支:%s"
8405
8406#: builtin/remote.c:1192
8407#, c-format
8408msgid ""
8409"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8410msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8411
8412#: builtin/remote.c:1204
8413#, c-format
8414msgid "  Remote branch:%s"
8415msgid_plural "  Remote branches:%s"
8416msgstr[0] "  远程分支:%s"
8417msgstr[1] "  远程分支:%s"
8418
8419#  译者:中文字符串拼接,可删除前导空格
8420#: builtin/remote.c:1207 builtin/remote.c:1234
8421msgid " (status not queried)"
8422msgstr "(状态未查询)"
8423
8424#: builtin/remote.c:1216
8425msgid "  Local branch configured for 'git pull':"
8426msgid_plural "  Local branches configured for 'git pull':"
8427msgstr[0] "  为 'git pull' 配置的本地分支:"
8428msgstr[1] "  为 'git pull' 配置的本地分支:"
8429
8430#: builtin/remote.c:1224
8431msgid "  Local refs will be mirrored by 'git push'"
8432msgstr "  本地引用将在 'git push' 时被镜像"
8433
8434#: builtin/remote.c:1231
8435#, c-format
8436msgid "  Local ref configured for 'git push'%s:"
8437msgid_plural "  Local refs configured for 'git push'%s:"
8438msgstr[0] "  为 'git push' 配置的本地引用%s:"
8439msgstr[1] "  为 'git push' 配置的本地引用%s:"
8440
8441#: builtin/remote.c:1252
8442msgid "set refs/remotes/<name>/HEAD according to remote"
8443msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8444
8445#: builtin/remote.c:1254
8446msgid "delete refs/remotes/<name>/HEAD"
8447msgstr "删除 refs/remotes/<名称>/HEAD"
8448
8449#: builtin/remote.c:1269
8450msgid "Cannot determine remote HEAD"
8451msgstr "无法确定远程 HEAD"
8452
8453#: builtin/remote.c:1271
8454msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8455msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8456
8457#: builtin/remote.c:1281
8458#, c-format
8459msgid "Could not delete %s"
8460msgstr "无法删除 %s"
8461
8462#: builtin/remote.c:1289
8463#, c-format
8464msgid "Not a valid ref: %s"
8465msgstr "不是一个有效引用:%s"
8466
8467#: builtin/remote.c:1291
8468#, c-format
8469msgid "Could not setup %s"
8470msgstr "不能设置 %s"
8471
8472#  译者:注意保持前导空格
8473#: builtin/remote.c:1307
8474#, c-format
8475msgid " %s will become dangling!"
8476msgstr " %s 将成为摇摆状态!"
8477
8478#  译者:注意保持前导空格
8479#: builtin/remote.c:1308
8480#, c-format
8481msgid " %s has become dangling!"
8482msgstr " %s 已成为摇摆状态!"
8483
8484#: builtin/remote.c:1314
8485#, c-format
8486msgid "Pruning %s"
8487msgstr "修剪 %s"
8488
8489#: builtin/remote.c:1315
8490#, c-format
8491msgid "URL: %s"
8492msgstr "URL:%s"
8493
8494#: builtin/remote.c:1328
8495#, c-format
8496msgid " * [would prune] %s"
8497msgstr " * [将删除] %s"
8498
8499#: builtin/remote.c:1331
8500#, c-format
8501msgid " * [pruned] %s"
8502msgstr " * [已删除] %s"
8503
8504#: builtin/remote.c:1374
8505msgid "prune remotes after fetching"
8506msgstr "抓取后清除远程"
8507
8508#: builtin/remote.c:1440 builtin/remote.c:1514
8509#, c-format
8510msgid "No such remote '%s'"
8511msgstr "没有此远程 '%s'"
8512
8513#: builtin/remote.c:1460
8514msgid "add branch"
8515msgstr "添加分支"
8516
8517#: builtin/remote.c:1467
8518msgid "no remote specified"
8519msgstr "未指定远程"
8520
8521#: builtin/remote.c:1489
8522msgid "manipulate push URLs"
8523msgstr "操作推送 URLS"
8524
8525#: builtin/remote.c:1491
8526msgid "add URL"
8527msgstr "添加 URL"
8528
8529#: builtin/remote.c:1493
8530msgid "delete URLs"
8531msgstr "删除 URLS"
8532
8533#: builtin/remote.c:1500
8534msgid "--add --delete doesn't make sense"
8535msgstr "--add --delete 无意义"
8536
8537#: builtin/remote.c:1540
8538#, c-format
8539msgid "Invalid old URL pattern: %s"
8540msgstr "无效的旧URL匹配模版:%s"
8541
8542#: builtin/remote.c:1548
8543#, c-format
8544msgid "No such URL found: %s"
8545msgstr "未找到此URL:%s"
8546
8547#: builtin/remote.c:1550
8548msgid "Will not delete all non-push URLs"
8549msgstr "将不会删除所有非推送URL地址"
8550
8551#: builtin/remote.c:1564
8552msgid "be verbose; must be placed before a subcommand"
8553msgstr "冗长输出;必须置于子命令之前"
8554
8555#: builtin/repack.c:16
8556msgid "git repack [options]"
8557msgstr "git repack [选项]"
8558
8559#: builtin/repack.c:156
8560msgid "pack everything in a single pack"
8561msgstr "所有内容打包到一个包文件中"
8562
8563#: builtin/repack.c:158
8564msgid "same as -a, and turn unreachable objects loose"
8565msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8566
8567#: builtin/repack.c:161
8568msgid "remove redundant packs, and run git-prune-packed"
8569msgstr "删除多余的包,运行 git-prune-packed"
8570
8571#: builtin/repack.c:163
8572msgid "pass --no-reuse-delta to git-pack-objects"
8573msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8574
8575#: builtin/repack.c:165
8576msgid "pass --no-reuse-object to git-pack-objects"
8577msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8578
8579#: builtin/repack.c:167
8580msgid "do not run git-update-server-info"
8581msgstr "不运行 git-update-server-info"
8582
8583#: builtin/repack.c:170
8584msgid "pass --local to git-pack-objects"
8585msgstr "向 git-pack-objects 传递参数 --local"
8586
8587#: builtin/repack.c:172
8588msgid "write bitmap index"
8589msgstr "写 bitmap 索引"
8590
8591#: builtin/repack.c:173
8592msgid "approxidate"
8593msgstr "近似日期"
8594
8595#: builtin/repack.c:174
8596msgid "with -A, do not loosen objects older than this"
8597msgstr "使用 -A,不要将早于给定时间的对象过期"
8598
8599#: builtin/repack.c:176
8600msgid "size of the window used for delta compression"
8601msgstr "用于增量压缩的窗口值"
8602
8603#: builtin/repack.c:177 builtin/repack.c:181
8604msgid "bytes"
8605msgstr "字节"
8606
8607#: builtin/repack.c:178
8608msgid "same as the above, but limit memory size instead of entries count"
8609msgstr "和上面的相似,但限制内存大小而非条目数"
8610
8611#: builtin/repack.c:180
8612msgid "limits the maximum delta depth"
8613msgstr "限制最大增量深度"
8614
8615#: builtin/repack.c:182
8616msgid "maximum size of each packfile"
8617msgstr "每个包的最大尺寸"
8618
8619#: builtin/repack.c:184
8620msgid "repack objects in packs marked with .keep"
8621msgstr "对标记为 .keep 的包中的对象重新打包"
8622
8623#: builtin/repack.c:371
8624#, c-format
8625msgid "removing '%s' failed"
8626msgstr "删除 '%s' 失败"
8627
8628#: builtin/replace.c:17
8629msgid "git replace [-f] <object> <replacement>"
8630msgstr "git replace [-f] <对象> <替换物>"
8631
8632#: builtin/replace.c:18
8633msgid "git replace -d <object>..."
8634msgstr "git replace -d <对象>..."
8635
8636#: builtin/replace.c:19
8637msgid "git replace [--format=<format>] [-l [<pattern>]]"
8638msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8639
8640#: builtin/replace.c:174
8641msgid "list replace refs"
8642msgstr "列出替换的引用"
8643
8644#: builtin/replace.c:175
8645msgid "delete replace refs"
8646msgstr "删除替换的引用"
8647
8648#: builtin/replace.c:176
8649msgid "replace the ref if it exists"
8650msgstr "如果存在则替换引用"
8651
8652#: builtin/replace.c:177
8653msgid "use this format"
8654msgstr "使用此格式"
8655
8656#: builtin/rerere.c:12
8657msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8658msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8659
8660#: builtin/rerere.c:57
8661msgid "register clean resolutions in index"
8662msgstr "在索引中注册干净的解决方案"
8663
8664#: builtin/reset.c:25
8665msgid ""
8666"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8667msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8668
8669#: builtin/reset.c:26
8670msgid "git reset [-q] <tree-ish> [--] <paths>..."
8671msgstr "git reset [-q] <树或提交> [--] <路径>..."
8672
8673#: builtin/reset.c:27
8674msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8675msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8676
8677#: builtin/reset.c:33
8678msgid "mixed"
8679msgstr "混杂"
8680
8681#: builtin/reset.c:33
8682msgid "soft"
8683msgstr "软性"
8684
8685#: builtin/reset.c:33
8686msgid "hard"
8687msgstr "硬性"
8688
8689#: builtin/reset.c:33
8690msgid "merge"
8691msgstr "合并"
8692
8693#: builtin/reset.c:33
8694msgid "keep"
8695msgstr "保持"
8696
8697#: builtin/reset.c:73
8698msgid "You do not have a valid HEAD."
8699msgstr "您没有一个有效的 HEAD。"
8700
8701#: builtin/reset.c:75
8702msgid "Failed to find tree of HEAD."
8703msgstr "无法找到 HEAD 指向的树。"
8704
8705#: builtin/reset.c:81
8706#, c-format
8707msgid "Failed to find tree of %s."
8708msgstr "无法找到 %s 指向的树。"
8709
8710#: builtin/reset.c:99
8711#, c-format
8712msgid "HEAD is now at %s"
8713msgstr "HEAD 现在位于 %s"
8714
8715#  译者:汉字之间无空格,故删除%s前后空格
8716#: builtin/reset.c:182
8717#, c-format
8718msgid "Cannot do a %s reset in the middle of a merge."
8719msgstr "在合并过程中不能做%s重置操作。"
8720
8721#: builtin/reset.c:273
8722msgid "be quiet, only report errors"
8723msgstr "安静模式,只报告错误"
8724
8725#: builtin/reset.c:275
8726msgid "reset HEAD and index"
8727msgstr "重置 HEAD 和索引"
8728
8729#: builtin/reset.c:276
8730msgid "reset only HEAD"
8731msgstr "只重置 HEAD"
8732
8733#: builtin/reset.c:278 builtin/reset.c:280
8734msgid "reset HEAD, index and working tree"
8735msgstr "重置 HEAD、索引和工作区"
8736
8737#: builtin/reset.c:282
8738msgid "reset HEAD but keep local changes"
8739msgstr "重置 HEAD 但保存本地变更"
8740
8741#: builtin/reset.c:285
8742msgid "record only the fact that removed paths will be added later"
8743msgstr "将删除的路径标记为稍后添加"
8744
8745#: builtin/reset.c:302
8746#, c-format
8747msgid "Failed to resolve '%s' as a valid revision."
8748msgstr "无法将 '%s' 解析为一个有效的版本。"
8749
8750#: builtin/reset.c:305 builtin/reset.c:313
8751#, c-format
8752msgid "Could not parse object '%s'."
8753msgstr "不能解析对象 '%s'。"
8754
8755#: builtin/reset.c:310
8756#, c-format
8757msgid "Failed to resolve '%s' as a valid tree."
8758msgstr "无法将 '%s' 解析为一个有效的树对象。"
8759
8760#: builtin/reset.c:319
8761msgid "--patch is incompatible with --{hard,mixed,soft}"
8762msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8763
8764#: builtin/reset.c:328
8765msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8766msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8767
8768#  译者:汉字之间无空格,故删除%s前后空格
8769#: builtin/reset.c:330
8770#, c-format
8771msgid "Cannot do %s reset with paths."
8772msgstr "不能带路径进行%s重置。"
8773
8774#  译者:汉字之间无空格,故删除%s前后空格
8775#: builtin/reset.c:340
8776#, c-format
8777msgid "%s reset is not allowed in a bare repository"
8778msgstr "不能对裸版本库进行%s重置"
8779
8780#: builtin/reset.c:344
8781msgid "-N can only be used with --mixed"
8782msgstr "-N 只能和 --mixed 同时使用"
8783
8784#: builtin/reset.c:361
8785msgid "Unstaged changes after reset:"
8786msgstr "重置后撤出暂存区的变更:"
8787
8788#: builtin/reset.c:367
8789#, c-format
8790msgid "Could not reset index file to revision '%s'."
8791msgstr "不能重置索引文件至版本 '%s'。"
8792
8793#: builtin/reset.c:372
8794msgid "Could not write new index file."
8795msgstr "不能写入新的索引文件。"
8796
8797#: builtin/rev-parse.c:359
8798msgid "git rev-parse --parseopt [options] -- [<args>...]"
8799msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8800
8801#: builtin/rev-parse.c:364
8802msgid "keep the `--` passed as an arg"
8803msgstr "保持 `--` 作为一个参数传递"
8804
8805#: builtin/rev-parse.c:366
8806msgid "stop parsing after the first non-option argument"
8807msgstr "遇到第一个非选项参数后停止解析"
8808
8809#: builtin/rev-parse.c:369
8810msgid "output in stuck long form"
8811msgstr "以固定长格式输出"
8812
8813#: builtin/rev-parse.c:497
8814msgid ""
8815"git rev-parse --parseopt [options] -- [<args>...]\n"
8816"   or: git rev-parse --sq-quote [<arg>...]\n"
8817"   or: git rev-parse [options] [<arg>...]\n"
8818"\n"
8819"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8820msgstr ""
8821"git rev-parse --parseopt [选项] -- [<参数>...]\n"
8822"   或者:git rev-parse --sq-quote [<参数>...]\n"
8823"   或者:git rev-parse [选项] [<参数>...]\n"
8824"\n"
8825"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8826
8827#: builtin/revert.c:22
8828msgid "git revert [options] <commit-ish>..."
8829msgstr "git revert [选项] <提交号>..."
8830
8831#: builtin/revert.c:23
8832msgid "git revert <subcommand>"
8833msgstr "git revert <子命令>"
8834
8835#: builtin/revert.c:28
8836msgid "git cherry-pick [options] <commit-ish>..."
8837msgstr "git cherry-pick [选项] <提交号>..."
8838
8839#: builtin/revert.c:29
8840msgid "git cherry-pick <subcommand>"
8841msgstr "git cherry-pick <子命令>"
8842
8843#: builtin/revert.c:71
8844#, c-format
8845msgid "%s: %s cannot be used with %s"
8846msgstr "%s:%s 不能和 %s 同时使用"
8847
8848#: builtin/revert.c:80
8849msgid "end revert or cherry-pick sequence"
8850msgstr "终止反转或拣选操作"
8851
8852#: builtin/revert.c:81
8853msgid "resume revert or cherry-pick sequence"
8854msgstr "继续反转或拣选操作"
8855
8856#: builtin/revert.c:82
8857msgid "cancel revert or cherry-pick sequence"
8858msgstr "取消反转或拣选操作"
8859
8860#: builtin/revert.c:83
8861msgid "don't automatically commit"
8862msgstr "不要自动提交"
8863
8864#: builtin/revert.c:84
8865msgid "edit the commit message"
8866msgstr "编辑提交说明"
8867
8868#: builtin/revert.c:87
8869msgid "parent number"
8870msgstr "父编号"
8871
8872#: builtin/revert.c:89
8873msgid "merge strategy"
8874msgstr "合并策略"
8875
8876#: builtin/revert.c:90
8877msgid "option"
8878msgstr "选项"
8879
8880#: builtin/revert.c:91
8881msgid "option for merge strategy"
8882msgstr "合并策略的选项"
8883
8884#: builtin/revert.c:104
8885msgid "append commit name"
8886msgstr "追加提交名称"
8887
8888#: builtin/revert.c:105
8889msgid "allow fast-forward"
8890msgstr "允许快进式"
8891
8892#: builtin/revert.c:106
8893msgid "preserve initially empty commits"
8894msgstr "保留初始化的空提交"
8895
8896#: builtin/revert.c:107
8897msgid "allow commits with empty messages"
8898msgstr "允许提交说明为空"
8899
8900#: builtin/revert.c:108
8901msgid "keep redundant, empty commits"
8902msgstr "保持多余的、空的提交"
8903
8904#: builtin/revert.c:112
8905msgid "program error"
8906msgstr "程序错误"
8907
8908#: builtin/revert.c:197
8909msgid "revert failed"
8910msgstr "还原失败"
8911
8912#: builtin/revert.c:212
8913msgid "cherry-pick failed"
8914msgstr "拣选失败"
8915
8916#: builtin/rm.c:17
8917msgid "git rm [options] [--] <file>..."
8918msgstr "git rm [选项] [--] <文件>..."
8919
8920#: builtin/rm.c:65
8921msgid ""
8922"the following submodule (or one of its nested submodules)\n"
8923"uses a .git directory:"
8924msgid_plural ""
8925"the following submodules (or one of its nested submodules)\n"
8926"use a .git directory:"
8927msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8928msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8929
8930#: builtin/rm.c:71
8931msgid ""
8932"\n"
8933"(use 'rm -rf' if you really want to remove it including all of its history)"
8934msgstr ""
8935"\n"
8936"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8937
8938#: builtin/rm.c:231
8939msgid ""
8940"the following file has staged content different from both the\n"
8941"file and the HEAD:"
8942msgid_plural ""
8943"the following files have staged content different from both the\n"
8944"file and the HEAD:"
8945msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8946msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8947
8948#: builtin/rm.c:236
8949msgid ""
8950"\n"
8951"(use -f to force removal)"
8952msgstr ""
8953"\n"
8954"(使用 -f 强制删除)"
8955
8956#: builtin/rm.c:240
8957msgid "the following file has changes staged in the index:"
8958msgid_plural "the following files have changes staged in the index:"
8959msgstr[0] "如下文件相对索引区的内容有修改"
8960msgstr[1] "如下文件相对索引区的内容有修改"
8961
8962#: builtin/rm.c:244 builtin/rm.c:255
8963msgid ""
8964"\n"
8965"(use --cached to keep the file, or -f to force removal)"
8966msgstr ""
8967"\n"
8968"(使用 --cached 保留本地文件,或用 -f 强制删除)"
8969
8970#: builtin/rm.c:252
8971msgid "the following file has local modifications:"
8972msgid_plural "the following files have local modifications:"
8973msgstr[0] "如下文件有本地修改:"
8974msgstr[1] "如下文件有本地修改:"
8975
8976#: builtin/rm.c:270
8977msgid "do not list removed files"
8978msgstr "不列出删除的文件"
8979
8980#: builtin/rm.c:271
8981msgid "only remove from the index"
8982msgstr "只从索引区删除"
8983
8984#: builtin/rm.c:272
8985msgid "override the up-to-date check"
8986msgstr "忽略文件更新状态检查"
8987
8988#: builtin/rm.c:273
8989msgid "allow recursive removal"
8990msgstr "允许递归删除"
8991
8992#: builtin/rm.c:275
8993msgid "exit with a zero status even if nothing matched"
8994msgstr "即使没有匹配,也以零状态退出"
8995
8996#: builtin/rm.c:336
8997#, c-format
8998msgid "not removing '%s' recursively without -r"
8999msgstr "未提供 -r 选项不会递归删除 '%s'"
9000
9001#: builtin/rm.c:375
9002#, c-format
9003msgid "git rm: unable to remove %s"
9004msgstr "git rm:不能删除 %s"
9005
9006#: builtin/shortlog.c:13
9007msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9008msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9009
9010#: builtin/shortlog.c:131
9011#, c-format
9012msgid "Missing author: %s"
9013msgstr "缺少作者:%s"
9014
9015#: builtin/shortlog.c:230
9016msgid "sort output according to the number of commits per author"
9017msgstr "根据每个作者的提交数量排序"
9018
9019#: builtin/shortlog.c:232
9020msgid "Suppress commit descriptions, only provides commit count"
9021msgstr "隐藏提交说明,只提供提交数量"
9022
9023#: builtin/shortlog.c:234
9024msgid "Show the email address of each author"
9025msgstr "显示每个作者的电子邮件地址"
9026
9027#: builtin/shortlog.c:235
9028msgid "w[,i1[,i2]]"
9029msgstr "w[,i1[,i2]]"
9030
9031#: builtin/shortlog.c:236
9032msgid "Linewrap output"
9033msgstr "折行输出"
9034
9035#: builtin/show-branch.c:9
9036msgid ""
9037"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9038"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9039"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9040"<glob>)...]"
9041msgstr ""
9042"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9043"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9044"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9045"<glob>)...]"
9046
9047#: builtin/show-branch.c:10
9048msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9049msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9050
9051#: builtin/show-branch.c:649
9052msgid "show remote-tracking and local branches"
9053msgstr "显示远程跟踪的和本地的分支"
9054
9055#: builtin/show-branch.c:651
9056msgid "show remote-tracking branches"
9057msgstr "显示远程跟踪的分支"
9058
9059#: builtin/show-branch.c:653
9060msgid "color '*!+-' corresponding to the branch"
9061msgstr "着色 '*!+-' 到相应的分支"
9062
9063#: builtin/show-branch.c:655
9064msgid "show <n> more commits after the common ancestor"
9065msgstr "显示共同祖先后的 <n> 个提交"
9066
9067#: builtin/show-branch.c:657
9068msgid "synonym to more=-1"
9069msgstr "和 more=-1 同义"
9070
9071#: builtin/show-branch.c:658
9072msgid "suppress naming strings"
9073msgstr "不显示字符串命名"
9074
9075#: builtin/show-branch.c:660
9076msgid "include the current branch"
9077msgstr "包括当前分支"
9078
9079#: builtin/show-branch.c:662
9080msgid "name commits with their object names"
9081msgstr "以对象名字命名提交"
9082
9083#: builtin/show-branch.c:664
9084msgid "show possible merge bases"
9085msgstr "显示可能合并的基线"
9086
9087#: builtin/show-branch.c:666
9088msgid "show refs unreachable from any other ref"
9089msgstr "显示没有任何引用的的引用"
9090
9091#: builtin/show-branch.c:668
9092msgid "show commits in topological order"
9093msgstr "以拓扑顺序显示提交"
9094
9095#: builtin/show-branch.c:671
9096msgid "show only commits not on the first branch"
9097msgstr "只显示不在第一个分支上的提交"
9098
9099#: builtin/show-branch.c:673
9100msgid "show merges reachable from only one tip"
9101msgstr "显示仅一个分支可访问的合并提交"
9102
9103#: builtin/show-branch.c:675
9104msgid "topologically sort, maintaining date order where possible"
9105msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9106
9107#: builtin/show-branch.c:678
9108msgid "<n>[,<base>]"
9109msgstr "<n>[,<base>]"
9110
9111#: builtin/show-branch.c:679
9112msgid "show <n> most recent ref-log entries starting at base"
9113msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9114
9115#: builtin/show-ref.c:10
9116msgid ""
9117"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9118"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9119msgstr ""
9120"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9121"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9122
9123#: builtin/show-ref.c:11
9124msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9125msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9126
9127#: builtin/show-ref.c:168
9128msgid "only show tags (can be combined with heads)"
9129msgstr "只显示 tags(可以和头共用)"
9130
9131#: builtin/show-ref.c:169
9132msgid "only show heads (can be combined with tags)"
9133msgstr "只显示头(可以和 tags 共用)"
9134
9135#: builtin/show-ref.c:170
9136msgid "stricter reference checking, requires exact ref path"
9137msgstr "更严格的引用检测,需要精确的引用路径"
9138
9139#: builtin/show-ref.c:173 builtin/show-ref.c:175
9140msgid "show the HEAD reference, even if it would be filtered out"
9141msgstr "显示 HEAD 引用,即使被过滤掉"
9142
9143#: builtin/show-ref.c:177
9144msgid "dereference tags into object IDs"
9145msgstr "转换 tags 到对象ID"
9146
9147#: builtin/show-ref.c:179
9148msgid "only show SHA1 hash using <n> digits"
9149msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9150
9151#: builtin/show-ref.c:183
9152msgid "do not print results to stdout (useful with --verify)"
9153msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9154
9155#: builtin/show-ref.c:185
9156msgid "show refs from stdin that aren't in local repository"
9157msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9158
9159#: builtin/symbolic-ref.c:7
9160msgid "git symbolic-ref [options] name [ref]"
9161msgstr "git symbolic-ref [选项] 名称 [引用]"
9162
9163#: builtin/symbolic-ref.c:8
9164msgid "git symbolic-ref -d [-q] name"
9165msgstr "git symbolic-ref -d [-q] 名称"
9166
9167#: builtin/symbolic-ref.c:40
9168msgid "suppress error message for non-symbolic (detached) refs"
9169msgstr "不显示非符号(分离的)引用的错误信息"
9170
9171#: builtin/symbolic-ref.c:41
9172msgid "delete symbolic ref"
9173msgstr "删除符号引用"
9174
9175#: builtin/symbolic-ref.c:42
9176msgid "shorten ref output"
9177msgstr "简短的引用输出"
9178
9179#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
9180msgid "reason"
9181msgstr "原因"
9182
9183#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
9184msgid "reason of the update"
9185msgstr "更新的原因"
9186
9187#: builtin/tag.c:22
9188msgid ""
9189"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9190msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9191
9192#: builtin/tag.c:23
9193msgid "git tag -d <tagname>..."
9194msgstr "git tag -d <标签名>..."
9195
9196#: builtin/tag.c:24
9197msgid ""
9198"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9199"\t\t[<pattern>...]"
9200msgstr ""
9201"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9202"\t\t[<模式>...]"
9203
9204#: builtin/tag.c:26
9205msgid "git tag -v <tagname>..."
9206msgstr "git tag -v <标签名>..."
9207
9208#: builtin/tag.c:67
9209#, c-format
9210msgid "malformed object at '%s'"
9211msgstr "非法的对象于 '%s'"
9212
9213#: builtin/tag.c:239
9214#, c-format
9215msgid "tag name too long: %.*s..."
9216msgstr "tag 名字太长:%.*s..."
9217
9218#: builtin/tag.c:244
9219#, c-format
9220msgid "tag '%s' not found."
9221msgstr "tag '%s' 未发现。"
9222
9223#: builtin/tag.c:259
9224#, c-format
9225msgid "Deleted tag '%s' (was %s)\n"
9226msgstr "已删除 tag '%s'(曾为 %s)\n"
9227
9228#: builtin/tag.c:271
9229#, c-format
9230msgid "could not verify the tag '%s'"
9231msgstr "不能校验 tag '%s'"
9232
9233#: builtin/tag.c:281
9234#, c-format
9235msgid ""
9236"\n"
9237"Write a tag message\n"
9238"Lines starting with '%c' will be ignored.\n"
9239msgstr ""
9240"\n"
9241"输入一个 tag 说明\n"
9242"以 '%c' 开头的行将被忽略。\n"
9243
9244#: builtin/tag.c:285
9245#, c-format
9246msgid ""
9247"\n"
9248"Write a tag message\n"
9249"Lines starting with '%c' will be kept; you may remove them yourself if you "
9250"want to.\n"
9251msgstr ""
9252"\n"
9253"输入一个 tag 说明\n"
9254"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9255
9256#: builtin/tag.c:324
9257msgid "unable to sign the tag"
9258msgstr "无法签署 tag"
9259
9260#: builtin/tag.c:326
9261msgid "unable to write tag file"
9262msgstr "无法写 tag 文件"
9263
9264#: builtin/tag.c:351
9265msgid "bad object type."
9266msgstr "坏的对象类型。"
9267
9268#: builtin/tag.c:364
9269msgid "tag header too big."
9270msgstr "tag 头信息太大。"
9271
9272#: builtin/tag.c:400
9273msgid "no tag message?"
9274msgstr "无 tag 说明?"
9275
9276#: builtin/tag.c:406
9277#, c-format
9278msgid "The tag message has been left in %s\n"
9279msgstr "tag 说明被保留在 %s\n"
9280
9281#: builtin/tag.c:455
9282msgid "switch 'points-at' requires an object"
9283msgstr "开关 'points-at' 需要一个对象"
9284
9285#: builtin/tag.c:457
9286#, c-format
9287msgid "malformed object name '%s'"
9288msgstr "非法的对象名 '%s'"
9289
9290#: builtin/tag.c:480
9291#, c-format
9292msgid "unsupported sort specification %s"
9293msgstr "不支持的排序规格 %s"
9294
9295#: builtin/tag.c:500
9296msgid "list tag names"
9297msgstr "列出tag名称"
9298
9299#: builtin/tag.c:502
9300msgid "print <n> lines of each tag message"
9301msgstr "每个 tag 信息打印 <n> 行"
9302
9303#: builtin/tag.c:504
9304msgid "delete tags"
9305msgstr "删除 tags"
9306
9307#: builtin/tag.c:505
9308msgid "verify tags"
9309msgstr "验证 tags"
9310
9311#: builtin/tag.c:507
9312msgid "Tag creation options"
9313msgstr "Tag 创建选项"
9314
9315#: builtin/tag.c:509
9316msgid "annotated tag, needs a message"
9317msgstr "注解 tag,需要一个说明"
9318
9319#: builtin/tag.c:511
9320msgid "tag message"
9321msgstr "tag 说明"
9322
9323#: builtin/tag.c:513
9324msgid "annotated and GPG-signed tag"
9325msgstr "注解并 GPG 签名的 tag"
9326
9327#: builtin/tag.c:517
9328msgid "use another key to sign the tag"
9329msgstr "使用另外的私钥签名 tag"
9330
9331#: builtin/tag.c:518
9332msgid "replace the tag if exists"
9333msgstr "如果存在,替换现有的 tag"
9334
9335#: builtin/tag.c:519
9336msgid "show tag list in columns"
9337msgstr "以列的方式显示 tag"
9338
9339#: builtin/tag.c:521
9340msgid "sort tags"
9341msgstr "排序 tags"
9342
9343#: builtin/tag.c:525
9344msgid "Tag listing options"
9345msgstr "Tag 列表选项"
9346
9347#: builtin/tag.c:528 builtin/tag.c:534
9348msgid "print only tags that contain the commit"
9349msgstr "只打印包含提交的tags"
9350
9351#: builtin/tag.c:540
9352msgid "print only tags of the object"
9353msgstr "只打印tags对象"
9354
9355#: builtin/tag.c:566
9356msgid "--column and -n are incompatible"
9357msgstr "--column 和 -n 不兼容"
9358
9359#: builtin/tag.c:578
9360msgid "--sort and -n are incompatible"
9361msgstr "--sort 和 -n 不兼容"
9362
9363#: builtin/tag.c:585
9364msgid "-n option is only allowed with -l."
9365msgstr "-n 选项只允许和 -l 同时使用。"
9366
9367#: builtin/tag.c:587
9368msgid "--contains option is only allowed with -l."
9369msgstr "--contains 选项只允许和 -l 同时使用。"
9370
9371#: builtin/tag.c:589
9372msgid "--points-at option is only allowed with -l."
9373msgstr "--points-at 选项只允许和 -l 同时使用。"
9374
9375#: builtin/tag.c:597
9376msgid "only one -F or -m option is allowed."
9377msgstr "只允许一个 -F 或 -m 选项。"
9378
9379#: builtin/tag.c:617
9380msgid "too many params"
9381msgstr "太多参数"
9382
9383#: builtin/tag.c:623
9384#, c-format
9385msgid "'%s' is not a valid tag name."
9386msgstr "'%s' 不是一个有效的tag名称。"
9387
9388#: builtin/tag.c:628
9389#, c-format
9390msgid "tag '%s' already exists"
9391msgstr "tag '%s' 已存在"
9392
9393#: builtin/tag.c:646
9394#, c-format
9395msgid "%s: cannot lock the ref"
9396msgstr "%s:不能锁定引用"
9397
9398#: builtin/tag.c:648
9399#, c-format
9400msgid "%s: cannot update the ref"
9401msgstr "%s:不能更新引用"
9402
9403#: builtin/tag.c:650
9404#, c-format
9405msgid "Updated tag '%s' (was %s)\n"
9406msgstr "已更新tag '%s'(曾为 %s)\n"
9407
9408#: builtin/unpack-objects.c:483
9409msgid "Unpacking objects"
9410msgstr "展开对象中"
9411
9412#: builtin/update-index.c:399
9413msgid "git update-index [options] [--] [<file>...]"
9414msgstr "git update-index [选项] [--] [<文件>...]"
9415
9416#: builtin/update-index.c:748
9417msgid "continue refresh even when index needs update"
9418msgstr "当索引需要更新时继续刷新"
9419
9420#: builtin/update-index.c:751
9421msgid "refresh: ignore submodules"
9422msgstr "刷新:忽略子模组"
9423
9424#: builtin/update-index.c:754
9425msgid "do not ignore new files"
9426msgstr "不忽略新的文件"
9427
9428#: builtin/update-index.c:756
9429msgid "let files replace directories and vice-versa"
9430msgstr "让文件替换目录(反之亦然)"
9431
9432#: builtin/update-index.c:758
9433msgid "notice files missing from worktree"
9434msgstr "通知文件从工作区丢失"
9435
9436#: builtin/update-index.c:760
9437msgid "refresh even if index contains unmerged entries"
9438msgstr "即使索引区包含未合并的条目也执行刷新"
9439
9440#: builtin/update-index.c:763
9441msgid "refresh stat information"
9442msgstr "刷新统计信息"
9443
9444#: builtin/update-index.c:767
9445msgid "like --refresh, but ignore assume-unchanged setting"
9446msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9447
9448#: builtin/update-index.c:771
9449msgid "<mode>,<object>,<path>"
9450msgstr "<mode>,<object>,<path>"
9451
9452#: builtin/update-index.c:772
9453msgid "add the specified entry to the index"
9454msgstr "添加指定的条目到索引区"
9455
9456#: builtin/update-index.c:776
9457msgid "(+/-)x"
9458msgstr "(+/-)x"
9459
9460#: builtin/update-index.c:777
9461msgid "override the executable bit of the listed files"
9462msgstr "覆盖列表里文件的可执行位"
9463
9464#: builtin/update-index.c:781
9465msgid "mark files as \"not changing\""
9466msgstr "把文件标记为 \"没有变更\""
9467
9468#: builtin/update-index.c:784
9469msgid "clear assumed-unchanged bit"
9470msgstr "清除 assumed-unchanged 位"
9471
9472#: builtin/update-index.c:787
9473msgid "mark files as \"index-only\""
9474msgstr "把文件标记为 \"仅索引\""
9475
9476#: builtin/update-index.c:790
9477msgid "clear skip-worktree bit"
9478msgstr "清除 skip-worktree 位"
9479
9480#: builtin/update-index.c:793
9481msgid "add to index only; do not add content to object database"
9482msgstr "只添加到索引区;不添加对象到对象库"
9483
9484#: builtin/update-index.c:795
9485msgid "remove named paths even if present in worktree"
9486msgstr "即使存在工作区里,也删除路径"
9487
9488#: builtin/update-index.c:797
9489msgid "with --stdin: input lines are terminated by null bytes"
9490msgstr "携带 --stdin:输入的行以 null 字符终止"
9491
9492#: builtin/update-index.c:799
9493msgid "read list of paths to be updated from standard input"
9494msgstr "从标准输入中读取需要更新的路径列表"
9495
9496#: builtin/update-index.c:803
9497msgid "add entries from standard input to the index"
9498msgstr "从标准输入添加条目到索引区"
9499
9500#: builtin/update-index.c:807
9501msgid "repopulate stages #2 and #3 for the listed paths"
9502msgstr "为指定文件重新生成第2和第3暂存区"
9503
9504#: builtin/update-index.c:811
9505msgid "only update entries that differ from HEAD"
9506msgstr "只更新与 HEAD 不同的条目"
9507
9508#: builtin/update-index.c:815
9509msgid "ignore files missing from worktree"
9510msgstr "忽略工作区丢失的文件"
9511
9512#: builtin/update-index.c:818
9513msgid "report actions to standard output"
9514msgstr "在标准输出显示操作"
9515
9516#: builtin/update-index.c:820
9517msgid "(for porcelains) forget saved unresolved conflicts"
9518msgstr "(for porcelains) 忘记保存的未解决的冲突"
9519
9520#: builtin/update-index.c:824
9521msgid "write index in this format"
9522msgstr "以这种格式写入索引区"
9523
9524#: builtin/update-ref.c:9
9525msgid "git update-ref [options] -d <refname> [<oldval>]"
9526msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9527
9528#: builtin/update-ref.c:10
9529msgid "git update-ref [options]    <refname> <newval> [<oldval>]"
9530msgstr "git update-ref [选项]    <引用名> <新值> [<旧值>]"
9531
9532#: builtin/update-ref.c:11
9533msgid "git update-ref [options] --stdin [-z]"
9534msgstr "git update-ref [选项] --stdin [-z]"
9535
9536#: builtin/update-ref.c:256
9537msgid "delete the reference"
9538msgstr "删除引用"
9539
9540#: builtin/update-ref.c:258
9541msgid "update <refname> not the one it points to"
9542msgstr "更新 <引用名> 本身而不是它指向的引用"
9543
9544#: builtin/update-ref.c:259
9545msgid "stdin has NUL-terminated arguments"
9546msgstr "标准输入有以 NUL 字符终止的参数"
9547
9548#: builtin/update-ref.c:260
9549msgid "read updates from stdin"
9550msgstr "从标准输入读取更新"
9551
9552#: builtin/update-server-info.c:6
9553msgid "git update-server-info [--force]"
9554msgstr "git update-server-info [--force]"
9555
9556#: builtin/update-server-info.c:14
9557msgid "update the info files from scratch"
9558msgstr "从头开始更新文件信息"
9559
9560#: builtin/verify-pack.c:56
9561msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9562msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9563
9564#: builtin/verify-pack.c:66
9565msgid "verbose"
9566msgstr "冗长输出"
9567
9568#: builtin/verify-pack.c:68
9569msgid "show statistics only"
9570msgstr "只显示统计"
9571
9572#: builtin/verify-tag.c:17
9573msgid "git verify-tag [-v|--verbose] <tag>..."
9574msgstr "git verify-tag [-v|--verbose] <tag>..."
9575
9576#: builtin/verify-tag.c:73
9577msgid "print tag contents"
9578msgstr "打印 tag 内容"
9579
9580#: builtin/write-tree.c:13
9581msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9582msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9583
9584#: builtin/write-tree.c:26
9585msgid "<prefix>/"
9586msgstr "<前缀>/"
9587
9588#: builtin/write-tree.c:27
9589msgid "write tree object for a subdirectory <prefix>"
9590msgstr "将 <前缀> 子目录内容写到一个树对象"
9591
9592#: builtin/write-tree.c:30
9593msgid "only useful for debugging"
9594msgstr "只对调试有用"
9595
9596#: git.c:17
9597msgid ""
9598"'git help -a' and 'git help -g' lists available subcommands and some\n"
9599"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9600"to read about a specific subcommand or concept."
9601msgstr ""
9602"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9603"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
9604
9605#: parse-options.h:143
9606msgid "expiry-date"
9607msgstr "逾期日期"
9608
9609#: parse-options.h:158
9610msgid "no-op (backward compatibility)"
9611msgstr "空操作(向后兼容)"
9612
9613#: parse-options.h:232
9614msgid "be more verbose"
9615msgstr "更加详细"
9616
9617#: parse-options.h:234
9618msgid "be more quiet"
9619msgstr "更加安静"
9620
9621#: parse-options.h:240
9622msgid "use <n> digits to display SHA-1s"
9623msgstr "用 <n> 位数字显示 SHA-1 哈希值"
9624
9625#: common-cmds.h:8
9626msgid "Add file contents to the index"
9627msgstr "添加文件内容至索引"
9628
9629#: common-cmds.h:9
9630msgid "Find by binary search the change that introduced a bug"
9631msgstr "通过二分查找定位引入 bug 的变更"
9632
9633#: common-cmds.h:10
9634msgid "List, create, or delete branches"
9635msgstr "列出、创建或删除分支"
9636
9637#: common-cmds.h:11
9638msgid "Checkout a branch or paths to the working tree"
9639msgstr "检出一个分支或路径到工作区"
9640
9641#: common-cmds.h:12
9642msgid "Clone a repository into a new directory"
9643msgstr "克隆一个版本库到一个新目录"
9644
9645#: common-cmds.h:13
9646msgid "Record changes to the repository"
9647msgstr "记录变更到版本库"
9648
9649#: common-cmds.h:14
9650msgid "Show changes between commits, commit and working tree, etc"
9651msgstr "显示提交之间、提交和工作区之间等的差异"
9652
9653#: common-cmds.h:15
9654msgid "Download objects and refs from another repository"
9655msgstr "从另外一个版本库下载对象和引用"
9656
9657#: common-cmds.h:16
9658msgid "Print lines matching a pattern"
9659msgstr "输出和模式匹配的行"
9660
9661#: common-cmds.h:17
9662msgid "Create an empty Git repository or reinitialize an existing one"
9663msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9664
9665#: common-cmds.h:18
9666msgid "Show commit logs"
9667msgstr "显示提交日志"
9668
9669#: common-cmds.h:19
9670msgid "Join two or more development histories together"
9671msgstr "合并两个或更多开发历史"
9672
9673#: common-cmds.h:20
9674msgid "Move or rename a file, a directory, or a symlink"
9675msgstr "移动或重命名一个文件、目录或符号链接"
9676
9677#: common-cmds.h:21
9678msgid "Fetch from and integrate with another repository or a local branch"
9679msgstr "获取并整合另外的版本库或一个本地分支"
9680
9681#: common-cmds.h:22
9682msgid "Update remote refs along with associated objects"
9683msgstr "更新远程引用和相关的对象"
9684
9685#: common-cmds.h:23
9686msgid "Forward-port local commits to the updated upstream head"
9687msgstr "本地提交转移至更新后的上游分支中"
9688
9689#: common-cmds.h:24
9690msgid "Reset current HEAD to the specified state"
9691msgstr "重置当前HEAD到指定状态"
9692
9693#: common-cmds.h:25
9694msgid "Remove files from the working tree and from the index"
9695msgstr "从工作区和索引中删除文件"
9696
9697#: common-cmds.h:26
9698msgid "Show various types of objects"
9699msgstr "显示各种类型的对象"
9700
9701#: common-cmds.h:27
9702msgid "Show the working tree status"
9703msgstr "显示工作区状态"
9704
9705#: common-cmds.h:28
9706msgid "Create, list, delete or verify a tag object signed with GPG"
9707msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
9708
9709#: git-am.sh:52
9710msgid "You need to set your committer info first"
9711msgstr "您需要先设置你的提交者信息"
9712
9713#: git-am.sh:97
9714msgid ""
9715"You seem to have moved HEAD since the last 'am' failure.\n"
9716"Not rewinding to ORIG_HEAD"
9717msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9718
9719#: git-am.sh:107
9720#, sh-format
9721msgid ""
9722"When you have resolved this problem, run \"$cmdline --continue\".\n"
9723"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9724"To restore the original branch and stop patching, run \"$cmdline --abort\"."
9725msgstr ""
9726"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
9727"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9728"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9729
9730#: git-am.sh:123
9731msgid "Cannot fall back to three-way merge."
9732msgstr "无法求助于三路合并。"
9733
9734#: git-am.sh:139
9735msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9736msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
9737
9738#: git-am.sh:141
9739msgid "Using index info to reconstruct a base tree..."
9740msgstr "使用索引来重建一个(三路合并的)基础目录树..."
9741
9742#: git-am.sh:156
9743msgid ""
9744"Did you hand edit your patch?\n"
9745"It does not apply to blobs recorded in its index."
9746msgstr ""
9747"您是否曾手动编辑过您的补丁?\n"
9748"无法应用补丁到索引中的数据(blob)对象上。"
9749
9750#: git-am.sh:165
9751msgid "Falling back to patching base and 3-way merge..."
9752msgstr "转而在基础版本上打补丁及进行三路合并..."
9753
9754#: git-am.sh:181
9755msgid "Failed to merge in the changes."
9756msgstr "无法合并变更。"
9757
9758#: git-am.sh:276
9759msgid "Only one StGIT patch series can be applied at once"
9760msgstr "一次只能有一个 StGIT 补丁队列被应用"
9761
9762#: git-am.sh:363
9763#, sh-format
9764msgid "Patch format $patch_format is not supported."
9765msgstr "不支持 $patch_format 补丁格式。"
9766
9767#: git-am.sh:365
9768msgid "Patch format detection failed."
9769msgstr "补丁格式检测失败。"
9770
9771#: git-am.sh:392
9772msgid ""
9773"The -b/--binary option has been a no-op for long time, and\n"
9774"it will be removed. Please do not use it anymore."
9775msgstr ""
9776"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9777"请不要再使用它了。"
9778
9779#: git-am.sh:486
9780#, sh-format
9781msgid "previous rebase directory $dotest still exists but mbox given."
9782msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
9783
9784#: git-am.sh:491
9785msgid "Please make up your mind. --skip or --abort?"
9786msgstr "请下决心。--skip 或是 --abort ?"
9787
9788#: git-am.sh:527
9789#, sh-format
9790msgid ""
9791"Stray $dotest directory found.\n"
9792"Use \"git am --abort\" to remove it."
9793msgstr ""
9794"发现了错误的 $dotest 目录。\n"
9795"使用 \"git am --abort\" 删除它。"
9796
9797#: git-am.sh:535
9798msgid "Resolve operation not in progress, we are not resuming."
9799msgstr "解决操作未进行,我们不会继续。"
9800
9801#: git-am.sh:601
9802#, sh-format
9803msgid "Dirty index: cannot apply patches (dirty: $files)"
9804msgstr "脏的索引:不能应用补丁(脏文件:$files)"
9805
9806#: git-am.sh:705
9807#, sh-format
9808msgid ""
9809"Patch is empty.  Was it split wrong?\n"
9810"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9811"To restore the original branch and stop patching run \"$cmdline --abort\"."
9812msgstr ""
9813"补丁为空。是不是切分错误?\n"
9814"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9815"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9816
9817#: git-am.sh:732
9818msgid "Patch does not have a valid e-mail address."
9819msgstr "补丁中没有一个有效的邮件地址。"
9820
9821#: git-am.sh:779
9822msgid "cannot be interactive without stdin connected to a terminal."
9823msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9824
9825#: git-am.sh:783
9826msgid "Commit Body is:"
9827msgstr "提交内容为:"
9828
9829#  译者:注意保持句尾空格
9830#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9831#. in your translation. The program will only accept English
9832#. input at this point.
9833#: git-am.sh:790
9834msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9835msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9836
9837#: git-am.sh:826
9838#, sh-format
9839msgid "Applying: $FIRSTLINE"
9840msgstr "正应用:$FIRSTLINE"
9841
9842#: git-am.sh:847
9843msgid ""
9844"No changes - did you forget to use 'git add'?\n"
9845"If there is nothing left to stage, chances are that something else\n"
9846"already introduced the same changes; you might want to skip this patch."
9847msgstr ""
9848"没有变更 —— 您是不是忘了执行 'git add'?\n"
9849"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9850"您也许想要跳过这个补丁。"
9851
9852#: git-am.sh:855
9853msgid ""
9854"You still have unmerged paths in your index\n"
9855"did you forget to use 'git add'?"
9856msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9857
9858#: git-am.sh:871
9859msgid "No changes -- Patch already applied."
9860msgstr "没有变更 —— 补丁已经应用过。"
9861
9862#: git-am.sh:881
9863#, sh-format
9864msgid "Patch failed at $msgnum $FIRSTLINE"
9865msgstr "补丁失败于 $msgnum $FIRSTLINE"
9866
9867#: git-am.sh:884
9868#, sh-format
9869msgid ""
9870"The copy of the patch that failed is found in:\n"
9871"   $dotest/patch"
9872msgstr ""
9873"失败的补丁文件副本位于:\n"
9874"   $dotest/patch"
9875
9876#: git-am.sh:902
9877msgid "applying to an empty history"
9878msgstr "正应用到一个空历史上"
9879
9880#: git-bisect.sh:48
9881msgid "You need to start by \"git bisect start\""
9882msgstr "您需要执行 \"git bisect start\" 来开始"
9883
9884#  译者:注意保持句尾空格
9885#. TRANSLATORS: Make sure to include [Y] and [n] in your
9886#. translation. The program will only accept English input
9887#. at this point.
9888#: git-bisect.sh:54
9889msgid "Do you want me to do it for you [Y/n]? "
9890msgstr "您想让我为您这样做么[Y/n]? "
9891
9892#: git-bisect.sh:95
9893#, sh-format
9894msgid "unrecognised option: '$arg'"
9895msgstr "未能识别的选项:'$arg'"
9896
9897#: git-bisect.sh:99
9898#, sh-format
9899msgid "'$arg' does not appear to be a valid revision"
9900msgstr "'$arg' 看起来不像是一个有效的版本"
9901
9902#: git-bisect.sh:117
9903msgid "Bad HEAD - I need a HEAD"
9904msgstr "坏的 HEAD - 我需要一个 HEAD"
9905
9906#: git-bisect.sh:130
9907#, sh-format
9908msgid ""
9909"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9910msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9911
9912#: git-bisect.sh:140
9913msgid "won't bisect on cg-seek'ed tree"
9914msgstr "不会在做了 cg-seek 的树上做二分查找"
9915
9916#: git-bisect.sh:144
9917msgid "Bad HEAD - strange symbolic ref"
9918msgstr "坏的 HEAD - 奇怪的符号引用"
9919
9920#: git-bisect.sh:189
9921#, sh-format
9922msgid "Bad bisect_write argument: $state"
9923msgstr "坏的 bisect_write 参数:$state"
9924
9925#: git-bisect.sh:218
9926#, sh-format
9927msgid "Bad rev input: $arg"
9928msgstr "输入坏的版本:$arg"
9929
9930#: git-bisect.sh:232
9931msgid "Please call 'bisect_state' with at least one argument."
9932msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9933
9934#: git-bisect.sh:244
9935#, sh-format
9936msgid "Bad rev input: $rev"
9937msgstr "输入坏的版本:$rev"
9938
9939#: git-bisect.sh:250
9940msgid "'git bisect bad' can take only one argument."
9941msgstr "'git bisect bad' 只能带一个参数。"
9942
9943#: git-bisect.sh:273
9944msgid "Warning: bisecting only with a bad commit."
9945msgstr "警告:在仅有一个坏提交下进行二分查找。"
9946
9947#  译者:注意保持句尾空格
9948#. TRANSLATORS: Make sure to include [Y] and [n] in your
9949#. translation. The program will only accept English input
9950#. at this point.
9951#: git-bisect.sh:279
9952msgid "Are you sure [Y/n]? "
9953msgstr "您确认么[Y/n]? "
9954
9955#: git-bisect.sh:289
9956msgid ""
9957"You need to give me at least one good and one bad revisions.\n"
9958"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9959msgstr ""
9960"您需要给我至少一个好版本和一个坏版本。\n"
9961"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9962
9963#: git-bisect.sh:292
9964msgid ""
9965"You need to start by \"git bisect start\".\n"
9966"You then need to give me at least one good and one bad revisions.\n"
9967"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9968msgstr ""
9969"您需要执行 \"git bisect start\" 来开始。\n"
9970"然后需要提供我至少一个好版本和一个坏版本。\n"
9971"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9972
9973#: git-bisect.sh:363 git-bisect.sh:490
9974msgid "We are not bisecting."
9975msgstr "我们没有在二分查找。"
9976
9977#: git-bisect.sh:370
9978#, sh-format
9979msgid "'$invalid' is not a valid commit"
9980msgstr "'$invalid' 不是一个有效的提交"
9981
9982#: git-bisect.sh:379
9983#, sh-format
9984msgid ""
9985"Could not check out original HEAD '$branch'.\n"
9986"Try 'git bisect reset <commit>'."
9987msgstr ""
9988"不能检出原始 HEAD '$branch'。\n"
9989"尝试 'git bisect reset <提交>'。"
9990
9991#: git-bisect.sh:406
9992msgid "No logfile given"
9993msgstr "未提供日志文件"
9994
9995#: git-bisect.sh:407
9996#, sh-format
9997msgid "cannot read $file for replaying"
9998msgstr "不能读取 $file 来重放"
9999
10000#: git-bisect.sh:424
10001msgid "?? what are you talking about?"
10002msgstr "?? 您在说什么?"
10003
10004#: git-bisect.sh:436
10005#, sh-format
10006msgid "running $command"
10007msgstr "运行 $command"
10008
10009#: git-bisect.sh:443
10010#, sh-format
10011msgid ""
10012"bisect run failed:\n"
10013"exit code $res from '$command' is < 0 or >= 128"
10014msgstr ""
10015"二分查找运行失败:\n"
10016"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10017
10018#: git-bisect.sh:469
10019msgid "bisect run cannot continue any more"
10020msgstr "二分查找不能继续运行"
10021
10022#: git-bisect.sh:475
10023#, sh-format
10024msgid ""
10025"bisect run failed:\n"
10026"'bisect_state $state' exited with error code $res"
10027msgstr ""
10028"二分查找运行失败:\n"
10029"'bisect_state $state' 退出码为 $res"
10030
10031#: git-bisect.sh:482
10032msgid "bisect run success"
10033msgstr "二分查找运行成功"
10034
10035#: git-pull.sh:21
10036msgid ""
10037"Pull is not possible because you have unmerged files.\n"
10038"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10039"as appropriate to mark resolution, or use 'git commit -a'."
10040msgstr ""
10041"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10042"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
10043"或者使用 'git commit -a'。"
10044
10045#: git-pull.sh:25
10046msgid "Pull is not possible because you have unmerged files."
10047msgstr "Pull 不可用,因为您尚有未合并的文件。"
10048
10049#: git-pull.sh:247
10050msgid "updating an unborn branch with changes added to the index"
10051msgstr "更新尚未诞生的分支,变更添加至索引"
10052
10053#: git-pull.sh:271
10054#, sh-format
10055msgid ""
10056"Warning: fetch updated the current branch head.\n"
10057"Warning: fast-forwarding your working tree from\n"
10058"Warning: commit $orig_head."
10059msgstr ""
10060"警告:fetch 更新了当前的分支。您的工作区\n"
10061"警告:从原提交 $orig_head 快进。"
10062
10063#: git-pull.sh:296
10064msgid "Cannot merge multiple branches into empty head"
10065msgstr "无法将多个分支合并到空分支"
10066
10067#: git-pull.sh:300
10068msgid "Cannot rebase onto multiple branches"
10069msgstr "无法变基到多个分支"
10070
10071#: git-rebase.sh:57
10072msgid ""
10073"When you have resolved this problem, run \"git rebase --continue\".\n"
10074"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10075"To check out the original branch and stop rebasing, run \"git rebase --abort"
10076"\"."
10077msgstr ""
10078"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10079"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10080"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10081
10082#: git-rebase.sh:164
10083msgid "Applied autostash."
10084msgstr "成功应用 autostash。"
10085
10086#: git-rebase.sh:167
10087#, sh-format
10088msgid "Cannot store $stash_sha1"
10089msgstr "无法保存 $stash_sha1"
10090
10091#: git-rebase.sh:168
10092msgid ""
10093"Applying autostash resulted in conflicts.\n"
10094"Your changes are safe in the stash.\n"
10095"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10096msgstr ""
10097"应用 autostash 导致冲突。\n"
10098"您的修改安全地保存在 stash 中。\n"
10099"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10100
10101#: git-rebase.sh:207
10102msgid "The pre-rebase hook refused to rebase."
10103msgstr "钩子 pre-rebase 拒绝变基操作。"
10104
10105#: git-rebase.sh:212
10106msgid "It looks like git-am is in progress. Cannot rebase."
10107msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10108
10109#: git-rebase.sh:350
10110msgid "The --exec option must be used with the --interactive option"
10111msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10112
10113#: git-rebase.sh:355
10114msgid "No rebase in progress?"
10115msgstr "没有正在进行的变基?"
10116
10117#: git-rebase.sh:366
10118msgid "The --edit-todo action can only be used during interactive rebase."
10119msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10120
10121#: git-rebase.sh:373
10122msgid "Cannot read HEAD"
10123msgstr "不能读取 HEAD"
10124
10125#: git-rebase.sh:376
10126msgid ""
10127"You must edit all merge conflicts and then\n"
10128"mark them as resolved using git add"
10129msgstr ""
10130"您必须编辑所有的合并冲突,然后通过 git add\n"
10131"命令将它们标记为已解决"
10132
10133#: git-rebase.sh:394
10134#, sh-format
10135msgid "Could not move back to $head_name"
10136msgstr "无法移回 $head_name"
10137
10138#: git-rebase.sh:413
10139#, sh-format
10140msgid ""
10141"It seems that there is already a $state_dir_base directory, and\n"
10142"I wonder if you are in the middle of another rebase.  If that is the\n"
10143"case, please try\n"
10144"\t$cmd_live_rebase\n"
10145"If that is not the case, please\n"
10146"\t$cmd_clear_stale_rebase\n"
10147"and run me again.  I am stopping in case you still have something\n"
10148"valuable there."
10149msgstr ""
10150"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10151"过程中。 如果是这样,请执行\n"
10152"\t$cmd_live_rebase\n"
10153"如果不是这样,请执行\n"
10154"\t$cmd_clear_stale_rebase\n"
10155"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10156
10157#: git-rebase.sh:464
10158#, sh-format
10159msgid "invalid upstream $upstream_name"
10160msgstr "无效的上游 $upstream_name"
10161
10162#: git-rebase.sh:488
10163#, sh-format
10164msgid "$onto_name: there are more than one merge bases"
10165msgstr "$onto_name: 有一个以上的合并基准"
10166
10167#: git-rebase.sh:491 git-rebase.sh:495
10168#, sh-format
10169msgid "$onto_name: there is no merge base"
10170msgstr "$onto_name: 没有合并基准"
10171
10172#: git-rebase.sh:500
10173#, sh-format
10174msgid "Does not point to a valid commit: $onto_name"
10175msgstr "没有指向一个有效的提交:$onto_name"
10176
10177#: git-rebase.sh:523
10178#, sh-format
10179msgid "fatal: no such branch: $branch_name"
10180msgstr "严重错误:无此分支:$branch_name"
10181
10182#: git-rebase.sh:556
10183msgid "Cannot autostash"
10184msgstr "无法 autostash"
10185
10186#: git-rebase.sh:561
10187#, sh-format
10188msgid "Created autostash: $stash_abbrev"
10189msgstr "创建了 autostash: $stash_abbrev"
10190
10191#: git-rebase.sh:565
10192msgid "Please commit or stash them."
10193msgstr "请提交或为它们保存进度。"
10194
10195#: git-rebase.sh:585
10196#, sh-format
10197msgid "Current branch $branch_name is up to date."
10198msgstr "当前分支 $branch_name 是最新的。"
10199
10200#: git-rebase.sh:589
10201#, sh-format
10202msgid "Current branch $branch_name is up to date, rebase forced."
10203msgstr "当前分支 $branch_name 是最新的,强制变基。"
10204
10205#: git-rebase.sh:600
10206#, sh-format
10207msgid "Changes from $mb to $onto:"
10208msgstr "变更从 $mb 到 $onto:"
10209
10210#: git-rebase.sh:609
10211msgid "First, rewinding head to replay your work on top of it..."
10212msgstr "首先,重置头指针以便在上面重放您的工作..."
10213
10214#: git-rebase.sh:619
10215#, sh-format
10216msgid "Fast-forwarded $branch_name to $onto_name."
10217msgstr "快进 $branch_name 至 $onto_name。"
10218
10219#: git-stash.sh:51
10220msgid "git stash clear with parameters is unimplemented"
10221msgstr "git stash clear 不支持参数"
10222
10223#: git-stash.sh:74
10224msgid "You do not have the initial commit yet"
10225msgstr "您尚未建立初始提交"
10226
10227#: git-stash.sh:89
10228msgid "Cannot save the current index state"
10229msgstr "无法保存当前索引状态"
10230
10231#: git-stash.sh:123 git-stash.sh:136
10232msgid "Cannot save the current worktree state"
10233msgstr "无法保存当前工作区状态"
10234
10235#: git-stash.sh:140
10236msgid "No changes selected"
10237msgstr "没有选择变更"
10238
10239#: git-stash.sh:143
10240msgid "Cannot remove temporary index (can't happen)"
10241msgstr "无法删除临时索引(不应发生)"
10242
10243#: git-stash.sh:156
10244msgid "Cannot record working tree state"
10245msgstr "不能记录工作区状态"
10246
10247#: git-stash.sh:190
10248#, sh-format
10249msgid "Cannot update $ref_stash with $w_commit"
10250msgstr "无法用 $w_commit 更新 $ref_stash"
10251
10252#. TRANSLATORS: $option is an invalid option, like
10253#. `--blah-blah'. The 7 spaces at the beginning of the
10254#. second line correspond to "error: ". So you should line
10255#. up the second line with however many characters the
10256#. translation of "error: " takes in your language. E.g. in
10257#. English this is:
10258#.
10259#. $ git stash save --blah-blah 2>&1 | head -n 2
10260#. error: unknown option for 'stash save': --blah-blah
10261#. To provide a message, use git stash save -- '--blah-blah'
10262#: git-stash.sh:237
10263#, sh-format
10264msgid ""
10265"error: unknown option for 'stash save': $option\n"
10266"       To provide a message, use git stash save -- '$option'"
10267msgstr ""
10268"错误:'stash save' 的未知选项:$option\n"
10269"      要提供一个描述信息,使用 git stash save -- '$option'"
10270
10271#: git-stash.sh:258
10272msgid "No local changes to save"
10273msgstr "没有要保存的本地修改"
10274
10275#: git-stash.sh:262
10276msgid "Cannot initialize stash"
10277msgstr "无法初始化 stash"
10278
10279#: git-stash.sh:266
10280msgid "Cannot save the current status"
10281msgstr "无法保存当前状态"
10282
10283#: git-stash.sh:284
10284msgid "Cannot remove worktree changes"
10285msgstr "无法删除工作区变更"
10286
10287#: git-stash.sh:383
10288msgid "No stash found."
10289msgstr "未发现 stash。"
10290
10291#: git-stash.sh:390
10292#, sh-format
10293msgid "Too many revisions specified: $REV"
10294msgstr "指定了太多的版本:$REV"
10295
10296#: git-stash.sh:396
10297#, sh-format
10298msgid "$reference is not valid reference"
10299msgstr "$reference 不是有效的引用"
10300
10301#: git-stash.sh:424
10302#, sh-format
10303msgid "'$args' is not a stash-like commit"
10304msgstr "'$args' 不是 stash 样提交"
10305
10306#: git-stash.sh:435
10307#, sh-format
10308msgid "'$args' is not a stash reference"
10309msgstr "'$args' 不是一个 stash 引用"
10310
10311#: git-stash.sh:443
10312msgid "unable to refresh index"
10313msgstr "无法刷新索引"
10314
10315#: git-stash.sh:447
10316msgid "Cannot apply a stash in the middle of a merge"
10317msgstr "无法在合并过程中恢复进度"
10318
10319#: git-stash.sh:455
10320msgid "Conflicts in index. Try without --index."
10321msgstr "索引中有冲突。尝试不使用 --index。"
10322
10323#: git-stash.sh:457
10324msgid "Could not save index tree"
10325msgstr "不能保存索引树"
10326
10327#: git-stash.sh:491
10328msgid "Cannot unstage modified files"
10329msgstr "无法还原修改的文件"
10330
10331#: git-stash.sh:506
10332msgid "Index was not unstashed."
10333msgstr "索引的进度没有被恢复。"
10334
10335#: git-stash.sh:529
10336#, sh-format
10337msgid "Dropped ${REV} ($s)"
10338msgstr "丢弃了 ${REV} ($s)"
10339
10340#: git-stash.sh:530
10341#, sh-format
10342msgid "${REV}: Could not drop stash entry"
10343msgstr "${REV}:不能丢弃进度条目"
10344
10345#: git-stash.sh:537
10346msgid "No branch name specified"
10347msgstr "未指定分支名"
10348
10349#: git-stash.sh:609
10350msgid "(To restore them type \"git stash apply\")"
10351msgstr "(为恢复数据输入 \"git stash apply\")"
10352
10353#: git-submodule.sh:95
10354#, sh-format
10355msgid "cannot strip one component off url '$remoteurl'"
10356msgstr "无法从 url '$remoteurl' 剥离一个组件"
10357
10358#: git-submodule.sh:237
10359#, sh-format
10360msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10361msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10362
10363#: git-submodule.sh:287
10364#, sh-format
10365msgid "Clone of '$url' into submodule path '$sm_path' failed"
10366msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10367
10368#: git-submodule.sh:299
10369#, sh-format
10370msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10371msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10372
10373#: git-submodule.sh:409
10374msgid "Relative path can only be used from the toplevel of the working tree"
10375msgstr "只能在工作区的顶级目录中使用相对路径"
10376
10377#: git-submodule.sh:419
10378#, sh-format
10379msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10380msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10381
10382#: git-submodule.sh:436
10383#, sh-format
10384msgid "'$sm_path' already exists in the index"
10385msgstr "'$sm_path' 已经存在于索引中"
10386
10387#: git-submodule.sh:440
10388#, sh-format
10389msgid ""
10390"The following path is ignored by one of your .gitignore files:\n"
10391"$sm_path\n"
10392"Use -f if you really want to add it."
10393msgstr ""
10394"以下路径被您的一个 .gitignore 文件所忽略:\n"
10395"$sm_path\n"
10396"如果您确实想添加它,使用 -f 参数。"
10397
10398#: git-submodule.sh:458
10399#, sh-format
10400msgid "Adding existing repo at '$sm_path' to the index"
10401msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10402
10403#: git-submodule.sh:460
10404#, sh-format
10405msgid "'$sm_path' already exists and is not a valid git repo"
10406msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10407
10408#: git-submodule.sh:468
10409#, sh-format
10410msgid "A git directory for '$sm_name' is found locally with remote(s):"
10411msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10412
10413#: git-submodule.sh:470
10414#, sh-format
10415msgid ""
10416"If you want to reuse this local git directory instead of cloning again from"
10417msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10418
10419#: git-submodule.sh:472
10420#, sh-format
10421msgid ""
10422"use the '--force' option. If the local git directory is not the correct repo"
10423msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10424
10425#: git-submodule.sh:473
10426#, sh-format
10427msgid ""
10428"or you are unsure what this means choose another name with the '--name' "
10429"option."
10430msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10431
10432#: git-submodule.sh:475
10433#, sh-format
10434msgid "Reactivating local git directory for submodule '$sm_name'."
10435msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10436
10437#: git-submodule.sh:487
10438#, sh-format
10439msgid "Unable to checkout submodule '$sm_path'"
10440msgstr "不能检出子模组 '$sm_path'"
10441
10442#: git-submodule.sh:492
10443#, sh-format
10444msgid "Failed to add submodule '$sm_path'"
10445msgstr "无法添加子模组 '$sm_path'"
10446
10447#: git-submodule.sh:501
10448#, sh-format
10449msgid "Failed to register submodule '$sm_path'"
10450msgstr "无法注册子模组 '$sm_path'"
10451
10452#: git-submodule.sh:545
10453#, sh-format
10454msgid "Entering '$prefix$displaypath'"
10455msgstr "正在进入 '$prefix$displaypath'"
10456
10457#: git-submodule.sh:565
10458#, sh-format
10459msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10460msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10461
10462#: git-submodule.sh:611
10463#, sh-format
10464msgid "No url found for submodule path '$displaypath' in .gitmodules"
10465msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10466
10467#: git-submodule.sh:620
10468#, sh-format
10469msgid "Failed to register url for submodule path '$displaypath'"
10470msgstr "无法为子模组路径 '$displaypath' 注册 url"
10471
10472#: git-submodule.sh:622
10473#, sh-format
10474msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10475msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10476
10477#: git-submodule.sh:639
10478#, sh-format
10479msgid "Failed to register update mode for submodule path '$displaypath'"
10480msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10481
10482#: git-submodule.sh:677
10483#, sh-format
10484msgid "Use '.' if you really want to deinitialize all submodules"
10485msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10486
10487#: git-submodule.sh:694
10488#, sh-format
10489msgid "Submodule work tree '$displaypath' contains a .git directory"
10490msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10491
10492#: git-submodule.sh:695
10493#, sh-format
10494msgid ""
10495"(use 'rm -rf' if you really want to remove it including all of its history)"
10496msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10497
10498#: git-submodule.sh:701
10499#, sh-format
10500msgid ""
10501"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10502"discard them"
10503msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10504
10505#: git-submodule.sh:704
10506#, sh-format
10507msgid "Cleared directory '$displaypath'"
10508msgstr "已清除目录 '$displaypath'"
10509
10510#: git-submodule.sh:705
10511#, sh-format
10512msgid "Could not remove submodule work tree '$displaypath'"
10513msgstr "无法移除子模组工作区 '$displaypath'"
10514
10515#: git-submodule.sh:708
10516#, sh-format
10517msgid "Could not create empty submodule directory '$displaypath'"
10518msgstr "不能创建空的子模组目录 '$displaypath'"
10519
10520#: git-submodule.sh:717
10521#, sh-format
10522msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10523msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10524
10525#: git-submodule.sh:833
10526#, sh-format
10527msgid ""
10528"Submodule path '$displaypath' not initialized\n"
10529"Maybe you want to use 'update --init'?"
10530msgstr ""
10531"子模组路径 '$displaypath' 没有初始化\n"
10532"也许您想用 'update --init'?"
10533
10534#: git-submodule.sh:846
10535#, sh-format
10536msgid "Unable to find current revision in submodule path '$displaypath'"
10537msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10538
10539#: git-submodule.sh:855
10540#, sh-format
10541msgid "Unable to fetch in submodule path '$sm_path'"
10542msgstr "无法在子模组路径 '$sm_path' 中获取"
10543
10544#: git-submodule.sh:879
10545#, sh-format
10546msgid "Unable to fetch in submodule path '$displaypath'"
10547msgstr "无法在子模组路径 '$displaypath' 中获取"
10548
10549#: git-submodule.sh:893
10550#, sh-format
10551msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10552msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10553
10554#: git-submodule.sh:894
10555#, sh-format
10556msgid "Submodule path '$displaypath': checked out '$sha1'"
10557msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10558
10559#: git-submodule.sh:898
10560#, sh-format
10561msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10562msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10563
10564#: git-submodule.sh:899
10565#, sh-format
10566msgid "Submodule path '$displaypath': rebased into '$sha1'"
10567msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10568
10569#: git-submodule.sh:904
10570#, sh-format
10571msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10572msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10573
10574#: git-submodule.sh:905
10575#, sh-format
10576msgid "Submodule path '$displaypath': merged in '$sha1'"
10577msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10578
10579#: git-submodule.sh:910
10580#, sh-format
10581msgid ""
10582"Execution of '$command $sha1' failed in submodule  path '$prefix$sm_path'"
10583msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10584
10585#: git-submodule.sh:911
10586#, sh-format
10587msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10588msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10589
10590#: git-submodule.sh:941
10591#, sh-format
10592msgid "Failed to recurse into submodule path '$displaypath'"
10593msgstr "无法递归进子模组路径 '$displaypath'"
10594
10595#: git-submodule.sh:1049
10596msgid "The --cached option cannot be used with the --files option"
10597msgstr "选项 --cached 不能和选项 --files 同时使用"
10598
10599#: git-submodule.sh:1097
10600#, sh-format
10601msgid "unexpected mode $mod_dst"
10602msgstr "意外的模式 $mod_dst"
10603
10604#  译者:注意保持前导空格
10605#: git-submodule.sh:1117
10606#, sh-format
10607msgid "  Warn: $display_name doesn't contain commit $sha1_src"
10608msgstr "  警告:$display_name 未包含提交 $sha1_src"
10609
10610#  译者:注意保持前导空格
10611#: git-submodule.sh:1120
10612#, sh-format
10613msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
10614msgstr "  警告:$display_name 未包含提交 $sha1_dst"
10615
10616#  译者:注意保持前导空格
10617#: git-submodule.sh:1123
10618#, sh-format
10619msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10620msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10621
10622#: git-submodule.sh:1148
10623msgid "blob"
10624msgstr "数据对象"
10625
10626#: git-submodule.sh:1262
10627#, sh-format
10628msgid "Failed to recurse into submodule path '$sm_path'"
10629msgstr "无法递归进子模组路径 '$sm_path'"
10630
10631#: git-submodule.sh:1326
10632#, sh-format
10633msgid "Synchronizing submodule url for '$displaypath'"
10634msgstr "为 '$displaypath' 同步子模组 url"
10635
10636#~ msgid "key id"
10637#~ msgstr "key id"
10638
10639#~ msgid "Tracking not set up: name too long: %s"
10640#~ msgstr "跟踪未设置:名字太长:%s"
10641
10642#~ msgid "bug"
10643#~ msgstr "bug"
10644
10645#  译者:注意保持句尾空格
10646#~ msgid "ahead "
10647#~ msgstr "领先 "
10648
10649#  译者:注意保持句尾空格
10650#~ msgid ", behind "
10651#~ msgstr ",落后 "
10652
10653#~ msgid "could not find .gitmodules in index"
10654#~ msgstr "无法在索引中找到 .gitmodules"
10655
10656#~ msgid "reading updated .gitmodules failed"
10657#~ msgstr "读取更新后的 .gitmodules 失败"
10658
10659#~ msgid "unable to stat updated .gitmodules"
10660#~ msgstr "不能枚举更新后的 .gitmodules"
10661
10662#~ msgid "unable to remove .gitmodules from index"
10663#~ msgstr "不能从索引中移除 .gitmodules"
10664
10665#~ msgid "adding updated .gitmodules failed"
10666#~ msgstr "添加更新后的 .gitmodules 失败"
10667
10668#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10669#~ msgid ""
10670#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
10671#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
10672#~ "anymore.\n"
10673#~ "To add content for the whole tree, run:\n"
10674#~ "\n"
10675#~ "  git add %s :/\n"
10676#~ "  (or git add %s :/)\n"
10677#~ "\n"
10678#~ "To restrict the command to the current directory, run:\n"
10679#~ "\n"
10680#~ "  git add %s .\n"
10681#~ "  (or git add %s .)\n"
10682#~ "\n"
10683#~ "With the current Git version, the command is restricted to the current "
10684#~ "directory.\n"
10685#~ msgstr ""
10686#~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
10687#~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
10688#~ "如果要添加整个目录树的内容,执行:\n"
10689#~ "\n"
10690#~ "  git add %s :/\n"
10691#~ "  (或 git add %s :/)\n"
10692#~ "\n"
10693#~ "如果要限制该命令只作用于当前目录,执行:\n"
10694#~ "\n"
10695#~ "  git add %s .\n"
10696#~ "  (或 git add %s .)\n"
10697#~ "\n"
10698#~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
10699
10700#~ msgid ""
10701#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
10702#~ "whose behaviour will change in Git 2.0 with respect to paths you "
10703#~ "removed.\n"
10704#~ "Paths like '%s' that are\n"
10705#~ "removed from your working tree are ignored with this version of Git.\n"
10706#~ "\n"
10707#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
10708#~ "  ignores paths you removed from your working tree.\n"
10709#~ "\n"
10710#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
10711#~ "\n"
10712#~ "Run 'git status' to check the paths you removed from your working tree.\n"
10713#~ msgstr ""
10714#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
10715#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
10716#~ "像本地工作区移除的路径 '%s'\n"
10717#~ "在此版本的 Git 中被忽略。\n"
10718#~ "\n"
10719#~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
10720#~ "  忽略您本地工作区中移除的文件。\n"
10721#~ "\n"
10722#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
10723#~ "\n"
10724#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
10725
10726#~ msgid ""
10727#~ "Auto packing the repository for optimum performance. You may also\n"
10728#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
10729#~ msgstr ""
10730#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
10731#~ "参见 \"git help gc\" 以获取更多信息。\n"
10732
10733#~ msgid ""
10734#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
10735#~ "counterpart. If you did not intend to push that branch, you may want to\n"
10736#~ "specify branches to push or set the 'push.default' configuration "
10737#~ "variable\n"
10738#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
10739#~ msgstr ""
10740#~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
10741#~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
10742#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
10743#~ "以便只推送当前分支。"
10744
10745#  译者:为保证在输出中对齐,注意调整句中空格!
10746#~ msgid "copied:     %s -> %s"
10747#~ msgstr "拷贝:      %s -> %s"
10748
10749#  译者:为保证在输出中对齐,注意调整句中空格!
10750#~ msgid "deleted:    %s"
10751#~ msgstr "删除:      %s"
10752
10753#  译者:为保证在输出中对齐,注意调整句中空格!
10754#~ msgid "modified:   %s"
10755#~ msgstr "修改:      %s"
10756
10757#  译者:为保证在输出中对齐,注意调整句中空格!
10758#~ msgid "renamed:    %s -> %s"
10759#~ msgstr "重命名:    %s -> %s"
10760
10761#  译者:为保证在输出中对齐,注意调整句中空格!
10762#~ msgid "unmerged:   %s"
10763#~ msgstr "未合并:    %s"
10764
10765#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10766#~ msgid ""
10767#~ "push.default is unset; its implicit value is changing in\n"
10768#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
10769#~ "and maintain the current behavior after the default changes, use:\n"
10770#~ "\n"
10771#~ "  git config --global push.default matching\n"
10772#~ "\n"
10773#~ "To squelch this message and adopt the new behavior now, use:\n"
10774#~ "\n"
10775#~ "  git config --global push.default simple\n"
10776#~ "\n"
10777#~ "See 'git help config' and search for 'push.default' for further "
10778#~ "information.\n"
10779#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
10780#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
10781#~ msgstr ""
10782#~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
10783#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
10784#~ "\n"
10785#~ "  git config --global push.default matching\n"
10786#~ "\n"
10787#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
10788#~ "\n"
10789#~ "  git config --global push.default simple\n"
10790#~ "\n"
10791#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
10792#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
10793#~ "为保持兼容,请用 'current' 代替 'simple')"
10794
10795#~ msgid "input paths are terminated by a null character"
10796#~ msgstr "输入路径以null字符终止"
10797
10798#~ msgid ""
10799#~ "The following untracked files would NOT be saved but need to be removed "
10800#~ "by stash save:"
10801#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
10802
10803#~ msgid ""
10804#~ "Aborting. Consider using either the --force or --include-untracked option."
10805#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
10806
10807#~ msgid ""
10808#~ "the following submodule (or one of its nested submodule)\n"
10809#~ "uses a .git directory:"
10810#~ msgid_plural ""
10811#~ "the following submodules (or one of its nested submodule)\n"
10812#~ "use a .git directory:"
10813#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10814#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10815
10816#  译者:注意保持前导空格
10817#~ msgid "  (fix conflicts and then run \"git am --resolved\")"
10818#~ msgstr "  (解决冲突,然后运行 \"git am --resolved\")"
10819
10820#  译者:注意保持前导空格
10821#~ msgid "  (all conflicts fixed: run \"git commit\")"
10822#~ msgstr "  (解决所有冲突后,执行 \"git commit\")"
10823
10824#~ msgid "more than %d trees given: '%s'"
10825#~ msgstr "提供了超过 %d 个树对象:'%s'"
10826
10827#~ msgid "You cannot combine --no-ff with --ff-only."
10828#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10829
10830#~ msgid ""
10831#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10832#~ "(use 'rm -rf' if you really want to remove it including all of its "
10833#~ "history)"
10834#~ msgstr ""
10835#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10836#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10837
10838#~ msgid ""
10839#~ "'%s' has changes staged in the index\n"
10840#~ "(use --cached to keep the file, or -f to force removal)"
10841#~ msgstr ""
10842#~ "'%s' 有变更已暂存至索引中\n"
10843#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10844
10845#~ msgid "show commits where no parent comes before its children"
10846#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10847
10848#~ msgid "show the HEAD reference"
10849#~ msgstr "显示 HEAD 引用"
10850
10851#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10852#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10853
10854#~ msgid "Change flags"
10855#~ msgstr "修改参数"
10856
10857#~ msgid ""
10858#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10859#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10860
10861#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
10862#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
10863
10864#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
10865#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
10866
10867#~ msgid "See 'git help <command>' for more information on a specific command."
10868#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
10869
10870#~ msgid "BUG: impossible combination of %d and %p"
10871#~ msgstr "BUG: 无法组合 %d 和 %p"
10872
10873#  译者:以下三条实际为一个段落
10874#~ msgid "It took %.2f seconds to enumerate untracked files.  'status -uno'"
10875#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
10876
10877#  译者:为对齐,下面两句内容有调整
10878#~ msgid "may speed it up, but you have to be careful not to forget to add"
10879#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
10880
10881#~ msgid "new files yourself (see 'git help status')."
10882#~ msgstr "(参见 'git help status')。"
10883
10884#~ msgid "use any ref in .git/refs"
10885#~ msgstr "使用 .git/refs 里的任意引用"
10886
10887#~ msgid "use any tag in .git/refs/tags"
10888#~ msgstr "使用 .git/refs/tags 里的任意 tag"
10889
10890#~ msgid "bad object %s"
10891#~ msgstr "坏对象 %s"
10892
10893#~ msgid "bogus committer info %s"
10894#~ msgstr "虚假的提交者信息 %s"
10895
10896#~ msgid "can't fdopen 'show' output fd"
10897#~ msgstr "不能打开 'show' 输出文件句柄"
10898
10899#~ msgid "failed to close pipe to 'show' for object '%s'"
10900#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
10901
10902#~ msgid " 0 files changed"
10903#~ msgstr " 0 个文件被修改"
10904
10905#~ msgid " %d file changed"
10906#~ msgid_plural " %d files changed"
10907#~ msgstr[0] " %d 个文件被修改"
10908#~ msgstr[1] " %d 个文件被修改"
10909
10910#~ msgid ", %d insertion(+)"
10911#~ msgid_plural ", %d insertions(+)"
10912#~ msgstr[0] ",插入 %d 行(+)"
10913#~ msgstr[1] ",插入 %d 行(+)"
10914
10915#~ msgid ", %d deletion(-)"
10916#~ msgid_plural ", %d deletions(-)"
10917#~ msgstr[0] ",删除 %d 行(-)"
10918#~ msgstr[1] ",删除 %d 行(-)"
10919
10920#~ msgid "You do not have a valid HEAD"
10921#~ msgstr "您没有一个有效的 HEAD"
10922
10923#~ msgid "oops"
10924#~ msgstr "哎哟"
10925
10926#~ msgid "Would not remove %s\n"
10927#~ msgstr "不会删除 %s\n"
10928
10929#~ msgid "Not removing %s\n"
10930#~ msgstr "未删除 %s\n"
10931
10932#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
10933#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
10934
10935#~ msgid "Could not read index"
10936#~ msgstr "不能读取索引"
10937
10938#  译者:中文字符串拼接,可删除前导空格
10939#~ msgid " (use \"git add\" to track)"
10940#~ msgstr "(使用 \"git add\" 建立跟踪)"
10941
10942#~ msgid "--detach cannot be used with -b/-B/--orphan"
10943#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
10944
10945#~ msgid "--detach cannot be used with -t"
10946#~ msgstr "--detach 不能和 -t 同时使用"
10947
10948#~ msgid "--orphan and -b|-B are mutually exclusive"
10949#~ msgstr "--orphan 和 -b|-B 互斥"
10950
10951#~ msgid "--orphan cannot be used with -t"
10952#~ msgstr "--orphan 不能和 -t 同时使用"
10953
10954#~ msgid "git checkout: -f and -m are incompatible"
10955#~ msgstr "git checkout:-f 和 -m 不兼容"
10956
10957#~ msgid ""
10958#~ "git checkout: updating paths is incompatible with switching branches."
10959#~ msgstr "git checkout:更新路径和切换分支不兼容。"
10960
10961#~ msgid "diff setup failed"
10962#~ msgstr "diff 设置失败"
10963
10964#~ msgid "merge-recursive: disk full?"
10965#~ msgstr "merge-recursive:磁盘已满?"
10966
10967#~ msgid "diff_setup_done failed"
10968#~ msgstr "diff_setup_done 失败"