po / zh_CN.poon commit Merge branch 'master' of git://github.com/git-l10n/git-po (694c76f)
   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: 2017-04-23 09:54+0800\n"
 139"PO-Revision-Date: 2017-05-02 22:07+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:1185
 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"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
 220"外\n"
 221"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
 222"\n"
 223"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
 224"参数 -b 来实现(现在或稍后)。例如:\n"
 225"\n"
 226"  git checkout -b <new-branch-name>\n"
 227"\n"
 228
 229#: apply.c:57
 230#, c-format
 231msgid "unrecognized whitespace option '%s'"
 232msgstr "未能识别的空白字符选项 '%s'"
 233
 234#: apply.c:73
 235#, c-format
 236msgid "unrecognized whitespace ignore option '%s'"
 237msgstr "未能识别的空白字符忽略选项 '%s'"
 238
 239#: apply.c:125
 240msgid "--reject and --3way cannot be used together."
 241msgstr "--reject 和 --3say 不能同时使用。"
 242
 243#: apply.c:127
 244msgid "--cached and --3way cannot be used together."
 245msgstr "--cached 和 --3way 不能同时使用。"
 246
 247#: apply.c:130
 248msgid "--3way outside a repository"
 249msgstr "--3way 在一个仓库之外"
 250
 251#: apply.c:141
 252msgid "--index outside a repository"
 253msgstr "--index 在一个仓库之外"
 254
 255#: apply.c:144
 256msgid "--cached outside a repository"
 257msgstr "--cached 在一个仓库之外"
 258
 259#: apply.c:845
 260#, c-format
 261msgid "Cannot prepare timestamp regexp %s"
 262msgstr "无法准备时间戳正则表达式 %s"
 263
 264#: apply.c:854
 265#, c-format
 266msgid "regexec returned %d for input: %s"
 267msgstr "regexec 返回 %d,输入为:%s"
 268
 269#: apply.c:938
 270#, c-format
 271msgid "unable to find filename in patch at line %d"
 272msgstr "不能在补丁的第 %d 行找到文件名"
 273
 274#: apply.c:977
 275#, c-format
 276msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 277msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
 278
 279#: apply.c:983
 280#, c-format
 281msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 282msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
 283
 284#: apply.c:984
 285#, c-format
 286msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 287msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
 288
 289#: apply.c:990
 290#, c-format
 291msgid "git apply: bad git-diff - expected /dev/null on line %d"
 292msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
 293
 294#: apply.c:1488
 295#, c-format
 296msgid "recount: unexpected line: %.*s"
 297msgstr "recount:意外的行:%.*s"
 298
 299#: apply.c:1557
 300#, c-format
 301msgid "patch fragment without header at line %d: %.*s"
 302msgstr "第 %d 行的补丁片段没有头信息:%.*s"
 303
 304#: apply.c:1577
 305#, c-format
 306msgid ""
 307"git diff header lacks filename information when removing %d leading pathname "
 308"component (line %d)"
 309msgid_plural ""
 310"git diff header lacks filename information when removing %d leading pathname "
 311"components (line %d)"
 312msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
 313msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
 314
 315#: apply.c:1589
 316#, c-format
 317msgid "git diff header lacks filename information (line %d)"
 318msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
 319
 320#: apply.c:1759
 321msgid "new file depends on old contents"
 322msgstr "新文件依赖旧内容"
 323
 324#: apply.c:1761
 325msgid "deleted file still has contents"
 326msgstr "删除的文件仍有内容"
 327
 328#: apply.c:1795
 329#, c-format
 330msgid "corrupt patch at line %d"
 331msgstr "补丁在第 %d 行损坏"
 332
 333#: apply.c:1832
 334#, c-format
 335msgid "new file %s depends on old contents"
 336msgstr "新文件 %s 依赖旧内容"
 337
 338#: apply.c:1834
 339#, c-format
 340msgid "deleted file %s still has contents"
 341msgstr "删除的文件 %s 仍有内容"
 342
 343#: apply.c:1837
 344#, c-format
 345msgid "** warning: file %s becomes empty but is not deleted"
 346msgstr "** 警告:文件 %s 成为空文件但并未删除"
 347
 348#: apply.c:1984
 349#, c-format
 350msgid "corrupt binary patch at line %d: %.*s"
 351msgstr "二进制补丁在第 %d 行损坏:%.*s"
 352
 353#: apply.c:2021
 354#, c-format
 355msgid "unrecognized binary patch at line %d"
 356msgstr "未能识别的二进制补丁位于第 %d 行"
 357
 358#: apply.c:2182
 359#, c-format
 360msgid "patch with only garbage at line %d"
 361msgstr "补丁文件的第 %d 行只有垃圾数据"
 362
 363#: apply.c:2265
 364#, c-format
 365msgid "unable to read symlink %s"
 366msgstr "无法读取符号链接 %s"
 367
 368#: apply.c:2269
 369#, c-format
 370msgid "unable to open or read %s"
 371msgstr "不能打开或读取 %s"
 372
 373#: apply.c:2922
 374#, c-format
 375msgid "invalid start of line: '%c'"
 376msgstr "无效的行首字符:'%c'"
 377
 378#: apply.c:3041
 379#, c-format
 380msgid "Hunk #%d succeeded at %d (offset %d line)."
 381msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 382msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
 383msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
 384
 385#: apply.c:3053
 386#, c-format
 387msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 388msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
 389
 390#: apply.c:3059
 391#, c-format
 392msgid ""
 393"while searching for:\n"
 394"%.*s"
 395msgstr ""
 396"当查询:\n"
 397"%.*s"
 398
 399#: apply.c:3081
 400#, c-format
 401msgid "missing binary patch data for '%s'"
 402msgstr "缺失 '%s' 的二进制补丁数据"
 403
 404#: apply.c:3089
 405#, c-format
 406msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 407msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
 408
 409#: apply.c:3135
 410#, c-format
 411msgid "cannot apply binary patch to '%s' without full index line"
 412msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 413
 414#: apply.c:3145
 415#, c-format
 416msgid ""
 417"the patch applies to '%s' (%s), which does not match the current contents."
 418msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
 419
 420#: apply.c:3153
 421#, c-format
 422msgid "the patch applies to an empty '%s' but it is not empty"
 423msgstr "补丁应用到空文件 '%s',但其并非空文件"
 424
 425#: apply.c:3171
 426#, c-format
 427msgid "the necessary postimage %s for '%s' cannot be read"
 428msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
 429
 430#: apply.c:3184
 431#, c-format
 432msgid "binary patch does not apply to '%s'"
 433msgstr "二进制补丁未应用到 '%s'"
 434
 435#: apply.c:3190
 436#, c-format
 437msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 438msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
 439
 440#: apply.c:3211
 441#, c-format
 442msgid "patch failed: %s:%ld"
 443msgstr "打补丁失败:%s:%ld"
 444
 445#: apply.c:3333
 446#, c-format
 447msgid "cannot checkout %s"
 448msgstr "不能检出 %s"
 449
 450#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
 451#, c-format
 452msgid "failed to read %s"
 453msgstr "无法读取 %s"
 454
 455#: apply.c:3389
 456#, c-format
 457msgid "reading from '%s' beyond a symbolic link"
 458msgstr "读取位于符号链接中的 '%s'"
 459
 460#: apply.c:3418 apply.c:3658
 461#, c-format
 462msgid "path %s has been renamed/deleted"
 463msgstr "路径 %s 已经被重命名/删除"
 464
 465#: apply.c:3501 apply.c:3672
 466#, c-format
 467msgid "%s: does not exist in index"
 468msgstr "%s:不存在于索引中"
 469
 470#: apply.c:3510 apply.c:3680
 471#, c-format
 472msgid "%s: does not match index"
 473msgstr "%s:和索引不匹配"
 474
 475#: apply.c:3545
 476msgid "repository lacks the necessary blob to fall back on 3-way merge."
 477msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 478
 479#: apply.c:3548
 480#, c-format
 481msgid "Falling back to three-way merge...\n"
 482msgstr "回落到三方合并...\n"
 483
 484#: apply.c:3564 apply.c:3568
 485#, c-format
 486msgid "cannot read the current contents of '%s'"
 487msgstr "无法读取 '%s' 的当前内容"
 488
 489#: apply.c:3580
 490#, c-format
 491msgid "Failed to fall back on three-way merge...\n"
 492msgstr "无法回落到三方合并...\n"
 493
 494#: apply.c:3594
 495#, c-format
 496msgid "Applied patch to '%s' with conflicts.\n"
 497msgstr "应用补丁到 '%s' 存在冲突。\n"
 498
 499#: apply.c:3599
 500#, c-format
 501msgid "Applied patch to '%s' cleanly.\n"
 502msgstr "成功应用补丁到 '%s'。\n"
 503
 504#: apply.c:3625
 505msgid "removal patch leaves file contents"
 506msgstr "移除补丁仍留下了文件内容"
 507
 508#: apply.c:3697
 509#, c-format
 510msgid "%s: wrong type"
 511msgstr "%s:错误类型"
 512
 513#: apply.c:3699
 514#, c-format
 515msgid "%s has type %o, expected %o"
 516msgstr "%s 的类型是 %o,应为 %o"
 517
 518#: apply.c:3850 apply.c:3852
 519#, c-format
 520msgid "invalid path '%s'"
 521msgstr "无效路径 '%s'"
 522
 523#: apply.c:3908
 524#, c-format
 525msgid "%s: already exists in index"
 526msgstr "%s:已经存在于索引中"
 527
 528#: apply.c:3911
 529#, c-format
 530msgid "%s: already exists in working directory"
 531msgstr "%s:已经存在于工作区中"
 532
 533#: apply.c:3931
 534#, c-format
 535msgid "new mode (%o) of %s does not match old mode (%o)"
 536msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
 537
 538#: apply.c:3936
 539#, c-format
 540msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 541msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
 542
 543#: apply.c:3956
 544#, c-format
 545msgid "affected file '%s' is beyond a symbolic link"
 546msgstr "受影响的文件 '%s' 位于符号链接中"
 547
 548#: apply.c:3960
 549#, c-format
 550msgid "%s: patch does not apply"
 551msgstr "%s:补丁未应用"
 552
 553#: apply.c:3975
 554#, c-format
 555msgid "Checking patch %s..."
 556msgstr "检查补丁 %s..."
 557
 558#: apply.c:4066
 559#, c-format
 560msgid "sha1 information is lacking or useless for submodule %s"
 561msgstr "子模组 %s 的 sha1 信息缺失或无效"
 562
 563#: apply.c:4073
 564#, c-format
 565msgid "mode change for %s, which is not in current HEAD"
 566msgstr "%s 的模式被改变,但它不在当前 HEAD 中"
 567
 568#: apply.c:4076
 569#, c-format
 570msgid "sha1 information is lacking or useless (%s)."
 571msgstr "sha1 信息缺失或无效(%s)。"
 572
 573#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
 574#, c-format
 575msgid "make_cache_entry failed for path '%s'"
 576msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 577
 578#: apply.c:4085
 579#, c-format
 580msgid "could not add %s to temporary index"
 581msgstr "不能在临时索引中添加 %s"
 582
 583#: apply.c:4095
 584#, c-format
 585msgid "could not write temporary index to %s"
 586msgstr "不能把临时索引写入到 %s"
 587
 588#: apply.c:4233
 589#, c-format
 590msgid "unable to remove %s from index"
 591msgstr "不能从索引中移除 %s"
 592
 593#: apply.c:4268
 594#, c-format
 595msgid "corrupt patch for submodule %s"
 596msgstr "子模组 %s 损坏的补丁"
 597
 598#: apply.c:4274
 599#, c-format
 600msgid "unable to stat newly created file '%s'"
 601msgstr "不能枚举新建文件 '%s' 的状态"
 602
 603#: apply.c:4282
 604#, c-format
 605msgid "unable to create backing store for newly created file %s"
 606msgstr "不能为新建文件 %s 创建后端存储"
 607
 608#: apply.c:4288 apply.c:4432
 609#, c-format
 610msgid "unable to add cache entry for %s"
 611msgstr "无法为 %s 添加缓存条目"
 612
 613#: apply.c:4329
 614#, c-format
 615msgid "failed to write to '%s'"
 616msgstr "无法写入 '%s'"
 617
 618#: apply.c:4333
 619#, c-format
 620msgid "closing file '%s'"
 621msgstr "关闭文件 '%s'"
 622
 623#: apply.c:4403
 624#, c-format
 625msgid "unable to write file '%s' mode %o"
 626msgstr "不能写文件 '%s' 权限 %o"
 627
 628#: apply.c:4501
 629#, c-format
 630msgid "Applied patch %s cleanly."
 631msgstr "成功应用补丁 %s。"
 632
 633#: apply.c:4509
 634msgid "internal error"
 635msgstr "内部错误"
 636
 637#: apply.c:4512
 638#, c-format
 639msgid "Applying patch %%s with %d reject..."
 640msgid_plural "Applying patch %%s with %d rejects..."
 641msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
 642msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
 643
 644#: apply.c:4523
 645#, c-format
 646msgid "truncating .rej filename to %.*s.rej"
 647msgstr "截短 .rej 文件名为 %.*s.rej"
 648
 649#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
 650#, c-format
 651msgid "cannot open %s"
 652msgstr "不能打开 %s"
 653
 654#: apply.c:4545
 655#, c-format
 656msgid "Hunk #%d applied cleanly."
 657msgstr "第 #%d 个片段成功应用。"
 658
 659#: apply.c:4549
 660#, c-format
 661msgid "Rejected hunk #%d."
 662msgstr "拒绝第 #%d 个片段。"
 663
 664#: apply.c:4659
 665#, c-format
 666msgid "Skipped patch '%s'."
 667msgstr "略过补丁 '%s'。"
 668
 669#: apply.c:4667
 670msgid "unrecognized input"
 671msgstr "未能识别的输入"
 672
 673#: apply.c:4686
 674msgid "unable to read index file"
 675msgstr "无法读取索引文件"
 676
 677#: apply.c:4823
 678#, c-format
 679msgid "can't open patch '%s': %s"
 680msgstr "不能打开补丁 '%s':%s"
 681
 682#: apply.c:4850
 683#, c-format
 684msgid "squelched %d whitespace error"
 685msgid_plural "squelched %d whitespace errors"
 686msgstr[0] "抑制下仍有 %d 个空白字符误用"
 687msgstr[1] "抑制下仍有 %d 个空白字符误用"
 688
 689#: apply.c:4856 apply.c:4871
 690#, c-format
 691msgid "%d line adds whitespace errors."
 692msgid_plural "%d lines add whitespace errors."
 693msgstr[0] "%d 行有空白字符误用。"
 694msgstr[1] "%d 行有空白字符误用。"
 695
 696#: apply.c:4864
 697#, c-format
 698msgid "%d line applied after fixing whitespace errors."
 699msgid_plural "%d lines applied after fixing whitespace errors."
 700msgstr[0] "修复空白错误后,应用了 %d 行。"
 701msgstr[1] "修复空白错误后,应用了 %d 行。"
 702
 703#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
 704msgid "Unable to write new index file"
 705msgstr "无法写入新索引文件"
 706
 707#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
 708#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
 709#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
 710#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
 711#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
 712#: git-add--interactive.perl:239
 713msgid "path"
 714msgstr "路径"
 715
 716#: apply.c:4912
 717msgid "don't apply changes matching the given path"
 718msgstr "不要应用与给出路径向匹配的变更"
 719
 720#: apply.c:4915
 721msgid "apply changes matching the given path"
 722msgstr "应用与给出路径向匹配的变更"
 723
 724#: apply.c:4917 builtin/am.c:2286
 725msgid "num"
 726msgstr "数字"
 727
 728#: apply.c:4918
 729msgid "remove <num> leading slashes from traditional diff paths"
 730msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
 731
 732#: apply.c:4921
 733msgid "ignore additions made by the patch"
 734msgstr "忽略补丁中的添加的文件"
 735
 736#: apply.c:4923
 737msgid "instead of applying the patch, output diffstat for the input"
 738msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
 739
 740#: apply.c:4927
 741msgid "show number of added and deleted lines in decimal notation"
 742msgstr "以十进制数显示添加和删除的行数"
 743
 744#: apply.c:4929
 745msgid "instead of applying the patch, output a summary for the input"
 746msgstr "不应用补丁,而是显示输入的概要"
 747
 748#: apply.c:4931
 749msgid "instead of applying the patch, see if the patch is applicable"
 750msgstr "不应用补丁,而是查看补丁是否可应用"
 751
 752#: apply.c:4933
 753msgid "make sure the patch is applicable to the current index"
 754msgstr "确认补丁可以应用到当前索引"
 755
 756#: apply.c:4935
 757msgid "apply a patch without touching the working tree"
 758msgstr "应用补丁而不修改工作区"
 759
 760#: apply.c:4937
 761msgid "accept a patch that touches outside the working area"
 762msgstr "接受修改工作区之外文件的补丁"
 763
 764#: apply.c:4939
 765msgid "also apply the patch (use with --stat/--summary/--check)"
 766msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
 767
 768#: apply.c:4941
 769msgid "attempt three-way merge if a patch does not apply"
 770msgstr "如果一个补丁不能应用则尝试三方合并"
 771
 772#: apply.c:4943
 773msgid "build a temporary index based on embedded index information"
 774msgstr "创建一个临时索引基于嵌入的索引信息"
 775
 776#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
 777msgid "paths are separated with NUL character"
 778msgstr "路径以 NUL 字符分隔"
 779
 780#: apply.c:4948
 781msgid "ensure at least <n> lines of context match"
 782msgstr "确保至少匹配 <n> 行上下文"
 783
 784#: apply.c:4949 builtin/am.c:2265
 785msgid "action"
 786msgstr "动作"
 787
 788#: apply.c:4950
 789msgid "detect new or modified lines that have whitespace errors"
 790msgstr "检查新增和修改的行中间的空白字符滥用"
 791
 792#: apply.c:4953 apply.c:4956
 793msgid "ignore changes in whitespace when finding context"
 794msgstr "查找上下文时忽略空白字符的变更"
 795
 796#: apply.c:4959
 797msgid "apply the patch in reverse"
 798msgstr "反向应用补丁"
 799
 800#: apply.c:4961
 801msgid "don't expect at least one line of context"
 802msgstr "无需至少一行上下文"
 803
 804#: apply.c:4963
 805msgid "leave the rejected hunks in corresponding *.rej files"
 806msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
 807
 808#: apply.c:4965
 809msgid "allow overlapping hunks"
 810msgstr "允许重叠的补丁片段"
 811
 812#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
 813#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
 814#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
 815msgid "be verbose"
 816msgstr "冗长输出"
 817
 818#: apply.c:4968
 819msgid "tolerate incorrectly detected missing new-line at the end of file"
 820msgstr "允许不正确的文件末尾换行符"
 821
 822#: apply.c:4971
 823msgid "do not trust the line counts in the hunk headers"
 824msgstr "不信任补丁片段的头信息中的行号"
 825
 826#: apply.c:4973 builtin/am.c:2274
 827msgid "root"
 828msgstr "根目录"
 829
 830#: apply.c:4974
 831msgid "prepend <root> to all filenames"
 832msgstr "为所有文件名前添加 <根目录>"
 833
 834#: archive.c:12
 835msgid "git archive [<options>] <tree-ish> [<path>...]"
 836msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 837
 838#: archive.c:13
 839msgid "git archive --list"
 840msgstr "git archive --list"
 841
 842#: archive.c:14
 843msgid ""
 844"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 845msgstr ""
 846"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 847
 848#: archive.c:15
 849msgid "git archive --remote <repo> [--exec <cmd>] --list"
 850msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 851
 852#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
 853#, c-format
 854msgid "pathspec '%s' did not match any files"
 855msgstr "路径规格 '%s' 未匹配任何文件"
 856
 857#: archive.c:417
 858msgid "fmt"
 859msgstr "格式"
 860
 861#: archive.c:417
 862msgid "archive format"
 863msgstr "归档格式"
 864
 865#: archive.c:418 builtin/log.c:1436
 866msgid "prefix"
 867msgstr "前缀"
 868
 869#: archive.c:419
 870msgid "prepend prefix to each pathname in the archive"
 871msgstr "为归档中每个路径名加上前缀"
 872
 873#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
 874#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
 875#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
 876#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
 877#: parse-options.h:153
 878msgid "file"
 879msgstr "文件"
 880
 881#: archive.c:421 builtin/archive.c:89
 882msgid "write the archive to this file"
 883msgstr "归档写入此文件"
 884
 885#: archive.c:423
 886msgid "read .gitattributes in working directory"
 887msgstr "读取工作区中的 .gitattributes"
 888
 889#: archive.c:424
 890msgid "report archived files on stderr"
 891msgstr "在标准错误上报告归档文件"
 892
 893#: archive.c:425
 894msgid "store only"
 895msgstr "只存储"
 896
 897#: archive.c:426
 898msgid "compress faster"
 899msgstr "压缩速度更快"
 900
 901#: archive.c:434
 902msgid "compress better"
 903msgstr "压缩效果更好"
 904
 905#: archive.c:437
 906msgid "list supported archive formats"
 907msgstr "列出支持的归档格式"
 908
 909#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
 910#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
 911msgid "repo"
 912msgstr "仓库"
 913
 914#: archive.c:440 builtin/archive.c:91
 915msgid "retrieve the archive from remote repository <repo>"
 916msgstr "从远程仓库(<仓库>)提取归档文件"
 917
 918#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
 919msgid "command"
 920msgstr "命令"
 921
 922#: archive.c:442 builtin/archive.c:93
 923msgid "path to the remote git-upload-archive command"
 924msgstr "远程 git-upload-archive 命令的路径"
 925
 926#: archive.c:449
 927msgid "Unexpected option --remote"
 928msgstr "未知参数 --remote"
 929
 930#: archive.c:451
 931msgid "Option --exec can only be used together with --remote"
 932msgstr "选项 --exec 只能和 --remote 同时使用"
 933
 934#: archive.c:453
 935msgid "Unexpected option --output"
 936msgstr "未知参数 --output"
 937
 938#: archive.c:475
 939#, c-format
 940msgid "Unknown archive format '%s'"
 941msgstr "未知归档格式 '%s'"
 942
 943#: archive.c:482
 944#, c-format
 945msgid "Argument not supported for format '%s': -%d"
 946msgstr "参数不支持此格式 '%s':-%d"
 947
 948#: attr.c:212
 949#, c-format
 950msgid "%.*s is not a valid attribute name"
 951msgstr "%.*s 不是一个有效的属性名"
 952
 953#: attr.c:408
 954msgid ""
 955"Negative patterns are ignored in git attributes\n"
 956"Use '\\!' for literal leading exclamation."
 957msgstr ""
 958"负值模版在 git attributes 中被忽略\n"
 959"当字符串确实要以感叹号开始时,使用 '\\!'。"
 960
 961#: bisect.c:443
 962#, c-format
 963msgid "Could not open file '%s'"
 964msgstr "不能打开文件 '%s'"
 965
 966#: bisect.c:448
 967#, c-format
 968msgid "Badly quoted content in file '%s': %s"
 969msgstr "文件 '%s' 包含错误的引用格式:%s"
 970
 971#: bisect.c:656
 972#, c-format
 973msgid "We cannot bisect more!\n"
 974msgstr "我们无法进行更多的二分查找!\n"
 975
 976#: bisect.c:709
 977#, c-format
 978msgid "Not a valid commit name %s"
 979msgstr "不是一个有效的提交名 %s"
 980
 981#: bisect.c:733
 982#, c-format
 983msgid ""
 984"The merge base %s is bad.\n"
 985"This means the bug has been fixed between %s and [%s].\n"
 986msgstr ""
 987"合并基线 %s 是坏的。\n"
 988"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 989
 990#: bisect.c:738
 991#, c-format
 992msgid ""
 993"The merge base %s is new.\n"
 994"The property has changed between %s and [%s].\n"
 995msgstr ""
 996"合并基线 %s 是新的。\n"
 997"介于 %s 和 [%s] 之间的属性已经被修改。\n"
 998
 999#: bisect.c:743
1000#, c-format
1001msgid ""
1002"The merge base %s is %s.\n"
1003"This means the first '%s' commit is between %s and [%s].\n"
1004msgstr ""
1005"合并基线 %s 是 %s。\n"
1006"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1007
1008#: bisect.c:751
1009#, c-format
1010msgid ""
1011"Some %s revs are not ancestors of the %s rev.\n"
1012"git bisect cannot work properly in this case.\n"
1013"Maybe you mistook %s and %s revs?\n"
1014msgstr ""
1015"一些 %s 版本不是 %s 版本的祖先。\n"
1016"这种情况下 git 二分查找无法正常工作。\n"
1017"您可能弄错了 %s 和 %s 版本?\n"
1018
1019#: bisect.c:764
1020#, c-format
1021msgid ""
1022"the merge base between %s and [%s] must be skipped.\n"
1023"So we cannot be sure the first %s commit is between %s and %s.\n"
1024"We continue anyway."
1025msgstr ""
1026"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1027"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1028"我们仍旧继续。"
1029
1030#: bisect.c:799
1031#, c-format
1032msgid "Bisecting: a merge base must be tested\n"
1033msgstr "二分查找中:合并基线必须是经过测试的\n"
1034
1035#: bisect.c:850
1036#, c-format
1037msgid "a %s revision is needed"
1038msgstr "需要一个 %s 版本"
1039
1040#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
1041#, c-format
1042msgid "could not create file '%s'"
1043msgstr "不能创建文件 '%s'"
1044
1045#: bisect.c:918
1046#, c-format
1047msgid "could not read file '%s'"
1048msgstr "不能读取文件 '%s'"
1049
1050#: bisect.c:948
1051msgid "reading bisect refs failed"
1052msgstr "读取二分查找引用失败"
1053
1054#: bisect.c:968
1055#, c-format
1056msgid "%s was both %s and %s\n"
1057msgstr "%s 同时为 %s 和 %s\n"
1058
1059#: bisect.c:976
1060#, c-format
1061msgid ""
1062"No testable commit found.\n"
1063"Maybe you started with bad path parameters?\n"
1064msgstr ""
1065"没有发现可测试的提交。\n"
1066"可能您在运行时使用了错误的路径参数?\n"
1067
1068#: bisect.c:995
1069#, c-format
1070msgid "(roughly %d step)"
1071msgid_plural "(roughly %d steps)"
1072msgstr[0] "(大概 %d 步)"
1073msgstr[1] "(大概 %d 步)"
1074
1075#. TRANSLATORS: the last %s will be replaced with
1076#. "(roughly %d steps)" translation
1077#: bisect.c:999
1078#, c-format
1079msgid "Bisecting: %d revision left to test after this %s\n"
1080msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1081msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1082msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1083
1084#: branch.c:53
1085#, c-format
1086msgid ""
1087"\n"
1088"After fixing the error cause you may try to fix up\n"
1089"the remote tracking information by invoking\n"
1090"\"git branch --set-upstream-to=%s%s%s\"."
1091msgstr ""
1092"\n"
1093"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1094"\"git branch --set-upstream-to=%s%s%s\" 。"
1095
1096#: branch.c:67
1097#, c-format
1098msgid "Not setting branch %s as its own upstream."
1099msgstr "未设置分支 %s 作为它自己的上游。"
1100
1101#: branch.c:93
1102#, c-format
1103msgid "Branch %s set up to track remote branch %s from %s by rebasing."
1104msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
1105
1106#: branch.c:94
1107#, c-format
1108msgid "Branch %s set up to track remote branch %s from %s."
1109msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
1110
1111#: branch.c:98
1112#, c-format
1113msgid "Branch %s set up to track local branch %s by rebasing."
1114msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
1115
1116#: branch.c:99
1117#, c-format
1118msgid "Branch %s set up to track local branch %s."
1119msgstr "分支 %s 设置为跟踪本地分支 %s。"
1120
1121#: branch.c:104
1122#, c-format
1123msgid "Branch %s set up to track remote ref %s by rebasing."
1124msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
1125
1126#: branch.c:105
1127#, c-format
1128msgid "Branch %s set up to track remote ref %s."
1129msgstr "分支 %s 设置为跟踪远程引用 %s。"
1130
1131#: branch.c:109
1132#, c-format
1133msgid "Branch %s set up to track local ref %s by rebasing."
1134msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
1135
1136#: branch.c:110
1137#, c-format
1138msgid "Branch %s set up to track local ref %s."
1139msgstr "分支 %s 设置为跟踪本地引用 %s。"
1140
1141#: branch.c:119
1142msgid "Unable to write upstream branch configuration"
1143msgstr "无法写入上游分支配置"
1144
1145#: branch.c:156
1146#, c-format
1147msgid "Not tracking: ambiguous information for ref %s"
1148msgstr "未跟踪:引用 %s 有歧义"
1149
1150#: branch.c:185
1151#, c-format
1152msgid "'%s' is not a valid branch name."
1153msgstr "'%s' 不是一个有效的分支名称。"
1154
1155#: branch.c:190
1156#, c-format
1157msgid "A branch named '%s' already exists."
1158msgstr "一个分支名 '%s' 已经存在。"
1159
1160#: branch.c:198
1161msgid "Cannot force update the current branch."
1162msgstr "无法强制更新当前分支。"
1163
1164#: branch.c:218
1165#, c-format
1166msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1167msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1168
1169#: branch.c:220
1170#, c-format
1171msgid "the requested upstream branch '%s' does not exist"
1172msgstr "请求的上游分支 '%s' 不存在"
1173
1174#: branch.c:222
1175msgid ""
1176"\n"
1177"If you are planning on basing your work on an upstream\n"
1178"branch that already exists at the remote, you may need to\n"
1179"run \"git fetch\" to retrieve it.\n"
1180"\n"
1181"If you are planning to push out a new local branch that\n"
1182"will track its remote counterpart, you may want to use\n"
1183"\"git push -u\" to set the upstream config as you push."
1184msgstr ""
1185"\n"
1186"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1187"您可能需要执行 \"git fetch\" 来获取分支。\n"
1188"\n"
1189"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1190"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1191
1192#: branch.c:265
1193#, c-format
1194msgid "Not a valid object name: '%s'."
1195msgstr "不是一个有效的对象名:'%s'。"
1196
1197#: branch.c:285
1198#, c-format
1199msgid "Ambiguous object name: '%s'."
1200msgstr "歧义的对象名:'%s'。"
1201
1202#: branch.c:290
1203#, c-format
1204msgid "Not a valid branch point: '%s'."
1205msgstr "无效的分支点:'%s'。"
1206
1207#: branch.c:344
1208#, c-format
1209msgid "'%s' is already checked out at '%s'"
1210msgstr "'%s' 已经检出到 '%s'"
1211
1212#: branch.c:364
1213#, c-format
1214msgid "HEAD of working tree %s is not updated"
1215msgstr "工作区 %s 的 HEAD 指向没有被更新"
1216
1217#: bundle.c:34
1218#, c-format
1219msgid "'%s' does not look like a v2 bundle file"
1220msgstr "'%s' 不像是一个 v2 版本的包文件"
1221
1222#: bundle.c:61
1223#, c-format
1224msgid "unrecognized header: %s%s (%d)"
1225msgstr "未能识别的包头:%s%s (%d)"
1226
1227#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
1228#, c-format
1229msgid "could not open '%s'"
1230msgstr "不能打开 '%s'"
1231
1232#: bundle.c:139
1233msgid "Repository lacks these prerequisite commits:"
1234msgstr "仓库中缺少这些必备的提交:"
1235
1236#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
1237#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
1238#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
1239#: builtin/merge.c:359 builtin/shortlog.c:176
1240msgid "revision walk setup failed"
1241msgstr "版本遍历设置失败"
1242
1243#: bundle.c:185
1244#, c-format
1245msgid "The bundle contains this ref:"
1246msgid_plural "The bundle contains these %d refs:"
1247msgstr[0] "这个包中含有这个引用:"
1248msgstr[1] "这个包中含有 %d 个引用:"
1249
1250#: bundle.c:192
1251msgid "The bundle records a complete history."
1252msgstr "这个包记录一个完整历史。"
1253
1254#: bundle.c:194
1255#, c-format
1256msgid "The bundle requires this ref:"
1257msgid_plural "The bundle requires these %d refs:"
1258msgstr[0] "这个包需要这个引用:"
1259msgstr[1] "这个包需要 %d 个引用:"
1260
1261#: bundle.c:253
1262msgid "Could not spawn pack-objects"
1263msgstr "不能生成 pack-objects 进程"
1264
1265#: bundle.c:264
1266msgid "pack-objects died"
1267msgstr "pack-objects 终止"
1268
1269#: bundle.c:304
1270msgid "rev-list died"
1271msgstr "rev-list 终止"
1272
1273#: bundle.c:353
1274#, c-format
1275msgid "ref '%s' is excluded by the rev-list options"
1276msgstr "引用 '%s' 被 rev-list 选项排除"
1277
1278#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
1279#, c-format
1280msgid "unrecognized argument: %s"
1281msgstr "未能识别的参数:%s"
1282
1283#: bundle.c:451
1284msgid "Refusing to create empty bundle."
1285msgstr "不能创建空包。"
1286
1287#: bundle.c:463
1288#, c-format
1289msgid "cannot create '%s'"
1290msgstr "不能创建 '%s'"
1291
1292#: bundle.c:491
1293msgid "index-pack died"
1294msgstr "index-pack 终止"
1295
1296#: color.c:300
1297#, c-format
1298msgid "invalid color value: %.*s"
1299msgstr "无效的颜色值:%.*s"
1300
1301#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
1302#: builtin/am.c:1493 builtin/am.c:2127
1303#, c-format
1304msgid "could not parse %s"
1305msgstr "不能解析 %s"
1306
1307#: commit.c:42
1308#, c-format
1309msgid "%s %s is not a commit!"
1310msgstr "%s %s 不是一个提交!"
1311
1312#: commit.c:1511
1313msgid ""
1314"Warning: commit message did not conform to UTF-8.\n"
1315"You may want to amend it after fixing the message, or set the config\n"
1316"variable i18n.commitencoding to the encoding your project uses.\n"
1317msgstr ""
1318"警告:提交说明不符合 UTF-8 字符编码。\n"
1319"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
1320"设置为您项目所用的字符编码。\n"
1321
1322#: compat/obstack.c:406 compat/obstack.c:408
1323msgid "memory exhausted"
1324msgstr "内存耗尽"
1325
1326#: config.c:191
1327msgid "relative config include conditionals must come from files"
1328msgstr "包含相对路径的条件引用必须来自于文件"
1329
1330#: config.c:701
1331#, c-format
1332msgid "bad config line %d in blob %s"
1333msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1334
1335#: config.c:705
1336#, c-format
1337msgid "bad config line %d in file %s"
1338msgstr "文件 %2$s 中错误的配置行 %1$d"
1339
1340#: config.c:709
1341#, c-format
1342msgid "bad config line %d in standard input"
1343msgstr "标准输入中错误的配置行 %d"
1344
1345#: config.c:713
1346#, c-format
1347msgid "bad config line %d in submodule-blob %s"
1348msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1349
1350#: config.c:717
1351#, c-format
1352msgid "bad config line %d in command line %s"
1353msgstr "命令行 %2$s 中错误的配置行 %1$d"
1354
1355#: config.c:721
1356#, c-format
1357msgid "bad config line %d in %s"
1358msgstr "在 %2$s 中错误的配置行 %1$d"
1359
1360#: config.c:840
1361msgid "out of range"
1362msgstr "超出范围"
1363
1364#: config.c:840
1365msgid "invalid unit"
1366msgstr "无效的单位"
1367
1368#: config.c:846
1369#, c-format
1370msgid "bad numeric config value '%s' for '%s': %s"
1371msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
1372
1373#: config.c:851
1374#, c-format
1375msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1376msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1377
1378#: config.c:854
1379#, c-format
1380msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1381msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1382
1383#: config.c:857
1384#, c-format
1385msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1386msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1387
1388#: config.c:860
1389#, c-format
1390msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1391msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1392
1393#: config.c:863
1394#, c-format
1395msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1396msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1397
1398#: config.c:866
1399#, c-format
1400msgid "bad numeric config value '%s' for '%s' in %s: %s"
1401msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1402
1403#: config.c:953
1404#, c-format
1405msgid "failed to expand user dir in: '%s'"
1406msgstr "无法扩展 '%s' 中的用户目录"
1407
1408#: config.c:1048 config.c:1059
1409#, c-format
1410msgid "bad zlib compression level %d"
1411msgstr "错误的 zlib 压缩级别 %d"
1412
1413#: config.c:1176
1414#, c-format
1415msgid "invalid mode for object creation: %s"
1416msgstr "无效的对象创建模式:%s"
1417
1418#: config.c:1332
1419#, c-format
1420msgid "bad pack compression level %d"
1421msgstr "错误的打包压缩级别 %d"
1422
1423#: config.c:1522
1424msgid "unable to parse command-line config"
1425msgstr "无法解析命令行中的配置"
1426
1427#: config.c:1572
1428msgid "unknown error occurred while reading the configuration files"
1429msgstr "在读取配置文件时遇到未知错误"
1430
1431#: config.c:1931
1432#, c-format
1433msgid "Invalid %s: '%s'"
1434msgstr "无效 %s:'%s'"
1435
1436#: config.c:1952
1437#, c-format
1438msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1439msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1440
1441#: config.c:1978
1442#, c-format
1443msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1444msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1445
1446#: config.c:1989
1447#, c-format
1448msgid "unable to parse '%s' from command-line config"
1449msgstr "无法解析命令行配置中的 '%s'"
1450
1451#: config.c:1991
1452#, c-format
1453msgid "bad config variable '%s' in file '%s' at line %d"
1454msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1455
1456#: config.c:2050
1457#, c-format
1458msgid "%s has multiple values"
1459msgstr "%s 有多个取值"
1460
1461#: config.c:2384 config.c:2609
1462#, c-format
1463msgid "fstat on %s failed"
1464msgstr "在 %s 上执行 fstat 失败"
1465
1466#: config.c:2502
1467#, c-format
1468msgid "could not set '%s' to '%s'"
1469msgstr "不能设置 '%s' 为 '%s'"
1470
1471#: config.c:2504 builtin/remote.c:774
1472#, c-format
1473msgid "could not unset '%s'"
1474msgstr "不能取消设置 '%s'"
1475
1476#: connect.c:49
1477msgid "The remote end hung up upon initial contact"
1478msgstr "远端在连接发起时即挂断"
1479
1480#: connect.c:51
1481msgid ""
1482"Could not read from remote repository.\n"
1483"\n"
1484"Please make sure you have the correct access rights\n"
1485"and the repository exists."
1486msgstr ""
1487"无法读取远程仓库。\n"
1488"\n"
1489"请确认您有正确的访问权限并且仓库存在。"
1490
1491#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
1492msgid "Checking connectivity"
1493msgstr "检查连接中"
1494
1495#: connected.c:75
1496msgid "Could not run 'git rev-list'"
1497msgstr "不能执行 'git rev-list'"
1498
1499#: connected.c:95
1500msgid "failed write to rev-list"
1501msgstr "无法写入 rev-list"
1502
1503#: connected.c:102
1504msgid "failed to close rev-list's stdin"
1505msgstr "无法关闭 rev-list 的标准输入"
1506
1507#: convert.c:201
1508#, c-format
1509msgid ""
1510"CRLF will be replaced by LF in %s.\n"
1511"The file will have its original line endings in your working directory."
1512msgstr ""
1513"文件 %s 中的 CRLF 将被 LF 替换。\n"
1514"在工作区中该文件仍保持原有的换行符。"
1515
1516#: convert.c:205
1517#, c-format
1518msgid "CRLF would be replaced by LF in %s."
1519msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1520
1521#: convert.c:211
1522#, c-format
1523msgid ""
1524"LF will be replaced by CRLF in %s.\n"
1525"The file will have its original line endings in your working directory."
1526msgstr ""
1527"文件 %s 中的 LF 将被 CRLF 替换。\n"
1528"在工作区中该文件仍保持原有的换行符。"
1529
1530#: convert.c:215
1531#, c-format
1532msgid "LF would be replaced by CRLF in %s"
1533msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1534
1535#: date.c:97
1536msgid "in the future"
1537msgstr "在将来"
1538
1539#: date.c:103
1540#, c-format
1541msgid "%lu second ago"
1542msgid_plural "%lu seconds ago"
1543msgstr[0] "%lu 秒钟前"
1544msgstr[1] "%lu 秒钟前"
1545
1546#: date.c:110
1547#, c-format
1548msgid "%lu minute ago"
1549msgid_plural "%lu minutes ago"
1550msgstr[0] "%lu 分钟前"
1551msgstr[1] "%lu 分钟前"
1552
1553#: date.c:117
1554#, c-format
1555msgid "%lu hour ago"
1556msgid_plural "%lu hours ago"
1557msgstr[0] "%lu 小时前"
1558msgstr[1] "%lu 小时前"
1559
1560#: date.c:124
1561#, c-format
1562msgid "%lu day ago"
1563msgid_plural "%lu days ago"
1564msgstr[0] "%lu 天前"
1565msgstr[1] "%lu 天前"
1566
1567#: date.c:130
1568#, c-format
1569msgid "%lu week ago"
1570msgid_plural "%lu weeks ago"
1571msgstr[0] "%lu 周前"
1572msgstr[1] "%lu 周前"
1573
1574#: date.c:137
1575#, c-format
1576msgid "%lu month ago"
1577msgid_plural "%lu months ago"
1578msgstr[0] "%lu 个月前"
1579msgstr[1] "%lu 个月前"
1580
1581#: date.c:148
1582#, c-format
1583msgid "%lu year"
1584msgid_plural "%lu years"
1585msgstr[0] "%lu 年"
1586msgstr[1] "%lu 年"
1587
1588#. TRANSLATORS: "%s" is "<n> years"
1589#: date.c:151
1590#, c-format
1591msgid "%s, %lu month ago"
1592msgid_plural "%s, %lu months ago"
1593msgstr[0] "%s %lu 个月前"
1594msgstr[1] "%s %lu 个月前"
1595
1596#: date.c:156 date.c:161
1597#, c-format
1598msgid "%lu year ago"
1599msgid_plural "%lu years ago"
1600msgstr[0] "%lu 年前"
1601msgstr[1] "%lu 年前"
1602
1603#: diffcore-order.c:24
1604#, c-format
1605msgid "failed to read orderfile '%s'"
1606msgstr "无法读取排序文件 '%s'"
1607
1608#: diffcore-rename.c:536
1609msgid "Performing inexact rename detection"
1610msgstr "正在进行非精确的重命名探测"
1611
1612#: diff.c:62
1613#, c-format
1614msgid "option '%s' requires a value"
1615msgstr "选项 '%s'  需要一个值"
1616
1617#  译者:注意保持前导空格
1618#: diff.c:124
1619#, c-format
1620msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
1621msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
1622
1623#  译者:注意保持前导空格
1624#: diff.c:129
1625#, c-format
1626msgid "  Unknown dirstat parameter '%s'\n"
1627msgstr "  未知的 dirstat 参数 '%s'\n"
1628
1629#: diff.c:281
1630#, c-format
1631msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1632msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1633
1634#: diff.c:344
1635#, c-format
1636msgid ""
1637"Found errors in 'diff.dirstat' config variable:\n"
1638"%s"
1639msgstr ""
1640"发现配置变量 'diff.dirstat' 中的错误:\n"
1641"%s"
1642
1643#: diff.c:3102
1644#, c-format
1645msgid "external diff died, stopping at %s"
1646msgstr "外部 diff 退出,停止在 %s"
1647
1648#: diff.c:3428
1649msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1650msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1651
1652#: diff.c:3518
1653msgid "--follow requires exactly one pathspec"
1654msgstr "--follow 明确要求只跟一个路径规格"
1655
1656#: diff.c:3681
1657#, c-format
1658msgid ""
1659"Failed to parse --dirstat/-X option parameter:\n"
1660"%s"
1661msgstr ""
1662"无法解析 --dirstat/-X 选项的参数:\n"
1663"%s"
1664
1665#: diff.c:3695
1666#, c-format
1667msgid "Failed to parse --submodule option parameter: '%s'"
1668msgstr "无法解析 --submodule 选项的参数:'%s'"
1669
1670#: diff.c:4719
1671msgid "inexact rename detection was skipped due to too many files."
1672msgstr "因为文件太多,略过不严格的重命名检查。"
1673
1674#: diff.c:4722
1675msgid "only found copies from modified paths due to too many files."
1676msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1677
1678#: diff.c:4725
1679#, c-format
1680msgid ""
1681"you may want to set your %s variable to at least %d and retry the command."
1682msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
1683
1684#: dir.c:1899
1685msgid "failed to get kernel name and information"
1686msgstr "无法获得内核名称和信息"
1687
1688#: dir.c:2018
1689msgid "Untracked cache is disabled on this system or location."
1690msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
1691
1692#: dir.c:2776 dir.c:2781
1693#, c-format
1694msgid "could not create directories for %s"
1695msgstr "不能为 %s 创建目录"
1696
1697#: dir.c:2806
1698#, c-format
1699msgid "could not migrate git directory from '%s' to '%s'"
1700msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1701
1702#: entry.c:280
1703#, c-format
1704msgid "could not stat file '%s'"
1705msgstr "不能获取文件 %s 的状态"
1706
1707#: fetch-pack.c:249
1708msgid "git fetch-pack: expected shallow list"
1709msgstr "git fetch-pack:应为 shallow 列表"
1710
1711#: fetch-pack.c:261
1712msgid "git fetch-pack: expected ACK/NAK, got EOF"
1713msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1714
1715#: fetch-pack.c:279
1716#, c-format
1717msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1718msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1719
1720#: fetch-pack.c:331
1721msgid "--stateless-rpc requires multi_ack_detailed"
1722msgstr "--stateless-rpc 需要 multi_ack_detailed"
1723
1724#: fetch-pack.c:417
1725#, c-format
1726msgid "invalid shallow line: %s"
1727msgstr "无效的 shallow 信息:%s"
1728
1729#: fetch-pack.c:423
1730#, c-format
1731msgid "invalid unshallow line: %s"
1732msgstr "无效的 unshallow 信息:%s"
1733
1734#: fetch-pack.c:425
1735#, c-format
1736msgid "object not found: %s"
1737msgstr "对象未找到:%s"
1738
1739#: fetch-pack.c:428
1740#, c-format
1741msgid "error in object: %s"
1742msgstr "对象中出错:%s"
1743
1744#: fetch-pack.c:430
1745#, c-format
1746msgid "no shallow found: %s"
1747msgstr "未发现 shallow:%s"
1748
1749#: fetch-pack.c:433
1750#, c-format
1751msgid "expected shallow/unshallow, got %s"
1752msgstr "应为 shallow/unshallow,却得到 %s"
1753
1754#: fetch-pack.c:472
1755#, c-format
1756msgid "got %s %d %s"
1757msgstr "得到 %s %d %s"
1758
1759#: fetch-pack.c:486
1760#, c-format
1761msgid "invalid commit %s"
1762msgstr "无效提交 %s"
1763
1764#: fetch-pack.c:519
1765msgid "giving up"
1766msgstr "放弃"
1767
1768#: fetch-pack.c:529 progress.c:235
1769msgid "done"
1770msgstr "完成"
1771
1772#: fetch-pack.c:541
1773#, c-format
1774msgid "got %s (%d) %s"
1775msgstr "得到 %s (%d) %s"
1776
1777#: fetch-pack.c:587
1778#, c-format
1779msgid "Marking %s as complete"
1780msgstr "标记 %s 为完成"
1781
1782#: fetch-pack.c:735
1783#, c-format
1784msgid "already have %s (%s)"
1785msgstr "已经有 %s(%s)"
1786
1787#: fetch-pack.c:773
1788msgid "fetch-pack: unable to fork off sideband demultiplexer"
1789msgstr "fetch-pack:无法派生 sideband 多路输出"
1790
1791#: fetch-pack.c:781
1792msgid "protocol error: bad pack header"
1793msgstr "协议错误:坏的包头"
1794
1795#: fetch-pack.c:837
1796#, c-format
1797msgid "fetch-pack: unable to fork off %s"
1798msgstr "fetch-pack:无法派生进程 %s"
1799
1800#: fetch-pack.c:853
1801#, c-format
1802msgid "%s failed"
1803msgstr "%s 失败"
1804
1805#: fetch-pack.c:855
1806msgid "error in sideband demultiplexer"
1807msgstr "sideband 多路输出出错"
1808
1809#: fetch-pack.c:882
1810msgid "Server does not support shallow clients"
1811msgstr "服务器不支持 shalllow 客户端"
1812
1813#: fetch-pack.c:886
1814msgid "Server supports multi_ack_detailed"
1815msgstr "服务器支持 multi_ack_detailed"
1816
1817#: fetch-pack.c:889
1818msgid "Server supports no-done"
1819msgstr "服务器支持 no-done"
1820
1821#: fetch-pack.c:895
1822msgid "Server supports multi_ack"
1823msgstr "服务器支持 multi_ack"
1824
1825#: fetch-pack.c:899
1826msgid "Server supports side-band-64k"
1827msgstr "服务器支持 side-band-64k"
1828
1829#: fetch-pack.c:903
1830msgid "Server supports side-band"
1831msgstr "服务器支持 side-band"
1832
1833#: fetch-pack.c:907
1834msgid "Server supports allow-tip-sha1-in-want"
1835msgstr "服务器支持 allow-tip-sha1-in-want"
1836
1837#: fetch-pack.c:911
1838msgid "Server supports allow-reachable-sha1-in-want"
1839msgstr "服务器支持 allow-reachable-sha1-in-want"
1840
1841#: fetch-pack.c:921
1842msgid "Server supports ofs-delta"
1843msgstr "服务器支持 ofs-delta"
1844
1845#: fetch-pack.c:928
1846#, c-format
1847msgid "Server version is %.*s"
1848msgstr "服务器版本 %.*s"
1849
1850#: fetch-pack.c:934
1851msgid "Server does not support --shallow-since"
1852msgstr "服务器不支持 --shallow-since"
1853
1854#: fetch-pack.c:938
1855msgid "Server does not support --shallow-exclude"
1856msgstr "服务器不支持 --shallow-exclude"
1857
1858#: fetch-pack.c:940
1859msgid "Server does not support --deepen"
1860msgstr "服务器不支持 --deepen"
1861
1862#: fetch-pack.c:951
1863msgid "no common commits"
1864msgstr "没有共同的提交"
1865
1866#: fetch-pack.c:963
1867msgid "git fetch-pack: fetch failed."
1868msgstr "git fetch-pack:获取失败。"
1869
1870#: fetch-pack.c:1125
1871msgid "no matching remote head"
1872msgstr "没有匹配的远程分支"
1873
1874#: fetch-pack.c:1147
1875#, c-format
1876msgid "no such remote ref %s"
1877msgstr "没有这样的远程引用 %s"
1878
1879#: fetch-pack.c:1150
1880#, c-format
1881msgid "Server does not allow request for unadvertised object %s"
1882msgstr "服务器不允许请求未公开的对象 %s"
1883
1884#: gpg-interface.c:185
1885msgid "gpg failed to sign the data"
1886msgstr "gpg 无法为数据签名"
1887
1888#: gpg-interface.c:215
1889msgid "could not create temporary file"
1890msgstr "不能创建临时文件"
1891
1892#: gpg-interface.c:217
1893#, c-format
1894msgid "failed writing detached signature to '%s'"
1895msgstr "无法将分离式签名写入 '%s'"
1896
1897#: graph.c:96
1898#, c-format
1899msgid "ignore invalid color '%.*s' in log.graphColors"
1900msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
1901
1902#: grep.c:1796
1903#, c-format
1904msgid "'%s': unable to read %s"
1905msgstr "'%s':无法读取 %s"
1906
1907#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
1908#, c-format
1909msgid "failed to stat '%s'"
1910msgstr "无法枚举 '%s' 状态"
1911
1912#: grep.c:1824
1913#, c-format
1914msgid "'%s': short read"
1915msgstr "'%s':读取不完整"
1916
1917#: help.c:218
1918#, c-format
1919msgid "available git commands in '%s'"
1920msgstr "在 '%s' 下可用的 git 命令"
1921
1922#: help.c:225
1923msgid "git commands available from elsewhere on your $PATH"
1924msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1925
1926#: help.c:256
1927msgid "These are common Git commands used in various situations:"
1928msgstr "这些是各种场合常见的 Git 命令:"
1929
1930#: help.c:321
1931#, c-format
1932msgid ""
1933"'%s' appears to be a git command, but we were not\n"
1934"able to execute it. Maybe git-%s is broken?"
1935msgstr ""
1936"'%s' 像是一个 git 命令,但却无法运行。\n"
1937"可能是 git-%s 受损?"
1938
1939#: help.c:376
1940msgid "Uh oh. Your system reports no Git commands at all."
1941msgstr "唉呀,您的系统中未发现 Git 命令。"
1942
1943#: help.c:398
1944#, c-format
1945msgid ""
1946"WARNING: You called a Git command named '%s', which does not exist.\n"
1947"Continuing under the assumption that you meant '%s'"
1948msgstr ""
1949"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
1950"是 '%s'"
1951
1952#: help.c:403
1953#, c-format
1954msgid "in %0.1f seconds automatically..."
1955msgstr "在 %0.1f 秒钟后自动运行..."
1956
1957#: help.c:410
1958#, c-format
1959msgid "git: '%s' is not a git command. See 'git --help'."
1960msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
1961
1962#: help.c:414 help.c:480
1963msgid ""
1964"\n"
1965"Did you mean this?"
1966msgid_plural ""
1967"\n"
1968"Did you mean one of these?"
1969msgstr[0] ""
1970"\n"
1971"您指的是这个么?"
1972msgstr[1] ""
1973"\n"
1974"您指的是这其中的某一个么?"
1975
1976#: help.c:476
1977#, c-format
1978msgid "%s: %s - %s"
1979msgstr "%s:%s - %s"
1980
1981#: ident.c:343
1982msgid ""
1983"\n"
1984"*** Please tell me who you are.\n"
1985"\n"
1986"Run\n"
1987"\n"
1988"  git config --global user.email \"you@example.com\"\n"
1989"  git config --global user.name \"Your Name\"\n"
1990"\n"
1991"to set your account's default identity.\n"
1992"Omit --global to set the identity only in this repository.\n"
1993"\n"
1994msgstr ""
1995"\n"
1996"*** 请告诉我你是谁。\n"
1997"\n"
1998"运行\n"
1999"\n"
2000"  git config --global user.email \"you@example.com\"\n"
2001"  git config --global user.name \"Your Name\"\n"
2002"\n"
2003"来设置您账号的缺省身份标识。\n"
2004"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
2005
2006#: ident.c:367
2007msgid "no email was given and auto-detection is disabled"
2008msgstr "未提供邮件地址且自动探测引用被禁用"
2009
2010#: ident.c:372
2011#, c-format
2012msgid "unable to auto-detect email address (got '%s')"
2013msgstr "无法自动探测邮件地址(得到 '%s')"
2014
2015#: ident.c:382
2016msgid "no name was given and auto-detection is disabled"
2017msgstr "未提供姓名且自动探测被禁用"
2018
2019#: ident.c:388
2020#, c-format
2021msgid "unable to auto-detect name (got '%s')"
2022msgstr "无法自动探测姓名(得到 '%s')"
2023
2024#: ident.c:396
2025#, c-format
2026msgid "empty ident name (for <%s>) not allowed"
2027msgstr "不允许空的姓名(对于 <%s>)"
2028
2029#: ident.c:402
2030#, c-format
2031msgid "name consists only of disallowed characters: %s"
2032msgstr "姓名中仅包含禁用字符:%s"
2033
2034#: ident.c:417 builtin/commit.c:611
2035#, c-format
2036msgid "invalid date format: %s"
2037msgstr "无效的日期格式:%s"
2038
2039#: lockfile.c:152
2040#, c-format
2041msgid ""
2042"Unable to create '%s.lock': %s.\n"
2043"\n"
2044"Another git process seems to be running in this repository, e.g.\n"
2045"an editor opened by 'git commit'. Please make sure all processes\n"
2046"are terminated then try again. If it still fails, a git process\n"
2047"may have crashed in this repository earlier:\n"
2048"remove the file manually to continue."
2049msgstr ""
2050"无法创建 '%s.lock':%s。\n"
2051"\n"
2052"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2053"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2054"可能之前有一个 git 进程在这个仓库中异常退出:\n"
2055"手动删除这个文件再继续。"
2056
2057#: lockfile.c:160
2058#, c-format
2059msgid "Unable to create '%s.lock': %s"
2060msgstr "不能创建 '%s.lock':%s"
2061
2062#: merge.c:41
2063msgid "failed to read the cache"
2064msgstr "无法读取缓存"
2065
2066#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
2067#: builtin/checkout.c:607 builtin/clone.c:749
2068msgid "unable to write new index file"
2069msgstr "无法写新的索引文件"
2070
2071#: merge-recursive.c:209
2072msgid "(bad commit)\n"
2073msgstr "(坏提交)\n"
2074
2075#: merge-recursive.c:231 merge-recursive.c:239
2076#, c-format
2077msgid "addinfo_cache failed for path '%s'"
2078msgstr "为路径 '%s' addinfo_cache 失败"
2079
2080#: merge-recursive.c:303
2081msgid "error building trees"
2082msgstr "无法创建树"
2083
2084#: merge-recursive.c:727
2085#, c-format
2086msgid "failed to create path '%s'%s"
2087msgstr "无法创建路径 '%s'%s"
2088
2089#: merge-recursive.c:738
2090#, c-format
2091msgid "Removing %s to make room for subdirectory\n"
2092msgstr "删除 %s 以便为子目录留出空间\n"
2093
2094#: merge-recursive.c:752 merge-recursive.c:771
2095msgid ": perhaps a D/F conflict?"
2096msgstr ":可能是一个目录/文件冲突?"
2097
2098#: merge-recursive.c:761
2099#, c-format
2100msgid "refusing to lose untracked file at '%s'"
2101msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2102
2103#: merge-recursive.c:803 builtin/cat-file.c:34
2104#, c-format
2105msgid "cannot read object %s '%s'"
2106msgstr "不能读取对象 %s '%s'"
2107
2108#: merge-recursive.c:805
2109#, c-format
2110msgid "blob expected for %s '%s'"
2111msgstr "%s '%s' 应为数据对象"
2112
2113#: merge-recursive.c:829
2114#, c-format
2115msgid "failed to open '%s': %s"
2116msgstr "无法打开 '%s':%s"
2117
2118#: merge-recursive.c:840
2119#, c-format
2120msgid "failed to symlink '%s': %s"
2121msgstr "无法创建符号链接 '%s':%s"
2122
2123#: merge-recursive.c:845
2124#, c-format
2125msgid "do not know what to do with %06o %s '%s'"
2126msgstr "不知道如何处理 %06o %s '%s'"
2127
2128#: merge-recursive.c:985
2129msgid "Failed to execute internal merge"
2130msgstr "无法执行内部合并"
2131
2132#: merge-recursive.c:989
2133#, c-format
2134msgid "Unable to add %s to database"
2135msgstr "不能添加 %s 至对象库"
2136
2137#: merge-recursive.c:1092
2138#, c-format
2139msgid ""
2140"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2141"in tree."
2142msgstr ""
2143"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2144"本被保留。"
2145
2146#: merge-recursive.c:1097
2147#, c-format
2148msgid ""
2149"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2150"left in tree."
2151msgstr ""
2152"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2153"%7$s 版本被保留。"
2154
2155#: merge-recursive.c:1104
2156#, c-format
2157msgid ""
2158"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2159"in tree at %s."
2160msgstr ""
2161"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2162"本保留在 %8$s 中。"
2163
2164#: merge-recursive.c:1109
2165#, c-format
2166msgid ""
2167"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2168"left in tree at %s."
2169msgstr ""
2170"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2171"%7$s 版本保留在 %9$s 中。"
2172
2173#: merge-recursive.c:1143
2174msgid "rename"
2175msgstr "重命名"
2176
2177#: merge-recursive.c:1143
2178msgid "renamed"
2179msgstr "重命名"
2180
2181#: merge-recursive.c:1200
2182#, c-format
2183msgid "%s is a directory in %s adding as %s instead"
2184msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2185
2186#: merge-recursive.c:1225
2187#, c-format
2188msgid ""
2189"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2190"\"->\"%s\" in \"%s\"%s"
2191msgstr ""
2192"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2193"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2194
2195#: merge-recursive.c:1230
2196msgid " (left unresolved)"
2197msgstr "(留下未解决)"
2198
2199#: merge-recursive.c:1292
2200#, c-format
2201msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2202msgstr ""
2203"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2204"%5$s"
2205
2206#: merge-recursive.c:1325
2207#, c-format
2208msgid "Renaming %s to %s and %s to %s instead"
2209msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
2210
2211#: merge-recursive.c:1528
2212#, c-format
2213msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2214msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2215
2216#: merge-recursive.c:1543
2217#, c-format
2218msgid "Adding merged %s"
2219msgstr "添加合并后的 %s"
2220
2221#: merge-recursive.c:1550 merge-recursive.c:1780
2222#, c-format
2223msgid "Adding as %s instead"
2224msgstr "而是以 %s 为名添加"
2225
2226#: merge-recursive.c:1607
2227#, c-format
2228msgid "cannot read object %s"
2229msgstr "不能读取对象 %s"
2230
2231#: merge-recursive.c:1610
2232#, c-format
2233msgid "object %s is not a blob"
2234msgstr "对象 %s 不是一个数据对象"
2235
2236#: merge-recursive.c:1679
2237msgid "modify"
2238msgstr "修改"
2239
2240#: merge-recursive.c:1679
2241msgid "modified"
2242msgstr "修改"
2243
2244#: merge-recursive.c:1689
2245msgid "content"
2246msgstr "内容"
2247
2248#: merge-recursive.c:1696
2249msgid "add/add"
2250msgstr "添加/添加"
2251
2252#: merge-recursive.c:1732
2253#, c-format
2254msgid "Skipped %s (merged same as existing)"
2255msgstr "略过 %s(已经做过相同合并)"
2256
2257#: merge-recursive.c:1746
2258#, c-format
2259msgid "Auto-merging %s"
2260msgstr "自动合并 %s"
2261
2262#: merge-recursive.c:1750 git-submodule.sh:944
2263msgid "submodule"
2264msgstr "子模组"
2265
2266#: merge-recursive.c:1751
2267#, c-format
2268msgid "CONFLICT (%s): Merge conflict in %s"
2269msgstr "冲突(%s):合并冲突于 %s"
2270
2271#: merge-recursive.c:1845
2272#, c-format
2273msgid "Removing %s"
2274msgstr "删除 %s"
2275
2276#: merge-recursive.c:1871
2277msgid "file/directory"
2278msgstr "文件/目录"
2279
2280#: merge-recursive.c:1877
2281msgid "directory/file"
2282msgstr "目录/文件"
2283
2284#: merge-recursive.c:1883
2285#, c-format
2286msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2287msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2288
2289#: merge-recursive.c:1892
2290#, c-format
2291msgid "Adding %s"
2292msgstr "添加 %s"
2293
2294#: merge-recursive.c:1929
2295msgid "Already up-to-date!"
2296msgstr "已经是最新的!"
2297
2298#: merge-recursive.c:1938
2299#, c-format
2300msgid "merging of trees %s and %s failed"
2301msgstr "无法合并树 %s 和 %s"
2302
2303#: merge-recursive.c:2021
2304msgid "Merging:"
2305msgstr "合并:"
2306
2307#: merge-recursive.c:2034
2308#, c-format
2309msgid "found %u common ancestor:"
2310msgid_plural "found %u common ancestors:"
2311msgstr[0] "发现 %u 个共同祖先:"
2312msgstr[1] "发现 %u 个共同祖先:"
2313
2314#: merge-recursive.c:2073
2315msgid "merge returned no commit"
2316msgstr "合并未返回提交"
2317
2318#: merge-recursive.c:2136
2319#, c-format
2320msgid "Could not parse object '%s'"
2321msgstr "不能解析对象 '%s'"
2322
2323#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
2324msgid "Unable to write index."
2325msgstr "不能写入索引。"
2326
2327#: notes-merge.c:273
2328#, c-format
2329msgid ""
2330"You have not concluded your previous notes merge (%s exists).\n"
2331"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2332"commit/abort the previous merge before you start a new notes merge."
2333msgstr ""
2334"您的前一次注释合并尚未结束(存在 %s)。\n"
2335"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2336"notes merge --abort' 来提交/终止前一次合并。"
2337
2338#: notes-merge.c:280
2339#, c-format
2340msgid "You have not concluded your notes merge (%s exists)."
2341msgstr "您尚未结束注释合并(存在 %s)。"
2342
2343#: notes-utils.c:41
2344msgid "Cannot commit uninitialized/unreferenced notes tree"
2345msgstr "不能提交未初始化/未引用的注解树"
2346
2347#: notes-utils.c:100
2348#, c-format
2349msgid "Bad notes.rewriteMode value: '%s'"
2350msgstr "坏的 notes.rewriteMode 值:'%s'"
2351
2352#: notes-utils.c:110
2353#, c-format
2354msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2355msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2356
2357#. TRANSLATORS: The first %s is the name of the
2358#. environment variable, the second %s is its value
2359#: notes-utils.c:137
2360#, c-format
2361msgid "Bad %s value: '%s'"
2362msgstr "坏的 %s 值:'%s'"
2363
2364#: object.c:240
2365#, c-format
2366msgid "unable to parse object: %s"
2367msgstr "不能解析对象:%s"
2368
2369#: parse-options.c:572
2370msgid "..."
2371msgstr "..."
2372
2373#: parse-options.c:590
2374#, c-format
2375msgid "usage: %s"
2376msgstr "用法:%s"
2377
2378#. TRANSLATORS: the colon here should align with the
2379#. one in "usage: %s" translation
2380#: parse-options.c:594
2381#, c-format
2382msgid "   or: %s"
2383msgstr "  或:%s"
2384
2385#  译者:为保证在输出中对齐,注意调整句中空格!
2386#: parse-options.c:597
2387#, c-format
2388msgid "    %s"
2389msgstr "    %s"
2390
2391#: parse-options.c:631
2392msgid "-NUM"
2393msgstr "-数字"
2394
2395#: parse-options-cb.c:108
2396#, c-format
2397msgid "malformed object name '%s'"
2398msgstr "非法的对象名 '%s'"
2399
2400#: path.c:805
2401#, c-format
2402msgid "Could not make %s writable by group"
2403msgstr "不能设置 %s 为组可写"
2404
2405#: pathspec.c:125
2406msgid "Escape character '\\' not allowed as last character in attr value"
2407msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2408
2409#: pathspec.c:143
2410msgid "Only one 'attr:' specification is allowed."
2411msgstr "只允许一个 'attr:' 规格。"
2412
2413#: pathspec.c:146
2414msgid "attr spec must not be empty"
2415msgstr "属性规格不能为空"
2416
2417#: pathspec.c:189
2418#, c-format
2419msgid "invalid attribute name %s"
2420msgstr "无效的属性名 %s"
2421
2422#: pathspec.c:254
2423msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2424msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2425
2426#: pathspec.c:261
2427msgid ""
2428"global 'literal' pathspec setting is incompatible with all other global "
2429"pathspec settings"
2430msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
2431
2432#: pathspec.c:301
2433msgid "invalid parameter for pathspec magic 'prefix'"
2434msgstr "路径规格包含无效的神奇前缀"
2435
2436#: pathspec.c:322
2437#, c-format
2438msgid "Invalid pathspec magic '%.*s' in '%s'"
2439msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
2440
2441#: pathspec.c:327
2442#, c-format
2443msgid "Missing ')' at the end of pathspec magic in '%s'"
2444msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
2445
2446#: pathspec.c:365
2447#, c-format
2448msgid "Unimplemented pathspec magic '%c' in '%s'"
2449msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
2450
2451#: pathspec.c:421 pathspec.c:443
2452#, c-format
2453msgid "Pathspec '%s' is in submodule '%.*s'"
2454msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
2455
2456#: pathspec.c:483
2457#, c-format
2458msgid "%s: 'literal' and 'glob' are incompatible"
2459msgstr "%s:'literal' 和 'glob' 不兼容"
2460
2461#: pathspec.c:496
2462#, c-format
2463msgid "%s: '%s' is outside repository"
2464msgstr "%s:'%s' 在仓库之外"
2465
2466#: pathspec.c:584
2467#, c-format
2468msgid "'%s' (mnemonic: '%c')"
2469msgstr "'%s'(助记符:'%c')"
2470
2471#: pathspec.c:594
2472#, c-format
2473msgid "%s: pathspec magic not supported by this command: %s"
2474msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2475
2476#: pathspec.c:644
2477msgid ""
2478"empty strings as pathspecs will be made invalid in upcoming releases. please "
2479"use . instead if you meant to match all paths"
2480msgstr ""
2481"在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n"
2482"请代之以 ."
2483
2484#: pathspec.c:668
2485#, c-format
2486msgid "pathspec '%s' is beyond a symbolic link"
2487msgstr "路径规格 '%s' 位于符号链接中"
2488
2489#: pretty.c:982
2490msgid "unable to parse --pretty format"
2491msgstr "不能解析 --pretty 格式"
2492
2493#: read-cache.c:1307
2494#, c-format
2495msgid ""
2496"index.version set, but the value is invalid.\n"
2497"Using version %i"
2498msgstr ""
2499"设置了 index.version,但是取值无效。\n"
2500"使用版本 %i"
2501
2502#: read-cache.c:1317
2503#, c-format
2504msgid ""
2505"GIT_INDEX_VERSION set, but the value is invalid.\n"
2506"Using version %i"
2507msgstr ""
2508"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2509"使用版本 %i"
2510
2511#: read-cache.c:2232
2512#, c-format
2513msgid "could not stat '%s"
2514msgstr "不能获取 '%s' 的文件状态"
2515
2516#: read-cache.c:2245
2517#, c-format
2518msgid "unable to open git dir: %s"
2519msgstr "不能打开 git 目录:%s"
2520
2521#: read-cache.c:2257
2522#, c-format
2523msgid "unable to unlink: %s"
2524msgstr "无法删除:%s"
2525
2526#: refs.c:619 builtin/merge.c:844
2527#, c-format
2528msgid "Could not open '%s' for writing"
2529msgstr "无法打开 '%s' 进行写入"
2530
2531#: refs/files-backend.c:2531
2532#, c-format
2533msgid "could not delete reference %s: %s"
2534msgstr "无法删除引用 %s:%s"
2535
2536#: refs/files-backend.c:2534
2537#, c-format
2538msgid "could not delete references: %s"
2539msgstr "无法删除引用:%s"
2540
2541#: refs/files-backend.c:2543
2542#, c-format
2543msgid "could not remove reference %s"
2544msgstr "无法删除引用 %s"
2545
2546#: ref-filter.c:35 wt-status.c:1780
2547msgid "gone"
2548msgstr "丢失"
2549
2550#: ref-filter.c:36
2551#, c-format
2552msgid "ahead %d"
2553msgstr "领先 %d"
2554
2555#: ref-filter.c:37
2556#, c-format
2557msgid "behind %d"
2558msgstr "落后 %d"
2559
2560#: ref-filter.c:38
2561#, c-format
2562msgid "ahead %d, behind %d"
2563msgstr "领先 %d,落后 %d"
2564
2565#: ref-filter.c:104
2566#, c-format
2567msgid "expected format: %%(color:<color>)"
2568msgstr "期望的格式:%%(color:<color>)"
2569
2570#: ref-filter.c:106
2571#, c-format
2572msgid "unrecognized color: %%(color:%s)"
2573msgstr "未能识别的颜色:%%(color:%s)"
2574
2575#: ref-filter.c:120
2576#, c-format
2577msgid "Integer value expected refname:lstrip=%s"
2578msgstr "期望整数值 refname:lstrip=%s"
2579
2580#: ref-filter.c:124
2581#, c-format
2582msgid "Integer value expected refname:rstrip=%s"
2583msgstr "期望整数值 refname:rstrip=%s"
2584
2585#: ref-filter.c:126
2586#, c-format
2587msgid "unrecognized %%(%s) argument: %s"
2588msgstr "未能识别的 %%(%s) 参数:%s"
2589
2590#: ref-filter.c:166
2591#, c-format
2592msgid "%%(body) does not take arguments"
2593msgstr "%%(body) 不带参数"
2594
2595#: ref-filter.c:173
2596#, c-format
2597msgid "%%(subject) does not take arguments"
2598msgstr "%%(subject) 不带参数"
2599
2600#: ref-filter.c:180
2601#, c-format
2602msgid "%%(trailers) does not take arguments"
2603msgstr "%%(trailers) 不带参数"
2604
2605#: ref-filter.c:199
2606#, c-format
2607msgid "positive value expected contents:lines=%s"
2608msgstr "期望一个正数 contents:lines=%s"
2609
2610#: ref-filter.c:201
2611#, c-format
2612msgid "unrecognized %%(contents) argument: %s"
2613msgstr "未能识别的 %%(contents) 参数:%s"
2614
2615#: ref-filter.c:214
2616#, c-format
2617msgid "positive value expected objectname:short=%s"
2618msgstr "期望一个正数 objectname:short=%s"
2619
2620#: ref-filter.c:218
2621#, c-format
2622msgid "unrecognized %%(objectname) argument: %s"
2623msgstr "未能识别的 %%(objectname) 参数:%s"
2624
2625#: ref-filter.c:245
2626#, c-format
2627msgid "expected format: %%(align:<width>,<position>)"
2628msgstr "期望的格式:%%(align:<width>,<position>)"
2629
2630#: ref-filter.c:257
2631#, c-format
2632msgid "unrecognized position:%s"
2633msgstr "未能识别的位置:%s"
2634
2635#: ref-filter.c:261
2636#, c-format
2637msgid "unrecognized width:%s"
2638msgstr "未能识别的宽度:%s"
2639
2640#: ref-filter.c:267
2641#, c-format
2642msgid "unrecognized %%(align) argument: %s"
2643msgstr "未能识别的 %%(align) 参数:%s"
2644
2645#: ref-filter.c:271
2646#, c-format
2647msgid "positive width expected with the %%(align) atom"
2648msgstr "元素 %%(align) 需要一个正数的宽度"
2649
2650#: ref-filter.c:286
2651#, c-format
2652msgid "unrecognized %%(if) argument: %s"
2653msgstr "未能识别的 %%(if) 参数:%s"
2654
2655#: ref-filter.c:371
2656#, c-format
2657msgid "malformed field name: %.*s"
2658msgstr "非法的字段名:%.*s"
2659
2660#: ref-filter.c:397
2661#, c-format
2662msgid "unknown field name: %.*s"
2663msgstr "未知的字段名:%.*s"
2664
2665#: ref-filter.c:501
2666#, c-format
2667msgid "format: %%(if) atom used without a %%(then) atom"
2668msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
2669
2670#: ref-filter.c:561
2671#, c-format
2672msgid "format: %%(then) atom used without an %%(if) atom"
2673msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
2674
2675#: ref-filter.c:563
2676#, c-format
2677msgid "format: %%(then) atom used more than once"
2678msgstr "格式:%%(then) 元素用了多次"
2679
2680#: ref-filter.c:565
2681#, c-format
2682msgid "format: %%(then) atom used after %%(else)"
2683msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
2684
2685#: ref-filter.c:591
2686#, c-format
2687msgid "format: %%(else) atom used without an %%(if) atom"
2688msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
2689
2690#: ref-filter.c:593
2691#, c-format
2692msgid "format: %%(else) atom used without a %%(then) atom"
2693msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
2694
2695#: ref-filter.c:595
2696#, c-format
2697msgid "format: %%(else) atom used more than once"
2698msgstr "格式:%%(else) 元素用了多次"
2699
2700#: ref-filter.c:608
2701#, c-format
2702msgid "format: %%(end) atom used without corresponding atom"
2703msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
2704
2705#: ref-filter.c:663
2706#, c-format
2707msgid "malformed format string %s"
2708msgstr "非法的格式化字符串 %s"
2709
2710#: ref-filter.c:1247
2711#, c-format
2712msgid "(no branch, rebasing %s)"
2713msgstr "(非分支,正变基 %s)"
2714
2715#: ref-filter.c:1250
2716#, c-format
2717msgid "(no branch, bisect started on %s)"
2718msgstr "(非分支,二分查找开始于 %s)"
2719
2720#. TRANSLATORS: make sure this matches
2721#. "HEAD detached at " in wt-status.c
2722#: ref-filter.c:1256
2723#, c-format
2724msgid "(HEAD detached at %s)"
2725msgstr "(头指针分离于 %s)"
2726
2727#. TRANSLATORS: make sure this matches
2728#. "HEAD detached from " in wt-status.c
2729#: ref-filter.c:1261
2730#, c-format
2731msgid "(HEAD detached from %s)"
2732msgstr "(头指针分离自 %s)"
2733
2734#: ref-filter.c:1265
2735msgid "(no branch)"
2736msgstr "(非分支)"
2737
2738#: ref-filter.c:1420 ref-filter.c:1451
2739#, c-format
2740msgid "missing object %s for %s"
2741msgstr "缺失 %2$s 的对象 %1$s"
2742
2743#: ref-filter.c:1423 ref-filter.c:1454
2744#, c-format
2745msgid "parse_object_buffer failed on %s for %s"
2746msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
2747
2748#: ref-filter.c:1692
2749#, c-format
2750msgid "malformed object at '%s'"
2751msgstr "非法的对象于 '%s'"
2752
2753#: ref-filter.c:1759
2754#, c-format
2755msgid "ignoring ref with broken name %s"
2756msgstr "忽略带有错误名称 %s 的引用"
2757
2758#: ref-filter.c:1764
2759#, c-format
2760msgid "ignoring broken ref %s"
2761msgstr "忽略损坏的引用 %s"
2762
2763#: ref-filter.c:2028
2764#, c-format
2765msgid "format: %%(end) atom missing"
2766msgstr "格式:缺少 %%(end) 元素"
2767
2768#: ref-filter.c:2109
2769#, c-format
2770msgid "malformed object name %s"
2771msgstr "非法的对象名 %s"
2772
2773#: remote.c:754
2774#, c-format
2775msgid "Cannot fetch both %s and %s to %s"
2776msgstr "不能同时获取 %s 和 %s 至 %s"
2777
2778#: remote.c:758
2779#, c-format
2780msgid "%s usually tracks %s, not %s"
2781msgstr "%s 通常跟踪 %s,而非 %s"
2782
2783#: remote.c:762
2784#, c-format
2785msgid "%s tracks both %s and %s"
2786msgstr "%s 同时跟踪 %s 和 %s"
2787
2788#: remote.c:770
2789msgid "Internal error"
2790msgstr "内部错误"
2791
2792#: remote.c:1685 remote.c:1787
2793msgid "HEAD does not point to a branch"
2794msgstr "HEAD 没有指向一个分支"
2795
2796#: remote.c:1694
2797#, c-format
2798msgid "no such branch: '%s'"
2799msgstr "没有此分支:'%s'"
2800
2801#: remote.c:1697
2802#, c-format
2803msgid "no upstream configured for branch '%s'"
2804msgstr "尚未给分支 '%s' 设置上游"
2805
2806#: remote.c:1703
2807#, c-format
2808msgid "upstream branch '%s' not stored as a remote-tracking branch"
2809msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
2810
2811#: remote.c:1718
2812#, c-format
2813msgid "push destination '%s' on remote '%s' has no local tracking branch"
2814msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
2815
2816#: remote.c:1730
2817#, c-format
2818msgid "branch '%s' has no remote for pushing"
2819msgstr "分支 '%s' 没有设置要推送的远程服务器"
2820
2821#: remote.c:1741
2822#, c-format
2823msgid "push refspecs for '%s' do not include '%s'"
2824msgstr "向 '%s' 推送引用规格未包含 '%s'"
2825
2826#: remote.c:1754
2827msgid "push has no destination (push.default is 'nothing')"
2828msgstr "推送无目标(push.default 是 'nothing')"
2829
2830#: remote.c:1776
2831msgid "cannot resolve 'simple' push to a single destination"
2832msgstr "无法解析 'simple' 推送至一个单独的目标"
2833
2834#: remote.c:2081
2835#, c-format
2836msgid "Your branch is based on '%s', but the upstream is gone.\n"
2837msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
2838
2839#: remote.c:2085
2840msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
2841msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
2842
2843#: remote.c:2088
2844#, c-format
2845msgid "Your branch is up-to-date with '%s'.\n"
2846msgstr "您的分支与上游分支 '%s' 一致。\n"
2847
2848#: remote.c:2092
2849#, c-format
2850msgid "Your branch is ahead of '%s' by %d commit.\n"
2851msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2852msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2853msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
2854
2855#: remote.c:2098
2856msgid "  (use \"git push\" to publish your local commits)\n"
2857msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
2858
2859#: remote.c:2101
2860#, c-format
2861msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2862msgid_plural ""
2863"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2864msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2865msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2866
2867#  译者:注意保持前导空格
2868#: remote.c:2109
2869msgid "  (use \"git pull\" to update your local branch)\n"
2870msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
2871
2872#: remote.c:2112
2873#, c-format
2874msgid ""
2875"Your branch and '%s' have diverged,\n"
2876"and have %d and %d different commit each, respectively.\n"
2877msgid_plural ""
2878"Your branch and '%s' have diverged,\n"
2879"and have %d and %d different commits each, respectively.\n"
2880msgstr[0] ""
2881"您的分支和 '%s' 出现了偏离,\n"
2882"并且分别有 %d 和 %d 处不同的提交。\n"
2883msgstr[1] ""
2884"您的分支和 '%s' 出现了偏离,\n"
2885"并且分别有 %d 和 %d 处不同的提交。\n"
2886
2887#  译者:注意保持前导空格
2888#: remote.c:2122
2889msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
2890msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
2891
2892#: revision.c:2158
2893msgid "your current branch appears to be broken"
2894msgstr "您的当前分支好像被损坏"
2895
2896#: revision.c:2161
2897#, c-format
2898msgid "your current branch '%s' does not have any commits yet"
2899msgstr "您的当前分支 '%s' 尚无任何提交"
2900
2901#: revision.c:2355
2902msgid "--first-parent is incompatible with --bisect"
2903msgstr "--first-parent 与 --bisect 不兼容"
2904
2905#: run-command.c:125
2906msgid "open /dev/null failed"
2907msgstr "不能打开 /dev/null"
2908
2909#: run-command.c:127
2910#, c-format
2911msgid "dup2(%d,%d) failed"
2912msgstr "不能调用 dup2(%d,%d)"
2913
2914#: send-pack.c:150
2915#, c-format
2916msgid "unable to parse remote unpack status: %s"
2917msgstr "不能解析远程解包状态:%s"
2918
2919#: send-pack.c:152
2920#, c-format
2921msgid "remote unpack failed: %s"
2922msgstr "远程解包失败:%s"
2923
2924#: send-pack.c:315
2925msgid "failed to sign the push certificate"
2926msgstr "无法为推送证书签名"
2927
2928#: send-pack.c:428
2929msgid "the receiving end does not support --signed push"
2930msgstr "接收端不支持签名推送"
2931
2932#: send-pack.c:430
2933msgid ""
2934"not sending a push certificate since the receiving end does not support --"
2935"signed push"
2936msgstr "未发送推送证书,因为接收端不支持签名推送"
2937
2938#: send-pack.c:442
2939msgid "the receiving end does not support --atomic push"
2940msgstr "接收端不支持原子推送"
2941
2942#: send-pack.c:447
2943msgid "the receiving end does not support push options"
2944msgstr "接收端不支持推送选项"
2945
2946#: sequencer.c:215
2947msgid "revert"
2948msgstr "还原"
2949
2950#: sequencer.c:217
2951msgid "cherry-pick"
2952msgstr "拣选"
2953
2954#: sequencer.c:219
2955msgid "rebase -i"
2956msgstr "rebase -i"
2957
2958#: sequencer.c:221
2959#, c-format
2960msgid "Unknown action: %d"
2961msgstr "未知动作:%d"
2962
2963#: sequencer.c:278
2964msgid ""
2965"after resolving the conflicts, mark the corrected paths\n"
2966"with 'git add <paths>' or 'git rm <paths>'"
2967msgstr ""
2968"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2969"命令标记修正后的文件"
2970
2971#: sequencer.c:281
2972msgid ""
2973"after resolving the conflicts, mark the corrected paths\n"
2974"with 'git add <paths>' or 'git rm <paths>'\n"
2975"and commit the result with 'git commit'"
2976msgstr ""
2977"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2978"对修正后的文件做标记,然后用 'git commit' 提交"
2979
2980#: sequencer.c:294 sequencer.c:1675
2981#, c-format
2982msgid "could not lock '%s'"
2983msgstr "不能锁定 '%s'"
2984
2985#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
2986#, c-format
2987msgid "could not write to '%s'"
2988msgstr "不能写入 '%s'"
2989
2990#: sequencer.c:301
2991#, c-format
2992msgid "could not write eol to '%s'"
2993msgstr "不能将换行符写入 '%s'"
2994
2995#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
2996#, c-format
2997msgid "failed to finalize '%s'."
2998msgstr "无法完成 '%s'。"
2999
3000#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
3001#: builtin/commit.c:749 builtin/merge.c:1018
3002#, c-format
3003msgid "could not read '%s'"
3004msgstr "不能读取 '%s'"
3005
3006#: sequencer.c:355
3007#, c-format
3008msgid "your local changes would be overwritten by %s."
3009msgstr "您的本地修改将被%s覆盖。"
3010
3011#: sequencer.c:359
3012msgid "commit your changes or stash them to proceed."
3013msgstr "提交您的修改或保存进度后再继续。"
3014
3015#: sequencer.c:388
3016#, c-format
3017msgid "%s: fast-forward"
3018msgstr "%s:快进"
3019
3020#. TRANSLATORS: %s will be "revert", "cherry-pick" or
3021#. * "rebase -i".
3022#.
3023#: sequencer.c:470
3024#, c-format
3025msgid "%s: Unable to write new index file"
3026msgstr "%s:无法写入新索引文件"
3027
3028#: sequencer.c:489
3029msgid "could not resolve HEAD commit\n"
3030msgstr "不能解析 HEAD 提交\n"
3031
3032#: sequencer.c:509
3033msgid "unable to update cache tree\n"
3034msgstr "不能更新缓存树\n"
3035
3036#: sequencer.c:592
3037#, c-format
3038msgid ""
3039"you have staged changes in your working tree\n"
3040"If these changes are meant to be squashed into the previous commit, run:\n"
3041"\n"
3042"  git commit --amend %s\n"
3043"\n"
3044"If they are meant to go into a new commit, run:\n"
3045"\n"
3046"  git commit %s\n"
3047"\n"
3048"In both cases, once you're done, continue with:\n"
3049"\n"
3050"  git rebase --continue\n"
3051msgstr ""
3052"您的工作区中存在已暂存的修改\n"
3053"如果这些修改需要被并入前一个提交,执行:\n"
3054"\n"
3055"  git commit --amend %s\n"
3056"\n"
3057"如果这些修改要形成一个新提交,执行:\n"
3058"\n"
3059"  git commit %s\n"
3060"\n"
3061"无论哪种情况,当您完成提交,继续执行:\n"
3062"\n"
3063"  git rebase --continue\n"
3064
3065#: sequencer.c:694
3066#, c-format
3067msgid "could not parse commit %s\n"
3068msgstr "不能解析提交 %s\n"
3069
3070#: sequencer.c:699
3071#, c-format
3072msgid "could not parse parent commit %s\n"
3073msgstr "不能解析父提交 %s\n"
3074
3075#: sequencer.c:821
3076#, c-format
3077msgid ""
3078"unexpected 1st line of squash message:\n"
3079"\n"
3080"\t%.*s"
3081msgstr ""
3082"意外的压缩提交首行提交信息:\n"
3083"\n"
3084"\t%.*s"
3085
3086#: sequencer.c:827
3087#, c-format
3088msgid ""
3089"invalid 1st line of squash message:\n"
3090"\n"
3091"\t%.*s"
3092msgstr ""
3093"压缩提交的首行提交信息无效:\n"
3094"\n"
3095"\t%.*s"
3096
3097#: sequencer.c:833 sequencer.c:858
3098#, c-format
3099msgid "This is a combination of %d commits."
3100msgstr "这是一个 %d 个提交的组合。"
3101
3102#: sequencer.c:842
3103msgid "need a HEAD to fixup"
3104msgstr "需要一个 HEAD 来修复"
3105
3106#: sequencer.c:844
3107msgid "could not read HEAD"
3108msgstr "不能读取 HEAD"
3109
3110#: sequencer.c:846
3111msgid "could not read HEAD's commit message"
3112msgstr "不能读取 HEAD 的提交说明"
3113
3114#: sequencer.c:852
3115#, c-format
3116msgid "cannot write '%s'"
3117msgstr "不能写 '%s'"
3118
3119#: sequencer.c:861 git-rebase--interactive.sh:445
3120msgid "This is the 1st commit message:"
3121msgstr "这是第一个提交说明:"
3122
3123#: sequencer.c:869
3124#, c-format
3125msgid "could not read commit message of %s"
3126msgstr "不能读取 %s 的提交说明"
3127
3128#: sequencer.c:876
3129#, c-format
3130msgid "This is the commit message #%d:"
3131msgstr "这是提交说明 #%d:"
3132
3133#: sequencer.c:881
3134#, c-format
3135msgid "The commit message #%d will be skipped:"
3136msgstr "提交说明 #%d 将被跳过:"
3137
3138#: sequencer.c:886
3139#, c-format
3140msgid "unknown command: %d"
3141msgstr "未知命令:%d"
3142
3143#: sequencer.c:952
3144msgid "your index file is unmerged."
3145msgstr "您的索引文件未完成合并。"
3146
3147#: sequencer.c:970
3148#, c-format
3149msgid "commit %s is a merge but no -m option was given."
3150msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
3151
3152#: sequencer.c:978
3153#, c-format
3154msgid "commit %s does not have parent %d"
3155msgstr "提交 %s 没有第 %d 个父提交"
3156
3157#: sequencer.c:982
3158#, c-format
3159msgid "mainline was specified but commit %s is not a merge."
3160msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3161
3162#: sequencer.c:988
3163#, c-format
3164msgid "cannot get commit message for %s"
3165msgstr "不能得到 %s 的提交说明"
3166
3167#. TRANSLATORS: The first %s will be a "todo" command like
3168#. "revert" or "pick", the second %s a SHA1.
3169#: sequencer.c:1009
3170#, c-format
3171msgid "%s: cannot parse parent commit %s"
3172msgstr "%s:不能解析父提交 %s"
3173
3174#: sequencer.c:1071 sequencer.c:1820
3175#, c-format
3176msgid "could not rename '%s' to '%s'"
3177msgstr "不能将 '%s' 重命名为 '%s'"
3178
3179#: sequencer.c:1122
3180#, c-format
3181msgid "could not revert %s... %s"
3182msgstr "不能还原 %s... %s"
3183
3184#: sequencer.c:1123
3185#, c-format
3186msgid "could not apply %s... %s"
3187msgstr "不能应用 %s... %s"
3188
3189#: sequencer.c:1165
3190msgid "empty commit set passed"
3191msgstr "提供了空的提交集"
3192
3193#: sequencer.c:1175
3194#, c-format
3195msgid "git %s: failed to read the index"
3196msgstr "git %s:无法读取索引"
3197
3198#: sequencer.c:1182
3199#, c-format
3200msgid "git %s: failed to refresh the index"
3201msgstr "git %s:无法刷新索引"
3202
3203#: sequencer.c:1302
3204#, c-format
3205msgid "invalid line %d: %.*s"
3206msgstr "无效行 %d:%.*s"
3207
3208#: sequencer.c:1310
3209#, c-format
3210msgid "cannot '%s' without a previous commit"
3211msgstr "没有父提交的情况下不能 '%s'"
3212
3213#: sequencer.c:1342
3214#, c-format
3215msgid "could not read '%s'."
3216msgstr "不能读取 '%s'。"
3217
3218#: sequencer.c:1349
3219msgid "please fix this using 'git rebase --edit-todo'."
3220msgstr "请用 'git rebase --edit-todo' 来修改。"
3221
3222#: sequencer.c:1351
3223#, c-format
3224msgid "unusable instruction sheet: '%s'"
3225msgstr "不可用的指令清单:'%s'"
3226
3227#: sequencer.c:1356
3228msgid "no commits parsed."
3229msgstr "没有解析提交。"
3230
3231#: sequencer.c:1367
3232msgid "cannot cherry-pick during a revert."
3233msgstr "不能在回退中执行拣选。"
3234
3235#: sequencer.c:1369
3236msgid "cannot revert during a cherry-pick."
3237msgstr "不能在拣选中执行回退。"
3238
3239#: sequencer.c:1432
3240#, c-format
3241msgid "invalid key: %s"
3242msgstr "无效键名:%s"
3243
3244#: sequencer.c:1435
3245#, c-format
3246msgid "invalid value for %s: %s"
3247msgstr "%s 的值无效:%s"
3248
3249#: sequencer.c:1492
3250#, c-format
3251msgid "malformed options sheet: '%s'"
3252msgstr "非法的选项清单:'%s'"
3253
3254#: sequencer.c:1530
3255msgid "a cherry-pick or revert is already in progress"
3256msgstr "一个拣选或还原操作已在进行"
3257
3258#: sequencer.c:1531
3259msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3260msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3261
3262#: sequencer.c:1534
3263#, c-format
3264msgid "could not create sequencer directory '%s'"
3265msgstr "不能创建序列目录 '%s'"
3266
3267#: sequencer.c:1548
3268msgid "could not lock HEAD"
3269msgstr "不能锁定 HEAD"
3270
3271#: sequencer.c:1604 sequencer.c:2159
3272msgid "no cherry-pick or revert in progress"
3273msgstr "拣选或还原操作并未进行"
3274
3275#: sequencer.c:1606
3276msgid "cannot resolve HEAD"
3277msgstr "不能解析 HEAD"
3278
3279#: sequencer.c:1608 sequencer.c:1642
3280msgid "cannot abort from a branch yet to be born"
3281msgstr "不能从尚未建立的分支终止"
3282
3283#: sequencer.c:1628 builtin/grep.c:910
3284#, c-format
3285msgid "cannot open '%s'"
3286msgstr "不能打开 '%s'"
3287
3288#: sequencer.c:1630
3289#, c-format
3290msgid "cannot read '%s': %s"
3291msgstr "不能读取 '%s':%s"
3292
3293#: sequencer.c:1631
3294msgid "unexpected end of file"
3295msgstr "意外的文件结束"
3296
3297#: sequencer.c:1637
3298#, c-format
3299msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3300msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3301
3302#: sequencer.c:1648
3303msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3304msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3305
3306#: sequencer.c:1785 sequencer.c:2058
3307msgid "cannot read HEAD"
3308msgstr "不能读取 HEAD"
3309
3310#: sequencer.c:1825 builtin/difftool.c:616
3311#, c-format
3312msgid "could not copy '%s' to '%s'"
3313msgstr "不能拷贝 '%s' 至 '%s'"
3314
3315#: sequencer.c:1841
3316msgid "could not read index"
3317msgstr "不能读取索引"
3318
3319#  译者:注意保持前导空格
3320#: sequencer.c:1846
3321#, c-format
3322msgid ""
3323"execution failed: %s\n"
3324"%sYou can fix the problem, and then run\n"
3325"\n"
3326"  git rebase --continue\n"
3327"\n"
3328msgstr ""
3329"执行失败:%s\n"
3330"%s您可以改正该问题,然后运行\n"
3331"\n"
3332"  git rebase --continue\n"
3333"\n"
3334
3335#: sequencer.c:1852
3336msgid "and made changes to the index and/or the working tree\n"
3337msgstr "并且修改索引和/或工作区\n"
3338
3339#: sequencer.c:1858
3340#, c-format
3341msgid ""
3342"execution succeeded: %s\n"
3343"but left changes to the index and/or the working tree\n"
3344"Commit or stash your changes, and then run\n"
3345"\n"
3346"  git rebase --continue\n"
3347"\n"
3348msgstr ""
3349"执行成功:%s\n"
3350"但是在索引和/或工作区中存在变更\n"
3351"提交或暂存修改,然后运行\n"
3352"\n"
3353"  git rebase --continue\n"
3354"\n"
3355
3356#: sequencer.c:1913 git-rebase.sh:168
3357#, c-format
3358msgid "Applied autostash."
3359msgstr "成功应用 autostash。"
3360
3361#: sequencer.c:1925
3362#, c-format
3363msgid "cannot store %s"
3364msgstr "不能存储 %s"
3365
3366#: sequencer.c:1927 git-rebase.sh:172
3367#, c-format
3368msgid ""
3369"Applying autostash resulted in conflicts.\n"
3370"Your changes are safe in the stash.\n"
3371"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3372msgstr ""
3373"应用 autostash 导致冲突。\n"
3374"您的修改安全地保存在 stash 中。\n"
3375"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3376
3377#: sequencer.c:2009
3378#, c-format
3379msgid "Stopped at %s...  %.*s\n"
3380msgstr "停止在 %s... %.*s\n"
3381
3382#: sequencer.c:2036
3383#, c-format
3384msgid "unknown command %d"
3385msgstr "未知命令 %d"
3386
3387#: sequencer.c:2066
3388msgid "could not read orig-head"
3389msgstr "不能读取 orig-head"
3390
3391#: sequencer.c:2070
3392msgid "could not read 'onto'"
3393msgstr "不能读取 'onto'"
3394
3395#: sequencer.c:2077
3396#, c-format
3397msgid "could not update %s"
3398msgstr "不能更新 %s"
3399
3400#: sequencer.c:2084
3401#, c-format
3402msgid "could not update HEAD to %s"
3403msgstr "不能更新 HEAD 为 %s"
3404
3405#: sequencer.c:2168
3406msgid "cannot rebase: You have unstaged changes."
3407msgstr "不能变基:您有未暂存的变更。"
3408
3409#: sequencer.c:2173
3410msgid "could not remove CHERRY_PICK_HEAD"
3411msgstr "不能删除 CHERRY_PICK_HEAD"
3412
3413#: sequencer.c:2182
3414msgid "cannot amend non-existing commit"
3415msgstr "不能修补不存在的提交"
3416
3417#: sequencer.c:2184
3418#, c-format
3419msgid "invalid file: '%s'"
3420msgstr "无效文件:'%s'"
3421
3422#: sequencer.c:2186
3423#, c-format
3424msgid "invalid contents: '%s'"
3425msgstr "无效内容:'%s'"
3426
3427#: sequencer.c:2189
3428msgid ""
3429"\n"
3430"You have uncommitted changes in your working tree. Please, commit them\n"
3431"first and then run 'git rebase --continue' again."
3432msgstr ""
3433"\n"
3434"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
3435
3436#: sequencer.c:2199
3437msgid "could not commit staged changes."
3438msgstr "不能提交暂存的修改。"
3439
3440#: sequencer.c:2279
3441#, c-format
3442msgid "%s: can't cherry-pick a %s"
3443msgstr "%s:不能拣选一个%s"
3444
3445#: sequencer.c:2283
3446#, c-format
3447msgid "%s: bad revision"
3448msgstr "%s:错误的版本"
3449
3450#: sequencer.c:2316
3451msgid "can't revert as initial commit"
3452msgstr "不能作为初始提交回退"
3453
3454#: setup.c:165
3455#, c-format
3456msgid ""
3457"%s: no such path in the working tree.\n"
3458"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
3459msgstr ""
3460"%s:工作区中无此路径。\n"
3461"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
3462
3463#: setup.c:178
3464#, c-format
3465msgid ""
3466"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
3467"Use '--' to separate paths from revisions, like this:\n"
3468"'git <command> [<revision>...] -- [<file>...]'"
3469msgstr ""
3470"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
3471"使用 '--' 来分隔版本和路径,例如:\n"
3472"'git <command> [<revision>...] -- [<file>...]'"
3473
3474#: setup.c:228
3475#, c-format
3476msgid ""
3477"ambiguous argument '%s': both revision and filename\n"
3478"Use '--' to separate paths from revisions, like this:\n"
3479"'git <command> [<revision>...] -- [<file>...]'"
3480msgstr ""
3481"有歧义的参数 '%s':可同时是版本和文件\n"
3482"使用 '--' 来分隔版本和路径,例如:\n"
3483"'git <command> [<revision>...] -- [<file>...]'"
3484
3485#: setup.c:475
3486#, c-format
3487msgid "Expected git repo version <= %d, found %d"
3488msgstr "期望 git 仓库版本 <= %d,却得到 %d"
3489
3490#: setup.c:483
3491msgid "unknown repository extensions found:"
3492msgstr "发现未知的仓库扩展:"
3493
3494#: setup.c:776
3495#, c-format
3496msgid "Not a git repository (or any of the parent directories): %s"
3497msgstr "不是一个 git 仓库(或者任何父目录):%s"
3498
3499#: setup.c:778 builtin/index-pack.c:1646
3500msgid "Cannot come back to cwd"
3501msgstr "无法返回当前工作目录"
3502
3503#: setup.c:1010
3504msgid "Unable to read current working directory"
3505msgstr "不能读取当前工作目录"
3506
3507#: setup.c:1022 setup.c:1028
3508#, c-format
3509msgid "Cannot change to '%s'"
3510msgstr "不能切换到 '%s'"
3511
3512#: setup.c:1041
3513#, c-format
3514msgid ""
3515"Not a git repository (or any parent up to mount point %s)\n"
3516"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3517msgstr ""
3518"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3519"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
3520
3521#: setup.c:1106
3522#, c-format
3523msgid ""
3524"Problem with core.sharedRepository filemode value (0%.3o).\n"
3525"The owner of files must always have read and write permissions."
3526msgstr ""
3527"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3528"文件属主必须始终拥有读写权限。"
3529
3530#: sha1_file.c:559
3531#, c-format
3532msgid "path '%s' does not exist"
3533msgstr "路径 '%s' 不存在"
3534
3535#: sha1_file.c:585
3536#, c-format
3537msgid "reference repository '%s' as a linked checkout is not supported yet."
3538msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3539
3540#: sha1_file.c:591
3541#, c-format
3542msgid "reference repository '%s' is not a local repository."
3543msgstr "参考仓库 '%s' 不是一个本地仓库。"
3544
3545#: sha1_file.c:597
3546#, c-format
3547msgid "reference repository '%s' is shallow"
3548msgstr "参考仓库 '%s' 是一个浅克隆"
3549
3550#: sha1_file.c:605
3551#, c-format
3552msgid "reference repository '%s' is grafted"
3553msgstr "参考仓库 '%s' 已被嫁接"
3554
3555#: sha1_file.c:1245
3556msgid "offset before end of packfile (broken .idx?)"
3557msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
3558
3559#: sha1_file.c:2721
3560#, c-format
3561msgid "offset before start of pack index for %s (corrupt index?)"
3562msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
3563
3564#: sha1_file.c:2725
3565#, c-format
3566msgid "offset beyond end of pack index for %s (truncated index?)"
3567msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
3568
3569#: sha1_name.c:409
3570#, c-format
3571msgid "short SHA1 %s is ambiguous"
3572msgstr "短 SHA1 %s 存在歧义"
3573
3574#: sha1_name.c:420
3575msgid "The candidates are:"
3576msgstr "候选者有:"
3577
3578#: sha1_name.c:580
3579msgid ""
3580"Git normally never creates a ref that ends with 40 hex characters\n"
3581"because it will be ignored when you just specify 40-hex. These refs\n"
3582"may be created by mistake. For example,\n"
3583"\n"
3584"  git checkout -b $br $(git rev-parse ...)\n"
3585"\n"
3586"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3587"examine these refs and maybe delete them. Turn this message off by\n"
3588"running \"git config advice.objectNameWarning false\""
3589msgstr ""
3590"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3591"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3592"\n"
3593"  git checkout -b $br $(git rev-parse ...)\n"
3594"\n"
3595"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3596"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3597"命令关闭本消息通知。"
3598
3599#: submodule.c:67 submodule.c:101
3600msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3601msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3602
3603#: submodule.c:71 submodule.c:105
3604#, c-format
3605msgid "Could not find section in .gitmodules where path=%s"
3606msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3607
3608#: submodule.c:79
3609#, c-format
3610msgid "Could not update .gitmodules entry %s"
3611msgstr "不能更新 .gitmodules 条目 %s"
3612
3613#: submodule.c:112
3614#, c-format
3615msgid "Could not remove .gitmodules entry for %s"
3616msgstr "无法移除 %s 的 .gitmodules 条目"
3617
3618#: submodule.c:123
3619msgid "staging updated .gitmodules failed"
3620msgstr "将更新后 .gitmodules 添加暂存区失败"
3621
3622#: submodule.c:161
3623msgid "negative values not allowed for submodule.fetchJobs"
3624msgstr "submodule.fetchJobs 不允许为负值"
3625
3626#: submodule.c:1194
3627#, c-format
3628msgid "'%s' not recognized as a git repository"
3629msgstr "'%s' 没有识别为一个 git 仓库"
3630
3631#: submodule.c:1332
3632#, c-format
3633msgid "could not start 'git status' in submodule '%s'"
3634msgstr "无法在子模组 '%s' 中启动 'git status'"
3635
3636#: submodule.c:1345
3637#, c-format
3638msgid "could not run 'git status' in submodule '%s'"
3639msgstr "无法在子模组 '%s' 中执行 'git status'"
3640
3641#: submodule.c:1421
3642#, c-format
3643msgid "submodule '%s' has dirty index"
3644msgstr "子模组 '%s' 中有脏索引"
3645
3646#: submodule.c:1679
3647#, c-format
3648msgid ""
3649"relocate_gitdir for submodule '%s' with more than one worktree not supported"
3650msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3651
3652#: submodule.c:1691 submodule.c:1747
3653#, c-format
3654msgid "could not lookup name for submodule '%s'"
3655msgstr "不能查询子模组 '%s' 的名称"
3656
3657#: submodule.c:1695 builtin/submodule--helper.c:678
3658#: builtin/submodule--helper.c:688
3659#, c-format
3660msgid "could not create directory '%s'"
3661msgstr "不能创建目录 '%s'"
3662
3663#: submodule.c:1698
3664#, c-format
3665msgid ""
3666"Migrating git directory of '%s%s' from\n"
3667"'%s' to\n"
3668"'%s'\n"
3669msgstr ""
3670"将 '%s%s' 的 git 目录从\n"
3671"'%s' 迁移至\n"
3672"'%s'\n"
3673
3674#: submodule.c:1782
3675#, c-format
3676msgid "could not recurse into submodule '%s'"
3677msgstr "无法递归进子模组路径 '%s'"
3678
3679#: submodule.c:1826
3680msgid "could not start ls-files in .."
3681msgstr "无法在 .. 中启动 ls-files"
3682
3683#: submodule.c:1846
3684msgid "BUG: returned path string doesn't match cwd?"
3685msgstr "BUG:返回的路径和当前路径不匹配?"
3686
3687#: submodule.c:1865
3688#, c-format
3689msgid "ls-tree returned unexpected return code %d"
3690msgstr "ls-tree 返回未知返回值 %d"
3691
3692#: submodule-config.c:380
3693#, c-format
3694msgid "invalid value for %s"
3695msgstr "%s 的值无效"
3696
3697#: trailer.c:240
3698#, c-format
3699msgid "running trailer command '%s' failed"
3700msgstr "执行 trailer 命令 '%s' 失败"
3701
3702#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
3703#: trailer.c:543
3704#, c-format
3705msgid "unknown value '%s' for key '%s'"
3706msgstr "键 '%2$s' 的未知取值 '%1$s'"
3707
3708#: trailer.c:525 trailer.c:530 builtin/remote.c:289
3709#, c-format
3710msgid "more than one %s"
3711msgstr "多于一个 %s"
3712
3713#: trailer.c:702
3714#, c-format
3715msgid "empty trailer token in trailer '%.*s'"
3716msgstr "签名 '%.*s' 的键为空"
3717
3718#: trailer.c:722
3719#, c-format
3720msgid "could not read input file '%s'"
3721msgstr "不能读取输入文件 '%s'"
3722
3723#: trailer.c:725
3724msgid "could not read from stdin"
3725msgstr "不能自标准输入读取"
3726
3727#: trailer.c:949 builtin/am.c:44
3728#, c-format
3729msgid "could not stat %s"
3730msgstr "不能获取 %s 的状态"
3731
3732#: trailer.c:951
3733#, c-format
3734msgid "file %s is not a regular file"
3735msgstr "文件 %s 不是一个正规文件"
3736
3737#: trailer.c:953
3738#, c-format
3739msgid "file %s is not writable by user"
3740msgstr "文件 %s 用户不可写"
3741
3742#: trailer.c:965
3743msgid "could not open temporary file"
3744msgstr "不能打开临时文件"
3745
3746#: trailer.c:1001
3747#, c-format
3748msgid "could not rename temporary file to %s"
3749msgstr "不能重命名临时文件为 %s"
3750
3751#: transport.c:62
3752#, c-format
3753msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3754msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3755
3756#: transport.c:151
3757#, c-format
3758msgid "transport: invalid depth option '%s'"
3759msgstr "传输:无效的深度选项 '%s'"
3760
3761#: transport.c:889
3762#, c-format
3763msgid ""
3764"The following submodule paths contain changes that can\n"
3765"not be found on any remote:\n"
3766msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3767
3768#: transport.c:893
3769#, c-format
3770msgid ""
3771"\n"
3772"Please try\n"
3773"\n"
3774"\tgit push --recurse-submodules=on-demand\n"
3775"\n"
3776"or cd to the path and use\n"
3777"\n"
3778"\tgit push\n"
3779"\n"
3780"to push them to a remote.\n"
3781"\n"
3782msgstr ""
3783"\n"
3784"请尝试\n"
3785"\n"
3786"\tgit push --recurse-submodules=on-demand\n"
3787"\n"
3788"或者进入到子目录执行\n"
3789"\n"
3790"\tgit push\n"
3791"\n"
3792"以推送至远程。\n"
3793"\n"
3794
3795#: transport.c:901
3796msgid "Aborting."
3797msgstr "正在终止。"
3798
3799#: transport-helper.c:1080
3800#, c-format
3801msgid "Could not read ref %s"
3802msgstr "不能读取引用 %s"
3803
3804#: tree-walk.c:31
3805msgid "too-short tree object"
3806msgstr "太短的树对象"
3807
3808#: tree-walk.c:37
3809msgid "malformed mode in tree entry"
3810msgstr "树对象中的条目模式错误"
3811
3812#: tree-walk.c:41
3813msgid "empty filename in tree entry"
3814msgstr "树对象条目中空的文件名"
3815
3816#: tree-walk.c:113
3817msgid "too-short tree file"
3818msgstr "太短的树文件"
3819
3820#: unpack-trees.c:104
3821#, c-format
3822msgid ""
3823"Your local changes to the following files would be overwritten by checkout:\n"
3824"%%sPlease commit your changes or stash them before you switch branches."
3825msgstr ""
3826"您对下列文件的本地修改将被检出操作覆盖:\n"
3827"%%s请在切换分支前提交您的修改或者保存进度。"
3828
3829#: unpack-trees.c:106
3830#, c-format
3831msgid ""
3832"Your local changes to the following files would be overwritten by checkout:\n"
3833"%%s"
3834msgstr ""
3835"您对下列文件的本地修改将被检出操作覆盖:\n"
3836"%%s"
3837
3838#: unpack-trees.c:109
3839#, c-format
3840msgid ""
3841"Your local changes to the following files would be overwritten by merge:\n"
3842"%%sPlease commit your changes or stash them before you merge."
3843msgstr ""
3844"您对下列文件的本地修改将被合并操作覆盖:\n"
3845"%%s请在合并前提交您的修改或者保存进度。"
3846
3847#: unpack-trees.c:111
3848#, c-format
3849msgid ""
3850"Your local changes to the following files would be overwritten by merge:\n"
3851"%%s"
3852msgstr ""
3853"您对下列文件的本地修改将被合并操作覆盖:\n"
3854"%%s"
3855
3856#: unpack-trees.c:114
3857#, c-format
3858msgid ""
3859"Your local changes to the following files would be overwritten by %s:\n"
3860"%%sPlease commit your changes or stash them before you %s."
3861msgstr ""
3862"您对下列文件的本地修改将被 %s 覆盖:\n"
3863"%%s请在 %s 之前提交您的修改或者保存进度。"
3864
3865#: unpack-trees.c:116
3866#, c-format
3867msgid ""
3868"Your local changes to the following files would be overwritten by %s:\n"
3869"%%s"
3870msgstr ""
3871"您对下列文件的本地修改将被 %s 覆盖:\n"
3872"%%s"
3873
3874#: unpack-trees.c:121
3875#, c-format
3876msgid ""
3877"Updating the following directories would lose untracked files in them:\n"
3878"%s"
3879msgstr ""
3880"更新如下目录将会丢失其中未跟踪的文件:\n"
3881"%s"
3882
3883#: unpack-trees.c:125
3884#, c-format
3885msgid ""
3886"The following untracked working tree files would be removed by checkout:\n"
3887"%%sPlease move or remove them before you switch branches."
3888msgstr ""
3889"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3890"%%s请在切换分支之前移动或删除。"
3891
3892#: unpack-trees.c:127
3893#, c-format
3894msgid ""
3895"The following untracked working tree files would be removed by checkout:\n"
3896"%%s"
3897msgstr ""
3898"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3899"%%s"
3900
3901#: unpack-trees.c:130
3902#, c-format
3903msgid ""
3904"The following untracked working tree files would be removed by merge:\n"
3905"%%sPlease move or remove them before you merge."
3906msgstr ""
3907"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3908"%%s请在合并前移动或删除。"
3909
3910#: unpack-trees.c:132
3911#, c-format
3912msgid ""
3913"The following untracked working tree files would be removed by merge:\n"
3914"%%s"
3915msgstr ""
3916"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3917"%%s"
3918
3919#: unpack-trees.c:135
3920#, c-format
3921msgid ""
3922"The following untracked working tree files would be removed by %s:\n"
3923"%%sPlease move or remove them before you %s."
3924msgstr ""
3925"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3926"%%s请在 %s 前移动或删除。"
3927
3928#: unpack-trees.c:137
3929#, c-format
3930msgid ""
3931"The following untracked working tree files would be removed by %s:\n"
3932"%%s"
3933msgstr ""
3934"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3935"%%s"
3936
3937#: unpack-trees.c:142
3938#, c-format
3939msgid ""
3940"The following untracked working tree files would be overwritten by "
3941"checkout:\n"
3942"%%sPlease move or remove them before you switch branches."
3943msgstr ""
3944"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3945"%%s请在切换分支前移动或删除。"
3946
3947#: unpack-trees.c:144
3948#, c-format
3949msgid ""
3950"The following untracked working tree files would be overwritten by "
3951"checkout:\n"
3952"%%s"
3953msgstr ""
3954"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3955"%%s"
3956
3957#: unpack-trees.c:147
3958#, c-format
3959msgid ""
3960"The following untracked working tree files would be overwritten by merge:\n"
3961"%%sPlease move or remove them before you merge."
3962msgstr ""
3963"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3964"%%s请在合并前移动或删除。"
3965
3966#: unpack-trees.c:149
3967#, c-format
3968msgid ""
3969"The following untracked working tree files would be overwritten by merge:\n"
3970"%%s"
3971msgstr ""
3972"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3973"%%s"
3974
3975#: unpack-trees.c:152
3976#, c-format
3977msgid ""
3978"The following untracked working tree files would be overwritten by %s:\n"
3979"%%sPlease move or remove them before you %s."
3980msgstr ""
3981"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3982"%%s请在 %s 前移动或删除。"
3983
3984#: unpack-trees.c:154
3985#, c-format
3986msgid ""
3987"The following untracked working tree files would be overwritten by %s:\n"
3988"%%s"
3989msgstr ""
3990"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3991"%%s"
3992
3993#: unpack-trees.c:161
3994#, c-format
3995msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
3996msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
3997
3998#: unpack-trees.c:164
3999#, c-format
4000msgid ""
4001"Cannot update sparse checkout: the following entries are not up-to-date:\n"
4002"%s"
4003msgstr ""
4004"无法更新稀疏检出:如下条目不是最新:\n"
4005"%s"
4006
4007#: unpack-trees.c:166
4008#, c-format
4009msgid ""
4010"The following working tree files would be overwritten by sparse checkout "
4011"update:\n"
4012"%s"
4013msgstr ""
4014"工作区中下列文件将被稀疏检出更新所覆盖:\n"
4015"%s"
4016
4017#: unpack-trees.c:168
4018#, c-format
4019msgid ""
4020"The following working tree files would be removed by sparse checkout "
4021"update:\n"
4022"%s"
4023msgstr ""
4024"工作区中下列文件将被稀疏检出更新所删除:\n"
4025"%s"
4026
4027#: unpack-trees.c:170
4028#, c-format
4029msgid ""
4030"Cannot update submodule:\n"
4031"%s"
4032msgstr ""
4033"无法更新子模组:\n"
4034"%s"
4035
4036#: unpack-trees.c:247
4037#, c-format
4038msgid "Aborting\n"
4039msgstr "终止中\n"
4040
4041#: unpack-trees.c:272
4042#, c-format
4043msgid "submodule update strategy not supported for submodule '%s'"
4044msgstr "子模组 %s 不支持子模组更新策略"
4045
4046#: unpack-trees.c:340
4047msgid "Checking out files"
4048msgstr "正在检出文件"
4049
4050#: urlmatch.c:163
4051msgid "invalid URL scheme name or missing '://' suffix"
4052msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4053
4054#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
4055#, c-format
4056msgid "invalid %XX escape sequence"
4057msgstr "无效的 %XX 转义序列"
4058
4059#: urlmatch.c:215
4060msgid "missing host and scheme is not 'file:'"
4061msgstr "缺失主机名且 URL 方案不是 'file:'"
4062
4063#: urlmatch.c:232
4064msgid "a 'file:' URL may not have a port number"
4065msgstr "一个 'file:' URL 不应该包含端口号"
4066
4067#: urlmatch.c:247
4068msgid "invalid characters in host name"
4069msgstr "主机名中包含无效的字符"
4070
4071#: urlmatch.c:292 urlmatch.c:303
4072msgid "invalid port number"
4073msgstr "无效的端口号"
4074
4075#: urlmatch.c:371
4076msgid "invalid '..' path segment"
4077msgstr "无效的 '..' 路径片段"
4078
4079#: worktree.c:285
4080#, c-format
4081msgid "failed to read '%s'"
4082msgstr "无法读取 '%s'"
4083
4084#: wrapper.c:222 wrapper.c:392
4085#, c-format
4086msgid "could not open '%s' for reading and writing"
4087msgstr "无法打开 '%s' 进行读写"
4088
4089#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
4090#, c-format
4091msgid "could not open '%s' for writing"
4092msgstr "无法打开 '%s' 进行写入"
4093
4094#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
4095#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
4096#: builtin/pull.c:341
4097#, c-format
4098msgid "could not open '%s' for reading"
4099msgstr "无法打开 '%s' 进行读取"
4100
4101#: wrapper.c:581 wrapper.c:602
4102#, c-format
4103msgid "unable to access '%s'"
4104msgstr "不能访问 '%s'"
4105
4106#: wrapper.c:610
4107msgid "unable to get current working directory"
4108msgstr "不能获取当前工作目录"
4109
4110#: wrapper.c:634
4111#, c-format
4112msgid "could not write to %s"
4113msgstr "不能写入 %s"
4114
4115#: wrapper.c:636
4116#, c-format
4117msgid "could not close %s"
4118msgstr "不能关闭 %s"
4119
4120#: wt-status.c:151
4121msgid "Unmerged paths:"
4122msgstr "未合并的路径:"
4123
4124#  译者:注意保持前导空格
4125#: wt-status.c:178 wt-status.c:205
4126#, c-format
4127msgid "  (use \"git reset %s <file>...\" to unstage)"
4128msgstr "  (使用 \"git reset %s <文件>...\" 以取消暂存)"
4129
4130#  译者:注意保持前导空格
4131#: wt-status.c:180 wt-status.c:207
4132msgid "  (use \"git rm --cached <file>...\" to unstage)"
4133msgstr "  (使用 \"git rm --cached <文件>...\" 以取消暂存)"
4134
4135#  译者:注意保持前导空格
4136#: wt-status.c:184
4137msgid "  (use \"git add <file>...\" to mark resolution)"
4138msgstr "  (使用 \"git add <文件>...\" 标记解决方案)"
4139
4140#  译者:注意保持前导空格
4141#: wt-status.c:186 wt-status.c:190
4142msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4143msgstr "  (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
4144
4145#  译者:注意保持前导空格
4146#: wt-status.c:188
4147msgid "  (use \"git rm <file>...\" to mark resolution)"
4148msgstr "  (使用 \"git rm <文件>...\" 标记解决方案)"
4149
4150#: wt-status.c:199 wt-status.c:958
4151msgid "Changes to be committed:"
4152msgstr "要提交的变更:"
4153
4154#: wt-status.c:217 wt-status.c:967
4155msgid "Changes not staged for commit:"
4156msgstr "尚未暂存以备提交的变更:"
4157
4158#  译者:注意保持前导空格
4159#: wt-status.c:221
4160msgid "  (use \"git add <file>...\" to update what will be committed)"
4161msgstr "  (使用 \"git add <文件>...\" 更新要提交的内容)"
4162
4163#  译者:注意保持前导空格
4164#: wt-status.c:223
4165msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
4166msgstr "  (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
4167
4168#  译者:注意保持前导空格
4169#: wt-status.c:224
4170msgid ""
4171"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
4172msgstr "  (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
4173
4174#  译者:注意保持前导空格
4175#: wt-status.c:226
4176msgid "  (commit or discard the untracked or modified content in submodules)"
4177msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
4178
4179#  译者:注意保持前导空格
4180#: wt-status.c:238
4181#, c-format
4182msgid "  (use \"git %s <file>...\" to include in what will be committed)"
4183msgstr "  (使用 \"git %s <文件>...\" 以包含要提交的内容)"
4184
4185#: wt-status.c:253
4186msgid "both deleted:"
4187msgstr "双方删除:"
4188
4189#: wt-status.c:255
4190msgid "added by us:"
4191msgstr "由我们添加:"
4192
4193#: wt-status.c:257
4194msgid "deleted by them:"
4195msgstr "由他们删除:"
4196
4197#: wt-status.c:259
4198msgid "added by them:"
4199msgstr "由他们添加:"
4200
4201#: wt-status.c:261
4202msgid "deleted by us:"
4203msgstr "由我们删除:"
4204
4205#: wt-status.c:263
4206msgid "both added:"
4207msgstr "双方添加:"
4208
4209#: wt-status.c:265
4210msgid "both modified:"
4211msgstr "双方修改:"
4212
4213#: wt-status.c:275
4214msgid "new file:"
4215msgstr "新文件:"
4216
4217#: wt-status.c:277
4218msgid "copied:"
4219msgstr "拷贝:"
4220
4221#: wt-status.c:279
4222msgid "deleted:"
4223msgstr "删除:"
4224
4225#: wt-status.c:281
4226msgid "modified:"
4227msgstr "修改:"
4228
4229#: wt-status.c:283
4230msgid "renamed:"
4231msgstr "重命名:"
4232
4233#: wt-status.c:285
4234msgid "typechange:"
4235msgstr "类型变更:"
4236
4237#: wt-status.c:287
4238msgid "unknown:"
4239msgstr "未知:"
4240
4241#: wt-status.c:289
4242msgid "unmerged:"
4243msgstr "未合并:"
4244
4245#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4246#: wt-status.c:371
4247msgid "new commits, "
4248msgstr "新提交, "
4249
4250#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4251#: wt-status.c:373
4252msgid "modified content, "
4253msgstr "修改的内容, "
4254
4255#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4256#: wt-status.c:375
4257msgid "untracked content, "
4258msgstr "未跟踪的内容, "
4259
4260#: wt-status.c:831
4261msgid "Submodules changed but not updated:"
4262msgstr "子模组已修改但尚未更新:"
4263
4264#: wt-status.c:833
4265msgid "Submodule changes to be committed:"
4266msgstr "要提交的子模组变更:"
4267
4268#: wt-status.c:914
4269msgid ""
4270"Do not touch the line above.\n"
4271"Everything below will be removed."
4272msgstr ""
4273"不要改动上面的一行。\n"
4274"下面的所有内容均将被删除。"
4275
4276#: wt-status.c:1026
4277msgid "You have unmerged paths."
4278msgstr "您有尚未合并的路径。"
4279
4280#  译者:注意保持前导空格
4281#: wt-status.c:1029
4282msgid "  (fix conflicts and run \"git commit\")"
4283msgstr "  (解决冲突并运行 \"git commit\")"
4284
4285#  译者:注意保持前导空格
4286#: wt-status.c:1031
4287msgid "  (use \"git merge --abort\" to abort the merge)"
4288msgstr "  (使用 \"git merge --abort\" 终止合并)"
4289
4290#: wt-status.c:1036
4291msgid "All conflicts fixed but you are still merging."
4292msgstr "所有冲突已解决但您仍处于合并中。"
4293
4294#  译者:注意保持前导空格
4295#: wt-status.c:1039
4296msgid "  (use \"git commit\" to conclude merge)"
4297msgstr "  (使用 \"git commit\" 结束合并)"
4298
4299#: wt-status.c:1049
4300msgid "You are in the middle of an am session."
4301msgstr "您正处于 am 操作过程中。"
4302
4303#: wt-status.c:1052
4304msgid "The current patch is empty."
4305msgstr "当前的补丁为空。"
4306
4307#  译者:注意保持前导空格
4308#: wt-status.c:1056
4309msgid "  (fix conflicts and then run \"git am --continue\")"
4310msgstr "  (解决冲突,然后运行 \"git am --continue\")"
4311
4312#  译者:注意保持前导空格
4313#: wt-status.c:1058
4314msgid "  (use \"git am --skip\" to skip this patch)"
4315msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
4316
4317#  译者:注意保持前导空格
4318#: wt-status.c:1060
4319msgid "  (use \"git am --abort\" to restore the original branch)"
4320msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
4321
4322#: wt-status.c:1189
4323msgid "git-rebase-todo is missing."
4324msgstr "git-rebase-todo 丢失。"
4325
4326#: wt-status.c:1191
4327msgid "No commands done."
4328msgstr "没有命令被执行。"
4329
4330#: wt-status.c:1194
4331#, c-format
4332msgid "Last command done (%d command done):"
4333msgid_plural "Last commands done (%d commands done):"
4334msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
4335msgstr[1] "最后的命令已完成(%d 条命令被执行):"
4336
4337#: wt-status.c:1205
4338#, c-format
4339msgid "  (see more in file %s)"
4340msgstr "  (更多参见文件 %s)"
4341
4342#: wt-status.c:1210
4343msgid "No commands remaining."
4344msgstr "未剩下任何命令。"
4345
4346#: wt-status.c:1213
4347#, c-format
4348msgid "Next command to do (%d remaining command):"
4349msgid_plural "Next commands to do (%d remaining commands):"
4350msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
4351msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
4352
4353#  译者:注意保持前导空格
4354#: wt-status.c:1221
4355msgid "  (use \"git rebase --edit-todo\" to view and edit)"
4356msgstr "  (使用 \"git rebase --edit-todo\" 来查看和编辑)"
4357
4358#: wt-status.c:1234
4359#, c-format
4360msgid "You are currently rebasing branch '%s' on '%s'."
4361msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
4362
4363#: wt-status.c:1239
4364msgid "You are currently rebasing."
4365msgstr "您在执行变基操作。"
4366
4367#  译者:注意保持前导空格
4368#: wt-status.c:1253
4369msgid "  (fix conflicts and then run \"git rebase --continue\")"
4370msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
4371
4372#  译者:注意保持前导空格
4373#: wt-status.c:1255
4374msgid "  (use \"git rebase --skip\" to skip this patch)"
4375msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
4376
4377#  译者:注意保持前导空格
4378#: wt-status.c:1257
4379msgid "  (use \"git rebase --abort\" to check out the original branch)"
4380msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
4381
4382#  译者:注意保持前导空格
4383#: wt-status.c:1263
4384msgid "  (all conflicts fixed: run \"git rebase --continue\")"
4385msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
4386
4387#: wt-status.c:1267
4388#, c-format
4389msgid ""
4390"You are currently splitting a commit while rebasing branch '%s' on '%s'."
4391msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
4392
4393#: wt-status.c:1272
4394msgid "You are currently splitting a commit during a rebase."
4395msgstr "您在执行变基操作时拆分提交。"
4396
4397#  译者:注意保持前导空格
4398#: wt-status.c:1275
4399msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
4400msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
4401
4402#: wt-status.c:1279
4403#, c-format
4404msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
4405msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
4406
4407#: wt-status.c:1284
4408msgid "You are currently editing a commit during a rebase."
4409msgstr "您在执行变基操作时编辑提交。"
4410
4411#  译者:注意保持前导空格
4412#: wt-status.c:1287
4413msgid "  (use \"git commit --amend\" to amend the current commit)"
4414msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
4415
4416#  译者:注意保持前导空格
4417#: wt-status.c:1289
4418msgid ""
4419"  (use \"git rebase --continue\" once you are satisfied with your changes)"
4420msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
4421
4422#: wt-status.c:1299
4423#, c-format
4424msgid "You are currently cherry-picking commit %s."
4425msgstr "您在执行拣选提交 %s 的操作。"
4426
4427#  译者:注意保持前导空格
4428#: wt-status.c:1304
4429msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
4430msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
4431
4432#  译者:注意保持前导空格
4433#: wt-status.c:1307
4434msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
4435msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
4436
4437#  译者:注意保持前导空格
4438#: wt-status.c:1309
4439msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
4440msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
4441
4442#: wt-status.c:1318
4443#, c-format
4444msgid "You are currently reverting commit %s."
4445msgstr "您在执行反转提交 %s 的操作。"
4446
4447#  译者:注意保持前导空格
4448#: wt-status.c:1323
4449msgid "  (fix conflicts and run \"git revert --continue\")"
4450msgstr "  (解决冲突并运行 \"git revert --continue\")"
4451
4452#  译者:注意保持前导空格
4453#: wt-status.c:1326
4454msgid "  (all conflicts fixed: run \"git revert --continue\")"
4455msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
4456
4457#  译者:注意保持前导空格
4458#: wt-status.c:1328
4459msgid "  (use \"git revert --abort\" to cancel the revert operation)"
4460msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
4461
4462#: wt-status.c:1339
4463#, c-format
4464msgid "You are currently bisecting, started from branch '%s'."
4465msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
4466
4467#: wt-status.c:1343
4468msgid "You are currently bisecting."
4469msgstr "您在执行二分查找操作。"
4470
4471#  译者:注意保持前导空格
4472#: wt-status.c:1346
4473msgid "  (use \"git bisect reset\" to get back to the original branch)"
4474msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
4475
4476#: wt-status.c:1543
4477msgid "On branch "
4478msgstr "位于分支 "
4479
4480#: wt-status.c:1549
4481msgid "interactive rebase in progress; onto "
4482msgstr "交互式变基操作正在进行中;至 "
4483
4484#: wt-status.c:1551
4485msgid "rebase in progress; onto "
4486msgstr "变基操作正在进行中;至 "
4487
4488#: wt-status.c:1556
4489msgid "HEAD detached at "
4490msgstr "头指针分离于 "
4491
4492#: wt-status.c:1558
4493msgid "HEAD detached from "
4494msgstr "头指针分离自 "
4495
4496#: wt-status.c:1561
4497msgid "Not currently on any branch."
4498msgstr "当前不在任何分支上。"
4499
4500#: wt-status.c:1579
4501msgid "Initial commit"
4502msgstr "初始提交"
4503
4504#: wt-status.c:1593
4505msgid "Untracked files"
4506msgstr "未跟踪的文件"
4507
4508#: wt-status.c:1595
4509msgid "Ignored files"
4510msgstr "忽略的文件"
4511
4512#: wt-status.c:1599
4513#, c-format
4514msgid ""
4515"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
4516"may speed it up, but you have to be careful not to forget to add\n"
4517"new files yourself (see 'git help status')."
4518msgstr ""
4519"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
4520"但您需要小心不要忘了添加新文件(参见 'git help status')。"
4521
4522#: wt-status.c:1605
4523#, c-format
4524msgid "Untracked files not listed%s"
4525msgstr "未跟踪的文件没有列出%s"
4526
4527#  译者:中文字符串拼接,可删除前导空格
4528#: wt-status.c:1607
4529msgid " (use -u option to show untracked files)"
4530msgstr "(使用 -u 参数显示未跟踪的文件)"
4531
4532#: wt-status.c:1613
4533msgid "No changes"
4534msgstr "没有修改"
4535
4536#: wt-status.c:1618
4537#, c-format
4538msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
4539msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
4540
4541#: wt-status.c:1621
4542#, c-format
4543msgid "no changes added to commit\n"
4544msgstr "修改尚未加入提交\n"
4545
4546#: wt-status.c:1624
4547#, c-format
4548msgid ""
4549"nothing added to commit but untracked files present (use \"git add\" to "
4550"track)\n"
4551msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
4552
4553#: wt-status.c:1627
4554#, c-format
4555msgid "nothing added to commit but untracked files present\n"
4556msgstr "提交为空,但是存在尚未跟踪的文件\n"
4557
4558#  译者:中文字符串拼接,可删除前导空格
4559#: wt-status.c:1630
4560#, c-format
4561msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
4562msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
4563
4564#: wt-status.c:1633 wt-status.c:1638
4565#, c-format
4566msgid "nothing to commit\n"
4567msgstr "无文件要提交\n"
4568
4569#  译者:中文字符串拼接,可删除前导空格
4570#: wt-status.c:1636
4571#, c-format
4572msgid "nothing to commit (use -u to show untracked files)\n"
4573msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
4574
4575#  译者:中文字符串拼接,可删除前导空格
4576#: wt-status.c:1640
4577#, c-format
4578msgid "nothing to commit, working tree clean\n"
4579msgstr "无文件要提交,干净的工作区\n"
4580
4581#  译者:注意保持句尾空格
4582#: wt-status.c:1749
4583msgid "Initial commit on "
4584msgstr "初始提交于 "
4585
4586#: wt-status.c:1753
4587msgid "HEAD (no branch)"
4588msgstr "HEAD(非分支)"
4589
4590#  译者:注意保持句尾空格
4591#: wt-status.c:1782 wt-status.c:1790
4592msgid "behind "
4593msgstr "落后 "
4594
4595#: wt-status.c:1785 wt-status.c:1788
4596msgid "ahead "
4597msgstr "领先 "
4598
4599#. TRANSLATORS: the action is e.g. "pull with rebase"
4600#: wt-status.c:2280
4601#, c-format
4602msgid "cannot %s: You have unstaged changes."
4603msgstr "不能%s:您有未暂存的变更。"
4604
4605#: wt-status.c:2286
4606msgid "additionally, your index contains uncommitted changes."
4607msgstr "另外,您的索引中包含未提交的变更。"
4608
4609#: wt-status.c:2288
4610#, c-format
4611msgid "cannot %s: Your index contains uncommitted changes."
4612msgstr "不能%s:您的索引中包含未提交的变更。"
4613
4614#: compat/precompose_utf8.c:57 builtin/clone.c:432
4615#, c-format
4616msgid "failed to unlink '%s'"
4617msgstr "无法删除 '%s'"
4618
4619#: builtin/add.c:22
4620msgid "git add [<options>] [--] <pathspec>..."
4621msgstr "git add [<选项>] [--] <路径规格>..."
4622
4623#: builtin/add.c:80
4624#, c-format
4625msgid "unexpected diff status %c"
4626msgstr "意外的差异状态 %c"
4627
4628#: builtin/add.c:85 builtin/commit.c:291
4629msgid "updating files failed"
4630msgstr "更新文件失败"
4631
4632#: builtin/add.c:95
4633#, c-format
4634msgid "remove '%s'\n"
4635msgstr "删除 '%s'\n"
4636
4637#: builtin/add.c:149
4638msgid "Unstaged changes after refreshing the index:"
4639msgstr "刷新索引之后尚未被暂存的变更:"
4640
4641#: builtin/add.c:209 builtin/rev-parse.c:872
4642msgid "Could not read the index"
4643msgstr "不能读取索引"
4644
4645#: builtin/add.c:220
4646#, c-format
4647msgid "Could not open '%s' for writing."
4648msgstr "无法打开 '%s' 进行写入。"
4649
4650#: builtin/add.c:224
4651msgid "Could not write patch"
4652msgstr "不能生成补丁"
4653
4654#: builtin/add.c:227
4655msgid "editing patch failed"
4656msgstr "编辑补丁失败"
4657
4658#: builtin/add.c:230
4659#, c-format
4660msgid "Could not stat '%s'"
4661msgstr "不能查看文件状态 '%s'"
4662
4663#: builtin/add.c:232
4664msgid "Empty patch. Aborted."
4665msgstr "空补丁。异常终止。"
4666
4667#: builtin/add.c:237
4668#, c-format
4669msgid "Could not apply '%s'"
4670msgstr "不能应用 '%s'"
4671
4672#: builtin/add.c:247
4673msgid "The following paths are ignored by one of your .gitignore files:\n"
4674msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
4675
4676#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
4677#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
4678#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
4679msgid "dry run"
4680msgstr "演习"
4681
4682#: builtin/add.c:269
4683msgid "interactive picking"
4684msgstr "交互式拣选"
4685
4686#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
4687msgid "select hunks interactively"
4688msgstr "交互式挑选数据块"
4689
4690#: builtin/add.c:271
4691msgid "edit current diff and apply"
4692msgstr "编辑当前差异并应用"
4693
4694#: builtin/add.c:272
4695msgid "allow adding otherwise ignored files"
4696msgstr "允许添加忽略的文件"
4697
4698#: builtin/add.c:273
4699msgid "update tracked files"
4700msgstr "更新已跟踪的文件"
4701
4702#: builtin/add.c:274
4703msgid "record only the fact that the path will be added later"
4704msgstr "只记录,该路径稍后再添加"
4705
4706#: builtin/add.c:275
4707msgid "add changes from all tracked and untracked files"
4708msgstr "添加所有改变的已跟踪文件和未跟踪文件"
4709
4710#: builtin/add.c:278
4711msgid "ignore paths removed in the working tree (same as --no-all)"
4712msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
4713
4714#: builtin/add.c:280
4715msgid "don't add, only refresh the index"
4716msgstr "不添加,只刷新索引"
4717
4718#: builtin/add.c:281
4719msgid "just skip files which cannot be added because of errors"
4720msgstr "跳过因出错不能添加的文件"
4721
4722#: builtin/add.c:282
4723msgid "check if - even missing - files are ignored in dry run"
4724msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
4725
4726#: builtin/add.c:283 builtin/update-index.c:951
4727msgid "(+/-)x"
4728msgstr "(+/-)x"
4729
4730#: builtin/add.c:283 builtin/update-index.c:952
4731msgid "override the executable bit of the listed files"
4732msgstr "覆盖列表里文件的可执行位"
4733
4734#: builtin/add.c:305
4735#, c-format
4736msgid "Use -f if you really want to add them.\n"
4737msgstr "使用 -f 参数如果您确实要添加它们。\n"
4738
4739#: builtin/add.c:312
4740msgid "adding files failed"
4741msgstr "添加文件失败"
4742
4743#: builtin/add.c:348
4744msgid "-A and -u are mutually incompatible"
4745msgstr "-A 和 -u 选项互斥"
4746
4747#: builtin/add.c:355
4748msgid "Option --ignore-missing can only be used together with --dry-run"
4749msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
4750
4751#: builtin/add.c:359
4752#, c-format
4753msgid "--chmod param '%s' must be either -x or +x"
4754msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
4755
4756#: builtin/add.c:374
4757#, c-format
4758msgid "Nothing specified, nothing added.\n"
4759msgstr "没有指定文件,也没有文件被添加。\n"
4760
4761#: builtin/add.c:375
4762#, c-format
4763msgid "Maybe you wanted to say 'git add .'?\n"
4764msgstr "也许您想要执行 'git add .'?\n"
4765
4766#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
4767#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
4768#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
4769#: builtin/submodule--helper.c:244
4770msgid "index file corrupt"
4771msgstr "索引文件损坏"
4772
4773#: builtin/am.c:414
4774msgid "could not parse author script"
4775msgstr "不能解析作者脚本"
4776
4777#: builtin/am.c:491
4778#, c-format
4779msgid "'%s' was deleted by the applypatch-msg hook"
4780msgstr "'%s' 被 applypatch-msg 钩子删除"
4781
4782#: builtin/am.c:532
4783#, c-format
4784msgid "Malformed input line: '%s'."
4785msgstr "非法的输入行:'%s'。"
4786
4787#: builtin/am.c:569
4788#, c-format
4789msgid "Failed to copy notes from '%s' to '%s'"
4790msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
4791
4792#: builtin/am.c:595
4793msgid "fseek failed"
4794msgstr "fseek 失败"
4795
4796#: builtin/am.c:775
4797#, c-format
4798msgid "could not parse patch '%s'"
4799msgstr "无法解析补丁 '%s'"
4800
4801#: builtin/am.c:840
4802msgid "Only one StGIT patch series can be applied at once"
4803msgstr "一次只能有一个 StGIT 补丁队列被应用"
4804
4805#: builtin/am.c:887
4806msgid "invalid timestamp"
4807msgstr "无效的时间戳"
4808
4809#: builtin/am.c:890 builtin/am.c:898
4810msgid "invalid Date line"
4811msgstr "无效的日期行"
4812
4813#: builtin/am.c:895
4814msgid "invalid timezone offset"
4815msgstr "无效的时区偏移值"
4816
4817#: builtin/am.c:984
4818msgid "Patch format detection failed."
4819msgstr "补丁格式探测失败。"
4820
4821#: builtin/am.c:989 builtin/clone.c:397
4822#, c-format
4823msgid "failed to create directory '%s'"
4824msgstr "无法创建目录 '%s'"
4825
4826#: builtin/am.c:993
4827msgid "Failed to split patches."
4828msgstr "无法拆分补丁。"
4829
4830#: builtin/am.c:1125 builtin/commit.c:376
4831msgid "unable to write index file"
4832msgstr "无法写入索引文件"
4833
4834#: builtin/am.c:1176
4835#, c-format
4836msgid "When you have resolved this problem, run \"%s --continue\"."
4837msgstr "当您解决这一问题,执行 \"%s --continue\"。"
4838
4839#: builtin/am.c:1177
4840#, c-format
4841msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4842msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
4843
4844#: builtin/am.c:1178
4845#, c-format
4846msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4847msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
4848
4849#: builtin/am.c:1316
4850msgid "Patch is empty. Was it split wrong?"
4851msgstr "补丁为空。是不是切分错误?"
4852
4853#: builtin/am.c:1390 builtin/log.c:1557
4854#, c-format
4855msgid "invalid ident line: %s"
4856msgstr "包含无效的身份标识:%s"
4857
4858#: builtin/am.c:1417
4859#, c-format
4860msgid "unable to parse commit %s"
4861msgstr "不能解析提交 %s"
4862
4863#: builtin/am.c:1610
4864msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4865msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4866
4867#: builtin/am.c:1612
4868msgid "Using index info to reconstruct a base tree..."
4869msgstr "使用索引来重建一个(三方合并的)基础目录树..."
4870
4871#: builtin/am.c:1631
4872msgid ""
4873"Did you hand edit your patch?\n"
4874"It does not apply to blobs recorded in its index."
4875msgstr ""
4876"您是否曾手动编辑过您的补丁?\n"
4877"无法应用补丁到索引中的数据对象上。"
4878
4879#: builtin/am.c:1637
4880msgid "Falling back to patching base and 3-way merge..."
4881msgstr "回落到基础版本上打补丁及进行三方合并..."
4882
4883#: builtin/am.c:1662
4884msgid "Failed to merge in the changes."
4885msgstr "无法合并变更。"
4886
4887#: builtin/am.c:1686 builtin/merge.c:631
4888msgid "git write-tree failed to write a tree"
4889msgstr "git write-tree 无法写入一树对象"
4890
4891#: builtin/am.c:1693
4892msgid "applying to an empty history"
4893msgstr "正应用到一个空历史上"
4894
4895#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
4896#: builtin/merge.c:827
4897msgid "failed to write commit object"
4898msgstr "无法写提交对象"
4899
4900#: builtin/am.c:1739 builtin/am.c:1743
4901#, c-format
4902msgid "cannot resume: %s does not exist."
4903msgstr "无法继续:%s 不存在。"
4904
4905#: builtin/am.c:1759
4906msgid "cannot be interactive without stdin connected to a terminal."
4907msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4908
4909#: builtin/am.c:1764
4910msgid "Commit Body is:"
4911msgstr "提交内容为:"
4912
4913#  译者:注意保持句尾空格
4914#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4915#. in your translation. The program will only accept English
4916#. input at this point.
4917#.
4918#: builtin/am.c:1774
4919msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
4920msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
4921
4922#: builtin/am.c:1824
4923#, c-format
4924msgid "Dirty index: cannot apply patches (dirty: %s)"
4925msgstr "脏索引:不能应用补丁(脏文件:%s)"
4926
4927#: builtin/am.c:1861 builtin/am.c:1933
4928#, c-format
4929msgid "Applying: %.*s"
4930msgstr "应用:%.*s"
4931
4932#: builtin/am.c:1877
4933msgid "No changes -- Patch already applied."
4934msgstr "没有变更 —— 补丁已经应用过。"
4935
4936#: builtin/am.c:1885
4937#, c-format
4938msgid "Patch failed at %s %.*s"
4939msgstr "打补丁失败于 %s %.*s"
4940
4941#: builtin/am.c:1891
4942#, c-format
4943msgid "The copy of the patch that failed is found in: %s"
4944msgstr "失败的补丁文件副本位于:%s"
4945
4946#: builtin/am.c:1936
4947msgid ""
4948"No changes - did you forget to use 'git add'?\n"
4949"If there is nothing left to stage, chances are that something else\n"
4950"already introduced the same changes; you might want to skip this patch."
4951msgstr ""
4952"没有变更 —— 您是不是忘了执行 'git add'?\n"
4953"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
4954"您也许想要跳过这个补丁。"
4955
4956#: builtin/am.c:1943
4957msgid ""
4958"You still have unmerged paths in your index.\n"
4959"Did you forget to use 'git add'?"
4960msgstr ""
4961"您的索引中仍有未合并的路径。\n"
4962"您是否忘了执行 'git add'?"
4963
4964#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
4965#: builtin/reset.c:316
4966#, c-format
4967msgid "Could not parse object '%s'."
4968msgstr "不能解析对象 '%s'。"
4969
4970#: builtin/am.c:2103
4971msgid "failed to clean index"
4972msgstr "无法清空索引"
4973
4974#: builtin/am.c:2137
4975msgid ""
4976"You seem to have moved HEAD since the last 'am' failure.\n"
4977"Not rewinding to ORIG_HEAD"
4978msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4979
4980#: builtin/am.c:2200
4981#, c-format
4982msgid "Invalid value for --patch-format: %s"
4983msgstr "无效的 --patch-format 值:%s"
4984
4985#: builtin/am.c:2233
4986msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
4987msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
4988
4989#: builtin/am.c:2234
4990msgid "git am [<options>] (--continue | --skip | --abort)"
4991msgstr "git am [<选项>] (--continue | --skip | --abort)"
4992
4993#: builtin/am.c:2240
4994msgid "run interactively"
4995msgstr "以交互式方式运行"
4996
4997#: builtin/am.c:2242
4998msgid "historical option -- no-op"
4999msgstr "老的参数 —— 无作用"
5000
5001#: builtin/am.c:2244
5002msgid "allow fall back on 3way merging if needed"
5003msgstr "如果必要,允许使用三方合并。"
5004
5005#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
5006#: builtin/repack.c:178
5007msgid "be quiet"
5008msgstr "静默模式"
5009
5010#: builtin/am.c:2247
5011msgid "add a Signed-off-by line to the commit message"
5012msgstr "在提交说明中添加一个 Signed-off-by 签名"
5013
5014#: builtin/am.c:2250
5015msgid "recode into utf8 (default)"
5016msgstr "使用 utf8 字符集(默认)"
5017
5018#: builtin/am.c:2252
5019msgid "pass -k flag to git-mailinfo"
5020msgstr "向 git-mailinfo 传递 -k 参数"
5021
5022#: builtin/am.c:2254
5023msgid "pass -b flag to git-mailinfo"
5024msgstr "向 git-mailinfo 传递 -b 参数"
5025
5026#: builtin/am.c:2256
5027msgid "pass -m flag to git-mailinfo"
5028msgstr "向 git-mailinfo 传递 -m 参数"
5029
5030#: builtin/am.c:2258
5031msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5032msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5033
5034#: builtin/am.c:2261
5035msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5036msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
5037
5038#: builtin/am.c:2264
5039msgid "strip everything before a scissors line"
5040msgstr "丢弃裁切线前的所有内容"
5041
5042#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
5043#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
5044#: builtin/am.c:2293
5045msgid "pass it through git-apply"
5046msgstr "传递给 git-apply"
5047
5048#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
5049#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
5050#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
5051#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
5052#: parse-options.h:132 parse-options.h:134 parse-options.h:245
5053msgid "n"
5054msgstr "n"
5055
5056#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
5057#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
5058msgid "format"
5059msgstr "格式"
5060
5061#: builtin/am.c:2290
5062msgid "format the patch(es) are in"
5063msgstr "补丁的格式"
5064
5065#: builtin/am.c:2296
5066msgid "override error message when patch failure occurs"
5067msgstr "打补丁失败时显示的错误信息"
5068
5069#: builtin/am.c:2298
5070msgid "continue applying patches after resolving a conflict"
5071msgstr "冲突解决后继续应用补丁"
5072
5073#: builtin/am.c:2301
5074msgid "synonyms for --continue"
5075msgstr "和 --continue 同义"
5076
5077#: builtin/am.c:2304
5078msgid "skip the current patch"
5079msgstr "跳过当前补丁"
5080
5081#: builtin/am.c:2307
5082msgid "restore the original branch and abort the patching operation."
5083msgstr "恢复原始分支并终止打补丁操作。"
5084
5085#: builtin/am.c:2311
5086msgid "lie about committer date"
5087msgstr "将作者日期作为提交日期"
5088
5089#: builtin/am.c:2313
5090msgid "use current timestamp for author date"
5091msgstr "用当前时间作为作者日期"
5092
5093#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
5094#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
5095msgid "key-id"
5096msgstr "key-id"
5097
5098#: builtin/am.c:2316
5099msgid "GPG-sign commits"
5100msgstr "使用 GPG 签名提交"
5101
5102#: builtin/am.c:2319
5103msgid "(internal use for git-rebase)"
5104msgstr "(内部使用,用于 git-rebase)"
5105
5106#: builtin/am.c:2334
5107msgid ""
5108"The -b/--binary option has been a no-op for long time, and\n"
5109"it will be removed. Please do not use it anymore."
5110msgstr ""
5111"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5112"请不要再使用它了。"
5113
5114#: builtin/am.c:2341
5115msgid "failed to read the index"
5116msgstr "无法读取索引"
5117
5118#: builtin/am.c:2356
5119#, c-format
5120msgid "previous rebase directory %s still exists but mbox given."
5121msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
5122
5123#: builtin/am.c:2380
5124#, c-format
5125msgid ""
5126"Stray %s directory found.\n"
5127"Use \"git am --abort\" to remove it."
5128msgstr ""
5129"发现了错误的 %s 目录。\n"
5130"使用 \"git am --abort\" 删除它。"
5131
5132#: builtin/am.c:2386
5133msgid "Resolve operation not in progress, we are not resuming."
5134msgstr "解决操作未进行,我们不会继续。"
5135
5136#: builtin/apply.c:8
5137msgid "git apply [<options>] [<patch>...]"
5138msgstr "git apply [<选项>] [<补丁>...]"
5139
5140#: builtin/archive.c:17
5141#, c-format
5142msgid "could not create archive file '%s'"
5143msgstr "不能创建归档文件 '%s'"
5144
5145#: builtin/archive.c:20
5146msgid "could not redirect output"
5147msgstr "不能重定向输出"
5148
5149#: builtin/archive.c:37
5150msgid "git archive: Remote with no URL"
5151msgstr "git archive:未提供远程 URL"
5152
5153#: builtin/archive.c:58
5154msgid "git archive: expected ACK/NAK, got EOF"
5155msgstr "git archive:应为 ACK/NACK,却得到 EOF"
5156
5157#: builtin/archive.c:61
5158#, c-format
5159msgid "git archive: NACK %s"
5160msgstr "git archive:NACK %s"
5161
5162#: builtin/archive.c:63
5163#, c-format
5164msgid "remote error: %s"
5165msgstr "远程错误:%s"
5166
5167#: builtin/archive.c:64
5168msgid "git archive: protocol error"
5169msgstr "git archive:协议错误"
5170
5171#: builtin/archive.c:68
5172msgid "git archive: expected a flush"
5173msgstr "git archive:应有一个 flush 刷新"
5174
5175#: builtin/bisect--helper.c:7
5176msgid "git bisect--helper --next-all [--no-checkout]"
5177msgstr "git bisect--helper --next-all [--no-checkout]"
5178
5179#: builtin/bisect--helper.c:17
5180msgid "perform 'git bisect next'"
5181msgstr "执行 'git bisect next'"
5182
5183#: builtin/bisect--helper.c:19
5184msgid "update BISECT_HEAD instead of checking out the current commit"
5185msgstr "更新 BISECT_HEAD 而非检出当前提交"
5186
5187#: builtin/blame.c:33
5188msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
5189msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
5190
5191#: builtin/blame.c:38
5192msgid "<rev-opts> are documented in git-rev-list(1)"
5193msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
5194
5195#: builtin/blame.c:1777
5196msgid "Blaming lines"
5197msgstr "追踪代码行"
5198
5199#: builtin/blame.c:2573
5200msgid "Show blame entries as we find them, incrementally"
5201msgstr "增量式地显示发现的 blame 条目"
5202
5203#: builtin/blame.c:2574
5204msgid "Show blank SHA-1 for boundary commits (Default: off)"
5205msgstr "边界提交显示空的 SHA-1(默认:关闭)"
5206
5207#: builtin/blame.c:2575
5208msgid "Do not treat root commits as boundaries (Default: off)"
5209msgstr "不把根提交作为边界(默认:关闭)"
5210
5211#: builtin/blame.c:2576
5212msgid "Show work cost statistics"
5213msgstr "显示命令消耗统计"
5214
5215#: builtin/blame.c:2577
5216msgid "Force progress reporting"
5217msgstr "强制进度显示"
5218
5219#: builtin/blame.c:2578
5220msgid "Show output score for blame entries"
5221msgstr "显示判断 blame 条目位移的得分诊断信息"
5222
5223#: builtin/blame.c:2579
5224msgid "Show original filename (Default: auto)"
5225msgstr "显示原始文件名(默认:自动)"
5226
5227#: builtin/blame.c:2580
5228msgid "Show original linenumber (Default: off)"
5229msgstr "显示原始的行号(默认:关闭)"
5230
5231#: builtin/blame.c:2581
5232msgid "Show in a format designed for machine consumption"
5233msgstr "显示为一个适合机器读取的格式"
5234
5235#: builtin/blame.c:2582
5236msgid "Show porcelain format with per-line commit information"
5237msgstr "为每一行显示机器适用的提交信息"
5238
5239#: builtin/blame.c:2583
5240msgid "Use the same output mode as git-annotate (Default: off)"
5241msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
5242
5243#: builtin/blame.c:2584
5244msgid "Show raw timestamp (Default: off)"
5245msgstr "显示原始时间戳(默认:关闭)"
5246
5247#: builtin/blame.c:2585
5248msgid "Show long commit SHA1 (Default: off)"
5249msgstr "显示长的 SHA1 提交号(默认:关闭)"
5250
5251#: builtin/blame.c:2586
5252msgid "Suppress author name and timestamp (Default: off)"
5253msgstr "隐藏作者名字和时间戳(默认:关闭)"
5254
5255#: builtin/blame.c:2587
5256msgid "Show author email instead of name (Default: off)"
5257msgstr "显示作者的邮箱而不是名字(默认:关闭)"
5258
5259#: builtin/blame.c:2588
5260msgid "Ignore whitespace differences"
5261msgstr "忽略空白差异"
5262
5263#: builtin/blame.c:2595
5264msgid "Use an experimental heuristic to improve diffs"
5265msgstr "使用一个试验性的启发式算法改进差异显示"
5266
5267#: builtin/blame.c:2597
5268msgid "Spend extra cycles to find better match"
5269msgstr "花费额外的循环来找到更好的匹配"
5270
5271#: builtin/blame.c:2598
5272msgid "Use revisions from <file> instead of calling git-rev-list"
5273msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
5274
5275#: builtin/blame.c:2599
5276msgid "Use <file>'s contents as the final image"
5277msgstr "使用 <文件> 的内容作为最终的图片"
5278
5279#: builtin/blame.c:2600 builtin/blame.c:2601
5280msgid "score"
5281msgstr "得分"
5282
5283#: builtin/blame.c:2600
5284msgid "Find line copies within and across files"
5285msgstr "找到文件内及跨文件的行拷贝"
5286
5287#: builtin/blame.c:2601
5288msgid "Find line movements within and across files"
5289msgstr "找到文件内及跨文件的行移动"
5290
5291#: builtin/blame.c:2602
5292msgid "n,m"
5293msgstr "n,m"
5294
5295#: builtin/blame.c:2602
5296msgid "Process only line range n,m, counting from 1"
5297msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
5298
5299#: builtin/blame.c:2649
5300msgid "--progress can't be used with --incremental or porcelain formats"
5301msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
5302
5303#. TRANSLATORS: This string is used to tell us the maximum
5304#. display width for a relative timestamp in "git blame"
5305#. output.  For C locale, "4 years, 11 months ago", which
5306#. takes 22 places, is the longest among various forms of
5307#. relative timestamps, but your language may need more or
5308#. fewer display columns.
5309#: builtin/blame.c:2697
5310msgid "4 years, 11 months ago"
5311msgstr "4 年 11 个月前"
5312
5313#: builtin/blame.c:2777
5314msgid "--contents and --reverse do not blend well."
5315msgstr "--contents 和 --reverse 不能混用。"
5316
5317#: builtin/blame.c:2797
5318msgid "cannot use --contents with final commit object name"
5319msgstr "不能将 --contents 和最终的提交对象名共用"
5320
5321#: builtin/blame.c:2802
5322msgid "--reverse and --first-parent together require specified latest commit"
5323msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
5324
5325#: builtin/blame.c:2829
5326msgid ""
5327"--reverse --first-parent together require range along first-parent chain"
5328msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
5329
5330#: builtin/blame.c:2840
5331#, c-format
5332msgid "no such path %s in %s"
5333msgstr "在 %2$s 中无此路径 %1$s"
5334
5335#: builtin/blame.c:2851
5336#, c-format
5337msgid "cannot read blob %s for path %s"
5338msgstr "不能为路径 %2$s 读取数据对象 %1$s"
5339
5340#: builtin/blame.c:2870
5341#, c-format
5342msgid "file %s has only %lu line"
5343msgid_plural "file %s has only %lu lines"
5344msgstr[0] "文件 %s 只有 %lu 行"
5345msgstr[1] "文件 %s 只有 %lu 行"
5346
5347#: builtin/branch.c:26
5348msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
5349msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
5350
5351#: builtin/branch.c:27
5352msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
5353msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
5354
5355#: builtin/branch.c:28
5356msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
5357msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
5358
5359#: builtin/branch.c:29
5360msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
5361msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
5362
5363#: builtin/branch.c:30
5364msgid "git branch [<options>] [-r | -a] [--points-at]"
5365msgstr "git branch [<选项>] [-r | -a] [--points-at]"
5366
5367#: builtin/branch.c:31
5368msgid "git branch [<options>] [-r | -a] [--format]"
5369msgstr "git branch [<选项>] [-r | -a] [--format]"
5370
5371#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5372#: builtin/branch.c:144
5373#, c-format
5374msgid ""
5375"deleting branch '%s' that has been merged to\n"
5376"         '%s', but not yet merged to HEAD."
5377msgstr ""
5378"将要删除的分支 '%s' 已经被合并到\n"
5379"         '%s',但未合并到 HEAD。"
5380
5381#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5382#: builtin/branch.c:148
5383#, c-format
5384msgid ""
5385"not deleting branch '%s' that is not yet merged to\n"
5386"         '%s', even though it is merged to HEAD."
5387msgstr ""
5388"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
5389"         然而却尚未被合并到分支 '%s' 。"
5390
5391#: builtin/branch.c:162
5392#, c-format
5393msgid "Couldn't look up commit object for '%s'"
5394msgstr "无法查询 '%s' 指向的提交对象"
5395
5396#: builtin/branch.c:166
5397#, c-format
5398msgid ""
5399"The branch '%s' is not fully merged.\n"
5400"If you are sure you want to delete it, run 'git branch -D %s'."
5401msgstr ""
5402"分支 '%s' 没有完全合并。\n"
5403"如果您确认要删除它,执行 'git branch -D %s'。"
5404
5405#: builtin/branch.c:179
5406msgid "Update of config-file failed"
5407msgstr "无法更新 config 文件"
5408
5409#: builtin/branch.c:210
5410msgid "cannot use -a with -d"
5411msgstr "不能将 -a 和 -d 同时使用"
5412
5413#: builtin/branch.c:216
5414msgid "Couldn't look up commit object for HEAD"
5415msgstr "无法查询 HEAD 指向的提交对象"
5416
5417#: builtin/branch.c:230
5418#, c-format
5419msgid "Cannot delete branch '%s' checked out at '%s'"
5420msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
5421
5422#: builtin/branch.c:245
5423#, c-format
5424msgid "remote-tracking branch '%s' not found."
5425msgstr "未能找到远程跟踪分支 '%s'。"
5426
5427#: builtin/branch.c:246
5428#, c-format
5429msgid "branch '%s' not found."
5430msgstr "分支 '%s' 未发现。"
5431
5432#: builtin/branch.c:261
5433#, c-format
5434msgid "Error deleting remote-tracking branch '%s'"
5435msgstr "无法删除远程跟踪分支 '%s'"
5436
5437#: builtin/branch.c:262
5438#, c-format
5439msgid "Error deleting branch '%s'"
5440msgstr "无法删除分支 '%s'"
5441
5442#: builtin/branch.c:269
5443#, c-format
5444msgid "Deleted remote-tracking branch %s (was %s).\n"
5445msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
5446
5447#: builtin/branch.c:270
5448#, c-format
5449msgid "Deleted branch %s (was %s).\n"
5450msgstr "已删除分支 %s(曾为 %s)。\n"
5451
5452#: builtin/branch.c:441
5453#, c-format
5454msgid "Branch %s is being rebased at %s"
5455msgstr "分支 %s 正被变基到 %s"
5456
5457#: builtin/branch.c:445
5458#, c-format
5459msgid "Branch %s is being bisected at %s"
5460msgstr "分支 %s 正被二分查找于 %s"
5461
5462#: builtin/branch.c:460
5463msgid "cannot rename the current branch while not on any."
5464msgstr "无法重命名当前分支因为不处于任何分支上。"
5465
5466#: builtin/branch.c:470
5467#, c-format
5468msgid "Invalid branch name: '%s'"
5469msgstr "无效的分支名:'%s'"
5470
5471#: builtin/branch.c:487
5472msgid "Branch rename failed"
5473msgstr "分支重命名失败"
5474
5475#: builtin/branch.c:490
5476#, c-format
5477msgid "Renamed a misnamed branch '%s' away"
5478msgstr "重命名掉一个错误命名的旧分支 '%s'"
5479
5480#: builtin/branch.c:493
5481#, c-format
5482msgid "Branch renamed to %s, but HEAD is not updated!"
5483msgstr "分支重命名为 %s,但 HEAD 没有更新!"
5484
5485#: builtin/branch.c:502
5486msgid "Branch is renamed, but update of config-file failed"
5487msgstr "分支被重命名,但更新 config 文件失败"
5488
5489#: builtin/branch.c:518
5490#, c-format
5491msgid ""
5492"Please edit the description for the branch\n"
5493"  %s\n"
5494"Lines starting with '%c' will be stripped.\n"
5495msgstr ""
5496"请编辑分支的描述\n"
5497"  %s\n"
5498"以 '%c' 开头的行将被过滤。\n"
5499
5500#: builtin/branch.c:551
5501msgid "Generic options"
5502msgstr "通用选项"
5503
5504#: builtin/branch.c:553
5505msgid "show hash and subject, give twice for upstream branch"
5506msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
5507
5508#: builtin/branch.c:554
5509msgid "suppress informational messages"
5510msgstr "不显示信息"
5511
5512#: builtin/branch.c:555
5513msgid "set up tracking mode (see git-pull(1))"
5514msgstr "设置跟踪模式(参见 git-pull(1))"
5515
5516#: builtin/branch.c:557
5517msgid "change upstream info"
5518msgstr "改变上游信息"
5519
5520#: builtin/branch.c:559
5521msgid "upstream"
5522msgstr "上游"
5523
5524#: builtin/branch.c:559
5525msgid "change the upstream info"
5526msgstr "改变上游信息"
5527
5528#: builtin/branch.c:560
5529msgid "Unset the upstream info"
5530msgstr "取消上游信息的设置"
5531
5532#: builtin/branch.c:561
5533msgid "use colored output"
5534msgstr "使用彩色输出"
5535
5536#: builtin/branch.c:562
5537msgid "act on remote-tracking branches"
5538msgstr "作用于远程跟踪分支"
5539
5540#: builtin/branch.c:564 builtin/branch.c:566
5541msgid "print only branches that contain the commit"
5542msgstr "只打印包含该提交的分支"
5543
5544#: builtin/branch.c:565 builtin/branch.c:567
5545msgid "print only branches that don't contain the commit"
5546msgstr "只打印不包含该提交的分支"
5547
5548#: builtin/branch.c:570
5549msgid "Specific git-branch actions:"
5550msgstr "具体的 git-branch 动作:"
5551
5552#: builtin/branch.c:571
5553msgid "list both remote-tracking and local branches"
5554msgstr "列出远程跟踪及本地分支"
5555
5556#: builtin/branch.c:573
5557msgid "delete fully merged branch"
5558msgstr "删除完全合并的分支"
5559
5560#: builtin/branch.c:574
5561msgid "delete branch (even if not merged)"
5562msgstr "删除分支(即使没有合并)"
5563
5564#: builtin/branch.c:575
5565msgid "move/rename a branch and its reflog"
5566msgstr "移动/重命名一个分支,以及它的引用日志"
5567
5568#: builtin/branch.c:576
5569msgid "move/rename a branch, even if target exists"
5570msgstr "移动/重命名一个分支,即使目标已存在"
5571
5572#: builtin/branch.c:577
5573msgid "list branch names"
5574msgstr "列出分支名"
5575
5576#: builtin/branch.c:578
5577msgid "create the branch's reflog"
5578msgstr "创建分支的引用日志"
5579
5580#: builtin/branch.c:580
5581msgid "edit the description for the branch"
5582msgstr "标记分支的描述"
5583
5584#: builtin/branch.c:581
5585msgid "force creation, move/rename, deletion"
5586msgstr "强制创建、移动/重命名、删除"
5587
5588#: builtin/branch.c:582
5589msgid "print only branches that are merged"
5590msgstr "只打印已经合并的分支"
5591
5592#: builtin/branch.c:583
5593msgid "print only branches that are not merged"
5594msgstr "只打印尚未合并的分支"
5595
5596#: builtin/branch.c:584
5597msgid "list branches in columns"
5598msgstr "以列的方式显示分支"
5599
5600#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
5601msgid "key"
5602msgstr "key"
5603
5604#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
5605msgid "field name to sort on"
5606msgstr "排序的字段名"
5607
5608#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
5609#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
5610#: builtin/tag.c:429
5611msgid "object"
5612msgstr "对象"
5613
5614#: builtin/branch.c:589
5615msgid "print only branches of the object"
5616msgstr "只打印指向该对象的分支"
5617
5618#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
5619msgid "sorting and filtering are case insensitive"
5620msgstr "排序和过滤属于大小写不敏感"
5621
5622#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
5623#: builtin/verify-tag.c:38
5624msgid "format to use for the output"
5625msgstr "输出格式"
5626
5627#: builtin/branch.c:611
5628msgid "Failed to resolve HEAD as a valid ref."
5629msgstr "无法将 HEAD 解析为有效引用。"
5630
5631#: builtin/branch.c:615 builtin/clone.c:724
5632msgid "HEAD not found below refs/heads!"
5633msgstr "HEAD 没有位于 /refs/heads 之下!"
5634
5635#: builtin/branch.c:638
5636msgid "--column and --verbose are incompatible"
5637msgstr "--column 和 --verbose 不兼容"
5638
5639#: builtin/branch.c:649 builtin/branch.c:701
5640msgid "branch name required"
5641msgstr "必须提供分支名"
5642
5643#: builtin/branch.c:677
5644msgid "Cannot give description to detached HEAD"
5645msgstr "不能向分离头指针提供描述"
5646
5647#: builtin/branch.c:682
5648msgid "cannot edit description of more than one branch"
5649msgstr "不能为一个以上的分支编辑描述"
5650
5651#: builtin/branch.c:689
5652#, c-format
5653msgid "No commit on branch '%s' yet."
5654msgstr "分支 '%s' 尚无提交。"
5655
5656#: builtin/branch.c:692
5657#, c-format
5658msgid "No branch named '%s'."
5659msgstr "没有分支 '%s'。"
5660
5661#: builtin/branch.c:707
5662msgid "too many branches for a rename operation"
5663msgstr "为重命名操作提供了太多的分支名"
5664
5665#: builtin/branch.c:712
5666msgid "too many branches to set new upstream"
5667msgstr "为设置新上游提供了太多的分支名"
5668
5669#: builtin/branch.c:716
5670#, c-format
5671msgid ""
5672"could not set upstream of HEAD to %s when it does not point to any branch."
5673msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5674
5675#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
5676#, c-format
5677msgid "no such branch '%s'"
5678msgstr "没有此分支 '%s'"
5679
5680#: builtin/branch.c:723
5681#, c-format
5682msgid "branch '%s' does not exist"
5683msgstr "分支 '%s' 不存在"
5684
5685#: builtin/branch.c:735
5686msgid "too many branches to unset upstream"
5687msgstr "为取消上游设置操作提供了太多的分支名"
5688
5689#: builtin/branch.c:739
5690msgid "could not unset upstream of HEAD when it does not point to any branch."
5691msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5692
5693#: builtin/branch.c:745
5694#, c-format
5695msgid "Branch '%s' has no upstream information"
5696msgstr "分支 '%s' 没有上游信息"
5697
5698#: builtin/branch.c:759
5699msgid "it does not make sense to create 'HEAD' manually"
5700msgstr "手工创建 'HEAD' 没有意义"
5701
5702#: builtin/branch.c:765
5703msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5704msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5705
5706#: builtin/branch.c:768
5707#, c-format
5708msgid ""
5709"The --set-upstream flag is deprecated and will be removed. Consider using --"
5710"track or --set-upstream-to\n"
5711msgstr ""
5712"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
5713
5714#: builtin/branch.c:785
5715#, c-format
5716msgid ""
5717"\n"
5718"If you wanted to make '%s' track '%s', do this:\n"
5719"\n"
5720msgstr ""
5721"\n"
5722"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
5723"\n"
5724
5725#: builtin/bundle.c:45
5726#, c-format
5727msgid "%s is okay\n"
5728msgstr "%s 可以\n"
5729
5730#: builtin/bundle.c:58
5731msgid "Need a repository to create a bundle."
5732msgstr "需要一个仓库来创建包。"
5733
5734#: builtin/bundle.c:62
5735msgid "Need a repository to unbundle."
5736msgstr "需要一个仓库来解包。"
5737
5738#: builtin/cat-file.c:513
5739msgid ""
5740"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5741"p | <type> | --textconv | --filters) [--path=<path>] <object>"
5742msgstr ""
5743"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5744"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5745
5746#: builtin/cat-file.c:514
5747msgid ""
5748"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5749"filters]"
5750msgstr ""
5751"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5752"filters]"
5753
5754#: builtin/cat-file.c:551
5755msgid "<type> can be one of: blob, tree, commit, tag"
5756msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
5757
5758#: builtin/cat-file.c:552
5759msgid "show object type"
5760msgstr "显示对象类型"
5761
5762#: builtin/cat-file.c:553
5763msgid "show object size"
5764msgstr "显示对象大小"
5765
5766#: builtin/cat-file.c:555
5767msgid "exit with zero when there's no error"
5768msgstr "当没有错误时退出并返回零"
5769
5770#: builtin/cat-file.c:556
5771msgid "pretty-print object's content"
5772msgstr "美观地打印对象的内容"
5773
5774#: builtin/cat-file.c:558
5775msgid "for blob objects, run textconv on object's content"
5776msgstr "对于数据对象,对其内容做文本转换"
5777
5778#: builtin/cat-file.c:560
5779msgid "for blob objects, run filters on object's content"
5780msgstr "对于数据对象,对其内容做过滤"
5781
5782#: builtin/cat-file.c:561 git-submodule.sh:943
5783msgid "blob"
5784msgstr "数据对象"
5785
5786#: builtin/cat-file.c:562
5787msgid "use a specific path for --textconv/--filters"
5788msgstr "对于 --textconv/--filters 使用一个特定的路径"
5789
5790#: builtin/cat-file.c:564
5791msgid "allow -s and -t to work with broken/corrupt objects"
5792msgstr "允许 -s 和 -t 对损坏的对象生效"
5793
5794#: builtin/cat-file.c:565
5795msgid "buffer --batch output"
5796msgstr "缓冲 --batch 的输出"
5797
5798#: builtin/cat-file.c:567
5799msgid "show info and content of objects fed from the standard input"
5800msgstr "显示从标准输入提供的对象的信息和内容"
5801
5802#: builtin/cat-file.c:570
5803msgid "show info about objects fed from the standard input"
5804msgstr "显示从标准输入提供的对象的信息"
5805
5806#: builtin/cat-file.c:573
5807msgid "follow in-tree symlinks (used with --batch or --batch-check)"
5808msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
5809
5810#: builtin/cat-file.c:575
5811msgid "show all objects with --batch or --batch-check"
5812msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
5813
5814#: builtin/check-attr.c:11
5815msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
5816msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
5817
5818#: builtin/check-attr.c:12
5819msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
5820msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
5821
5822#: builtin/check-attr.c:19
5823msgid "report all attributes set on file"
5824msgstr "报告设置在文件上的所有属性"
5825
5826#: builtin/check-attr.c:20
5827msgid "use .gitattributes only from the index"
5828msgstr "只使用索引中的 .gitattributes"
5829
5830#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
5831msgid "read file names from stdin"
5832msgstr "从标准输入读出文件名"
5833
5834#: builtin/check-attr.c:23 builtin/check-ignore.c:24
5835msgid "terminate input and output records by a NUL character"
5836msgstr "输入和输出的记录使用 NUL 字符终结"
5837
5838#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
5839msgid "suppress progress reporting"
5840msgstr "不显示进度报告"
5841
5842#: builtin/check-ignore.c:26
5843msgid "show non-matching input paths"
5844msgstr "显示未匹配的输入路径"
5845
5846#: builtin/check-ignore.c:28
5847msgid "ignore index when checking"
5848msgstr "检查时忽略索引"
5849
5850#: builtin/check-ignore.c:154
5851msgid "cannot specify pathnames with --stdin"
5852msgstr "不能同时指定路径及 --stdin 参数"
5853
5854#: builtin/check-ignore.c:157
5855msgid "-z only makes sense with --stdin"
5856msgstr "-z 需要和 --stdin 参数共用才有意义"
5857
5858#: builtin/check-ignore.c:159
5859msgid "no path specified"
5860msgstr "未指定路径"
5861
5862#: builtin/check-ignore.c:163
5863msgid "--quiet is only valid with a single pathname"
5864msgstr "参数 --quiet 只在提供一个路径名时有效"
5865
5866#: builtin/check-ignore.c:165
5867msgid "cannot have both --quiet and --verbose"
5868msgstr "不能同时提供 --quiet 和 --verbose 参数"
5869
5870#: builtin/check-ignore.c:168
5871msgid "--non-matching is only valid with --verbose"
5872msgstr "--non-matching 选项只在使用 --verbose 时有效"
5873
5874#: builtin/check-mailmap.c:8
5875msgid "git check-mailmap [<options>] <contact>..."
5876msgstr "git check-mailmap [<选项>] <联系地址>..."
5877
5878#: builtin/check-mailmap.c:13
5879msgid "also read contacts from stdin"
5880msgstr "还从标准输入读取联系地址"
5881
5882#: builtin/check-mailmap.c:24
5883#, c-format
5884msgid "unable to parse contact: %s"
5885msgstr "不能解析联系地址:%s"
5886
5887#: builtin/check-mailmap.c:47
5888msgid "no contacts specified"
5889msgstr "未指定联系地址"
5890
5891#: builtin/checkout-index.c:127
5892msgid "git checkout-index [<options>] [--] [<file>...]"
5893msgstr "git checkout-index [<选项>] [--] [<文件>...]"
5894
5895#: builtin/checkout-index.c:144
5896msgid "stage should be between 1 and 3 or all"
5897msgstr "索引值应该取值 1 到 3 或者 all"
5898
5899#: builtin/checkout-index.c:160
5900msgid "check out all files in the index"
5901msgstr "检出索引区的所有文件"
5902
5903#: builtin/checkout-index.c:161
5904msgid "force overwrite of existing files"
5905msgstr "强制覆盖现有的文件"
5906
5907#: builtin/checkout-index.c:163
5908msgid "no warning for existing files and files not in index"
5909msgstr "存在或不在索引中的文件都没有警告"
5910
5911#: builtin/checkout-index.c:165
5912msgid "don't checkout new files"
5913msgstr "不检出新文件"
5914
5915#: builtin/checkout-index.c:167
5916msgid "update stat information in the index file"
5917msgstr "更新索引中文件的状态信息"
5918
5919#: builtin/checkout-index.c:171
5920msgid "read list of paths from the standard input"
5921msgstr "从标准输入读取路径列表"
5922
5923#: builtin/checkout-index.c:173
5924msgid "write the content to temporary files"
5925msgstr "将内容写入临时文件"
5926
5927#: builtin/checkout-index.c:174 builtin/column.c:30
5928#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
5929#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
5930#: builtin/worktree.c:472
5931msgid "string"
5932msgstr "字符串"
5933
5934#: builtin/checkout-index.c:175
5935msgid "when creating files, prepend <string>"
5936msgstr "在创建文件时,在前面加上 <字符串>"
5937
5938#: builtin/checkout-index.c:177
5939msgid "copy out the files from named stage"
5940msgstr "从指定暂存区中拷出文件"
5941
5942#: builtin/checkout.c:27
5943msgid "git checkout [<options>] <branch>"
5944msgstr "git checkout [<选项>] <分支>"
5945
5946#: builtin/checkout.c:28
5947msgid "git checkout [<options>] [<branch>] -- <file>..."
5948msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
5949
5950#: builtin/checkout.c:153 builtin/checkout.c:186
5951#, c-format
5952msgid "path '%s' does not have our version"
5953msgstr "路径 '%s' 没有我们的版本"
5954
5955#: builtin/checkout.c:155 builtin/checkout.c:188
5956#, c-format
5957msgid "path '%s' does not have their version"
5958msgstr "路径 '%s' 没有他们的版本"
5959
5960#: builtin/checkout.c:171
5961#, c-format
5962msgid "path '%s' does not have all necessary versions"
5963msgstr "路径 '%s' 没有全部必须的版本"
5964
5965#: builtin/checkout.c:215
5966#, c-format
5967msgid "path '%s' does not have necessary versions"
5968msgstr "路径 '%s' 没有必须的版本"
5969
5970#: builtin/checkout.c:232
5971#, c-format
5972msgid "path '%s': cannot merge"
5973msgstr "path '%s':无法合并"
5974
5975#: builtin/checkout.c:249
5976#, c-format
5977msgid "Unable to add merge result for '%s'"
5978msgstr "无法为 '%s' 添加合并结果"
5979
5980#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
5981#: builtin/checkout.c:278
5982#, c-format
5983msgid "'%s' cannot be used with updating paths"
5984msgstr "'%s' 不能在更新路径时使用"
5985
5986#: builtin/checkout.c:281 builtin/checkout.c:284
5987#, c-format
5988msgid "'%s' cannot be used with %s"
5989msgstr "'%s' 不能和 %s 同时使用"
5990
5991#: builtin/checkout.c:287
5992#, c-format
5993msgid "Cannot update paths and switch to branch '%s' at the same time."
5994msgstr "不能同时更新路径并切换到分支'%s'。"
5995
5996#: builtin/checkout.c:358 builtin/checkout.c:365
5997#, c-format
5998msgid "path '%s' is unmerged"
5999msgstr "路径 '%s' 未合并"
6000
6001#: builtin/checkout.c:513
6002msgid "you need to resolve your current index first"
6003msgstr "您需要先解决当前索引的冲突"
6004
6005#: builtin/checkout.c:644
6006#, c-format
6007msgid "Can not do reflog for '%s': %s\n"
6008msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
6009
6010#: builtin/checkout.c:685
6011msgid "HEAD is now at"
6012msgstr "HEAD 目前位于"
6013
6014#: builtin/checkout.c:689 builtin/clone.c:678
6015msgid "unable to update HEAD"
6016msgstr "不能更新 HEAD"
6017
6018#: builtin/checkout.c:693
6019#, c-format
6020msgid "Reset branch '%s'\n"
6021msgstr "重置分支 '%s'\n"
6022
6023#: builtin/checkout.c:696
6024#, c-format
6025msgid "Already on '%s'\n"
6026msgstr "已经位于 '%s'\n"
6027
6028#: builtin/checkout.c:700
6029#, c-format
6030msgid "Switched to and reset branch '%s'\n"
6031msgstr "切换并重置分支 '%s'\n"
6032
6033#: builtin/checkout.c:702 builtin/checkout.c:1090
6034#, c-format
6035msgid "Switched to a new branch '%s'\n"
6036msgstr "切换到一个新分支 '%s'\n"
6037
6038#: builtin/checkout.c:704
6039#, c-format
6040msgid "Switched to branch '%s'\n"
6041msgstr "切换到分支 '%s'\n"
6042
6043#  译者:注意保持前导空格
6044#: builtin/checkout.c:755
6045#, c-format
6046msgid " ... and %d more.\n"
6047msgstr " ... 及其它 %d 个。\n"
6048
6049#: builtin/checkout.c:761
6050#, c-format
6051msgid ""
6052"Warning: you are leaving %d commit behind, not connected to\n"
6053"any of your branches:\n"
6054"\n"
6055"%s\n"
6056msgid_plural ""
6057"Warning: you are leaving %d commits behind, not connected to\n"
6058"any of your branches:\n"
6059"\n"
6060"%s\n"
6061msgstr[0] ""
6062"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6063"\n"
6064"%s\n"
6065msgstr[1] ""
6066"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6067"\n"
6068"%s\n"
6069
6070#: builtin/checkout.c:780
6071#, c-format
6072msgid ""
6073"If you want to keep it by creating a new branch, this may be a good time\n"
6074"to do so with:\n"
6075"\n"
6076" git branch <new-branch-name> %s\n"
6077"\n"
6078msgid_plural ""
6079"If you want to keep them by creating a new branch, this may be a good time\n"
6080"to do so with:\n"
6081"\n"
6082" git branch <new-branch-name> %s\n"
6083"\n"
6084msgstr[0] ""
6085"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6086"如下操作:\n"
6087"\n"
6088" git branch <新分支名> %s\n"
6089"\n"
6090msgstr[1] ""
6091"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
6092"如下操作:\n"
6093"\n"
6094" git branch <新分支名> %s\n"
6095"\n"
6096
6097#: builtin/checkout.c:816
6098msgid "internal error in revision walk"
6099msgstr "在版本遍历时遇到内部错误"
6100
6101#: builtin/checkout.c:820
6102msgid "Previous HEAD position was"
6103msgstr "之前的 HEAD 位置是"
6104
6105#: builtin/checkout.c:847 builtin/checkout.c:1085
6106msgid "You are on a branch yet to be born"
6107msgstr "您位于一个尚未初始化的分支"
6108
6109#: builtin/checkout.c:991
6110#, c-format
6111msgid "only one reference expected, %d given."
6112msgstr "应只有一个引用,却给出了 %d 个"
6113
6114#: builtin/checkout.c:1031 builtin/worktree.c:214
6115#, c-format
6116msgid "invalid reference: %s"
6117msgstr "无效引用:%s"
6118
6119#: builtin/checkout.c:1060
6120#, c-format
6121msgid "reference is not a tree: %s"
6122msgstr "引用不是一个树:%s"
6123
6124#: builtin/checkout.c:1099
6125msgid "paths cannot be used with switching branches"
6126msgstr "路径不能和切换分支同时使用"
6127
6128#: builtin/checkout.c:1102 builtin/checkout.c:1106
6129#, c-format
6130msgid "'%s' cannot be used with switching branches"
6131msgstr "'%s' 不能和切换分支同时使用"
6132
6133#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
6134#: builtin/checkout.c:1121
6135#, c-format
6136msgid "'%s' cannot be used with '%s'"
6137msgstr "'%s' 不能和 '%s' 同时使用"
6138
6139#: builtin/checkout.c:1126
6140#, c-format
6141msgid "Cannot switch branch to a non-commit '%s'"
6142msgstr "不能切换分支到一个非提交 '%s'"
6143
6144#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
6145#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
6146#: builtin/worktree.c:327
6147msgid "branch"
6148msgstr "分支"
6149
6150#: builtin/checkout.c:1160
6151msgid "create and checkout a new branch"
6152msgstr "创建并检出一个新的分支"
6153
6154#: builtin/checkout.c:1162
6155msgid "create/reset and checkout a branch"
6156msgstr "创建/重置并检出一个分支"
6157
6158#: builtin/checkout.c:1163
6159msgid "create reflog for new branch"
6160msgstr "为新的分支创建引用日志"
6161
6162#: builtin/checkout.c:1164 builtin/worktree.c:329
6163msgid "detach HEAD at named commit"
6164msgstr "HEAD 从指定的提交分离"
6165
6166#: builtin/checkout.c:1165
6167msgid "set upstream info for new branch"
6168msgstr "为新的分支设置上游信息"
6169
6170#: builtin/checkout.c:1167
6171msgid "new-branch"
6172msgstr "新分支"
6173
6174#: builtin/checkout.c:1167
6175msgid "new unparented branch"
6176msgstr "新的没有父提交的分支"
6177
6178#: builtin/checkout.c:1168
6179msgid "checkout our version for unmerged files"
6180msgstr "对尚未合并的文件检出我们的版本"
6181
6182#: builtin/checkout.c:1170
6183msgid "checkout their version for unmerged files"
6184msgstr "对尚未合并的文件检出他们的版本"
6185
6186#: builtin/checkout.c:1172
6187msgid "force checkout (throw away local modifications)"
6188msgstr "强制检出(丢弃本地修改)"
6189
6190#: builtin/checkout.c:1173
6191msgid "perform a 3-way merge with the new branch"
6192msgstr "和新的分支执行三方合并"
6193
6194#: builtin/checkout.c:1174 builtin/merge.c:234
6195msgid "update ignored files (default)"
6196msgstr "更新忽略的文件(默认)"
6197
6198#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
6199msgid "style"
6200msgstr "风格"
6201
6202#: builtin/checkout.c:1176
6203msgid "conflict style (merge or diff3)"
6204msgstr "冲突输出风格(merge 或 diff3)"
6205
6206#: builtin/checkout.c:1179
6207msgid "do not limit pathspecs to sparse entries only"
6208msgstr "对路径不做稀疏检出的限制"
6209
6210#: builtin/checkout.c:1181
6211msgid "second guess 'git checkout <no-such-branch>'"
6212msgstr "二次猜测'git checkout <无此分支>'"
6213
6214#: builtin/checkout.c:1183
6215msgid "do not check if another worktree is holding the given ref"
6216msgstr "不检查指定的引用是否被其他工作区所占用"
6217
6218#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
6219#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
6220#: builtin/send-pack.c:172
6221msgid "force progress reporting"
6222msgstr "强制显示进度报告"
6223
6224#: builtin/checkout.c:1224
6225msgid "-b, -B and --orphan are mutually exclusive"
6226msgstr "-b、-B 和 --orphan 是互斥的"
6227
6228#: builtin/checkout.c:1241
6229msgid "--track needs a branch name"
6230msgstr "--track 需要一个分支名"
6231
6232#: builtin/checkout.c:1246
6233msgid "Missing branch name; try -b"
6234msgstr "缺少分支名;尝试 -b"
6235
6236#: builtin/checkout.c:1282
6237msgid "invalid path specification"
6238msgstr "无效的路径规格"
6239
6240#: builtin/checkout.c:1289
6241#, c-format
6242msgid ""
6243"Cannot update paths and switch to branch '%s' at the same time.\n"
6244"Did you intend to checkout '%s' which can not be resolved as commit?"
6245msgstr ""
6246"不能同时更新路径并切换到分支'%s'。\n"
6247"您是想要检出 '%s' 但其未能解析为提交么?"
6248
6249#: builtin/checkout.c:1294
6250#, c-format
6251msgid "git checkout: --detach does not take a path argument '%s'"
6252msgstr "git checkout:--detach 不能接收路径参数 '%s'"
6253
6254#: builtin/checkout.c:1298
6255msgid ""
6256"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
6257"checking out of the index."
6258msgstr ""
6259"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
6260
6261#: builtin/clean.c:25
6262msgid ""
6263"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
6264msgstr ""
6265"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
6266
6267#: builtin/clean.c:29
6268#, c-format
6269msgid "Removing %s\n"
6270msgstr "正删除 %s\n"
6271
6272#: builtin/clean.c:30
6273#, c-format
6274msgid "Would remove %s\n"
6275msgstr "将删除 %s\n"
6276
6277#: builtin/clean.c:31
6278#, c-format
6279msgid "Skipping repository %s\n"
6280msgstr "忽略仓库 %s\n"
6281
6282#: builtin/clean.c:32
6283#, c-format
6284msgid "Would skip repository %s\n"
6285msgstr "将忽略仓库 %s\n"
6286
6287#: builtin/clean.c:33
6288#, c-format
6289msgid "failed to remove %s"
6290msgstr "无法删除 %s"
6291
6292#: builtin/clean.c:297 git-add--interactive.perl:614
6293#, c-format
6294msgid ""
6295"Prompt help:\n"
6296"1          - select a numbered item\n"
6297"foo        - select item based on unique prefix\n"
6298"           - (empty) select nothing\n"
6299msgstr ""
6300"帮助:\n"
6301"1          - 通过编号选择一个选项\n"
6302"foo        - 通过唯一前缀选择一个选项\n"
6303"           - (空)什么也不选择\n"
6304
6305#: builtin/clean.c:301 git-add--interactive.perl:623
6306#, c-format
6307msgid ""
6308"Prompt help:\n"
6309"1          - select a single item\n"
6310"3-5        - select a range of items\n"
6311"2-3,6-9    - select multiple ranges\n"
6312"foo        - select item based on unique prefix\n"
6313"-...       - unselect specified items\n"
6314"*          - choose all items\n"
6315"           - (empty) finish selecting\n"
6316msgstr ""
6317"帮助:\n"
6318"1          - 选择一个选项\n"
6319"3-5        - 选择一个范围内的所有选项\n"
6320"2-3,6-9    - 选择多个范围内的所有选项\n"
6321"foo        - 通过唯一前缀选择一个选项\n"
6322"-...       - 反选特定的选项\n"
6323"*          - 选择所有选项\n"
6324"           - (空)结束选择\n"
6325
6326#: builtin/clean.c:517 git-add--interactive.perl:589
6327#: git-add--interactive.perl:594
6328#, c-format, perl-format
6329msgid "Huh (%s)?\n"
6330msgstr "嗯(%s)?\n"
6331
6332#: builtin/clean.c:659
6333#, c-format
6334msgid "Input ignore patterns>> "
6335msgstr "输入模版以排除条目>> "
6336
6337#: builtin/clean.c:696
6338#, c-format
6339msgid "WARNING: Cannot find items matched by: %s"
6340msgstr "警告:无法找到和 %s 匹配的条目"
6341
6342#: builtin/clean.c:717
6343msgid "Select items to delete"
6344msgstr "选择要删除的条目"
6345
6346#. TRANSLATORS: Make sure to keep [y/N] as is
6347#: builtin/clean.c:758
6348#, c-format
6349msgid "Remove %s [y/N]? "
6350msgstr "删除 %s [y/N]?"
6351
6352#: builtin/clean.c:783 git-add--interactive.perl:1660
6353#, c-format
6354msgid "Bye.\n"
6355msgstr "再见。\n"
6356
6357#: builtin/clean.c:791
6358msgid ""
6359"clean               - start cleaning\n"
6360"filter by pattern   - exclude items from deletion\n"
6361"select by numbers   - select items to be deleted by numbers\n"
6362"ask each            - confirm each deletion (like \"rm -i\")\n"
6363"quit                - stop cleaning\n"
6364"help                - this screen\n"
6365"?                   - help for prompt selection"
6366msgstr ""
6367"clean               - 开始清理\n"
6368"filter by pattern   - 通过模版排除要删除的条目\n"
6369"select by numbers   - 通过数字选择要删除的条目\n"
6370"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
6371"quit                - 停止删除并退出\n"
6372"help                - 显示本帮助\n"
6373"?                   - 显示如何在提示符下选择的帮助"
6374
6375#: builtin/clean.c:818 git-add--interactive.perl:1736
6376msgid "*** Commands ***"
6377msgstr "*** 命令 ***"
6378
6379#: builtin/clean.c:819 git-add--interactive.perl:1733
6380msgid "What now"
6381msgstr "请选择"
6382
6383#: builtin/clean.c:827
6384msgid "Would remove the following item:"
6385msgid_plural "Would remove the following items:"
6386msgstr[0] "将删除如下条目:"
6387msgstr[1] "将删除如下条目:"
6388
6389#: builtin/clean.c:844
6390msgid "No more files to clean, exiting."
6391msgstr "没有要清理的文件,退出。"
6392
6393#: builtin/clean.c:875
6394msgid "do not print names of files removed"
6395msgstr "不打印删除文件的名称"
6396
6397#: builtin/clean.c:877
6398msgid "force"
6399msgstr "强制"
6400
6401#: builtin/clean.c:878
6402msgid "interactive cleaning"
6403msgstr "交互式清除"
6404
6405#: builtin/clean.c:880
6406msgid "remove whole directories"
6407msgstr "删除整个目录"
6408
6409#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
6410#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
6411#: builtin/name-rev.c:350 builtin/show-ref.c:176
6412msgid "pattern"
6413msgstr "模式"
6414
6415#: builtin/clean.c:882
6416msgid "add <pattern> to ignore rules"
6417msgstr "添加 <模式> 到忽略规则"
6418
6419#: builtin/clean.c:883
6420msgid "remove ignored files, too"
6421msgstr "也删除忽略的文件"
6422
6423#: builtin/clean.c:885
6424msgid "remove only ignored files"
6425msgstr "只删除忽略的文件"
6426
6427#: builtin/clean.c:903
6428msgid "-x and -X cannot be used together"
6429msgstr "-x 和 -X 不能同时使用"
6430
6431#: builtin/clean.c:907
6432msgid ""
6433"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
6434"clean"
6435msgstr ""
6436"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6437
6438#: builtin/clean.c:910
6439msgid ""
6440"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
6441"refusing to clean"
6442msgstr ""
6443"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6444
6445#: builtin/clone.c:37
6446msgid "git clone [<options>] [--] <repo> [<dir>]"
6447msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
6448
6449#: builtin/clone.c:80
6450msgid "don't create a checkout"
6451msgstr "不创建一个检出"
6452
6453#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
6454msgid "create a bare repository"
6455msgstr "创建一个纯仓库"
6456
6457#: builtin/clone.c:85
6458msgid "create a mirror repository (implies bare)"
6459msgstr "创建一个镜像仓库(也是纯仓库)"
6460
6461#: builtin/clone.c:87
6462msgid "to clone from a local repository"
6463msgstr "从本地仓库克隆"
6464
6465#: builtin/clone.c:89
6466msgid "don't use local hardlinks, always copy"
6467msgstr "不使用本地硬链接,始终复制"
6468
6469#: builtin/clone.c:91
6470msgid "setup as shared repository"
6471msgstr "设置为共享仓库"
6472
6473#: builtin/clone.c:93 builtin/clone.c:97
6474msgid "pathspec"
6475msgstr "路径"
6476
6477#: builtin/clone.c:93 builtin/clone.c:97
6478msgid "initialize submodules in the clone"
6479msgstr "在克隆时初始化子模组"
6480
6481#: builtin/clone.c:100
6482msgid "number of submodules cloned in parallel"
6483msgstr "并发克隆的子模组的数量"
6484
6485#: builtin/clone.c:101 builtin/init-db.c:475
6486msgid "template-directory"
6487msgstr "模板目录"
6488
6489#: builtin/clone.c:102 builtin/init-db.c:476
6490msgid "directory from which templates will be used"
6491msgstr "模板目录将被使用"
6492
6493#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
6494#: builtin/submodule--helper.c:983
6495msgid "reference repository"
6496msgstr "参考仓库"
6497
6498#: builtin/clone.c:108
6499msgid "use --reference only while cloning"
6500msgstr "仅在克隆时参考 --reference 指向的本地仓库"
6501
6502#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
6503msgid "name"
6504msgstr "名称"
6505
6506#: builtin/clone.c:110
6507msgid "use <name> instead of 'origin' to track upstream"
6508msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
6509
6510#: builtin/clone.c:112
6511msgid "checkout <branch> instead of the remote's HEAD"
6512msgstr "检出 <分支> 而不是远程 HEAD"
6513
6514#: builtin/clone.c:114
6515msgid "path to git-upload-pack on the remote"
6516msgstr "远程 git-upload-pack 路径"
6517
6518#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
6519#: builtin/pull.c:202
6520msgid "depth"
6521msgstr "深度"
6522
6523#: builtin/clone.c:116
6524msgid "create a shallow clone of that depth"
6525msgstr "创建一个指定深度的浅克隆"
6526
6527#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
6528#: parse-options.h:142
6529msgid "time"
6530msgstr "时间"
6531
6532#: builtin/clone.c:118
6533msgid "create a shallow clone since a specific time"
6534msgstr "从一个特定时间创建一个浅克隆"
6535
6536#: builtin/clone.c:119 builtin/fetch.c:124
6537msgid "revision"
6538msgstr "版本"
6539
6540#: builtin/clone.c:120 builtin/fetch.c:125
6541msgid "deepen history of shallow clone, excluding rev"
6542msgstr "深化浅克隆的历史,除了特定版本"
6543
6544#: builtin/clone.c:122
6545msgid "clone only one branch, HEAD or --branch"
6546msgstr "只克隆一个分支、HEAD 或 --branch"
6547
6548#: builtin/clone.c:124
6549msgid "any cloned submodules will be shallow"
6550msgstr "子模组将以浅下载模式克隆"
6551
6552#: builtin/clone.c:125 builtin/init-db.c:484
6553msgid "gitdir"
6554msgstr "git目录"
6555
6556#: builtin/clone.c:126 builtin/init-db.c:485
6557msgid "separate git dir from working tree"
6558msgstr "git目录和工作区分离"
6559
6560#: builtin/clone.c:127
6561msgid "key=value"
6562msgstr "key=value"
6563
6564#: builtin/clone.c:128
6565msgid "set config inside the new repository"
6566msgstr "在新仓库中设置配置信息"
6567
6568#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
6569msgid "use IPv4 addresses only"
6570msgstr "只使用 IPv4 地址"
6571
6572#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
6573msgid "use IPv6 addresses only"
6574msgstr "只使用 IPv6 地址"
6575
6576#: builtin/clone.c:268
6577msgid ""
6578"No directory name could be guessed.\n"
6579"Please specify a directory on the command line"
6580msgstr ""
6581"无法猜到目录名。\n"
6582"请在命令行指定一个目录"
6583
6584#: builtin/clone.c:321
6585#, c-format
6586msgid "info: Could not add alternate for '%s': %s\n"
6587msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
6588
6589#: builtin/clone.c:393
6590#, c-format
6591msgid "failed to open '%s'"
6592msgstr "无法打开 '%s'"
6593
6594#: builtin/clone.c:401
6595#, c-format
6596msgid "%s exists and is not a directory"
6597msgstr "%s 存在且不是一个目录"
6598
6599#: builtin/clone.c:415
6600#, c-format
6601msgid "failed to stat %s\n"
6602msgstr "无法枚举 %s 状态\n"
6603
6604#: builtin/clone.c:437
6605#, c-format
6606msgid "failed to create link '%s'"
6607msgstr "无法创建链接 '%s'"
6608
6609#: builtin/clone.c:441
6610#, c-format
6611msgid "failed to copy file to '%s'"
6612msgstr "无法拷贝文件至 '%s'"
6613
6614#: builtin/clone.c:466
6615#, c-format
6616msgid "done.\n"
6617msgstr "完成。\n"
6618
6619#: builtin/clone.c:478
6620msgid ""
6621"Clone succeeded, but checkout failed.\n"
6622"You can inspect what was checked out with 'git status'\n"
6623"and retry the checkout with 'git checkout -f HEAD'\n"
6624msgstr ""
6625"克隆成功,但是检出失败。\n"
6626"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6627"'git checkout -f HEAD' 重试\n"
6628
6629#: builtin/clone.c:555
6630#, c-format
6631msgid "Could not find remote branch %s to clone."
6632msgstr "不能发现要克隆的远程分支 %s。"
6633
6634#: builtin/clone.c:650
6635msgid "remote did not send all necessary objects"
6636msgstr "远程没有发送所有必须的对象"
6637
6638#: builtin/clone.c:666
6639#, c-format
6640msgid "unable to update %s"
6641msgstr "不能更新 %s"
6642
6643#: builtin/clone.c:715
6644msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6645msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6646
6647#: builtin/clone.c:746
6648msgid "unable to checkout working tree"
6649msgstr "不能检出工作区"
6650
6651#: builtin/clone.c:786
6652msgid "unable to write parameters to config file"
6653msgstr "无法将参数写入配置文件"
6654
6655#: builtin/clone.c:849
6656msgid "cannot repack to clean up"
6657msgstr "无法执行 repack 来清理"
6658
6659#: builtin/clone.c:851
6660msgid "cannot unlink temporary alternates file"
6661msgstr "无法删除临时的 alternates 文件"
6662
6663#: builtin/clone.c:884 builtin/receive-pack.c:1901
6664msgid "Too many arguments."
6665msgstr "太多参数。"
6666
6667#: builtin/clone.c:888
6668msgid "You must specify a repository to clone."
6669msgstr "您必须指定一个仓库来克隆。"
6670
6671#: builtin/clone.c:901
6672#, c-format
6673msgid "--bare and --origin %s options are incompatible."
6674msgstr "--bare 和 --origin %s 选项不兼容。"
6675
6676#: builtin/clone.c:904
6677msgid "--bare and --separate-git-dir are incompatible."
6678msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6679
6680#: builtin/clone.c:917
6681#, c-format
6682msgid "repository '%s' does not exist"
6683msgstr "仓库 '%s' 不存在"
6684
6685#: builtin/clone.c:923 builtin/fetch.c:1337
6686#, c-format
6687msgid "depth %s is not a positive number"
6688msgstr "深度 %s 不是一个正数"
6689
6690#: builtin/clone.c:933
6691#, c-format
6692msgid "destination path '%s' already exists and is not an empty directory."
6693msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
6694
6695#: builtin/clone.c:943
6696#, c-format
6697msgid "working tree '%s' already exists."
6698msgstr "工作区 '%s' 已经存在。"
6699
6700#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
6701#: builtin/worktree.c:222 builtin/worktree.c:249
6702#, c-format
6703msgid "could not create leading directories of '%s'"
6704msgstr "不能为 '%s' 创建先导目录"
6705
6706#: builtin/clone.c:961
6707#, c-format
6708msgid "could not create work tree dir '%s'"
6709msgstr "不能创建工作区目录 '%s'"
6710
6711#: builtin/clone.c:973
6712#, c-format
6713msgid "Cloning into bare repository '%s'...\n"
6714msgstr "克隆到纯仓库 '%s'...\n"
6715
6716#: builtin/clone.c:975
6717#, c-format
6718msgid "Cloning into '%s'...\n"
6719msgstr "正克隆到 '%s'...\n"
6720
6721#: builtin/clone.c:999
6722msgid ""
6723"clone --recursive is not compatible with both --reference and --reference-if-"
6724"able"
6725msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
6726
6727#: builtin/clone.c:1055
6728msgid "--depth is ignored in local clones; use file:// instead."
6729msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6730
6731#: builtin/clone.c:1057
6732msgid "--shallow-since is ignored in local clones; use file:// instead."
6733msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6734
6735#: builtin/clone.c:1059
6736msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6737msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6738
6739#: builtin/clone.c:1062
6740msgid "source repository is shallow, ignoring --local"
6741msgstr "源仓库是浅克隆,忽略 --local"
6742
6743#: builtin/clone.c:1067
6744msgid "--local is ignored"
6745msgstr "--local 被忽略"
6746
6747#: builtin/clone.c:1071
6748#, c-format
6749msgid "Don't know how to clone %s"
6750msgstr "不知道如何克隆 %s"
6751
6752#: builtin/clone.c:1126 builtin/clone.c:1134
6753#, c-format
6754msgid "Remote branch %s not found in upstream %s"
6755msgstr "远程分支 %s 在上游 %s 未发现"
6756
6757#: builtin/clone.c:1137
6758msgid "You appear to have cloned an empty repository."
6759msgstr "您似乎克隆了一个空仓库。"
6760
6761#: builtin/column.c:9
6762msgid "git column [<options>]"
6763msgstr "git column [<选项>]"
6764
6765#: builtin/column.c:26
6766msgid "lookup config vars"
6767msgstr "查找配置变量"
6768
6769#: builtin/column.c:27 builtin/column.c:28
6770msgid "layout to use"
6771msgstr "要使用的布局"
6772
6773#: builtin/column.c:29
6774msgid "Maximum width"
6775msgstr "最大宽度"
6776
6777#: builtin/column.c:30
6778msgid "Padding space on left border"
6779msgstr "左边框的填充空间"
6780
6781#: builtin/column.c:31
6782msgid "Padding space on right border"
6783msgstr "右边框的填充空间"
6784
6785#: builtin/column.c:32
6786msgid "Padding space between columns"
6787msgstr "两列之间的填充空间"
6788
6789#: builtin/column.c:51
6790msgid "--command must be the first argument"
6791msgstr "--command 必须是第一个参数"
6792
6793#: builtin/commit.c:38
6794msgid "git commit [<options>] [--] <pathspec>..."
6795msgstr "git commit [<选项>] [--] <路径规格>..."
6796
6797#: builtin/commit.c:43
6798msgid "git status [<options>] [--] <pathspec>..."
6799msgstr "git status [<选项>] [--] <路径规格>..."
6800
6801#: builtin/commit.c:48
6802msgid ""
6803"Your name and email address were configured automatically based\n"
6804"on your username and hostname. Please check that they are accurate.\n"
6805"You can suppress this message by setting them explicitly. Run the\n"
6806"following command and follow the instructions in your editor to edit\n"
6807"your configuration file:\n"
6808"\n"
6809"    git config --global --edit\n"
6810"\n"
6811"After doing this, you may fix the identity used for this commit with:\n"
6812"\n"
6813"    git commit --amend --reset-author\n"
6814msgstr ""
6815"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6816"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6817"中编辑您的配置文件:\n"
6818"\n"
6819"    git config --global --edit\n"
6820"\n"
6821"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6822"\n"
6823"    git commit --amend --reset-author\n"
6824
6825#: builtin/commit.c:61
6826msgid ""
6827"Your name and email address were configured automatically based\n"
6828"on your username and hostname. Please check that they are accurate.\n"
6829"You can suppress this message by setting them explicitly:\n"
6830"\n"
6831"    git config --global user.name \"Your Name\"\n"
6832"    git config --global user.email you@example.com\n"
6833"\n"
6834"After doing this, you may fix the identity used for this commit with:\n"
6835"\n"
6836"    git commit --amend --reset-author\n"
6837msgstr ""
6838"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6839"与否。您可以对其进行设置以免再出现本提示信息:\n"
6840"\n"
6841"    git config --global user.name \"Your Name\"\n"
6842"    git config --global user.email you@example.com\n"
6843"\n"
6844"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6845"\n"
6846"    git commit --amend --reset-author\n"
6847
6848#: builtin/commit.c:73
6849msgid ""
6850"You asked to amend the most recent commit, but doing so would make\n"
6851"it empty. You can repeat your command with --allow-empty, or you can\n"
6852"remove the commit entirely with \"git reset HEAD^\".\n"
6853msgstr ""
6854"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
6855"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
6856
6857#: builtin/commit.c:78
6858msgid ""
6859"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
6860"If you wish to commit it anyway, use:\n"
6861"\n"
6862"    git commit --allow-empty\n"
6863"\n"
6864msgstr ""
6865"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
6866"也要提交,使用命令:\n"
6867"\n"
6868"    git commit --allow-empty\n"
6869"\n"
6870
6871#: builtin/commit.c:85
6872msgid "Otherwise, please use 'git reset'\n"
6873msgstr "否则,请使用命令 'git reset'\n"
6874
6875#: builtin/commit.c:88
6876msgid ""
6877"If you wish to skip this commit, use:\n"
6878"\n"
6879"    git reset\n"
6880"\n"
6881"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
6882"the remaining commits.\n"
6883msgstr ""
6884"如果您想跳过这个提交,使用命令:\n"
6885"\n"
6886"    git reset\n"
6887"\n"
6888"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
6889"操作。\n"
6890
6891#: builtin/commit.c:318
6892msgid "failed to unpack HEAD tree object"
6893msgstr "无法解包 HEAD 树对象"
6894
6895#: builtin/commit.c:359
6896msgid "unable to create temporary index"
6897msgstr "不能创建临时索引"
6898
6899#: builtin/commit.c:365
6900msgid "interactive add failed"
6901msgstr "交互式添加失败"
6902
6903#: builtin/commit.c:378
6904msgid "unable to update temporary index"
6905msgstr "无法更新临时索引"
6906
6907#: builtin/commit.c:380
6908msgid "Failed to update main cache tree"
6909msgstr "不能更新树的主缓存"
6910
6911#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
6912msgid "unable to write new_index file"
6913msgstr "无法写 new_index 文件"
6914
6915#: builtin/commit.c:458
6916msgid "cannot do a partial commit during a merge."
6917msgstr "在合并过程中不能做部分提交。"
6918
6919#: builtin/commit.c:460
6920msgid "cannot do a partial commit during a cherry-pick."
6921msgstr "在拣选过程中不能做部分提交。"
6922
6923#: builtin/commit.c:469
6924msgid "cannot read the index"
6925msgstr "无法读取索引"
6926
6927#: builtin/commit.c:488
6928msgid "unable to write temporary index file"
6929msgstr "无法写临时索引文件"
6930
6931#: builtin/commit.c:582
6932#, c-format
6933msgid "commit '%s' lacks author header"
6934msgstr "提交 '%s' 缺少作者信息"
6935
6936#: builtin/commit.c:584
6937#, c-format
6938msgid "commit '%s' has malformed author line"
6939msgstr "提交 '%s' 有非法的作者信息"
6940
6941#: builtin/commit.c:603
6942msgid "malformed --author parameter"
6943msgstr "非法的 --author 参数"
6944
6945#: builtin/commit.c:655
6946msgid ""
6947"unable to select a comment character that is not used\n"
6948"in the current commit message"
6949msgstr "无法选择一个未被当前提交说明使用的注释字符"
6950
6951#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
6952#, c-format
6953msgid "could not lookup commit %s"
6954msgstr "不能查询提交 %s"
6955
6956#: builtin/commit.c:704 builtin/shortlog.c:294
6957#, c-format
6958msgid "(reading log message from standard input)\n"
6959msgstr "(正从标准输入中读取日志信息)\n"
6960
6961#: builtin/commit.c:706
6962msgid "could not read log from standard input"
6963msgstr "不能从标准输入中读取日志信息"
6964
6965#: builtin/commit.c:710
6966#, c-format
6967msgid "could not read log file '%s'"
6968msgstr "不能读取日志文件 '%s'"
6969
6970#: builtin/commit.c:737 builtin/commit.c:745
6971msgid "could not read SQUASH_MSG"
6972msgstr "不能读取 SQUASH_MSG"
6973
6974#: builtin/commit.c:742
6975msgid "could not read MERGE_MSG"
6976msgstr "不能读取 MERGE_MSG"
6977
6978#: builtin/commit.c:796
6979msgid "could not write commit template"
6980msgstr "不能写提交模版"
6981
6982#: builtin/commit.c:814
6983#, c-format
6984msgid ""
6985"\n"
6986"It looks like you may be committing a merge.\n"
6987"If this is not correct, please remove the file\n"
6988"\t%s\n"
6989"and try again.\n"
6990msgstr ""
6991"\n"
6992"似乎您正在做一个合并提交。如果不对,请删除文件\n"
6993"\t%s\n"
6994"然后重试。\n"
6995
6996#: builtin/commit.c:819
6997#, c-format
6998msgid ""
6999"\n"
7000"It looks like you may be committing a cherry-pick.\n"
7001"If this is not correct, please remove the file\n"
7002"\t%s\n"
7003"and try again.\n"
7004msgstr ""
7005"\n"
7006"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
7007"\t%s\n"
7008"然后重试。\n"
7009
7010#: builtin/commit.c:832
7011#, c-format
7012msgid ""
7013"Please enter the commit message for your changes. Lines starting\n"
7014"with '%c' will be ignored, and an empty message aborts the commit.\n"
7015msgstr ""
7016"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
7017"说明将会终止提交。\n"
7018
7019#: builtin/commit.c:839
7020#, c-format
7021msgid ""
7022"Please enter the commit message for your changes. Lines starting\n"
7023"with '%c' will be kept; you may remove them yourself if you want to.\n"
7024"An empty message aborts the commit.\n"
7025msgstr ""
7026"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7027"也可以删除它们。一个空的提交说明将会终止提交。\n"
7028
7029#  译者:为保证在输出中对齐,注意调整句中空格!
7030#: builtin/commit.c:859
7031#, c-format
7032msgid "%sAuthor:    %.*s <%.*s>"
7033msgstr "%s作者:  %.*s <%.*s>"
7034
7035#  译者:为保证在输出中对齐,注意调整句中空格!
7036#: builtin/commit.c:867
7037#, c-format
7038msgid "%sDate:      %s"
7039msgstr "%s日期:  %s"
7040
7041#  译者:为保证在输出中对齐,注意调整句中空格!
7042#: builtin/commit.c:874
7043#, c-format
7044msgid "%sCommitter: %.*s <%.*s>"
7045msgstr "%s提交者:%.*s <%.*s>"
7046
7047#: builtin/commit.c:892
7048msgid "Cannot read index"
7049msgstr "无法读取索引"
7050
7051#: builtin/commit.c:954
7052msgid "Error building trees"
7053msgstr "无法创建树对象"
7054
7055#: builtin/commit.c:968 builtin/tag.c:273
7056#, c-format
7057msgid "Please supply the message using either -m or -F option.\n"
7058msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
7059
7060#: builtin/commit.c:1071
7061#, c-format
7062msgid "--author '%s' is not 'Name <email>' and matches no existing author"
7063msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
7064
7065#: builtin/commit.c:1086 builtin/commit.c:1325
7066#, c-format
7067msgid "Invalid untracked files mode '%s'"
7068msgstr "无效的未追踪文件参数 '%s'"
7069
7070#: builtin/commit.c:1124
7071msgid "--long and -z are incompatible"
7072msgstr "--long 和 -z 选项不兼容"
7073
7074#: builtin/commit.c:1154
7075msgid "Using both --reset-author and --author does not make sense"
7076msgstr "同时使用 --reset-author 和 --author 没有意义"
7077
7078#: builtin/commit.c:1163
7079msgid "You have nothing to amend."
7080msgstr "您没有可修补的提交。"
7081
7082#: builtin/commit.c:1166
7083msgid "You are in the middle of a merge -- cannot amend."
7084msgstr "您正处于一个合并过程中 -- 无法修补提交。"
7085
7086#: builtin/commit.c:1168
7087msgid "You are in the middle of a cherry-pick -- cannot amend."
7088msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
7089
7090#: builtin/commit.c:1171
7091msgid "Options --squash and --fixup cannot be used together"
7092msgstr "选项 --squash 和 --fixup 不能同时使用"
7093
7094#: builtin/commit.c:1181
7095msgid "Only one of -c/-C/-F/--fixup can be used."
7096msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7097
7098#: builtin/commit.c:1183
7099msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
7100msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
7101
7102#: builtin/commit.c:1191
7103msgid "--reset-author can be used only with -C, -c or --amend."
7104msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
7105
7106#: builtin/commit.c:1208
7107msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7108msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7109
7110#: builtin/commit.c:1210
7111msgid "No paths with --include/--only does not make sense."
7112msgstr "参数 --include/--only 不跟路径没有意义。"
7113
7114#: builtin/commit.c:1212
7115msgid "Explicit paths specified without -i or -o; assuming --only paths..."
7116msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
7117
7118#: builtin/commit.c:1224 builtin/tag.c:551
7119#, c-format
7120msgid "Invalid cleanup mode %s"
7121msgstr "无效的清理模式 %s"
7122
7123#: builtin/commit.c:1229
7124msgid "Paths with -a does not make sense."
7125msgstr "路径和 -a 选项同时使用没有意义。"
7126
7127#: builtin/commit.c:1339 builtin/commit.c:1612
7128msgid "show status concisely"
7129msgstr "以简洁的格式显示状态"
7130
7131#: builtin/commit.c:1341 builtin/commit.c:1614
7132msgid "show branch information"
7133msgstr "显示分支信息"
7134
7135#: builtin/commit.c:1343
7136msgid "version"
7137msgstr "版本"
7138
7139#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
7140#: builtin/worktree.c:443
7141msgid "machine-readable output"
7142msgstr "机器可读的输出"
7143
7144#: builtin/commit.c:1346 builtin/commit.c:1618
7145msgid "show status in long format (default)"
7146msgstr "以长格式显示状态(默认)"
7147
7148#: builtin/commit.c:1349 builtin/commit.c:1621
7149msgid "terminate entries with NUL"
7150msgstr "条目以 NUL 字符结尾"
7151
7152#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
7153#: builtin/fast-export.c:984 builtin/tag.c:411
7154msgid "mode"
7155msgstr "模式"
7156
7157#: builtin/commit.c:1352 builtin/commit.c:1624
7158msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
7159msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
7160
7161#: builtin/commit.c:1355
7162msgid "show ignored files"
7163msgstr "显示忽略的文件"
7164
7165#: builtin/commit.c:1356 parse-options.h:155
7166msgid "when"
7167msgstr "何时"
7168
7169#: builtin/commit.c:1357
7170msgid ""
7171"ignore changes to submodules, optional when: all, dirty, untracked. "
7172"(Default: all)"
7173msgstr ""
7174"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
7175
7176#: builtin/commit.c:1359
7177msgid "list untracked files in columns"
7178msgstr "以列的方式显示未跟踪的文件"
7179
7180#: builtin/commit.c:1435
7181msgid "couldn't look up newly created commit"
7182msgstr "无法找到新创建的提交"
7183
7184#: builtin/commit.c:1437
7185msgid "could not parse newly created commit"
7186msgstr "不能解析新创建的提交"
7187
7188#: builtin/commit.c:1482
7189msgid "detached HEAD"
7190msgstr "分离头指针"
7191
7192#  译者:中文字符串拼接,可删除前导空格
7193#: builtin/commit.c:1485
7194msgid " (root-commit)"
7195msgstr "(根提交)"
7196
7197#: builtin/commit.c:1582
7198msgid "suppress summary after successful commit"
7199msgstr "提交成功后不显示概述信息"
7200
7201#: builtin/commit.c:1583
7202msgid "show diff in commit message template"
7203msgstr "在提交说明模板里显示差异"
7204
7205#: builtin/commit.c:1585
7206msgid "Commit message options"
7207msgstr "提交说明选项"
7208
7209#: builtin/commit.c:1586 builtin/tag.c:409
7210msgid "read message from file"
7211msgstr "从文件中读取提交说明"
7212
7213#: builtin/commit.c:1587
7214msgid "author"
7215msgstr "作者"
7216
7217#: builtin/commit.c:1587
7218msgid "override author for commit"
7219msgstr "提交时覆盖作者"
7220
7221#: builtin/commit.c:1588 builtin/gc.c:353
7222msgid "date"
7223msgstr "日期"
7224
7225#: builtin/commit.c:1588
7226msgid "override date for commit"
7227msgstr "提交时覆盖日期"
7228
7229#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
7230#: builtin/notes.c:561 builtin/tag.c:407
7231msgid "message"
7232msgstr "说明"
7233
7234#: builtin/commit.c:1589
7235msgid "commit message"
7236msgstr "提交说明"
7237
7238#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
7239#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
7240msgid "commit"
7241msgstr "提交"
7242
7243#: builtin/commit.c:1590
7244msgid "reuse and edit message from specified commit"
7245msgstr "重用并编辑指定提交的提交说明"
7246
7247#: builtin/commit.c:1591
7248msgid "reuse message from specified commit"
7249msgstr "重用指定提交的提交说明"
7250
7251#: builtin/commit.c:1592
7252msgid "use autosquash formatted message to fixup specified commit"
7253msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
7254
7255#: builtin/commit.c:1593
7256msgid "use autosquash formatted message to squash specified commit"
7257msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
7258
7259#: builtin/commit.c:1594
7260msgid "the commit is authored by me now (used with -C/-c/--amend)"
7261msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
7262
7263#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
7264msgid "add Signed-off-by:"
7265msgstr "添加 Signed-off-by: 签名"
7266
7267#: builtin/commit.c:1596
7268msgid "use specified template file"
7269msgstr "使用指定的模板文件"
7270
7271#: builtin/commit.c:1597
7272msgid "force edit of commit"
7273msgstr "强制编辑提交"
7274
7275#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7276#: builtin/commit.c:1598
7277msgid "default"
7278msgstr "default"
7279
7280#: builtin/commit.c:1598 builtin/tag.c:412
7281msgid "how to strip spaces and #comments from message"
7282msgstr "设置如何删除提交说明里的空格和#注释"
7283
7284#: builtin/commit.c:1599
7285msgid "include status in commit message template"
7286msgstr "在提交说明模板里包含状态信息"
7287
7288#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
7289#: builtin/revert.c:112
7290msgid "GPG sign commit"
7291msgstr "GPG 提交签名"
7292
7293#: builtin/commit.c:1604
7294msgid "Commit contents options"
7295msgstr "提交内容选项"
7296
7297#: builtin/commit.c:1605
7298msgid "commit all changed files"
7299msgstr "提交所有改动的文件"
7300
7301#: builtin/commit.c:1606
7302msgid "add specified files to index for commit"
7303msgstr "添加指定的文件到索引区等待提交"
7304
7305#: builtin/commit.c:1607
7306msgid "interactively add files"
7307msgstr "交互式添加文件"
7308
7309#: builtin/commit.c:1608
7310msgid "interactively add changes"
7311msgstr "交互式添加变更"
7312
7313#: builtin/commit.c:1609
7314msgid "commit only specified files"
7315msgstr "只提交指定的文件"
7316
7317#: builtin/commit.c:1610
7318msgid "bypass pre-commit and commit-msg hooks"
7319msgstr "绕过 pre-commit 和 commit-msg 钩子"
7320
7321#: builtin/commit.c:1611
7322msgid "show what would be committed"
7323msgstr "显示将要提交的内容"
7324
7325#: builtin/commit.c:1622
7326msgid "amend previous commit"
7327msgstr "修改先前的提交"
7328
7329#: builtin/commit.c:1623
7330msgid "bypass post-rewrite hook"
7331msgstr "绕过 post-rewrite 钩子"
7332
7333#: builtin/commit.c:1628
7334msgid "ok to record an empty change"
7335msgstr "允许一个空提交"
7336
7337#: builtin/commit.c:1630
7338msgid "ok to record a change with an empty message"
7339msgstr "允许空的提交说明"
7340
7341#: builtin/commit.c:1659
7342msgid "could not parse HEAD commit"
7343msgstr "不能解析 HEAD 提交"
7344
7345#: builtin/commit.c:1707
7346#, c-format
7347msgid "Corrupt MERGE_HEAD file (%s)"
7348msgstr "损坏的 MERGE_HEAD 文件(%s)"
7349
7350#: builtin/commit.c:1714
7351msgid "could not read MERGE_MODE"
7352msgstr "不能读取 MERGE_MODE"
7353
7354#: builtin/commit.c:1733
7355#, c-format
7356msgid "could not read commit message: %s"
7357msgstr "不能读取提交说明:%s"
7358
7359#: builtin/commit.c:1744
7360#, c-format
7361msgid "Aborting commit; you did not edit the message.\n"
7362msgstr "终止提交;您未更改来自模版的提交说明。\n"
7363
7364#: builtin/commit.c:1749
7365#, c-format
7366msgid "Aborting commit due to empty commit message.\n"
7367msgstr "终止提交因为提交说明为空。\n"
7368
7369#: builtin/commit.c:1797
7370msgid ""
7371"Repository has been updated, but unable to write\n"
7372"new_index file. Check that disk is not full and quota is\n"
7373"not exceeded, and then \"git reset HEAD\" to recover."
7374msgstr ""
7375"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
7376"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
7377
7378#: builtin/config.c:9
7379msgid "git config [<options>]"
7380msgstr "git config [<选项>]"
7381
7382#: builtin/config.c:55
7383msgid "Config file location"
7384msgstr "配置文件位置"
7385
7386#: builtin/config.c:56
7387msgid "use global config file"
7388msgstr "使用全局配置文件"
7389
7390#: builtin/config.c:57
7391msgid "use system config file"
7392msgstr "使用系统级配置文件"
7393
7394#: builtin/config.c:58
7395msgid "use repository config file"
7396msgstr "使用仓库级配置文件"
7397
7398#: builtin/config.c:59
7399msgid "use given config file"
7400msgstr "使用指定的配置文件"
7401
7402#: builtin/config.c:60
7403msgid "blob-id"
7404msgstr "数据对象 ID"
7405
7406#: builtin/config.c:60
7407msgid "read config from given blob object"
7408msgstr "从给定的数据对象读取配置"
7409
7410#: builtin/config.c:61
7411msgid "Action"
7412msgstr "操作"
7413
7414#: builtin/config.c:62
7415msgid "get value: name [value-regex]"
7416msgstr "获取值:name [value-regex]"
7417
7418#: builtin/config.c:63
7419msgid "get all values: key [value-regex]"
7420msgstr "获得所有的值:key [value-regex]"
7421
7422#: builtin/config.c:64
7423msgid "get values for regexp: name-regex [value-regex]"
7424msgstr "根据正则表达式获得值:name-regex [value-regex]"
7425
7426#: builtin/config.c:65
7427msgid "get value specific for the URL: section[.var] URL"
7428msgstr "获得 URL 取值:section[.var] URL"
7429
7430#: builtin/config.c:66
7431msgid "replace all matching variables: name value [value_regex]"
7432msgstr "替换所有匹配的变量:name value [value_regex]"
7433
7434#: builtin/config.c:67
7435msgid "add a new variable: name value"
7436msgstr "添加一个新的变量:name value"
7437
7438#: builtin/config.c:68
7439msgid "remove a variable: name [value-regex]"
7440msgstr "删除一个变量:name [value-regex]"
7441
7442#: builtin/config.c:69
7443msgid "remove all matches: name [value-regex]"
7444msgstr "删除所有匹配项:name [value-regex]"
7445
7446#: builtin/config.c:70
7447msgid "rename section: old-name new-name"
7448msgstr "重命名小节:old-name new-name"
7449
7450#: builtin/config.c:71
7451msgid "remove a section: name"
7452msgstr "删除一个小节:name"
7453
7454#: builtin/config.c:72
7455msgid "list all"
7456msgstr "列出所有"
7457
7458#: builtin/config.c:73
7459msgid "open an editor"
7460msgstr "打开一个编辑器"
7461
7462#: builtin/config.c:74
7463msgid "find the color configured: slot [default]"
7464msgstr "获得配置的颜色:配置 [默认]"
7465
7466#: builtin/config.c:75
7467msgid "find the color setting: slot [stdout-is-tty]"
7468msgstr "获得颜色设置:配置 [stdout-is-tty]"
7469
7470#: builtin/config.c:76
7471msgid "Type"
7472msgstr "类型"
7473
7474#: builtin/config.c:77
7475msgid "value is \"true\" or \"false\""
7476msgstr "值是 \"true\" 或 \"false\""
7477
7478#: builtin/config.c:78
7479msgid "value is decimal number"
7480msgstr "值是十进制数"
7481
7482#: builtin/config.c:79
7483msgid "value is --bool or --int"
7484msgstr "值是 --bool or --int"
7485
7486#: builtin/config.c:80
7487msgid "value is a path (file or directory name)"
7488msgstr "值是一个路径(文件或目录名)"
7489
7490#: builtin/config.c:81
7491msgid "Other"
7492msgstr "其它"
7493
7494#: builtin/config.c:82
7495msgid "terminate values with NUL byte"
7496msgstr "终止值是 NUL 字节"
7497
7498#: builtin/config.c:83
7499msgid "show variable names only"
7500msgstr "只显示变量名"
7501
7502#: builtin/config.c:84
7503msgid "respect include directives on lookup"
7504msgstr "查询时参照 include 指令递归查找"
7505
7506#: builtin/config.c:85
7507msgid "show origin of config (file, standard input, blob, command line)"
7508msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7509
7510#: builtin/config.c:327
7511msgid "unable to parse default color value"
7512msgstr "不能解析默认颜色值"
7513
7514#: builtin/config.c:471
7515#, c-format
7516msgid ""
7517"# This is Git's per-user configuration file.\n"
7518"[user]\n"
7519"# Please adapt and uncomment the following lines:\n"
7520"#\tname = %s\n"
7521"#\temail = %s\n"
7522msgstr ""
7523"# This is Git's per-user configuration file.\n"
7524"[user]\n"
7525"# Please adapt and uncomment the following lines:\n"
7526"#\tname = %s\n"
7527"#\temail = %s\n"
7528
7529#: builtin/config.c:611
7530#, c-format
7531msgid "cannot create configuration file %s"
7532msgstr "不能创建配置文件 %s"
7533
7534#: builtin/config.c:623
7535#, c-format
7536msgid ""
7537"cannot overwrite multiple values with a single value\n"
7538"       Use a regexp, --add or --replace-all to change %s."
7539msgstr ""
7540"无法用一个值覆盖多个值\n"
7541"       使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7542
7543#: builtin/count-objects.c:86
7544msgid "git count-objects [-v] [-H | --human-readable]"
7545msgstr "git count-objects [-v] [-H | --human-readable]"
7546
7547#: builtin/count-objects.c:96
7548msgid "print sizes in human readable format"
7549msgstr "以用户可读的格式显示大小"
7550
7551#: builtin/describe.c:18
7552msgid "git describe [<options>] [<commit-ish>...]"
7553msgstr "git describe [<选项>] [<提交号>...]"
7554
7555#: builtin/describe.c:19
7556msgid "git describe [<options>] --dirty"
7557msgstr "git describe [<选项>] --dirty"
7558
7559#: builtin/describe.c:53
7560msgid "head"
7561msgstr "头"
7562
7563#: builtin/describe.c:53
7564msgid "lightweight"
7565msgstr "轻量级的"
7566
7567#: builtin/describe.c:53
7568msgid "annotated"
7569msgstr "附注的"
7570
7571#: builtin/describe.c:250
7572#, c-format
7573msgid "annotated tag %s not available"
7574msgstr "附注标签 %s 无效"
7575
7576#: builtin/describe.c:254
7577#, c-format
7578msgid "annotated tag %s has no embedded name"
7579msgstr "附注标签 %s 没有嵌入名称"
7580
7581#: builtin/describe.c:256
7582#, c-format
7583msgid "tag '%s' is really '%s' here"
7584msgstr "标签 '%s' 的确是在 '%s'"
7585
7586#: builtin/describe.c:283 builtin/log.c:487
7587#, c-format
7588msgid "Not a valid object name %s"
7589msgstr "不是一个有效的对象名 %s"
7590
7591#: builtin/describe.c:286
7592#, c-format
7593msgid "%s is not a valid '%s' object"
7594msgstr "%s 不是一个有效的 '%s' 对象"
7595
7596#: builtin/describe.c:303
7597#, c-format
7598msgid "no tag exactly matches '%s'"
7599msgstr "没有标签准确匹配 '%s'"
7600
7601#: builtin/describe.c:305
7602#, c-format
7603msgid "searching to describe %s\n"
7604msgstr "搜索描述 %s\n"
7605
7606#: builtin/describe.c:352
7607#, c-format
7608msgid "finished search at %s\n"
7609msgstr "完成搜索 %s\n"
7610
7611#: builtin/describe.c:379
7612#, c-format
7613msgid ""
7614"No annotated tags can describe '%s'.\n"
7615"However, there were unannotated tags: try --tags."
7616msgstr ""
7617"没有附注标签能描述 '%s'。\n"
7618"然而,存在未附注标签:尝试 --tags。"
7619
7620#: builtin/describe.c:383
7621#, c-format
7622msgid ""
7623"No tags can describe '%s'.\n"
7624"Try --always, or create some tags."
7625msgstr ""
7626"没有标签能描述 '%s'。\n"
7627"尝试 --always,或者创建一些标签。"
7628
7629#: builtin/describe.c:413
7630#, c-format
7631msgid "traversed %lu commits\n"
7632msgstr "已遍历 %lu 个提交\n"
7633
7634#: builtin/describe.c:416
7635#, c-format
7636msgid ""
7637"more than %i tags found; listed %i most recent\n"
7638"gave up search at %s\n"
7639msgstr ""
7640"发现多于 %i 个标签,列出最近的 %i 个\n"
7641"在 %s 放弃搜索\n"
7642
7643#: builtin/describe.c:438
7644msgid "find the tag that comes after the commit"
7645msgstr "寻找该提交之后的标签"
7646
7647#: builtin/describe.c:439
7648msgid "debug search strategy on stderr"
7649msgstr "在标准错误上调试搜索策略"
7650
7651#: builtin/describe.c:440
7652msgid "use any ref"
7653msgstr "使用任意引用"
7654
7655#: builtin/describe.c:441
7656msgid "use any tag, even unannotated"
7657msgstr "使用任意标签,即使未附带注释"
7658
7659#: builtin/describe.c:442
7660msgid "always use long format"
7661msgstr "始终使用长提交号格式"
7662
7663#: builtin/describe.c:443
7664msgid "only follow first parent"
7665msgstr "只跟随第一个父提交"
7666
7667#: builtin/describe.c:446
7668msgid "only output exact matches"
7669msgstr "只输出精确匹配"
7670
7671#: builtin/describe.c:448
7672msgid "consider <n> most recent tags (default: 10)"
7673msgstr "考虑最近 <n> 个标签(默认:10)"
7674
7675#: builtin/describe.c:450
7676msgid "only consider tags matching <pattern>"
7677msgstr "只考虑匹配 <模式> 的标签"
7678
7679#: builtin/describe.c:452
7680msgid "do not consider tags matching <pattern>"
7681msgstr "不考虑匹配 <模式> 的标签"
7682
7683#: builtin/describe.c:454 builtin/name-rev.c:357
7684msgid "show abbreviated commit object as fallback"
7685msgstr "显示简写的提交号作为后备"
7686
7687#: builtin/describe.c:455 builtin/describe.c:458
7688msgid "mark"
7689msgstr "标记"
7690
7691#: builtin/describe.c:456
7692msgid "append <mark> on dirty working tree (default: \"-dirty\")"
7693msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
7694
7695#: builtin/describe.c:459
7696msgid "append <mark> on broken working tree (default: \"-broken\")"
7697msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
7698
7699#: builtin/describe.c:477
7700msgid "--long is incompatible with --abbrev=0"
7701msgstr "--long 与 --abbrev=0 不兼容"
7702
7703#: builtin/describe.c:506
7704msgid "No names found, cannot describe anything."
7705msgstr "没有发现名称,无法描述任何东西。"
7706
7707#: builtin/describe.c:549
7708msgid "--dirty is incompatible with commit-ishes"
7709msgstr "--dirty 与提交号不兼容"
7710
7711#: builtin/describe.c:551
7712msgid "--broken is incompatible with commit-ishes"
7713msgstr "--broken 与提交号不兼容"
7714
7715#: builtin/diff.c:83
7716#, c-format
7717msgid "'%s': not a regular file or symlink"
7718msgstr "'%s':不是一个正规文件或符号链接"
7719
7720#: builtin/diff.c:234
7721#, c-format
7722msgid "invalid option: %s"
7723msgstr "无效选项:%s"
7724
7725#: builtin/diff.c:358
7726msgid "Not a git repository"
7727msgstr "不是一个 git 仓库"
7728
7729#: builtin/diff.c:401
7730#, c-format
7731msgid "invalid object '%s' given."
7732msgstr "提供了无效对象 '%s'。"
7733
7734#: builtin/diff.c:410
7735#, c-format
7736msgid "more than two blobs given: '%s'"
7737msgstr "提供了超过两个数据对象:'%s'"
7738
7739#: builtin/diff.c:417
7740#, c-format
7741msgid "unhandled object '%s' given."
7742msgstr "无法处理的对象 '%s'。"
7743
7744#: builtin/difftool.c:28
7745msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
7746msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
7747
7748#: builtin/difftool.c:241
7749#, c-format
7750msgid "failed: %d"
7751msgstr "失败:%d"
7752
7753#: builtin/difftool.c:283
7754#, c-format
7755msgid "could not read symlink %s"
7756msgstr "无法读取符号链接 %s"
7757
7758#: builtin/difftool.c:285
7759#, c-format
7760msgid "could not read symlink file %s"
7761msgstr "无法读取符号链接文件 %s"
7762
7763#: builtin/difftool.c:293
7764#, c-format
7765msgid "could not read object %s for symlink %s"
7766msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
7767
7768#: builtin/difftool.c:395
7769msgid ""
7770"combined diff formats('-c' and '--cc') are not supported in\n"
7771"directory diff mode('-d' and '--dir-diff')."
7772msgstr ""
7773"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
7774"cc')。"
7775
7776#: builtin/difftool.c:609
7777#, c-format
7778msgid "both files modified: '%s' and '%s'."
7779msgstr "两个文件都被修改:'%s' 和 '%s'。"
7780
7781#: builtin/difftool.c:611
7782msgid "working tree file has been left."
7783msgstr "工作区文件被留了下来。"
7784
7785#: builtin/difftool.c:622
7786#, c-format
7787msgid "temporary files exist in '%s'."
7788msgstr "临时文件存在于 '%s'。"
7789
7790#: builtin/difftool.c:623
7791msgid "you may want to cleanup or recover these."
7792msgstr "您可能想要清理或者恢复它们。"
7793
7794#: builtin/difftool.c:669
7795msgid "use `diff.guitool` instead of `diff.tool`"
7796msgstr "使用 `diff.guitool` 代替 `diff.tool`"
7797
7798#: builtin/difftool.c:671
7799msgid "perform a full-directory diff"
7800msgstr "执行一个全目录差异比较"
7801
7802#: builtin/difftool.c:673
7803msgid "do not prompt before launching a diff tool"
7804msgstr "启动差异比较工具之前不提示"
7805
7806#: builtin/difftool.c:679
7807msgid "use symlinks in dir-diff mode"
7808msgstr "在 dir-diff 模式中使用符号链接"
7809
7810#: builtin/difftool.c:680
7811msgid "<tool>"
7812msgstr "<工具>"
7813
7814#: builtin/difftool.c:681
7815msgid "use the specified diff tool"
7816msgstr "使用指定的差异比较工具"
7817
7818#: builtin/difftool.c:683
7819msgid "print a list of diff tools that may be used with `--tool`"
7820msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
7821
7822#: builtin/difftool.c:686
7823msgid ""
7824"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
7825"code"
7826msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
7827
7828#: builtin/difftool.c:688
7829msgid "<command>"
7830msgstr "<命令>"
7831
7832#: builtin/difftool.c:689
7833msgid "specify a custom command for viewing diffs"
7834msgstr "指定一个用于查看差异的自定义命令"
7835
7836#: builtin/difftool.c:713
7837msgid "no <tool> given for --tool=<tool>"
7838msgstr "没有为 --tool=<工具> 参数提供 <工具>"
7839
7840#: builtin/difftool.c:720
7841msgid "no <cmd> given for --extcmd=<cmd>"
7842msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
7843
7844#: builtin/fast-export.c:25
7845msgid "git fast-export [rev-list-opts]"
7846msgstr "git fast-export [rev-list-opts]"
7847
7848#: builtin/fast-export.c:980
7849msgid "show progress after <n> objects"
7850msgstr "在 <n> 个对象之后显示进度"
7851
7852#: builtin/fast-export.c:982
7853msgid "select handling of signed tags"
7854msgstr "选择如何处理签名标签"
7855
7856#: builtin/fast-export.c:985
7857msgid "select handling of tags that tag filtered objects"
7858msgstr "选择当标签指向被过滤对象时该标签的处理方式"
7859
7860#: builtin/fast-export.c:988
7861msgid "Dump marks to this file"
7862msgstr "把标记存储到这个文件"
7863
7864#: builtin/fast-export.c:990
7865msgid "Import marks from this file"
7866msgstr "从这个文件导入标记"
7867
7868#: builtin/fast-export.c:992
7869msgid "Fake a tagger when tags lack one"
7870msgstr "当标签缺少标记者字段时,假装提供一个"
7871
7872#: builtin/fast-export.c:994
7873msgid "Output full tree for each commit"
7874msgstr "每次提交都输出整个树"
7875
7876#: builtin/fast-export.c:996
7877msgid "Use the done feature to terminate the stream"
7878msgstr "使用 done 功能来终止流"
7879
7880#: builtin/fast-export.c:997
7881msgid "Skip output of blob data"
7882msgstr "跳过数据对象的输出"
7883
7884#: builtin/fast-export.c:998
7885msgid "refspec"
7886msgstr "引用规格"
7887
7888#: builtin/fast-export.c:999
7889msgid "Apply refspec to exported refs"
7890msgstr "对导出的引用应用引用规格"
7891
7892#: builtin/fast-export.c:1000
7893msgid "anonymize output"
7894msgstr "匿名输出"
7895
7896#: builtin/fetch.c:21
7897msgid "git fetch [<options>] [<repository> [<refspec>...]]"
7898msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
7899
7900#: builtin/fetch.c:22
7901msgid "git fetch [<options>] <group>"
7902msgstr "git fetch [<选项>] <组>"
7903
7904#: builtin/fetch.c:23
7905msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
7906msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
7907
7908#: builtin/fetch.c:24
7909msgid "git fetch --all [<options>]"
7910msgstr "git fetch --all [<选项>]"
7911
7912#: builtin/fetch.c:95 builtin/pull.c:175
7913msgid "fetch from all remotes"
7914msgstr "从所有的远程抓取"
7915
7916#: builtin/fetch.c:97 builtin/pull.c:178
7917msgid "append to .git/FETCH_HEAD instead of overwriting"
7918msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
7919
7920#: builtin/fetch.c:99 builtin/pull.c:181
7921msgid "path to upload pack on remote end"
7922msgstr "上传包到远程的路径"
7923
7924#: builtin/fetch.c:100 builtin/pull.c:183
7925msgid "force overwrite of local branch"
7926msgstr "强制覆盖本地分支"
7927
7928#: builtin/fetch.c:102
7929msgid "fetch from multiple remotes"
7930msgstr "从多个远程抓取"
7931
7932#: builtin/fetch.c:104 builtin/pull.c:185
7933msgid "fetch all tags and associated objects"
7934msgstr "抓取所有的标签和关联对象"
7935
7936#: builtin/fetch.c:106
7937msgid "do not fetch all tags (--no-tags)"
7938msgstr "不抓取任何标签(--no-tags)"
7939
7940#: builtin/fetch.c:108
7941msgid "number of submodules fetched in parallel"
7942msgstr "子模组获取的并发数"
7943
7944#: builtin/fetch.c:110 builtin/pull.c:188
7945msgid "prune remote-tracking branches no longer on remote"
7946msgstr "清除远程已经不存在的分支的跟踪分支"
7947
7948#  译者:可选值,不能翻译
7949#: builtin/fetch.c:111 builtin/pull.c:191
7950msgid "on-demand"
7951msgstr "on-demand"
7952
7953#: builtin/fetch.c:112 builtin/pull.c:192
7954msgid "control recursive fetching of submodules"
7955msgstr "控制子模组的递归抓取"
7956
7957#: builtin/fetch.c:116 builtin/pull.c:200
7958msgid "keep downloaded pack"
7959msgstr "保持下载包"
7960
7961#: builtin/fetch.c:118
7962msgid "allow updating of HEAD ref"
7963msgstr "允许更新 HEAD 引用"
7964
7965#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
7966msgid "deepen history of shallow clone"
7967msgstr "深化浅克隆的历史"
7968
7969#: builtin/fetch.c:123
7970msgid "deepen history of shallow repository based on time"
7971msgstr "基于时间来深化浅克隆的历史"
7972
7973#: builtin/fetch.c:129 builtin/pull.c:206
7974msgid "convert to a complete repository"
7975msgstr "转换为一个完整的仓库"
7976
7977#: builtin/fetch.c:131 builtin/log.c:1440
7978msgid "dir"
7979msgstr "目录"
7980
7981#: builtin/fetch.c:132
7982msgid "prepend this to submodule path output"
7983msgstr "在子模组路径输出的前面加上此目录"
7984
7985#: builtin/fetch.c:135
7986msgid "default mode for recursion"
7987msgstr "递归的默认模式"
7988
7989#: builtin/fetch.c:137 builtin/pull.c:209
7990msgid "accept refs that update .git/shallow"
7991msgstr "接受更新 .git/shallow 的引用"
7992
7993#: builtin/fetch.c:138 builtin/pull.c:211
7994msgid "refmap"
7995msgstr "引用映射"
7996
7997#: builtin/fetch.c:139 builtin/pull.c:212
7998msgid "specify fetch refmap"
7999msgstr "指定获取操作的引用映射"
8000
8001#: builtin/fetch.c:395
8002msgid "Couldn't find remote ref HEAD"
8003msgstr "无法发现远程 HEAD 引用"
8004
8005#: builtin/fetch.c:513
8006#, c-format
8007msgid "configuration fetch.output contains invalid value %s"
8008msgstr "配置变量 fetch.output 包含无效值 %s"
8009
8010#: builtin/fetch.c:606
8011#, c-format
8012msgid "object %s not found"
8013msgstr "对象 %s 未发现"
8014
8015#: builtin/fetch.c:610
8016msgid "[up to date]"
8017msgstr "[最新]"
8018
8019#: builtin/fetch.c:623 builtin/fetch.c:703
8020msgid "[rejected]"
8021msgstr "[已拒绝]"
8022
8023#: builtin/fetch.c:624
8024msgid "can't fetch in current branch"
8025msgstr "当前分支下不能执行获取操作"
8026
8027#: builtin/fetch.c:633
8028msgid "[tag update]"
8029msgstr "[标签更新]"
8030
8031#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
8032#: builtin/fetch.c:698
8033msgid "unable to update local ref"
8034msgstr "不能更新本地引用"
8035
8036#: builtin/fetch.c:653
8037msgid "[new tag]"
8038msgstr "[新标签]"
8039
8040#: builtin/fetch.c:656
8041msgid "[new branch]"
8042msgstr "[新分支]"
8043
8044#: builtin/fetch.c:659
8045msgid "[new ref]"
8046msgstr "[新引用]"
8047
8048#: builtin/fetch.c:698
8049msgid "forced update"
8050msgstr "强制更新"
8051
8052#: builtin/fetch.c:703
8053msgid "non-fast-forward"
8054msgstr "非快进"
8055
8056#: builtin/fetch.c:748
8057#, c-format
8058msgid "%s did not send all necessary objects\n"
8059msgstr "%s 未发送所有必须的对象\n"
8060
8061#: builtin/fetch.c:768
8062#, c-format
8063msgid "reject %s because shallow roots are not allowed to be updated"
8064msgstr "拒绝 %s 因为浅克隆不允许被更新"
8065
8066#: builtin/fetch.c:855 builtin/fetch.c:951
8067#, c-format
8068msgid "From %.*s\n"
8069msgstr "来自 %.*s\n"
8070
8071#: builtin/fetch.c:866
8072#, c-format
8073msgid ""
8074"some local refs could not be updated; try running\n"
8075" 'git remote prune %s' to remove any old, conflicting branches"
8076msgstr ""
8077"一些本地引用不能被更新;尝试运行\n"
8078" 'git remote prune %s' 来删除旧的、有冲突的分支"
8079
8080#  译者:注意保持前导空格
8081#: builtin/fetch.c:921
8082#, c-format
8083msgid "   (%s will become dangling)"
8084msgstr "   (%s 将成为摇摆状态)"
8085
8086#  译者:注意保持前导空格
8087#: builtin/fetch.c:922
8088#, c-format
8089msgid "   (%s has become dangling)"
8090msgstr "   (%s 已成为摇摆状态)"
8091
8092#: builtin/fetch.c:954
8093msgid "[deleted]"
8094msgstr "[已删除]"
8095
8096#: builtin/fetch.c:955 builtin/remote.c:1022
8097msgid "(none)"
8098msgstr "(无)"
8099
8100#: builtin/fetch.c:978
8101#, c-format
8102msgid "Refusing to fetch into current branch %s of non-bare repository"
8103msgstr "拒绝获取到非纯仓库的当前分支 %s"
8104
8105#: builtin/fetch.c:997
8106#, c-format
8107msgid "Option \"%s\" value \"%s\" is not valid for %s"
8108msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
8109
8110#: builtin/fetch.c:1000
8111#, c-format
8112msgid "Option \"%s\" is ignored for %s\n"
8113msgstr "选项 \"%s\" 为 %s 所忽略\n"
8114
8115#: builtin/fetch.c:1076
8116#, c-format
8117msgid "Don't know how to fetch from %s"
8118msgstr "不知道如何从 %s 获取"
8119
8120#: builtin/fetch.c:1236
8121#, c-format
8122msgid "Fetching %s\n"
8123msgstr "正在获取 %s\n"
8124
8125#: builtin/fetch.c:1238 builtin/remote.c:96
8126#, c-format
8127msgid "Could not fetch %s"
8128msgstr "不能获取 %s"
8129
8130#: builtin/fetch.c:1256
8131msgid ""
8132"No remote repository specified.  Please, specify either a URL or a\n"
8133"remote name from which new revisions should be fetched."
8134msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
8135
8136#: builtin/fetch.c:1279
8137msgid "You need to specify a tag name."
8138msgstr "您需要指定一个标签名称。"
8139
8140#: builtin/fetch.c:1321
8141msgid "Negative depth in --deepen is not supported"
8142msgstr "--deepen 不支持负数深度"
8143
8144#: builtin/fetch.c:1323
8145msgid "--deepen and --depth are mutually exclusive"
8146msgstr "--deepen 和 --depth 是互斥的"
8147
8148#: builtin/fetch.c:1328
8149msgid "--depth and --unshallow cannot be used together"
8150msgstr "--depth 和 --unshallow 不能同时使用"
8151
8152#: builtin/fetch.c:1330
8153msgid "--unshallow on a complete repository does not make sense"
8154msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
8155
8156#: builtin/fetch.c:1352
8157msgid "fetch --all does not take a repository argument"
8158msgstr "fetch --all 不能带一个仓库参数"
8159
8160#: builtin/fetch.c:1354
8161msgid "fetch --all does not make sense with refspecs"
8162msgstr "fetch --all 带引用规格没有任何意义"
8163
8164#: builtin/fetch.c:1365
8165#, c-format
8166msgid "No such remote or remote group: %s"
8167msgstr "没有这样的远程或远程组:%s"
8168
8169#: builtin/fetch.c:1373
8170msgid "Fetching a group and specifying refspecs does not make sense"
8171msgstr "获取组并指定引用规格没有意义"
8172
8173#: builtin/fmt-merge-msg.c:14
8174msgid ""
8175"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
8176msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
8177
8178#: builtin/fmt-merge-msg.c:663
8179msgid "populate log with at most <n> entries from shortlog"
8180msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
8181
8182#: builtin/fmt-merge-msg.c:666
8183msgid "alias for --log (deprecated)"
8184msgstr "参数 --log 的别名(已弃用)"
8185
8186#: builtin/fmt-merge-msg.c:669
8187msgid "text"
8188msgstr "文本"
8189
8190#: builtin/fmt-merge-msg.c:670
8191msgid "use <text> as start of message"
8192msgstr "使用 <文本> 作为提交说明的开始"
8193
8194#: builtin/fmt-merge-msg.c:671
8195msgid "file to read from"
8196msgstr "从文件中读取"
8197
8198#: builtin/for-each-ref.c:9
8199msgid "git for-each-ref [<options>] [<pattern>]"
8200msgstr "git for-each-ref [<选项>] [<模式>]"
8201
8202#: builtin/for-each-ref.c:10
8203msgid "git for-each-ref [--points-at <object>]"
8204msgstr "git for-each-ref [--points-at <对象>]"
8205
8206#: builtin/for-each-ref.c:11
8207msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
8208msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
8209
8210#: builtin/for-each-ref.c:12
8211msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
8212msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
8213
8214#: builtin/for-each-ref.c:27
8215msgid "quote placeholders suitably for shells"
8216msgstr "引用占位符适用于 shells"
8217
8218#: builtin/for-each-ref.c:29
8219msgid "quote placeholders suitably for perl"
8220msgstr "引用占位符适用于 perl"
8221
8222#: builtin/for-each-ref.c:31
8223msgid "quote placeholders suitably for python"
8224msgstr "引用占位符适用于 python"
8225
8226#: builtin/for-each-ref.c:33
8227msgid "quote placeholders suitably for Tcl"
8228msgstr "引用占位符适用于 Tcl"
8229
8230#: builtin/for-each-ref.c:36
8231msgid "show only <n> matched refs"
8232msgstr "只显示 <n> 个匹配的引用"
8233
8234#: builtin/for-each-ref.c:41
8235msgid "print only refs which points at the given object"
8236msgstr "只打印指向给定对象的引用"
8237
8238#: builtin/for-each-ref.c:43
8239msgid "print only refs that are merged"
8240msgstr "只打印已经合并的引用"
8241
8242#: builtin/for-each-ref.c:44
8243msgid "print only refs that are not merged"
8244msgstr "只打印没有合并的引用"
8245
8246#: builtin/for-each-ref.c:45
8247msgid "print only refs which contain the commit"
8248msgstr "只打印包含该提交的引用"
8249
8250#: builtin/for-each-ref.c:46
8251msgid "print only refs which don't contain the commit"
8252msgstr "只打印不包含该提交的引用"
8253
8254#: builtin/fsck.c:554
8255msgid "Checking object directories"
8256msgstr "检查对象目录中"
8257
8258#: builtin/fsck.c:646
8259msgid "git fsck [<options>] [<object>...]"
8260msgstr "git fsck [<选项>] [<对象>...]"
8261
8262#: builtin/fsck.c:652
8263msgid "show unreachable objects"
8264msgstr "显示不可达的对象"
8265
8266#: builtin/fsck.c:653
8267msgid "show dangling objects"
8268msgstr "显示摇摆的对象"
8269
8270#: builtin/fsck.c:654
8271msgid "report tags"
8272msgstr "报告标签"
8273
8274#: builtin/fsck.c:655
8275msgid "report root nodes"
8276msgstr "报告根节点"
8277
8278#: builtin/fsck.c:656
8279msgid "make index objects head nodes"
8280msgstr "将索引亦作为检查的头节点"
8281
8282#: builtin/fsck.c:657
8283msgid "make reflogs head nodes (default)"
8284msgstr "将引用日志作为检查的头节点(默认)"
8285
8286#: builtin/fsck.c:658
8287msgid "also consider packs and alternate objects"
8288msgstr "也考虑包和备用对象"
8289
8290#: builtin/fsck.c:659
8291msgid "check only connectivity"
8292msgstr "仅检查连通性"
8293
8294#: builtin/fsck.c:660
8295msgid "enable more strict checking"
8296msgstr "启用更严格的检查"
8297
8298#: builtin/fsck.c:662
8299msgid "write dangling objects in .git/lost-found"
8300msgstr "将摇摆对象写入 .git/lost-found 中"
8301
8302#: builtin/fsck.c:663 builtin/prune.c:107
8303msgid "show progress"
8304msgstr "显示进度"
8305
8306#: builtin/fsck.c:664
8307msgid "show verbose names for reachable objects"
8308msgstr "显示可达对象的详细名称"
8309
8310#: builtin/fsck.c:725
8311msgid "Checking objects"
8312msgstr "检查对象中"
8313
8314#: builtin/gc.c:25
8315msgid "git gc [<options>]"
8316msgstr "git gc [<选项>]"
8317
8318#: builtin/gc.c:78
8319#, c-format
8320msgid "Failed to fstat %s: %s"
8321msgstr "无法获取 %s 状态:%s"
8322
8323#: builtin/gc.c:306
8324#, c-format
8325msgid "Can't stat %s"
8326msgstr "不能获取 %s 状态"
8327
8328#: builtin/gc.c:315
8329#, c-format
8330msgid ""
8331"The last gc run reported the following. Please correct the root cause\n"
8332"and remove %s.\n"
8333"Automatic cleanup will not be performed until the file is removed.\n"
8334"\n"
8335"%s"
8336msgstr ""
8337"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
8338"在该文件被删除之前,自动清理将不会执行。\n"
8339"\n"
8340"%s"
8341
8342#: builtin/gc.c:354
8343msgid "prune unreferenced objects"
8344msgstr "清除未引用的对象"
8345
8346#: builtin/gc.c:356
8347msgid "be more thorough (increased runtime)"
8348msgstr "更彻底(增加运行时间)"
8349
8350#: builtin/gc.c:357
8351msgid "enable auto-gc mode"
8352msgstr "启用自动垃圾回收模式"
8353
8354#: builtin/gc.c:358
8355msgid "force running gc even if there may be another gc running"
8356msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8357
8358#: builtin/gc.c:375
8359#, c-format
8360msgid "Failed to parse gc.logexpiry value %s"
8361msgstr "无法解析 gc.logexpiry 的值 %s"
8362
8363#: builtin/gc.c:403
8364#, c-format
8365msgid "Auto packing the repository in background for optimum performance.\n"
8366msgstr "自动在后台执行仓库打包以求最佳性能。\n"
8367
8368#: builtin/gc.c:405
8369#, c-format
8370msgid "Auto packing the repository for optimum performance.\n"
8371msgstr "自动打包仓库以求最佳性能。\n"
8372
8373#: builtin/gc.c:406
8374#, c-format
8375msgid "See \"git help gc\" for manual housekeeping.\n"
8376msgstr "手工维护参见 \"git help gc\"。\n"
8377
8378#: builtin/gc.c:427
8379#, c-format
8380msgid ""
8381"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8382msgstr ""
8383"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
8384
8385#: builtin/gc.c:471
8386msgid ""
8387"There are too many unreachable loose objects; run 'git prune' to remove them."
8388msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
8389
8390#: builtin/grep.c:25
8391msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8392msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
8393
8394#: builtin/grep.c:232
8395#, c-format
8396msgid "grep: failed to create thread: %s"
8397msgstr "grep:无法创建线程:%s"
8398
8399#: builtin/grep.c:290
8400#, c-format
8401msgid "invalid number of threads specified (%d) for %s"
8402msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8403
8404#: builtin/grep.c:769 builtin/grep.c:810
8405#, c-format
8406msgid "unable to read tree (%s)"
8407msgstr "无法读取树(%s)"
8408
8409#: builtin/grep.c:829
8410#, c-format
8411msgid "unable to grep from object of type %s"
8412msgstr "无法抓取来自于 %s 类型的对象"
8413
8414#: builtin/grep.c:893
8415#, c-format
8416msgid "switch `%c' expects a numerical value"
8417msgstr "开关 `%c' 期望一个数字值"
8418
8419#: builtin/grep.c:980
8420msgid "search in index instead of in the work tree"
8421msgstr "在索引区搜索而不是在工作区"
8422
8423#: builtin/grep.c:982
8424msgid "find in contents not managed by git"
8425msgstr "在未被 git 管理的内容中查找"
8426
8427#  译者:中文字符串拼接,可删除前导空格
8428#: builtin/grep.c:984
8429msgid "search in both tracked and untracked files"
8430msgstr "在跟踪和未跟踪的文件中搜索"
8431
8432#: builtin/grep.c:986
8433msgid "ignore files specified via '.gitignore'"
8434msgstr "忽略 '.gitignore' 包含的文件"
8435
8436#: builtin/grep.c:988
8437msgid "recursively search in each submodule"
8438msgstr "在每一个子模组中递归搜索"
8439
8440#: builtin/grep.c:990
8441msgid "basename"
8442msgstr "基本名"
8443
8444#: builtin/grep.c:991
8445msgid "prepend parent project's basename to output"
8446msgstr "在输出中以父项目的基本名为前缀"
8447
8448#: builtin/grep.c:994
8449msgid "show non-matching lines"
8450msgstr "显示未匹配的行"
8451
8452#: builtin/grep.c:996
8453msgid "case insensitive matching"
8454msgstr "不区分大小写匹配"
8455
8456#: builtin/grep.c:998
8457msgid "match patterns only at word boundaries"
8458msgstr "只在单词边界匹配模式"
8459
8460#: builtin/grep.c:1000
8461msgid "process binary files as text"
8462msgstr "把二进制文件当做文本处理"
8463
8464#: builtin/grep.c:1002
8465msgid "don't match patterns in binary files"
8466msgstr "不在二进制文件中匹配模式"
8467
8468#: builtin/grep.c:1005
8469msgid "process binary files with textconv filters"
8470msgstr "用 textconv 过滤器处理二进制文件"
8471
8472#: builtin/grep.c:1007
8473msgid "descend at most <depth> levels"
8474msgstr "最多以指定的深度向下寻找"
8475
8476#: builtin/grep.c:1011
8477msgid "use extended POSIX regular expressions"
8478msgstr "使用扩展的 POSIX 正则表达式"
8479
8480#: builtin/grep.c:1014
8481msgid "use basic POSIX regular expressions (default)"
8482msgstr "使用基本的 POSIX 正则表达式(默认)"
8483
8484#: builtin/grep.c:1017
8485msgid "interpret patterns as fixed strings"
8486msgstr "把模式解析为固定的字符串"
8487
8488#: builtin/grep.c:1020
8489msgid "use Perl-compatible regular expressions"
8490msgstr "使用 Perl 兼容的正则表达式"
8491
8492#: builtin/grep.c:1023
8493msgid "show line numbers"
8494msgstr "显示行号"
8495
8496#: builtin/grep.c:1024
8497msgid "don't show filenames"
8498msgstr "不显示文件名"
8499
8500#: builtin/grep.c:1025
8501msgid "show filenames"
8502msgstr "显示文件名"
8503
8504#: builtin/grep.c:1027
8505msgid "show filenames relative to top directory"
8506msgstr "显示相对于顶级目录的文件名"
8507
8508#: builtin/grep.c:1029
8509msgid "show only filenames instead of matching lines"
8510msgstr "只显示文件名而不显示匹配的行"
8511
8512#: builtin/grep.c:1031
8513msgid "synonym for --files-with-matches"
8514msgstr "和 --files-with-matches 同义"
8515
8516#: builtin/grep.c:1034
8517msgid "show only the names of files without match"
8518msgstr "只显示未匹配的文件名"
8519
8520#: builtin/grep.c:1036
8521msgid "print NUL after filenames"
8522msgstr "在文件名后输出 NUL 字符"
8523
8524#: builtin/grep.c:1038
8525msgid "show the number of matches instead of matching lines"
8526msgstr "显示总匹配行数,而不显示匹配的行"
8527
8528#: builtin/grep.c:1039
8529msgid "highlight matches"
8530msgstr "高亮显示匹配项"
8531
8532#: builtin/grep.c:1041
8533msgid "print empty line between matches from different files"
8534msgstr "在不同文件的匹配项之间打印空行"
8535
8536#: builtin/grep.c:1043
8537msgid "show filename only once above matches from same file"
8538msgstr "只在同一文件的匹配项的上面显示一次文件名"
8539
8540#: builtin/grep.c:1046
8541msgid "show <n> context lines before and after matches"
8542msgstr "显示匹配项前后的 <n> 行上下文"
8543
8544#: builtin/grep.c:1049
8545msgid "show <n> context lines before matches"
8546msgstr "显示匹配项前 <n> 行上下文"
8547
8548#: builtin/grep.c:1051
8549msgid "show <n> context lines after matches"
8550msgstr "显示匹配项后 <n> 行上下文"
8551
8552#: builtin/grep.c:1053
8553msgid "use <n> worker threads"
8554msgstr "使用 <n> 个工作线程"
8555
8556#: builtin/grep.c:1054
8557msgid "shortcut for -C NUM"
8558msgstr "快捷键 -C 数字"
8559
8560#: builtin/grep.c:1057
8561msgid "show a line with the function name before matches"
8562msgstr "在匹配的前面显示一行函数名"
8563
8564#: builtin/grep.c:1059
8565msgid "show the surrounding function"
8566msgstr "显示所在函数的前后内容"
8567
8568#: builtin/grep.c:1062
8569msgid "read patterns from file"
8570msgstr "从文件读取模式"
8571
8572#: builtin/grep.c:1064
8573msgid "match <pattern>"
8574msgstr "匹配 <模式>"
8575
8576#: builtin/grep.c:1066
8577msgid "combine patterns specified with -e"
8578msgstr "组合用 -e 参数设定的模式"
8579
8580#: builtin/grep.c:1078
8581msgid "indicate hit with exit status without output"
8582msgstr "不输出,而用退出码标识命中状态"
8583
8584#: builtin/grep.c:1080
8585msgid "show only matches from files that match all patterns"
8586msgstr "只显示匹配所有模式的文件中的匹配"
8587
8588#: builtin/grep.c:1082
8589msgid "show parse tree for grep expression"
8590msgstr "显示 grep 表达式的解析树"
8591
8592#: builtin/grep.c:1086
8593msgid "pager"
8594msgstr "分页"
8595
8596#: builtin/grep.c:1086
8597msgid "show matching files in the pager"
8598msgstr "分页显示匹配的文件"
8599
8600#: builtin/grep.c:1089
8601msgid "allow calling of grep(1) (ignored by this build)"
8602msgstr "允许调用 grep(1)(本次构建忽略)"
8603
8604#: builtin/grep.c:1153
8605msgid "no pattern given."
8606msgstr "未提供模式匹配。"
8607
8608#: builtin/grep.c:1189
8609msgid "--no-index or --untracked cannot be used with revs"
8610msgstr "--no-index 或 --untracked 不能和版本同时使用"
8611
8612#: builtin/grep.c:1195
8613#, c-format
8614msgid "unable to resolve revision: %s"
8615msgstr "不能解析版本:%s"
8616
8617#: builtin/grep.c:1228 builtin/index-pack.c:1485
8618#, c-format
8619msgid "invalid number of threads specified (%d)"
8620msgstr "指定的线程数无效(%d)"
8621
8622#: builtin/grep.c:1251
8623msgid "--open-files-in-pager only works on the worktree"
8624msgstr "--open-files-in-pager 仅用于工作区"
8625
8626#: builtin/grep.c:1274
8627msgid "option not supported with --recurse-submodules."
8628msgstr "选项不支持和 --recurse-submodules 共用。"
8629
8630#: builtin/grep.c:1280
8631msgid "--cached or --untracked cannot be used with --no-index."
8632msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
8633
8634#: builtin/grep.c:1286
8635msgid "--[no-]exclude-standard cannot be used for tracked contents."
8636msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
8637
8638#: builtin/grep.c:1294
8639msgid "both --cached and trees are given."
8640msgstr "同时给出了 --cached 和树对象。"
8641
8642#: builtin/hash-object.c:81
8643msgid ""
8644"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8645"[--] <file>..."
8646msgstr ""
8647"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8648"[--] <文件>..."
8649
8650#: builtin/hash-object.c:82
8651msgid "git hash-object  --stdin-paths"
8652msgstr "git hash-object  --stdin-paths"
8653
8654#: builtin/hash-object.c:94
8655msgid "type"
8656msgstr "类型"
8657
8658#: builtin/hash-object.c:94
8659msgid "object type"
8660msgstr "对象类型"
8661
8662#: builtin/hash-object.c:95
8663msgid "write the object into the object database"
8664msgstr "将对象写入对象数据库"
8665
8666#: builtin/hash-object.c:97
8667msgid "read the object from stdin"
8668msgstr "从标准输入读取对象"
8669
8670#: builtin/hash-object.c:99
8671msgid "store file as is without filters"
8672msgstr "原样存储文件不使用过滤器"
8673
8674#: builtin/hash-object.c:100
8675msgid ""
8676"just hash any random garbage to create corrupt objects for debugging Git"
8677msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8678
8679#: builtin/hash-object.c:101
8680msgid "process file as it were from this path"
8681msgstr "处理文件并假设其来自于此路径"
8682
8683#: builtin/help.c:42
8684msgid "print all available commands"
8685msgstr "打印所有可用的命令"
8686
8687#: builtin/help.c:43
8688msgid "exclude guides"
8689msgstr "排除向导"
8690
8691#: builtin/help.c:44
8692msgid "print list of useful guides"
8693msgstr "显示有用的指南列表"
8694
8695#: builtin/help.c:45
8696msgid "show man page"
8697msgstr "显示 man 手册"
8698
8699#: builtin/help.c:46
8700msgid "show manual in web browser"
8701msgstr "在 web 浏览器中显示手册"
8702
8703#: builtin/help.c:48
8704msgid "show info page"
8705msgstr "显示 info 手册"
8706
8707#: builtin/help.c:54
8708msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8709msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
8710
8711#: builtin/help.c:66
8712#, c-format
8713msgid "unrecognized help format '%s'"
8714msgstr "未能识别的帮助格式 '%s'"
8715
8716#: builtin/help.c:93
8717msgid "Failed to start emacsclient."
8718msgstr "无法启动 emacsclient。"
8719
8720#: builtin/help.c:106
8721msgid "Failed to parse emacsclient version."
8722msgstr "无法解析 emacsclient 版本。"
8723
8724#: builtin/help.c:114
8725#, c-format
8726msgid "emacsclient version '%d' too old (< 22)."
8727msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8728
8729#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
8730#, c-format
8731msgid "failed to exec '%s'"
8732msgstr "无法执行 '%s'"
8733
8734#: builtin/help.c:207
8735#, c-format
8736msgid ""
8737"'%s': path for unsupported man viewer.\n"
8738"Please consider using 'man.<tool>.cmd' instead."
8739msgstr ""
8740"'%s':不支持的 man 手册查看器的路径。\n"
8741"请使用 'man.<工具>.cmd'。"
8742
8743#: builtin/help.c:219
8744#, c-format
8745msgid ""
8746"'%s': cmd for supported man viewer.\n"
8747"Please consider using 'man.<tool>.path' instead."
8748msgstr ""
8749"'%s': 支持的 man 手册查看器命令。\n"
8750"请使用 'man.<工具>.path'。"
8751
8752#: builtin/help.c:336
8753#, c-format
8754msgid "'%s': unknown man viewer."
8755msgstr "'%s':未知的 man 查看器。"
8756
8757#: builtin/help.c:353
8758msgid "no man viewer handled the request"
8759msgstr "没有 man 查看器处理此请求"
8760
8761#: builtin/help.c:361
8762msgid "no info viewer handled the request"
8763msgstr "没有 info 查看器处理此请求"
8764
8765#: builtin/help.c:403
8766msgid "Defining attributes per path"
8767msgstr "定义路径的属性"
8768
8769#: builtin/help.c:404
8770msgid "Everyday Git With 20 Commands Or So"
8771msgstr "每一天 Git 常用的约 20 条命令"
8772
8773#: builtin/help.c:405
8774msgid "A Git glossary"
8775msgstr "Git 词汇表"
8776
8777#: builtin/help.c:406
8778msgid "Specifies intentionally untracked files to ignore"
8779msgstr "忽略指定的未跟踪文件"
8780
8781#: builtin/help.c:407
8782msgid "Defining submodule properties"
8783msgstr "定义子模组属性"
8784
8785#: builtin/help.c:408
8786msgid "Specifying revisions and ranges for Git"
8787msgstr "指定 Git 的版本和版本范围"
8788
8789#: builtin/help.c:409
8790msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
8791msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
8792
8793#: builtin/help.c:410
8794msgid "An overview of recommended workflows with Git"
8795msgstr "Git 推荐的工作流概览"
8796
8797#: builtin/help.c:422
8798msgid "The common Git guides are:\n"
8799msgstr "最常用的 Git 向导有:\n"
8800
8801#: builtin/help.c:440
8802#, c-format
8803msgid "`git %s' is aliased to `%s'"
8804msgstr "`git %s' 是 `%s' 的别名"
8805
8806#: builtin/help.c:462 builtin/help.c:479
8807#, c-format
8808msgid "usage: %s%s"
8809msgstr "用法:%s%s"
8810
8811#: builtin/index-pack.c:154
8812#, c-format
8813msgid "unable to open %s"
8814msgstr "不能打开 %s"
8815
8816#: builtin/index-pack.c:204
8817#, c-format
8818msgid "object type mismatch at %s"
8819msgstr "%s 的对象类型不匹配"
8820
8821#: builtin/index-pack.c:224
8822#, c-format
8823msgid "did not receive expected object %s"
8824msgstr "未能获取预期的对象 %s"
8825
8826#: builtin/index-pack.c:227
8827#, c-format
8828msgid "object %s: expected type %s, found %s"
8829msgstr "对象 %s:应为类型 %s,却是 %s"
8830
8831#: builtin/index-pack.c:269
8832#, c-format
8833msgid "cannot fill %d byte"
8834msgid_plural "cannot fill %d bytes"
8835msgstr[0] "无法填充 %d 字节"
8836msgstr[1] "无法填充 %d 字节"
8837
8838#: builtin/index-pack.c:279
8839msgid "early EOF"
8840msgstr "过早的文件结束符(EOF)"
8841
8842#: builtin/index-pack.c:280
8843msgid "read error on input"
8844msgstr "输入上的读错误"
8845
8846#: builtin/index-pack.c:292
8847msgid "used more bytes than were available"
8848msgstr "用掉了超过可用的字节"
8849
8850#: builtin/index-pack.c:299
8851msgid "pack too large for current definition of off_t"
8852msgstr "包太大超过了当前 off_t 的定义"
8853
8854#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
8855msgid "pack exceeds maximum allowed size"
8856msgstr "包超过了最大允许值"
8857
8858#: builtin/index-pack.c:317
8859#, c-format
8860msgid "unable to create '%s'"
8861msgstr "不能创建 '%s'"
8862
8863#: builtin/index-pack.c:323
8864#, c-format
8865msgid "cannot open packfile '%s'"
8866msgstr "无法打开包文件 '%s'"
8867
8868#: builtin/index-pack.c:337
8869msgid "pack signature mismatch"
8870msgstr "包签名不匹配"
8871
8872#: builtin/index-pack.c:339
8873#, c-format
8874msgid "pack version %<PRIu32> unsupported"
8875msgstr "不支持包版本 %<PRIu32>"
8876
8877#: builtin/index-pack.c:357
8878#, c-format
8879msgid "pack has bad object at offset %<PRIuMAX>: %s"
8880msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8881
8882#: builtin/index-pack.c:479
8883#, c-format
8884msgid "inflate returned %d"
8885msgstr "解压缩返回 %d"
8886
8887#: builtin/index-pack.c:528
8888msgid "offset value overflow for delta base object"
8889msgstr "偏移值覆盖了 delta 基准对象"
8890
8891#: builtin/index-pack.c:536
8892msgid "delta base offset is out of bound"
8893msgstr "delta 基准偏移越界"
8894
8895#: builtin/index-pack.c:544
8896#, c-format
8897msgid "unknown object type %d"
8898msgstr "未知对象类型 %d"
8899
8900#: builtin/index-pack.c:575
8901msgid "cannot pread pack file"
8902msgstr "无法读取包文件"
8903
8904#: builtin/index-pack.c:577
8905#, c-format
8906msgid "premature end of pack file, %<PRIuMAX> byte missing"
8907msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
8908msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8909msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8910
8911#: builtin/index-pack.c:603
8912msgid "serious inflate inconsistency"
8913msgstr "解压缩严重的不一致"
8914
8915#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
8916#: builtin/index-pack.c:816 builtin/index-pack.c:825
8917#, c-format
8918msgid "SHA1 COLLISION FOUND WITH %s !"
8919msgstr "发现 %s 出现 SHA1 冲突!"
8920
8921#: builtin/index-pack.c:752 builtin/pack-objects.c:164
8922#: builtin/pack-objects.c:257
8923#, c-format
8924msgid "unable to read %s"
8925msgstr "不能读 %s"
8926
8927#: builtin/index-pack.c:814
8928#, c-format
8929msgid "cannot read existing object info %s"
8930msgstr "不能读取现存对象信息 %s"
8931
8932#: builtin/index-pack.c:822
8933#, c-format
8934msgid "cannot read existing object %s"
8935msgstr "不能读取现存对象 %s"
8936
8937#: builtin/index-pack.c:836
8938#, c-format
8939msgid "invalid blob object %s"
8940msgstr "无效的数据对象 %s"
8941
8942#: builtin/index-pack.c:850
8943#, c-format
8944msgid "invalid %s"
8945msgstr "无效的 %s"
8946
8947#: builtin/index-pack.c:853
8948msgid "Error in object"
8949msgstr "对象中出错"
8950
8951#: builtin/index-pack.c:855
8952#, c-format
8953msgid "Not all child objects of %s are reachable"
8954msgstr "%s 的所有子对象并非都可达"
8955
8956#: builtin/index-pack.c:927 builtin/index-pack.c:958
8957msgid "failed to apply delta"
8958msgstr "无法应用 delta"
8959
8960#: builtin/index-pack.c:1128
8961msgid "Receiving objects"
8962msgstr "接收对象中"
8963
8964#: builtin/index-pack.c:1128
8965msgid "Indexing objects"
8966msgstr "索引对象中"
8967
8968#: builtin/index-pack.c:1160
8969msgid "pack is corrupted (SHA1 mismatch)"
8970msgstr "包冲突(SHA1 不匹配)"
8971
8972#: builtin/index-pack.c:1165
8973msgid "cannot fstat packfile"
8974msgstr "不能枚举包文件状态"
8975
8976#: builtin/index-pack.c:1168
8977msgid "pack has junk at the end"
8978msgstr "包的结尾有垃圾数据"
8979
8980#: builtin/index-pack.c:1179
8981msgid "confusion beyond insanity in parse_pack_objects()"
8982msgstr "parse_pack_objects() 中遇到不可理喻的问题"
8983
8984#: builtin/index-pack.c:1202
8985msgid "Resolving deltas"
8986msgstr "处理 delta 中"
8987
8988#: builtin/index-pack.c:1213
8989#, c-format
8990msgid "unable to create thread: %s"
8991msgstr "不能创建线程:%s"
8992
8993#: builtin/index-pack.c:1255
8994msgid "confusion beyond insanity"
8995msgstr "不可理喻"
8996
8997#: builtin/index-pack.c:1261
8998#, c-format
8999msgid "completed with %d local object"
9000msgid_plural "completed with %d local objects"
9001msgstr[0] "完成 %d 个本地对象"
9002msgstr[1] "完成 %d 个本地对象"
9003
9004#: builtin/index-pack.c:1273
9005#, c-format
9006msgid "Unexpected tail checksum for %s (disk corruption?)"
9007msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
9008
9009#: builtin/index-pack.c:1277
9010#, c-format
9011msgid "pack has %d unresolved delta"
9012msgid_plural "pack has %d unresolved deltas"
9013msgstr[0] "包有 %d 个未解决的 delta"
9014msgstr[1] "包有 %d 个未解决的 delta"
9015
9016#: builtin/index-pack.c:1301
9017#, c-format
9018msgid "unable to deflate appended object (%d)"
9019msgstr "不能压缩附加对象(%d)"
9020
9021#: builtin/index-pack.c:1377
9022#, c-format
9023msgid "local object %s is corrupt"
9024msgstr "本地对象 %s 已损坏"
9025
9026#: builtin/index-pack.c:1403
9027msgid "error while closing pack file"
9028msgstr "关闭包文件时出错"
9029
9030#: builtin/index-pack.c:1415
9031#, c-format
9032msgid "cannot write keep file '%s'"
9033msgstr "无法写保留文件 '%s'"
9034
9035#: builtin/index-pack.c:1423
9036#, c-format
9037msgid "cannot close written keep file '%s'"
9038msgstr "无法关闭保留文件 '%s'"
9039
9040#: builtin/index-pack.c:1433
9041msgid "cannot store pack file"
9042msgstr "无法存储包文件"
9043
9044#: builtin/index-pack.c:1441
9045msgid "cannot store index file"
9046msgstr "无法存储索引文件"
9047
9048#: builtin/index-pack.c:1479
9049#, c-format
9050msgid "bad pack.indexversion=%<PRIu32>"
9051msgstr "坏的 pack.indexversion=%<PRIu32>"
9052
9053#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
9054#, c-format
9055msgid "no threads support, ignoring %s"
9056msgstr "没有线程支持,忽略 %s"
9057
9058#: builtin/index-pack.c:1547
9059#, c-format
9060msgid "Cannot open existing pack file '%s'"
9061msgstr "无法打开现存包文件 '%s'"
9062
9063#: builtin/index-pack.c:1549
9064#, c-format
9065msgid "Cannot open existing pack idx file for '%s'"
9066msgstr "无法为 %s 打开包索引文件"
9067
9068#: builtin/index-pack.c:1596
9069#, c-format
9070msgid "non delta: %d object"
9071msgid_plural "non delta: %d objects"
9072msgstr[0] "非 delta:%d 个对象"
9073msgstr[1] "非 delta:%d 个对象"
9074
9075#: builtin/index-pack.c:1603
9076#, c-format
9077msgid "chain length = %d: %lu object"
9078msgid_plural "chain length = %d: %lu objects"
9079msgstr[0] "链长 = %d: %lu 对象"
9080msgstr[1] "链长 = %d: %lu 对象"
9081
9082#: builtin/index-pack.c:1616
9083#, c-format
9084msgid "packfile name '%s' does not end with '.pack'"
9085msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
9086
9087#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
9088#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
9089#, c-format
9090msgid "bad %s"
9091msgstr "错误选项 %s"
9092
9093#: builtin/index-pack.c:1737
9094msgid "--fix-thin cannot be used without --stdin"
9095msgstr "--fix-thin 不能和 --stdin 同时使用"
9096
9097#: builtin/index-pack.c:1739
9098msgid "--stdin requires a git repository"
9099msgstr "--stdin 需要一个 git 仓库"
9100
9101#: builtin/index-pack.c:1747
9102msgid "--verify with no packfile name given"
9103msgstr "--verify 没有提供包文件名参数"
9104
9105#: builtin/init-db.c:54
9106#, c-format
9107msgid "cannot stat '%s'"
9108msgstr "不能枚举 '%s' 状态"
9109
9110#: builtin/init-db.c:60
9111#, c-format
9112msgid "cannot stat template '%s'"
9113msgstr "不能枚举模版 '%s' 状态"
9114
9115#: builtin/init-db.c:65
9116#, c-format
9117msgid "cannot opendir '%s'"
9118msgstr "不能打开目录 '%s'"
9119
9120#: builtin/init-db.c:76
9121#, c-format
9122msgid "cannot readlink '%s'"
9123msgstr "不能读取链接 '%s'"
9124
9125#: builtin/init-db.c:78
9126#, c-format
9127msgid "cannot symlink '%s' '%s'"
9128msgstr "不能自 '%s' 到 '%s' 创建符号链接"
9129
9130#: builtin/init-db.c:84
9131#, c-format
9132msgid "cannot copy '%s' to '%s'"
9133msgstr "不能拷贝 '%s' 至 '%s'"
9134
9135#: builtin/init-db.c:88
9136#, c-format
9137msgid "ignoring template %s"
9138msgstr "忽略模版 %s"
9139
9140#: builtin/init-db.c:119
9141#, c-format
9142msgid "templates not found %s"
9143msgstr "模版未找到 %s"
9144
9145#: builtin/init-db.c:134
9146#, c-format
9147msgid "not copying templates from '%s': %s"
9148msgstr "没有从 '%s' 复制模版:%s"
9149
9150#: builtin/init-db.c:327
9151#, c-format
9152msgid "unable to handle file type %d"
9153msgstr "不能处理 %d 类型的文件"
9154
9155#: builtin/init-db.c:330
9156#, c-format
9157msgid "unable to move %s to %s"
9158msgstr "不能移动 %s 至 %s"
9159
9160#: builtin/init-db.c:347 builtin/init-db.c:350
9161#, c-format
9162msgid "%s already exists"
9163msgstr "%s 已经存在"
9164
9165#: builtin/init-db.c:403
9166#, c-format
9167msgid "Reinitialized existing shared Git repository in %s%s\n"
9168msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
9169
9170#: builtin/init-db.c:404
9171#, c-format
9172msgid "Reinitialized existing Git repository in %s%s\n"
9173msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
9174
9175#: builtin/init-db.c:408
9176#, c-format
9177msgid "Initialized empty shared Git repository in %s%s\n"
9178msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
9179
9180#: builtin/init-db.c:409
9181#, c-format
9182msgid "Initialized empty Git repository in %s%s\n"
9183msgstr "已初始化空的 Git 仓库于 %s%s\n"
9184
9185#: builtin/init-db.c:457
9186msgid ""
9187"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
9188"shared[=<permissions>]] [<directory>]"
9189msgstr ""
9190"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
9191"[<目录>]"
9192
9193#: builtin/init-db.c:480
9194msgid "permissions"
9195msgstr "权限"
9196
9197#: builtin/init-db.c:481
9198msgid "specify that the git repository is to be shared amongst several users"
9199msgstr "指定 git 仓库是多个用户之间共享的"
9200
9201#: builtin/init-db.c:515 builtin/init-db.c:520
9202#, c-format
9203msgid "cannot mkdir %s"
9204msgstr "不能创建目录 %s"
9205
9206#: builtin/init-db.c:524
9207#, c-format
9208msgid "cannot chdir to %s"
9209msgstr "不能切换目录到 %s"
9210
9211#: builtin/init-db.c:545
9212#, c-format
9213msgid ""
9214"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
9215"dir=<directory>)"
9216msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
9217
9218#: builtin/init-db.c:573
9219#, c-format
9220msgid "Cannot access work tree '%s'"
9221msgstr "不能访问工作区 '%s'"
9222
9223#: builtin/interpret-trailers.c:15
9224msgid ""
9225"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
9226"<token>[(=|:)<value>])...] [<file>...]"
9227msgstr ""
9228"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
9229">])...] [<文件>...]"
9230
9231#: builtin/interpret-trailers.c:26
9232msgid "edit files in place"
9233msgstr "在原位编辑文件"
9234
9235#: builtin/interpret-trailers.c:27
9236msgid "trim empty trailers"
9237msgstr "删除空签名"
9238
9239#: builtin/interpret-trailers.c:28
9240msgid "trailer"
9241msgstr "签名"
9242
9243#: builtin/interpret-trailers.c:29
9244msgid "trailer(s) to add"
9245msgstr "要添加的签名"
9246
9247#: builtin/interpret-trailers.c:42
9248msgid "no input file given for in-place editing"
9249msgstr "没有给出要原位编辑的文件"
9250
9251#: builtin/log.c:44
9252msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
9253msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
9254
9255#: builtin/log.c:45
9256msgid "git show [<options>] <object>..."
9257msgstr "git show [<选项>] <对象>..."
9258
9259#: builtin/log.c:89
9260#, c-format
9261msgid "invalid --decorate option: %s"
9262msgstr "无效的 --decorate 选项:%s"
9263
9264#: builtin/log.c:144
9265msgid "suppress diff output"
9266msgstr "不显示差异输出"
9267
9268#: builtin/log.c:145
9269msgid "show source"
9270msgstr "显示源"
9271
9272#: builtin/log.c:146
9273msgid "Use mail map file"
9274msgstr "使用邮件映射文件"
9275
9276#: builtin/log.c:147
9277msgid "decorate options"
9278msgstr "修饰选项"
9279
9280#: builtin/log.c:150
9281msgid "Process line range n,m in file, counting from 1"
9282msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
9283
9284#: builtin/log.c:246
9285#, c-format
9286msgid "Final output: %d %s\n"
9287msgstr "最终输出:%d %s\n"
9288
9289#: builtin/log.c:493
9290#, c-format
9291msgid "git show %s: bad file"
9292msgstr "git show %s: 损坏的文件"
9293
9294#: builtin/log.c:507 builtin/log.c:601
9295#, c-format
9296msgid "Could not read object %s"
9297msgstr "不能读取对象 %s"
9298
9299#: builtin/log.c:625
9300#, c-format
9301msgid "Unknown type: %d"
9302msgstr "未知类型:%d"
9303
9304#: builtin/log.c:746
9305msgid "format.headers without value"
9306msgstr "format.headers 没有值"
9307
9308#: builtin/log.c:846
9309msgid "name of output directory is too long"
9310msgstr "输出目录名太长"
9311
9312#: builtin/log.c:861
9313#, c-format
9314msgid "Cannot open patch file %s"
9315msgstr "无法打开补丁文件 %s"
9316
9317#: builtin/log.c:875
9318msgid "Need exactly one range."
9319msgstr "只需要一个范围。"
9320
9321#: builtin/log.c:885
9322msgid "Not a range."
9323msgstr "不是一个范围。"
9324
9325#: builtin/log.c:991
9326msgid "Cover letter needs email format"
9327msgstr "信封需要邮件地址格式"
9328
9329#: builtin/log.c:1071
9330#, c-format
9331msgid "insane in-reply-to: %s"
9332msgstr "不正常的 in-reply-to:%s"
9333
9334#: builtin/log.c:1098
9335msgid "git format-patch [<options>] [<since> | <revision-range>]"
9336msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
9337
9338#: builtin/log.c:1148
9339msgid "Two output directories?"
9340msgstr "两个输出目录?"
9341
9342#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
9343#, c-format
9344msgid "Unknown commit %s"
9345msgstr "未知提交 %s"
9346
9347#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
9348#, c-format
9349msgid "Failed to resolve '%s' as a valid ref."
9350msgstr "无法解析 '%s' 为一个有效引用。"
9351
9352#: builtin/log.c:1270
9353msgid "Could not find exact merge base."
9354msgstr "不能找到准确的合并基线。"
9355
9356#: builtin/log.c:1274
9357msgid ""
9358"Failed to get upstream, if you want to record base commit automatically,\n"
9359"please use git branch --set-upstream-to to track a remote branch.\n"
9360"Or you could specify base commit by --base=<base-commit-id> manually."
9361msgstr ""
9362"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
9363"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
9364"参数 --base=<base-commit-id> 手动指定一个基线提交。"
9365
9366#: builtin/log.c:1294
9367msgid "Failed to find exact merge base"
9368msgstr "无法找到准确的合并基线"
9369
9370#: builtin/log.c:1305
9371msgid "base commit should be the ancestor of revision list"
9372msgstr "基线提交应该是版本列表的祖先"
9373
9374#: builtin/log.c:1309
9375msgid "base commit shouldn't be in revision list"
9376msgstr "基线提交不应该出现在版本列表中"
9377
9378#: builtin/log.c:1358
9379msgid "cannot get patch id"
9380msgstr "无法得到补丁 id"
9381
9382#: builtin/log.c:1415
9383msgid "use [PATCH n/m] even with a single patch"
9384msgstr "使用 [PATCH n/m],即使只有一个补丁"
9385
9386#: builtin/log.c:1418
9387msgid "use [PATCH] even with multiple patches"
9388msgstr "使用 [PATCH],即使有多个补丁"
9389
9390#: builtin/log.c:1422
9391msgid "print patches to standard out"
9392msgstr "打印补丁到标准输出"
9393
9394#: builtin/log.c:1424
9395msgid "generate a cover letter"
9396msgstr "生成一封附信"
9397
9398#: builtin/log.c:1426
9399msgid "use simple number sequence for output file names"
9400msgstr "使用简单的数字序列作为输出文件名"
9401
9402#: builtin/log.c:1427
9403msgid "sfx"
9404msgstr "后缀"
9405
9406#: builtin/log.c:1428
9407msgid "use <sfx> instead of '.patch'"
9408msgstr "使用 <后缀> 代替 '.patch'"
9409
9410#: builtin/log.c:1430
9411msgid "start numbering patches at <n> instead of 1"
9412msgstr "补丁以 <n> 开始编号,而不是1"
9413
9414#: builtin/log.c:1432
9415msgid "mark the series as Nth re-roll"
9416msgstr "标记补丁系列是第几次重制"
9417
9418#: builtin/log.c:1434
9419msgid "Use [RFC PATCH] instead of [PATCH]"
9420msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9421
9422#: builtin/log.c:1437
9423msgid "Use [<prefix>] instead of [PATCH]"
9424msgstr "使用 [<前缀>] 代替 [PATCH]"
9425
9426#: builtin/log.c:1440
9427msgid "store resulting files in <dir>"
9428msgstr "把结果文件存储在 <目录>"
9429
9430#: builtin/log.c:1443
9431msgid "don't strip/add [PATCH]"
9432msgstr "不删除/添加 [PATCH]"
9433
9434#: builtin/log.c:1446
9435msgid "don't output binary diffs"
9436msgstr "不输出二进制差异"
9437
9438#: builtin/log.c:1448
9439msgid "output all-zero hash in From header"
9440msgstr "在 From 头信息中输出全为零的哈希值"
9441
9442#: builtin/log.c:1450
9443msgid "don't include a patch matching a commit upstream"
9444msgstr "不包含已在上游提交中的补丁"
9445
9446#: builtin/log.c:1452
9447msgid "show patch format instead of default (patch + stat)"
9448msgstr "显示纯补丁格式而非默认的(补丁+状态)"
9449
9450#: builtin/log.c:1454
9451msgid "Messaging"
9452msgstr "邮件发送"
9453
9454#: builtin/log.c:1455
9455msgid "header"
9456msgstr "header"
9457
9458#: builtin/log.c:1456
9459msgid "add email header"
9460msgstr "添加邮件头"
9461
9462#: builtin/log.c:1457 builtin/log.c:1459
9463msgid "email"
9464msgstr "邮件地址"
9465
9466#: builtin/log.c:1457
9467msgid "add To: header"
9468msgstr "添加收件人"
9469
9470#: builtin/log.c:1459
9471msgid "add Cc: header"
9472msgstr "添加抄送"
9473
9474#: builtin/log.c:1461
9475msgid "ident"
9476msgstr "标识"
9477
9478#: builtin/log.c:1462
9479msgid "set From address to <ident> (or committer ident if absent)"
9480msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
9481
9482#: builtin/log.c:1464
9483msgid "message-id"
9484msgstr "邮件标识"
9485
9486#: builtin/log.c:1465
9487msgid "make first mail a reply to <message-id>"
9488msgstr "使第一封邮件作为对 <邮件标识> 的回复"
9489
9490#: builtin/log.c:1466 builtin/log.c:1469
9491msgid "boundary"
9492msgstr "边界"
9493
9494#: builtin/log.c:1467
9495msgid "attach the patch"
9496msgstr "附件方式添加补丁"
9497
9498#: builtin/log.c:1470
9499msgid "inline the patch"
9500msgstr "内联显示补丁"
9501
9502#: builtin/log.c:1474
9503msgid "enable message threading, styles: shallow, deep"
9504msgstr "启用邮件线索,风格:浅,深"
9505
9506#: builtin/log.c:1476
9507msgid "signature"
9508msgstr "签名"
9509
9510#: builtin/log.c:1477
9511msgid "add a signature"
9512msgstr "添加一个签名"
9513
9514#: builtin/log.c:1478
9515msgid "base-commit"
9516msgstr "基线提交"
9517
9518#: builtin/log.c:1479
9519msgid "add prerequisite tree info to the patch series"
9520msgstr "为补丁列表添加前置树信息"
9521
9522#: builtin/log.c:1481
9523msgid "add a signature from a file"
9524msgstr "从文件添加一个签名"
9525
9526#: builtin/log.c:1482
9527msgid "don't print the patch filenames"
9528msgstr "不要打印补丁文件名"
9529
9530#: builtin/log.c:1572
9531msgid "-n and -k are mutually exclusive."
9532msgstr "-n 和 -k 互斥。"
9533
9534#: builtin/log.c:1574
9535msgid "--subject-prefix/--rfc and -k are mutually exclusive."
9536msgstr "--subject-prefix/--rfc 和 -k 互斥。"
9537
9538#: builtin/log.c:1582
9539msgid "--name-only does not make sense"
9540msgstr "--name-only 无意义"
9541
9542#: builtin/log.c:1584
9543msgid "--name-status does not make sense"
9544msgstr "--name-status 无意义"
9545
9546#: builtin/log.c:1586
9547msgid "--check does not make sense"
9548msgstr "--check 无意义"
9549
9550#: builtin/log.c:1616
9551msgid "standard output, or directory, which one?"
9552msgstr "标准输出或目录,哪一个?"
9553
9554#: builtin/log.c:1618
9555#, c-format
9556msgid "Could not create directory '%s'"
9557msgstr "不能创建目录 '%s'"
9558
9559#: builtin/log.c:1712
9560#, c-format
9561msgid "unable to read signature file '%s'"
9562msgstr "无法读取签名文件 '%s'"
9563
9564#: builtin/log.c:1784
9565msgid "Failed to create output files"
9566msgstr "无法创建输出文件"
9567
9568#: builtin/log.c:1833
9569msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
9570msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
9571
9572#: builtin/log.c:1887
9573#, c-format
9574msgid ""
9575"Could not find a tracked remote branch, please specify <upstream> manually.\n"
9576msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
9577
9578#: builtin/ls-files.c:461
9579msgid "git ls-files [<options>] [<file>...]"
9580msgstr "git ls-files [<选项>] [<文件>...]"
9581
9582#: builtin/ls-files.c:510
9583msgid "identify the file status with tags"
9584msgstr "用标签标识文件的状态"
9585
9586#: builtin/ls-files.c:512
9587msgid "use lowercase letters for 'assume unchanged' files"
9588msgstr "使用小写字母表示 '假设未改变的' 文件"
9589
9590#: builtin/ls-files.c:514
9591msgid "show cached files in the output (default)"
9592msgstr "显示缓存的文件(默认)"
9593
9594#: builtin/ls-files.c:516
9595msgid "show deleted files in the output"
9596msgstr "显示已删除的文件"
9597
9598#: builtin/ls-files.c:518
9599msgid "show modified files in the output"
9600msgstr "显示已修改的文件"
9601
9602#: builtin/ls-files.c:520
9603msgid "show other files in the output"
9604msgstr "显示其它文件"
9605
9606#: builtin/ls-files.c:522
9607msgid "show ignored files in the output"
9608msgstr "显示忽略的文件"
9609
9610#: builtin/ls-files.c:525
9611msgid "show staged contents' object name in the output"
9612msgstr "显示暂存区内容的对象名称"
9613
9614#: builtin/ls-files.c:527
9615msgid "show files on the filesystem that need to be removed"
9616msgstr "显示文件系统需要删除的文件"
9617
9618#: builtin/ls-files.c:529
9619msgid "show 'other' directories' names only"
9620msgstr "只显示“其他”目录的名称"
9621
9622#: builtin/ls-files.c:531
9623msgid "show line endings of files"
9624msgstr "显示文件换行符格式"
9625
9626#: builtin/ls-files.c:533
9627msgid "don't show empty directories"
9628msgstr "不显示空目录"
9629
9630#: builtin/ls-files.c:536
9631msgid "show unmerged files in the output"
9632msgstr "显示未合并的文件"
9633
9634#: builtin/ls-files.c:538
9635msgid "show resolve-undo information"
9636msgstr "显示 resolve-undo 信息"
9637
9638#: builtin/ls-files.c:540
9639msgid "skip files matching pattern"
9640msgstr "匹配排除文件的模式"
9641
9642#: builtin/ls-files.c:543
9643msgid "exclude patterns are read from <file>"
9644msgstr "从 <文件> 中读取排除模式"
9645
9646#: builtin/ls-files.c:546
9647msgid "read additional per-directory exclude patterns in <file>"
9648msgstr "从 <文件> 读取额外的每个目录的排除模式"
9649
9650#: builtin/ls-files.c:548
9651msgid "add the standard git exclusions"
9652msgstr "添加标准的 git 排除"
9653
9654#: builtin/ls-files.c:551
9655msgid "make the output relative to the project top directory"
9656msgstr "显示相对于顶级目录的文件名"
9657
9658#: builtin/ls-files.c:554
9659msgid "recurse through submodules"
9660msgstr "在子模组中递归"
9661
9662#: builtin/ls-files.c:556
9663msgid "if any <file> is not in the index, treat this as an error"
9664msgstr "如果任何 <文件> 都不在索引区,视为错误"
9665
9666#: builtin/ls-files.c:557
9667msgid "tree-ish"
9668msgstr "树或提交"
9669
9670#: builtin/ls-files.c:558
9671msgid "pretend that paths removed since <tree-ish> are still present"
9672msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
9673
9674#: builtin/ls-files.c:560
9675msgid "show debugging data"
9676msgstr "显示调试数据"
9677
9678#: builtin/ls-remote.c:7
9679msgid ""
9680"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9681"                     [-q | --quiet] [--exit-code] [--get-url]\n"
9682"                     [--symref] [<repository> [<refs>...]]"
9683msgstr ""
9684"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9685"                     [-q | --quiet] [--exit-code] [--get-url]\n"
9686"                     [--symref] [<仓库> [<引用>...]]"
9687
9688#: builtin/ls-remote.c:52
9689msgid "do not print remote URL"
9690msgstr "不打印远程 URL"
9691
9692#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
9693msgid "exec"
9694msgstr "exec"
9695
9696#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
9697msgid "path of git-upload-pack on the remote host"
9698msgstr "远程主机上的 git-upload-pack 路径"
9699
9700#: builtin/ls-remote.c:58
9701msgid "limit to tags"
9702msgstr "仅限于标签"
9703
9704#: builtin/ls-remote.c:59
9705msgid "limit to heads"
9706msgstr "仅限于分支"
9707
9708#: builtin/ls-remote.c:60
9709msgid "do not show peeled tags"
9710msgstr "不显示已解析的标签"
9711
9712#: builtin/ls-remote.c:62
9713msgid "take url.<base>.insteadOf into account"
9714msgstr "参考 url.<base>.insteadOf 设置"
9715
9716#: builtin/ls-remote.c:64
9717msgid "exit with exit code 2 if no matching refs are found"
9718msgstr "若未找到匹配的引用则以退出码2退出"
9719
9720#: builtin/ls-remote.c:66
9721msgid "show underlying ref in addition to the object pointed by it"
9722msgstr "除了显示指向的对象外,显示指向的引用名"
9723
9724#: builtin/ls-tree.c:28
9725msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9726msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
9727
9728#: builtin/ls-tree.c:126
9729msgid "only show trees"
9730msgstr "只显示树"
9731
9732#: builtin/ls-tree.c:128
9733msgid "recurse into subtrees"
9734msgstr "递归到子树"
9735
9736#: builtin/ls-tree.c:130
9737msgid "show trees when recursing"
9738msgstr "当递归时显示树"
9739
9740#: builtin/ls-tree.c:133
9741msgid "terminate entries with NUL byte"
9742msgstr "条目以 NUL 字符终止"
9743
9744#: builtin/ls-tree.c:134
9745msgid "include object size"
9746msgstr "包括对象大小"
9747
9748#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
9749msgid "list only filenames"
9750msgstr "只列出文件名"
9751
9752#: builtin/ls-tree.c:141
9753msgid "use full path names"
9754msgstr "使用文件的全路径"
9755
9756#: builtin/ls-tree.c:143
9757msgid "list entire tree; not just current directory (implies --full-name)"
9758msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
9759
9760#: builtin/merge.c:46
9761msgid "git merge [<options>] [<commit>...]"
9762msgstr "git merge [<选项>] [<提交>...]"
9763
9764#: builtin/merge.c:47
9765msgid "git merge --abort"
9766msgstr "git merge --abort"
9767
9768#: builtin/merge.c:48
9769msgid "git merge --continue"
9770msgstr "git merge --continue"
9771
9772#: builtin/merge.c:103
9773msgid "switch `m' requires a value"
9774msgstr "开关 `m' 需要一个值"
9775
9776#: builtin/merge.c:140
9777#, c-format
9778msgid "Could not find merge strategy '%s'.\n"
9779msgstr "不能找到合并策略 '%s'。\n"
9780
9781#: builtin/merge.c:141
9782#, c-format
9783msgid "Available strategies are:"
9784msgstr "可用的策略有:"
9785
9786#: builtin/merge.c:146
9787#, c-format
9788msgid "Available custom strategies are:"
9789msgstr "可用的自定义策略有:"
9790
9791#: builtin/merge.c:196 builtin/pull.c:127
9792msgid "do not show a diffstat at the end of the merge"
9793msgstr "在合并的最后不显示差异统计"
9794
9795#: builtin/merge.c:199 builtin/pull.c:130
9796msgid "show a diffstat at the end of the merge"
9797msgstr "在合并的最后显示差异统计"
9798
9799#: builtin/merge.c:200 builtin/pull.c:133
9800msgid "(synonym to --stat)"
9801msgstr "(和 --stat 同义)"
9802
9803#: builtin/merge.c:202 builtin/pull.c:136
9804msgid "add (at most <n>) entries from shortlog to merge commit message"
9805msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
9806
9807#: builtin/merge.c:205 builtin/pull.c:139
9808msgid "create a single commit instead of doing a merge"
9809msgstr "创建一个单独的提交而不是做一次合并"
9810
9811#: builtin/merge.c:207 builtin/pull.c:142
9812msgid "perform a commit if the merge succeeds (default)"
9813msgstr "如果合并成功,执行一次提交(默认)"
9814
9815#: builtin/merge.c:209 builtin/pull.c:145
9816msgid "edit message before committing"
9817msgstr "在提交前编辑提交说明"
9818
9819#: builtin/merge.c:210
9820msgid "allow fast-forward (default)"
9821msgstr "允许快进(默认)"
9822
9823#: builtin/merge.c:212 builtin/pull.c:151
9824msgid "abort if fast-forward is not possible"
9825msgstr "如果不能快进就放弃合并"
9826
9827#: builtin/merge.c:216 builtin/pull.c:154
9828msgid "verify that the named commit has a valid GPG signature"
9829msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9830
9831#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
9832#: builtin/revert.c:108
9833msgid "strategy"
9834msgstr "策略"
9835
9836#: builtin/merge.c:218 builtin/pull.c:159
9837msgid "merge strategy to use"
9838msgstr "要使用的合并策略"
9839
9840#: builtin/merge.c:219 builtin/pull.c:162
9841msgid "option=value"
9842msgstr "option=value"
9843
9844#: builtin/merge.c:220 builtin/pull.c:163
9845msgid "option for selected merge strategy"
9846msgstr "所选的合并策略的选项"
9847
9848#: builtin/merge.c:222
9849msgid "merge commit message (for a non-fast-forward merge)"
9850msgstr "合并的提交说明(针对非快进式合并)"
9851
9852#: builtin/merge.c:226
9853msgid "abort the current in-progress merge"
9854msgstr "放弃当前正在进行的合并"
9855
9856#: builtin/merge.c:228
9857msgid "continue the current in-progress merge"
9858msgstr "继续当前正在进行的合并"
9859
9860#: builtin/merge.c:230 builtin/pull.c:170
9861msgid "allow merging unrelated histories"
9862msgstr "允许合并不相关的历史"
9863
9864#: builtin/merge.c:258
9865msgid "could not run stash."
9866msgstr "不能进行进度保存。"
9867
9868#: builtin/merge.c:263
9869msgid "stash failed"
9870msgstr "进度保存失败"
9871
9872#: builtin/merge.c:268
9873#, c-format
9874msgid "not a valid object: %s"
9875msgstr "不是一个有效对象:%s"
9876
9877#: builtin/merge.c:287 builtin/merge.c:304
9878msgid "read-tree failed"
9879msgstr "读取树失败"
9880
9881#  译者:注意保持前导空格
9882#: builtin/merge.c:334
9883msgid " (nothing to squash)"
9884msgstr " (无可压缩)"
9885
9886#: builtin/merge.c:345
9887#, c-format
9888msgid "Squash commit -- not updating HEAD\n"
9889msgstr "压缩提交 -- 未更新 HEAD\n"
9890
9891#: builtin/merge.c:395
9892#, c-format
9893msgid "No merge message -- not updating HEAD\n"
9894msgstr "无合并信息 -- 未更新 HEAD\n"
9895
9896#: builtin/merge.c:446
9897#, c-format
9898msgid "'%s' does not point to a commit"
9899msgstr "'%s' 没有指向一个提交"
9900
9901#: builtin/merge.c:536
9902#, c-format
9903msgid "Bad branch.%s.mergeoptions string: %s"
9904msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
9905
9906#: builtin/merge.c:656
9907msgid "Not handling anything other than two heads merge."
9908msgstr "未处理两个头合并之外的任何操作。"
9909
9910#: builtin/merge.c:670
9911#, c-format
9912msgid "Unknown option for merge-recursive: -X%s"
9913msgstr "merge-recursive 的未知选项:-X%s"
9914
9915#: builtin/merge.c:685
9916#, c-format
9917msgid "unable to write %s"
9918msgstr "不能写 %s"
9919
9920#: builtin/merge.c:737
9921#, c-format
9922msgid "Could not read from '%s'"
9923msgstr "不能从 '%s' 读取"
9924
9925#: builtin/merge.c:746
9926#, c-format
9927msgid "Not committing merge; use 'git commit' to complete the merge.\n"
9928msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
9929
9930#: builtin/merge.c:752
9931#, c-format
9932msgid ""
9933"Please enter a commit message to explain why this merge is necessary,\n"
9934"especially if it merges an updated upstream into a topic branch.\n"
9935"\n"
9936"Lines starting with '%c' will be ignored, and an empty message aborts\n"
9937"the commit.\n"
9938msgstr ""
9939"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
9940"合并到主题分支。\n"
9941"\n"
9942"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
9943
9944#: builtin/merge.c:776
9945msgid "Empty commit message."
9946msgstr "空提交信息。"
9947
9948#: builtin/merge.c:796
9949#, c-format
9950msgid "Wonderful.\n"
9951msgstr "太棒了。\n"
9952
9953#: builtin/merge.c:851
9954#, c-format
9955msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
9956msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
9957
9958#: builtin/merge.c:890
9959msgid "No current branch."
9960msgstr "没有当前分支。"
9961
9962#: builtin/merge.c:892
9963msgid "No remote for the current branch."
9964msgstr "当前分支没有对应的远程仓库。"
9965
9966#: builtin/merge.c:894
9967msgid "No default upstream defined for the current branch."
9968msgstr "当前分支没有定义默认的上游分支。"
9969
9970#: builtin/merge.c:899
9971#, c-format
9972msgid "No remote-tracking branch for %s from %s"
9973msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
9974
9975#: builtin/merge.c:946
9976#, c-format
9977msgid "Bad value '%s' in environment '%s'"
9978msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
9979
9980#: builtin/merge.c:1020
9981#, c-format
9982msgid "could not close '%s'"
9983msgstr "不能关闭 '%s'"
9984
9985#: builtin/merge.c:1047
9986#, c-format
9987msgid "not something we can merge in %s: %s"
9988msgstr "不能在 %s 中合并:%s"
9989
9990#: builtin/merge.c:1081
9991msgid "not something we can merge"
9992msgstr "不能合并"
9993
9994#: builtin/merge.c:1146
9995msgid "--abort expects no arguments"
9996msgstr "--abort 不带参数"
9997
9998#: builtin/merge.c:1150
9999msgid "There is no merge to abort (MERGE_HEAD missing)."
10000msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
10001
10002#: builtin/merge.c:1162
10003msgid "--continue expects no arguments"
10004msgstr "--continue 不带参数"
10005
10006#: builtin/merge.c:1166
10007msgid "There is no merge in progress (MERGE_HEAD missing)."
10008msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
10009
10010#: builtin/merge.c:1182
10011msgid ""
10012"You have not concluded your merge (MERGE_HEAD exists).\n"
10013"Please, commit your changes before you merge."
10014msgstr ""
10015"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10016"请在合并前先提交您的修改。"
10017
10018#: builtin/merge.c:1189
10019msgid ""
10020"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
10021"Please, commit your changes before you merge."
10022msgstr ""
10023"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
10024"请在合并前先提交您的修改。"
10025
10026#: builtin/merge.c:1192
10027msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
10028msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
10029
10030#: builtin/merge.c:1201
10031msgid "You cannot combine --squash with --no-ff."
10032msgstr "您不能将 --squash 与 --no-ff 同时使用。"
10033
10034#: builtin/merge.c:1209
10035msgid "No commit specified and merge.defaultToUpstream not set."
10036msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
10037
10038#: builtin/merge.c:1226
10039msgid "Squash commit into empty head not supported yet"
10040msgstr "尚不支持到空分支的压缩提交"
10041
10042#: builtin/merge.c:1228
10043msgid "Non-fast-forward commit does not make sense into an empty head"
10044msgstr "到空分支的非快进式提交没有意义"
10045
10046#: builtin/merge.c:1233
10047#, c-format
10048msgid "%s - not something we can merge"
10049msgstr "%s - 不能被合并"
10050
10051#: builtin/merge.c:1235
10052msgid "Can merge only exactly one commit into empty head"
10053msgstr "只能将一个提交合并到空分支上"
10054
10055#: builtin/merge.c:1269
10056#, c-format
10057msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
10058msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
10059
10060#: builtin/merge.c:1272
10061#, c-format
10062msgid "Commit %s has a bad GPG signature allegedly by %s."
10063msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
10064
10065#: builtin/merge.c:1275
10066#, c-format
10067msgid "Commit %s does not have a GPG signature."
10068msgstr "提交 %s 没有一个 GPG 签名。"
10069
10070#: builtin/merge.c:1278
10071#, c-format
10072msgid "Commit %s has a good GPG signature by %s\n"
10073msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
10074
10075#: builtin/merge.c:1340
10076msgid "refusing to merge unrelated histories"
10077msgstr "拒绝合并无关的历史"
10078
10079#: builtin/merge.c:1349
10080msgid "Already up-to-date."
10081msgstr "已经是最新的。"
10082
10083#: builtin/merge.c:1359
10084#, c-format
10085msgid "Updating %s..%s\n"
10086msgstr "更新 %s..%s\n"
10087
10088#: builtin/merge.c:1400
10089#, c-format
10090msgid "Trying really trivial in-index merge...\n"
10091msgstr "尝试非常小的索引内合并...\n"
10092
10093#: builtin/merge.c:1407
10094#, c-format
10095msgid "Nope.\n"
10096msgstr "无。\n"
10097
10098#: builtin/merge.c:1432
10099msgid "Already up-to-date. Yeeah!"
10100msgstr "已经是最新的。耶!"
10101
10102#: builtin/merge.c:1438
10103msgid "Not possible to fast-forward, aborting."
10104msgstr "无法快进,终止。"
10105
10106#: builtin/merge.c:1461 builtin/merge.c:1540
10107#, c-format
10108msgid "Rewinding the tree to pristine...\n"
10109msgstr "将树回滚至原始状态...\n"
10110
10111#: builtin/merge.c:1465
10112#, c-format
10113msgid "Trying merge strategy %s...\n"
10114msgstr "尝试合并策略 %s...\n"
10115
10116#: builtin/merge.c:1531
10117#, c-format
10118msgid "No merge strategy handled the merge.\n"
10119msgstr "没有合并策略处理此合并。\n"
10120
10121#: builtin/merge.c:1533
10122#, c-format
10123msgid "Merge with strategy %s failed.\n"
10124msgstr "使用策略 %s 合并失败。\n"
10125
10126#: builtin/merge.c:1542
10127#, c-format
10128msgid "Using the %s to prepare resolving by hand.\n"
10129msgstr "使用 %s 以准备手工解决。\n"
10130
10131#: builtin/merge.c:1554
10132#, c-format
10133msgid "Automatic merge went well; stopped before committing as requested\n"
10134msgstr "自动合并进展顺利,按要求在提交前停止\n"
10135
10136#: builtin/merge-base.c:29
10137msgid "git merge-base [-a | --all] <commit> <commit>..."
10138msgstr "git merge-base [-a | --all] <提交> <提交>..."
10139
10140#: builtin/merge-base.c:30
10141msgid "git merge-base [-a | --all] --octopus <commit>..."
10142msgstr "git merge-base [-a | --all] --octopus <提交>..."
10143
10144#: builtin/merge-base.c:31
10145msgid "git merge-base --independent <commit>..."
10146msgstr "git merge-base --independent <提交>..."
10147
10148#: builtin/merge-base.c:32
10149msgid "git merge-base --is-ancestor <commit> <commit>"
10150msgstr "git merge-base --is-ancestor <提交> <提交>"
10151
10152#: builtin/merge-base.c:33
10153msgid "git merge-base --fork-point <ref> [<commit>]"
10154msgstr "git merge-base --fork-point <引用> [<提交>]"
10155
10156#: builtin/merge-base.c:217
10157msgid "output all common ancestors"
10158msgstr "输出所有共同的祖先"
10159
10160#: builtin/merge-base.c:219
10161msgid "find ancestors for a single n-way merge"
10162msgstr "查找一个多路合并的祖先提交"
10163
10164#: builtin/merge-base.c:221
10165msgid "list revs not reachable from others"
10166msgstr "显示不能被其他访问到的版本"
10167
10168#: builtin/merge-base.c:223
10169msgid "is the first one ancestor of the other?"
10170msgstr "第一个是其他的祖先提交么?"
10171
10172#: builtin/merge-base.c:225
10173msgid "find where <commit> forked from reflog of <ref>"
10174msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
10175
10176#: builtin/merge-file.c:8
10177msgid ""
10178"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
10179"<orig-file> <file2>"
10180msgstr ""
10181"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
10182"件> <文件2>"
10183
10184#: builtin/merge-file.c:32
10185msgid "send results to standard output"
10186msgstr "将结果发送到标准输出"
10187
10188#: builtin/merge-file.c:33
10189msgid "use a diff3 based merge"
10190msgstr "使用基于 diff3 的合并"
10191
10192#: builtin/merge-file.c:34
10193msgid "for conflicts, use our version"
10194msgstr "如果冲突,使用我们的版本"
10195
10196#: builtin/merge-file.c:36
10197msgid "for conflicts, use their version"
10198msgstr "如果冲突,使用他们的版本"
10199
10200#: builtin/merge-file.c:38
10201msgid "for conflicts, use a union version"
10202msgstr "如果冲突,使用联合版本"
10203
10204#: builtin/merge-file.c:41
10205msgid "for conflicts, use this marker size"
10206msgstr "如果冲突,使用指定长度的标记"
10207
10208#: builtin/merge-file.c:42
10209msgid "do not warn about conflicts"
10210msgstr "不要警告冲突"
10211
10212#: builtin/merge-file.c:44
10213msgid "set labels for file1/orig-file/file2"
10214msgstr "为 文件1/初始文件/文件2 设置标签"
10215
10216#: builtin/merge-recursive.c:45
10217#, c-format
10218msgid "unknown option %s"
10219msgstr "未知选项 %s"
10220
10221#: builtin/merge-recursive.c:51
10222#, c-format
10223msgid "could not parse object '%s'"
10224msgstr "不能解析对象 '%s'"
10225
10226#: builtin/merge-recursive.c:55
10227#, c-format
10228msgid "cannot handle more than %d base. Ignoring %s."
10229msgid_plural "cannot handle more than %d bases. Ignoring %s."
10230msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
10231msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
10232
10233#: builtin/merge-recursive.c:63
10234msgid "not handling anything other than two heads merge."
10235msgstr "不能处理两个头合并之外的任何操作。"
10236
10237#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
10238#, c-format
10239msgid "could not resolve ref '%s'"
10240msgstr "无法解析引用 '%s'"
10241
10242#: builtin/merge-recursive.c:77
10243#, c-format
10244msgid "Merging %s with %s\n"
10245msgstr "合并 %s 和 %s\n"
10246
10247#: builtin/mktree.c:65
10248msgid "git mktree [-z] [--missing] [--batch]"
10249msgstr "git mktree [-z] [--missing] [--batch]"
10250
10251#: builtin/mktree.c:152
10252msgid "input is NUL terminated"
10253msgstr "输入以 NUL 字符终止"
10254
10255#: builtin/mktree.c:153 builtin/write-tree.c:24
10256msgid "allow missing objects"
10257msgstr "允许丢失的对象"
10258
10259#: builtin/mktree.c:154
10260msgid "allow creation of more than one tree"
10261msgstr "允许创建一个以上的树"
10262
10263#: builtin/mv.c:16
10264msgid "git mv [<options>] <source>... <destination>"
10265msgstr "git mv [<选项>] <源>... <目标>"
10266
10267#: builtin/mv.c:82
10268#, c-format
10269msgid "Directory %s is in index and no submodule?"
10270msgstr "目录 %s 在索引中并且不是子模组?"
10271
10272#: builtin/mv.c:84 builtin/rm.c:290
10273msgid "Please stage your changes to .gitmodules or stash them to proceed"
10274msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
10275
10276#: builtin/mv.c:102
10277#, c-format
10278msgid "%.*s is in index"
10279msgstr "%.*s 在索引中"
10280
10281#: builtin/mv.c:124
10282msgid "force move/rename even if target exists"
10283msgstr "强制移动/重命令,即使目标存在"
10284
10285#: builtin/mv.c:125
10286msgid "skip move/rename errors"
10287msgstr "跳过移动/重命名错误"
10288
10289#: builtin/mv.c:167
10290#, c-format
10291msgid "destination '%s' is not a directory"
10292msgstr "目标 '%s' 不是一个目录"
10293
10294#: builtin/mv.c:178
10295#, c-format
10296msgid "Checking rename of '%s' to '%s'\n"
10297msgstr "检查 '%s' 到 '%s' 的重命名\n"
10298
10299#: builtin/mv.c:182
10300msgid "bad source"
10301msgstr "坏的源"
10302
10303#: builtin/mv.c:185
10304msgid "can not move directory into itself"
10305msgstr "不能将目录移动到自身"
10306
10307#: builtin/mv.c:188
10308msgid "cannot move directory over file"
10309msgstr "不能将目录移动到文件"
10310
10311#: builtin/mv.c:197
10312msgid "source directory is empty"
10313msgstr "源目录为空"
10314
10315#: builtin/mv.c:222
10316msgid "not under version control"
10317msgstr "不在版本控制之下"
10318
10319#: builtin/mv.c:225
10320msgid "destination exists"
10321msgstr "目标已存在"
10322
10323#: builtin/mv.c:233
10324#, c-format
10325msgid "overwriting '%s'"
10326msgstr "覆盖 '%s'"
10327
10328#: builtin/mv.c:236
10329msgid "Cannot overwrite"
10330msgstr "不能覆盖"
10331
10332#: builtin/mv.c:239
10333msgid "multiple sources for the same target"
10334msgstr "同一目标具有多个源"
10335
10336#: builtin/mv.c:241
10337msgid "destination directory does not exist"
10338msgstr "目标目录不存在"
10339
10340#: builtin/mv.c:248
10341#, c-format
10342msgid "%s, source=%s, destination=%s"
10343msgstr "%s,源=%s,目标=%s"
10344
10345#: builtin/mv.c:269
10346#, c-format
10347msgid "Renaming %s to %s\n"
10348msgstr "重命名 %s 至 %s\n"
10349
10350#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
10351#, c-format
10352msgid "renaming '%s' failed"
10353msgstr "重命名 '%s' 失败"
10354
10355#: builtin/name-rev.c:289
10356msgid "git name-rev [<options>] <commit>..."
10357msgstr "git name-rev [<选项>] <提交>..."
10358
10359#: builtin/name-rev.c:290
10360msgid "git name-rev [<options>] --all"
10361msgstr "git name-rev [<选项>] --all"
10362
10363#: builtin/name-rev.c:291
10364msgid "git name-rev [<options>] --stdin"
10365msgstr "git name-rev [<选项>] --stdin"
10366
10367#: builtin/name-rev.c:346
10368msgid "print only names (no SHA-1)"
10369msgstr "只打印名称(无 SHA-1)"
10370
10371#: builtin/name-rev.c:347
10372msgid "only use tags to name the commits"
10373msgstr "只使用标签来命名提交"
10374
10375#: builtin/name-rev.c:349
10376msgid "only use refs matching <pattern>"
10377msgstr "只使用和 <模式> 相匹配的引用"
10378
10379#: builtin/name-rev.c:351
10380msgid "ignore refs matching <pattern>"
10381msgstr "忽略和 <模式> 相匹配的引用"
10382
10383#: builtin/name-rev.c:353
10384msgid "list all commits reachable from all refs"
10385msgstr "列出可以从所有引用访问的提交"
10386
10387#: builtin/name-rev.c:354
10388msgid "read from stdin"
10389msgstr "从标准输入读取"
10390
10391#: builtin/name-rev.c:355
10392msgid "allow to print `undefined` names (default)"
10393msgstr "允许打印 `未定义` 的名称(默认)"
10394
10395#: builtin/name-rev.c:361
10396msgid "dereference tags in the input (internal use)"
10397msgstr "反向解析输入中的标签(内部使用)"
10398
10399#: builtin/notes.c:25
10400msgid "git notes [--ref <notes-ref>] [list [<object>]]"
10401msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
10402
10403#: builtin/notes.c:26
10404msgid ""
10405"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
10406"| (-c | -C) <object>] [<object>]"
10407msgstr ""
10408"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
10409"| (-c | -C) <对象>] [<对象>]"
10410
10411#: builtin/notes.c:27
10412msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
10413msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
10414
10415#: builtin/notes.c:28
10416msgid ""
10417"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
10418"(-c | -C) <object>] [<object>]"
10419msgstr ""
10420"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
10421"(-c | -C) <对象>] [<对象>]"
10422
10423#: builtin/notes.c:29
10424msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
10425msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
10426
10427#: builtin/notes.c:30
10428msgid "git notes [--ref <notes-ref>] show [<object>]"
10429msgstr "git notes [--ref <注解引用>] show [<对象>]"
10430
10431#: builtin/notes.c:31
10432msgid ""
10433"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
10434msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
10435
10436#: builtin/notes.c:32
10437msgid "git notes merge --commit [-v | -q]"
10438msgstr "git notes merge --commit [-v | -q]"
10439
10440#: builtin/notes.c:33
10441msgid "git notes merge --abort [-v | -q]"
10442msgstr "git notes merge --abort [-v | -q]"
10443
10444#: builtin/notes.c:34
10445msgid "git notes [--ref <notes-ref>] remove [<object>...]"
10446msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
10447
10448#: builtin/notes.c:35
10449msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
10450msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
10451
10452#: builtin/notes.c:36
10453msgid "git notes [--ref <notes-ref>] get-ref"
10454msgstr "git notes [--ref <注解引用>] get-ref"
10455
10456#: builtin/notes.c:41
10457msgid "git notes [list [<object>]]"
10458msgstr "git notes [list [<对象>]]"
10459
10460#: builtin/notes.c:46
10461msgid "git notes add [<options>] [<object>]"
10462msgstr "git notes add [<选项>] [<对象>]"
10463
10464#: builtin/notes.c:51
10465msgid "git notes copy [<options>] <from-object> <to-object>"
10466msgstr "git notes copy [<选项>] <源对象> <目标对象>"
10467
10468#: builtin/notes.c:52
10469msgid "git notes copy --stdin [<from-object> <to-object>]..."
10470msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
10471
10472#: builtin/notes.c:57
10473msgid "git notes append [<options>] [<object>]"
10474msgstr "git notes append [<选项>] [<对象>]"
10475
10476#: builtin/notes.c:62
10477msgid "git notes edit [<object>]"
10478msgstr "git notes edit [<对象>]"
10479
10480#: builtin/notes.c:67
10481msgid "git notes show [<object>]"
10482msgstr "git notes show [<对象>]"
10483
10484#: builtin/notes.c:72
10485msgid "git notes merge [<options>] <notes-ref>"
10486msgstr "git notes merge [<选项>] <注解引用>"
10487
10488#: builtin/notes.c:73
10489msgid "git notes merge --commit [<options>]"
10490msgstr "git notes merge --commit [<选项>]"
10491
10492#: builtin/notes.c:74
10493msgid "git notes merge --abort [<options>]"
10494msgstr "git notes merge --abort [<选项>]"
10495
10496#: builtin/notes.c:79
10497msgid "git notes remove [<object>]"
10498msgstr "git notes remove [<对象>]"
10499
10500#: builtin/notes.c:84
10501msgid "git notes prune [<options>]"
10502msgstr "git notes prune [<选项>]"
10503
10504#: builtin/notes.c:89
10505msgid "git notes get-ref"
10506msgstr "git notes get-ref"
10507
10508#: builtin/notes.c:94
10509msgid "Write/edit the notes for the following object:"
10510msgstr "为下面的对象写/编辑说明:"
10511
10512#: builtin/notes.c:147
10513#, c-format
10514msgid "unable to start 'show' for object '%s'"
10515msgstr "不能为对象 '%s' 开始 'show'"
10516
10517#: builtin/notes.c:151
10518msgid "could not read 'show' output"
10519msgstr "不能读取 'show' 的输出"
10520
10521#: builtin/notes.c:159
10522#, c-format
10523msgid "failed to finish 'show' for object '%s'"
10524msgstr "无法为对象 '%s' 完成 'show'"
10525
10526#: builtin/notes.c:194
10527msgid "please supply the note contents using either -m or -F option"
10528msgstr "请通过 -m 或 -F 选项为注解提供内容"
10529
10530#: builtin/notes.c:203
10531msgid "unable to write note object"
10532msgstr "不能写注解对象"
10533
10534#: builtin/notes.c:205
10535#, c-format
10536msgid "the note contents have been left in %s"
10537msgstr "注解内容被留在 %s 中"
10538
10539#: builtin/notes.c:233 builtin/tag.c:516
10540#, c-format
10541msgid "cannot read '%s'"
10542msgstr "不能读取 '%s'"
10543
10544#: builtin/notes.c:235 builtin/tag.c:519
10545#, c-format
10546msgid "could not open or read '%s'"
10547msgstr "不能打开或读取 '%s'"
10548
10549#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
10550#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
10551#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
10552#, c-format
10553msgid "failed to resolve '%s' as a valid ref."
10554msgstr "无法解析 '%s' 为一个有效引用。"
10555
10556#: builtin/notes.c:257
10557#, c-format
10558msgid "failed to read object '%s'."
10559msgstr "无法读取对象 '%s'。"
10560
10561#: builtin/notes.c:261
10562#, c-format
10563msgid "cannot read note data from non-blob object '%s'."
10564msgstr "不能从非数据对象 '%s' 中读取注解数据。"
10565
10566#: builtin/notes.c:301
10567#, c-format
10568msgid "malformed input line: '%s'."
10569msgstr "非法的输入行:'%s'。"
10570
10571#: builtin/notes.c:316
10572#, c-format
10573msgid "failed to copy notes from '%s' to '%s'"
10574msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
10575
10576#. TRANSLATORS: the first %s will be replaced by a
10577#. git notes command: 'add', 'merge', 'remove', etc.
10578#: builtin/notes.c:345
10579#, c-format
10580msgid "refusing to %s notes in %s (outside of refs/notes/)"
10581msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
10582
10583#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
10584#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
10585#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
10586msgid "too many parameters"
10587msgstr "参数太多"
10588
10589#: builtin/notes.c:378 builtin/notes.c:664
10590#, c-format
10591msgid "no note found for object %s."
10592msgstr "未发现对象 %s 的注解。"
10593
10594#: builtin/notes.c:399 builtin/notes.c:562
10595msgid "note contents as a string"
10596msgstr "注解内容作为一个字符串"
10597
10598#: builtin/notes.c:402 builtin/notes.c:565
10599msgid "note contents in a file"
10600msgstr "注解内容到一个文件中"
10601
10602#: builtin/notes.c:405 builtin/notes.c:568
10603msgid "reuse and edit specified note object"
10604msgstr "重用和编辑指定的注解对象"
10605
10606#: builtin/notes.c:408 builtin/notes.c:571
10607msgid "reuse specified note object"
10608msgstr "重用指定的注解对象"
10609
10610#: builtin/notes.c:411 builtin/notes.c:574
10611msgid "allow storing empty note"
10612msgstr "允许保存空白注释"
10613
10614#: builtin/notes.c:412 builtin/notes.c:483
10615msgid "replace existing notes"
10616msgstr "替换已存在的注解"
10617
10618#: builtin/notes.c:437
10619#, c-format
10620msgid ""
10621"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
10622"existing notes"
10623msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10624
10625#: builtin/notes.c:452 builtin/notes.c:531
10626#, c-format
10627msgid "Overwriting existing notes for object %s\n"
10628msgstr "覆盖对象 %s 现存注解\n"
10629
10630#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
10631#, c-format
10632msgid "Removing note for object %s\n"
10633msgstr "删除对象 %s 的注解\n"
10634
10635#: builtin/notes.c:484
10636msgid "read objects from stdin"
10637msgstr "从标准输入读取对象"
10638
10639#: builtin/notes.c:486
10640msgid "load rewriting config for <command> (implies --stdin)"
10641msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
10642
10643#: builtin/notes.c:504
10644msgid "too few parameters"
10645msgstr "参数太少"
10646
10647#: builtin/notes.c:525
10648#, c-format
10649msgid ""
10650"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
10651"existing notes"
10652msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10653
10654#: builtin/notes.c:537
10655#, c-format
10656msgid "missing notes on source object %s. Cannot copy."
10657msgstr "源对象 %s 缺少注解。不能拷贝。"
10658
10659#: builtin/notes.c:589
10660#, c-format
10661msgid ""
10662"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
10663"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
10664msgstr ""
10665"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
10666"请换用 'git notes add -f -m/-F/-c/-C'。\n"
10667
10668#: builtin/notes.c:684
10669msgid "failed to delete ref NOTES_MERGE_PARTIAL"
10670msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
10671
10672#: builtin/notes.c:686
10673msgid "failed to delete ref NOTES_MERGE_REF"
10674msgstr "无法删除引用 NOTES_MERGE_REF"
10675
10676#: builtin/notes.c:688
10677msgid "failed to remove 'git notes merge' worktree"
10678msgstr "无法删除 'git notes merge' 工作区"
10679
10680#: builtin/notes.c:708
10681msgid "failed to read ref NOTES_MERGE_PARTIAL"
10682msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10683
10684#: builtin/notes.c:710
10685msgid "could not find commit from NOTES_MERGE_PARTIAL."
10686msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10687
10688#: builtin/notes.c:712
10689msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10690msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10691
10692#: builtin/notes.c:725
10693msgid "failed to resolve NOTES_MERGE_REF"
10694msgstr "无法解析 NOTES_MERGE_REF"
10695
10696#: builtin/notes.c:728
10697msgid "failed to finalize notes merge"
10698msgstr "无法完成注解合并"
10699
10700#: builtin/notes.c:754
10701#, c-format
10702msgid "unknown notes merge strategy %s"
10703msgstr "未知的注解合并策略 %s"
10704
10705#: builtin/notes.c:770
10706msgid "General options"
10707msgstr "通用选项"
10708
10709#: builtin/notes.c:772
10710msgid "Merge options"
10711msgstr "合并选项"
10712
10713#: builtin/notes.c:774
10714msgid ""
10715"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10716"cat_sort_uniq)"
10717msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
10718
10719#: builtin/notes.c:776
10720msgid "Committing unmerged notes"
10721msgstr "提交未合并的注解"
10722
10723#: builtin/notes.c:778
10724msgid "finalize notes merge by committing unmerged notes"
10725msgstr "通过提交未合并的注解来完成注解合并"
10726
10727#: builtin/notes.c:780
10728msgid "Aborting notes merge resolution"
10729msgstr "中止注解合并的方案"
10730
10731#: builtin/notes.c:782
10732msgid "abort notes merge"
10733msgstr "中止注解合并"
10734
10735#: builtin/notes.c:793
10736msgid "cannot mix --commit, --abort or -s/--strategy"
10737msgstr "不能混用 --commit、--abort 或 -s/--strategy"
10738
10739#: builtin/notes.c:798
10740msgid "must specify a notes ref to merge"
10741msgstr "必须指定一个注解引用来合并"
10742
10743#: builtin/notes.c:822
10744#, c-format
10745msgid "unknown -s/--strategy: %s"
10746msgstr "未知的 -s/--strategy:%s"
10747
10748#: builtin/notes.c:859
10749#, c-format
10750msgid "a notes merge into %s is already in-progress at %s"
10751msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
10752
10753#: builtin/notes.c:862
10754#, c-format
10755msgid "failed to store link to current notes ref (%s)"
10756msgstr "无法存储链接到当前的注解引用(%s)"
10757
10758#: builtin/notes.c:864
10759#, c-format
10760msgid ""
10761"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
10762"'git notes merge --commit', or abort the merge with 'git notes merge --"
10763"abort'.\n"
10764msgstr ""
10765"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
10766"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
10767
10768#: builtin/notes.c:886
10769#, c-format
10770msgid "Object %s has no note\n"
10771msgstr "对象 %s 没有注解\n"
10772
10773#: builtin/notes.c:898
10774msgid "attempt to remove non-existent note is not an error"
10775msgstr "尝试删除不存在的注解不是一个错误"
10776
10777#: builtin/notes.c:901
10778msgid "read object names from the standard input"
10779msgstr "从标准输入读取对象名称"
10780
10781#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
10782msgid "do not remove, show only"
10783msgstr "不删除,只显示"
10784
10785#: builtin/notes.c:940
10786msgid "report pruned notes"
10787msgstr "报告清除的注解"
10788
10789#: builtin/notes.c:982
10790msgid "notes-ref"
10791msgstr "注解引用"
10792
10793#: builtin/notes.c:983
10794msgid "use notes from <notes-ref>"
10795msgstr "从 <注解引用> 使用注解"
10796
10797#: builtin/notes.c:1018
10798#, c-format
10799msgid "unknown subcommand: %s"
10800msgstr "未知子命令:%s"
10801
10802#: builtin/pack-objects.c:29
10803msgid ""
10804"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
10805msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
10806
10807#: builtin/pack-objects.c:30
10808msgid ""
10809"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
10810msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
10811
10812#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
10813#, c-format
10814msgid "deflate error (%d)"
10815msgstr "压缩错误 (%d)"
10816
10817#: builtin/pack-objects.c:770
10818msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
10819msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
10820
10821#: builtin/pack-objects.c:783
10822msgid "Writing objects"
10823msgstr "写入对象中"
10824
10825#: builtin/pack-objects.c:1063
10826msgid "disabling bitmap writing, as some objects are not being packed"
10827msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
10828
10829#: builtin/pack-objects.c:2426
10830msgid "Compressing objects"
10831msgstr "压缩对象中"
10832
10833#: builtin/pack-objects.c:2829
10834#, c-format
10835msgid "unsupported index version %s"
10836msgstr "不支持的索引版本 %s"
10837
10838#: builtin/pack-objects.c:2833
10839#, c-format
10840msgid "bad index version '%s'"
10841msgstr "坏的索引版本 '%s'"
10842
10843#: builtin/pack-objects.c:2863
10844msgid "do not show progress meter"
10845msgstr "不显示进度表"
10846
10847#: builtin/pack-objects.c:2865
10848msgid "show progress meter"
10849msgstr "显示进度表"
10850
10851#: builtin/pack-objects.c:2867
10852msgid "show progress meter during object writing phase"
10853msgstr "在对象写入阶段显示进度表"
10854
10855#: builtin/pack-objects.c:2870
10856msgid "similar to --all-progress when progress meter is shown"
10857msgstr "当进度表显示时类似于 --all-progress"
10858
10859#: builtin/pack-objects.c:2871
10860msgid "version[,offset]"
10861msgstr "版本[,偏移]"
10862
10863#: builtin/pack-objects.c:2872
10864msgid "write the pack index file in the specified idx format version"
10865msgstr "用指定的 idx 格式版本来写包索引文件"
10866
10867#: builtin/pack-objects.c:2875
10868msgid "maximum size of each output pack file"
10869msgstr "每个输出包的最大尺寸"
10870
10871#: builtin/pack-objects.c:2877
10872msgid "ignore borrowed objects from alternate object store"
10873msgstr "忽略从备用对象存储里借用对象"
10874
10875#: builtin/pack-objects.c:2879
10876msgid "ignore packed objects"
10877msgstr "忽略包对象"
10878
10879#: builtin/pack-objects.c:2881
10880msgid "limit pack window by objects"
10881msgstr "限制打包窗口的对象数"
10882
10883#: builtin/pack-objects.c:2883
10884msgid "limit pack window by memory in addition to object limit"
10885msgstr "除对象数量限制外设置打包窗口的内存限制"
10886
10887#: builtin/pack-objects.c:2885
10888msgid "maximum length of delta chain allowed in the resulting pack"
10889msgstr "打包允许的 delta 链的最大长度"
10890
10891#: builtin/pack-objects.c:2887
10892msgid "reuse existing deltas"
10893msgstr "重用已存在的 deltas"
10894
10895#: builtin/pack-objects.c:2889
10896msgid "reuse existing objects"
10897msgstr "重用已存在的对象"
10898
10899#: builtin/pack-objects.c:2891
10900msgid "use OFS_DELTA objects"
10901msgstr "使用 OFS_DELTA 对象"
10902
10903#: builtin/pack-objects.c:2893
10904msgid "use threads when searching for best delta matches"
10905msgstr "使用线程查询最佳 delta 匹配"
10906
10907#: builtin/pack-objects.c:2895
10908msgid "do not create an empty pack output"
10909msgstr "不创建空的包输出"
10910
10911#: builtin/pack-objects.c:2897
10912msgid "read revision arguments from standard input"
10913msgstr "从标准输入读取版本号参数"
10914
10915#: builtin/pack-objects.c:2899
10916msgid "limit the objects to those that are not yet packed"
10917msgstr "限制那些尚未打包的对象"
10918
10919#: builtin/pack-objects.c:2902
10920msgid "include objects reachable from any reference"
10921msgstr "包括可以从任何引用访问到的对象"
10922
10923#: builtin/pack-objects.c:2905
10924msgid "include objects referred by reflog entries"
10925msgstr "包括被引用日志引用到的对象"
10926
10927#: builtin/pack-objects.c:2908
10928msgid "include objects referred to by the index"
10929msgstr "包括被索引引用到的对象"
10930
10931#: builtin/pack-objects.c:2911
10932msgid "output pack to stdout"
10933msgstr "输出包到标准输出"
10934
10935#: builtin/pack-objects.c:2913
10936msgid "include tag objects that refer to objects to be packed"
10937msgstr "包括那些引用了待打包对象的标签对象"
10938
10939#: builtin/pack-objects.c:2915
10940msgid "keep unreachable objects"
10941msgstr "维持不可达的对象"
10942
10943#: builtin/pack-objects.c:2917
10944msgid "pack loose unreachable objects"
10945msgstr "打包松散的不可达对象"
10946
10947#: builtin/pack-objects.c:2919
10948msgid "unpack unreachable objects newer than <time>"
10949msgstr "将比给定 <时间> 新的无法访问的对象解包"
10950
10951#: builtin/pack-objects.c:2922
10952msgid "create thin packs"
10953msgstr "创建精简包"
10954
10955#: builtin/pack-objects.c:2924
10956msgid "create packs suitable for shallow fetches"
10957msgstr "创建适合浅克隆仓库获取的包"
10958
10959#: builtin/pack-objects.c:2926
10960msgid "ignore packs that have companion .keep file"
10961msgstr "忽略配有 .keep 文件的包"
10962
10963#: builtin/pack-objects.c:2928
10964msgid "pack compression level"
10965msgstr "打包压缩级别"
10966
10967#: builtin/pack-objects.c:2930
10968msgid "do not hide commits by grafts"
10969msgstr "显示被嫁接隐藏的提交"
10970
10971#: builtin/pack-objects.c:2932
10972msgid "use a bitmap index if available to speed up counting objects"
10973msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
10974
10975#: builtin/pack-objects.c:2934
10976msgid "write a bitmap index together with the pack index"
10977msgstr "在建立包索引的同时创建 bitmap 索引"
10978
10979#: builtin/pack-objects.c:3061
10980msgid "Counting objects"
10981msgstr "对象计数中"
10982
10983#: builtin/pack-refs.c:6
10984msgid "git pack-refs [<options>]"
10985msgstr "git pack-refs [<选项>]"
10986
10987#: builtin/pack-refs.c:14
10988msgid "pack everything"
10989msgstr "打包一切"
10990
10991#: builtin/pack-refs.c:15
10992msgid "prune loose refs (default)"
10993msgstr "清除松散的引用(默认)"
10994
10995#: builtin/prune-packed.c:7
10996msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
10997msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
10998
10999#: builtin/prune-packed.c:40
11000msgid "Removing duplicate objects"
11001msgstr "正在删除重复对象"
11002
11003#: builtin/prune.c:11
11004msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
11005msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
11006
11007#: builtin/prune.c:106
11008msgid "report pruned objects"
11009msgstr "报告清除的对象"
11010
11011#: builtin/prune.c:109
11012msgid "expire objects older than <time>"
11013msgstr "使早于给定时间的对象过期"
11014
11015#: builtin/prune.c:123
11016msgid "cannot prune in a precious-objects repo"
11017msgstr "不能在珍品仓库中执行清理操作"
11018
11019#: builtin/pull.c:51 builtin/pull.c:53
11020#, c-format
11021msgid "Invalid value for %s: %s"
11022msgstr "%s 的值无效:%s"
11023
11024#: builtin/pull.c:73
11025msgid "git pull [<options>] [<repository> [<refspec>...]]"
11026msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
11027
11028#: builtin/pull.c:121
11029msgid "Options related to merging"
11030msgstr "和合并相关的选项"
11031
11032#: builtin/pull.c:124
11033msgid "incorporate changes by rebasing rather than merging"
11034msgstr "使用变基操作取代合并操作以合入修改"
11035
11036#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
11037msgid "allow fast-forward"
11038msgstr "允许快进式"
11039
11040#: builtin/pull.c:157
11041msgid "automatically stash/stash pop before and after rebase"
11042msgstr "自动在变基操作前后执行 stash/stash pop"
11043
11044#: builtin/pull.c:173
11045msgid "Options related to fetching"
11046msgstr "和获取相关的参数"
11047
11048#: builtin/pull.c:195
11049msgid "number of submodules pulled in parallel"
11050msgstr "并发拉取的子模组的数量"
11051
11052#: builtin/pull.c:284
11053#, c-format
11054msgid "Invalid value for pull.ff: %s"
11055msgstr "pull.ff 的取值无效:%s"
11056
11057#: builtin/pull.c:397
11058msgid ""
11059"There is no candidate for rebasing against among the refs that you just "
11060"fetched."
11061msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
11062
11063#: builtin/pull.c:399
11064msgid ""
11065"There are no candidates for merging among the refs that you just fetched."
11066msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
11067
11068#: builtin/pull.c:400
11069msgid ""
11070"Generally this means that you provided a wildcard refspec which had no\n"
11071"matches on the remote end."
11072msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
11073
11074#: builtin/pull.c:403
11075#, c-format
11076msgid ""
11077"You asked to pull from the remote '%s', but did not specify\n"
11078"a branch. Because this is not the default configured remote\n"
11079"for your current branch, you must specify a branch on the command line."
11080msgstr ""
11081"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
11082"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
11083
11084#: builtin/pull.c:408 git-parse-remote.sh:73
11085msgid "You are not currently on a branch."
11086msgstr "您当前不在一个分支上。"
11087
11088#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
11089msgid "Please specify which branch you want to rebase against."
11090msgstr "请指定您要变基到哪一个分支。"
11091
11092#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
11093msgid "Please specify which branch you want to merge with."
11094msgstr "请指定您要合并哪一个分支。"
11095
11096#: builtin/pull.c:413 builtin/pull.c:428
11097msgid "See git-pull(1) for details."
11098msgstr "详见 git-pull(1)。"
11099
11100#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
11101#: git-parse-remote.sh:64
11102msgid "<remote>"
11103msgstr "<远程>"
11104
11105#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
11106#: git-parse-remote.sh:65
11107msgid "<branch>"
11108msgstr "<分支>"
11109
11110#: builtin/pull.c:423 git-parse-remote.sh:75
11111msgid "There is no tracking information for the current branch."
11112msgstr "当前分支没有跟踪信息。"
11113
11114#: builtin/pull.c:432 git-parse-remote.sh:95
11115msgid ""
11116"If you wish to set tracking information for this branch you can do so with:"
11117msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
11118
11119#: builtin/pull.c:437
11120#, c-format
11121msgid ""
11122"Your configuration specifies to merge with the ref '%s'\n"
11123"from the remote, but no such ref was fetched."
11124msgstr ""
11125"您的配置中指定要合并远程的引用 '%s',\n"
11126"但是没有获取到这个引用。"
11127
11128#: builtin/pull.c:754
11129msgid "ignoring --verify-signatures for rebase"
11130msgstr "为变基操作忽略 --verify-signatures"
11131
11132#: builtin/pull.c:801
11133msgid "--[no-]autostash option is only valid with --rebase."
11134msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
11135
11136#: builtin/pull.c:809
11137msgid "Updating an unborn branch with changes added to the index."
11138msgstr "更新尚未诞生的分支,变更添加至索引。"
11139
11140#: builtin/pull.c:812
11141msgid "pull with rebase"
11142msgstr "变基式拉取"
11143
11144#: builtin/pull.c:813
11145msgid "please commit or stash them."
11146msgstr "请提交或为它们保存进度。"
11147
11148#: builtin/pull.c:838
11149#, c-format
11150msgid ""
11151"fetch updated the current branch head.\n"
11152"fast-forwarding your working tree from\n"
11153"commit %s."
11154msgstr ""
11155"fetch 更新了当前的分支。快进您的工作区\n"
11156"至提交 %s。"
11157
11158#: builtin/pull.c:843
11159#, c-format
11160msgid ""
11161"Cannot fast-forward your working tree.\n"
11162"After making sure that you saved anything precious from\n"
11163"$ git diff %s\n"
11164"output, run\n"
11165"$ git reset --hard\n"
11166"to recover."
11167msgstr ""
11168"您当前的工作区无法执行快进操作。\n"
11169"首先执行如下命令:\n"
11170"$ git diff %s\n"
11171"以确认所有有用的数据均已保存。然后执行下面的命令\n"
11172"$ git reset --hard\n"
11173"恢复之前的状态。"
11174
11175#: builtin/pull.c:858
11176msgid "Cannot merge multiple branches into empty head."
11177msgstr "无法将多个分支合并到空分支。"
11178
11179#: builtin/pull.c:862
11180msgid "Cannot rebase onto multiple branches."
11181msgstr "无法变基到多个分支。"
11182
11183#: builtin/push.c:16
11184msgid "git push [<options>] [<repository> [<refspec>...]]"
11185msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
11186
11187#: builtin/push.c:89
11188msgid "tag shorthand without <tag>"
11189msgstr "标签后面未提供 <标签> 参数"
11190
11191#: builtin/push.c:99
11192msgid "--delete only accepts plain target ref names"
11193msgstr "--delete 只接受简单的目标引用名"
11194
11195#: builtin/push.c:143
11196msgid ""
11197"\n"
11198"To choose either option permanently, see push.default in 'git help config'."
11199msgstr ""
11200"\n"
11201"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
11202
11203#: builtin/push.c:146
11204#, c-format
11205msgid ""
11206"The upstream branch of your current branch does not match\n"
11207"the name of your current branch.  To push to the upstream branch\n"
11208"on the remote, use\n"
11209"\n"
11210"    git push %s HEAD:%s\n"
11211"\n"
11212"To push to the branch of the same name on the remote, use\n"
11213"\n"
11214"    git push %s %s\n"
11215"%s"
11216msgstr ""
11217"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
11218"上游分支,使用\n"
11219"\n"
11220"    git push %s HEAD:%s\n"
11221"\n"
11222"为推送至远程同名分支,使用\n"
11223"\n"
11224"    git push %s %s\n"
11225"%s"
11226
11227#: builtin/push.c:161
11228#, c-format
11229msgid ""
11230"You are not currently on a branch.\n"
11231"To push the history leading to the current (detached HEAD)\n"
11232"state now, use\n"
11233"\n"
11234"    git push %s HEAD:<name-of-remote-branch>\n"
11235msgstr ""
11236"您当前不在一个分支上。\n"
11237"现在为推送当前(分离头指针)的历史,使用\n"
11238"\n"
11239"    git push %s HEAD:<远程分支名字>\n"
11240
11241#: builtin/push.c:175
11242#, c-format
11243msgid ""
11244"The current branch %s has no upstream branch.\n"
11245"To push the current branch and set the remote as upstream, use\n"
11246"\n"
11247"    git push --set-upstream %s %s\n"
11248msgstr ""
11249"当前分支 %s 没有对应的上游分支。\n"
11250"为推送当前分支并建立与远程上游的跟踪,使用\n"
11251"\n"
11252"    git push --set-upstream %s %s\n"
11253
11254#: builtin/push.c:183
11255#, c-format
11256msgid "The current branch %s has multiple upstream branches, refusing to push."
11257msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
11258
11259#: builtin/push.c:186
11260#, c-format
11261msgid ""
11262"You are pushing to remote '%s', which is not the upstream of\n"
11263"your current branch '%s', without telling me what to push\n"
11264"to update which remote branch."
11265msgstr ""
11266"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
11267"而没有告诉我要推送什么、更新哪个远程分支。"
11268
11269#: builtin/push.c:245
11270msgid ""
11271"You didn't specify any refspecs to push, and push.default is \"nothing\"."
11272msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
11273
11274#: builtin/push.c:252
11275msgid ""
11276"Updates were rejected because the tip of your current branch is behind\n"
11277"its remote counterpart. Integrate the remote changes (e.g.\n"
11278"'git pull ...') before pushing again.\n"
11279"See the 'Note about fast-forwards' in 'git push --help' for details."
11280msgstr ""
11281"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
11282"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
11283"'git push --help' 中的 'Note about fast-forwards' 小节。"
11284
11285#: builtin/push.c:258
11286msgid ""
11287"Updates were rejected because a pushed branch tip is behind its remote\n"
11288"counterpart. Check out this branch and integrate the remote changes\n"
11289"(e.g. 'git pull ...') before pushing again.\n"
11290"See the 'Note about fast-forwards' in 'git push --help' for details."
11291msgstr ""
11292"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11293"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
11294"'git push --help' 中的 'Note about fast-forwards' 小节。"
11295
11296#: builtin/push.c:264
11297msgid ""
11298"Updates were rejected because the remote contains work that you do\n"
11299"not have locally. This is usually caused by another repository pushing\n"
11300"to the same ref. You may want to first integrate the remote changes\n"
11301"(e.g., 'git pull ...') before pushing again.\n"
11302"See the 'Note about fast-forwards' in 'git push --help' for details."
11303msgstr ""
11304"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
11305"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
11306"(如 'git pull ...')。\n"
11307"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
11308
11309#: builtin/push.c:271
11310msgid "Updates were rejected because the tag already exists in the remote."
11311msgstr "更新被拒绝,因为该标签在远程已经存在。"
11312
11313#: builtin/push.c:274
11314msgid ""
11315"You cannot update a remote ref that points at a non-commit object,\n"
11316"or update a remote ref to make it point at a non-commit object,\n"
11317"without using the '--force' option.\n"
11318msgstr ""
11319"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
11320"也不能更新远程引用让其指向一个非提交对象。\n"
11321
11322#: builtin/push.c:334
11323#, c-format
11324msgid "Pushing to %s\n"
11325msgstr "推送到 %s\n"
11326
11327#: builtin/push.c:338
11328#, c-format
11329msgid "failed to push some refs to '%s'"
11330msgstr "无法推送一些引用到 '%s'"
11331
11332#: builtin/push.c:369
11333#, c-format
11334msgid "bad repository '%s'"
11335msgstr "坏的仓库 '%s'"
11336
11337#: builtin/push.c:370
11338msgid ""
11339"No configured push destination.\n"
11340"Either specify the URL from the command-line or configure a remote "
11341"repository using\n"
11342"\n"
11343"    git remote add <name> <url>\n"
11344"\n"
11345"and then push using the remote name\n"
11346"\n"
11347"    git push <name>\n"
11348msgstr ""
11349"没有配置推送目标。\n"
11350"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
11351"\n"
11352"    git remote add <名称> <地址>\n"
11353"\n"
11354"然后使用该远程仓库名执行推送\n"
11355"\n"
11356"    git push <名称>\n"
11357
11358#: builtin/push.c:388
11359msgid "--all and --tags are incompatible"
11360msgstr "--all 和 --tags 不兼容"
11361
11362#: builtin/push.c:389
11363msgid "--all can't be combined with refspecs"
11364msgstr "--all 不能和引用规格同时使用"
11365
11366#: builtin/push.c:394
11367msgid "--mirror and --tags are incompatible"
11368msgstr "--mirror 和 --tags 不兼容"
11369
11370#: builtin/push.c:395
11371msgid "--mirror can't be combined with refspecs"
11372msgstr "--mirror 不能和引用规格同时使用"
11373
11374#: builtin/push.c:400
11375msgid "--all and --mirror are incompatible"
11376msgstr "--all 和 --mirror 不兼容"
11377
11378#: builtin/push.c:518
11379msgid "repository"
11380msgstr "仓库"
11381
11382#: builtin/push.c:519 builtin/send-pack.c:162
11383msgid "push all refs"
11384msgstr "推送所有引用"
11385
11386#: builtin/push.c:520 builtin/send-pack.c:164
11387msgid "mirror all refs"
11388msgstr "镜像所有引用"
11389
11390#: builtin/push.c:522
11391msgid "delete refs"
11392msgstr "删除引用"
11393
11394#: builtin/push.c:523
11395msgid "push tags (can't be used with --all or --mirror)"
11396msgstr "推送标签(不能使用 --all or --mirror)"
11397
11398#: builtin/push.c:526 builtin/send-pack.c:165
11399msgid "force updates"
11400msgstr "强制更新"
11401
11402#: builtin/push.c:528 builtin/send-pack.c:179
11403msgid "refname>:<expect"
11404msgstr "引用名>:<期望值"
11405
11406#: builtin/push.c:529 builtin/send-pack.c:180
11407msgid "require old value of ref to be at this value"
11408msgstr "要求引用旧的取值为设定值"
11409
11410#: builtin/push.c:532
11411msgid "control recursive pushing of submodules"
11412msgstr "控制子模组的递归推送"
11413
11414#: builtin/push.c:534 builtin/send-pack.c:173
11415msgid "use thin pack"
11416msgstr "使用精简打包"
11417
11418#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
11419#: builtin/send-pack.c:160
11420msgid "receive pack program"
11421msgstr "接收包程序"
11422
11423#: builtin/push.c:537
11424msgid "set upstream for git pull/status"
11425msgstr "设置 git pull/status 的上游"
11426
11427#: builtin/push.c:540
11428msgid "prune locally removed refs"
11429msgstr "清除本地删除的引用"
11430
11431#: builtin/push.c:542
11432msgid "bypass pre-push hook"
11433msgstr "绕过 pre-push 钩子"
11434
11435#: builtin/push.c:543
11436msgid "push missing but relevant tags"
11437msgstr "推送缺失但有关的标签"
11438
11439#: builtin/push.c:546 builtin/send-pack.c:167
11440msgid "GPG sign the push"
11441msgstr "用 GPG 为推送签名"
11442
11443#: builtin/push.c:548 builtin/send-pack.c:174
11444msgid "request atomic transaction on remote side"
11445msgstr "需要远端支持原子事务"
11446
11447#: builtin/push.c:549 builtin/send-pack.c:170
11448msgid "server-specific"
11449msgstr "server-specific"
11450
11451#: builtin/push.c:549 builtin/send-pack.c:171
11452msgid "option to transmit"
11453msgstr "传输选项"
11454
11455#: builtin/push.c:563
11456msgid "--delete is incompatible with --all, --mirror and --tags"
11457msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
11458
11459#: builtin/push.c:565
11460msgid "--delete doesn't make sense without any refs"
11461msgstr "--delete 未接任何引用没有意义"
11462
11463#: builtin/push.c:584
11464msgid "push options must not have new line characters"
11465msgstr "推送选项不能有换行符"
11466
11467#: builtin/read-tree.c:40
11468msgid ""
11469"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
11470"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11471"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
11472msgstr ""
11473"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
11474"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11475"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
11476
11477#: builtin/read-tree.c:130
11478msgid "write resulting index to <file>"
11479msgstr "将索引结果写入 <文件>"
11480
11481#: builtin/read-tree.c:133
11482msgid "only empty the index"
11483msgstr "只是清空索引"
11484
11485#: builtin/read-tree.c:135
11486msgid "Merging"
11487msgstr "合并"
11488
11489#: builtin/read-tree.c:137
11490msgid "perform a merge in addition to a read"
11491msgstr "读取之余再执行一个合并"
11492
11493#: builtin/read-tree.c:139
11494msgid "3-way merge if no file level merging required"
11495msgstr "如果没有文件级合并需要,执行三方合并"
11496
11497#: builtin/read-tree.c:141
11498msgid "3-way merge in presence of adds and removes"
11499msgstr "存在添加和删除时,也执行三方合并"
11500
11501#: builtin/read-tree.c:143
11502msgid "same as -m, but discard unmerged entries"
11503msgstr "类似于 -m,但丢弃未合并的条目"
11504
11505#: builtin/read-tree.c:144
11506msgid "<subdirectory>/"
11507msgstr "<子目录>/"
11508
11509#: builtin/read-tree.c:145
11510msgid "read the tree into the index under <subdirectory>/"
11511msgstr "读取树对象到索引的 <子目录>/ 下"
11512
11513#: builtin/read-tree.c:148
11514msgid "update working tree with merge result"
11515msgstr "用合并的结果更新工作区"
11516
11517#: builtin/read-tree.c:150
11518msgid "gitignore"
11519msgstr "gitignore"
11520
11521#: builtin/read-tree.c:151
11522msgid "allow explicitly ignored files to be overwritten"
11523msgstr "允许忽略文件中设定的文件可以被覆盖"
11524
11525#: builtin/read-tree.c:154
11526msgid "don't check the working tree after merging"
11527msgstr "合并后不检查工作区"
11528
11529#: builtin/read-tree.c:155
11530msgid "don't update the index or the work tree"
11531msgstr "不更新索引区和工作区"
11532
11533#: builtin/read-tree.c:157
11534msgid "skip applying sparse checkout filter"
11535msgstr "跳过应用稀疏检出过滤器"
11536
11537#: builtin/read-tree.c:159
11538msgid "debug unpack-trees"
11539msgstr "调试 unpack-trees"
11540
11541#: builtin/rebase--helper.c:7
11542msgid "git rebase--helper [<options>]"
11543msgstr "git rebase--helper [<选项>]"
11544
11545#: builtin/rebase--helper.c:19
11546msgid "continue rebase"
11547msgstr "继续变基"
11548
11549#: builtin/rebase--helper.c:21
11550msgid "abort rebase"
11551msgstr "中止变基"
11552
11553#: builtin/receive-pack.c:27
11554msgid "git receive-pack <git-dir>"
11555msgstr "git receive-pack <git-dir>"
11556
11557#: builtin/receive-pack.c:796
11558msgid ""
11559"By default, updating the current branch in a non-bare repository\n"
11560"is denied, because it will make the index and work tree inconsistent\n"
11561"with what you pushed, and will require 'git reset --hard' to match\n"
11562"the work tree to HEAD.\n"
11563"\n"
11564"You can set the 'receive.denyCurrentBranch' configuration variable\n"
11565"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
11566"its current branch; however, this is not recommended unless you\n"
11567"arranged to update its work tree to match what you pushed in some\n"
11568"other way.\n"
11569"\n"
11570"To squelch this message and still keep the default behaviour, set\n"
11571"'receive.denyCurrentBranch' configuration variable to 'refuse'."
11572msgstr ""
11573"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
11574"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
11575"\n"
11576"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
11577"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
11578"用某种方式将其工作区更新至您推送的状态。\n"
11579"\n"
11580"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
11581"配置变量为 'refuse'。"
11582
11583#: builtin/receive-pack.c:816
11584msgid ""
11585"By default, deleting the current branch is denied, because the next\n"
11586"'git clone' won't result in any file checked out, causing confusion.\n"
11587"\n"
11588"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
11589"'warn' or 'ignore' in the remote repository to allow deleting the\n"
11590"current branch, with or without a warning message.\n"
11591"\n"
11592"To squelch this message, you can set it to 'refuse'."
11593msgstr ""
11594"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
11595"导致困惑。\n"
11596"\n"
11597"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
11598"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
11599"\n"
11600"若要屏蔽此信息,您可以设置它为 'refuse'。"
11601
11602#: builtin/receive-pack.c:1889
11603msgid "quiet"
11604msgstr "静默模式"
11605
11606#: builtin/receive-pack.c:1903
11607msgid "You must specify a directory."
11608msgstr "您必须指定一个目录。"
11609
11610#: builtin/reflog.c:423
11611#, c-format
11612msgid "'%s' for '%s' is not a valid timestamp"
11613msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
11614
11615#: builtin/reflog.c:540 builtin/reflog.c:545
11616#, c-format
11617msgid "'%s' is not a valid timestamp"
11618msgstr "'%s' 不是一个有效的时间戳"
11619
11620#: builtin/remote.c:12
11621msgid "git remote [-v | --verbose]"
11622msgstr "git remote [-v | --verbose]"
11623
11624#: builtin/remote.c:13
11625msgid ""
11626"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
11627"mirror=<fetch|push>] <name> <url>"
11628msgstr ""
11629"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
11630"mirror=<fetch|push>] <名称> <地址>"
11631
11632#: builtin/remote.c:14 builtin/remote.c:34
11633msgid "git remote rename <old> <new>"
11634msgstr "git remote rename <旧名称> <新名称>"
11635
11636#: builtin/remote.c:15 builtin/remote.c:39
11637msgid "git remote remove <name>"
11638msgstr "git remote remove <名称>"
11639
11640#: builtin/remote.c:16 builtin/remote.c:44
11641msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
11642msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
11643
11644#: builtin/remote.c:17
11645msgid "git remote [-v | --verbose] show [-n] <name>"
11646msgstr "git remote [-v | --verbose] show [-n] <名称>"
11647
11648#: builtin/remote.c:18
11649msgid "git remote prune [-n | --dry-run] <name>"
11650msgstr "git remote prune [-n | --dry-run] <名称>"
11651
11652#: builtin/remote.c:19
11653msgid ""
11654"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
11655msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
11656
11657#: builtin/remote.c:20
11658msgid "git remote set-branches [--add] <name> <branch>..."
11659msgstr "git remote set-branches [--add] <名称> <分支>..."
11660
11661#: builtin/remote.c:21 builtin/remote.c:70
11662msgid "git remote get-url [--push] [--all] <name>"
11663msgstr "git remote get-url [--push] [--all] <名称>"
11664
11665#: builtin/remote.c:22 builtin/remote.c:75
11666msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
11667msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
11668
11669#: builtin/remote.c:23 builtin/remote.c:76
11670msgid "git remote set-url --add <name> <newurl>"
11671msgstr "git remote set-url --add <名称> <新的地址>"
11672
11673#: builtin/remote.c:24 builtin/remote.c:77
11674msgid "git remote set-url --delete <name> <url>"
11675msgstr "git remote set-url --delete <名称> <地址>"
11676
11677#: builtin/remote.c:29
11678msgid "git remote add [<options>] <name> <url>"
11679msgstr "git remote add [<选项>] <名称> <地址>"
11680
11681#: builtin/remote.c:49
11682msgid "git remote set-branches <name> <branch>..."
11683msgstr "git remote set-branches <名称> <分支>..."
11684
11685#: builtin/remote.c:50
11686msgid "git remote set-branches --add <name> <branch>..."
11687msgstr "git remote set-branches --add <名称> <分支>..."
11688
11689#: builtin/remote.c:55
11690msgid "git remote show [<options>] <name>"
11691msgstr "git remote show [<选项>] <名称>"
11692
11693#: builtin/remote.c:60
11694msgid "git remote prune [<options>] <name>"
11695msgstr "git remote prune [<选项>] <名称>"
11696
11697#: builtin/remote.c:65
11698msgid "git remote update [<options>] [<group> | <remote>]..."
11699msgstr "git remote update [<选项>] [<组> | <远程>]..."
11700
11701#: builtin/remote.c:94
11702#, c-format
11703msgid "Updating %s"
11704msgstr "更新 %s 中"
11705
11706#: builtin/remote.c:126
11707msgid ""
11708"--mirror is dangerous and deprecated; please\n"
11709"\t use --mirror=fetch or --mirror=push instead"
11710msgstr ""
11711"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
11712"\t 或 --mirror=push"
11713
11714#: builtin/remote.c:143
11715#, c-format
11716msgid "unknown mirror argument: %s"
11717msgstr "未知的镜像参数:%s"
11718
11719#: builtin/remote.c:159
11720msgid "fetch the remote branches"
11721msgstr "抓取远程的分支"
11722
11723#: builtin/remote.c:161
11724msgid "import all tags and associated objects when fetching"
11725msgstr "抓取时导入所有的标签和关联对象"
11726
11727#: builtin/remote.c:164
11728msgid "or do not fetch any tag at all (--no-tags)"
11729msgstr "或不抓取任何标签(--no-tags)"
11730
11731#: builtin/remote.c:166
11732msgid "branch(es) to track"
11733msgstr "跟踪的分支"
11734
11735#: builtin/remote.c:167
11736msgid "master branch"
11737msgstr "主线分支"
11738
11739#: builtin/remote.c:168
11740msgid "push|fetch"
11741msgstr "push|fetch"
11742
11743#: builtin/remote.c:169
11744msgid "set up remote as a mirror to push to or fetch from"
11745msgstr "把远程设置为用以推送或抓取的镜像"
11746
11747#: builtin/remote.c:181
11748msgid "specifying a master branch makes no sense with --mirror"
11749msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
11750
11751#: builtin/remote.c:183
11752msgid "specifying branches to track makes sense only with fetch mirrors"
11753msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
11754
11755#: builtin/remote.c:190 builtin/remote.c:629
11756#, c-format
11757msgid "remote %s already exists."
11758msgstr "远程 %s 已经存在。"
11759
11760#: builtin/remote.c:194 builtin/remote.c:633
11761#, c-format
11762msgid "'%s' is not a valid remote name"
11763msgstr "'%s' 不是一个有效的远程名称"
11764
11765#: builtin/remote.c:234
11766#, c-format
11767msgid "Could not setup master '%s'"
11768msgstr "无法设置 master '%s'"
11769
11770#: builtin/remote.c:336
11771#, c-format
11772msgid "Could not get fetch map for refspec %s"
11773msgstr "无法得到引用规格 %s 的获取列表"
11774
11775#: builtin/remote.c:437 builtin/remote.c:445
11776msgid "(matching)"
11777msgstr "(匹配)"
11778
11779#: builtin/remote.c:449
11780msgid "(delete)"
11781msgstr "(删除)"
11782
11783#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
11784#, c-format
11785msgid "No such remote: %s"
11786msgstr "没有这样的远程:%s"
11787
11788#: builtin/remote.c:639
11789#, c-format
11790msgid "Could not rename config section '%s' to '%s'"
11791msgstr "不能重命名配置小节 '%s' 到 '%s'"
11792
11793#: builtin/remote.c:659
11794#, c-format
11795msgid ""
11796"Not updating non-default fetch refspec\n"
11797"\t%s\n"
11798"\tPlease update the configuration manually if necessary."
11799msgstr ""
11800"没有更新非默认的获取引用规格\n"
11801"\t%s\n"
11802"\t如果必要请手动更新配置。"
11803
11804#: builtin/remote.c:695
11805#, c-format
11806msgid "deleting '%s' failed"
11807msgstr "删除 '%s' 失败"
11808
11809#: builtin/remote.c:729
11810#, c-format
11811msgid "creating '%s' failed"
11812msgstr "创建 '%s' 失败"
11813
11814#: builtin/remote.c:794
11815msgid ""
11816"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
11817"to delete it, use:"
11818msgid_plural ""
11819"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
11820"to delete them, use:"
11821msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
11822msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
11823
11824#: builtin/remote.c:808
11825#, c-format
11826msgid "Could not remove config section '%s'"
11827msgstr "不能移除配置小节 '%s'"
11828
11829#: builtin/remote.c:909
11830#, c-format
11831msgid " new (next fetch will store in remotes/%s)"
11832msgstr " 新的(下一次获取将存储于 remotes/%s)"
11833
11834#: builtin/remote.c:912
11835msgid " tracked"
11836msgstr " 已跟踪"
11837
11838#: builtin/remote.c:914
11839msgid " stale (use 'git remote prune' to remove)"
11840msgstr " 过时(使用 'git remote prune' 来移除)"
11841
11842#: builtin/remote.c:916
11843msgid " ???"
11844msgstr " ???"
11845
11846#: builtin/remote.c:957
11847#, c-format
11848msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
11849msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
11850
11851#: builtin/remote.c:965
11852#, c-format
11853msgid "rebases interactively onto remote %s"
11854msgstr "交互式变基到远程 %s"
11855
11856#: builtin/remote.c:966
11857#, c-format
11858msgid "rebases onto remote %s"
11859msgstr "变基到远程 %s"
11860
11861#: builtin/remote.c:969
11862#, c-format
11863msgid " merges with remote %s"
11864msgstr " 与远程 %s 合并"
11865
11866#: builtin/remote.c:972
11867#, c-format
11868msgid "merges with remote %s"
11869msgstr "与远程 %s 合并"
11870
11871#: builtin/remote.c:975
11872#, c-format
11873msgid "%-*s    and with remote %s\n"
11874msgstr "%-*s    以及和远程 %s\n"
11875
11876#: builtin/remote.c:1018
11877msgid "create"
11878msgstr "创建"
11879
11880#: builtin/remote.c:1021
11881msgid "delete"
11882msgstr "删除"
11883
11884#: builtin/remote.c:1025
11885msgid "up to date"
11886msgstr "最新"
11887
11888#: builtin/remote.c:1028
11889msgid "fast-forwardable"
11890msgstr "可快进"
11891
11892#: builtin/remote.c:1031
11893msgid "local out of date"
11894msgstr "本地已过时"
11895
11896#: builtin/remote.c:1038
11897#, c-format
11898msgid "    %-*s forces to %-*s (%s)"
11899msgstr "    %-*s 强制推送至 %-*s (%s)"
11900
11901#: builtin/remote.c:1041
11902#, c-format
11903msgid "    %-*s pushes to %-*s (%s)"
11904msgstr "    %-*s 推送至 %-*s (%s)"
11905
11906#: builtin/remote.c:1045
11907#, c-format
11908msgid "    %-*s forces to %s"
11909msgstr "    %-*s 强制推送至 %s"
11910
11911#: builtin/remote.c:1048
11912#, c-format
11913msgid "    %-*s pushes to %s"
11914msgstr "    %-*s 推送至 %s"
11915
11916#: builtin/remote.c:1116
11917msgid "do not query remotes"
11918msgstr "不查询远程"
11919
11920#: builtin/remote.c:1143
11921#, c-format
11922msgid "* remote %s"
11923msgstr "* 远程 %s"
11924
11925#: builtin/remote.c:1144
11926#, c-format
11927msgid "  Fetch URL: %s"
11928msgstr "  获取地址:%s"
11929
11930#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
11931msgid "(no URL)"
11932msgstr "(无 URL)"
11933
11934#. TRANSLATORS: the colon ':' should align with
11935#. the one in "  Fetch URL: %s" translation
11936#: builtin/remote.c:1156 builtin/remote.c:1158
11937#, c-format
11938msgid "  Push  URL: %s"
11939msgstr "  推送地址:%s"
11940
11941#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
11942#, c-format
11943msgid "  HEAD branch: %s"
11944msgstr "  HEAD 分支:%s"
11945
11946#  译者:中文字符串拼接,可删除前导空格
11947#: builtin/remote.c:1160
11948msgid "(not queried)"
11949msgstr "(未查询)"
11950
11951#: builtin/remote.c:1162
11952msgid "(unknown)"
11953msgstr "(未知)"
11954
11955#: builtin/remote.c:1166
11956#, c-format
11957msgid ""
11958"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
11959msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
11960
11961#: builtin/remote.c:1178
11962#, c-format
11963msgid "  Remote branch:%s"
11964msgid_plural "  Remote branches:%s"
11965msgstr[0] "  远程分支:%s"
11966msgstr[1] "  远程分支:%s"
11967
11968#  译者:中文字符串拼接,可删除前导空格
11969#: builtin/remote.c:1181 builtin/remote.c:1207
11970msgid " (status not queried)"
11971msgstr "(状态未查询)"
11972
11973#: builtin/remote.c:1190
11974msgid "  Local branch configured for 'git pull':"
11975msgid_plural "  Local branches configured for 'git pull':"
11976msgstr[0] "  为 'git pull' 配置的本地分支:"
11977msgstr[1] "  为 'git pull' 配置的本地分支:"
11978
11979#: builtin/remote.c:1198
11980msgid "  Local refs will be mirrored by 'git push'"
11981msgstr "  本地引用将在 'git push' 时被镜像"
11982
11983#: builtin/remote.c:1204
11984#, c-format
11985msgid "  Local ref configured for 'git push'%s:"
11986msgid_plural "  Local refs configured for 'git push'%s:"
11987msgstr[0] "  为 'git push' 配置的本地引用%s:"
11988msgstr[1] "  为 'git push' 配置的本地引用%s:"
11989
11990#: builtin/remote.c:1225
11991msgid "set refs/remotes/<name>/HEAD according to remote"
11992msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
11993
11994#: builtin/remote.c:1227
11995msgid "delete refs/remotes/<name>/HEAD"
11996msgstr "删除 refs/remotes/<名称>/HEAD"
11997
11998#: builtin/remote.c:1242
11999msgid "Cannot determine remote HEAD"
12000msgstr "无法确定远程 HEAD"
12001
12002#: builtin/remote.c:1244
12003msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
12004msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
12005
12006#: builtin/remote.c:1254
12007#, c-format
12008msgid "Could not delete %s"
12009msgstr "无法删除 %s"
12010
12011#: builtin/remote.c:1262
12012#, c-format
12013msgid "Not a valid ref: %s"
12014msgstr "不是一个有效引用:%s"
12015
12016#: builtin/remote.c:1264
12017#, c-format
12018msgid "Could not setup %s"
12019msgstr "不能设置 %s"
12020
12021#  译者:注意保持前导空格
12022#: builtin/remote.c:1282
12023#, c-format
12024msgid " %s will become dangling!"
12025msgstr " %s 将成为摇摆状态!"
12026
12027#  译者:注意保持前导空格
12028#: builtin/remote.c:1283
12029#, c-format
12030msgid " %s has become dangling!"
12031msgstr " %s 已成为摇摆状态!"
12032
12033#: builtin/remote.c:1293
12034#, c-format
12035msgid "Pruning %s"
12036msgstr "修剪 %s"
12037
12038#: builtin/remote.c:1294
12039#, c-format
12040msgid "URL: %s"
12041msgstr "URL:%s"
12042
12043#: builtin/remote.c:1310
12044#, c-format
12045msgid " * [would prune] %s"
12046msgstr " * [将删除] %s"
12047
12048#: builtin/remote.c:1313
12049#, c-format
12050msgid " * [pruned] %s"
12051msgstr " * [已删除] %s"
12052
12053#: builtin/remote.c:1358
12054msgid "prune remotes after fetching"
12055msgstr "抓取后清除远程"
12056
12057#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
12058#, c-format
12059msgid "No such remote '%s'"
12060msgstr "没有此远程 '%s'"
12061
12062#: builtin/remote.c:1437
12063msgid "add branch"
12064msgstr "添加分支"
12065
12066#: builtin/remote.c:1444
12067msgid "no remote specified"
12068msgstr "未指定远程"
12069
12070#: builtin/remote.c:1461
12071msgid "query push URLs rather than fetch URLs"
12072msgstr "查询推送 URL 地址,而非获取 URL 地址"
12073
12074#: builtin/remote.c:1463
12075msgid "return all URLs"
12076msgstr "返回所有 URL 地址"
12077
12078#: builtin/remote.c:1491
12079#, c-format
12080msgid "no URLs configured for remote '%s'"
12081msgstr "没有给远程仓库 '%s' 设定 URL"
12082
12083#: builtin/remote.c:1517
12084msgid "manipulate push URLs"
12085msgstr "操作推送 URLS"
12086
12087#: builtin/remote.c:1519
12088msgid "add URL"
12089msgstr "添加 URL"
12090
12091#: builtin/remote.c:1521
12092msgid "delete URLs"
12093msgstr "删除 URLS"
12094
12095#: builtin/remote.c:1528
12096msgid "--add --delete doesn't make sense"
12097msgstr "--add --delete 无意义"
12098
12099#: builtin/remote.c:1569
12100#, c-format
12101msgid "Invalid old URL pattern: %s"
12102msgstr "无效的旧 URL 匹配模版:%s"
12103
12104#: builtin/remote.c:1577
12105#, c-format
12106msgid "No such URL found: %s"
12107msgstr "未找到此 URL:%s"
12108
12109#: builtin/remote.c:1579
12110msgid "Will not delete all non-push URLs"
12111msgstr "将不会删除所有非推送 URL 地址"
12112
12113#: builtin/remote.c:1593
12114msgid "be verbose; must be placed before a subcommand"
12115msgstr "冗长输出;必须置于子命令之前"
12116
12117#: builtin/remote.c:1624
12118#, c-format
12119msgid "Unknown subcommand: %s"
12120msgstr "未知子命令:%s"
12121
12122#: builtin/repack.c:17
12123msgid "git repack [<options>]"
12124msgstr "git repack [<选项>]"
12125
12126#: builtin/repack.c:22
12127msgid ""
12128"Incremental repacks are incompatible with bitmap indexes.  Use\n"
12129"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
12130msgstr ""
12131"增量 repack 和 bitmap 索引不兼容。  使用 --no-write-bitmap-index\n"
12132"或禁用 pack.writebitmaps 配置。"
12133
12134#: builtin/repack.c:166
12135msgid "pack everything in a single pack"
12136msgstr "所有内容打包到一个包文件中"
12137
12138#: builtin/repack.c:168
12139msgid "same as -a, and turn unreachable objects loose"
12140msgstr "和 -a 相同,并将不可达的对象设为松散对象"
12141
12142#: builtin/repack.c:171
12143msgid "remove redundant packs, and run git-prune-packed"
12144msgstr "删除多余的包,运行 git-prune-packed"
12145
12146#: builtin/repack.c:173
12147msgid "pass --no-reuse-delta to git-pack-objects"
12148msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
12149
12150#: builtin/repack.c:175
12151msgid "pass --no-reuse-object to git-pack-objects"
12152msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
12153
12154#: builtin/repack.c:177
12155msgid "do not run git-update-server-info"
12156msgstr "不运行 git-update-server-info"
12157
12158#: builtin/repack.c:180
12159msgid "pass --local to git-pack-objects"
12160msgstr "向 git-pack-objects 传递参数 --local"
12161
12162#: builtin/repack.c:182
12163msgid "write bitmap index"
12164msgstr "写 bitmap 索引"
12165
12166#: builtin/repack.c:183
12167msgid "approxidate"
12168msgstr "近似日期"
12169
12170#: builtin/repack.c:184
12171msgid "with -A, do not loosen objects older than this"
12172msgstr "使用 -A,不要将早于给定时间的对象过期"
12173
12174#: builtin/repack.c:186
12175msgid "with -a, repack unreachable objects"
12176msgstr "使用 -a ,重新对不可达对象打包"
12177
12178#: builtin/repack.c:188
12179msgid "size of the window used for delta compression"
12180msgstr "用于增量压缩的窗口值"
12181
12182#: builtin/repack.c:189 builtin/repack.c:193
12183msgid "bytes"
12184msgstr "字节"
12185
12186#: builtin/repack.c:190
12187msgid "same as the above, but limit memory size instead of entries count"
12188msgstr "和上面的相似,但限制内存大小而非条目数"
12189
12190#: builtin/repack.c:192
12191msgid "limits the maximum delta depth"
12192msgstr "限制最大增量深度"
12193
12194#: builtin/repack.c:194
12195msgid "maximum size of each packfile"
12196msgstr "每个包文件的最大尺寸"
12197
12198#: builtin/repack.c:196
12199msgid "repack objects in packs marked with .keep"
12200msgstr "对标记为 .keep 的包中的对象重新打包"
12201
12202#: builtin/repack.c:206
12203msgid "cannot delete packs in a precious-objects repo"
12204msgstr "不能删除珍品仓库中的打包文件"
12205
12206#: builtin/repack.c:210
12207msgid "--keep-unreachable and -A are incompatible"
12208msgstr "--keep-unreachable 和 -A 不兼容"
12209
12210#: builtin/repack.c:400 builtin/worktree.c:115
12211#, c-format
12212msgid "failed to remove '%s'"
12213msgstr "无法删除 '%s'"
12214
12215#: builtin/replace.c:19
12216msgid "git replace [-f] <object> <replacement>"
12217msgstr "git replace [-f] <对象> <替换物>"
12218
12219#: builtin/replace.c:20
12220msgid "git replace [-f] --edit <object>"
12221msgstr "git replace [-f] --edit <对象>"
12222
12223#: builtin/replace.c:21
12224msgid "git replace [-f] --graft <commit> [<parent>...]"
12225msgstr "git replace [-f] --graft <提交> [<父提交>...]"
12226
12227#: builtin/replace.c:22
12228msgid "git replace -d <object>..."
12229msgstr "git replace -d <对象>..."
12230
12231#: builtin/replace.c:23
12232msgid "git replace [--format=<format>] [-l [<pattern>]]"
12233msgstr "git replace [--format=<格式>] [-l [<模式>]]"
12234
12235#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
12236#, c-format
12237msgid "Not a valid object name: '%s'"
12238msgstr "不是一个有效的对象名:'%s'"
12239
12240#: builtin/replace.c:359
12241#, c-format
12242msgid "bad mergetag in commit '%s'"
12243msgstr "提交 '%s' 中含有损坏的合并标签"
12244
12245#: builtin/replace.c:361
12246#, c-format
12247msgid "malformed mergetag in commit '%s'"
12248msgstr "提交 '%s' 中含有非法的合并标签"
12249
12250#: builtin/replace.c:372
12251#, c-format
12252msgid ""
12253"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
12254"instead of --graft"
12255msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
12256
12257#: builtin/replace.c:405
12258#, c-format
12259msgid "the original commit '%s' has a gpg signature."
12260msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12261
12262#: builtin/replace.c:406
12263msgid "the signature will be removed in the replacement commit!"
12264msgstr "在替换的提交中签名将被移除!"
12265
12266#: builtin/replace.c:412
12267#, c-format
12268msgid "could not write replacement commit for: '%s'"
12269msgstr "不能为 '%s' 写替换提交"
12270
12271#: builtin/replace.c:436
12272msgid "list replace refs"
12273msgstr "列出替换的引用"
12274
12275#: builtin/replace.c:437
12276msgid "delete replace refs"
12277msgstr "删除替换的引用"
12278
12279#: builtin/replace.c:438
12280msgid "edit existing object"
12281msgstr "编辑现存的对象"
12282
12283#: builtin/replace.c:439
12284msgid "change a commit's parents"
12285msgstr "修改一个提交的父提交"
12286
12287#: builtin/replace.c:440
12288msgid "replace the ref if it exists"
12289msgstr "如果存在则替换引用"
12290
12291#: builtin/replace.c:441
12292msgid "do not pretty-print contents for --edit"
12293msgstr "不要为 --edit 操作美观显示内容"
12294
12295#: builtin/replace.c:442
12296msgid "use this format"
12297msgstr "使用此格式"
12298
12299#: builtin/rerere.c:12
12300msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
12301msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
12302
12303#: builtin/rerere.c:58
12304msgid "register clean resolutions in index"
12305msgstr "在索引中注册干净的解决方案"
12306
12307#: builtin/reset.c:26
12308msgid ""
12309"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
12310msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
12311
12312#: builtin/reset.c:27
12313msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
12314msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
12315
12316#: builtin/reset.c:28
12317msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
12318msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
12319
12320#: builtin/reset.c:34
12321msgid "mixed"
12322msgstr "混杂"
12323
12324#: builtin/reset.c:34
12325msgid "soft"
12326msgstr "软性"
12327
12328#: builtin/reset.c:34
12329msgid "hard"
12330msgstr "硬性"
12331
12332#: builtin/reset.c:34
12333msgid "merge"
12334msgstr "合并"
12335
12336#: builtin/reset.c:34
12337msgid "keep"
12338msgstr "保持"
12339
12340#: builtin/reset.c:74
12341msgid "You do not have a valid HEAD."
12342msgstr "您没有一个有效的 HEAD。"
12343
12344#: builtin/reset.c:76
12345msgid "Failed to find tree of HEAD."
12346msgstr "无法找到 HEAD 指向的树。"
12347
12348#: builtin/reset.c:82
12349#, c-format
12350msgid "Failed to find tree of %s."
12351msgstr "无法找到 %s 指向的树。"
12352
12353#: builtin/reset.c:100
12354#, c-format
12355msgid "HEAD is now at %s"
12356msgstr "HEAD 现在位于 %s"
12357
12358#  译者:汉字之间无空格,故删除%s前后空格
12359#: builtin/reset.c:183
12360#, c-format
12361msgid "Cannot do a %s reset in the middle of a merge."
12362msgstr "在合并过程中不能做%s重置操作。"
12363
12364#: builtin/reset.c:276
12365msgid "be quiet, only report errors"
12366msgstr "安静模式,只报告错误"
12367
12368#: builtin/reset.c:278
12369msgid "reset HEAD and index"
12370msgstr "重置 HEAD 和索引"
12371
12372#: builtin/reset.c:279
12373msgid "reset only HEAD"
12374msgstr "只重置 HEAD"
12375
12376#: builtin/reset.c:281 builtin/reset.c:283
12377msgid "reset HEAD, index and working tree"
12378msgstr "重置 HEAD、索引和工作区"
12379
12380#: builtin/reset.c:285
12381msgid "reset HEAD but keep local changes"
12382msgstr "重置 HEAD 但保存本地变更"
12383
12384#: builtin/reset.c:288
12385msgid "record only the fact that removed paths will be added later"
12386msgstr "将删除的路径标记为稍后添加"
12387
12388#: builtin/reset.c:305
12389#, c-format
12390msgid "Failed to resolve '%s' as a valid revision."
12391msgstr "无法将 '%s' 解析为一个有效的版本。"
12392
12393#: builtin/reset.c:313
12394#, c-format
12395msgid "Failed to resolve '%s' as a valid tree."
12396msgstr "无法将 '%s' 解析为一个有效的树对象。"
12397
12398#: builtin/reset.c:322
12399msgid "--patch is incompatible with --{hard,mixed,soft}"
12400msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
12401
12402#: builtin/reset.c:331
12403msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
12404msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
12405
12406#  译者:汉字之间无空格,故删除%s前后空格
12407#: builtin/reset.c:333
12408#, c-format
12409msgid "Cannot do %s reset with paths."
12410msgstr "不能带路径进行%s重置。"
12411
12412#  译者:汉字之间无空格,故删除%s前后空格
12413#: builtin/reset.c:343
12414#, c-format
12415msgid "%s reset is not allowed in a bare repository"
12416msgstr "不能对纯仓库进行%s重置"
12417
12418#: builtin/reset.c:347
12419msgid "-N can only be used with --mixed"
12420msgstr "-N 只能和 --mixed 同时使用"
12421
12422#: builtin/reset.c:364
12423msgid "Unstaged changes after reset:"
12424msgstr "重置后取消暂存的变更:"
12425
12426#: builtin/reset.c:370
12427#, c-format
12428msgid "Could not reset index file to revision '%s'."
12429msgstr "不能重置索引文件至版本 '%s'。"
12430
12431#: builtin/reset.c:374
12432msgid "Could not write new index file."
12433msgstr "不能写入新的索引文件。"
12434
12435#: builtin/rev-list.c:354
12436msgid "rev-list does not support display of notes"
12437msgstr "rev-list 不支持显示注解"
12438
12439#: builtin/rev-parse.c:393
12440msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12441msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
12442
12443#: builtin/rev-parse.c:398
12444msgid "keep the `--` passed as an arg"
12445msgstr "保持 `--` 作为一个参数传递"
12446
12447#: builtin/rev-parse.c:400
12448msgid "stop parsing after the first non-option argument"
12449msgstr "遇到第一个非选项参数后停止解析"
12450
12451#: builtin/rev-parse.c:403
12452msgid "output in stuck long form"
12453msgstr "以固定长格式输出"
12454
12455#: builtin/rev-parse.c:534
12456msgid ""
12457"git rev-parse --parseopt [<options>] -- [<args>...]\n"
12458"   or: git rev-parse --sq-quote [<arg>...]\n"
12459"   or: git rev-parse [<options>] [<arg>...]\n"
12460"\n"
12461"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
12462msgstr ""
12463"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
12464"   或者:git rev-parse --sq-quote [<参数>...]\n"
12465"   或者:git rev-parse [<选项>] [<参数>...]\n"
12466"\n"
12467"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
12468
12469#: builtin/revert.c:22
12470msgid "git revert [<options>] <commit-ish>..."
12471msgstr "git revert [<选项>] <提交号>..."
12472
12473#: builtin/revert.c:23
12474msgid "git revert <subcommand>"
12475msgstr "git revert <子命令>"
12476
12477#: builtin/revert.c:28
12478msgid "git cherry-pick [<options>] <commit-ish>..."
12479msgstr "git cherry-pick [<选项>] <提交号>..."
12480
12481#: builtin/revert.c:29
12482msgid "git cherry-pick <subcommand>"
12483msgstr "git cherry-pick <子命令>"
12484
12485#: builtin/revert.c:89
12486#, c-format
12487msgid "%s: %s cannot be used with %s"
12488msgstr "%s:%s 不能和 %s 同时使用"
12489
12490#: builtin/revert.c:98
12491msgid "end revert or cherry-pick sequence"
12492msgstr "终止反转或拣选操作"
12493
12494#: builtin/revert.c:99
12495msgid "resume revert or cherry-pick sequence"
12496msgstr "继续反转或拣选操作"
12497
12498#: builtin/revert.c:100
12499msgid "cancel revert or cherry-pick sequence"
12500msgstr "取消反转或拣选操作"
12501
12502#: builtin/revert.c:101
12503msgid "don't automatically commit"
12504msgstr "不要自动提交"
12505
12506#: builtin/revert.c:102
12507msgid "edit the commit message"
12508msgstr "编辑提交说明"
12509
12510#: builtin/revert.c:105
12511msgid "parent-number"
12512msgstr "父编号"
12513
12514#: builtin/revert.c:106
12515msgid "select mainline parent"
12516msgstr "选择主干父提交编号"
12517
12518#: builtin/revert.c:108
12519msgid "merge strategy"
12520msgstr "合并策略"
12521
12522#: builtin/revert.c:109
12523msgid "option"
12524msgstr "选项"
12525
12526#: builtin/revert.c:110
12527msgid "option for merge strategy"
12528msgstr "合并策略的选项"
12529
12530#: builtin/revert.c:119
12531msgid "append commit name"
12532msgstr "追加提交名称"
12533
12534#: builtin/revert.c:121
12535msgid "preserve initially empty commits"
12536msgstr "保留初始化的空提交"
12537
12538#: builtin/revert.c:122
12539msgid "allow commits with empty messages"
12540msgstr "允许提交说明为空"
12541
12542#: builtin/revert.c:123
12543msgid "keep redundant, empty commits"
12544msgstr "保持多余的、空的提交"
12545
12546#: builtin/revert.c:211
12547msgid "revert failed"
12548msgstr "还原失败"
12549
12550#: builtin/revert.c:224
12551msgid "cherry-pick failed"
12552msgstr "拣选失败"
12553
12554#: builtin/rm.c:17
12555msgid "git rm [<options>] [--] <file>..."
12556msgstr "git rm [<选项>] [--] <文件>..."
12557
12558#: builtin/rm.c:205
12559msgid ""
12560"the following file has staged content different from both the\n"
12561"file and the HEAD:"
12562msgid_plural ""
12563"the following files have staged content different from both the\n"
12564"file and the HEAD:"
12565msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12566msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12567
12568#: builtin/rm.c:210
12569msgid ""
12570"\n"
12571"(use -f to force removal)"
12572msgstr ""
12573"\n"
12574"(使用 -f 强制删除)"
12575
12576#: builtin/rm.c:214
12577msgid "the following file has changes staged in the index:"
12578msgid_plural "the following files have changes staged in the index:"
12579msgstr[0] "下列文件索引中有变更"
12580msgstr[1] "下列文件索引中有变更"
12581
12582#: builtin/rm.c:218 builtin/rm.c:227
12583msgid ""
12584"\n"
12585"(use --cached to keep the file, or -f to force removal)"
12586msgstr ""
12587"\n"
12588"(使用 --cached 保留本地文件,或用 -f 强制删除)"
12589
12590#: builtin/rm.c:224
12591msgid "the following file has local modifications:"
12592msgid_plural "the following files have local modifications:"
12593msgstr[0] "如下文件有本地修改:"
12594msgstr[1] "如下文件有本地修改:"
12595
12596#: builtin/rm.c:242
12597msgid "do not list removed files"
12598msgstr "不列出删除的文件"
12599
12600#: builtin/rm.c:243
12601msgid "only remove from the index"
12602msgstr "只从索引区删除"
12603
12604#: builtin/rm.c:244
12605msgid "override the up-to-date check"
12606msgstr "忽略文件更新状态检查"
12607
12608#: builtin/rm.c:245
12609msgid "allow recursive removal"
12610msgstr "允许递归删除"
12611
12612#: builtin/rm.c:247
12613msgid "exit with a zero status even if nothing matched"
12614msgstr "即使没有匹配,也以零状态退出"
12615
12616#: builtin/rm.c:308
12617#, c-format
12618msgid "not removing '%s' recursively without -r"
12619msgstr "未提供 -r 选项不会递归删除 '%s'"
12620
12621#: builtin/rm.c:347
12622#, c-format
12623msgid "git rm: unable to remove %s"
12624msgstr "git rm:不能删除 %s"
12625
12626#: builtin/rm.c:370
12627#, c-format
12628msgid "could not remove '%s'"
12629msgstr "无法删除 '%s'"
12630
12631#: builtin/send-pack.c:18
12632msgid ""
12633"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12634"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
12635"[<ref>...]\n"
12636"  --all and explicit <ref> specification are mutually exclusive."
12637msgstr ""
12638"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12639"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
12640"  --all 和明确的 <引用> 互斥。"
12641
12642#: builtin/send-pack.c:161
12643msgid "remote name"
12644msgstr "远程名称"
12645
12646#: builtin/send-pack.c:175
12647msgid "use stateless RPC protocol"
12648msgstr "使用无状态的 RPC 协议"
12649
12650#: builtin/send-pack.c:176
12651msgid "read refs from stdin"
12652msgstr "从标准输入读取引用"
12653
12654#: builtin/send-pack.c:177
12655msgid "print status from remote helper"
12656msgstr "打印来自远程 helper 的状态"
12657
12658#: builtin/shortlog.c:13
12659msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
12660msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
12661
12662#: builtin/shortlog.c:248
12663msgid "Group by committer rather than author"
12664msgstr "按照提交者分组而不是作者"
12665
12666#: builtin/shortlog.c:250
12667msgid "sort output according to the number of commits per author"
12668msgstr "根据每个作者的提交数量排序"
12669
12670#: builtin/shortlog.c:252
12671msgid "Suppress commit descriptions, only provides commit count"
12672msgstr "隐藏提交说明,只提供提交数量"
12673
12674#: builtin/shortlog.c:254
12675msgid "Show the email address of each author"
12676msgstr "显示每个作者的电子邮件地址"
12677
12678#: builtin/shortlog.c:255
12679msgid "w[,i1[,i2]]"
12680msgstr "w[,i1[,i2]]"
12681
12682#: builtin/shortlog.c:256
12683msgid "Linewrap output"
12684msgstr "折行输出"
12685
12686#: builtin/show-branch.c:10
12687msgid ""
12688"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
12689"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
12690"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12691"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
12692msgstr ""
12693"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
12694"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
12695"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12696"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
12697
12698#: builtin/show-branch.c:14
12699msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
12700msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
12701
12702#: builtin/show-branch.c:374
12703#, c-format
12704msgid "ignoring %s; cannot handle more than %d ref"
12705msgid_plural "ignoring %s; cannot handle more than %d refs"
12706msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
12707msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
12708
12709#: builtin/show-branch.c:536
12710#, c-format
12711msgid "no matching refs with %s"
12712msgstr "没有和 %s 匹配的引用"
12713
12714#: builtin/show-branch.c:632
12715msgid "show remote-tracking and local branches"
12716msgstr "显示远程跟踪的和本地的分支"
12717
12718#: builtin/show-branch.c:634
12719msgid "show remote-tracking branches"
12720msgstr "显示远程跟踪的分支"
12721
12722#: builtin/show-branch.c:636
12723msgid "color '*!+-' corresponding to the branch"
12724msgstr "着色 '*!+-' 到相应的分支"
12725
12726#: builtin/show-branch.c:638
12727msgid "show <n> more commits after the common ancestor"
12728msgstr "显示共同祖先后的 <n> 个提交"
12729
12730#: builtin/show-branch.c:640
12731msgid "synonym to more=-1"
12732msgstr "和 more=-1 同义"
12733
12734#: builtin/show-branch.c:641
12735msgid "suppress naming strings"
12736msgstr "不显示字符串命名"
12737
12738#: builtin/show-branch.c:643
12739msgid "include the current branch"
12740msgstr "包括当前分支"
12741
12742#: builtin/show-branch.c:645
12743msgid "name commits with their object names"
12744msgstr "以对象名字命名提交"
12745
12746#: builtin/show-branch.c:647
12747msgid "show possible merge bases"
12748msgstr "显示可能合并的基线"
12749
12750#: builtin/show-branch.c:649
12751msgid "show refs unreachable from any other ref"
12752msgstr "显示没有任何引用的的引用"
12753
12754#: builtin/show-branch.c:651
12755msgid "show commits in topological order"
12756msgstr "以拓扑顺序显示提交"
12757
12758#: builtin/show-branch.c:654
12759msgid "show only commits not on the first branch"
12760msgstr "只显示不在第一个分支上的提交"
12761
12762#: builtin/show-branch.c:656
12763msgid "show merges reachable from only one tip"
12764msgstr "显示仅一个分支可访问的合并提交"
12765
12766#: builtin/show-branch.c:658
12767msgid "topologically sort, maintaining date order where possible"
12768msgstr "拓扑方式排序,并尽可能地保持日期顺序"
12769
12770#: builtin/show-branch.c:661
12771msgid "<n>[,<base>]"
12772msgstr "<n>[,<base>]"
12773
12774#: builtin/show-branch.c:662
12775msgid "show <n> most recent ref-log entries starting at base"
12776msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
12777
12778#: builtin/show-branch.c:696
12779msgid ""
12780"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12781msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
12782
12783#: builtin/show-branch.c:720
12784msgid "no branches given, and HEAD is not valid"
12785msgstr "未提供分支,且 HEAD 无效"
12786
12787#: builtin/show-branch.c:723
12788msgid "--reflog option needs one branch name"
12789msgstr "选项 --reflog 需要一个分支名"
12790
12791#: builtin/show-branch.c:726
12792#, c-format
12793msgid "only %d entry can be shown at one time."
12794msgid_plural "only %d entries can be shown at one time."
12795msgstr[0] "一次只能显示 %d 个条目。"
12796msgstr[1] "一次只能显示 %d 个条目。"
12797
12798#: builtin/show-branch.c:730
12799#, c-format
12800msgid "no such ref %s"
12801msgstr "无此引用 %s"
12802
12803#: builtin/show-branch.c:814
12804#, c-format
12805msgid "cannot handle more than %d rev."
12806msgid_plural "cannot handle more than %d revs."
12807msgstr[0] "不能处理 %d 个以上的版本。"
12808msgstr[1] "不能处理 %d 个以上的版本。"
12809
12810#: builtin/show-branch.c:818
12811#, c-format
12812msgid "'%s' is not a valid ref."
12813msgstr "'%s' 不是一个有效的引用。"
12814
12815#: builtin/show-branch.c:821
12816#, c-format
12817msgid "cannot find commit %s (%s)"
12818msgstr "不能找到提交 %s(%s)"
12819
12820#: builtin/show-ref.c:10
12821msgid ""
12822"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12823"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
12824msgstr ""
12825"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12826"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
12827
12828#: builtin/show-ref.c:11
12829msgid "git show-ref --exclude-existing[=<pattern>]"
12830msgstr "git show-ref --exclude-existing[=<模式>]"
12831
12832#: builtin/show-ref.c:159
12833msgid "only show tags (can be combined with heads)"
12834msgstr "只显示标签(可以和头共用)"
12835
12836#: builtin/show-ref.c:160
12837msgid "only show heads (can be combined with tags)"
12838msgstr "只显示头(可以和标签共用)"
12839
12840#: builtin/show-ref.c:161
12841msgid "stricter reference checking, requires exact ref path"
12842msgstr "更严格的引用检测,需要精确的引用路径"
12843
12844#: builtin/show-ref.c:164 builtin/show-ref.c:166
12845msgid "show the HEAD reference, even if it would be filtered out"
12846msgstr "显示 HEAD 引用,即使被过滤掉"
12847
12848#: builtin/show-ref.c:168
12849msgid "dereference tags into object IDs"
12850msgstr "转换标签到对象 ID"
12851
12852#: builtin/show-ref.c:170
12853msgid "only show SHA1 hash using <n> digits"
12854msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
12855
12856#: builtin/show-ref.c:174
12857msgid "do not print results to stdout (useful with --verify)"
12858msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
12859
12860#: builtin/show-ref.c:176
12861msgid "show refs from stdin that aren't in local repository"
12862msgstr "显示从标准输入中读入的不在本地仓库中的引用"
12863
12864#: builtin/stripspace.c:17
12865msgid "git stripspace [-s | --strip-comments]"
12866msgstr "git stripspace [-s | --strip-comments]"
12867
12868#: builtin/stripspace.c:18
12869msgid "git stripspace [-c | --comment-lines]"
12870msgstr "git stripspace [-c | --comment-lines]"
12871
12872#: builtin/stripspace.c:35
12873msgid "skip and remove all lines starting with comment character"
12874msgstr "跳过和移除所有的注释行"
12875
12876#: builtin/stripspace.c:38
12877msgid "prepend comment character and space to each line"
12878msgstr "为每一行的行首添加注释符和空格"
12879
12880#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
12881#, c-format
12882msgid "No such ref: %s"
12883msgstr "没有这样的引用:%s"
12884
12885#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
12886#, c-format
12887msgid "Expecting a full ref name, got %s"
12888msgstr "期望一个完整的引用名称,却得到 %s"
12889
12890#: builtin/submodule--helper.c:71
12891#, c-format
12892msgid "cannot strip one component off url '%s'"
12893msgstr "无法从 url '%s' 剥离一个组件"
12894
12895#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
12896msgid "alternative anchor for relative paths"
12897msgstr "相对路径的替代锚记(anchor)"
12898
12899#: builtin/submodule--helper.c:310
12900msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
12901msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
12902
12903#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
12904#, c-format
12905msgid "No url found for submodule path '%s' in .gitmodules"
12906msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
12907
12908#: builtin/submodule--helper.c:395
12909#, c-format
12910msgid ""
12911"could not lookup configuration '%s'. Assuming this repository is its own "
12912"authoritative upstream."
12913msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
12914
12915#: builtin/submodule--helper.c:406
12916#, c-format
12917msgid "Failed to register url for submodule path '%s'"
12918msgstr "无法为子模组 '%s' 注册 url"
12919
12920#: builtin/submodule--helper.c:410
12921#, c-format
12922msgid "Submodule '%s' (%s) registered for path '%s'\n"
12923msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
12924
12925#
12926#: builtin/submodule--helper.c:420
12927#, c-format
12928msgid "warning: command update mode suggested for submodule '%s'\n"
12929msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
12930
12931#: builtin/submodule--helper.c:427
12932#, c-format
12933msgid "Failed to register update mode for submodule path '%s'"
12934msgstr "无法为子模组 '%s' 注册更新模式"
12935
12936#: builtin/submodule--helper.c:443
12937msgid "Suppress output for initializing a submodule"
12938msgstr "初始化子模组时抑制输出"
12939
12940#: builtin/submodule--helper.c:448
12941msgid "git submodule--helper init [<path>]"
12942msgstr "git submodule--helper init [<路径>]"
12943
12944#: builtin/submodule--helper.c:476
12945msgid "git submodule--helper name <path>"
12946msgstr "git submodule--helper name <路径>"
12947
12948#: builtin/submodule--helper.c:482
12949#, c-format
12950msgid "no submodule mapping found in .gitmodules for path '%s'"
12951msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
12952
12953#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
12954#, c-format
12955msgid "submodule '%s' cannot add alternate: %s"
12956msgstr "子模组 '%s' 不能添加仓库备选:%s"
12957
12958#: builtin/submodule--helper.c:604
12959#, c-format
12960msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
12961msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
12962
12963#: builtin/submodule--helper.c:611
12964#, c-format
12965msgid "Value '%s' for submodule.alternateLocation is not recognized"
12966msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
12967
12968#: builtin/submodule--helper.c:633
12969msgid "where the new submodule will be cloned to"
12970msgstr "新的子模组将要克隆的路径"
12971
12972#: builtin/submodule--helper.c:636
12973msgid "name of the new submodule"
12974msgstr "新子模组的名称"
12975
12976#: builtin/submodule--helper.c:639
12977msgid "url where to clone the submodule from"
12978msgstr "克隆子模组的 url 地址"
12979
12980#: builtin/submodule--helper.c:645
12981msgid "depth for shallow clones"
12982msgstr "浅克隆的深度"
12983
12984#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
12985msgid "force cloning progress"
12986msgstr "强制显示克隆进度"
12987
12988#: builtin/submodule--helper.c:653
12989msgid ""
12990"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
12991"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
12992msgstr ""
12993"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
12994"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
12995
12996#: builtin/submodule--helper.c:684
12997#, c-format
12998msgid "clone of '%s' into submodule path '%s' failed"
12999msgstr "无法克隆 '%s' 到子模组路径 '%s'"
13000
13001#: builtin/submodule--helper.c:699
13002#, c-format
13003msgid "could not get submodule directory for '%s'"
13004msgstr "无法得到 '%s' 的子模组目录"
13005
13006#: builtin/submodule--helper.c:764
13007#, c-format
13008msgid "Submodule path '%s' not initialized"
13009msgstr "子模组 '%s' 尚未初始化"
13010
13011#: builtin/submodule--helper.c:768
13012msgid "Maybe you want to use 'update --init'?"
13013msgstr "也许您想要执行 'update --init'?"
13014
13015#: builtin/submodule--helper.c:793
13016#, c-format
13017msgid "Skipping unmerged submodule %s"
13018msgstr "略过未合并的子模组 %s"
13019
13020#: builtin/submodule--helper.c:814
13021#, c-format
13022msgid "Skipping submodule '%s'"
13023msgstr "略过子模组 '%s'"
13024
13025#: builtin/submodule--helper.c:942
13026#, c-format
13027msgid "Failed to clone '%s'. Retry scheduled"
13028msgstr "克隆 '%s' 失败。按计划重试"
13029
13030#: builtin/submodule--helper.c:953
13031#, c-format
13032msgid "Failed to clone '%s' a second time, aborting"
13033msgstr "第二次尝试克隆 '%s' 失败,退出"
13034
13035#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
13036msgid "path into the working tree"
13037msgstr "到工作区的路径"
13038
13039#: builtin/submodule--helper.c:977
13040msgid "path into the working tree, across nested submodule boundaries"
13041msgstr "工作区中的路径,递归嵌套子模组"
13042
13043#: builtin/submodule--helper.c:981
13044msgid "rebase, merge, checkout or none"
13045msgstr "rebase、merge、checkout 或 none"
13046
13047#: builtin/submodule--helper.c:985
13048msgid "Create a shallow clone truncated to the specified number of revisions"
13049msgstr "创建一个指定深度的浅克隆"
13050
13051#: builtin/submodule--helper.c:988
13052msgid "parallel jobs"
13053msgstr "并发任务"
13054
13055#: builtin/submodule--helper.c:990
13056msgid "whether the initial clone should follow the shallow recommendation"
13057msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
13058
13059#: builtin/submodule--helper.c:991
13060msgid "don't print cloning progress"
13061msgstr "不要输出克隆进度"
13062
13063#: builtin/submodule--helper.c:998
13064msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
13065msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
13066
13067#: builtin/submodule--helper.c:1008
13068msgid "bad value for update parameter"
13069msgstr "update 参数取值错误"
13070
13071#: builtin/submodule--helper.c:1079
13072#, c-format
13073msgid ""
13074"Submodule (%s) branch configured to inherit branch from superproject, but "
13075"the superproject is not on any branch"
13076msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
13077
13078#: builtin/submodule--helper.c:1163
13079msgid "recurse into submodules"
13080msgstr "在子模组中递归"
13081
13082#: builtin/submodule--helper.c:1169
13083msgid "git submodule--helper embed-git-dir [<path>...]"
13084msgstr "git submodule--helper embed-git-dir [<路径>...]"
13085
13086#: builtin/submodule--helper.c:1226
13087msgid "submodule--helper subcommand must be called with a subcommand"
13088msgstr "submodule-helper 子命令必须由另外的子命令调用"
13089
13090#: builtin/submodule--helper.c:1233
13091#, c-format
13092msgid "%s doesn't support --super-prefix"
13093msgstr "%s 不支持 --super-prefix"
13094
13095#: builtin/submodule--helper.c:1239
13096#, c-format
13097msgid "'%s' is not a valid submodule--helper subcommand"
13098msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
13099
13100#: builtin/symbolic-ref.c:7
13101msgid "git symbolic-ref [<options>] <name> [<ref>]"
13102msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
13103
13104#: builtin/symbolic-ref.c:8
13105msgid "git symbolic-ref -d [-q] <name>"
13106msgstr "git symbolic-ref -d [-q] <名称>"
13107
13108#: builtin/symbolic-ref.c:40
13109msgid "suppress error message for non-symbolic (detached) refs"
13110msgstr "不显示非符号(分离的)引用的错误信息"
13111
13112#: builtin/symbolic-ref.c:41
13113msgid "delete symbolic ref"
13114msgstr "删除符号引用"
13115
13116#: builtin/symbolic-ref.c:42
13117msgid "shorten ref output"
13118msgstr "简短的引用输出"
13119
13120#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
13121msgid "reason"
13122msgstr "原因"
13123
13124#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
13125msgid "reason of the update"
13126msgstr "更新的原因"
13127
13128#: builtin/tag.c:23
13129msgid ""
13130"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
13131"[<head>]"
13132msgstr ""
13133"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
13134
13135#: builtin/tag.c:24
13136msgid "git tag -d <tagname>..."
13137msgstr "git tag -d <标签名>..."
13138
13139#: builtin/tag.c:25
13140msgid ""
13141"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
13142"points-at <object>]\n"
13143"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
13144msgstr ""
13145"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
13146"at <对象>]\n"
13147"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
13148
13149#: builtin/tag.c:27
13150msgid "git tag -v [--format=<format>] <tagname>..."
13151msgstr "git tag -v [--format=<格式>] <标签名>..."
13152
13153#: builtin/tag.c:83
13154#, c-format
13155msgid "tag '%s' not found."
13156msgstr "未发现标签 '%s'。"
13157
13158#: builtin/tag.c:99
13159#, c-format
13160msgid "Deleted tag '%s' (was %s)\n"
13161msgstr "已删除标签 '%s'(曾为 %s)\n"
13162
13163#: builtin/tag.c:128
13164#, c-format
13165msgid ""
13166"\n"
13167"Write a message for tag:\n"
13168"  %s\n"
13169"Lines starting with '%c' will be ignored.\n"
13170msgstr ""
13171"\n"
13172"输入一个标签说明:\n"
13173"  %s\n"
13174"以 '%c' 开头的行将被忽略。\n"
13175
13176#: builtin/tag.c:132
13177#, c-format
13178msgid ""
13179"\n"
13180"Write a message for tag:\n"
13181"  %s\n"
13182"Lines starting with '%c' will be kept; you may remove them yourself if you "
13183"want to.\n"
13184msgstr ""
13185"\n"
13186"输入一个标签说明:\n"
13187"  %s\n"
13188"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
13189
13190#: builtin/tag.c:210
13191msgid "unable to sign the tag"
13192msgstr "无法签署标签"
13193
13194#: builtin/tag.c:212
13195msgid "unable to write tag file"
13196msgstr "无法写标签文件"
13197
13198#: builtin/tag.c:236
13199msgid "bad object type."
13200msgstr "坏的对象类型。"
13201
13202#: builtin/tag.c:282
13203msgid "no tag message?"
13204msgstr "无标签说明?"
13205
13206#: builtin/tag.c:289
13207#, c-format
13208msgid "The tag message has been left in %s\n"
13209msgstr "标签说明被保留在 %s\n"
13210
13211#: builtin/tag.c:312
13212msgid "tag: tagging "
13213msgstr "tag: tagging "
13214
13215#: builtin/tag.c:320
13216msgid "object of unknown type"
13217msgstr "未知类型的对象"
13218
13219#: builtin/tag.c:327
13220msgid "commit object"
13221msgstr "提交对象"
13222
13223#: builtin/tag.c:335
13224msgid "tree object"
13225msgstr "树对象"
13226
13227#: builtin/tag.c:338
13228msgid "blob object"
13229msgstr "数据对象"
13230
13231#: builtin/tag.c:341
13232msgid "other tag object"
13233msgstr "其它标签对象"
13234
13235#: builtin/tag.c:397
13236msgid "list tag names"
13237msgstr "列出标签名称"
13238
13239#: builtin/tag.c:399
13240msgid "print <n> lines of each tag message"
13241msgstr "每个标签信息打印 <n> 行"
13242
13243#: builtin/tag.c:401
13244msgid "delete tags"
13245msgstr "删除标签"
13246
13247#: builtin/tag.c:402
13248msgid "verify tags"
13249msgstr "验证标签"
13250
13251#: builtin/tag.c:404
13252msgid "Tag creation options"
13253msgstr "标签创建选项"
13254
13255#: builtin/tag.c:406
13256msgid "annotated tag, needs a message"
13257msgstr "附注标签,需要一个说明"
13258
13259#: builtin/tag.c:408
13260msgid "tag message"
13261msgstr "标签说明"
13262
13263#: builtin/tag.c:410
13264msgid "annotated and GPG-signed tag"
13265msgstr "附注并附加 GPG 签名的标签"
13266
13267#: builtin/tag.c:414
13268msgid "use another key to sign the tag"
13269msgstr "使用另外的私钥签名该标签"
13270
13271#: builtin/tag.c:415
13272msgid "replace the tag if exists"
13273msgstr "如果存在,替换现有的标签"
13274
13275#: builtin/tag.c:416 builtin/update-ref.c:368
13276msgid "create a reflog"
13277msgstr "创建引用日志"
13278
13279#: builtin/tag.c:418
13280msgid "Tag listing options"
13281msgstr "标签列表选项"
13282
13283#: builtin/tag.c:419
13284msgid "show tag list in columns"
13285msgstr "以列的方式显示标签列表"
13286
13287#: builtin/tag.c:420 builtin/tag.c:422
13288msgid "print only tags that contain the commit"
13289msgstr "只打印包含该提交的标签"
13290
13291#: builtin/tag.c:421 builtin/tag.c:423
13292msgid "print only tags that don't contain the commit"
13293msgstr "只打印不包含该提交的标签"
13294
13295#: builtin/tag.c:424
13296msgid "print only tags that are merged"
13297msgstr "只打印已经合并的标签"
13298
13299#: builtin/tag.c:425
13300msgid "print only tags that are not merged"
13301msgstr "只打印尚未合并的标签"
13302
13303#: builtin/tag.c:430
13304msgid "print only tags of the object"
13305msgstr "只打印指向该对象的标签"
13306
13307#: builtin/tag.c:469
13308msgid "--column and -n are incompatible"
13309msgstr "--column 和 -n 不兼容"
13310
13311#: builtin/tag.c:491
13312msgid "-n option is only allowed in list mode"
13313msgstr "-n 选项只允许用在列表显示模式"
13314
13315#: builtin/tag.c:493
13316msgid "--contains option is only allowed in list mode"
13317msgstr "--contains 选项只允许用在列表显示模式"
13318
13319#: builtin/tag.c:495
13320msgid "--no-contains option is only allowed in list mode"
13321msgstr "--no-contains 选项只允许用在列表显示模式"
13322
13323#: builtin/tag.c:497
13324msgid "--points-at option is only allowed in list mode"
13325msgstr "--points-at 选项只允许用在列表显示模式"
13326
13327#: builtin/tag.c:499
13328msgid "--merged and --no-merged options are only allowed in list mode"
13329msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
13330
13331#: builtin/tag.c:510
13332msgid "only one -F or -m option is allowed."
13333msgstr "只允许一个 -F 或 -m 选项。"
13334
13335#: builtin/tag.c:529
13336msgid "too many params"
13337msgstr "太多参数"
13338
13339#: builtin/tag.c:535
13340#, c-format
13341msgid "'%s' is not a valid tag name."
13342msgstr "'%s' 不是一个有效的标签名称。"
13343
13344#: builtin/tag.c:540
13345#, c-format
13346msgid "tag '%s' already exists"
13347msgstr "标签 '%s' 已存在"
13348
13349#: builtin/tag.c:570
13350#, c-format
13351msgid "Updated tag '%s' (was %s)\n"
13352msgstr "已更新标签 '%s'(曾为 %s)\n"
13353
13354#: builtin/unpack-objects.c:493
13355msgid "Unpacking objects"
13356msgstr "展开对象中"
13357
13358#: builtin/update-index.c:79
13359#, c-format
13360msgid "failed to create directory %s"
13361msgstr "无法创建目录 %s"
13362
13363#: builtin/update-index.c:85
13364#, c-format
13365msgid "failed to stat %s"
13366msgstr "无法枚举 %s 状态"
13367
13368#: builtin/update-index.c:95
13369#, c-format
13370msgid "failed to create file %s"
13371msgstr "无法创建文件 %s"
13372
13373#: builtin/update-index.c:103
13374#, c-format
13375msgid "failed to delete file %s"
13376msgstr "无法删除文件 %s"
13377
13378#: builtin/update-index.c:110 builtin/update-index.c:216
13379#, c-format
13380msgid "failed to delete directory %s"
13381msgstr "无法删除目录 %s"
13382
13383#: builtin/update-index.c:135
13384#, c-format
13385msgid "Testing mtime in '%s' "
13386msgstr "在 '%s' 中测试 mtime "
13387
13388#: builtin/update-index.c:149
13389msgid "directory stat info does not change after adding a new file"
13390msgstr "添加一个新文件后,目录的状态信息未改变"
13391
13392#: builtin/update-index.c:162
13393msgid "directory stat info does not change after adding a new directory"
13394msgstr "添加一个新目录后,目录的状态信息未改变"
13395
13396#: builtin/update-index.c:175
13397msgid "directory stat info changes after updating a file"
13398msgstr "更新一个文件后,目录的状态信息被修改"
13399
13400#: builtin/update-index.c:186
13401msgid "directory stat info changes after adding a file inside subdirectory"
13402msgstr "在子目录中添加文件后,目录的状态信息被修改"
13403
13404#: builtin/update-index.c:197
13405msgid "directory stat info does not change after deleting a file"
13406msgstr "删除一个文件后,目录的状态信息未改变"
13407
13408#: builtin/update-index.c:210
13409msgid "directory stat info does not change after deleting a directory"
13410msgstr "删除一个目录后,目录的状态信息未改变"
13411
13412#: builtin/update-index.c:217
13413msgid " OK"
13414msgstr " OK"
13415
13416#: builtin/update-index.c:568
13417msgid "git update-index [<options>] [--] [<file>...]"
13418msgstr "git update-index [<选项>] [--] [<文件>...]"
13419
13420#: builtin/update-index.c:923
13421msgid "continue refresh even when index needs update"
13422msgstr "当索引需要更新时继续刷新"
13423
13424#: builtin/update-index.c:926
13425msgid "refresh: ignore submodules"
13426msgstr "刷新:忽略子模组"
13427
13428#: builtin/update-index.c:929
13429msgid "do not ignore new files"
13430msgstr "不忽略新的文件"
13431
13432#: builtin/update-index.c:931
13433msgid "let files replace directories and vice-versa"
13434msgstr "让文件替换目录(反之亦然)"
13435
13436#: builtin/update-index.c:933
13437msgid "notice files missing from worktree"
13438msgstr "通知文件从工作区丢失"
13439
13440#: builtin/update-index.c:935
13441msgid "refresh even if index contains unmerged entries"
13442msgstr "即使索引区包含未合并的条目也执行刷新"
13443
13444#: builtin/update-index.c:938
13445msgid "refresh stat information"
13446msgstr "刷新统计信息"
13447
13448#: builtin/update-index.c:942
13449msgid "like --refresh, but ignore assume-unchanged setting"
13450msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
13451
13452#: builtin/update-index.c:946
13453msgid "<mode>,<object>,<path>"
13454msgstr "<存取模式>,<对象>,<路径>"
13455
13456#: builtin/update-index.c:947
13457msgid "add the specified entry to the index"
13458msgstr "添加指定的条目到索引区"
13459
13460#: builtin/update-index.c:956
13461msgid "mark files as \"not changing\""
13462msgstr "把文件标记为 \"没有变更\""
13463
13464#: builtin/update-index.c:959
13465msgid "clear assumed-unchanged bit"
13466msgstr "清除 assumed-unchanged 位"
13467
13468#: builtin/update-index.c:962
13469msgid "mark files as \"index-only\""
13470msgstr "把文件标记为 \"仅索引\""
13471
13472#: builtin/update-index.c:965
13473msgid "clear skip-worktree bit"
13474msgstr "清除 skip-worktree 位"
13475
13476#: builtin/update-index.c:968
13477msgid "add to index only; do not add content to object database"
13478msgstr "只添加到索引区;不添加对象到对象库"
13479
13480#: builtin/update-index.c:970
13481msgid "remove named paths even if present in worktree"
13482msgstr "即使存在工作区里,也删除路径"
13483
13484#: builtin/update-index.c:972
13485msgid "with --stdin: input lines are terminated by null bytes"
13486msgstr "携带 --stdin:输入的行以 null 字符终止"
13487
13488#: builtin/update-index.c:974
13489msgid "read list of paths to be updated from standard input"
13490msgstr "从标准输入中读取需要更新的路径列表"
13491
13492#: builtin/update-index.c:978
13493msgid "add entries from standard input to the index"
13494msgstr "从标准输入添加条目到索引区"
13495
13496#: builtin/update-index.c:982
13497msgid "repopulate stages #2 and #3 for the listed paths"
13498msgstr "为指定文件重新生成第2和第3暂存区"
13499
13500#: builtin/update-index.c:986
13501msgid "only update entries that differ from HEAD"
13502msgstr "只更新与 HEAD 不同的条目"
13503
13504#: builtin/update-index.c:990
13505msgid "ignore files missing from worktree"
13506msgstr "忽略工作区丢失的文件"
13507
13508#: builtin/update-index.c:993
13509msgid "report actions to standard output"
13510msgstr "在标准输出显示操作"
13511
13512#: builtin/update-index.c:995
13513msgid "(for porcelains) forget saved unresolved conflicts"
13514msgstr "(for porcelains) 忘记保存的未解决的冲突"
13515
13516#: builtin/update-index.c:999
13517msgid "write index in this format"
13518msgstr "以这种格式写入索引区"
13519
13520#: builtin/update-index.c:1001
13521msgid "enable or disable split index"
13522msgstr "启用或禁用索引拆分"
13523
13524#: builtin/update-index.c:1003
13525msgid "enable/disable untracked cache"
13526msgstr "启用/禁用对未跟踪文件的缓存"
13527
13528#: builtin/update-index.c:1005
13529msgid "test if the filesystem supports untracked cache"
13530msgstr "测试文件系统是否支持未跟踪文件缓存"
13531
13532#: builtin/update-index.c:1007
13533msgid "enable untracked cache without testing the filesystem"
13534msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
13535
13536#: builtin/update-index.c:1107
13537msgid ""
13538"core.splitIndex is set to false; remove or change it, if you really want to "
13539"enable split index"
13540msgstr ""
13541"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
13542
13543#: builtin/update-index.c:1116
13544msgid ""
13545"core.splitIndex is set to true; remove or change it, if you really want to "
13546"disable split index"
13547msgstr ""
13548"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
13549
13550#: builtin/update-index.c:1127
13551msgid ""
13552"core.untrackedCache is set to true; remove or change it, if you really want "
13553"to disable the untracked cache"
13554msgstr ""
13555"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
13556"改它。"
13557
13558#: builtin/update-index.c:1131
13559msgid "Untracked cache disabled"
13560msgstr "缓存未跟踪文件被禁用"
13561
13562#: builtin/update-index.c:1139
13563msgid ""
13564"core.untrackedCache is set to false; remove or change it, if you really want "
13565"to enable the untracked cache"
13566msgstr ""
13567"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
13568"修改它。"
13569
13570#: builtin/update-index.c:1143
13571#, c-format
13572msgid "Untracked cache enabled for '%s'"
13573msgstr "缓存未跟踪文件在 '%s' 启用"
13574
13575#: builtin/update-ref.c:9
13576msgid "git update-ref [<options>] -d <refname> [<old-val>]"
13577msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
13578
13579#: builtin/update-ref.c:10
13580msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
13581msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
13582
13583#: builtin/update-ref.c:11
13584msgid "git update-ref [<options>] --stdin [-z]"
13585msgstr "git update-ref [<选项>] --stdin [-z]"
13586
13587#: builtin/update-ref.c:363
13588msgid "delete the reference"
13589msgstr "删除引用"
13590
13591#: builtin/update-ref.c:365
13592msgid "update <refname> not the one it points to"
13593msgstr "更新 <引用名> 本身而不是它指向的引用"
13594
13595#: builtin/update-ref.c:366
13596msgid "stdin has NUL-terminated arguments"
13597msgstr "标准输入有以 NUL 字符终止的参数"
13598
13599#: builtin/update-ref.c:367
13600msgid "read updates from stdin"
13601msgstr "从标准输入读取更新"
13602
13603#: builtin/update-server-info.c:6
13604msgid "git update-server-info [--force]"
13605msgstr "git update-server-info [--force]"
13606
13607#: builtin/update-server-info.c:14
13608msgid "update the info files from scratch"
13609msgstr "从头开始更新文件信息"
13610
13611#: builtin/verify-commit.c:17
13612msgid "git verify-commit [-v | --verbose] <commit>..."
13613msgstr "git verify-commit [-v | --verbose] <提交>..."
13614
13615#: builtin/verify-commit.c:72
13616msgid "print commit contents"
13617msgstr "打印提交内容"
13618
13619#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
13620msgid "print raw gpg status output"
13621msgstr "打印原始 gpg 状态输出"
13622
13623#: builtin/verify-pack.c:54
13624msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
13625msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
13626
13627#: builtin/verify-pack.c:64
13628msgid "verbose"
13629msgstr "冗长输出"
13630
13631#: builtin/verify-pack.c:66
13632msgid "show statistics only"
13633msgstr "只显示统计"
13634
13635#: builtin/verify-tag.c:18
13636msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
13637msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
13638
13639#: builtin/verify-tag.c:36
13640msgid "print tag contents"
13641msgstr "打印标签内容"
13642
13643#: builtin/worktree.c:15
13644msgid "git worktree add [<options>] <path> [<branch>]"
13645msgstr "git worktree add [<选项>] <路径> [<分支>]"
13646
13647#: builtin/worktree.c:16
13648msgid "git worktree list [<options>]"
13649msgstr "git worktree list [<选项>]"
13650
13651#: builtin/worktree.c:17
13652msgid "git worktree lock [<options>] <path>"
13653msgstr "git worktree lock [<选项>] <路径>"
13654
13655#: builtin/worktree.c:18
13656msgid "git worktree prune [<options>]"
13657msgstr "git worktree prune [<选项>]"
13658
13659#: builtin/worktree.c:19
13660msgid "git worktree unlock <path>"
13661msgstr "git worktree unlock <路径>"
13662
13663#: builtin/worktree.c:42
13664#, c-format
13665msgid "Removing worktrees/%s: not a valid directory"
13666msgstr "删除工作区/%s:不是一个有效的目录"
13667
13668#: builtin/worktree.c:48
13669#, c-format
13670msgid "Removing worktrees/%s: gitdir file does not exist"
13671msgstr "删除 worktrees/%s:gitdir 文件不存在"
13672
13673#: builtin/worktree.c:53
13674#, c-format
13675msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
13676msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
13677
13678#: builtin/worktree.c:64
13679#, c-format
13680msgid "Removing worktrees/%s: invalid gitdir file"
13681msgstr "删除 worktrees/%s:无效的 gitdir 文件"
13682
13683#: builtin/worktree.c:80
13684#, c-format
13685msgid "Removing worktrees/%s: gitdir file points to non-existent location"
13686msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
13687
13688#: builtin/worktree.c:128
13689msgid "report pruned working trees"
13690msgstr "报告清除的工作区"
13691
13692#: builtin/worktree.c:130
13693msgid "expire working trees older than <time>"
13694msgstr "将早于 <time> 的工作区过期"
13695
13696#: builtin/worktree.c:204
13697#, c-format
13698msgid "'%s' already exists"
13699msgstr "'%s' 已经存在"
13700
13701#: builtin/worktree.c:236
13702#, c-format
13703msgid "could not create directory of '%s'"
13704msgstr "不能创建目录 '%s'"
13705
13706#: builtin/worktree.c:272
13707#, c-format
13708msgid "Preparing %s (identifier %s)"
13709msgstr "准备 %s(标识符 %s)"
13710
13711#: builtin/worktree.c:324
13712msgid "checkout <branch> even if already checked out in other worktree"
13713msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
13714
13715#: builtin/worktree.c:326
13716msgid "create a new branch"
13717msgstr "创建一个新分支"
13718
13719#: builtin/worktree.c:328
13720msgid "create or reset a branch"
13721msgstr "创建或重置一个分支"
13722
13723#: builtin/worktree.c:330
13724msgid "populate the new working tree"
13725msgstr "生成新的工作区"
13726
13727#: builtin/worktree.c:338
13728msgid "-b, -B, and --detach are mutually exclusive"
13729msgstr "-b、-B 和 --detach 是互斥的"
13730
13731#: builtin/worktree.c:473
13732msgid "reason for locking"
13733msgstr "锁定原因"
13734
13735#: builtin/worktree.c:485 builtin/worktree.c:518
13736#, c-format
13737msgid "'%s' is not a working tree"
13738msgstr "'%s' 不是一个工作区"
13739
13740#: builtin/worktree.c:487 builtin/worktree.c:520
13741msgid "The main working tree cannot be locked or unlocked"
13742msgstr "主工作区无法被加锁或解锁"
13743
13744#: builtin/worktree.c:492
13745#, c-format
13746msgid "'%s' is already locked, reason: %s"
13747msgstr "'%s' 已被锁定,原因:%s"
13748
13749#: builtin/worktree.c:494
13750#, c-format
13751msgid "'%s' is already locked"
13752msgstr "'%s' 已被锁定"
13753
13754#: builtin/worktree.c:522
13755#, c-format
13756msgid "'%s' is not locked"
13757msgstr "'%s' 未被锁定"
13758
13759#: builtin/write-tree.c:13
13760msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
13761msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
13762
13763#: builtin/write-tree.c:26
13764msgid "<prefix>/"
13765msgstr "<前缀>/"
13766
13767#: builtin/write-tree.c:27
13768msgid "write tree object for a subdirectory <prefix>"
13769msgstr "将 <前缀> 子目录内容写到一个树对象"
13770
13771#: builtin/write-tree.c:30
13772msgid "only useful for debugging"
13773msgstr "只对调试有用"
13774
13775#: upload-pack.c:22
13776msgid "git upload-pack [<options>] <dir>"
13777msgstr "git upload-pack [<选项>] <目录>"
13778
13779#: upload-pack.c:1040
13780msgid "quit after a single request/response exchange"
13781msgstr "在一次单独的请求/响应(request/response)交换后退出"
13782
13783#: upload-pack.c:1042
13784msgid "exit immediately after initial ref advertisement"
13785msgstr "在初始的引用广告后立即退出"
13786
13787#: upload-pack.c:1044
13788msgid "do not try <directory>/.git/ if <directory> is no Git directory"
13789msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
13790
13791#: upload-pack.c:1046
13792msgid "interrupt transfer after <n> seconds of inactivity"
13793msgstr "不活动 <n> 秒钟后终止传输"
13794
13795#: credential-cache--daemon.c:223
13796#, c-format
13797msgid ""
13798"The permissions on your socket directory are too loose; other\n"
13799"users may be able to read your cached credentials. Consider running:\n"
13800"\n"
13801"\tchmod 0700 %s"
13802msgstr ""
13803"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
13804"行:\n"
13805"\n"
13806"\tchmod 0700 %s"
13807
13808#: credential-cache--daemon.c:271
13809msgid "print debugging messages to stderr"
13810msgstr "调试信息输出到标准错误"
13811
13812#: git.c:14
13813msgid ""
13814"'git help -a' and 'git help -g' list available subcommands and some\n"
13815"concept guides. See 'git help <command>' or 'git help <concept>'\n"
13816"to read about a specific subcommand or concept."
13817msgstr ""
13818"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
13819"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
13820"帮助。"
13821
13822#: http.c:355
13823msgid "Delegation control is not supported with cURL < 7.22.0"
13824msgstr "当 cURL < 7.22.0 时,不支持委托控制"
13825
13826#: http.c:364
13827msgid "Public key pinning not supported with cURL < 7.44.0"
13828msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
13829
13830#: http.c:1755
13831#, c-format
13832msgid ""
13833"unable to update url base from redirection:\n"
13834"  asked for: %s\n"
13835"   redirect: %s"
13836msgstr ""
13837"不能更新重定向的 url base:\n"
13838"     请求:%s\n"
13839"   重定向:%s"
13840
13841#: remote-curl.c:323
13842#, c-format
13843msgid "redirecting to %s"
13844msgstr "重定向到 %s"
13845
13846#: common-cmds.h:9
13847msgid "start a working area (see also: git help tutorial)"
13848msgstr "开始一个工作区(参见:git help tutorial)"
13849
13850#: common-cmds.h:10
13851msgid "work on the current change (see also: git help everyday)"
13852msgstr "在当前变更上工作(参见:git help everyday)"
13853
13854#: common-cmds.h:11
13855msgid "examine the history and state (see also: git help revisions)"
13856msgstr "检查历史和状态(参见:git help revisions)"
13857
13858#: common-cmds.h:12
13859msgid "grow, mark and tweak your common history"
13860msgstr "扩展、标记和调校您的历史记录"
13861
13862#: common-cmds.h:13
13863msgid "collaborate (see also: git help workflows)"
13864msgstr "协同(参见:git help workflows)"
13865
13866#: common-cmds.h:17
13867msgid "Add file contents to the index"
13868msgstr "添加文件内容至索引"
13869
13870#: common-cmds.h:18
13871msgid "Use binary search to find the commit that introduced a bug"
13872msgstr "通过二分查找定位引入 bug 的提交"
13873
13874#: common-cmds.h:19
13875msgid "List, create, or delete branches"
13876msgstr "列出、创建或删除分支"
13877
13878#: common-cmds.h:20
13879msgid "Switch branches or restore working tree files"
13880msgstr "切换分支或恢复工作区文件"
13881
13882#: common-cmds.h:21
13883msgid "Clone a repository into a new directory"
13884msgstr "克隆一个仓库到一个新目录"
13885
13886#: common-cmds.h:22
13887msgid "Record changes to the repository"
13888msgstr "记录变更到仓库"
13889
13890#: common-cmds.h:23
13891msgid "Show changes between commits, commit and working tree, etc"
13892msgstr "显示提交之间、提交和工作区之间等的差异"
13893
13894#: common-cmds.h:24
13895msgid "Download objects and refs from another repository"
13896msgstr "从另外一个仓库下载对象和引用"
13897
13898#: common-cmds.h:25
13899msgid "Print lines matching a pattern"
13900msgstr "输出和模式匹配的行"
13901
13902#: common-cmds.h:26
13903msgid "Create an empty Git repository or reinitialize an existing one"
13904msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
13905
13906#: common-cmds.h:27
13907msgid "Show commit logs"
13908msgstr "显示提交日志"
13909
13910#: common-cmds.h:28
13911msgid "Join two or more development histories together"
13912msgstr "合并两个或更多开发历史"
13913
13914#: common-cmds.h:29
13915msgid "Move or rename a file, a directory, or a symlink"
13916msgstr "移动或重命名一个文件、目录或符号链接"
13917
13918#: common-cmds.h:30
13919msgid "Fetch from and integrate with another repository or a local branch"
13920msgstr "获取并整合另外的仓库或一个本地分支"
13921
13922#: common-cmds.h:31
13923msgid "Update remote refs along with associated objects"
13924msgstr "更新远程引用和相关的对象"
13925
13926#: common-cmds.h:32
13927msgid "Reapply commits on top of another base tip"
13928msgstr "在另一个分支上重新应用提交"
13929
13930#: common-cmds.h:33
13931msgid "Reset current HEAD to the specified state"
13932msgstr "重置当前 HEAD 到指定状态"
13933
13934#: common-cmds.h:34
13935msgid "Remove files from the working tree and from the index"
13936msgstr "从工作区和索引中删除文件"
13937
13938#: common-cmds.h:35
13939msgid "Show various types of objects"
13940msgstr "显示各种类型的对象"
13941
13942#: common-cmds.h:36
13943msgid "Show the working tree status"
13944msgstr "显示工作区状态"
13945
13946#: common-cmds.h:37
13947msgid "Create, list, delete or verify a tag object signed with GPG"
13948msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
13949
13950#: parse-options.h:145
13951msgid "expiry-date"
13952msgstr "到期时间"
13953
13954#: parse-options.h:160
13955msgid "no-op (backward compatibility)"
13956msgstr "空操作(向后兼容)"
13957
13958#: parse-options.h:238
13959msgid "be more verbose"
13960msgstr "更加详细"
13961
13962#: parse-options.h:240
13963msgid "be more quiet"
13964msgstr "更加安静"
13965
13966#: parse-options.h:246
13967msgid "use <n> digits to display SHA-1s"
13968msgstr "用 <n> 位数字显示 SHA-1 哈希值"
13969
13970#: rerere.h:40
13971msgid "update the index with reused conflict resolution if possible"
13972msgstr "如果可能,重用冲突解决更新索引"
13973
13974#: git-bisect.sh:54
13975msgid "You need to start by \"git bisect start\""
13976msgstr "您需要执行 \"git bisect start\" 来开始"
13977
13978#  译者:注意保持句尾空格
13979#. TRANSLATORS: Make sure to include [Y] and [n] in your
13980#. translation. The program will only accept English input
13981#. at this point.
13982#: git-bisect.sh:60
13983msgid "Do you want me to do it for you [Y/n]? "
13984msgstr "您想让我为您这样做么[Y/n]? "
13985
13986#: git-bisect.sh:121
13987#, sh-format
13988msgid "unrecognised option: '$arg'"
13989msgstr "未能识别的选项:'$arg'"
13990
13991#: git-bisect.sh:125
13992#, sh-format
13993msgid "'$arg' does not appear to be a valid revision"
13994msgstr "'$arg' 看起来不像是一个有效的版本"
13995
13996#: git-bisect.sh:154
13997msgid "Bad HEAD - I need a HEAD"
13998msgstr "坏的 HEAD - 我需要一个 HEAD"
13999
14000#: git-bisect.sh:167
14001#, sh-format
14002msgid ""
14003"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
14004msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
14005
14006#: git-bisect.sh:177
14007msgid "won't bisect on cg-seek'ed tree"
14008msgstr "不会在做了 cg-seek 的树上做二分查找"
14009
14010#: git-bisect.sh:181
14011msgid "Bad HEAD - strange symbolic ref"
14012msgstr "坏的 HEAD - 奇怪的符号引用"
14013
14014#: git-bisect.sh:233
14015#, sh-format
14016msgid "Bad bisect_write argument: $state"
14017msgstr "坏的 bisect_write 参数:$state"
14018
14019#: git-bisect.sh:262
14020#, sh-format
14021msgid "Bad rev input: $arg"
14022msgstr "坏的输入版本:$arg"
14023
14024#: git-bisect.sh:281
14025#, sh-format
14026msgid "Bad rev input: $bisected_head"
14027msgstr "坏的输入版本:$bisected_head"
14028
14029#: git-bisect.sh:290
14030#, sh-format
14031msgid "Bad rev input: $rev"
14032msgstr "坏的输入版本:$rev"
14033
14034#: git-bisect.sh:299
14035#, sh-format
14036msgid "'git bisect $TERM_BAD' can take only one argument."
14037msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
14038
14039#: git-bisect.sh:322
14040#, sh-format
14041msgid "Warning: bisecting only with a $TERM_BAD commit."
14042msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
14043
14044#  译者:注意保持句尾空格
14045#. TRANSLATORS: Make sure to include [Y] and [n] in your
14046#. translation. The program will only accept English input
14047#. at this point.
14048#: git-bisect.sh:328
14049msgid "Are you sure [Y/n]? "
14050msgstr "您确认么[Y/n]? "
14051
14052#: git-bisect.sh:340
14053#, sh-format
14054msgid ""
14055"You need to give me at least one $bad_syn and one $good_syn revision.\n"
14056"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14057msgstr ""
14058"您需要给我至少一个好版本和一个坏版本。\n"
14059"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14060
14061#: git-bisect.sh:343
14062#, sh-format
14063msgid ""
14064"You need to start by \"git bisect start\".\n"
14065"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
14066"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14067msgstr ""
14068"您需要执行 \"git bisect start\" 来开始。\n"
14069"然后需要提供我至少一个好版本和一个坏版本。\n"
14070"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14071
14072#: git-bisect.sh:414 git-bisect.sh:546
14073msgid "We are not bisecting."
14074msgstr "我们没有在二分查找。"
14075
14076#: git-bisect.sh:421
14077#, sh-format
14078msgid "'$invalid' is not a valid commit"
14079msgstr "'$invalid' 不是一个有效的提交"
14080
14081#: git-bisect.sh:430
14082#, sh-format
14083msgid ""
14084"Could not check out original HEAD '$branch'.\n"
14085"Try 'git bisect reset <commit>'."
14086msgstr ""
14087"不能检出原始 HEAD '$branch'。\n"
14088"尝试 'git bisect reset <提交>'。"
14089
14090#: git-bisect.sh:458
14091msgid "No logfile given"
14092msgstr "未提供日志文件"
14093
14094#: git-bisect.sh:459
14095#, sh-format
14096msgid "cannot read $file for replaying"
14097msgstr "不能读取 $file 来重放"
14098
14099#: git-bisect.sh:480
14100msgid "?? what are you talking about?"
14101msgstr "?? 您在说什么?"
14102
14103#: git-bisect.sh:492
14104#, sh-format
14105msgid "running $command"
14106msgstr "运行 $command"
14107
14108#: git-bisect.sh:499
14109#, sh-format
14110msgid ""
14111"bisect run failed:\n"
14112"exit code $res from '$command' is < 0 or >= 128"
14113msgstr ""
14114"二分查找运行失败:\n"
14115"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
14116
14117#: git-bisect.sh:525
14118msgid "bisect run cannot continue any more"
14119msgstr "二分查找不能继续运行"
14120
14121#: git-bisect.sh:531
14122#, sh-format
14123msgid ""
14124"bisect run failed:\n"
14125"'bisect_state $state' exited with error code $res"
14126msgstr ""
14127"二分查找运行失败:\n"
14128"'bisect_state $state' 退出码为 $res"
14129
14130#: git-bisect.sh:538
14131msgid "bisect run success"
14132msgstr "二分查找运行成功"
14133
14134#: git-bisect.sh:565
14135msgid "please use two different terms"
14136msgstr "请使用两个不同的术语"
14137
14138#: git-bisect.sh:575
14139#, sh-format
14140msgid "'$term' is not a valid term"
14141msgstr "'$term' 不是一个有效的名称"
14142
14143#: git-bisect.sh:578
14144#, sh-format
14145msgid "can't use the builtin command '$term' as a term"
14146msgstr "不能使用内置命令 '$term' 作为术语"
14147
14148#: git-bisect.sh:587 git-bisect.sh:593
14149#, sh-format
14150msgid "can't change the meaning of term '$term'"
14151msgstr "不能修改术语 '$term' 的含义"
14152
14153#: git-bisect.sh:606
14154#, sh-format
14155msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
14156msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
14157
14158#: git-bisect.sh:636
14159msgid "no terms defined"
14160msgstr "未定义术语"
14161
14162#: git-bisect.sh:653
14163#, sh-format
14164msgid ""
14165"invalid argument $arg for 'git bisect terms'.\n"
14166"Supported options are: --term-good|--term-old and --term-bad|--term-new."
14167msgstr ""
14168"参数 $arg 对命令 'git bisect terms' 无效。\n"
14169"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
14170
14171#: git-merge-octopus.sh:46
14172msgid ""
14173"Error: Your local changes to the following files would be overwritten by "
14174"merge"
14175msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
14176
14177#: git-merge-octopus.sh:61
14178msgid "Automated merge did not work."
14179msgstr "自动合并未生效。"
14180
14181#: git-merge-octopus.sh:62
14182msgid "Should not be doing an octopus."
14183msgstr "不应该执行章鱼式合并。"
14184
14185#: git-merge-octopus.sh:73
14186#, sh-format
14187msgid "Unable to find common commit with $pretty_name"
14188msgstr "无法找到和 $pretty_name 的基线提交"
14189
14190#: git-merge-octopus.sh:77
14191#, sh-format
14192msgid "Already up-to-date with $pretty_name"
14193msgstr "已经和 $pretty_name 保持一致"
14194
14195#: git-merge-octopus.sh:89
14196#, sh-format
14197msgid "Fast-forwarding to: $pretty_name"
14198msgstr "快进至:$pretty_name"
14199
14200#: git-merge-octopus.sh:97
14201#, sh-format
14202msgid "Trying simple merge with $pretty_name"
14203msgstr "尝试和 $pretty_name 的简单合并"
14204
14205#: git-merge-octopus.sh:102
14206msgid "Simple merge did not work, trying automatic merge."
14207msgstr "简单合并未生效,尝试自动合并。"
14208
14209#: git-rebase.sh:57
14210msgid ""
14211"When you have resolved this problem, run \"git rebase --continue\".\n"
14212"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
14213"To check out the original branch and stop rebasing, run \"git rebase --abort"
14214"\"."
14215msgstr ""
14216"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
14217"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
14218"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
14219
14220#: git-rebase.sh:157 git-rebase.sh:396
14221#, sh-format
14222msgid "Could not move back to $head_name"
14223msgstr "无法移回 $head_name"
14224
14225#: git-rebase.sh:171
14226#, sh-format
14227msgid "Cannot store $stash_sha1"
14228msgstr "无法保存 $stash_sha1"
14229
14230#: git-rebase.sh:211
14231msgid "The pre-rebase hook refused to rebase."
14232msgstr "钩子 pre-rebase 拒绝变基操作。"
14233
14234#: git-rebase.sh:216
14235msgid "It looks like git-am is in progress. Cannot rebase."
14236msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
14237
14238#: git-rebase.sh:357
14239msgid "No rebase in progress?"
14240msgstr "没有正在进行的变基?"
14241
14242#: git-rebase.sh:368
14243msgid "The --edit-todo action can only be used during interactive rebase."
14244msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
14245
14246#: git-rebase.sh:375
14247msgid "Cannot read HEAD"
14248msgstr "不能读取 HEAD"
14249
14250#: git-rebase.sh:378
14251msgid ""
14252"You must edit all merge conflicts and then\n"
14253"mark them as resolved using git add"
14254msgstr ""
14255"您必须编辑所有的合并冲突,然后通过 git add\n"
14256"命令将它们标记为已解决"
14257
14258#: git-rebase.sh:418
14259#, sh-format
14260msgid ""
14261"It seems that there is already a $state_dir_base directory, and\n"
14262"I wonder if you are in the middle of another rebase.  If that is the\n"
14263"case, please try\n"
14264"\t$cmd_live_rebase\n"
14265"If that is not the case, please\n"
14266"\t$cmd_clear_stale_rebase\n"
14267"and run me again.  I am stopping in case you still have something\n"
14268"valuable there."
14269msgstr ""
14270"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
14271"过程中。 如果是这样,请执行\n"
14272"\t$cmd_live_rebase\n"
14273"如果不是这样,请执行\n"
14274"\t$cmd_clear_stale_rebase\n"
14275"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
14276
14277#: git-rebase.sh:469
14278#, sh-format
14279msgid "invalid upstream $upstream_name"
14280msgstr "无效的上游 $upstream_name"
14281
14282#: git-rebase.sh:493
14283#, sh-format
14284msgid "$onto_name: there are more than one merge bases"
14285msgstr "$onto_name: 有一个以上的合并基准"
14286
14287#: git-rebase.sh:496 git-rebase.sh:500
14288#, sh-format
14289msgid "$onto_name: there is no merge base"
14290msgstr "$onto_name: 没有合并基准"
14291
14292#: git-rebase.sh:505
14293#, sh-format
14294msgid "Does not point to a valid commit: $onto_name"
14295msgstr "没有指向一个有效的提交:$onto_name"
14296
14297#: git-rebase.sh:528
14298#, sh-format
14299msgid "fatal: no such branch: $branch_name"
14300msgstr "严重错误:无此分支:$branch_name"
14301
14302#: git-rebase.sh:561
14303msgid "Cannot autostash"
14304msgstr "无法 autostash"
14305
14306#: git-rebase.sh:566
14307#, sh-format
14308msgid "Created autostash: $stash_abbrev"
14309msgstr "创建了 autostash: $stash_abbrev"
14310
14311#: git-rebase.sh:570
14312msgid "Please commit or stash them."
14313msgstr "请提交或为它们保存进度。"
14314
14315#: git-rebase.sh:590
14316#, sh-format
14317msgid "Current branch $branch_name is up to date."
14318msgstr "当前分支 $branch_name 是最新的。"
14319
14320#: git-rebase.sh:594
14321#, sh-format
14322msgid "Current branch $branch_name is up to date, rebase forced."
14323msgstr "当前分支 $branch_name 是最新的,强制变基。"
14324
14325#: git-rebase.sh:605
14326#, sh-format
14327msgid "Changes from $mb to $onto:"
14328msgstr "变更从 $mb 到 $onto:"
14329
14330#: git-rebase.sh:614
14331msgid "First, rewinding head to replay your work on top of it..."
14332msgstr "首先,回退分支以便在上面重放您的工作..."
14333
14334#: git-rebase.sh:624
14335#, sh-format
14336msgid "Fast-forwarded $branch_name to $onto_name."
14337msgstr "快进 $branch_name 至 $onto_name。"
14338
14339#: git-stash.sh:53
14340msgid "git stash clear with parameters is unimplemented"
14341msgstr "git stash clear 不支持参数"
14342
14343#: git-stash.sh:94
14344msgid "You do not have the initial commit yet"
14345msgstr "您尚未建立初始提交"
14346
14347#: git-stash.sh:109
14348msgid "Cannot save the current index state"
14349msgstr "无法保存当前索引状态"
14350
14351#: git-stash.sh:124
14352msgid "Cannot save the untracked files"
14353msgstr "无法保存未跟踪文件"
14354
14355#: git-stash.sh:144 git-stash.sh:157
14356msgid "Cannot save the current worktree state"
14357msgstr "无法保存当前工作区状态"
14358
14359#: git-stash.sh:161
14360msgid "No changes selected"
14361msgstr "没有选择变更"
14362
14363#: git-stash.sh:164
14364msgid "Cannot remove temporary index (can't happen)"
14365msgstr "无法删除临时索引(不应发生)"
14366
14367#: git-stash.sh:177
14368msgid "Cannot record working tree state"
14369msgstr "不能记录工作区状态"
14370
14371#: git-stash.sh:209
14372#, sh-format
14373msgid "Cannot update $ref_stash with $w_commit"
14374msgstr "无法用 $w_commit 更新 $ref_stash"
14375
14376#. TRANSLATORS: $option is an invalid option, like
14377#. `--blah-blah'. The 7 spaces at the beginning of the
14378#. second line correspond to "error: ". So you should line
14379#. up the second line with however many characters the
14380#. translation of "error: " takes in your language. E.g. in
14381#. English this is:
14382#.
14383#. $ git stash save --blah-blah 2>&1 | head -n 2
14384#. error: unknown option for 'stash save': --blah-blah
14385#. To provide a message, use git stash save -- '--blah-blah'
14386#: git-stash.sh:265
14387#, sh-format
14388msgid ""
14389"error: unknown option for 'stash save': $option\n"
14390"       To provide a message, use git stash save -- '$option'"
14391msgstr ""
14392"错误:'stash save' 的未知选项:$option\n"
14393"      要提供一个描述信息,使用 git stash save -- '$option'"
14394
14395#: git-stash.sh:278
14396msgid "Can't use --patch and --include-untracked or --all at the same time"
14397msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
14398
14399#: git-stash.sh:286
14400msgid "No local changes to save"
14401msgstr "没有要保存的本地修改"
14402
14403#: git-stash.sh:291
14404msgid "Cannot initialize stash"
14405msgstr "无法初始化 stash"
14406
14407#: git-stash.sh:295
14408msgid "Cannot save the current status"
14409msgstr "无法保存当前状态"
14410
14411#: git-stash.sh:296
14412#, sh-format
14413msgid "Saved working directory and index state $stash_msg"
14414msgstr "保存工作目录和索引状态 $stash_msg"
14415
14416#: git-stash.sh:323
14417msgid "Cannot remove worktree changes"
14418msgstr "无法删除工作区变更"
14419
14420#: git-stash.sh:471
14421#, sh-format
14422msgid "unknown option: $opt"
14423msgstr "未知选项: $opt"
14424
14425#: git-stash.sh:484
14426msgid "No stash found."
14427msgstr "未发现 stash。"
14428
14429#: git-stash.sh:491
14430#, sh-format
14431msgid "Too many revisions specified: $REV"
14432msgstr "指定了太多的版本:$REV"
14433
14434#: git-stash.sh:506
14435#, sh-format
14436msgid "$reference is not a valid reference"
14437msgstr "$reference 不是一个有效的引用"
14438
14439#: git-stash.sh:534
14440#, sh-format
14441msgid "'$args' is not a stash-like commit"
14442msgstr "'$args' 不是 stash 样提交"
14443
14444#: git-stash.sh:545
14445#, sh-format
14446msgid "'$args' is not a stash reference"
14447msgstr "'$args' 不是一个 stash 引用"
14448
14449#: git-stash.sh:553
14450msgid "unable to refresh index"
14451msgstr "无法刷新索引"
14452
14453#: git-stash.sh:557
14454msgid "Cannot apply a stash in the middle of a merge"
14455msgstr "无法在合并过程中恢复进度"
14456
14457#: git-stash.sh:565
14458msgid "Conflicts in index. Try without --index."
14459msgstr "索引中有冲突。尝试不使用 --index。"
14460
14461#: git-stash.sh:567
14462msgid "Could not save index tree"
14463msgstr "不能保存索引树"
14464
14465#: git-stash.sh:576
14466msgid "Could not restore untracked files from stash"
14467msgstr "无法从进度保存中恢复未跟踪文件"
14468
14469#: git-stash.sh:601
14470msgid "Cannot unstage modified files"
14471msgstr "无法将修改的文件取消暂存"
14472
14473#: git-stash.sh:616
14474msgid "Index was not unstashed."
14475msgstr "索引的进度没有被恢复。"
14476
14477#: git-stash.sh:630
14478msgid "The stash is kept in case you need it again."
14479msgstr "暂存被保留以备您再次需要。"
14480
14481#: git-stash.sh:639
14482#, sh-format
14483msgid "Dropped ${REV} ($s)"
14484msgstr "丢弃了 ${REV} ($s)"
14485
14486#: git-stash.sh:640
14487#, sh-format
14488msgid "${REV}: Could not drop stash entry"
14489msgstr "${REV}:不能丢弃进度条目"
14490
14491#: git-stash.sh:648
14492msgid "No branch name specified"
14493msgstr "未指定分支名"
14494
14495#: git-stash.sh:727
14496msgid "(To restore them type \"git stash apply\")"
14497msgstr "(为恢复数据输入 \"git stash apply\")"
14498
14499#: git-submodule.sh:181
14500msgid "Relative path can only be used from the toplevel of the working tree"
14501msgstr "只能在工作区的顶级目录中使用相对路径"
14502
14503#: git-submodule.sh:191
14504#, sh-format
14505msgid "repo URL: '$repo' must be absolute or begin with ./|../"
14506msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
14507
14508#: git-submodule.sh:210
14509#, sh-format
14510msgid "'$sm_path' already exists in the index"
14511msgstr "'$sm_path' 已经存在于索引中"
14512
14513#: git-submodule.sh:213
14514#, sh-format
14515msgid "'$sm_path' already exists in the index and is not a submodule"
14516msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
14517
14518#: git-submodule.sh:218
14519#, sh-format
14520msgid ""
14521"The following path is ignored by one of your .gitignore files:\n"
14522"$sm_path\n"
14523"Use -f if you really want to add it."
14524msgstr ""
14525"以下路径被您的一个 .gitignore 文件所忽略:\n"
14526"$sm_path\n"
14527"如果您确实想添加它,使用 -f 参数。"
14528
14529#: git-submodule.sh:236
14530#, sh-format
14531msgid "Adding existing repo at '$sm_path' to the index"
14532msgstr "添加位于 '$sm_path' 的现存仓库到索引"
14533
14534#: git-submodule.sh:238
14535#, sh-format
14536msgid "'$sm_path' already exists and is not a valid git repo"
14537msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
14538
14539#: git-submodule.sh:246
14540#, sh-format
14541msgid "A git directory for '$sm_name' is found locally with remote(s):"
14542msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
14543
14544#: git-submodule.sh:248
14545#, sh-format
14546msgid ""
14547"If you want to reuse this local git directory instead of cloning again from\n"
14548"  $realrepo\n"
14549"use the '--force' option. If the local git directory is not the correct "
14550"repo\n"
14551"or you are unsure what this means choose another name with the '--name' "
14552"option."
14553msgstr ""
14554"如果您想要重用这个本地 git 目录而非重新克隆自\n"
14555"  $realrepo\n"
14556"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
14557"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
14558
14559#: git-submodule.sh:254
14560#, sh-format
14561msgid "Reactivating local git directory for submodule '$sm_name'."
14562msgstr "激活本地 git 目录到子模组 '$sm_name'。"
14563
14564#: git-submodule.sh:266
14565#, sh-format
14566msgid "Unable to checkout submodule '$sm_path'"
14567msgstr "不能检出子模组 '$sm_path'"
14568
14569#: git-submodule.sh:271
14570#, sh-format
14571msgid "Failed to add submodule '$sm_path'"
14572msgstr "无法添加子模组 '$sm_path'"
14573
14574#: git-submodule.sh:280
14575#, sh-format
14576msgid "Failed to register submodule '$sm_path'"
14577msgstr "无法注册子模组 '$sm_path'"
14578
14579#: git-submodule.sh:341
14580#, sh-format
14581msgid "Entering '$displaypath'"
14582msgstr "正在进入 '$displaypath'"
14583
14584#: git-submodule.sh:361
14585#, sh-format
14586msgid "Stopping at '$displaypath'; script returned non-zero status."
14587msgstr "停止于 '$displaypath';脚本返回非零值。"
14588
14589#: git-submodule.sh:432
14590#, sh-format
14591msgid "pathspec and --all are incompatible"
14592msgstr "pathspec 和 --all 不兼容"
14593
14594#: git-submodule.sh:437
14595#, sh-format
14596msgid "Use '--all' if you really want to deinitialize all submodules"
14597msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
14598
14599#: git-submodule.sh:457
14600#, sh-format
14601msgid ""
14602"Submodule work tree '$displaypath' contains a .git directory\n"
14603"(use 'rm -rf' if you really want to remove it including all of its history)"
14604msgstr ""
14605"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
14606"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
14607
14608#: git-submodule.sh:465
14609#, sh-format
14610msgid ""
14611"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
14612"discard them"
14613msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
14614
14615#: git-submodule.sh:468
14616#, sh-format
14617msgid "Cleared directory '$displaypath'"
14618msgstr "已清除目录 '$displaypath'"
14619
14620#: git-submodule.sh:469
14621#, sh-format
14622msgid "Could not remove submodule work tree '$displaypath'"
14623msgstr "无法移除子模组工作区 '$displaypath'"
14624
14625#: git-submodule.sh:472
14626#, sh-format
14627msgid "Could not create empty submodule directory '$displaypath'"
14628msgstr "不能创建空的子模组目录 '$displaypath'"
14629
14630#: git-submodule.sh:481
14631#, sh-format
14632msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
14633msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
14634
14635#: git-submodule.sh:637
14636#, sh-format
14637msgid "Unable to find current revision in submodule path '$displaypath'"
14638msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
14639
14640#: git-submodule.sh:647
14641#, sh-format
14642msgid "Unable to fetch in submodule path '$sm_path'"
14643msgstr "无法在子模组路径 '$sm_path' 中获取"
14644
14645#: git-submodule.sh:652
14646#, sh-format
14647msgid ""
14648"Unable to find current ${remote_name}/${branch} revision in submodule path "
14649"'$sm_path'"
14650msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
14651
14652#: git-submodule.sh:670
14653#, sh-format
14654msgid "Unable to fetch in submodule path '$displaypath'"
14655msgstr "无法在子模组路径 '$displaypath' 中获取"
14656
14657#: git-submodule.sh:676
14658#, sh-format
14659msgid ""
14660"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
14661"Direct fetching of that commit failed."
14662msgstr ""
14663"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
14664
14665#: git-submodule.sh:683
14666#, sh-format
14667msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
14668msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
14669
14670#: git-submodule.sh:684
14671#, sh-format
14672msgid "Submodule path '$displaypath': checked out '$sha1'"
14673msgstr "子模组路径 '$displaypath':检出 '$sha1'"
14674
14675#: git-submodule.sh:688
14676#, sh-format
14677msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
14678msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
14679
14680#: git-submodule.sh:689
14681#, sh-format
14682msgid "Submodule path '$displaypath': rebased into '$sha1'"
14683msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
14684
14685#: git-submodule.sh:694
14686#, sh-format
14687msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
14688msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
14689
14690#: git-submodule.sh:695
14691#, sh-format
14692msgid "Submodule path '$displaypath': merged in '$sha1'"
14693msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
14694
14695#: git-submodule.sh:700
14696#, sh-format
14697msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
14698msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
14699
14700#: git-submodule.sh:701
14701#, sh-format
14702msgid "Submodule path '$displaypath': '$command $sha1'"
14703msgstr "子模组 '$displaypath':'$command $sha1'"
14704
14705#: git-submodule.sh:732
14706#, sh-format
14707msgid "Failed to recurse into submodule path '$displaypath'"
14708msgstr "无法递归进子模组路径 '$displaypath'"
14709
14710#: git-submodule.sh:840
14711msgid "The --cached option cannot be used with the --files option"
14712msgstr "选项 --cached 不能和选项 --files 同时使用"
14713
14714#: git-submodule.sh:892
14715#, sh-format
14716msgid "unexpected mode $mod_dst"
14717msgstr "意外的模式 $mod_dst"
14718
14719#  译者:注意保持前导空格
14720#: git-submodule.sh:912
14721#, sh-format
14722msgid "  Warn: $display_name doesn't contain commit $sha1_src"
14723msgstr "  警告:$display_name 未包含提交 $sha1_src"
14724
14725#  译者:注意保持前导空格
14726#: git-submodule.sh:915
14727#, sh-format
14728msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
14729msgstr "  警告:$display_name 未包含提交 $sha1_dst"
14730
14731#  译者:注意保持前导空格
14732#: git-submodule.sh:918
14733#, sh-format
14734msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
14735msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
14736
14737#: git-submodule.sh:1064
14738#, sh-format
14739msgid "Failed to recurse into submodule path '$sm_path'"
14740msgstr "无法递归进子模组路径 '$sm_path'"
14741
14742#: git-submodule.sh:1136
14743#, sh-format
14744msgid "Synchronizing submodule url for '$displaypath'"
14745msgstr "为 '$displaypath' 同步子模组 url"
14746
14747#: git-parse-remote.sh:89
14748#, sh-format
14749msgid "See git-${cmd}(1) for details."
14750msgstr "详见 git-${cmd}(1)。"
14751
14752#: git-rebase--interactive.sh:140
14753#, sh-format
14754msgid "Rebasing ($new_count/$total)"
14755msgstr "变基中($new_count/$total)"
14756
14757#: git-rebase--interactive.sh:156
14758msgid ""
14759"\n"
14760"Commands:\n"
14761" p, pick = use commit\n"
14762" r, reword = use commit, but edit the commit message\n"
14763" e, edit = use commit, but stop for amending\n"
14764" s, squash = use commit, but meld into previous commit\n"
14765" f, fixup = like \"squash\", but discard this commit's log message\n"
14766" x, exec = run command (the rest of the line) using shell\n"
14767" d, drop = remove commit\n"
14768"\n"
14769"These lines can be re-ordered; they are executed from top to bottom.\n"
14770msgstr ""
14771"\n"
14772"命令:\n"
14773" p, pick = 使用提交\n"
14774" r, reword = 使用提交,但修改提交说明\n"
14775" e, edit = 使用提交,但停止以便进行提交修补\n"
14776" s, squash = 使用提交,但和前一个版本融合\n"
14777" f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
14778" x, exec = 使用 shell 运行命令(此行剩余部分)\n"
14779" d, drop = 删除提交\n"
14780"\n"
14781"这些行可以被重新排序;它们会被从上至下地执行。\n"
14782"\n"
14783
14784#: git-rebase--interactive.sh:171
14785msgid ""
14786"\n"
14787"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
14788msgstr ""
14789"\n"
14790"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
14791
14792#: git-rebase--interactive.sh:175
14793msgid ""
14794"\n"
14795"If you remove a line here THAT COMMIT WILL BE LOST.\n"
14796msgstr ""
14797"\n"
14798"如果您在这里删除一行,对应的提交将会丢失。\n"
14799
14800#: git-rebase--interactive.sh:211
14801#, sh-format
14802msgid ""
14803"You can amend the commit now, with\n"
14804"\n"
14805"\tgit commit --amend $gpg_sign_opt_quoted\n"
14806"\n"
14807"Once you are satisfied with your changes, run\n"
14808"\n"
14809"\tgit rebase --continue"
14810msgstr ""
14811"您现在可以修补这个提交,使用\n"
14812"\n"
14813"\tgit commit --amend $gpg_sign_opt_quoted\n"
14814"\n"
14815"当您对变更感到满意,执行\n"
14816"\n"
14817"\tgit rebase --continue"
14818
14819#: git-rebase--interactive.sh:236
14820#, sh-format
14821msgid "$sha1: not a commit that can be picked"
14822msgstr "$sha1:不是一个可以被拣选的提交"
14823
14824#: git-rebase--interactive.sh:275
14825#, sh-format
14826msgid "Invalid commit name: $sha1"
14827msgstr "无效的提交名:$sha1"
14828
14829#: git-rebase--interactive.sh:317
14830msgid "Cannot write current commit's replacement sha1"
14831msgstr "不能写入当前提交的替代 sha1"
14832
14833#: git-rebase--interactive.sh:369
14834#, sh-format
14835msgid "Fast-forward to $sha1"
14836msgstr "快进到 $sha1"
14837
14838#: git-rebase--interactive.sh:371
14839#, sh-format
14840msgid "Cannot fast-forward to $sha1"
14841msgstr "不能快进到 $sha1"
14842
14843#: git-rebase--interactive.sh:380
14844#, sh-format
14845msgid "Cannot move HEAD to $first_parent"
14846msgstr "不能移动 HEAD 到 $first_parent"
14847
14848#: git-rebase--interactive.sh:385
14849#, sh-format
14850msgid "Refusing to squash a merge: $sha1"
14851msgstr "拒绝压缩一个合并:$sha1"
14852
14853#: git-rebase--interactive.sh:399
14854#, sh-format
14855msgid "Error redoing merge $sha1"
14856msgstr "无法重做合并 $sha1"
14857
14858#: git-rebase--interactive.sh:407
14859#, sh-format
14860msgid "Could not pick $sha1"
14861msgstr "不能拣选 $sha1"
14862
14863#: git-rebase--interactive.sh:416
14864#, sh-format
14865msgid "This is the commit message #${n}:"
14866msgstr "这是提交说明 #${n}:"
14867
14868#: git-rebase--interactive.sh:421
14869#, sh-format
14870msgid "The commit message #${n} will be skipped:"
14871msgstr "提交说明 #${n} 将被跳过:"
14872
14873#: git-rebase--interactive.sh:432
14874#, sh-format
14875msgid "This is a combination of $count commit."
14876msgid_plural "This is a combination of $count commits."
14877msgstr[0] "这是一个 $count 个提交的组合。"
14878msgstr[1] "这是一个 $count 个提交的组合。"
14879
14880#: git-rebase--interactive.sh:441
14881#, sh-format
14882msgid "Cannot write $fixup_msg"
14883msgstr "不能写入 $fixup_msg"
14884
14885#: git-rebase--interactive.sh:444
14886msgid "This is a combination of 2 commits."
14887msgstr "这是一个 2 个提交的组合。"
14888
14889#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
14890#: git-rebase--interactive.sh:531
14891#, sh-format
14892msgid "Could not apply $sha1... $rest"
14893msgstr "不能应用 $sha1... $rest"
14894
14895#: git-rebase--interactive.sh:559
14896#, sh-format
14897msgid ""
14898"Could not amend commit after successfully picking $sha1... $rest\n"
14899"This is most likely due to an empty commit message, or the pre-commit hook\n"
14900"failed. If the pre-commit hook failed, you may need to resolve the issue "
14901"before\n"
14902"you are able to reword the commit."
14903msgstr ""
14904"不能在成功拣选 $sha1... $rest 之后修补提交\n"
14905"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
14906"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
14907
14908#: git-rebase--interactive.sh:574
14909#, sh-format
14910msgid "Stopped at $sha1_abbrev... $rest"
14911msgstr "停止在 $sha1_abbrev... $rest"
14912
14913#: git-rebase--interactive.sh:589
14914#, sh-format
14915msgid "Cannot '$squash_style' without a previous commit"
14916msgstr "没有父提交的情况下不能 '$squash_style'"
14917
14918#: git-rebase--interactive.sh:631
14919#, sh-format
14920msgid "Executing: $rest"
14921msgstr "执行:$rest"
14922
14923#: git-rebase--interactive.sh:639
14924#, sh-format
14925msgid "Execution failed: $rest"
14926msgstr "执行失败:$rest"
14927
14928#: git-rebase--interactive.sh:641
14929msgid "and made changes to the index and/or the working tree"
14930msgstr "并且修改索引和/或工作区"
14931
14932#  译者:注意保持前导空格
14933#: git-rebase--interactive.sh:643
14934msgid ""
14935"You can fix the problem, and then run\n"
14936"\n"
14937"\tgit rebase --continue"
14938msgstr ""
14939"您可以解决这个问题,然后运行\n"
14940"\n"
14941"\tgit rebase --continue"
14942
14943#. TRANSLATORS: after these lines is a command to be issued by the user
14944#: git-rebase--interactive.sh:656
14945#, sh-format
14946msgid ""
14947"Execution succeeded: $rest\n"
14948"but left changes to the index and/or the working tree\n"
14949"Commit or stash your changes, and then run\n"
14950"\n"
14951"\tgit rebase --continue"
14952msgstr ""
14953"执行成功:$rest\n"
14954"但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
14955"\n"
14956"\tgit rebase --continue"
14957
14958#: git-rebase--interactive.sh:667
14959#, sh-format
14960msgid "Unknown command: $command $sha1 $rest"
14961msgstr "未知命令:$command $sha1 $rest"
14962
14963#: git-rebase--interactive.sh:668
14964msgid "Please fix this using 'git rebase --edit-todo'."
14965msgstr "要修改请使用命令 'git rebase --edit-todo'。"
14966
14967#: git-rebase--interactive.sh:703
14968#, sh-format
14969msgid "Successfully rebased and updated $head_name."
14970msgstr "成功变基并更新 $head_name。"
14971
14972#: git-rebase--interactive.sh:750
14973msgid "Could not skip unnecessary pick commands"
14974msgstr "不能跳过不必要的拣选命令"
14975
14976#: git-rebase--interactive.sh:908
14977#, sh-format
14978msgid ""
14979"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
14980" - $line"
14981msgstr ""
14982"警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
14983" - $line"
14984
14985#: git-rebase--interactive.sh:941
14986#, sh-format
14987msgid ""
14988"Warning: the command isn't recognized in the following line:\n"
14989" - $line"
14990msgstr ""
14991"警告:下面一行中的命令未能被识别:\n"
14992" - $line"
14993
14994#: git-rebase--interactive.sh:980
14995msgid "could not detach HEAD"
14996msgstr "不能检出为分离头指针"
14997
14998#: git-rebase--interactive.sh:1018
14999msgid ""
15000"Warning: some commits may have been dropped accidentally.\n"
15001"Dropped commits (newer to older):"
15002msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
15003
15004#: git-rebase--interactive.sh:1026
15005msgid ""
15006"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
15007"\n"
15008"Use 'git config rebase.missingCommitsCheck' to change the level of "
15009"warnings.\n"
15010"The possible behaviours are: ignore, warn, error."
15011msgstr ""
15012"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
15013"\n"
15014"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
15015"可选值有:ignore、warn、error。"
15016
15017#: git-rebase--interactive.sh:1037
15018#, sh-format
15019msgid ""
15020"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
15021"Ignoring."
15022msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
15023
15024#: git-rebase--interactive.sh:1054
15025msgid ""
15026"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
15027"continue'."
15028msgstr ""
15029"您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"
15030
15031#: git-rebase--interactive.sh:1055
15032msgid "Or you can abort the rebase with 'git rebase --abort'."
15033msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
15034
15035#: git-rebase--interactive.sh:1083
15036msgid "Could not remove CHERRY_PICK_HEAD"
15037msgstr "不能删除 CHERRY_PICK_HEAD"
15038
15039#: git-rebase--interactive.sh:1088
15040#, sh-format
15041msgid ""
15042"You have staged changes in your working tree.\n"
15043"If these changes are meant to be\n"
15044"squashed into the previous commit, run:\n"
15045"\n"
15046"  git commit --amend $gpg_sign_opt_quoted\n"
15047"\n"
15048"If they are meant to go into a new commit, run:\n"
15049"\n"
15050"  git commit $gpg_sign_opt_quoted\n"
15051"\n"
15052"In both cases, once you're done, continue with:\n"
15053"\n"
15054"  git rebase --continue\n"
15055msgstr ""
15056"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
15057"\n"
15058"  git commit --amend $gpg_sign_opt_quoted\n"
15059"\n"
15060"如果这些变更要形成一个新提交,执行:\n"
15061"\n"
15062"  git commit $gpg_sign_opt_quoted\n"
15063"\n"
15064"无论哪种情况,当您完成提交,继续执行:\n"
15065"\n"
15066"  git rebase --continue\n"
15067
15068#: git-rebase--interactive.sh:1105
15069msgid "Error trying to find the author identity to amend commit"
15070msgstr "在修补提交中查找作者信息时遇到错误"
15071
15072#: git-rebase--interactive.sh:1110
15073msgid ""
15074"You have uncommitted changes in your working tree. Please commit them\n"
15075"first and then run 'git rebase --continue' again."
15076msgstr ""
15077"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
15078
15079#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
15080msgid "Could not commit staged changes."
15081msgstr "不能提交暂存的修改。"
15082
15083#: git-rebase--interactive.sh:1147
15084msgid ""
15085"\n"
15086"You are editing the todo file of an ongoing interactive rebase.\n"
15087"To continue rebase after editing, run:\n"
15088"    git rebase --continue\n"
15089"\n"
15090msgstr ""
15091"\n"
15092"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
15093"请执行:\n"
15094"    git rebase --continue\n"
15095"\n"
15096
15097#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
15098msgid "Could not execute editor"
15099msgstr "无法运行编辑器"
15100
15101#: git-rebase--interactive.sh:1168
15102#, sh-format
15103msgid "Could not checkout $switch_to"
15104msgstr "不能检出 $switch_to"
15105
15106#: git-rebase--interactive.sh:1173
15107msgid "No HEAD?"
15108msgstr "没有 HEAD?"
15109
15110#: git-rebase--interactive.sh:1174
15111#, sh-format
15112msgid "Could not create temporary $state_dir"
15113msgstr "不能创建临时 $state_dir"
15114
15115#: git-rebase--interactive.sh:1176
15116msgid "Could not mark as interactive"
15117msgstr "不能标记为交互式"
15118
15119#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
15120msgid "Could not init rewritten commits"
15121msgstr "不能对重写提交进行初始化"
15122
15123#: git-rebase--interactive.sh:1291
15124#, sh-format
15125msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
15126msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
15127msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15128msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15129
15130#: git-rebase--interactive.sh:1296
15131msgid ""
15132"\n"
15133"However, if you remove everything, the rebase will be aborted.\n"
15134"\n"
15135msgstr ""
15136"\n"
15137"然而,如果您删除全部内容,变基操作将会终止。\n"
15138"\n"
15139
15140#: git-rebase--interactive.sh:1303
15141msgid "Note that empty commits are commented out"
15142msgstr "注意空提交已被注释掉"
15143
15144#: git-sh-setup.sh:89 git-sh-setup.sh:94
15145#, sh-format
15146msgid "usage: $dashless $USAGE"
15147msgstr "用法:$dashless $USAGE"
15148
15149#: git-sh-setup.sh:190
15150#, sh-format
15151msgid "Cannot chdir to $cdup, the toplevel of the working tree"
15152msgstr "不能切换目录到 $cdup,工作区的顶级目录"
15153
15154#: git-sh-setup.sh:199 git-sh-setup.sh:206
15155#, sh-format
15156msgid "fatal: $program_name cannot be used without a working tree."
15157msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
15158
15159#: git-sh-setup.sh:220
15160msgid "Cannot rebase: You have unstaged changes."
15161msgstr "不能变基:您有未暂存的变更。"
15162
15163#: git-sh-setup.sh:223
15164msgid "Cannot rewrite branches: You have unstaged changes."
15165msgstr "不能重写分支:您有未暂存的变更。"
15166
15167#: git-sh-setup.sh:226
15168msgid "Cannot pull with rebase: You have unstaged changes."
15169msgstr "无法通过变基方式拉取:您有未暂存的变更。"
15170
15171#: git-sh-setup.sh:229
15172#, sh-format
15173msgid "Cannot $action: You have unstaged changes."
15174msgstr "不能 $action:您有未暂存的变更。"
15175
15176#: git-sh-setup.sh:242
15177msgid "Cannot rebase: Your index contains uncommitted changes."
15178msgstr "不能变基:您的索引中包含未提交的变更。"
15179
15180#: git-sh-setup.sh:245
15181msgid "Cannot pull with rebase: Your index contains uncommitted changes."
15182msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
15183
15184#: git-sh-setup.sh:248
15185#, sh-format
15186msgid "Cannot $action: Your index contains uncommitted changes."
15187msgstr "不能 $action:您的索引中包含未提交的变更。"
15188
15189#: git-sh-setup.sh:252
15190msgid "Additionally, your index contains uncommitted changes."
15191msgstr "而且您的索引中包含未提交的变更。"
15192
15193#: git-sh-setup.sh:372
15194msgid "You need to run this command from the toplevel of the working tree."
15195msgstr "您需要在工作区的顶级目录中运行这个命令。"
15196
15197#: git-sh-setup.sh:377
15198msgid "Unable to determine absolute path of git directory"
15199msgstr "不能确定 git 目录的绝对路径"
15200
15201#. TRANSLATORS: you can adjust this to align "git add -i" status menu
15202#: git-add--interactive.perl:238
15203#, perl-format
15204msgid "%12s %12s %s"
15205msgstr "%12s %12s %s"
15206
15207#: git-add--interactive.perl:239
15208msgid "staged"
15209msgstr "缓存"
15210
15211#: git-add--interactive.perl:239
15212msgid "unstaged"
15213msgstr "未缓存"
15214
15215#: git-add--interactive.perl:288 git-add--interactive.perl:313
15216msgid "binary"
15217msgstr "二进制"
15218
15219#: git-add--interactive.perl:297 git-add--interactive.perl:351
15220msgid "nothing"
15221msgstr "无"
15222
15223#: git-add--interactive.perl:333 git-add--interactive.perl:348
15224msgid "unchanged"
15225msgstr "没有修改"
15226
15227#: git-add--interactive.perl:644
15228#, perl-format
15229msgid "added %d path\n"
15230msgid_plural "added %d paths\n"
15231msgstr[0] "增加了 %d 个路径\n"
15232msgstr[1] "增加了 %d 个路径\n"
15233
15234#: git-add--interactive.perl:647
15235#, perl-format
15236msgid "updated %d path\n"
15237msgid_plural "updated %d paths\n"
15238msgstr[0] "更新了 %d 个路径\n"
15239msgstr[1] "更新了 %d 个路径\n"
15240
15241#: git-add--interactive.perl:650
15242#, perl-format
15243msgid "reverted %d path\n"
15244msgid_plural "reverted %d paths\n"
15245msgstr[0] "还原了 %d 个路径\n"
15246msgstr[1] "还原了 %d 个路径\n"
15247
15248#: git-add--interactive.perl:653
15249#, perl-format
15250msgid "touched %d path\n"
15251msgid_plural "touched %d paths\n"
15252msgstr[0] "触碰了 %d 个路径\n"
15253msgstr[1] "触碰了 %d 个路径\n"
15254
15255#: git-add--interactive.perl:662
15256msgid "Update"
15257msgstr "更新"
15258
15259#: git-add--interactive.perl:674
15260msgid "Revert"
15261msgstr "还原"
15262
15263#: git-add--interactive.perl:697
15264#, perl-format
15265msgid "note: %s is untracked now.\n"
15266msgstr "说明:%s 现已成为未跟踪的。\n"
15267
15268#: git-add--interactive.perl:708
15269msgid "Add untracked"
15270msgstr "添加未跟踪的"
15271
15272#: git-add--interactive.perl:714
15273msgid "No untracked files.\n"
15274msgstr "没有未跟踪的文件。\n"
15275
15276#: git-add--interactive.perl:1030
15277msgid ""
15278"If the patch applies cleanly, the edited hunk will immediately be\n"
15279"marked for staging."
15280msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
15281
15282#: git-add--interactive.perl:1033
15283msgid ""
15284"If the patch applies cleanly, the edited hunk will immediately be\n"
15285"marked for stashing."
15286msgstr "如果补丁能干净地应用,编辑块将立即标记为保存进度。"
15287
15288#: git-add--interactive.perl:1036
15289msgid ""
15290"If the patch applies cleanly, the edited hunk will immediately be\n"
15291"marked for unstaging."
15292msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
15293
15294#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
15295msgid ""
15296"If the patch applies cleanly, the edited hunk will immediately be\n"
15297"marked for applying."
15298msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
15299
15300#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
15301msgid ""
15302"If the patch applies cleanly, the edited hunk will immediately be\n"
15303"marked for discarding."
15304msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
15305
15306#: git-add--interactive.perl:1058
15307#, perl-format
15308msgid "failed to open hunk edit file for writing: %s"
15309msgstr "无法写入块编辑文件:%s"
15310
15311#: git-add--interactive.perl:1059
15312msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
15313msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
15314
15315#: git-add--interactive.perl:1065
15316#, perl-format
15317msgid ""
15318"---\n"
15319"To remove '%s' lines, make them ' ' lines (context).\n"
15320"To remove '%s' lines, delete them.\n"
15321"Lines starting with %s will be removed.\n"
15322msgstr ""
15323"---\n"
15324"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
15325"要删除 '%s' 开始的行,删除它们。\n"
15326"以 %s 开始的行将被删除。\n"
15327
15328#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
15329#: git-add--interactive.perl:1073
15330msgid ""
15331"If it does not apply cleanly, you will be given an opportunity to\n"
15332"edit again.  If all lines of the hunk are removed, then the edit is\n"
15333"aborted and the hunk is left unchanged.\n"
15334msgstr ""
15335"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
15336"此次编辑被终止,该块不会被修改。\n"
15337
15338#: git-add--interactive.perl:1087
15339#, perl-format
15340msgid "failed to open hunk edit file for reading: %s"
15341msgstr "无法读取块编辑文件:%s"
15342
15343#. TRANSLATORS: do not translate [y/n]
15344#. The program will only accept that input
15345#. at this point.
15346#. Consider translating (saying "no" discards!) as
15347#. (saying "n" for "no" discards!) if the translation
15348#. of the word "no" does not start with n.
15349#: git-add--interactive.perl:1178
15350msgid ""
15351"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
15352msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
15353
15354#: git-add--interactive.perl:1187
15355msgid ""
15356"y - stage this hunk\n"
15357"n - do not stage this hunk\n"
15358"q - quit; do not stage this hunk or any of the remaining ones\n"
15359"a - stage this hunk and all later hunks in the file\n"
15360"d - do not stage this hunk or any of the later hunks in the file"
15361msgstr ""
15362"y - 暂存该块\n"
15363"n - 不要暂存该块\n"
15364"q - 退出。不暂存该块及后面的全部块\n"
15365"a - 暂存该块和本文件中后面的全部块\n"
15366"d - 不暂存该块和本文件中后面的全部块"
15367
15368#: git-add--interactive.perl:1193
15369msgid ""
15370"y - stash this hunk\n"
15371"n - do not stash this hunk\n"
15372"q - quit; do not stash this hunk or any of the remaining ones\n"
15373"a - stash this hunk and all later hunks in the file\n"
15374"d - do not stash this hunk or any of the later hunks in the file"
15375msgstr ""
15376"y - 贮藏该块\n"
15377"n - 不要贮藏该块\n"
15378"q - 退出。不贮藏该块及后面的全部块\n"
15379"a - 贮藏该块和本文件中后面的全部块\n"
15380"d - 不贮藏该块和本文件中后面的全部块"
15381
15382#: git-add--interactive.perl:1199
15383msgid ""
15384"y - unstage this hunk\n"
15385"n - do not unstage this hunk\n"
15386"q - quit; do not unstage this hunk or any of the remaining ones\n"
15387"a - unstage this hunk and all later hunks in the file\n"
15388"d - do not unstage this hunk or any of the later hunks in the file"
15389msgstr ""
15390"y - 不暂存该块\n"
15391"n - 不要不暂存该块\n"
15392"q - 退出。不要不暂存该块及后面的全部块\n"
15393"a - 不暂存该块和本文件中后面的全部块\n"
15394"d - 不要不暂存该块和本文件中后面的全部块"
15395
15396#: git-add--interactive.perl:1205
15397msgid ""
15398"y - apply this hunk to index\n"
15399"n - do not apply this hunk to index\n"
15400"q - quit; do not apply this hunk or any of the remaining ones\n"
15401"a - apply this hunk and all later hunks in the file\n"
15402"d - do not apply this hunk or any of the later hunks in the file"
15403msgstr ""
15404"y - 在索引中应用该块\n"
15405"n - 不要在索引中应用该块\n"
15406"q - 退出。不要应用该块及后面的全部块\n"
15407"a - 应用该块和本文件中后面的全部块\n"
15408"d - 不要应用该块和本文件中后面的全部块"
15409
15410#: git-add--interactive.perl:1211
15411msgid ""
15412"y - discard this hunk from worktree\n"
15413"n - do not discard this hunk from worktree\n"
15414"q - quit; do not discard this hunk or any of the remaining ones\n"
15415"a - discard this hunk and all later hunks in the file\n"
15416"d - do not discard this hunk or any of the later hunks in the file"
15417msgstr ""
15418"y - 在工作区中丢弃该块\n"
15419"n - 不要在工作区中丢弃该块\n"
15420"q - 退出。不要丢弃该块及后面的全部块\n"
15421"a - 丢弃该块和本文件中后面的全部块\n"
15422"d - 不要丢弃该块和本文件中后面的全部块"
15423
15424#: git-add--interactive.perl:1217
15425msgid ""
15426"y - discard this hunk from index and worktree\n"
15427"n - do not discard this hunk from index and worktree\n"
15428"q - quit; do not discard this hunk or any of the remaining ones\n"
15429"a - discard this hunk and all later hunks in the file\n"
15430"d - do not discard this hunk or any of the later hunks in the file"
15431msgstr ""
15432"y - 在索引和工作区中丢弃该块\n"
15433"n - 不要在索引和工作区中丢弃该块\n"
15434"q - 退出。不要丢弃该块及后面的全部块\n"
15435"a - 丢弃该块和本文件中后面的全部块\n"
15436"d - 不要丢弃该块和本文件中后面的全部块"
15437
15438#: git-add--interactive.perl:1223
15439msgid ""
15440"y - apply this hunk to index and worktree\n"
15441"n - do not apply this hunk to index and worktree\n"
15442"q - quit; do not apply this hunk or any of the remaining ones\n"
15443"a - apply this hunk and all later hunks in the file\n"
15444"d - do not apply this hunk or any of the later hunks in the file"
15445msgstr ""
15446"y - 在索引和工作区中应用该块\n"
15447"n - 不要在索引和工作区中应用该块\n"
15448"q - 退出。不要应用该块及后面的全部块\n"
15449"a - 应用该块和本文件中后面的全部块\n"
15450"d - 不要应用该块和本文件中后面的全部块"
15451
15452#: git-add--interactive.perl:1232
15453msgid ""
15454"g - select a hunk to go to\n"
15455"/ - search for a hunk matching the given regex\n"
15456"j - leave this hunk undecided, see next undecided hunk\n"
15457"J - leave this hunk undecided, see next hunk\n"
15458"k - leave this hunk undecided, see previous undecided hunk\n"
15459"K - leave this hunk undecided, see previous hunk\n"
15460"s - split the current hunk into smaller hunks\n"
15461"e - manually edit the current hunk\n"
15462"? - print help\n"
15463msgstr ""
15464"g - 选择跳转到一个块\n"
15465"/ - 查找和给定正则表达式匹配的块\n"
15466"j - 维持该块未决状态,查看下一个未决块\n"
15467"J - 维持该块未决状态,查看下一个块\n"
15468"k - 维持该块未决状态,查看上一个未决块\n"
15469"K - 维持该块未决状态,查看上一个块\n"
15470"s - 拆分当前块为更小的块\n"
15471"e - 手动编辑当前块\n"
15472"? - 显示帮助\n"
15473
15474#: git-add--interactive.perl:1263
15475msgid "The selected hunks do not apply to the index!\n"
15476msgstr "选中的块不能应用到索引!\n"
15477
15478#: git-add--interactive.perl:1264
15479msgid "Apply them to the worktree anyway? "
15480msgstr "无论如何都要应用到工作区么?"
15481
15482#: git-add--interactive.perl:1267
15483msgid "Nothing was applied.\n"
15484msgstr "未应用。\n"
15485
15486#: git-add--interactive.perl:1278
15487#, perl-format
15488msgid "ignoring unmerged: %s\n"
15489msgstr "忽略未合入的:%s\n"
15490
15491#: git-add--interactive.perl:1287
15492msgid "Only binary files changed.\n"
15493msgstr "只有二进制文件被修改。\n"
15494
15495#: git-add--interactive.perl:1289
15496msgid "No changes.\n"
15497msgstr "没有修改。\n"
15498
15499#: git-add--interactive.perl:1297
15500msgid "Patch update"
15501msgstr "补丁更新"
15502
15503#: git-add--interactive.perl:1349
15504#, perl-format
15505msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
15506msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
15507
15508#: git-add--interactive.perl:1350
15509#, perl-format
15510msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
15511msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
15512
15513#: git-add--interactive.perl:1351
15514#, perl-format
15515msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
15516msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
15517
15518#: git-add--interactive.perl:1354
15519#, perl-format
15520msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
15521msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
15522
15523#: git-add--interactive.perl:1355
15524#, perl-format
15525msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
15526msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
15527
15528#: git-add--interactive.perl:1356
15529#, perl-format
15530msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
15531msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
15532
15533#: git-add--interactive.perl:1359
15534#, perl-format
15535msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
15536msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
15537
15538#: git-add--interactive.perl:1360
15539#, perl-format
15540msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
15541msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
15542
15543#: git-add--interactive.perl:1361
15544#, perl-format
15545msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
15546msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
15547
15548#: git-add--interactive.perl:1364
15549#, perl-format
15550msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
15551msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
15552
15553#: git-add--interactive.perl:1365
15554#, perl-format
15555msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
15556msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
15557
15558#: git-add--interactive.perl:1366
15559#, perl-format
15560msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
15561msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
15562
15563#: git-add--interactive.perl:1369
15564#, perl-format
15565msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
15566msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15567
15568#: git-add--interactive.perl:1370
15569#, perl-format
15570msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
15571msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15572
15573#: git-add--interactive.perl:1371
15574#, perl-format
15575msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
15576msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15577
15578#: git-add--interactive.perl:1374
15579#, perl-format
15580msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
15581msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15582
15583#: git-add--interactive.perl:1375
15584#, perl-format
15585msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
15586msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15587
15588#: git-add--interactive.perl:1376
15589#, perl-format
15590msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
15591msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15592
15593#: git-add--interactive.perl:1379
15594#, perl-format
15595msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
15596msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
15597
15598#: git-add--interactive.perl:1380
15599#, perl-format
15600msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
15601msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
15602
15603#: git-add--interactive.perl:1381
15604#, perl-format
15605msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
15606msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
15607
15608#: git-add--interactive.perl:1484
15609msgid "go to which hunk (<ret> to see more)? "
15610msgstr "跳转到哪个块(<回车> 查看更多)? "
15611
15612#: git-add--interactive.perl:1486
15613msgid "go to which hunk? "
15614msgstr "跳转到哪个块?"
15615
15616#: git-add--interactive.perl:1495
15617#, perl-format
15618msgid "Invalid number: '%s'\n"
15619msgstr "无效数字:'%s'\n"
15620
15621#: git-add--interactive.perl:1500
15622#, perl-format
15623msgid "Sorry, only %d hunk available.\n"
15624msgid_plural "Sorry, only %d hunks available.\n"
15625msgstr[0] "对不起,只有 %d 个可用块。\n"
15626msgstr[1] "对不起,只有 %d 个可用块。\n"
15627
15628#: git-add--interactive.perl:1526
15629msgid "search for regex? "
15630msgstr "使用正则表达式搜索?"
15631
15632#: git-add--interactive.perl:1539
15633#, perl-format
15634msgid "Malformed search regexp %s: %s\n"
15635msgstr "错误的正则表达式 %s:%s\n"
15636
15637#: git-add--interactive.perl:1549
15638msgid "No hunk matches the given pattern\n"
15639msgstr "没有和给定模式相匹配的快\n"
15640
15641#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
15642msgid "No previous hunk\n"
15643msgstr "没有前一个块\n"
15644
15645#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
15646msgid "No next hunk\n"
15647msgstr "没有下一个块\n"
15648
15649#: git-add--interactive.perl:1597
15650#, perl-format
15651msgid "Split into %d hunk.\n"
15652msgid_plural "Split into %d hunks.\n"
15653msgstr[0] "拆分为 %d 块。\n"
15654msgstr[1] "拆分为 %d 块。\n"
15655
15656#: git-add--interactive.perl:1649
15657msgid "Review diff"
15658msgstr "检视 diff"
15659
15660#. TRANSLATORS: please do not translate the command names
15661#. 'status', 'update', 'revert', etc.
15662#: git-add--interactive.perl:1668
15663msgid ""
15664"status        - show paths with changes\n"
15665"update        - add working tree state to the staged set of changes\n"
15666"revert        - revert staged set of changes back to the HEAD version\n"
15667"patch         - pick hunks and update selectively\n"
15668"diff          - view diff between HEAD and index\n"
15669"add untracked - add contents of untracked files to the staged set of "
15670"changes\n"
15671msgstr ""
15672"status        - 显示含变更的路径\n"
15673"update        - 添加工作区状态至暂存列表\n"
15674"revert        - 还原修改的暂存集至 HEAD 版本\n"
15675"patch         - 挑选块并且有选择地更新\n"
15676"diff          - 显示 HEAD 和索引间差异\n"
15677"add untracked - 添加未跟踪文件的内容至暂存列表\n"
15678
15679#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
15680#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
15681#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
15682msgid "missing --"
15683msgstr "缺失 --"
15684
15685#: git-add--interactive.perl:1706
15686#, perl-format
15687msgid "unknown --patch mode: %s"
15688msgstr "未知的 --patch 模式:%s"
15689
15690#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
15691#, perl-format
15692msgid "invalid argument %s, expecting --"
15693msgstr "无效的参数 %s,期望是 --"
15694
15695#: git-send-email.perl:121
15696msgid "local zone differs from GMT by a non-minute interval\n"
15697msgstr "本地时间和 GMT 有不到一分钟间隔\n"
15698
15699#: git-send-email.perl:128 git-send-email.perl:134
15700msgid "local time offset greater than or equal to 24 hours\n"
15701msgstr "本地时间偏移量大于等于 24 小时\n"
15702
15703#: git-send-email.perl:202 git-send-email.perl:208
15704msgid "the editor exited uncleanly, aborting everything"
15705msgstr "编辑器非正常退出,终止所有操作"
15706
15707#: git-send-email.perl:282
15708#, perl-format
15709msgid ""
15710"'%s' contains an intermediate version of the email you were composing.\n"
15711msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
15712
15713#: git-send-email.perl:287
15714#, perl-format
15715msgid "'%s.final' contains the composed email.\n"
15716msgstr "'%s.final' 包含编辑的邮件。\n"
15717
15718#: git-send-email.perl:305
15719msgid "--dump-aliases incompatible with other options\n"
15720msgstr "--dump-aliases 和其它选项不兼容\n"
15721
15722#: git-send-email.perl:368 git-send-email.perl:623
15723msgid "Cannot run git format-patch from outside a repository\n"
15724msgstr "不能在仓库之外运行 git format-patch\n"
15725
15726#: git-send-email.perl:437
15727#, perl-format
15728msgid "Unknown --suppress-cc field: '%s'\n"
15729msgstr "未知的 --suppress-cc 字段:'%s'\n"
15730
15731#: git-send-email.perl:466
15732#, perl-format
15733msgid "Unknown --confirm setting: '%s'\n"
15734msgstr "未知的 --confirm 设置:'%s'\n"
15735
15736#: git-send-email.perl:498
15737#, perl-format
15738msgid "warning: sendmail alias with quotes is not supported: %s\n"
15739msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
15740
15741#: git-send-email.perl:500
15742#, perl-format
15743msgid "warning: `:include:` not supported: %s\n"
15744msgstr "警告:不支持 `:include:`:%s\n"
15745
15746#: git-send-email.perl:502
15747#, perl-format
15748msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
15749msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
15750
15751#: git-send-email.perl:507
15752#, perl-format
15753msgid "warning: sendmail line is not recognized: %s\n"
15754msgstr "警告:不能识别的 sendmail 行:%s\n"
15755
15756#: git-send-email.perl:589
15757#, perl-format
15758msgid ""
15759"File '%s' exists but it could also be the range of commits\n"
15760"to produce patches for.  Please disambiguate by...\n"
15761"\n"
15762"    * Saying \"./%s\" if you mean a file; or\n"
15763"    * Giving --format-patch option if you mean a range.\n"
15764msgstr ""
15765"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
15766"歧义:\n"
15767"\n"
15768"    * 如果含义为一个文件,使用 \"./%s\",或者\n"
15769"    * 如果含义为一个范围,使用 --format-patch 选项。\n"
15770
15771#: git-send-email.perl:610
15772#, perl-format
15773msgid "Failed to opendir %s: %s"
15774msgstr "无法打开目录 %s: %s"
15775
15776#: git-send-email.perl:634
15777#, perl-format
15778msgid ""
15779"fatal: %s: %s\n"
15780"warning: no patches were sent\n"
15781msgstr ""
15782"严重:%s:%s\n"
15783"警告:补丁未能发送\n"
15784
15785#: git-send-email.perl:645
15786msgid ""
15787"\n"
15788"No patch files specified!\n"
15789"\n"
15790msgstr ""
15791"\n"
15792"未指定补丁文件!\n"
15793"\n"
15794
15795#: git-send-email.perl:658
15796#, perl-format
15797msgid "No subject line in %s?"
15798msgstr "在 %s 中没有标题行?"
15799
15800#: git-send-email.perl:668
15801#, perl-format
15802msgid "Failed to open for writing %s: %s"
15803msgstr "无法写入 %s: %s"
15804
15805#: git-send-email.perl:678
15806msgid ""
15807"Lines beginning in \"GIT:\" will be removed.\n"
15808"Consider including an overall diffstat or table of contents\n"
15809"for the patch you are writing.\n"
15810"\n"
15811"Clear the body content if you don't wish to send a summary.\n"
15812msgstr ""
15813"以 \"GIT:\" 开头的行将被删除。\n"
15814"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
15815"\n"
15816"如果您不想发送摘要,清除内容。\n"
15817
15818#: git-send-email.perl:701
15819#, perl-format
15820msgid "Failed to open %s.final: %s"
15821msgstr "无法打开 %s.final: %s"
15822
15823#: git-send-email.perl:704
15824#, perl-format
15825msgid "Failed to open %s: %s"
15826msgstr "无法打开 %s: %s"
15827
15828#: git-send-email.perl:739
15829msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
15830msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
15831
15832#: git-send-email.perl:748
15833msgid "Summary email is empty, skipping it\n"
15834msgstr "摘要邮件为空,跳过\n"
15835
15836#. TRANSLATORS: please keep [y/N] as is.
15837#: git-send-email.perl:780
15838#, perl-format
15839msgid "Are you sure you want to use <%s> [y/N]? "
15840msgstr "您确认要使用 <%s> [y/N]?"
15841
15842#: git-send-email.perl:809
15843msgid ""
15844"The following files are 8bit, but do not declare a Content-Transfer-"
15845"Encoding.\n"
15846msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
15847
15848#: git-send-email.perl:814
15849msgid "Which 8bit encoding should I declare [UTF-8]? "
15850msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
15851
15852#: git-send-email.perl:822
15853#, perl-format
15854msgid ""
15855"Refusing to send because the patch\n"
15856"\t%s\n"
15857"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
15858"want to send.\n"
15859msgstr ""
15860"拒绝发送,因为补丁\n"
15861"\t%s\n"
15862"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
15863
15864#: git-send-email.perl:841
15865msgid "To whom should the emails be sent (if anyone)?"
15866msgstr "邮件将要发送给谁?"
15867
15868#: git-send-email.perl:859
15869#, perl-format
15870msgid "fatal: alias '%s' expands to itself\n"
15871msgstr "严重:别名 '%s' 扩展为它自己\n"
15872
15873#: git-send-email.perl:871
15874msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
15875msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
15876
15877#: git-send-email.perl:921 git-send-email.perl:929
15878#, perl-format
15879msgid "error: unable to extract a valid address from: %s\n"
15880msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
15881
15882#. TRANSLATORS: Make sure to include [q] [d] [e] in your
15883#. translation. The program will only accept English input
15884#. at this point.
15885#: git-send-email.perl:933
15886msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
15887msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
15888
15889#: git-send-email.perl:1234
15890#, perl-format
15891msgid "CA path \"%s\" does not exist"
15892msgstr "CA 路径 \"%s\" 不存在"
15893
15894#: git-send-email.perl:1309
15895msgid ""
15896"    The Cc list above has been expanded by additional\n"
15897"    addresses found in the patch commit message. By default\n"
15898"    send-email prompts before sending whenever this occurs.\n"
15899"    This behavior is controlled by the sendemail.confirm\n"
15900"    configuration setting.\n"
15901"\n"
15902"    For additional information, run 'git send-email --help'.\n"
15903"    To retain the current behavior, but squelch this message,\n"
15904"    run 'git config --global sendemail.confirm auto'.\n"
15905"\n"
15906msgstr ""
15907"    以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
15908"    了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
15909"    sendemail.confirm 配置设置。\n"
15910"\n"
15911"    更多信息,执行 'git send-email --help'。\n"
15912"    要保持当前行为,但不显示此信息,运行 'git config --global\n"
15913"    sendemail.confirm auto'。\n"
15914"\n"
15915
15916#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
15917#. translation. The program will only accept English input
15918#. at this point.
15919#: git-send-email.perl:1324
15920msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
15921msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):"
15922
15923#: git-send-email.perl:1327
15924msgid "Send this email reply required"
15925msgstr "发送要求的邮件回复"
15926
15927#: git-send-email.perl:1353
15928msgid "The required SMTP server is not properly defined."
15929msgstr "要求的 SMTP 服务器未被正确定义。"
15930
15931#: git-send-email.perl:1397
15932#, perl-format
15933msgid "Server does not support STARTTLS! %s"
15934msgstr "服务器不支持 STARTTLS!%s"
15935
15936#: git-send-email.perl:1403
15937msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
15938msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
15939
15940#: git-send-email.perl:1421
15941#, perl-format
15942msgid "Failed to send %s\n"
15943msgstr "无法发送 %s\n"
15944
15945#: git-send-email.perl:1424
15946#, perl-format
15947msgid "Dry-Sent %s\n"
15948msgstr "演习发送 %s\n"
15949
15950#: git-send-email.perl:1424
15951#, perl-format
15952msgid "Sent %s\n"
15953msgstr "正发送 %s\n"
15954
15955#: git-send-email.perl:1426
15956msgid "Dry-OK. Log says:\n"
15957msgstr "演习成功。日志说:\n"
15958
15959#: git-send-email.perl:1426
15960msgid "OK. Log says:\n"
15961msgstr "OK。日志说:\n"
15962
15963#: git-send-email.perl:1438
15964msgid "Result: "
15965msgstr "结果:"
15966
15967#: git-send-email.perl:1441
15968msgid "Result: OK\n"
15969msgstr "结果:OK\n"
15970
15971#: git-send-email.perl:1454
15972#, perl-format
15973msgid "can't open file %s"
15974msgstr "无法打开文件 %s"
15975
15976#: git-send-email.perl:1501 git-send-email.perl:1521
15977#, perl-format
15978msgid "(mbox) Adding cc: %s from line '%s'\n"
15979msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
15980
15981#: git-send-email.perl:1507
15982#, perl-format
15983msgid "(mbox) Adding to: %s from line '%s'\n"
15984msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
15985
15986#: git-send-email.perl:1555
15987#, perl-format
15988msgid "(non-mbox) Adding cc: %s from line '%s'\n"
15989msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
15990
15991#: git-send-email.perl:1578
15992#, perl-format
15993msgid "(body) Adding cc: %s from line '%s'\n"
15994msgstr "(body) 添加 cc: %s 自行 '%s'\n"
15995
15996#: git-send-email.perl:1676
15997#, perl-format
15998msgid "(%s) Could not execute '%s'"
15999msgstr "(%s) 不能执行 '%s'"
16000
16001#: git-send-email.perl:1683
16002#, perl-format
16003msgid "(%s) Adding %s: %s from: '%s'\n"
16004msgstr "(%s) 添加 %s: %s 自:'%s'\n"
16005
16006#: git-send-email.perl:1687
16007#, perl-format
16008msgid "(%s) failed to close pipe to '%s'"
16009msgstr "(%s) 无法关闭管道至 '%s'"
16010
16011#: git-send-email.perl:1714
16012msgid "cannot send message as 7bit"
16013msgstr "不能以 7bit 形式发送信息"
16014
16015#: git-send-email.perl:1722
16016msgid "invalid transfer encoding"
16017msgstr "无效的传送编码"
16018
16019#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
16020#, perl-format
16021msgid "unable to open %s: %s\n"
16022msgstr "不能打开 %s:%s\n"
16023
16024#: git-send-email.perl:1744
16025#, perl-format
16026msgid "%s: patch contains a line longer than 998 characters"
16027msgstr "%s:补丁包含一个超过 998 字符的行"
16028
16029#: git-send-email.perl:1760
16030#, perl-format
16031msgid "Skipping %s with backup suffix '%s'.\n"
16032msgstr "略过 %s 含备份后缀 '%s'。\n"
16033
16034#. TRANSLATORS: please keep "[y|N]" as is.
16035#: git-send-email.perl:1764
16036#, perl-format
16037msgid "Do you really want to send %s? [y|N]: "
16038msgstr "您真的要发送 %s?[y|N]:"
16039
16040#~ msgid ""
16041#~ "There is nothing to exclude from by :(exclude) patterns.\n"
16042#~ "Perhaps you forgot to add either ':/' or '.' ?"
16043#~ msgstr ""
16044#~ "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
16045#~ "添加 ':/' 或 '.' ?"
16046
16047#~ msgid "unrecognized format: %%(%s)"
16048#~ msgstr "未能识别的格式:%%(%s)"
16049
16050#~ msgid ":strip= requires a positive integer argument"
16051#~ msgstr ":strip= 需要一个正整型参数"
16052
16053#~ msgid "ref '%s' does not have %ld components to :strip"
16054#~ msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
16055
16056#~ msgid "unknown %.*s format %s"
16057#~ msgstr "未知的 %.*s 格式 %s"
16058
16059#~ msgid "[%s: gone]"
16060#~ msgstr "[%s: 丢失]"
16061
16062#~ msgid "[%s]"
16063#~ msgstr "[%s]"
16064
16065#~ msgid "[%s: behind %d]"
16066#~ msgstr "[%s:落后 %d]"
16067
16068#~ msgid "[%s: ahead %d]"
16069#~ msgstr "[%s:领先 %d]"
16070
16071#~ msgid "[%s: ahead %d, behind %d]"
16072#~ msgstr "[%s:领先 %d,落后 %d]"
16073
16074#~ msgid " **** invalid ref ****"
16075#~ msgstr " **** 无效引用 ****"
16076
16077#~ msgid "insanely long object directory %.*s"
16078#~ msgstr "不正常的长对象目录 %.*s"
16079
16080#~ msgid "git merge [<options>] <msg> HEAD <commit>"
16081#~ msgstr "git merge [<选项>] <说明> HEAD <提交>"
16082
16083#~ msgid "'%s' is not a commit"
16084#~ msgstr "'%s' 不是一个提交"
16085
16086#~ msgid "cannot open file '%s'"
16087#~ msgstr "无法打开文件 '%s'"
16088
16089#~ msgid "could not close file %s"
16090#~ msgstr "无法关闭文件 %s"
16091
16092#~ msgid "tag name too long: %.*s..."
16093#~ msgstr "标签名称太长:%.*s..."
16094
16095#~ msgid "tag header too big."
16096#~ msgstr "标签头信息太大。"
16097
16098#~ msgid ""
16099#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
16100#~ "marked for discarding"
16101#~ msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃"
16102
16103#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
16104#~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
16105
16106#~ msgid "Clever... amending the last one with dirty index."
16107#~ msgstr "聪明... 用脏索引修补最后一个提交。"
16108
16109#~ msgid ""
16110#~ "the following submodule (or one of its nested submodules)\n"
16111#~ "uses a .git directory:"
16112#~ msgid_plural ""
16113#~ "the following submodules (or one of their nested submodules)\n"
16114#~ "use a .git directory:"
16115#~ msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
16116#~ msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
16117
16118#~ msgid ""
16119#~ "\n"
16120#~ "(use 'rm -rf' if you really want to remove it including all of its "
16121#~ "history)"
16122#~ msgstr ""
16123#~ "\n"
16124#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
16125
16126#~ msgid "Could not write to %s"
16127#~ msgstr "不能写入 %s"
16128
16129#~ msgid "Error wrapping up %s."
16130#~ msgstr "错误收尾 %s。"
16131
16132#~ msgid "Your local changes would be overwritten by cherry-pick."
16133#~ msgstr "您的本地修改将被拣选操作覆盖。"
16134
16135#~ msgid "Cannot revert during another revert."
16136#~ msgstr "不能在回退中执行另一回退。"
16137
16138#~ msgid "Cannot cherry-pick during another cherry-pick."
16139#~ msgstr "不能在拣选过程中执行另一拣选。"
16140
16141#~ msgid "Could not parse line %d."
16142#~ msgstr "不能解析第 %d 行。"
16143
16144#~ msgid "Could not open %s"
16145#~ msgstr "不能打开 %s"
16146
16147#~ msgid "Could not read %s."
16148#~ msgstr "不能读取 %s。"
16149
16150#~ msgid "Could not format %s."
16151#~ msgstr "不能格式化 %s。"
16152
16153#~ msgid "%s: %s"
16154#~ msgstr "%s:%s"
16155
16156#~ msgid "cannot open %s: %s"
16157#~ msgstr "不能打开 %s:%s"
16158
16159#~ msgid "You need to set your committer info first"
16160#~ msgstr "您需要先设置您的提交者信息"