po / zh_CN.poon commit Merge branch 'jc/ws-error-highlight' (e5272d3)
   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# Contributors:
   6#   - Jiang Xin <worldhello.net AT gmail.com>
   7#   - Lian Cheng <rhythm.mail AT gmail.com>
   8#   - Ray Chen <oldsharp AT gmail.com>
   9#   - Riku <lu.riku AT gmail.com>
  10#   - Thynson <lanxingcan AT gmail.com>
  11#   - ws3389 <willsmith3389 AT gmail.com>
  12#   - Wang Sheng <wangsheng2008love AT 163.com>
  13#   - Yichao Yu <yyc1992 AT gmail.com>
  14#   - Zhuang Ya <zhuangya AT me.com>
  15#
  16#  Git glossary for Chinese translators
  17#
  18#   English                          |  Chinese
  19#   ---------------------------------+--------------------------------------
  20#   3-way merge                      |  三方合并
  21#   abbreviate                       |  简写(的 SHA-1 值)
  22#   alternate object database        |  备用对象库
  23#   amend                            |  修补
  24#   ancestor                         |  祖先,祖先提交
  25#   annotated tag                    |  附注标签
  26#   bare repository                  |  纯仓库
  27#   bisect                           |  二分查找
  28#   blob object                      |  数据对象
  29#   branch                           |  分支
  30#   bundle                           |  包
  31#   bypass                           |  绕过
  32#   cache                            |  索引(的别称)
  33#   chain                            |  (提交)链
  34#   changeset                        |  变更集
  35#   checkout                         |  检出
  36#   checksum                         |  校验,校验和
  37#   cherry-picking                   |  拣选
  38#   clean                            |  干净(的工作区)
  39#   clone                            |  克隆
  40#   commit                           |  提交
  41#   commit message                   |  提交说明
  42#   commit object                    |  提交对象
  43#   commit-ish (also committish)     |  提交号
  44#   conflict                         |  冲突
  45#   core Git                         |  核心 Git 工具
  46#   DAG                              |  有向无环图
  47#   dangling object                  |  摇摆对象
  48#   detached HEAD                    |  分离头指针
  49#   directory                        |  目录
  50#   dirty                            |  脏(的工作区)
  51#   dumb HTTP protocol               |  哑 HTTP 协议
  52#   evil merge                       |  坏合并(合并引入了父提交没有的修改)
  53#   fast-forward                     |  快进
  54#   fetch                            |  获取
  55#   file system                      |  文件系统
  56#   fork                             |  派生
  57#   Git archive                      |  仓库(对于 arch 用户)
  58#   gitfile                          |  gitfile(仓库链接文件)
  59#   grafts                           |  (提交)嫁接
  60#   hash                             |  哈希值
  61#   HEAD                             |  HEAD(头指针,亦即当前分支)
  62#   head                             |  头、分支
  63#   head ref                         |  分支
  64#   header                           |  头信息
  65#   hook                             |  钩子
  66#   hunk                             |  补丁片段
  67#   index                            |  索引
  68#   index entry                      |  索引条目
  69#   loose object                     |  松散对象
  70#   loose refs                       |  松散引用
  71#   master                           |  master(默认分支名)
  72#   merge                            |  合并
  73#   object                           |  对象
  74#   object database                  |  对象库
  75#   object identifier                |  对象标识符
  76#   object name                      |  对象名称
  77#   object type                      |  对象类型
  78#   octopus                          |  章鱼式合并(两分支以上的合并)
  79#   origin                           |  origin(默认的远程名称)
  80#   pack                             |  包
  81#   pack index                       |  包索引
  82#   packfile                         |  包文件
  83#   parent                           |  父提交
  84#   patch                            |  补丁
  85#   pathspec                         |  路径规格
  86#   pattern                          |  模式
  87#   pickaxe                          |  挖掘
  88#   plumbing                         |  管件(Git 底层核心命令的别称)
  89#   porcelain                        |  瓷件(Git 上层封装命令的别称)
  90#   precious-objects repo            |  珍品仓库
  91#   prune                            |  清除
  92#   pull                             |  拉,拉取
  93#   push                             |  推,推送
  94#   reachable                        |  可达
  95#   rebase                           |  变基
  96#   ref                              |  引用
  97#   reflog                           |  引用日志
  98#   refspec                          |  引用规格
  99#   remote                           |  远程,远程仓库
 100#   remote-tracking branch           |  远程跟踪分支
 101#   replay                           |  重放
 102#   repo                             |  仓库
 103#   repository                       |  仓库
 104#   resolve                          |  (冲突)解决
 105#   revert                           |  还原
 106#   revision                         |  版本
 107#   rewind                           |  回退
 108#   SCM                              |  源代码管理(工具)
 109#   SHA-1                            |  SHA-1(安全哈希算法1)
 110#   shallow repository               |  浅(克隆)仓库
 111#   signed tag                       |  签名标签
 112#   smart HTTP protocol              |  智能 HTTP 协议
 113#   squash                           |  压缩
 114#   stage                            |  n. 暂存区(即索引); v. 暂存
 115#   stash                            |  n. 进度保存; v. 保存进度
 116#   submodule                        |  子模组
 117#   symref                           |  符号引用
 118#   tag                              |  n. 标签; v. 打标签
 119#   tag object                       |  标签对象
 120#   tagger                           |  打标签者
 121#   topic branch                     |  主题分支
 122#   track                            |  跟踪
 123#   tree                             |  树(工作区或树对象)
 124#   tree object                      |  树对象
 125#   tree-ish (also treeish)          |  树对象(或可以解析为一树对象)
 126#   unmerged index                   |  未合并索引
 127#   unpack                           |  解包
 128#   unreachable object               |  不可达对象
 129#   unstage                          |  取消暂存
 130#   upstream                         |  上游
 131#   upstream branch                  |  上游分支
 132#   working tree                     |  工作区
 133#
 134msgid ""
 135msgstr ""
 136"Project-Id-Version: Git\n"
 137"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 138"POT-Creation-Date: 2016-08-27 23:21+0800\n"
 139"PO-Revision-Date: 2016-09-05 23:36+0800\n"
 140"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 141"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 142"Language: zh_CN\n"
 143"MIME-Version: 1.0\n"
 144"Content-Type: text/plain; charset=UTF-8\n"
 145"Content-Transfer-Encoding: 8bit\n"
 146"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 147
 148#: advice.c:55
 149#, c-format
 150msgid "hint: %.*s\n"
 151msgstr "提示:%.*s\n"
 152
 153#: advice.c:83
 154msgid "Cherry-picking is not possible because you have unmerged files."
 155msgstr "无法拣选,因为您有未合并的文件。"
 156
 157#: advice.c:85
 158msgid "Committing is not possible because you have unmerged files."
 159msgstr "无法提交,因为您有未合并的文件。"
 160
 161#: advice.c:87
 162msgid "Merging is not possible because you have unmerged files."
 163msgstr "无法合并,因为您有未合并的文件。"
 164
 165#: advice.c:89
 166msgid "Pulling is not possible because you have unmerged files."
 167msgstr "无法拉取,因为您有未合并的文件。"
 168
 169#: advice.c:91
 170msgid "Reverting is not possible because you have unmerged files."
 171msgstr "无法回退,因为您有未合并的文件。"
 172
 173#: advice.c:93
 174#, c-format
 175msgid "It is not possible to %s because you have unmerged files."
 176msgstr "无法 %s,因为您有未合并的文件。"
 177
 178#: advice.c:101
 179msgid ""
 180"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 181"as appropriate to mark resolution and make a commit."
 182msgstr ""
 183"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
 184"解决方案并提交。"
 185
 186#: advice.c:109
 187msgid "Exiting because of an unresolved conflict."
 188msgstr "因为存在未解决的冲突而退出。"
 189
 190#: advice.c:114 builtin/merge.c:1181
 191msgid "You have not concluded your merge (MERGE_HEAD exists)."
 192msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
 193
 194#: advice.c:116
 195msgid "Please, commit your changes before merging."
 196msgstr "请在合并前先提交您的修改。"
 197
 198#: advice.c:117
 199msgid "Exiting because of unfinished merge."
 200msgstr "因为存在未完成的合并而退出。"
 201
 202#: advice.c:123
 203#, c-format
 204msgid ""
 205"Note: checking out '%s'.\n"
 206"\n"
 207"You are in 'detached HEAD' state. You can look around, make experimental\n"
 208"changes and commit them, and you can discard any commits you make in this\n"
 209"state without impacting any branches by performing another checkout.\n"
 210"\n"
 211"If you want to create a new branch to retain commits you create, you may\n"
 212"do so (now or later) by using -b with the checkout command again. Example:\n"
 213"\n"
 214"  git checkout -b <new-branch-name>\n"
 215"\n"
 216msgstr ""
 217"注意:正在检出 '%s'。\n"
 218"\n"
 219"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另外\n"
 220"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
 221"\n"
 222"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
 223"参数 -b 来实现(现在或稍后)。例如:\n"
 224"\n"
 225"  git checkout -b <new-branch-name>\n"
 226"\n"
 227
 228#: archive.c:12
 229msgid "git archive [<options>] <tree-ish> [<path>...]"
 230msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 231
 232#: archive.c:13
 233msgid "git archive --list"
 234msgstr "git archive --list"
 235
 236#: archive.c:14
 237msgid ""
 238"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 239msgstr ""
 240"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 241
 242#: archive.c:15
 243msgid "git archive --remote <repo> [--exec <cmd>] --list"
 244msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 245
 246#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
 247#, c-format
 248msgid "pathspec '%s' did not match any files"
 249msgstr "路径规格 '%s' 未匹配任何文件"
 250
 251#: archive.c:429
 252msgid "fmt"
 253msgstr "格式"
 254
 255#: archive.c:429
 256msgid "archive format"
 257msgstr "归档格式"
 258
 259#: archive.c:430 builtin/log.c:1422
 260msgid "prefix"
 261msgstr "前缀"
 262
 263#: archive.c:431
 264msgid "prepend prefix to each pathname in the archive"
 265msgstr "为归档中每个路径名加上前缀"
 266
 267#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
 268#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
 269#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
 270#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
 271#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
 272msgid "file"
 273msgstr "文件"
 274
 275#: archive.c:433 builtin/archive.c:89
 276msgid "write the archive to this file"
 277msgstr "归档写入此文件"
 278
 279#: archive.c:435
 280msgid "read .gitattributes in working directory"
 281msgstr "读取工作区中的 .gitattributes"
 282
 283#: archive.c:436
 284msgid "report archived files on stderr"
 285msgstr "在标准错误上报告归档文件"
 286
 287#: archive.c:437
 288msgid "store only"
 289msgstr "只存储"
 290
 291#: archive.c:438
 292msgid "compress faster"
 293msgstr "压缩速度更快"
 294
 295#: archive.c:446
 296msgid "compress better"
 297msgstr "压缩效果更好"
 298
 299#: archive.c:449
 300msgid "list supported archive formats"
 301msgstr "列出支持的归档格式"
 302
 303#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
 304#: builtin/submodule--helper.c:832
 305msgid "repo"
 306msgstr "仓库"
 307
 308#: archive.c:452 builtin/archive.c:91
 309msgid "retrieve the archive from remote repository <repo>"
 310msgstr "从远程仓库(<仓库>)提取归档文件"
 311
 312#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
 313msgid "command"
 314msgstr "命令"
 315
 316#: archive.c:454 builtin/archive.c:93
 317msgid "path to the remote git-upload-archive command"
 318msgstr "远程 git-upload-archive 命令的路径"
 319
 320#: archive.c:461
 321msgid "Unexpected option --remote"
 322msgstr "未知参数 --remote"
 323
 324#: archive.c:463
 325msgid "Option --exec can only be used together with --remote"
 326msgstr "选项 --exec 只能和 --remote 同时使用"
 327
 328#: archive.c:465
 329msgid "Unexpected option --output"
 330msgstr "未知参数 --output"
 331
 332#: archive.c:487
 333#, c-format
 334msgid "Unknown archive format '%s'"
 335msgstr "未知归档格式 '%s'"
 336
 337#: archive.c:494
 338#, c-format
 339msgid "Argument not supported for format '%s': -%d"
 340msgstr "参数不支持此格式 '%s':-%d"
 341
 342#: attr.c:263
 343msgid ""
 344"Negative patterns are ignored in git attributes\n"
 345"Use '\\!' for literal leading exclamation."
 346msgstr ""
 347"负值模版在 git attributes 中被忽略\n"
 348"当字符串确实要以感叹号开始时,使用 '\\!'。"
 349
 350#: bisect.c:441
 351#, c-format
 352msgid "Could not open file '%s'"
 353msgstr "不能打开文件 '%s'"
 354
 355#: bisect.c:446
 356#, c-format
 357msgid "Badly quoted content in file '%s': %s"
 358msgstr "文件 '%s' 包含错误的引用格式:%s"
 359
 360#: bisect.c:655
 361#, c-format
 362msgid "We cannot bisect more!\n"
 363msgstr "我们无法进行更多的二分查找!\n"
 364
 365#: bisect.c:708
 366#, c-format
 367msgid "Not a valid commit name %s"
 368msgstr "不是一个有效的提交名 %s"
 369
 370#: bisect.c:732
 371#, c-format
 372msgid ""
 373"The merge base %s is bad.\n"
 374"This means the bug has been fixed between %s and [%s].\n"
 375msgstr ""
 376"合并基线 %s 是坏的。\n"
 377"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 378
 379#: bisect.c:737
 380#, c-format
 381msgid ""
 382"The merge base %s is new.\n"
 383"The property has changed between %s and [%s].\n"
 384msgstr ""
 385"合并基线 %s 是新的。\n"
 386"介于 %s 和 [%s] 之间的属性已经被修改。\n"
 387
 388#: bisect.c:742
 389#, c-format
 390msgid ""
 391"The merge base %s is %s.\n"
 392"This means the first '%s' commit is between %s and [%s].\n"
 393msgstr ""
 394"合并基线 %s 是 %s。\n"
 395"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
 396
 397#: bisect.c:750
 398#, c-format
 399msgid ""
 400"Some %s revs are not ancestor of the %s rev.\n"
 401"git bisect cannot work properly in this case.\n"
 402"Maybe you mistook %s and %s revs?\n"
 403msgstr ""
 404"一些 %s 版本不是 %s 版本的祖先。\n"
 405"这种情况下 git 二分查找无法正常工作。\n"
 406"您可能弄错了 %s 和 %s 版本?\n"
 407
 408#: bisect.c:763
 409#, c-format
 410msgid ""
 411"the merge base between %s and [%s] must be skipped.\n"
 412"So we cannot be sure the first %s commit is between %s and %s.\n"
 413"We continue anyway."
 414msgstr ""
 415"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
 416"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
 417"我们仍旧继续。"
 418
 419#: bisect.c:798
 420#, c-format
 421msgid "Bisecting: a merge base must be tested\n"
 422msgstr "二分查找中:合并基线必须是经过测试的\n"
 423
 424#: bisect.c:849
 425#, c-format
 426msgid "a %s revision is needed"
 427msgstr "需要一个 %s 版本"
 428
 429#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
 430#, c-format
 431msgid "could not create file '%s'"
 432msgstr "不能创建文件 '%s'"
 433
 434#: bisect.c:917
 435#, c-format
 436msgid "could not read file '%s'"
 437msgstr "不能读取文件 '%s'"
 438
 439#: bisect.c:947
 440msgid "reading bisect refs failed"
 441msgstr "读取二分查找引用失败"
 442
 443#: bisect.c:967
 444#, c-format
 445msgid "%s was both %s and %s\n"
 446msgstr "%s 同时为 %s 和 %s\n"
 447
 448#: bisect.c:975
 449#, c-format
 450msgid ""
 451"No testable commit found.\n"
 452"Maybe you started with bad path parameters?\n"
 453msgstr ""
 454"没有发现可测试的提交。\n"
 455"可能您在运行时使用了错误的路径参数?\n"
 456
 457#: bisect.c:994
 458#, c-format
 459msgid "(roughly %d step)"
 460msgid_plural "(roughly %d steps)"
 461msgstr[0] "(大概 %d 步)"
 462msgstr[1] "(大概 %d 步)"
 463
 464#. TRANSLATORS: the last %s will be replaced with
 465#. "(roughly %d steps)" translation
 466#: bisect.c:998
 467#, c-format
 468msgid "Bisecting: %d revision left to test after this %s\n"
 469msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 470msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
 471msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
 472
 473#: branch.c:53
 474#, c-format
 475msgid ""
 476"\n"
 477"After fixing the error cause you may try to fix up\n"
 478"the remote tracking information by invoking\n"
 479"\"git branch --set-upstream-to=%s%s%s\"."
 480msgstr ""
 481"\n"
 482"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
 483"\"git branch --set-upstream-to=%s%s%s\" 。"
 484
 485#: branch.c:67
 486#, c-format
 487msgid "Not setting branch %s as its own upstream."
 488msgstr "未设置分支 %s 作为它自己的上游。"
 489
 490#: branch.c:93
 491#, c-format
 492msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 493msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 494
 495#: branch.c:94
 496#, c-format
 497msgid "Branch %s set up to track remote branch %s from %s."
 498msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 499
 500#: branch.c:98
 501#, c-format
 502msgid "Branch %s set up to track local branch %s by rebasing."
 503msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 504
 505#: branch.c:99
 506#, c-format
 507msgid "Branch %s set up to track local branch %s."
 508msgstr "分支 %s 设置为跟踪本地分支 %s。"
 509
 510#: branch.c:104
 511#, c-format
 512msgid "Branch %s set up to track remote ref %s by rebasing."
 513msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 514
 515#: branch.c:105
 516#, c-format
 517msgid "Branch %s set up to track remote ref %s."
 518msgstr "分支 %s 设置为跟踪远程引用 %s。"
 519
 520#: branch.c:109
 521#, c-format
 522msgid "Branch %s set up to track local ref %s by rebasing."
 523msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 524
 525#: branch.c:110
 526#, c-format
 527msgid "Branch %s set up to track local ref %s."
 528msgstr "分支 %s 设置为跟踪本地引用 %s。"
 529
 530#: branch.c:119
 531msgid "Unable to write upstream branch configuration"
 532msgstr "无法写入上游分支配置"
 533
 534#: branch.c:156
 535#, c-format
 536msgid "Not tracking: ambiguous information for ref %s"
 537msgstr "未跟踪:引用 %s 有歧义"
 538
 539#: branch.c:185
 540#, c-format
 541msgid "'%s' is not a valid branch name."
 542msgstr "'%s' 不是一个有效的分支名称。"
 543
 544#: branch.c:190
 545#, c-format
 546msgid "A branch named '%s' already exists."
 547msgstr "一个分支名 '%s' 已经存在。"
 548
 549#: branch.c:198
 550msgid "Cannot force update the current branch."
 551msgstr "无法强制更新当前分支。"
 552
 553#: branch.c:218
 554#, c-format
 555msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 556msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
 557
 558#: branch.c:220
 559#, c-format
 560msgid "the requested upstream branch '%s' does not exist"
 561msgstr "请求的上游分支 '%s' 不存在"
 562
 563#: branch.c:222
 564msgid ""
 565"\n"
 566"If you are planning on basing your work on an upstream\n"
 567"branch that already exists at the remote, you may need to\n"
 568"run \"git fetch\" to retrieve it.\n"
 569"\n"
 570"If you are planning to push out a new local branch that\n"
 571"will track its remote counterpart, you may want to use\n"
 572"\"git push -u\" to set the upstream config as you push."
 573msgstr ""
 574"\n"
 575"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
 576"您可能需要执行 \"git fetch\" 来获取分支。\n"
 577"\n"
 578"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
 579"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 580
 581#: branch.c:266
 582#, c-format
 583msgid "Not a valid object name: '%s'."
 584msgstr "不是一个有效的对象名:'%s'。"
 585
 586#: branch.c:286
 587#, c-format
 588msgid "Ambiguous object name: '%s'."
 589msgstr "歧义的对象名:'%s'。"
 590
 591#: branch.c:291
 592#, c-format
 593msgid "Not a valid branch point: '%s'."
 594msgstr "无效的分支点:'%s'。"
 595
 596#: branch.c:345
 597#, c-format
 598msgid "'%s' is already checked out at '%s'"
 599msgstr "'%s' 已经检出到 '%s'"
 600
 601#: branch.c:364
 602#, c-format
 603msgid "HEAD of working tree %s is not updated"
 604msgstr "工作区 %s 的 HEAD 指向没有被更新"
 605
 606#: bundle.c:34
 607#, c-format
 608msgid "'%s' does not look like a v2 bundle file"
 609msgstr "'%s' 不像是一个 v2 版本的包文件"
 610
 611#: bundle.c:61
 612#, c-format
 613msgid "unrecognized header: %s%s (%d)"
 614msgstr "未能识别的包头:%s%s (%d)"
 615
 616#: bundle.c:87 builtin/commit.c:778
 617#, c-format
 618msgid "could not open '%s'"
 619msgstr "不能打开 '%s'"
 620
 621#: bundle.c:139
 622msgid "Repository lacks these prerequisite commits:"
 623msgstr "仓库中缺少这些必备的提交:"
 624
 625#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
 626#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
 627#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
 628#: builtin/merge.c:356 builtin/shortlog.c:170
 629msgid "revision walk setup failed"
 630msgstr "版本遍历设置失败"
 631
 632#: bundle.c:185
 633#, c-format
 634msgid "The bundle contains this ref:"
 635msgid_plural "The bundle contains these %d refs:"
 636msgstr[0] "这个包中含有这个引用:"
 637msgstr[1] "这个包中含有 %d 个引用:"
 638
 639#: bundle.c:192
 640msgid "The bundle records a complete history."
 641msgstr "这个包记录一个完整历史。"
 642
 643#: bundle.c:194
 644#, c-format
 645msgid "The bundle requires this ref:"
 646msgid_plural "The bundle requires these %d refs:"
 647msgstr[0] "这个包需要这个引用:"
 648msgstr[1] "这个包需要 %d 个引用:"
 649
 650#: bundle.c:253
 651msgid "Could not spawn pack-objects"
 652msgstr "不能生成 pack-objects 进程"
 653
 654#: bundle.c:264
 655msgid "pack-objects died"
 656msgstr "pack-objects 终止"
 657
 658#: bundle.c:304
 659msgid "rev-list died"
 660msgstr "rev-list 终止"
 661
 662#: bundle.c:353
 663#, c-format
 664msgid "ref '%s' is excluded by the rev-list options"
 665msgstr "引用 '%s' 被 rev-list 选项排除"
 666
 667#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
 668#, c-format
 669msgid "unrecognized argument: %s"
 670msgstr "未能识别的参数:%s"
 671
 672#: bundle.c:451
 673msgid "Refusing to create empty bundle."
 674msgstr "不能创建空包。"
 675
 676#: bundle.c:463
 677#, c-format
 678msgid "cannot create '%s'"
 679msgstr "不能创建 '%s'"
 680
 681#: bundle.c:491
 682msgid "index-pack died"
 683msgstr "index-pack 终止"
 684
 685#: color.c:290
 686#, c-format
 687msgid "invalid color value: %.*s"
 688msgstr "无效的颜色值:%.*s"
 689
 690#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
 691#: builtin/am.c:2119
 692#, c-format
 693msgid "could not parse %s"
 694msgstr "不能解析 %s"
 695
 696#: commit.c:42
 697#, c-format
 698msgid "%s %s is not a commit!"
 699msgstr "%s %s 不是一个提交!"
 700
 701#: compat/obstack.c:406 compat/obstack.c:408
 702msgid "memory exhausted"
 703msgstr "内存耗尽"
 704
 705#: config.c:516
 706#, c-format
 707msgid "bad config line %d in blob %s"
 708msgstr "数据对象 %2$s 中错误的配置行 %1$d"
 709
 710#: config.c:520
 711#, c-format
 712msgid "bad config line %d in file %s"
 713msgstr "文件 %2$s 中错误的配置行 %1$d"
 714
 715#: config.c:524
 716#, c-format
 717msgid "bad config line %d in standard input"
 718msgstr "标准输入中错误的配置行 %d"
 719
 720#: config.c:528
 721#, c-format
 722msgid "bad config line %d in submodule-blob %s"
 723msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
 724
 725#: config.c:532
 726#, c-format
 727msgid "bad config line %d in command line %s"
 728msgstr "命令行 %2$s 中错误的配置行 %1$d"
 729
 730#: config.c:536
 731#, c-format
 732msgid "bad config line %d in %s"
 733msgstr "在 %2$s 中错误的配置行 %1$d"
 734
 735#: config.c:655
 736msgid "out of range"
 737msgstr "超出范围"
 738
 739#: config.c:655
 740msgid "invalid unit"
 741msgstr "无效的单位"
 742
 743#: config.c:661
 744#, c-format
 745msgid "bad numeric config value '%s' for '%s': %s"
 746msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
 747
 748#: config.c:666
 749#, c-format
 750msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 751msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
 752
 753#: config.c:669
 754#, c-format
 755msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 756msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
 757
 758#: config.c:672
 759#, c-format
 760msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 761msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
 762
 763#: config.c:675
 764#, c-format
 765msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 766msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
 767
 768#: config.c:678
 769#, c-format
 770msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 771msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
 772
 773#: config.c:681
 774#, c-format
 775msgid "bad numeric config value '%s' for '%s' in %s: %s"
 776msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
 777
 778#: config.c:768
 779#, c-format
 780msgid "failed to expand user dir in: '%s'"
 781msgstr "无法扩展 '%s' 中的用户目录"
 782
 783#: config.c:849 config.c:860
 784#, c-format
 785msgid "bad zlib compression level %d"
 786msgstr "错误的 zlib 压缩级别 %d"
 787
 788#: config.c:978
 789#, c-format
 790msgid "invalid mode for object creation: %s"
 791msgstr "无效的对象创建模式:%s"
 792
 793#: config.c:1312
 794msgid "unable to parse command-line config"
 795msgstr "无法解析命令行中的配置"
 796
 797#: config.c:1362
 798msgid "unknown error occurred while reading the configuration files"
 799msgstr "在读取配置文件时遇到未知错误"
 800
 801#: config.c:1716
 802#, c-format
 803msgid "unable to parse '%s' from command-line config"
 804msgstr "无法解析命令行配置中的 '%s'"
 805
 806#: config.c:1718
 807#, c-format
 808msgid "bad config variable '%s' in file '%s' at line %d"
 809msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 810
 811#: config.c:1777
 812#, c-format
 813msgid "%s has multiple values"
 814msgstr "%s 有多个取值"
 815
 816#: config.c:2311
 817#, c-format
 818msgid "could not set '%s' to '%s'"
 819msgstr "不能设置 '%s' 为 '%s'"
 820
 821#: config.c:2313
 822#, c-format
 823msgid "could not unset '%s'"
 824msgstr "不能取消设置 '%s'"
 825
 826#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
 827msgid "Checking connectivity"
 828msgstr "检查连接中"
 829
 830#: connected.c:74
 831msgid "Could not run 'git rev-list'"
 832msgstr "不能执行 'git rev-list'"
 833
 834#: connected.c:94
 835msgid "failed write to rev-list"
 836msgstr "无法写入 rev-list"
 837
 838#: connected.c:101
 839msgid "failed to close rev-list's stdin"
 840msgstr "无法关闭 rev-list 的标准输入"
 841
 842#: date.c:97
 843msgid "in the future"
 844msgstr "在将来"
 845
 846#: date.c:103
 847#, c-format
 848msgid "%lu second ago"
 849msgid_plural "%lu seconds ago"
 850msgstr[0] "%lu 秒钟前"
 851msgstr[1] "%lu 秒钟前"
 852
 853#: date.c:110
 854#, c-format
 855msgid "%lu minute ago"
 856msgid_plural "%lu minutes ago"
 857msgstr[0] "%lu 分钟前"
 858msgstr[1] "%lu 分钟前"
 859
 860#: date.c:117
 861#, c-format
 862msgid "%lu hour ago"
 863msgid_plural "%lu hours ago"
 864msgstr[0] "%lu 小时前"
 865msgstr[1] "%lu 小时前"
 866
 867#: date.c:124
 868#, c-format
 869msgid "%lu day ago"
 870msgid_plural "%lu days ago"
 871msgstr[0] "%lu 天前"
 872msgstr[1] "%lu 天前"
 873
 874#: date.c:130
 875#, c-format
 876msgid "%lu week ago"
 877msgid_plural "%lu weeks ago"
 878msgstr[0] "%lu 周前"
 879msgstr[1] "%lu 周前"
 880
 881#: date.c:137
 882#, c-format
 883msgid "%lu month ago"
 884msgid_plural "%lu months ago"
 885msgstr[0] "%lu 个月前"
 886msgstr[1] "%lu 个月前"
 887
 888#: date.c:148
 889#, c-format
 890msgid "%lu year"
 891msgid_plural "%lu years"
 892msgstr[0] "%lu 年"
 893msgstr[1] "%lu 年"
 894
 895#. TRANSLATORS: "%s" is "<n> years"
 896#: date.c:151
 897#, c-format
 898msgid "%s, %lu month ago"
 899msgid_plural "%s, %lu months ago"
 900msgstr[0] "%s %lu 个月前"
 901msgstr[1] "%s %lu 个月前"
 902
 903#: date.c:156 date.c:161
 904#, c-format
 905msgid "%lu year ago"
 906msgid_plural "%lu years ago"
 907msgstr[0] "%lu 年前"
 908msgstr[1] "%lu 年前"
 909
 910#: diffcore-order.c:24
 911#, c-format
 912msgid "failed to read orderfile '%s'"
 913msgstr "无法读取排序文件 '%s'"
 914
 915#: diffcore-rename.c:540
 916msgid "Performing inexact rename detection"
 917msgstr "正在进行非精确的重命名检测"
 918
 919#  译者:注意保持前导空格
 920#: diff.c:116
 921#, c-format
 922msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 923msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 924
 925#  译者:注意保持前导空格
 926#: diff.c:121
 927#, c-format
 928msgid "  Unknown dirstat parameter '%s'\n"
 929msgstr "  未知的 dirstat 参数 '%s'\n"
 930
 931#: diff.c:225
 932#, c-format
 933msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 934msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 935
 936#: diff.c:277
 937#, c-format
 938msgid ""
 939"Found errors in 'diff.dirstat' config variable:\n"
 940"%s"
 941msgstr ""
 942"发现配置变量 'diff.dirstat' 中的错误:\n"
 943"%s"
 944
 945#: diff.c:3017
 946#, c-format
 947msgid "external diff died, stopping at %s"
 948msgstr "外部 diff 退出,停止在 %s"
 949
 950#: diff.c:3415
 951msgid "--follow requires exactly one pathspec"
 952msgstr "--follow 明确要求只跟一个路径规格"
 953
 954#: diff.c:3578
 955#, c-format
 956msgid ""
 957"Failed to parse --dirstat/-X option parameter:\n"
 958"%s"
 959msgstr ""
 960"无法解析 --dirstat/-X 选项的参数:\n"
 961"%s"
 962
 963#: diff.c:3592
 964#, c-format
 965msgid "Failed to parse --submodule option parameter: '%s'"
 966msgstr "无法解析 --submodule 选项的参数:'%s'"
 967
 968#: dir.c:1823
 969msgid "failed to get kernel name and information"
 970msgstr "无法获得内核名称和信息"
 971
 972#: dir.c:1942
 973msgid "Untracked cache is disabled on this system or location."
 974msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
 975
 976#: gpg-interface.c:178
 977msgid "gpg failed to sign the data"
 978msgstr "gpg 无法为数据签名"
 979
 980#: gpg-interface.c:208
 981msgid "could not create temporary file"
 982msgstr "不能创建临时文件"
 983
 984#: gpg-interface.c:210
 985#, c-format
 986msgid "failed writing detached signature to '%s'"
 987msgstr "无法将分离式签名写入 '%s'"
 988
 989#: grep.c:1792
 990#, c-format
 991msgid "'%s': unable to read %s"
 992msgstr "'%s':无法读取 %s"
 993
 994#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 995#, c-format
 996msgid "failed to stat '%s'"
 997msgstr "无法枚举 '%s' 状态"
 998
 999#: grep.c:1820
1000#, c-format
1001msgid "'%s': short read"
1002msgstr "'%s':读取不完整"
1003
1004#: help.c:205
1005#, c-format
1006msgid "available git commands in '%s'"
1007msgstr "在 '%s' 下可用的 git 命令"
1008
1009#: help.c:212
1010msgid "git commands available from elsewhere on your $PATH"
1011msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1012
1013#: help.c:244
1014msgid "These are common Git commands used in various situations:"
1015msgstr "这些是各种场合常见的 Git 命令:"
1016
1017#: help.c:309
1018#, c-format
1019msgid ""
1020"'%s' appears to be a git command, but we were not\n"
1021"able to execute it. Maybe git-%s is broken?"
1022msgstr ""
1023"'%s' 像是一个 git 命令,但却无法运行。\n"
1024"可能是 git-%s 受损?"
1025
1026#: help.c:366
1027msgid "Uh oh. Your system reports no Git commands at all."
1028msgstr "唉呀,您的系统中未发现 Git 命令。"
1029
1030#: help.c:388
1031#, c-format
1032msgid ""
1033"WARNING: You called a Git command named '%s', which does not exist.\n"
1034"Continuing under the assumption that you meant '%s'"
1035msgstr ""
1036"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
1037"是 '%s'"
1038
1039#: help.c:393
1040#, c-format
1041msgid "in %0.1f seconds automatically..."
1042msgstr "在 %0.1f 秒钟后自动运行..."
1043
1044#: help.c:400
1045#, c-format
1046msgid "git: '%s' is not a git command. See 'git --help'."
1047msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
1048
1049#: help.c:404 help.c:470
1050msgid ""
1051"\n"
1052"Did you mean this?"
1053msgid_plural ""
1054"\n"
1055"Did you mean one of these?"
1056msgstr[0] ""
1057"\n"
1058"您指的是这个么?"
1059msgstr[1] ""
1060"\n"
1061"您指的是这其中的某一个么?"
1062
1063#: help.c:466
1064#, c-format
1065msgid "%s: %s - %s"
1066msgstr "%s:%s - %s"
1067
1068#: lockfile.c:152
1069#, c-format
1070msgid ""
1071"Unable to create '%s.lock': %s.\n"
1072"\n"
1073"Another git process seems to be running in this repository, e.g.\n"
1074"an editor opened by 'git commit'. Please make sure all processes\n"
1075"are terminated then try again. If it still fails, a git process\n"
1076"may have crashed in this repository earlier:\n"
1077"remove the file manually to continue."
1078msgstr ""
1079"无法创建 '%s.lock':%s。\n"
1080"\n"
1081"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
1082"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
1083"可能之前有一个 git 进程在这个仓库中异常退出:\n"
1084"手动删除这个文件再继续。"
1085
1086#: lockfile.c:160
1087#, c-format
1088msgid "Unable to create '%s.lock': %s"
1089msgstr "不能创建 '%s.lock':%s"
1090
1091#: merge.c:41
1092msgid "failed to read the cache"
1093msgstr "无法读取缓存"
1094
1095#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
1096#: builtin/checkout.c:589 builtin/clone.c:732
1097msgid "unable to write new index file"
1098msgstr "无法写新的索引文件"
1099
1100#: merge-recursive.c:209
1101msgid "(bad commit)\n"
1102msgstr "(坏提交)\n"
1103
1104#: merge-recursive.c:231
1105#, c-format
1106msgid "addinfo_cache failed for path '%s'"
1107msgstr "为路径 '%s' addinfo_cache 失败"
1108
1109#: merge-recursive.c:301
1110msgid "error building trees"
1111msgstr "无法创建树"
1112
1113#: merge-recursive.c:720
1114#, c-format
1115msgid "failed to create path '%s'%s"
1116msgstr "无法创建路径 '%s'%s"
1117
1118#: merge-recursive.c:731
1119#, c-format
1120msgid "Removing %s to make room for subdirectory\n"
1121msgstr "删除 %s 以便为子目录留出空间\n"
1122
1123#: merge-recursive.c:745 merge-recursive.c:764
1124msgid ": perhaps a D/F conflict?"
1125msgstr ":可能是一个目录/文件冲突?"
1126
1127#: merge-recursive.c:754
1128#, c-format
1129msgid "refusing to lose untracked file at '%s'"
1130msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
1131
1132#: merge-recursive.c:796
1133#, c-format
1134msgid "cannot read object %s '%s'"
1135msgstr "不能读取对象 %s '%s'"
1136
1137#: merge-recursive.c:798
1138#, c-format
1139msgid "blob expected for %s '%s'"
1140msgstr "%s '%s' 应为数据对象"
1141
1142#: merge-recursive.c:822
1143#, c-format
1144msgid "failed to open '%s': %s"
1145msgstr "无法打开 '%s':%s"
1146
1147#: merge-recursive.c:833
1148#, c-format
1149msgid "failed to symlink '%s': %s"
1150msgstr "无法创建符号链接 '%s':%s"
1151
1152#: merge-recursive.c:838
1153#, c-format
1154msgid "do not know what to do with %06o %s '%s'"
1155msgstr "不知道如何处理 %06o %s '%s'"
1156
1157#: merge-recursive.c:978
1158msgid "Failed to execute internal merge"
1159msgstr "无法执行内部合并"
1160
1161#: merge-recursive.c:982
1162#, c-format
1163msgid "Unable to add %s to database"
1164msgstr "不能添加 %s 至对象库"
1165
1166#: merge-recursive.c:1081 merge-recursive.c:1095
1167#, c-format
1168msgid ""
1169"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
1170"in tree."
1171msgstr ""
1172"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
1173"的版本被保留。"
1174
1175#: merge-recursive.c:1087 merge-recursive.c:1100
1176#, c-format
1177msgid ""
1178"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
1179"in tree at %s."
1180msgstr ""
1181"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
1182"的版本保留于 %8$s 中。"
1183
1184#: merge-recursive.c:1143
1185msgid "rename"
1186msgstr "重命名"
1187
1188#: merge-recursive.c:1143
1189msgid "renamed"
1190msgstr "重命名"
1191
1192#: merge-recursive.c:1200
1193#, c-format
1194msgid "%s is a directory in %s adding as %s instead"
1195msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
1196
1197#: merge-recursive.c:1225
1198#, c-format
1199msgid ""
1200"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
1201"\"->\"%s\" in \"%s\"%s"
1202msgstr ""
1203"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
1204"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
1205
1206#: merge-recursive.c:1230
1207msgid " (left unresolved)"
1208msgstr "(留下未解决)"
1209
1210#: merge-recursive.c:1292
1211#, c-format
1212msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
1213msgstr ""
1214"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
1215"%5$s"
1216
1217#: merge-recursive.c:1325
1218#, c-format
1219msgid "Renaming %s to %s and %s to %s instead"
1220msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
1221
1222#: merge-recursive.c:1531
1223#, c-format
1224msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
1225msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
1226
1227#: merge-recursive.c:1546
1228#, c-format
1229msgid "Adding merged %s"
1230msgstr "添加合并后的 %s"
1231
1232#: merge-recursive.c:1553 merge-recursive.c:1766
1233#, c-format
1234msgid "Adding as %s instead"
1235msgstr "而是以 %s 为名添加"
1236
1237#: merge-recursive.c:1610
1238#, c-format
1239msgid "cannot read object %s"
1240msgstr "不能读取对象 %s"
1241
1242#: merge-recursive.c:1613
1243#, c-format
1244msgid "object %s is not a blob"
1245msgstr "对象 %s 不是一个数据对象"
1246
1247#: merge-recursive.c:1666
1248msgid "modify"
1249msgstr "修改"
1250
1251#: merge-recursive.c:1666
1252msgid "modified"
1253msgstr "修改"
1254
1255#: merge-recursive.c:1676
1256msgid "content"
1257msgstr "内容"
1258
1259#: merge-recursive.c:1683
1260msgid "add/add"
1261msgstr "添加/添加"
1262
1263#: merge-recursive.c:1718
1264#, c-format
1265msgid "Skipped %s (merged same as existing)"
1266msgstr "略过 %s(已经做过相同合并)"
1267
1268#: merge-recursive.c:1732
1269#, c-format
1270msgid "Auto-merging %s"
1271msgstr "自动合并 %s"
1272
1273#: merge-recursive.c:1736 git-submodule.sh:919
1274msgid "submodule"
1275msgstr "子模组"
1276
1277#: merge-recursive.c:1737
1278#, c-format
1279msgid "CONFLICT (%s): Merge conflict in %s"
1280msgstr "冲突(%s):合并冲突于 %s"
1281
1282#: merge-recursive.c:1831
1283#, c-format
1284msgid "Removing %s"
1285msgstr "删除 %s"
1286
1287#: merge-recursive.c:1857
1288msgid "file/directory"
1289msgstr "文件/目录"
1290
1291#: merge-recursive.c:1863
1292msgid "directory/file"
1293msgstr "目录/文件"
1294
1295#: merge-recursive.c:1868
1296#, c-format
1297msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1298msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
1299
1300#: merge-recursive.c:1877
1301#, c-format
1302msgid "Adding %s"
1303msgstr "添加 %s"
1304
1305#: merge-recursive.c:1914
1306msgid "Already up-to-date!"
1307msgstr "已经是最新的!"
1308
1309#: merge-recursive.c:1923
1310#, c-format
1311msgid "merging of trees %s and %s failed"
1312msgstr "无法合并树 %s 和 %s"
1313
1314#: merge-recursive.c:2006
1315msgid "Merging:"
1316msgstr "合并:"
1317
1318#: merge-recursive.c:2019
1319#, c-format
1320msgid "found %u common ancestor:"
1321msgid_plural "found %u common ancestors:"
1322msgstr[0] "发现 %u 个共同祖先:"
1323msgstr[1] "发现 %u 个共同祖先:"
1324
1325#: merge-recursive.c:2058
1326msgid "merge returned no commit"
1327msgstr "合并未返回提交"
1328
1329#: merge-recursive.c:2121
1330#, c-format
1331msgid "Could not parse object '%s'"
1332msgstr "不能解析对象 '%s'"
1333
1334#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
1335msgid "Unable to write index."
1336msgstr "不能写入索引。"
1337
1338#: notes-utils.c:41
1339msgid "Cannot commit uninitialized/unreferenced notes tree"
1340msgstr "不能提交未初始化/未引用的注解树"
1341
1342#: notes-utils.c:100
1343#, c-format
1344msgid "Bad notes.rewriteMode value: '%s'"
1345msgstr "坏的 notes.rewriteMode 值:'%s'"
1346
1347#: notes-utils.c:110
1348#, c-format
1349msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1350msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1351
1352#. TRANSLATORS: The first %s is the name of the
1353#. environment variable, the second %s is its value
1354#: notes-utils.c:137
1355#, c-format
1356msgid "Bad %s value: '%s'"
1357msgstr "坏的 %s 值:'%s'"
1358
1359#: object.c:242
1360#, c-format
1361msgid "unable to parse object: %s"
1362msgstr "不能解析对象:%s"
1363
1364#: parse-options.c:572
1365msgid "..."
1366msgstr "..."
1367
1368#: parse-options.c:590
1369#, c-format
1370msgid "usage: %s"
1371msgstr "用法:%s"
1372
1373#. TRANSLATORS: the colon here should align with the
1374#. one in "usage: %s" translation
1375#: parse-options.c:594
1376#, c-format
1377msgid "   or: %s"
1378msgstr "  或:%s"
1379
1380#  译者:为保证在输出中对齐,注意调整句中空格!
1381#: parse-options.c:597
1382#, c-format
1383msgid "    %s"
1384msgstr "    %s"
1385
1386#: parse-options.c:631
1387msgid "-NUM"
1388msgstr "-数字"
1389
1390#: parse-options-cb.c:108
1391#, c-format
1392msgid "malformed object name '%s'"
1393msgstr "非法的对象名 '%s'"
1394
1395#: path.c:798
1396#, c-format
1397msgid "Could not make %s writable by group"
1398msgstr "不能设置 %s 为组可写"
1399
1400#: pathspec.c:133
1401msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1402msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1403
1404#: pathspec.c:143
1405msgid ""
1406"global 'literal' pathspec setting is incompatible with all other global "
1407"pathspec settings"
1408msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1409
1410#: pathspec.c:177
1411msgid "invalid parameter for pathspec magic 'prefix'"
1412msgstr "路径规格包含无效的神奇前缀"
1413
1414#: pathspec.c:183
1415#, c-format
1416msgid "Invalid pathspec magic '%.*s' in '%s'"
1417msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1418
1419#: pathspec.c:187
1420#, c-format
1421msgid "Missing ')' at the end of pathspec magic in '%s'"
1422msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1423
1424#: pathspec.c:205
1425#, c-format
1426msgid "Unimplemented pathspec magic '%c' in '%s'"
1427msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1428
1429#: pathspec.c:230
1430#, c-format
1431msgid "%s: 'literal' and 'glob' are incompatible"
1432msgstr "%s:'literal' 和 'glob' 不兼容"
1433
1434#: pathspec.c:241
1435#, c-format
1436msgid "%s: '%s' is outside repository"
1437msgstr "%s:'%s' 在仓库之外"
1438
1439#: pathspec.c:291
1440#, c-format
1441msgid "Pathspec '%s' is in submodule '%.*s'"
1442msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1443
1444#: pathspec.c:353
1445#, c-format
1446msgid "%s: pathspec magic not supported by this command: %s"
1447msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1448
1449#: pathspec.c:433
1450#, c-format
1451msgid "pathspec '%s' is beyond a symbolic link"
1452msgstr "路径规格 '%s' 位于符号链接中"
1453
1454#: pathspec.c:442
1455msgid ""
1456"There is nothing to exclude from by :(exclude) patterns.\n"
1457"Perhaps you forgot to add either ':/' or '.' ?"
1458msgstr ""
1459"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1460"添加 ':/' 或 '.' ?"
1461
1462#: pretty.c:973
1463msgid "unable to parse --pretty format"
1464msgstr "不能解析 --pretty 格式"
1465
1466#: progress.c:235
1467msgid "done"
1468msgstr "完成"
1469
1470#: read-cache.c:1281
1471#, c-format
1472msgid ""
1473"index.version set, but the value is invalid.\n"
1474"Using version %i"
1475msgstr ""
1476"设置了 index.version,但是取值无效。\n"
1477"使用版本 %i"
1478
1479#: read-cache.c:1291
1480#, c-format
1481msgid ""
1482"GIT_INDEX_VERSION set, but the value is invalid.\n"
1483"Using version %i"
1484msgstr ""
1485"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1486"使用版本 %i"
1487
1488#: refs.c:551 builtin/merge.c:840
1489#, c-format
1490msgid "Could not open '%s' for writing"
1491msgstr "无法打开 '%s' 进行写入"
1492
1493#: refs/files-backend.c:2534
1494#, c-format
1495msgid "could not delete reference %s: %s"
1496msgstr "无法删除引用 %s:%s"
1497
1498#: refs/files-backend.c:2537
1499#, c-format
1500msgid "could not delete references: %s"
1501msgstr "无法删除引用:%s"
1502
1503#: refs/files-backend.c:2546
1504#, c-format
1505msgid "could not remove reference %s"
1506msgstr "无法删除引用 %s"
1507
1508#: ref-filter.c:55
1509#, c-format
1510msgid "expected format: %%(color:<color>)"
1511msgstr "期望的格式:%%(color:<color>)"
1512
1513#: ref-filter.c:57
1514#, c-format
1515msgid "unrecognized color: %%(color:%s)"
1516msgstr "未能识别的颜色:%%(color:%s)"
1517
1518#: ref-filter.c:71
1519#, c-format
1520msgid "unrecognized format: %%(%s)"
1521msgstr "未能识别的格式:%%(%s)"
1522
1523#: ref-filter.c:77
1524#, c-format
1525msgid "%%(body) does not take arguments"
1526msgstr "%%(body) 不带参数"
1527
1528#: ref-filter.c:84
1529#, c-format
1530msgid "%%(subject) does not take arguments"
1531msgstr "%%(subject) 不带参数"
1532
1533#: ref-filter.c:101
1534#, c-format
1535msgid "positive value expected contents:lines=%s"
1536msgstr "要为 contents:lines=%s 提供一个正数"
1537
1538#: ref-filter.c:103
1539#, c-format
1540msgid "unrecognized %%(contents) argument: %s"
1541msgstr "未能识别的 %%(contents) 参数:%s"
1542
1543#: ref-filter.c:113
1544#, c-format
1545msgid "unrecognized %%(objectname) argument: %s"
1546msgstr "未能识别的 %%(objectname) 参数:%s"
1547
1548#: ref-filter.c:135
1549#, c-format
1550msgid "expected format: %%(align:<width>,<position>)"
1551msgstr "期望的格式:%%(align:<width>,<position>)"
1552
1553#: ref-filter.c:147
1554#, c-format
1555msgid "unrecognized position:%s"
1556msgstr "未能识别的位置:%s"
1557
1558#: ref-filter.c:151
1559#, c-format
1560msgid "unrecognized width:%s"
1561msgstr "未能识别的宽度:%s"
1562
1563#: ref-filter.c:157
1564#, c-format
1565msgid "unrecognized %%(align) argument: %s"
1566msgstr "未能识别的 %%(align) 参数:%s"
1567
1568#: ref-filter.c:161
1569#, c-format
1570msgid "positive width expected with the %%(align) atom"
1571msgstr "元素 %%(align) 需要一个正数的宽度"
1572
1573#: ref-filter.c:244
1574#, c-format
1575msgid "malformed field name: %.*s"
1576msgstr "非法的字段名:%.*s"
1577
1578#: ref-filter.c:270
1579#, c-format
1580msgid "unknown field name: %.*s"
1581msgstr "未知的字段名:%.*s"
1582
1583#: ref-filter.c:372
1584#, c-format
1585msgid "format: %%(end) atom used without corresponding atom"
1586msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1587
1588#: ref-filter.c:424
1589#, c-format
1590msgid "malformed format string %s"
1591msgstr "非法的格式化字符串 %s"
1592
1593#: ref-filter.c:878
1594msgid ":strip= requires a positive integer argument"
1595msgstr ":strip= 需要一个正整型参数"
1596
1597#: ref-filter.c:883
1598#, c-format
1599msgid "ref '%s' does not have %ld components to :strip"
1600msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
1601
1602#: ref-filter.c:1046
1603#, c-format
1604msgid "unknown %.*s format %s"
1605msgstr "未知的 %.*s 格式 %s"
1606
1607#: ref-filter.c:1066 ref-filter.c:1097
1608#, c-format
1609msgid "missing object %s for %s"
1610msgstr "缺失 %2$s 的对象 %1$s"
1611
1612#: ref-filter.c:1069 ref-filter.c:1100
1613#, c-format
1614msgid "parse_object_buffer failed on %s for %s"
1615msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
1616
1617#: ref-filter.c:1311
1618#, c-format
1619msgid "malformed object at '%s'"
1620msgstr "非法的对象于 '%s'"
1621
1622#: ref-filter.c:1373
1623#, c-format
1624msgid "ignoring ref with broken name %s"
1625msgstr "忽略带有错误名称 %s 的引用"
1626
1627#: ref-filter.c:1378
1628#, c-format
1629msgid "ignoring broken ref %s"
1630msgstr "忽略损坏的引用 %s"
1631
1632#: ref-filter.c:1651
1633#, c-format
1634msgid "format: %%(end) atom missing"
1635msgstr "格式:缺少 %%(end) 元素"
1636
1637#: ref-filter.c:1705
1638#, c-format
1639msgid "malformed object name %s"
1640msgstr "非法的对象名 %s"
1641
1642#: remote.c:746
1643#, c-format
1644msgid "Cannot fetch both %s and %s to %s"
1645msgstr "不能同时获取 %s 和 %s 至 %s"
1646
1647#: remote.c:750
1648#, c-format
1649msgid "%s usually tracks %s, not %s"
1650msgstr "%s 通常跟踪 %s,而非 %s"
1651
1652#: remote.c:754
1653#, c-format
1654msgid "%s tracks both %s and %s"
1655msgstr "%s 同时跟踪 %s 和 %s"
1656
1657#: remote.c:762
1658msgid "Internal error"
1659msgstr "内部错误"
1660
1661#: remote.c:1677 remote.c:1720
1662msgid "HEAD does not point to a branch"
1663msgstr "HEAD 没有指向一个分支"
1664
1665#: remote.c:1686
1666#, c-format
1667msgid "no such branch: '%s'"
1668msgstr "没有此分支:'%s'"
1669
1670#: remote.c:1689
1671#, c-format
1672msgid "no upstream configured for branch '%s'"
1673msgstr "尚未给分支 '%s' 设置上游"
1674
1675#: remote.c:1695
1676#, c-format
1677msgid "upstream branch '%s' not stored as a remote-tracking branch"
1678msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1679
1680#: remote.c:1710
1681#, c-format
1682msgid "push destination '%s' on remote '%s' has no local tracking branch"
1683msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1684
1685#: remote.c:1725
1686#, c-format
1687msgid "branch '%s' has no remote for pushing"
1688msgstr "分支 '%s' 没有设置要推送的远程服务器"
1689
1690#: remote.c:1736
1691#, c-format
1692msgid "push refspecs for '%s' do not include '%s'"
1693msgstr "向 '%s' 推送引用规格未包含 '%s'"
1694
1695#: remote.c:1749
1696msgid "push has no destination (push.default is 'nothing')"
1697msgstr "推送无目标(push.default 是 'nothing')"
1698
1699#: remote.c:1771
1700msgid "cannot resolve 'simple' push to a single destination"
1701msgstr "无法解析 'simple' 推送至一个单独的目标"
1702
1703#: remote.c:2073
1704#, c-format
1705msgid "Your branch is based on '%s', but the upstream is gone.\n"
1706msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1707
1708#: remote.c:2077
1709msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1710msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
1711
1712#: remote.c:2080
1713#, c-format
1714msgid "Your branch is up-to-date with '%s'.\n"
1715msgstr "您的分支与上游分支 '%s' 一致。\n"
1716
1717#: remote.c:2084
1718#, c-format
1719msgid "Your branch is ahead of '%s' by %d commit.\n"
1720msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1721msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1722msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1723
1724#: remote.c:2090
1725msgid "  (use \"git push\" to publish your local commits)\n"
1726msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
1727
1728#: remote.c:2093
1729#, c-format
1730msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1731msgid_plural ""
1732"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1733msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1734msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1735
1736#  译者:注意保持前导空格
1737#: remote.c:2101
1738msgid "  (use \"git pull\" to update your local branch)\n"
1739msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
1740
1741#: remote.c:2104
1742#, c-format
1743msgid ""
1744"Your branch and '%s' have diverged,\n"
1745"and have %d and %d different commit each, respectively.\n"
1746msgid_plural ""
1747"Your branch and '%s' have diverged,\n"
1748"and have %d and %d different commits each, respectively.\n"
1749msgstr[0] ""
1750"您的分支和 '%s' 出现了偏离,\n"
1751"并且分别有 %d 和 %d 处不同的提交。\n"
1752msgstr[1] ""
1753"您的分支和 '%s' 出现了偏离,\n"
1754"并且分别有 %d 和 %d 处不同的提交。\n"
1755
1756#  译者:注意保持前导空格
1757#: remote.c:2114
1758msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1759msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
1760
1761#: revision.c:2132
1762msgid "your current branch appears to be broken"
1763msgstr "您的当前分支好像被损坏"
1764
1765#: revision.c:2135
1766#, c-format
1767msgid "your current branch '%s' does not have any commits yet"
1768msgstr "您的当前分支 '%s' 尚无任何提交"
1769
1770#: revision.c:2329
1771msgid "--first-parent is incompatible with --bisect"
1772msgstr "--first-parent 与 --bisect 不兼容"
1773
1774#: run-command.c:92
1775msgid "open /dev/null failed"
1776msgstr "不能打开 /dev/null"
1777
1778#: run-command.c:94
1779#, c-format
1780msgid "dup2(%d,%d) failed"
1781msgstr "不能调用 dup2(%d,%d)"
1782
1783#: send-pack.c:298
1784msgid "failed to sign the push certificate"
1785msgstr "无法为推送证书签名"
1786
1787#: send-pack.c:411
1788msgid "the receiving end does not support --signed push"
1789msgstr "接收端不支持签名推送"
1790
1791#: send-pack.c:413
1792msgid ""
1793"not sending a push certificate since the receiving end does not support --"
1794"signed push"
1795msgstr "未发送推送证书,因为接收端不支持签名推送"
1796
1797#: send-pack.c:425
1798msgid "the receiving end does not support --atomic push"
1799msgstr "接收端不支持原子推送"
1800
1801#: send-pack.c:430
1802msgid "the receiving end does not support push options"
1803msgstr "接收端不支持推送选项"
1804
1805#: sequencer.c:174
1806msgid ""
1807"after resolving the conflicts, mark the corrected paths\n"
1808"with 'git add <paths>' or 'git rm <paths>'"
1809msgstr ""
1810"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1811"命令标记修正后的文件"
1812
1813#: sequencer.c:177
1814msgid ""
1815"after resolving the conflicts, mark the corrected paths\n"
1816"with 'git add <paths>' or 'git rm <paths>'\n"
1817"and commit the result with 'git commit'"
1818msgstr ""
1819"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1820"对修正后的文件做标记,然后用 'git commit' 提交"
1821
1822#: sequencer.c:190 sequencer.c:841 sequencer.c:924
1823#, c-format
1824msgid "Could not write to %s"
1825msgstr "不能写入 %s"
1826
1827#: sequencer.c:193 sequencer.c:843 sequencer.c:928
1828#, c-format
1829msgid "Error wrapping up %s."
1830msgstr "错误收尾 %s。"
1831
1832#: sequencer.c:208
1833msgid "Your local changes would be overwritten by cherry-pick."
1834msgstr "您的本地修改将被拣选操作覆盖。"
1835
1836#: sequencer.c:210
1837msgid "Your local changes would be overwritten by revert."
1838msgstr "您的本地修改将被还原操作覆盖。"
1839
1840#: sequencer.c:213
1841msgid "Commit your changes or stash them to proceed."
1842msgstr "提交您的修改或保存进度后再继续。"
1843
1844#: sequencer.c:228
1845#, c-format
1846msgid "%s: fast-forward"
1847msgstr "%s:快进"
1848
1849#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1850#: sequencer.c:303
1851#, c-format
1852msgid "%s: Unable to write new index file"
1853msgstr "%s:无法写入新索引文件"
1854
1855#: sequencer.c:321
1856msgid "Could not resolve HEAD commit\n"
1857msgstr "不能解析 HEAD 提交\n"
1858
1859#: sequencer.c:341
1860msgid "Unable to update cache tree\n"
1861msgstr "不能更新缓存\n"
1862
1863#: sequencer.c:393
1864#, c-format
1865msgid "Could not parse commit %s\n"
1866msgstr "不能解析提交 %s\n"
1867
1868#: sequencer.c:398
1869#, c-format
1870msgid "Could not parse parent commit %s\n"
1871msgstr "不能解析父提交 %s\n"
1872
1873#: sequencer.c:463
1874msgid "Your index file is unmerged."
1875msgstr "您的索引文件未完成合并。"
1876
1877#: sequencer.c:482
1878#, c-format
1879msgid "Commit %s is a merge but no -m option was given."
1880msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1881
1882#: sequencer.c:490
1883#, c-format
1884msgid "Commit %s does not have parent %d"
1885msgstr "提交 %s 没有父提交 %d"
1886
1887#: sequencer.c:494
1888#, c-format
1889msgid "Mainline was specified but commit %s is not a merge."
1890msgstr "指定了主线但提交 %s 不是一个合并。"
1891
1892#. TRANSLATORS: The first %s will be "revert" or
1893#. "cherry-pick", the second %s a SHA1
1894#: sequencer.c:507
1895#, c-format
1896msgid "%s: cannot parse parent commit %s"
1897msgstr "%s:不能解析父提交 %s"
1898
1899#: sequencer.c:511
1900#, c-format
1901msgid "Cannot get commit message for %s"
1902msgstr "不能得到 %s 的提交说明"
1903
1904#: sequencer.c:597
1905#, c-format
1906msgid "could not revert %s... %s"
1907msgstr "不能还原 %s... %s"
1908
1909#: sequencer.c:598
1910#, c-format
1911msgid "could not apply %s... %s"
1912msgstr "不能应用 %s... %s"
1913
1914#: sequencer.c:633
1915msgid "empty commit set passed"
1916msgstr "提供了空的提交集"
1917
1918#: sequencer.c:641
1919#, c-format
1920msgid "git %s: failed to read the index"
1921msgstr "git %s:无法读取索引"
1922
1923#: sequencer.c:645
1924#, c-format
1925msgid "git %s: failed to refresh the index"
1926msgstr "git %s:无法刷新索引"
1927
1928#: sequencer.c:705
1929msgid "Cannot revert during another revert."
1930msgstr "不能在回退中执行另一回退。"
1931
1932#: sequencer.c:706
1933msgid "Cannot revert during a cherry-pick."
1934msgstr "不能在拣选中执行回退。"
1935
1936#: sequencer.c:709
1937msgid "Cannot cherry-pick during a revert."
1938msgstr "不能在回退中执行拣选。"
1939
1940#: sequencer.c:710
1941msgid "Cannot cherry-pick during another cherry-pick."
1942msgstr "不能在拣选过程中执行另一拣选。"
1943
1944#: sequencer.c:732
1945#, c-format
1946msgid "Could not parse line %d."
1947msgstr "不能解析第 %d 行。"
1948
1949#: sequencer.c:737
1950msgid "No commits parsed."
1951msgstr "没有提交被解析。"
1952
1953#: sequencer.c:749
1954#, c-format
1955msgid "Could not open %s"
1956msgstr "不能打开 %s"
1957
1958#: sequencer.c:753
1959#, c-format
1960msgid "Could not read %s."
1961msgstr "不能读取 %s。"
1962
1963#: sequencer.c:760
1964#, c-format
1965msgid "Unusable instruction sheet: %s"
1966msgstr "无用的指令表单:%s"
1967
1968#: sequencer.c:790
1969#, c-format
1970msgid "Invalid key: %s"
1971msgstr "无效键名:%s"
1972
1973#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
1974#, c-format
1975msgid "Invalid value for %s: %s"
1976msgstr "%s 的值无效:%s"
1977
1978#: sequencer.c:803
1979#, c-format
1980msgid "Malformed options sheet: %s"
1981msgstr "非法的选项表单:%s"
1982
1983#: sequencer.c:822
1984msgid "a cherry-pick or revert is already in progress"
1985msgstr "一个拣选或还原操作已在进行"
1986
1987#: sequencer.c:823
1988msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1989msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1990
1991#: sequencer.c:827
1992#, c-format
1993msgid "Could not create sequencer directory %s"
1994msgstr "不能创建序列目录 %s"
1995
1996#: sequencer.c:862 sequencer.c:998
1997msgid "no cherry-pick or revert in progress"
1998msgstr "拣选或还原操作并未进行"
1999
2000#: sequencer.c:864
2001msgid "cannot resolve HEAD"
2002msgstr "不能解析 HEAD"
2003
2004#: sequencer.c:866 sequencer.c:900
2005msgid "cannot abort from a branch yet to be born"
2006msgstr "不能从尚未建立的分支终止"
2007
2008#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
2009#, c-format
2010msgid "cannot open %s"
2011msgstr "不能打开 %s"
2012
2013#: sequencer.c:888
2014#, c-format
2015msgid "cannot read %s: %s"
2016msgstr "不能读取 %s:%s"
2017
2018#: sequencer.c:889
2019msgid "unexpected end of file"
2020msgstr "意外的文件结束"
2021
2022#: sequencer.c:895
2023#, c-format
2024msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
2025msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
2026
2027#: sequencer.c:921
2028#, c-format
2029msgid "Could not format %s."
2030msgstr "不能格式化 %s。"
2031
2032#: sequencer.c:1066
2033#, c-format
2034msgid "%s: can't cherry-pick a %s"
2035msgstr "%s:不能拣选一个%s"
2036
2037#: sequencer.c:1069
2038#, c-format
2039msgid "%s: bad revision"
2040msgstr "%s:错误的版本"
2041
2042#: sequencer.c:1102
2043msgid "Can't revert as initial commit"
2044msgstr "不能作为初始提交还原"
2045
2046#: setup.c:160
2047#, c-format
2048msgid ""
2049"%s: no such path in the working tree.\n"
2050"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
2051msgstr ""
2052"%s:工作区中无此路径。\n"
2053"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
2054
2055#: setup.c:173
2056#, c-format
2057msgid ""
2058"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
2059"Use '--' to separate paths from revisions, like this:\n"
2060"'git <command> [<revision>...] -- [<file>...]'"
2061msgstr ""
2062"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
2063"使用 '--' 来分隔版本和路径,例如:\n"
2064"'git <command> [<revision>...] -- [<file>...]'"
2065
2066#: setup.c:223
2067#, c-format
2068msgid ""
2069"ambiguous argument '%s': both revision and filename\n"
2070"Use '--' to separate paths from revisions, like this:\n"
2071"'git <command> [<revision>...] -- [<file>...]'"
2072msgstr ""
2073"有歧义的参数 '%s':可同时是版本和文件\n"
2074"使用 '--' 来分隔版本和路径,例如:\n"
2075"'git <command> [<revision>...] -- [<file>...]'"
2076
2077#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
2078#, c-format
2079msgid "failed to read %s"
2080msgstr "无法读取 %s"
2081
2082#: setup.c:468
2083#, c-format
2084msgid "Expected git repo version <= %d, found %d"
2085msgstr "期望 git 仓库版本 <= %d,却得到 %d"
2086
2087#: setup.c:476
2088msgid "unknown repository extensions found:"
2089msgstr "发现未知的仓库扩展:"
2090
2091#: setup.c:762
2092#, c-format
2093msgid "Not a git repository (or any of the parent directories): %s"
2094msgstr "不是一个 git 仓库(或者任何父目录):%s"
2095
2096#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
2097msgid "Cannot come back to cwd"
2098msgstr "无法返回当前工作目录"
2099
2100#: setup.c:845
2101msgid "Unable to read current working directory"
2102msgstr "不能读取当前工作目录"
2103
2104#: setup.c:920
2105#, c-format
2106msgid ""
2107"Not a git repository (or any parent up to mount point %s)\n"
2108"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
2109msgstr ""
2110"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
2111"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
2112
2113#: setup.c:927
2114#, c-format
2115msgid "Cannot change to '%s/..'"
2116msgstr "不能切换到 '%s/..'"
2117
2118#: setup.c:989
2119#, c-format
2120msgid ""
2121"Problem with core.sharedRepository filemode value (0%.3o).\n"
2122"The owner of files must always have read and write permissions."
2123msgstr ""
2124"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
2125"文件属主必须始终拥有读写权限。"
2126
2127#: sha1_file.c:1046
2128msgid "offset before end of packfile (broken .idx?)"
2129msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
2130
2131#: sha1_file.c:2434
2132#, c-format
2133msgid "offset before start of pack index for %s (corrupt index?)"
2134msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
2135
2136#: sha1_file.c:2438
2137#, c-format
2138msgid "offset beyond end of pack index for %s (truncated index?)"
2139msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
2140
2141#: sha1_name.c:462
2142msgid ""
2143"Git normally never creates a ref that ends with 40 hex characters\n"
2144"because it will be ignored when you just specify 40-hex. These refs\n"
2145"may be created by mistake. For example,\n"
2146"\n"
2147"  git checkout -b $br $(git rev-parse ...)\n"
2148"\n"
2149"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
2150"examine these refs and maybe delete them. Turn this message off by\n"
2151"running \"git config advice.objectNameWarning false\""
2152msgstr ""
2153"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
2154"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
2155"\n"
2156"  git checkout -b $br $(git rev-parse ...)\n"
2157"\n"
2158"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
2159"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2160"命令关闭本消息通知。"
2161
2162#: submodule.c:64 submodule.c:98
2163msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
2164msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
2165
2166#: submodule.c:68 submodule.c:102
2167#, c-format
2168msgid "Could not find section in .gitmodules where path=%s"
2169msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
2170
2171#: submodule.c:76
2172#, c-format
2173msgid "Could not update .gitmodules entry %s"
2174msgstr "不能更新 .gitmodules 条目 %s"
2175
2176#: submodule.c:109
2177#, c-format
2178msgid "Could not remove .gitmodules entry for %s"
2179msgstr "无法移除 %s 的 .gitmodules 条目"
2180
2181#: submodule.c:120
2182msgid "staging updated .gitmodules failed"
2183msgstr "将更新后 .gitmodules 添加暂存区失败"
2184
2185#: submodule.c:177
2186msgid "negative values not allowed for submodule.fetchJobs"
2187msgstr "submodule.fetchJobs 不允许为负值"
2188
2189#: submodule-config.c:358
2190#, c-format
2191msgid "invalid value for %s"
2192msgstr "%s 的值无效"
2193
2194#: trailer.c:237
2195#, c-format
2196msgid "running trailer command '%s' failed"
2197msgstr "执行 trailer 命令 '%s' 失败"
2198
2199#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
2200#: trailer.c:562
2201#, c-format
2202msgid "unknown value '%s' for key '%s'"
2203msgstr "键 '%2$s' 的未知取值 '%1$s'"
2204
2205#: trailer.c:544 trailer.c:549 builtin/remote.c:289
2206#, c-format
2207msgid "more than one %s"
2208msgstr "多于一个 %s"
2209
2210#: trailer.c:582
2211#, c-format
2212msgid "empty trailer token in trailer '%.*s'"
2213msgstr "签名 '%.*s' 的键为空"
2214
2215#: trailer.c:702
2216#, c-format
2217msgid "could not read input file '%s'"
2218msgstr "不能读取输入文件 '%s'"
2219
2220#: trailer.c:705
2221msgid "could not read from stdin"
2222msgstr "不能自标准输入读取"
2223
2224#: trailer.c:857 builtin/am.c:42
2225#, c-format
2226msgid "could not stat %s"
2227msgstr "不能获取 %s 的文件状态"
2228
2229#: trailer.c:859
2230#, c-format
2231msgid "file %s is not a regular file"
2232msgstr "文件 %s 不是一个正规文件"
2233
2234#: trailer.c:861
2235#, c-format
2236msgid "file %s is not writable by user"
2237msgstr "文件 %s 用户不可写"
2238
2239#: trailer.c:873
2240msgid "could not open temporary file"
2241msgstr "不能打开临时文件"
2242
2243#: trailer.c:912
2244#, c-format
2245msgid "could not rename temporary file to %s"
2246msgstr "不能重命名临时文件为 %s"
2247
2248#: transport.c:62
2249#, c-format
2250msgid "Would set upstream of '%s' to '%s' of '%s'\n"
2251msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
2252
2253#: transport.c:151
2254#, c-format
2255msgid "transport: invalid depth option '%s'"
2256msgstr "传输:无效的深度选项 '%s'"
2257
2258#: transport.c:771
2259#, c-format
2260msgid ""
2261"The following submodule paths contain changes that can\n"
2262"not be found on any remote:\n"
2263msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
2264
2265#: transport.c:775
2266#, c-format
2267msgid ""
2268"\n"
2269"Please try\n"
2270"\n"
2271"\tgit push --recurse-submodules=on-demand\n"
2272"\n"
2273"or cd to the path and use\n"
2274"\n"
2275"\tgit push\n"
2276"\n"
2277"to push them to a remote.\n"
2278"\n"
2279msgstr ""
2280"\n"
2281"请尝试\n"
2282"\n"
2283"\tgit push --recurse-submodules=on-demand\n"
2284"\n"
2285"或者进入到子目录执行\n"
2286"\n"
2287"\tgit push\n"
2288"\n"
2289"以推送至远程。\n"
2290"\n"
2291
2292#: transport.c:783
2293msgid "Aborting."
2294msgstr "正在终止。"
2295
2296#: transport-helper.c:1041
2297#, c-format
2298msgid "Could not read ref %s"
2299msgstr "不能读取引用 %s"
2300
2301#: unpack-trees.c:64
2302#, c-format
2303msgid ""
2304"Your local changes to the following files would be overwritten by checkout:\n"
2305"%%sPlease commit your changes or stash them before you switch branches."
2306msgstr ""
2307"您对下列文件的本地修改将被检出操作覆盖:\n"
2308"%%s请在切换分支前提交您的修改或者保存进度。"
2309
2310#: unpack-trees.c:66
2311#, c-format
2312msgid ""
2313"Your local changes to the following files would be overwritten by checkout:\n"
2314"%%s"
2315msgstr ""
2316"您对下列文件的本地修改将被检出操作覆盖:\n"
2317"%%s"
2318
2319#: unpack-trees.c:69
2320#, c-format
2321msgid ""
2322"Your local changes to the following files would be overwritten by merge:\n"
2323"%%sPlease commit your changes or stash them before you merge."
2324msgstr ""
2325"您对下列文件的本地修改将被合并操作覆盖:\n"
2326"%%s请在合并前提交您的修改或者保存进度。"
2327
2328#: unpack-trees.c:71
2329#, c-format
2330msgid ""
2331"Your local changes to the following files would be overwritten by merge:\n"
2332"%%s"
2333msgstr ""
2334"您对下列文件的本地修改将被合并操作覆盖:\n"
2335"%%s"
2336
2337#: unpack-trees.c:74
2338#, c-format
2339msgid ""
2340"Your local changes to the following files would be overwritten by %s:\n"
2341"%%sPlease commit your changes or stash them before you %s."
2342msgstr ""
2343"您对下列文件的本地修改将被 %s 覆盖:\n"
2344"%%s请在 %s 之前提交您的修改或者保存进度。"
2345
2346#: unpack-trees.c:76
2347#, c-format
2348msgid ""
2349"Your local changes to the following files would be overwritten by %s:\n"
2350"%%s"
2351msgstr ""
2352"您对下列文件的本地修改将被 %s 覆盖:\n"
2353"%%s"
2354
2355#: unpack-trees.c:81
2356#, c-format
2357msgid ""
2358"Updating the following directories would lose untracked files in it:\n"
2359"%s"
2360msgstr ""
2361"更新如下目录将会丢失其中未跟踪的文件:\n"
2362"%s"
2363
2364#: unpack-trees.c:85
2365#, c-format
2366msgid ""
2367"The following untracked working tree files would be removed by checkout:\n"
2368"%%sPlease move or remove them before you switch branches."
2369msgstr ""
2370"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2371"%%s请在切换分支之前移动或删除。"
2372
2373#: unpack-trees.c:87
2374#, c-format
2375msgid ""
2376"The following untracked working tree files would be removed by checkout:\n"
2377"%%s"
2378msgstr ""
2379"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2380"%%s"
2381
2382#: unpack-trees.c:90
2383#, c-format
2384msgid ""
2385"The following untracked working tree files would be removed by merge:\n"
2386"%%sPlease move or remove them before you merge."
2387msgstr ""
2388"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2389"%%s请在合并前移动或删除。"
2390
2391#: unpack-trees.c:92
2392#, c-format
2393msgid ""
2394"The following untracked working tree files would be removed by merge:\n"
2395"%%s"
2396msgstr ""
2397"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2398"%%s"
2399
2400#: unpack-trees.c:95
2401#, c-format
2402msgid ""
2403"The following untracked working tree files would be removed by %s:\n"
2404"%%sPlease move or remove them before you %s."
2405msgstr ""
2406"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2407"%%s请在 %s 前移动或删除。"
2408
2409#: unpack-trees.c:97
2410#, c-format
2411msgid ""
2412"The following untracked working tree files would be removed by %s:\n"
2413"%%s"
2414msgstr ""
2415"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2416"%%s"
2417
2418#: unpack-trees.c:102
2419#, c-format
2420msgid ""
2421"The following untracked working tree files would be overwritten by "
2422"checkout:\n"
2423"%%sPlease move or remove them before you switch branches."
2424msgstr ""
2425"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2426"%%s请在切换分支前移动或删除。"
2427
2428#: unpack-trees.c:104
2429#, c-format
2430msgid ""
2431"The following untracked working tree files would be overwritten by "
2432"checkout:\n"
2433"%%s"
2434msgstr ""
2435"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2436"%%s"
2437
2438#: unpack-trees.c:107
2439#, c-format
2440msgid ""
2441"The following untracked working tree files would be overwritten by merge:\n"
2442"%%sPlease move or remove them before you merge."
2443msgstr ""
2444"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2445"%%s请在合并前移动或删除。"
2446
2447#: unpack-trees.c:109
2448#, c-format
2449msgid ""
2450"The following untracked working tree files would be overwritten by merge:\n"
2451"%%s"
2452msgstr ""
2453"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2454"%%s"
2455
2456#: unpack-trees.c:112
2457#, c-format
2458msgid ""
2459"The following untracked working tree files would be overwritten by %s:\n"
2460"%%sPlease move or remove them before you %s."
2461msgstr ""
2462"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2463"%%s请在 %s 前移动或删除。"
2464
2465#: unpack-trees.c:114
2466#, c-format
2467msgid ""
2468"The following untracked working tree files would be overwritten by %s:\n"
2469"%%s"
2470msgstr ""
2471"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2472"%%s"
2473
2474#: unpack-trees.c:121
2475#, c-format
2476msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
2477msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
2478
2479#: unpack-trees.c:124
2480#, c-format
2481msgid ""
2482"Cannot update sparse checkout: the following entries are not up-to-date:\n"
2483"%s"
2484msgstr ""
2485"无法更新稀疏检出:如下条目不是最新:\n"
2486"%s"
2487
2488#: unpack-trees.c:126
2489#, c-format
2490msgid ""
2491"The following Working tree files would be overwritten by sparse checkout "
2492"update:\n"
2493"%s"
2494msgstr ""
2495"工作区中下列文件将会因为稀疏检出而被覆盖:\n"
2496"%s"
2497
2498#: unpack-trees.c:128
2499#, c-format
2500msgid ""
2501"The following Working tree files would be removed by sparse checkout "
2502"update:\n"
2503"%s"
2504msgstr ""
2505"工作区中下列文件将会因为稀疏检出而被删除:\n"
2506"%s"
2507
2508#: unpack-trees.c:205
2509#, c-format
2510msgid "Aborting\n"
2511msgstr "终止中\n"
2512
2513#: unpack-trees.c:237
2514msgid "Checking out files"
2515msgstr "正在检出文件"
2516
2517#: urlmatch.c:120
2518msgid "invalid URL scheme name or missing '://' suffix"
2519msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
2520
2521#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
2522#, c-format
2523msgid "invalid %XX escape sequence"
2524msgstr "无效的 %XX 转义序列"
2525
2526#: urlmatch.c:172
2527msgid "missing host and scheme is not 'file:'"
2528msgstr "缺失主机名且 URL 方案不是 'file:'"
2529
2530#: urlmatch.c:189
2531msgid "a 'file:' URL may not have a port number"
2532msgstr "一个 'file:' URL 不应该包含端口号"
2533
2534#: urlmatch.c:199
2535msgid "invalid characters in host name"
2536msgstr "主机名中包含无效的字符"
2537
2538#: urlmatch.c:244 urlmatch.c:255
2539msgid "invalid port number"
2540msgstr "无效的端口号"
2541
2542#: urlmatch.c:322
2543msgid "invalid '..' path segment"
2544msgstr "无效的 '..' 路径片段"
2545
2546#: worktree.c:282
2547#, c-format
2548msgid "failed to read '%s'"
2549msgstr "无法读取 '%s'"
2550
2551#: wrapper.c:222 wrapper.c:392
2552#, c-format
2553msgid "could not open '%s' for reading and writing"
2554msgstr "无法打开 '%s' 进行读写"
2555
2556#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
2557#, c-format
2558msgid "could not open '%s' for writing"
2559msgstr "无法打开 '%s' 进行写入"
2560
2561#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
2562#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
2563#: builtin/pull.c:407
2564#, c-format
2565msgid "could not open '%s' for reading"
2566msgstr "无法打开 '%s' 进行读取"
2567
2568#: wrapper.c:605 wrapper.c:626
2569#, c-format
2570msgid "unable to access '%s'"
2571msgstr "不能访问 '%s'"
2572
2573#: wrapper.c:634
2574msgid "unable to get current working directory"
2575msgstr "不能获取当前工作目录"
2576
2577#: wrapper.c:658
2578#, c-format
2579msgid "could not write to %s"
2580msgstr "不能写入 %s"
2581
2582#: wrapper.c:660
2583#, c-format
2584msgid "could not close %s"
2585msgstr "不能关闭 %s"
2586
2587#: wt-status.c:150
2588msgid "Unmerged paths:"
2589msgstr "未合并的路径:"
2590
2591#  译者:注意保持前导空格
2592#: wt-status.c:177 wt-status.c:204
2593#, c-format
2594msgid "  (use \"git reset %s <file>...\" to unstage)"
2595msgstr "  (使用 \"git reset %s <文件>...\" 以取消暂存)"
2596
2597#  译者:注意保持前导空格
2598#: wt-status.c:179 wt-status.c:206
2599msgid "  (use \"git rm --cached <file>...\" to unstage)"
2600msgstr "  (使用 \"git rm --cached <文件>...\" 以取消暂存)"
2601
2602#  译者:注意保持前导空格
2603#: wt-status.c:183
2604msgid "  (use \"git add <file>...\" to mark resolution)"
2605msgstr "  (使用 \"git add <文件>...\" 标记解决方案)"
2606
2607#  译者:注意保持前导空格
2608#: wt-status.c:185 wt-status.c:189
2609msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
2610msgstr "  (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
2611
2612#  译者:注意保持前导空格
2613#: wt-status.c:187
2614msgid "  (use \"git rm <file>...\" to mark resolution)"
2615msgstr "  (使用 \"git rm <文件>...\" 标记解决方案)"
2616
2617#: wt-status.c:198 wt-status.c:882
2618msgid "Changes to be committed:"
2619msgstr "要提交的变更:"
2620
2621#: wt-status.c:216 wt-status.c:891
2622msgid "Changes not staged for commit:"
2623msgstr "尚未暂存以备提交的变更:"
2624
2625#  译者:注意保持前导空格
2626#: wt-status.c:220
2627msgid "  (use \"git add <file>...\" to update what will be committed)"
2628msgstr "  (使用 \"git add <文件>...\" 更新要提交的内容)"
2629
2630#  译者:注意保持前导空格
2631#: wt-status.c:222
2632msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
2633msgstr "  (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
2634
2635#  译者:注意保持前导空格
2636#: wt-status.c:223
2637msgid ""
2638"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
2639msgstr "  (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
2640
2641#  译者:注意保持前导空格
2642#: wt-status.c:225
2643msgid "  (commit or discard the untracked or modified content in submodules)"
2644msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
2645
2646#  译者:注意保持前导空格
2647#: wt-status.c:237
2648#, c-format
2649msgid "  (use \"git %s <file>...\" to include in what will be committed)"
2650msgstr "  (使用 \"git %s <文件>...\" 以包含要提交的内容)"
2651
2652#: wt-status.c:252
2653msgid "both deleted:"
2654msgstr "双方删除:"
2655
2656#: wt-status.c:254
2657msgid "added by us:"
2658msgstr "由我们添加:"
2659
2660#: wt-status.c:256
2661msgid "deleted by them:"
2662msgstr "由他们删除:"
2663
2664#: wt-status.c:258
2665msgid "added by them:"
2666msgstr "由他们添加:"
2667
2668#: wt-status.c:260
2669msgid "deleted by us:"
2670msgstr "由我们删除:"
2671
2672#: wt-status.c:262
2673msgid "both added:"
2674msgstr "双方添加:"
2675
2676#: wt-status.c:264
2677msgid "both modified:"
2678msgstr "双方修改:"
2679
2680#: wt-status.c:274
2681msgid "new file:"
2682msgstr "新文件:"
2683
2684#: wt-status.c:276
2685msgid "copied:"
2686msgstr "拷贝:"
2687
2688#: wt-status.c:278
2689msgid "deleted:"
2690msgstr "删除:"
2691
2692#: wt-status.c:280
2693msgid "modified:"
2694msgstr "修改:"
2695
2696#: wt-status.c:282
2697msgid "renamed:"
2698msgstr "重命名:"
2699
2700#: wt-status.c:284
2701msgid "typechange:"
2702msgstr "类型变更:"
2703
2704#: wt-status.c:286
2705msgid "unknown:"
2706msgstr "未知:"
2707
2708#: wt-status.c:288
2709msgid "unmerged:"
2710msgstr "未合并:"
2711
2712#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2713#: wt-status.c:370
2714msgid "new commits, "
2715msgstr "新提交, "
2716
2717#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2718#: wt-status.c:372
2719msgid "modified content, "
2720msgstr "修改的内容, "
2721
2722#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2723#: wt-status.c:374
2724msgid "untracked content, "
2725msgstr "未跟踪的内容, "
2726
2727#: wt-status.c:756
2728msgid "Submodules changed but not updated:"
2729msgstr "子模组已修改但尚未更新:"
2730
2731#: wt-status.c:758
2732msgid "Submodule changes to be committed:"
2733msgstr "要提交的子模组变更:"
2734
2735#: wt-status.c:839
2736msgid ""
2737"Do not touch the line above.\n"
2738"Everything below will be removed."
2739msgstr ""
2740"不要改动上面的一行。\n"
2741"下面的所有内容均将被删除。"
2742
2743#: wt-status.c:950
2744msgid "You have unmerged paths."
2745msgstr "您有尚未合并的路径。"
2746
2747#  译者:注意保持前导空格
2748#: wt-status.c:953
2749msgid "  (fix conflicts and run \"git commit\")"
2750msgstr "  (解决冲突并运行 \"git commit\")"
2751
2752#  译者:注意保持前导空格
2753#: wt-status.c:955
2754msgid "  (use \"git merge --abort\" to abort the merge)"
2755msgstr "  (使用 \"git merge --abort\" 终止合并)"
2756
2757#: wt-status.c:960
2758msgid "All conflicts fixed but you are still merging."
2759msgstr "所有冲突已解决但您仍处于合并中。"
2760
2761#  译者:注意保持前导空格
2762#: wt-status.c:963
2763msgid "  (use \"git commit\" to conclude merge)"
2764msgstr "  (使用 \"git commit\" 结束合并)"
2765
2766#: wt-status.c:973
2767msgid "You are in the middle of an am session."
2768msgstr "您正处于 am 操作过程中。"
2769
2770#: wt-status.c:976
2771msgid "The current patch is empty."
2772msgstr "当前的补丁为空。"
2773
2774#  译者:注意保持前导空格
2775#: wt-status.c:980
2776msgid "  (fix conflicts and then run \"git am --continue\")"
2777msgstr "  (解决冲突,然后运行 \"git am --continue\")"
2778
2779#  译者:注意保持前导空格
2780#: wt-status.c:982
2781msgid "  (use \"git am --skip\" to skip this patch)"
2782msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
2783
2784#  译者:注意保持前导空格
2785#: wt-status.c:984
2786msgid "  (use \"git am --abort\" to restore the original branch)"
2787msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
2788
2789#: wt-status.c:1109
2790msgid "No commands done."
2791msgstr "没有命令被执行。"
2792
2793#: wt-status.c:1112
2794#, c-format
2795msgid "Last command done (%d command done):"
2796msgid_plural "Last commands done (%d commands done):"
2797msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2798msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2799
2800#: wt-status.c:1123
2801#, c-format
2802msgid "  (see more in file %s)"
2803msgstr "  (更多参见文件 %s)"
2804
2805#: wt-status.c:1128
2806msgid "No commands remaining."
2807msgstr "未剩下任何命令。"
2808
2809#: wt-status.c:1131
2810#, c-format
2811msgid "Next command to do (%d remaining command):"
2812msgid_plural "Next commands to do (%d remaining commands):"
2813msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2814msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2815
2816#  译者:注意保持前导空格
2817#: wt-status.c:1139
2818msgid "  (use \"git rebase --edit-todo\" to view and edit)"
2819msgstr "  (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2820
2821#: wt-status.c:1152
2822#, c-format
2823msgid "You are currently rebasing branch '%s' on '%s'."
2824msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2825
2826#: wt-status.c:1157
2827msgid "You are currently rebasing."
2828msgstr "您在执行变基操作。"
2829
2830#  译者:注意保持前导空格
2831#: wt-status.c:1171
2832msgid "  (fix conflicts and then run \"git rebase --continue\")"
2833msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
2834
2835#  译者:注意保持前导空格
2836#: wt-status.c:1173
2837msgid "  (use \"git rebase --skip\" to skip this patch)"
2838msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
2839
2840#  译者:注意保持前导空格
2841#: wt-status.c:1175
2842msgid "  (use \"git rebase --abort\" to check out the original branch)"
2843msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
2844
2845#  译者:注意保持前导空格
2846#: wt-status.c:1181
2847msgid "  (all conflicts fixed: run \"git rebase --continue\")"
2848msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
2849
2850#: wt-status.c:1185
2851#, c-format
2852msgid ""
2853"You are currently splitting a commit while rebasing branch '%s' on '%s'."
2854msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2855
2856#: wt-status.c:1190
2857msgid "You are currently splitting a commit during a rebase."
2858msgstr "您在执行变基操作时拆分提交。"
2859
2860#  译者:注意保持前导空格
2861#: wt-status.c:1193
2862msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
2863msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2864
2865#: wt-status.c:1197
2866#, c-format
2867msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2868msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2869
2870#: wt-status.c:1202
2871msgid "You are currently editing a commit during a rebase."
2872msgstr "您在执行变基操作时编辑提交。"
2873
2874#  译者:注意保持前导空格
2875#: wt-status.c:1205
2876msgid "  (use \"git commit --amend\" to amend the current commit)"
2877msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
2878
2879#  译者:注意保持前导空格
2880#: wt-status.c:1207
2881msgid ""
2882"  (use \"git rebase --continue\" once you are satisfied with your changes)"
2883msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
2884
2885#: wt-status.c:1217
2886#, c-format
2887msgid "You are currently cherry-picking commit %s."
2888msgstr "您在执行拣选提交 %s 的操作。"
2889
2890#  译者:注意保持前导空格
2891#: wt-status.c:1222
2892msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
2893msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
2894
2895#  译者:注意保持前导空格
2896#: wt-status.c:1225
2897msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
2898msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2899
2900#  译者:注意保持前导空格
2901#: wt-status.c:1227
2902msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2903msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2904
2905#: wt-status.c:1236
2906#, c-format
2907msgid "You are currently reverting commit %s."
2908msgstr "您在执行反转提交 %s 的操作。"
2909
2910#  译者:注意保持前导空格
2911#: wt-status.c:1241
2912msgid "  (fix conflicts and run \"git revert --continue\")"
2913msgstr "  (解决冲突并运行 \"git revert --continue\")"
2914
2915#  译者:注意保持前导空格
2916#: wt-status.c:1244
2917msgid "  (all conflicts fixed: run \"git revert --continue\")"
2918msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
2919
2920#  译者:注意保持前导空格
2921#: wt-status.c:1246
2922msgid "  (use \"git revert --abort\" to cancel the revert operation)"
2923msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
2924
2925#: wt-status.c:1257
2926#, c-format
2927msgid "You are currently bisecting, started from branch '%s'."
2928msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2929
2930#: wt-status.c:1261
2931msgid "You are currently bisecting."
2932msgstr "您在执行二分查找操作。"
2933
2934#  译者:注意保持前导空格
2935#: wt-status.c:1264
2936msgid "  (use \"git bisect reset\" to get back to the original branch)"
2937msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
2938
2939#: wt-status.c:1464
2940msgid "On branch "
2941msgstr "位于分支 "
2942
2943#: wt-status.c:1470
2944msgid "interactive rebase in progress; onto "
2945msgstr "交互式变基操作正在进行中;至 "
2946
2947#: wt-status.c:1472
2948msgid "rebase in progress; onto "
2949msgstr "变基操作正在进行中;至 "
2950
2951#: wt-status.c:1477
2952msgid "HEAD detached at "
2953msgstr "头指针分离于 "
2954
2955#: wt-status.c:1479
2956msgid "HEAD detached from "
2957msgstr "头指针分离自 "
2958
2959#: wt-status.c:1482
2960msgid "Not currently on any branch."
2961msgstr "当前不在任何分支上。"
2962
2963#: wt-status.c:1500
2964msgid "Initial commit"
2965msgstr "初始提交"
2966
2967#: wt-status.c:1514
2968msgid "Untracked files"
2969msgstr "未跟踪的文件"
2970
2971#: wt-status.c:1516
2972msgid "Ignored files"
2973msgstr "忽略的文件"
2974
2975#: wt-status.c:1520
2976#, c-format
2977msgid ""
2978"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2979"may speed it up, but you have to be careful not to forget to add\n"
2980"new files yourself (see 'git help status')."
2981msgstr ""
2982"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2983"但您需要小心不要忘了添加新文件(参见 'git help status')。"
2984
2985#: wt-status.c:1526
2986#, c-format
2987msgid "Untracked files not listed%s"
2988msgstr "未跟踪的文件没有列出%s"
2989
2990#  译者:中文字符串拼接,可删除前导空格
2991#: wt-status.c:1528
2992msgid " (use -u option to show untracked files)"
2993msgstr "(使用 -u 参数显示未跟踪的文件)"
2994
2995#: wt-status.c:1534
2996msgid "No changes"
2997msgstr "没有修改"
2998
2999#: wt-status.c:1539
3000#, c-format
3001msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
3002msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
3003
3004#: wt-status.c:1542
3005#, c-format
3006msgid "no changes added to commit\n"
3007msgstr "修改尚未加入提交\n"
3008
3009#: wt-status.c:1545
3010#, c-format
3011msgid ""
3012"nothing added to commit but untracked files present (use \"git add\" to "
3013"track)\n"
3014msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
3015
3016#: wt-status.c:1548
3017#, c-format
3018msgid "nothing added to commit but untracked files present\n"
3019msgstr "提交为空,但是存在尚未跟踪的文件\n"
3020
3021#  译者:中文字符串拼接,可删除前导空格
3022#: wt-status.c:1551
3023#, c-format
3024msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
3025msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
3026
3027#: wt-status.c:1554 wt-status.c:1559
3028#, c-format
3029msgid "nothing to commit\n"
3030msgstr "无文件要提交\n"
3031
3032#  译者:中文字符串拼接,可删除前导空格
3033#: wt-status.c:1557
3034#, c-format
3035msgid "nothing to commit (use -u to show untracked files)\n"
3036msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
3037
3038#  译者:中文字符串拼接,可删除前导空格
3039#: wt-status.c:1561
3040#, c-format
3041msgid "nothing to commit, working tree clean\n"
3042msgstr "无文件要提交,干净的工作区\n"
3043
3044#  译者:注意保持句尾空格
3045#: wt-status.c:1668
3046msgid "Initial commit on "
3047msgstr "初始提交于 "
3048
3049#: wt-status.c:1672
3050msgid "HEAD (no branch)"
3051msgstr "HEAD(非分支)"
3052
3053#: wt-status.c:1701
3054msgid "gone"
3055msgstr "丢失"
3056
3057#  译者:注意保持句尾空格
3058#: wt-status.c:1703 wt-status.c:1711
3059msgid "behind "
3060msgstr "落后 "
3061
3062#: wt-status.c:1706 wt-status.c:1709
3063msgid "ahead "
3064msgstr "领先 "
3065
3066#: compat/precompose_utf8.c:57 builtin/clone.c:415
3067#, c-format
3068msgid "failed to unlink '%s'"
3069msgstr "无法删除 '%s'"
3070
3071#: builtin/add.c:22
3072msgid "git add [<options>] [--] <pathspec>..."
3073msgstr "git add [<选项>] [--] <路径规格>..."
3074
3075#: builtin/add.c:65
3076#, c-format
3077msgid "unexpected diff status %c"
3078msgstr "意外的差异状态 %c"
3079
3080#: builtin/add.c:71 builtin/commit.c:281
3081msgid "updating files failed"
3082msgstr "更新文件失败"
3083
3084#: builtin/add.c:81
3085#, c-format
3086msgid "remove '%s'\n"
3087msgstr "删除 '%s'\n"
3088
3089#: builtin/add.c:136
3090msgid "Unstaged changes after refreshing the index:"
3091msgstr "刷新索引之后尚未被暂存的变更:"
3092
3093#: builtin/add.c:196 builtin/rev-parse.c:811
3094msgid "Could not read the index"
3095msgstr "不能读取索引"
3096
3097#: builtin/add.c:207
3098#, c-format
3099msgid "Could not open '%s' for writing."
3100msgstr "无法打开 '%s' 进行写入。"
3101
3102#: builtin/add.c:211
3103msgid "Could not write patch"
3104msgstr "不能生成补丁"
3105
3106#: builtin/add.c:214
3107msgid "editing patch failed"
3108msgstr "编辑补丁失败"
3109
3110#: builtin/add.c:217
3111#, c-format
3112msgid "Could not stat '%s'"
3113msgstr "不能查看文件状态 '%s'"
3114
3115#: builtin/add.c:219
3116msgid "Empty patch. Aborted."
3117msgstr "空补丁。异常终止。"
3118
3119#: builtin/add.c:224
3120#, c-format
3121msgid "Could not apply '%s'"
3122msgstr "不能应用 '%s'"
3123
3124#: builtin/add.c:234
3125msgid "The following paths are ignored by one of your .gitignore files:\n"
3126msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
3127
3128#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
3129#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
3130#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
3131msgid "dry run"
3132msgstr "演习"
3133
3134#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
3135#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
3136#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
3137msgid "be verbose"
3138msgstr "冗长输出"
3139
3140#: builtin/add.c:256
3141msgid "interactive picking"
3142msgstr "交互式拣选"
3143
3144#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
3145msgid "select hunks interactively"
3146msgstr "交互式挑选数据块"
3147
3148#: builtin/add.c:258
3149msgid "edit current diff and apply"
3150msgstr "编辑当前差异并应用"
3151
3152#: builtin/add.c:259
3153msgid "allow adding otherwise ignored files"
3154msgstr "允许添加忽略的文件"
3155
3156#: builtin/add.c:260
3157msgid "update tracked files"
3158msgstr "更新已跟踪的文件"
3159
3160#: builtin/add.c:261
3161msgid "record only the fact that the path will be added later"
3162msgstr "只记录,该路径稍后再添加"
3163
3164#: builtin/add.c:262
3165msgid "add changes from all tracked and untracked files"
3166msgstr "添加所有改变的已跟踪文件和未跟踪文件"
3167
3168#: builtin/add.c:265
3169msgid "ignore paths removed in the working tree (same as --no-all)"
3170msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
3171
3172#: builtin/add.c:267
3173msgid "don't add, only refresh the index"
3174msgstr "不添加,只刷新索引"
3175
3176#: builtin/add.c:268
3177msgid "just skip files which cannot be added because of errors"
3178msgstr "跳过因出错不能添加的文件"
3179
3180#: builtin/add.c:269
3181msgid "check if - even missing - files are ignored in dry run"
3182msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
3183
3184#: builtin/add.c:270 builtin/update-index.c:958
3185msgid "(+/-)x"
3186msgstr "(+/-)x"
3187
3188#: builtin/add.c:270 builtin/update-index.c:959
3189msgid "override the executable bit of the listed files"
3190msgstr "覆盖列表里文件的可执行位"
3191
3192#: builtin/add.c:292
3193#, c-format
3194msgid "Use -f if you really want to add them.\n"
3195msgstr "使用 -f 参数如果您确实要添加它们。\n"
3196
3197#: builtin/add.c:300
3198msgid "adding files failed"
3199msgstr "添加文件失败"
3200
3201#: builtin/add.c:336
3202msgid "-A and -u are mutually incompatible"
3203msgstr "-A 和 -u 选项互斥"
3204
3205#: builtin/add.c:343
3206msgid "Option --ignore-missing can only be used together with --dry-run"
3207msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
3208
3209#: builtin/add.c:352
3210#, c-format
3211msgid "--chmod param '%s' must be either -x or +x"
3212msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
3213
3214#: builtin/add.c:367
3215#, c-format
3216msgid "Nothing specified, nothing added.\n"
3217msgstr "没有指定文件,也没有文件被添加。\n"
3218
3219#: builtin/add.c:368
3220#, c-format
3221msgid "Maybe you wanted to say 'git add .'?\n"
3222msgstr "也许您想要执行 'git add .'?\n"
3223
3224#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
3225#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
3226#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
3227#: builtin/submodule--helper.c:240
3228msgid "index file corrupt"
3229msgstr "索引文件损坏"
3230
3231#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
3232msgid "Unable to write new index file"
3233msgstr "无法写入新索引文件"
3234
3235#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
3236#, c-format
3237msgid "could not read '%s'"
3238msgstr "不能读取 '%s'"
3239
3240#: builtin/am.c:426
3241msgid "could not parse author script"
3242msgstr "不能解析作者脚本"
3243
3244#: builtin/am.c:503
3245#, c-format
3246msgid "'%s' was deleted by the applypatch-msg hook"
3247msgstr "'%s' 被 applypatch-msg 钩子删除"
3248
3249#: builtin/am.c:544 builtin/notes.c:301
3250#, c-format
3251msgid "Malformed input line: '%s'."
3252msgstr "非法的输入行:'%s'。"
3253
3254#: builtin/am.c:581 builtin/notes.c:316
3255#, c-format
3256msgid "Failed to copy notes from '%s' to '%s'"
3257msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
3258
3259#: builtin/am.c:607
3260msgid "fseek failed"
3261msgstr "fseek 失败"
3262
3263#: builtin/am.c:787
3264#, c-format
3265msgid "could not parse patch '%s'"
3266msgstr "无法解析补丁 '%s'"
3267
3268#: builtin/am.c:852
3269msgid "Only one StGIT patch series can be applied at once"
3270msgstr "一次只能有一个 StGIT 补丁队列被应用"
3271
3272#: builtin/am.c:899
3273msgid "invalid timestamp"
3274msgstr "无效的时间戳"
3275
3276#: builtin/am.c:902 builtin/am.c:910
3277msgid "invalid Date line"
3278msgstr "无效的日期行"
3279
3280#: builtin/am.c:907
3281msgid "invalid timezone offset"
3282msgstr "无效的时区偏移值"
3283
3284#: builtin/am.c:996
3285msgid "Patch format detection failed."
3286msgstr "补丁格式检测失败。"
3287
3288#: builtin/am.c:1001 builtin/clone.c:380
3289#, c-format
3290msgid "failed to create directory '%s'"
3291msgstr "无法创建目录 '%s'"
3292
3293#: builtin/am.c:1005
3294msgid "Failed to split patches."
3295msgstr "无法拆分补丁。"
3296
3297#: builtin/am.c:1137 builtin/commit.c:366
3298msgid "unable to write index file"
3299msgstr "无法写入索引文件"
3300
3301#: builtin/am.c:1188
3302#, c-format
3303msgid "When you have resolved this problem, run \"%s --continue\"."
3304msgstr "当您解决这一问题,执行 \"%s --continue\"。"
3305
3306#: builtin/am.c:1189
3307#, c-format
3308msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
3309msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
3310
3311#: builtin/am.c:1190
3312#, c-format
3313msgid "To restore the original branch and stop patching, run \"%s --abort\"."
3314msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
3315
3316#: builtin/am.c:1328
3317msgid "Patch is empty. Was it split wrong?"
3318msgstr "补丁为空。是不是切分错误?"
3319
3320#: builtin/am.c:1402 builtin/log.c:1543
3321#, c-format
3322msgid "invalid ident line: %s"
3323msgstr "包含无效的身份标识:%s"
3324
3325#: builtin/am.c:1429
3326#, c-format
3327msgid "unable to parse commit %s"
3328msgstr "不能解析提交 %s"
3329
3330#: builtin/am.c:1602
3331msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3332msgstr "仓库缺乏必要的数据对象以进行三方合并。"
3333
3334#: builtin/am.c:1604
3335msgid "Using index info to reconstruct a base tree..."
3336msgstr "使用索引来重建一个(三方合并的)基础目录树..."
3337
3338#: builtin/am.c:1623
3339msgid ""
3340"Did you hand edit your patch?\n"
3341"It does not apply to blobs recorded in its index."
3342msgstr ""
3343"您是否曾手动编辑过您的补丁?\n"
3344"无法应用补丁到索引中的数据对象上。"
3345
3346#: builtin/am.c:1629
3347msgid "Falling back to patching base and 3-way merge..."
3348msgstr "回落到基础版本上打补丁及进行三方合并..."
3349
3350#: builtin/am.c:1654
3351msgid "Failed to merge in the changes."
3352msgstr "无法合并变更。"
3353
3354#: builtin/am.c:1679 builtin/merge.c:628
3355msgid "git write-tree failed to write a tree"
3356msgstr "git write-tree 无法写入一树对象"
3357
3358#: builtin/am.c:1686
3359msgid "applying to an empty history"
3360msgstr "正应用到一个空历史上"
3361
3362#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
3363#: builtin/merge.c:823
3364msgid "failed to write commit object"
3365msgstr "无法写提交对象"
3366
3367#: builtin/am.c:1731 builtin/am.c:1735
3368#, c-format
3369msgid "cannot resume: %s does not exist."
3370msgstr "无法继续:%s 不存在。"
3371
3372#: builtin/am.c:1751
3373msgid "cannot be interactive without stdin connected to a terminal."
3374msgstr "标准输入没有和终端关联,不能进行交互式操作。"
3375
3376#: builtin/am.c:1756
3377msgid "Commit Body is:"
3378msgstr "提交内容为:"
3379
3380#  译者:注意保持句尾空格
3381#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3382#. in your translation. The program will only accept English
3383#. input at this point.
3384#.
3385#: builtin/am.c:1766
3386msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
3387msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
3388
3389#: builtin/am.c:1816
3390#, c-format
3391msgid "Dirty index: cannot apply patches (dirty: %s)"
3392msgstr "脏索引:不能应用补丁(脏文件:%s)"
3393
3394#: builtin/am.c:1853 builtin/am.c:1925
3395#, c-format
3396msgid "Applying: %.*s"
3397msgstr "应用:%.*s"
3398
3399#: builtin/am.c:1869
3400msgid "No changes -- Patch already applied."
3401msgstr "没有变更 —— 补丁已经应用过。"
3402
3403#: builtin/am.c:1877
3404#, c-format
3405msgid "Patch failed at %s %.*s"
3406msgstr "打补丁失败于 %s %.*s"
3407
3408#: builtin/am.c:1883
3409#, c-format
3410msgid "The copy of the patch that failed is found in: %s"
3411msgstr "失败的补丁文件副本位于:%s"
3412
3413#: builtin/am.c:1928
3414msgid ""
3415"No changes - did you forget to use 'git add'?\n"
3416"If there is nothing left to stage, chances are that something else\n"
3417"already introduced the same changes; you might want to skip this patch."
3418msgstr ""
3419"没有变更 —— 您是不是忘了执行 'git add'?\n"
3420"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
3421"您也许想要跳过这个补丁。"
3422
3423#: builtin/am.c:1935
3424msgid ""
3425"You still have unmerged paths in your index.\n"
3426"Did you forget to use 'git add'?"
3427msgstr ""
3428"您的索引中仍有未合并的路径。\n"
3429"您是否忘了执行 'git add'?"
3430
3431#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
3432#: builtin/reset.c:316
3433#, c-format
3434msgid "Could not parse object '%s'."
3435msgstr "不能解析对象 '%s'。"
3436
3437#: builtin/am.c:2095
3438msgid "failed to clean index"
3439msgstr "无法清空索引"
3440
3441#: builtin/am.c:2129
3442msgid ""
3443"You seem to have moved HEAD since the last 'am' failure.\n"
3444"Not rewinding to ORIG_HEAD"
3445msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
3446
3447#: builtin/am.c:2192
3448#, c-format
3449msgid "Invalid value for --patch-format: %s"
3450msgstr "无效的 --patch-format 值:%s"
3451
3452#: builtin/am.c:2225
3453msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
3454msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
3455
3456#: builtin/am.c:2226
3457msgid "git am [<options>] (--continue | --skip | --abort)"
3458msgstr "git am [<选项>] (--continue | --skip | --abort)"
3459
3460#: builtin/am.c:2232
3461msgid "run interactively"
3462msgstr "以交互式方式运行"
3463
3464#: builtin/am.c:2234
3465msgid "historical option -- no-op"
3466msgstr "老的参数 —— 无作用"
3467
3468#: builtin/am.c:2236
3469msgid "allow fall back on 3way merging if needed"
3470msgstr "如果必要,允许使用三方合并。"
3471
3472#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
3473#: builtin/repack.c:172
3474msgid "be quiet"
3475msgstr "静默模式"
3476
3477#: builtin/am.c:2239
3478msgid "add a Signed-off-by line to the commit message"
3479msgstr "在提交说明中添加一个 Signed-off-by 签名"
3480
3481#: builtin/am.c:2242
3482msgid "recode into utf8 (default)"
3483msgstr "使用 utf8 字符集(默认)"
3484
3485#: builtin/am.c:2244
3486msgid "pass -k flag to git-mailinfo"
3487msgstr "向 git-mailinfo 传递 -k 参数"
3488
3489#: builtin/am.c:2246
3490msgid "pass -b flag to git-mailinfo"
3491msgstr "向 git-mailinfo 传递 -b 参数"
3492
3493#: builtin/am.c:2248
3494msgid "pass -m flag to git-mailinfo"
3495msgstr "向 git-mailinfo 传递 -m 参数"
3496
3497#: builtin/am.c:2250
3498msgid "pass --keep-cr flag to git-mailsplit for mbox format"
3499msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
3500
3501#: builtin/am.c:2253
3502msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
3503msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
3504
3505#: builtin/am.c:2256
3506msgid "strip everything before a scissors line"
3507msgstr "丢弃裁切线前的所有内容"
3508
3509#: builtin/am.c:2257 builtin/apply.c:4837
3510msgid "action"
3511msgstr "动作"
3512
3513#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
3514#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
3515#: builtin/am.c:2285
3516msgid "pass it through git-apply"
3517msgstr "传递给 git-apply"
3518
3519#: builtin/am.c:2266 builtin/apply.c:4861
3520msgid "root"
3521msgstr "根目录"
3522
3523#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
3524#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
3525#: builtin/pull.c:179 builtin/submodule--helper.c:277
3526#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
3527#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
3528#: builtin/submodule--helper.c:826
3529msgid "path"
3530msgstr "路径"
3531
3532#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
3533#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
3534#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
3535#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
3536#: parse-options.h:132 parse-options.h:134 parse-options.h:244
3537msgid "n"
3538msgstr "n"
3539
3540#: builtin/am.c:2278 builtin/apply.c:4805
3541msgid "num"
3542msgstr "数字"
3543
3544#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
3545#: builtin/tag.c:372
3546msgid "format"
3547msgstr "格式"
3548
3549#: builtin/am.c:2282
3550msgid "format the patch(es) are in"
3551msgstr "补丁的格式"
3552
3553#: builtin/am.c:2288
3554msgid "override error message when patch failure occurs"
3555msgstr "打补丁失败时显示的错误信息"
3556
3557#: builtin/am.c:2290
3558msgid "continue applying patches after resolving a conflict"
3559msgstr "冲突解决后继续应用补丁"
3560
3561#: builtin/am.c:2293
3562msgid "synonyms for --continue"
3563msgstr "和 --continue 同义"
3564
3565#: builtin/am.c:2296
3566msgid "skip the current patch"
3567msgstr "跳过当前补丁"
3568
3569#: builtin/am.c:2299
3570msgid "restore the original branch and abort the patching operation."
3571msgstr "恢复原始分支并终止打补丁操作。"
3572
3573#: builtin/am.c:2303
3574msgid "lie about committer date"
3575msgstr "将作者日期作为提交日期"
3576
3577#: builtin/am.c:2305
3578msgid "use current timestamp for author date"
3579msgstr "用当前时间作为作者日期"
3580
3581#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
3582#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
3583msgid "key-id"
3584msgstr "key-id"
3585
3586#: builtin/am.c:2308
3587msgid "GPG-sign commits"
3588msgstr "使用 GPG 签名提交"
3589
3590#: builtin/am.c:2311
3591msgid "(internal use for git-rebase)"
3592msgstr "(内部使用,用于 git-rebase)"
3593
3594#: builtin/am.c:2326
3595msgid ""
3596"The -b/--binary option has been a no-op for long time, and\n"
3597"it will be removed. Please do not use it anymore."
3598msgstr ""
3599"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
3600"请不要再使用它了。"
3601
3602#: builtin/am.c:2333
3603msgid "failed to read the index"
3604msgstr "无法读取索引"
3605
3606#: builtin/am.c:2348
3607#, c-format
3608msgid "previous rebase directory %s still exists but mbox given."
3609msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
3610
3611#: builtin/am.c:2372
3612#, c-format
3613msgid ""
3614"Stray %s directory found.\n"
3615"Use \"git am --abort\" to remove it."
3616msgstr ""
3617"发现了错误的 %s 目录。\n"
3618"使用 \"git am --abort\" 删除它。"
3619
3620#: builtin/am.c:2378
3621msgid "Resolve operation not in progress, we are not resuming."
3622msgstr "解决操作未进行,我们不会继续。"
3623
3624#: builtin/apply.c:122
3625msgid "git apply [<options>] [<patch>...]"
3626msgstr "git apply [<选项>] [<补丁>...]"
3627
3628#: builtin/apply.c:153
3629#, c-format
3630msgid "unrecognized whitespace option '%s'"
3631msgstr "未能识别的空白字符选项 '%s'"
3632
3633#: builtin/apply.c:169
3634#, c-format
3635msgid "unrecognized whitespace ignore option '%s'"
3636msgstr "未能识别的空白字符忽略选项 '%s'"
3637
3638#: builtin/apply.c:854
3639#, c-format
3640msgid "Cannot prepare timestamp regexp %s"
3641msgstr "无法准备时间戳正则表达式 %s"
3642
3643#: builtin/apply.c:863
3644#, c-format
3645msgid "regexec returned %d for input: %s"
3646msgstr "regexec 返回 %d,输入为:%s"
3647
3648#: builtin/apply.c:947
3649#, c-format
3650msgid "unable to find filename in patch at line %d"
3651msgstr "不能在补丁的第 %d 行找到文件名"
3652
3653#: builtin/apply.c:984
3654#, c-format
3655msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
3656msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
3657
3658#: builtin/apply.c:989
3659#, c-format
3660msgid "git apply: bad git-diff - inconsistent new filename on line %d"
3661msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
3662
3663#: builtin/apply.c:990
3664#, c-format
3665msgid "git apply: bad git-diff - inconsistent old filename on line %d"
3666msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
3667
3668#: builtin/apply.c:995
3669#, c-format
3670msgid "git apply: bad git-diff - expected /dev/null on line %d"
3671msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
3672
3673#: builtin/apply.c:1489
3674#, c-format
3675msgid "recount: unexpected line: %.*s"
3676msgstr "recount:意外的行:%.*s"
3677
3678#: builtin/apply.c:1550
3679#, c-format
3680msgid "patch fragment without header at line %d: %.*s"
3681msgstr "第 %d 行的补丁片段没有头信息:%.*s"
3682
3683#: builtin/apply.c:1567
3684#, c-format
3685msgid ""
3686"git diff header lacks filename information when removing %d leading pathname "
3687"component (line %d)"
3688msgid_plural ""
3689"git diff header lacks filename information when removing %d leading pathname "
3690"components (line %d)"
3691msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3692msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3693
3694#: builtin/apply.c:1743
3695msgid "new file depends on old contents"
3696msgstr "新文件依赖旧内容"
3697
3698#: builtin/apply.c:1745
3699msgid "deleted file still has contents"
3700msgstr "删除的文件仍有内容"
3701
3702#: builtin/apply.c:1774
3703#, c-format
3704msgid "corrupt patch at line %d"
3705msgstr "补丁在第 %d 行损坏"
3706
3707#: builtin/apply.c:1810
3708#, c-format
3709msgid "new file %s depends on old contents"
3710msgstr "新文件 %s 依赖旧内容"
3711
3712#: builtin/apply.c:1812
3713#, c-format
3714msgid "deleted file %s still has contents"
3715msgstr "删除的文件 %s 仍有内容"
3716
3717#: builtin/apply.c:1815
3718#, c-format
3719msgid "** warning: file %s becomes empty but is not deleted"
3720msgstr "** 警告:文件 %s 成为空文件但并未删除"
3721
3722#: builtin/apply.c:1962
3723#, c-format
3724msgid "corrupt binary patch at line %d: %.*s"
3725msgstr "二进制补丁在第 %d 行损坏:%.*s"
3726
3727#: builtin/apply.c:1999
3728#, c-format
3729msgid "unrecognized binary patch at line %d"
3730msgstr "未能识别的二进制补丁位于第 %d 行"
3731
3732#: builtin/apply.c:2154
3733#, c-format
3734msgid "patch with only garbage at line %d"
3735msgstr "补丁文件的第 %d 行只有垃圾数据"
3736
3737#: builtin/apply.c:2244
3738#, c-format
3739msgid "unable to read symlink %s"
3740msgstr "无法读取符号链接 %s"
3741
3742#: builtin/apply.c:2248
3743#, c-format
3744msgid "unable to open or read %s"
3745msgstr "不能打开或读取 %s"
3746
3747#: builtin/apply.c:2901
3748#, c-format
3749msgid "invalid start of line: '%c'"
3750msgstr "无效的行首字符:'%c'"
3751
3752#: builtin/apply.c:3020
3753#, c-format
3754msgid "Hunk #%d succeeded at %d (offset %d line)."
3755msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3756msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3757msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3758
3759#: builtin/apply.c:3032
3760#, c-format
3761msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3762msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3763
3764#: builtin/apply.c:3038
3765#, c-format
3766msgid ""
3767"while searching for:\n"
3768"%.*s"
3769msgstr ""
3770"当查询:\n"
3771"%.*s"
3772
3773#: builtin/apply.c:3060
3774#, c-format
3775msgid "missing binary patch data for '%s'"
3776msgstr "缺失 '%s' 的二进制补丁数据"
3777
3778#: builtin/apply.c:3163
3779#, c-format
3780msgid "binary patch does not apply to '%s'"
3781msgstr "二进制补丁未应用到 '%s'"
3782
3783#: builtin/apply.c:3169
3784#, c-format
3785msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3786msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3787
3788#: builtin/apply.c:3190
3789#, c-format
3790msgid "patch failed: %s:%ld"
3791msgstr "打补丁失败:%s:%ld"
3792
3793#: builtin/apply.c:3314
3794#, c-format
3795msgid "cannot checkout %s"
3796msgstr "不能检出 %s"
3797
3798#: builtin/apply.c:3370
3799#, c-format
3800msgid "reading from '%s' beyond a symbolic link"
3801msgstr "读取位于符号链接中的 '%s'"
3802
3803#: builtin/apply.c:3399 builtin/apply.c:3630
3804#, c-format
3805msgid "path %s has been renamed/deleted"
3806msgstr "路径 %s 已经被重命名/删除"
3807
3808#: builtin/apply.c:3482 builtin/apply.c:3644
3809#, c-format
3810msgid "%s: does not exist in index"
3811msgstr "%s:不存在于索引中"
3812
3813#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
3814#, c-format
3815msgid "%s: %s"
3816msgstr "%s:%s"
3817
3818#: builtin/apply.c:3491 builtin/apply.c:3652
3819#, c-format
3820msgid "%s: does not match index"
3821msgstr "%s:和索引不匹配"
3822
3823#: builtin/apply.c:3597
3824msgid "removal patch leaves file contents"
3825msgstr "移除补丁仍留下了文件内容"
3826
3827#: builtin/apply.c:3669
3828#, c-format
3829msgid "%s: wrong type"
3830msgstr "%s:错误类型"
3831
3832#: builtin/apply.c:3671
3833#, c-format
3834msgid "%s has type %o, expected %o"
3835msgstr "%s 的类型是 %o,应为 %o"
3836
3837#: builtin/apply.c:3822 builtin/apply.c:3824
3838#, c-format
3839msgid "invalid path '%s'"
3840msgstr "无效路径 '%s'"
3841
3842#: builtin/apply.c:3879
3843#, c-format
3844msgid "%s: already exists in index"
3845msgstr "%s:已经存在于索引中"
3846
3847#: builtin/apply.c:3882
3848#, c-format
3849msgid "%s: already exists in working directory"
3850msgstr "%s:已经存在于工作区中"
3851
3852#: builtin/apply.c:3902
3853#, c-format
3854msgid "new mode (%o) of %s does not match old mode (%o)"
3855msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3856
3857#: builtin/apply.c:3907
3858#, c-format
3859msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3860msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3861
3862#: builtin/apply.c:3927
3863#, c-format
3864msgid "affected file '%s' is beyond a symbolic link"
3865msgstr "受影响的文件 '%s' 位于符号链接中"
3866
3867#: builtin/apply.c:3931
3868#, c-format
3869msgid "%s: patch does not apply"
3870msgstr "%s:补丁未应用"
3871
3872#: builtin/apply.c:3945
3873#, c-format
3874msgid "Checking patch %s..."
3875msgstr "检查补丁 %s..."
3876
3877#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
3878#, c-format
3879msgid "make_cache_entry failed for path '%s'"
3880msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3881
3882#: builtin/apply.c:4182
3883#, c-format
3884msgid "unable to remove %s from index"
3885msgstr "不能从索引中移除 %s"
3886
3887#: builtin/apply.c:4215
3888#, c-format
3889msgid "corrupt patch for submodule %s"
3890msgstr "子模组 %s 损坏的补丁"
3891
3892#: builtin/apply.c:4219
3893#, c-format
3894msgid "unable to stat newly created file '%s'"
3895msgstr "不能枚举新建文件 '%s' 的状态"
3896
3897#: builtin/apply.c:4224
3898#, c-format
3899msgid "unable to create backing store for newly created file %s"
3900msgstr "不能为新建文件 %s 创建后端存储"
3901
3902#: builtin/apply.c:4227 builtin/apply.c:4340
3903#, c-format
3904msgid "unable to add cache entry for %s"
3905msgstr "无法为 %s 添加缓存条目"
3906
3907#: builtin/apply.c:4260
3908#, c-format
3909msgid "closing file '%s'"
3910msgstr "关闭文件 '%s'"
3911
3912#: builtin/apply.c:4313
3913#, c-format
3914msgid "unable to write file '%s' mode %o"
3915msgstr "不能写文件 '%s' 权限 %o"
3916
3917#: builtin/apply.c:4403
3918#, c-format
3919msgid "Applied patch %s cleanly."
3920msgstr "成功应用补丁 %s。"
3921
3922#: builtin/apply.c:4411
3923msgid "internal error"
3924msgstr "内部错误"
3925
3926#: builtin/apply.c:4414
3927#, c-format
3928msgid "Applying patch %%s with %d reject..."
3929msgid_plural "Applying patch %%s with %d rejects..."
3930msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3931msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3932
3933#: builtin/apply.c:4424
3934#, c-format
3935msgid "truncating .rej filename to %.*s.rej"
3936msgstr "截短 .rej 文件名为 %.*s.rej"
3937
3938#: builtin/apply.c:4432
3939#, c-format
3940msgid "cannot open %s: %s"
3941msgstr "不能打开 %s:%s"
3942
3943#: builtin/apply.c:4445
3944#, c-format
3945msgid "Hunk #%d applied cleanly."
3946msgstr "第 #%d 个片段成功应用。"
3947
3948#: builtin/apply.c:4448
3949#, c-format
3950msgid "Rejected hunk #%d."
3951msgstr "拒绝第 #%d 个片段。"
3952
3953#: builtin/apply.c:4537
3954#, c-format
3955msgid "Skipped patch '%s'."
3956msgstr "略过补丁 '%s'。"
3957
3958#: builtin/apply.c:4545
3959msgid "unrecognized input"
3960msgstr "未能识别的输入"
3961
3962#: builtin/apply.c:4556
3963msgid "unable to read index file"
3964msgstr "无法读取索引文件"
3965
3966#: builtin/apply.c:4701
3967msgid "--3way outside a repository"
3968msgstr "--3way 在一个仓库之外"
3969
3970#: builtin/apply.c:4709
3971msgid "--index outside a repository"
3972msgstr "--index 在一个仓库之外"
3973
3974#: builtin/apply.c:4712
3975msgid "--cached outside a repository"
3976msgstr "--cached 在一个仓库之外"
3977
3978#: builtin/apply.c:4745
3979#, c-format
3980msgid "can't open patch '%s'"
3981msgstr "不能打开补丁 '%s'"
3982
3983#: builtin/apply.c:4760
3984#, c-format
3985msgid "squelched %d whitespace error"
3986msgid_plural "squelched %d whitespace errors"
3987msgstr[0] "抑制下仍有 %d 个空白字符误用"
3988msgstr[1] "抑制下仍有 %d 个空白字符误用"
3989
3990#: builtin/apply.c:4766 builtin/apply.c:4776
3991#, c-format
3992msgid "%d line adds whitespace errors."
3993msgid_plural "%d lines add whitespace errors."
3994msgstr[0] "%d 行有空白字符误用。"
3995msgstr[1] "%d 行有空白字符误用。"
3996
3997#: builtin/apply.c:4800
3998msgid "don't apply changes matching the given path"
3999msgstr "不要应用与给出路径向匹配的变更"
4000
4001#: builtin/apply.c:4803
4002msgid "apply changes matching the given path"
4003msgstr "应用与给出路径向匹配的变更"
4004
4005#: builtin/apply.c:4806
4006msgid "remove <num> leading slashes from traditional diff paths"
4007msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
4008
4009#: builtin/apply.c:4809
4010msgid "ignore additions made by the patch"
4011msgstr "忽略补丁中的添加的文件"
4012
4013#: builtin/apply.c:4811
4014msgid "instead of applying the patch, output diffstat for the input"
4015msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
4016
4017#: builtin/apply.c:4815
4018msgid "show number of added and deleted lines in decimal notation"
4019msgstr "以十进制数显示添加和删除的行数"
4020
4021#: builtin/apply.c:4817
4022msgid "instead of applying the patch, output a summary for the input"
4023msgstr "不应用补丁,而是显示输入的概要"
4024
4025#: builtin/apply.c:4819
4026msgid "instead of applying the patch, see if the patch is applicable"
4027msgstr "不应用补丁,而是查看补丁是否可应用"
4028
4029#: builtin/apply.c:4821
4030msgid "make sure the patch is applicable to the current index"
4031msgstr "确认补丁可以应用到当前索引"
4032
4033#: builtin/apply.c:4823
4034msgid "apply a patch without touching the working tree"
4035msgstr "应用补丁而不修改工作区"
4036
4037#: builtin/apply.c:4825
4038msgid "accept a patch that touches outside the working area"
4039msgstr "接受修改工作区之外文件的补丁"
4040
4041#: builtin/apply.c:4827
4042msgid "also apply the patch (use with --stat/--summary/--check)"
4043msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
4044
4045#: builtin/apply.c:4829
4046msgid "attempt three-way merge if a patch does not apply"
4047msgstr "如果一个补丁不能应用则尝试三方合并"
4048
4049#: builtin/apply.c:4831
4050msgid "build a temporary index based on embedded index information"
4051msgstr "创建一个临时索引基于嵌入的索引信息"
4052
4053#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
4054msgid "paths are separated with NUL character"
4055msgstr "路径以 NUL 字符分隔"
4056
4057#: builtin/apply.c:4836
4058msgid "ensure at least <n> lines of context match"
4059msgstr "确保至少匹配 <n> 行上下文"
4060
4061#: builtin/apply.c:4838
4062msgid "detect new or modified lines that have whitespace errors"
4063msgstr "检查新增和修改的行中间的空白字符滥用"
4064
4065#: builtin/apply.c:4841 builtin/apply.c:4844
4066msgid "ignore changes in whitespace when finding context"
4067msgstr "查找上下文时忽略空白字符的变更"
4068
4069#: builtin/apply.c:4847
4070msgid "apply the patch in reverse"
4071msgstr "反向应用补丁"
4072
4073#: builtin/apply.c:4849
4074msgid "don't expect at least one line of context"
4075msgstr "无需至少一行上下文"
4076
4077#: builtin/apply.c:4851
4078msgid "leave the rejected hunks in corresponding *.rej files"
4079msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
4080
4081#: builtin/apply.c:4853
4082msgid "allow overlapping hunks"
4083msgstr "允许重叠的补丁片段"
4084
4085#: builtin/apply.c:4856
4086msgid "tolerate incorrectly detected missing new-line at the end of file"
4087msgstr "允许不正确的文件末尾换行符"
4088
4089#: builtin/apply.c:4859
4090msgid "do not trust the line counts in the hunk headers"
4091msgstr "不信任补丁片段的头信息中的行号"
4092
4093#: builtin/apply.c:4862
4094msgid "prepend <root> to all filenames"
4095msgstr "为所有文件名前添加 <根目录>"
4096
4097#: builtin/archive.c:17
4098#, c-format
4099msgid "could not create archive file '%s'"
4100msgstr "不能创建归档文件 '%s'"
4101
4102#: builtin/archive.c:20
4103msgid "could not redirect output"
4104msgstr "不能重定向输出"
4105
4106#: builtin/archive.c:37
4107msgid "git archive: Remote with no URL"
4108msgstr "git archive:未提供远程 URL"
4109
4110#: builtin/archive.c:58
4111msgid "git archive: expected ACK/NAK, got EOF"
4112msgstr "git archive:应为 ACK/NACK,却得到 EOF"
4113
4114#: builtin/archive.c:61
4115#, c-format
4116msgid "git archive: NACK %s"
4117msgstr "git archive:NACK %s"
4118
4119#: builtin/archive.c:63
4120#, c-format
4121msgid "remote error: %s"
4122msgstr "远程错误:%s"
4123
4124#: builtin/archive.c:64
4125msgid "git archive: protocol error"
4126msgstr "git archive:协议错误"
4127
4128#: builtin/archive.c:68
4129msgid "git archive: expected a flush"
4130msgstr "git archive:应为刷新"
4131
4132#: builtin/bisect--helper.c:7
4133msgid "git bisect--helper --next-all [--no-checkout]"
4134msgstr "git bisect--helper --next-all [--no-checkout]"
4135
4136#: builtin/bisect--helper.c:17
4137msgid "perform 'git bisect next'"
4138msgstr "执行 'git bisect next'"
4139
4140#: builtin/bisect--helper.c:19
4141msgid "update BISECT_HEAD instead of checking out the current commit"
4142msgstr "更新 BISECT_HEAD 而非检出当前提交"
4143
4144#: builtin/blame.c:33
4145msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
4146msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
4147
4148#: builtin/blame.c:38
4149msgid "<rev-opts> are documented in git-rev-list(1)"
4150msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
4151
4152#: builtin/blame.c:1781
4153msgid "Blaming lines"
4154msgstr "追踪代码行"
4155
4156#: builtin/blame.c:2536
4157msgid "Show blame entries as we find them, incrementally"
4158msgstr "增量式地显示发现的 blame 条目"
4159
4160#: builtin/blame.c:2537
4161msgid "Show blank SHA-1 for boundary commits (Default: off)"
4162msgstr "边界提交显示空的 SHA-1(默认:关闭)"
4163
4164#: builtin/blame.c:2538
4165msgid "Do not treat root commits as boundaries (Default: off)"
4166msgstr "不把根提交作为边界(默认:关闭)"
4167
4168#: builtin/blame.c:2539
4169msgid "Show work cost statistics"
4170msgstr "显示命令消耗统计"
4171
4172#: builtin/blame.c:2540
4173msgid "Force progress reporting"
4174msgstr "强制进度显示"
4175
4176#: builtin/blame.c:2541
4177msgid "Show output score for blame entries"
4178msgstr "显示判断 blame 条目位移的得分诊断信息"
4179
4180#: builtin/blame.c:2542
4181msgid "Show original filename (Default: auto)"
4182msgstr "显示原始文件名(默认:自动)"
4183
4184#: builtin/blame.c:2543
4185msgid "Show original linenumber (Default: off)"
4186msgstr "显示原始的行号(默认:关闭)"
4187
4188#: builtin/blame.c:2544
4189msgid "Show in a format designed for machine consumption"
4190msgstr "显示为一个适合机器读取的格式"
4191
4192#: builtin/blame.c:2545
4193msgid "Show porcelain format with per-line commit information"
4194msgstr "为每一行显示机器适用的提交信息"
4195
4196#: builtin/blame.c:2546
4197msgid "Use the same output mode as git-annotate (Default: off)"
4198msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
4199
4200#: builtin/blame.c:2547
4201msgid "Show raw timestamp (Default: off)"
4202msgstr "显示原始时间戳(默认:关闭)"
4203
4204#: builtin/blame.c:2548
4205msgid "Show long commit SHA1 (Default: off)"
4206msgstr "显示长的 SHA1 提交号(默认:关闭)"
4207
4208#: builtin/blame.c:2549
4209msgid "Suppress author name and timestamp (Default: off)"
4210msgstr "隐藏作者名字和时间戳(默认:关闭)"
4211
4212#: builtin/blame.c:2550
4213msgid "Show author email instead of name (Default: off)"
4214msgstr "显示作者的邮箱而不是名字(默认:关闭)"
4215
4216#: builtin/blame.c:2551
4217msgid "Ignore whitespace differences"
4218msgstr "忽略空白差异"
4219
4220#: builtin/blame.c:2552
4221msgid "Spend extra cycles to find better match"
4222msgstr "花费额外的循环来找到更好的匹配"
4223
4224#: builtin/blame.c:2553
4225msgid "Use revisions from <file> instead of calling git-rev-list"
4226msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
4227
4228#: builtin/blame.c:2554
4229msgid "Use <file>'s contents as the final image"
4230msgstr "使用 <文件> 的内容作为最终的图片"
4231
4232#: builtin/blame.c:2555 builtin/blame.c:2556
4233msgid "score"
4234msgstr "得分"
4235
4236#: builtin/blame.c:2555
4237msgid "Find line copies within and across files"
4238msgstr "找到文件内及跨文件的行拷贝"
4239
4240#: builtin/blame.c:2556
4241msgid "Find line movements within and across files"
4242msgstr "找到文件内及跨文件的行移动"
4243
4244#: builtin/blame.c:2557
4245msgid "n,m"
4246msgstr "n,m"
4247
4248#: builtin/blame.c:2557
4249msgid "Process only line range n,m, counting from 1"
4250msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
4251
4252#. TRANSLATORS: This string is used to tell us the maximum
4253#. display width for a relative timestamp in "git blame"
4254#. output.  For C locale, "4 years, 11 months ago", which
4255#. takes 22 places, is the longest among various forms of
4256#. relative timestamps, but your language may need more or
4257#. fewer display columns.
4258#: builtin/blame.c:2649
4259msgid "4 years, 11 months ago"
4260msgstr "4 年 11 个月前"
4261
4262#: builtin/branch.c:26
4263msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
4264msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
4265
4266#: builtin/branch.c:27
4267msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
4268msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
4269
4270#: builtin/branch.c:28
4271msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
4272msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
4273
4274#: builtin/branch.c:29
4275msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
4276msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
4277
4278#: builtin/branch.c:30
4279msgid "git branch [<options>] [-r | -a] [--points-at]"
4280msgstr "git branch [<选项>] [-r | -a] [--points-at]"
4281
4282#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4283#: builtin/branch.c:143
4284#, c-format
4285msgid ""
4286"deleting branch '%s' that has been merged to\n"
4287"         '%s', but not yet merged to HEAD."
4288msgstr ""
4289"将要删除的分支 '%s' 已经被合并到\n"
4290"         '%s',但未合并到 HEAD。"
4291
4292#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4293#: builtin/branch.c:147
4294#, c-format
4295msgid ""
4296"not deleting branch '%s' that is not yet merged to\n"
4297"         '%s', even though it is merged to HEAD."
4298msgstr ""
4299"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
4300"         然而却尚未被合并到分支 '%s' 。"
4301
4302#: builtin/branch.c:161
4303#, c-format
4304msgid "Couldn't look up commit object for '%s'"
4305msgstr "无法查询 '%s' 指向的提交对象"
4306
4307#: builtin/branch.c:165
4308#, c-format
4309msgid ""
4310"The branch '%s' is not fully merged.\n"
4311"If you are sure you want to delete it, run 'git branch -D %s'."
4312msgstr ""
4313"分支 '%s' 没有完全合并。\n"
4314"如果您确认要删除它,执行 'git branch -D %s'。"
4315
4316#: builtin/branch.c:178
4317msgid "Update of config-file failed"
4318msgstr "无法更新 config 文件"
4319
4320#: builtin/branch.c:206
4321msgid "cannot use -a with -d"
4322msgstr "不能将 -a 和 -d 同时使用"
4323
4324#: builtin/branch.c:212
4325msgid "Couldn't look up commit object for HEAD"
4326msgstr "无法查询 HEAD 指向的提交对象"
4327
4328#: builtin/branch.c:226
4329#, c-format
4330msgid "Cannot delete branch '%s' checked out at '%s'"
4331msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
4332
4333#: builtin/branch.c:241
4334#, c-format
4335msgid "remote-tracking branch '%s' not found."
4336msgstr "未能找到远程跟踪分支 '%s'。"
4337
4338#: builtin/branch.c:242
4339#, c-format
4340msgid "branch '%s' not found."
4341msgstr "分支 '%s' 未发现。"
4342
4343#: builtin/branch.c:257
4344#, c-format
4345msgid "Error deleting remote-tracking branch '%s'"
4346msgstr "无法删除远程跟踪分支 '%s'"
4347
4348#: builtin/branch.c:258
4349#, c-format
4350msgid "Error deleting branch '%s'"
4351msgstr "无法删除分支 '%s'"
4352
4353#: builtin/branch.c:265
4354#, c-format
4355msgid "Deleted remote-tracking branch %s (was %s).\n"
4356msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
4357
4358#: builtin/branch.c:266
4359#, c-format
4360msgid "Deleted branch %s (was %s).\n"
4361msgstr "已删除分支 %s(曾为 %s)。\n"
4362
4363#: builtin/branch.c:312
4364#, c-format
4365msgid "[%s: gone]"
4366msgstr "[%s: 丢失]"
4367
4368#: builtin/branch.c:317
4369#, c-format
4370msgid "[%s]"
4371msgstr "[%s]"
4372
4373#: builtin/branch.c:322
4374#, c-format
4375msgid "[%s: behind %d]"
4376msgstr "[%s:落后 %d]"
4377
4378#: builtin/branch.c:324
4379#, c-format
4380msgid "[behind %d]"
4381msgstr "[落后 %d]"
4382
4383#: builtin/branch.c:328
4384#, c-format
4385msgid "[%s: ahead %d]"
4386msgstr "[%s:领先 %d]"
4387
4388#: builtin/branch.c:330
4389#, c-format
4390msgid "[ahead %d]"
4391msgstr "[领先 %d]"
4392
4393#: builtin/branch.c:333
4394#, c-format
4395msgid "[%s: ahead %d, behind %d]"
4396msgstr "[%s:领先 %d,落后 %d]"
4397
4398#: builtin/branch.c:336
4399#, c-format
4400msgid "[ahead %d, behind %d]"
4401msgstr "[领先 %d,落后 %d]"
4402
4403#: builtin/branch.c:349
4404msgid " **** invalid ref ****"
4405msgstr " **** 无效引用 ****"
4406
4407#: builtin/branch.c:375
4408#, c-format
4409msgid "(no branch, rebasing %s)"
4410msgstr "(非分支,正变基 %s)"
4411
4412#: builtin/branch.c:378
4413#, c-format
4414msgid "(no branch, bisect started on %s)"
4415msgstr "(非分支,二分查找开始于 %s)"
4416
4417#. TRANSLATORS: make sure this matches
4418#. "HEAD detached at " in wt-status.c
4419#: builtin/branch.c:384
4420#, c-format
4421msgid "(HEAD detached at %s)"
4422msgstr "(头指针分离于 %s)"
4423
4424#. TRANSLATORS: make sure this matches
4425#. "HEAD detached from " in wt-status.c
4426#: builtin/branch.c:389
4427#, c-format
4428msgid "(HEAD detached from %s)"
4429msgstr "(头指针分离自 %s)"
4430
4431#: builtin/branch.c:393
4432msgid "(no branch)"
4433msgstr "(非分支)"
4434
4435#: builtin/branch.c:544
4436#, c-format
4437msgid "Branch %s is being rebased at %s"
4438msgstr "分支 %s 正被变基到 %s"
4439
4440#: builtin/branch.c:548
4441#, c-format
4442msgid "Branch %s is being bisected at %s"
4443msgstr "分支 %s 正被二分查找于 %s"
4444
4445#: builtin/branch.c:563
4446msgid "cannot rename the current branch while not on any."
4447msgstr "无法重命名当前分支因为不处于任何分支上。"
4448
4449#: builtin/branch.c:573
4450#, c-format
4451msgid "Invalid branch name: '%s'"
4452msgstr "无效的分支名:'%s'"
4453
4454#: builtin/branch.c:590
4455msgid "Branch rename failed"
4456msgstr "分支重命名失败"
4457
4458#: builtin/branch.c:594
4459#, c-format
4460msgid "Renamed a misnamed branch '%s' away"
4461msgstr "重命名掉一个错误命名的旧分支 '%s'"
4462
4463#: builtin/branch.c:597
4464#, c-format
4465msgid "Branch renamed to %s, but HEAD is not updated!"
4466msgstr "分支重命名为 %s,但 HEAD 没有更新!"
4467
4468#: builtin/branch.c:604
4469msgid "Branch is renamed, but update of config-file failed"
4470msgstr "分支被重命名,但更新 config 文件失败"
4471
4472#: builtin/branch.c:620
4473#, c-format
4474msgid ""
4475"Please edit the description for the branch\n"
4476"  %s\n"
4477"Lines starting with '%c' will be stripped.\n"
4478msgstr ""
4479"请编辑分支的描述\n"
4480"  %s\n"
4481"以 '%c' 开头的行将被过滤。\n"
4482
4483#: builtin/branch.c:651
4484msgid "Generic options"
4485msgstr "通用选项"
4486
4487#: builtin/branch.c:653
4488msgid "show hash and subject, give twice for upstream branch"
4489msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
4490
4491#: builtin/branch.c:654
4492msgid "suppress informational messages"
4493msgstr "不显示信息"
4494
4495#: builtin/branch.c:655
4496msgid "set up tracking mode (see git-pull(1))"
4497msgstr "设置跟踪模式(参见 git-pull(1))"
4498
4499#: builtin/branch.c:657
4500msgid "change upstream info"
4501msgstr "改变上游信息"
4502
4503#: builtin/branch.c:659
4504msgid "upstream"
4505msgstr "上游"
4506
4507#: builtin/branch.c:659
4508msgid "change the upstream info"
4509msgstr "改变上游信息"
4510
4511#: builtin/branch.c:661
4512msgid "use colored output"
4513msgstr "使用彩色输出"
4514
4515#: builtin/branch.c:662
4516msgid "act on remote-tracking branches"
4517msgstr "作用于远程跟踪分支"
4518
4519#: builtin/branch.c:664 builtin/branch.c:665
4520msgid "print only branches that contain the commit"
4521msgstr "只打印包含该提交的分支"
4522
4523#: builtin/branch.c:668
4524msgid "Specific git-branch actions:"
4525msgstr "具体的 git-branch 动作:"
4526
4527#: builtin/branch.c:669
4528msgid "list both remote-tracking and local branches"
4529msgstr "列出远程跟踪及本地分支"
4530
4531#: builtin/branch.c:671
4532msgid "delete fully merged branch"
4533msgstr "删除完全合并的分支"
4534
4535#: builtin/branch.c:672
4536msgid "delete branch (even if not merged)"
4537msgstr "删除分支(即使没有合并)"
4538
4539#: builtin/branch.c:673
4540msgid "move/rename a branch and its reflog"
4541msgstr "移动/重命名一个分支,以及它的引用日志"
4542
4543#: builtin/branch.c:674
4544msgid "move/rename a branch, even if target exists"
4545msgstr "移动/重命名一个分支,即使目标已存在"
4546
4547#: builtin/branch.c:675
4548msgid "list branch names"
4549msgstr "列出分支名"
4550
4551#: builtin/branch.c:676
4552msgid "create the branch's reflog"
4553msgstr "创建分支的引用日志"
4554
4555#: builtin/branch.c:678
4556msgid "edit the description for the branch"
4557msgstr "标记分支的描述"
4558
4559#: builtin/branch.c:679
4560msgid "force creation, move/rename, deletion"
4561msgstr "强制创建、移动/重命名、删除"
4562
4563#: builtin/branch.c:680
4564msgid "print only branches that are merged"
4565msgstr "只打印已经合并的分支"
4566
4567#: builtin/branch.c:681
4568msgid "print only branches that are not merged"
4569msgstr "只打印尚未合并的分支"
4570
4571#: builtin/branch.c:682
4572msgid "list branches in columns"
4573msgstr "以列的方式显示分支"
4574
4575#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
4576msgid "key"
4577msgstr "key"
4578
4579#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
4580msgid "field name to sort on"
4581msgstr "排序的字段名"
4582
4583#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
4584#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
4585#: builtin/tag.c:369
4586msgid "object"
4587msgstr "对象"
4588
4589#: builtin/branch.c:687
4590msgid "print only branches of the object"
4591msgstr "只打印指向该对象的分支"
4592
4593#: builtin/branch.c:705
4594msgid "Failed to resolve HEAD as a valid ref."
4595msgstr "无法将 HEAD 解析为有效引用。"
4596
4597#: builtin/branch.c:709 builtin/clone.c:707
4598msgid "HEAD not found below refs/heads!"
4599msgstr "HEAD 没有位于 /refs/heads 之下!"
4600
4601#: builtin/branch.c:729
4602msgid "--column and --verbose are incompatible"
4603msgstr "--column 和 --verbose 不兼容"
4604
4605#: builtin/branch.c:740 builtin/branch.c:782
4606msgid "branch name required"
4607msgstr "必须提供分支名"
4608
4609#: builtin/branch.c:758
4610msgid "Cannot give description to detached HEAD"
4611msgstr "不能向分离头指针提供描述"
4612
4613#: builtin/branch.c:763
4614msgid "cannot edit description of more than one branch"
4615msgstr "不能为一个以上的分支编辑描述"
4616
4617#: builtin/branch.c:770
4618#, c-format
4619msgid "No commit on branch '%s' yet."
4620msgstr "分支 '%s' 尚无提交。"
4621
4622#: builtin/branch.c:773
4623#, c-format
4624msgid "No branch named '%s'."
4625msgstr "没有分支 '%s'。"
4626
4627#: builtin/branch.c:788
4628msgid "too many branches for a rename operation"
4629msgstr "为重命名操作提供了太多的分支名"
4630
4631#: builtin/branch.c:793
4632msgid "too many branches to set new upstream"
4633msgstr "为设置新上游提供了太多的分支名"
4634
4635#: builtin/branch.c:797
4636#, c-format
4637msgid ""
4638"could not set upstream of HEAD to %s when it does not point to any branch."
4639msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
4640
4641#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
4642#, c-format
4643msgid "no such branch '%s'"
4644msgstr "没有此分支 '%s'"
4645
4646#: builtin/branch.c:804
4647#, c-format
4648msgid "branch '%s' does not exist"
4649msgstr "分支 '%s' 不存在"
4650
4651#: builtin/branch.c:816
4652msgid "too many branches to unset upstream"
4653msgstr "为取消上游设置操作提供了太多的分支名"
4654
4655#: builtin/branch.c:820
4656msgid "could not unset upstream of HEAD when it does not point to any branch."
4657msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
4658
4659#: builtin/branch.c:826
4660#, c-format
4661msgid "Branch '%s' has no upstream information"
4662msgstr "分支 '%s' 没有上游信息"
4663
4664#: builtin/branch.c:840
4665msgid "it does not make sense to create 'HEAD' manually"
4666msgstr "手工创建 'HEAD' 没有意义"
4667
4668#: builtin/branch.c:846
4669msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4670msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4671
4672#: builtin/branch.c:849
4673#, c-format
4674msgid ""
4675"The --set-upstream flag is deprecated and will be removed. Consider using --"
4676"track or --set-upstream-to\n"
4677msgstr ""
4678"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
4679
4680#: builtin/branch.c:866
4681#, c-format
4682msgid ""
4683"\n"
4684"If you wanted to make '%s' track '%s', do this:\n"
4685"\n"
4686msgstr ""
4687"\n"
4688"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4689"\n"
4690
4691#: builtin/bundle.c:51
4692#, c-format
4693msgid "%s is okay\n"
4694msgstr "%s 可以\n"
4695
4696#: builtin/bundle.c:64
4697msgid "Need a repository to create a bundle."
4698msgstr "需要一个仓库来创建包。"
4699
4700#: builtin/bundle.c:68
4701msgid "Need a repository to unbundle."
4702msgstr "需要一个仓库来解包。"
4703
4704#: builtin/cat-file.c:443
4705msgid ""
4706"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4707"<type>|--textconv) <object>"
4708msgstr ""
4709"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4710">|--textconv) <对象>"
4711
4712#: builtin/cat-file.c:444
4713msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4714msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4715
4716#: builtin/cat-file.c:481
4717msgid "<type> can be one of: blob, tree, commit, tag"
4718msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
4719
4720#: builtin/cat-file.c:482
4721msgid "show object type"
4722msgstr "显示对象类型"
4723
4724#: builtin/cat-file.c:483
4725msgid "show object size"
4726msgstr "显示对象大小"
4727
4728#: builtin/cat-file.c:485
4729msgid "exit with zero when there's no error"
4730msgstr "当没有错误时退出并返回零"
4731
4732#: builtin/cat-file.c:486
4733msgid "pretty-print object's content"
4734msgstr "美观地打印对象的内容"
4735
4736#: builtin/cat-file.c:488
4737msgid "for blob objects, run textconv on object's content"
4738msgstr "对于数据对象,对其内容执行 textconv"
4739
4740#: builtin/cat-file.c:490
4741msgid "allow -s and -t to work with broken/corrupt objects"
4742msgstr "允许 -s 和 -t 对损坏的对象生效"
4743
4744#: builtin/cat-file.c:491
4745msgid "buffer --batch output"
4746msgstr "缓冲 --batch 的输出"
4747
4748#: builtin/cat-file.c:493
4749msgid "show info and content of objects fed from the standard input"
4750msgstr "显示从标准输入提供的对象的信息和内容"
4751
4752#: builtin/cat-file.c:496
4753msgid "show info about objects fed from the standard input"
4754msgstr "显示从标准输入提供的对象的信息"
4755
4756#: builtin/cat-file.c:499
4757msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4758msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4759
4760#: builtin/cat-file.c:501
4761msgid "show all objects with --batch or --batch-check"
4762msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4763
4764#: builtin/check-attr.c:11
4765msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4766msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4767
4768#: builtin/check-attr.c:12
4769msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4770msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4771
4772#: builtin/check-attr.c:19
4773msgid "report all attributes set on file"
4774msgstr "报告设置在文件上的所有属性"
4775
4776#: builtin/check-attr.c:20
4777msgid "use .gitattributes only from the index"
4778msgstr "只使用索引中的 .gitattributes"
4779
4780#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4781msgid "read file names from stdin"
4782msgstr "从标准输入读出文件名"
4783
4784#: builtin/check-attr.c:23 builtin/check-ignore.c:24
4785msgid "terminate input and output records by a NUL character"
4786msgstr "输入和输出的记录使用 NUL 字符终结"
4787
4788#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
4789msgid "suppress progress reporting"
4790msgstr "不显示进度报告"
4791
4792#: builtin/check-ignore.c:26
4793msgid "show non-matching input paths"
4794msgstr "显示未匹配的输入路径"
4795
4796#: builtin/check-ignore.c:28
4797msgid "ignore index when checking"
4798msgstr "检查时忽略索引"
4799
4800#: builtin/check-ignore.c:154
4801msgid "cannot specify pathnames with --stdin"
4802msgstr "不能同时指定路径及 --stdin 参数"
4803
4804#: builtin/check-ignore.c:157
4805msgid "-z only makes sense with --stdin"
4806msgstr "-z 需要和 --stdin 参数共用才有意义"
4807
4808#: builtin/check-ignore.c:159
4809msgid "no path specified"
4810msgstr "未指定路径"
4811
4812#: builtin/check-ignore.c:163
4813msgid "--quiet is only valid with a single pathname"
4814msgstr "参数 --quiet 只在提供一个路径名时有效"
4815
4816#: builtin/check-ignore.c:165
4817msgid "cannot have both --quiet and --verbose"
4818msgstr "不能同时提供 --quiet 和 --verbose 参数"
4819
4820#: builtin/check-ignore.c:168
4821msgid "--non-matching is only valid with --verbose"
4822msgstr "--non-matching 选项只在使用 --verbose 时有效"
4823
4824#: builtin/check-mailmap.c:8
4825msgid "git check-mailmap [<options>] <contact>..."
4826msgstr "git check-mailmap [<选项>] <联系地址>..."
4827
4828#: builtin/check-mailmap.c:13
4829msgid "also read contacts from stdin"
4830msgstr "还从标准输入读取联系地址"
4831
4832#: builtin/check-mailmap.c:24
4833#, c-format
4834msgid "unable to parse contact: %s"
4835msgstr "不能解析联系地址:%s"
4836
4837#: builtin/check-mailmap.c:47
4838msgid "no contacts specified"
4839msgstr "未指定联系地址"
4840
4841#: builtin/checkout-index.c:127
4842msgid "git checkout-index [<options>] [--] [<file>...]"
4843msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4844
4845#: builtin/checkout-index.c:144
4846msgid "stage should be between 1 and 3 or all"
4847msgstr "索引值应该取值 1 到 3 或者 all"
4848
4849#: builtin/checkout-index.c:160
4850msgid "check out all files in the index"
4851msgstr "检出索引区的所有文件"
4852
4853#: builtin/checkout-index.c:161
4854msgid "force overwrite of existing files"
4855msgstr "强制覆盖现有的文件"
4856
4857#: builtin/checkout-index.c:163
4858msgid "no warning for existing files and files not in index"
4859msgstr "存在或不在索引中的文件都没有警告"
4860
4861#: builtin/checkout-index.c:165
4862msgid "don't checkout new files"
4863msgstr "不检出新文件"
4864
4865#: builtin/checkout-index.c:167
4866msgid "update stat information in the index file"
4867msgstr "更新索引中文件的状态信息"
4868
4869#: builtin/checkout-index.c:171
4870msgid "read list of paths from the standard input"
4871msgstr "从标准输入读取路径列表"
4872
4873#: builtin/checkout-index.c:173
4874msgid "write the content to temporary files"
4875msgstr "将内容写入临时文件"
4876
4877#: builtin/checkout-index.c:174 builtin/column.c:30
4878#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
4879#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
4880#: builtin/submodule--helper.c:830 builtin/worktree.c:469
4881msgid "string"
4882msgstr "字符串"
4883
4884#: builtin/checkout-index.c:175
4885msgid "when creating files, prepend <string>"
4886msgstr "在创建文件时,在前面加上 <字符串>"
4887
4888#: builtin/checkout-index.c:177
4889msgid "copy out the files from named stage"
4890msgstr "从指定暂存区中拷出文件"
4891
4892#: builtin/checkout.c:25
4893msgid "git checkout [<options>] <branch>"
4894msgstr "git checkout [<选项>] <分支>"
4895
4896#: builtin/checkout.c:26
4897msgid "git checkout [<options>] [<branch>] -- <file>..."
4898msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4899
4900#: builtin/checkout.c:134 builtin/checkout.c:167
4901#, c-format
4902msgid "path '%s' does not have our version"
4903msgstr "路径 '%s' 没有我们的版本"
4904
4905#: builtin/checkout.c:136 builtin/checkout.c:169
4906#, c-format
4907msgid "path '%s' does not have their version"
4908msgstr "路径 '%s' 没有他们的版本"
4909
4910#: builtin/checkout.c:152
4911#, c-format
4912msgid "path '%s' does not have all necessary versions"
4913msgstr "路径 '%s' 没有全部必须的版本"
4914
4915#: builtin/checkout.c:196
4916#, c-format
4917msgid "path '%s' does not have necessary versions"
4918msgstr "路径 '%s' 没有必须的版本"
4919
4920#: builtin/checkout.c:213
4921#, c-format
4922msgid "path '%s': cannot merge"
4923msgstr "path '%s':无法合并"
4924
4925#: builtin/checkout.c:230
4926#, c-format
4927msgid "Unable to add merge result for '%s'"
4928msgstr "无法为 '%s' 添加合并结果"
4929
4930#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
4931#: builtin/checkout.c:259
4932#, c-format
4933msgid "'%s' cannot be used with updating paths"
4934msgstr "'%s' 不能在更新路径时使用"
4935
4936#: builtin/checkout.c:262 builtin/checkout.c:265
4937#, c-format
4938msgid "'%s' cannot be used with %s"
4939msgstr "'%s' 不能和 %s 同时使用"
4940
4941#: builtin/checkout.c:268
4942#, c-format
4943msgid "Cannot update paths and switch to branch '%s' at the same time."
4944msgstr "不能同时更新路径并切换到分支'%s'。"
4945
4946#: builtin/checkout.c:339 builtin/checkout.c:346
4947#, c-format
4948msgid "path '%s' is unmerged"
4949msgstr "路径 '%s' 未合并"
4950
4951#: builtin/checkout.c:495
4952msgid "you need to resolve your current index first"
4953msgstr "您需要先解决当前索引的冲突"
4954
4955#: builtin/checkout.c:625
4956#, c-format
4957msgid "Can not do reflog for '%s': %s\n"
4958msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4959
4960#: builtin/checkout.c:664
4961msgid "HEAD is now at"
4962msgstr "HEAD 目前位于"
4963
4964#: builtin/checkout.c:668 builtin/clone.c:661
4965msgid "unable to update HEAD"
4966msgstr "不能更新 HEAD"
4967
4968#: builtin/checkout.c:672
4969#, c-format
4970msgid "Reset branch '%s'\n"
4971msgstr "重置分支 '%s'\n"
4972
4973#: builtin/checkout.c:675
4974#, c-format
4975msgid "Already on '%s'\n"
4976msgstr "已经位于 '%s'\n"
4977
4978#: builtin/checkout.c:679
4979#, c-format
4980msgid "Switched to and reset branch '%s'\n"
4981msgstr "切换并重置分支 '%s'\n"
4982
4983#: builtin/checkout.c:681 builtin/checkout.c:1070
4984#, c-format
4985msgid "Switched to a new branch '%s'\n"
4986msgstr "切换到一个新分支 '%s'\n"
4987
4988#: builtin/checkout.c:683
4989#, c-format
4990msgid "Switched to branch '%s'\n"
4991msgstr "切换到分支 '%s'\n"
4992
4993#  译者:注意保持前导空格
4994#: builtin/checkout.c:734
4995#, c-format
4996msgid " ... and %d more.\n"
4997msgstr " ... 及其它 %d 个。\n"
4998
4999#: builtin/checkout.c:740
5000#, c-format
5001msgid ""
5002"Warning: you are leaving %d commit behind, not connected to\n"
5003"any of your branches:\n"
5004"\n"
5005"%s\n"
5006msgid_plural ""
5007"Warning: you are leaving %d commits behind, not connected to\n"
5008"any of your branches:\n"
5009"\n"
5010"%s\n"
5011msgstr[0] ""
5012"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5013"\n"
5014"%s\n"
5015msgstr[1] ""
5016"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5017"\n"
5018"%s\n"
5019
5020#: builtin/checkout.c:759
5021#, c-format
5022msgid ""
5023"If you want to keep it by creating a new branch, this may be a good time\n"
5024"to do so with:\n"
5025"\n"
5026" git branch <new-branch-name> %s\n"
5027"\n"
5028msgid_plural ""
5029"If you want to keep them by creating a new branch, this may be a good time\n"
5030"to do so with:\n"
5031"\n"
5032" git branch <new-branch-name> %s\n"
5033"\n"
5034msgstr[0] ""
5035"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
5036"如下操作:\n"
5037"\n"
5038" git branch <新分支名> %s\n"
5039"\n"
5040msgstr[1] ""
5041"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
5042"如下操作:\n"
5043"\n"
5044" git branch <新分支名> %s\n"
5045"\n"
5046
5047#: builtin/checkout.c:795
5048msgid "internal error in revision walk"
5049msgstr "在版本遍历时遇到内部错误"
5050
5051#: builtin/checkout.c:799
5052msgid "Previous HEAD position was"
5053msgstr "之前的 HEAD 位置是"
5054
5055#: builtin/checkout.c:826 builtin/checkout.c:1065
5056msgid "You are on a branch yet to be born"
5057msgstr "您位于一个尚未初始化的分支"
5058
5059#: builtin/checkout.c:971
5060#, c-format
5061msgid "only one reference expected, %d given."
5062msgstr "只要一个引用,却给出了 %d 个"
5063
5064#: builtin/checkout.c:1011 builtin/worktree.c:214
5065#, c-format
5066msgid "invalid reference: %s"
5067msgstr "无效引用:%s"
5068
5069#: builtin/checkout.c:1040
5070#, c-format
5071msgid "reference is not a tree: %s"
5072msgstr "引用不是一个树:%s"
5073
5074#: builtin/checkout.c:1079
5075msgid "paths cannot be used with switching branches"
5076msgstr "路径不能和切换分支同时使用"
5077
5078#: builtin/checkout.c:1082 builtin/checkout.c:1086
5079#, c-format
5080msgid "'%s' cannot be used with switching branches"
5081msgstr "'%s' 不能和切换分支同时使用"
5082
5083#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
5084#: builtin/checkout.c:1101
5085#, c-format
5086msgid "'%s' cannot be used with '%s'"
5087msgstr "'%s' 不能和 '%s' 同时使用"
5088
5089#: builtin/checkout.c:1106
5090#, c-format
5091msgid "Cannot switch branch to a non-commit '%s'"
5092msgstr "不能切换分支到一个非提交 '%s'"
5093
5094#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
5095#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
5096#: builtin/worktree.c:326
5097msgid "branch"
5098msgstr "分支"
5099
5100#: builtin/checkout.c:1140
5101msgid "create and checkout a new branch"
5102msgstr "创建并检出一个新的分支"
5103
5104#: builtin/checkout.c:1142
5105msgid "create/reset and checkout a branch"
5106msgstr "创建/重置并检出一个分支"
5107
5108#: builtin/checkout.c:1143
5109msgid "create reflog for new branch"
5110msgstr "为新的分支创建引用日志"
5111
5112#: builtin/checkout.c:1144 builtin/worktree.c:328
5113msgid "detach HEAD at named commit"
5114msgstr "HEAD 从指定的提交分离"
5115
5116#: builtin/checkout.c:1145
5117msgid "set upstream info for new branch"
5118msgstr "为新的分支设置上游信息"
5119
5120#: builtin/checkout.c:1147
5121msgid "new-branch"
5122msgstr "新分支"
5123
5124#: builtin/checkout.c:1147
5125msgid "new unparented branch"
5126msgstr "新的没有父提交的分支"
5127
5128#: builtin/checkout.c:1148
5129msgid "checkout our version for unmerged files"
5130msgstr "对尚未合并的文件检出我们的版本"
5131
5132#: builtin/checkout.c:1150
5133msgid "checkout their version for unmerged files"
5134msgstr "对尚未合并的文件检出他们的版本"
5135
5136#: builtin/checkout.c:1152
5137msgid "force checkout (throw away local modifications)"
5138msgstr "强制检出(丢弃本地修改)"
5139
5140#: builtin/checkout.c:1153
5141msgid "perform a 3-way merge with the new branch"
5142msgstr "和新的分支执行三方合并"
5143
5144#: builtin/checkout.c:1154 builtin/merge.c:231
5145msgid "update ignored files (default)"
5146msgstr "更新忽略的文件(默认)"
5147
5148#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
5149msgid "style"
5150msgstr "风格"
5151
5152#: builtin/checkout.c:1156
5153msgid "conflict style (merge or diff3)"
5154msgstr "冲突输出风格(merge 或 diff3)"
5155
5156#: builtin/checkout.c:1159
5157msgid "do not limit pathspecs to sparse entries only"
5158msgstr "对路径不做稀疏检出的限制"
5159
5160#: builtin/checkout.c:1161
5161msgid "second guess 'git checkout <no-such-branch>'"
5162msgstr "二次猜测'git checkout <无此分支>'"
5163
5164#: builtin/checkout.c:1163
5165msgid "do not check if another worktree is holding the given ref"
5166msgstr "不检查指定的引用是否被其他工作区所占用"
5167
5168#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
5169#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
5170#: builtin/send-pack.c:168
5171msgid "force progress reporting"
5172msgstr "强制显示进度报告"
5173
5174#: builtin/checkout.c:1195
5175msgid "-b, -B and --orphan are mutually exclusive"
5176msgstr "-b、-B 和 --orphan 是互斥的"
5177
5178#: builtin/checkout.c:1212
5179msgid "--track needs a branch name"
5180msgstr "--track 需要一个分支名"
5181
5182#: builtin/checkout.c:1217
5183msgid "Missing branch name; try -b"
5184msgstr "缺少分支名;尝试 -b"
5185
5186#: builtin/checkout.c:1253
5187msgid "invalid path specification"
5188msgstr "无效的路径规格"
5189
5190#: builtin/checkout.c:1260
5191#, c-format
5192msgid ""
5193"Cannot update paths and switch to branch '%s' at the same time.\n"
5194"Did you intend to checkout '%s' which can not be resolved as commit?"
5195msgstr ""
5196"不能同时更新路径并切换到分支'%s'。\n"
5197"您是想要检出 '%s' 但其未能解析为提交么?"
5198
5199#: builtin/checkout.c:1265
5200#, c-format
5201msgid "git checkout: --detach does not take a path argument '%s'"
5202msgstr "git checkout:--detach 不能接收路径参数 '%s'"
5203
5204#: builtin/checkout.c:1269
5205msgid ""
5206"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
5207"checking out of the index."
5208msgstr ""
5209"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
5210
5211#: builtin/clean.c:25
5212msgid ""
5213"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
5214msgstr ""
5215"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
5216
5217#: builtin/clean.c:29
5218#, c-format
5219msgid "Removing %s\n"
5220msgstr "正删除 %s\n"
5221
5222#: builtin/clean.c:30
5223#, c-format
5224msgid "Would remove %s\n"
5225msgstr "将删除 %s\n"
5226
5227#: builtin/clean.c:31
5228#, c-format
5229msgid "Skipping repository %s\n"
5230msgstr "忽略仓库 %s\n"
5231
5232#: builtin/clean.c:32
5233#, c-format
5234msgid "Would skip repository %s\n"
5235msgstr "将忽略仓库 %s\n"
5236
5237#: builtin/clean.c:33
5238#, c-format
5239msgid "failed to remove %s"
5240msgstr "无法删除 %s"
5241
5242#: builtin/clean.c:291
5243msgid ""
5244"Prompt help:\n"
5245"1          - select a numbered item\n"
5246"foo        - select item based on unique prefix\n"
5247"           - (empty) select nothing"
5248msgstr ""
5249"帮助:\n"
5250"1          - 通过编号选择一个选项\n"
5251"foo        - 通过标题选择一个选项\n"
5252"           - (空)什么也不选择"
5253
5254#: builtin/clean.c:295
5255msgid ""
5256"Prompt help:\n"
5257"1          - select a single item\n"
5258"3-5        - select a range of items\n"
5259"2-3,6-9    - select multiple ranges\n"
5260"foo        - select item based on unique prefix\n"
5261"-...       - unselect specified items\n"
5262"*          - choose all items\n"
5263"           - (empty) finish selecting"
5264msgstr ""
5265"帮助:\n"
5266"1          - 选择一个选项\n"
5267"3-5        - 选择一个范围内的所有选项\n"
5268"2-3,6-9    - 选择多个范围内的所有选项\n"
5269"foo        - 通过标题选择一个选项\n"
5270"-...       - 反选特定的选项\n"
5271"*          - 选择所有选项\n"
5272"           - (空)结束选择"
5273
5274#: builtin/clean.c:511
5275#, c-format
5276msgid "Huh (%s)?"
5277msgstr "嗯(%s)?"
5278
5279#: builtin/clean.c:653
5280#, c-format
5281msgid "Input ignore patterns>> "
5282msgstr "输入模版以排除条目>> "
5283
5284#: builtin/clean.c:690
5285#, c-format
5286msgid "WARNING: Cannot find items matched by: %s"
5287msgstr "警告:无法找到和 %s 匹配的条目"
5288
5289#: builtin/clean.c:711
5290msgid "Select items to delete"
5291msgstr "选择要删除的条目"
5292
5293#. TRANSLATORS: Make sure to keep [y/N] as is
5294#: builtin/clean.c:752
5295#, c-format
5296msgid "Remove %s [y/N]? "
5297msgstr "删除 %s [y/N]?"
5298
5299#: builtin/clean.c:777
5300msgid "Bye."
5301msgstr "再见。"
5302
5303#: builtin/clean.c:785
5304msgid ""
5305"clean               - start cleaning\n"
5306"filter by pattern   - exclude items from deletion\n"
5307"select by numbers   - select items to be deleted by numbers\n"
5308"ask each            - confirm each deletion (like \"rm -i\")\n"
5309"quit                - stop cleaning\n"
5310"help                - this screen\n"
5311"?                   - help for prompt selection"
5312msgstr ""
5313"clean               - 开始清理\n"
5314"filter by pattern   - 通过模版排除要删除的条目\n"
5315"select by numbers   - 通过数字选择要删除的条目\n"
5316"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
5317"quit                - 停止删除并退出\n"
5318"help                - 显示本帮助\n"
5319"?                   - 显示如何在提示符下选择的帮助"
5320
5321#: builtin/clean.c:812
5322msgid "*** Commands ***"
5323msgstr "*** 命令 ***"
5324
5325#: builtin/clean.c:813
5326msgid "What now"
5327msgstr "请选择"
5328
5329#: builtin/clean.c:821
5330msgid "Would remove the following item:"
5331msgid_plural "Would remove the following items:"
5332msgstr[0] "将删除如下条目:"
5333msgstr[1] "将删除如下条目:"
5334
5335#: builtin/clean.c:838
5336msgid "No more files to clean, exiting."
5337msgstr "没有要清理的文件,退出。"
5338
5339#: builtin/clean.c:869
5340msgid "do not print names of files removed"
5341msgstr "不打印删除文件的名称"
5342
5343#: builtin/clean.c:871
5344msgid "force"
5345msgstr "强制"
5346
5347#: builtin/clean.c:872
5348msgid "interactive cleaning"
5349msgstr "交互式清除"
5350
5351#: builtin/clean.c:874
5352msgid "remove whole directories"
5353msgstr "删除整个目录"
5354
5355#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
5356#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
5357msgid "pattern"
5358msgstr "模式"
5359
5360#: builtin/clean.c:876
5361msgid "add <pattern> to ignore rules"
5362msgstr "添加 <模式> 到忽略规则"
5363
5364#: builtin/clean.c:877
5365msgid "remove ignored files, too"
5366msgstr "也删除忽略的文件"
5367
5368#: builtin/clean.c:879
5369msgid "remove only ignored files"
5370msgstr "只删除忽略的文件"
5371
5372#: builtin/clean.c:897
5373msgid "-x and -X cannot be used together"
5374msgstr "-x 和 -X 不能同时使用"
5375
5376#: builtin/clean.c:901
5377msgid ""
5378"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
5379"clean"
5380msgstr ""
5381"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5382
5383#: builtin/clean.c:904
5384msgid ""
5385"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
5386"refusing to clean"
5387msgstr ""
5388"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5389
5390#: builtin/clone.c:37
5391msgid "git clone [<options>] [--] <repo> [<dir>]"
5392msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
5393
5394#: builtin/clone.c:62
5395msgid "don't create a checkout"
5396msgstr "不创建一个检出"
5397
5398#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
5399msgid "create a bare repository"
5400msgstr "创建一个纯仓库"
5401
5402#: builtin/clone.c:67
5403msgid "create a mirror repository (implies bare)"
5404msgstr "创建一个镜像仓库(也是纯仓库)"
5405
5406#: builtin/clone.c:69
5407msgid "to clone from a local repository"
5408msgstr "从本地仓库克隆"
5409
5410#: builtin/clone.c:71
5411msgid "don't use local hardlinks, always copy"
5412msgstr "不使用本地硬链接,始终复制"
5413
5414#: builtin/clone.c:73
5415msgid "setup as shared repository"
5416msgstr "设置为共享仓库"
5417
5418#: builtin/clone.c:75 builtin/clone.c:77
5419msgid "initialize submodules in the clone"
5420msgstr "在克隆时初始化子模组"
5421
5422#: builtin/clone.c:79
5423msgid "number of submodules cloned in parallel"
5424msgstr "并发克隆的子模组的数量"
5425
5426#: builtin/clone.c:80 builtin/init-db.c:473
5427msgid "template-directory"
5428msgstr "模板目录"
5429
5430#: builtin/clone.c:81 builtin/init-db.c:474
5431msgid "directory from which templates will be used"
5432msgstr "模板目录将被使用"
5433
5434#: builtin/clone.c:83 builtin/submodule--helper.c:495
5435#: builtin/submodule--helper.c:833
5436msgid "reference repository"
5437msgstr "参考仓库"
5438
5439#: builtin/clone.c:85
5440msgid "use --reference only while cloning"
5441msgstr "仅在克隆时参考 --reference 指向的本地仓库"
5442
5443#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
5444msgid "name"
5445msgstr "名称"
5446
5447#: builtin/clone.c:87
5448msgid "use <name> instead of 'origin' to track upstream"
5449msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
5450
5451#: builtin/clone.c:89
5452msgid "checkout <branch> instead of the remote's HEAD"
5453msgstr "检出 <分支> 而不是远程 HEAD"
5454
5455#: builtin/clone.c:91
5456msgid "path to git-upload-pack on the remote"
5457msgstr "远程 git-upload-pack 路径"
5458
5459#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
5460#: builtin/pull.c:201
5461msgid "depth"
5462msgstr "深度"
5463
5464#: builtin/clone.c:93
5465msgid "create a shallow clone of that depth"
5466msgstr "创建一个指定深度的浅克隆"
5467
5468#: builtin/clone.c:95
5469msgid "clone only one branch, HEAD or --branch"
5470msgstr "只克隆一个分支、HEAD 或 --branch"
5471
5472#: builtin/clone.c:97
5473msgid "any cloned submodules will be shallow"
5474msgstr "子模组将以浅下载模式克隆"
5475
5476#: builtin/clone.c:98 builtin/init-db.c:482
5477msgid "gitdir"
5478msgstr "git目录"
5479
5480#: builtin/clone.c:99 builtin/init-db.c:483
5481msgid "separate git dir from working tree"
5482msgstr "git目录和工作区分离"
5483
5484#: builtin/clone.c:100
5485msgid "key=value"
5486msgstr "key=value"
5487
5488#: builtin/clone.c:101
5489msgid "set config inside the new repository"
5490msgstr "在新仓库中设置配置信息"
5491
5492#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
5493msgid "use IPv4 addresses only"
5494msgstr "只使用 IPv4 地址"
5495
5496#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
5497msgid "use IPv6 addresses only"
5498msgstr "只使用 IPv6 地址"
5499
5500#: builtin/clone.c:241
5501msgid ""
5502"No directory name could be guessed.\n"
5503"Please specify a directory on the command line"
5504msgstr ""
5505"无法猜到目录名。\n"
5506"请在命令行指定一个目录"
5507
5508#: builtin/clone.c:307
5509#, c-format
5510msgid "reference repository '%s' as a linked checkout is not supported yet."
5511msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
5512
5513#: builtin/clone.c:309
5514#, c-format
5515msgid "reference repository '%s' is not a local repository."
5516msgstr "参考仓库 '%s' 不是一个本地仓库。"
5517
5518#: builtin/clone.c:314
5519#, c-format
5520msgid "reference repository '%s' is shallow"
5521msgstr "参考仓库 '%s' 是一个浅克隆"
5522
5523#: builtin/clone.c:317
5524#, c-format
5525msgid "reference repository '%s' is grafted"
5526msgstr "参考仓库 '%s' 已被嫁接"
5527
5528#: builtin/clone.c:376
5529#, c-format
5530msgid "failed to open '%s'"
5531msgstr "无法打开 '%s'"
5532
5533#: builtin/clone.c:384
5534#, c-format
5535msgid "%s exists and is not a directory"
5536msgstr "%s 存在且不是一个目录"
5537
5538#: builtin/clone.c:398
5539#, c-format
5540msgid "failed to stat %s\n"
5541msgstr "无法枚举 %s 状态\n"
5542
5543#: builtin/clone.c:420
5544#, c-format
5545msgid "failed to create link '%s'"
5546msgstr "无法创建链接 '%s'"
5547
5548#: builtin/clone.c:424
5549#, c-format
5550msgid "failed to copy file to '%s'"
5551msgstr "无法拷贝文件至 '%s'"
5552
5553#: builtin/clone.c:449
5554#, c-format
5555msgid "done.\n"
5556msgstr "完成。\n"
5557
5558#: builtin/clone.c:461
5559msgid ""
5560"Clone succeeded, but checkout failed.\n"
5561"You can inspect what was checked out with 'git status'\n"
5562"and retry the checkout with 'git checkout -f HEAD'\n"
5563msgstr ""
5564"克隆成功,但是检出失败。\n"
5565"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
5566"'git checkout -f HEAD' 重试\n"
5567
5568#: builtin/clone.c:538
5569#, c-format
5570msgid "Could not find remote branch %s to clone."
5571msgstr "不能发现要克隆的远程分支 %s。"
5572
5573#: builtin/clone.c:633
5574msgid "remote did not send all necessary objects"
5575msgstr "远程没有发送所有必须的对象"
5576
5577#: builtin/clone.c:649
5578#, c-format
5579msgid "unable to update %s"
5580msgstr "不能更新 %s"
5581
5582#: builtin/clone.c:698
5583msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
5584msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
5585
5586#: builtin/clone.c:729
5587msgid "unable to checkout working tree"
5588msgstr "不能检出工作区"
5589
5590#: builtin/clone.c:766
5591msgid "unable to write parameters to config file"
5592msgstr "无法将参数写入配置文件"
5593
5594#: builtin/clone.c:829
5595msgid "cannot repack to clean up"
5596msgstr "无法执行 repack 来清理"
5597
5598#: builtin/clone.c:831
5599msgid "cannot unlink temporary alternates file"
5600msgstr "无法删除临时的 alternates 文件"
5601
5602#: builtin/clone.c:863 builtin/receive-pack.c:1855
5603msgid "Too many arguments."
5604msgstr "太多参数。"
5605
5606#: builtin/clone.c:867
5607msgid "You must specify a repository to clone."
5608msgstr "您必须指定一个仓库来克隆。"
5609
5610#: builtin/clone.c:878
5611#, c-format
5612msgid "--bare and --origin %s options are incompatible."
5613msgstr "--bare 和 --origin %s 选项不兼容。"
5614
5615#: builtin/clone.c:881
5616msgid "--bare and --separate-git-dir are incompatible."
5617msgstr "--bare 和 --separate-git-dir 选项不兼容。"
5618
5619#: builtin/clone.c:894
5620#, c-format
5621msgid "repository '%s' does not exist"
5622msgstr "仓库 '%s' 不存在"
5623
5624#: builtin/clone.c:900 builtin/fetch.c:1293
5625#, c-format
5626msgid "depth %s is not a positive number"
5627msgstr "深度 %s 不是一个正数"
5628
5629#: builtin/clone.c:910
5630#, c-format
5631msgid "destination path '%s' already exists and is not an empty directory."
5632msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
5633
5634#: builtin/clone.c:920
5635#, c-format
5636msgid "working tree '%s' already exists."
5637msgstr "工作区 '%s' 已经存在。"
5638
5639#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
5640#: builtin/worktree.c:222 builtin/worktree.c:249
5641#, c-format
5642msgid "could not create leading directories of '%s'"
5643msgstr "不能为 '%s' 创建先导目录"
5644
5645#: builtin/clone.c:938
5646#, c-format
5647msgid "could not create work tree dir '%s'"
5648msgstr "不能创建工作区目录 '%s'"
5649
5650#: builtin/clone.c:956
5651#, c-format
5652msgid "Cloning into bare repository '%s'...\n"
5653msgstr "克隆到纯仓库 '%s'...\n"
5654
5655#: builtin/clone.c:958
5656#, c-format
5657msgid "Cloning into '%s'...\n"
5658msgstr "正克隆到 '%s'...\n"
5659
5660#: builtin/clone.c:997
5661msgid "--depth is ignored in local clones; use file:// instead."
5662msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5663
5664#: builtin/clone.c:1000
5665msgid "source repository is shallow, ignoring --local"
5666msgstr "源仓库是浅克隆,忽略 --local"
5667
5668#: builtin/clone.c:1005
5669msgid "--local is ignored"
5670msgstr "--local 被忽略"
5671
5672#: builtin/clone.c:1009
5673#, c-format
5674msgid "Don't know how to clone %s"
5675msgstr "不知道如何克隆 %s"
5676
5677#: builtin/clone.c:1058 builtin/clone.c:1066
5678#, c-format
5679msgid "Remote branch %s not found in upstream %s"
5680msgstr "远程分支 %s 在上游 %s 未发现"
5681
5682#: builtin/clone.c:1069
5683msgid "You appear to have cloned an empty repository."
5684msgstr "您似乎克隆了一个空仓库。"
5685
5686#: builtin/column.c:9
5687msgid "git column [<options>]"
5688msgstr "git column [<选项>]"
5689
5690#: builtin/column.c:26
5691msgid "lookup config vars"
5692msgstr "查找配置变量"
5693
5694#: builtin/column.c:27 builtin/column.c:28
5695msgid "layout to use"
5696msgstr "要使用的布局"
5697
5698#: builtin/column.c:29
5699msgid "Maximum width"
5700msgstr "最大宽度"
5701
5702#: builtin/column.c:30
5703msgid "Padding space on left border"
5704msgstr "左边框的填充空间"
5705
5706#: builtin/column.c:31
5707msgid "Padding space on right border"
5708msgstr "右边框的填充空间"
5709
5710#: builtin/column.c:32
5711msgid "Padding space between columns"
5712msgstr "两列之间的填充空间"
5713
5714#: builtin/column.c:51
5715msgid "--command must be the first argument"
5716msgstr "--command 必须是第一个参数"
5717
5718#: builtin/commit.c:38
5719msgid "git commit [<options>] [--] <pathspec>..."
5720msgstr "git commit [<选项>] [--] <路径规格>..."
5721
5722#: builtin/commit.c:43
5723msgid "git status [<options>] [--] <pathspec>..."
5724msgstr "git status [<选项>] [--] <路径规格>..."
5725
5726#: builtin/commit.c:48
5727msgid ""
5728"Your name and email address were configured automatically based\n"
5729"on your username and hostname. Please check that they are accurate.\n"
5730"You can suppress this message by setting them explicitly. Run the\n"
5731"following command and follow the instructions in your editor to edit\n"
5732"your configuration file:\n"
5733"\n"
5734"    git config --global --edit\n"
5735"\n"
5736"After doing this, you may fix the identity used for this commit with:\n"
5737"\n"
5738"    git commit --amend --reset-author\n"
5739msgstr ""
5740"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5741"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5742"中编辑您的配置文件:\n"
5743"\n"
5744"    git config --global --edit\n"
5745"\n"
5746"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5747"\n"
5748"    git commit --amend --reset-author\n"
5749
5750#: builtin/commit.c:61
5751msgid ""
5752"Your name and email address were configured automatically based\n"
5753"on your username and hostname. Please check that they are accurate.\n"
5754"You can suppress this message by setting them explicitly:\n"
5755"\n"
5756"    git config --global user.name \"Your Name\"\n"
5757"    git config --global user.email you@example.com\n"
5758"\n"
5759"After doing this, you may fix the identity used for this commit with:\n"
5760"\n"
5761"    git commit --amend --reset-author\n"
5762msgstr ""
5763"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5764"与否。您可以对其进行设置以免再出现本提示信息:\n"
5765"\n"
5766"    git config --global user.name \"Your Name\"\n"
5767"    git config --global user.email you@example.com\n"
5768"\n"
5769"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5770"\n"
5771"    git commit --amend --reset-author\n"
5772
5773#: builtin/commit.c:73
5774msgid ""
5775"You asked to amend the most recent commit, but doing so would make\n"
5776"it empty. You can repeat your command with --allow-empty, or you can\n"
5777"remove the commit entirely with \"git reset HEAD^\".\n"
5778msgstr ""
5779"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5780"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5781
5782#: builtin/commit.c:78
5783msgid ""
5784"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5785"If you wish to commit it anyway, use:\n"
5786"\n"
5787"    git commit --allow-empty\n"
5788"\n"
5789msgstr ""
5790"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5791"也要提交,使用命令:\n"
5792"\n"
5793"    git commit --allow-empty\n"
5794"\n"
5795
5796#: builtin/commit.c:85
5797msgid "Otherwise, please use 'git reset'\n"
5798msgstr "否则,请使用命令 'git reset'\n"
5799
5800#: builtin/commit.c:88
5801msgid ""
5802"If you wish to skip this commit, use:\n"
5803"\n"
5804"    git reset\n"
5805"\n"
5806"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5807"the remaining commits.\n"
5808msgstr ""
5809"如果您想跳过这个提交,使用命令:\n"
5810"\n"
5811"    git reset\n"
5812"\n"
5813"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5814"操作。\n"
5815
5816#: builtin/commit.c:308
5817msgid "failed to unpack HEAD tree object"
5818msgstr "无法解包 HEAD 树对象"
5819
5820#: builtin/commit.c:349
5821msgid "unable to create temporary index"
5822msgstr "不能创建临时索引"
5823
5824#: builtin/commit.c:355
5825msgid "interactive add failed"
5826msgstr "交互式添加失败"
5827
5828#: builtin/commit.c:368
5829msgid "unable to update temporary index"
5830msgstr "无法更新临时索引"
5831
5832#: builtin/commit.c:370
5833msgid "Failed to update main cache tree"
5834msgstr "不能更新树的主缓存"
5835
5836#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
5837msgid "unable to write new_index file"
5838msgstr "无法写 new_index 文件"
5839
5840#: builtin/commit.c:448
5841msgid "cannot do a partial commit during a merge."
5842msgstr "在合并过程中不能做部分提交。"
5843
5844#: builtin/commit.c:450
5845msgid "cannot do a partial commit during a cherry-pick."
5846msgstr "在拣选过程中不能做部分提交。"
5847
5848#: builtin/commit.c:459
5849msgid "cannot read the index"
5850msgstr "无法读取索引"
5851
5852#: builtin/commit.c:478
5853msgid "unable to write temporary index file"
5854msgstr "无法写临时索引文件"
5855
5856#: builtin/commit.c:583
5857#, c-format
5858msgid "commit '%s' lacks author header"
5859msgstr "提交 '%s' 缺少作者信息"
5860
5861#: builtin/commit.c:585
5862#, c-format
5863msgid "commit '%s' has malformed author line"
5864msgstr "提交 '%s' 有非法的作者信息"
5865
5866#: builtin/commit.c:604
5867msgid "malformed --author parameter"
5868msgstr "非法的 --author 参数"
5869
5870#: builtin/commit.c:612
5871#, c-format
5872msgid "invalid date format: %s"
5873msgstr "无效的日期格式:%s"
5874
5875#: builtin/commit.c:656
5876msgid ""
5877"unable to select a comment character that is not used\n"
5878"in the current commit message"
5879msgstr "无法选择一个未被当前提交说明使用的注释字符"
5880
5881#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
5882#, c-format
5883msgid "could not lookup commit %s"
5884msgstr "不能查询提交 %s"
5885
5886#: builtin/commit.c:705 builtin/shortlog.c:286
5887#, c-format
5888msgid "(reading log message from standard input)\n"
5889msgstr "(正从标准输入中读取日志信息)\n"
5890
5891#: builtin/commit.c:707
5892msgid "could not read log from standard input"
5893msgstr "不能从标准输入中读取日志信息"
5894
5895#: builtin/commit.c:711
5896#, c-format
5897msgid "could not read log file '%s'"
5898msgstr "不能读取日志文件 '%s'"
5899
5900#: builtin/commit.c:738 builtin/commit.c:746
5901msgid "could not read SQUASH_MSG"
5902msgstr "不能读取 SQUASH_MSG"
5903
5904#: builtin/commit.c:743
5905msgid "could not read MERGE_MSG"
5906msgstr "不能读取 MERGE_MSG"
5907
5908#: builtin/commit.c:797
5909msgid "could not write commit template"
5910msgstr "不能写提交模版"
5911
5912#: builtin/commit.c:815
5913#, c-format
5914msgid ""
5915"\n"
5916"It looks like you may be committing a merge.\n"
5917"If this is not correct, please remove the file\n"
5918"\t%s\n"
5919"and try again.\n"
5920msgstr ""
5921"\n"
5922"似乎您正在做一个合并提交。如果不对,请删除文件\n"
5923"\t%s\n"
5924"然后重试。\n"
5925
5926#: builtin/commit.c:820
5927#, c-format
5928msgid ""
5929"\n"
5930"It looks like you may be committing a cherry-pick.\n"
5931"If this is not correct, please remove the file\n"
5932"\t%s\n"
5933"and try again.\n"
5934msgstr ""
5935"\n"
5936"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5937"\t%s\n"
5938"然后重试。\n"
5939
5940#: builtin/commit.c:833
5941#, c-format
5942msgid ""
5943"Please enter the commit message for your changes. Lines starting\n"
5944"with '%c' will be ignored, and an empty message aborts the commit.\n"
5945msgstr ""
5946"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5947"说明将会终止提交。\n"
5948
5949#: builtin/commit.c:840
5950#, c-format
5951msgid ""
5952"Please enter the commit message for your changes. Lines starting\n"
5953"with '%c' will be kept; you may remove them yourself if you want to.\n"
5954"An empty message aborts the commit.\n"
5955msgstr ""
5956"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5957"也可以删除它们。一个空的提交说明将会终止提交。\n"
5958
5959#  译者:为保证在输出中对齐,注意调整句中空格!
5960#: builtin/commit.c:860
5961#, c-format
5962msgid "%sAuthor:    %.*s <%.*s>"
5963msgstr "%s作者:  %.*s <%.*s>"
5964
5965#  译者:为保证在输出中对齐,注意调整句中空格!
5966#: builtin/commit.c:868
5967#, c-format
5968msgid "%sDate:      %s"
5969msgstr "%s日期:  %s"
5970
5971#  译者:为保证在输出中对齐,注意调整句中空格!
5972#: builtin/commit.c:875
5973#, c-format
5974msgid "%sCommitter: %.*s <%.*s>"
5975msgstr "%s提交者:%.*s <%.*s>"
5976
5977#: builtin/commit.c:893
5978msgid "Cannot read index"
5979msgstr "无法读取索引"
5980
5981#: builtin/commit.c:950
5982msgid "Error building trees"
5983msgstr "无法创建树对象"
5984
5985#: builtin/commit.c:965 builtin/tag.c:266
5986#, c-format
5987msgid "Please supply the message using either -m or -F option.\n"
5988msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5989
5990#: builtin/commit.c:1067
5991#, c-format
5992msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5993msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5994
5995#: builtin/commit.c:1082 builtin/commit.c:1322
5996#, c-format
5997msgid "Invalid untracked files mode '%s'"
5998msgstr "无效的未追踪文件参数 '%s'"
5999
6000#: builtin/commit.c:1119
6001msgid "--long and -z are incompatible"
6002msgstr "--long 和 -z 选项不兼容"
6003
6004#: builtin/commit.c:1149
6005msgid "Using both --reset-author and --author does not make sense"
6006msgstr "同时使用 --reset-author 和 --author 没有意义"
6007
6008#: builtin/commit.c:1158
6009msgid "You have nothing to amend."
6010msgstr "您没有可修补的提交。"
6011
6012#: builtin/commit.c:1161
6013msgid "You are in the middle of a merge -- cannot amend."
6014msgstr "您正处于一个合并过程中 -- 无法修补提交。"
6015
6016#: builtin/commit.c:1163
6017msgid "You are in the middle of a cherry-pick -- cannot amend."
6018msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
6019
6020#: builtin/commit.c:1166
6021msgid "Options --squash and --fixup cannot be used together"
6022msgstr "选项 --squash 和 --fixup 不能同时使用"
6023
6024#: builtin/commit.c:1176
6025msgid "Only one of -c/-C/-F/--fixup can be used."
6026msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
6027
6028#: builtin/commit.c:1178
6029msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
6030msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
6031
6032#: builtin/commit.c:1186
6033msgid "--reset-author can be used only with -C, -c or --amend."
6034msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
6035
6036#: builtin/commit.c:1203
6037msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
6038msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
6039
6040#: builtin/commit.c:1205
6041msgid "No paths with --include/--only does not make sense."
6042msgstr "参数 --include/--only 不跟路径没有意义。"
6043
6044#: builtin/commit.c:1207
6045msgid "Clever... amending the last one with dirty index."
6046msgstr "聪明... 用脏索引修补最后一个提交。"
6047
6048#: builtin/commit.c:1209
6049msgid "Explicit paths specified without -i or -o; assuming --only paths..."
6050msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
6051
6052#: builtin/commit.c:1221 builtin/tag.c:474
6053#, c-format
6054msgid "Invalid cleanup mode %s"
6055msgstr "无效的清理模式 %s"
6056
6057#: builtin/commit.c:1226
6058msgid "Paths with -a does not make sense."
6059msgstr "路径和 -a 选项同时使用没有意义。"
6060
6061#: builtin/commit.c:1336 builtin/commit.c:1622
6062msgid "show status concisely"
6063msgstr "以简洁的格式显示状态"
6064
6065#: builtin/commit.c:1338 builtin/commit.c:1624
6066msgid "show branch information"
6067msgstr "显示分支信息"
6068
6069#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
6070#: builtin/worktree.c:440
6071msgid "machine-readable output"
6072msgstr "机器可读的输出"
6073
6074#: builtin/commit.c:1343 builtin/commit.c:1628
6075msgid "show status in long format (default)"
6076msgstr "以长格式显示状态(默认)"
6077
6078#: builtin/commit.c:1346 builtin/commit.c:1631
6079msgid "terminate entries with NUL"
6080msgstr "条目以 NUL 字符结尾"
6081
6082#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
6083#: builtin/fast-export.c:984 builtin/tag.c:353
6084msgid "mode"
6085msgstr "模式"
6086
6087#: builtin/commit.c:1349 builtin/commit.c:1634
6088msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
6089msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
6090
6091#: builtin/commit.c:1352
6092msgid "show ignored files"
6093msgstr "显示忽略的文件"
6094
6095#: builtin/commit.c:1353 parse-options.h:155
6096msgid "when"
6097msgstr "何时"
6098
6099#: builtin/commit.c:1354
6100msgid ""
6101"ignore changes to submodules, optional when: all, dirty, untracked. "
6102"(Default: all)"
6103msgstr ""
6104"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
6105
6106#: builtin/commit.c:1356
6107msgid "list untracked files in columns"
6108msgstr "以列的方式显示未跟踪的文件"
6109
6110#: builtin/commit.c:1442
6111msgid "couldn't look up newly created commit"
6112msgstr "无法找到新创建的提交"
6113
6114#: builtin/commit.c:1444
6115msgid "could not parse newly created commit"
6116msgstr "不能解析新创建的提交"
6117
6118#: builtin/commit.c:1489
6119msgid "detached HEAD"
6120msgstr "分离头指针"
6121
6122#  译者:中文字符串拼接,可删除前导空格
6123#: builtin/commit.c:1492
6124msgid " (root-commit)"
6125msgstr "(根提交)"
6126
6127#: builtin/commit.c:1592
6128msgid "suppress summary after successful commit"
6129msgstr "提交成功后不显示概述信息"
6130
6131#: builtin/commit.c:1593
6132msgid "show diff in commit message template"
6133msgstr "在提交说明模板里显示差异"
6134
6135#: builtin/commit.c:1595
6136msgid "Commit message options"
6137msgstr "提交说明选项"
6138
6139#: builtin/commit.c:1596 builtin/tag.c:351
6140msgid "read message from file"
6141msgstr "从文件中读取提交说明"
6142
6143#: builtin/commit.c:1597
6144msgid "author"
6145msgstr "作者"
6146
6147#: builtin/commit.c:1597
6148msgid "override author for commit"
6149msgstr "提交时覆盖作者"
6150
6151#: builtin/commit.c:1598 builtin/gc.c:326
6152msgid "date"
6153msgstr "日期"
6154
6155#: builtin/commit.c:1598
6156msgid "override date for commit"
6157msgstr "提交时覆盖日期"
6158
6159#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
6160#: builtin/notes.c:559 builtin/tag.c:349
6161msgid "message"
6162msgstr "说明"
6163
6164#: builtin/commit.c:1599
6165msgid "commit message"
6166msgstr "提交说明"
6167
6168#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
6169#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
6170msgid "commit"
6171msgstr "提交"
6172
6173#: builtin/commit.c:1600
6174msgid "reuse and edit message from specified commit"
6175msgstr "重用并编辑指定提交的提交说明"
6176
6177#: builtin/commit.c:1601
6178msgid "reuse message from specified commit"
6179msgstr "重用指定提交的提交说明"
6180
6181#: builtin/commit.c:1602
6182msgid "use autosquash formatted message to fixup specified commit"
6183msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
6184
6185#: builtin/commit.c:1603
6186msgid "use autosquash formatted message to squash specified commit"
6187msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
6188
6189#: builtin/commit.c:1604
6190msgid "the commit is authored by me now (used with -C/-c/--amend)"
6191msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
6192
6193#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
6194msgid "add Signed-off-by:"
6195msgstr "添加 Signed-off-by: 签名"
6196
6197#: builtin/commit.c:1606
6198msgid "use specified template file"
6199msgstr "使用指定的模板文件"
6200
6201#: builtin/commit.c:1607
6202msgid "force edit of commit"
6203msgstr "强制编辑提交"
6204
6205#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
6206#: builtin/commit.c:1608
6207msgid "default"
6208msgstr "default"
6209
6210#: builtin/commit.c:1608 builtin/tag.c:354
6211msgid "how to strip spaces and #comments from message"
6212msgstr "设置如何删除提交说明里的空格和#注释"
6213
6214#: builtin/commit.c:1609
6215msgid "include status in commit message template"
6216msgstr "在提交说明模板里包含状态信息"
6217
6218#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
6219#: builtin/revert.c:93
6220msgid "GPG sign commit"
6221msgstr "GPG 提交签名"
6222
6223#: builtin/commit.c:1614
6224msgid "Commit contents options"
6225msgstr "提交内容选项"
6226
6227#: builtin/commit.c:1615
6228msgid "commit all changed files"
6229msgstr "提交所有改动的文件"
6230
6231#: builtin/commit.c:1616
6232msgid "add specified files to index for commit"
6233msgstr "添加指定的文件到索引区等待提交"
6234
6235#: builtin/commit.c:1617
6236msgid "interactively add files"
6237msgstr "交互式添加文件"
6238
6239#: builtin/commit.c:1618
6240msgid "interactively add changes"
6241msgstr "交互式添加变更"
6242
6243#: builtin/commit.c:1619
6244msgid "commit only specified files"
6245msgstr "只提交指定的文件"
6246
6247#: builtin/commit.c:1620
6248msgid "bypass pre-commit and commit-msg hooks"
6249msgstr "绕过 pre-commit 和 commit-msg 钩子"
6250
6251#: builtin/commit.c:1621
6252msgid "show what would be committed"
6253msgstr "显示将要提交的内容"
6254
6255#: builtin/commit.c:1632
6256msgid "amend previous commit"
6257msgstr "修改先前的提交"
6258
6259#: builtin/commit.c:1633
6260msgid "bypass post-rewrite hook"
6261msgstr "绕过 post-rewrite 钩子"
6262
6263#: builtin/commit.c:1638
6264msgid "ok to record an empty change"
6265msgstr "允许一个空提交"
6266
6267#: builtin/commit.c:1640
6268msgid "ok to record a change with an empty message"
6269msgstr "允许空的提交说明"
6270
6271#: builtin/commit.c:1669
6272msgid "could not parse HEAD commit"
6273msgstr "不能解析 HEAD 提交"
6274
6275#: builtin/commit.c:1719
6276#, c-format
6277msgid "Corrupt MERGE_HEAD file (%s)"
6278msgstr "损坏的 MERGE_HEAD 文件(%s)"
6279
6280#: builtin/commit.c:1726
6281msgid "could not read MERGE_MODE"
6282msgstr "不能读取 MERGE_MODE"
6283
6284#: builtin/commit.c:1745
6285#, c-format
6286msgid "could not read commit message: %s"
6287msgstr "不能读取提交说明:%s"
6288
6289#: builtin/commit.c:1756
6290#, c-format
6291msgid "Aborting commit; you did not edit the message.\n"
6292msgstr "终止提交;您未更改来自模版的提交说明。\n"
6293
6294#: builtin/commit.c:1761
6295#, c-format
6296msgid "Aborting commit due to empty commit message.\n"
6297msgstr "终止提交因为提交说明为空。\n"
6298
6299#: builtin/commit.c:1809
6300msgid ""
6301"Repository has been updated, but unable to write\n"
6302"new_index file. Check that disk is not full and quota is\n"
6303"not exceeded, and then \"git reset HEAD\" to recover."
6304msgstr ""
6305"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
6306"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
6307
6308#: builtin/config.c:9
6309msgid "git config [<options>]"
6310msgstr "git config [<选项>]"
6311
6312#: builtin/config.c:55
6313msgid "Config file location"
6314msgstr "配置文件位置"
6315
6316#: builtin/config.c:56
6317msgid "use global config file"
6318msgstr "使用全局配置文件"
6319
6320#: builtin/config.c:57
6321msgid "use system config file"
6322msgstr "使用系统级配置文件"
6323
6324#: builtin/config.c:58
6325msgid "use repository config file"
6326msgstr "使用仓库级配置文件"
6327
6328#: builtin/config.c:59
6329msgid "use given config file"
6330msgstr "使用指定的配置文件"
6331
6332#: builtin/config.c:60
6333msgid "blob-id"
6334msgstr "数据对象 ID"
6335
6336#: builtin/config.c:60
6337msgid "read config from given blob object"
6338msgstr "从给定的数据对象读取配置"
6339
6340#: builtin/config.c:61
6341msgid "Action"
6342msgstr "操作"
6343
6344#: builtin/config.c:62
6345msgid "get value: name [value-regex]"
6346msgstr "获取值:name [value-regex]"
6347
6348#: builtin/config.c:63
6349msgid "get all values: key [value-regex]"
6350msgstr "获得所有的值:key [value-regex]"
6351
6352#: builtin/config.c:64
6353msgid "get values for regexp: name-regex [value-regex]"
6354msgstr "根据正则表达式获得值:name-regex [value-regex]"
6355
6356#: builtin/config.c:65
6357msgid "get value specific for the URL: section[.var] URL"
6358msgstr "获得 URL 取值:section[.var] URL"
6359
6360#: builtin/config.c:66
6361msgid "replace all matching variables: name value [value_regex]"
6362msgstr "替换所有匹配的变量:name value [value_regex]"
6363
6364#: builtin/config.c:67
6365msgid "add a new variable: name value"
6366msgstr "添加一个新的变量:name value"
6367
6368#: builtin/config.c:68
6369msgid "remove a variable: name [value-regex]"
6370msgstr "删除一个变量:name [value-regex]"
6371
6372#: builtin/config.c:69
6373msgid "remove all matches: name [value-regex]"
6374msgstr "删除所有匹配项:name [value-regex]"
6375
6376#: builtin/config.c:70
6377msgid "rename section: old-name new-name"
6378msgstr "重命名小节:old-name new-name"
6379
6380#: builtin/config.c:71
6381msgid "remove a section: name"
6382msgstr "删除一个小节:name"
6383
6384#: builtin/config.c:72
6385msgid "list all"
6386msgstr "列出所有"
6387
6388#: builtin/config.c:73
6389msgid "open an editor"
6390msgstr "打开一个编辑器"
6391
6392#: builtin/config.c:74
6393msgid "find the color configured: slot [default]"
6394msgstr "获得配置的颜色:配置 [默认]"
6395
6396#: builtin/config.c:75
6397msgid "find the color setting: slot [stdout-is-tty]"
6398msgstr "获得颜色设置:配置 [stdout-is-tty]"
6399
6400#: builtin/config.c:76
6401msgid "Type"
6402msgstr "类型"
6403
6404#: builtin/config.c:77
6405msgid "value is \"true\" or \"false\""
6406msgstr "值是 \"true\" 或 \"false\""
6407
6408#: builtin/config.c:78
6409msgid "value is decimal number"
6410msgstr "值是十进制数"
6411
6412#: builtin/config.c:79
6413msgid "value is --bool or --int"
6414msgstr "值是 --bool or --int"
6415
6416#: builtin/config.c:80
6417msgid "value is a path (file or directory name)"
6418msgstr "值是一个路径(文件或目录名)"
6419
6420#: builtin/config.c:81
6421msgid "Other"
6422msgstr "其它"
6423
6424#: builtin/config.c:82
6425msgid "terminate values with NUL byte"
6426msgstr "终止值是 NUL 字节"
6427
6428#: builtin/config.c:83
6429msgid "show variable names only"
6430msgstr "只显示变量名"
6431
6432#: builtin/config.c:84
6433msgid "respect include directives on lookup"
6434msgstr "查询时参照 include 指令递归查找"
6435
6436#: builtin/config.c:85
6437msgid "show origin of config (file, standard input, blob, command line)"
6438msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
6439
6440#: builtin/config.c:327
6441msgid "unable to parse default color value"
6442msgstr "不能解析默认颜色值"
6443
6444#: builtin/config.c:471
6445#, c-format
6446msgid ""
6447"# This is Git's per-user configuration file.\n"
6448"[user]\n"
6449"# Please adapt and uncomment the following lines:\n"
6450"#\tname = %s\n"
6451"#\temail = %s\n"
6452msgstr ""
6453"# This is Git's per-user configuration file.\n"
6454"[user]\n"
6455"# Please adapt and uncomment the following lines:\n"
6456"#\tname = %s\n"
6457"#\temail = %s\n"
6458
6459#: builtin/config.c:613
6460#, c-format
6461msgid "cannot create configuration file %s"
6462msgstr "不能创建配置文件 %s"
6463
6464#: builtin/count-objects.c:77
6465msgid "git count-objects [-v] [-H | --human-readable]"
6466msgstr "git count-objects [-v] [-H | --human-readable]"
6467
6468#: builtin/count-objects.c:87
6469msgid "print sizes in human readable format"
6470msgstr "以用户可读的格式显示大小"
6471
6472#: builtin/describe.c:17
6473msgid "git describe [<options>] [<commit-ish>...]"
6474msgstr "git describe [<选项>] [<提交号>...]"
6475
6476#: builtin/describe.c:18
6477msgid "git describe [<options>] --dirty"
6478msgstr "git describe [<选项>] --dirty"
6479
6480#: builtin/describe.c:217
6481#, c-format
6482msgid "annotated tag %s not available"
6483msgstr "附注标签 %s 无效"
6484
6485#: builtin/describe.c:221
6486#, c-format
6487msgid "annotated tag %s has no embedded name"
6488msgstr "附注标签 %s 没有嵌入名称"
6489
6490#: builtin/describe.c:223
6491#, c-format
6492msgid "tag '%s' is really '%s' here"
6493msgstr "标签 '%s' 的确是在 '%s'"
6494
6495#: builtin/describe.c:250 builtin/log.c:480
6496#, c-format
6497msgid "Not a valid object name %s"
6498msgstr "不是一个有效的对象名 %s"
6499
6500#: builtin/describe.c:253
6501#, c-format
6502msgid "%s is not a valid '%s' object"
6503msgstr "%s 不是一个有效的 '%s' 对象"
6504
6505#: builtin/describe.c:270
6506#, c-format
6507msgid "no tag exactly matches '%s'"
6508msgstr "没有标签准确匹配 '%s'"
6509
6510#: builtin/describe.c:272
6511#, c-format
6512msgid "searching to describe %s\n"
6513msgstr "搜索描述 %s\n"
6514
6515#: builtin/describe.c:319
6516#, c-format
6517msgid "finished search at %s\n"
6518msgstr "完成搜索 %s\n"
6519
6520#: builtin/describe.c:346
6521#, c-format
6522msgid ""
6523"No annotated tags can describe '%s'.\n"
6524"However, there were unannotated tags: try --tags."
6525msgstr ""
6526"没有附注标签能描述 '%s'。\n"
6527"然而,存在未附注标签:尝试 --tags。"
6528
6529#: builtin/describe.c:350
6530#, c-format
6531msgid ""
6532"No tags can describe '%s'.\n"
6533"Try --always, or create some tags."
6534msgstr ""
6535"没有标签能描述 '%s'。\n"
6536"尝试 --always,或者创建一些标签。"
6537
6538#: builtin/describe.c:371
6539#, c-format
6540msgid "traversed %lu commits\n"
6541msgstr "已遍历 %lu 个提交\n"
6542
6543#: builtin/describe.c:374
6544#, c-format
6545msgid ""
6546"more than %i tags found; listed %i most recent\n"
6547"gave up search at %s\n"
6548msgstr ""
6549"发现多于 %i 个标签,列出最近的 %i 个\n"
6550"在 %s 放弃搜索\n"
6551
6552#: builtin/describe.c:396
6553msgid "find the tag that comes after the commit"
6554msgstr "寻找该提交之后的标签"
6555
6556#: builtin/describe.c:397
6557msgid "debug search strategy on stderr"
6558msgstr "在标准错误上调试搜索策略"
6559
6560#: builtin/describe.c:398
6561msgid "use any ref"
6562msgstr "使用任意引用"
6563
6564#: builtin/describe.c:399
6565msgid "use any tag, even unannotated"
6566msgstr "使用任意标签,即使未附带注释"
6567
6568#: builtin/describe.c:400
6569msgid "always use long format"
6570msgstr "始终使用长提交号格式"
6571
6572#: builtin/describe.c:401
6573msgid "only follow first parent"
6574msgstr "只跟随第一个父提交"
6575
6576#: builtin/describe.c:404
6577msgid "only output exact matches"
6578msgstr "只输出精确匹配"
6579
6580#: builtin/describe.c:406
6581msgid "consider <n> most recent tags (default: 10)"
6582msgstr "考虑最近 <n> 个标签(默认:10)"
6583
6584#: builtin/describe.c:408
6585msgid "only consider tags matching <pattern>"
6586msgstr "只考虑匹配 <模式> 的标签"
6587
6588#: builtin/describe.c:410 builtin/name-rev.c:321
6589msgid "show abbreviated commit object as fallback"
6590msgstr "显示简写的提交号作为后备"
6591
6592#: builtin/describe.c:411
6593msgid "mark"
6594msgstr "标记"
6595
6596#: builtin/describe.c:412
6597msgid "append <mark> on dirty working tree (default: \"-dirty\")"
6598msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
6599
6600#: builtin/describe.c:430
6601msgid "--long is incompatible with --abbrev=0"
6602msgstr "--long 与 --abbrev=0 不兼容"
6603
6604#: builtin/describe.c:456
6605msgid "No names found, cannot describe anything."
6606msgstr "没有发现名称,无法描述任何东西。"
6607
6608#: builtin/describe.c:476
6609msgid "--dirty is incompatible with commit-ishes"
6610msgstr "--dirty 不能与提交同时使用"
6611
6612#: builtin/diff.c:86
6613#, c-format
6614msgid "'%s': not a regular file or symlink"
6615msgstr "'%s':不是一个正规文件或符号链接"
6616
6617#: builtin/diff.c:237
6618#, c-format
6619msgid "invalid option: %s"
6620msgstr "无效选项:%s"
6621
6622#: builtin/diff.c:360
6623msgid "Not a git repository"
6624msgstr "不是一个 git 仓库"
6625
6626#: builtin/diff.c:403
6627#, c-format
6628msgid "invalid object '%s' given."
6629msgstr "提供了无效对象 '%s'。"
6630
6631#: builtin/diff.c:412
6632#, c-format
6633msgid "more than two blobs given: '%s'"
6634msgstr "提供了超过两个数据对象:'%s'"
6635
6636#: builtin/diff.c:419
6637#, c-format
6638msgid "unhandled object '%s' given."
6639msgstr "无法处理的对象 '%s'。"
6640
6641#: builtin/fast-export.c:25
6642msgid "git fast-export [rev-list-opts]"
6643msgstr "git fast-export [rev-list-opts]"
6644
6645#: builtin/fast-export.c:980
6646msgid "show progress after <n> objects"
6647msgstr "在 <n> 个对象之后显示进度"
6648
6649#: builtin/fast-export.c:982
6650msgid "select handling of signed tags"
6651msgstr "选择如何处理签名标签"
6652
6653#: builtin/fast-export.c:985
6654msgid "select handling of tags that tag filtered objects"
6655msgstr "选择当标签指向被过滤对象时该标签的处理方式"
6656
6657#: builtin/fast-export.c:988
6658msgid "Dump marks to this file"
6659msgstr "把标记存储到这个文件"
6660
6661#: builtin/fast-export.c:990
6662msgid "Import marks from this file"
6663msgstr "从这个文件导入标记"
6664
6665#: builtin/fast-export.c:992
6666msgid "Fake a tagger when tags lack one"
6667msgstr "当标签缺少标记者字段时,假装提供一个"
6668
6669#: builtin/fast-export.c:994
6670msgid "Output full tree for each commit"
6671msgstr "每次提交都输出整个树"
6672
6673#: builtin/fast-export.c:996
6674msgid "Use the done feature to terminate the stream"
6675msgstr "使用 done 功能来终止流"
6676
6677#: builtin/fast-export.c:997
6678msgid "Skip output of blob data"
6679msgstr "跳过数据对象的输出"
6680
6681#: builtin/fast-export.c:998
6682msgid "refspec"
6683msgstr "引用规格"
6684
6685#: builtin/fast-export.c:999
6686msgid "Apply refspec to exported refs"
6687msgstr "对导出的引用应用引用规格"
6688
6689#: builtin/fast-export.c:1000
6690msgid "anonymize output"
6691msgstr "匿名输出"
6692
6693#: builtin/fetch.c:21
6694msgid "git fetch [<options>] [<repository> [<refspec>...]]"
6695msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
6696
6697#: builtin/fetch.c:22
6698msgid "git fetch [<options>] <group>"
6699msgstr "git fetch [<选项>] <组>"
6700
6701#: builtin/fetch.c:23
6702msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
6703msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
6704
6705#: builtin/fetch.c:24
6706msgid "git fetch --all [<options>]"
6707msgstr "git fetch --all [<选项>]"
6708
6709#: builtin/fetch.c:93 builtin/pull.c:174
6710msgid "fetch from all remotes"
6711msgstr "从所有的远程抓取"
6712
6713#: builtin/fetch.c:95 builtin/pull.c:177
6714msgid "append to .git/FETCH_HEAD instead of overwriting"
6715msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
6716
6717#: builtin/fetch.c:97 builtin/pull.c:180
6718msgid "path to upload pack on remote end"
6719msgstr "上传包到远程的路径"
6720
6721#: builtin/fetch.c:98 builtin/pull.c:182
6722msgid "force overwrite of local branch"
6723msgstr "强制覆盖本地分支"
6724
6725#: builtin/fetch.c:100
6726msgid "fetch from multiple remotes"
6727msgstr "从多个远程抓取"
6728
6729#: builtin/fetch.c:102 builtin/pull.c:184
6730msgid "fetch all tags and associated objects"
6731msgstr "抓取所有的标签和关联对象"
6732
6733#: builtin/fetch.c:104
6734msgid "do not fetch all tags (--no-tags)"
6735msgstr "不抓取任何标签(--no-tags)"
6736
6737#: builtin/fetch.c:106
6738msgid "number of submodules fetched in parallel"
6739msgstr "子模组获取的并发数"
6740
6741#: builtin/fetch.c:108 builtin/pull.c:187
6742msgid "prune remote-tracking branches no longer on remote"
6743msgstr "清除远程已经不存在的分支的跟踪分支"
6744
6745#  译者:可选值,不能翻译
6746#: builtin/fetch.c:109 builtin/pull.c:190
6747msgid "on-demand"
6748msgstr "on-demand"
6749
6750#: builtin/fetch.c:110 builtin/pull.c:191
6751msgid "control recursive fetching of submodules"
6752msgstr "控制子模组的递归抓取"
6753
6754#: builtin/fetch.c:114 builtin/pull.c:199
6755msgid "keep downloaded pack"
6756msgstr "保持下载包"
6757
6758#: builtin/fetch.c:116
6759msgid "allow updating of HEAD ref"
6760msgstr "允许更新 HEAD 引用"
6761
6762#: builtin/fetch.c:119 builtin/pull.c:202
6763msgid "deepen history of shallow clone"
6764msgstr "深化浅克隆的历史"
6765
6766#: builtin/fetch.c:121 builtin/pull.c:205
6767msgid "convert to a complete repository"
6768msgstr "转换为一个完整的仓库"
6769
6770#: builtin/fetch.c:123 builtin/log.c:1426
6771msgid "dir"
6772msgstr "目录"
6773
6774#: builtin/fetch.c:124
6775msgid "prepend this to submodule path output"
6776msgstr "在子模组路径输出的前面加上此目录"
6777
6778#: builtin/fetch.c:127
6779msgid "default mode for recursion"
6780msgstr "递归的默认模式"
6781
6782#: builtin/fetch.c:129 builtin/pull.c:208
6783msgid "accept refs that update .git/shallow"
6784msgstr "接受更新 .git/shallow 的引用"
6785
6786#: builtin/fetch.c:130 builtin/pull.c:210
6787msgid "refmap"
6788msgstr "引用映射"
6789
6790#: builtin/fetch.c:131 builtin/pull.c:211
6791msgid "specify fetch refmap"
6792msgstr "指定获取操作的引用映射"
6793
6794#: builtin/fetch.c:387
6795msgid "Couldn't find remote ref HEAD"
6796msgstr "无法发现远程 HEAD 引用"
6797
6798#: builtin/fetch.c:503
6799#, c-format
6800msgid "configuration fetch.output contains invalid value %s"
6801msgstr "配置变量 fetch.output 包含无效值 %s"
6802
6803#: builtin/fetch.c:592
6804#, c-format
6805msgid "object %s not found"
6806msgstr "对象 %s 未发现"
6807
6808#: builtin/fetch.c:596
6809msgid "[up to date]"
6810msgstr "[最新]"
6811
6812#: builtin/fetch.c:609 builtin/fetch.c:689
6813msgid "[rejected]"
6814msgstr "[已拒绝]"
6815
6816#: builtin/fetch.c:610
6817msgid "can't fetch in current branch"
6818msgstr "当前分支下不能执行获取操作"
6819
6820#: builtin/fetch.c:619
6821msgid "[tag update]"
6822msgstr "[标签更新]"
6823
6824#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
6825#: builtin/fetch.c:684
6826msgid "unable to update local ref"
6827msgstr "不能更新本地引用"
6828
6829#: builtin/fetch.c:639
6830msgid "[new tag]"
6831msgstr "[新标签]"
6832
6833#: builtin/fetch.c:642
6834msgid "[new branch]"
6835msgstr "[新分支]"
6836
6837#: builtin/fetch.c:645
6838msgid "[new ref]"
6839msgstr "[新引用]"
6840
6841#: builtin/fetch.c:684
6842msgid "forced update"
6843msgstr "强制更新"
6844
6845#: builtin/fetch.c:689
6846msgid "non-fast-forward"
6847msgstr "非快进"
6848
6849#: builtin/fetch.c:733
6850#, c-format
6851msgid "%s did not send all necessary objects\n"
6852msgstr "%s 未发送所有必须的对象\n"
6853
6854#: builtin/fetch.c:753
6855#, c-format
6856msgid "reject %s because shallow roots are not allowed to be updated"
6857msgstr "拒绝 %s 因为浅克隆不允许被更新"
6858
6859#: builtin/fetch.c:839 builtin/fetch.c:934
6860#, c-format
6861msgid "From %.*s\n"
6862msgstr "来自 %.*s\n"
6863
6864#: builtin/fetch.c:850
6865#, c-format
6866msgid ""
6867"some local refs could not be updated; try running\n"
6868" 'git remote prune %s' to remove any old, conflicting branches"
6869msgstr ""
6870"一些本地引用不能被更新;尝试运行\n"
6871" 'git remote prune %s' 来删除旧的、有冲突的分支"
6872
6873#  译者:注意保持前导空格
6874#: builtin/fetch.c:904
6875#, c-format
6876msgid "   (%s will become dangling)"
6877msgstr "   (%s 将成为摇摆状态)"
6878
6879#  译者:注意保持前导空格
6880#: builtin/fetch.c:905
6881#, c-format
6882msgid "   (%s has become dangling)"
6883msgstr "   (%s 已成为摇摆状态)"
6884
6885#: builtin/fetch.c:937
6886msgid "[deleted]"
6887msgstr "[已删除]"
6888
6889#: builtin/fetch.c:938 builtin/remote.c:1020
6890msgid "(none)"
6891msgstr "(无)"
6892
6893#: builtin/fetch.c:960
6894#, c-format
6895msgid "Refusing to fetch into current branch %s of non-bare repository"
6896msgstr "拒绝获取到非纯仓库的当前分支 %s"
6897
6898#: builtin/fetch.c:979
6899#, c-format
6900msgid "Option \"%s\" value \"%s\" is not valid for %s"
6901msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6902
6903#: builtin/fetch.c:982
6904#, c-format
6905msgid "Option \"%s\" is ignored for %s\n"
6906msgstr "选项 \"%s\" 为 %s 所忽略\n"
6907
6908#: builtin/fetch.c:1039
6909#, c-format
6910msgid "Don't know how to fetch from %s"
6911msgstr "不知道如何从 %s 获取"
6912
6913#: builtin/fetch.c:1199
6914#, c-format
6915msgid "Fetching %s\n"
6916msgstr "正在获取 %s\n"
6917
6918#: builtin/fetch.c:1201 builtin/remote.c:96
6919#, c-format
6920msgid "Could not fetch %s"
6921msgstr "不能获取 %s"
6922
6923#: builtin/fetch.c:1219
6924msgid ""
6925"No remote repository specified.  Please, specify either a URL or a\n"
6926"remote name from which new revisions should be fetched."
6927msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6928
6929#: builtin/fetch.c:1242
6930msgid "You need to specify a tag name."
6931msgstr "您需要指定一个标签名称。"
6932
6933#: builtin/fetch.c:1284
6934msgid "--depth and --unshallow cannot be used together"
6935msgstr "--depth 和 --unshallow 不能同时使用"
6936
6937#: builtin/fetch.c:1286
6938msgid "--unshallow on a complete repository does not make sense"
6939msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6940
6941#: builtin/fetch.c:1306
6942msgid "fetch --all does not take a repository argument"
6943msgstr "fetch --all 不能带一个仓库参数"
6944
6945#: builtin/fetch.c:1308
6946msgid "fetch --all does not make sense with refspecs"
6947msgstr "fetch --all 带引用规格没有任何意义"
6948
6949#: builtin/fetch.c:1319
6950#, c-format
6951msgid "No such remote or remote group: %s"
6952msgstr "没有这样的远程或远程组:%s"
6953
6954#: builtin/fetch.c:1327
6955msgid "Fetching a group and specifying refspecs does not make sense"
6956msgstr "获取组并指定引用规格没有意义"
6957
6958#: builtin/fmt-merge-msg.c:14
6959msgid ""
6960"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6961msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6962
6963#: builtin/fmt-merge-msg.c:667
6964msgid "populate log with at most <n> entries from shortlog"
6965msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6966
6967#: builtin/fmt-merge-msg.c:670
6968msgid "alias for --log (deprecated)"
6969msgstr "参数 --log 的别名(已弃用)"
6970
6971#: builtin/fmt-merge-msg.c:673
6972msgid "text"
6973msgstr "文本"
6974
6975#: builtin/fmt-merge-msg.c:674
6976msgid "use <text> as start of message"
6977msgstr "使用 <文本> 作为提交说明的开始"
6978
6979#: builtin/fmt-merge-msg.c:675
6980msgid "file to read from"
6981msgstr "从文件中读取"
6982
6983#: builtin/for-each-ref.c:9
6984msgid "git for-each-ref [<options>] [<pattern>]"
6985msgstr "git for-each-ref [<选项>] [<模式>]"
6986
6987#: builtin/for-each-ref.c:10
6988msgid "git for-each-ref [--points-at <object>]"
6989msgstr "git for-each-ref [--points-at <对象>]"
6990
6991#: builtin/for-each-ref.c:11
6992msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6993msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6994
6995#: builtin/for-each-ref.c:12
6996msgid "git for-each-ref [--contains [<object>]]"
6997msgstr "git for-each-ref [--contains [<对象>]]"
6998
6999#: builtin/for-each-ref.c:27
7000msgid "quote placeholders suitably for shells"
7001msgstr "引用占位符适用于 shells"
7002
7003#: builtin/for-each-ref.c:29
7004msgid "quote placeholders suitably for perl"
7005msgstr "引用占位符适用于 perl"
7006
7007#: builtin/for-each-ref.c:31
7008msgid "quote placeholders suitably for python"
7009msgstr "引用占位符适用于 python"
7010
7011#: builtin/for-each-ref.c:33
7012msgid "quote placeholders suitably for Tcl"
7013msgstr "引用占位符适用于 Tcl"
7014
7015#: builtin/for-each-ref.c:36
7016msgid "show only <n> matched refs"
7017msgstr "只显示 <n> 个匹配的引用"
7018
7019#: builtin/for-each-ref.c:37 builtin/tag.c:372
7020msgid "format to use for the output"
7021msgstr "输出格式"
7022
7023#: builtin/for-each-ref.c:41
7024msgid "print only refs which points at the given object"
7025msgstr "只打印指向给定对象的引用"
7026
7027#: builtin/for-each-ref.c:43
7028msgid "print only refs that are merged"
7029msgstr "只打印已经合并的引用"
7030
7031#: builtin/for-each-ref.c:44
7032msgid "print only refs that are not merged"
7033msgstr "只打印没有合并的引用"
7034
7035#: builtin/for-each-ref.c:45
7036msgid "print only refs which contain the commit"
7037msgstr "只打印包含该提交的引用"
7038
7039#: builtin/fsck.c:519
7040msgid "Checking object directories"
7041msgstr "检查对象目录中"
7042
7043#: builtin/fsck.c:588
7044msgid "git fsck [<options>] [<object>...]"
7045msgstr "git fsck [<选项>] [<对象>...]"
7046
7047#: builtin/fsck.c:594
7048msgid "show unreachable objects"
7049msgstr "显示不可达的对象"
7050
7051#: builtin/fsck.c:595
7052msgid "show dangling objects"
7053msgstr "显示摇摆的对象"
7054
7055#: builtin/fsck.c:596
7056msgid "report tags"
7057msgstr "报告标签"
7058
7059#: builtin/fsck.c:597
7060msgid "report root nodes"
7061msgstr "报告根节点"
7062
7063#: builtin/fsck.c:598
7064msgid "make index objects head nodes"
7065msgstr "将索引亦作为检查的头节点"
7066
7067#: builtin/fsck.c:599
7068msgid "make reflogs head nodes (default)"
7069msgstr "将引用日志作为检查的头节点(默认)"
7070
7071#: builtin/fsck.c:600
7072msgid "also consider packs and alternate objects"
7073msgstr "也考虑包和备用对象"
7074
7075#: builtin/fsck.c:601
7076msgid "check only connectivity"
7077msgstr "仅检查连通性"
7078
7079#: builtin/fsck.c:602
7080msgid "enable more strict checking"
7081msgstr "启用更严格的检查"
7082
7083#: builtin/fsck.c:604
7084msgid "write dangling objects in .git/lost-found"
7085msgstr "将摇摆对象写入 .git/lost-found 中"
7086
7087#: builtin/fsck.c:605 builtin/prune.c:107
7088msgid "show progress"
7089msgstr "显示进度"
7090
7091#: builtin/fsck.c:606
7092msgid "show verbose names for reachable objects"
7093msgstr "显示可达对象的详细名称"
7094
7095#: builtin/fsck.c:671
7096msgid "Checking objects"
7097msgstr "检查对象中"
7098
7099#: builtin/gc.c:25
7100msgid "git gc [<options>]"
7101msgstr "git gc [<选项>]"
7102
7103#: builtin/gc.c:72
7104#, c-format
7105msgid "Invalid %s: '%s'"
7106msgstr "无效 %s:'%s'"
7107
7108#: builtin/gc.c:139
7109#, c-format
7110msgid "insanely long object directory %.*s"
7111msgstr "不正常的长对象目录 %.*s"
7112
7113#: builtin/gc.c:290
7114#, c-format
7115msgid ""
7116"The last gc run reported the following. Please correct the root cause\n"
7117"and remove %s.\n"
7118"Automatic cleanup will not be performed until the file is removed.\n"
7119"\n"
7120"%s"
7121msgstr ""
7122"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
7123"在该文件被删除之前,自动清理将不会执行。\n"
7124"\n"
7125"%s"
7126
7127#: builtin/gc.c:327
7128msgid "prune unreferenced objects"
7129msgstr "清除未引用的对象"
7130
7131#: builtin/gc.c:329
7132msgid "be more thorough (increased runtime)"
7133msgstr "更彻底(增加运行时间)"
7134
7135#: builtin/gc.c:330
7136msgid "enable auto-gc mode"
7137msgstr "启用自动垃圾回收模式"
7138
7139#: builtin/gc.c:331
7140msgid "force running gc even if there may be another gc running"
7141msgstr "强制执行 gc 即使另外一个 gc 正在执行"
7142
7143#: builtin/gc.c:373
7144#, c-format
7145msgid "Auto packing the repository in background for optimum performance.\n"
7146msgstr "自动在后台执行仓库打包以求最佳性能。\n"
7147
7148#: builtin/gc.c:375
7149#, c-format
7150msgid "Auto packing the repository for optimum performance.\n"
7151msgstr "自动打包仓库以求最佳性能。\n"
7152
7153#: builtin/gc.c:376
7154#, c-format
7155msgid "See \"git help gc\" for manual housekeeping.\n"
7156msgstr "手工维护参见 \"git help gc\"。\n"
7157
7158#: builtin/gc.c:397
7159#, c-format
7160msgid ""
7161"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
7162msgstr ""
7163"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
7164
7165#: builtin/gc.c:441
7166msgid ""
7167"There are too many unreachable loose objects; run 'git prune' to remove them."
7168msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
7169
7170#: builtin/grep.c:23
7171msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
7172msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
7173
7174#: builtin/grep.c:219
7175#, c-format
7176msgid "grep: failed to create thread: %s"
7177msgstr "grep:无法创建线程:%s"
7178
7179#: builtin/grep.c:277
7180#, c-format
7181msgid "invalid number of threads specified (%d) for %s"
7182msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
7183
7184#: builtin/grep.c:452 builtin/grep.c:487
7185#, c-format
7186msgid "unable to read tree (%s)"
7187msgstr "无法读取树(%s)"
7188
7189#: builtin/grep.c:502
7190#, c-format
7191msgid "unable to grep from object of type %s"
7192msgstr "无法抓取来自于 %s 类型的对象"
7193
7194#: builtin/grep.c:560
7195#, c-format
7196msgid "switch `%c' expects a numerical value"
7197msgstr "开关 `%c' 期望一个数字值"
7198
7199#: builtin/grep.c:577
7200#, c-format
7201msgid "cannot open '%s'"
7202msgstr "不能打开 '%s'"
7203
7204#: builtin/grep.c:646
7205msgid "search in index instead of in the work tree"
7206msgstr "在索引区搜索而不是在工作区"
7207
7208#: builtin/grep.c:648
7209msgid "find in contents not managed by git"
7210msgstr "在未被 git 管理的内容中查找"
7211
7212#  译者:中文字符串拼接,可删除前导空格
7213#: builtin/grep.c:650
7214msgid "search in both tracked and untracked files"
7215msgstr "在跟踪和未跟踪的文件中搜索"
7216
7217#: builtin/grep.c:652
7218msgid "ignore files specified via '.gitignore'"
7219msgstr "忽略 '.gitignore' 包含的文件"
7220
7221#: builtin/grep.c:655
7222msgid "show non-matching lines"
7223msgstr "显示未匹配的行"
7224
7225#: builtin/grep.c:657
7226msgid "case insensitive matching"
7227msgstr "不区分大小写匹配"
7228
7229#: builtin/grep.c:659
7230msgid "match patterns only at word boundaries"
7231msgstr "只在单词边界匹配模式"
7232
7233#: builtin/grep.c:661
7234msgid "process binary files as text"
7235msgstr "把二进制文件当做文本处理"
7236
7237#: builtin/grep.c:663
7238msgid "don't match patterns in binary files"
7239msgstr "不在二进制文件中匹配模式"
7240
7241#: builtin/grep.c:666
7242msgid "process binary files with textconv filters"
7243msgstr "用 textconv 过滤器处理二进制文件"
7244
7245#: builtin/grep.c:668
7246msgid "descend at most <depth> levels"
7247msgstr "最多以指定的深度向下寻找"
7248
7249#: builtin/grep.c:672
7250msgid "use extended POSIX regular expressions"
7251msgstr "使用扩展的 POSIX 正则表达式"
7252
7253#: builtin/grep.c:675
7254msgid "use basic POSIX regular expressions (default)"
7255msgstr "使用基本的 POSIX 正则表达式(默认)"
7256
7257#: builtin/grep.c:678
7258msgid "interpret patterns as fixed strings"
7259msgstr "把模式解析为固定的字符串"
7260
7261#: builtin/grep.c:681
7262msgid "use Perl-compatible regular expressions"
7263msgstr "使用 Perl 兼容的正则表达式"
7264
7265#: builtin/grep.c:684
7266msgid "show line numbers"
7267msgstr "显示行号"
7268
7269#: builtin/grep.c:685
7270msgid "don't show filenames"
7271msgstr "不显示文件名"
7272
7273#: builtin/grep.c:686
7274msgid "show filenames"
7275msgstr "显示文件名"
7276
7277#: builtin/grep.c:688
7278msgid "show filenames relative to top directory"
7279msgstr "显示相对于顶级目录的文件名"
7280
7281#: builtin/grep.c:690
7282msgid "show only filenames instead of matching lines"
7283msgstr "只显示文件名而不显示匹配的行"
7284
7285#: builtin/grep.c:692
7286msgid "synonym for --files-with-matches"
7287msgstr "和 --files-with-matches 同义"
7288
7289#: builtin/grep.c:695
7290msgid "show only the names of files without match"
7291msgstr "只显示未匹配的文件名"
7292
7293#: builtin/grep.c:697
7294msgid "print NUL after filenames"
7295msgstr "在文件名后输出 NUL 字符"
7296
7297#: builtin/grep.c:699
7298msgid "show the number of matches instead of matching lines"
7299msgstr "显示总匹配行数,而不显示匹配的行"
7300
7301#: builtin/grep.c:700
7302msgid "highlight matches"
7303msgstr "高亮显示匹配项"
7304
7305#: builtin/grep.c:702
7306msgid "print empty line between matches from different files"
7307msgstr "在不同文件的匹配项之间打印空行"
7308
7309#: builtin/grep.c:704
7310msgid "show filename only once above matches from same file"
7311msgstr "只在同一文件的匹配项的上面显示一次文件名"
7312
7313#: builtin/grep.c:707
7314msgid "show <n> context lines before and after matches"
7315msgstr "显示匹配项前后的 <n> 行上下文"
7316
7317#: builtin/grep.c:710
7318msgid "show <n> context lines before matches"
7319msgstr "显示匹配项前 <n> 行上下文"
7320
7321#: builtin/grep.c:712
7322msgid "show <n> context lines after matches"
7323msgstr "显示匹配项后 <n> 行上下文"
7324
7325#: builtin/grep.c:714
7326msgid "use <n> worker threads"
7327msgstr "使用 <n> 个工作线程"
7328
7329#: builtin/grep.c:715
7330msgid "shortcut for -C NUM"
7331msgstr "快捷键 -C 数字"
7332
7333#: builtin/grep.c:718
7334msgid "show a line with the function name before matches"
7335msgstr "在匹配的前面显示一行函数名"
7336
7337#: builtin/grep.c:720
7338msgid "show the surrounding function"
7339msgstr "显示所在函数的前后内容"
7340
7341#: builtin/grep.c:723
7342msgid "read patterns from file"
7343msgstr "从文件读取模式"
7344
7345#: builtin/grep.c:725
7346msgid "match <pattern>"
7347msgstr "匹配 <模式>"
7348
7349#: builtin/grep.c:727
7350msgid "combine patterns specified with -e"
7351msgstr "组合用 -e 参数设定的模式"
7352
7353#: builtin/grep.c:739
7354msgid "indicate hit with exit status without output"
7355msgstr "不输出,而用退出码标识命中状态"
7356
7357#: builtin/grep.c:741
7358msgid "show only matches from files that match all patterns"
7359msgstr "只显示匹配所有模式的文件中的匹配"
7360
7361#: builtin/grep.c:743
7362msgid "show parse tree for grep expression"
7363msgstr "显示 grep 表达式的解析树"
7364
7365#: builtin/grep.c:747
7366msgid "pager"
7367msgstr "分页"
7368
7369#: builtin/grep.c:747
7370msgid "show matching files in the pager"
7371msgstr "分页显示匹配的文件"
7372
7373#: builtin/grep.c:750
7374msgid "allow calling of grep(1) (ignored by this build)"
7375msgstr "允许调用 grep(1)(本次构建忽略)"
7376
7377#: builtin/grep.c:813
7378msgid "no pattern given."
7379msgstr "未提供模式匹配。"
7380
7381#: builtin/grep.c:845 builtin/index-pack.c:1479
7382#, c-format
7383msgid "invalid number of threads specified (%d)"
7384msgstr "指定的线程数无效(%d)"
7385
7386#: builtin/grep.c:875
7387msgid "--open-files-in-pager only works on the worktree"
7388msgstr "--open-files-in-pager 仅用于工作区"
7389
7390#: builtin/grep.c:901
7391msgid "--cached or --untracked cannot be used with --no-index."
7392msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
7393
7394#: builtin/grep.c:906
7395msgid "--no-index or --untracked cannot be used with revs."
7396msgstr "--no-index 或 --untracked 不能和版本同时使用。"
7397
7398#: builtin/grep.c:909
7399msgid "--[no-]exclude-standard cannot be used for tracked contents."
7400msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
7401
7402#: builtin/grep.c:917
7403msgid "both --cached and trees are given."
7404msgstr "同时给出了 --cached 和树对象。"
7405
7406#: builtin/hash-object.c:81
7407msgid ""
7408"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
7409"[--] <file>..."
7410msgstr ""
7411"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
7412"[--] <文件>..."
7413
7414#: builtin/hash-object.c:82
7415msgid "git hash-object  --stdin-paths"
7416msgstr "git hash-object  --stdin-paths"
7417
7418#: builtin/hash-object.c:93
7419msgid "type"
7420msgstr "类型"
7421
7422#: builtin/hash-object.c:93
7423msgid "object type"
7424msgstr "对象类型"
7425
7426#: builtin/hash-object.c:94
7427msgid "write the object into the object database"
7428msgstr "将对象写入对象数据库"
7429
7430#: builtin/hash-object.c:96
7431msgid "read the object from stdin"
7432msgstr "从标准输入读取对象"
7433
7434#: builtin/hash-object.c:98
7435msgid "store file as is without filters"
7436msgstr "原样存储文件不使用过滤器"
7437
7438#: builtin/hash-object.c:99
7439msgid ""
7440"just hash any random garbage to create corrupt objects for debugging Git"
7441msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
7442
7443#: builtin/hash-object.c:100
7444msgid "process file as it were from this path"
7445msgstr "处理文件并假设其来自于此路径"
7446
7447#: builtin/help.c:41
7448msgid "print all available commands"
7449msgstr "打印所有可用的命令"
7450
7451#: builtin/help.c:42
7452msgid "print list of useful guides"
7453msgstr "显示有用的指南列表"
7454
7455#: builtin/help.c:43
7456msgid "show man page"
7457msgstr "显示 man 手册"
7458
7459#: builtin/help.c:44
7460msgid "show manual in web browser"
7461msgstr "在 web 浏览器中显示手册"
7462
7463#: builtin/help.c:46
7464msgid "show info page"
7465msgstr "显示 info 手册"
7466
7467#: builtin/help.c:52
7468msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
7469msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
7470
7471#: builtin/help.c:64
7472#, c-format
7473msgid "unrecognized help format '%s'"
7474msgstr "未能识别的帮助格式 '%s'"
7475
7476#: builtin/help.c:91
7477msgid "Failed to start emacsclient."
7478msgstr "无法启动 emacsclient。"
7479
7480#: builtin/help.c:104
7481msgid "Failed to parse emacsclient version."
7482msgstr "无法解析 emacsclient 版本。"
7483
7484#: builtin/help.c:112
7485#, c-format
7486msgid "emacsclient version '%d' too old (< 22)."
7487msgstr "emacsclient 版本 '%d' 太老(< 22)。"
7488
7489#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
7490#, c-format
7491msgid "failed to exec '%s'"
7492msgstr "无法执行 '%s'"
7493
7494#: builtin/help.c:205
7495#, c-format
7496msgid ""
7497"'%s': path for unsupported man viewer.\n"
7498"Please consider using 'man.<tool>.cmd' instead."
7499msgstr ""
7500"'%s':不支持的 man 手册查看器的路径。\n"
7501"请使用 'man.<工具>.cmd'。"
7502
7503#: builtin/help.c:217
7504#, c-format
7505msgid ""
7506"'%s': cmd for supported man viewer.\n"
7507"Please consider using 'man.<tool>.path' instead."
7508msgstr ""
7509"'%s': 支持的 man 手册查看器命令。\n"
7510"请使用 'man.<工具>.path'。"
7511
7512#: builtin/help.c:334
7513#, c-format
7514msgid "'%s': unknown man viewer."
7515msgstr "'%s':未知的 man 查看器。"
7516
7517#: builtin/help.c:351
7518msgid "no man viewer handled the request"
7519msgstr "没有 man 查看器处理此请求"
7520
7521#: builtin/help.c:359
7522msgid "no info viewer handled the request"
7523msgstr "没有 info 查看器处理此请求"
7524
7525#: builtin/help.c:401
7526msgid "Defining attributes per path"
7527msgstr "定义路径的属性"
7528
7529#: builtin/help.c:402
7530msgid "Everyday Git With 20 Commands Or So"
7531msgstr "每一天 Git 常用的约 20 条命令"
7532
7533#: builtin/help.c:403
7534msgid "A Git glossary"
7535msgstr "Git 词汇表"
7536
7537#: builtin/help.c:404
7538msgid "Specifies intentionally untracked files to ignore"
7539msgstr "忽略指定的未跟踪文件"
7540
7541#: builtin/help.c:405
7542msgid "Defining submodule properties"
7543msgstr "定义子模组属性"
7544
7545#: builtin/help.c:406
7546msgid "Specifying revisions and ranges for Git"
7547msgstr "指定 Git 的版本和版本范围"
7548
7549#: builtin/help.c:407
7550msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
7551msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
7552
7553#: builtin/help.c:408
7554msgid "An overview of recommended workflows with Git"
7555msgstr "Git 推荐的工作流概览"
7556
7557#: builtin/help.c:420
7558msgid "The common Git guides are:\n"
7559msgstr "最常用的 Git 向导有:\n"
7560
7561#: builtin/help.c:441 builtin/help.c:458
7562#, c-format
7563msgid "usage: %s%s"
7564msgstr "用法:%s%s"
7565
7566#: builtin/help.c:474
7567#, c-format
7568msgid "`git %s' is aliased to `%s'"
7569msgstr "`git %s' 是 `%s' 的别名"
7570
7571#: builtin/index-pack.c:153
7572#, c-format
7573msgid "unable to open %s"
7574msgstr "不能打开 %s"
7575
7576#: builtin/index-pack.c:203
7577#, c-format
7578msgid "object type mismatch at %s"
7579msgstr "%s 的对象类型不匹配"
7580
7581#: builtin/index-pack.c:223
7582#, c-format
7583msgid "did not receive expected object %s"
7584msgstr "未能获取期望的对象 %s"
7585
7586#: builtin/index-pack.c:226
7587#, c-format
7588msgid "object %s: expected type %s, found %s"
7589msgstr "对象 %s:期待类型 %s,却是 %s"
7590
7591#: builtin/index-pack.c:268
7592#, c-format
7593msgid "cannot fill %d byte"
7594msgid_plural "cannot fill %d bytes"
7595msgstr[0] "无法填充 %d 字节"
7596msgstr[1] "无法填充 %d 字节"
7597
7598#: builtin/index-pack.c:278
7599msgid "early EOF"
7600msgstr "过早的文件结束符(EOF)"
7601
7602#: builtin/index-pack.c:279
7603msgid "read error on input"
7604msgstr "输入上的读错误"
7605
7606#: builtin/index-pack.c:291
7607msgid "used more bytes than were available"
7608msgstr "用掉了超过可用的字节"
7609
7610#: builtin/index-pack.c:298
7611msgid "pack too large for current definition of off_t"
7612msgstr "包太大超过了当前 off_t 的定义"
7613
7614#: builtin/index-pack.c:314
7615#, c-format
7616msgid "unable to create '%s'"
7617msgstr "不能创建 '%s'"
7618
7619#: builtin/index-pack.c:319
7620#, c-format
7621msgid "cannot open packfile '%s'"
7622msgstr "无法打开包文件 '%s'"
7623
7624#: builtin/index-pack.c:333
7625msgid "pack signature mismatch"
7626msgstr "包签名不匹配"
7627
7628#: builtin/index-pack.c:335
7629#, c-format
7630msgid "pack version %<PRIu32> unsupported"
7631msgstr "不支持包版本 %<PRIu32>"
7632
7633#: builtin/index-pack.c:353
7634#, c-format
7635msgid "pack has bad object at offset %<PRIuMAX>: %s"
7636msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
7637
7638#: builtin/index-pack.c:475
7639#, c-format
7640msgid "inflate returned %d"
7641msgstr "解压缩返回 %d"
7642
7643#: builtin/index-pack.c:524
7644msgid "offset value overflow for delta base object"
7645msgstr "偏移值覆盖了 delta 基准对象"
7646
7647#: builtin/index-pack.c:532
7648msgid "delta base offset is out of bound"
7649msgstr "delta 基准偏移越界"
7650
7651#: builtin/index-pack.c:540
7652#, c-format
7653msgid "unknown object type %d"
7654msgstr "未知对象类型 %d"
7655
7656#: builtin/index-pack.c:571
7657msgid "cannot pread pack file"
7658msgstr "无法读取包文件"
7659
7660#: builtin/index-pack.c:573
7661#, c-format
7662msgid "premature end of pack file, %<PRIuMAX> byte missing"
7663msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
7664msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
7665msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
7666
7667#: builtin/index-pack.c:599
7668msgid "serious inflate inconsistency"
7669msgstr "解压缩严重的不一致"
7670
7671#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
7672#: builtin/index-pack.c:808 builtin/index-pack.c:817
7673#, c-format
7674msgid "SHA1 COLLISION FOUND WITH %s !"
7675msgstr "发现 %s 出现 SHA1 冲突!"
7676
7677#: builtin/index-pack.c:748 builtin/pack-objects.c:164
7678#: builtin/pack-objects.c:256
7679#, c-format
7680msgid "unable to read %s"
7681msgstr "不能读 %s"
7682
7683#: builtin/index-pack.c:814
7684#, c-format
7685msgid "cannot read existing object %s"
7686msgstr "不能读取现存对象 %s"
7687
7688#: builtin/index-pack.c:828
7689#, c-format
7690msgid "invalid blob object %s"
7691msgstr "无效的数据对象 %s"
7692
7693#: builtin/index-pack.c:842
7694#, c-format
7695msgid "invalid %s"
7696msgstr "无效的 %s"
7697
7698#: builtin/index-pack.c:845
7699msgid "Error in object"
7700msgstr "对象中出错"
7701
7702#: builtin/index-pack.c:847
7703#, c-format
7704msgid "Not all child objects of %s are reachable"
7705msgstr "%s 的所有子对象并非都可达"
7706
7707#: builtin/index-pack.c:919 builtin/index-pack.c:950
7708msgid "failed to apply delta"
7709msgstr "无法应用 delta"
7710
7711#: builtin/index-pack.c:1120
7712msgid "Receiving objects"
7713msgstr "接收对象中"
7714
7715#: builtin/index-pack.c:1120
7716msgid "Indexing objects"
7717msgstr "索引对象中"
7718
7719#: builtin/index-pack.c:1152
7720msgid "pack is corrupted (SHA1 mismatch)"
7721msgstr "包冲突(SHA1 不匹配)"
7722
7723#: builtin/index-pack.c:1157
7724msgid "cannot fstat packfile"
7725msgstr "不能枚举包文件状态"
7726
7727#: builtin/index-pack.c:1160
7728msgid "pack has junk at the end"
7729msgstr "包的结尾有垃圾数据"
7730
7731#: builtin/index-pack.c:1171
7732msgid "confusion beyond insanity in parse_pack_objects()"
7733msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7734
7735#: builtin/index-pack.c:1196
7736msgid "Resolving deltas"
7737msgstr "处理 delta 中"
7738
7739#: builtin/index-pack.c:1207
7740#, c-format
7741msgid "unable to create thread: %s"
7742msgstr "不能创建线程:%s"
7743
7744#: builtin/index-pack.c:1249
7745msgid "confusion beyond insanity"
7746msgstr "不可理喻"
7747
7748#: builtin/index-pack.c:1255
7749#, c-format
7750msgid "completed with %d local object"
7751msgid_plural "completed with %d local objects"
7752msgstr[0] "完成 %d 个本地对象"
7753msgstr[1] "完成 %d 个本地对象"
7754
7755#: builtin/index-pack.c:1267
7756#, c-format
7757msgid "Unexpected tail checksum for %s (disk corruption?)"
7758msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7759
7760#: builtin/index-pack.c:1271
7761#, c-format
7762msgid "pack has %d unresolved delta"
7763msgid_plural "pack has %d unresolved deltas"
7764msgstr[0] "包有 %d 个未解决的 delta"
7765msgstr[1] "包有 %d 个未解决的 delta"
7766
7767#: builtin/index-pack.c:1295
7768#, c-format
7769msgid "unable to deflate appended object (%d)"
7770msgstr "不能压缩附加对象(%d)"
7771
7772#: builtin/index-pack.c:1371
7773#, c-format
7774msgid "local object %s is corrupt"
7775msgstr "本地对象 %s 已损坏"
7776
7777#: builtin/index-pack.c:1395
7778msgid "error while closing pack file"
7779msgstr "关闭包文件时出错"
7780
7781#: builtin/index-pack.c:1408
7782#, c-format
7783msgid "cannot write keep file '%s'"
7784msgstr "无法写保留文件 '%s'"
7785
7786#: builtin/index-pack.c:1416
7787#, c-format
7788msgid "cannot close written keep file '%s'"
7789msgstr "无法关闭保留文件 '%s'"
7790
7791#: builtin/index-pack.c:1429
7792msgid "cannot store pack file"
7793msgstr "无法存储包文件"
7794
7795#: builtin/index-pack.c:1440
7796msgid "cannot store index file"
7797msgstr "无法存储索引文件"
7798
7799#: builtin/index-pack.c:1473
7800#, c-format
7801msgid "bad pack.indexversion=%<PRIu32>"
7802msgstr "坏的 pack.indexversion=%<PRIu32>"
7803
7804#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
7805#, c-format
7806msgid "no threads support, ignoring %s"
7807msgstr "没有线程支持,忽略 %s"
7808
7809#: builtin/index-pack.c:1542
7810#, c-format
7811msgid "Cannot open existing pack file '%s'"
7812msgstr "无法打开现存包文件 '%s'"
7813
7814#: builtin/index-pack.c:1544
7815#, c-format
7816msgid "Cannot open existing pack idx file for '%s'"
7817msgstr "无法为 %s 打开包索引文件"
7818
7819#: builtin/index-pack.c:1591
7820#, c-format
7821msgid "non delta: %d object"
7822msgid_plural "non delta: %d objects"
7823msgstr[0] "非 delta:%d 个对象"
7824msgstr[1] "非 delta:%d 个对象"
7825
7826#: builtin/index-pack.c:1598
7827#, c-format
7828msgid "chain length = %d: %lu object"
7829msgid_plural "chain length = %d: %lu objects"
7830msgstr[0] "链长 = %d: %lu 对象"
7831msgstr[1] "链长 = %d: %lu 对象"
7832
7833#: builtin/index-pack.c:1611
7834#, c-format
7835msgid "packfile name '%s' does not end with '.pack'"
7836msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7837
7838#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
7839#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
7840#, c-format
7841msgid "bad %s"
7842msgstr "错误选项 %s"
7843
7844#: builtin/index-pack.c:1730
7845msgid "--fix-thin cannot be used without --stdin"
7846msgstr "--fix-thin 不能和 --stdin 同时使用"
7847
7848#: builtin/index-pack.c:1738
7849msgid "--verify with no packfile name given"
7850msgstr "--verify 没有提供包文件名参数"
7851
7852#: builtin/init-db.c:55
7853#, c-format
7854msgid "cannot stat '%s'"
7855msgstr "不能枚举 '%s' 状态"
7856
7857#: builtin/init-db.c:61
7858#, c-format
7859msgid "cannot stat template '%s'"
7860msgstr "不能枚举模版 '%s' 状态"
7861
7862#: builtin/init-db.c:66
7863#, c-format
7864msgid "cannot opendir '%s'"
7865msgstr "不能打开目录 '%s'"
7866
7867#: builtin/init-db.c:77
7868#, c-format
7869msgid "cannot readlink '%s'"
7870msgstr "不能读取链接 '%s'"
7871
7872#: builtin/init-db.c:79
7873#, c-format
7874msgid "cannot symlink '%s' '%s'"
7875msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7876
7877#: builtin/init-db.c:85
7878#, c-format
7879msgid "cannot copy '%s' to '%s'"
7880msgstr "不能拷贝 '%s' 至 '%s'"
7881
7882#: builtin/init-db.c:89
7883#, c-format
7884msgid "ignoring template %s"
7885msgstr "忽略模版 %s"
7886
7887#: builtin/init-db.c:120
7888#, c-format
7889msgid "templates not found %s"
7890msgstr "模版未找到 %s"
7891
7892#: builtin/init-db.c:135
7893#, c-format
7894msgid "not copying templates from '%s': %s"
7895msgstr "没有从 '%s' 复制模版:%s"
7896
7897#: builtin/init-db.c:312 builtin/init-db.c:315
7898#, c-format
7899msgid "%s already exists"
7900msgstr "%s 已经存在"
7901
7902#: builtin/init-db.c:344
7903#, c-format
7904msgid "unable to handle file type %d"
7905msgstr "不能处理 %d 类型的文件"
7906
7907#: builtin/init-db.c:347
7908#, c-format
7909msgid "unable to move %s to %s"
7910msgstr "不能移动 %s 至 %s"
7911
7912#: builtin/init-db.c:402
7913#, c-format
7914msgid "Reinitialized existing shared Git repository in %s%s\n"
7915msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
7916
7917#: builtin/init-db.c:403
7918#, c-format
7919msgid "Reinitialized existing Git repository in %s%s\n"
7920msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
7921
7922#: builtin/init-db.c:407
7923#, c-format
7924msgid "Initialized empty shared Git repository in %s%s\n"
7925msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
7926
7927#: builtin/init-db.c:408
7928#, c-format
7929msgid "Initialized empty Git repository in %s%s\n"
7930msgstr "已初始化空的 Git 仓库于 %s%s\n"
7931
7932#: builtin/init-db.c:455
7933msgid ""
7934"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7935"shared[=<permissions>]] [<directory>]"
7936msgstr ""
7937"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7938"[<目录>]"
7939
7940#: builtin/init-db.c:478
7941msgid "permissions"
7942msgstr "权限"
7943
7944#: builtin/init-db.c:479
7945msgid "specify that the git repository is to be shared amongst several users"
7946msgstr "指定 git 仓库是多个用户之间共享的"
7947
7948#: builtin/init-db.c:513 builtin/init-db.c:518
7949#, c-format
7950msgid "cannot mkdir %s"
7951msgstr "不能创建目录 %s"
7952
7953#: builtin/init-db.c:522
7954#, c-format
7955msgid "cannot chdir to %s"
7956msgstr "不能切换目录到 %s"
7957
7958#: builtin/init-db.c:543
7959#, c-format
7960msgid ""
7961"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7962"dir=<directory>)"
7963msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7964
7965#: builtin/init-db.c:571
7966#, c-format
7967msgid "Cannot access work tree '%s'"
7968msgstr "不能访问工作区 '%s'"
7969
7970#: builtin/interpret-trailers.c:15
7971msgid ""
7972"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7973"<token>[(=|:)<value>])...] [<file>...]"
7974msgstr ""
7975"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7976">])...] [<文件>...]"
7977
7978#: builtin/interpret-trailers.c:26
7979msgid "edit files in place"
7980msgstr "在原位编辑文件"
7981
7982#: builtin/interpret-trailers.c:27
7983msgid "trim empty trailers"
7984msgstr "删除空签名"
7985
7986#: builtin/interpret-trailers.c:28
7987msgid "trailer"
7988msgstr "签名"
7989
7990#: builtin/interpret-trailers.c:29
7991msgid "trailer(s) to add"
7992msgstr "要添加的签名"
7993
7994#: builtin/interpret-trailers.c:42
7995msgid "no input file given for in-place editing"
7996msgstr "没有给出要原位编辑的文件"
7997
7998#: builtin/log.c:44
7999msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
8000msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
8001
8002#: builtin/log.c:45
8003msgid "git show [<options>] <object>..."
8004msgstr "git show [<选项>] <对象>..."
8005
8006#: builtin/log.c:84
8007#, c-format
8008msgid "invalid --decorate option: %s"
8009msgstr "无效的 --decorate 选项:%s"
8010
8011#: builtin/log.c:139
8012msgid "suppress diff output"
8013msgstr "不显示差异输出"
8014
8015#: builtin/log.c:140
8016msgid "show source"
8017msgstr "显示源"
8018
8019#: builtin/log.c:141
8020msgid "Use mail map file"
8021msgstr "使用邮件映射文件"
8022
8023#: builtin/log.c:142
8024msgid "decorate options"
8025msgstr "修饰选项"
8026
8027#: builtin/log.c:145
8028msgid "Process line range n,m in file, counting from 1"
8029msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
8030
8031#: builtin/log.c:241
8032#, c-format
8033msgid "Final output: %d %s\n"
8034msgstr "最终输出:%d %s\n"
8035
8036#: builtin/log.c:486
8037#, c-format
8038msgid "git show %s: bad file"
8039msgstr "git show %s: 损坏的文件"
8040
8041#: builtin/log.c:500 builtin/log.c:594
8042#, c-format
8043msgid "Could not read object %s"
8044msgstr "不能读取对象 %s"
8045
8046#: builtin/log.c:618
8047#, c-format
8048msgid "Unknown type: %d"
8049msgstr "未知类型:%d"
8050
8051#: builtin/log.c:739
8052msgid "format.headers without value"
8053msgstr "format.headers 没有值"
8054
8055#: builtin/log.c:839
8056msgid "name of output directory is too long"
8057msgstr "输出目录名太长"
8058
8059#: builtin/log.c:854
8060#, c-format
8061msgid "Cannot open patch file %s"
8062msgstr "无法打开补丁文件 %s"
8063
8064#: builtin/log.c:868
8065msgid "Need exactly one range."
8066msgstr "只需要一个范围。"
8067
8068#: builtin/log.c:878
8069msgid "Not a range."
8070msgstr "不是一个范围。"
8071
8072#: builtin/log.c:984
8073msgid "Cover letter needs email format"
8074msgstr "信封需要邮件地址格式"
8075
8076#: builtin/log.c:1064
8077#, c-format
8078msgid "insane in-reply-to: %s"
8079msgstr "不正常的 in-reply-to:%s"
8080
8081#: builtin/log.c:1092
8082msgid "git format-patch [<options>] [<since> | <revision-range>]"
8083msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
8084
8085#: builtin/log.c:1137
8086msgid "Two output directories?"
8087msgstr "两个输出目录?"
8088
8089#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
8090#, c-format
8091msgid "Unknown commit %s"
8092msgstr "未知提交 %s"
8093
8094#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
8095#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
8096#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
8097#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
8098#, c-format
8099msgid "Failed to resolve '%s' as a valid ref."
8100msgstr "无法解析 '%s' 为一个有效引用。"
8101
8102#: builtin/log.c:1259
8103msgid "Could not find exact merge base."
8104msgstr "不能找到准确的合并基线。"
8105
8106#: builtin/log.c:1263
8107msgid ""
8108"Failed to get upstream, if you want to record base commit automatically,\n"
8109"please use git branch --set-upstream-to to track a remote branch.\n"
8110"Or you could specify base commit by --base=<base-commit-id> manually."
8111msgstr ""
8112"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
8113"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
8114"参数 --base=<base-commit-id> 手动指定一个基线提交。"
8115
8116#: builtin/log.c:1283
8117msgid "Failed to find exact merge base"
8118msgstr "无法找到准确的合并基线"
8119
8120#: builtin/log.c:1294
8121msgid "base commit should be the ancestor of revision list"
8122msgstr "基线提交应该是版本列表的祖先"
8123
8124#: builtin/log.c:1298
8125msgid "base commit shouldn't be in revision list"
8126msgstr "基线提交不应该出现在版本列表中"
8127
8128#: builtin/log.c:1347
8129msgid "cannot get patch id"
8130msgstr "无法得到补丁 id"
8131
8132#: builtin/log.c:1404
8133msgid "use [PATCH n/m] even with a single patch"
8134msgstr "使用 [PATCH n/m],即使只有一个补丁"
8135
8136#: builtin/log.c:1407
8137msgid "use [PATCH] even with multiple patches"
8138msgstr "使用 [PATCH],即使有多个补丁"
8139
8140#: builtin/log.c:1411
8141msgid "print patches to standard out"
8142msgstr "打印补丁到标准输出"
8143
8144#: builtin/log.c:1413
8145msgid "generate a cover letter"
8146msgstr "生成一封附信"
8147
8148#: builtin/log.c:1415
8149msgid "use simple number sequence for output file names"
8150msgstr "使用简单的数字序列作为输出文件名"
8151
8152#: builtin/log.c:1416
8153msgid "sfx"
8154msgstr "后缀"
8155
8156#: builtin/log.c:1417
8157msgid "use <sfx> instead of '.patch'"
8158msgstr "使用 <后缀> 代替 '.patch'"
8159
8160#: builtin/log.c:1419
8161msgid "start numbering patches at <n> instead of 1"
8162msgstr "补丁以 <n> 开始编号,而不是1"
8163
8164#: builtin/log.c:1421
8165msgid "mark the series as Nth re-roll"
8166msgstr "标记补丁系列是第几次重制"
8167
8168#: builtin/log.c:1423
8169msgid "Use [<prefix>] instead of [PATCH]"
8170msgstr "使用 [<前缀>] 代替 [PATCH]"
8171
8172#: builtin/log.c:1426
8173msgid "store resulting files in <dir>"
8174msgstr "把结果文件存储在 <目录>"
8175
8176#: builtin/log.c:1429
8177msgid "don't strip/add [PATCH]"
8178msgstr "不删除/添加 [PATCH]"
8179
8180#: builtin/log.c:1432
8181msgid "don't output binary diffs"
8182msgstr "不输出二进制差异"
8183
8184#: builtin/log.c:1434
8185msgid "output all-zero hash in From header"
8186msgstr "在 From 头信息中输出全为零的哈希值"
8187
8188#: builtin/log.c:1436
8189msgid "don't include a patch matching a commit upstream"
8190msgstr "不包含已在上游提交中的补丁"
8191
8192#: builtin/log.c:1438
8193msgid "show patch format instead of default (patch + stat)"
8194msgstr "显示纯补丁格式而非默认的(补丁+状态)"
8195
8196#: builtin/log.c:1440
8197msgid "Messaging"
8198msgstr "邮件发送"
8199
8200#: builtin/log.c:1441
8201msgid "header"
8202msgstr "header"
8203
8204#: builtin/log.c:1442
8205msgid "add email header"
8206msgstr "添加邮件头"
8207
8208#: builtin/log.c:1443 builtin/log.c:1445
8209msgid "email"
8210msgstr "邮件地址"
8211
8212#: builtin/log.c:1443
8213msgid "add To: header"
8214msgstr "添加收件人"
8215
8216#: builtin/log.c:1445
8217msgid "add Cc: header"
8218msgstr "添加抄送"
8219
8220#: builtin/log.c:1447
8221msgid "ident"
8222msgstr "标识"
8223
8224#: builtin/log.c:1448
8225msgid "set From address to <ident> (or committer ident if absent)"
8226msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
8227
8228#: builtin/log.c:1450
8229msgid "message-id"
8230msgstr "邮件标识"
8231
8232#: builtin/log.c:1451
8233msgid "make first mail a reply to <message-id>"
8234msgstr "使第一封邮件作为对 <邮件标识> 的回复"
8235
8236#: builtin/log.c:1452 builtin/log.c:1455
8237msgid "boundary"
8238msgstr "边界"
8239
8240#: builtin/log.c:1453
8241msgid "attach the patch"
8242msgstr "附件方式添加补丁"
8243
8244#: builtin/log.c:1456
8245msgid "inline the patch"
8246msgstr "内联显示补丁"
8247
8248#: builtin/log.c:1460
8249msgid "enable message threading, styles: shallow, deep"
8250msgstr "启用邮件线索,风格:浅,深"
8251
8252#: builtin/log.c:1462
8253msgid "signature"
8254msgstr "签名"
8255
8256#: builtin/log.c:1463
8257msgid "add a signature"
8258msgstr "添加一个签名"
8259
8260#: builtin/log.c:1464
8261msgid "base-commit"
8262msgstr "基线提交"
8263
8264#: builtin/log.c:1465
8265msgid "add prerequisite tree info to the patch series"
8266msgstr "为补丁列表添加前置树信息"
8267
8268#: builtin/log.c:1467
8269msgid "add a signature from a file"
8270msgstr "从文件添加一个签名"
8271
8272#: builtin/log.c:1468
8273msgid "don't print the patch filenames"
8274msgstr "不要打印补丁文件名"
8275
8276#: builtin/log.c:1558
8277msgid "-n and -k are mutually exclusive."
8278msgstr "-n 和 -k 互斥。"
8279
8280#: builtin/log.c:1560
8281msgid "--subject-prefix and -k are mutually exclusive."
8282msgstr "--subject-prefix 和 -k 互斥。"
8283
8284#: builtin/log.c:1568
8285msgid "--name-only does not make sense"
8286msgstr "--name-only 无意义"
8287
8288#: builtin/log.c:1570
8289msgid "--name-status does not make sense"
8290msgstr "--name-status 无意义"
8291
8292#: builtin/log.c:1572
8293msgid "--check does not make sense"
8294msgstr "--check 无意义"
8295
8296#: builtin/log.c:1602
8297msgid "standard output, or directory, which one?"
8298msgstr "标准输出或目录,哪一个?"
8299
8300#: builtin/log.c:1604
8301#, c-format
8302msgid "Could not create directory '%s'"
8303msgstr "不能创建目录 '%s'"
8304
8305#: builtin/log.c:1698
8306#, c-format
8307msgid "unable to read signature file '%s'"
8308msgstr "无法读取签名文件 '%s'"
8309
8310#: builtin/log.c:1769
8311msgid "Failed to create output files"
8312msgstr "无法创建输出文件"
8313
8314#: builtin/log.c:1818
8315msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
8316msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
8317
8318#: builtin/log.c:1872
8319#, c-format
8320msgid ""
8321"Could not find a tracked remote branch, please specify <upstream> manually.\n"
8322msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
8323
8324#: builtin/ls-files.c:379
8325msgid "git ls-files [<options>] [<file>...]"
8326msgstr "git ls-files [<选项>] [<文件>...]"
8327
8328#: builtin/ls-files.c:428
8329msgid "identify the file status with tags"
8330msgstr "用标签标识文件的状态"
8331
8332#: builtin/ls-files.c:430
8333msgid "use lowercase letters for 'assume unchanged' files"
8334msgstr "使用小写字母表示 '假设未改变的' 文件"
8335
8336#: builtin/ls-files.c:432
8337msgid "show cached files in the output (default)"
8338msgstr "显示缓存的文件(默认)"
8339
8340#: builtin/ls-files.c:434
8341msgid "show deleted files in the output"
8342msgstr "显示已删除的文件"
8343
8344#: builtin/ls-files.c:436
8345msgid "show modified files in the output"
8346msgstr "显示已修改的文件"
8347
8348#: builtin/ls-files.c:438
8349msgid "show other files in the output"
8350msgstr "显示其它文件"
8351
8352#: builtin/ls-files.c:440
8353msgid "show ignored files in the output"
8354msgstr "显示忽略的文件"
8355
8356#: builtin/ls-files.c:443
8357msgid "show staged contents' object name in the output"
8358msgstr "显示暂存区内容的对象名称"
8359
8360#: builtin/ls-files.c:445
8361msgid "show files on the filesystem that need to be removed"
8362msgstr "显示文件系统需要删除的文件"
8363
8364#: builtin/ls-files.c:447
8365msgid "show 'other' directories' names only"
8366msgstr "只显示“其他”目录的名称"
8367
8368#: builtin/ls-files.c:449
8369msgid "show line endings of files"
8370msgstr "显示文件换行符格式"
8371
8372#: builtin/ls-files.c:451
8373msgid "don't show empty directories"
8374msgstr "不显示空目录"
8375
8376#: builtin/ls-files.c:454
8377msgid "show unmerged files in the output"
8378msgstr "显示未合并的文件"
8379
8380#: builtin/ls-files.c:456
8381msgid "show resolve-undo information"
8382msgstr "显示 resolve-undo 信息"
8383
8384#: builtin/ls-files.c:458
8385msgid "skip files matching pattern"
8386msgstr "匹配排除文件的模式"
8387
8388#: builtin/ls-files.c:461
8389msgid "exclude patterns are read from <file>"
8390msgstr "从 <文件> 中读取排除模式"
8391
8392#: builtin/ls-files.c:464
8393msgid "read additional per-directory exclude patterns in <file>"
8394msgstr "从 <文件> 读取额外的每个目录的排除模式"
8395
8396#: builtin/ls-files.c:466
8397msgid "add the standard git exclusions"
8398msgstr "添加标准的 git 排除"
8399
8400#: builtin/ls-files.c:469
8401msgid "make the output relative to the project top directory"
8402msgstr "显示相对于顶级目录的文件名"
8403
8404#: builtin/ls-files.c:472
8405msgid "if any <file> is not in the index, treat this as an error"
8406msgstr "如果任何 <文件> 都不在索引区,视为错误"
8407
8408#: builtin/ls-files.c:473
8409msgid "tree-ish"
8410msgstr "树或提交"
8411
8412#: builtin/ls-files.c:474
8413msgid "pretend that paths removed since <tree-ish> are still present"
8414msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
8415
8416#: builtin/ls-files.c:476
8417msgid "show debugging data"
8418msgstr "显示调试数据"
8419
8420#: builtin/ls-remote.c:7
8421msgid ""
8422"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8423"                     [-q | --quiet] [--exit-code] [--get-url]\n"
8424"                     [--symref] [<repository> [<refs>...]]"
8425msgstr ""
8426"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8427"                     [-q | --quiet] [--exit-code] [--get-url]\n"
8428"                     [--symref] [<仓库> [<引用>...]]"
8429
8430#: builtin/ls-remote.c:50
8431msgid "do not print remote URL"
8432msgstr "不打印远程 URL"
8433
8434#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
8435msgid "exec"
8436msgstr "exec"
8437
8438#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
8439msgid "path of git-upload-pack on the remote host"
8440msgstr "远程主机上的 git-upload-pack 路径"
8441
8442#: builtin/ls-remote.c:56
8443msgid "limit to tags"
8444msgstr "仅限于标签"
8445
8446#: builtin/ls-remote.c:57
8447msgid "limit to heads"
8448msgstr "仅限于分支"
8449
8450#: builtin/ls-remote.c:58
8451msgid "do not show peeled tags"
8452msgstr "不显示已解析的标签"
8453
8454#: builtin/ls-remote.c:60
8455msgid "take url.<base>.insteadOf into account"
8456msgstr "参考 url.<base>.insteadOf 设置"
8457
8458#: builtin/ls-remote.c:62
8459msgid "exit with exit code 2 if no matching refs are found"
8460msgstr "若未找到匹配的引用则以退出码2退出"
8461
8462#: builtin/ls-remote.c:64
8463msgid "show underlying ref in addition to the object pointed by it"
8464msgstr "除了显示指向的对象外,显示指向的引用名"
8465
8466#: builtin/ls-tree.c:28
8467msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
8468msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
8469
8470#: builtin/ls-tree.c:128
8471msgid "only show trees"
8472msgstr "只显示树"
8473
8474#: builtin/ls-tree.c:130
8475msgid "recurse into subtrees"
8476msgstr "递归到子树"
8477
8478#: builtin/ls-tree.c:132
8479msgid "show trees when recursing"
8480msgstr "当递归时显示树"
8481
8482#: builtin/ls-tree.c:135
8483msgid "terminate entries with NUL byte"
8484msgstr "条目以 NUL 字符终止"
8485
8486#: builtin/ls-tree.c:136
8487msgid "include object size"
8488msgstr "包括对象大小"
8489
8490#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
8491msgid "list only filenames"
8492msgstr "只列出文件名"
8493
8494#: builtin/ls-tree.c:143
8495msgid "use full path names"
8496msgstr "使用文件的全路径"
8497
8498#: builtin/ls-tree.c:145
8499msgid "list entire tree; not just current directory (implies --full-name)"
8500msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
8501
8502#: builtin/merge.c:46
8503msgid "git merge [<options>] [<commit>...]"
8504msgstr "git merge [<选项>] [<提交>...]"
8505
8506#: builtin/merge.c:47
8507msgid "git merge [<options>] <msg> HEAD <commit>"
8508msgstr "git merge [<选项>] <说明> HEAD <提交>"
8509
8510#: builtin/merge.c:48
8511msgid "git merge --abort"
8512msgstr "git merge --abort"
8513
8514#: builtin/merge.c:102
8515msgid "switch `m' requires a value"
8516msgstr "开关 `m' 需要一个值"
8517
8518#: builtin/merge.c:139
8519#, c-format
8520msgid "Could not find merge strategy '%s'.\n"
8521msgstr "不能找到合并策略 '%s'。\n"
8522
8523#: builtin/merge.c:140
8524#, c-format
8525msgid "Available strategies are:"
8526msgstr "可用的策略有:"
8527
8528#: builtin/merge.c:145
8529#, c-format
8530msgid "Available custom strategies are:"
8531msgstr "可用的自定义策略有:"
8532
8533#: builtin/merge.c:195 builtin/pull.c:126
8534msgid "do not show a diffstat at the end of the merge"
8535msgstr "在合并的最后不显示差异统计"
8536
8537#: builtin/merge.c:198 builtin/pull.c:129
8538msgid "show a diffstat at the end of the merge"
8539msgstr "在合并的最后显示差异统计"
8540
8541#: builtin/merge.c:199 builtin/pull.c:132
8542msgid "(synonym to --stat)"
8543msgstr "(和 --stat 同义)"
8544
8545#: builtin/merge.c:201 builtin/pull.c:135
8546msgid "add (at most <n>) entries from shortlog to merge commit message"
8547msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
8548
8549#: builtin/merge.c:204 builtin/pull.c:138
8550msgid "create a single commit instead of doing a merge"
8551msgstr "创建一个单独的提交而不是做一次合并"
8552
8553#: builtin/merge.c:206 builtin/pull.c:141
8554msgid "perform a commit if the merge succeeds (default)"
8555msgstr "如果合并成功,执行一次提交(默认)"
8556
8557#: builtin/merge.c:208 builtin/pull.c:144
8558msgid "edit message before committing"
8559msgstr "在提交前编辑提交说明"
8560
8561#: builtin/merge.c:209
8562msgid "allow fast-forward (default)"
8563msgstr "允许快进(默认)"
8564
8565#: builtin/merge.c:211 builtin/pull.c:150
8566msgid "abort if fast-forward is not possible"
8567msgstr "如果不能快进就放弃合并"
8568
8569#: builtin/merge.c:215 builtin/pull.c:153
8570msgid "verify that the named commit has a valid GPG signature"
8571msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8572
8573#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
8574#: builtin/revert.c:89
8575msgid "strategy"
8576msgstr "策略"
8577
8578#: builtin/merge.c:217 builtin/pull.c:158
8579msgid "merge strategy to use"
8580msgstr "要使用的合并策略"
8581
8582#: builtin/merge.c:218 builtin/pull.c:161
8583msgid "option=value"
8584msgstr "option=value"
8585
8586#: builtin/merge.c:219 builtin/pull.c:162
8587msgid "option for selected merge strategy"
8588msgstr "所选的合并策略的选项"
8589
8590#: builtin/merge.c:221
8591msgid "merge commit message (for a non-fast-forward merge)"
8592msgstr "合并的提交说明(针对非快进式合并)"
8593
8594#: builtin/merge.c:225
8595msgid "abort the current in-progress merge"
8596msgstr "放弃当前正在进行的合并"
8597
8598#: builtin/merge.c:227 builtin/pull.c:169
8599msgid "allow merging unrelated histories"
8600msgstr "允许合并不相关的历史"
8601
8602#: builtin/merge.c:255
8603msgid "could not run stash."
8604msgstr "不能进行进度保存。"
8605
8606#: builtin/merge.c:260
8607msgid "stash failed"
8608msgstr "进度保存失败"
8609
8610#: builtin/merge.c:265
8611#, c-format
8612msgid "not a valid object: %s"
8613msgstr "不是一个有效对象:%s"
8614
8615#: builtin/merge.c:284 builtin/merge.c:301
8616msgid "read-tree failed"
8617msgstr "读取树失败"
8618
8619#  译者:注意保持前导空格
8620#: builtin/merge.c:331
8621msgid " (nothing to squash)"
8622msgstr " (无可压缩)"
8623
8624#: builtin/merge.c:342
8625#, c-format
8626msgid "Squash commit -- not updating HEAD\n"
8627msgstr "压缩提交 -- 未更新 HEAD\n"
8628
8629#: builtin/merge.c:392
8630#, c-format
8631msgid "No merge message -- not updating HEAD\n"
8632msgstr "无合并信息 -- 未更新 HEAD\n"
8633
8634#: builtin/merge.c:443
8635#, c-format
8636msgid "'%s' does not point to a commit"
8637msgstr "'%s' 没有指向一个提交"
8638
8639#: builtin/merge.c:533
8640#, c-format
8641msgid "Bad branch.%s.mergeoptions string: %s"
8642msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
8643
8644#: builtin/merge.c:652
8645msgid "Not handling anything other than two heads merge."
8646msgstr "不能处理两个头合并之外的任何操作。"
8647
8648#: builtin/merge.c:666
8649#, c-format
8650msgid "Unknown option for merge-recursive: -X%s"
8651msgstr "merge-recursive 的未知选项:-X%s"
8652
8653#: builtin/merge.c:681
8654#, c-format
8655msgid "unable to write %s"
8656msgstr "不能写 %s"
8657
8658#: builtin/merge.c:733
8659#, c-format
8660msgid "Could not read from '%s'"
8661msgstr "不能从 '%s' 读取"
8662
8663#: builtin/merge.c:742
8664#, c-format
8665msgid "Not committing merge; use 'git commit' to complete the merge.\n"
8666msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
8667
8668#: builtin/merge.c:748
8669#, c-format
8670msgid ""
8671"Please enter a commit message to explain why this merge is necessary,\n"
8672"especially if it merges an updated upstream into a topic branch.\n"
8673"\n"
8674"Lines starting with '%c' will be ignored, and an empty message aborts\n"
8675"the commit.\n"
8676msgstr ""
8677"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8678"合并到主题分支。\n"
8679"\n"
8680"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
8681
8682#: builtin/merge.c:772
8683msgid "Empty commit message."
8684msgstr "空提交信息。"
8685
8686#: builtin/merge.c:792
8687#, c-format
8688msgid "Wonderful.\n"
8689msgstr "太棒了。\n"
8690
8691#: builtin/merge.c:847
8692#, c-format
8693msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8694msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8695
8696#: builtin/merge.c:863
8697#, c-format
8698msgid "'%s' is not a commit"
8699msgstr "'%s' 不是一个提交"
8700
8701#: builtin/merge.c:904
8702msgid "No current branch."
8703msgstr "没有当前分支。"
8704
8705#: builtin/merge.c:906
8706msgid "No remote for the current branch."
8707msgstr "当前分支没有对应的远程仓库。"
8708
8709#: builtin/merge.c:908
8710msgid "No default upstream defined for the current branch."
8711msgstr "当前分支没有定义默认的上游分支。"
8712
8713#: builtin/merge.c:913
8714#, c-format
8715msgid "No remote-tracking branch for %s from %s"
8716msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8717
8718#: builtin/merge.c:960
8719#, c-format
8720msgid "Bad value '%s' in environment '%s'"
8721msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
8722
8723#: builtin/merge.c:1034
8724#, c-format
8725msgid "could not close '%s'"
8726msgstr "不能关闭 '%s'"
8727
8728#: builtin/merge.c:1061
8729#, c-format
8730msgid "not something we can merge in %s: %s"
8731msgstr "不能在 %s 中合并:%s"
8732
8733#: builtin/merge.c:1095
8734msgid "not something we can merge"
8735msgstr "不能合并"
8736
8737#: builtin/merge.c:1162
8738msgid "There is no merge to abort (MERGE_HEAD missing)."
8739msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
8740
8741#: builtin/merge.c:1178
8742msgid ""
8743"You have not concluded your merge (MERGE_HEAD exists).\n"
8744"Please, commit your changes before you merge."
8745msgstr ""
8746"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
8747"请在合并前先提交您的修改。"
8748
8749#: builtin/merge.c:1185
8750msgid ""
8751"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
8752"Please, commit your changes before you merge."
8753msgstr ""
8754"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
8755"请在合并前先提交您的修改。"
8756
8757#: builtin/merge.c:1188
8758msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8759msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8760
8761#: builtin/merge.c:1197
8762msgid "You cannot combine --squash with --no-ff."
8763msgstr "您不能将 --squash 与 --no-ff 同时使用。"
8764
8765#: builtin/merge.c:1205
8766msgid "No commit specified and merge.defaultToUpstream not set."
8767msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
8768
8769#: builtin/merge.c:1222
8770msgid "Squash commit into empty head not supported yet"
8771msgstr "尚不支持到空分支的压缩提交"
8772
8773#: builtin/merge.c:1224
8774msgid "Non-fast-forward commit does not make sense into an empty head"
8775msgstr "到空分支的非快进式提交没有意义"
8776
8777#: builtin/merge.c:1229
8778#, c-format
8779msgid "%s - not something we can merge"
8780msgstr "%s - 不能被合并"
8781
8782#: builtin/merge.c:1231
8783msgid "Can merge only exactly one commit into empty head"
8784msgstr "只能将一个提交合并到空分支上"
8785
8786#: builtin/merge.c:1287
8787#, c-format
8788msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8789msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8790
8791#: builtin/merge.c:1290
8792#, c-format
8793msgid "Commit %s has a bad GPG signature allegedly by %s."
8794msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8795
8796#: builtin/merge.c:1293
8797#, c-format
8798msgid "Commit %s does not have a GPG signature."
8799msgstr "提交 %s 没有一个 GPG 签名。"
8800
8801#: builtin/merge.c:1296
8802#, c-format
8803msgid "Commit %s has a good GPG signature by %s\n"
8804msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8805
8806#: builtin/merge.c:1358
8807msgid "refusing to merge unrelated histories"
8808msgstr "拒绝合并无关的历史"
8809
8810#: builtin/merge.c:1367
8811msgid "Already up-to-date."
8812msgstr "已经是最新的。"
8813
8814#: builtin/merge.c:1382
8815#, c-format
8816msgid "Updating %s..%s\n"
8817msgstr "更新 %s..%s\n"
8818
8819#: builtin/merge.c:1419
8820#, c-format
8821msgid "Trying really trivial in-index merge...\n"
8822msgstr "尝试非常小的索引内合并...\n"
8823
8824#: builtin/merge.c:1426
8825#, c-format
8826msgid "Nope.\n"
8827msgstr "无。\n"
8828
8829#: builtin/merge.c:1451
8830msgid "Already up-to-date. Yeeah!"
8831msgstr "已经是最新的。耶!"
8832
8833#: builtin/merge.c:1457
8834msgid "Not possible to fast-forward, aborting."
8835msgstr "无法快进,终止。"
8836
8837#: builtin/merge.c:1480 builtin/merge.c:1559
8838#, c-format
8839msgid "Rewinding the tree to pristine...\n"
8840msgstr "将树回滚至原始状态...\n"
8841
8842#: builtin/merge.c:1484
8843#, c-format
8844msgid "Trying merge strategy %s...\n"
8845msgstr "尝试合并策略 %s...\n"
8846
8847#: builtin/merge.c:1550
8848#, c-format
8849msgid "No merge strategy handled the merge.\n"
8850msgstr "没有合并策略处理此合并。\n"
8851
8852#: builtin/merge.c:1552
8853#, c-format
8854msgid "Merge with strategy %s failed.\n"
8855msgstr "使用策略 %s 合并失败。\n"
8856
8857#: builtin/merge.c:1561
8858#, c-format
8859msgid "Using the %s to prepare resolving by hand.\n"
8860msgstr "使用 %s 以准备手工解决。\n"
8861
8862#: builtin/merge.c:1573
8863#, c-format
8864msgid "Automatic merge went well; stopped before committing as requested\n"
8865msgstr "自动合并进展顺利,按要求在提交前停止\n"
8866
8867#: builtin/merge-base.c:29
8868msgid "git merge-base [-a | --all] <commit> <commit>..."
8869msgstr "git merge-base [-a | --all] <提交> <提交>..."
8870
8871#: builtin/merge-base.c:30
8872msgid "git merge-base [-a | --all] --octopus <commit>..."
8873msgstr "git merge-base [-a | --all] --octopus <提交>..."
8874
8875#: builtin/merge-base.c:31
8876msgid "git merge-base --independent <commit>..."
8877msgstr "git merge-base --independent <提交>..."
8878
8879#: builtin/merge-base.c:32
8880msgid "git merge-base --is-ancestor <commit> <commit>"
8881msgstr "git merge-base --is-ancestor <提交> <提交>"
8882
8883#: builtin/merge-base.c:33
8884msgid "git merge-base --fork-point <ref> [<commit>]"
8885msgstr "git merge-base --fork-point <引用> [<提交>]"
8886
8887#: builtin/merge-base.c:214
8888msgid "output all common ancestors"
8889msgstr "输出所有共同的祖先"
8890
8891#: builtin/merge-base.c:216
8892msgid "find ancestors for a single n-way merge"
8893msgstr "查找一个多路合并的祖先提交"
8894
8895#: builtin/merge-base.c:218
8896msgid "list revs not reachable from others"
8897msgstr "显示不能被其他访问到的版本"
8898
8899#: builtin/merge-base.c:220
8900msgid "is the first one ancestor of the other?"
8901msgstr "第一个是其他的祖先提交么?"
8902
8903#: builtin/merge-base.c:222
8904msgid "find where <commit> forked from reflog of <ref>"
8905msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8906
8907#: builtin/merge-file.c:8
8908msgid ""
8909"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8910"<orig-file> <file2>"
8911msgstr ""
8912"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8913"件> <文件2>"
8914
8915#: builtin/merge-file.c:33
8916msgid "send results to standard output"
8917msgstr "将结果发送到标准输出"
8918
8919#: builtin/merge-file.c:34
8920msgid "use a diff3 based merge"
8921msgstr "使用基于 diff3 的合并"
8922
8923#: builtin/merge-file.c:35
8924msgid "for conflicts, use our version"
8925msgstr "如果冲突,使用我们的版本"
8926
8927#: builtin/merge-file.c:37
8928msgid "for conflicts, use their version"
8929msgstr "如果冲突,使用他们的版本"
8930
8931#: builtin/merge-file.c:39
8932msgid "for conflicts, use a union version"
8933msgstr "如果冲突,使用联合版本"
8934
8935#: builtin/merge-file.c:42
8936msgid "for conflicts, use this marker size"
8937msgstr "如果冲突,使用指定长度的标记"
8938
8939#: builtin/merge-file.c:43
8940msgid "do not warn about conflicts"
8941msgstr "不要警告冲突"
8942
8943#: builtin/merge-file.c:45
8944msgid "set labels for file1/orig-file/file2"
8945msgstr "为 文件1/初始文件/文件2 设置标签"
8946
8947#: builtin/mktree.c:65
8948msgid "git mktree [-z] [--missing] [--batch]"
8949msgstr "git mktree [-z] [--missing] [--batch]"
8950
8951#: builtin/mktree.c:152
8952msgid "input is NUL terminated"
8953msgstr "输入以 NUL 字符终止"
8954
8955#: builtin/mktree.c:153 builtin/write-tree.c:24
8956msgid "allow missing objects"
8957msgstr "允许丢失的对象"
8958
8959#: builtin/mktree.c:154
8960msgid "allow creation of more than one tree"
8961msgstr "允许创建一个以上的树"
8962
8963#: builtin/mv.c:15
8964msgid "git mv [<options>] <source>... <destination>"
8965msgstr "git mv [<选项>] <源>... <目标>"
8966
8967#: builtin/mv.c:70
8968#, c-format
8969msgid "Directory %s is in index and no submodule?"
8970msgstr "目录 %s 在索引中并且不是子模组?"
8971
8972#: builtin/mv.c:72 builtin/rm.c:317
8973msgid "Please stage your changes to .gitmodules or stash them to proceed"
8974msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8975
8976#: builtin/mv.c:90
8977#, c-format
8978msgid "%.*s is in index"
8979msgstr "%.*s 在索引中"
8980
8981#: builtin/mv.c:112
8982msgid "force move/rename even if target exists"
8983msgstr "强制移动/重命令,即使目标存在"
8984
8985#: builtin/mv.c:113
8986msgid "skip move/rename errors"
8987msgstr "跳过移动/重命名错误"
8988
8989#: builtin/mv.c:155
8990#, c-format
8991msgid "destination '%s' is not a directory"
8992msgstr "目标 '%s' 不是一个目录"
8993
8994#: builtin/mv.c:166
8995#, c-format
8996msgid "Checking rename of '%s' to '%s'\n"
8997msgstr "检查 '%s' 到 '%s' 的重命名\n"
8998
8999#: builtin/mv.c:170
9000msgid "bad source"
9001msgstr "坏的源"
9002
9003#: builtin/mv.c:173
9004msgid "can not move directory into itself"
9005msgstr "不能将目录移动到自身"
9006
9007#: builtin/mv.c:176
9008msgid "cannot move directory over file"
9009msgstr "不能将目录移动到文件"
9010
9011#: builtin/mv.c:185
9012msgid "source directory is empty"
9013msgstr "源目录为空"
9014
9015#: builtin/mv.c:210
9016msgid "not under version control"
9017msgstr "不在版本控制之下"
9018
9019#: builtin/mv.c:213
9020msgid "destination exists"
9021msgstr "目标已存在"
9022
9023#: builtin/mv.c:221
9024#, c-format
9025msgid "overwriting '%s'"
9026msgstr "覆盖 '%s'"
9027
9028#: builtin/mv.c:224
9029msgid "Cannot overwrite"
9030msgstr "不能覆盖"
9031
9032#: builtin/mv.c:227
9033msgid "multiple sources for the same target"
9034msgstr "同一目标具有多个源"
9035
9036#: builtin/mv.c:229
9037msgid "destination directory does not exist"
9038msgstr "目标目录不存在"
9039
9040#: builtin/mv.c:236
9041#, c-format
9042msgid "%s, source=%s, destination=%s"
9043msgstr "%s,源=%s,目标=%s"
9044
9045#: builtin/mv.c:257
9046#, c-format
9047msgid "Renaming %s to %s\n"
9048msgstr "重命名 %s 至 %s\n"
9049
9050#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
9051#, c-format
9052msgid "renaming '%s' failed"
9053msgstr "重命名 '%s' 失败"
9054
9055#: builtin/name-rev.c:258
9056msgid "git name-rev [<options>] <commit>..."
9057msgstr "git name-rev [<选项>] <提交>..."
9058
9059#: builtin/name-rev.c:259
9060msgid "git name-rev [<options>] --all"
9061msgstr "git name-rev [<选项>] --all"
9062
9063#: builtin/name-rev.c:260
9064msgid "git name-rev [<options>] --stdin"
9065msgstr "git name-rev [<选项>] --stdin"
9066
9067#: builtin/name-rev.c:312
9068msgid "print only names (no SHA-1)"
9069msgstr "只打印名称(无 SHA-1)"
9070
9071#: builtin/name-rev.c:313
9072msgid "only use tags to name the commits"
9073msgstr "只使用标签来命名提交"
9074
9075#: builtin/name-rev.c:315
9076msgid "only use refs matching <pattern>"
9077msgstr "只使用和 <模式> 相匹配的引用"
9078
9079#: builtin/name-rev.c:317
9080msgid "list all commits reachable from all refs"
9081msgstr "列出可以从所有引用访问的提交"
9082
9083#: builtin/name-rev.c:318
9084msgid "read from stdin"
9085msgstr "从标准输入读取"
9086
9087#: builtin/name-rev.c:319
9088msgid "allow to print `undefined` names (default)"
9089msgstr "允许打印 `未定义` 的名称(默认)"
9090
9091#: builtin/name-rev.c:325
9092msgid "dereference tags in the input (internal use)"
9093msgstr "反向解析输入中的标签(内部使用)"
9094
9095#: builtin/notes.c:25
9096msgid "git notes [--ref <notes-ref>] [list [<object>]]"
9097msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
9098
9099#: builtin/notes.c:26
9100msgid ""
9101"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
9102"| (-c | -C) <object>] [<object>]"
9103msgstr ""
9104"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
9105"| (-c | -C) <对象>] [<对象>]"
9106
9107#: builtin/notes.c:27
9108msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
9109msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
9110
9111#: builtin/notes.c:28
9112msgid ""
9113"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
9114"(-c | -C) <object>] [<object>]"
9115msgstr ""
9116"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
9117"(-c | -C) <对象>] [<对象>]"
9118
9119#: builtin/notes.c:29
9120msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
9121msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
9122
9123#: builtin/notes.c:30
9124msgid "git notes [--ref <notes-ref>] show [<object>]"
9125msgstr "git notes [--ref <注解引用>] show [<对象>]"
9126
9127#: builtin/notes.c:31
9128msgid ""
9129"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
9130msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
9131
9132#: builtin/notes.c:32
9133msgid "git notes merge --commit [-v | -q]"
9134msgstr "git notes merge --commit [-v | -q]"
9135
9136#: builtin/notes.c:33
9137msgid "git notes merge --abort [-v | -q]"
9138msgstr "git notes merge --abort [-v | -q]"
9139
9140#: builtin/notes.c:34
9141msgid "git notes [--ref <notes-ref>] remove [<object>...]"
9142msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
9143
9144#: builtin/notes.c:35
9145msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
9146msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
9147
9148#: builtin/notes.c:36
9149msgid "git notes [--ref <notes-ref>] get-ref"
9150msgstr "git notes [--ref <注解引用>] get-ref"
9151
9152#: builtin/notes.c:41
9153msgid "git notes [list [<object>]]"
9154msgstr "git notes [list [<对象>]]"
9155
9156#: builtin/notes.c:46
9157msgid "git notes add [<options>] [<object>]"
9158msgstr "git notes add [<选项>] [<对象>]"
9159
9160#: builtin/notes.c:51
9161msgid "git notes copy [<options>] <from-object> <to-object>"
9162msgstr "git notes copy [<选项>] <源对象> <目标对象>"
9163
9164#: builtin/notes.c:52
9165msgid "git notes copy --stdin [<from-object> <to-object>]..."
9166msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
9167
9168#: builtin/notes.c:57
9169msgid "git notes append [<options>] [<object>]"
9170msgstr "git notes append [<选项>] [<对象>]"
9171
9172#: builtin/notes.c:62
9173msgid "git notes edit [<object>]"
9174msgstr "git notes edit [<对象>]"
9175
9176#: builtin/notes.c:67
9177msgid "git notes show [<object>]"
9178msgstr "git notes show [<对象>]"
9179
9180#: builtin/notes.c:72
9181msgid "git notes merge [<options>] <notes-ref>"
9182msgstr "git notes merge [<选项>] <注解引用>"
9183
9184#: builtin/notes.c:73
9185msgid "git notes merge --commit [<options>]"
9186msgstr "git notes merge --commit [<选项>]"
9187
9188#: builtin/notes.c:74
9189msgid "git notes merge --abort [<options>]"
9190msgstr "git notes merge --abort [<选项>]"
9191
9192#: builtin/notes.c:79
9193msgid "git notes remove [<object>]"
9194msgstr "git notes remove [<对象>]"
9195
9196#: builtin/notes.c:84
9197msgid "git notes prune [<options>]"
9198msgstr "git notes prune [<选项>]"
9199
9200#: builtin/notes.c:89
9201msgid "git notes get-ref"
9202msgstr "git notes get-ref"
9203
9204#: builtin/notes.c:94
9205msgid "Write/edit the notes for the following object:"
9206msgstr "为下面的对象写/编辑说明:"
9207
9208#: builtin/notes.c:147
9209#, c-format
9210msgid "unable to start 'show' for object '%s'"
9211msgstr "不能为对象 '%s' 开始 'show'"
9212
9213#: builtin/notes.c:151
9214msgid "could not read 'show' output"
9215msgstr "不能读取 'show' 的输出"
9216
9217#: builtin/notes.c:159
9218#, c-format
9219msgid "failed to finish 'show' for object '%s'"
9220msgstr "无法为对象 '%s' 完成 'show'"
9221
9222#: builtin/notes.c:194
9223msgid "Please supply the note contents using either -m or -F option"
9224msgstr "请通过 -m 或 -F 选项为注解提供内容"
9225
9226#: builtin/notes.c:203
9227msgid "unable to write note object"
9228msgstr "不能写注解对象"
9229
9230#: builtin/notes.c:205
9231#, c-format
9232msgid "The note contents have been left in %s"
9233msgstr "注解内容被留在 %s 中"
9234
9235#: builtin/notes.c:233 builtin/tag.c:439
9236#, c-format
9237msgid "cannot read '%s'"
9238msgstr "不能读取 '%s'"
9239
9240#: builtin/notes.c:235 builtin/tag.c:442
9241#, c-format
9242msgid "could not open or read '%s'"
9243msgstr "不能打开或读取 '%s'"
9244
9245#: builtin/notes.c:257
9246#, c-format
9247msgid "Failed to read object '%s'."
9248msgstr "无法读取对象 '%s'。"
9249
9250#: builtin/notes.c:261
9251#, c-format
9252msgid "Cannot read note data from non-blob object '%s'."
9253msgstr "不能从非数据对象 '%s' 中读取注解数据"
9254
9255#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
9256#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
9257#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
9258msgid "too many parameters"
9259msgstr "参数太多"
9260
9261#: builtin/notes.c:376 builtin/notes.c:663
9262#, c-format
9263msgid "No note found for object %s."
9264msgstr "未发现对象 %s 的注解。"
9265
9266#: builtin/notes.c:397 builtin/notes.c:560
9267msgid "note contents as a string"
9268msgstr "注解内容作为一个字符串"
9269
9270#: builtin/notes.c:400 builtin/notes.c:563
9271msgid "note contents in a file"
9272msgstr "注解内容到一个文件中"
9273
9274#: builtin/notes.c:403 builtin/notes.c:566
9275msgid "reuse and edit specified note object"
9276msgstr "重用和编辑指定的注解对象"
9277
9278#: builtin/notes.c:406 builtin/notes.c:569
9279msgid "reuse specified note object"
9280msgstr "重用指定的注解对象"
9281
9282#: builtin/notes.c:409 builtin/notes.c:572
9283msgid "allow storing empty note"
9284msgstr "允许保存空白注释"
9285
9286#: builtin/notes.c:410 builtin/notes.c:481
9287msgid "replace existing notes"
9288msgstr "替换已存在的注解"
9289
9290#: builtin/notes.c:435
9291#, c-format
9292msgid ""
9293"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
9294"existing notes"
9295msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9296
9297#: builtin/notes.c:450 builtin/notes.c:529
9298#, c-format
9299msgid "Overwriting existing notes for object %s\n"
9300msgstr "覆盖对象 %s 现存注解\n"
9301
9302#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
9303#, c-format
9304msgid "Removing note for object %s\n"
9305msgstr "删除对象 %s 的注解\n"
9306
9307#: builtin/notes.c:482
9308msgid "read objects from stdin"
9309msgstr "从标准输入读取对象"
9310
9311#: builtin/notes.c:484
9312msgid "load rewriting config for <command> (implies --stdin)"
9313msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
9314
9315#: builtin/notes.c:502
9316msgid "too few parameters"
9317msgstr "参数太少"
9318
9319#: builtin/notes.c:523
9320#, c-format
9321msgid ""
9322"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
9323"existing notes"
9324msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9325
9326#: builtin/notes.c:535
9327#, c-format
9328msgid "Missing notes on source object %s. Cannot copy."
9329msgstr "源对象 %s 缺少注解。不能拷贝。"
9330
9331#: builtin/notes.c:587
9332#, c-format
9333msgid ""
9334"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
9335"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
9336msgstr ""
9337"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
9338"请换用 'git notes add -f -m/-F/-c/-C'。\n"
9339
9340#: builtin/notes.c:753
9341#, c-format
9342msgid "unknown notes merge strategy %s"
9343msgstr "未知的注解合并策略 %s"
9344
9345#: builtin/notes.c:769
9346msgid "General options"
9347msgstr "通用选项"
9348
9349#: builtin/notes.c:771
9350msgid "Merge options"
9351msgstr "合并选项"
9352
9353#: builtin/notes.c:773
9354msgid ""
9355"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
9356"cat_sort_uniq)"
9357msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
9358
9359#: builtin/notes.c:775
9360msgid "Committing unmerged notes"
9361msgstr "提交未合并的注解"
9362
9363#: builtin/notes.c:777
9364msgid "finalize notes merge by committing unmerged notes"
9365msgstr "通过提交未合并的注解来完成注解合并"
9366
9367#: builtin/notes.c:779
9368msgid "Aborting notes merge resolution"
9369msgstr "中止注解合并的方案"
9370
9371#: builtin/notes.c:781
9372msgid "abort notes merge"
9373msgstr "中止注解合并"
9374
9375#: builtin/notes.c:792
9376msgid "cannot mix --commit, --abort or -s/--strategy"
9377msgstr "不能混用 --commit、--abort 或 -s/--strategy"
9378
9379#: builtin/notes.c:797
9380msgid "Must specify a notes ref to merge"
9381msgstr "必须指定一个注解引用来合并"
9382
9383#: builtin/notes.c:821
9384#, c-format
9385msgid "Unknown -s/--strategy: %s"
9386msgstr "未知的 -s/--strategy:%s"
9387
9388#: builtin/notes.c:858
9389#, c-format
9390msgid "A notes merge into %s is already in-progress at %s"
9391msgstr "一个到 %s 的注解合并已经在 %s 执行中"
9392
9393#: builtin/notes.c:861
9394#, c-format
9395msgid "Failed to store link to current notes ref (%s)"
9396msgstr "无法存储链接到当前注解的引用(%s)"
9397
9398#: builtin/notes.c:863
9399#, c-format
9400msgid ""
9401"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
9402"'git notes merge --commit', or abort the merge with 'git notes merge --"
9403"abort'.\n"
9404msgstr "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
9405
9406#: builtin/notes.c:885
9407#, c-format
9408msgid "Object %s has no note\n"
9409msgstr "对象 %s 没有注解\n"
9410
9411#: builtin/notes.c:897
9412msgid "attempt to remove non-existent note is not an error"
9413msgstr "尝试删除不存在的注解不是一个错误"
9414
9415#: builtin/notes.c:900
9416msgid "read object names from the standard input"
9417msgstr "从标准输入读取对象名称"
9418
9419#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
9420msgid "do not remove, show only"
9421msgstr "不删除,只显示"
9422
9423#: builtin/notes.c:939
9424msgid "report pruned notes"
9425msgstr "报告清除的注解"
9426
9427#: builtin/notes.c:981
9428msgid "notes-ref"
9429msgstr "注解引用"
9430
9431#: builtin/notes.c:982
9432msgid "use notes from <notes-ref>"
9433msgstr "从 <注解引用> 使用注解"
9434
9435#: builtin/notes.c:1017 builtin/remote.c:1623
9436#, c-format
9437msgid "Unknown subcommand: %s"
9438msgstr "未知子命令:%s"
9439
9440#: builtin/pack-objects.c:28
9441msgid ""
9442"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
9443msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
9444
9445#: builtin/pack-objects.c:29
9446msgid ""
9447"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
9448msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
9449
9450#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
9451#, c-format
9452msgid "deflate error (%d)"
9453msgstr "压缩错误 (%d)"
9454
9455#: builtin/pack-objects.c:766
9456msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
9457msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
9458
9459#: builtin/pack-objects.c:779
9460msgid "Writing objects"
9461msgstr "写入对象中"
9462
9463#: builtin/pack-objects.c:1037
9464msgid "disabling bitmap writing, as some objects are not being packed"
9465msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
9466
9467#: builtin/pack-objects.c:2197
9468msgid "Compressing objects"
9469msgstr "压缩对象中"
9470
9471#: builtin/pack-objects.c:2611
9472#, c-format
9473msgid "unsupported index version %s"
9474msgstr "不支持的索引版本 %s"
9475
9476#: builtin/pack-objects.c:2615
9477#, c-format
9478msgid "bad index version '%s'"
9479msgstr "坏的索引版本 '%s'"
9480
9481#: builtin/pack-objects.c:2645
9482msgid "do not show progress meter"
9483msgstr "不显示进度表"
9484
9485#: builtin/pack-objects.c:2647
9486msgid "show progress meter"
9487msgstr "显示进度表"
9488
9489#: builtin/pack-objects.c:2649
9490msgid "show progress meter during object writing phase"
9491msgstr "在对象写入阶段显示进度表"
9492
9493#: builtin/pack-objects.c:2652
9494msgid "similar to --all-progress when progress meter is shown"
9495msgstr "当进度表显示时类似于 --all-progress"
9496
9497#: builtin/pack-objects.c:2653
9498msgid "version[,offset]"
9499msgstr "版本[,偏移]"
9500
9501#: builtin/pack-objects.c:2654
9502msgid "write the pack index file in the specified idx format version"
9503msgstr "用指定的 idx 格式版本来写包索引文件"
9504
9505#: builtin/pack-objects.c:2657
9506msgid "maximum size of each output pack file"
9507msgstr "每个输出包的最大尺寸"
9508
9509#: builtin/pack-objects.c:2659
9510msgid "ignore borrowed objects from alternate object store"
9511msgstr "忽略从备用对象存储里借用对象"
9512
9513#: builtin/pack-objects.c:2661
9514msgid "ignore packed objects"
9515msgstr "忽略包对象"
9516
9517#: builtin/pack-objects.c:2663
9518msgid "limit pack window by objects"
9519msgstr "限制打包窗口的对象数"
9520
9521#: builtin/pack-objects.c:2665
9522msgid "limit pack window by memory in addition to object limit"
9523msgstr "除对象数量限制外设置打包窗口的内存限制"
9524
9525#: builtin/pack-objects.c:2667
9526msgid "maximum length of delta chain allowed in the resulting pack"
9527msgstr "打包允许的 delta 链的最大长度"
9528
9529#: builtin/pack-objects.c:2669
9530msgid "reuse existing deltas"
9531msgstr "重用已存在的 deltas"
9532
9533#: builtin/pack-objects.c:2671
9534msgid "reuse existing objects"
9535msgstr "重用已存在的对象"
9536
9537#: builtin/pack-objects.c:2673
9538msgid "use OFS_DELTA objects"
9539msgstr "使用 OFS_DELTA 对象"
9540
9541#: builtin/pack-objects.c:2675
9542msgid "use threads when searching for best delta matches"
9543msgstr "使用线程查询最佳 delta 匹配"
9544
9545#: builtin/pack-objects.c:2677
9546msgid "do not create an empty pack output"
9547msgstr "不创建空的包输出"
9548
9549#: builtin/pack-objects.c:2679
9550msgid "read revision arguments from standard input"
9551msgstr "从标准输入读取版本号参数"
9552
9553#: builtin/pack-objects.c:2681
9554msgid "limit the objects to those that are not yet packed"
9555msgstr "限制那些尚未打包的对象"
9556
9557#: builtin/pack-objects.c:2684
9558msgid "include objects reachable from any reference"
9559msgstr "包括可以从任何引用访问到的对象"
9560
9561#: builtin/pack-objects.c:2687
9562msgid "include objects referred by reflog entries"
9563msgstr "包括被引用日志引用到的对象"
9564
9565#: builtin/pack-objects.c:2690
9566msgid "include objects referred to by the index"
9567msgstr "包括被索引引用到的对象"
9568
9569#: builtin/pack-objects.c:2693
9570msgid "output pack to stdout"
9571msgstr "输出包到标准输出"
9572
9573#: builtin/pack-objects.c:2695
9574msgid "include tag objects that refer to objects to be packed"
9575msgstr "包括那些引用了待打包对象的标签对象"
9576
9577#: builtin/pack-objects.c:2697
9578msgid "keep unreachable objects"
9579msgstr "维持不可达的对象"
9580
9581#: builtin/pack-objects.c:2699
9582msgid "pack loose unreachable objects"
9583msgstr "打包松散的不可达对象"
9584
9585#: builtin/pack-objects.c:2700 parse-options.h:142
9586msgid "time"
9587msgstr "时间"
9588
9589#: builtin/pack-objects.c:2701
9590msgid "unpack unreachable objects newer than <time>"
9591msgstr "将比给定 <时间> 新的无法访问的对象解包"
9592
9593#: builtin/pack-objects.c:2704
9594msgid "create thin packs"
9595msgstr "创建精简包"
9596
9597#: builtin/pack-objects.c:2706
9598msgid "create packs suitable for shallow fetches"
9599msgstr "创建适合浅克隆仓库获取的包"
9600
9601#: builtin/pack-objects.c:2708
9602msgid "ignore packs that have companion .keep file"
9603msgstr "忽略配有 .keep 文件的包"
9604
9605#: builtin/pack-objects.c:2710
9606msgid "pack compression level"
9607msgstr "打包压缩级别"
9608
9609#: builtin/pack-objects.c:2712
9610msgid "do not hide commits by grafts"
9611msgstr "显示被嫁接隐藏的提交"
9612
9613#: builtin/pack-objects.c:2714
9614msgid "use a bitmap index if available to speed up counting objects"
9615msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
9616
9617#: builtin/pack-objects.c:2716
9618msgid "write a bitmap index together with the pack index"
9619msgstr "在建立包索引的同时创建 bitmap 索引"
9620
9621#: builtin/pack-objects.c:2829
9622msgid "Counting objects"
9623msgstr "对象计数中"
9624
9625#: builtin/pack-refs.c:6
9626msgid "git pack-refs [<options>]"
9627msgstr "git pack-refs [<选项>]"
9628
9629#: builtin/pack-refs.c:14
9630msgid "pack everything"
9631msgstr "打包一切"
9632
9633#: builtin/pack-refs.c:15
9634msgid "prune loose refs (default)"
9635msgstr "清除松散的引用(默认)"
9636
9637#: builtin/prune-packed.c:7
9638msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
9639msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
9640
9641#: builtin/prune-packed.c:40
9642msgid "Removing duplicate objects"
9643msgstr "正在删除重复对象"
9644
9645#: builtin/prune.c:11
9646msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
9647msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
9648
9649#: builtin/prune.c:106 builtin/worktree.c:128
9650msgid "report pruned objects"
9651msgstr "报告清除的对象"
9652
9653#: builtin/prune.c:109 builtin/worktree.c:130
9654msgid "expire objects older than <time>"
9655msgstr "使早于给定时间的对象过期"
9656
9657#: builtin/prune.c:123
9658msgid "cannot prune in a precious-objects repo"
9659msgstr "不能在珍品仓库中执行清理操作"
9660
9661#: builtin/pull.c:72
9662msgid "git pull [<options>] [<repository> [<refspec>...]]"
9663msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
9664
9665#: builtin/pull.c:120
9666msgid "Options related to merging"
9667msgstr "和合并相关的选项"
9668
9669#: builtin/pull.c:123
9670msgid "incorporate changes by rebasing rather than merging"
9671msgstr "使用变基操作取代合并操作以合入修改"
9672
9673#: builtin/pull.c:147 builtin/revert.c:101
9674msgid "allow fast-forward"
9675msgstr "允许快进式"
9676
9677#: builtin/pull.c:156
9678msgid "automatically stash/stash pop before and after rebase"
9679msgstr "自动在变基操作前后执行 stash/stash pop"
9680
9681#: builtin/pull.c:172
9682msgid "Options related to fetching"
9683msgstr "和获取相关的参数"
9684
9685#: builtin/pull.c:194
9686msgid "number of submodules pulled in parallel"
9687msgstr "并发拉取的子模组的数量"
9688
9689#: builtin/pull.c:283
9690#, c-format
9691msgid "Invalid value for pull.ff: %s"
9692msgstr "pull.ff 的取值无效:%s"
9693
9694#: builtin/pull.c:379 git-sh-setup.sh:226
9695msgid "Cannot pull with rebase: You have unstaged changes."
9696msgstr "无法通过变基方式拉取:您有未暂存的变更。"
9697
9698#: builtin/pull.c:385 git-sh-setup.sh:252
9699msgid "Additionally, your index contains uncommitted changes."
9700msgstr "而且您的索引中包含未提交的变更。"
9701
9702#: builtin/pull.c:387 git-sh-setup.sh:245
9703msgid "Cannot pull with rebase: Your index contains uncommitted changes."
9704msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
9705
9706#: builtin/pull.c:463
9707msgid ""
9708"There is no candidate for rebasing against among the refs that you just "
9709"fetched."
9710msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
9711
9712#: builtin/pull.c:465
9713msgid ""
9714"There are no candidates for merging among the refs that you just fetched."
9715msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
9716
9717#: builtin/pull.c:466
9718msgid ""
9719"Generally this means that you provided a wildcard refspec which had no\n"
9720"matches on the remote end."
9721msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
9722
9723#: builtin/pull.c:469
9724#, c-format
9725msgid ""
9726"You asked to pull from the remote '%s', but did not specify\n"
9727"a branch. Because this is not the default configured remote\n"
9728"for your current branch, you must specify a branch on the command line."
9729msgstr ""
9730"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
9731"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
9732
9733#: builtin/pull.c:474 git-parse-remote.sh:73
9734msgid "You are not currently on a branch."
9735msgstr "您当前不在一个分支上。"
9736
9737#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
9738msgid "Please specify which branch you want to rebase against."
9739msgstr "请指定您要变基到哪一个分支。"
9740
9741#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
9742msgid "Please specify which branch you want to merge with."
9743msgstr "请指定您要合并哪一个分支。"
9744
9745#: builtin/pull.c:479 builtin/pull.c:494
9746msgid "See git-pull(1) for details."
9747msgstr "详见 git-pull(1)。"
9748
9749#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
9750#: git-parse-remote.sh:64
9751msgid "<remote>"
9752msgstr "<远程>"
9753
9754#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
9755#: git-parse-remote.sh:65
9756msgid "<branch>"
9757msgstr "<分支>"
9758
9759#: builtin/pull.c:489 git-parse-remote.sh:75
9760msgid "There is no tracking information for the current branch."
9761msgstr "当前分支没有跟踪信息。"
9762
9763#: builtin/pull.c:498 git-parse-remote.sh:95
9764msgid ""
9765"If you wish to set tracking information for this branch you can do so with:"
9766msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
9767
9768#: builtin/pull.c:503
9769#, c-format
9770msgid ""
9771"Your configuration specifies to merge with the ref '%s'\n"
9772"from the remote, but no such ref was fetched."
9773msgstr ""
9774"您的配置中指定要合并远程的引用 '%s',\n"
9775"但是没有获取到这个引用。"
9776
9777#: builtin/pull.c:820
9778msgid "ignoring --verify-signatures for rebase"
9779msgstr "为变基操作忽略 --verify-signatures"
9780
9781#: builtin/pull.c:867
9782msgid "--[no-]autostash option is only valid with --rebase."
9783msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
9784
9785#: builtin/pull.c:875
9786msgid "Updating an unborn branch with changes added to the index."
9787msgstr "更新尚未诞生的分支,变更添加至索引。"
9788
9789#: builtin/pull.c:903
9790#, c-format
9791msgid ""
9792"fetch updated the current branch head.\n"
9793"fast-forwarding your working tree from\n"
9794"commit %s."
9795msgstr ""
9796"fetch 更新了当前的分支。快进您的工作区\n"
9797"至提交 %s。"
9798
9799#: builtin/pull.c:908
9800#, c-format
9801msgid ""
9802"Cannot fast-forward your working tree.\n"
9803"After making sure that you saved anything precious from\n"
9804"$ git diff %s\n"
9805"output, run\n"
9806"$ git reset --hard\n"
9807"to recover."
9808msgstr ""
9809"您当前的工作区无法执行快进操作。\n"
9810"首先执行如下命令:\n"
9811"$ git diff %s\n"
9812"以确认所有有用的数据均已保存。然后执行下面的命令\n"
9813"$ git reset --hard\n"
9814"恢复之前的状态。"
9815
9816#: builtin/pull.c:923
9817msgid "Cannot merge multiple branches into empty head."
9818msgstr "无法将多个分支合并到空分支。"
9819
9820#: builtin/pull.c:927
9821msgid "Cannot rebase onto multiple branches."
9822msgstr "无法变基到多个分支。"
9823
9824#: builtin/push.c:16
9825msgid "git push [<options>] [<repository> [<refspec>...]]"
9826msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
9827
9828#: builtin/push.c:89
9829msgid "tag shorthand without <tag>"
9830msgstr "标签后面未提供 <标签> 参数"
9831
9832#: builtin/push.c:99
9833msgid "--delete only accepts plain target ref names"
9834msgstr "--delete 只接受简单的目标引用名"
9835
9836#: builtin/push.c:143
9837msgid ""
9838"\n"
9839"To choose either option permanently, see push.default in 'git help config'."
9840msgstr ""
9841"\n"
9842"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
9843
9844#: builtin/push.c:146
9845#, c-format
9846msgid ""
9847"The upstream branch of your current branch does not match\n"
9848"the name of your current branch.  To push to the upstream branch\n"
9849"on the remote, use\n"
9850"\n"
9851"    git push %s HEAD:%s\n"
9852"\n"
9853"To push to the branch of the same name on the remote, use\n"
9854"\n"
9855"    git push %s %s\n"
9856"%s"
9857msgstr ""
9858"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9859"上游分支,使用\n"
9860"\n"
9861"    git push %s HEAD:%s\n"
9862"\n"
9863"为推送至远程同名分支,使用\n"
9864"\n"
9865"    git push %s %s\n"
9866"%s"
9867
9868#: builtin/push.c:161
9869#, c-format
9870msgid ""
9871"You are not currently on a branch.\n"
9872"To push the history leading to the current (detached HEAD)\n"
9873"state now, use\n"
9874"\n"
9875"    git push %s HEAD:<name-of-remote-branch>\n"
9876msgstr ""
9877"您当前不在一个分支上。\n"
9878"现在为推送当前(分离头指针)的历史,使用\n"
9879"\n"
9880"    git push %s HEAD:<远程分支名字>\n"
9881
9882#: builtin/push.c:175
9883#, c-format
9884msgid ""
9885"The current branch %s has no upstream branch.\n"
9886"To push the current branch and set the remote as upstream, use\n"
9887"\n"
9888"    git push --set-upstream %s %s\n"
9889msgstr ""
9890"当前分支 %s 没有对应的上游分支。\n"
9891"为推送当前分支并建立与远程上游的跟踪,使用\n"
9892"\n"
9893"    git push --set-upstream %s %s\n"
9894
9895#: builtin/push.c:183
9896#, c-format
9897msgid "The current branch %s has multiple upstream branches, refusing to push."
9898msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9899
9900#: builtin/push.c:186
9901#, c-format
9902msgid ""
9903"You are pushing to remote '%s', which is not the upstream of\n"
9904"your current branch '%s', without telling me what to push\n"
9905"to update which remote branch."
9906msgstr ""
9907"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9908"而没有告诉我要推送什么、更新哪个远程分支。"
9909
9910#: builtin/push.c:242
9911msgid ""
9912"You didn't specify any refspecs to push, and push.default is \"nothing\"."
9913msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9914
9915#: builtin/push.c:249
9916msgid ""
9917"Updates were rejected because the tip of your current branch is behind\n"
9918"its remote counterpart. Integrate the remote changes (e.g.\n"
9919"'git pull ...') before pushing again.\n"
9920"See the 'Note about fast-forwards' in 'git push --help' for details."
9921msgstr ""
9922"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9923"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9924"'git push --help' 中的 'Note about fast-forwards' 小节。"
9925
9926#: builtin/push.c:255
9927msgid ""
9928"Updates were rejected because a pushed branch tip is behind its remote\n"
9929"counterpart. Check out this branch and integrate the remote changes\n"
9930"(e.g. 'git pull ...') before pushing again.\n"
9931"See the 'Note about fast-forwards' in 'git push --help' for details."
9932msgstr ""
9933"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9934"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9935"'git push --help' 中的 'Note about fast-forwards' 小节。"
9936
9937#: builtin/push.c:261
9938msgid ""
9939"Updates were rejected because the remote contains work that you do\n"
9940"not have locally. This is usually caused by another repository pushing\n"
9941"to the same ref. You may want to first integrate the remote changes\n"
9942"(e.g., 'git pull ...') before pushing again.\n"
9943"See the 'Note about fast-forwards' in 'git push --help' for details."
9944msgstr ""
9945"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9946"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9947"(如 'git pull ...')。\n"
9948"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9949
9950#: builtin/push.c:268
9951msgid "Updates were rejected because the tag already exists in the remote."
9952msgstr "更新被拒绝,因为该标签在远程已经存在。"
9953
9954#: builtin/push.c:271
9955msgid ""
9956"You cannot update a remote ref that points at a non-commit object,\n"
9957"or update a remote ref to make it point at a non-commit object,\n"
9958"without using the '--force' option.\n"
9959msgstr ""
9960"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9961"也不能更新远程引用让其指向一个非提交对象。\n"
9962
9963#: builtin/push.c:331
9964#, c-format
9965msgid "Pushing to %s\n"
9966msgstr "推送到 %s\n"
9967
9968#: builtin/push.c:335
9969#, c-format
9970msgid "failed to push some refs to '%s'"
9971msgstr "无法推送一些引用到 '%s'"
9972
9973#: builtin/push.c:366
9974#, c-format
9975msgid "bad repository '%s'"
9976msgstr "坏的仓库 '%s'"
9977
9978#: builtin/push.c:367
9979msgid ""
9980"No configured push destination.\n"
9981"Either specify the URL from the command-line or configure a remote "
9982"repository using\n"
9983"\n"
9984"    git remote add <name> <url>\n"
9985"\n"
9986"and then push using the remote name\n"
9987"\n"
9988"    git push <name>\n"
9989msgstr ""
9990"没有配置推送目标。\n"
9991"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9992"\n"
9993"    git remote add <名称> <地址>\n"
9994"\n"
9995"然后使用该远程仓库名执行推送\n"
9996"\n"
9997"    git push <名称>\n"
9998
9999#: builtin/push.c:385
10000msgid "--all and --tags are incompatible"
10001msgstr "--all 和 --tags 不兼容"
10002
10003#: builtin/push.c:386
10004msgid "--all can't be combined with refspecs"
10005msgstr "--all 不能和引用规格同时使用"
10006
10007#: builtin/push.c:391
10008msgid "--mirror and --tags are incompatible"
10009msgstr "--mirror 和 --tags 不兼容"
10010
10011#: builtin/push.c:392
10012msgid "--mirror can't be combined with refspecs"
10013msgstr "--mirror 不能和引用规格同时使用"
10014
10015#: builtin/push.c:397
10016msgid "--all and --mirror are incompatible"
10017msgstr "--all 和 --mirror 不兼容"
10018
10019#: builtin/push.c:515
10020msgid "repository"
10021msgstr "仓库"
10022
10023#: builtin/push.c:516 builtin/send-pack.c:161
10024msgid "push all refs"
10025msgstr "推送所有引用"
10026
10027#: builtin/push.c:517 builtin/send-pack.c:163
10028msgid "mirror all refs"
10029msgstr "镜像所有引用"
10030
10031#: builtin/push.c:519
10032msgid "delete refs"
10033msgstr "删除引用"
10034
10035#: builtin/push.c:520
10036msgid "push tags (can't be used with --all or --mirror)"
10037msgstr "推送标签(不能使用 --all or --mirror)"
10038
10039#: builtin/push.c:523 builtin/send-pack.c:164
10040msgid "force updates"
10041msgstr "强制更新"
10042
10043#: builtin/push.c:525 builtin/send-pack.c:175
10044msgid "refname>:<expect"
10045msgstr "引用名>:<期望值"
10046
10047#: builtin/push.c:526 builtin/send-pack.c:176
10048msgid "require old value of ref to be at this value"
10049msgstr "要求引用旧的取值为设定值"
10050
10051#: builtin/push.c:529
10052msgid "control recursive pushing of submodules"
10053msgstr "控制子模组的递归推送"
10054
10055#: builtin/push.c:531 builtin/send-pack.c:169
10056msgid "use thin pack"
10057msgstr "使用精简打包"
10058
10059#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
10060#: builtin/send-pack.c:159
10061msgid "receive pack program"
10062msgstr "接收包程序"
10063
10064#: builtin/push.c:534
10065msgid "set upstream for git pull/status"
10066msgstr "设置 git pull/status 的上游"
10067
10068#: builtin/push.c:537
10069msgid "prune locally removed refs"
10070msgstr "清除本地删除的引用"
10071
10072#: builtin/push.c:539
10073msgid "bypass pre-push hook"
10074msgstr "绕过 pre-push 钩子"
10075
10076#: builtin/push.c:540
10077msgid "push missing but relevant tags"
10078msgstr "推送缺失但有关的标签"
10079
10080#: builtin/push.c:543 builtin/send-pack.c:166
10081msgid "GPG sign the push"
10082msgstr "用 GPG 为推送签名"
10083
10084#: builtin/push.c:545 builtin/send-pack.c:170
10085msgid "request atomic transaction on remote side"
10086msgstr "需要远端支持原子事务"
10087
10088#: builtin/push.c:546
10089msgid "server-specific"
10090msgstr "server-specific"
10091
10092#: builtin/push.c:546
10093msgid "option to transmit"
10094msgstr "传输选项"
10095
10096#: builtin/push.c:560
10097msgid "--delete is incompatible with --all, --mirror and --tags"
10098msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
10099
10100#: builtin/push.c:562
10101msgid "--delete doesn't make sense without any refs"
10102msgstr "--delete 未接任何引用没有意义"
10103
10104#: builtin/push.c:579
10105msgid "push options must not have new line characters"
10106msgstr "推送选项不能有换行符"
10107
10108#: builtin/read-tree.c:37
10109msgid ""
10110"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
10111"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10112"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
10113msgstr ""
10114"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
10115"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10116"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
10117
10118#: builtin/read-tree.c:110
10119msgid "write resulting index to <file>"
10120msgstr "将索引结果写入 <文件>"
10121
10122#: builtin/read-tree.c:113
10123msgid "only empty the index"
10124msgstr "只是清空索引"
10125
10126#: builtin/read-tree.c:115
10127msgid "Merging"
10128msgstr "合并"
10129
10130#: builtin/read-tree.c:117
10131msgid "perform a merge in addition to a read"
10132msgstr "读取之余再执行一个合并"
10133
10134#: builtin/read-tree.c:119
10135msgid "3-way merge if no file level merging required"
10136msgstr "如果没有文件级合并需要,执行三方合并"
10137
10138#: builtin/read-tree.c:121
10139msgid "3-way merge in presence of adds and removes"
10140msgstr "存在添加和删除时,也执行三方合并"
10141
10142#: builtin/read-tree.c:123
10143msgid "same as -m, but discard unmerged entries"
10144msgstr "类似于 -m,但丢弃未合并的条目"
10145
10146#: builtin/read-tree.c:124
10147msgid "<subdirectory>/"
10148msgstr "<子目录>/"
10149
10150#: builtin/read-tree.c:125
10151msgid "read the tree into the index under <subdirectory>/"
10152msgstr "读取树对象到索引的 <子目录>/ 下"
10153
10154#: builtin/read-tree.c:128
10155msgid "update working tree with merge result"
10156msgstr "用合并的结果更新工作区"
10157
10158#: builtin/read-tree.c:130
10159msgid "gitignore"
10160msgstr "gitignore"
10161
10162#: builtin/read-tree.c:131
10163msgid "allow explicitly ignored files to be overwritten"
10164msgstr "允许忽略文件中设定的文件可以被覆盖"
10165
10166#: builtin/read-tree.c:134
10167msgid "don't check the working tree after merging"
10168msgstr "合并后不检查工作区"
10169
10170#: builtin/read-tree.c:135
10171msgid "don't update the index or the work tree"
10172msgstr "不更新索引区和工作区"
10173
10174#: builtin/read-tree.c:137
10175msgid "skip applying sparse checkout filter"
10176msgstr "跳过应用稀疏检出过滤器"
10177
10178#: builtin/read-tree.c:139
10179msgid "debug unpack-trees"
10180msgstr "调试 unpack-trees"
10181
10182#: builtin/receive-pack.c:25
10183msgid "git receive-pack <git-dir>"
10184msgstr "git receive-pack <git-dir>"
10185
10186#: builtin/receive-pack.c:1843
10187msgid "quiet"
10188msgstr "静默模式"
10189
10190#: builtin/receive-pack.c:1857
10191msgid "You must specify a directory."
10192msgstr "您必须指定一个目录。"
10193
10194#: builtin/reflog.c:423
10195#, c-format
10196msgid "'%s' for '%s' is not a valid timestamp"
10197msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
10198
10199#: builtin/reflog.c:540 builtin/reflog.c:545
10200#, c-format
10201msgid "'%s' is not a valid timestamp"
10202msgstr "'%s' 不是一个有效的时间戳"
10203
10204#: builtin/remote.c:12
10205msgid "git remote [-v | --verbose]"
10206msgstr "git remote [-v | --verbose]"
10207
10208#: builtin/remote.c:13
10209msgid ""
10210"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
10211"mirror=<fetch|push>] <name> <url>"
10212msgstr ""
10213"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
10214"mirror=<fetch|push>] <名称> <地址>"
10215
10216#: builtin/remote.c:14 builtin/remote.c:34
10217msgid "git remote rename <old> <new>"
10218msgstr "git remote rename <旧名称> <新名称>"
10219
10220#: builtin/remote.c:15 builtin/remote.c:39
10221msgid "git remote remove <name>"
10222msgstr "git remote remove <名称>"
10223
10224#: builtin/remote.c:16 builtin/remote.c:44
10225msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
10226msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
10227
10228#: builtin/remote.c:17
10229msgid "git remote [-v | --verbose] show [-n] <name>"
10230msgstr "git remote [-v | --verbose] show [-n] <名称>"
10231
10232#: builtin/remote.c:18
10233msgid "git remote prune [-n | --dry-run] <name>"
10234msgstr "git remote prune [-n | --dry-run] <名称>"
10235
10236#: builtin/remote.c:19
10237msgid ""
10238"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
10239msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
10240
10241#: builtin/remote.c:20
10242msgid "git remote set-branches [--add] <name> <branch>..."
10243msgstr "git remote set-branches [--add] <名称> <分支>..."
10244
10245#: builtin/remote.c:21 builtin/remote.c:70
10246msgid "git remote get-url [--push] [--all] <name>"
10247msgstr "git remote get-url [--push] [--all] <名称>"
10248
10249#: builtin/remote.c:22 builtin/remote.c:75
10250msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
10251msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
10252
10253#: builtin/remote.c:23 builtin/remote.c:76
10254msgid "git remote set-url --add <name> <newurl>"
10255msgstr "git remote set-url --add <名称> <新的地址>"
10256
10257#: builtin/remote.c:24 builtin/remote.c:77
10258msgid "git remote set-url --delete <name> <url>"
10259msgstr "git remote set-url --delete <名称> <地址>"
10260
10261#: builtin/remote.c:29
10262msgid "git remote add [<options>] <name> <url>"
10263msgstr "git remote add [<选项>] <名称> <地址>"
10264
10265#: builtin/remote.c:49
10266msgid "git remote set-branches <name> <branch>..."
10267msgstr "git remote set-branches <名称> <分支>..."
10268
10269#: builtin/remote.c:50
10270msgid "git remote set-branches --add <name> <branch>..."
10271msgstr "git remote set-branches --add <名称> <分支>..."
10272
10273#: builtin/remote.c:55
10274msgid "git remote show [<options>] <name>"
10275msgstr "git remote show [<选项>] <名称>"
10276
10277#: builtin/remote.c:60
10278msgid "git remote prune [<options>] <name>"
10279msgstr "git remote prune [<选项>] <名称>"
10280
10281#: builtin/remote.c:65
10282msgid "git remote update [<options>] [<group> | <remote>]..."
10283msgstr "git remote update [<选项>] [<组> | <远程>]..."
10284
10285#: builtin/remote.c:94
10286#, c-format
10287msgid "Updating %s"
10288msgstr "更新 %s 中"
10289
10290#: builtin/remote.c:126
10291msgid ""
10292"--mirror is dangerous and deprecated; please\n"
10293"\t use --mirror=fetch or --mirror=push instead"
10294msgstr ""
10295"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
10296"\t 或 --mirror=push"
10297
10298#: builtin/remote.c:143
10299#, c-format
10300msgid "unknown mirror argument: %s"
10301msgstr "未知的镜像参数:%s"
10302
10303#: builtin/remote.c:159
10304msgid "fetch the remote branches"
10305msgstr "抓取远程的分支"
10306
10307#: builtin/remote.c:161
10308msgid "import all tags and associated objects when fetching"
10309msgstr "抓取时导入所有的标签和关联对象"
10310
10311#: builtin/remote.c:164
10312msgid "or do not fetch any tag at all (--no-tags)"
10313msgstr "或不抓取任何标签(--no-tags)"
10314
10315#: builtin/remote.c:166
10316msgid "branch(es) to track"
10317msgstr "跟踪的分支"
10318
10319#: builtin/remote.c:167
10320msgid "master branch"
10321msgstr "主线分支"
10322
10323#: builtin/remote.c:168
10324msgid "push|fetch"
10325msgstr "push|fetch"
10326
10327#: builtin/remote.c:169
10328msgid "set up remote as a mirror to push to or fetch from"
10329msgstr "把远程设置为用以推送或抓取的镜像"
10330
10331#: builtin/remote.c:181
10332msgid "specifying a master branch makes no sense with --mirror"
10333msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
10334
10335#: builtin/remote.c:183
10336msgid "specifying branches to track makes sense only with fetch mirrors"
10337msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
10338
10339#: builtin/remote.c:190 builtin/remote.c:629
10340#, c-format
10341msgid "remote %s already exists."
10342msgstr "远程 %s 已经存在。"
10343
10344#: builtin/remote.c:194 builtin/remote.c:633
10345#, c-format
10346msgid "'%s' is not a valid remote name"
10347msgstr "'%s' 不是一个有效的远程名称"
10348
10349#: builtin/remote.c:234
10350#, c-format
10351msgid "Could not setup master '%s'"
10352msgstr "无法设置 master '%s'"
10353
10354#: builtin/remote.c:336
10355#, c-format
10356msgid "Could not get fetch map for refspec %s"
10357msgstr "无法得到引用规格 %s 的获取列表"
10358
10359#: builtin/remote.c:437 builtin/remote.c:445
10360msgid "(matching)"
10361msgstr "(匹配)"
10362
10363#: builtin/remote.c:449
10364msgid "(delete)"
10365msgstr "(删除)"
10366
10367#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
10368#, c-format
10369msgid "No such remote: %s"
10370msgstr "没有这样的远程:%s"
10371
10372#: builtin/remote.c:639
10373#, c-format
10374msgid "Could not rename config section '%s' to '%s'"
10375msgstr "不能重命名配置小节 '%s' 到 '%s'"
10376
10377#: builtin/remote.c:659
10378#, c-format
10379msgid ""
10380"Not updating non-default fetch refspec\n"
10381"\t%s\n"
10382"\tPlease update the configuration manually if necessary."
10383msgstr ""
10384"没有更新非默认的获取引用规格\n"
10385"\t%s\n"
10386"\t如果必要请手动更新配置。"
10387
10388#: builtin/remote.c:695
10389#, c-format
10390msgid "deleting '%s' failed"
10391msgstr "删除 '%s' 失败"
10392
10393#: builtin/remote.c:729
10394#, c-format
10395msgid "creating '%s' failed"
10396msgstr "创建 '%s' 失败"
10397
10398#: builtin/remote.c:792
10399msgid ""
10400"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
10401"to delete it, use:"
10402msgid_plural ""
10403"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
10404"to delete them, use:"
10405msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
10406msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
10407
10408#: builtin/remote.c:806
10409#, c-format
10410msgid "Could not remove config section '%s'"
10411msgstr "不能移除配置小节 '%s'"
10412
10413#: builtin/remote.c:907
10414#, c-format
10415msgid " new (next fetch will store in remotes/%s)"
10416msgstr " 新的(下一次获取将存储于 remotes/%s)"
10417
10418#: builtin/remote.c:910
10419msgid " tracked"
10420msgstr " 已跟踪"
10421
10422#: builtin/remote.c:912
10423msgid " stale (use 'git remote prune' to remove)"
10424msgstr " 过时(使用 'git remote prune' 来移除)"
10425
10426#: builtin/remote.c:914
10427msgid " ???"
10428msgstr " ???"
10429
10430#: builtin/remote.c:955
10431#, c-format
10432msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
10433msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
10434
10435#: builtin/remote.c:963
10436#, c-format
10437msgid "rebases interactively onto remote %s"
10438msgstr "交互式变基到远程 %s"
10439
10440#: builtin/remote.c:964
10441#, c-format
10442msgid "rebases onto remote %s"
10443msgstr "变基到远程 %s"
10444
10445#: builtin/remote.c:967
10446#, c-format
10447msgid " merges with remote %s"
10448msgstr " 与远程 %s 合并"
10449
10450#: builtin/remote.c:970
10451#, c-format
10452msgid "merges with remote %s"
10453msgstr "与远程 %s 合并"
10454
10455#: builtin/remote.c:973
10456#, c-format
10457msgid "%-*s    and with remote %s\n"
10458msgstr "%-*s    以及和远程 %s\n"
10459
10460#: builtin/remote.c:1016
10461msgid "create"
10462msgstr "创建"
10463
10464#: builtin/remote.c:1019
10465msgid "delete"
10466msgstr "删除"
10467
10468#: builtin/remote.c:1023
10469msgid "up to date"
10470msgstr "最新"
10471
10472#: builtin/remote.c:1026
10473msgid "fast-forwardable"
10474msgstr "可快进"
10475
10476#: builtin/remote.c:1029
10477msgid "local out of date"
10478msgstr "本地已过时"
10479
10480#: builtin/remote.c:1036
10481#, c-format
10482msgid "    %-*s forces to %-*s (%s)"
10483msgstr "    %-*s 强制推送至 %-*s (%s)"
10484
10485#: builtin/remote.c:1039
10486#, c-format
10487msgid "    %-*s pushes to %-*s (%s)"
10488msgstr "    %-*s 推送至 %-*s (%s)"
10489
10490#: builtin/remote.c:1043
10491#, c-format
10492msgid "    %-*s forces to %s"
10493msgstr "    %-*s 强制推送至 %s"
10494
10495#: builtin/remote.c:1046
10496#, c-format
10497msgid "    %-*s pushes to %s"
10498msgstr "    %-*s 推送至 %s"
10499
10500#: builtin/remote.c:1114
10501msgid "do not query remotes"
10502msgstr "不查询远程"
10503
10504#: builtin/remote.c:1141
10505#, c-format
10506msgid "* remote %s"
10507msgstr "* 远程 %s"
10508
10509#: builtin/remote.c:1142
10510#, c-format
10511msgid "  Fetch URL: %s"
10512msgstr "  获取地址:%s"
10513
10514#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
10515msgid "(no URL)"
10516msgstr "(无 URL)"
10517
10518#. TRANSLATORS: the colon ':' should align with
10519#. the one in "  Fetch URL: %s" translation
10520#: builtin/remote.c:1154 builtin/remote.c:1156
10521#, c-format
10522msgid "  Push  URL: %s"
10523msgstr "  推送地址:%s"
10524
10525#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
10526#, c-format
10527msgid "  HEAD branch: %s"
10528msgstr "  HEAD 分支:%s"
10529
10530#  译者:中文字符串拼接,可删除前导空格
10531#: builtin/remote.c:1158
10532msgid "(not queried)"
10533msgstr "(未查询)"
10534
10535#: builtin/remote.c:1160
10536msgid "(unknown)"
10537msgstr "(未知)"
10538
10539#: builtin/remote.c:1164
10540#, c-format
10541msgid ""
10542"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
10543msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
10544
10545#: builtin/remote.c:1176
10546#, c-format
10547msgid "  Remote branch:%s"
10548msgid_plural "  Remote branches:%s"
10549msgstr[0] "  远程分支:%s"
10550msgstr[1] "  远程分支:%s"
10551
10552#  译者:中文字符串拼接,可删除前导空格
10553#: builtin/remote.c:1179 builtin/remote.c:1206
10554msgid " (status not queried)"
10555msgstr "(状态未查询)"
10556
10557#: builtin/remote.c:1188
10558msgid "  Local branch configured for 'git pull':"
10559msgid_plural "  Local branches configured for 'git pull':"
10560msgstr[0] "  为 'git pull' 配置的本地分支:"
10561msgstr[1] "  为 'git pull' 配置的本地分支:"
10562
10563#: builtin/remote.c:1196
10564msgid "  Local refs will be mirrored by 'git push'"
10565msgstr "  本地引用将在 'git push' 时被镜像"
10566
10567#: builtin/remote.c:1203
10568#, c-format
10569msgid "  Local ref configured for 'git push'%s:"
10570msgid_plural "  Local refs configured for 'git push'%s:"
10571msgstr[0] "  为 'git push' 配置的本地引用%s:"
10572msgstr[1] "  为 'git push' 配置的本地引用%s:"
10573
10574#: builtin/remote.c:1224
10575msgid "set refs/remotes/<name>/HEAD according to remote"
10576msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
10577
10578#: builtin/remote.c:1226
10579msgid "delete refs/remotes/<name>/HEAD"
10580msgstr "删除 refs/remotes/<名称>/HEAD"
10581
10582#: builtin/remote.c:1241
10583msgid "Cannot determine remote HEAD"
10584msgstr "无法确定远程 HEAD"
10585
10586#: builtin/remote.c:1243
10587msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
10588msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
10589
10590#: builtin/remote.c:1253
10591#, c-format
10592msgid "Could not delete %s"
10593msgstr "无法删除 %s"
10594
10595#: builtin/remote.c:1261
10596#, c-format
10597msgid "Not a valid ref: %s"
10598msgstr "不是一个有效引用:%s"
10599
10600#: builtin/remote.c:1263
10601#, c-format
10602msgid "Could not setup %s"
10603msgstr "不能设置 %s"
10604
10605#  译者:注意保持前导空格
10606#: builtin/remote.c:1281
10607#, c-format
10608msgid " %s will become dangling!"
10609msgstr " %s 将成为摇摆状态!"
10610
10611#  译者:注意保持前导空格
10612#: builtin/remote.c:1282
10613#, c-format
10614msgid " %s has become dangling!"
10615msgstr " %s 已成为摇摆状态!"
10616
10617#: builtin/remote.c:1292
10618#, c-format
10619msgid "Pruning %s"
10620msgstr "修剪 %s"
10621
10622#: builtin/remote.c:1293
10623#, c-format
10624msgid "URL: %s"
10625msgstr "URL:%s"
10626
10627#: builtin/remote.c:1309
10628#, c-format
10629msgid " * [would prune] %s"
10630msgstr " * [将删除] %s"
10631
10632#: builtin/remote.c:1312
10633#, c-format
10634msgid " * [pruned] %s"
10635msgstr " * [已删除] %s"
10636
10637#: builtin/remote.c:1357
10638msgid "prune remotes after fetching"
10639msgstr "抓取后清除远程"
10640
10641#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
10642#, c-format
10643msgid "No such remote '%s'"
10644msgstr "没有此远程 '%s'"
10645
10646#: builtin/remote.c:1436
10647msgid "add branch"
10648msgstr "添加分支"
10649
10650#: builtin/remote.c:1443
10651msgid "no remote specified"
10652msgstr "未指定远程"
10653
10654#: builtin/remote.c:1460
10655msgid "query push URLs rather than fetch URLs"
10656msgstr "查询推送 URL 地址,而非获取 URL 地址"
10657
10658#: builtin/remote.c:1462
10659msgid "return all URLs"
10660msgstr "返回所有 URL 地址"
10661
10662#: builtin/remote.c:1490
10663#, c-format
10664msgid "no URLs configured for remote '%s'"
10665msgstr "没有给远程仓库 '%s' 设定 URL"
10666
10667#: builtin/remote.c:1516
10668msgid "manipulate push URLs"
10669msgstr "操作推送 URLS"
10670
10671#: builtin/remote.c:1518
10672msgid "add URL"
10673msgstr "添加 URL"
10674
10675#: builtin/remote.c:1520
10676msgid "delete URLs"
10677msgstr "删除 URLS"
10678
10679#: builtin/remote.c:1527
10680msgid "--add --delete doesn't make sense"
10681msgstr "--add --delete 无意义"
10682
10683#: builtin/remote.c:1568
10684#, c-format
10685msgid "Invalid old URL pattern: %s"
10686msgstr "无效的旧 URL 匹配模版:%s"
10687
10688#: builtin/remote.c:1576
10689#, c-format
10690msgid "No such URL found: %s"
10691msgstr "未找到此 URL:%s"
10692
10693#: builtin/remote.c:1578
10694msgid "Will not delete all non-push URLs"
10695msgstr "将不会删除所有非推送 URL 地址"
10696
10697#: builtin/remote.c:1592
10698msgid "be verbose; must be placed before a subcommand"
10699msgstr "冗长输出;必须置于子命令之前"
10700
10701#: builtin/repack.c:17
10702msgid "git repack [<options>]"
10703msgstr "git repack [<选项>]"
10704
10705#: builtin/repack.c:160
10706msgid "pack everything in a single pack"
10707msgstr "所有内容打包到一个包文件中"
10708
10709#: builtin/repack.c:162
10710msgid "same as -a, and turn unreachable objects loose"
10711msgstr "和 -a 相同,并将不可达的对象设为松散对象"
10712
10713#: builtin/repack.c:165
10714msgid "remove redundant packs, and run git-prune-packed"
10715msgstr "删除多余的包,运行 git-prune-packed"
10716
10717#: builtin/repack.c:167
10718msgid "pass --no-reuse-delta to git-pack-objects"
10719msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
10720
10721#: builtin/repack.c:169
10722msgid "pass --no-reuse-object to git-pack-objects"
10723msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
10724
10725#: builtin/repack.c:171
10726msgid "do not run git-update-server-info"
10727msgstr "不运行 git-update-server-info"
10728
10729#: builtin/repack.c:174
10730msgid "pass --local to git-pack-objects"
10731msgstr "向 git-pack-objects 传递参数 --local"
10732
10733#: builtin/repack.c:176
10734msgid "write bitmap index"
10735msgstr "写 bitmap 索引"
10736
10737#: builtin/repack.c:177
10738msgid "approxidate"
10739msgstr "近似日期"
10740
10741#: builtin/repack.c:178
10742msgid "with -A, do not loosen objects older than this"
10743msgstr "使用 -A,不要将早于给定时间的对象过期"
10744
10745#: builtin/repack.c:180
10746msgid "with -a, repack unreachable objects"
10747msgstr "使用 -a ,重新对不可达对象打包"
10748
10749#: builtin/repack.c:182
10750msgid "size of the window used for delta compression"
10751msgstr "用于增量压缩的窗口值"
10752
10753#: builtin/repack.c:183 builtin/repack.c:187
10754msgid "bytes"
10755msgstr "字节"
10756
10757#: builtin/repack.c:184
10758msgid "same as the above, but limit memory size instead of entries count"
10759msgstr "和上面的相似,但限制内存大小而非条目数"
10760
10761#: builtin/repack.c:186
10762msgid "limits the maximum delta depth"
10763msgstr "限制最大增量深度"
10764
10765#: builtin/repack.c:188
10766msgid "maximum size of each packfile"
10767msgstr "每个包文件的最大尺寸"
10768
10769#: builtin/repack.c:190
10770msgid "repack objects in packs marked with .keep"
10771msgstr "对标记为 .keep 的包中的对象重新打包"
10772
10773#: builtin/repack.c:200
10774msgid "cannot delete packs in a precious-objects repo"
10775msgstr "不能删除珍品仓库中的打包文件"
10776
10777#: builtin/repack.c:204
10778msgid "--keep-unreachable and -A are incompatible"
10779msgstr "--keep-unreachable 和 -A 不兼容"
10780
10781#: builtin/repack.c:391 builtin/worktree.c:115
10782#, c-format
10783msgid "failed to remove '%s'"
10784msgstr "无法删除 '%s'"
10785
10786#: builtin/replace.c:19
10787msgid "git replace [-f] <object> <replacement>"
10788msgstr "git replace [-f] <对象> <替换物>"
10789
10790#: builtin/replace.c:20
10791msgid "git replace [-f] --edit <object>"
10792msgstr "git replace [-f] --edit <对象>"
10793
10794#: builtin/replace.c:21
10795msgid "git replace [-f] --graft <commit> [<parent>...]"
10796msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10797
10798#: builtin/replace.c:22
10799msgid "git replace -d <object>..."
10800msgstr "git replace -d <对象>..."
10801
10802#: builtin/replace.c:23
10803msgid "git replace [--format=<format>] [-l [<pattern>]]"
10804msgstr "git replace [--format=<格式>] [-l [<模式>]]"
10805
10806#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
10807#, c-format
10808msgid "Not a valid object name: '%s'"
10809msgstr "不是一个有效的对象名:'%s'"
10810
10811#: builtin/replace.c:355
10812#, c-format
10813msgid "bad mergetag in commit '%s'"
10814msgstr "提交 '%s' 中含有损坏的合并标签"
10815
10816#: builtin/replace.c:357
10817#, c-format
10818msgid "malformed mergetag in commit '%s'"
10819msgstr "提交 '%s' 中含有非法的合并标签"
10820
10821#: builtin/replace.c:368
10822#, c-format
10823msgid ""
10824"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10825"instead of --graft"
10826msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
10827
10828#: builtin/replace.c:401
10829#, c-format
10830msgid "the original commit '%s' has a gpg signature."
10831msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10832
10833#: builtin/replace.c:402
10834msgid "the signature will be removed in the replacement commit!"
10835msgstr "在替换的提交中签名将被移除!"
10836
10837#: builtin/replace.c:408
10838#, c-format
10839msgid "could not write replacement commit for: '%s'"
10840msgstr "不能为 '%s' 写替换提交"
10841
10842#: builtin/replace.c:432
10843msgid "list replace refs"
10844msgstr "列出替换的引用"
10845
10846#: builtin/replace.c:433
10847msgid "delete replace refs"
10848msgstr "删除替换的引用"
10849
10850#: builtin/replace.c:434
10851msgid "edit existing object"
10852msgstr "编辑现存的对象"
10853
10854#: builtin/replace.c:435
10855msgid "change a commit's parents"
10856msgstr "修改一个提交的父提交"
10857
10858#: builtin/replace.c:436
10859msgid "replace the ref if it exists"
10860msgstr "如果存在则替换引用"
10861
10862#: builtin/replace.c:437
10863msgid "do not pretty-print contents for --edit"
10864msgstr "不要为 --edit 操作美观显示内容"
10865
10866#: builtin/replace.c:438
10867msgid "use this format"
10868msgstr "使用此格式"
10869
10870#: builtin/rerere.c:12
10871msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10872msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
10873
10874#: builtin/rerere.c:58
10875msgid "register clean resolutions in index"
10876msgstr "在索引中注册干净的解决方案"
10877
10878#: builtin/reset.c:26
10879msgid ""
10880"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
10881msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
10882
10883#: builtin/reset.c:27
10884msgid "git reset [-q] <tree-ish> [--] <paths>..."
10885msgstr "git reset [-q] <树或提交> [--] <路径>..."
10886
10887#: builtin/reset.c:28
10888msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10889msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
10890
10891#: builtin/reset.c:34
10892msgid "mixed"
10893msgstr "混杂"
10894
10895#: builtin/reset.c:34
10896msgid "soft"
10897msgstr "软性"
10898
10899#: builtin/reset.c:34
10900msgid "hard"
10901msgstr "硬性"
10902
10903#: builtin/reset.c:34
10904msgid "merge"
10905msgstr "合并"
10906
10907#: builtin/reset.c:34
10908msgid "keep"
10909msgstr "保持"
10910
10911#: builtin/reset.c:74
10912msgid "You do not have a valid HEAD."
10913msgstr "您没有一个有效的 HEAD。"
10914
10915#: builtin/reset.c:76
10916msgid "Failed to find tree of HEAD."
10917msgstr "无法找到 HEAD 指向的树。"
10918
10919#: builtin/reset.c:82
10920#, c-format
10921msgid "Failed to find tree of %s."
10922msgstr "无法找到 %s 指向的树。"
10923
10924#: builtin/reset.c:100
10925#, c-format
10926msgid "HEAD is now at %s"
10927msgstr "HEAD 现在位于 %s"
10928
10929#  译者:汉字之间无空格,故删除%s前后空格
10930#: builtin/reset.c:183
10931#, c-format
10932msgid "Cannot do a %s reset in the middle of a merge."
10933msgstr "在合并过程中不能做%s重置操作。"
10934
10935#: builtin/reset.c:276
10936msgid "be quiet, only report errors"
10937msgstr "安静模式,只报告错误"
10938
10939#: builtin/reset.c:278
10940msgid "reset HEAD and index"
10941msgstr "重置 HEAD 和索引"
10942
10943#: builtin/reset.c:279
10944msgid "reset only HEAD"
10945msgstr "只重置 HEAD"
10946
10947#: builtin/reset.c:281 builtin/reset.c:283
10948msgid "reset HEAD, index and working tree"
10949msgstr "重置 HEAD、索引和工作区"
10950
10951#: builtin/reset.c:285
10952msgid "reset HEAD but keep local changes"
10953msgstr "重置 HEAD 但保存本地变更"
10954
10955#: builtin/reset.c:288
10956msgid "record only the fact that removed paths will be added later"
10957msgstr "将删除的路径标记为稍后添加"
10958
10959#: builtin/reset.c:305
10960#, c-format
10961msgid "Failed to resolve '%s' as a valid revision."
10962msgstr "无法将 '%s' 解析为一个有效的版本。"
10963
10964#: builtin/reset.c:313
10965#, c-format
10966msgid "Failed to resolve '%s' as a valid tree."
10967msgstr "无法将 '%s' 解析为一个有效的树对象。"
10968
10969#: builtin/reset.c:322
10970msgid "--patch is incompatible with --{hard,mixed,soft}"
10971msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10972
10973#: builtin/reset.c:331
10974msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10975msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10976
10977#  译者:汉字之间无空格,故删除%s前后空格
10978#: builtin/reset.c:333
10979#, c-format
10980msgid "Cannot do %s reset with paths."
10981msgstr "不能带路径进行%s重置。"
10982
10983#  译者:汉字之间无空格,故删除%s前后空格
10984#: builtin/reset.c:343
10985#, c-format
10986msgid "%s reset is not allowed in a bare repository"
10987msgstr "不能对纯仓库进行%s重置"
10988
10989#: builtin/reset.c:347
10990msgid "-N can only be used with --mixed"
10991msgstr "-N 只能和 --mixed 同时使用"
10992
10993#: builtin/reset.c:364
10994msgid "Unstaged changes after reset:"
10995msgstr "重置后取消暂存的变更:"
10996
10997#: builtin/reset.c:370
10998#, c-format
10999msgid "Could not reset index file to revision '%s'."
11000msgstr "不能重置索引文件至版本 '%s'。"
11001
11002#: builtin/reset.c:374
11003msgid "Could not write new index file."
11004msgstr "不能写入新的索引文件。"
11005
11006#: builtin/rev-list.c:362
11007msgid "rev-list does not support display of notes"
11008msgstr "rev-list 不支持显示注解"
11009
11010#: builtin/rev-parse.c:358
11011msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
11012msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
11013
11014#: builtin/rev-parse.c:363
11015msgid "keep the `--` passed as an arg"
11016msgstr "保持 `--` 作为一个参数传递"
11017
11018#: builtin/rev-parse.c:365
11019msgid "stop parsing after the first non-option argument"
11020msgstr "遇到第一个非选项参数后停止解析"
11021
11022#: builtin/rev-parse.c:368
11023msgid "output in stuck long form"
11024msgstr "以固定长格式输出"
11025
11026#: builtin/rev-parse.c:499
11027msgid ""
11028"git rev-parse --parseopt [<options>] -- [<args>...]\n"
11029"   or: git rev-parse --sq-quote [<arg>...]\n"
11030"   or: git rev-parse [<options>] [<arg>...]\n"
11031"\n"
11032"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
11033msgstr ""
11034"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
11035"   或者:git rev-parse --sq-quote [<参数>...]\n"
11036"   或者:git rev-parse [<选项>] [<参数>...]\n"
11037"\n"
11038"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
11039
11040#: builtin/revert.c:22
11041msgid "git revert [<options>] <commit-ish>..."
11042msgstr "git revert [<选项>] <提交号>..."
11043
11044#: builtin/revert.c:23
11045msgid "git revert <subcommand>"
11046msgstr "git revert <子命令>"
11047
11048#: builtin/revert.c:28
11049msgid "git cherry-pick [<options>] <commit-ish>..."
11050msgstr "git cherry-pick [<选项>] <提交号>..."
11051
11052#: builtin/revert.c:29
11053msgid "git cherry-pick <subcommand>"
11054msgstr "git cherry-pick <子命令>"
11055
11056#: builtin/revert.c:71
11057#, c-format
11058msgid "%s: %s cannot be used with %s"
11059msgstr "%s:%s 不能和 %s 同时使用"
11060
11061#: builtin/revert.c:80
11062msgid "end revert or cherry-pick sequence"
11063msgstr "终止反转或拣选操作"
11064
11065#: builtin/revert.c:81
11066msgid "resume revert or cherry-pick sequence"
11067msgstr "继续反转或拣选操作"
11068
11069#: builtin/revert.c:82
11070msgid "cancel revert or cherry-pick sequence"
11071msgstr "取消反转或拣选操作"
11072
11073#: builtin/revert.c:83
11074msgid "don't automatically commit"
11075msgstr "不要自动提交"
11076
11077#: builtin/revert.c:84
11078msgid "edit the commit message"
11079msgstr "编辑提交说明"
11080
11081#: builtin/revert.c:87
11082msgid "parent number"
11083msgstr "父编号"
11084
11085#: builtin/revert.c:89
11086msgid "merge strategy"
11087msgstr "合并策略"
11088
11089#: builtin/revert.c:90
11090msgid "option"
11091msgstr "选项"
11092
11093#: builtin/revert.c:91
11094msgid "option for merge strategy"
11095msgstr "合并策略的选项"
11096
11097#: builtin/revert.c:100
11098msgid "append commit name"
11099msgstr "追加提交名称"
11100
11101#: builtin/revert.c:102
11102msgid "preserve initially empty commits"
11103msgstr "保留初始化的空提交"
11104
11105#: builtin/revert.c:103
11106msgid "allow commits with empty messages"
11107msgstr "允许提交说明为空"
11108
11109#: builtin/revert.c:104
11110msgid "keep redundant, empty commits"
11111msgstr "保持多余的、空的提交"
11112
11113#: builtin/revert.c:192
11114msgid "revert failed"
11115msgstr "还原失败"
11116
11117#: builtin/revert.c:207
11118msgid "cherry-pick failed"
11119msgstr "拣选失败"
11120
11121#: builtin/rm.c:17
11122msgid "git rm [<options>] [--] <file>..."
11123msgstr "git rm [<选项>] [--] <文件>..."
11124
11125#: builtin/rm.c:65
11126msgid ""
11127"the following submodule (or one of its nested submodules)\n"
11128"uses a .git directory:"
11129msgid_plural ""
11130"the following submodules (or one of their nested submodules)\n"
11131"use a .git directory:"
11132msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11133msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11134
11135#: builtin/rm.c:71
11136msgid ""
11137"\n"
11138"(use 'rm -rf' if you really want to remove it including all of its history)"
11139msgstr ""
11140"\n"
11141"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11142
11143#: builtin/rm.c:230
11144msgid ""
11145"the following file has staged content different from both the\n"
11146"file and the HEAD:"
11147msgid_plural ""
11148"the following files have staged content different from both the\n"
11149"file and the HEAD:"
11150msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11151msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11152
11153#: builtin/rm.c:235
11154msgid ""
11155"\n"
11156"(use -f to force removal)"
11157msgstr ""
11158"\n"
11159"(使用 -f 强制删除)"
11160
11161#: builtin/rm.c:239
11162msgid "the following file has changes staged in the index:"
11163msgid_plural "the following files have changes staged in the index:"
11164msgstr[0] "下列文件索引中有变更"
11165msgstr[1] "下列文件索引中有变更"
11166
11167#: builtin/rm.c:243 builtin/rm.c:254
11168msgid ""
11169"\n"
11170"(use --cached to keep the file, or -f to force removal)"
11171msgstr ""
11172"\n"
11173"(使用 --cached 保留本地文件,或用 -f 强制删除)"
11174
11175#: builtin/rm.c:251
11176msgid "the following file has local modifications:"
11177msgid_plural "the following files have local modifications:"
11178msgstr[0] "如下文件有本地修改:"
11179msgstr[1] "如下文件有本地修改:"
11180
11181#: builtin/rm.c:269
11182msgid "do not list removed files"
11183msgstr "不列出删除的文件"
11184
11185#: builtin/rm.c:270
11186msgid "only remove from the index"
11187msgstr "只从索引区删除"
11188
11189#: builtin/rm.c:271
11190msgid "override the up-to-date check"
11191msgstr "忽略文件更新状态检查"
11192
11193#: builtin/rm.c:272
11194msgid "allow recursive removal"
11195msgstr "允许递归删除"
11196
11197#: builtin/rm.c:274
11198msgid "exit with a zero status even if nothing matched"
11199msgstr "即使没有匹配,也以零状态退出"
11200
11201#: builtin/rm.c:335
11202#, c-format
11203msgid "not removing '%s' recursively without -r"
11204msgstr "未提供 -r 选项不会递归删除 '%s'"
11205
11206#: builtin/rm.c:374
11207#, c-format
11208msgid "git rm: unable to remove %s"
11209msgstr "git rm:不能删除 %s"
11210
11211#: builtin/send-pack.c:18
11212msgid ""
11213"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11214"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
11215"[<ref>...]\n"
11216"  --all and explicit <ref> specification are mutually exclusive."
11217msgstr ""
11218"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11219"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
11220"  --all 和明确的 <引用> 互斥。"
11221
11222#: builtin/send-pack.c:160
11223msgid "remote name"
11224msgstr "远程名称"
11225
11226#: builtin/send-pack.c:171
11227msgid "use stateless RPC protocol"
11228msgstr "使用无状态的 RPC 协议"
11229
11230#: builtin/send-pack.c:172
11231msgid "read refs from stdin"
11232msgstr "从标准输入读取引用"
11233
11234#: builtin/send-pack.c:173
11235msgid "print status from remote helper"
11236msgstr "打印来自远程 helper 的状态"
11237
11238#: builtin/shortlog.c:13
11239msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
11240msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
11241
11242#: builtin/shortlog.c:242
11243msgid "sort output according to the number of commits per author"
11244msgstr "根据每个作者的提交数量排序"
11245
11246#: builtin/shortlog.c:244
11247msgid "Suppress commit descriptions, only provides commit count"
11248msgstr "隐藏提交说明,只提供提交数量"
11249
11250#: builtin/shortlog.c:246
11251msgid "Show the email address of each author"
11252msgstr "显示每个作者的电子邮件地址"
11253
11254#: builtin/shortlog.c:247
11255msgid "w[,i1[,i2]]"
11256msgstr "w[,i1[,i2]]"
11257
11258#: builtin/shortlog.c:248
11259msgid "Linewrap output"
11260msgstr "折行输出"
11261
11262#: builtin/show-branch.c:10
11263msgid ""
11264"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
11265"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
11266"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
11267"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
11268msgstr ""
11269"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
11270"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
11271"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
11272"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
11273
11274#: builtin/show-branch.c:14
11275msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
11276msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
11277
11278#: builtin/show-branch.c:640
11279msgid "show remote-tracking and local branches"
11280msgstr "显示远程跟踪的和本地的分支"
11281
11282#: builtin/show-branch.c:642
11283msgid "show remote-tracking branches"
11284msgstr "显示远程跟踪的分支"
11285
11286#: builtin/show-branch.c:644
11287msgid "color '*!+-' corresponding to the branch"
11288msgstr "着色 '*!+-' 到相应的分支"
11289
11290#: builtin/show-branch.c:646
11291msgid "show <n> more commits after the common ancestor"
11292msgstr "显示共同祖先后的 <n> 个提交"
11293
11294#: builtin/show-branch.c:648
11295msgid "synonym to more=-1"
11296msgstr "和 more=-1 同义"
11297
11298#: builtin/show-branch.c:649
11299msgid "suppress naming strings"
11300msgstr "不显示字符串命名"
11301
11302#: builtin/show-branch.c:651
11303msgid "include the current branch"
11304msgstr "包括当前分支"
11305
11306#: builtin/show-branch.c:653
11307msgid "name commits with their object names"
11308msgstr "以对象名字命名提交"
11309
11310#: builtin/show-branch.c:655
11311msgid "show possible merge bases"
11312msgstr "显示可能合并的基线"
11313
11314#: builtin/show-branch.c:657
11315msgid "show refs unreachable from any other ref"
11316msgstr "显示没有任何引用的的引用"
11317
11318#: builtin/show-branch.c:659
11319msgid "show commits in topological order"
11320msgstr "以拓扑顺序显示提交"
11321
11322#: builtin/show-branch.c:662
11323msgid "show only commits not on the first branch"
11324msgstr "只显示不在第一个分支上的提交"
11325
11326#: builtin/show-branch.c:664
11327msgid "show merges reachable from only one tip"
11328msgstr "显示仅一个分支可访问的合并提交"
11329
11330#: builtin/show-branch.c:666
11331msgid "topologically sort, maintaining date order where possible"
11332msgstr "拓扑方式排序,并尽可能地保持日期顺序"
11333
11334#: builtin/show-branch.c:669
11335msgid "<n>[,<base>]"
11336msgstr "<n>[,<base>]"
11337
11338#: builtin/show-branch.c:670
11339msgid "show <n> most recent ref-log entries starting at base"
11340msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
11341
11342#: builtin/show-ref.c:10
11343msgid ""
11344"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
11345"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
11346msgstr ""
11347"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
11348"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
11349
11350#: builtin/show-ref.c:11
11351msgid "git show-ref --exclude-existing[=<pattern>]"
11352msgstr "git show-ref --exclude-existing[=<模式>]"
11353
11354#: builtin/show-ref.c:165
11355msgid "only show tags (can be combined with heads)"
11356msgstr "只显示标签(可以和头共用)"
11357
11358#: builtin/show-ref.c:166
11359msgid "only show heads (can be combined with tags)"
11360msgstr "只显示头(可以和标签共用)"
11361
11362#: builtin/show-ref.c:167
11363msgid "stricter reference checking, requires exact ref path"
11364msgstr "更严格的引用检测,需要精确的引用路径"
11365
11366#: builtin/show-ref.c:170 builtin/show-ref.c:172
11367msgid "show the HEAD reference, even if it would be filtered out"
11368msgstr "显示 HEAD 引用,即使被过滤掉"
11369
11370#: builtin/show-ref.c:174
11371msgid "dereference tags into object IDs"
11372msgstr "转换标签到对象 ID"
11373
11374#: builtin/show-ref.c:176
11375msgid "only show SHA1 hash using <n> digits"
11376msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
11377
11378#: builtin/show-ref.c:180
11379msgid "do not print results to stdout (useful with --verify)"
11380msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
11381
11382#: builtin/show-ref.c:182
11383msgid "show refs from stdin that aren't in local repository"
11384msgstr "显示从标准输入中读入的不在本地仓库中的引用"
11385
11386#: builtin/stripspace.c:17
11387msgid "git stripspace [-s | --strip-comments]"
11388msgstr "git stripspace [-s | --strip-comments]"
11389
11390#: builtin/stripspace.c:18
11391msgid "git stripspace [-c | --comment-lines]"
11392msgstr "git stripspace [-c | --comment-lines]"
11393
11394#: builtin/stripspace.c:35
11395msgid "skip and remove all lines starting with comment character"
11396msgstr "跳过和移除所有的注释行"
11397
11398#: builtin/stripspace.c:38
11399msgid "prepend comment character and space to each line"
11400msgstr "为每一行的行首添加注释符和空格"
11401
11402#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
11403#, c-format
11404msgid "No such ref: %s"
11405msgstr "没有这样的引用:%s"
11406
11407#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
11408#, c-format
11409msgid "Expecting a full ref name, got %s"
11410msgstr "期望一个完整的引用名称,却得到 %s"
11411
11412#: builtin/submodule--helper.c:71
11413#, c-format
11414msgid "cannot strip one component off url '%s'"
11415msgstr "无法从 url '%s' 剥离一个组件"
11416
11417#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
11418#: builtin/submodule--helper.c:483
11419msgid "alternative anchor for relative paths"
11420msgstr "相对路径的替代锚记(anchor)"
11421
11422#: builtin/submodule--helper.c:283
11423msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
11424msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
11425
11426#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
11427#, c-format
11428msgid "No url found for submodule path '%s' in .gitmodules"
11429msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
11430
11431#: builtin/submodule--helper.c:364
11432#, c-format
11433msgid "Failed to register url for submodule path '%s'"
11434msgstr "无法为子模组 '%s' 注册 url"
11435
11436#: builtin/submodule--helper.c:368
11437#, c-format
11438msgid "Submodule '%s' (%s) registered for path '%s'\n"
11439msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
11440
11441#
11442#: builtin/submodule--helper.c:378
11443#, c-format
11444msgid "warning: command update mode suggested for submodule '%s'\n"
11445msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
11446
11447#: builtin/submodule--helper.c:385
11448#, c-format
11449msgid "Failed to register update mode for submodule path '%s'"
11450msgstr "无法为子模组 '%s' 注册更新模式"
11451
11452#: builtin/submodule--helper.c:404
11453msgid "Suppress output for initializing a submodule"
11454msgstr "初始化子模组时抑制输出"
11455
11456#: builtin/submodule--helper.c:409
11457msgid "git submodule--helper init [<path>]"
11458msgstr "git submodule--helper init [<路径>]"
11459
11460#: builtin/submodule--helper.c:430
11461msgid "git submodule--helper name <path>"
11462msgstr "git submodule--helper name <路径>"
11463
11464#: builtin/submodule--helper.c:436
11465#, c-format
11466msgid "no submodule mapping found in .gitmodules for path '%s'"
11467msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
11468
11469#: builtin/submodule--helper.c:486
11470msgid "where the new submodule will be cloned to"
11471msgstr "新的子模组将要克隆的路径"
11472
11473#: builtin/submodule--helper.c:489
11474msgid "name of the new submodule"
11475msgstr "新子模组的名称"
11476
11477#: builtin/submodule--helper.c:492
11478msgid "url where to clone the submodule from"
11479msgstr "克隆子模组的 url 地址"
11480
11481#: builtin/submodule--helper.c:498
11482msgid "depth for shallow clones"
11483msgstr "浅克隆的深度"
11484
11485#: builtin/submodule--helper.c:504
11486msgid ""
11487"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
11488"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
11489msgstr ""
11490"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
11491"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
11492
11493#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
11494#, c-format
11495msgid "could not create directory '%s'"
11496msgstr "不能创建目录 '%s'"
11497
11498#: builtin/submodule--helper.c:531
11499#, c-format
11500msgid "clone of '%s' into submodule path '%s' failed"
11501msgstr "无法克隆 '%s' 到子模组路径 '%s'"
11502
11503#: builtin/submodule--helper.c:547
11504#, c-format
11505msgid "cannot open file '%s'"
11506msgstr "无法打开文件 '%s'"
11507
11508#: builtin/submodule--helper.c:552
11509#, c-format
11510msgid "could not close file %s"
11511msgstr "无法关闭文件 %s"
11512
11513#: builtin/submodule--helper.c:559
11514#, c-format
11515msgid "could not get submodule directory for '%s'"
11516msgstr "无法得到 '%s' 的子模组目录"
11517
11518#: builtin/submodule--helper.c:611
11519#, c-format
11520msgid "Submodule path '%s' not initialized"
11521msgstr "子模组 '%s' 尚未初始化"
11522
11523#: builtin/submodule--helper.c:615
11524msgid "Maybe you want to use 'update --init'?"
11525msgstr "也许您想要执行 'update --init'?"
11526
11527#: builtin/submodule--helper.c:641
11528#, c-format
11529msgid "Skipping unmerged submodule %s"
11530msgstr "略过未合并的子模组 %s"
11531
11532#: builtin/submodule--helper.c:662
11533#, c-format
11534msgid "Skipping submodule '%s'"
11535msgstr "略过子模组 '%s'"
11536
11537#: builtin/submodule--helper.c:792
11538#, c-format
11539msgid "Failed to clone '%s'. Retry scheduled"
11540msgstr "克隆 '%s' 失败。按计划重试"
11541
11542#: builtin/submodule--helper.c:803
11543#, c-format
11544msgid "Failed to clone '%s' a second time, aborting"
11545msgstr "第二次尝试克隆 '%s' 失败,退出"
11546
11547#: builtin/submodule--helper.c:824
11548msgid "path into the working tree"
11549msgstr "到工作区的路径"
11550
11551#: builtin/submodule--helper.c:827
11552msgid "path into the working tree, across nested submodule boundaries"
11553msgstr "工作区中的路径,递归嵌套子模组"
11554
11555#: builtin/submodule--helper.c:831
11556msgid "rebase, merge, checkout or none"
11557msgstr "rebase、merge、checkout 或 none"
11558
11559#: builtin/submodule--helper.c:835
11560msgid "Create a shallow clone truncated to the specified number of revisions"
11561msgstr "创建一个指定深度的浅克隆"
11562
11563#: builtin/submodule--helper.c:838
11564msgid "parallel jobs"
11565msgstr "并发任务"
11566
11567#: builtin/submodule--helper.c:840
11568msgid "whether the initial clone should follow the shallow recommendation"
11569msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
11570
11571#: builtin/submodule--helper.c:841
11572msgid "don't print cloning progress"
11573msgstr "不要输出克隆进度"
11574
11575#: builtin/submodule--helper.c:846
11576msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
11577msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
11578
11579#: builtin/submodule--helper.c:856
11580msgid "bad value for update parameter"
11581msgstr "update 参数取值错误"
11582
11583#: builtin/submodule--helper.c:927
11584#, c-format
11585msgid ""
11586"Submodule (%s) branch configured to inherit branch from superproject, but "
11587"the superproject is not on any branch"
11588msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
11589
11590#: builtin/submodule--helper.c:977
11591msgid "submodule--helper subcommand must be called with a subcommand"
11592msgstr "submodule-helper 子命令必须由另外的子命令调用"
11593
11594#: builtin/submodule--helper.c:984
11595#, c-format
11596msgid "'%s' is not a valid submodule--helper subcommand"
11597msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
11598
11599#: builtin/symbolic-ref.c:7
11600msgid "git symbolic-ref [<options>] <name> [<ref>]"
11601msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
11602
11603#: builtin/symbolic-ref.c:8
11604msgid "git symbolic-ref -d [-q] <name>"
11605msgstr "git symbolic-ref -d [-q] <名称>"
11606
11607#: builtin/symbolic-ref.c:40
11608msgid "suppress error message for non-symbolic (detached) refs"
11609msgstr "不显示非符号(分离的)引用的错误信息"
11610
11611#: builtin/symbolic-ref.c:41
11612msgid "delete symbolic ref"
11613msgstr "删除符号引用"
11614
11615#: builtin/symbolic-ref.c:42
11616msgid "shorten ref output"
11617msgstr "简短的引用输出"
11618
11619#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11620msgid "reason"
11621msgstr "原因"
11622
11623#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11624msgid "reason of the update"
11625msgstr "更新的原因"
11626
11627#: builtin/tag.c:23
11628msgid ""
11629"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
11630"[<head>]"
11631msgstr ""
11632"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
11633
11634#: builtin/tag.c:24
11635msgid "git tag -d <tagname>..."
11636msgstr "git tag -d <标签名>..."
11637
11638#: builtin/tag.c:25
11639msgid ""
11640"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
11641"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
11642msgstr ""
11643"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
11644"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
11645
11646#: builtin/tag.c:27
11647msgid "git tag -v <tagname>..."
11648msgstr "git tag -v <标签名>..."
11649
11650#: builtin/tag.c:81
11651#, c-format
11652msgid "tag name too long: %.*s..."
11653msgstr "标签名称太长:%.*s..."
11654
11655#: builtin/tag.c:86
11656#, c-format
11657msgid "tag '%s' not found."
11658msgstr "未发现标签 '%s'。"
11659
11660#: builtin/tag.c:101
11661#, c-format
11662msgid "Deleted tag '%s' (was %s)\n"
11663msgstr "已删除标签 '%s'(曾为 %s)\n"
11664
11665#: builtin/tag.c:117
11666#, c-format
11667msgid ""
11668"\n"
11669"Write a message for tag:\n"
11670"  %s\n"
11671"Lines starting with '%c' will be ignored.\n"
11672msgstr ""
11673"\n"
11674"输入一个标签说明:\n"
11675"  %s\n"
11676"以 '%c' 开头的行将被忽略。\n"
11677
11678#: builtin/tag.c:121
11679#, c-format
11680msgid ""
11681"\n"
11682"Write a message for tag:\n"
11683"  %s\n"
11684"Lines starting with '%c' will be kept; you may remove them yourself if you "
11685"want to.\n"
11686msgstr ""
11687"\n"
11688"输入一个标签说明:\n"
11689"  %s\n"
11690"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
11691
11692#: builtin/tag.c:199
11693msgid "unable to sign the tag"
11694msgstr "无法签署标签"
11695
11696#: builtin/tag.c:201
11697msgid "unable to write tag file"
11698msgstr "无法写标签文件"
11699
11700#: builtin/tag.c:226
11701msgid "bad object type."
11702msgstr "坏的对象类型。"
11703
11704#: builtin/tag.c:239
11705msgid "tag header too big."
11706msgstr "标签头信息太大。"
11707
11708#: builtin/tag.c:275
11709msgid "no tag message?"
11710msgstr "无标签说明?"
11711
11712#: builtin/tag.c:281
11713#, c-format
11714msgid "The tag message has been left in %s\n"
11715msgstr "标签说明被保留在 %s\n"
11716
11717#: builtin/tag.c:339
11718msgid "list tag names"
11719msgstr "列出标签名称"
11720
11721#: builtin/tag.c:341
11722msgid "print <n> lines of each tag message"
11723msgstr "每个标签信息打印 <n> 行"
11724
11725#: builtin/tag.c:343
11726msgid "delete tags"
11727msgstr "删除标签"
11728
11729#: builtin/tag.c:344
11730msgid "verify tags"
11731msgstr "验证标签"
11732
11733#: builtin/tag.c:346
11734msgid "Tag creation options"
11735msgstr "标签创建选项"
11736
11737#: builtin/tag.c:348
11738msgid "annotated tag, needs a message"
11739msgstr "附注标签,需要一个说明"
11740
11741#: builtin/tag.c:350
11742msgid "tag message"
11743msgstr "标签说明"
11744
11745#: builtin/tag.c:352
11746msgid "annotated and GPG-signed tag"
11747msgstr "附注并附加 GPG 签名的标签"
11748
11749#: builtin/tag.c:356
11750msgid "use another key to sign the tag"
11751msgstr "使用另外的私钥签名该标签"
11752
11753#: builtin/tag.c:357
11754msgid "replace the tag if exists"
11755msgstr "如果存在,替换现有的标签"
11756
11757#: builtin/tag.c:358 builtin/update-ref.c:368
11758msgid "create a reflog"
11759msgstr "创建引用日志"
11760
11761#: builtin/tag.c:360
11762msgid "Tag listing options"
11763msgstr "标签列表选项"
11764
11765#: builtin/tag.c:361
11766msgid "show tag list in columns"
11767msgstr "以列的方式显示标签列表"
11768
11769#: builtin/tag.c:362 builtin/tag.c:363
11770msgid "print only tags that contain the commit"
11771msgstr "只打印包含提交的标签"
11772
11773#: builtin/tag.c:364
11774msgid "print only tags that are merged"
11775msgstr "只打印已经合并的标签"
11776
11777#: builtin/tag.c:365
11778msgid "print only tags that are not merged"
11779msgstr "只打印尚未合并的标签"
11780
11781#: builtin/tag.c:370
11782msgid "print only tags of the object"
11783msgstr "只打印对象的标签"
11784
11785#: builtin/tag.c:399
11786msgid "--column and -n are incompatible"
11787msgstr "--column 和 -n 不兼容"
11788
11789#: builtin/tag.c:419
11790msgid "-n option is only allowed with -l."
11791msgstr "-n 选项只允许和 -l 同时使用。"
11792
11793#: builtin/tag.c:421
11794msgid "--contains option is only allowed with -l."
11795msgstr "--contains 选项只允许和 -l 同时使用。"
11796
11797#: builtin/tag.c:423
11798msgid "--points-at option is only allowed with -l."
11799msgstr "--points-at 选项只允许和 -l 同时使用。"
11800
11801#: builtin/tag.c:425
11802msgid "--merged and --no-merged option are only allowed with -l"
11803msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
11804
11805#: builtin/tag.c:433
11806msgid "only one -F or -m option is allowed."
11807msgstr "只允许一个 -F 或 -m 选项。"
11808
11809#: builtin/tag.c:452
11810msgid "too many params"
11811msgstr "太多参数"
11812
11813#: builtin/tag.c:458
11814#, c-format
11815msgid "'%s' is not a valid tag name."
11816msgstr "'%s' 不是一个有效的标签名称。"
11817
11818#: builtin/tag.c:463
11819#, c-format
11820msgid "tag '%s' already exists"
11821msgstr "标签 '%s' 已存在"
11822
11823#: builtin/tag.c:491
11824#, c-format
11825msgid "Updated tag '%s' (was %s)\n"
11826msgstr "已更新标签 '%s'(曾为 %s)\n"
11827
11828#: builtin/unpack-objects.c:490
11829msgid "Unpacking objects"
11830msgstr "展开对象中"
11831
11832#: builtin/update-index.c:79
11833#, c-format
11834msgid "failed to create directory %s"
11835msgstr "无法创建目录 %s"
11836
11837#: builtin/update-index.c:85
11838#, c-format
11839msgid "failed to stat %s"
11840msgstr "无法枚举 %s 状态"
11841
11842#: builtin/update-index.c:95
11843#, c-format
11844msgid "failed to create file %s"
11845msgstr "无法创建文件 %s"
11846
11847#: builtin/update-index.c:103
11848#, c-format
11849msgid "failed to delete file %s"
11850msgstr "无法删除文件 %s"
11851
11852#: builtin/update-index.c:110 builtin/update-index.c:212
11853#, c-format
11854msgid "failed to delete directory %s"
11855msgstr "无法删除目录 %s"
11856
11857#: builtin/update-index.c:133
11858#, c-format
11859msgid "Testing mtime in '%s' "
11860msgstr "在 '%s' 中测试 mtime "
11861
11862#: builtin/update-index.c:145
11863msgid "directory stat info does not change after adding a new file"
11864msgstr "添加一个新文件后,目录的状态信息未改变"
11865
11866#: builtin/update-index.c:158
11867msgid "directory stat info does not change after adding a new directory"
11868msgstr "添加一个新目录后,目录的状态信息未改变"
11869
11870#: builtin/update-index.c:171
11871msgid "directory stat info changes after updating a file"
11872msgstr "更新一个文件后,目录的状态信息被修改"
11873
11874#: builtin/update-index.c:182
11875msgid "directory stat info changes after adding a file inside subdirectory"
11876msgstr "在子目录中添加文件后,目录的状态信息被修改"
11877
11878#: builtin/update-index.c:193
11879msgid "directory stat info does not change after deleting a file"
11880msgstr "删除一个文件后,目录的状态信息未改变"
11881
11882#: builtin/update-index.c:206
11883msgid "directory stat info does not change after deleting a directory"
11884msgstr "删除一个目录后,目录的状态信息未改变"
11885
11886#: builtin/update-index.c:213
11887msgid " OK"
11888msgstr " OK"
11889
11890#: builtin/update-index.c:575
11891msgid "git update-index [<options>] [--] [<file>...]"
11892msgstr "git update-index [<选项>] [--] [<文件>...]"
11893
11894#: builtin/update-index.c:930
11895msgid "continue refresh even when index needs update"
11896msgstr "当索引需要更新时继续刷新"
11897
11898#: builtin/update-index.c:933
11899msgid "refresh: ignore submodules"
11900msgstr "刷新:忽略子模组"
11901
11902#: builtin/update-index.c:936
11903msgid "do not ignore new files"
11904msgstr "不忽略新的文件"
11905
11906#: builtin/update-index.c:938
11907msgid "let files replace directories and vice-versa"
11908msgstr "让文件替换目录(反之亦然)"
11909
11910#: builtin/update-index.c:940
11911msgid "notice files missing from worktree"
11912msgstr "通知文件从工作区丢失"
11913
11914#: builtin/update-index.c:942
11915msgid "refresh even if index contains unmerged entries"
11916msgstr "即使索引区包含未合并的条目也执行刷新"
11917
11918#: builtin/update-index.c:945
11919msgid "refresh stat information"
11920msgstr "刷新统计信息"
11921
11922#: builtin/update-index.c:949
11923msgid "like --refresh, but ignore assume-unchanged setting"
11924msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
11925
11926#: builtin/update-index.c:953
11927msgid "<mode>,<object>,<path>"
11928msgstr "<存取模式>,<对象>,<路径>"
11929
11930#: builtin/update-index.c:954
11931msgid "add the specified entry to the index"
11932msgstr "添加指定的条目到索引区"
11933
11934#: builtin/update-index.c:963
11935msgid "mark files as \"not changing\""
11936msgstr "把文件标记为 \"没有变更\""
11937
11938#: builtin/update-index.c:966
11939msgid "clear assumed-unchanged bit"
11940msgstr "清除 assumed-unchanged 位"
11941
11942#: builtin/update-index.c:969
11943msgid "mark files as \"index-only\""
11944msgstr "把文件标记为 \"仅索引\""
11945
11946#: builtin/update-index.c:972
11947msgid "clear skip-worktree bit"
11948msgstr "清除 skip-worktree 位"
11949
11950#: builtin/update-index.c:975
11951msgid "add to index only; do not add content to object database"
11952msgstr "只添加到索引区;不添加对象到对象库"
11953
11954#: builtin/update-index.c:977
11955msgid "remove named paths even if present in worktree"
11956msgstr "即使存在工作区里,也删除路径"
11957
11958#: builtin/update-index.c:979
11959msgid "with --stdin: input lines are terminated by null bytes"
11960msgstr "携带 --stdin:输入的行以 null 字符终止"
11961
11962#: builtin/update-index.c:981
11963msgid "read list of paths to be updated from standard input"
11964msgstr "从标准输入中读取需要更新的路径列表"
11965
11966#: builtin/update-index.c:985
11967msgid "add entries from standard input to the index"
11968msgstr "从标准输入添加条目到索引区"
11969
11970#: builtin/update-index.c:989
11971msgid "repopulate stages #2 and #3 for the listed paths"
11972msgstr "为指定文件重新生成第2和第3暂存区"
11973
11974#: builtin/update-index.c:993
11975msgid "only update entries that differ from HEAD"
11976msgstr "只更新与 HEAD 不同的条目"
11977
11978#: builtin/update-index.c:997
11979msgid "ignore files missing from worktree"
11980msgstr "忽略工作区丢失的文件"
11981
11982#: builtin/update-index.c:1000
11983msgid "report actions to standard output"
11984msgstr "在标准输出显示操作"
11985
11986#: builtin/update-index.c:1002
11987msgid "(for porcelains) forget saved unresolved conflicts"
11988msgstr "(for porcelains) 忘记保存的未解决的冲突"
11989
11990#: builtin/update-index.c:1006
11991msgid "write index in this format"
11992msgstr "以这种格式写入索引区"
11993
11994#: builtin/update-index.c:1008
11995msgid "enable or disable split index"
11996msgstr "启用或禁用索引拆分"
11997
11998#: builtin/update-index.c:1010
11999msgid "enable/disable untracked cache"
12000msgstr "启用/禁用对未跟踪文件的缓存"
12001
12002#: builtin/update-index.c:1012
12003msgid "test if the filesystem supports untracked cache"
12004msgstr "测试文件系统是否支持未跟踪文件缓存"
12005
12006#: builtin/update-index.c:1014
12007msgid "enable untracked cache without testing the filesystem"
12008msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
12009
12010#: builtin/update-index.c:1134
12011msgid "Untracked cache disabled"
12012msgstr "缓存未跟踪文件被禁用"
12013
12014#: builtin/update-index.c:1146
12015#, c-format
12016msgid "Untracked cache enabled for '%s'"
12017msgstr "缓存未跟踪文件在 '%s' 启用"
12018
12019#: builtin/update-ref.c:9
12020msgid "git update-ref [<options>] -d <refname> [<old-val>]"
12021msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
12022
12023#: builtin/update-ref.c:10
12024msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
12025msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
12026
12027#: builtin/update-ref.c:11
12028msgid "git update-ref [<options>] --stdin [-z]"
12029msgstr "git update-ref [<选项>] --stdin [-z]"
12030
12031#: builtin/update-ref.c:363
12032msgid "delete the reference"
12033msgstr "删除引用"
12034
12035#: builtin/update-ref.c:365
12036msgid "update <refname> not the one it points to"
12037msgstr "更新 <引用名> 本身而不是它指向的引用"
12038
12039#: builtin/update-ref.c:366
12040msgid "stdin has NUL-terminated arguments"
12041msgstr "标准输入有以 NUL 字符终止的参数"
12042
12043#: builtin/update-ref.c:367
12044msgid "read updates from stdin"
12045msgstr "从标准输入读取更新"
12046
12047#: builtin/update-server-info.c:6
12048msgid "git update-server-info [--force]"
12049msgstr "git update-server-info [--force]"
12050
12051#: builtin/update-server-info.c:14
12052msgid "update the info files from scratch"
12053msgstr "从头开始更新文件信息"
12054
12055#: builtin/verify-commit.c:17
12056msgid "git verify-commit [-v | --verbose] <commit>..."
12057msgstr "git verify-commit [-v | --verbose] <提交>..."
12058
12059#: builtin/verify-commit.c:72
12060msgid "print commit contents"
12061msgstr "打印提交内容"
12062
12063#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
12064msgid "print raw gpg status output"
12065msgstr "打印原始 gpg 状态输出"
12066
12067#: builtin/verify-pack.c:54
12068msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
12069msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
12070
12071#: builtin/verify-pack.c:64
12072msgid "verbose"
12073msgstr "冗长输出"
12074
12075#: builtin/verify-pack.c:66
12076msgid "show statistics only"
12077msgstr "只显示统计"
12078
12079#: builtin/verify-tag.c:17
12080msgid "git verify-tag [-v | --verbose] <tag>..."
12081msgstr "git verify-tag [-v | --verbose] <标签>..."
12082
12083#: builtin/verify-tag.c:34
12084msgid "print tag contents"
12085msgstr "打印标签内容"
12086
12087#: builtin/worktree.c:15
12088msgid "git worktree add [<options>] <path> [<branch>]"
12089msgstr "git worktree add [<选项>] <路径> [<分支>]"
12090
12091#: builtin/worktree.c:16
12092msgid "git worktree list [<options>]"
12093msgstr "git worktree list [<选项>]"
12094
12095#: builtin/worktree.c:17
12096msgid "git worktree lock [<options>] <path>"
12097msgstr "git worktree lock [<选项>] <路径>"
12098
12099#: builtin/worktree.c:18
12100msgid "git worktree prune [<options>]"
12101msgstr "git worktree prune [<选项>]"
12102
12103#: builtin/worktree.c:19
12104msgid "git worktree unlock <path>"
12105msgstr "git worktree unlock <路径>"
12106
12107#: builtin/worktree.c:42
12108#, c-format
12109msgid "Removing worktrees/%s: not a valid directory"
12110msgstr "删除工作区/%s:不是一个有效的目录"
12111
12112#: builtin/worktree.c:48
12113#, c-format
12114msgid "Removing worktrees/%s: gitdir file does not exist"
12115msgstr "删除 worktrees/%s:gitdir 文件不存在"
12116
12117#: builtin/worktree.c:53
12118#, c-format
12119msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
12120msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
12121
12122#: builtin/worktree.c:64
12123#, c-format
12124msgid "Removing worktrees/%s: invalid gitdir file"
12125msgstr "删除 worktrees/%s:无效的 gitdir 文件"
12126
12127#: builtin/worktree.c:80
12128#, c-format
12129msgid "Removing worktrees/%s: gitdir file points to non-existent location"
12130msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
12131
12132#: builtin/worktree.c:204
12133#, c-format
12134msgid "'%s' already exists"
12135msgstr "'%s' 已经存在"
12136
12137#: builtin/worktree.c:236
12138#, c-format
12139msgid "could not create directory of '%s'"
12140msgstr "不能创建目录 '%s'"
12141
12142#: builtin/worktree.c:272
12143#, c-format
12144msgid "Preparing %s (identifier %s)"
12145msgstr "准备 %s (标识符 %s)"
12146
12147#: builtin/worktree.c:323
12148msgid "checkout <branch> even if already checked out in other worktree"
12149msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
12150
12151#: builtin/worktree.c:325
12152msgid "create a new branch"
12153msgstr "创建一个新分支"
12154
12155#: builtin/worktree.c:327
12156msgid "create or reset a branch"
12157msgstr "创建或重置一个分支"
12158
12159#: builtin/worktree.c:329
12160msgid "populate the new working tree"
12161msgstr "生成新的工作区"
12162
12163#: builtin/worktree.c:337
12164msgid "-b, -B, and --detach are mutually exclusive"
12165msgstr "-b、-B 和 --detach 是互斥的"
12166
12167#: builtin/worktree.c:470
12168msgid "reason for locking"
12169msgstr "锁定原因"
12170
12171#: builtin/worktree.c:482 builtin/worktree.c:515
12172#, c-format
12173msgid "'%s' is not a working tree"
12174msgstr "'%s' 不是一个工作区"
12175
12176#: builtin/worktree.c:484 builtin/worktree.c:517
12177msgid "The main working tree cannot be locked or unlocked"
12178msgstr "主工作区无法被加锁或解锁"
12179
12180#: builtin/worktree.c:489
12181#, c-format
12182msgid "'%s' is already locked, reason: %s"
12183msgstr "'%s' 已被锁定,原因:%s"
12184
12185#: builtin/worktree.c:491
12186#, c-format
12187msgid "'%s' is already locked"
12188msgstr "'%s' 已被锁定"
12189
12190#: builtin/worktree.c:519
12191#, c-format
12192msgid "'%s' is not locked"
12193msgstr "'%s' 未被锁定"
12194
12195#: builtin/write-tree.c:13
12196msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
12197msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
12198
12199#: builtin/write-tree.c:26
12200msgid "<prefix>/"
12201msgstr "<前缀>/"
12202
12203#: builtin/write-tree.c:27
12204msgid "write tree object for a subdirectory <prefix>"
12205msgstr "将 <前缀> 子目录内容写到一个树对象"
12206
12207#: builtin/write-tree.c:30
12208msgid "only useful for debugging"
12209msgstr "只对调试有用"
12210
12211#: upload-pack.c:20
12212msgid "git upload-pack [<options>] <dir>"
12213msgstr "git upload-pack [<选项>] <目录>"
12214
12215#: upload-pack.c:837
12216msgid "quit after a single request/response exchange"
12217msgstr "在一次单独的请求/响应(request/response)交换后退出"
12218
12219#: upload-pack.c:839
12220msgid "exit immediately after initial ref advertisement"
12221msgstr "在初始的引用广告后立即退出"
12222
12223#: upload-pack.c:841
12224msgid "do not try <directory>/.git/ if <directory> is no Git directory"
12225msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
12226
12227#: upload-pack.c:843
12228msgid "interrupt transfer after <n> seconds of inactivity"
12229msgstr "不活动 <n> 秒钟后终止传输"
12230
12231#: credential-cache--daemon.c:271
12232msgid "print debugging messages to stderr"
12233msgstr "调试信息输出到标准错误"
12234
12235#: git.c:14
12236msgid ""
12237"'git help -a' and 'git help -g' list available subcommands and some\n"
12238"concept guides. See 'git help <command>' or 'git help <concept>'\n"
12239"to read about a specific subcommand or concept."
12240msgstr ""
12241"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
12242"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
12243"帮助。"
12244
12245#: http.c:323
12246msgid "Public key pinning not supported with cURL < 7.44.0"
12247msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
12248
12249#: common-cmds.h:9
12250msgid "start a working area (see also: git help tutorial)"
12251msgstr "开始一个工作区(参见:git help tutorial)"
12252
12253#: common-cmds.h:10
12254msgid "work on the current change (see also: git help everyday)"
12255msgstr "在当前变更上工作(参见:git help everyday)"
12256
12257#: common-cmds.h:11
12258msgid "examine the history and state (see also: git help revisions)"
12259msgstr "检查历史和状态(参见:git help revisions)"
12260
12261#: common-cmds.h:12
12262msgid "grow, mark and tweak your common history"
12263msgstr "扩展、标记和调校您的历史记录"
12264
12265#: common-cmds.h:13
12266msgid "collaborate (see also: git help workflows)"
12267msgstr "协同(参见:git help workflows)"
12268
12269#: common-cmds.h:17
12270msgid "Add file contents to the index"
12271msgstr "添加文件内容至索引"
12272
12273#: common-cmds.h:18
12274msgid "Use binary search to find the commit that introduced a bug"
12275msgstr "通过二分查找定位引入 bug 的提交"
12276
12277#: common-cmds.h:19
12278msgid "List, create, or delete branches"
12279msgstr "列出、创建或删除分支"
12280
12281#: common-cmds.h:20
12282msgid "Switch branches or restore working tree files"
12283msgstr "切换分支或恢复工作区文件"
12284
12285#: common-cmds.h:21
12286msgid "Clone a repository into a new directory"
12287msgstr "克隆一个仓库到一个新目录"
12288
12289#: common-cmds.h:22
12290msgid "Record changes to the repository"
12291msgstr "记录变更到仓库"
12292
12293#: common-cmds.h:23
12294msgid "Show changes between commits, commit and working tree, etc"
12295msgstr "显示提交之间、提交和工作区之间等的差异"
12296
12297#: common-cmds.h:24
12298msgid "Download objects and refs from another repository"
12299msgstr "从另外一个仓库下载对象和引用"
12300
12301#: common-cmds.h:25
12302msgid "Print lines matching a pattern"
12303msgstr "输出和模式匹配的行"
12304
12305#: common-cmds.h:26
12306msgid "Create an empty Git repository or reinitialize an existing one"
12307msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
12308
12309#: common-cmds.h:27
12310msgid "Show commit logs"
12311msgstr "显示提交日志"
12312
12313#: common-cmds.h:28
12314msgid "Join two or more development histories together"
12315msgstr "合并两个或更多开发历史"
12316
12317#: common-cmds.h:29
12318msgid "Move or rename a file, a directory, or a symlink"
12319msgstr "移动或重命名一个文件、目录或符号链接"
12320
12321#: common-cmds.h:30
12322msgid "Fetch from and integrate with another repository or a local branch"
12323msgstr "获取并整合另外的仓库或一个本地分支"
12324
12325#: common-cmds.h:31
12326msgid "Update remote refs along with associated objects"
12327msgstr "更新远程引用和相关的对象"
12328
12329#: common-cmds.h:32
12330msgid "Reapply commits on top of another base tip"
12331msgstr "在另一个分支上重新应用提交"
12332
12333#: common-cmds.h:33
12334msgid "Reset current HEAD to the specified state"
12335msgstr "重置当前 HEAD 到指定状态"
12336
12337#: common-cmds.h:34
12338msgid "Remove files from the working tree and from the index"
12339msgstr "从工作区和索引中删除文件"
12340
12341#: common-cmds.h:35
12342msgid "Show various types of objects"
12343msgstr "显示各种类型的对象"
12344
12345#: common-cmds.h:36
12346msgid "Show the working tree status"
12347msgstr "显示工作区状态"
12348
12349#: common-cmds.h:37
12350msgid "Create, list, delete or verify a tag object signed with GPG"
12351msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
12352
12353#: parse-options.h:145
12354msgid "expiry-date"
12355msgstr "到期时间"
12356
12357#: parse-options.h:160
12358msgid "no-op (backward compatibility)"
12359msgstr "空操作(向后兼容)"
12360
12361#: parse-options.h:237
12362msgid "be more verbose"
12363msgstr "更加详细"
12364
12365#: parse-options.h:239
12366msgid "be more quiet"
12367msgstr "更加安静"
12368
12369#: parse-options.h:245
12370msgid "use <n> digits to display SHA-1s"
12371msgstr "用 <n> 位数字显示 SHA-1 哈希值"
12372
12373#: rerere.h:40
12374msgid "update the index with reused conflict resolution if possible"
12375msgstr "如果可能,重用冲突解决更新索引"
12376
12377#: git-bisect.sh:54
12378msgid "You need to start by \"git bisect start\""
12379msgstr "您需要执行 \"git bisect start\" 来开始"
12380
12381#  译者:注意保持句尾空格
12382#. TRANSLATORS: Make sure to include [Y] and [n] in your
12383#. translation. The program will only accept English input
12384#. at this point.
12385#: git-bisect.sh:60
12386msgid "Do you want me to do it for you [Y/n]? "
12387msgstr "您想让我为您这样做么[Y/n]? "
12388
12389#: git-bisect.sh:121
12390#, sh-format
12391msgid "unrecognised option: '$arg'"
12392msgstr "未能识别的选项:'$arg'"
12393
12394#: git-bisect.sh:125
12395#, sh-format
12396msgid "'$arg' does not appear to be a valid revision"
12397msgstr "'$arg' 看起来不像是一个有效的版本"
12398
12399#: git-bisect.sh:154
12400msgid "Bad HEAD - I need a HEAD"
12401msgstr "坏的 HEAD - 我需要一个 HEAD"
12402
12403#: git-bisect.sh:167
12404#, sh-format
12405msgid ""
12406"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
12407msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
12408
12409#: git-bisect.sh:177
12410msgid "won't bisect on cg-seek'ed tree"
12411msgstr "不会在做了 cg-seek 的树上做二分查找"
12412
12413#: git-bisect.sh:181
12414msgid "Bad HEAD - strange symbolic ref"
12415msgstr "坏的 HEAD - 奇怪的符号引用"
12416
12417#: git-bisect.sh:233
12418#, sh-format
12419msgid "Bad bisect_write argument: $state"
12420msgstr "坏的 bisect_write 参数:$state"
12421
12422#: git-bisect.sh:262
12423#, sh-format
12424msgid "Bad rev input: $arg"
12425msgstr "坏的输入版本:$arg"
12426
12427#: git-bisect.sh:281
12428#, sh-format
12429msgid "Bad rev input: $bisected_head"
12430msgstr "坏的输入版本:$bisected_head"
12431
12432#: git-bisect.sh:290
12433#, sh-format
12434msgid "Bad rev input: $rev"
12435msgstr "坏的输入版本:$rev"
12436
12437#: git-bisect.sh:299
12438#, sh-format
12439msgid "'git bisect $TERM_BAD' can take only one argument."
12440msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
12441
12442#: git-bisect.sh:322
12443#, sh-format
12444msgid "Warning: bisecting only with a $TERM_BAD commit."
12445msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
12446
12447#  译者:注意保持句尾空格
12448#. TRANSLATORS: Make sure to include [Y] and [n] in your
12449#. translation. The program will only accept English input
12450#. at this point.
12451#: git-bisect.sh:328
12452msgid "Are you sure [Y/n]? "
12453msgstr "您确认么[Y/n]? "
12454
12455#: git-bisect.sh:340
12456#, sh-format
12457msgid ""
12458"You need to give me at least one $bad_syn and one $good_syn revision.\n"
12459"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
12460msgstr ""
12461"您需要给我至少一个好版本和一个坏版本。\n"
12462"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
12463
12464#: git-bisect.sh:343
12465#, sh-format
12466msgid ""
12467"You need to start by \"git bisect start\".\n"
12468"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
12469"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
12470msgstr ""
12471"您需要执行 \"git bisect start\" 来开始。\n"
12472"然后需要提供我至少一个好版本和一个坏版本。\n"
12473"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
12474
12475#: git-bisect.sh:414 git-bisect.sh:546
12476msgid "We are not bisecting."
12477msgstr "我们没有在二分查找。"
12478
12479#: git-bisect.sh:421
12480#, sh-format
12481msgid "'$invalid' is not a valid commit"
12482msgstr "'$invalid' 不是一个有效的提交"
12483
12484#: git-bisect.sh:430
12485#, sh-format
12486msgid ""
12487"Could not check out original HEAD '$branch'.\n"
12488"Try 'git bisect reset <commit>'."
12489msgstr ""
12490"不能检出原始 HEAD '$branch'。\n"
12491"尝试 'git bisect reset <提交>'。"
12492
12493#: git-bisect.sh:458
12494msgid "No logfile given"
12495msgstr "未提供日志文件"
12496
12497#: git-bisect.sh:459
12498#, sh-format
12499msgid "cannot read $file for replaying"
12500msgstr "不能读取 $file 来重放"
12501
12502#: git-bisect.sh:480
12503msgid "?? what are you talking about?"
12504msgstr "?? 您在说什么?"
12505
12506#: git-bisect.sh:492
12507#, sh-format
12508msgid "running $command"
12509msgstr "运行 $command"
12510
12511#: git-bisect.sh:499
12512#, sh-format
12513msgid ""
12514"bisect run failed:\n"
12515"exit code $res from '$command' is < 0 or >= 128"
12516msgstr ""
12517"二分查找运行失败:\n"
12518"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
12519
12520#: git-bisect.sh:525
12521msgid "bisect run cannot continue any more"
12522msgstr "二分查找不能继续运行"
12523
12524#: git-bisect.sh:531
12525#, sh-format
12526msgid ""
12527"bisect run failed:\n"
12528"'bisect_state $state' exited with error code $res"
12529msgstr ""
12530"二分查找运行失败:\n"
12531"'bisect_state $state' 退出码为 $res"
12532
12533#: git-bisect.sh:538
12534msgid "bisect run success"
12535msgstr "二分查找运行成功"
12536
12537#: git-bisect.sh:565
12538msgid "please use two different terms"
12539msgstr "请使用两个不同的术语"
12540
12541#: git-bisect.sh:575
12542#, sh-format
12543msgid "'$term' is not a valid term"
12544msgstr "'$term' 不是一个有效的名称"
12545
12546#: git-bisect.sh:578
12547#, sh-format
12548msgid "can't use the builtin command '$term' as a term"
12549msgstr "不能使用内置命令 '$term' 作为术语"
12550
12551#: git-bisect.sh:587 git-bisect.sh:593
12552#, sh-format
12553msgid "can't change the meaning of term '$term'"
12554msgstr "不能修改术语 '$term' 的含义"
12555
12556#: git-bisect.sh:606
12557#, sh-format
12558msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
12559msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
12560
12561#: git-bisect.sh:636
12562msgid "no terms defined"
12563msgstr "未定义术语"
12564
12565#: git-bisect.sh:653
12566#, sh-format
12567msgid ""
12568"invalid argument $arg for 'git bisect terms'.\n"
12569"Supported options are: --term-good|--term-old and --term-bad|--term-new."
12570msgstr ""
12571"参数 $arg 对命令 'git bisect terms' 无效。\n"
12572"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
12573
12574#: git-merge-octopus.sh:46
12575msgid ""
12576"Error: Your local changes to the following files would be overwritten by "
12577"merge"
12578msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
12579
12580#: git-merge-octopus.sh:61
12581msgid "Automated merge did not work."
12582msgstr "自动合并未生效。"
12583
12584#: git-merge-octopus.sh:62
12585msgid "Should not be doing an Octopus."
12586msgstr "不应该执行章鱼式合并。"
12587
12588#: git-merge-octopus.sh:73
12589#, sh-format
12590msgid "Unable to find common commit with $pretty_name"
12591msgstr "无法找到和 $pretty_name 的基线提交"
12592
12593#: git-merge-octopus.sh:77
12594#, sh-format
12595msgid "Already up-to-date with $pretty_name"
12596msgstr "已经和 $pretty_name 保持一致"
12597
12598#: git-merge-octopus.sh:89
12599#, sh-format
12600msgid "Fast-forwarding to: $pretty_name"
12601msgstr "快进至:$pretty_name"
12602
12603#: git-merge-octopus.sh:97
12604#, sh-format
12605msgid "Trying simple merge with $pretty_name"
12606msgstr "尝试和 $pretty_name 的简单合并"
12607
12608#: git-merge-octopus.sh:102
12609msgid "Simple merge did not work, trying automatic merge."
12610msgstr "简单合并未生效,尝试自动合并。"
12611
12612#: git-rebase.sh:56
12613msgid ""
12614"When you have resolved this problem, run \"git rebase --continue\".\n"
12615"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
12616"To check out the original branch and stop rebasing, run \"git rebase --abort"
12617"\"."
12618msgstr ""
12619"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
12620"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
12621"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
12622
12623#: git-rebase.sh:156 git-rebase.sh:395
12624#, sh-format
12625msgid "Could not move back to $head_name"
12626msgstr "无法移回 $head_name"
12627
12628#: git-rebase.sh:167
12629msgid "Applied autostash."
12630msgstr "成功应用 autostash。"
12631
12632#: git-rebase.sh:170
12633#, sh-format
12634msgid "Cannot store $stash_sha1"
12635msgstr "无法保存 $stash_sha1"
12636
12637#: git-rebase.sh:171
12638msgid ""
12639"Applying autostash resulted in conflicts.\n"
12640"Your changes are safe in the stash.\n"
12641"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
12642msgstr ""
12643"应用 autostash 导致冲突。\n"
12644"您的修改安全地保存在 stash 中。\n"
12645"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
12646
12647#: git-rebase.sh:210
12648msgid "The pre-rebase hook refused to rebase."
12649msgstr "钩子 pre-rebase 拒绝变基操作。"
12650
12651#: git-rebase.sh:215
12652msgid "It looks like git-am is in progress. Cannot rebase."
12653msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
12654
12655#: git-rebase.sh:356
12656msgid "No rebase in progress?"
12657msgstr "没有正在进行的变基?"
12658
12659#: git-rebase.sh:367
12660msgid "The --edit-todo action can only be used during interactive rebase."
12661msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
12662
12663#: git-rebase.sh:374
12664msgid "Cannot read HEAD"
12665msgstr "不能读取 HEAD"
12666
12667#: git-rebase.sh:377
12668msgid ""
12669"You must edit all merge conflicts and then\n"
12670"mark them as resolved using git add"
12671msgstr ""
12672"您必须编辑所有的合并冲突,然后通过 git add\n"
12673"命令将它们标记为已解决"
12674
12675#: git-rebase.sh:414
12676#, sh-format
12677msgid ""
12678"It seems that there is already a $state_dir_base directory, and\n"
12679"I wonder if you are in the middle of another rebase.  If that is the\n"
12680"case, please try\n"
12681"\t$cmd_live_rebase\n"
12682"If that is not the case, please\n"
12683"\t$cmd_clear_stale_rebase\n"
12684"and run me again.  I am stopping in case you still have something\n"
12685"valuable there."
12686msgstr ""
12687"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
12688"过程中。 如果是这样,请执行\n"
12689"\t$cmd_live_rebase\n"
12690"如果不是这样,请执行\n"
12691"\t$cmd_clear_stale_rebase\n"
12692"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
12693
12694#: git-rebase.sh:465
12695#, sh-format
12696msgid "invalid upstream $upstream_name"
12697msgstr "无效的上游 $upstream_name"
12698
12699#: git-rebase.sh:489
12700#, sh-format
12701msgid "$onto_name: there are more than one merge bases"
12702msgstr "$onto_name: 有一个以上的合并基准"
12703
12704#: git-rebase.sh:492 git-rebase.sh:496
12705#, sh-format
12706msgid "$onto_name: there is no merge base"
12707msgstr "$onto_name: 没有合并基准"
12708
12709#: git-rebase.sh:501
12710#, sh-format
12711msgid "Does not point to a valid commit: $onto_name"
12712msgstr "没有指向一个有效的提交:$onto_name"
12713
12714#: git-rebase.sh:524
12715#, sh-format
12716msgid "fatal: no such branch: $branch_name"
12717msgstr "严重错误:无此分支:$branch_name"
12718
12719#: git-rebase.sh:557
12720msgid "Cannot autostash"
12721msgstr "无法 autostash"
12722
12723#: git-rebase.sh:562
12724#, sh-format
12725msgid "Created autostash: $stash_abbrev"
12726msgstr "创建了 autostash: $stash_abbrev"
12727
12728#: git-rebase.sh:566
12729msgid "Please commit or stash them."
12730msgstr "请提交或为它们保存进度。"
12731
12732#: git-rebase.sh:586
12733#, sh-format
12734msgid "Current branch $branch_name is up to date."
12735msgstr "当前分支 $branch_name 是最新的。"
12736
12737#: git-rebase.sh:590
12738#, sh-format
12739msgid "Current branch $branch_name is up to date, rebase forced."
12740msgstr "当前分支 $branch_name 是最新的,强制变基。"
12741
12742#: git-rebase.sh:601
12743#, sh-format
12744msgid "Changes from $mb to $onto:"
12745msgstr "变更从 $mb 到 $onto:"
12746
12747#: git-rebase.sh:610
12748msgid "First, rewinding head to replay your work on top of it..."
12749msgstr "首先,回退分支以便在上面重放您的工作..."
12750
12751#: git-rebase.sh:620
12752#, sh-format
12753msgid "Fast-forwarded $branch_name to $onto_name."
12754msgstr "快进 $branch_name 至 $onto_name。"
12755
12756#: git-stash.sh:50
12757msgid "git stash clear with parameters is unimplemented"
12758msgstr "git stash clear 不支持参数"
12759
12760#: git-stash.sh:73
12761msgid "You do not have the initial commit yet"
12762msgstr "您尚未建立初始提交"
12763
12764#: git-stash.sh:88
12765msgid "Cannot save the current index state"
12766msgstr "无法保存当前索引状态"
12767
12768#: git-stash.sh:123 git-stash.sh:136
12769msgid "Cannot save the current worktree state"
12770msgstr "无法保存当前工作区状态"
12771
12772#: git-stash.sh:140
12773msgid "No changes selected"
12774msgstr "没有选择变更"
12775
12776#: git-stash.sh:143
12777msgid "Cannot remove temporary index (can't happen)"
12778msgstr "无法删除临时索引(不应发生)"
12779
12780#: git-stash.sh:156
12781msgid "Cannot record working tree state"
12782msgstr "不能记录工作区状态"
12783
12784#: git-stash.sh:188
12785#, sh-format
12786msgid "Cannot update $ref_stash with $w_commit"
12787msgstr "无法用 $w_commit 更新 $ref_stash"
12788
12789#. TRANSLATORS: $option is an invalid option, like
12790#. `--blah-blah'. The 7 spaces at the beginning of the
12791#. second line correspond to "error: ". So you should line
12792#. up the second line with however many characters the
12793#. translation of "error: " takes in your language. E.g. in
12794#. English this is:
12795#.
12796#. $ git stash save --blah-blah 2>&1 | head -n 2
12797#. error: unknown option for 'stash save': --blah-blah
12798#. To provide a message, use git stash save -- '--blah-blah'
12799#: git-stash.sh:238
12800#, sh-format
12801msgid ""
12802"error: unknown option for 'stash save': $option\n"
12803"       To provide a message, use git stash save -- '$option'"
12804msgstr ""
12805"错误:'stash save' 的未知选项:$option\n"
12806"      要提供一个描述信息,使用 git stash save -- '$option'"
12807
12808#: git-stash.sh:259
12809msgid "No local changes to save"
12810msgstr "没有要保存的本地修改"
12811
12812#: git-stash.sh:263
12813msgid "Cannot initialize stash"
12814msgstr "无法初始化 stash"
12815
12816#: git-stash.sh:267
12817msgid "Cannot save the current status"
12818msgstr "无法保存当前状态"
12819
12820#: git-stash.sh:268
12821#, sh-format
12822msgid "Saved working directory and index state $stash_msg"
12823msgstr "保存工作目录和索引状态 $stash_msg"
12824
12825#: git-stash.sh:285
12826msgid "Cannot remove worktree changes"
12827msgstr "无法删除工作区变更"
12828
12829#: git-stash.sh:404
12830#, sh-format
12831msgid "unknown option: $opt"
12832msgstr "未知选项: $opt"
12833
12834#: git-stash.sh:414
12835msgid "No stash found."
12836msgstr "未发现 stash。"
12837
12838#: git-stash.sh:421
12839#, sh-format
12840msgid "Too many revisions specified: $REV"
12841msgstr "指定了太多的版本:$REV"
12842
12843#: git-stash.sh:427
12844#, sh-format
12845msgid "$reference is not a valid reference"
12846msgstr "$reference 不是一个有效的引用"
12847
12848#: git-stash.sh:455
12849#, sh-format
12850msgid "'$args' is not a stash-like commit"
12851msgstr "'$args' 不是 stash 样提交"
12852
12853#: git-stash.sh:466
12854#, sh-format
12855msgid "'$args' is not a stash reference"
12856msgstr "'$args' 不是一个 stash 引用"
12857
12858#: git-stash.sh:474
12859msgid "unable to refresh index"
12860msgstr "无法刷新索引"
12861
12862#: git-stash.sh:478
12863msgid "Cannot apply a stash in the middle of a merge"
12864msgstr "无法在合并过程中恢复进度"
12865
12866#: git-stash.sh:486
12867msgid "Conflicts in index. Try without --index."
12868msgstr "索引中有冲突。尝试不使用 --index。"
12869
12870#: git-stash.sh:488
12871msgid "Could not save index tree"
12872msgstr "不能保存索引树"
12873
12874#: git-stash.sh:522
12875msgid "Cannot unstage modified files"
12876msgstr "无法将修改的文件取消暂存"
12877
12878#: git-stash.sh:537
12879msgid "Index was not unstashed."
12880msgstr "索引的进度没有被恢复。"
12881
12882#: git-stash.sh:551
12883msgid "The stash is kept in case you need it again."
12884msgstr "暂存被保留以备您再次需要。"
12885
12886#: git-stash.sh:560
12887#, sh-format
12888msgid "Dropped ${REV} ($s)"
12889msgstr "丢弃了 ${REV} ($s)"
12890
12891#: git-stash.sh:561
12892#, sh-format
12893msgid "${REV}: Could not drop stash entry"
12894msgstr "${REV}:不能丢弃进度条目"
12895
12896#: git-stash.sh:569
12897msgid "No branch name specified"
12898msgstr "未指定分支名"
12899
12900#: git-stash.sh:641
12901msgid "(To restore them type \"git stash apply\")"
12902msgstr "(为恢复数据输入 \"git stash apply\")"
12903
12904#: git-submodule.sh:183
12905msgid "Relative path can only be used from the toplevel of the working tree"
12906msgstr "只能在工作区的顶级目录中使用相对路径"
12907
12908#: git-submodule.sh:193
12909#, sh-format
12910msgid "repo URL: '$repo' must be absolute or begin with ./|../"
12911msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
12912
12913#: git-submodule.sh:210
12914#, sh-format
12915msgid "'$sm_path' already exists in the index"
12916msgstr "'$sm_path' 已经存在于索引中"
12917
12918#: git-submodule.sh:214
12919#, sh-format
12920msgid ""
12921"The following path is ignored by one of your .gitignore files:\n"
12922"$sm_path\n"
12923"Use -f if you really want to add it."
12924msgstr ""
12925"以下路径被您的一个 .gitignore 文件所忽略:\n"
12926"$sm_path\n"
12927"如果您确实想添加它,使用 -f 参数。"
12928
12929#: git-submodule.sh:232
12930#, sh-format
12931msgid "Adding existing repo at '$sm_path' to the index"
12932msgstr "添加位于 '$sm_path' 的现存仓库到索引"
12933
12934#: git-submodule.sh:234
12935#, sh-format
12936msgid "'$sm_path' already exists and is not a valid git repo"
12937msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
12938
12939#: git-submodule.sh:242
12940#, sh-format
12941msgid "A git directory for '$sm_name' is found locally with remote(s):"
12942msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
12943
12944#: git-submodule.sh:244
12945#, sh-format
12946msgid ""
12947"If you want to reuse this local git directory instead of cloning again from\n"
12948"  $realrepo\n"
12949"use the '--force' option. If the local git directory is not the correct "
12950"repo\n"
12951"or you are unsure what this means choose another name with the '--name' "
12952"option."
12953msgstr ""
12954"如果您想要重用这个本地 git 目录而非重新克隆自\n"
12955"  $realrepo\n"
12956"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
12957"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
12958
12959#: git-submodule.sh:250
12960#, sh-format
12961msgid "Reactivating local git directory for submodule '$sm_name'."
12962msgstr "激活本地 git 目录到子模组 '$sm_name'。"
12963
12964#: git-submodule.sh:262
12965#, sh-format
12966msgid "Unable to checkout submodule '$sm_path'"
12967msgstr "不能检出子模组 '$sm_path'"
12968
12969#: git-submodule.sh:267
12970#, sh-format
12971msgid "Failed to add submodule '$sm_path'"
12972msgstr "无法添加子模组 '$sm_path'"
12973
12974#: git-submodule.sh:276
12975#, sh-format
12976msgid "Failed to register submodule '$sm_path'"
12977msgstr "无法注册子模组 '$sm_path'"
12978
12979#: git-submodule.sh:323
12980#, sh-format
12981msgid "Entering '$displaypath'"
12982msgstr "正在进入 '$displaypath'"
12983
12984#: git-submodule.sh:343
12985#, sh-format
12986msgid "Stopping at '$displaypath'; script returned non-zero status."
12987msgstr "停止于 '$displaypath';脚本返回非零值。"
12988
12989#: git-submodule.sh:414
12990#, sh-format
12991msgid "pathspec and --all are incompatible"
12992msgstr "pathspec 和 --all 不兼容"
12993
12994#: git-submodule.sh:419
12995#, sh-format
12996msgid "Use '--all' if you really want to deinitialize all submodules"
12997msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
12998
12999#: git-submodule.sh:439
13000#, sh-format
13001msgid ""
13002"Submodule work tree '$displaypath' contains a .git directory\n"
13003"(use 'rm -rf' if you really want to remove it including all of its history)"
13004msgstr ""
13005"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
13006"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
13007
13008#: git-submodule.sh:447
13009#, sh-format
13010msgid ""
13011"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
13012"discard them"
13013msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
13014
13015#: git-submodule.sh:450
13016#, sh-format
13017msgid "Cleared directory '$displaypath'"
13018msgstr "已清除目录 '$displaypath'"
13019
13020#: git-submodule.sh:451
13021#, sh-format
13022msgid "Could not remove submodule work tree '$displaypath'"
13023msgstr "无法移除子模组工作区 '$displaypath'"
13024
13025#: git-submodule.sh:454
13026#, sh-format
13027msgid "Could not create empty submodule directory '$displaypath'"
13028msgstr "不能创建空的子模组目录 '$displaypath'"
13029
13030#: git-submodule.sh:463
13031#, sh-format
13032msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
13033msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
13034
13035#: git-submodule.sh:612
13036#, sh-format
13037msgid "Unable to find current revision in submodule path '$displaypath'"
13038msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
13039
13040#: git-submodule.sh:622
13041#, sh-format
13042msgid "Unable to fetch in submodule path '$sm_path'"
13043msgstr "无法在子模组路径 '$sm_path' 中获取"
13044
13045#: git-submodule.sh:627
13046#, sh-format
13047msgid ""
13048"Unable to find current ${remote_name}/${branch} revision in submodule path "
13049"'$sm_path'"
13050msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
13051
13052#: git-submodule.sh:645
13053#, sh-format
13054msgid "Unable to fetch in submodule path '$displaypath'"
13055msgstr "无法在子模组路径 '$displaypath' 中获取"
13056
13057#: git-submodule.sh:651
13058#, sh-format
13059msgid ""
13060"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
13061"Direct fetching of that commit failed."
13062msgstr "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
13063
13064#: git-submodule.sh:658
13065#, sh-format
13066msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
13067msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
13068
13069#: git-submodule.sh:659
13070#, sh-format
13071msgid "Submodule path '$displaypath': checked out '$sha1'"
13072msgstr "子模组路径 '$displaypath':检出 '$sha1'"
13073
13074#: git-submodule.sh:663
13075#, sh-format
13076msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
13077msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
13078
13079#: git-submodule.sh:664
13080#, sh-format
13081msgid "Submodule path '$displaypath': rebased into '$sha1'"
13082msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
13083
13084#: git-submodule.sh:669
13085#, sh-format
13086msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
13087msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
13088
13089#: git-submodule.sh:670
13090#, sh-format
13091msgid "Submodule path '$displaypath': merged in '$sha1'"
13092msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
13093
13094#: git-submodule.sh:675
13095#, sh-format
13096msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
13097msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
13098
13099#: git-submodule.sh:676
13100#, sh-format
13101msgid "Submodule path '$displaypath': '$command $sha1'"
13102msgstr "子模组 '$displaypath':'$command $sha1'"
13103
13104#: git-submodule.sh:707
13105#, sh-format
13106msgid "Failed to recurse into submodule path '$displaypath'"
13107msgstr "无法递归进子模组路径 '$displaypath'"
13108
13109#: git-submodule.sh:815
13110msgid "The --cached option cannot be used with the --files option"
13111msgstr "选项 --cached 不能和选项 --files 同时使用"
13112
13113#: git-submodule.sh:867
13114#, sh-format
13115msgid "unexpected mode $mod_dst"
13116msgstr "意外的模式 $mod_dst"
13117
13118#  译者:注意保持前导空格
13119#: git-submodule.sh:887
13120#, sh-format
13121msgid "  Warn: $display_name doesn't contain commit $sha1_src"
13122msgstr "  警告:$display_name 未包含提交 $sha1_src"
13123
13124#  译者:注意保持前导空格
13125#: git-submodule.sh:890
13126#, sh-format
13127msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
13128msgstr "  警告:$display_name 未包含提交 $sha1_dst"
13129
13130#  译者:注意保持前导空格
13131#: git-submodule.sh:893
13132#, sh-format
13133msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
13134msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
13135
13136#: git-submodule.sh:918
13137msgid "blob"
13138msgstr "数据对象"
13139
13140#: git-submodule.sh:1040
13141#, sh-format
13142msgid "Failed to recurse into submodule path '$sm_path'"
13143msgstr "无法递归进子模组路径 '$sm_path'"
13144
13145#: git-submodule.sh:1107
13146#, sh-format
13147msgid "Synchronizing submodule url for '$displaypath'"
13148msgstr "为 '$displaypath' 同步子模组 url"
13149
13150#: git-parse-remote.sh:89
13151#, sh-format
13152msgid "See git-${cmd}(1) for details."
13153msgstr "详见 git-${cmd}(1)。"
13154
13155#: git-rebase--interactive.sh:131
13156#, sh-format
13157msgid "Rebasing ($new_count/$total)"
13158msgstr "变基中($new_count/$total)"
13159
13160#: git-rebase--interactive.sh:147
13161msgid ""
13162"\n"
13163"Commands:\n"
13164" p, pick = use commit\n"
13165" r, reword = use commit, but edit the commit message\n"
13166" e, edit = use commit, but stop for amending\n"
13167" s, squash = use commit, but meld into previous commit\n"
13168" f, fixup = like \"squash\", but discard this commit's log message\n"
13169" x, exec = run command (the rest of the line) using shell\n"
13170" d, drop = remove commit\n"
13171"\n"
13172"These lines can be re-ordered; they are executed from top to bottom.\n"
13173msgstr ""
13174"\n"
13175"命令:\n"
13176" p, pick = 使用提交\n"
13177" r, reword = 使用提交,但修改提交说明\n"
13178" e, edit = 使用提交,但停止以便进行提交修补\n"
13179" s, squash = 使用提交,但和前一个版本融合\n"
13180" f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
13181" x, exec = 使用 shell 运行命令(此行剩余部分)\n"
13182" d, drop = 删除提交\n"
13183"\n"
13184"这些行可以被重新排序;它们会被从上至下地执行。\n"
13185"\n"
13186
13187#: git-rebase--interactive.sh:162
13188msgid ""
13189"\n"
13190"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
13191msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
13192
13193#: git-rebase--interactive.sh:166
13194msgid ""
13195"\n"
13196"If you remove a line here THAT COMMIT WILL BE LOST.\n"
13197msgstr "\n如果您在这里删除一行,对应的提交将会丢失。\n"
13198
13199#: git-rebase--interactive.sh:202
13200#, sh-format
13201msgid ""
13202"You can amend the commit now, with\n"
13203"\n"
13204"\tgit commit --amend $gpg_sign_opt_quoted\n"
13205"\n"
13206"Once you are satisfied with your changes, run\n"
13207"\n"
13208"\tgit rebase --continue"
13209msgstr ""
13210"您现在可以修补这个提交,使用\n"
13211"\n"
13212"\tgit commit --amend $gpg_sign_opt_quoted\n"
13213"\n"
13214"当您对变更感到满意,执行\n"
13215"\n"
13216"\tgit rebase --continue"
13217
13218#: git-rebase--interactive.sh:227
13219#, sh-format
13220msgid "$sha1: not a commit that can be picked"
13221msgstr "$sha1:不是一个可以被拣选的提交"
13222
13223#: git-rebase--interactive.sh:266
13224#, sh-format
13225msgid "Invalid commit name: $sha1"
13226msgstr "无效的提交名:$sha1"
13227
13228#: git-rebase--interactive.sh:308
13229msgid "Cannot write current commit's replacement sha1"
13230msgstr "不能写入当前提交的替代 sha1"
13231
13232#: git-rebase--interactive.sh:360
13233#, sh-format
13234msgid "Fast-forward to $sha1"
13235msgstr "快进到 $sha1"
13236
13237#: git-rebase--interactive.sh:362
13238#, sh-format
13239msgid "Cannot fast-forward to $sha1"
13240msgstr "不能快进到 $sha1"
13241
13242#: git-rebase--interactive.sh:371
13243#, sh-format
13244msgid "Cannot move HEAD to $first_parent"
13245msgstr "不能移动 HEAD 到 $first_parent"
13246
13247#: git-rebase--interactive.sh:376
13248#, sh-format
13249msgid "Refusing to squash a merge: $sha1"
13250msgstr "拒绝压缩一个合并:$sha1"
13251
13252#: git-rebase--interactive.sh:390
13253#, sh-format
13254msgid "Error redoing merge $sha1"
13255msgstr "无法重做合并 $sha1"
13256
13257#: git-rebase--interactive.sh:398
13258#, sh-format
13259msgid "Could not pick $sha1"
13260msgstr "不能拣选 $sha1"
13261
13262#: git-rebase--interactive.sh:407
13263#, sh-format
13264msgid "This is the commit message #${n}:"
13265msgstr "这是提交说明 #${n}:"
13266
13267#: git-rebase--interactive.sh:412
13268#, sh-format
13269msgid "The commit message #${n} will be skipped:"
13270msgstr "提交说明 #${n} 将被跳过:"
13271
13272#: git-rebase--interactive.sh:423
13273#, sh-format
13274msgid "This is a combination of $count commit."
13275msgid_plural "This is a combination of $count commits."
13276msgstr[0] "这是一个 $count 个提交的组合。"
13277msgstr[1] "这是一个 $count 个提交的组合。"
13278
13279#: git-rebase--interactive.sh:431
13280#, sh-format
13281msgid "Cannot write $fixup_msg"
13282msgstr "不能写入 $fixup_msg"
13283
13284#: git-rebase--interactive.sh:434
13285msgid "This is a combination of 2 commits."
13286msgstr "这是一个 2 个提交的组合。"
13287
13288#: git-rebase--interactive.sh:435
13289msgid "This is the 1st commit message:"
13290msgstr "这是第一个提交说明:"
13291
13292#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
13293#: git-rebase--interactive.sh:521
13294#, sh-format
13295msgid "Could not apply $sha1... $rest"
13296msgstr "不能应用 $sha1... $rest"
13297
13298#: git-rebase--interactive.sh:549
13299#, sh-format
13300msgid ""
13301"Could not amend commit after successfully picking $sha1... $rest\n"
13302"This is most likely due to an empty commit message, or the pre-commit hook\n"
13303"failed. If the pre-commit hook failed, you may need to resolve the issue "
13304"before\n"
13305"you are able to reword the commit."
13306msgstr ""
13307"不能在成功拣选 $sha1... $rest 之后修补提交\n"
13308"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
13309"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
13310
13311#: git-rebase--interactive.sh:564
13312#, sh-format
13313msgid "Stopped at $sha1_abbrev... $rest"
13314msgstr "停止在 $sha1_abbrev... $rest"
13315
13316#: git-rebase--interactive.sh:579
13317#, sh-format
13318msgid "Cannot '$squash_style' without a previous commit"
13319msgstr "没有父提交的情况下不能 '$squash_style'"
13320
13321#: git-rebase--interactive.sh:621
13322#, sh-format
13323msgid "Executing: $rest"
13324msgstr "执行:$rest"
13325
13326#: git-rebase--interactive.sh:629
13327#, sh-format
13328msgid "Execution failed: $rest"
13329msgstr "执行失败:$rest"
13330
13331#: git-rebase--interactive.sh:631
13332msgid "and made changes to the index and/or the working tree"
13333msgstr "并且修改索引和/或工作区"
13334
13335#  译者:注意保持前导空格
13336#: git-rebase--interactive.sh:633
13337msgid ""
13338"You can fix the problem, and then run\n"
13339"\n"
13340"\tgit rebase --continue"
13341msgstr ""
13342"您可以解决这个问题,然后运行\n"
13343"\n"
13344"\tgit rebase --continue"
13345
13346#. TRANSLATORS: after these lines is a command to be issued by the user
13347#: git-rebase--interactive.sh:646
13348#, sh-format
13349msgid ""
13350"Execution succeeded: $rest\n"
13351"but left changes to the index and/or the working tree\n"
13352"Commit or stash your changes, and then run\n"
13353"\n"
13354"\tgit rebase --continue"
13355msgstr ""
13356"执行成功:$rest\n"
13357"但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
13358"\n"
13359"\tgit rebase --continue"
13360
13361#: git-rebase--interactive.sh:657
13362#, sh-format
13363msgid "Unknown command: $command $sha1 $rest"
13364msgstr "未知命令:$command $sha1 $rest"
13365
13366#: git-rebase--interactive.sh:658
13367msgid "Please fix this using 'git rebase --edit-todo'."
13368msgstr "要修改请使用命令 'git rebase --edit-todo'。"
13369
13370#: git-rebase--interactive.sh:693
13371#, sh-format
13372msgid "Successfully rebased and updated $head_name."
13373msgstr "成功变基并更新 $head_name。"
13374
13375#: git-rebase--interactive.sh:740
13376msgid "Could not skip unnecessary pick commands"
13377msgstr "不能跳过不必要的拣选命令"
13378
13379#: git-rebase--interactive.sh:898
13380#, sh-format
13381msgid ""
13382"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
13383" - $line"
13384msgstr ""
13385"警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
13386" - $line"
13387
13388#: git-rebase--interactive.sh:931
13389#, sh-format
13390msgid ""
13391"Warning: the command isn't recognized in the following line:\n"
13392" - $line"
13393msgstr ""
13394"警告:下面一行中的命令未能被识别:\n"
13395" - $line"
13396
13397#: git-rebase--interactive.sh:970
13398msgid "could not detach HEAD"
13399msgstr "不能检出为分离头指针"
13400
13401#: git-rebase--interactive.sh:1008
13402msgid ""
13403"Warning: some commits may have been dropped accidentally.\n"
13404"Dropped commits (newer to older):"
13405msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
13406
13407#: git-rebase--interactive.sh:1016
13408msgid ""
13409"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
13410"\n"
13411"Use 'git config rebase.missingCommitsCheck' to change the level of "
13412"warnings.\n"
13413"The possible behaviours are: ignore, warn, error."
13414msgstr ""
13415"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
13416"\n"
13417"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
13418"可选值有:ignore、warn、error。"
13419
13420#: git-rebase--interactive.sh:1027
13421#, sh-format
13422msgid ""
13423"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
13424"Ignoring."
13425msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
13426
13427#: git-rebase--interactive.sh:1044
13428msgid "You can fix this with 'git rebase --edit-todo'."
13429msgstr "您可以使用 'git rebase --edit-todo' 命令修改。"
13430
13431#: git-rebase--interactive.sh:1045
13432msgid "Or you can abort the rebase with 'git rebase --abort'."
13433msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
13434
13435#: git-rebase--interactive.sh:1069
13436msgid "Could not remove CHERRY_PICK_HEAD"
13437msgstr "不能删除 CHERRY_PICK_HEAD"
13438
13439#: git-rebase--interactive.sh:1074
13440#, sh-format
13441msgid ""
13442"You have staged changes in your working tree.\n"
13443"If these changes are meant to be\n"
13444"squashed into the previous commit, run:\n"
13445"\n"
13446"  git commit --amend $gpg_sign_opt_quoted\n"
13447"\n"
13448"If they are meant to go into a new commit, run:\n"
13449"\n"
13450"  git commit $gpg_sign_opt_quoted\n"
13451"\n"
13452"In both case, once you're done, continue with:\n"
13453"\n"
13454"  git rebase --continue\n"
13455msgstr ""
13456"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
13457"\n"
13458"  git commit --amend $gpg_sign_opt_quoted\n"
13459"\n"
13460"如果这些变更要形成一个新提交,执行:\n"
13461"\n"
13462"  git commit $gpg_sign_opt_quoted\n"
13463"\n"
13464"无论哪种情况,当您完成提交,继续执行:\n"
13465"\n"
13466"  git rebase --continue\n"
13467
13468#: git-rebase--interactive.sh:1091
13469msgid "Error trying to find the author identity to amend commit"
13470msgstr "在修补提交中查找作者信息时遇到错误"
13471
13472#: git-rebase--interactive.sh:1096
13473msgid ""
13474"You have uncommitted changes in your working tree. Please commit them\n"
13475"first and then run 'git rebase --continue' again."
13476msgstr "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
13477
13478#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
13479msgid "Could not commit staged changes."
13480msgstr "不能提交暂存的修改。"
13481
13482#: git-rebase--interactive.sh:1129
13483msgid ""
13484"\n"
13485"You are editing the todo file of an ongoing interactive rebase.\n"
13486"To continue rebase after editing, run:\n"
13487"    git rebase --continue\n"
13488"\n"
13489msgstr ""
13490"\n"
13491"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
13492"请执行:\n"
13493"    git rebase --continue\n"
13494"\n"
13495
13496#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
13497msgid "Could not execute editor"
13498msgstr "无法运行编辑器"
13499
13500#: git-rebase--interactive.sh:1145
13501msgid "You need to set your committer info first"
13502msgstr "您需要先设置您的提交者信息"
13503
13504#: git-rebase--interactive.sh:1153
13505#, sh-format
13506msgid "Could not checkout $switch_to"
13507msgstr "不能检出 $switch_to"
13508
13509#: git-rebase--interactive.sh:1158
13510msgid "No HEAD?"
13511msgstr "没有 HEAD?"
13512
13513#: git-rebase--interactive.sh:1159
13514#, sh-format
13515msgid "Could not create temporary $state_dir"
13516msgstr "不能创建临时 $state_dir"
13517
13518#: git-rebase--interactive.sh:1161
13519msgid "Could not mark as interactive"
13520msgstr "不能标记为交互式"
13521
13522#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
13523msgid "Could not init rewritten commits"
13524msgstr "不能对重写提交进行初始化"
13525
13526#: git-rebase--interactive.sh:1276
13527#, sh-format
13528msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
13529msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
13530msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
13531msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
13532
13533#: git-rebase--interactive.sh:1281
13534msgid ""
13535"\n"
13536"However, if you remove everything, the rebase will be aborted.\n"
13537"\n"
13538msgstr "\n然而,如果您删除全部内容,变基操作将会终止。\n\n"
13539
13540#: git-rebase--interactive.sh:1288
13541msgid "Note that empty commits are commented out"
13542msgstr "注意空提交已被注释掉"
13543
13544#: git-sh-setup.sh:89 git-sh-setup.sh:94
13545#, sh-format
13546msgid "usage: $dashless $USAGE"
13547msgstr "用法:$dashless $USAGE"
13548
13549#: git-sh-setup.sh:190
13550#, sh-format
13551msgid "Cannot chdir to $cdup, the toplevel of the working tree"
13552msgstr "不能切换目录到 $cdup,工作区的顶级目录"
13553
13554#: git-sh-setup.sh:199 git-sh-setup.sh:206
13555#, sh-format
13556msgid "fatal: $program_name cannot be used without a working tree."
13557msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
13558
13559#: git-sh-setup.sh:220
13560msgid "Cannot rebase: You have unstaged changes."
13561msgstr "不能变基:您有未暂存的变更。"
13562
13563#: git-sh-setup.sh:223
13564msgid "Cannot rewrite branches: You have unstaged changes."
13565msgstr "不能重写分支:您有未暂存的变更。"
13566
13567#: git-sh-setup.sh:229
13568#, sh-format
13569msgid "Cannot $action: You have unstaged changes."
13570msgstr "不能 $action:您有未暂存的变更。"
13571
13572#: git-sh-setup.sh:242
13573msgid "Cannot rebase: Your index contains uncommitted changes."
13574msgstr "不能变基:您的索引中包含未提交的变更。"
13575
13576#: git-sh-setup.sh:248
13577#, sh-format
13578msgid "Cannot $action: Your index contains uncommitted changes."
13579msgstr "不能 $action:您的索引中包含未提交的变更。"
13580
13581#: git-sh-setup.sh:372
13582msgid "You need to run this command from the toplevel of the working tree."
13583msgstr "您需要在工作区的顶级目录中运行这个命令。"
13584
13585#: git-sh-setup.sh:377
13586msgid "Unable to determine absolute path of git directory"
13587msgstr "不能确定 git 目录的绝对路径"