po / zh_CN.poon commit merge-recursive: handle addition of submodule on our side of history (c641ca6)
   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#   - 依云 <lilydjwg AT gmail.com>
  14#   - Yichao Yu <yyc1992 AT gmail.com>
  15#   - Zhuang Ya <zhuangya AT me.com>
  16#
  17#  Git glossary for Chinese translators
  18#
  19#   English                          |  Chinese
  20#   ---------------------------------+--------------------------------------
  21#   3-way merge                      |  三方合并
  22#   abbreviate                       |  简写(的 SHA-1 值)
  23#   alternate object database        |  备用对象库
  24#   amend                            |  修补
  25#   ancestor                         |  祖先,祖先提交
  26#   annotated tag                    |  附注标签
  27#   bare repository                  |  纯仓库
  28#   bisect                           |  二分查找
  29#   blob object                      |  数据对象
  30#   branch                           |  分支
  31#   bundle                           |  包
  32#   bypass                           |  绕过
  33#   cache                            |  索引(的别称)
  34#   chain                            |  (提交)链
  35#   changeset                        |  变更集
  36#   checkout                         |  检出
  37#   checksum                         |  校验,校验和
  38#   cherry-picking                   |  拣选
  39#   clean                            |  干净(的工作区)
  40#   clone                            |  克隆
  41#   commit                           |  提交
  42#   commit message                   |  提交说明
  43#   commit object                    |  提交对象
  44#   commit-ish (also committish)     |  提交号
  45#   conflict                         |  冲突
  46#   core Git                         |  核心 Git 工具
  47#   DAG                              |  有向无环图
  48#   dangling object                  |  摇摆对象
  49#   detached HEAD                    |  分离头指针
  50#   directory                        |  目录
  51#   dirty                            |  脏(的工作区)
  52#   dumb HTTP protocol               |  哑 HTTP 协议
  53#   evil merge                       |  坏合并(合并引入了父提交没有的修改)
  54#   fast-forward                     |  快进
  55#   fetch                            |  获取
  56#   file system                      |  文件系统
  57#   fork                             |  派生
  58#   Git archive                      |  仓库(对于 arch 用户)
  59#   gitfile                          |  gitfile(仓库链接文件)
  60#   grafts                           |  (提交)嫁接
  61#   hash                             |  哈希值
  62#   HEAD                             |  HEAD(头指针,亦即当前分支)
  63#   head                             |  头、分支
  64#   head ref                         |  分支
  65#   header                           |  头信息
  66#   hook                             |  钩子
  67#   hunk                             |  补丁片段
  68#   index                            |  索引
  69#   index entry                      |  索引条目
  70#   loose object                     |  松散对象
  71#   loose refs                       |  松散引用
  72#   master                           |  master(默认分支名)
  73#   merge                            |  合并
  74#   object                           |  对象
  75#   object database                  |  对象库
  76#   object identifier                |  对象标识符
  77#   object name                      |  对象名称
  78#   object type                      |  对象类型
  79#   octopus                          |  章鱼式合并(两分支以上的合并)
  80#   origin                           |  origin(默认的远程名称)
  81#   pack                             |  包
  82#   pack index                       |  包索引
  83#   packfile                         |  包文件
  84#   parent                           |  父提交
  85#   patch                            |  补丁
  86#   pathspec                         |  路径规格
  87#   pattern                          |  模式
  88#   pickaxe                          |  挖掘
  89#   plumbing                         |  管件(Git 底层核心命令的别称)
  90#   porcelain                        |  瓷件(Git 上层封装命令的别称)
  91#   precious-objects repo            |  珍品仓库
  92#   prune                            |  清除
  93#   pull                             |  拉,拉取
  94#   push                             |  推,推送
  95#   reachable                        |  可达
  96#   rebase                           |  变基
  97#   ref                              |  引用
  98#   reflog                           |  引用日志
  99#   refspec                          |  引用规格
 100#   remote                           |  远程,远程仓库
 101#   remote-tracking branch           |  远程跟踪分支
 102#   replay                           |  重放
 103#   repo                             |  仓库
 104#   repository                       |  仓库
 105#   resolve                          |  (冲突)解决
 106#   revert                           |  还原
 107#   revision                         |  版本
 108#   rewind                           |  回退
 109#   SCM                              |  源代码管理(工具)
 110#   SHA-1                            |  SHA-1(安全哈希算法1)
 111#   shallow repository               |  浅(克隆)仓库
 112#   signed tag                       |  签名标签
 113#   smart HTTP protocol              |  智能 HTTP 协议
 114#   squash                           |  压缩
 115#   stage                            |  n. 暂存区(即索引); v. 暂存
 116#   stash                            |  n. 贮藏区; v. 贮藏
 117#   submodule                        |  子模组
 118#   symref                           |  符号引用
 119#   tag                              |  n. 标签; v. 打标签
 120#   tag object                       |  标签对象
 121#   tagger                           |  打标签者
 122#   topic branch                     |  主题分支
 123#   track                            |  跟踪
 124#   trailer                          |  尾部署名
 125#   tree                             |  树(工作区或树对象)
 126#   tree object                      |  树对象
 127#   tree-ish (also treeish)          |  树对象(或可以解析为一树对象)
 128#   unmerged index                   |  未合并索引
 129#   unpack                           |  解包
 130#   unreachable object               |  不可达对象
 131#   unstage                          |  取消暂存
 132#   upstream                         |  上游
 133#   upstream branch                  |  上游分支
 134#   working tree                     |  工作区
 135#
 136msgid ""
 137msgstr ""
 138"Project-Id-Version: Git\n"
 139"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 140"POT-Creation-Date: 2017-10-17 09:44+0800\n"
 141"PO-Revision-Date: 2017-10-24 09:43+0800\n"
 142"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 143"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 144"Language: zh_CN\n"
 145"MIME-Version: 1.0\n"
 146"Content-Type: text/plain; charset=UTF-8\n"
 147"Content-Transfer-Encoding: 8bit\n"
 148"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 149
 150#: advice.c:58
 151#, c-format
 152msgid "hint: %.*s\n"
 153msgstr "提示:%.*s\n"
 154
 155#: advice.c:86
 156msgid "Cherry-picking is not possible because you have unmerged files."
 157msgstr "无法拣选,因为您有未合并的文件。"
 158
 159#: advice.c:88
 160msgid "Committing is not possible because you have unmerged files."
 161msgstr "无法提交,因为您有未合并的文件。"
 162
 163#: advice.c:90
 164msgid "Merging is not possible because you have unmerged files."
 165msgstr "无法合并,因为您有未合并的文件。"
 166
 167#: advice.c:92
 168msgid "Pulling is not possible because you have unmerged files."
 169msgstr "无法拉取,因为您有未合并的文件。"
 170
 171#: advice.c:94
 172msgid "Reverting is not possible because you have unmerged files."
 173msgstr "无法回退,因为您有未合并的文件。"
 174
 175#: advice.c:96
 176#, c-format
 177msgid "It is not possible to %s because you have unmerged files."
 178msgstr "无法 %s,因为您有未合并的文件。"
 179
 180#: advice.c:104
 181msgid ""
 182"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 183"as appropriate to mark resolution and make a commit."
 184msgstr ""
 185"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
 186"解决方案并提交。"
 187
 188#: advice.c:112
 189msgid "Exiting because of an unresolved conflict."
 190msgstr "因为存在未解决的冲突而退出。"
 191
 192#: advice.c:117 builtin/merge.c:1211
 193msgid "You have not concluded your merge (MERGE_HEAD exists)."
 194msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
 195
 196#: advice.c:119
 197msgid "Please, commit your changes before merging."
 198msgstr "请在合并前先提交您的修改。"
 199
 200#: advice.c:120
 201msgid "Exiting because of unfinished merge."
 202msgstr "因为存在未完成的合并而退出。"
 203
 204#: advice.c:126
 205#, c-format
 206msgid ""
 207"Note: checking out '%s'.\n"
 208"\n"
 209"You are in 'detached HEAD' state. You can look around, make experimental\n"
 210"changes and commit them, and you can discard any commits you make in this\n"
 211"state without impacting any branches by performing another checkout.\n"
 212"\n"
 213"If you want to create a new branch to retain commits you create, you may\n"
 214"do so (now or later) by using -b with the checkout command again. Example:\n"
 215"\n"
 216"  git checkout -b <new-branch-name>\n"
 217"\n"
 218msgstr ""
 219"注意:正在检出 '%s'。\n"
 220"\n"
 221"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
 222"外\n"
 223"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
 224"\n"
 225"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
 226"参数 -b 来实现(现在或稍后)。例如:\n"
 227"\n"
 228"  git checkout -b <new-branch-name>\n"
 229"\n"
 230
 231#: apply.c:58
 232#, c-format
 233msgid "unrecognized whitespace option '%s'"
 234msgstr "未能识别的空白字符选项 '%s'"
 235
 236#: apply.c:74
 237#, c-format
 238msgid "unrecognized whitespace ignore option '%s'"
 239msgstr "未能识别的空白字符忽略选项 '%s'"
 240
 241#: apply.c:125
 242msgid "--reject and --3way cannot be used together."
 243msgstr "--reject 和 --3say 不能同时使用。"
 244
 245#: apply.c:127
 246msgid "--cached and --3way cannot be used together."
 247msgstr "--cached 和 --3way 不能同时使用。"
 248
 249#: apply.c:130
 250msgid "--3way outside a repository"
 251msgstr "--3way 在一个仓库之外"
 252
 253#: apply.c:141
 254msgid "--index outside a repository"
 255msgstr "--index 在一个仓库之外"
 256
 257#: apply.c:144
 258msgid "--cached outside a repository"
 259msgstr "--cached 在一个仓库之外"
 260
 261#: apply.c:845
 262#, c-format
 263msgid "Cannot prepare timestamp regexp %s"
 264msgstr "无法准备时间戳正则表达式 %s"
 265
 266#: apply.c:854
 267#, c-format
 268msgid "regexec returned %d for input: %s"
 269msgstr "regexec 返回 %d,输入为:%s"
 270
 271#: apply.c:928
 272#, c-format
 273msgid "unable to find filename in patch at line %d"
 274msgstr "不能在补丁的第 %d 行找到文件名"
 275
 276#: apply.c:966
 277#, c-format
 278msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 279msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
 280
 281#: apply.c:972
 282#, c-format
 283msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 284msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
 285
 286#: apply.c:973
 287#, c-format
 288msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 289msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
 290
 291#: apply.c:978
 292#, c-format
 293msgid "git apply: bad git-diff - expected /dev/null on line %d"
 294msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
 295
 296#: apply.c:1007
 297#, c-format
 298msgid "invalid mode on line %d: %s"
 299msgstr "第 %d 行包含无效文件模式:%s"
 300
 301#: apply.c:1325
 302#, c-format
 303msgid "inconsistent header lines %d and %d"
 304msgstr "不一致的文件头,%d 行和 %d 行"
 305
 306#: apply.c:1497
 307#, c-format
 308msgid "recount: unexpected line: %.*s"
 309msgstr "recount:意外的行:%.*s"
 310
 311#: apply.c:1566
 312#, c-format
 313msgid "patch fragment without header at line %d: %.*s"
 314msgstr "第 %d 行的补丁片段没有头信息:%.*s"
 315
 316#: apply.c:1586
 317#, c-format
 318msgid ""
 319"git diff header lacks filename information when removing %d leading pathname "
 320"component (line %d)"
 321msgid_plural ""
 322"git diff header lacks filename information when removing %d leading pathname "
 323"components (line %d)"
 324msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
 325msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
 326
 327#: apply.c:1599
 328#, c-format
 329msgid "git diff header lacks filename information (line %d)"
 330msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
 331
 332#: apply.c:1787
 333msgid "new file depends on old contents"
 334msgstr "新文件依赖旧内容"
 335
 336#: apply.c:1789
 337msgid "deleted file still has contents"
 338msgstr "删除的文件仍有内容"
 339
 340#: apply.c:1823
 341#, c-format
 342msgid "corrupt patch at line %d"
 343msgstr "补丁在第 %d 行损坏"
 344
 345#: apply.c:1860
 346#, c-format
 347msgid "new file %s depends on old contents"
 348msgstr "新文件 %s 依赖旧内容"
 349
 350#: apply.c:1862
 351#, c-format
 352msgid "deleted file %s still has contents"
 353msgstr "删除的文件 %s 仍有内容"
 354
 355#: apply.c:1865
 356#, c-format
 357msgid "** warning: file %s becomes empty but is not deleted"
 358msgstr "** 警告:文件 %s 成为空文件但并未删除"
 359
 360#: apply.c:2012
 361#, c-format
 362msgid "corrupt binary patch at line %d: %.*s"
 363msgstr "二进制补丁在第 %d 行损坏:%.*s"
 364
 365#: apply.c:2049
 366#, c-format
 367msgid "unrecognized binary patch at line %d"
 368msgstr "未能识别的二进制补丁位于第 %d 行"
 369
 370#: apply.c:2209
 371#, c-format
 372msgid "patch with only garbage at line %d"
 373msgstr "补丁文件的第 %d 行只有垃圾数据"
 374
 375#: apply.c:2295
 376#, c-format
 377msgid "unable to read symlink %s"
 378msgstr "无法读取符号链接 %s"
 379
 380#: apply.c:2299
 381#, c-format
 382msgid "unable to open or read %s"
 383msgstr "不能打开或读取 %s"
 384
 385#: apply.c:2958
 386#, c-format
 387msgid "invalid start of line: '%c'"
 388msgstr "无效的行首字符:'%c'"
 389
 390#: apply.c:3077
 391#, c-format
 392msgid "Hunk #%d succeeded at %d (offset %d line)."
 393msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 394msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
 395msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
 396
 397#: apply.c:3089
 398#, c-format
 399msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 400msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
 401
 402#: apply.c:3095
 403#, c-format
 404msgid ""
 405"while searching for:\n"
 406"%.*s"
 407msgstr ""
 408"当查询:\n"
 409"%.*s"
 410
 411#: apply.c:3117
 412#, c-format
 413msgid "missing binary patch data for '%s'"
 414msgstr "缺失 '%s' 的二进制补丁数据"
 415
 416#: apply.c:3125
 417#, c-format
 418msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 419msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
 420
 421#: apply.c:3171
 422#, c-format
 423msgid "cannot apply binary patch to '%s' without full index line"
 424msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 425
 426#: apply.c:3181
 427#, c-format
 428msgid ""
 429"the patch applies to '%s' (%s), which does not match the current contents."
 430msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
 431
 432#: apply.c:3189
 433#, c-format
 434msgid "the patch applies to an empty '%s' but it is not empty"
 435msgstr "补丁应用到空文件 '%s',但其并非空文件"
 436
 437#: apply.c:3207
 438#, c-format
 439msgid "the necessary postimage %s for '%s' cannot be read"
 440msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
 441
 442#: apply.c:3220
 443#, c-format
 444msgid "binary patch does not apply to '%s'"
 445msgstr "二进制补丁未应用到 '%s'"
 446
 447#: apply.c:3226
 448#, c-format
 449msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 450msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
 451
 452#: apply.c:3247
 453#, c-format
 454msgid "patch failed: %s:%ld"
 455msgstr "打补丁失败:%s:%ld"
 456
 457#: apply.c:3369
 458#, c-format
 459msgid "cannot checkout %s"
 460msgstr "不能检出 %s"
 461
 462#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
 463#, c-format
 464msgid "failed to read %s"
 465msgstr "无法读取 %s"
 466
 467#: apply.c:3426
 468#, c-format
 469msgid "reading from '%s' beyond a symbolic link"
 470msgstr "读取位于符号链接中的 '%s'"
 471
 472#: apply.c:3455 apply.c:3695
 473#, c-format
 474msgid "path %s has been renamed/deleted"
 475msgstr "路径 %s 已经被重命名/删除"
 476
 477#: apply.c:3538 apply.c:3709
 478#, c-format
 479msgid "%s: does not exist in index"
 480msgstr "%s:不存在于索引中"
 481
 482#: apply.c:3547 apply.c:3717
 483#, c-format
 484msgid "%s: does not match index"
 485msgstr "%s:和索引不匹配"
 486
 487#: apply.c:3582
 488msgid "repository lacks the necessary blob to fall back on 3-way merge."
 489msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 490
 491#: apply.c:3585
 492#, c-format
 493msgid "Falling back to three-way merge...\n"
 494msgstr "回落到三方合并...\n"
 495
 496#: apply.c:3601 apply.c:3605
 497#, c-format
 498msgid "cannot read the current contents of '%s'"
 499msgstr "无法读取 '%s' 的当前内容"
 500
 501#: apply.c:3617
 502#, c-format
 503msgid "Failed to fall back on three-way merge...\n"
 504msgstr "无法回落到三方合并...\n"
 505
 506#: apply.c:3631
 507#, c-format
 508msgid "Applied patch to '%s' with conflicts.\n"
 509msgstr "应用补丁到 '%s' 存在冲突。\n"
 510
 511#: apply.c:3636
 512#, c-format
 513msgid "Applied patch to '%s' cleanly.\n"
 514msgstr "成功应用补丁到 '%s'。\n"
 515
 516#: apply.c:3662
 517msgid "removal patch leaves file contents"
 518msgstr "移除补丁仍留下了文件内容"
 519
 520#: apply.c:3734
 521#, c-format
 522msgid "%s: wrong type"
 523msgstr "%s:错误类型"
 524
 525#: apply.c:3736
 526#, c-format
 527msgid "%s has type %o, expected %o"
 528msgstr "%s 的类型是 %o,应为 %o"
 529
 530#: apply.c:3886 apply.c:3888
 531#, c-format
 532msgid "invalid path '%s'"
 533msgstr "无效路径 '%s'"
 534
 535#: apply.c:3944
 536#, c-format
 537msgid "%s: already exists in index"
 538msgstr "%s:已经存在于索引中"
 539
 540#: apply.c:3947
 541#, c-format
 542msgid "%s: already exists in working directory"
 543msgstr "%s:已经存在于工作区中"
 544
 545#: apply.c:3967
 546#, c-format
 547msgid "new mode (%o) of %s does not match old mode (%o)"
 548msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
 549
 550#: apply.c:3972
 551#, c-format
 552msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 553msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
 554
 555#: apply.c:3992
 556#, c-format
 557msgid "affected file '%s' is beyond a symbolic link"
 558msgstr "受影响的文件 '%s' 位于符号链接中"
 559
 560#: apply.c:3996
 561#, c-format
 562msgid "%s: patch does not apply"
 563msgstr "%s:补丁未应用"
 564
 565#: apply.c:4011
 566#, c-format
 567msgid "Checking patch %s..."
 568msgstr "检查补丁 %s..."
 569
 570#: apply.c:4102
 571#, c-format
 572msgid "sha1 information is lacking or useless for submodule %s"
 573msgstr "子模组 %s 的 sha1 信息缺失或无效"
 574
 575#: apply.c:4109
 576#, c-format
 577msgid "mode change for %s, which is not in current HEAD"
 578msgstr "%s 的模式被改变,但它不在当前 HEAD 中"
 579
 580#: apply.c:4112
 581#, c-format
 582msgid "sha1 information is lacking or useless (%s)."
 583msgstr "sha1 信息缺失或无效(%s)。"
 584
 585#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
 586#, c-format
 587msgid "make_cache_entry failed for path '%s'"
 588msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 589
 590#: apply.c:4121
 591#, c-format
 592msgid "could not add %s to temporary index"
 593msgstr "不能在临时索引中添加 %s"
 594
 595#: apply.c:4131
 596#, c-format
 597msgid "could not write temporary index to %s"
 598msgstr "不能把临时索引写入到 %s"
 599
 600#: apply.c:4269
 601#, c-format
 602msgid "unable to remove %s from index"
 603msgstr "不能从索引中移除 %s"
 604
 605#: apply.c:4304
 606#, c-format
 607msgid "corrupt patch for submodule %s"
 608msgstr "子模组 %s 损坏的补丁"
 609
 610#: apply.c:4310
 611#, c-format
 612msgid "unable to stat newly created file '%s'"
 613msgstr "不能对新建文件 '%s' 调用 stat"
 614
 615#: apply.c:4318
 616#, c-format
 617msgid "unable to create backing store for newly created file %s"
 618msgstr "不能为新建文件 %s 创建后端存储"
 619
 620#: apply.c:4324 apply.c:4468
 621#, c-format
 622msgid "unable to add cache entry for %s"
 623msgstr "无法为 %s 添加缓存条目"
 624
 625#: apply.c:4365
 626#, c-format
 627msgid "failed to write to '%s'"
 628msgstr "无法写入 '%s'"
 629
 630#: apply.c:4369
 631#, c-format
 632msgid "closing file '%s'"
 633msgstr "关闭文件 '%s'"
 634
 635#: apply.c:4439
 636#, c-format
 637msgid "unable to write file '%s' mode %o"
 638msgstr "不能写文件 '%s' 权限 %o"
 639
 640#: apply.c:4537
 641#, c-format
 642msgid "Applied patch %s cleanly."
 643msgstr "成功应用补丁 %s。"
 644
 645#: apply.c:4545
 646msgid "internal error"
 647msgstr "内部错误"
 648
 649#: apply.c:4548
 650#, c-format
 651msgid "Applying patch %%s with %d reject..."
 652msgid_plural "Applying patch %%s with %d rejects..."
 653msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
 654msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
 655
 656#: apply.c:4559
 657#, c-format
 658msgid "truncating .rej filename to %.*s.rej"
 659msgstr "截短 .rej 文件名为 %.*s.rej"
 660
 661#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
 662#, c-format
 663msgid "cannot open %s"
 664msgstr "不能打开 %s"
 665
 666#: apply.c:4581
 667#, c-format
 668msgid "Hunk #%d applied cleanly."
 669msgstr "第 #%d 个片段成功应用。"
 670
 671#: apply.c:4585
 672#, c-format
 673msgid "Rejected hunk #%d."
 674msgstr "拒绝第 #%d 个片段。"
 675
 676#: apply.c:4695
 677#, c-format
 678msgid "Skipped patch '%s'."
 679msgstr "略过补丁 '%s'。"
 680
 681#: apply.c:4703
 682msgid "unrecognized input"
 683msgstr "未能识别的输入"
 684
 685#: apply.c:4722
 686msgid "unable to read index file"
 687msgstr "无法读取索引文件"
 688
 689#: apply.c:4859
 690#, c-format
 691msgid "can't open patch '%s': %s"
 692msgstr "不能打开补丁 '%s':%s"
 693
 694#: apply.c:4886
 695#, c-format
 696msgid "squelched %d whitespace error"
 697msgid_plural "squelched %d whitespace errors"
 698msgstr[0] "抑制下仍有 %d 个空白字符误用"
 699msgstr[1] "抑制下仍有 %d 个空白字符误用"
 700
 701#: apply.c:4892 apply.c:4907
 702#, c-format
 703msgid "%d line adds whitespace errors."
 704msgid_plural "%d lines add whitespace errors."
 705msgstr[0] "%d 行新增了空白字符误用。"
 706msgstr[1] "%d 行新增了空白字符误用。"
 707
 708#: apply.c:4900
 709#, c-format
 710msgid "%d line applied after fixing whitespace errors."
 711msgid_plural "%d lines applied after fixing whitespace errors."
 712msgstr[0] "修复空白错误后,应用了 %d 行。"
 713msgstr[1] "修复空白错误后,应用了 %d 行。"
 714
 715#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
 716msgid "Unable to write new index file"
 717msgstr "无法写入新索引文件"
 718
 719#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
 720#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
 721#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
 722#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
 723#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
 724#: git-add--interactive.perl:197
 725msgid "path"
 726msgstr "路径"
 727
 728#: apply.c:4948
 729msgid "don't apply changes matching the given path"
 730msgstr "不要应用与给出路径向匹配的变更"
 731
 732#: apply.c:4951
 733msgid "apply changes matching the given path"
 734msgstr "应用与给出路径向匹配的变更"
 735
 736#: apply.c:4953 builtin/am.c:2265
 737msgid "num"
 738msgstr "数字"
 739
 740#: apply.c:4954
 741msgid "remove <num> leading slashes from traditional diff paths"
 742msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
 743
 744#: apply.c:4957
 745msgid "ignore additions made by the patch"
 746msgstr "忽略补丁中的添加的文件"
 747
 748#: apply.c:4959
 749msgid "instead of applying the patch, output diffstat for the input"
 750msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
 751
 752#: apply.c:4963
 753msgid "show number of added and deleted lines in decimal notation"
 754msgstr "以十进制数显示添加和删除的行数"
 755
 756#: apply.c:4965
 757msgid "instead of applying the patch, output a summary for the input"
 758msgstr "不应用补丁,而是显示输入的概要"
 759
 760#: apply.c:4967
 761msgid "instead of applying the patch, see if the patch is applicable"
 762msgstr "不应用补丁,而是查看补丁是否可应用"
 763
 764#: apply.c:4969
 765msgid "make sure the patch is applicable to the current index"
 766msgstr "确认补丁可以应用到当前索引"
 767
 768#: apply.c:4971
 769msgid "apply a patch without touching the working tree"
 770msgstr "应用补丁而不修改工作区"
 771
 772#: apply.c:4973
 773msgid "accept a patch that touches outside the working area"
 774msgstr "接受修改工作区之外文件的补丁"
 775
 776#: apply.c:4975
 777msgid "also apply the patch (use with --stat/--summary/--check)"
 778msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
 779
 780#: apply.c:4977
 781msgid "attempt three-way merge if a patch does not apply"
 782msgstr "如果一个补丁不能应用则尝试三方合并"
 783
 784#: apply.c:4979
 785msgid "build a temporary index based on embedded index information"
 786msgstr "创建一个临时索引基于嵌入的索引信息"
 787
 788#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
 789msgid "paths are separated with NUL character"
 790msgstr "路径以 NUL 字符分隔"
 791
 792#: apply.c:4984
 793msgid "ensure at least <n> lines of context match"
 794msgstr "确保至少匹配 <n> 行上下文"
 795
 796#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
 797#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 798msgid "action"
 799msgstr "动作"
 800
 801#: apply.c:4986
 802msgid "detect new or modified lines that have whitespace errors"
 803msgstr "检查新增和修改的行中间的空白字符滥用"
 804
 805#: apply.c:4989 apply.c:4992
 806msgid "ignore changes in whitespace when finding context"
 807msgstr "查找上下文时忽略空白字符的变更"
 808
 809#: apply.c:4995
 810msgid "apply the patch in reverse"
 811msgstr "反向应用补丁"
 812
 813#: apply.c:4997
 814msgid "don't expect at least one line of context"
 815msgstr "无需至少一行上下文"
 816
 817#: apply.c:4999
 818msgid "leave the rejected hunks in corresponding *.rej files"
 819msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
 820
 821#: apply.c:5001
 822msgid "allow overlapping hunks"
 823msgstr "允许重叠的补丁片段"
 824
 825#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
 826#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
 827#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
 828msgid "be verbose"
 829msgstr "冗长输出"
 830
 831#: apply.c:5004
 832msgid "tolerate incorrectly detected missing new-line at the end of file"
 833msgstr "允许不正确的文件末尾换行符"
 834
 835#: apply.c:5007
 836msgid "do not trust the line counts in the hunk headers"
 837msgstr "不信任补丁片段的头信息中的行号"
 838
 839#: apply.c:5009 builtin/am.c:2253
 840msgid "root"
 841msgstr "根目录"
 842
 843#: apply.c:5010
 844msgid "prepend <root> to all filenames"
 845msgstr "为所有文件名前添加 <根目录>"
 846
 847#: archive.c:13
 848msgid "git archive [<options>] <tree-ish> [<path>...]"
 849msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 850
 851#: archive.c:14
 852msgid "git archive --list"
 853msgstr "git archive --list"
 854
 855#: archive.c:15
 856msgid ""
 857"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 858msgstr ""
 859"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 860
 861#: archive.c:16
 862msgid "git archive --remote <repo> [--exec <cmd>] --list"
 863msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 864
 865#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
 866#, c-format
 867msgid "pathspec '%s' did not match any files"
 868msgstr "路径规格 '%s' 未匹配任何文件"
 869
 870#: archive.c:436
 871msgid "fmt"
 872msgstr "格式"
 873
 874#: archive.c:436
 875msgid "archive format"
 876msgstr "归档格式"
 877
 878#: archive.c:437 builtin/log.c:1452
 879msgid "prefix"
 880msgstr "前缀"
 881
 882#: archive.c:438
 883msgid "prepend prefix to each pathname in the archive"
 884msgstr "为归档中每个路径名加上前缀"
 885
 886#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
 887#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
 888#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
 889#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
 890#: parse-options.h:153
 891msgid "file"
 892msgstr "文件"
 893
 894#: archive.c:440 builtin/archive.c:89
 895msgid "write the archive to this file"
 896msgstr "归档写入此文件"
 897
 898#: archive.c:442
 899msgid "read .gitattributes in working directory"
 900msgstr "读取工作区中的 .gitattributes"
 901
 902#: archive.c:443
 903msgid "report archived files on stderr"
 904msgstr "在标准错误上报告归档文件"
 905
 906#: archive.c:444
 907msgid "store only"
 908msgstr "只存储"
 909
 910#: archive.c:445
 911msgid "compress faster"
 912msgstr "压缩速度更快"
 913
 914#: archive.c:453
 915msgid "compress better"
 916msgstr "压缩效果更好"
 917
 918#: archive.c:456
 919msgid "list supported archive formats"
 920msgstr "列出支持的归档格式"
 921
 922#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
 923#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
 924msgid "repo"
 925msgstr "仓库"
 926
 927#: archive.c:459 builtin/archive.c:91
 928msgid "retrieve the archive from remote repository <repo>"
 929msgstr "从远程仓库(<仓库>)提取归档文件"
 930
 931#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
 932msgid "command"
 933msgstr "命令"
 934
 935#: archive.c:461 builtin/archive.c:93
 936msgid "path to the remote git-upload-archive command"
 937msgstr "远程 git-upload-archive 命令的路径"
 938
 939#: archive.c:468
 940msgid "Unexpected option --remote"
 941msgstr "未知参数 --remote"
 942
 943#: archive.c:470
 944msgid "Option --exec can only be used together with --remote"
 945msgstr "选项 --exec 只能和 --remote 同时使用"
 946
 947#: archive.c:472
 948msgid "Unexpected option --output"
 949msgstr "未知参数 --output"
 950
 951#: archive.c:494
 952#, c-format
 953msgid "Unknown archive format '%s'"
 954msgstr "未知归档格式 '%s'"
 955
 956#: archive.c:501
 957#, c-format
 958msgid "Argument not supported for format '%s': -%d"
 959msgstr "参数不支持此格式 '%s':-%d"
 960
 961#: attr.c:218
 962#, c-format
 963msgid "%.*s is not a valid attribute name"
 964msgstr "%.*s 不是一个有效的属性名"
 965
 966#: attr.c:415
 967msgid ""
 968"Negative patterns are ignored in git attributes\n"
 969"Use '\\!' for literal leading exclamation."
 970msgstr ""
 971"负值模版在 git attributes 中被忽略\n"
 972"当字符串确实要以感叹号开始时,使用 '\\!'。"
 973
 974#: bisect.c:447
 975#, c-format
 976msgid "Badly quoted content in file '%s': %s"
 977msgstr "文件 '%s' 包含错误的引用格式:%s"
 978
 979#: bisect.c:655
 980#, c-format
 981msgid "We cannot bisect more!\n"
 982msgstr "我们无法进行更多的二分查找!\n"
 983
 984#: bisect.c:708
 985#, c-format
 986msgid "Not a valid commit name %s"
 987msgstr "不是一个有效的提交名 %s"
 988
 989#: bisect.c:732
 990#, c-format
 991msgid ""
 992"The merge base %s is bad.\n"
 993"This means the bug has been fixed between %s and [%s].\n"
 994msgstr ""
 995"合并基线 %s 是坏的。\n"
 996"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 997
 998#: bisect.c:737
 999#, c-format
1000msgid ""
1001"The merge base %s is new.\n"
1002"The property has changed between %s and [%s].\n"
1003msgstr ""
1004"合并基线 %s 是新的。\n"
1005"介于 %s 和 [%s] 之间的属性已经被修改。\n"
1006
1007#: bisect.c:742
1008#, c-format
1009msgid ""
1010"The merge base %s is %s.\n"
1011"This means the first '%s' commit is between %s and [%s].\n"
1012msgstr ""
1013"合并基线 %s 是 %s。\n"
1014"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1015
1016#: bisect.c:750
1017#, c-format
1018msgid ""
1019"Some %s revs are not ancestors of the %s rev.\n"
1020"git bisect cannot work properly in this case.\n"
1021"Maybe you mistook %s and %s revs?\n"
1022msgstr ""
1023"一些 %s 版本不是 %s 版本的祖先。\n"
1024"这种情况下 git 二分查找无法正常工作。\n"
1025"您可能弄错了 %s 和 %s 版本?\n"
1026
1027#: bisect.c:763
1028#, c-format
1029msgid ""
1030"the merge base between %s and [%s] must be skipped.\n"
1031"So we cannot be sure the first %s commit is between %s and %s.\n"
1032"We continue anyway."
1033msgstr ""
1034"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1035"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1036"我们仍旧继续。"
1037
1038#: bisect.c:798
1039#, c-format
1040msgid "Bisecting: a merge base must be tested\n"
1041msgstr "二分查找中:合并基线必须是经过测试的\n"
1042
1043#: bisect.c:850
1044#, c-format
1045msgid "a %s revision is needed"
1046msgstr "需要一个 %s 版本"
1047
1048#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
1049#, c-format
1050msgid "could not create file '%s'"
1051msgstr "不能创建文件 '%s'"
1052
1053#: bisect.c:918
1054#, c-format
1055msgid "could not read file '%s'"
1056msgstr "不能读取文件 '%s'"
1057
1058#: bisect.c:948
1059msgid "reading bisect refs failed"
1060msgstr "读取二分查找引用失败"
1061
1062#: bisect.c:968
1063#, c-format
1064msgid "%s was both %s and %s\n"
1065msgstr "%s 同时为 %s 和 %s\n"
1066
1067#: bisect.c:976
1068#, c-format
1069msgid ""
1070"No testable commit found.\n"
1071"Maybe you started with bad path parameters?\n"
1072msgstr ""
1073"没有发现可测试的提交。\n"
1074"可能您在运行时使用了错误的路径参数?\n"
1075
1076#: bisect.c:995
1077#, c-format
1078msgid "(roughly %d step)"
1079msgid_plural "(roughly %d steps)"
1080msgstr[0] "(大概 %d 步)"
1081msgstr[1] "(大概 %d 步)"
1082
1083#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1084#. steps)" translation.
1085#.
1086#: bisect.c:1001
1087#, c-format
1088msgid "Bisecting: %d revision left to test after this %s\n"
1089msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1090msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1091msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1092
1093#: blame.c:1757
1094msgid "--contents and --reverse do not blend well."
1095msgstr "--contents 和 --reverse 不能混用。"
1096
1097#: blame.c:1768
1098msgid "cannot use --contents with final commit object name"
1099msgstr "不能将 --contents 和最终的提交对象名共用"
1100
1101#: blame.c:1788
1102msgid "--reverse and --first-parent together require specified latest commit"
1103msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1104
1105#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
1106#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
1107#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
1108#: builtin/shortlog.c:191
1109msgid "revision walk setup failed"
1110msgstr "版本遍历设置失败"
1111
1112#: blame.c:1815
1113msgid ""
1114"--reverse --first-parent together require range along first-parent chain"
1115msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1116
1117#: blame.c:1826
1118#, c-format
1119msgid "no such path %s in %s"
1120msgstr "在 %2$s 中无此路径 %1$s"
1121
1122#: blame.c:1837
1123#, c-format
1124msgid "cannot read blob %s for path %s"
1125msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1126
1127#: branch.c:53
1128#, c-format
1129msgid ""
1130"\n"
1131"After fixing the error cause you may try to fix up\n"
1132"the remote tracking information by invoking\n"
1133"\"git branch --set-upstream-to=%s%s%s\"."
1134msgstr ""
1135"\n"
1136"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1137"\"git branch --set-upstream-to=%s%s%s\" 。"
1138
1139#: branch.c:67
1140#, c-format
1141msgid "Not setting branch %s as its own upstream."
1142msgstr "未设置分支 %s 作为它自己的上游。"
1143
1144#: branch.c:93
1145#, c-format
1146msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1147msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1148
1149#: branch.c:94
1150#, c-format
1151msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1152msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1153
1154#: branch.c:98
1155#, c-format
1156msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1157msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
1158
1159#: branch.c:99
1160#, c-format
1161msgid "Branch '%s' set up to track local branch '%s'."
1162msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
1163
1164#: branch.c:104
1165#, c-format
1166msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1167msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
1168
1169#: branch.c:105
1170#, c-format
1171msgid "Branch '%s' set up to track remote ref '%s'."
1172msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
1173
1174#: branch.c:109
1175#, c-format
1176msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1177msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
1178
1179#: branch.c:110
1180#, c-format
1181msgid "Branch '%s' set up to track local ref '%s'."
1182msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
1183
1184#: branch.c:119
1185msgid "Unable to write upstream branch configuration"
1186msgstr "无法写入上游分支配置"
1187
1188#: branch.c:156
1189#, c-format
1190msgid "Not tracking: ambiguous information for ref %s"
1191msgstr "未跟踪:引用 %s 有歧义"
1192
1193#: branch.c:185
1194#, c-format
1195msgid "'%s' is not a valid branch name."
1196msgstr "'%s' 不是一个有效的分支名称。"
1197
1198#: branch.c:190
1199#, c-format
1200msgid "A branch named '%s' already exists."
1201msgstr "一个分支名 '%s' 已经存在。"
1202
1203#: branch.c:197
1204msgid "Cannot force update the current branch."
1205msgstr "无法强制更新当前分支。"
1206
1207#: branch.c:217
1208#, c-format
1209msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1210msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1211
1212#: branch.c:219
1213#, c-format
1214msgid "the requested upstream branch '%s' does not exist"
1215msgstr "请求的上游分支 '%s' 不存在"
1216
1217#: branch.c:221
1218msgid ""
1219"\n"
1220"If you are planning on basing your work on an upstream\n"
1221"branch that already exists at the remote, you may need to\n"
1222"run \"git fetch\" to retrieve it.\n"
1223"\n"
1224"If you are planning to push out a new local branch that\n"
1225"will track its remote counterpart, you may want to use\n"
1226"\"git push -u\" to set the upstream config as you push."
1227msgstr ""
1228"\n"
1229"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1230"您可能需要执行 \"git fetch\" 来获取分支。\n"
1231"\n"
1232"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1233"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1234
1235#: branch.c:264
1236#, c-format
1237msgid "Not a valid object name: '%s'."
1238msgstr "不是一个有效的对象名:'%s'。"
1239
1240#: branch.c:284
1241#, c-format
1242msgid "Ambiguous object name: '%s'."
1243msgstr "歧义的对象名:'%s'。"
1244
1245#: branch.c:289
1246#, c-format
1247msgid "Not a valid branch point: '%s'."
1248msgstr "无效的分支点:'%s'。"
1249
1250#: branch.c:343
1251#, c-format
1252msgid "'%s' is already checked out at '%s'"
1253msgstr "'%s' 已经检出到 '%s'"
1254
1255#: branch.c:366
1256#, c-format
1257msgid "HEAD of working tree %s is not updated"
1258msgstr "工作区 %s 的 HEAD 指向没有被更新"
1259
1260#: bundle.c:34
1261#, c-format
1262msgid "'%s' does not look like a v2 bundle file"
1263msgstr "'%s' 不像是一个 v2 版本的包文件"
1264
1265#: bundle.c:62
1266#, c-format
1267msgid "unrecognized header: %s%s (%d)"
1268msgstr "未能识别的包头:%s%s (%d)"
1269
1270#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
1271#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
1272#: sequencer.c:2949 builtin/commit.c:782
1273#, c-format
1274msgid "could not open '%s'"
1275msgstr "不能打开 '%s'"
1276
1277#: bundle.c:140
1278msgid "Repository lacks these prerequisite commits:"
1279msgstr "仓库中缺少这些必备的提交:"
1280
1281#: bundle.c:193
1282#, c-format
1283msgid "The bundle contains this ref:"
1284msgid_plural "The bundle contains these %d refs:"
1285msgstr[0] "这个包中含有这个引用:"
1286msgstr[1] "这个包中含有 %d 个引用:"
1287
1288#: bundle.c:200
1289msgid "The bundle records a complete history."
1290msgstr "这个包记录一个完整历史。"
1291
1292#: bundle.c:202
1293#, c-format
1294msgid "The bundle requires this ref:"
1295msgid_plural "The bundle requires these %d refs:"
1296msgstr[0] "这个包需要这个引用:"
1297msgstr[1] "这个包需要 %d 个引用:"
1298
1299#: bundle.c:261
1300msgid "Could not spawn pack-objects"
1301msgstr "不能生成 pack-objects 进程"
1302
1303#: bundle.c:272
1304msgid "pack-objects died"
1305msgstr "pack-objects 终止"
1306
1307#: bundle.c:314
1308msgid "rev-list died"
1309msgstr "rev-list 终止"
1310
1311#: bundle.c:363
1312#, c-format
1313msgid "ref '%s' is excluded by the rev-list options"
1314msgstr "引用 '%s' 被 rev-list 选项排除"
1315
1316#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
1317#, c-format
1318msgid "unrecognized argument: %s"
1319msgstr "未能识别的参数:%s"
1320
1321#: bundle.c:461
1322msgid "Refusing to create empty bundle."
1323msgstr "不能创建空包。"
1324
1325#: bundle.c:473
1326#, c-format
1327msgid "cannot create '%s'"
1328msgstr "不能创建 '%s'"
1329
1330#: bundle.c:501
1331msgid "index-pack died"
1332msgstr "index-pack 终止"
1333
1334#: color.c:301
1335#, c-format
1336msgid "invalid color value: %.*s"
1337msgstr "无效的颜色值:%.*s"
1338
1339#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
1340#: builtin/am.c:1467 builtin/am.c:2105
1341#, c-format
1342msgid "could not parse %s"
1343msgstr "不能解析 %s"
1344
1345#: commit.c:43
1346#, c-format
1347msgid "%s %s is not a commit!"
1348msgstr "%s %s 不是一个提交!"
1349
1350#: commit.c:1517
1351msgid ""
1352"Warning: commit message did not conform to UTF-8.\n"
1353"You may want to amend it after fixing the message, or set the config\n"
1354"variable i18n.commitencoding to the encoding your project uses.\n"
1355msgstr ""
1356"警告:提交说明不符合 UTF-8 字符编码。\n"
1357"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
1358"设置为您项目所用的字符编码。\n"
1359
1360#: compat/obstack.c:406 compat/obstack.c:408
1361msgid "memory exhausted"
1362msgstr "内存耗尽"
1363
1364#: config.c:187
1365msgid "relative config include conditionals must come from files"
1366msgstr "包含相对路径的条件引用必须来自于文件"
1367
1368#: config.c:721
1369#, c-format
1370msgid "bad config line %d in blob %s"
1371msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1372
1373#: config.c:725
1374#, c-format
1375msgid "bad config line %d in file %s"
1376msgstr "文件 %2$s 中错误的配置行 %1$d"
1377
1378#: config.c:729
1379#, c-format
1380msgid "bad config line %d in standard input"
1381msgstr "标准输入中错误的配置行 %d"
1382
1383#: config.c:733
1384#, c-format
1385msgid "bad config line %d in submodule-blob %s"
1386msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1387
1388#: config.c:737
1389#, c-format
1390msgid "bad config line %d in command line %s"
1391msgstr "命令行 %2$s 中错误的配置行 %1$d"
1392
1393#: config.c:741
1394#, c-format
1395msgid "bad config line %d in %s"
1396msgstr "在 %2$s 中错误的配置行 %1$d"
1397
1398#: config.c:869
1399msgid "out of range"
1400msgstr "超出范围"
1401
1402#: config.c:869
1403msgid "invalid unit"
1404msgstr "无效的单位"
1405
1406#: config.c:875
1407#, c-format
1408msgid "bad numeric config value '%s' for '%s': %s"
1409msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
1410
1411#: config.c:880
1412#, c-format
1413msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1414msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1415
1416#: config.c:883
1417#, c-format
1418msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1419msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1420
1421#: config.c:886
1422#, c-format
1423msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1424msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1425
1426#: config.c:889
1427#, c-format
1428msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1429msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1430
1431#: config.c:892
1432#, c-format
1433msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1434msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1435
1436#: config.c:895
1437#, c-format
1438msgid "bad numeric config value '%s' for '%s' in %s: %s"
1439msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1440
1441#: config.c:990
1442#, c-format
1443msgid "failed to expand user dir in: '%s'"
1444msgstr "无法扩展 '%s' 中的用户目录"
1445
1446#: config.c:1085 config.c:1096
1447#, c-format
1448msgid "bad zlib compression level %d"
1449msgstr "错误的 zlib 压缩级别 %d"
1450
1451#: config.c:1213
1452#, c-format
1453msgid "invalid mode for object creation: %s"
1454msgstr "无效的对象创建模式:%s"
1455
1456#: config.c:1372
1457#, c-format
1458msgid "bad pack compression level %d"
1459msgstr "错误的打包压缩级别 %d"
1460
1461#: config.c:1568
1462msgid "unable to parse command-line config"
1463msgstr "无法解析命令行中的配置"
1464
1465#: config.c:1900
1466msgid "unknown error occurred while reading the configuration files"
1467msgstr "在读取配置文件时遇到未知错误"
1468
1469#: config.c:2087
1470#, c-format
1471msgid "Invalid %s: '%s'"
1472msgstr "无效 %s:'%s'"
1473
1474#: config.c:2130
1475#, c-format
1476msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1477msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1478
1479#: config.c:2156
1480#, c-format
1481msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1482msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1483
1484#: config.c:2167
1485#, c-format
1486msgid "unable to parse '%s' from command-line config"
1487msgstr "无法解析命令行配置中的 '%s'"
1488
1489#: config.c:2169
1490#, c-format
1491msgid "bad config variable '%s' in file '%s' at line %d"
1492msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1493
1494#: config.c:2228
1495#, c-format
1496msgid "%s has multiple values"
1497msgstr "%s 有多个取值"
1498
1499#: config.c:2571 config.c:2789
1500#, c-format
1501msgid "fstat on %s failed"
1502msgstr "对 %s 调用 fstat 失败"
1503
1504#: config.c:2678
1505#, c-format
1506msgid "could not set '%s' to '%s'"
1507msgstr "不能设置 '%s' 为 '%s'"
1508
1509#: config.c:2680 builtin/remote.c:776
1510#, c-format
1511msgid "could not unset '%s'"
1512msgstr "不能取消设置 '%s'"
1513
1514#: connect.c:50
1515msgid "The remote end hung up upon initial contact"
1516msgstr "远端在连接发起时即挂断"
1517
1518#: connect.c:52
1519msgid ""
1520"Could not read from remote repository.\n"
1521"\n"
1522"Please make sure you have the correct access rights\n"
1523"and the repository exists."
1524msgstr ""
1525"无法读取远程仓库。\n"
1526"\n"
1527"请确认您有正确的访问权限并且仓库存在。"
1528
1529#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
1530msgid "Checking connectivity"
1531msgstr "检查连接中"
1532
1533#: connected.c:76
1534msgid "Could not run 'git rev-list'"
1535msgstr "不能执行 'git rev-list'"
1536
1537#: connected.c:96
1538msgid "failed write to rev-list"
1539msgstr "无法写入 rev-list"
1540
1541#: connected.c:103
1542msgid "failed to close rev-list's stdin"
1543msgstr "无法关闭 rev-list 的标准输入"
1544
1545#: convert.c:205
1546#, c-format
1547msgid ""
1548"CRLF will be replaced by LF in %s.\n"
1549"The file will have its original line endings in your working directory."
1550msgstr ""
1551"文件 %s 中的 CRLF 将被 LF 替换。\n"
1552"在工作区中该文件仍保持原有的换行符。"
1553
1554#: convert.c:209
1555#, c-format
1556msgid "CRLF would be replaced by LF in %s."
1557msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1558
1559#: convert.c:215
1560#, c-format
1561msgid ""
1562"LF will be replaced by CRLF in %s.\n"
1563"The file will have its original line endings in your working directory."
1564msgstr ""
1565"文件 %s 中的 LF 将被 CRLF 替换。\n"
1566"在工作区中该文件仍保持原有的换行符。"
1567
1568#: convert.c:219
1569#, c-format
1570msgid "LF would be replaced by CRLF in %s"
1571msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1572
1573#: date.c:116
1574msgid "in the future"
1575msgstr "在将来"
1576
1577#: date.c:122
1578#, c-format
1579msgid "%<PRIuMAX> second ago"
1580msgid_plural "%<PRIuMAX> seconds ago"
1581msgstr[0] "%<PRIuMAX> 秒钟前"
1582msgstr[1] "%<PRIuMAX> 秒钟前"
1583
1584#: date.c:129
1585#, c-format
1586msgid "%<PRIuMAX> minute ago"
1587msgid_plural "%<PRIuMAX> minutes ago"
1588msgstr[0] "%<PRIuMAX> 分钟前"
1589msgstr[1] "%<PRIuMAX> 分钟前"
1590
1591#: date.c:136
1592#, c-format
1593msgid "%<PRIuMAX> hour ago"
1594msgid_plural "%<PRIuMAX> hours ago"
1595msgstr[0] "%<PRIuMAX> 小时前"
1596msgstr[1] "%<PRIuMAX> 小时前"
1597
1598#: date.c:143
1599#, c-format
1600msgid "%<PRIuMAX> day ago"
1601msgid_plural "%<PRIuMAX> days ago"
1602msgstr[0] "%<PRIuMAX> 天前"
1603msgstr[1] "%<PRIuMAX> 天前"
1604
1605#: date.c:149
1606#, c-format
1607msgid "%<PRIuMAX> week ago"
1608msgid_plural "%<PRIuMAX> weeks ago"
1609msgstr[0] "%<PRIuMAX> 周前"
1610msgstr[1] "%<PRIuMAX> 周前"
1611
1612#: date.c:156
1613#, c-format
1614msgid "%<PRIuMAX> month ago"
1615msgid_plural "%<PRIuMAX> months ago"
1616msgstr[0] "%<PRIuMAX> 个月前"
1617msgstr[1] "%<PRIuMAX> 个月前"
1618
1619#: date.c:167
1620#, c-format
1621msgid "%<PRIuMAX> year"
1622msgid_plural "%<PRIuMAX> years"
1623msgstr[0] "%<PRIuMAX> 年"
1624msgstr[1] "%<PRIuMAX> 年"
1625
1626#. TRANSLATORS: "%s" is "<n> years"
1627#: date.c:170
1628#, c-format
1629msgid "%s, %<PRIuMAX> month ago"
1630msgid_plural "%s, %<PRIuMAX> months ago"
1631msgstr[0] "%s %<PRIuMAX> 个月前"
1632msgstr[1] "%s %<PRIuMAX> 个月前"
1633
1634#: date.c:175 date.c:180
1635#, c-format
1636msgid "%<PRIuMAX> year ago"
1637msgid_plural "%<PRIuMAX> years ago"
1638msgstr[0] "%<PRIuMAX> 年前"
1639msgstr[1] "%<PRIuMAX> 年前"
1640
1641#: diffcore-order.c:24
1642#, c-format
1643msgid "failed to read orderfile '%s'"
1644msgstr "无法读取排序文件 '%s'"
1645
1646#: diffcore-rename.c:536
1647msgid "Performing inexact rename detection"
1648msgstr "正在进行非精确的重命名探测"
1649
1650#: diff.c:74
1651#, c-format
1652msgid "option '%s' requires a value"
1653msgstr "选项 '%s'  需要一个值"
1654
1655#  译者:注意保持前导空格
1656#: diff.c:152
1657#, c-format
1658msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
1659msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
1660
1661#  译者:注意保持前导空格
1662#: diff.c:157
1663#, c-format
1664msgid "  Unknown dirstat parameter '%s'\n"
1665msgstr "  未知的 dirstat 参数 '%s'\n"
1666
1667#: diff.c:281
1668msgid ""
1669"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
1670"'plain'"
1671msgstr "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
1672
1673#: diff.c:341
1674#, c-format
1675msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1676msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1677
1678#: diff.c:398
1679#, c-format
1680msgid ""
1681"Found errors in 'diff.dirstat' config variable:\n"
1682"%s"
1683msgstr ""
1684"发现配置变量 'diff.dirstat' 中的错误:\n"
1685"%s"
1686
1687#: diff.c:3861
1688#, c-format
1689msgid "external diff died, stopping at %s"
1690msgstr "外部 diff 退出,停止在 %s"
1691
1692#: diff.c:4189
1693msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1694msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1695
1696#: diff.c:4279
1697msgid "--follow requires exactly one pathspec"
1698msgstr "--follow 明确要求只跟一个路径规格"
1699
1700#: diff.c:4445
1701#, c-format
1702msgid ""
1703"Failed to parse --dirstat/-X option parameter:\n"
1704"%s"
1705msgstr ""
1706"无法解析 --dirstat/-X 选项的参数:\n"
1707"%s"
1708
1709#: diff.c:4459
1710#, c-format
1711msgid "Failed to parse --submodule option parameter: '%s'"
1712msgstr "无法解析 --submodule 选项的参数:'%s'"
1713
1714#: diff.c:5505
1715msgid "inexact rename detection was skipped due to too many files."
1716msgstr "因为文件太多,略过不严格的重命名检查。"
1717
1718#: diff.c:5508
1719msgid "only found copies from modified paths due to too many files."
1720msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1721
1722#: diff.c:5511
1723#, c-format
1724msgid ""
1725"you may want to set your %s variable to at least %d and retry the command."
1726msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
1727
1728#: dir.c:1983
1729msgid "failed to get kernel name and information"
1730msgstr "无法获得内核名称和信息"
1731
1732#: dir.c:2102
1733msgid "Untracked cache is disabled on this system or location."
1734msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
1735
1736#: dir.c:2885 dir.c:2890
1737#, c-format
1738msgid "could not create directories for %s"
1739msgstr "不能为 %s 创建目录"
1740
1741#: dir.c:2915
1742#, c-format
1743msgid "could not migrate git directory from '%s' to '%s'"
1744msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1745
1746#: entry.c:176
1747msgid "Filtering content"
1748msgstr "过滤内容"
1749
1750#: entry.c:433
1751#, c-format
1752msgid "could not stat file '%s'"
1753msgstr "不能对文件 '%s' 调用 stat"
1754
1755#: fetch-pack.c:252
1756msgid "git fetch-pack: expected shallow list"
1757msgstr "git fetch-pack:应为 shallow 列表"
1758
1759#: fetch-pack.c:264
1760msgid "git fetch-pack: expected ACK/NAK, got EOF"
1761msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1762
1763#: fetch-pack.c:283 builtin/archive.c:63
1764#, c-format
1765msgid "remote error: %s"
1766msgstr "远程错误:%s"
1767
1768#: fetch-pack.c:284
1769#, c-format
1770msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1771msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1772
1773#: fetch-pack.c:336
1774msgid "--stateless-rpc requires multi_ack_detailed"
1775msgstr "--stateless-rpc 需要 multi_ack_detailed"
1776
1777#: fetch-pack.c:422
1778#, c-format
1779msgid "invalid shallow line: %s"
1780msgstr "无效的 shallow 信息:%s"
1781
1782#: fetch-pack.c:428
1783#, c-format
1784msgid "invalid unshallow line: %s"
1785msgstr "无效的 unshallow 信息:%s"
1786
1787#: fetch-pack.c:430
1788#, c-format
1789msgid "object not found: %s"
1790msgstr "对象未找到:%s"
1791
1792#: fetch-pack.c:433
1793#, c-format
1794msgid "error in object: %s"
1795msgstr "对象中出错:%s"
1796
1797#: fetch-pack.c:435
1798#, c-format
1799msgid "no shallow found: %s"
1800msgstr "未发现 shallow:%s"
1801
1802#: fetch-pack.c:438
1803#, c-format
1804msgid "expected shallow/unshallow, got %s"
1805msgstr "应为 shallow/unshallow,却得到 %s"
1806
1807#: fetch-pack.c:477
1808#, c-format
1809msgid "got %s %d %s"
1810msgstr "得到 %s %d %s"
1811
1812#: fetch-pack.c:491
1813#, c-format
1814msgid "invalid commit %s"
1815msgstr "无效提交 %s"
1816
1817#: fetch-pack.c:524
1818msgid "giving up"
1819msgstr "放弃"
1820
1821#: fetch-pack.c:534 progress.c:242
1822msgid "done"
1823msgstr "完成"
1824
1825#: fetch-pack.c:546
1826#, c-format
1827msgid "got %s (%d) %s"
1828msgstr "得到 %s (%d) %s"
1829
1830#: fetch-pack.c:592
1831#, c-format
1832msgid "Marking %s as complete"
1833msgstr "标记 %s 为完成"
1834
1835#: fetch-pack.c:776
1836#, c-format
1837msgid "already have %s (%s)"
1838msgstr "已经有 %s(%s)"
1839
1840#: fetch-pack.c:814
1841msgid "fetch-pack: unable to fork off sideband demultiplexer"
1842msgstr "fetch-pack:无法派生 sideband 多路输出"
1843
1844#: fetch-pack.c:822
1845msgid "protocol error: bad pack header"
1846msgstr "协议错误:坏的包头"
1847
1848#: fetch-pack.c:878
1849#, c-format
1850msgid "fetch-pack: unable to fork off %s"
1851msgstr "fetch-pack:无法派生进程 %s"
1852
1853#: fetch-pack.c:894
1854#, c-format
1855msgid "%s failed"
1856msgstr "%s 失败"
1857
1858#: fetch-pack.c:896
1859msgid "error in sideband demultiplexer"
1860msgstr "sideband 多路输出出错"
1861
1862#: fetch-pack.c:923
1863msgid "Server does not support shallow clients"
1864msgstr "服务器不支持 shalllow 客户端"
1865
1866#: fetch-pack.c:927
1867msgid "Server supports multi_ack_detailed"
1868msgstr "服务器支持 multi_ack_detailed"
1869
1870#: fetch-pack.c:930
1871msgid "Server supports no-done"
1872msgstr "服务器支持 no-done"
1873
1874#: fetch-pack.c:936
1875msgid "Server supports multi_ack"
1876msgstr "服务器支持 multi_ack"
1877
1878#: fetch-pack.c:940
1879msgid "Server supports side-band-64k"
1880msgstr "服务器支持 side-band-64k"
1881
1882#: fetch-pack.c:944
1883msgid "Server supports side-band"
1884msgstr "服务器支持 side-band"
1885
1886#: fetch-pack.c:948
1887msgid "Server supports allow-tip-sha1-in-want"
1888msgstr "服务器支持 allow-tip-sha1-in-want"
1889
1890#: fetch-pack.c:952
1891msgid "Server supports allow-reachable-sha1-in-want"
1892msgstr "服务器支持 allow-reachable-sha1-in-want"
1893
1894#: fetch-pack.c:962
1895msgid "Server supports ofs-delta"
1896msgstr "服务器支持 ofs-delta"
1897
1898#: fetch-pack.c:969
1899#, c-format
1900msgid "Server version is %.*s"
1901msgstr "服务器版本 %.*s"
1902
1903#: fetch-pack.c:975
1904msgid "Server does not support --shallow-since"
1905msgstr "服务器不支持 --shallow-since"
1906
1907#: fetch-pack.c:979
1908msgid "Server does not support --shallow-exclude"
1909msgstr "服务器不支持 --shallow-exclude"
1910
1911#: fetch-pack.c:981
1912msgid "Server does not support --deepen"
1913msgstr "服务器不支持 --deepen"
1914
1915#: fetch-pack.c:992
1916msgid "no common commits"
1917msgstr "没有共同的提交"
1918
1919#: fetch-pack.c:1004
1920msgid "git fetch-pack: fetch failed."
1921msgstr "git fetch-pack:获取失败。"
1922
1923#: fetch-pack.c:1166
1924msgid "no matching remote head"
1925msgstr "没有匹配的远程分支"
1926
1927#: fetch-pack.c:1188
1928#, c-format
1929msgid "no such remote ref %s"
1930msgstr "没有这样的远程引用 %s"
1931
1932#: fetch-pack.c:1191
1933#, c-format
1934msgid "Server does not allow request for unadvertised object %s"
1935msgstr "服务器不允许请求未公开的对象 %s"
1936
1937#: gpg-interface.c:181
1938msgid "gpg failed to sign the data"
1939msgstr "gpg 无法为数据签名"
1940
1941#: gpg-interface.c:211
1942msgid "could not create temporary file"
1943msgstr "不能创建临时文件"
1944
1945#: gpg-interface.c:214
1946#, c-format
1947msgid "failed writing detached signature to '%s'"
1948msgstr "无法将分离式签名写入 '%s'"
1949
1950#: graph.c:97
1951#, c-format
1952msgid "ignore invalid color '%.*s' in log.graphColors"
1953msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
1954
1955#: grep.c:1970
1956#, c-format
1957msgid "'%s': unable to read %s"
1958msgstr "'%s':无法读取 %s"
1959
1960#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
1961#, c-format
1962msgid "failed to stat '%s'"
1963msgstr "对 '%s' 调用 stat 失败"
1964
1965#: grep.c:1998
1966#, c-format
1967msgid "'%s': short read"
1968msgstr "'%s':读取不完整"
1969
1970#: help.c:179
1971#, c-format
1972msgid "available git commands in '%s'"
1973msgstr "在 '%s' 下可用的 git 命令"
1974
1975#: help.c:186
1976msgid "git commands available from elsewhere on your $PATH"
1977msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1978
1979#: help.c:217
1980msgid "These are common Git commands used in various situations:"
1981msgstr "这些是各种场合常见的 Git 命令:"
1982
1983#: help.c:281
1984#, c-format
1985msgid ""
1986"'%s' appears to be a git command, but we were not\n"
1987"able to execute it. Maybe git-%s is broken?"
1988msgstr ""
1989"'%s' 像是一个 git 命令,但却无法运行。\n"
1990"可能是 git-%s 受损?"
1991
1992#: help.c:336
1993msgid "Uh oh. Your system reports no Git commands at all."
1994msgstr "唉呀,您的系统中未发现 Git 命令。"
1995
1996#: help.c:358
1997#, c-format
1998msgid "WARNING: You called a Git command named '%s', which does not exist."
1999msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
2000
2001#: help.c:363
2002#, c-format
2003msgid "Continuing under the assumption that you meant '%s'."
2004msgstr "假定你想要的是 '%s' 并继续。"
2005
2006#: help.c:368
2007#, c-format
2008msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
2009msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
2010
2011#: help.c:376
2012#, c-format
2013msgid "git: '%s' is not a git command. See 'git --help'."
2014msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
2015
2016#: help.c:380
2017msgid ""
2018"\n"
2019"The most similar command is"
2020msgid_plural ""
2021"\n"
2022"The most similar commands are"
2023msgstr[0] ""
2024"\n"
2025"最相似的命令是"
2026msgstr[1] ""
2027"\n"
2028"最相似的命令是"
2029
2030#: help.c:395
2031msgid "git version [<options>]"
2032msgstr "git version [<选项>]"
2033
2034#: help.c:456
2035#, c-format
2036msgid "%s: %s - %s"
2037msgstr "%s:%s - %s"
2038
2039#: help.c:460
2040msgid ""
2041"\n"
2042"Did you mean this?"
2043msgid_plural ""
2044"\n"
2045"Did you mean one of these?"
2046msgstr[0] ""
2047"\n"
2048"您指的是这个么?"
2049msgstr[1] ""
2050"\n"
2051"您指的是这其中的某一个么?"
2052
2053#: ident.c:342
2054msgid ""
2055"\n"
2056"*** Please tell me who you are.\n"
2057"\n"
2058"Run\n"
2059"\n"
2060"  git config --global user.email \"you@example.com\"\n"
2061"  git config --global user.name \"Your Name\"\n"
2062"\n"
2063"to set your account's default identity.\n"
2064"Omit --global to set the identity only in this repository.\n"
2065"\n"
2066msgstr ""
2067"\n"
2068"*** 请告诉我你是谁。\n"
2069"\n"
2070"运行\n"
2071"\n"
2072"  git config --global user.email \"you@example.com\"\n"
2073"  git config --global user.name \"Your Name\"\n"
2074"\n"
2075"来设置您账号的缺省身份标识。\n"
2076"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
2077
2078#: ident.c:366
2079msgid "no email was given and auto-detection is disabled"
2080msgstr "未提供邮件地址且自动探测被禁用"
2081
2082#: ident.c:371
2083#, c-format
2084msgid "unable to auto-detect email address (got '%s')"
2085msgstr "无法自动探测邮件地址(得到 '%s')"
2086
2087#: ident.c:381
2088msgid "no name was given and auto-detection is disabled"
2089msgstr "未提供姓名且自动探测被禁用"
2090
2091#: ident.c:387
2092#, c-format
2093msgid "unable to auto-detect name (got '%s')"
2094msgstr "无法自动探测姓名(得到 '%s')"
2095
2096#: ident.c:395
2097#, c-format
2098msgid "empty ident name (for <%s>) not allowed"
2099msgstr "不允许空的姓名(对于 <%s>)"
2100
2101#: ident.c:401
2102#, c-format
2103msgid "name consists only of disallowed characters: %s"
2104msgstr "姓名中仅包含禁用字符:%s"
2105
2106#: ident.c:416 builtin/commit.c:616
2107#, c-format
2108msgid "invalid date format: %s"
2109msgstr "无效的日期格式:%s"
2110
2111#: lockfile.c:151
2112#, c-format
2113msgid ""
2114"Unable to create '%s.lock': %s.\n"
2115"\n"
2116"Another git process seems to be running in this repository, e.g.\n"
2117"an editor opened by 'git commit'. Please make sure all processes\n"
2118"are terminated then try again. If it still fails, a git process\n"
2119"may have crashed in this repository earlier:\n"
2120"remove the file manually to continue."
2121msgstr ""
2122"无法创建 '%s.lock':%s。\n"
2123"\n"
2124"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2125"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2126"可能之前有一个 git 进程在这个仓库中异常退出:\n"
2127"手动删除这个文件再继续。"
2128
2129#: lockfile.c:159
2130#, c-format
2131msgid "Unable to create '%s.lock': %s"
2132msgstr "不能创建 '%s.lock':%s"
2133
2134#: merge.c:41
2135msgid "failed to read the cache"
2136msgstr "无法读取缓存"
2137
2138#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
2139#: builtin/checkout.c:595 builtin/clone.c:754
2140msgid "unable to write new index file"
2141msgstr "无法写新的索引文件"
2142
2143#: merge-recursive.c:235
2144msgid "(bad commit)\n"
2145msgstr "(坏提交)\n"
2146
2147#: merge-recursive.c:257 merge-recursive.c:265
2148#, c-format
2149msgid "addinfo_cache failed for path '%s'"
2150msgstr "为路径 '%s' addinfo_cache 失败"
2151
2152#: merge-recursive.c:329
2153msgid "error building trees"
2154msgstr "无法创建树"
2155
2156#: merge-recursive.c:752
2157#, c-format
2158msgid "failed to create path '%s'%s"
2159msgstr "无法创建路径 '%s'%s"
2160
2161#: merge-recursive.c:763
2162#, c-format
2163msgid "Removing %s to make room for subdirectory\n"
2164msgstr "删除 %s 以便为子目录留出空间\n"
2165
2166#: merge-recursive.c:777 merge-recursive.c:796
2167msgid ": perhaps a D/F conflict?"
2168msgstr ":可能是一个目录/文件冲突?"
2169
2170#: merge-recursive.c:786
2171#, c-format
2172msgid "refusing to lose untracked file at '%s'"
2173msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2174
2175#: merge-recursive.c:828 builtin/cat-file.c:37
2176#, c-format
2177msgid "cannot read object %s '%s'"
2178msgstr "不能读取对象 %s '%s'"
2179
2180#: merge-recursive.c:830
2181#, c-format
2182msgid "blob expected for %s '%s'"
2183msgstr "%s '%s' 应为数据对象"
2184
2185#: merge-recursive.c:854
2186#, c-format
2187msgid "failed to open '%s': %s"
2188msgstr "无法打开 '%s':%s"
2189
2190#: merge-recursive.c:865
2191#, c-format
2192msgid "failed to symlink '%s': %s"
2193msgstr "无法创建符号链接 '%s':%s"
2194
2195#: merge-recursive.c:870
2196#, c-format
2197msgid "do not know what to do with %06o %s '%s'"
2198msgstr "不知道如何处理 %06o %s '%s'"
2199
2200#: merge-recursive.c:1010
2201msgid "Failed to execute internal merge"
2202msgstr "无法执行内部合并"
2203
2204#: merge-recursive.c:1014
2205#, c-format
2206msgid "Unable to add %s to database"
2207msgstr "不能添加 %s 至对象库"
2208
2209#: merge-recursive.c:1117
2210#, c-format
2211msgid ""
2212"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2213"in tree."
2214msgstr ""
2215"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2216"本被保留。"
2217
2218#: merge-recursive.c:1122
2219#, c-format
2220msgid ""
2221"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2222"left in tree."
2223msgstr ""
2224"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2225"%7$s 版本被保留。"
2226
2227#: merge-recursive.c:1129
2228#, c-format
2229msgid ""
2230"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2231"in tree at %s."
2232msgstr ""
2233"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2234"本保留在 %8$s 中。"
2235
2236#: merge-recursive.c:1134
2237#, c-format
2238msgid ""
2239"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2240"left in tree at %s."
2241msgstr ""
2242"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2243"%7$s 版本保留在 %9$s 中。"
2244
2245#: merge-recursive.c:1168
2246msgid "rename"
2247msgstr "重命名"
2248
2249#: merge-recursive.c:1168
2250msgid "renamed"
2251msgstr "重命名"
2252
2253#: merge-recursive.c:1225
2254#, c-format
2255msgid "%s is a directory in %s adding as %s instead"
2256msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2257
2258#: merge-recursive.c:1250
2259#, c-format
2260msgid ""
2261"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2262"\"->\"%s\" in \"%s\"%s"
2263msgstr ""
2264"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2265"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2266
2267#: merge-recursive.c:1255
2268msgid " (left unresolved)"
2269msgstr "(留下未解决)"
2270
2271#: merge-recursive.c:1317
2272#, c-format
2273msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2274msgstr ""
2275"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2276"%5$s"
2277
2278#: merge-recursive.c:1350
2279#, c-format
2280msgid "Renaming %s to %s and %s to %s instead"
2281msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
2282
2283#: merge-recursive.c:1553
2284#, c-format
2285msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2286msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2287
2288#: merge-recursive.c:1568
2289#, c-format
2290msgid "Adding merged %s"
2291msgstr "添加合并后的 %s"
2292
2293#: merge-recursive.c:1575 merge-recursive.c:1805
2294#, c-format
2295msgid "Adding as %s instead"
2296msgstr "而是以 %s 为名添加"
2297
2298#: merge-recursive.c:1632
2299#, c-format
2300msgid "cannot read object %s"
2301msgstr "不能读取对象 %s"
2302
2303#: merge-recursive.c:1635
2304#, c-format
2305msgid "object %s is not a blob"
2306msgstr "对象 %s 不是一个数据对象"
2307
2308#: merge-recursive.c:1704
2309msgid "modify"
2310msgstr "修改"
2311
2312#: merge-recursive.c:1704
2313msgid "modified"
2314msgstr "修改"
2315
2316#: merge-recursive.c:1714
2317msgid "content"
2318msgstr "内容"
2319
2320#: merge-recursive.c:1721
2321msgid "add/add"
2322msgstr "添加/添加"
2323
2324#: merge-recursive.c:1757
2325#, c-format
2326msgid "Skipped %s (merged same as existing)"
2327msgstr "略过 %s(已经做过相同合并)"
2328
2329#: merge-recursive.c:1771
2330#, c-format
2331msgid "Auto-merging %s"
2332msgstr "自动合并 %s"
2333
2334#: merge-recursive.c:1775 git-submodule.sh:944
2335msgid "submodule"
2336msgstr "子模组"
2337
2338#: merge-recursive.c:1776
2339#, c-format
2340msgid "CONFLICT (%s): Merge conflict in %s"
2341msgstr "冲突(%s):合并冲突于 %s"
2342
2343#: merge-recursive.c:1870
2344#, c-format
2345msgid "Removing %s"
2346msgstr "删除 %s"
2347
2348#: merge-recursive.c:1896
2349msgid "file/directory"
2350msgstr "文件/目录"
2351
2352#: merge-recursive.c:1902
2353msgid "directory/file"
2354msgstr "目录/文件"
2355
2356#: merge-recursive.c:1908
2357#, c-format
2358msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2359msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2360
2361#: merge-recursive.c:1917
2362#, c-format
2363msgid "Adding %s"
2364msgstr "添加 %s"
2365
2366#: merge-recursive.c:1954
2367msgid "Already up to date!"
2368msgstr "已经是最新的!"
2369
2370#: merge-recursive.c:1963
2371#, c-format
2372msgid "merging of trees %s and %s failed"
2373msgstr "无法合并树 %s 和 %s"
2374
2375#: merge-recursive.c:2060
2376msgid "Merging:"
2377msgstr "合并:"
2378
2379#: merge-recursive.c:2073
2380#, c-format
2381msgid "found %u common ancestor:"
2382msgid_plural "found %u common ancestors:"
2383msgstr[0] "发现 %u 个共同祖先:"
2384msgstr[1] "发现 %u 个共同祖先:"
2385
2386#: merge-recursive.c:2112
2387msgid "merge returned no commit"
2388msgstr "合并未返回提交"
2389
2390#: merge-recursive.c:2175
2391#, c-format
2392msgid "Could not parse object '%s'"
2393msgstr "不能解析对象 '%s'"
2394
2395#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
2396msgid "Unable to write index."
2397msgstr "不能写入索引。"
2398
2399#: notes-merge.c:272
2400#, c-format
2401msgid ""
2402"You have not concluded your previous notes merge (%s exists).\n"
2403"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2404"commit/abort the previous merge before you start a new notes merge."
2405msgstr ""
2406"您的前一次注释合并尚未结束(存在 %s)。\n"
2407"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2408"notes merge --abort' 来提交/终止前一次合并。"
2409
2410#: notes-merge.c:279
2411#, c-format
2412msgid "You have not concluded your notes merge (%s exists)."
2413msgstr "您尚未结束注释合并(存在 %s)。"
2414
2415#: notes-utils.c:42
2416msgid "Cannot commit uninitialized/unreferenced notes tree"
2417msgstr "不能提交未初始化/未引用的注解树"
2418
2419#: notes-utils.c:101
2420#, c-format
2421msgid "Bad notes.rewriteMode value: '%s'"
2422msgstr "坏的 notes.rewriteMode 值:'%s'"
2423
2424#: notes-utils.c:111
2425#, c-format
2426msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2427msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2428
2429#. TRANSLATORS: The first %s is the name of
2430#. the environment variable, the second %s is
2431#. its value.
2432#.
2433#: notes-utils.c:141
2434#, c-format
2435msgid "Bad %s value: '%s'"
2436msgstr "坏的 %s 值:'%s'"
2437
2438#: object.c:239
2439#, c-format
2440msgid "unable to parse object: %s"
2441msgstr "不能解析对象:%s"
2442
2443#: packfile.c:556
2444msgid "offset before end of packfile (broken .idx?)"
2445msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
2446
2447#: packfile.c:1683
2448#, c-format
2449msgid "offset before start of pack index for %s (corrupt index?)"
2450msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
2451
2452#: packfile.c:1687
2453#, c-format
2454msgid "offset beyond end of pack index for %s (truncated index?)"
2455msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
2456
2457#: parse-options.c:573
2458msgid "..."
2459msgstr "..."
2460
2461#: parse-options.c:592
2462#, c-format
2463msgid "usage: %s"
2464msgstr "用法:%s"
2465
2466#. TRANSLATORS: the colon here should align with the
2467#. one in "usage: %s" translation.
2468#.
2469#: parse-options.c:598
2470#, c-format
2471msgid "   or: %s"
2472msgstr "  或:%s"
2473
2474#  译者:为保证在输出中对齐,注意调整句中空格!
2475#: parse-options.c:601
2476#, c-format
2477msgid "    %s"
2478msgstr "    %s"
2479
2480#: parse-options.c:640
2481msgid "-NUM"
2482msgstr "-数字"
2483
2484#: parse-options-cb.c:108
2485#, c-format
2486msgid "malformed object name '%s'"
2487msgstr "非法的对象名 '%s'"
2488
2489#: path.c:891
2490#, c-format
2491msgid "Could not make %s writable by group"
2492msgstr "不能设置 %s 为组可写"
2493
2494#: pathspec.c:129
2495msgid "Escape character '\\' not allowed as last character in attr value"
2496msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2497
2498#: pathspec.c:147
2499msgid "Only one 'attr:' specification is allowed."
2500msgstr "只允许一个 'attr:' 规格。"
2501
2502#: pathspec.c:150
2503msgid "attr spec must not be empty"
2504msgstr "属性规格不能为空"
2505
2506#: pathspec.c:193
2507#, c-format
2508msgid "invalid attribute name %s"
2509msgstr "无效的属性名 %s"
2510
2511#: pathspec.c:258
2512msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2513msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2514
2515#: pathspec.c:265
2516msgid ""
2517"global 'literal' pathspec setting is incompatible with all other global "
2518"pathspec settings"
2519msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
2520
2521#: pathspec.c:305
2522msgid "invalid parameter for pathspec magic 'prefix'"
2523msgstr "路径规格包含无效的神奇前缀"
2524
2525#: pathspec.c:326
2526#, c-format
2527msgid "Invalid pathspec magic '%.*s' in '%s'"
2528msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
2529
2530#: pathspec.c:331
2531#, c-format
2532msgid "Missing ')' at the end of pathspec magic in '%s'"
2533msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
2534
2535#: pathspec.c:369
2536#, c-format
2537msgid "Unimplemented pathspec magic '%c' in '%s'"
2538msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
2539
2540#: pathspec.c:428
2541#, c-format
2542msgid "%s: 'literal' and 'glob' are incompatible"
2543msgstr "%s:'literal' 和 'glob' 不兼容"
2544
2545#: pathspec.c:441
2546#, c-format
2547msgid "%s: '%s' is outside repository"
2548msgstr "%s:'%s' 在仓库之外"
2549
2550#: pathspec.c:515
2551#, c-format
2552msgid "'%s' (mnemonic: '%c')"
2553msgstr "'%s'(助记符:'%c')"
2554
2555#: pathspec.c:525
2556#, c-format
2557msgid "%s: pathspec magic not supported by this command: %s"
2558msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2559
2560#: pathspec.c:571
2561msgid ""
2562"empty strings as pathspecs will be made invalid in upcoming releases. please "
2563"use . instead if you meant to match all paths"
2564msgstr ""
2565"在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n"
2566"请代之以 ."
2567
2568#: pathspec.c:595
2569#, c-format
2570msgid "pathspec '%s' is beyond a symbolic link"
2571msgstr "路径规格 '%s' 位于符号链接中"
2572
2573#: pretty.c:962
2574msgid "unable to parse --pretty format"
2575msgstr "不能解析 --pretty 格式"
2576
2577#: read-cache.c:1443
2578#, c-format
2579msgid ""
2580"index.version set, but the value is invalid.\n"
2581"Using version %i"
2582msgstr ""
2583"设置了 index.version,但是取值无效。\n"
2584"使用版本 %i"
2585
2586#: read-cache.c:1453
2587#, c-format
2588msgid ""
2589"GIT_INDEX_VERSION set, but the value is invalid.\n"
2590"Using version %i"
2591msgstr ""
2592"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2593"使用版本 %i"
2594
2595#: read-cache.c:2316 builtin/merge.c:1046
2596#, c-format
2597msgid "could not close '%s'"
2598msgstr "不能关闭 '%s'"
2599
2600#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
2601#, c-format
2602msgid "could not stat '%s'"
2603msgstr "不能对 '%s' 调用 stat"
2604
2605#: read-cache.c:2407
2606#, c-format
2607msgid "unable to open git dir: %s"
2608msgstr "不能打开 git 目录:%s"
2609
2610#: read-cache.c:2419
2611#, c-format
2612msgid "unable to unlink: %s"
2613msgstr "无法删除:%s"
2614
2615#: refs.c:638
2616#, c-format
2617msgid "Could not open '%s' for writing"
2618msgstr "无法打开 '%s' 进行写入"
2619
2620#: refs.c:1792
2621msgid "ref updates forbidden inside quarantine environment"
2622msgstr "在隔离环境中禁止更新引用"
2623
2624#: refs/files-backend.c:1136
2625#, c-format
2626msgid "could not remove reference %s"
2627msgstr "无法删除引用 %s"
2628
2629#: refs/files-backend.c:1150 refs/packed-backend.c:1430
2630#: refs/packed-backend.c:1440
2631#, c-format
2632msgid "could not delete reference %s: %s"
2633msgstr "无法删除引用 %s:%s"
2634
2635#: refs/files-backend.c:1153 refs/packed-backend.c:1443
2636#, c-format
2637msgid "could not delete references: %s"
2638msgstr "无法删除引用:%s"
2639
2640#: ref-filter.c:35 wt-status.c:1811
2641msgid "gone"
2642msgstr "丢失"
2643
2644#: ref-filter.c:36
2645#, c-format
2646msgid "ahead %d"
2647msgstr "领先 %d"
2648
2649#: ref-filter.c:37
2650#, c-format
2651msgid "behind %d"
2652msgstr "落后 %d"
2653
2654#: ref-filter.c:38
2655#, c-format
2656msgid "ahead %d, behind %d"
2657msgstr "领先 %d,落后 %d"
2658
2659#: ref-filter.c:105
2660#, c-format
2661msgid "expected format: %%(color:<color>)"
2662msgstr "期望的格式:%%(color:<color>)"
2663
2664#: ref-filter.c:107
2665#, c-format
2666msgid "unrecognized color: %%(color:%s)"
2667msgstr "未能识别的颜色:%%(color:%s)"
2668
2669#: ref-filter.c:127
2670#, c-format
2671msgid "Integer value expected refname:lstrip=%s"
2672msgstr "期望整数值 refname:lstrip=%s"
2673
2674#: ref-filter.c:131
2675#, c-format
2676msgid "Integer value expected refname:rstrip=%s"
2677msgstr "期望整数值 refname:rstrip=%s"
2678
2679#: ref-filter.c:133
2680#, c-format
2681msgid "unrecognized %%(%s) argument: %s"
2682msgstr "未能识别的 %%(%s) 参数:%s"
2683
2684#: ref-filter.c:173
2685#, c-format
2686msgid "%%(body) does not take arguments"
2687msgstr "%%(body) 不带参数"
2688
2689#: ref-filter.c:180
2690#, c-format
2691msgid "%%(subject) does not take arguments"
2692msgstr "%%(subject) 不带参数"
2693
2694#: ref-filter.c:198
2695#, c-format
2696msgid "unknown %%(trailers) argument: %s"
2697msgstr "未知的 %%(trailers) 参数:%s"
2698
2699#: ref-filter.c:221
2700#, c-format
2701msgid "positive value expected contents:lines=%s"
2702msgstr "期望一个正数 contents:lines=%s"
2703
2704#: ref-filter.c:223
2705#, c-format
2706msgid "unrecognized %%(contents) argument: %s"
2707msgstr "未能识别的 %%(contents) 参数:%s"
2708
2709#: ref-filter.c:236
2710#, c-format
2711msgid "positive value expected objectname:short=%s"
2712msgstr "期望一个正数 objectname:short=%s"
2713
2714#: ref-filter.c:240
2715#, c-format
2716msgid "unrecognized %%(objectname) argument: %s"
2717msgstr "未能识别的 %%(objectname) 参数:%s"
2718
2719#: ref-filter.c:267
2720#, c-format
2721msgid "expected format: %%(align:<width>,<position>)"
2722msgstr "期望的格式:%%(align:<width>,<position>)"
2723
2724#: ref-filter.c:279
2725#, c-format
2726msgid "unrecognized position:%s"
2727msgstr "未能识别的位置:%s"
2728
2729#: ref-filter.c:283
2730#, c-format
2731msgid "unrecognized width:%s"
2732msgstr "未能识别的宽度:%s"
2733
2734#: ref-filter.c:289
2735#, c-format
2736msgid "unrecognized %%(align) argument: %s"
2737msgstr "未能识别的 %%(align) 参数:%s"
2738
2739#: ref-filter.c:293
2740#, c-format
2741msgid "positive width expected with the %%(align) atom"
2742msgstr "元素 %%(align) 需要一个正数的宽度"
2743
2744#: ref-filter.c:308
2745#, c-format
2746msgid "unrecognized %%(if) argument: %s"
2747msgstr "未能识别的 %%(if) 参数:%s"
2748
2749#: ref-filter.c:398
2750#, c-format
2751msgid "malformed field name: %.*s"
2752msgstr "非法的字段名:%.*s"
2753
2754#: ref-filter.c:424
2755#, c-format
2756msgid "unknown field name: %.*s"
2757msgstr "未知的字段名:%.*s"
2758
2759#: ref-filter.c:536
2760#, c-format
2761msgid "format: %%(if) atom used without a %%(then) atom"
2762msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
2763
2764#: ref-filter.c:596
2765#, c-format
2766msgid "format: %%(then) atom used without an %%(if) atom"
2767msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
2768
2769#: ref-filter.c:598
2770#, c-format
2771msgid "format: %%(then) atom used more than once"
2772msgstr "格式:%%(then) 元素用了多次"
2773
2774#: ref-filter.c:600
2775#, c-format
2776msgid "format: %%(then) atom used after %%(else)"
2777msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
2778
2779#: ref-filter.c:626
2780#, c-format
2781msgid "format: %%(else) atom used without an %%(if) atom"
2782msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
2783
2784#: ref-filter.c:628
2785#, c-format
2786msgid "format: %%(else) atom used without a %%(then) atom"
2787msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
2788
2789#: ref-filter.c:630
2790#, c-format
2791msgid "format: %%(else) atom used more than once"
2792msgstr "格式:%%(else) 元素用了多次"
2793
2794#: ref-filter.c:643
2795#, c-format
2796msgid "format: %%(end) atom used without corresponding atom"
2797msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
2798
2799#: ref-filter.c:698
2800#, c-format
2801msgid "malformed format string %s"
2802msgstr "非法的格式化字符串 %s"
2803
2804#: ref-filter.c:1283
2805#, c-format
2806msgid "(no branch, rebasing %s)"
2807msgstr "(非分支,正变基 %s)"
2808
2809#: ref-filter.c:1286
2810#, c-format
2811msgid "(no branch, bisect started on %s)"
2812msgstr "(非分支,二分查找开始于 %s)"
2813
2814#. TRANSLATORS: make sure this matches "HEAD
2815#. detached at " in wt-status.c
2816#.
2817#: ref-filter.c:1294
2818#, c-format
2819msgid "(HEAD detached at %s)"
2820msgstr "(头指针分离于 %s)"
2821
2822#. TRANSLATORS: make sure this matches "HEAD
2823#. detached from " in wt-status.c
2824#.
2825#: ref-filter.c:1301
2826#, c-format
2827msgid "(HEAD detached from %s)"
2828msgstr "(头指针分离自 %s)"
2829
2830#: ref-filter.c:1305
2831msgid "(no branch)"
2832msgstr "(非分支)"
2833
2834#: ref-filter.c:1454 ref-filter.c:1485
2835#, c-format
2836msgid "missing object %s for %s"
2837msgstr "缺失 %2$s 的对象 %1$s"
2838
2839#: ref-filter.c:1457 ref-filter.c:1488
2840#, c-format
2841msgid "parse_object_buffer failed on %s for %s"
2842msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
2843
2844#: ref-filter.c:1788
2845#, c-format
2846msgid "malformed object at '%s'"
2847msgstr "非法的对象于 '%s'"
2848
2849#: ref-filter.c:1855
2850#, c-format
2851msgid "ignoring ref with broken name %s"
2852msgstr "忽略带有错误名称 %s 的引用"
2853
2854#: ref-filter.c:1860
2855#, c-format
2856msgid "ignoring broken ref %s"
2857msgstr "忽略损坏的引用 %s"
2858
2859#: ref-filter.c:2122
2860#, c-format
2861msgid "format: %%(end) atom missing"
2862msgstr "格式:缺少 %%(end) 元素"
2863
2864#: ref-filter.c:2216
2865#, c-format
2866msgid "malformed object name %s"
2867msgstr "非法的对象名 %s"
2868
2869#: remote.c:750
2870#, c-format
2871msgid "Cannot fetch both %s and %s to %s"
2872msgstr "不能同时获取 %s 和 %s 至 %s"
2873
2874#: remote.c:754
2875#, c-format
2876msgid "%s usually tracks %s, not %s"
2877msgstr "%s 通常跟踪 %s,而非 %s"
2878
2879#: remote.c:758
2880#, c-format
2881msgid "%s tracks both %s and %s"
2882msgstr "%s 同时跟踪 %s 和 %s"
2883
2884#: remote.c:766
2885msgid "Internal error"
2886msgstr "内部错误"
2887
2888#: remote.c:1681 remote.c:1783
2889msgid "HEAD does not point to a branch"
2890msgstr "HEAD 没有指向一个分支"
2891
2892#: remote.c:1690
2893#, c-format
2894msgid "no such branch: '%s'"
2895msgstr "没有此分支:'%s'"
2896
2897#: remote.c:1693
2898#, c-format
2899msgid "no upstream configured for branch '%s'"
2900msgstr "尚未给分支 '%s' 设置上游"
2901
2902#: remote.c:1699
2903#, c-format
2904msgid "upstream branch '%s' not stored as a remote-tracking branch"
2905msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
2906
2907#: remote.c:1714
2908#, c-format
2909msgid "push destination '%s' on remote '%s' has no local tracking branch"
2910msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
2911
2912#: remote.c:1726
2913#, c-format
2914msgid "branch '%s' has no remote for pushing"
2915msgstr "分支 '%s' 没有设置要推送的远程服务器"
2916
2917#: remote.c:1737
2918#, c-format
2919msgid "push refspecs for '%s' do not include '%s'"
2920msgstr "向 '%s' 推送引用规格未包含 '%s'"
2921
2922#: remote.c:1750
2923msgid "push has no destination (push.default is 'nothing')"
2924msgstr "推送无目标(push.default 是 'nothing')"
2925
2926#: remote.c:1772
2927msgid "cannot resolve 'simple' push to a single destination"
2928msgstr "无法解析 'simple' 推送至一个单独的目标"
2929
2930#: remote.c:2076
2931#, c-format
2932msgid "Your branch is based on '%s', but the upstream is gone.\n"
2933msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
2934
2935#: remote.c:2080
2936msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
2937msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
2938
2939#: remote.c:2083
2940#, c-format
2941msgid "Your branch is up to date with '%s'.\n"
2942msgstr "您的分支与上游分支 '%s' 一致。\n"
2943
2944#: remote.c:2087
2945#, c-format
2946msgid "Your branch is ahead of '%s' by %d commit.\n"
2947msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2948msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2949msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
2950
2951#: remote.c:2093
2952msgid "  (use \"git push\" to publish your local commits)\n"
2953msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
2954
2955#: remote.c:2096
2956#, c-format
2957msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2958msgid_plural ""
2959"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2960msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2961msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2962
2963#  译者:注意保持前导空格
2964#: remote.c:2104
2965msgid "  (use \"git pull\" to update your local branch)\n"
2966msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
2967
2968#: remote.c:2107
2969#, c-format
2970msgid ""
2971"Your branch and '%s' have diverged,\n"
2972"and have %d and %d different commit each, respectively.\n"
2973msgid_plural ""
2974"Your branch and '%s' have diverged,\n"
2975"and have %d and %d different commits each, respectively.\n"
2976msgstr[0] ""
2977"您的分支和 '%s' 出现了偏离,\n"
2978"并且分别有 %d 和 %d 处不同的提交。\n"
2979msgstr[1] ""
2980"您的分支和 '%s' 出现了偏离,\n"
2981"并且分别有 %d 和 %d 处不同的提交。\n"
2982
2983#  译者:注意保持前导空格
2984#: remote.c:2117
2985msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
2986msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
2987
2988#: revision.c:2256
2989msgid "your current branch appears to be broken"
2990msgstr "您的当前分支好像被损坏"
2991
2992#: revision.c:2259
2993#, c-format
2994msgid "your current branch '%s' does not have any commits yet"
2995msgstr "您的当前分支 '%s' 尚无任何提交"
2996
2997#: revision.c:2453
2998msgid "--first-parent is incompatible with --bisect"
2999msgstr "--first-parent 与 --bisect 不兼容"
3000
3001#: run-command.c:644
3002msgid "open /dev/null failed"
3003msgstr "不能打开 /dev/null"
3004
3005#: send-pack.c:151
3006#, c-format
3007msgid "unable to parse remote unpack status: %s"
3008msgstr "不能解析远程解包状态:%s"
3009
3010#: send-pack.c:153
3011#, c-format
3012msgid "remote unpack failed: %s"
3013msgstr "远程解包失败:%s"
3014
3015#: send-pack.c:316
3016msgid "failed to sign the push certificate"
3017msgstr "无法为推送证书签名"
3018
3019#: send-pack.c:429
3020msgid "the receiving end does not support --signed push"
3021msgstr "接收端不支持签名推送"
3022
3023#: send-pack.c:431
3024msgid ""
3025"not sending a push certificate since the receiving end does not support --"
3026"signed push"
3027msgstr "未发送推送证书,因为接收端不支持签名推送"
3028
3029#: send-pack.c:443
3030msgid "the receiving end does not support --atomic push"
3031msgstr "接收端不支持原子推送"
3032
3033#: send-pack.c:448
3034msgid "the receiving end does not support push options"
3035msgstr "接收端不支持推送选项"
3036
3037#: sequencer.c:218
3038msgid "revert"
3039msgstr "还原"
3040
3041#: sequencer.c:220
3042msgid "cherry-pick"
3043msgstr "拣选"
3044
3045#: sequencer.c:222
3046msgid "rebase -i"
3047msgstr "rebase -i"
3048
3049#: sequencer.c:224
3050#, c-format
3051msgid "Unknown action: %d"
3052msgstr "未知动作:%d"
3053
3054#: sequencer.c:281
3055msgid ""
3056"after resolving the conflicts, mark the corrected paths\n"
3057"with 'git add <paths>' or 'git rm <paths>'"
3058msgstr ""
3059"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3060"命令标记修正后的文件"
3061
3062#: sequencer.c:284
3063msgid ""
3064"after resolving the conflicts, mark the corrected paths\n"
3065"with 'git add <paths>' or 'git rm <paths>'\n"
3066"and commit the result with 'git commit'"
3067msgstr ""
3068"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3069"对修正后的文件做标记,然后用 'git commit' 提交"
3070
3071#: sequencer.c:297 sequencer.c:1704
3072#, c-format
3073msgid "could not lock '%s'"
3074msgstr "不能锁定 '%s'"
3075
3076#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
3077#: sequencer.c:2733 sequencer.c:2749
3078#, c-format
3079msgid "could not write to '%s'"
3080msgstr "不能写入 '%s'"
3081
3082#: sequencer.c:304
3083#, c-format
3084msgid "could not write eol to '%s'"
3085msgstr "不能将换行符写入 '%s'"
3086
3087#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
3088#, c-format
3089msgid "failed to finalize '%s'."
3090msgstr "无法完成 '%s'。"
3091
3092#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
3093#: builtin/commit.c:754 builtin/merge.c:1044
3094#, c-format
3095msgid "could not read '%s'"
3096msgstr "不能读取 '%s'"
3097
3098#: sequencer.c:358
3099#, c-format
3100msgid "your local changes would be overwritten by %s."
3101msgstr "您的本地修改将被%s覆盖。"
3102
3103#: sequencer.c:362
3104msgid "commit your changes or stash them to proceed."
3105msgstr "提交您的修改或贮藏后再继续。"
3106
3107#: sequencer.c:391
3108#, c-format
3109msgid "%s: fast-forward"
3110msgstr "%s:快进"
3111
3112#. TRANSLATORS: %s will be "revert", "cherry-pick" or
3113#. "rebase -i".
3114#.
3115#: sequencer.c:474
3116#, c-format
3117msgid "%s: Unable to write new index file"
3118msgstr "%s:无法写入新索引文件"
3119
3120#: sequencer.c:493
3121msgid "could not resolve HEAD commit\n"
3122msgstr "不能解析 HEAD 提交\n"
3123
3124#: sequencer.c:513
3125msgid "unable to update cache tree\n"
3126msgstr "不能更新缓存树\n"
3127
3128#: sequencer.c:597
3129#, c-format
3130msgid ""
3131"you have staged changes in your working tree\n"
3132"If these changes are meant to be squashed into the previous commit, run:\n"
3133"\n"
3134"  git commit --amend %s\n"
3135"\n"
3136"If they are meant to go into a new commit, run:\n"
3137"\n"
3138"  git commit %s\n"
3139"\n"
3140"In both cases, once you're done, continue with:\n"
3141"\n"
3142"  git rebase --continue\n"
3143msgstr ""
3144"您的工作区中存在已暂存的修改\n"
3145"如果这些修改需要被并入前一个提交,执行:\n"
3146"\n"
3147"  git commit --amend %s\n"
3148"\n"
3149"如果这些修改要形成一个新提交,执行:\n"
3150"\n"
3151"  git commit %s\n"
3152"\n"
3153"无论哪种情况,当您完成提交,继续执行:\n"
3154"\n"
3155"  git rebase --continue\n"
3156
3157#: sequencer.c:699
3158#, c-format
3159msgid "could not parse commit %s\n"
3160msgstr "不能解析提交 %s\n"
3161
3162#: sequencer.c:704
3163#, c-format
3164msgid "could not parse parent commit %s\n"
3165msgstr "不能解析父提交 %s\n"
3166
3167#: sequencer.c:826
3168#, c-format
3169msgid ""
3170"unexpected 1st line of squash message:\n"
3171"\n"
3172"\t%.*s"
3173msgstr ""
3174"意外的压缩提交首行提交信息:\n"
3175"\n"
3176"\t%.*s"
3177
3178#: sequencer.c:832
3179#, c-format
3180msgid ""
3181"invalid 1st line of squash message:\n"
3182"\n"
3183"\t%.*s"
3184msgstr ""
3185"压缩提交的首行提交信息无效:\n"
3186"\n"
3187"\t%.*s"
3188
3189#: sequencer.c:838 sequencer.c:863
3190#, c-format
3191msgid "This is a combination of %d commits."
3192msgstr "这是一个 %d 个提交的组合。"
3193
3194#: sequencer.c:847 sequencer.c:2681
3195msgid "need a HEAD to fixup"
3196msgstr "需要一个 HEAD 来修复"
3197
3198#: sequencer.c:849
3199msgid "could not read HEAD"
3200msgstr "不能读取 HEAD"
3201
3202#: sequencer.c:851
3203msgid "could not read HEAD's commit message"
3204msgstr "不能读取 HEAD 的提交说明"
3205
3206#: sequencer.c:857
3207#, c-format
3208msgid "cannot write '%s'"
3209msgstr "不能写 '%s'"
3210
3211#: sequencer.c:866 git-rebase--interactive.sh:446
3212msgid "This is the 1st commit message:"
3213msgstr "这是第一个提交说明:"
3214
3215#: sequencer.c:874
3216#, c-format
3217msgid "could not read commit message of %s"
3218msgstr "不能读取 %s 的提交说明"
3219
3220#: sequencer.c:881
3221#, c-format
3222msgid "This is the commit message #%d:"
3223msgstr "这是提交说明 #%d:"
3224
3225#: sequencer.c:886
3226#, c-format
3227msgid "The commit message #%d will be skipped:"
3228msgstr "提交说明 #%d 将被跳过:"
3229
3230#: sequencer.c:891
3231#, c-format
3232msgid "unknown command: %d"
3233msgstr "未知命令:%d"
3234
3235#: sequencer.c:957
3236msgid "your index file is unmerged."
3237msgstr "您的索引文件未完成合并。"
3238
3239#: sequencer.c:975
3240#, c-format
3241msgid "commit %s is a merge but no -m option was given."
3242msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
3243
3244#: sequencer.c:983
3245#, c-format
3246msgid "commit %s does not have parent %d"
3247msgstr "提交 %s 没有第 %d 个父提交"
3248
3249#: sequencer.c:987
3250#, c-format
3251msgid "mainline was specified but commit %s is not a merge."
3252msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3253
3254#: sequencer.c:993
3255#, c-format
3256msgid "cannot get commit message for %s"
3257msgstr "不能得到 %s 的提交说明"
3258
3259#. TRANSLATORS: The first %s will be a "todo" command like
3260#. "revert" or "pick", the second %s a SHA1.
3261#: sequencer.c:1014
3262#, c-format
3263msgid "%s: cannot parse parent commit %s"
3264msgstr "%s:不能解析父提交 %s"
3265
3266#: sequencer.c:1077 sequencer.c:1853
3267#, c-format
3268msgid "could not rename '%s' to '%s'"
3269msgstr "不能将 '%s' 重命名为 '%s'"
3270
3271#: sequencer.c:1128
3272#, c-format
3273msgid "could not revert %s... %s"
3274msgstr "不能还原 %s... %s"
3275
3276#: sequencer.c:1129
3277#, c-format
3278msgid "could not apply %s... %s"
3279msgstr "不能应用 %s... %s"
3280
3281#: sequencer.c:1171
3282msgid "empty commit set passed"
3283msgstr "提供了空的提交集"
3284
3285#: sequencer.c:1181
3286#, c-format
3287msgid "git %s: failed to read the index"
3288msgstr "git %s:无法读取索引"
3289
3290#: sequencer.c:1188
3291#, c-format
3292msgid "git %s: failed to refresh the index"
3293msgstr "git %s:无法刷新索引"
3294
3295#: sequencer.c:1308
3296#, c-format
3297msgid "invalid line %d: %.*s"
3298msgstr "无效行 %d:%.*s"
3299
3300#: sequencer.c:1316
3301#, c-format
3302msgid "cannot '%s' without a previous commit"
3303msgstr "没有父提交的情况下不能 '%s'"
3304
3305#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
3306#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
3307#, c-format
3308msgid "could not read '%s'."
3309msgstr "不能读取 '%s'。"
3310
3311#: sequencer.c:1361
3312msgid "please fix this using 'git rebase --edit-todo'."
3313msgstr "请用 'git rebase --edit-todo' 来修改。"
3314
3315#: sequencer.c:1363
3316#, c-format
3317msgid "unusable instruction sheet: '%s'"
3318msgstr "不可用的指令清单:'%s'"
3319
3320#: sequencer.c:1368
3321msgid "no commits parsed."
3322msgstr "没有解析提交。"
3323
3324#: sequencer.c:1379
3325msgid "cannot cherry-pick during a revert."
3326msgstr "不能在回退中执行拣选。"
3327
3328#: sequencer.c:1381
3329msgid "cannot revert during a cherry-pick."
3330msgstr "不能在拣选中执行回退。"
3331
3332#: sequencer.c:1448
3333#, c-format
3334msgid "invalid key: %s"
3335msgstr "无效键名:%s"
3336
3337#: sequencer.c:1451
3338#, c-format
3339msgid "invalid value for %s: %s"
3340msgstr "%s 的值无效:%s"
3341
3342#: sequencer.c:1517
3343#, c-format
3344msgid "malformed options sheet: '%s'"
3345msgstr "非法的选项清单:'%s'"
3346
3347#: sequencer.c:1555
3348msgid "a cherry-pick or revert is already in progress"
3349msgstr "一个拣选或还原操作已在进行"
3350
3351#: sequencer.c:1556
3352msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3353msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3354
3355#: sequencer.c:1559
3356#, c-format
3357msgid "could not create sequencer directory '%s'"
3358msgstr "不能创建序列目录 '%s'"
3359
3360#: sequencer.c:1574
3361msgid "could not lock HEAD"
3362msgstr "不能锁定 HEAD"
3363
3364#: sequencer.c:1632 sequencer.c:2211
3365msgid "no cherry-pick or revert in progress"
3366msgstr "拣选或还原操作并未进行"
3367
3368#: sequencer.c:1634
3369msgid "cannot resolve HEAD"
3370msgstr "不能解析 HEAD"
3371
3372#: sequencer.c:1636 sequencer.c:1671
3373msgid "cannot abort from a branch yet to be born"
3374msgstr "不能从尚未建立的分支终止"
3375
3376#: sequencer.c:1657 builtin/grep.c:711
3377#, c-format
3378msgid "cannot open '%s'"
3379msgstr "不能打开 '%s'"
3380
3381#: sequencer.c:1659
3382#, c-format
3383msgid "cannot read '%s': %s"
3384msgstr "不能读取 '%s':%s"
3385
3386#: sequencer.c:1660
3387msgid "unexpected end of file"
3388msgstr "意外的文件结束"
3389
3390#: sequencer.c:1666
3391#, c-format
3392msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3393msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3394
3395#: sequencer.c:1677
3396msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3397msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3398
3399#: sequencer.c:1818 sequencer.c:2109
3400msgid "cannot read HEAD"
3401msgstr "不能读取 HEAD"
3402
3403#: sequencer.c:1858 builtin/difftool.c:640
3404#, c-format
3405msgid "could not copy '%s' to '%s'"
3406msgstr "不能拷贝 '%s' 至 '%s'"
3407
3408#: sequencer.c:1874
3409msgid "could not read index"
3410msgstr "不能读取索引"
3411
3412#  译者:注意保持前导空格
3413#: sequencer.c:1879
3414#, c-format
3415msgid ""
3416"execution failed: %s\n"
3417"%sYou can fix the problem, and then run\n"
3418"\n"
3419"  git rebase --continue\n"
3420"\n"
3421msgstr ""
3422"执行失败:%s\n"
3423"%s您可以改正该问题,然后运行\n"
3424"\n"
3425"  git rebase --continue\n"
3426"\n"
3427
3428#: sequencer.c:1885
3429msgid "and made changes to the index and/or the working tree\n"
3430msgstr "并且修改索引和/或工作区\n"
3431
3432#: sequencer.c:1891
3433#, c-format
3434msgid ""
3435"execution succeeded: %s\n"
3436"but left changes to the index and/or the working tree\n"
3437"Commit or stash your changes, and then run\n"
3438"\n"
3439"  git rebase --continue\n"
3440"\n"
3441msgstr ""
3442"执行成功:%s\n"
3443"但是在索引和/或工作区中存在变更\n"
3444"提交或贮藏修改,然后运行\n"
3445"\n"
3446"  git rebase --continue\n"
3447"\n"
3448
3449#: sequencer.c:1948
3450#, c-format
3451msgid "Applied autostash.\n"
3452msgstr "已应用 autostash。\n"
3453
3454#: sequencer.c:1960
3455#, c-format
3456msgid "cannot store %s"
3457msgstr "不能存储 %s"
3458
3459#: sequencer.c:1963 git-rebase.sh:175
3460#, c-format
3461msgid ""
3462"Applying autostash resulted in conflicts.\n"
3463"Your changes are safe in the stash.\n"
3464"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3465msgstr ""
3466"应用 autostash 导致冲突。\n"
3467"您的修改安全地保存在贮藏区中。\n"
3468"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3469
3470#: sequencer.c:2045
3471#, c-format
3472msgid "Stopped at %s...  %.*s\n"
3473msgstr "停止在 %s... %.*s\n"
3474
3475#: sequencer.c:2087
3476#, c-format
3477msgid "unknown command %d"
3478msgstr "未知命令 %d"
3479
3480#: sequencer.c:2117
3481msgid "could not read orig-head"
3482msgstr "不能读取 orig-head"
3483
3484#: sequencer.c:2122 sequencer.c:2678
3485msgid "could not read 'onto'"
3486msgstr "不能读取 'onto'"
3487
3488#: sequencer.c:2129
3489#, c-format
3490msgid "could not update %s"
3491msgstr "不能更新 %s"
3492
3493#: sequencer.c:2136
3494#, c-format
3495msgid "could not update HEAD to %s"
3496msgstr "不能更新 HEAD 为 %s"
3497
3498#: sequencer.c:2220
3499msgid "cannot rebase: You have unstaged changes."
3500msgstr "不能变基:您有未暂存的变更。"
3501
3502#: sequencer.c:2225
3503msgid "could not remove CHERRY_PICK_HEAD"
3504msgstr "不能删除 CHERRY_PICK_HEAD"
3505
3506#: sequencer.c:2234
3507msgid "cannot amend non-existing commit"
3508msgstr "不能修补不存在的提交"
3509
3510#: sequencer.c:2236
3511#, c-format
3512msgid "invalid file: '%s'"
3513msgstr "无效文件:'%s'"
3514
3515#: sequencer.c:2238
3516#, c-format
3517msgid "invalid contents: '%s'"
3518msgstr "无效内容:'%s'"
3519
3520#: sequencer.c:2241
3521msgid ""
3522"\n"
3523"You have uncommitted changes in your working tree. Please, commit them\n"
3524"first and then run 'git rebase --continue' again."
3525msgstr ""
3526"\n"
3527"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
3528
3529#: sequencer.c:2251
3530msgid "could not commit staged changes."
3531msgstr "不能提交暂存的修改。"
3532
3533#: sequencer.c:2331
3534#, c-format
3535msgid "%s: can't cherry-pick a %s"
3536msgstr "%s:不能拣选一个%s"
3537
3538#: sequencer.c:2335
3539#, c-format
3540msgid "%s: bad revision"
3541msgstr "%s:错误的版本"
3542
3543#: sequencer.c:2368
3544msgid "can't revert as initial commit"
3545msgstr "不能作为初始提交回退"
3546
3547#: sequencer.c:2471
3548msgid "make_script: unhandled options"
3549msgstr "make_script:有未能处理的选项"
3550
3551#: sequencer.c:2474
3552msgid "make_script: error preparing revisions"
3553msgstr "make_script:准备版本时错误"
3554
3555#: sequencer.c:2510
3556#, c-format
3557msgid "unusable todo list: '%s'"
3558msgstr "不可用的待办列表:'%s'"
3559
3560#: sequencer.c:2516
3561#, c-format
3562msgid "unable to open '%s' for writing"
3563msgstr "无法以写入方式打开 '%s'"
3564
3565#: sequencer.c:2561
3566#, c-format
3567msgid ""
3568"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
3569msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
3570
3571#: sequencer.c:2641
3572#, c-format
3573msgid ""
3574"Warning: some commits may have been dropped accidentally.\n"
3575"Dropped commits (newer to older):\n"
3576msgstr ""
3577"警告:一些提交可能被意外丢弃。\n"
3578"丢弃的提交(从新到旧):\n"
3579
3580#: sequencer.c:2648
3581#, c-format
3582msgid ""
3583"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
3584"\n"
3585"Use 'git config rebase.missingCommitsCheck' to change the level of "
3586"warnings.\n"
3587"The possible behaviours are: ignore, warn, error.\n"
3588"\n"
3589msgstr ""
3590"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
3591"\n"
3592"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
3593"可选值有:ignore、warn、error。\n"
3594"\n"
3595
3596#: sequencer.c:2660
3597#, c-format
3598msgid ""
3599"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
3600"continue'.\n"
3601"Or you can abort the rebase with 'git rebase --abort'.\n"
3602msgstr ""
3603"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
3604"或者您可以用 'git rebase --abort' 终止变基。\n"
3605
3606#: sequencer.c:2708
3607#, c-format
3608msgid "could not parse commit '%s'"
3609msgstr "不能解析提交 '%s'"
3610
3611#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
3612#: builtin/am.c:775
3613#, c-format
3614msgid "could not open '%s' for writing"
3615msgstr "无法打开 '%s' 进行写入"
3616
3617#: sequencer.c:2756
3618#, c-format
3619msgid "could not truncate '%s'"
3620msgstr "无法截断 '%s'"
3621
3622#: sequencer.c:2848
3623msgid "the script was already rearranged."
3624msgstr "脚本已经重新编排。"
3625
3626#: sequencer.c:2953
3627#, c-format
3628msgid "could not finish '%s'"
3629msgstr "无法结束 '%s'"
3630
3631#: setup.c:171
3632#, c-format
3633msgid ""
3634"%s: no such path in the working tree.\n"
3635"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
3636msgstr ""
3637"%s:工作区中无此路径。\n"
3638"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
3639
3640#: setup.c:184
3641#, c-format
3642msgid ""
3643"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
3644"Use '--' to separate paths from revisions, like this:\n"
3645"'git <command> [<revision>...] -- [<file>...]'"
3646msgstr ""
3647"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
3648"使用 '--' 来分隔版本和路径,例如:\n"
3649"'git <command> [<revision>...] -- [<file>...]'"
3650
3651#: setup.c:252
3652#, c-format
3653msgid ""
3654"ambiguous argument '%s': both revision and filename\n"
3655"Use '--' to separate paths from revisions, like this:\n"
3656"'git <command> [<revision>...] -- [<file>...]'"
3657msgstr ""
3658"有歧义的参数 '%s':可同时是版本和文件\n"
3659"使用 '--' 来分隔版本和路径,例如:\n"
3660"'git <command> [<revision>...] -- [<file>...]'"
3661
3662#: setup.c:499
3663#, c-format
3664msgid "Expected git repo version <= %d, found %d"
3665msgstr "期望 git 仓库版本 <= %d,却得到 %d"
3666
3667#: setup.c:507
3668msgid "unknown repository extensions found:"
3669msgstr "发现未知的仓库扩展:"
3670
3671#: setup.c:806
3672#, c-format
3673msgid "Not a git repository (or any of the parent directories): %s"
3674msgstr "不是一个 git 仓库(或者任何父目录):%s"
3675
3676#: setup.c:808 builtin/index-pack.c:1653
3677msgid "Cannot come back to cwd"
3678msgstr "无法返回当前工作目录"
3679
3680#: setup.c:1046
3681msgid "Unable to read current working directory"
3682msgstr "不能读取当前工作目录"
3683
3684#: setup.c:1058 setup.c:1064
3685#, c-format
3686msgid "Cannot change to '%s'"
3687msgstr "不能切换到 '%s'"
3688
3689#: setup.c:1077
3690#, c-format
3691msgid ""
3692"Not a git repository (or any parent up to mount point %s)\n"
3693"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3694msgstr ""
3695"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3696"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
3697
3698#: setup.c:1159
3699#, c-format
3700msgid ""
3701"Problem with core.sharedRepository filemode value (0%.3o).\n"
3702"The owner of files must always have read and write permissions."
3703msgstr ""
3704"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3705"文件属主必须始终拥有读写权限。"
3706
3707#: sha1_file.c:528
3708#, c-format
3709msgid "path '%s' does not exist"
3710msgstr "路径 '%s' 不存在"
3711
3712#: sha1_file.c:554
3713#, c-format
3714msgid "reference repository '%s' as a linked checkout is not supported yet."
3715msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3716
3717#: sha1_file.c:560
3718#, c-format
3719msgid "reference repository '%s' is not a local repository."
3720msgstr "参考仓库 '%s' 不是一个本地仓库。"
3721
3722#: sha1_file.c:566
3723#, c-format
3724msgid "reference repository '%s' is shallow"
3725msgstr "参考仓库 '%s' 是一个浅克隆"
3726
3727#: sha1_file.c:574
3728#, c-format
3729msgid "reference repository '%s' is grafted"
3730msgstr "参考仓库 '%s' 已被嫁接"
3731
3732#: sha1_name.c:420
3733#, c-format
3734msgid "short SHA1 %s is ambiguous"
3735msgstr "短 SHA1 %s 存在歧义"
3736
3737#: sha1_name.c:431
3738msgid "The candidates are:"
3739msgstr "候选者有:"
3740
3741#: sha1_name.c:590
3742msgid ""
3743"Git normally never creates a ref that ends with 40 hex characters\n"
3744"because it will be ignored when you just specify 40-hex. These refs\n"
3745"may be created by mistake. For example,\n"
3746"\n"
3747"  git checkout -b $br $(git rev-parse ...)\n"
3748"\n"
3749"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3750"examine these refs and maybe delete them. Turn this message off by\n"
3751"running \"git config advice.objectNameWarning false\""
3752msgstr ""
3753"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3754"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3755"\n"
3756"  git checkout -b $br $(git rev-parse ...)\n"
3757"\n"
3758"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3759"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3760"命令关闭本消息通知。"
3761
3762#: submodule.c:93 submodule.c:127
3763msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3764msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3765
3766#: submodule.c:97 submodule.c:131
3767#, c-format
3768msgid "Could not find section in .gitmodules where path=%s"
3769msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3770
3771#: submodule.c:105
3772#, c-format
3773msgid "Could not update .gitmodules entry %s"
3774msgstr "不能更新 .gitmodules 条目 %s"
3775
3776#: submodule.c:138
3777#, c-format
3778msgid "Could not remove .gitmodules entry for %s"
3779msgstr "无法移除 %s 的 .gitmodules 条目"
3780
3781#: submodule.c:149
3782msgid "staging updated .gitmodules failed"
3783msgstr "将更新后 .gitmodules 添加暂存区失败"
3784
3785#: submodule.c:309
3786#, c-format
3787msgid "in unpopulated submodule '%s'"
3788msgstr "位于未检出的子模组 '%s'"
3789
3790#: submodule.c:340
3791#, c-format
3792msgid "Pathspec '%s' is in submodule '%.*s'"
3793msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
3794
3795#: submodule.c:799
3796#, c-format
3797msgid "submodule entry '%s' (%s) is a %s, not a commit"
3798msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
3799
3800#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
3801msgid "Failed to resolve HEAD as a valid ref."
3802msgstr "无法将 HEAD 解析为有效引用。"
3803
3804#: submodule.c:1304
3805#, c-format
3806msgid "'%s' not recognized as a git repository"
3807msgstr "无法将 '%s' 识别为一个 git 仓库"
3808
3809#: submodule.c:1442
3810#, c-format
3811msgid "could not start 'git status' in submodule '%s'"
3812msgstr "无法在子模组 '%s' 中启动 'git status'"
3813
3814#: submodule.c:1455
3815#, c-format
3816msgid "could not run 'git status' in submodule '%s'"
3817msgstr "无法在子模组 '%s' 中执行 'git status'"
3818
3819#: submodule.c:1548
3820#, c-format
3821msgid "submodule '%s' has dirty index"
3822msgstr "子模组 '%s' 中有脏索引"
3823
3824#: submodule.c:1809
3825#, c-format
3826msgid ""
3827"relocate_gitdir for submodule '%s' with more than one worktree not supported"
3828msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3829
3830#: submodule.c:1821 submodule.c:1877
3831#, c-format
3832msgid "could not lookup name for submodule '%s'"
3833msgstr "不能查询子模组 '%s' 的名称"
3834
3835#: submodule.c:1825 builtin/submodule--helper.c:671
3836#: builtin/submodule--helper.c:681
3837#, c-format
3838msgid "could not create directory '%s'"
3839msgstr "不能创建目录 '%s'"
3840
3841#: submodule.c:1828
3842#, c-format
3843msgid ""
3844"Migrating git directory of '%s%s' from\n"
3845"'%s' to\n"
3846"'%s'\n"
3847msgstr ""
3848"将 '%s%s' 的 git 目录从\n"
3849"'%s' 迁移至\n"
3850"'%s'\n"
3851
3852#: submodule.c:1912
3853#, c-format
3854msgid "could not recurse into submodule '%s'"
3855msgstr "无法递归进子模组路径 '%s'"
3856
3857#: submodule.c:1956
3858msgid "could not start ls-files in .."
3859msgstr "无法在 .. 中启动 ls-files"
3860
3861#: submodule.c:1976
3862msgid "BUG: returned path string doesn't match cwd?"
3863msgstr "BUG:返回的路径和当前路径不匹配?"
3864
3865#: submodule.c:1995
3866#, c-format
3867msgid "ls-tree returned unexpected return code %d"
3868msgstr "ls-tree 返回未知返回值 %d"
3869
3870#: submodule-config.c:263
3871msgid "negative values not allowed for submodule.fetchjobs"
3872msgstr "submodule.fetchjobs 不允许为负值"
3873
3874#: submodule-config.c:436
3875#, c-format
3876msgid "invalid value for %s"
3877msgstr "%s 的值无效"
3878
3879#: trailer.c:238
3880#, c-format
3881msgid "running trailer command '%s' failed"
3882msgstr "执行 trailer 命令 '%s' 失败"
3883
3884#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
3885#: trailer.c:557
3886#, c-format
3887msgid "unknown value '%s' for key '%s'"
3888msgstr "键 '%2$s' 的未知取值 '%1$s'"
3889
3890#: trailer.c:539 trailer.c:544 builtin/remote.c:290
3891#, c-format
3892msgid "more than one %s"
3893msgstr "多于一个 %s"
3894
3895#: trailer.c:730
3896#, c-format
3897msgid "empty trailer token in trailer '%.*s'"
3898msgstr "签名 '%.*s' 的键为空"
3899
3900#: trailer.c:750
3901#, c-format
3902msgid "could not read input file '%s'"
3903msgstr "不能读取输入文件 '%s'"
3904
3905#: trailer.c:753
3906msgid "could not read from stdin"
3907msgstr "不能自标准输入读取"
3908
3909#: trailer.c:1008 builtin/am.c:46
3910#, c-format
3911msgid "could not stat %s"
3912msgstr "不能对 %s 调用 stat"
3913
3914#: trailer.c:1010
3915#, c-format
3916msgid "file %s is not a regular file"
3917msgstr "文件 %s 不是一个正规文件"
3918
3919#: trailer.c:1012
3920#, c-format
3921msgid "file %s is not writable by user"
3922msgstr "文件 %s 用户不可写"
3923
3924#: trailer.c:1024
3925msgid "could not open temporary file"
3926msgstr "不能打开临时文件"
3927
3928#: trailer.c:1064
3929#, c-format
3930msgid "could not rename temporary file to %s"
3931msgstr "不能重命名临时文件为 %s"
3932
3933#: transport.c:62
3934#, c-format
3935msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3936msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3937
3938#: transport.c:151
3939#, c-format
3940msgid "transport: invalid depth option '%s'"
3941msgstr "传输:无效的深度选项 '%s'"
3942
3943#: transport.c:888
3944#, c-format
3945msgid ""
3946"The following submodule paths contain changes that can\n"
3947"not be found on any remote:\n"
3948msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3949
3950#: transport.c:892
3951#, c-format
3952msgid ""
3953"\n"
3954"Please try\n"
3955"\n"
3956"\tgit push --recurse-submodules=on-demand\n"
3957"\n"
3958"or cd to the path and use\n"
3959"\n"
3960"\tgit push\n"
3961"\n"
3962"to push them to a remote.\n"
3963"\n"
3964msgstr ""
3965"\n"
3966"请尝试\n"
3967"\n"
3968"\tgit push --recurse-submodules=on-demand\n"
3969"\n"
3970"或者进入到子目录执行\n"
3971"\n"
3972"\tgit push\n"
3973"\n"
3974"以推送至远程。\n"
3975"\n"
3976
3977#: transport.c:900
3978msgid "Aborting."
3979msgstr "正在终止。"
3980
3981#: transport-helper.c:1071
3982#, c-format
3983msgid "Could not read ref %s"
3984msgstr "不能读取引用 %s"
3985
3986#: tree-walk.c:31
3987msgid "too-short tree object"
3988msgstr "太短的树对象"
3989
3990#: tree-walk.c:37
3991msgid "malformed mode in tree entry"
3992msgstr "树对象中的条目模式错误"
3993
3994#: tree-walk.c:41
3995msgid "empty filename in tree entry"
3996msgstr "树对象条目中空的文件名"
3997
3998#: tree-walk.c:114
3999msgid "too-short tree file"
4000msgstr "太短的树文件"
4001
4002#: unpack-trees.c:106
4003#, c-format
4004msgid ""
4005"Your local changes to the following files would be overwritten by checkout:\n"
4006"%%sPlease commit your changes or stash them before you switch branches."
4007msgstr ""
4008"您对下列文件的本地修改将被检出操作覆盖:\n"
4009"%%s请在切换分支前提交或贮藏您的修改。"
4010
4011#: unpack-trees.c:108
4012#, c-format
4013msgid ""
4014"Your local changes to the following files would be overwritten by checkout:\n"
4015"%%s"
4016msgstr ""
4017"您对下列文件的本地修改将被检出操作覆盖:\n"
4018"%%s"
4019
4020#: unpack-trees.c:111
4021#, c-format
4022msgid ""
4023"Your local changes to the following files would be overwritten by merge:\n"
4024"%%sPlease commit your changes or stash them before you merge."
4025msgstr ""
4026"您对下列文件的本地修改将被合并操作覆盖:\n"
4027"%%s请在合并前提交或贮藏您的修改。"
4028
4029#: unpack-trees.c:113
4030#, c-format
4031msgid ""
4032"Your local changes to the following files would be overwritten by merge:\n"
4033"%%s"
4034msgstr ""
4035"您对下列文件的本地修改将被合并操作覆盖:\n"
4036"%%s"
4037
4038#: unpack-trees.c:116
4039#, c-format
4040msgid ""
4041"Your local changes to the following files would be overwritten by %s:\n"
4042"%%sPlease commit your changes or stash them before you %s."
4043msgstr ""
4044"您对下列文件的本地修改将被 %s 覆盖:\n"
4045"%%s请在 %s 之前提交或贮藏您的修改。"
4046
4047#: unpack-trees.c:118
4048#, c-format
4049msgid ""
4050"Your local changes to the following files would be overwritten by %s:\n"
4051"%%s"
4052msgstr ""
4053"您对下列文件的本地修改将被 %s 覆盖:\n"
4054"%%s"
4055
4056#: unpack-trees.c:123
4057#, c-format
4058msgid ""
4059"Updating the following directories would lose untracked files in them:\n"
4060"%s"
4061msgstr ""
4062"更新如下目录将会丢失其中未跟踪的文件:\n"
4063"%s"
4064
4065#: unpack-trees.c:127
4066#, c-format
4067msgid ""
4068"The following untracked working tree files would be removed by checkout:\n"
4069"%%sPlease move or remove them before you switch branches."
4070msgstr ""
4071"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4072"%%s请在切换分支之前移动或删除。"
4073
4074#: unpack-trees.c:129
4075#, c-format
4076msgid ""
4077"The following untracked working tree files would be removed by checkout:\n"
4078"%%s"
4079msgstr ""
4080"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4081"%%s"
4082
4083#: unpack-trees.c:132
4084#, c-format
4085msgid ""
4086"The following untracked working tree files would be removed by merge:\n"
4087"%%sPlease move or remove them before you merge."
4088msgstr ""
4089"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4090"%%s请在合并前移动或删除。"
4091
4092#: unpack-trees.c:134
4093#, c-format
4094msgid ""
4095"The following untracked working tree files would be removed by merge:\n"
4096"%%s"
4097msgstr ""
4098"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4099"%%s"
4100
4101#: unpack-trees.c:137
4102#, c-format
4103msgid ""
4104"The following untracked working tree files would be removed by %s:\n"
4105"%%sPlease move or remove them before you %s."
4106msgstr ""
4107"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4108"%%s请在 %s 前移动或删除。"
4109
4110#: unpack-trees.c:139
4111#, c-format
4112msgid ""
4113"The following untracked working tree files would be removed by %s:\n"
4114"%%s"
4115msgstr ""
4116"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4117"%%s"
4118
4119#: unpack-trees.c:144
4120#, c-format
4121msgid ""
4122"The following untracked working tree files would be overwritten by "
4123"checkout:\n"
4124"%%sPlease move or remove them before you switch branches."
4125msgstr ""
4126"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4127"%%s请在切换分支前移动或删除。"
4128
4129#: unpack-trees.c:146
4130#, c-format
4131msgid ""
4132"The following untracked working tree files would be overwritten by "
4133"checkout:\n"
4134"%%s"
4135msgstr ""
4136"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4137"%%s"
4138
4139#: unpack-trees.c:149
4140#, c-format
4141msgid ""
4142"The following untracked working tree files would be overwritten by merge:\n"
4143"%%sPlease move or remove them before you merge."
4144msgstr ""
4145"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4146"%%s请在合并前移动或删除。"
4147
4148#: unpack-trees.c:151
4149#, c-format
4150msgid ""
4151"The following untracked working tree files would be overwritten by merge:\n"
4152"%%s"
4153msgstr ""
4154"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4155"%%s"
4156
4157#: unpack-trees.c:154
4158#, c-format
4159msgid ""
4160"The following untracked working tree files would be overwritten by %s:\n"
4161"%%sPlease move or remove them before you %s."
4162msgstr ""
4163"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4164"%%s请在 %s 前移动或删除。"
4165
4166#: unpack-trees.c:156
4167#, c-format
4168msgid ""
4169"The following untracked working tree files would be overwritten by %s:\n"
4170"%%s"
4171msgstr ""
4172"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4173"%%s"
4174
4175#: unpack-trees.c:163
4176#, c-format
4177msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
4178msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
4179
4180#: unpack-trees.c:166
4181#, c-format
4182msgid ""
4183"Cannot update sparse checkout: the following entries are not up to date:\n"
4184"%s"
4185msgstr ""
4186"无法更新稀疏检出:如下条目不是最新:\n"
4187"%s"
4188
4189#: unpack-trees.c:168
4190#, c-format
4191msgid ""
4192"The following working tree files would be overwritten by sparse checkout "
4193"update:\n"
4194"%s"
4195msgstr ""
4196"工作区中下列文件将被稀疏检出更新所覆盖:\n"
4197"%s"
4198
4199#: unpack-trees.c:170
4200#, c-format
4201msgid ""
4202"The following working tree files would be removed by sparse checkout "
4203"update:\n"
4204"%s"
4205msgstr ""
4206"工作区中下列文件将被稀疏检出更新所删除:\n"
4207"%s"
4208
4209#: unpack-trees.c:172
4210#, c-format
4211msgid ""
4212"Cannot update submodule:\n"
4213"%s"
4214msgstr ""
4215"无法更新子模组:\n"
4216"%s"
4217
4218#: unpack-trees.c:249
4219#, c-format
4220msgid "Aborting\n"
4221msgstr "终止中\n"
4222
4223#: unpack-trees.c:331
4224msgid "Checking out files"
4225msgstr "正在检出文件"
4226
4227#: urlmatch.c:163
4228msgid "invalid URL scheme name or missing '://' suffix"
4229msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4230
4231#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
4232#, c-format
4233msgid "invalid %XX escape sequence"
4234msgstr "无效的 %XX 转义序列"
4235
4236#: urlmatch.c:215
4237msgid "missing host and scheme is not 'file:'"
4238msgstr "缺失主机名且 URL 方案不是 'file:'"
4239
4240#: urlmatch.c:232
4241msgid "a 'file:' URL may not have a port number"
4242msgstr "一个 'file:' URL 不应该包含端口号"
4243
4244#: urlmatch.c:247
4245msgid "invalid characters in host name"
4246msgstr "主机名中包含无效的字符"
4247
4248#: urlmatch.c:292 urlmatch.c:303
4249msgid "invalid port number"
4250msgstr "无效的端口号"
4251
4252#: urlmatch.c:371
4253msgid "invalid '..' path segment"
4254msgstr "无效的 '..' 路径片段"
4255
4256#: worktree.c:245
4257#, c-format
4258msgid "failed to read '%s'"
4259msgstr "无法读取 '%s'"
4260
4261#: wrapper.c:223 wrapper.c:393
4262#, c-format
4263msgid "could not open '%s' for reading and writing"
4264msgstr "无法打开 '%s' 进行读写"
4265
4266#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
4267#: builtin/am.c:858 builtin/merge.c:1041
4268#, c-format
4269msgid "could not open '%s' for reading"
4270msgstr "无法打开 '%s' 进行读取"
4271
4272#: wrapper.c:424 wrapper.c:624
4273#, c-format
4274msgid "unable to access '%s'"
4275msgstr "不能访问 '%s'"
4276
4277#: wrapper.c:632
4278msgid "unable to get current working directory"
4279msgstr "不能获取当前工作目录"
4280
4281#: wrapper.c:656
4282#, c-format
4283msgid "could not write to %s"
4284msgstr "不能写入 %s"
4285
4286#: wrapper.c:658
4287#, c-format
4288msgid "could not close %s"
4289msgstr "不能关闭 %s"
4290
4291#: wt-status.c:150
4292msgid "Unmerged paths:"
4293msgstr "未合并的路径:"
4294
4295#  译者:注意保持前导空格
4296#: wt-status.c:177 wt-status.c:204
4297#, c-format
4298msgid "  (use \"git reset %s <file>...\" to unstage)"
4299msgstr "  (使用 \"git reset %s <文件>...\" 以取消暂存)"
4300
4301#  译者:注意保持前导空格
4302#: wt-status.c:179 wt-status.c:206
4303msgid "  (use \"git rm --cached <file>...\" to unstage)"
4304msgstr "  (使用 \"git rm --cached <文件>...\" 以取消暂存)"
4305
4306#  译者:注意保持前导空格
4307#: wt-status.c:183
4308msgid "  (use \"git add <file>...\" to mark resolution)"
4309msgstr "  (使用 \"git add <文件>...\" 标记解决方案)"
4310
4311#  译者:注意保持前导空格
4312#: wt-status.c:185 wt-status.c:189
4313msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4314msgstr "  (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
4315
4316#  译者:注意保持前导空格
4317#: wt-status.c:187
4318msgid "  (use \"git rm <file>...\" to mark resolution)"
4319msgstr "  (使用 \"git rm <文件>...\" 标记解决方案)"
4320
4321#: wt-status.c:198 wt-status.c:979
4322msgid "Changes to be committed:"
4323msgstr "要提交的变更:"
4324
4325#: wt-status.c:216 wt-status.c:988
4326msgid "Changes not staged for commit:"
4327msgstr "尚未暂存以备提交的变更:"
4328
4329#  译者:注意保持前导空格
4330#: wt-status.c:220
4331msgid "  (use \"git add <file>...\" to update what will be committed)"
4332msgstr "  (使用 \"git add <文件>...\" 更新要提交的内容)"
4333
4334#  译者:注意保持前导空格
4335#: wt-status.c:222
4336msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
4337msgstr "  (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
4338
4339#  译者:注意保持前导空格
4340#: wt-status.c:223
4341msgid ""
4342"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
4343msgstr "  (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
4344
4345#  译者:注意保持前导空格
4346#: wt-status.c:225
4347msgid "  (commit or discard the untracked or modified content in submodules)"
4348msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
4349
4350#  译者:注意保持前导空格
4351#: wt-status.c:237
4352#, c-format
4353msgid "  (use \"git %s <file>...\" to include in what will be committed)"
4354msgstr "  (使用 \"git %s <文件>...\" 以包含要提交的内容)"
4355
4356#: wt-status.c:252
4357msgid "both deleted:"
4358msgstr "双方删除:"
4359
4360#: wt-status.c:254
4361msgid "added by us:"
4362msgstr "由我们添加:"
4363
4364#: wt-status.c:256
4365msgid "deleted by them:"
4366msgstr "由他们删除:"
4367
4368#: wt-status.c:258
4369msgid "added by them:"
4370msgstr "由他们添加:"
4371
4372#: wt-status.c:260
4373msgid "deleted by us:"
4374msgstr "由我们删除:"
4375
4376#: wt-status.c:262
4377msgid "both added:"
4378msgstr "双方添加:"
4379
4380#: wt-status.c:264
4381msgid "both modified:"
4382msgstr "双方修改:"
4383
4384#: wt-status.c:274
4385msgid "new file:"
4386msgstr "新文件:"
4387
4388#: wt-status.c:276
4389msgid "copied:"
4390msgstr "拷贝:"
4391
4392#: wt-status.c:278
4393msgid "deleted:"
4394msgstr "删除:"
4395
4396#: wt-status.c:280
4397msgid "modified:"
4398msgstr "修改:"
4399
4400#: wt-status.c:282
4401msgid "renamed:"
4402msgstr "重命名:"
4403
4404#: wt-status.c:284
4405msgid "typechange:"
4406msgstr "类型变更:"
4407
4408#: wt-status.c:286
4409msgid "unknown:"
4410msgstr "未知:"
4411
4412#: wt-status.c:288
4413msgid "unmerged:"
4414msgstr "未合并:"
4415
4416#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4417#: wt-status.c:370
4418msgid "new commits, "
4419msgstr "新提交, "
4420
4421#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4422#: wt-status.c:372
4423msgid "modified content, "
4424msgstr "修改的内容, "
4425
4426#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4427#: wt-status.c:374
4428msgid "untracked content, "
4429msgstr "未跟踪的内容, "
4430
4431#: wt-status.c:819
4432#, c-format
4433msgid "Your stash currently has %d entry"
4434msgid_plural "Your stash currently has %d entries"
4435msgstr[0] "您的贮藏区当前有 %d 条记录"
4436msgstr[1] "您的贮藏区当前有 %d 条记录"
4437
4438#: wt-status.c:851
4439msgid "Submodules changed but not updated:"
4440msgstr "子模组已修改但尚未更新:"
4441
4442#: wt-status.c:853
4443msgid "Submodule changes to be committed:"
4444msgstr "要提交的子模组变更:"
4445
4446#: wt-status.c:935
4447msgid ""
4448"Do not modify or remove the line above.\n"
4449"Everything below it will be ignored."
4450msgstr ""
4451"不要改动或删除上面的一行。\n"
4452"其下所有内容都将被忽略。"
4453
4454#: wt-status.c:1048
4455msgid "You have unmerged paths."
4456msgstr "您有尚未合并的路径。"
4457
4458#  译者:注意保持前导空格
4459#: wt-status.c:1051
4460msgid "  (fix conflicts and run \"git commit\")"
4461msgstr "  (解决冲突并运行 \"git commit\")"
4462
4463#  译者:注意保持前导空格
4464#: wt-status.c:1053
4465msgid "  (use \"git merge --abort\" to abort the merge)"
4466msgstr "  (使用 \"git merge --abort\" 终止合并)"
4467
4468#: wt-status.c:1058
4469msgid "All conflicts fixed but you are still merging."
4470msgstr "所有冲突已解决但您仍处于合并中。"
4471
4472#  译者:注意保持前导空格
4473#: wt-status.c:1061
4474msgid "  (use \"git commit\" to conclude merge)"
4475msgstr "  (使用 \"git commit\" 结束合并)"
4476
4477#: wt-status.c:1071
4478msgid "You are in the middle of an am session."
4479msgstr "您正处于 am 操作过程中。"
4480
4481#: wt-status.c:1074
4482msgid "The current patch is empty."
4483msgstr "当前的补丁为空。"
4484
4485#  译者:注意保持前导空格
4486#: wt-status.c:1078
4487msgid "  (fix conflicts and then run \"git am --continue\")"
4488msgstr "  (解决冲突,然后运行 \"git am --continue\")"
4489
4490#  译者:注意保持前导空格
4491#: wt-status.c:1080
4492msgid "  (use \"git am --skip\" to skip this patch)"
4493msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
4494
4495#  译者:注意保持前导空格
4496#: wt-status.c:1082
4497msgid "  (use \"git am --abort\" to restore the original branch)"
4498msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
4499
4500#: wt-status.c:1214
4501msgid "git-rebase-todo is missing."
4502msgstr "git-rebase-todo 丢失。"
4503
4504#: wt-status.c:1216
4505msgid "No commands done."
4506msgstr "没有命令被执行。"
4507
4508#: wt-status.c:1219
4509#, c-format
4510msgid "Last command done (%d command done):"
4511msgid_plural "Last commands done (%d commands done):"
4512msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
4513msgstr[1] "最后的命令已完成(%d 条命令被执行):"
4514
4515#: wt-status.c:1230
4516#, c-format
4517msgid "  (see more in file %s)"
4518msgstr "  (更多参见文件 %s)"
4519
4520#: wt-status.c:1235
4521msgid "No commands remaining."
4522msgstr "未剩下任何命令。"
4523
4524#: wt-status.c:1238
4525#, c-format
4526msgid "Next command to do (%d remaining command):"
4527msgid_plural "Next commands to do (%d remaining commands):"
4528msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
4529msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
4530
4531#  译者:注意保持前导空格
4532#: wt-status.c:1246
4533msgid "  (use \"git rebase --edit-todo\" to view and edit)"
4534msgstr "  (使用 \"git rebase --edit-todo\" 来查看和编辑)"
4535
4536#: wt-status.c:1259
4537#, c-format
4538msgid "You are currently rebasing branch '%s' on '%s'."
4539msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
4540
4541#: wt-status.c:1264
4542msgid "You are currently rebasing."
4543msgstr "您在执行变基操作。"
4544
4545#  译者:注意保持前导空格
4546#: wt-status.c:1278
4547msgid "  (fix conflicts and then run \"git rebase --continue\")"
4548msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
4549
4550#  译者:注意保持前导空格
4551#: wt-status.c:1280
4552msgid "  (use \"git rebase --skip\" to skip this patch)"
4553msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
4554
4555#  译者:注意保持前导空格
4556#: wt-status.c:1282
4557msgid "  (use \"git rebase --abort\" to check out the original branch)"
4558msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
4559
4560#  译者:注意保持前导空格
4561#: wt-status.c:1288
4562msgid "  (all conflicts fixed: run \"git rebase --continue\")"
4563msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
4564
4565#: wt-status.c:1292
4566#, c-format
4567msgid ""
4568"You are currently splitting a commit while rebasing branch '%s' on '%s'."
4569msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
4570
4571#: wt-status.c:1297
4572msgid "You are currently splitting a commit during a rebase."
4573msgstr "您在执行变基操作时拆分提交。"
4574
4575#  译者:注意保持前导空格
4576#: wt-status.c:1300
4577msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
4578msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
4579
4580#: wt-status.c:1304
4581#, c-format
4582msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
4583msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
4584
4585#: wt-status.c:1309
4586msgid "You are currently editing a commit during a rebase."
4587msgstr "您在执行变基操作时编辑提交。"
4588
4589#  译者:注意保持前导空格
4590#: wt-status.c:1312
4591msgid "  (use \"git commit --amend\" to amend the current commit)"
4592msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
4593
4594#  译者:注意保持前导空格
4595#: wt-status.c:1314
4596msgid ""
4597"  (use \"git rebase --continue\" once you are satisfied with your changes)"
4598msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
4599
4600#: wt-status.c:1324
4601#, c-format
4602msgid "You are currently cherry-picking commit %s."
4603msgstr "您在执行拣选提交 %s 的操作。"
4604
4605#  译者:注意保持前导空格
4606#: wt-status.c:1329
4607msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
4608msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
4609
4610#  译者:注意保持前导空格
4611#: wt-status.c:1332
4612msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
4613msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
4614
4615#  译者:注意保持前导空格
4616#: wt-status.c:1334
4617msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
4618msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
4619
4620#: wt-status.c:1343
4621#, c-format
4622msgid "You are currently reverting commit %s."
4623msgstr "您在执行反转提交 %s 的操作。"
4624
4625#  译者:注意保持前导空格
4626#: wt-status.c:1348
4627msgid "  (fix conflicts and run \"git revert --continue\")"
4628msgstr "  (解决冲突并运行 \"git revert --continue\")"
4629
4630#  译者:注意保持前导空格
4631#: wt-status.c:1351
4632msgid "  (all conflicts fixed: run \"git revert --continue\")"
4633msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
4634
4635#  译者:注意保持前导空格
4636#: wt-status.c:1353
4637msgid "  (use \"git revert --abort\" to cancel the revert operation)"
4638msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
4639
4640#: wt-status.c:1364
4641#, c-format
4642msgid "You are currently bisecting, started from branch '%s'."
4643msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
4644
4645#: wt-status.c:1368
4646msgid "You are currently bisecting."
4647msgstr "您在执行二分查找操作。"
4648
4649#  译者:注意保持前导空格
4650#: wt-status.c:1371
4651msgid "  (use \"git bisect reset\" to get back to the original branch)"
4652msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
4653
4654#: wt-status.c:1568
4655msgid "On branch "
4656msgstr "位于分支 "
4657
4658#: wt-status.c:1574
4659msgid "interactive rebase in progress; onto "
4660msgstr "交互式变基操作正在进行中;至 "
4661
4662#: wt-status.c:1576
4663msgid "rebase in progress; onto "
4664msgstr "变基操作正在进行中;至 "
4665
4666#: wt-status.c:1581
4667msgid "HEAD detached at "
4668msgstr "头指针分离于 "
4669
4670#: wt-status.c:1583
4671msgid "HEAD detached from "
4672msgstr "头指针分离自 "
4673
4674#: wt-status.c:1586
4675msgid "Not currently on any branch."
4676msgstr "当前不在任何分支上。"
4677
4678#: wt-status.c:1606
4679msgid "Initial commit"
4680msgstr "初始提交"
4681
4682#: wt-status.c:1607
4683msgid "No commits yet"
4684msgstr "尚无提交"
4685
4686#: wt-status.c:1621
4687msgid "Untracked files"
4688msgstr "未跟踪的文件"
4689
4690#: wt-status.c:1623
4691msgid "Ignored files"
4692msgstr "忽略的文件"
4693
4694#: wt-status.c:1627
4695#, c-format
4696msgid ""
4697"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
4698"may speed it up, but you have to be careful not to forget to add\n"
4699"new files yourself (see 'git help status')."
4700msgstr ""
4701"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
4702"但您需要小心不要忘了添加新文件(参见 'git help status')。"
4703
4704#: wt-status.c:1633
4705#, c-format
4706msgid "Untracked files not listed%s"
4707msgstr "未跟踪的文件没有列出%s"
4708
4709#  译者:中文字符串拼接,可删除前导空格
4710#: wt-status.c:1635
4711msgid " (use -u option to show untracked files)"
4712msgstr "(使用 -u 参数显示未跟踪的文件)"
4713
4714#: wt-status.c:1641
4715msgid "No changes"
4716msgstr "没有修改"
4717
4718#: wt-status.c:1646
4719#, c-format
4720msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
4721msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
4722
4723#: wt-status.c:1649
4724#, c-format
4725msgid "no changes added to commit\n"
4726msgstr "修改尚未加入提交\n"
4727
4728#: wt-status.c:1652
4729#, c-format
4730msgid ""
4731"nothing added to commit but untracked files present (use \"git add\" to "
4732"track)\n"
4733msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
4734
4735#: wt-status.c:1655
4736#, c-format
4737msgid "nothing added to commit but untracked files present\n"
4738msgstr "提交为空,但是存在尚未跟踪的文件\n"
4739
4740#  译者:中文字符串拼接,可删除前导空格
4741#: wt-status.c:1658
4742#, c-format
4743msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
4744msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
4745
4746#: wt-status.c:1661 wt-status.c:1666
4747#, c-format
4748msgid "nothing to commit\n"
4749msgstr "无文件要提交\n"
4750
4751#  译者:中文字符串拼接,可删除前导空格
4752#: wt-status.c:1664
4753#, c-format
4754msgid "nothing to commit (use -u to show untracked files)\n"
4755msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
4756
4757#  译者:中文字符串拼接,可删除前导空格
4758#: wt-status.c:1668
4759#, c-format
4760msgid "nothing to commit, working tree clean\n"
4761msgstr "无文件要提交,干净的工作区\n"
4762
4763#: wt-status.c:1780
4764msgid "No commits yet on "
4765msgstr "尚无提交在 "
4766
4767#: wt-status.c:1784
4768msgid "HEAD (no branch)"
4769msgstr "HEAD(非分支)"
4770
4771#  译者:注意保持句尾空格
4772#: wt-status.c:1813 wt-status.c:1821
4773msgid "behind "
4774msgstr "落后 "
4775
4776#: wt-status.c:1816 wt-status.c:1819
4777msgid "ahead "
4778msgstr "领先 "
4779
4780#. TRANSLATORS: the action is e.g. "pull with rebase"
4781#: wt-status.c:2311
4782#, c-format
4783msgid "cannot %s: You have unstaged changes."
4784msgstr "不能%s:您有未暂存的变更。"
4785
4786#: wt-status.c:2317
4787msgid "additionally, your index contains uncommitted changes."
4788msgstr "另外,您的索引中包含未提交的变更。"
4789
4790#: wt-status.c:2319
4791#, c-format
4792msgid "cannot %s: Your index contains uncommitted changes."
4793msgstr "不能%s:您的索引中包含未提交的变更。"
4794
4795#: compat/precompose_utf8.c:58 builtin/clone.c:437
4796#, c-format
4797msgid "failed to unlink '%s'"
4798msgstr "无法删除 '%s'"
4799
4800#: builtin/add.c:24
4801msgid "git add [<options>] [--] <pathspec>..."
4802msgstr "git add [<选项>] [--] <路径规格>..."
4803
4804#: builtin/add.c:82
4805#, c-format
4806msgid "unexpected diff status %c"
4807msgstr "意外的差异状态 %c"
4808
4809#: builtin/add.c:87 builtin/commit.c:291
4810msgid "updating files failed"
4811msgstr "更新文件失败"
4812
4813#: builtin/add.c:97
4814#, c-format
4815msgid "remove '%s'\n"
4816msgstr "删除 '%s'\n"
4817
4818#: builtin/add.c:153
4819msgid "Unstaged changes after refreshing the index:"
4820msgstr "刷新索引之后尚未被暂存的变更:"
4821
4822#: builtin/add.c:213 builtin/rev-parse.c:888
4823msgid "Could not read the index"
4824msgstr "不能读取索引"
4825
4826#: builtin/add.c:224
4827#, c-format
4828msgid "Could not open '%s' for writing."
4829msgstr "无法打开 '%s' 进行写入。"
4830
4831#: builtin/add.c:228
4832msgid "Could not write patch"
4833msgstr "不能生成补丁"
4834
4835#: builtin/add.c:231
4836msgid "editing patch failed"
4837msgstr "编辑补丁失败"
4838
4839#: builtin/add.c:234
4840#, c-format
4841msgid "Could not stat '%s'"
4842msgstr "不能对 '%s' 调用 stat"
4843
4844#: builtin/add.c:236
4845msgid "Empty patch. Aborted."
4846msgstr "空补丁。异常终止。"
4847
4848#: builtin/add.c:241
4849#, c-format
4850msgid "Could not apply '%s'"
4851msgstr "不能应用 '%s'"
4852
4853#: builtin/add.c:251
4854msgid "The following paths are ignored by one of your .gitignore files:\n"
4855msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
4856
4857#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
4858#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
4859#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
4860msgid "dry run"
4861msgstr "演习"
4862
4863#: builtin/add.c:274
4864msgid "interactive picking"
4865msgstr "交互式拣选"
4866
4867#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
4868msgid "select hunks interactively"
4869msgstr "交互式挑选数据块"
4870
4871#: builtin/add.c:276
4872msgid "edit current diff and apply"
4873msgstr "编辑当前差异并应用"
4874
4875#: builtin/add.c:277
4876msgid "allow adding otherwise ignored files"
4877msgstr "允许添加忽略的文件"
4878
4879#: builtin/add.c:278
4880msgid "update tracked files"
4881msgstr "更新已跟踪的文件"
4882
4883#: builtin/add.c:279
4884msgid "record only the fact that the path will be added later"
4885msgstr "只记录,该路径稍后再添加"
4886
4887#: builtin/add.c:280
4888msgid "add changes from all tracked and untracked files"
4889msgstr "添加所有改变的已跟踪文件和未跟踪文件"
4890
4891#: builtin/add.c:283
4892msgid "ignore paths removed in the working tree (same as --no-all)"
4893msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
4894
4895#: builtin/add.c:285
4896msgid "don't add, only refresh the index"
4897msgstr "不添加,只刷新索引"
4898
4899#: builtin/add.c:286
4900msgid "just skip files which cannot be added because of errors"
4901msgstr "跳过因出错不能添加的文件"
4902
4903#: builtin/add.c:287
4904msgid "check if - even missing - files are ignored in dry run"
4905msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
4906
4907#: builtin/add.c:288 builtin/update-index.c:954
4908msgid "(+/-)x"
4909msgstr "(+/-)x"
4910
4911#: builtin/add.c:288 builtin/update-index.c:955
4912msgid "override the executable bit of the listed files"
4913msgstr "覆盖列表里文件的可执行位"
4914
4915#: builtin/add.c:290
4916msgid "warn when adding an embedded repository"
4917msgstr "创建一个嵌入式仓库时给予警告"
4918
4919#: builtin/add.c:305
4920#, c-format
4921msgid ""
4922"You've added another git repository inside your current repository.\n"
4923"Clones of the outer repository will not contain the contents of\n"
4924"the embedded repository and will not know how to obtain it.\n"
4925"If you meant to add a submodule, use:\n"
4926"\n"
4927"\tgit submodule add <url> %s\n"
4928"\n"
4929"If you added this path by mistake, you can remove it from the\n"
4930"index with:\n"
4931"\n"
4932"\tgit rm --cached %s\n"
4933"\n"
4934"See \"git help submodule\" for more information."
4935msgstr ""
4936"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并"
4937"且不知道该如何获取它。\n"
4938"如果您要添加一个子模组,使用:\n"
4939"\n"
4940"\tgit submodule add <url> %s\n"
4941"\n"
4942"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
4943"\n"
4944"\tgit rm --cached %s\n"
4945"\n"
4946"参见 \"git help submodule\" 获取更多信息。"
4947
4948#: builtin/add.c:333
4949#, c-format
4950msgid "adding embedded git repository: %s"
4951msgstr "正在添加嵌入式 git 仓库:%s"
4952
4953#: builtin/add.c:351
4954#, c-format
4955msgid "Use -f if you really want to add them.\n"
4956msgstr "使用 -f 参数如果您确实要添加它们。\n"
4957
4958#: builtin/add.c:359
4959msgid "adding files failed"
4960msgstr "添加文件失败"
4961
4962#: builtin/add.c:396
4963msgid "-A and -u are mutually incompatible"
4964msgstr "-A 和 -u 选项互斥"
4965
4966#: builtin/add.c:403
4967msgid "Option --ignore-missing can only be used together with --dry-run"
4968msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
4969
4970#: builtin/add.c:407
4971#, c-format
4972msgid "--chmod param '%s' must be either -x or +x"
4973msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
4974
4975#: builtin/add.c:422
4976#, c-format
4977msgid "Nothing specified, nothing added.\n"
4978msgstr "没有指定文件,也没有文件被添加。\n"
4979
4980#: builtin/add.c:423
4981#, c-format
4982msgid "Maybe you wanted to say 'git add .'?\n"
4983msgstr "也许您想要执行 'git add .'?\n"
4984
4985#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
4986#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
4987#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
4988#: builtin/submodule--helper.c:243
4989msgid "index file corrupt"
4990msgstr "索引文件损坏"
4991
4992#: builtin/am.c:414
4993msgid "could not parse author script"
4994msgstr "不能解析作者脚本"
4995
4996#: builtin/am.c:498
4997#, c-format
4998msgid "'%s' was deleted by the applypatch-msg hook"
4999msgstr "'%s' 被 applypatch-msg 钩子删除"
5000
5001#: builtin/am.c:539
5002#, c-format
5003msgid "Malformed input line: '%s'."
5004msgstr "非法的输入行:'%s'。"
5005
5006#: builtin/am.c:576
5007#, c-format
5008msgid "Failed to copy notes from '%s' to '%s'"
5009msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
5010
5011#: builtin/am.c:602
5012msgid "fseek failed"
5013msgstr "fseek 失败"
5014
5015#: builtin/am.c:786
5016#, c-format
5017msgid "could not parse patch '%s'"
5018msgstr "无法解析补丁 '%s'"
5019
5020#: builtin/am.c:851
5021msgid "Only one StGIT patch series can be applied at once"
5022msgstr "一次只能有一个 StGIT 补丁队列被应用"
5023
5024#: builtin/am.c:899
5025msgid "invalid timestamp"
5026msgstr "无效的时间戳"
5027
5028#: builtin/am.c:904 builtin/am.c:916
5029msgid "invalid Date line"
5030msgstr "无效的日期行"
5031
5032#: builtin/am.c:911
5033msgid "invalid timezone offset"
5034msgstr "无效的时区偏移值"
5035
5036#: builtin/am.c:1004
5037msgid "Patch format detection failed."
5038msgstr "补丁格式探测失败。"
5039
5040#: builtin/am.c:1009 builtin/clone.c:402
5041#, c-format
5042msgid "failed to create directory '%s'"
5043msgstr "无法创建目录 '%s'"
5044
5045#: builtin/am.c:1013
5046msgid "Failed to split patches."
5047msgstr "无法拆分补丁。"
5048
5049#: builtin/am.c:1142 builtin/commit.c:376
5050msgid "unable to write index file"
5051msgstr "无法写入索引文件"
5052
5053#: builtin/am.c:1193
5054#, c-format
5055msgid "When you have resolved this problem, run \"%s --continue\"."
5056msgstr "当您解决这一问题,执行 \"%s --continue\"。"
5057
5058#: builtin/am.c:1194
5059#, c-format
5060msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
5061msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
5062
5063#: builtin/am.c:1195
5064#, c-format
5065msgid "To restore the original branch and stop patching, run \"%s --abort\"."
5066msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
5067
5068#: builtin/am.c:1302
5069msgid "Patch is empty."
5070msgstr "补丁为空。"
5071
5072#: builtin/am.c:1368
5073#, c-format
5074msgid "invalid ident line: %.*s"
5075msgstr "无效的身份标识:%.*s"
5076
5077#: builtin/am.c:1390
5078#, c-format
5079msgid "unable to parse commit %s"
5080msgstr "不能解析提交 %s"
5081
5082#: builtin/am.c:1584
5083msgid "Repository lacks necessary blobs to fall back on 3-way merge."
5084msgstr "仓库缺乏必要的数据对象以进行三方合并。"
5085
5086#: builtin/am.c:1586
5087msgid "Using index info to reconstruct a base tree..."
5088msgstr "使用索引来重建一个(三方合并的)基础目录树..."
5089
5090#: builtin/am.c:1605
5091msgid ""
5092"Did you hand edit your patch?\n"
5093"It does not apply to blobs recorded in its index."
5094msgstr ""
5095"您是否曾手动编辑过您的补丁?\n"
5096"无法应用补丁到索引中的数据对象上。"
5097
5098#: builtin/am.c:1611
5099msgid "Falling back to patching base and 3-way merge..."
5100msgstr "回落到基础版本上打补丁及进行三方合并..."
5101
5102#: builtin/am.c:1636
5103msgid "Failed to merge in the changes."
5104msgstr "无法合并变更。"
5105
5106#: builtin/am.c:1660 builtin/merge.c:641
5107msgid "git write-tree failed to write a tree"
5108msgstr "git write-tree 无法写入一树对象"
5109
5110#: builtin/am.c:1667
5111msgid "applying to an empty history"
5112msgstr "正应用到一个空历史上"
5113
5114#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
5115#: builtin/merge.c:849
5116msgid "failed to write commit object"
5117msgstr "无法写提交对象"
5118
5119#: builtin/am.c:1713 builtin/am.c:1717
5120#, c-format
5121msgid "cannot resume: %s does not exist."
5122msgstr "无法继续:%s 不存在。"
5123
5124#: builtin/am.c:1733
5125msgid "cannot be interactive without stdin connected to a terminal."
5126msgstr "标准输入没有和终端关联,不能进行交互式操作。"
5127
5128#: builtin/am.c:1738
5129msgid "Commit Body is:"
5130msgstr "提交内容为:"
5131
5132#  译者:注意保持句尾空格
5133#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5134#. in your translation. The program will only accept English
5135#. input at this point.
5136#.
5137#: builtin/am.c:1748
5138msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5139msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
5140
5141#: builtin/am.c:1798
5142#, c-format
5143msgid "Dirty index: cannot apply patches (dirty: %s)"
5144msgstr "脏索引:不能应用补丁(脏文件:%s)"
5145
5146#: builtin/am.c:1838 builtin/am.c:1910
5147#, c-format
5148msgid "Applying: %.*s"
5149msgstr "应用:%.*s"
5150
5151#: builtin/am.c:1854
5152msgid "No changes -- Patch already applied."
5153msgstr "没有变更 —— 补丁已经应用过。"
5154
5155#: builtin/am.c:1862
5156#, c-format
5157msgid "Patch failed at %s %.*s"
5158msgstr "打补丁失败于 %s %.*s"
5159
5160#: builtin/am.c:1868
5161#, c-format
5162msgid "The copy of the patch that failed is found in: %s"
5163msgstr "失败的补丁文件副本位于:%s"
5164
5165#: builtin/am.c:1913
5166msgid ""
5167"No changes - did you forget to use 'git add'?\n"
5168"If there is nothing left to stage, chances are that something else\n"
5169"already introduced the same changes; you might want to skip this patch."
5170msgstr ""
5171"没有变更 —— 您是不是忘了执行 'git add'?\n"
5172"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5173"您也许想要跳过这个补丁。"
5174
5175#: builtin/am.c:1920
5176msgid ""
5177"You still have unmerged paths in your index.\n"
5178"You should 'git add' each file with resolved conflicts to mark them as "
5179"such.\n"
5180"You might run `git rm` on a file to accept \"deleted by them\" for it."
5181msgstr ""
5182"在您的索引中仍存在未合并的路径。\n"
5183"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
5184"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
5185
5186#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
5187#: builtin/reset.c:340
5188#, c-format
5189msgid "Could not parse object '%s'."
5190msgstr "不能解析对象 '%s'。"
5191
5192#: builtin/am.c:2081
5193msgid "failed to clean index"
5194msgstr "无法清空索引"
5195
5196#: builtin/am.c:2116
5197msgid ""
5198"You seem to have moved HEAD since the last 'am' failure.\n"
5199"Not rewinding to ORIG_HEAD"
5200msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
5201
5202#: builtin/am.c:2179
5203#, c-format
5204msgid "Invalid value for --patch-format: %s"
5205msgstr "无效的 --patch-format 值:%s"
5206
5207#: builtin/am.c:2212
5208msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
5209msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5210
5211#: builtin/am.c:2213
5212msgid "git am [<options>] (--continue | --skip | --abort)"
5213msgstr "git am [<选项>] (--continue | --skip | --abort)"
5214
5215#: builtin/am.c:2219
5216msgid "run interactively"
5217msgstr "以交互式方式运行"
5218
5219#: builtin/am.c:2221
5220msgid "historical option -- no-op"
5221msgstr "老的参数 —— 无作用"
5222
5223#: builtin/am.c:2223
5224msgid "allow fall back on 3way merging if needed"
5225msgstr "如果必要,允许使用三方合并。"
5226
5227#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
5228#: builtin/repack.c:180
5229msgid "be quiet"
5230msgstr "静默模式"
5231
5232#: builtin/am.c:2226
5233msgid "add a Signed-off-by line to the commit message"
5234msgstr "在提交说明中添加一个 Signed-off-by 签名"
5235
5236#: builtin/am.c:2229
5237msgid "recode into utf8 (default)"
5238msgstr "使用 utf8 字符集(默认)"
5239
5240#: builtin/am.c:2231
5241msgid "pass -k flag to git-mailinfo"
5242msgstr "向 git-mailinfo 传递 -k 参数"
5243
5244#: builtin/am.c:2233
5245msgid "pass -b flag to git-mailinfo"
5246msgstr "向 git-mailinfo 传递 -b 参数"
5247
5248#: builtin/am.c:2235
5249msgid "pass -m flag to git-mailinfo"
5250msgstr "向 git-mailinfo 传递 -m 参数"
5251
5252#: builtin/am.c:2237
5253msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5254msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5255
5256#: builtin/am.c:2240
5257msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5258msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
5259
5260#: builtin/am.c:2243
5261msgid "strip everything before a scissors line"
5262msgstr "丢弃裁切线前的所有内容"
5263
5264#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
5265#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
5266#: builtin/am.c:2272
5267msgid "pass it through git-apply"
5268msgstr "传递给 git-apply"
5269
5270#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
5271#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
5272#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
5273#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
5274#: parse-options.h:132 parse-options.h:134 parse-options.h:245
5275msgid "n"
5276msgstr "n"
5277
5278#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
5279#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
5280msgid "format"
5281msgstr "格式"
5282
5283#: builtin/am.c:2269
5284msgid "format the patch(es) are in"
5285msgstr "补丁的格式"
5286
5287#: builtin/am.c:2275
5288msgid "override error message when patch failure occurs"
5289msgstr "打补丁失败时显示的错误信息"
5290
5291#: builtin/am.c:2277
5292msgid "continue applying patches after resolving a conflict"
5293msgstr "冲突解决后继续应用补丁"
5294
5295#: builtin/am.c:2280
5296msgid "synonyms for --continue"
5297msgstr "和 --continue 同义"
5298
5299#: builtin/am.c:2283
5300msgid "skip the current patch"
5301msgstr "跳过当前补丁"
5302
5303#: builtin/am.c:2286
5304msgid "restore the original branch and abort the patching operation."
5305msgstr "恢复原始分支并终止打补丁操作。"
5306
5307#: builtin/am.c:2290
5308msgid "lie about committer date"
5309msgstr "将作者日期作为提交日期"
5310
5311#: builtin/am.c:2292
5312msgid "use current timestamp for author date"
5313msgstr "用当前时间作为作者日期"
5314
5315#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
5316#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
5317msgid "key-id"
5318msgstr "key-id"
5319
5320#: builtin/am.c:2295
5321msgid "GPG-sign commits"
5322msgstr "使用 GPG 签名提交"
5323
5324#: builtin/am.c:2298
5325msgid "(internal use for git-rebase)"
5326msgstr "(内部使用,用于 git-rebase)"
5327
5328#: builtin/am.c:2316
5329msgid ""
5330"The -b/--binary option has been a no-op for long time, and\n"
5331"it will be removed. Please do not use it anymore."
5332msgstr ""
5333"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5334"请不要再使用它了。"
5335
5336#: builtin/am.c:2323
5337msgid "failed to read the index"
5338msgstr "无法读取索引"
5339
5340#: builtin/am.c:2338
5341#, c-format
5342msgid "previous rebase directory %s still exists but mbox given."
5343msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
5344
5345#: builtin/am.c:2362
5346#, c-format
5347msgid ""
5348"Stray %s directory found.\n"
5349"Use \"git am --abort\" to remove it."
5350msgstr ""
5351"发现了错误的 %s 目录。\n"
5352"使用 \"git am --abort\" 删除它。"
5353
5354#: builtin/am.c:2368
5355msgid "Resolve operation not in progress, we are not resuming."
5356msgstr "解决操作未进行,我们不会继续。"
5357
5358#: builtin/apply.c:8
5359msgid "git apply [<options>] [<patch>...]"
5360msgstr "git apply [<选项>] [<补丁>...]"
5361
5362#: builtin/archive.c:17
5363#, c-format
5364msgid "could not create archive file '%s'"
5365msgstr "不能创建归档文件 '%s'"
5366
5367#: builtin/archive.c:20
5368msgid "could not redirect output"
5369msgstr "不能重定向输出"
5370
5371#: builtin/archive.c:37
5372msgid "git archive: Remote with no URL"
5373msgstr "git archive:未提供远程 URL"
5374
5375#: builtin/archive.c:58
5376msgid "git archive: expected ACK/NAK, got EOF"
5377msgstr "git archive:应为 ACK/NACK,却得到 EOF"
5378
5379#: builtin/archive.c:61
5380#, c-format
5381msgid "git archive: NACK %s"
5382msgstr "git archive:NACK %s"
5383
5384#: builtin/archive.c:64
5385msgid "git archive: protocol error"
5386msgstr "git archive:协议错误"
5387
5388#: builtin/archive.c:68
5389msgid "git archive: expected a flush"
5390msgstr "git archive:应有一个 flush 刷新"
5391
5392#: builtin/bisect--helper.c:7
5393msgid "git bisect--helper --next-all [--no-checkout]"
5394msgstr "git bisect--helper --next-all [--no-checkout]"
5395
5396#: builtin/bisect--helper.c:17
5397msgid "perform 'git bisect next'"
5398msgstr "执行 'git bisect next'"
5399
5400#: builtin/bisect--helper.c:19
5401msgid "update BISECT_HEAD instead of checking out the current commit"
5402msgstr "更新 BISECT_HEAD 而非检出当前提交"
5403
5404#: builtin/blame.c:27
5405msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
5406msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
5407
5408#: builtin/blame.c:32
5409msgid "<rev-opts> are documented in git-rev-list(1)"
5410msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
5411
5412#: builtin/blame.c:668
5413msgid "Show blame entries as we find them, incrementally"
5414msgstr "增量式地显示发现的 blame 条目"
5415
5416#: builtin/blame.c:669
5417msgid "Show blank SHA-1 for boundary commits (Default: off)"
5418msgstr "边界提交显示空的 SHA-1(默认:关闭)"
5419
5420#: builtin/blame.c:670
5421msgid "Do not treat root commits as boundaries (Default: off)"
5422msgstr "不把根提交作为边界(默认:关闭)"
5423
5424#: builtin/blame.c:671
5425msgid "Show work cost statistics"
5426msgstr "显示命令消耗统计"
5427
5428#: builtin/blame.c:672
5429msgid "Force progress reporting"
5430msgstr "强制进度显示"
5431
5432#: builtin/blame.c:673
5433msgid "Show output score for blame entries"
5434msgstr "显示判断 blame 条目位移的得分诊断信息"
5435
5436#: builtin/blame.c:674
5437msgid "Show original filename (Default: auto)"
5438msgstr "显示原始文件名(默认:自动)"
5439
5440#: builtin/blame.c:675
5441msgid "Show original linenumber (Default: off)"
5442msgstr "显示原始的行号(默认:关闭)"
5443
5444#: builtin/blame.c:676
5445msgid "Show in a format designed for machine consumption"
5446msgstr "显示为一个适合机器读取的格式"
5447
5448#: builtin/blame.c:677
5449msgid "Show porcelain format with per-line commit information"
5450msgstr "为每一行显示机器适用的提交信息"
5451
5452#: builtin/blame.c:678
5453msgid "Use the same output mode as git-annotate (Default: off)"
5454msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
5455
5456#: builtin/blame.c:679
5457msgid "Show raw timestamp (Default: off)"
5458msgstr "显示原始时间戳(默认:关闭)"
5459
5460#: builtin/blame.c:680
5461msgid "Show long commit SHA1 (Default: off)"
5462msgstr "显示长的 SHA1 提交号(默认:关闭)"
5463
5464#: builtin/blame.c:681
5465msgid "Suppress author name and timestamp (Default: off)"
5466msgstr "隐藏作者名字和时间戳(默认:关闭)"
5467
5468#: builtin/blame.c:682
5469msgid "Show author email instead of name (Default: off)"
5470msgstr "显示作者的邮箱而不是名字(默认:关闭)"
5471
5472#: builtin/blame.c:683
5473msgid "Ignore whitespace differences"
5474msgstr "忽略空白差异"
5475
5476#: builtin/blame.c:690
5477msgid "Use an experimental heuristic to improve diffs"
5478msgstr "使用一个试验性的启发式算法改进差异显示"
5479
5480#: builtin/blame.c:692
5481msgid "Spend extra cycles to find better match"
5482msgstr "花费额外的循环来找到更好的匹配"
5483
5484#: builtin/blame.c:693
5485msgid "Use revisions from <file> instead of calling git-rev-list"
5486msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
5487
5488#: builtin/blame.c:694
5489msgid "Use <file>'s contents as the final image"
5490msgstr "使用 <文件> 的内容作为最终的图片"
5491
5492#: builtin/blame.c:695 builtin/blame.c:696
5493msgid "score"
5494msgstr "得分"
5495
5496#: builtin/blame.c:695
5497msgid "Find line copies within and across files"
5498msgstr "找到文件内及跨文件的行拷贝"
5499
5500#: builtin/blame.c:696
5501msgid "Find line movements within and across files"
5502msgstr "找到文件内及跨文件的行移动"
5503
5504#: builtin/blame.c:697
5505msgid "n,m"
5506msgstr "n,m"
5507
5508#: builtin/blame.c:697
5509msgid "Process only line range n,m, counting from 1"
5510msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
5511
5512#: builtin/blame.c:744
5513msgid "--progress can't be used with --incremental or porcelain formats"
5514msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
5515
5516#. TRANSLATORS: This string is used to tell us the
5517#. maximum display width for a relative timestamp in
5518#. "git blame" output.  For C locale, "4 years, 11
5519#. months ago", which takes 22 places, is the longest
5520#. among various forms of relative timestamps, but
5521#. your language may need more or fewer display
5522#. columns.
5523#.
5524#: builtin/blame.c:795
5525msgid "4 years, 11 months ago"
5526msgstr "4 年 11 个月前"
5527
5528#: builtin/blame.c:882
5529#, c-format
5530msgid "file %s has only %lu line"
5531msgid_plural "file %s has only %lu lines"
5532msgstr[0] "文件 %s 只有 %lu 行"
5533msgstr[1] "文件 %s 只有 %lu 行"
5534
5535#: builtin/blame.c:928
5536msgid "Blaming lines"
5537msgstr "追踪代码行"
5538
5539#: builtin/branch.c:27
5540msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
5541msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
5542
5543#: builtin/branch.c:28
5544msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
5545msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
5546
5547#: builtin/branch.c:29
5548msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
5549msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
5550
5551#: builtin/branch.c:30
5552msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
5553msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
5554
5555#: builtin/branch.c:31
5556msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
5557msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
5558
5559#: builtin/branch.c:32
5560msgid "git branch [<options>] [-r | -a] [--points-at]"
5561msgstr "git branch [<选项>] [-r | -a] [--points-at]"
5562
5563#: builtin/branch.c:33
5564msgid "git branch [<options>] [-r | -a] [--format]"
5565msgstr "git branch [<选项>] [-r | -a] [--format]"
5566
5567#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5568#: builtin/branch.c:146
5569#, c-format
5570msgid ""
5571"deleting branch '%s' that has been merged to\n"
5572"         '%s', but not yet merged to HEAD."
5573msgstr ""
5574"将要删除的分支 '%s' 已经被合并到\n"
5575"         '%s',但未合并到 HEAD。"
5576
5577#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5578#: builtin/branch.c:150
5579#, c-format
5580msgid ""
5581"not deleting branch '%s' that is not yet merged to\n"
5582"         '%s', even though it is merged to HEAD."
5583msgstr ""
5584"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
5585"         然而却尚未被合并到分支 '%s' 。"
5586
5587#: builtin/branch.c:164
5588#, c-format
5589msgid "Couldn't look up commit object for '%s'"
5590msgstr "无法查询 '%s' 指向的提交对象"
5591
5592#: builtin/branch.c:168
5593#, c-format
5594msgid ""
5595"The branch '%s' is not fully merged.\n"
5596"If you are sure you want to delete it, run 'git branch -D %s'."
5597msgstr ""
5598"分支 '%s' 没有完全合并。\n"
5599"如果您确认要删除它,执行 'git branch -D %s'。"
5600
5601#: builtin/branch.c:181
5602msgid "Update of config-file failed"
5603msgstr "更新配置文件失败"
5604
5605#: builtin/branch.c:212
5606msgid "cannot use -a with -d"
5607msgstr "不能将 -a 和 -d 同时使用"
5608
5609#: builtin/branch.c:218
5610msgid "Couldn't look up commit object for HEAD"
5611msgstr "无法查询 HEAD 指向的提交对象"
5612
5613#: builtin/branch.c:232
5614#, c-format
5615msgid "Cannot delete branch '%s' checked out at '%s'"
5616msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
5617
5618#: builtin/branch.c:247
5619#, c-format
5620msgid "remote-tracking branch '%s' not found."
5621msgstr "未能找到远程跟踪分支 '%s'。"
5622
5623#: builtin/branch.c:248
5624#, c-format
5625msgid "branch '%s' not found."
5626msgstr "分支 '%s' 未发现。"
5627
5628#: builtin/branch.c:263
5629#, c-format
5630msgid "Error deleting remote-tracking branch '%s'"
5631msgstr "无法删除远程跟踪分支 '%s'"
5632
5633#: builtin/branch.c:264
5634#, c-format
5635msgid "Error deleting branch '%s'"
5636msgstr "无法删除分支 '%s'"
5637
5638#: builtin/branch.c:271
5639#, c-format
5640msgid "Deleted remote-tracking branch %s (was %s).\n"
5641msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
5642
5643#: builtin/branch.c:272
5644#, c-format
5645msgid "Deleted branch %s (was %s).\n"
5646msgstr "已删除分支 %s(曾为 %s)。\n"
5647
5648#: builtin/branch.c:417 builtin/tag.c:58
5649msgid "unable to parse format string"
5650msgstr "不能解析格式化字符串"
5651
5652#: builtin/branch.c:450
5653#, c-format
5654msgid "Branch %s is being rebased at %s"
5655msgstr "分支 %s 正被变基到 %s"
5656
5657#: builtin/branch.c:454
5658#, c-format
5659msgid "Branch %s is being bisected at %s"
5660msgstr "分支 %s 正被二分查找于 %s"
5661
5662#: builtin/branch.c:470
5663msgid "cannot copy the current branch while not on any."
5664msgstr "无法拷贝当前分支因为不处于任何分支上。"
5665
5666#: builtin/branch.c:472
5667msgid "cannot rename the current branch while not on any."
5668msgstr "无法重命名当前分支因为不处于任何分支上。"
5669
5670#: builtin/branch.c:483
5671#, c-format
5672msgid "Invalid branch name: '%s'"
5673msgstr "无效的分支名:'%s'"
5674
5675#: builtin/branch.c:504
5676msgid "Branch rename failed"
5677msgstr "分支重命名失败"
5678
5679#: builtin/branch.c:506
5680msgid "Branch copy failed"
5681msgstr "分支拷贝失败"
5682
5683#: builtin/branch.c:510
5684#, c-format
5685msgid "Copied a misnamed branch '%s' away"
5686msgstr "已将错误命名的分支 '%s' 复制"
5687
5688#: builtin/branch.c:513
5689#, c-format
5690msgid "Renamed a misnamed branch '%s' away"
5691msgstr "已将错误命名的分支 '%s' 重命名"
5692
5693#: builtin/branch.c:519
5694#, c-format
5695msgid "Branch renamed to %s, but HEAD is not updated!"
5696msgstr "分支重命名为 %s,但 HEAD 没有更新!"
5697
5698#: builtin/branch.c:528
5699msgid "Branch is renamed, but update of config-file failed"
5700msgstr "分支被重命名,但更新配置文件失败"
5701
5702#: builtin/branch.c:530
5703msgid "Branch is copied, but update of config-file failed"
5704msgstr "分支已拷贝,但更新配置文件失败"
5705
5706#: builtin/branch.c:546
5707#, c-format
5708msgid ""
5709"Please edit the description for the branch\n"
5710"  %s\n"
5711"Lines starting with '%c' will be stripped.\n"
5712msgstr ""
5713"请编辑分支的描述\n"
5714"  %s\n"
5715"以 '%c' 开头的行将被过滤。\n"
5716
5717#: builtin/branch.c:579
5718msgid "Generic options"
5719msgstr "通用选项"
5720
5721#: builtin/branch.c:581
5722msgid "show hash and subject, give twice for upstream branch"
5723msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
5724
5725#: builtin/branch.c:582
5726msgid "suppress informational messages"
5727msgstr "不显示信息"
5728
5729#: builtin/branch.c:583
5730msgid "set up tracking mode (see git-pull(1))"
5731msgstr "设置跟踪模式(参见 git-pull(1))"
5732
5733#: builtin/branch.c:585
5734msgid "do not use"
5735msgstr "不要使用"
5736
5737#: builtin/branch.c:587
5738msgid "upstream"
5739msgstr "上游"
5740
5741#: builtin/branch.c:587
5742msgid "change the upstream info"
5743msgstr "改变上游信息"
5744
5745#: builtin/branch.c:588
5746msgid "Unset the upstream info"
5747msgstr "取消上游信息的设置"
5748
5749#: builtin/branch.c:589
5750msgid "use colored output"
5751msgstr "使用彩色输出"
5752
5753#: builtin/branch.c:590
5754msgid "act on remote-tracking branches"
5755msgstr "作用于远程跟踪分支"
5756
5757#: builtin/branch.c:592 builtin/branch.c:594
5758msgid "print only branches that contain the commit"
5759msgstr "只打印包含该提交的分支"
5760
5761#: builtin/branch.c:593 builtin/branch.c:595
5762msgid "print only branches that don't contain the commit"
5763msgstr "只打印不包含该提交的分支"
5764
5765#: builtin/branch.c:598
5766msgid "Specific git-branch actions:"
5767msgstr "具体的 git-branch 动作:"
5768
5769#: builtin/branch.c:599
5770msgid "list both remote-tracking and local branches"
5771msgstr "列出远程跟踪及本地分支"
5772
5773#: builtin/branch.c:601
5774msgid "delete fully merged branch"
5775msgstr "删除完全合并的分支"
5776
5777#: builtin/branch.c:602
5778msgid "delete branch (even if not merged)"
5779msgstr "删除分支(即使没有合并)"
5780
5781#: builtin/branch.c:603
5782msgid "move/rename a branch and its reflog"
5783msgstr "移动/重命名一个分支,以及它的引用日志"
5784
5785#: builtin/branch.c:604
5786msgid "move/rename a branch, even if target exists"
5787msgstr "移动/重命名一个分支,即使目标已存在"
5788
5789#: builtin/branch.c:605
5790msgid "copy a branch and its reflog"
5791msgstr "拷贝一个分支和它的引用日志"
5792
5793#: builtin/branch.c:606
5794msgid "copy a branch, even if target exists"
5795msgstr "拷贝一个分支,即使目标已存在"
5796
5797#: builtin/branch.c:607
5798msgid "list branch names"
5799msgstr "列出分支名"
5800
5801#: builtin/branch.c:608
5802msgid "create the branch's reflog"
5803msgstr "创建分支的引用日志"
5804
5805#: builtin/branch.c:610
5806msgid "edit the description for the branch"
5807msgstr "标记分支的描述"
5808
5809#: builtin/branch.c:611
5810msgid "force creation, move/rename, deletion"
5811msgstr "强制创建、移动/重命名、删除"
5812
5813#: builtin/branch.c:612
5814msgid "print only branches that are merged"
5815msgstr "只打印已经合并的分支"
5816
5817#: builtin/branch.c:613
5818msgid "print only branches that are not merged"
5819msgstr "只打印尚未合并的分支"
5820
5821#: builtin/branch.c:614
5822msgid "list branches in columns"
5823msgstr "以列的方式显示分支"
5824
5825#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
5826msgid "key"
5827msgstr "key"
5828
5829#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
5830msgid "field name to sort on"
5831msgstr "排序的字段名"
5832
5833#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
5834#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
5835#: builtin/tag.c:408
5836msgid "object"
5837msgstr "对象"
5838
5839#: builtin/branch.c:619
5840msgid "print only branches of the object"
5841msgstr "只打印指向该对象的分支"
5842
5843#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
5844msgid "sorting and filtering are case insensitive"
5845msgstr "排序和过滤属于大小写不敏感"
5846
5847#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
5848#: builtin/verify-tag.c:39
5849msgid "format to use for the output"
5850msgstr "输出格式"
5851
5852#: builtin/branch.c:645 builtin/clone.c:729
5853msgid "HEAD not found below refs/heads!"
5854msgstr "HEAD 没有位于 /refs/heads 之下!"
5855
5856#: builtin/branch.c:668
5857msgid "--column and --verbose are incompatible"
5858msgstr "--column 和 --verbose 不兼容"
5859
5860#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
5861msgid "branch name required"
5862msgstr "必须提供分支名"
5863
5864#: builtin/branch.c:708
5865msgid "Cannot give description to detached HEAD"
5866msgstr "不能向分离头指针提供描述"
5867
5868#: builtin/branch.c:713
5869msgid "cannot edit description of more than one branch"
5870msgstr "不能为一个以上的分支编辑描述"
5871
5872#: builtin/branch.c:720
5873#, c-format
5874msgid "No commit on branch '%s' yet."
5875msgstr "分支 '%s' 尚无提交。"
5876
5877#: builtin/branch.c:723
5878#, c-format
5879msgid "No branch named '%s'."
5880msgstr "没有分支 '%s'。"
5881
5882#: builtin/branch.c:738
5883msgid "too many branches for a copy operation"
5884msgstr "为拷贝操作提供了太多的分支名"
5885
5886#: builtin/branch.c:747
5887msgid "too many arguments for a rename operation"
5888msgstr "为重命名操作提供了太多的参数"
5889
5890#: builtin/branch.c:752
5891msgid "too many arguments to set new upstream"
5892msgstr "为设置新上游提供了太多的参数"
5893
5894#: builtin/branch.c:756
5895#, c-format
5896msgid ""
5897"could not set upstream of HEAD to %s when it does not point to any branch."
5898msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5899
5900#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
5901#, c-format
5902msgid "no such branch '%s'"
5903msgstr "没有此分支 '%s'"
5904
5905#: builtin/branch.c:763
5906#, c-format
5907msgid "branch '%s' does not exist"
5908msgstr "分支 '%s' 不存在"
5909
5910#: builtin/branch.c:775
5911msgid "too many arguments to unset upstream"
5912msgstr "为取消上游设置操作提供了太多的参数"
5913
5914#: builtin/branch.c:779
5915msgid "could not unset upstream of HEAD when it does not point to any branch."
5916msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5917
5918#: builtin/branch.c:785
5919#, c-format
5920msgid "Branch '%s' has no upstream information"
5921msgstr "分支 '%s' 没有上游信息"
5922
5923#: builtin/branch.c:797
5924msgid "it does not make sense to create 'HEAD' manually"
5925msgstr "手工创建 'HEAD' 没有意义"
5926
5927#: builtin/branch.c:803
5928msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5929msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5930
5931#: builtin/branch.c:806
5932msgid ""
5933"the '--set-upstream' option is no longer supported. Please use '--track' or "
5934"'--set-upstream-to' instead."
5935msgstr ""
5936"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
5937
5938#: builtin/bundle.c:45
5939#, c-format
5940msgid "%s is okay\n"
5941msgstr "%s 可以\n"
5942
5943#: builtin/bundle.c:58
5944msgid "Need a repository to create a bundle."
5945msgstr "需要一个仓库来创建包。"
5946
5947#: builtin/bundle.c:62
5948msgid "Need a repository to unbundle."
5949msgstr "需要一个仓库来解包。"
5950
5951#: builtin/cat-file.c:521
5952msgid ""
5953"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5954"p | <type> | --textconv | --filters) [--path=<path>] <object>"
5955msgstr ""
5956"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5957"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5958
5959#: builtin/cat-file.c:522
5960msgid ""
5961"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5962"filters]"
5963msgstr ""
5964"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5965"filters]"
5966
5967#: builtin/cat-file.c:559
5968msgid "<type> can be one of: blob, tree, commit, tag"
5969msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
5970
5971#: builtin/cat-file.c:560
5972msgid "show object type"
5973msgstr "显示对象类型"
5974
5975#: builtin/cat-file.c:561
5976msgid "show object size"
5977msgstr "显示对象大小"
5978
5979#: builtin/cat-file.c:563
5980msgid "exit with zero when there's no error"
5981msgstr "当没有错误时退出并返回零"
5982
5983#: builtin/cat-file.c:564
5984msgid "pretty-print object's content"
5985msgstr "美观地打印对象的内容"
5986
5987#: builtin/cat-file.c:566
5988msgid "for blob objects, run textconv on object's content"
5989msgstr "对于数据对象,对其内容做文本转换"
5990
5991#: builtin/cat-file.c:568
5992msgid "for blob objects, run filters on object's content"
5993msgstr "对于数据对象,对其内容做过滤"
5994
5995#: builtin/cat-file.c:569 git-submodule.sh:943
5996msgid "blob"
5997msgstr "数据对象"
5998
5999#: builtin/cat-file.c:570
6000msgid "use a specific path for --textconv/--filters"
6001msgstr "对于 --textconv/--filters 使用一个特定的路径"
6002
6003#: builtin/cat-file.c:572
6004msgid "allow -s and -t to work with broken/corrupt objects"
6005msgstr "允许 -s 和 -t 对损坏的对象生效"
6006
6007#: builtin/cat-file.c:573
6008msgid "buffer --batch output"
6009msgstr "缓冲 --batch 的输出"
6010
6011#: builtin/cat-file.c:575
6012msgid "show info and content of objects fed from the standard input"
6013msgstr "显示从标准输入提供的对象的信息和内容"
6014
6015#: builtin/cat-file.c:578
6016msgid "show info about objects fed from the standard input"
6017msgstr "显示从标准输入提供的对象的信息"
6018
6019#: builtin/cat-file.c:581
6020msgid "follow in-tree symlinks (used with --batch or --batch-check)"
6021msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
6022
6023#: builtin/cat-file.c:583
6024msgid "show all objects with --batch or --batch-check"
6025msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
6026
6027#: builtin/check-attr.c:12
6028msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
6029msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
6030
6031#: builtin/check-attr.c:13
6032msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
6033msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
6034
6035#: builtin/check-attr.c:20
6036msgid "report all attributes set on file"
6037msgstr "报告设置在文件上的所有属性"
6038
6039#: builtin/check-attr.c:21
6040msgid "use .gitattributes only from the index"
6041msgstr "只使用索引中的 .gitattributes"
6042
6043#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
6044msgid "read file names from stdin"
6045msgstr "从标准输入读出文件名"
6046
6047#: builtin/check-attr.c:24 builtin/check-ignore.c:26
6048msgid "terminate input and output records by a NUL character"
6049msgstr "输入和输出的记录使用 NUL 字符终结"
6050
6051#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
6052msgid "suppress progress reporting"
6053msgstr "不显示进度报告"
6054
6055#: builtin/check-ignore.c:28
6056msgid "show non-matching input paths"
6057msgstr "显示未匹配的输入路径"
6058
6059#: builtin/check-ignore.c:30
6060msgid "ignore index when checking"
6061msgstr "检查时忽略索引"
6062
6063#: builtin/check-ignore.c:158
6064msgid "cannot specify pathnames with --stdin"
6065msgstr "不能同时指定路径及 --stdin 参数"
6066
6067#: builtin/check-ignore.c:161
6068msgid "-z only makes sense with --stdin"
6069msgstr "-z 需要和 --stdin 参数共用才有意义"
6070
6071#: builtin/check-ignore.c:163
6072msgid "no path specified"
6073msgstr "未指定路径"
6074
6075#: builtin/check-ignore.c:167
6076msgid "--quiet is only valid with a single pathname"
6077msgstr "参数 --quiet 只在提供一个路径名时有效"
6078
6079#: builtin/check-ignore.c:169
6080msgid "cannot have both --quiet and --verbose"
6081msgstr "不能同时提供 --quiet 和 --verbose 参数"
6082
6083#: builtin/check-ignore.c:172
6084msgid "--non-matching is only valid with --verbose"
6085msgstr "--non-matching 选项只在使用 --verbose 时有效"
6086
6087#: builtin/check-mailmap.c:9
6088msgid "git check-mailmap [<options>] <contact>..."
6089msgstr "git check-mailmap [<选项>] <联系地址>..."
6090
6091#: builtin/check-mailmap.c:14
6092msgid "also read contacts from stdin"
6093msgstr "还从标准输入读取联系地址"
6094
6095#: builtin/check-mailmap.c:25
6096#, c-format
6097msgid "unable to parse contact: %s"
6098msgstr "不能解析联系地址:%s"
6099
6100#: builtin/check-mailmap.c:48
6101msgid "no contacts specified"
6102msgstr "未指定联系地址"
6103
6104#: builtin/checkout-index.c:128
6105msgid "git checkout-index [<options>] [--] [<file>...]"
6106msgstr "git checkout-index [<选项>] [--] [<文件>...]"
6107
6108#: builtin/checkout-index.c:145
6109msgid "stage should be between 1 and 3 or all"
6110msgstr "索引值应该取值 1 到 3 或者 all"
6111
6112#: builtin/checkout-index.c:161
6113msgid "check out all files in the index"
6114msgstr "检出索引区的所有文件"
6115
6116#: builtin/checkout-index.c:162
6117msgid "force overwrite of existing files"
6118msgstr "强制覆盖现有的文件"
6119
6120#: builtin/checkout-index.c:164
6121msgid "no warning for existing files and files not in index"
6122msgstr "存在或不在索引中的文件都没有警告"
6123
6124#: builtin/checkout-index.c:166
6125msgid "don't checkout new files"
6126msgstr "不检出新文件"
6127
6128#: builtin/checkout-index.c:168
6129msgid "update stat information in the index file"
6130msgstr "更新索引中文件的状态信息"
6131
6132#: builtin/checkout-index.c:172
6133msgid "read list of paths from the standard input"
6134msgstr "从标准输入读取路径列表"
6135
6136#: builtin/checkout-index.c:174
6137msgid "write the content to temporary files"
6138msgstr "将内容写入临时文件"
6139
6140#: builtin/checkout-index.c:175 builtin/column.c:31
6141#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
6142#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
6143#: builtin/worktree.c:498
6144msgid "string"
6145msgstr "字符串"
6146
6147#: builtin/checkout-index.c:176
6148msgid "when creating files, prepend <string>"
6149msgstr "在创建文件时,在前面加上 <字符串>"
6150
6151#: builtin/checkout-index.c:178
6152msgid "copy out the files from named stage"
6153msgstr "从指定暂存区中拷出文件"
6154
6155#: builtin/checkout.c:26
6156msgid "git checkout [<options>] <branch>"
6157msgstr "git checkout [<选项>] <分支>"
6158
6159#: builtin/checkout.c:27
6160msgid "git checkout [<options>] [<branch>] -- <file>..."
6161msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
6162
6163#: builtin/checkout.c:135 builtin/checkout.c:168
6164#, c-format
6165msgid "path '%s' does not have our version"
6166msgstr "路径 '%s' 没有我们的版本"
6167
6168#: builtin/checkout.c:137 builtin/checkout.c:170
6169#, c-format
6170msgid "path '%s' does not have their version"
6171msgstr "路径 '%s' 没有他们的版本"
6172
6173#: builtin/checkout.c:153
6174#, c-format
6175msgid "path '%s' does not have all necessary versions"
6176msgstr "路径 '%s' 没有全部必须的版本"
6177
6178#: builtin/checkout.c:197
6179#, c-format
6180msgid "path '%s' does not have necessary versions"
6181msgstr "路径 '%s' 没有必须的版本"
6182
6183#: builtin/checkout.c:214
6184#, c-format
6185msgid "path '%s': cannot merge"
6186msgstr "path '%s':无法合并"
6187
6188#: builtin/checkout.c:231
6189#, c-format
6190msgid "Unable to add merge result for '%s'"
6191msgstr "无法为 '%s' 添加合并结果"
6192
6193#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
6194#: builtin/checkout.c:262
6195#, c-format
6196msgid "'%s' cannot be used with updating paths"
6197msgstr "'%s' 不能在更新路径时使用"
6198
6199#: builtin/checkout.c:265 builtin/checkout.c:268
6200#, c-format
6201msgid "'%s' cannot be used with %s"
6202msgstr "'%s' 不能和 %s 同时使用"
6203
6204#: builtin/checkout.c:271
6205#, c-format
6206msgid "Cannot update paths and switch to branch '%s' at the same time."
6207msgstr "不能同时更新路径并切换到分支'%s'。"
6208
6209#: builtin/checkout.c:342 builtin/checkout.c:349
6210#, c-format
6211msgid "path '%s' is unmerged"
6212msgstr "路径 '%s' 未合并"
6213
6214#: builtin/checkout.c:501
6215msgid "you need to resolve your current index first"
6216msgstr "您需要先解决当前索引的冲突"
6217
6218#: builtin/checkout.c:632
6219#, c-format
6220msgid "Can not do reflog for '%s': %s\n"
6221msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
6222
6223#: builtin/checkout.c:673
6224msgid "HEAD is now at"
6225msgstr "HEAD 目前位于"
6226
6227#: builtin/checkout.c:677 builtin/clone.c:683
6228msgid "unable to update HEAD"
6229msgstr "不能更新 HEAD"
6230
6231#: builtin/checkout.c:681
6232#, c-format
6233msgid "Reset branch '%s'\n"
6234msgstr "重置分支 '%s'\n"
6235
6236#: builtin/checkout.c:684
6237#, c-format
6238msgid "Already on '%s'\n"
6239msgstr "已经位于 '%s'\n"
6240
6241#: builtin/checkout.c:688
6242#, c-format
6243msgid "Switched to and reset branch '%s'\n"
6244msgstr "切换并重置分支 '%s'\n"
6245
6246#: builtin/checkout.c:690 builtin/checkout.c:1086
6247#, c-format
6248msgid "Switched to a new branch '%s'\n"
6249msgstr "切换到一个新分支 '%s'\n"
6250
6251#: builtin/checkout.c:692
6252#, c-format
6253msgid "Switched to branch '%s'\n"
6254msgstr "切换到分支 '%s'\n"
6255
6256#  译者:注意保持前导空格
6257#: builtin/checkout.c:743
6258#, c-format
6259msgid " ... and %d more.\n"
6260msgstr " ... 及其它 %d 个。\n"
6261
6262#: builtin/checkout.c:749
6263#, c-format
6264msgid ""
6265"Warning: you are leaving %d commit behind, not connected to\n"
6266"any of your branches:\n"
6267"\n"
6268"%s\n"
6269msgid_plural ""
6270"Warning: you are leaving %d commits behind, not connected to\n"
6271"any of your branches:\n"
6272"\n"
6273"%s\n"
6274msgstr[0] ""
6275"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6276"\n"
6277"%s\n"
6278msgstr[1] ""
6279"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6280"\n"
6281"%s\n"
6282
6283#: builtin/checkout.c:768
6284#, c-format
6285msgid ""
6286"If you want to keep it by creating a new branch, this may be a good time\n"
6287"to do so with:\n"
6288"\n"
6289" git branch <new-branch-name> %s\n"
6290"\n"
6291msgid_plural ""
6292"If you want to keep them by creating a new branch, this may be a good time\n"
6293"to do so with:\n"
6294"\n"
6295" git branch <new-branch-name> %s\n"
6296"\n"
6297msgstr[0] ""
6298"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6299"如下操作:\n"
6300"\n"
6301" git branch <新分支名> %s\n"
6302"\n"
6303msgstr[1] ""
6304"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
6305"如下操作:\n"
6306"\n"
6307" git branch <新分支名> %s\n"
6308"\n"
6309
6310#: builtin/checkout.c:809
6311msgid "internal error in revision walk"
6312msgstr "在版本遍历时遇到内部错误"
6313
6314#: builtin/checkout.c:813
6315msgid "Previous HEAD position was"
6316msgstr "之前的 HEAD 位置是"
6317
6318#: builtin/checkout.c:843 builtin/checkout.c:1081
6319msgid "You are on a branch yet to be born"
6320msgstr "您位于一个尚未初始化的分支"
6321
6322#: builtin/checkout.c:987
6323#, c-format
6324msgid "only one reference expected, %d given."
6325msgstr "应只有一个引用,却给出了 %d 个"
6326
6327#: builtin/checkout.c:1027 builtin/worktree.c:233
6328#, c-format
6329msgid "invalid reference: %s"
6330msgstr "无效引用:%s"
6331
6332#: builtin/checkout.c:1056
6333#, c-format
6334msgid "reference is not a tree: %s"
6335msgstr "引用不是一个树:%s"
6336
6337#: builtin/checkout.c:1095
6338msgid "paths cannot be used with switching branches"
6339msgstr "路径不能和切换分支同时使用"
6340
6341#: builtin/checkout.c:1098 builtin/checkout.c:1102
6342#, c-format
6343msgid "'%s' cannot be used with switching branches"
6344msgstr "'%s' 不能和切换分支同时使用"
6345
6346#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
6347#: builtin/checkout.c:1117
6348#, c-format
6349msgid "'%s' cannot be used with '%s'"
6350msgstr "'%s' 不能和 '%s' 同时使用"
6351
6352#: builtin/checkout.c:1122
6353#, c-format
6354msgid "Cannot switch branch to a non-commit '%s'"
6355msgstr "不能切换分支到一个非提交 '%s'"
6356
6357#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
6358#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
6359#: builtin/worktree.c:348
6360msgid "branch"
6361msgstr "分支"
6362
6363#: builtin/checkout.c:1155
6364msgid "create and checkout a new branch"
6365msgstr "创建并检出一个新的分支"
6366
6367#: builtin/checkout.c:1157
6368msgid "create/reset and checkout a branch"
6369msgstr "创建/重置并检出一个分支"
6370
6371#: builtin/checkout.c:1158
6372msgid "create reflog for new branch"
6373msgstr "为新的分支创建引用日志"
6374
6375#: builtin/checkout.c:1159 builtin/worktree.c:350
6376msgid "detach HEAD at named commit"
6377msgstr "HEAD 从指定的提交分离"
6378
6379#: builtin/checkout.c:1160
6380msgid "set upstream info for new branch"
6381msgstr "为新的分支设置上游信息"
6382
6383#: builtin/checkout.c:1162
6384msgid "new-branch"
6385msgstr "新分支"
6386
6387#: builtin/checkout.c:1162
6388msgid "new unparented branch"
6389msgstr "新的没有父提交的分支"
6390
6391#: builtin/checkout.c:1163
6392msgid "checkout our version for unmerged files"
6393msgstr "对尚未合并的文件检出我们的版本"
6394
6395#: builtin/checkout.c:1165
6396msgid "checkout their version for unmerged files"
6397msgstr "对尚未合并的文件检出他们的版本"
6398
6399#: builtin/checkout.c:1167
6400msgid "force checkout (throw away local modifications)"
6401msgstr "强制检出(丢弃本地修改)"
6402
6403#: builtin/checkout.c:1168
6404msgid "perform a 3-way merge with the new branch"
6405msgstr "和新的分支执行三方合并"
6406
6407#: builtin/checkout.c:1169 builtin/merge.c:238
6408msgid "update ignored files (default)"
6409msgstr "更新忽略的文件(默认)"
6410
6411#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
6412msgid "style"
6413msgstr "风格"
6414
6415#: builtin/checkout.c:1171
6416msgid "conflict style (merge or diff3)"
6417msgstr "冲突输出风格(merge 或 diff3)"
6418
6419#: builtin/checkout.c:1174
6420msgid "do not limit pathspecs to sparse entries only"
6421msgstr "对路径不做稀疏检出的限制"
6422
6423#: builtin/checkout.c:1176
6424msgid "second guess 'git checkout <no-such-branch>'"
6425msgstr "二次猜测'git checkout <无此分支>'"
6426
6427#: builtin/checkout.c:1178
6428msgid "do not check if another worktree is holding the given ref"
6429msgstr "不检查指定的引用是否被其他工作区所占用"
6430
6431#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
6432#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
6433#: builtin/send-pack.c:173
6434msgid "force progress reporting"
6435msgstr "强制显示进度报告"
6436
6437#: builtin/checkout.c:1212
6438msgid "-b, -B and --orphan are mutually exclusive"
6439msgstr "-b、-B 和 --orphan 是互斥的"
6440
6441#: builtin/checkout.c:1229
6442msgid "--track needs a branch name"
6443msgstr "--track 需要一个分支名"
6444
6445#: builtin/checkout.c:1234
6446msgid "Missing branch name; try -b"
6447msgstr "缺少分支名;尝试 -b"
6448
6449#: builtin/checkout.c:1270
6450msgid "invalid path specification"
6451msgstr "无效的路径规格"
6452
6453#: builtin/checkout.c:1277
6454#, c-format
6455msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
6456msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
6457
6458#: builtin/checkout.c:1281
6459#, c-format
6460msgid "git checkout: --detach does not take a path argument '%s'"
6461msgstr "git checkout:--detach 不能接收路径参数 '%s'"
6462
6463#: builtin/checkout.c:1285
6464msgid ""
6465"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
6466"checking out of the index."
6467msgstr ""
6468"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
6469
6470#: builtin/clean.c:26
6471msgid ""
6472"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
6473msgstr ""
6474"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
6475
6476#: builtin/clean.c:30
6477#, c-format
6478msgid "Removing %s\n"
6479msgstr "正删除 %s\n"
6480
6481#: builtin/clean.c:31
6482#, c-format
6483msgid "Would remove %s\n"
6484msgstr "将删除 %s\n"
6485
6486#: builtin/clean.c:32
6487#, c-format
6488msgid "Skipping repository %s\n"
6489msgstr "忽略仓库 %s\n"
6490
6491#: builtin/clean.c:33
6492#, c-format
6493msgid "Would skip repository %s\n"
6494msgstr "将忽略仓库 %s\n"
6495
6496#: builtin/clean.c:34
6497#, c-format
6498msgid "failed to remove %s"
6499msgstr "无法删除 %s"
6500
6501#: builtin/clean.c:301 git-add--interactive.perl:572
6502#, c-format
6503msgid ""
6504"Prompt help:\n"
6505"1          - select a numbered item\n"
6506"foo        - select item based on unique prefix\n"
6507"           - (empty) select nothing\n"
6508msgstr ""
6509"帮助:\n"
6510"1          - 通过编号选择一个选项\n"
6511"foo        - 通过唯一前缀选择一个选项\n"
6512"           - (空)什么也不选择\n"
6513
6514#: builtin/clean.c:305 git-add--interactive.perl:581
6515#, c-format
6516msgid ""
6517"Prompt help:\n"
6518"1          - select a single item\n"
6519"3-5        - select a range of items\n"
6520"2-3,6-9    - select multiple ranges\n"
6521"foo        - select item based on unique prefix\n"
6522"-...       - unselect specified items\n"
6523"*          - choose all items\n"
6524"           - (empty) finish selecting\n"
6525msgstr ""
6526"帮助:\n"
6527"1          - 选择一个选项\n"
6528"3-5        - 选择一个范围内的所有选项\n"
6529"2-3,6-9    - 选择多个范围内的所有选项\n"
6530"foo        - 通过唯一前缀选择一个选项\n"
6531"-...       - 反选特定的选项\n"
6532"*          - 选择所有选项\n"
6533"           - (空)结束选择\n"
6534
6535#: builtin/clean.c:521 git-add--interactive.perl:547
6536#: git-add--interactive.perl:552
6537#, c-format, perl-format
6538msgid "Huh (%s)?\n"
6539msgstr "嗯(%s)?\n"
6540
6541#: builtin/clean.c:663
6542#, c-format
6543msgid "Input ignore patterns>> "
6544msgstr "输入模版以排除条目>> "
6545
6546#: builtin/clean.c:700
6547#, c-format
6548msgid "WARNING: Cannot find items matched by: %s"
6549msgstr "警告:无法找到和 %s 匹配的条目"
6550
6551#: builtin/clean.c:721
6552msgid "Select items to delete"
6553msgstr "选择要删除的条目"
6554
6555#. TRANSLATORS: Make sure to keep [y/N] as is
6556#: builtin/clean.c:762
6557#, c-format
6558msgid "Remove %s [y/N]? "
6559msgstr "删除 %s [y/N]?"
6560
6561#: builtin/clean.c:787 git-add--interactive.perl:1616
6562#, c-format
6563msgid "Bye.\n"
6564msgstr "再见。\n"
6565
6566#: builtin/clean.c:795
6567msgid ""
6568"clean               - start cleaning\n"
6569"filter by pattern   - exclude items from deletion\n"
6570"select by numbers   - select items to be deleted by numbers\n"
6571"ask each            - confirm each deletion (like \"rm -i\")\n"
6572"quit                - stop cleaning\n"
6573"help                - this screen\n"
6574"?                   - help for prompt selection"
6575msgstr ""
6576"clean               - 开始清理\n"
6577"filter by pattern   - 通过模版排除要删除的条目\n"
6578"select by numbers   - 通过数字选择要删除的条目\n"
6579"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
6580"quit                - 停止删除并退出\n"
6581"help                - 显示本帮助\n"
6582"?                   - 显示如何在提示符下选择的帮助"
6583
6584#: builtin/clean.c:822 git-add--interactive.perl:1692
6585msgid "*** Commands ***"
6586msgstr "*** 命令 ***"
6587
6588#: builtin/clean.c:823 git-add--interactive.perl:1689
6589msgid "What now"
6590msgstr "请选择"
6591
6592#: builtin/clean.c:831
6593msgid "Would remove the following item:"
6594msgid_plural "Would remove the following items:"
6595msgstr[0] "将删除如下条目:"
6596msgstr[1] "将删除如下条目:"
6597
6598#: builtin/clean.c:847
6599msgid "No more files to clean, exiting."
6600msgstr "没有要清理的文件,退出。"
6601
6602#: builtin/clean.c:909
6603msgid "do not print names of files removed"
6604msgstr "不打印删除文件的名称"
6605
6606#: builtin/clean.c:911
6607msgid "force"
6608msgstr "强制"
6609
6610#: builtin/clean.c:912
6611msgid "interactive cleaning"
6612msgstr "交互式清除"
6613
6614#: builtin/clean.c:914
6615msgid "remove whole directories"
6616msgstr "删除整个目录"
6617
6618#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
6619#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
6620#: builtin/name-rev.c:399 builtin/show-ref.c:176
6621msgid "pattern"
6622msgstr "模式"
6623
6624#: builtin/clean.c:916
6625msgid "add <pattern> to ignore rules"
6626msgstr "添加 <模式> 到忽略规则"
6627
6628#: builtin/clean.c:917
6629msgid "remove ignored files, too"
6630msgstr "也删除忽略的文件"
6631
6632#: builtin/clean.c:919
6633msgid "remove only ignored files"
6634msgstr "只删除忽略的文件"
6635
6636#: builtin/clean.c:937
6637msgid "-x and -X cannot be used together"
6638msgstr "-x 和 -X 不能同时使用"
6639
6640#: builtin/clean.c:941
6641msgid ""
6642"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
6643"clean"
6644msgstr ""
6645"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6646
6647#: builtin/clean.c:944
6648msgid ""
6649"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
6650"refusing to clean"
6651msgstr ""
6652"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6653
6654#: builtin/clone.c:39
6655msgid "git clone [<options>] [--] <repo> [<dir>]"
6656msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
6657
6658#: builtin/clone.c:83
6659msgid "don't create a checkout"
6660msgstr "不创建一个检出"
6661
6662#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
6663msgid "create a bare repository"
6664msgstr "创建一个纯仓库"
6665
6666#: builtin/clone.c:88
6667msgid "create a mirror repository (implies bare)"
6668msgstr "创建一个镜像仓库(也是纯仓库)"
6669
6670#: builtin/clone.c:90
6671msgid "to clone from a local repository"
6672msgstr "从本地仓库克隆"
6673
6674#: builtin/clone.c:92
6675msgid "don't use local hardlinks, always copy"
6676msgstr "不使用本地硬链接,始终复制"
6677
6678#: builtin/clone.c:94
6679msgid "setup as shared repository"
6680msgstr "设置为共享仓库"
6681
6682#: builtin/clone.c:96 builtin/clone.c:100
6683msgid "pathspec"
6684msgstr "路径规格"
6685
6686#: builtin/clone.c:96 builtin/clone.c:100
6687msgid "initialize submodules in the clone"
6688msgstr "在克隆时初始化子模组"
6689
6690#: builtin/clone.c:103
6691msgid "number of submodules cloned in parallel"
6692msgstr "并发克隆的子模组的数量"
6693
6694#: builtin/clone.c:104 builtin/init-db.c:476
6695msgid "template-directory"
6696msgstr "模板目录"
6697
6698#: builtin/clone.c:105 builtin/init-db.c:477
6699msgid "directory from which templates will be used"
6700msgstr "模板目录将被使用"
6701
6702#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
6703#: builtin/submodule--helper.c:1002
6704msgid "reference repository"
6705msgstr "参考仓库"
6706
6707#: builtin/clone.c:111
6708msgid "use --reference only while cloning"
6709msgstr "仅在克隆时参考 --reference 指向的本地仓库"
6710
6711#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
6712msgid "name"
6713msgstr "名称"
6714
6715#: builtin/clone.c:113
6716msgid "use <name> instead of 'origin' to track upstream"
6717msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
6718
6719#: builtin/clone.c:115
6720msgid "checkout <branch> instead of the remote's HEAD"
6721msgstr "检出 <分支> 而不是远程 HEAD"
6722
6723#: builtin/clone.c:117
6724msgid "path to git-upload-pack on the remote"
6725msgstr "远程 git-upload-pack 路径"
6726
6727#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
6728#: builtin/pull.c:205
6729msgid "depth"
6730msgstr "深度"
6731
6732#: builtin/clone.c:119
6733msgid "create a shallow clone of that depth"
6734msgstr "创建一个指定深度的浅克隆"
6735
6736#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
6737#: parse-options.h:142
6738msgid "time"
6739msgstr "时间"
6740
6741#: builtin/clone.c:121
6742msgid "create a shallow clone since a specific time"
6743msgstr "从一个特定时间创建一个浅克隆"
6744
6745#: builtin/clone.c:122 builtin/fetch.c:141
6746msgid "revision"
6747msgstr "版本"
6748
6749#: builtin/clone.c:123 builtin/fetch.c:142
6750msgid "deepen history of shallow clone, excluding rev"
6751msgstr "深化浅克隆的历史,除了特定版本"
6752
6753#: builtin/clone.c:125
6754msgid "clone only one branch, HEAD or --branch"
6755msgstr "只克隆一个分支、HEAD 或 --branch"
6756
6757#: builtin/clone.c:127
6758msgid "don't clone any tags, and make later fetches not to follow them"
6759msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
6760
6761#: builtin/clone.c:129
6762msgid "any cloned submodules will be shallow"
6763msgstr "子模组将以浅下载模式克隆"
6764
6765#: builtin/clone.c:130 builtin/init-db.c:485
6766msgid "gitdir"
6767msgstr "git目录"
6768
6769#: builtin/clone.c:131 builtin/init-db.c:486
6770msgid "separate git dir from working tree"
6771msgstr "git目录和工作区分离"
6772
6773#: builtin/clone.c:132
6774msgid "key=value"
6775msgstr "key=value"
6776
6777#: builtin/clone.c:133
6778msgid "set config inside the new repository"
6779msgstr "在新仓库中设置配置信息"
6780
6781#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
6782msgid "use IPv4 addresses only"
6783msgstr "只使用 IPv4 地址"
6784
6785#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
6786msgid "use IPv6 addresses only"
6787msgstr "只使用 IPv6 地址"
6788
6789#: builtin/clone.c:273
6790msgid ""
6791"No directory name could be guessed.\n"
6792"Please specify a directory on the command line"
6793msgstr ""
6794"无法猜到目录名。\n"
6795"请在命令行指定一个目录"
6796
6797#: builtin/clone.c:326
6798#, c-format
6799msgid "info: Could not add alternate for '%s': %s\n"
6800msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
6801
6802#: builtin/clone.c:398
6803#, c-format
6804msgid "failed to open '%s'"
6805msgstr "无法打开 '%s'"
6806
6807#: builtin/clone.c:406
6808#, c-format
6809msgid "%s exists and is not a directory"
6810msgstr "%s 存在且不是一个目录"
6811
6812#: builtin/clone.c:420
6813#, c-format
6814msgid "failed to stat %s\n"
6815msgstr "对 %s 调用 stat 失败\n"
6816
6817#: builtin/clone.c:442
6818#, c-format
6819msgid "failed to create link '%s'"
6820msgstr "无法创建链接 '%s'"
6821
6822#: builtin/clone.c:446
6823#, c-format
6824msgid "failed to copy file to '%s'"
6825msgstr "无法拷贝文件至 '%s'"
6826
6827#: builtin/clone.c:471
6828#, c-format
6829msgid "done.\n"
6830msgstr "完成。\n"
6831
6832#: builtin/clone.c:483
6833msgid ""
6834"Clone succeeded, but checkout failed.\n"
6835"You can inspect what was checked out with 'git status'\n"
6836"and retry the checkout with 'git checkout -f HEAD'\n"
6837msgstr ""
6838"克隆成功,但是检出失败。\n"
6839"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6840"'git checkout -f HEAD' 重试\n"
6841
6842#: builtin/clone.c:560
6843#, c-format
6844msgid "Could not find remote branch %s to clone."
6845msgstr "不能发现要克隆的远程分支 %s。"
6846
6847#: builtin/clone.c:655
6848msgid "remote did not send all necessary objects"
6849msgstr "远程没有发送所有必须的对象"
6850
6851#: builtin/clone.c:671
6852#, c-format
6853msgid "unable to update %s"
6854msgstr "不能更新 %s"
6855
6856#: builtin/clone.c:720
6857msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6858msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6859
6860#: builtin/clone.c:751
6861msgid "unable to checkout working tree"
6862msgstr "不能检出工作区"
6863
6864#: builtin/clone.c:796
6865msgid "unable to write parameters to config file"
6866msgstr "无法将参数写入配置文件"
6867
6868#: builtin/clone.c:859
6869msgid "cannot repack to clean up"
6870msgstr "无法执行 repack 来清理"
6871
6872#: builtin/clone.c:861
6873msgid "cannot unlink temporary alternates file"
6874msgstr "无法删除临时的 alternates 文件"
6875
6876#: builtin/clone.c:894 builtin/receive-pack.c:1944
6877msgid "Too many arguments."
6878msgstr "太多参数。"
6879
6880#: builtin/clone.c:898
6881msgid "You must specify a repository to clone."
6882msgstr "您必须指定一个仓库来克隆。"
6883
6884#: builtin/clone.c:911
6885#, c-format
6886msgid "--bare and --origin %s options are incompatible."
6887msgstr "--bare 和 --origin %s 选项不兼容。"
6888
6889#: builtin/clone.c:914
6890msgid "--bare and --separate-git-dir are incompatible."
6891msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6892
6893#: builtin/clone.c:927
6894#, c-format
6895msgid "repository '%s' does not exist"
6896msgstr "仓库 '%s' 不存在"
6897
6898#: builtin/clone.c:933 builtin/fetch.c:1360
6899#, c-format
6900msgid "depth %s is not a positive number"
6901msgstr "深度 %s 不是一个正数"
6902
6903#: builtin/clone.c:943
6904#, c-format
6905msgid "destination path '%s' already exists and is not an empty directory."
6906msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
6907
6908#: builtin/clone.c:953
6909#, c-format
6910msgid "working tree '%s' already exists."
6911msgstr "工作区 '%s' 已经存在。"
6912
6913#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
6914#: builtin/worktree.c:240 builtin/worktree.c:270
6915#, c-format
6916msgid "could not create leading directories of '%s'"
6917msgstr "不能为 '%s' 创建先导目录"
6918
6919#: builtin/clone.c:971
6920#, c-format
6921msgid "could not create work tree dir '%s'"
6922msgstr "不能创建工作区目录 '%s'"
6923
6924#: builtin/clone.c:983
6925#, c-format
6926msgid "Cloning into bare repository '%s'...\n"
6927msgstr "克隆到纯仓库 '%s'...\n"
6928
6929#: builtin/clone.c:985
6930#, c-format
6931msgid "Cloning into '%s'...\n"
6932msgstr "正克隆到 '%s'...\n"
6933
6934#: builtin/clone.c:1009
6935msgid ""
6936"clone --recursive is not compatible with both --reference and --reference-if-"
6937"able"
6938msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
6939
6940#: builtin/clone.c:1071
6941msgid "--depth is ignored in local clones; use file:// instead."
6942msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6943
6944#: builtin/clone.c:1073
6945msgid "--shallow-since is ignored in local clones; use file:// instead."
6946msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6947
6948#: builtin/clone.c:1075
6949msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6950msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6951
6952#: builtin/clone.c:1078
6953msgid "source repository is shallow, ignoring --local"
6954msgstr "源仓库是浅克隆,忽略 --local"
6955
6956#: builtin/clone.c:1083
6957msgid "--local is ignored"
6958msgstr "--local 被忽略"
6959
6960#: builtin/clone.c:1087
6961#, c-format
6962msgid "Don't know how to clone %s"
6963msgstr "不知道如何克隆 %s"
6964
6965#: builtin/clone.c:1142 builtin/clone.c:1150
6966#, c-format
6967msgid "Remote branch %s not found in upstream %s"
6968msgstr "远程分支 %s 在上游 %s 未发现"
6969
6970#: builtin/clone.c:1153
6971msgid "You appear to have cloned an empty repository."
6972msgstr "您似乎克隆了一个空仓库。"
6973
6974#: builtin/column.c:10
6975msgid "git column [<options>]"
6976msgstr "git column [<选项>]"
6977
6978#: builtin/column.c:27
6979msgid "lookup config vars"
6980msgstr "查找配置变量"
6981
6982#: builtin/column.c:28 builtin/column.c:29
6983msgid "layout to use"
6984msgstr "要使用的布局"
6985
6986#: builtin/column.c:30
6987msgid "Maximum width"
6988msgstr "最大宽度"
6989
6990#: builtin/column.c:31
6991msgid "Padding space on left border"
6992msgstr "左边框的填充空间"
6993
6994#: builtin/column.c:32
6995msgid "Padding space on right border"
6996msgstr "右边框的填充空间"
6997
6998#: builtin/column.c:33
6999msgid "Padding space between columns"
7000msgstr "两列之间的填充空间"
7001
7002#: builtin/column.c:52
7003msgid "--command must be the first argument"
7004msgstr "--command 必须是第一个参数"
7005
7006#: builtin/commit.c:39
7007msgid "git commit [<options>] [--] <pathspec>..."
7008msgstr "git commit [<选项>] [--] <路径规格>..."
7009
7010#: builtin/commit.c:44
7011msgid "git status [<options>] [--] <pathspec>..."
7012msgstr "git status [<选项>] [--] <路径规格>..."
7013
7014#: builtin/commit.c:49
7015msgid ""
7016"Your name and email address were configured automatically based\n"
7017"on your username and hostname. Please check that they are accurate.\n"
7018"You can suppress this message by setting them explicitly. Run the\n"
7019"following command and follow the instructions in your editor to edit\n"
7020"your configuration file:\n"
7021"\n"
7022"    git config --global --edit\n"
7023"\n"
7024"After doing this, you may fix the identity used for this commit with:\n"
7025"\n"
7026"    git commit --amend --reset-author\n"
7027msgstr ""
7028"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7029"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
7030"中编辑您的配置文件:\n"
7031"\n"
7032"    git config --global --edit\n"
7033"\n"
7034"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
7035"\n"
7036"    git commit --amend --reset-author\n"
7037
7038#: builtin/commit.c:62
7039msgid ""
7040"Your name and email address were configured automatically based\n"
7041"on your username and hostname. Please check that they are accurate.\n"
7042"You can suppress this message by setting them explicitly:\n"
7043"\n"
7044"    git config --global user.name \"Your Name\"\n"
7045"    git config --global user.email you@example.com\n"
7046"\n"
7047"After doing this, you may fix the identity used for this commit with:\n"
7048"\n"
7049"    git commit --amend --reset-author\n"
7050msgstr ""
7051"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7052"与否。您可以对其进行设置以免再出现本提示信息:\n"
7053"\n"
7054"    git config --global user.name \"Your Name\"\n"
7055"    git config --global user.email you@example.com\n"
7056"\n"
7057"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
7058"\n"
7059"    git commit --amend --reset-author\n"
7060
7061#: builtin/commit.c:74
7062msgid ""
7063"You asked to amend the most recent commit, but doing so would make\n"
7064"it empty. You can repeat your command with --allow-empty, or you can\n"
7065"remove the commit entirely with \"git reset HEAD^\".\n"
7066msgstr ""
7067"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
7068"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
7069
7070#: builtin/commit.c:79
7071msgid ""
7072"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
7073"If you wish to commit it anyway, use:\n"
7074"\n"
7075"    git commit --allow-empty\n"
7076"\n"
7077msgstr ""
7078"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
7079"也要提交,使用命令:\n"
7080"\n"
7081"    git commit --allow-empty\n"
7082"\n"
7083
7084#: builtin/commit.c:86
7085msgid "Otherwise, please use 'git reset'\n"
7086msgstr "否则,请使用命令 'git reset'\n"
7087
7088#: builtin/commit.c:89
7089msgid ""
7090"If you wish to skip this commit, use:\n"
7091"\n"
7092"    git reset\n"
7093"\n"
7094"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
7095"the remaining commits.\n"
7096msgstr ""
7097"如果您想跳过这个提交,使用命令:\n"
7098"\n"
7099"    git reset\n"
7100"\n"
7101"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
7102"操作。\n"
7103
7104#: builtin/commit.c:318
7105msgid "failed to unpack HEAD tree object"
7106msgstr "无法解包 HEAD 树对象"
7107
7108#: builtin/commit.c:359
7109msgid "unable to create temporary index"
7110msgstr "不能创建临时索引"
7111
7112#: builtin/commit.c:365
7113msgid "interactive add failed"
7114msgstr "交互式添加失败"
7115
7116#: builtin/commit.c:378
7117msgid "unable to update temporary index"
7118msgstr "无法更新临时索引"
7119
7120#: builtin/commit.c:380
7121msgid "Failed to update main cache tree"
7122msgstr "不能更新树的主缓存"
7123
7124#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
7125msgid "unable to write new_index file"
7126msgstr "无法写 new_index 文件"
7127
7128#: builtin/commit.c:461
7129msgid "cannot do a partial commit during a merge."
7130msgstr "在合并过程中不能做部分提交。"
7131
7132#: builtin/commit.c:463
7133msgid "cannot do a partial commit during a cherry-pick."
7134msgstr "在拣选过程中不能做部分提交。"
7135
7136#: builtin/commit.c:471
7137msgid "cannot read the index"
7138msgstr "无法读取索引"
7139
7140#: builtin/commit.c:490
7141msgid "unable to write temporary index file"
7142msgstr "无法写临时索引文件"
7143
7144#: builtin/commit.c:587
7145#, c-format
7146msgid "commit '%s' lacks author header"
7147msgstr "提交 '%s' 缺少作者信息"
7148
7149#: builtin/commit.c:589
7150#, c-format
7151msgid "commit '%s' has malformed author line"
7152msgstr "提交 '%s' 有非法的作者信息"
7153
7154#: builtin/commit.c:608
7155msgid "malformed --author parameter"
7156msgstr "非法的 --author 参数"
7157
7158#: builtin/commit.c:660
7159msgid ""
7160"unable to select a comment character that is not used\n"
7161"in the current commit message"
7162msgstr "无法选择一个未被当前提交说明使用的注释字符"
7163
7164#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
7165#, c-format
7166msgid "could not lookup commit %s"
7167msgstr "不能查询提交 %s"
7168
7169#: builtin/commit.c:709 builtin/shortlog.c:309
7170#, c-format
7171msgid "(reading log message from standard input)\n"
7172msgstr "(正从标准输入中读取日志信息)\n"
7173
7174#: builtin/commit.c:711
7175msgid "could not read log from standard input"
7176msgstr "不能从标准输入中读取日志信息"
7177
7178#: builtin/commit.c:715
7179#, c-format
7180msgid "could not read log file '%s'"
7181msgstr "不能读取日志文件 '%s'"
7182
7183#: builtin/commit.c:742 builtin/commit.c:750
7184msgid "could not read SQUASH_MSG"
7185msgstr "不能读取 SQUASH_MSG"
7186
7187#: builtin/commit.c:747
7188msgid "could not read MERGE_MSG"
7189msgstr "不能读取 MERGE_MSG"
7190
7191#: builtin/commit.c:801
7192msgid "could not write commit template"
7193msgstr "不能写提交模版"
7194
7195#: builtin/commit.c:819
7196#, c-format
7197msgid ""
7198"\n"
7199"It looks like you may be committing a merge.\n"
7200"If this is not correct, please remove the file\n"
7201"\t%s\n"
7202"and try again.\n"
7203msgstr ""
7204"\n"
7205"似乎您正在做一个合并提交。如果不对,请删除文件\n"
7206"\t%s\n"
7207"然后重试。\n"
7208
7209#: builtin/commit.c:824
7210#, c-format
7211msgid ""
7212"\n"
7213"It looks like you may be committing a cherry-pick.\n"
7214"If this is not correct, please remove the file\n"
7215"\t%s\n"
7216"and try again.\n"
7217msgstr ""
7218"\n"
7219"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
7220"\t%s\n"
7221"然后重试。\n"
7222
7223#: builtin/commit.c:837
7224#, c-format
7225msgid ""
7226"Please enter the commit message for your changes. Lines starting\n"
7227"with '%c' will be ignored, and an empty message aborts the commit.\n"
7228msgstr ""
7229"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
7230"说明将会终止提交。\n"
7231
7232#: builtin/commit.c:844
7233#, c-format
7234msgid ""
7235"Please enter the commit message for your changes. Lines starting\n"
7236"with '%c' will be kept; you may remove them yourself if you want to.\n"
7237"An empty message aborts the commit.\n"
7238msgstr ""
7239"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7240"也可以删除它们。一个空的提交说明将会终止提交。\n"
7241
7242#  译者:为保证在输出中对齐,注意调整句中空格!
7243#: builtin/commit.c:861
7244#, c-format
7245msgid "%sAuthor:    %.*s <%.*s>"
7246msgstr "%s作者:  %.*s <%.*s>"
7247
7248#  译者:为保证在输出中对齐,注意调整句中空格!
7249#: builtin/commit.c:869
7250#, c-format
7251msgid "%sDate:      %s"
7252msgstr "%s日期:  %s"
7253
7254#  译者:为保证在输出中对齐,注意调整句中空格!
7255#: builtin/commit.c:876
7256#, c-format
7257msgid "%sCommitter: %.*s <%.*s>"
7258msgstr "%s提交者:%.*s <%.*s>"
7259
7260#: builtin/commit.c:893
7261msgid "Cannot read index"
7262msgstr "无法读取索引"
7263
7264#: builtin/commit.c:958
7265msgid "Error building trees"
7266msgstr "无法创建树对象"
7267
7268#: builtin/commit.c:972 builtin/tag.c:252
7269#, c-format
7270msgid "Please supply the message using either -m or -F option.\n"
7271msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
7272
7273#: builtin/commit.c:1075
7274#, c-format
7275msgid "--author '%s' is not 'Name <email>' and matches no existing author"
7276msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
7277
7278#: builtin/commit.c:1090 builtin/commit.c:1335
7279#, c-format
7280msgid "Invalid untracked files mode '%s'"
7281msgstr "无效的未追踪文件参数 '%s'"
7282
7283#: builtin/commit.c:1128
7284msgid "--long and -z are incompatible"
7285msgstr "--long 和 -z 选项不兼容"
7286
7287#: builtin/commit.c:1158
7288msgid "Using both --reset-author and --author does not make sense"
7289msgstr "同时使用 --reset-author 和 --author 没有意义"
7290
7291#: builtin/commit.c:1167
7292msgid "You have nothing to amend."
7293msgstr "您没有可修补的提交。"
7294
7295#: builtin/commit.c:1170
7296msgid "You are in the middle of a merge -- cannot amend."
7297msgstr "您正处于一个合并过程中 -- 无法修补提交。"
7298
7299#: builtin/commit.c:1172
7300msgid "You are in the middle of a cherry-pick -- cannot amend."
7301msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
7302
7303#: builtin/commit.c:1175
7304msgid "Options --squash and --fixup cannot be used together"
7305msgstr "选项 --squash 和 --fixup 不能同时使用"
7306
7307#: builtin/commit.c:1185
7308msgid "Only one of -c/-C/-F/--fixup can be used."
7309msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7310
7311#: builtin/commit.c:1187
7312msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
7313msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
7314
7315#: builtin/commit.c:1195
7316msgid "--reset-author can be used only with -C, -c or --amend."
7317msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
7318
7319#: builtin/commit.c:1212
7320msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7321msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7322
7323#: builtin/commit.c:1214
7324msgid "No paths with --include/--only does not make sense."
7325msgstr "参数 --include/--only 不跟路径没有意义。"
7326
7327#: builtin/commit.c:1226 builtin/tag.c:535
7328#, c-format
7329msgid "Invalid cleanup mode %s"
7330msgstr "无效的清理模式 %s"
7331
7332#: builtin/commit.c:1231
7333msgid "Paths with -a does not make sense."
7334msgstr "路径和 -a 选项同时使用没有意义。"
7335
7336#: builtin/commit.c:1349 builtin/commit.c:1626
7337msgid "show status concisely"
7338msgstr "以简洁的格式显示状态"
7339
7340#: builtin/commit.c:1351 builtin/commit.c:1628
7341msgid "show branch information"
7342msgstr "显示分支信息"
7343
7344#: builtin/commit.c:1353
7345msgid "show stash information"
7346msgstr "显示贮藏区信息"
7347
7348#: builtin/commit.c:1355
7349msgid "version"
7350msgstr "版本"
7351
7352#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
7353#: builtin/worktree.c:469
7354msgid "machine-readable output"
7355msgstr "机器可读的输出"
7356
7357#: builtin/commit.c:1358 builtin/commit.c:1632
7358msgid "show status in long format (default)"
7359msgstr "以长格式显示状态(默认)"
7360
7361#: builtin/commit.c:1361 builtin/commit.c:1635
7362msgid "terminate entries with NUL"
7363msgstr "条目以 NUL 字符结尾"
7364
7365#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
7366#: builtin/fast-export.c:1002 builtin/tag.c:390
7367msgid "mode"
7368msgstr "模式"
7369
7370#: builtin/commit.c:1364 builtin/commit.c:1638
7371msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
7372msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
7373
7374#: builtin/commit.c:1367
7375msgid "show ignored files"
7376msgstr "显示忽略的文件"
7377
7378#: builtin/commit.c:1368 parse-options.h:155
7379msgid "when"
7380msgstr "何时"
7381
7382#: builtin/commit.c:1369
7383msgid ""
7384"ignore changes to submodules, optional when: all, dirty, untracked. "
7385"(Default: all)"
7386msgstr ""
7387"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
7388
7389#: builtin/commit.c:1371
7390msgid "list untracked files in columns"
7391msgstr "以列的方式显示未跟踪的文件"
7392
7393#: builtin/commit.c:1449
7394msgid "couldn't look up newly created commit"
7395msgstr "无法找到新创建的提交"
7396
7397#: builtin/commit.c:1451
7398msgid "could not parse newly created commit"
7399msgstr "不能解析新创建的提交"
7400
7401#: builtin/commit.c:1496
7402msgid "detached HEAD"
7403msgstr "分离头指针"
7404
7405#  译者:中文字符串拼接,可删除前导空格
7406#: builtin/commit.c:1499
7407msgid " (root-commit)"
7408msgstr "(根提交)"
7409
7410#: builtin/commit.c:1596
7411msgid "suppress summary after successful commit"
7412msgstr "提交成功后不显示概述信息"
7413
7414#: builtin/commit.c:1597
7415msgid "show diff in commit message template"
7416msgstr "在提交说明模板里显示差异"
7417
7418#: builtin/commit.c:1599
7419msgid "Commit message options"
7420msgstr "提交说明选项"
7421
7422#: builtin/commit.c:1600 builtin/tag.c:388
7423msgid "read message from file"
7424msgstr "从文件中读取提交说明"
7425
7426#: builtin/commit.c:1601
7427msgid "author"
7428msgstr "作者"
7429
7430#: builtin/commit.c:1601
7431msgid "override author for commit"
7432msgstr "提交时覆盖作者"
7433
7434#: builtin/commit.c:1602 builtin/gc.c:359
7435msgid "date"
7436msgstr "日期"
7437
7438#: builtin/commit.c:1602
7439msgid "override date for commit"
7440msgstr "提交时覆盖日期"
7441
7442#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
7443#: builtin/notes.c:565 builtin/tag.c:386
7444msgid "message"
7445msgstr "说明"
7446
7447#: builtin/commit.c:1603
7448msgid "commit message"
7449msgstr "提交说明"
7450
7451#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
7452#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
7453msgid "commit"
7454msgstr "提交"
7455
7456#: builtin/commit.c:1604
7457msgid "reuse and edit message from specified commit"
7458msgstr "重用并编辑指定提交的提交说明"
7459
7460#: builtin/commit.c:1605
7461msgid "reuse message from specified commit"
7462msgstr "重用指定提交的提交说明"
7463
7464#: builtin/commit.c:1606
7465msgid "use autosquash formatted message to fixup specified commit"
7466msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
7467
7468#: builtin/commit.c:1607
7469msgid "use autosquash formatted message to squash specified commit"
7470msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
7471
7472#: builtin/commit.c:1608
7473msgid "the commit is authored by me now (used with -C/-c/--amend)"
7474msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
7475
7476#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
7477#: builtin/revert.c:105
7478msgid "add Signed-off-by:"
7479msgstr "添加 Signed-off-by: 签名"
7480
7481#: builtin/commit.c:1610
7482msgid "use specified template file"
7483msgstr "使用指定的模板文件"
7484
7485#: builtin/commit.c:1611
7486msgid "force edit of commit"
7487msgstr "强制编辑提交"
7488
7489#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7490#: builtin/commit.c:1612
7491msgid "default"
7492msgstr "default"
7493
7494#: builtin/commit.c:1612 builtin/tag.c:391
7495msgid "how to strip spaces and #comments from message"
7496msgstr "设置如何删除提交说明里的空格和#注释"
7497
7498#: builtin/commit.c:1613
7499msgid "include status in commit message template"
7500msgstr "在提交说明模板里包含状态信息"
7501
7502#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
7503#: builtin/revert.c:113
7504msgid "GPG sign commit"
7505msgstr "GPG 提交签名"
7506
7507#: builtin/commit.c:1618
7508msgid "Commit contents options"
7509msgstr "提交内容选项"
7510
7511#: builtin/commit.c:1619
7512msgid "commit all changed files"
7513msgstr "提交所有改动的文件"
7514
7515#: builtin/commit.c:1620
7516msgid "add specified files to index for commit"
7517msgstr "添加指定的文件到索引区等待提交"
7518
7519#: builtin/commit.c:1621
7520msgid "interactively add files"
7521msgstr "交互式添加文件"
7522
7523#: builtin/commit.c:1622
7524msgid "interactively add changes"
7525msgstr "交互式添加变更"
7526
7527#: builtin/commit.c:1623
7528msgid "commit only specified files"
7529msgstr "只提交指定的文件"
7530
7531#: builtin/commit.c:1624
7532msgid "bypass pre-commit and commit-msg hooks"
7533msgstr "绕过 pre-commit 和 commit-msg 钩子"
7534
7535#: builtin/commit.c:1625
7536msgid "show what would be committed"
7537msgstr "显示将要提交的内容"
7538
7539#: builtin/commit.c:1636
7540msgid "amend previous commit"
7541msgstr "修改先前的提交"
7542
7543#: builtin/commit.c:1637
7544msgid "bypass post-rewrite hook"
7545msgstr "绕过 post-rewrite 钩子"
7546
7547#: builtin/commit.c:1642
7548msgid "ok to record an empty change"
7549msgstr "允许一个空提交"
7550
7551#: builtin/commit.c:1644
7552msgid "ok to record a change with an empty message"
7553msgstr "允许空的提交说明"
7554
7555#: builtin/commit.c:1674
7556msgid "could not parse HEAD commit"
7557msgstr "不能解析 HEAD 提交"
7558
7559#: builtin/commit.c:1719
7560#, c-format
7561msgid "Corrupt MERGE_HEAD file (%s)"
7562msgstr "损坏的 MERGE_HEAD 文件(%s)"
7563
7564#: builtin/commit.c:1726
7565msgid "could not read MERGE_MODE"
7566msgstr "不能读取 MERGE_MODE"
7567
7568#: builtin/commit.c:1745
7569#, c-format
7570msgid "could not read commit message: %s"
7571msgstr "不能读取提交说明:%s"
7572
7573#: builtin/commit.c:1756
7574#, c-format
7575msgid "Aborting commit due to empty commit message.\n"
7576msgstr "终止提交因为提交说明为空。\n"
7577
7578#: builtin/commit.c:1761
7579#, c-format
7580msgid "Aborting commit; you did not edit the message.\n"
7581msgstr "终止提交;您未更改来自模版的提交说明。\n"
7582
7583#: builtin/commit.c:1809
7584msgid ""
7585"Repository has been updated, but unable to write\n"
7586"new_index file. Check that disk is not full and quota is\n"
7587"not exceeded, and then \"git reset HEAD\" to recover."
7588msgstr ""
7589"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
7590"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
7591
7592#: builtin/config.c:10
7593msgid "git config [<options>]"
7594msgstr "git config [<选项>]"
7595
7596#: builtin/config.c:57
7597msgid "Config file location"
7598msgstr "配置文件位置"
7599
7600#: builtin/config.c:58
7601msgid "use global config file"
7602msgstr "使用全局配置文件"
7603
7604#: builtin/config.c:59
7605msgid "use system config file"
7606msgstr "使用系统级配置文件"
7607
7608#: builtin/config.c:60
7609msgid "use repository config file"
7610msgstr "使用仓库级配置文件"
7611
7612#: builtin/config.c:61
7613msgid "use given config file"
7614msgstr "使用指定的配置文件"
7615
7616#: builtin/config.c:62
7617msgid "blob-id"
7618msgstr "数据对象 ID"
7619
7620#: builtin/config.c:62
7621msgid "read config from given blob object"
7622msgstr "从给定的数据对象读取配置"
7623
7624#: builtin/config.c:63
7625msgid "Action"
7626msgstr "操作"
7627
7628#: builtin/config.c:64
7629msgid "get value: name [value-regex]"
7630msgstr "获取值:name [value-regex]"
7631
7632#: builtin/config.c:65
7633msgid "get all values: key [value-regex]"
7634msgstr "获得所有的值:key [value-regex]"
7635
7636#: builtin/config.c:66
7637msgid "get values for regexp: name-regex [value-regex]"
7638msgstr "根据正则表达式获得值:name-regex [value-regex]"
7639
7640#: builtin/config.c:67
7641msgid "get value specific for the URL: section[.var] URL"
7642msgstr "获得 URL 取值:section[.var] URL"
7643
7644#: builtin/config.c:68
7645msgid "replace all matching variables: name value [value_regex]"
7646msgstr "替换所有匹配的变量:name value [value_regex]"
7647
7648#: builtin/config.c:69
7649msgid "add a new variable: name value"
7650msgstr "添加一个新的变量:name value"
7651
7652#: builtin/config.c:70
7653msgid "remove a variable: name [value-regex]"
7654msgstr "删除一个变量:name [value-regex]"
7655
7656#: builtin/config.c:71
7657msgid "remove all matches: name [value-regex]"
7658msgstr "删除所有匹配项:name [value-regex]"
7659
7660#: builtin/config.c:72
7661msgid "rename section: old-name new-name"
7662msgstr "重命名小节:old-name new-name"
7663
7664#: builtin/config.c:73
7665msgid "remove a section: name"
7666msgstr "删除一个小节:name"
7667
7668#: builtin/config.c:74
7669msgid "list all"
7670msgstr "列出所有"
7671
7672#: builtin/config.c:75
7673msgid "open an editor"
7674msgstr "打开一个编辑器"
7675
7676#: builtin/config.c:76
7677msgid "find the color configured: slot [default]"
7678msgstr "获得配置的颜色:配置 [默认]"
7679
7680#: builtin/config.c:77
7681msgid "find the color setting: slot [stdout-is-tty]"
7682msgstr "获得颜色设置:配置 [stdout-is-tty]"
7683
7684#: builtin/config.c:78
7685msgid "Type"
7686msgstr "类型"
7687
7688#: builtin/config.c:79
7689msgid "value is \"true\" or \"false\""
7690msgstr "值是 \"true\" 或 \"false\""
7691
7692#: builtin/config.c:80
7693msgid "value is decimal number"
7694msgstr "值是十进制数"
7695
7696#: builtin/config.c:81
7697msgid "value is --bool or --int"
7698msgstr "值是 --bool or --int"
7699
7700#: builtin/config.c:82
7701msgid "value is a path (file or directory name)"
7702msgstr "值是一个路径(文件或目录名)"
7703
7704#: builtin/config.c:83
7705msgid "Other"
7706msgstr "其它"
7707
7708#: builtin/config.c:84
7709msgid "terminate values with NUL byte"
7710msgstr "终止值是 NUL 字节"
7711
7712#: builtin/config.c:85
7713msgid "show variable names only"
7714msgstr "只显示变量名"
7715
7716#: builtin/config.c:86
7717msgid "respect include directives on lookup"
7718msgstr "查询时参照 include 指令递归查找"
7719
7720#: builtin/config.c:87
7721msgid "show origin of config (file, standard input, blob, command line)"
7722msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7723
7724#: builtin/config.c:327
7725msgid "unable to parse default color value"
7726msgstr "不能解析默认颜色值"
7727
7728#: builtin/config.c:471
7729#, c-format
7730msgid ""
7731"# This is Git's per-user configuration file.\n"
7732"[user]\n"
7733"# Please adapt and uncomment the following lines:\n"
7734"#\tname = %s\n"
7735"#\temail = %s\n"
7736msgstr ""
7737"# This is Git's per-user configuration file.\n"
7738"[user]\n"
7739"# Please adapt and uncomment the following lines:\n"
7740"#\tname = %s\n"
7741"#\temail = %s\n"
7742
7743#: builtin/config.c:499
7744msgid "--local can only be used inside a git repository"
7745msgstr "--local 只能在一个仓库内使用"
7746
7747#: builtin/config.c:624
7748#, c-format
7749msgid "cannot create configuration file %s"
7750msgstr "不能创建配置文件 %s"
7751
7752#: builtin/config.c:637
7753#, c-format
7754msgid ""
7755"cannot overwrite multiple values with a single value\n"
7756"       Use a regexp, --add or --replace-all to change %s."
7757msgstr ""
7758"无法用一个值覆盖多个值\n"
7759"       使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7760
7761#: builtin/count-objects.c:88
7762msgid "git count-objects [-v] [-H | --human-readable]"
7763msgstr "git count-objects [-v] [-H | --human-readable]"
7764
7765#: builtin/count-objects.c:98
7766msgid "print sizes in human readable format"
7767msgstr "以用户可读的格式显示大小"
7768
7769#: builtin/describe.c:19
7770msgid "git describe [<options>] [<commit-ish>...]"
7771msgstr "git describe [<选项>] [<提交号>...]"
7772
7773#: builtin/describe.c:20
7774msgid "git describe [<options>] --dirty"
7775msgstr "git describe [<选项>] --dirty"
7776
7777#: builtin/describe.c:54
7778msgid "head"
7779msgstr "头"
7780
7781#: builtin/describe.c:54
7782msgid "lightweight"
7783msgstr "轻量级的"
7784
7785#: builtin/describe.c:54
7786msgid "annotated"
7787msgstr "附注的"
7788
7789#: builtin/describe.c:264
7790#, c-format
7791msgid "annotated tag %s not available"
7792msgstr "附注标签 %s 无效"
7793
7794#: builtin/describe.c:268
7795#, c-format
7796msgid "annotated tag %s has no embedded name"
7797msgstr "附注标签 %s 没有嵌入名称"
7798
7799#: builtin/describe.c:270
7800#, c-format
7801msgid "tag '%s' is really '%s' here"
7802msgstr "标签 '%s' 的确是在 '%s'"
7803
7804#: builtin/describe.c:297 builtin/log.c:493
7805#, c-format
7806msgid "Not a valid object name %s"
7807msgstr "不是一个有效的对象名 %s"
7808
7809#: builtin/describe.c:300
7810#, c-format
7811msgid "%s is not a valid '%s' object"
7812msgstr "%s 不是一个有效的 '%s' 对象"
7813
7814#: builtin/describe.c:317
7815#, c-format
7816msgid "no tag exactly matches '%s'"
7817msgstr "没有标签准确匹配 '%s'"
7818
7819#: builtin/describe.c:319
7820#, c-format
7821msgid "searching to describe %s\n"
7822msgstr "搜索描述 %s\n"
7823
7824#: builtin/describe.c:366
7825#, c-format
7826msgid "finished search at %s\n"
7827msgstr "完成搜索 %s\n"
7828
7829#: builtin/describe.c:393
7830#, c-format
7831msgid ""
7832"No annotated tags can describe '%s'.\n"
7833"However, there were unannotated tags: try --tags."
7834msgstr ""
7835"没有附注标签能描述 '%s'。\n"
7836"然而,存在未附注标签:尝试 --tags。"
7837
7838#: builtin/describe.c:397
7839#, c-format
7840msgid ""
7841"No tags can describe '%s'.\n"
7842"Try --always, or create some tags."
7843msgstr ""
7844"没有标签能描述 '%s'。\n"
7845"尝试 --always,或者创建一些标签。"
7846
7847#: builtin/describe.c:427
7848#, c-format
7849msgid "traversed %lu commits\n"
7850msgstr "已遍历 %lu 个提交\n"
7851
7852#: builtin/describe.c:430
7853#, c-format
7854msgid ""
7855"more than %i tags found; listed %i most recent\n"
7856"gave up search at %s\n"
7857msgstr ""
7858"发现多于 %i 个标签,列出最近的 %i 个\n"
7859"在 %s 放弃搜索\n"
7860
7861#: builtin/describe.c:452
7862msgid "find the tag that comes after the commit"
7863msgstr "寻找该提交之后的标签"
7864
7865#: builtin/describe.c:453
7866msgid "debug search strategy on stderr"
7867msgstr "在标准错误上调试搜索策略"
7868
7869#: builtin/describe.c:454
7870msgid "use any ref"
7871msgstr "使用任意引用"
7872
7873#: builtin/describe.c:455
7874msgid "use any tag, even unannotated"
7875msgstr "使用任意标签,即使未附带注释"
7876
7877#: builtin/describe.c:456
7878msgid "always use long format"
7879msgstr "始终使用长提交号格式"
7880
7881#: builtin/describe.c:457
7882msgid "only follow first parent"
7883msgstr "只跟随第一个父提交"
7884
7885#: builtin/describe.c:460
7886msgid "only output exact matches"
7887msgstr "只输出精确匹配"
7888
7889#: builtin/describe.c:462
7890msgid "consider <n> most recent tags (default: 10)"
7891msgstr "考虑最近 <n> 个标签(默认:10)"
7892
7893#: builtin/describe.c:464
7894msgid "only consider tags matching <pattern>"
7895msgstr "只考虑匹配 <模式> 的标签"
7896
7897#: builtin/describe.c:466
7898msgid "do not consider tags matching <pattern>"
7899msgstr "不考虑匹配 <模式> 的标签"
7900
7901#: builtin/describe.c:468 builtin/name-rev.c:406
7902msgid "show abbreviated commit object as fallback"
7903msgstr "显示简写的提交号作为后备"
7904
7905#: builtin/describe.c:469 builtin/describe.c:472
7906msgid "mark"
7907msgstr "标记"
7908
7909#: builtin/describe.c:470
7910msgid "append <mark> on dirty working tree (default: \"-dirty\")"
7911msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
7912
7913#: builtin/describe.c:473
7914msgid "append <mark> on broken working tree (default: \"-broken\")"
7915msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
7916
7917#: builtin/describe.c:491
7918msgid "--long is incompatible with --abbrev=0"
7919msgstr "--long 与 --abbrev=0 不兼容"
7920
7921#: builtin/describe.c:520
7922msgid "No names found, cannot describe anything."
7923msgstr "没有发现名称,无法描述任何东西。"
7924
7925#: builtin/describe.c:563
7926msgid "--dirty is incompatible with commit-ishes"
7927msgstr "--dirty 与提交号不兼容"
7928
7929#: builtin/describe.c:565
7930msgid "--broken is incompatible with commit-ishes"
7931msgstr "--broken 与提交号不兼容"
7932
7933#: builtin/diff.c:83
7934#, c-format
7935msgid "'%s': not a regular file or symlink"
7936msgstr "'%s':不是一个正规文件或符号链接"
7937
7938#: builtin/diff.c:235
7939#, c-format
7940msgid "invalid option: %s"
7941msgstr "无效选项:%s"
7942
7943#: builtin/diff.c:357
7944msgid "Not a git repository"
7945msgstr "不是一个 git 仓库"
7946
7947#: builtin/diff.c:400
7948#, c-format
7949msgid "invalid object '%s' given."
7950msgstr "提供了无效对象 '%s'。"
7951
7952#: builtin/diff.c:409
7953#, c-format
7954msgid "more than two blobs given: '%s'"
7955msgstr "提供了超过两个数据对象:'%s'"
7956
7957#: builtin/diff.c:414
7958#, c-format
7959msgid "unhandled object '%s' given."
7960msgstr "无法处理的对象 '%s'。"
7961
7962#: builtin/difftool.c:29
7963msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
7964msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
7965
7966#: builtin/difftool.c:259
7967#, c-format
7968msgid "failed: %d"
7969msgstr "失败:%d"
7970
7971#: builtin/difftool.c:301
7972#, c-format
7973msgid "could not read symlink %s"
7974msgstr "无法读取符号链接 %s"
7975
7976#: builtin/difftool.c:303
7977#, c-format
7978msgid "could not read symlink file %s"
7979msgstr "无法读取符号链接文件 %s"
7980
7981#: builtin/difftool.c:311
7982#, c-format
7983msgid "could not read object %s for symlink %s"
7984msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
7985
7986#: builtin/difftool.c:412
7987msgid ""
7988"combined diff formats('-c' and '--cc') are not supported in\n"
7989"directory diff mode('-d' and '--dir-diff')."
7990msgstr ""
7991"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
7992"cc')。"
7993
7994#: builtin/difftool.c:633
7995#, c-format
7996msgid "both files modified: '%s' and '%s'."
7997msgstr "两个文件都被修改:'%s' 和 '%s'。"
7998
7999#: builtin/difftool.c:635
8000msgid "working tree file has been left."
8001msgstr "工作区文件被留了下来。"
8002
8003#: builtin/difftool.c:646
8004#, c-format
8005msgid "temporary files exist in '%s'."
8006msgstr "临时文件存在于 '%s'。"
8007
8008#: builtin/difftool.c:647
8009msgid "you may want to cleanup or recover these."
8010msgstr "您可能想要清理或者恢复它们。"
8011
8012#: builtin/difftool.c:696
8013msgid "use `diff.guitool` instead of `diff.tool`"
8014msgstr "使用 `diff.guitool` 代替 `diff.tool`"
8015
8016#: builtin/difftool.c:698
8017msgid "perform a full-directory diff"
8018msgstr "执行一个全目录差异比较"
8019
8020#: builtin/difftool.c:700
8021msgid "do not prompt before launching a diff tool"
8022msgstr "启动差异比较工具之前不提示"
8023
8024#: builtin/difftool.c:706
8025msgid "use symlinks in dir-diff mode"
8026msgstr "在 dir-diff 模式中使用符号链接"
8027
8028#: builtin/difftool.c:707
8029msgid "<tool>"
8030msgstr "<工具>"
8031
8032#: builtin/difftool.c:708
8033msgid "use the specified diff tool"
8034msgstr "使用指定的差异比较工具"
8035
8036#: builtin/difftool.c:710
8037msgid "print a list of diff tools that may be used with `--tool`"
8038msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
8039
8040#: builtin/difftool.c:713
8041msgid ""
8042"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
8043"code"
8044msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
8045
8046#: builtin/difftool.c:715
8047msgid "<command>"
8048msgstr "<命令>"
8049
8050#: builtin/difftool.c:716
8051msgid "specify a custom command for viewing diffs"
8052msgstr "指定一个用于查看差异的自定义命令"
8053
8054#: builtin/difftool.c:740
8055msgid "no <tool> given for --tool=<tool>"
8056msgstr "没有为 --tool=<工具> 参数提供 <工具>"
8057
8058#: builtin/difftool.c:747
8059msgid "no <cmd> given for --extcmd=<cmd>"
8060msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
8061
8062#: builtin/fast-export.c:26
8063msgid "git fast-export [rev-list-opts]"
8064msgstr "git fast-export [rev-list-opts]"
8065
8066#: builtin/fast-export.c:998
8067msgid "show progress after <n> objects"
8068msgstr "在 <n> 个对象之后显示进度"
8069
8070#: builtin/fast-export.c:1000
8071msgid "select handling of signed tags"
8072msgstr "选择如何处理签名标签"
8073
8074#: builtin/fast-export.c:1003
8075msgid "select handling of tags that tag filtered objects"
8076msgstr "选择当标签指向被过滤对象时该标签的处理方式"
8077
8078#: builtin/fast-export.c:1006
8079msgid "Dump marks to this file"
8080msgstr "把标记存储到这个文件"
8081
8082#: builtin/fast-export.c:1008
8083msgid "Import marks from this file"
8084msgstr "从这个文件导入标记"
8085
8086#: builtin/fast-export.c:1010
8087msgid "Fake a tagger when tags lack one"
8088msgstr "当标签缺少标记者字段时,假装提供一个"
8089
8090#: builtin/fast-export.c:1012
8091msgid "Output full tree for each commit"
8092msgstr "每次提交都输出整个树"
8093
8094#: builtin/fast-export.c:1014
8095msgid "Use the done feature to terminate the stream"
8096msgstr "使用 done 功能来终止流"
8097
8098#: builtin/fast-export.c:1015
8099msgid "Skip output of blob data"
8100msgstr "跳过数据对象的输出"
8101
8102#: builtin/fast-export.c:1016
8103msgid "refspec"
8104msgstr "引用规格"
8105
8106#: builtin/fast-export.c:1017
8107msgid "Apply refspec to exported refs"
8108msgstr "对导出的引用应用引用规格"
8109
8110#: builtin/fast-export.c:1018
8111msgid "anonymize output"
8112msgstr "匿名输出"
8113
8114#: builtin/fetch.c:23
8115msgid "git fetch [<options>] [<repository> [<refspec>...]]"
8116msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
8117
8118#: builtin/fetch.c:24
8119msgid "git fetch [<options>] <group>"
8120msgstr "git fetch [<选项>] <组>"
8121
8122#: builtin/fetch.c:25
8123msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
8124msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
8125
8126#: builtin/fetch.c:26
8127msgid "git fetch --all [<options>]"
8128msgstr "git fetch --all [<选项>]"
8129
8130#: builtin/fetch.c:112 builtin/pull.c:182
8131msgid "fetch from all remotes"
8132msgstr "从所有的远程抓取"
8133
8134#: builtin/fetch.c:114 builtin/pull.c:185
8135msgid "append to .git/FETCH_HEAD instead of overwriting"
8136msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
8137
8138#: builtin/fetch.c:116 builtin/pull.c:188
8139msgid "path to upload pack on remote end"
8140msgstr "上传包到远程的路径"
8141
8142#: builtin/fetch.c:117 builtin/pull.c:190
8143msgid "force overwrite of local branch"
8144msgstr "强制覆盖本地分支"
8145
8146#: builtin/fetch.c:119
8147msgid "fetch from multiple remotes"
8148msgstr "从多个远程抓取"
8149
8150#: builtin/fetch.c:121 builtin/pull.c:192
8151msgid "fetch all tags and associated objects"
8152msgstr "抓取所有的标签和关联对象"
8153
8154#: builtin/fetch.c:123
8155msgid "do not fetch all tags (--no-tags)"
8156msgstr "不抓取任何标签(--no-tags)"
8157
8158#: builtin/fetch.c:125
8159msgid "number of submodules fetched in parallel"
8160msgstr "子模组获取的并发数"
8161
8162#: builtin/fetch.c:127 builtin/pull.c:195
8163msgid "prune remote-tracking branches no longer on remote"
8164msgstr "清除远程已经不存在的分支的跟踪分支"
8165
8166#  译者:可选值,不能翻译
8167#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
8168msgid "on-demand"
8169msgstr "on-demand"
8170
8171#: builtin/fetch.c:129
8172msgid "control recursive fetching of submodules"
8173msgstr "控制子模组的递归抓取"
8174
8175#: builtin/fetch.c:133 builtin/pull.c:203
8176msgid "keep downloaded pack"
8177msgstr "保持下载包"
8178
8179#: builtin/fetch.c:135
8180msgid "allow updating of HEAD ref"
8181msgstr "允许更新 HEAD 引用"
8182
8183#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
8184msgid "deepen history of shallow clone"
8185msgstr "深化浅克隆的历史"
8186
8187#: builtin/fetch.c:140
8188msgid "deepen history of shallow repository based on time"
8189msgstr "基于时间来深化浅克隆的历史"
8190
8191#: builtin/fetch.c:146 builtin/pull.c:209
8192msgid "convert to a complete repository"
8193msgstr "转换为一个完整的仓库"
8194
8195#: builtin/fetch.c:148 builtin/log.c:1456
8196msgid "dir"
8197msgstr "目录"
8198
8199#: builtin/fetch.c:149
8200msgid "prepend this to submodule path output"
8201msgstr "在子模组路径输出的前面加上此目录"
8202
8203#: builtin/fetch.c:152
8204msgid ""
8205"default for recursive fetching of submodules (lower priority than config "
8206"files)"
8207msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
8208
8209#: builtin/fetch.c:156 builtin/pull.c:212
8210msgid "accept refs that update .git/shallow"
8211msgstr "接受更新 .git/shallow 的引用"
8212
8213#: builtin/fetch.c:157 builtin/pull.c:214
8214msgid "refmap"
8215msgstr "引用映射"
8216
8217#: builtin/fetch.c:158 builtin/pull.c:215
8218msgid "specify fetch refmap"
8219msgstr "指定获取操作的引用映射"
8220
8221#: builtin/fetch.c:416
8222msgid "Couldn't find remote ref HEAD"
8223msgstr "无法发现远程 HEAD 引用"
8224
8225#: builtin/fetch.c:534
8226#, c-format
8227msgid "configuration fetch.output contains invalid value %s"
8228msgstr "配置变量 fetch.output 包含无效值 %s"
8229
8230#: builtin/fetch.c:627
8231#, c-format
8232msgid "object %s not found"
8233msgstr "对象 %s 未发现"
8234
8235#: builtin/fetch.c:631
8236msgid "[up to date]"
8237msgstr "[最新]"
8238
8239#: builtin/fetch.c:644 builtin/fetch.c:724
8240msgid "[rejected]"
8241msgstr "[已拒绝]"
8242
8243#: builtin/fetch.c:645
8244msgid "can't fetch in current branch"
8245msgstr "当前分支下不能执行获取操作"
8246
8247#: builtin/fetch.c:654
8248msgid "[tag update]"
8249msgstr "[标签更新]"
8250
8251#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
8252#: builtin/fetch.c:719
8253msgid "unable to update local ref"
8254msgstr "不能更新本地引用"
8255
8256#: builtin/fetch.c:674
8257msgid "[new tag]"
8258msgstr "[新标签]"
8259
8260#: builtin/fetch.c:677
8261msgid "[new branch]"
8262msgstr "[新分支]"
8263
8264#: builtin/fetch.c:680
8265msgid "[new ref]"
8266msgstr "[新引用]"
8267
8268#: builtin/fetch.c:719
8269msgid "forced update"
8270msgstr "强制更新"
8271
8272#: builtin/fetch.c:724
8273msgid "non-fast-forward"
8274msgstr "非快进"
8275
8276#: builtin/fetch.c:769
8277#, c-format
8278msgid "%s did not send all necessary objects\n"
8279msgstr "%s 未发送所有必须的对象\n"
8280
8281#: builtin/fetch.c:789
8282#, c-format
8283msgid "reject %s because shallow roots are not allowed to be updated"
8284msgstr "拒绝 %s 因为浅克隆不允许被更新"
8285
8286#: builtin/fetch.c:877 builtin/fetch.c:973
8287#, c-format
8288msgid "From %.*s\n"
8289msgstr "来自 %.*s\n"
8290
8291#: builtin/fetch.c:888
8292#, c-format
8293msgid ""
8294"some local refs could not be updated; try running\n"
8295" 'git remote prune %s' to remove any old, conflicting branches"
8296msgstr ""
8297"一些本地引用不能被更新;尝试运行\n"
8298" 'git remote prune %s' 来删除旧的、有冲突的分支"
8299
8300#  译者:注意保持前导空格
8301#: builtin/fetch.c:943
8302#, c-format
8303msgid "   (%s will become dangling)"
8304msgstr "   (%s 将成为摇摆状态)"
8305
8306#  译者:注意保持前导空格
8307#: builtin/fetch.c:944
8308#, c-format
8309msgid "   (%s has become dangling)"
8310msgstr "   (%s 已成为摇摆状态)"
8311
8312#: builtin/fetch.c:976
8313msgid "[deleted]"
8314msgstr "[已删除]"
8315
8316#: builtin/fetch.c:977 builtin/remote.c:1024
8317msgid "(none)"
8318msgstr "(无)"
8319
8320#: builtin/fetch.c:1000
8321#, c-format
8322msgid "Refusing to fetch into current branch %s of non-bare repository"
8323msgstr "拒绝获取到非纯仓库的当前分支 %s"
8324
8325#: builtin/fetch.c:1019
8326#, c-format
8327msgid "Option \"%s\" value \"%s\" is not valid for %s"
8328msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
8329
8330#: builtin/fetch.c:1022
8331#, c-format
8332msgid "Option \"%s\" is ignored for %s\n"
8333msgstr "选项 \"%s\" 为 %s 所忽略\n"
8334
8335#: builtin/fetch.c:1098
8336#, c-format
8337msgid "Don't know how to fetch from %s"
8338msgstr "不知道如何从 %s 获取"
8339
8340#: builtin/fetch.c:1258
8341#, c-format
8342msgid "Fetching %s\n"
8343msgstr "正在获取 %s\n"
8344
8345#: builtin/fetch.c:1260 builtin/remote.c:97
8346#, c-format
8347msgid "Could not fetch %s"
8348msgstr "不能获取 %s"
8349
8350#: builtin/fetch.c:1278
8351msgid ""
8352"No remote repository specified.  Please, specify either a URL or a\n"
8353"remote name from which new revisions should be fetched."
8354msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
8355
8356#: builtin/fetch.c:1301
8357msgid "You need to specify a tag name."
8358msgstr "您需要指定一个标签名称。"
8359
8360#: builtin/fetch.c:1344
8361msgid "Negative depth in --deepen is not supported"
8362msgstr "--deepen 不支持负数深度"
8363
8364#: builtin/fetch.c:1346
8365msgid "--deepen and --depth are mutually exclusive"
8366msgstr "--deepen 和 --depth 是互斥的"
8367
8368#: builtin/fetch.c:1351
8369msgid "--depth and --unshallow cannot be used together"
8370msgstr "--depth 和 --unshallow 不能同时使用"
8371
8372#: builtin/fetch.c:1353
8373msgid "--unshallow on a complete repository does not make sense"
8374msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
8375
8376#: builtin/fetch.c:1366
8377msgid "fetch --all does not take a repository argument"
8378msgstr "fetch --all 不能带一个仓库参数"
8379
8380#: builtin/fetch.c:1368
8381msgid "fetch --all does not make sense with refspecs"
8382msgstr "fetch --all 带引用规格没有任何意义"
8383
8384#: builtin/fetch.c:1379
8385#, c-format
8386msgid "No such remote or remote group: %s"
8387msgstr "没有这样的远程或远程组:%s"
8388
8389#: builtin/fetch.c:1387
8390msgid "Fetching a group and specifying refspecs does not make sense"
8391msgstr "获取组并指定引用规格没有意义"
8392
8393#: builtin/fmt-merge-msg.c:15
8394msgid ""
8395"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
8396msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
8397
8398#: builtin/fmt-merge-msg.c:665
8399msgid "populate log with at most <n> entries from shortlog"
8400msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
8401
8402#: builtin/fmt-merge-msg.c:668
8403msgid "alias for --log (deprecated)"
8404msgstr "参数 --log 的别名(已弃用)"
8405
8406#: builtin/fmt-merge-msg.c:671
8407msgid "text"
8408msgstr "文本"
8409
8410#: builtin/fmt-merge-msg.c:672
8411msgid "use <text> as start of message"
8412msgstr "使用 <文本> 作为提交说明的开始"
8413
8414#: builtin/fmt-merge-msg.c:673
8415msgid "file to read from"
8416msgstr "从文件中读取"
8417
8418#: builtin/for-each-ref.c:10
8419msgid "git for-each-ref [<options>] [<pattern>]"
8420msgstr "git for-each-ref [<选项>] [<模式>]"
8421
8422#: builtin/for-each-ref.c:11
8423msgid "git for-each-ref [--points-at <object>]"
8424msgstr "git for-each-ref [--points-at <对象>]"
8425
8426#: builtin/for-each-ref.c:12
8427msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
8428msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
8429
8430#: builtin/for-each-ref.c:13
8431msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
8432msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
8433
8434#: builtin/for-each-ref.c:28
8435msgid "quote placeholders suitably for shells"
8436msgstr "引用占位符适用于 shells"
8437
8438#: builtin/for-each-ref.c:30
8439msgid "quote placeholders suitably for perl"
8440msgstr "引用占位符适用于 perl"
8441
8442#: builtin/for-each-ref.c:32
8443msgid "quote placeholders suitably for python"
8444msgstr "引用占位符适用于 python"
8445
8446#: builtin/for-each-ref.c:34
8447msgid "quote placeholders suitably for Tcl"
8448msgstr "引用占位符适用于 Tcl"
8449
8450#: builtin/for-each-ref.c:37
8451msgid "show only <n> matched refs"
8452msgstr "只显示 <n> 个匹配的引用"
8453
8454#: builtin/for-each-ref.c:39 builtin/tag.c:414
8455msgid "respect format colors"
8456msgstr "遵照格式中的颜色输出"
8457
8458#: builtin/for-each-ref.c:43
8459msgid "print only refs which points at the given object"
8460msgstr "只打印指向给定对象的引用"
8461
8462#: builtin/for-each-ref.c:45
8463msgid "print only refs that are merged"
8464msgstr "只打印已经合并的引用"
8465
8466#: builtin/for-each-ref.c:46
8467msgid "print only refs that are not merged"
8468msgstr "只打印没有合并的引用"
8469
8470#: builtin/for-each-ref.c:47
8471msgid "print only refs which contain the commit"
8472msgstr "只打印包含该提交的引用"
8473
8474#: builtin/for-each-ref.c:48
8475msgid "print only refs which don't contain the commit"
8476msgstr "只打印不包含该提交的引用"
8477
8478#: builtin/fsck.c:543
8479msgid "Checking object directories"
8480msgstr "检查对象目录中"
8481
8482#: builtin/fsck.c:635
8483msgid "git fsck [<options>] [<object>...]"
8484msgstr "git fsck [<选项>] [<对象>...]"
8485
8486#: builtin/fsck.c:641
8487msgid "show unreachable objects"
8488msgstr "显示不可达的对象"
8489
8490#: builtin/fsck.c:642
8491msgid "show dangling objects"
8492msgstr "显示摇摆的对象"
8493
8494#: builtin/fsck.c:643
8495msgid "report tags"
8496msgstr "报告标签"
8497
8498#: builtin/fsck.c:644
8499msgid "report root nodes"
8500msgstr "报告根节点"
8501
8502#: builtin/fsck.c:645
8503msgid "make index objects head nodes"
8504msgstr "将索引亦作为检查的头节点"
8505
8506#: builtin/fsck.c:646
8507msgid "make reflogs head nodes (default)"
8508msgstr "将引用日志作为检查的头节点(默认)"
8509
8510#: builtin/fsck.c:647
8511msgid "also consider packs and alternate objects"
8512msgstr "也考虑包和备用对象"
8513
8514#: builtin/fsck.c:648
8515msgid "check only connectivity"
8516msgstr "仅检查连通性"
8517
8518#: builtin/fsck.c:649
8519msgid "enable more strict checking"
8520msgstr "启用更严格的检查"
8521
8522#: builtin/fsck.c:651
8523msgid "write dangling objects in .git/lost-found"
8524msgstr "将摇摆对象写入 .git/lost-found 中"
8525
8526#: builtin/fsck.c:652 builtin/prune.c:107
8527msgid "show progress"
8528msgstr "显示进度"
8529
8530#: builtin/fsck.c:653
8531msgid "show verbose names for reachable objects"
8532msgstr "显示可达对象的详细名称"
8533
8534#: builtin/fsck.c:714
8535msgid "Checking objects"
8536msgstr "检查对象中"
8537
8538#: builtin/gc.c:27
8539msgid "git gc [<options>]"
8540msgstr "git gc [<选项>]"
8541
8542#: builtin/gc.c:80
8543#, c-format
8544msgid "Failed to fstat %s: %s"
8545msgstr "对 %s 调用 fstat 失败:%s"
8546
8547#: builtin/gc.c:312
8548#, c-format
8549msgid "Can't stat %s"
8550msgstr "不能对 %s 调用 stat"
8551
8552#: builtin/gc.c:321
8553#, c-format
8554msgid ""
8555"The last gc run reported the following. Please correct the root cause\n"
8556"and remove %s.\n"
8557"Automatic cleanup will not be performed until the file is removed.\n"
8558"\n"
8559"%s"
8560msgstr ""
8561"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
8562"在该文件被删除之前,自动清理将不会执行。\n"
8563"\n"
8564"%s"
8565
8566#: builtin/gc.c:360
8567msgid "prune unreferenced objects"
8568msgstr "清除未引用的对象"
8569
8570#: builtin/gc.c:362
8571msgid "be more thorough (increased runtime)"
8572msgstr "更彻底(增加运行时间)"
8573
8574#: builtin/gc.c:363
8575msgid "enable auto-gc mode"
8576msgstr "启用自动垃圾回收模式"
8577
8578#: builtin/gc.c:364
8579msgid "force running gc even if there may be another gc running"
8580msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8581
8582#: builtin/gc.c:381
8583#, c-format
8584msgid "Failed to parse gc.logexpiry value %s"
8585msgstr "无法解析 gc.logexpiry 的值 %s"
8586
8587#: builtin/gc.c:409
8588#, c-format
8589msgid "Auto packing the repository in background for optimum performance.\n"
8590msgstr "自动在后台执行仓库打包以求最佳性能。\n"
8591
8592#: builtin/gc.c:411
8593#, c-format
8594msgid "Auto packing the repository for optimum performance.\n"
8595msgstr "自动打包仓库以求最佳性能。\n"
8596
8597#: builtin/gc.c:412
8598#, c-format
8599msgid "See \"git help gc\" for manual housekeeping.\n"
8600msgstr "手工维护参见 \"git help gc\"。\n"
8601
8602#: builtin/gc.c:437
8603#, c-format
8604msgid ""
8605"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8606msgstr ""
8607"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
8608
8609#: builtin/gc.c:481
8610msgid ""
8611"There are too many unreachable loose objects; run 'git prune' to remove them."
8612msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
8613
8614#: builtin/grep.c:27
8615msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8616msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
8617
8618#: builtin/grep.c:226
8619#, c-format
8620msgid "grep: failed to create thread: %s"
8621msgstr "grep:无法创建线程:%s"
8622
8623#: builtin/grep.c:284
8624#, c-format
8625msgid "invalid number of threads specified (%d) for %s"
8626msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8627
8628#. TRANSLATORS: %s is the configuration
8629#. variable for tweaking threads, currently
8630#. grep.threads
8631#.
8632#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
8633#, c-format
8634msgid "no threads support, ignoring %s"
8635msgstr "没有线程支持,忽略 %s"
8636
8637#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
8638#, c-format
8639msgid "unable to read tree (%s)"
8640msgstr "无法读取树(%s)"
8641
8642#: builtin/grep.c:628
8643#, c-format
8644msgid "unable to grep from object of type %s"
8645msgstr "无法抓取来自于 %s 类型的对象"
8646
8647#: builtin/grep.c:694
8648#, c-format
8649msgid "switch `%c' expects a numerical value"
8650msgstr "开关 `%c' 期望一个数字值"
8651
8652#: builtin/grep.c:781
8653msgid "search in index instead of in the work tree"
8654msgstr "在索引区搜索而不是在工作区"
8655
8656#: builtin/grep.c:783
8657msgid "find in contents not managed by git"
8658msgstr "在未被 git 管理的内容中查找"
8659
8660#  译者:中文字符串拼接,可删除前导空格
8661#: builtin/grep.c:785
8662msgid "search in both tracked and untracked files"
8663msgstr "在跟踪和未跟踪的文件中搜索"
8664
8665#: builtin/grep.c:787
8666msgid "ignore files specified via '.gitignore'"
8667msgstr "忽略 '.gitignore' 包含的文件"
8668
8669#: builtin/grep.c:789
8670msgid "recursively search in each submodule"
8671msgstr "在每一个子模组中递归搜索"
8672
8673#: builtin/grep.c:792
8674msgid "show non-matching lines"
8675msgstr "显示未匹配的行"
8676
8677#: builtin/grep.c:794
8678msgid "case insensitive matching"
8679msgstr "不区分大小写匹配"
8680
8681#: builtin/grep.c:796
8682msgid "match patterns only at word boundaries"
8683msgstr "只在单词边界匹配模式"
8684
8685#: builtin/grep.c:798
8686msgid "process binary files as text"
8687msgstr "把二进制文件当做文本处理"
8688
8689#: builtin/grep.c:800
8690msgid "don't match patterns in binary files"
8691msgstr "不在二进制文件中匹配模式"
8692
8693#: builtin/grep.c:803
8694msgid "process binary files with textconv filters"
8695msgstr "用 textconv 过滤器处理二进制文件"
8696
8697#: builtin/grep.c:805
8698msgid "descend at most <depth> levels"
8699msgstr "最多以指定的深度向下寻找"
8700
8701#: builtin/grep.c:809
8702msgid "use extended POSIX regular expressions"
8703msgstr "使用扩展的 POSIX 正则表达式"
8704
8705#: builtin/grep.c:812
8706msgid "use basic POSIX regular expressions (default)"
8707msgstr "使用基本的 POSIX 正则表达式(默认)"
8708
8709#: builtin/grep.c:815
8710msgid "interpret patterns as fixed strings"
8711msgstr "把模式解析为固定的字符串"
8712
8713#: builtin/grep.c:818
8714msgid "use Perl-compatible regular expressions"
8715msgstr "使用 Perl 兼容的正则表达式"
8716
8717#: builtin/grep.c:821
8718msgid "show line numbers"
8719msgstr "显示行号"
8720
8721#: builtin/grep.c:822
8722msgid "don't show filenames"
8723msgstr "不显示文件名"
8724
8725#: builtin/grep.c:823
8726msgid "show filenames"
8727msgstr "显示文件名"
8728
8729#: builtin/grep.c:825
8730msgid "show filenames relative to top directory"
8731msgstr "显示相对于顶级目录的文件名"
8732
8733#: builtin/grep.c:827
8734msgid "show only filenames instead of matching lines"
8735msgstr "只显示文件名而不显示匹配的行"
8736
8737#: builtin/grep.c:829
8738msgid "synonym for --files-with-matches"
8739msgstr "和 --files-with-matches 同义"
8740
8741#: builtin/grep.c:832
8742msgid "show only the names of files without match"
8743msgstr "只显示未匹配的文件名"
8744
8745#: builtin/grep.c:834
8746msgid "print NUL after filenames"
8747msgstr "在文件名后输出 NUL 字符"
8748
8749#: builtin/grep.c:836
8750msgid "show the number of matches instead of matching lines"
8751msgstr "显示总匹配行数,而不显示匹配的行"
8752
8753#: builtin/grep.c:837
8754msgid "highlight matches"
8755msgstr "高亮显示匹配项"
8756
8757#: builtin/grep.c:839
8758msgid "print empty line between matches from different files"
8759msgstr "在不同文件的匹配项之间打印空行"
8760
8761#: builtin/grep.c:841
8762msgid "show filename only once above matches from same file"
8763msgstr "只在同一文件的匹配项的上面显示一次文件名"
8764
8765#: builtin/grep.c:844
8766msgid "show <n> context lines before and after matches"
8767msgstr "显示匹配项前后的 <n> 行上下文"
8768
8769#: builtin/grep.c:847
8770msgid "show <n> context lines before matches"
8771msgstr "显示匹配项前 <n> 行上下文"
8772
8773#: builtin/grep.c:849
8774msgid "show <n> context lines after matches"
8775msgstr "显示匹配项后 <n> 行上下文"
8776
8777#: builtin/grep.c:851
8778msgid "use <n> worker threads"
8779msgstr "使用 <n> 个工作线程"
8780
8781#: builtin/grep.c:852
8782msgid "shortcut for -C NUM"
8783msgstr "快捷键 -C 数字"
8784
8785#: builtin/grep.c:855
8786msgid "show a line with the function name before matches"
8787msgstr "在匹配的前面显示一行函数名"
8788
8789#: builtin/grep.c:857
8790msgid "show the surrounding function"
8791msgstr "显示所在函数的前后内容"
8792
8793#: builtin/grep.c:860
8794msgid "read patterns from file"
8795msgstr "从文件读取模式"
8796
8797#: builtin/grep.c:862
8798msgid "match <pattern>"
8799msgstr "匹配 <模式>"
8800
8801#: builtin/grep.c:864
8802msgid "combine patterns specified with -e"
8803msgstr "组合用 -e 参数设定的模式"
8804
8805#: builtin/grep.c:876
8806msgid "indicate hit with exit status without output"
8807msgstr "不输出,而用退出码标识命中状态"
8808
8809#: builtin/grep.c:878
8810msgid "show only matches from files that match all patterns"
8811msgstr "只显示匹配所有模式的文件中的匹配"
8812
8813#: builtin/grep.c:880
8814msgid "show parse tree for grep expression"
8815msgstr "显示 grep 表达式的解析树"
8816
8817#: builtin/grep.c:884
8818msgid "pager"
8819msgstr "分页"
8820
8821#: builtin/grep.c:884
8822msgid "show matching files in the pager"
8823msgstr "分页显示匹配的文件"
8824
8825#: builtin/grep.c:887
8826msgid "allow calling of grep(1) (ignored by this build)"
8827msgstr "允许调用 grep(1)(本次构建忽略)"
8828
8829#: builtin/grep.c:950
8830msgid "no pattern given."
8831msgstr "未提供模式匹配。"
8832
8833#: builtin/grep.c:982
8834msgid "--no-index or --untracked cannot be used with revs"
8835msgstr "--no-index 或 --untracked 不能和版本同时使用"
8836
8837#: builtin/grep.c:989
8838#, c-format
8839msgid "unable to resolve revision: %s"
8840msgstr "不能解析版本:%s"
8841
8842#: builtin/grep.c:1023 builtin/index-pack.c:1491
8843#, c-format
8844msgid "invalid number of threads specified (%d)"
8845msgstr "指定的线程数无效(%d)"
8846
8847#: builtin/grep.c:1028
8848msgid "no threads support, ignoring --threads"
8849msgstr "没有线程支持,忽略 --threads"
8850
8851#: builtin/grep.c:1052
8852msgid "--open-files-in-pager only works on the worktree"
8853msgstr "--open-files-in-pager 仅用于工作区"
8854
8855#: builtin/grep.c:1075
8856msgid "option not supported with --recurse-submodules."
8857msgstr "选项不支持和 --recurse-submodules 共用。"
8858
8859#: builtin/grep.c:1081
8860msgid "--cached or --untracked cannot be used with --no-index."
8861msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
8862
8863#: builtin/grep.c:1087
8864msgid "--[no-]exclude-standard cannot be used for tracked contents."
8865msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
8866
8867#: builtin/grep.c:1095
8868msgid "both --cached and trees are given."
8869msgstr "同时给出了 --cached 和树对象。"
8870
8871#: builtin/hash-object.c:82
8872msgid ""
8873"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8874"[--] <file>..."
8875msgstr ""
8876"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8877"[--] <文件>..."
8878
8879#: builtin/hash-object.c:83
8880msgid "git hash-object  --stdin-paths"
8881msgstr "git hash-object  --stdin-paths"
8882
8883#: builtin/hash-object.c:95
8884msgid "type"
8885msgstr "类型"
8886
8887#: builtin/hash-object.c:95
8888msgid "object type"
8889msgstr "对象类型"
8890
8891#: builtin/hash-object.c:96
8892msgid "write the object into the object database"
8893msgstr "将对象写入对象数据库"
8894
8895#: builtin/hash-object.c:98
8896msgid "read the object from stdin"
8897msgstr "从标准输入读取对象"
8898
8899#: builtin/hash-object.c:100
8900msgid "store file as is without filters"
8901msgstr "原样存储文件不使用过滤器"
8902
8903#: builtin/hash-object.c:101
8904msgid ""
8905"just hash any random garbage to create corrupt objects for debugging Git"
8906msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8907
8908#: builtin/hash-object.c:102
8909msgid "process file as it were from this path"
8910msgstr "处理文件并假设其来自于此路径"
8911
8912#: builtin/help.c:43
8913msgid "print all available commands"
8914msgstr "打印所有可用的命令"
8915
8916#: builtin/help.c:44
8917msgid "exclude guides"
8918msgstr "排除向导"
8919
8920#: builtin/help.c:45
8921msgid "print list of useful guides"
8922msgstr "显示有用的指南列表"
8923
8924#: builtin/help.c:46
8925msgid "show man page"
8926msgstr "显示 man 手册"
8927
8928#: builtin/help.c:47
8929msgid "show manual in web browser"
8930msgstr "在 web 浏览器中显示手册"
8931
8932#: builtin/help.c:49
8933msgid "show info page"
8934msgstr "显示 info 手册"
8935
8936#: builtin/help.c:55
8937msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8938msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
8939
8940#: builtin/help.c:67
8941#, c-format
8942msgid "unrecognized help format '%s'"
8943msgstr "未能识别的帮助格式 '%s'"
8944
8945#: builtin/help.c:94
8946msgid "Failed to start emacsclient."
8947msgstr "无法启动 emacsclient。"
8948
8949#: builtin/help.c:107
8950msgid "Failed to parse emacsclient version."
8951msgstr "无法解析 emacsclient 版本。"
8952
8953#: builtin/help.c:115
8954#, c-format
8955msgid "emacsclient version '%d' too old (< 22)."
8956msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8957
8958#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
8959#, c-format
8960msgid "failed to exec '%s'"
8961msgstr "无法执行 '%s'"
8962
8963#: builtin/help.c:211
8964#, c-format
8965msgid ""
8966"'%s': path for unsupported man viewer.\n"
8967"Please consider using 'man.<tool>.cmd' instead."
8968msgstr ""
8969"'%s':不支持的 man 手册查看器的路径。\n"
8970"请使用 'man.<工具>.cmd'。"
8971
8972#: builtin/help.c:223
8973#, c-format
8974msgid ""
8975"'%s': cmd for supported man viewer.\n"
8976"Please consider using 'man.<tool>.path' instead."
8977msgstr ""
8978"'%s': 支持的 man 手册查看器命令。\n"
8979"请使用 'man.<工具>.path'。"
8980
8981#: builtin/help.c:340
8982#, c-format
8983msgid "'%s': unknown man viewer."
8984msgstr "'%s':未知的 man 查看器。"
8985
8986#: builtin/help.c:357
8987msgid "no man viewer handled the request"
8988msgstr "没有 man 查看器处理此请求"
8989
8990#: builtin/help.c:365
8991msgid "no info viewer handled the request"
8992msgstr "没有 info 查看器处理此请求"
8993
8994#: builtin/help.c:407
8995msgid "Defining attributes per path"
8996msgstr "定义路径的属性"
8997
8998#: builtin/help.c:408
8999msgid "Everyday Git With 20 Commands Or So"
9000msgstr "每一天 Git 常用的约 20 条命令"
9001
9002#: builtin/help.c:409
9003msgid "A Git glossary"
9004msgstr "Git 词汇表"
9005
9006#: builtin/help.c:410
9007msgid "Specifies intentionally untracked files to ignore"
9008msgstr "忽略指定的未跟踪文件"
9009
9010#: builtin/help.c:411
9011msgid "Defining submodule properties"
9012msgstr "定义子模组属性"
9013
9014#: builtin/help.c:412
9015msgid "Specifying revisions and ranges for Git"
9016msgstr "指定 Git 的版本和版本范围"
9017
9018#: builtin/help.c:413
9019msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
9020msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
9021
9022#: builtin/help.c:414
9023msgid "An overview of recommended workflows with Git"
9024msgstr "Git 推荐的工作流概览"
9025
9026#: builtin/help.c:426
9027msgid "The common Git guides are:\n"
9028msgstr "最常用的 Git 向导有:\n"
9029
9030#: builtin/help.c:444
9031#, c-format
9032msgid "'%s' is aliased to '%s'"
9033msgstr "'%s' 是 '%s' 的别名"
9034
9035#: builtin/help.c:466 builtin/help.c:483
9036#, c-format
9037msgid "usage: %s%s"
9038msgstr "用法:%s%s"
9039
9040#: builtin/index-pack.c:156
9041#, c-format
9042msgid "unable to open %s"
9043msgstr "不能打开 %s"
9044
9045#: builtin/index-pack.c:206
9046#, c-format
9047msgid "object type mismatch at %s"
9048msgstr "%s 的对象类型不匹配"
9049
9050#: builtin/index-pack.c:226
9051#, c-format
9052msgid "did not receive expected object %s"
9053msgstr "未能获取预期的对象 %s"
9054
9055#: builtin/index-pack.c:229
9056#, c-format
9057msgid "object %s: expected type %s, found %s"
9058msgstr "对象 %s:应为类型 %s,却是 %s"
9059
9060#: builtin/index-pack.c:271
9061#, c-format
9062msgid "cannot fill %d byte"
9063msgid_plural "cannot fill %d bytes"
9064msgstr[0] "无法填充 %d 字节"
9065msgstr[1] "无法填充 %d 字节"
9066
9067#: builtin/index-pack.c:281
9068msgid "early EOF"
9069msgstr "过早的文件结束符(EOF)"
9070
9071#: builtin/index-pack.c:282
9072msgid "read error on input"
9073msgstr "输入上的读错误"
9074
9075#: builtin/index-pack.c:294
9076msgid "used more bytes than were available"
9077msgstr "用掉了超过可用的字节"
9078
9079#: builtin/index-pack.c:301
9080msgid "pack too large for current definition of off_t"
9081msgstr "包太大超过了当前 off_t 的定义"
9082
9083#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
9084msgid "pack exceeds maximum allowed size"
9085msgstr "包超过了最大允许值"
9086
9087#: builtin/index-pack.c:319
9088#, c-format
9089msgid "unable to create '%s'"
9090msgstr "不能创建 '%s'"
9091
9092#: builtin/index-pack.c:325
9093#, c-format
9094msgid "cannot open packfile '%s'"
9095msgstr "无法打开包文件 '%s'"
9096
9097#: builtin/index-pack.c:339
9098msgid "pack signature mismatch"
9099msgstr "包签名不匹配"
9100
9101#: builtin/index-pack.c:341
9102#, c-format
9103msgid "pack version %<PRIu32> unsupported"
9104msgstr "不支持包版本 %<PRIu32>"
9105
9106#: builtin/index-pack.c:359
9107#, c-format
9108msgid "pack has bad object at offset %<PRIuMAX>: %s"
9109msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
9110
9111#: builtin/index-pack.c:480
9112#, c-format
9113msgid "inflate returned %d"
9114msgstr "解压缩返回 %d"
9115
9116#: builtin/index-pack.c:529
9117msgid "offset value overflow for delta base object"
9118msgstr "偏移值覆盖了 delta 基准对象"
9119
9120#: builtin/index-pack.c:537
9121msgid "delta base offset is out of bound"
9122msgstr "delta 基准偏移越界"
9123
9124#: builtin/index-pack.c:545
9125#, c-format
9126msgid "unknown object type %d"
9127msgstr "未知对象类型 %d"
9128
9129#: builtin/index-pack.c:576
9130msgid "cannot pread pack file"
9131msgstr "无法读取包文件"
9132
9133#: builtin/index-pack.c:578
9134#, c-format
9135msgid "premature end of pack file, %<PRIuMAX> byte missing"
9136msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
9137msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9138msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9139
9140#: builtin/index-pack.c:604
9141msgid "serious inflate inconsistency"
9142msgstr "解压缩严重的不一致"
9143
9144#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
9145#: builtin/index-pack.c:817 builtin/index-pack.c:826
9146#, c-format
9147msgid "SHA1 COLLISION FOUND WITH %s !"
9148msgstr "发现 %s 出现 SHA1 冲突!"
9149
9150#: builtin/index-pack.c:752 builtin/pack-objects.c:168
9151#: builtin/pack-objects.c:262
9152#, c-format
9153msgid "unable to read %s"
9154msgstr "不能读 %s"
9155
9156#: builtin/index-pack.c:815
9157#, c-format
9158msgid "cannot read existing object info %s"
9159msgstr "不能读取现存对象信息 %s"
9160
9161#: builtin/index-pack.c:823
9162#, c-format
9163msgid "cannot read existing object %s"
9164msgstr "不能读取现存对象 %s"
9165
9166#: builtin/index-pack.c:837
9167#, c-format
9168msgid "invalid blob object %s"
9169msgstr "无效的数据对象 %s"
9170
9171#: builtin/index-pack.c:852
9172#, c-format
9173msgid "invalid %s"
9174msgstr "无效的 %s"
9175
9176#: builtin/index-pack.c:855
9177msgid "Error in object"
9178msgstr "对象中出错"
9179
9180#: builtin/index-pack.c:857
9181#, c-format
9182msgid "Not all child objects of %s are reachable"
9183msgstr "%s 的所有子对象并非都可达"
9184
9185#: builtin/index-pack.c:929 builtin/index-pack.c:960
9186msgid "failed to apply delta"
9187msgstr "无法应用 delta"
9188
9189#: builtin/index-pack.c:1131
9190msgid "Receiving objects"
9191msgstr "接收对象中"
9192
9193#: builtin/index-pack.c:1131
9194msgid "Indexing objects"
9195msgstr "索引对象中"
9196
9197#: builtin/index-pack.c:1165
9198msgid "pack is corrupted (SHA1 mismatch)"
9199msgstr "包冲突(SHA1 不匹配)"
9200
9201#: builtin/index-pack.c:1170
9202msgid "cannot fstat packfile"
9203msgstr "不能对包文件调用 fstat"
9204
9205#: builtin/index-pack.c:1173
9206msgid "pack has junk at the end"
9207msgstr "包的结尾有垃圾数据"
9208
9209#: builtin/index-pack.c:1185
9210msgid "confusion beyond insanity in parse_pack_objects()"
9211msgstr "parse_pack_objects() 中遇到不可理喻的问题"
9212
9213#: builtin/index-pack.c:1208
9214msgid "Resolving deltas"
9215msgstr "处理 delta 中"
9216
9217#: builtin/index-pack.c:1219
9218#, c-format
9219msgid "unable to create thread: %s"
9220msgstr "不能创建线程:%s"
9221
9222#: builtin/index-pack.c:1261
9223msgid "confusion beyond insanity"
9224msgstr "不可理喻"
9225
9226#: builtin/index-pack.c:1267
9227#, c-format
9228msgid "completed with %d local object"
9229msgid_plural "completed with %d local objects"
9230msgstr[0] "完成 %d 个本地对象"
9231msgstr[1] "完成 %d 个本地对象"
9232
9233#: builtin/index-pack.c:1279
9234#, c-format
9235msgid "Unexpected tail checksum for %s (disk corruption?)"
9236msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
9237
9238#: builtin/index-pack.c:1283
9239#, c-format
9240msgid "pack has %d unresolved delta"
9241msgid_plural "pack has %d unresolved deltas"
9242msgstr[0] "包有 %d 个未解决的 delta"
9243msgstr[1] "包有 %d 个未解决的 delta"
9244
9245#: builtin/index-pack.c:1307
9246#, c-format
9247msgid "unable to deflate appended object (%d)"
9248msgstr "不能压缩附加对象(%d)"
9249
9250#: builtin/index-pack.c:1383
9251#, c-format
9252msgid "local object %s is corrupt"
9253msgstr "本地对象 %s 已损坏"
9254
9255#: builtin/index-pack.c:1409
9256msgid "error while closing pack file"
9257msgstr "关闭包文件时出错"
9258
9259#: builtin/index-pack.c:1421
9260#, c-format
9261msgid "cannot write keep file '%s'"
9262msgstr "无法写保留文件 '%s'"
9263
9264#: builtin/index-pack.c:1429
9265#, c-format
9266msgid "cannot close written keep file '%s'"
9267msgstr "无法关闭保留文件 '%s'"
9268
9269#: builtin/index-pack.c:1439
9270msgid "cannot store pack file"
9271msgstr "无法存储包文件"
9272
9273#: builtin/index-pack.c:1447
9274msgid "cannot store index file"
9275msgstr "无法存储索引文件"
9276
9277#: builtin/index-pack.c:1485
9278#, c-format
9279msgid "bad pack.indexversion=%<PRIu32>"
9280msgstr "坏的 pack.indexversion=%<PRIu32>"
9281
9282#: builtin/index-pack.c:1553
9283#, c-format
9284msgid "Cannot open existing pack file '%s'"
9285msgstr "无法打开现存包文件 '%s'"
9286
9287#: builtin/index-pack.c:1555
9288#, c-format
9289msgid "Cannot open existing pack idx file for '%s'"
9290msgstr "无法为 %s 打开包索引文件"
9291
9292#: builtin/index-pack.c:1603
9293#, c-format
9294msgid "non delta: %d object"
9295msgid_plural "non delta: %d objects"
9296msgstr[0] "非 delta:%d 个对象"
9297msgstr[1] "非 delta:%d 个对象"
9298
9299#: builtin/index-pack.c:1610
9300#, c-format
9301msgid "chain length = %d: %lu object"
9302msgid_plural "chain length = %d: %lu objects"
9303msgstr[0] "链长 = %d: %lu 对象"
9304msgstr[1] "链长 = %d: %lu 对象"
9305
9306#: builtin/index-pack.c:1623
9307#, c-format
9308msgid "packfile name '%s' does not end with '.pack'"
9309msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
9310
9311#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
9312#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
9313#, c-format
9314msgid "bad %s"
9315msgstr "错误选项 %s"
9316
9317#: builtin/index-pack.c:1744
9318msgid "--fix-thin cannot be used without --stdin"
9319msgstr "--fix-thin 不能和 --stdin 同时使用"
9320
9321#: builtin/index-pack.c:1746
9322msgid "--stdin requires a git repository"
9323msgstr "--stdin 需要一个 git 仓库"
9324
9325#: builtin/index-pack.c:1754
9326msgid "--verify with no packfile name given"
9327msgstr "--verify 没有提供包文件名参数"
9328
9329#: builtin/init-db.c:55
9330#, c-format
9331msgid "cannot stat '%s'"
9332msgstr "不能对 '%s' 调用 stat"
9333
9334#: builtin/init-db.c:61
9335#, c-format
9336msgid "cannot stat template '%s'"
9337msgstr "不能对模版 '%s' 调用 stat"
9338
9339#: builtin/init-db.c:66
9340#, c-format
9341msgid "cannot opendir '%s'"
9342msgstr "不能打开目录 '%s'"
9343
9344#: builtin/init-db.c:77
9345#, c-format
9346msgid "cannot readlink '%s'"
9347msgstr "不能读取链接 '%s'"
9348
9349#: builtin/init-db.c:79
9350#, c-format
9351msgid "cannot symlink '%s' '%s'"
9352msgstr "不能自 '%s' 到 '%s' 创建符号链接"
9353
9354#: builtin/init-db.c:85
9355#, c-format
9356msgid "cannot copy '%s' to '%s'"
9357msgstr "不能拷贝 '%s' 至 '%s'"
9358
9359#: builtin/init-db.c:89
9360#, c-format
9361msgid "ignoring template %s"
9362msgstr "忽略模版 %s"
9363
9364#: builtin/init-db.c:120
9365#, c-format
9366msgid "templates not found %s"
9367msgstr "模版未找到 %s"
9368
9369#: builtin/init-db.c:135
9370#, c-format
9371msgid "not copying templates from '%s': %s"
9372msgstr "没有从 '%s' 复制模版:%s"
9373
9374#: builtin/init-db.c:328
9375#, c-format
9376msgid "unable to handle file type %d"
9377msgstr "不能处理 %d 类型的文件"
9378
9379#: builtin/init-db.c:331
9380#, c-format
9381msgid "unable to move %s to %s"
9382msgstr "不能移动 %s 至 %s"
9383
9384#: builtin/init-db.c:348 builtin/init-db.c:351
9385#, c-format
9386msgid "%s already exists"
9387msgstr "%s 已经存在"
9388
9389#: builtin/init-db.c:404
9390#, c-format
9391msgid "Reinitialized existing shared Git repository in %s%s\n"
9392msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
9393
9394#: builtin/init-db.c:405
9395#, c-format
9396msgid "Reinitialized existing Git repository in %s%s\n"
9397msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
9398
9399#: builtin/init-db.c:409
9400#, c-format
9401msgid "Initialized empty shared Git repository in %s%s\n"
9402msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
9403
9404#: builtin/init-db.c:410
9405#, c-format
9406msgid "Initialized empty Git repository in %s%s\n"
9407msgstr "已初始化空的 Git 仓库于 %s%s\n"
9408
9409#: builtin/init-db.c:458
9410msgid ""
9411"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
9412"shared[=<permissions>]] [<directory>]"
9413msgstr ""
9414"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
9415"[<目录>]"
9416
9417#: builtin/init-db.c:481
9418msgid "permissions"
9419msgstr "权限"
9420
9421#: builtin/init-db.c:482
9422msgid "specify that the git repository is to be shared amongst several users"
9423msgstr "指定 git 仓库是多个用户之间共享的"
9424
9425#: builtin/init-db.c:516 builtin/init-db.c:521
9426#, c-format
9427msgid "cannot mkdir %s"
9428msgstr "不能创建目录 %s"
9429
9430#: builtin/init-db.c:525
9431#, c-format
9432msgid "cannot chdir to %s"
9433msgstr "不能切换目录到 %s"
9434
9435#: builtin/init-db.c:546
9436#, c-format
9437msgid ""
9438"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
9439"dir=<directory>)"
9440msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
9441
9442#: builtin/init-db.c:574
9443#, c-format
9444msgid "Cannot access work tree '%s'"
9445msgstr "不能访问工作区 '%s'"
9446
9447#: builtin/interpret-trailers.c:15
9448msgid ""
9449"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
9450"<token>[(=|:)<value>])...] [<file>...]"
9451msgstr ""
9452"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
9453">])...] [<文件>...]"
9454
9455#: builtin/interpret-trailers.c:92
9456msgid "edit files in place"
9457msgstr "在原位编辑文件"
9458
9459#: builtin/interpret-trailers.c:93
9460msgid "trim empty trailers"
9461msgstr "删除空的尾部署名"
9462
9463#: builtin/interpret-trailers.c:96
9464msgid "where to place the new trailer"
9465msgstr "在哪里放置新的尾部署名"
9466
9467#: builtin/interpret-trailers.c:98
9468msgid "action if trailer already exists"
9469msgstr "当尾部署名已经存在时所采取的动作"
9470
9471#: builtin/interpret-trailers.c:100
9472msgid "action if trailer is missing"
9473msgstr "当尾部署名缺失时所采取的动作"
9474
9475#: builtin/interpret-trailers.c:102
9476msgid "output only the trailers"
9477msgstr "只输出尾部署名"
9478
9479#: builtin/interpret-trailers.c:103
9480msgid "do not apply config rules"
9481msgstr "不要应用配置规则"
9482
9483#: builtin/interpret-trailers.c:104
9484msgid "join whitespace-continued values"
9485msgstr "连接空白折行的值"
9486
9487#: builtin/interpret-trailers.c:105
9488msgid "set parsing options"
9489msgstr "设置解析选项"
9490
9491#: builtin/interpret-trailers.c:107
9492msgid "trailer"
9493msgstr "尾部署名"
9494
9495#: builtin/interpret-trailers.c:108
9496msgid "trailer(s) to add"
9497msgstr "要添加的尾部署名"
9498
9499#: builtin/interpret-trailers.c:117
9500msgid "--trailer with --only-input does not make sense"
9501msgstr "--trailer 和 --only-input 同时使用没有意义"
9502
9503#: builtin/interpret-trailers.c:127
9504msgid "no input file given for in-place editing"
9505msgstr "没有给出要原位编辑的文件"
9506
9507#: builtin/log.c:46
9508msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
9509msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
9510
9511#: builtin/log.c:47
9512msgid "git show [<options>] <object>..."
9513msgstr "git show [<选项>] <对象>..."
9514
9515#: builtin/log.c:91
9516#, c-format
9517msgid "invalid --decorate option: %s"
9518msgstr "无效的 --decorate 选项:%s"
9519
9520#: builtin/log.c:148
9521msgid "suppress diff output"
9522msgstr "不显示差异输出"
9523
9524#: builtin/log.c:149
9525msgid "show source"
9526msgstr "显示源"
9527
9528#: builtin/log.c:150
9529msgid "Use mail map file"
9530msgstr "使用邮件映射文件"
9531
9532#: builtin/log.c:151
9533msgid "decorate options"
9534msgstr "修饰选项"
9535
9536#: builtin/log.c:154
9537msgid "Process line range n,m in file, counting from 1"
9538msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
9539
9540#: builtin/log.c:250
9541#, c-format
9542msgid "Final output: %d %s\n"
9543msgstr "最终输出:%d %s\n"
9544
9545#: builtin/log.c:501
9546#, c-format
9547msgid "git show %s: bad file"
9548msgstr "git show %s: 损坏的文件"
9549
9550#: builtin/log.c:516 builtin/log.c:610
9551#, c-format
9552msgid "Could not read object %s"
9553msgstr "不能读取对象 %s"
9554
9555#: builtin/log.c:634
9556#, c-format
9557msgid "Unknown type: %d"
9558msgstr "未知类型:%d"
9559
9560#: builtin/log.c:755
9561msgid "format.headers without value"
9562msgstr "format.headers 没有值"
9563
9564#: builtin/log.c:856
9565msgid "name of output directory is too long"
9566msgstr "输出目录名太长"
9567
9568#: builtin/log.c:872
9569#, c-format
9570msgid "Cannot open patch file %s"
9571msgstr "无法打开补丁文件 %s"
9572
9573#: builtin/log.c:889
9574msgid "Need exactly one range."
9575msgstr "只需要一个范围。"
9576
9577#: builtin/log.c:899
9578msgid "Not a range."
9579msgstr "不是一个范围。"
9580
9581#: builtin/log.c:1005
9582msgid "Cover letter needs email format"
9583msgstr "信封需要邮件地址格式"
9584
9585#: builtin/log.c:1085
9586#, c-format
9587msgid "insane in-reply-to: %s"
9588msgstr "不正常的 in-reply-to:%s"
9589
9590#: builtin/log.c:1112
9591msgid "git format-patch [<options>] [<since> | <revision-range>]"
9592msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
9593
9594#: builtin/log.c:1162
9595msgid "Two output directories?"
9596msgstr "两个输出目录?"
9597
9598#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
9599#, c-format
9600msgid "Unknown commit %s"
9601msgstr "未知提交 %s"
9602
9603#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
9604#, c-format
9605msgid "Failed to resolve '%s' as a valid ref."
9606msgstr "无法解析 '%s' 为一个有效引用。"
9607
9608#: builtin/log.c:1284
9609msgid "Could not find exact merge base."
9610msgstr "不能找到准确的合并基线。"
9611
9612#: builtin/log.c:1288
9613msgid ""
9614"Failed to get upstream, if you want to record base commit automatically,\n"
9615"please use git branch --set-upstream-to to track a remote branch.\n"
9616"Or you could specify base commit by --base=<base-commit-id> manually."
9617msgstr ""
9618"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
9619"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
9620"参数 --base=<base-commit-id> 手动指定一个基线提交。"
9621
9622#: builtin/log.c:1308
9623msgid "Failed to find exact merge base"
9624msgstr "无法找到准确的合并基线"
9625
9626#: builtin/log.c:1319
9627msgid "base commit should be the ancestor of revision list"
9628msgstr "基线提交应该是版本列表的祖先"
9629
9630#: builtin/log.c:1323
9631msgid "base commit shouldn't be in revision list"
9632msgstr "基线提交不应该出现在版本列表中"
9633
9634#: builtin/log.c:1372
9635msgid "cannot get patch id"
9636msgstr "无法得到补丁 id"
9637
9638#: builtin/log.c:1431
9639msgid "use [PATCH n/m] even with a single patch"
9640msgstr "使用 [PATCH n/m],即使只有一个补丁"
9641
9642#: builtin/log.c:1434
9643msgid "use [PATCH] even with multiple patches"
9644msgstr "使用 [PATCH],即使有多个补丁"
9645
9646#: builtin/log.c:1438
9647msgid "print patches to standard out"
9648msgstr "打印补丁到标准输出"
9649
9650#: builtin/log.c:1440
9651msgid "generate a cover letter"
9652msgstr "生成一封附信"
9653
9654#: builtin/log.c:1442
9655msgid "use simple number sequence for output file names"
9656msgstr "使用简单的数字序列作为输出文件名"
9657
9658#: builtin/log.c:1443
9659msgid "sfx"
9660msgstr "后缀"
9661
9662#: builtin/log.c:1444
9663msgid "use <sfx> instead of '.patch'"
9664msgstr "使用 <后缀> 代替 '.patch'"
9665
9666#: builtin/log.c:1446
9667msgid "start numbering patches at <n> instead of 1"
9668msgstr "补丁以 <n> 开始编号,而不是1"
9669
9670#: builtin/log.c:1448
9671msgid "mark the series as Nth re-roll"
9672msgstr "标记补丁系列是第几次重制"
9673
9674#: builtin/log.c:1450
9675msgid "Use [RFC PATCH] instead of [PATCH]"
9676msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9677
9678#: builtin/log.c:1453
9679msgid "Use [<prefix>] instead of [PATCH]"
9680msgstr "使用 [<前缀>] 代替 [PATCH]"
9681
9682#: builtin/log.c:1456
9683msgid "store resulting files in <dir>"
9684msgstr "把结果文件存储在 <目录>"
9685
9686#: builtin/log.c:1459
9687msgid "don't strip/add [PATCH]"
9688msgstr "不删除/添加 [PATCH]"
9689
9690#: builtin/log.c:1462
9691msgid "don't output binary diffs"
9692msgstr "不输出二进制差异"
9693
9694#: builtin/log.c:1464
9695msgid "output all-zero hash in From header"
9696msgstr "在 From 头信息中输出全为零的哈希值"
9697
9698#: builtin/log.c:1466
9699msgid "don't include a patch matching a commit upstream"
9700msgstr "不包含已在上游提交中的补丁"
9701
9702#: builtin/log.c:1468
9703msgid "show patch format instead of default (patch + stat)"
9704msgstr "显示纯补丁格式而非默认的(补丁+状态)"
9705
9706#: builtin/log.c:1470
9707msgid "Messaging"
9708msgstr "邮件发送"
9709
9710#: builtin/log.c:1471
9711msgid "header"
9712msgstr "header"
9713
9714#: builtin/log.c:1472
9715msgid "add email header"
9716msgstr "添加邮件头"
9717
9718#: builtin/log.c:1473 builtin/log.c:1475
9719msgid "email"
9720msgstr "邮件地址"
9721
9722#: builtin/log.c:1473
9723msgid "add To: header"
9724msgstr "添加收件人"
9725
9726#: builtin/log.c:1475
9727msgid "add Cc: header"
9728msgstr "添加抄送"
9729
9730#: builtin/log.c:1477
9731msgid "ident"
9732msgstr "标识"
9733
9734#: builtin/log.c:1478
9735msgid "set From address to <ident> (or committer ident if absent)"
9736msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
9737
9738#: builtin/log.c:1480
9739msgid "message-id"
9740msgstr "邮件标识"
9741
9742#: builtin/log.c:1481
9743msgid "make first mail a reply to <message-id>"
9744msgstr "使第一封邮件作为对 <邮件标识> 的回复"
9745
9746#: builtin/log.c:1482 builtin/log.c:1485
9747msgid "boundary"
9748msgstr "边界"
9749
9750#: builtin/log.c:1483
9751msgid "attach the patch"
9752msgstr "附件方式添加补丁"
9753
9754#: builtin/log.c:1486
9755msgid "inline the patch"
9756msgstr "内联显示补丁"
9757
9758#: builtin/log.c:1490
9759msgid "enable message threading, styles: shallow, deep"
9760msgstr "启用邮件线索,风格:浅,深"
9761
9762#: builtin/log.c:1492
9763msgid "signature"
9764msgstr "签名"
9765
9766#: builtin/log.c:1493
9767msgid "add a signature"
9768msgstr "添加一个签名"
9769
9770#: builtin/log.c:1494
9771msgid "base-commit"
9772msgstr "基线提交"
9773
9774#: builtin/log.c:1495
9775msgid "add prerequisite tree info to the patch series"
9776msgstr "为补丁列表添加前置树信息"
9777
9778#: builtin/log.c:1497
9779msgid "add a signature from a file"
9780msgstr "从文件添加一个签名"
9781
9782#: builtin/log.c:1498
9783msgid "don't print the patch filenames"
9784msgstr "不要打印补丁文件名"
9785
9786#: builtin/log.c:1500
9787msgid "show progress while generating patches"
9788msgstr "在生成补丁时显示进度"
9789
9790#: builtin/log.c:1575
9791#, c-format
9792msgid "invalid ident line: %s"
9793msgstr "包含无效的身份标识:%s"
9794
9795#: builtin/log.c:1590
9796msgid "-n and -k are mutually exclusive."
9797msgstr "-n 和 -k 互斥。"
9798
9799#: builtin/log.c:1592
9800msgid "--subject-prefix/--rfc and -k are mutually exclusive."
9801msgstr "--subject-prefix/--rfc 和 -k 互斥。"
9802
9803#: builtin/log.c:1600
9804msgid "--name-only does not make sense"
9805msgstr "--name-only 无意义"
9806
9807#: builtin/log.c:1602
9808msgid "--name-status does not make sense"
9809msgstr "--name-status 无意义"
9810
9811#: builtin/log.c:1604
9812msgid "--check does not make sense"
9813msgstr "--check 无意义"
9814
9815#: builtin/log.c:1634
9816msgid "standard output, or directory, which one?"
9817msgstr "标准输出或目录,哪一个?"
9818
9819#: builtin/log.c:1636
9820#, c-format
9821msgid "Could not create directory '%s'"
9822msgstr "不能创建目录 '%s'"
9823
9824#: builtin/log.c:1729
9825#, c-format
9826msgid "unable to read signature file '%s'"
9827msgstr "无法读取签名文件 '%s'"
9828
9829#: builtin/log.c:1761
9830msgid "Generating patches"
9831msgstr "生成补丁"
9832
9833#: builtin/log.c:1805
9834msgid "Failed to create output files"
9835msgstr "无法创建输出文件"
9836
9837#: builtin/log.c:1855
9838msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
9839msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
9840
9841#: builtin/log.c:1909
9842#, c-format
9843msgid ""
9844"Could not find a tracked remote branch, please specify <upstream> manually.\n"
9845msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
9846
9847#: builtin/ls-files.c:466
9848msgid "git ls-files [<options>] [<file>...]"
9849msgstr "git ls-files [<选项>] [<文件>...]"
9850
9851#: builtin/ls-files.c:515
9852msgid "identify the file status with tags"
9853msgstr "用标签标识文件的状态"
9854
9855#: builtin/ls-files.c:517
9856msgid "use lowercase letters for 'assume unchanged' files"
9857msgstr "使用小写字母表示 '假设未改变的' 文件"
9858
9859#: builtin/ls-files.c:519
9860msgid "show cached files in the output (default)"
9861msgstr "显示缓存的文件(默认)"
9862
9863#: builtin/ls-files.c:521
9864msgid "show deleted files in the output"
9865msgstr "显示已删除的文件"
9866
9867#: builtin/ls-files.c:523
9868msgid "show modified files in the output"
9869msgstr "显示已修改的文件"
9870
9871#: builtin/ls-files.c:525
9872msgid "show other files in the output"
9873msgstr "显示其它文件"
9874
9875#: builtin/ls-files.c:527
9876msgid "show ignored files in the output"
9877msgstr "显示忽略的文件"
9878
9879#: builtin/ls-files.c:530
9880msgid "show staged contents' object name in the output"
9881msgstr "显示暂存区内容的对象名称"
9882
9883#: builtin/ls-files.c:532
9884msgid "show files on the filesystem that need to be removed"
9885msgstr "显示文件系统需要删除的文件"
9886
9887#: builtin/ls-files.c:534
9888msgid "show 'other' directories' names only"
9889msgstr "只显示“其他”目录的名称"
9890
9891#: builtin/ls-files.c:536
9892msgid "show line endings of files"
9893msgstr "显示文件换行符格式"
9894
9895#: builtin/ls-files.c:538
9896msgid "don't show empty directories"
9897msgstr "不显示空目录"
9898
9899#: builtin/ls-files.c:541
9900msgid "show unmerged files in the output"
9901msgstr "显示未合并的文件"
9902
9903#: builtin/ls-files.c:543
9904msgid "show resolve-undo information"
9905msgstr "显示 resolve-undo 信息"
9906
9907#: builtin/ls-files.c:545
9908msgid "skip files matching pattern"
9909msgstr "匹配排除文件的模式"
9910
9911#: builtin/ls-files.c:548
9912msgid "exclude patterns are read from <file>"
9913msgstr "从 <文件> 中读取排除模式"
9914
9915#: builtin/ls-files.c:551
9916msgid "read additional per-directory exclude patterns in <file>"
9917msgstr "从 <文件> 读取额外的每个目录的排除模式"
9918
9919#: builtin/ls-files.c:553
9920msgid "add the standard git exclusions"
9921msgstr "添加标准的 git 排除"
9922
9923#: builtin/ls-files.c:556
9924msgid "make the output relative to the project top directory"
9925msgstr "显示相对于顶级目录的文件名"
9926
9927#: builtin/ls-files.c:559
9928msgid "recurse through submodules"
9929msgstr "在子模组中递归"
9930
9931#: builtin/ls-files.c:561
9932msgid "if any <file> is not in the index, treat this as an error"
9933msgstr "如果任何 <文件> 都不在索引区,视为错误"
9934
9935#: builtin/ls-files.c:562
9936msgid "tree-ish"
9937msgstr "树或提交"
9938
9939#: builtin/ls-files.c:563
9940msgid "pretend that paths removed since <tree-ish> are still present"
9941msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
9942
9943#: builtin/ls-files.c:565
9944msgid "show debugging data"
9945msgstr "显示调试数据"
9946
9947#: builtin/ls-remote.c:7
9948msgid ""
9949"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9950"                     [-q | --quiet] [--exit-code] [--get-url]\n"
9951"                     [--symref] [<repository> [<refs>...]]"
9952msgstr ""
9953"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9954"                     [-q | --quiet] [--exit-code] [--get-url]\n"
9955"                     [--symref] [<仓库> [<引用>...]]"
9956
9957#: builtin/ls-remote.c:52
9958msgid "do not print remote URL"
9959msgstr "不打印远程 URL"
9960
9961#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
9962msgid "exec"
9963msgstr "exec"
9964
9965#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
9966msgid "path of git-upload-pack on the remote host"
9967msgstr "远程主机上的 git-upload-pack 路径"
9968
9969#: builtin/ls-remote.c:58
9970msgid "limit to tags"
9971msgstr "仅限于标签"
9972
9973#: builtin/ls-remote.c:59
9974msgid "limit to heads"
9975msgstr "仅限于分支"
9976
9977#: builtin/ls-remote.c:60
9978msgid "do not show peeled tags"
9979msgstr "不显示已解析的标签"
9980
9981#: builtin/ls-remote.c:62
9982msgid "take url.<base>.insteadOf into account"
9983msgstr "参考 url.<base>.insteadOf 设置"
9984
9985#: builtin/ls-remote.c:64
9986msgid "exit with exit code 2 if no matching refs are found"
9987msgstr "若未找到匹配的引用则以退出码2退出"
9988
9989#: builtin/ls-remote.c:66
9990msgid "show underlying ref in addition to the object pointed by it"
9991msgstr "除了显示指向的对象外,显示指向的引用名"
9992
9993#: builtin/ls-tree.c:29
9994msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9995msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
9996
9997#: builtin/ls-tree.c:127
9998msgid "only show trees"
9999msgstr "只显示树"
10000
10001#: builtin/ls-tree.c:129
10002msgid "recurse into subtrees"
10003msgstr "递归到子树"
10004
10005#: builtin/ls-tree.c:131
10006msgid "show trees when recursing"
10007msgstr "当递归时显示树"
10008
10009#: builtin/ls-tree.c:134
10010msgid "terminate entries with NUL byte"
10011msgstr "条目以 NUL 字符终止"
10012
10013#: builtin/ls-tree.c:135
10014msgid "include object size"
10015msgstr "包括对象大小"
10016
10017#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
10018msgid "list only filenames"
10019msgstr "只列出文件名"
10020
10021#: builtin/ls-tree.c:142
10022msgid "use full path names"
10023msgstr "使用文件的全路径"
10024
10025#: builtin/ls-tree.c:144
10026msgid "list entire tree; not just current directory (implies --full-name)"
10027msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
10028
10029#: builtin/mailsplit.c:241
10030#, c-format
10031msgid "empty mbox: '%s'"
10032msgstr "空的 mbox:'%s'"
10033
10034#: builtin/merge.c:48
10035msgid "git merge [<options>] [<commit>...]"
10036msgstr "git merge [<选项>] [<提交>...]"
10037
10038#: builtin/merge.c:49
10039msgid "git merge --abort"
10040msgstr "git merge --abort"
10041
10042#: builtin/merge.c:50
10043msgid "git merge --continue"
10044msgstr "git merge --continue"
10045
10046#: builtin/merge.c:107
10047msgid "switch `m' requires a value"
10048msgstr "开关 `m' 需要一个值"
10049
10050#: builtin/merge.c:144
10051#, c-format
10052msgid "Could not find merge strategy '%s'.\n"
10053msgstr "不能找到合并策略 '%s'。\n"
10054
10055#: builtin/merge.c:145
10056#, c-format
10057msgid "Available strategies are:"
10058msgstr "可用的策略有:"
10059
10060#: builtin/merge.c:150
10061#, c-format
10062msgid "Available custom strategies are:"
10063msgstr "可用的自定义策略有:"
10064
10065#: builtin/merge.c:200 builtin/pull.c:134
10066msgid "do not show a diffstat at the end of the merge"
10067msgstr "在合并的最后不显示差异统计"
10068
10069#: builtin/merge.c:203 builtin/pull.c:137
10070msgid "show a diffstat at the end of the merge"
10071msgstr "在合并的最后显示差异统计"
10072
10073#: builtin/merge.c:204 builtin/pull.c:140
10074msgid "(synonym to --stat)"
10075msgstr "(和 --stat 同义)"
10076
10077#: builtin/merge.c:206 builtin/pull.c:143
10078msgid "add (at most <n>) entries from shortlog to merge commit message"
10079msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
10080
10081#: builtin/merge.c:209 builtin/pull.c:146
10082msgid "create a single commit instead of doing a merge"
10083msgstr "创建一个单独的提交而不是做一次合并"
10084
10085#: builtin/merge.c:211 builtin/pull.c:149
10086msgid "perform a commit if the merge succeeds (default)"
10087msgstr "如果合并成功,执行一次提交(默认)"
10088
10089#: builtin/merge.c:213 builtin/pull.c:152
10090msgid "edit message before committing"
10091msgstr "在提交前编辑提交说明"
10092
10093#: builtin/merge.c:214
10094msgid "allow fast-forward (default)"
10095msgstr "允许快进(默认)"
10096
10097#: builtin/merge.c:216 builtin/pull.c:158
10098msgid "abort if fast-forward is not possible"
10099msgstr "如果不能快进就放弃合并"
10100
10101#: builtin/merge.c:220 builtin/pull.c:161
10102msgid "verify that the named commit has a valid GPG signature"
10103msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
10104
10105#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
10106#: builtin/revert.c:109
10107msgid "strategy"
10108msgstr "策略"
10109
10110#: builtin/merge.c:222 builtin/pull.c:166
10111msgid "merge strategy to use"
10112msgstr "要使用的合并策略"
10113
10114#: builtin/merge.c:223 builtin/pull.c:169
10115msgid "option=value"
10116msgstr "option=value"
10117
10118#: builtin/merge.c:224 builtin/pull.c:170
10119msgid "option for selected merge strategy"
10120msgstr "所选的合并策略的选项"
10121
10122#: builtin/merge.c:226
10123msgid "merge commit message (for a non-fast-forward merge)"
10124msgstr "合并的提交说明(针对非快进式合并)"
10125
10126#: builtin/merge.c:230
10127msgid "abort the current in-progress merge"
10128msgstr "放弃当前正在进行的合并"
10129
10130#: builtin/merge.c:232
10131msgid "continue the current in-progress merge"
10132msgstr "继续当前正在进行的合并"
10133
10134#: builtin/merge.c:234 builtin/pull.c:177
10135msgid "allow merging unrelated histories"
10136msgstr "允许合并不相关的历史"
10137
10138#: builtin/merge.c:240
10139msgid "verify commit-msg hook"
10140msgstr "校验 commit-msg 钩子"
10141
10142#: builtin/merge.c:265
10143msgid "could not run stash."
10144msgstr "不能运行贮藏。"
10145
10146#: builtin/merge.c:270
10147msgid "stash failed"
10148msgstr "贮藏失败"
10149
10150#: builtin/merge.c:275
10151#, c-format
10152msgid "not a valid object: %s"
10153msgstr "不是一个有效对象:%s"
10154
10155#: builtin/merge.c:297 builtin/merge.c:314
10156msgid "read-tree failed"
10157msgstr "读取树失败"
10158
10159#  译者:注意保持前导空格
10160#: builtin/merge.c:344
10161msgid " (nothing to squash)"
10162msgstr " (无可压缩)"
10163
10164#: builtin/merge.c:355
10165#, c-format
10166msgid "Squash commit -- not updating HEAD\n"
10167msgstr "压缩提交 -- 未更新 HEAD\n"
10168
10169#: builtin/merge.c:405
10170#, c-format
10171msgid "No merge message -- not updating HEAD\n"
10172msgstr "无合并信息 -- 未更新 HEAD\n"
10173
10174#: builtin/merge.c:456
10175#, c-format
10176msgid "'%s' does not point to a commit"
10177msgstr "'%s' 没有指向一个提交"
10178
10179#: builtin/merge.c:546
10180#, c-format
10181msgid "Bad branch.%s.mergeoptions string: %s"
10182msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
10183
10184#: builtin/merge.c:666
10185msgid "Not handling anything other than two heads merge."
10186msgstr "未处理两个头合并之外的任何操作。"
10187
10188#: builtin/merge.c:680
10189#, c-format
10190msgid "Unknown option for merge-recursive: -X%s"
10191msgstr "merge-recursive 的未知选项:-X%s"
10192
10193#: builtin/merge.c:695
10194#, c-format
10195msgid "unable to write %s"
10196msgstr "不能写 %s"
10197
10198#: builtin/merge.c:747
10199#, c-format
10200msgid "Could not read from '%s'"
10201msgstr "不能从 '%s' 读取"
10202
10203#: builtin/merge.c:756
10204#, c-format
10205msgid "Not committing merge; use 'git commit' to complete the merge.\n"
10206msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
10207
10208#: builtin/merge.c:762
10209#, c-format
10210msgid ""
10211"Please enter a commit message to explain why this merge is necessary,\n"
10212"especially if it merges an updated upstream into a topic branch.\n"
10213"\n"
10214"Lines starting with '%c' will be ignored, and an empty message aborts\n"
10215"the commit.\n"
10216msgstr ""
10217"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
10218"合并到主题分支。\n"
10219"\n"
10220"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
10221
10222#: builtin/merge.c:798
10223msgid "Empty commit message."
10224msgstr "空提交信息。"
10225
10226#: builtin/merge.c:818
10227#, c-format
10228msgid "Wonderful.\n"
10229msgstr "太棒了。\n"
10230
10231#: builtin/merge.c:871
10232#, c-format
10233msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
10234msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
10235
10236#: builtin/merge.c:910
10237msgid "No current branch."
10238msgstr "没有当前分支。"
10239
10240#: builtin/merge.c:912
10241msgid "No remote for the current branch."
10242msgstr "当前分支没有对应的远程仓库。"
10243
10244#: builtin/merge.c:914
10245msgid "No default upstream defined for the current branch."
10246msgstr "当前分支没有定义默认的上游分支。"
10247
10248#: builtin/merge.c:919
10249#, c-format
10250msgid "No remote-tracking branch for %s from %s"
10251msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
10252
10253#: builtin/merge.c:972
10254#, c-format
10255msgid "Bad value '%s' in environment '%s'"
10256msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
10257
10258#: builtin/merge.c:1073
10259#, c-format
10260msgid "not something we can merge in %s: %s"
10261msgstr "不能在 %s 中合并:%s"
10262
10263#: builtin/merge.c:1107
10264msgid "not something we can merge"
10265msgstr "不能合并"
10266
10267#: builtin/merge.c:1172
10268msgid "--abort expects no arguments"
10269msgstr "--abort 不带参数"
10270
10271#: builtin/merge.c:1176
10272msgid "There is no merge to abort (MERGE_HEAD missing)."
10273msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
10274
10275#: builtin/merge.c:1188
10276msgid "--continue expects no arguments"
10277msgstr "--continue 不带参数"
10278
10279#: builtin/merge.c:1192
10280msgid "There is no merge in progress (MERGE_HEAD missing)."
10281msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
10282
10283#: builtin/merge.c:1208
10284msgid ""
10285"You have not concluded your merge (MERGE_HEAD exists).\n"
10286"Please, commit your changes before you merge."
10287msgstr ""
10288"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10289"请在合并前先提交您的修改。"
10290
10291#: builtin/merge.c:1215
10292msgid ""
10293"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
10294"Please, commit your changes before you merge."
10295msgstr ""
10296"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
10297"请在合并前先提交您的修改。"
10298
10299#: builtin/merge.c:1218
10300msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
10301msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
10302
10303#: builtin/merge.c:1227
10304msgid "You cannot combine --squash with --no-ff."
10305msgstr "您不能将 --squash 与 --no-ff 同时使用。"
10306
10307#: builtin/merge.c:1235
10308msgid "No commit specified and merge.defaultToUpstream not set."
10309msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
10310
10311#: builtin/merge.c:1252
10312msgid "Squash commit into empty head not supported yet"
10313msgstr "尚不支持到空分支的压缩提交"
10314
10315#: builtin/merge.c:1254
10316msgid "Non-fast-forward commit does not make sense into an empty head"
10317msgstr "到空分支的非快进式提交没有意义"
10318
10319#: builtin/merge.c:1259
10320#, c-format
10321msgid "%s - not something we can merge"
10322msgstr "%s - 不能被合并"
10323
10324#: builtin/merge.c:1261
10325msgid "Can merge only exactly one commit into empty head"
10326msgstr "只能将一个提交合并到空分支上"
10327
10328#: builtin/merge.c:1295
10329#, c-format
10330msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
10331msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
10332
10333#: builtin/merge.c:1298
10334#, c-format
10335msgid "Commit %s has a bad GPG signature allegedly by %s."
10336msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
10337
10338#: builtin/merge.c:1301
10339#, c-format
10340msgid "Commit %s does not have a GPG signature."
10341msgstr "提交 %s 没有一个 GPG 签名。"
10342
10343#: builtin/merge.c:1304
10344#, c-format
10345msgid "Commit %s has a good GPG signature by %s\n"
10346msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
10347
10348#: builtin/merge.c:1366
10349msgid "refusing to merge unrelated histories"
10350msgstr "拒绝合并无关的历史"
10351
10352#: builtin/merge.c:1375
10353msgid "Already up to date."
10354msgstr "已经是最新的。"
10355
10356#: builtin/merge.c:1385
10357#, c-format
10358msgid "Updating %s..%s\n"
10359msgstr "更新 %s..%s\n"
10360
10361#: builtin/merge.c:1426
10362#, c-format
10363msgid "Trying really trivial in-index merge...\n"
10364msgstr "尝试非常小的索引内合并...\n"
10365
10366#: builtin/merge.c:1433
10367#, c-format
10368msgid "Nope.\n"
10369msgstr "无。\n"
10370
10371#: builtin/merge.c:1458
10372msgid "Already up to date. Yeeah!"
10373msgstr "已经是最新的。耶!"
10374
10375#: builtin/merge.c:1464
10376msgid "Not possible to fast-forward, aborting."
10377msgstr "无法快进,终止。"
10378
10379#: builtin/merge.c:1487 builtin/merge.c:1566
10380#, c-format
10381msgid "Rewinding the tree to pristine...\n"
10382msgstr "将树回滚至原始状态...\n"
10383
10384#: builtin/merge.c:1491
10385#, c-format
10386msgid "Trying merge strategy %s...\n"
10387msgstr "尝试合并策略 %s...\n"
10388
10389#: builtin/merge.c:1557
10390#, c-format
10391msgid "No merge strategy handled the merge.\n"
10392msgstr "没有合并策略处理此合并。\n"
10393
10394#: builtin/merge.c:1559
10395#, c-format
10396msgid "Merge with strategy %s failed.\n"
10397msgstr "使用策略 %s 合并失败。\n"
10398
10399#: builtin/merge.c:1568
10400#, c-format
10401msgid "Using the %s to prepare resolving by hand.\n"
10402msgstr "使用 %s 以准备手工解决。\n"
10403
10404#: builtin/merge.c:1580
10405#, c-format
10406msgid "Automatic merge went well; stopped before committing as requested\n"
10407msgstr "自动合并进展顺利,按要求在提交前停止\n"
10408
10409#: builtin/merge-base.c:30
10410msgid "git merge-base [-a | --all] <commit> <commit>..."
10411msgstr "git merge-base [-a | --all] <提交> <提交>..."
10412
10413#: builtin/merge-base.c:31
10414msgid "git merge-base [-a | --all] --octopus <commit>..."
10415msgstr "git merge-base [-a | --all] --octopus <提交>..."
10416
10417#: builtin/merge-base.c:32
10418msgid "git merge-base --independent <commit>..."
10419msgstr "git merge-base --independent <提交>..."
10420
10421#: builtin/merge-base.c:33
10422msgid "git merge-base --is-ancestor <commit> <commit>"
10423msgstr "git merge-base --is-ancestor <提交> <提交>"
10424
10425#: builtin/merge-base.c:34
10426msgid "git merge-base --fork-point <ref> [<commit>]"
10427msgstr "git merge-base --fork-point <引用> [<提交>]"
10428
10429#: builtin/merge-base.c:218
10430msgid "output all common ancestors"
10431msgstr "输出所有共同的祖先"
10432
10433#: builtin/merge-base.c:220
10434msgid "find ancestors for a single n-way merge"
10435msgstr "查找一个多路合并的祖先提交"
10436
10437#: builtin/merge-base.c:222
10438msgid "list revs not reachable from others"
10439msgstr "显示不能被其他访问到的版本"
10440
10441#: builtin/merge-base.c:224
10442msgid "is the first one ancestor of the other?"
10443msgstr "第一个是其他的祖先提交么?"
10444
10445#: builtin/merge-base.c:226
10446msgid "find where <commit> forked from reflog of <ref>"
10447msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
10448
10449#: builtin/merge-file.c:9
10450msgid ""
10451"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
10452"<orig-file> <file2>"
10453msgstr ""
10454"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
10455"件> <文件2>"
10456
10457#: builtin/merge-file.c:33
10458msgid "send results to standard output"
10459msgstr "将结果发送到标准输出"
10460
10461#: builtin/merge-file.c:34
10462msgid "use a diff3 based merge"
10463msgstr "使用基于 diff3 的合并"
10464
10465#: builtin/merge-file.c:35
10466msgid "for conflicts, use our version"
10467msgstr "如果冲突,使用我们的版本"
10468
10469#: builtin/merge-file.c:37
10470msgid "for conflicts, use their version"
10471msgstr "如果冲突,使用他们的版本"
10472
10473#: builtin/merge-file.c:39
10474msgid "for conflicts, use a union version"
10475msgstr "如果冲突,使用联合版本"
10476
10477#: builtin/merge-file.c:42
10478msgid "for conflicts, use this marker size"
10479msgstr "如果冲突,使用指定长度的标记"
10480
10481#: builtin/merge-file.c:43
10482msgid "do not warn about conflicts"
10483msgstr "不要警告冲突"
10484
10485#: builtin/merge-file.c:45
10486msgid "set labels for file1/orig-file/file2"
10487msgstr "为 文件1/初始文件/文件2 设置标签"
10488
10489#: builtin/merge-recursive.c:45
10490#, c-format
10491msgid "unknown option %s"
10492msgstr "未知选项 %s"
10493
10494#: builtin/merge-recursive.c:51
10495#, c-format
10496msgid "could not parse object '%s'"
10497msgstr "不能解析对象 '%s'"
10498
10499#: builtin/merge-recursive.c:55
10500#, c-format
10501msgid "cannot handle more than %d base. Ignoring %s."
10502msgid_plural "cannot handle more than %d bases. Ignoring %s."
10503msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
10504msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
10505
10506#: builtin/merge-recursive.c:63
10507msgid "not handling anything other than two heads merge."
10508msgstr "不能处理两个头合并之外的任何操作。"
10509
10510#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
10511#, c-format
10512msgid "could not resolve ref '%s'"
10513msgstr "无法解析引用 '%s'"
10514
10515#: builtin/merge-recursive.c:77
10516#, c-format
10517msgid "Merging %s with %s\n"
10518msgstr "合并 %s 和 %s\n"
10519
10520#: builtin/mktree.c:65
10521msgid "git mktree [-z] [--missing] [--batch]"
10522msgstr "git mktree [-z] [--missing] [--batch]"
10523
10524#: builtin/mktree.c:153
10525msgid "input is NUL terminated"
10526msgstr "输入以 NUL 字符终止"
10527
10528#: builtin/mktree.c:154 builtin/write-tree.c:25
10529msgid "allow missing objects"
10530msgstr "允许丢失的对象"
10531
10532#: builtin/mktree.c:155
10533msgid "allow creation of more than one tree"
10534msgstr "允许创建一个以上的树"
10535
10536#: builtin/mv.c:17
10537msgid "git mv [<options>] <source>... <destination>"
10538msgstr "git mv [<选项>] <源>... <目标>"
10539
10540#: builtin/mv.c:83
10541#, c-format
10542msgid "Directory %s is in index and no submodule?"
10543msgstr "目录 %s 在索引中并且不是子模组?"
10544
10545#: builtin/mv.c:85 builtin/rm.c:289
10546msgid "Please stage your changes to .gitmodules or stash them to proceed"
10547msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
10548
10549#: builtin/mv.c:103
10550#, c-format
10551msgid "%.*s is in index"
10552msgstr "%.*s 在索引中"
10553
10554#: builtin/mv.c:125
10555msgid "force move/rename even if target exists"
10556msgstr "强制移动/重命令,即使目标存在"
10557
10558#: builtin/mv.c:126
10559msgid "skip move/rename errors"
10560msgstr "跳过移动/重命名错误"
10561
10562#: builtin/mv.c:167
10563#, c-format
10564msgid "destination '%s' is not a directory"
10565msgstr "目标 '%s' 不是一个目录"
10566
10567#: builtin/mv.c:178
10568#, c-format
10569msgid "Checking rename of '%s' to '%s'\n"
10570msgstr "检查 '%s' 到 '%s' 的重命名\n"
10571
10572#: builtin/mv.c:182
10573msgid "bad source"
10574msgstr "坏的源"
10575
10576#: builtin/mv.c:185
10577msgid "can not move directory into itself"
10578msgstr "不能将目录移动到自身"
10579
10580#: builtin/mv.c:188
10581msgid "cannot move directory over file"
10582msgstr "不能将目录移动到文件"
10583
10584#: builtin/mv.c:197
10585msgid "source directory is empty"
10586msgstr "源目录为空"
10587
10588#: builtin/mv.c:222
10589msgid "not under version control"
10590msgstr "不在版本控制之下"
10591
10592#: builtin/mv.c:225
10593msgid "destination exists"
10594msgstr "目标已存在"
10595
10596#: builtin/mv.c:233
10597#, c-format
10598msgid "overwriting '%s'"
10599msgstr "覆盖 '%s'"
10600
10601#: builtin/mv.c:236
10602msgid "Cannot overwrite"
10603msgstr "不能覆盖"
10604
10605#: builtin/mv.c:239
10606msgid "multiple sources for the same target"
10607msgstr "同一目标具有多个源"
10608
10609#: builtin/mv.c:241
10610msgid "destination directory does not exist"
10611msgstr "目标目录不存在"
10612
10613#: builtin/mv.c:248
10614#, c-format
10615msgid "%s, source=%s, destination=%s"
10616msgstr "%s,源=%s,目标=%s"
10617
10618#: builtin/mv.c:269
10619#, c-format
10620msgid "Renaming %s to %s\n"
10621msgstr "重命名 %s 至 %s\n"
10622
10623#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
10624#, c-format
10625msgid "renaming '%s' failed"
10626msgstr "重命名 '%s' 失败"
10627
10628#: builtin/name-rev.c:338
10629msgid "git name-rev [<options>] <commit>..."
10630msgstr "git name-rev [<选项>] <提交>..."
10631
10632#: builtin/name-rev.c:339
10633msgid "git name-rev [<options>] --all"
10634msgstr "git name-rev [<选项>] --all"
10635
10636#: builtin/name-rev.c:340
10637msgid "git name-rev [<options>] --stdin"
10638msgstr "git name-rev [<选项>] --stdin"
10639
10640#: builtin/name-rev.c:395
10641msgid "print only names (no SHA-1)"
10642msgstr "只打印名称(无 SHA-1)"
10643
10644#: builtin/name-rev.c:396
10645msgid "only use tags to name the commits"
10646msgstr "只使用标签来命名提交"
10647
10648#: builtin/name-rev.c:398
10649msgid "only use refs matching <pattern>"
10650msgstr "只使用和 <模式> 相匹配的引用"
10651
10652#: builtin/name-rev.c:400
10653msgid "ignore refs matching <pattern>"
10654msgstr "忽略和 <模式> 相匹配的引用"
10655
10656#: builtin/name-rev.c:402
10657msgid "list all commits reachable from all refs"
10658msgstr "列出可以从所有引用访问的提交"
10659
10660#: builtin/name-rev.c:403
10661msgid "read from stdin"
10662msgstr "从标准输入读取"
10663
10664#: builtin/name-rev.c:404
10665msgid "allow to print `undefined` names (default)"
10666msgstr "允许打印 `未定义` 的名称(默认)"
10667
10668#: builtin/name-rev.c:410
10669msgid "dereference tags in the input (internal use)"
10670msgstr "反向解析输入中的标签(内部使用)"
10671
10672#: builtin/notes.c:26
10673msgid "git notes [--ref <notes-ref>] [list [<object>]]"
10674msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
10675
10676#: builtin/notes.c:27
10677msgid ""
10678"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
10679"| (-c | -C) <object>] [<object>]"
10680msgstr ""
10681"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
10682"| (-c | -C) <对象>] [<对象>]"
10683
10684#: builtin/notes.c:28
10685msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
10686msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
10687
10688#: builtin/notes.c:29
10689msgid ""
10690"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
10691"(-c | -C) <object>] [<object>]"
10692msgstr ""
10693"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
10694"(-c | -C) <对象>] [<对象>]"
10695
10696#: builtin/notes.c:30
10697msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
10698msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
10699
10700#: builtin/notes.c:31
10701msgid "git notes [--ref <notes-ref>] show [<object>]"
10702msgstr "git notes [--ref <注解引用>] show [<对象>]"
10703
10704#: builtin/notes.c:32
10705msgid ""
10706"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
10707msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
10708
10709#: builtin/notes.c:33
10710msgid "git notes merge --commit [-v | -q]"
10711msgstr "git notes merge --commit [-v | -q]"
10712
10713#: builtin/notes.c:34
10714msgid "git notes merge --abort [-v | -q]"
10715msgstr "git notes merge --abort [-v | -q]"
10716
10717#: builtin/notes.c:35
10718msgid "git notes [--ref <notes-ref>] remove [<object>...]"
10719msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
10720
10721#: builtin/notes.c:36
10722msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
10723msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
10724
10725#: builtin/notes.c:37
10726msgid "git notes [--ref <notes-ref>] get-ref"
10727msgstr "git notes [--ref <注解引用>] get-ref"
10728
10729#: builtin/notes.c:42
10730msgid "git notes [list [<object>]]"
10731msgstr "git notes [list [<对象>]]"
10732
10733#: builtin/notes.c:47
10734msgid "git notes add [<options>] [<object>]"
10735msgstr "git notes add [<选项>] [<对象>]"
10736
10737#: builtin/notes.c:52
10738msgid "git notes copy [<options>] <from-object> <to-object>"
10739msgstr "git notes copy [<选项>] <源对象> <目标对象>"
10740
10741#: builtin/notes.c:53
10742msgid "git notes copy --stdin [<from-object> <to-object>]..."
10743msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
10744
10745#: builtin/notes.c:58
10746msgid "git notes append [<options>] [<object>]"
10747msgstr "git notes append [<选项>] [<对象>]"
10748
10749#: builtin/notes.c:63
10750msgid "git notes edit [<object>]"
10751msgstr "git notes edit [<对象>]"
10752
10753#: builtin/notes.c:68
10754msgid "git notes show [<object>]"
10755msgstr "git notes show [<对象>]"
10756
10757#: builtin/notes.c:73
10758msgid "git notes merge [<options>] <notes-ref>"
10759msgstr "git notes merge [<选项>] <注解引用>"
10760
10761#: builtin/notes.c:74
10762msgid "git notes merge --commit [<options>]"
10763msgstr "git notes merge --commit [<选项>]"
10764
10765#: builtin/notes.c:75
10766msgid "git notes merge --abort [<options>]"
10767msgstr "git notes merge --abort [<选项>]"
10768
10769#: builtin/notes.c:80
10770msgid "git notes remove [<object>]"
10771msgstr "git notes remove [<对象>]"
10772
10773#: builtin/notes.c:85
10774msgid "git notes prune [<options>]"
10775msgstr "git notes prune [<选项>]"
10776
10777#: builtin/notes.c:90
10778msgid "git notes get-ref"
10779msgstr "git notes get-ref"
10780
10781#: builtin/notes.c:95
10782msgid "Write/edit the notes for the following object:"
10783msgstr "为下面的对象写/编辑说明:"
10784
10785#: builtin/notes.c:148
10786#, c-format
10787msgid "unable to start 'show' for object '%s'"
10788msgstr "不能为对象 '%s' 开始 'show'"
10789
10790#: builtin/notes.c:152
10791msgid "could not read 'show' output"
10792msgstr "不能读取 'show' 的输出"
10793
10794#: builtin/notes.c:160
10795#, c-format
10796msgid "failed to finish 'show' for object '%s'"
10797msgstr "无法为对象 '%s' 完成 'show'"
10798
10799#: builtin/notes.c:195
10800msgid "please supply the note contents using either -m or -F option"
10801msgstr "请通过 -m 或 -F 选项为注解提供内容"
10802
10803#: builtin/notes.c:204
10804msgid "unable to write note object"
10805msgstr "不能写注解对象"
10806
10807#: builtin/notes.c:206
10808#, c-format
10809msgid "the note contents have been left in %s"
10810msgstr "注解内容被留在 %s 中"
10811
10812#: builtin/notes.c:234 builtin/tag.c:500
10813#, c-format
10814msgid "cannot read '%s'"
10815msgstr "不能读取 '%s'"
10816
10817#: builtin/notes.c:236 builtin/tag.c:503
10818#, c-format
10819msgid "could not open or read '%s'"
10820msgstr "不能打开或读取 '%s'"
10821
10822#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
10823#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
10824#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
10825#, c-format
10826msgid "failed to resolve '%s' as a valid ref."
10827msgstr "无法解析 '%s' 为一个有效引用。"
10828
10829#: builtin/notes.c:258
10830#, c-format
10831msgid "failed to read object '%s'."
10832msgstr "无法读取对象 '%s'。"
10833
10834#: builtin/notes.c:262
10835#, c-format
10836msgid "cannot read note data from non-blob object '%s'."
10837msgstr "不能从非数据对象 '%s' 中读取注解数据。"
10838
10839#: builtin/notes.c:302
10840#, c-format
10841msgid "malformed input line: '%s'."
10842msgstr "非法的输入行:'%s'。"
10843
10844#: builtin/notes.c:317
10845#, c-format
10846msgid "failed to copy notes from '%s' to '%s'"
10847msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
10848
10849#. TRANSLATORS: the first %s will be replaced by a git
10850#. notes command: 'add', 'merge', 'remove', etc.
10851#.
10852#: builtin/notes.c:349
10853#, c-format
10854msgid "refusing to %s notes in %s (outside of refs/notes/)"
10855msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
10856
10857#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
10858#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
10859#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
10860msgid "too many parameters"
10861msgstr "参数太多"
10862
10863#: builtin/notes.c:382 builtin/notes.c:668
10864#, c-format
10865msgid "no note found for object %s."
10866msgstr "未发现对象 %s 的注解。"
10867
10868#: builtin/notes.c:403 builtin/notes.c:566
10869msgid "note contents as a string"
10870msgstr "注解内容作为一个字符串"
10871
10872#: builtin/notes.c:406 builtin/notes.c:569
10873msgid "note contents in a file"
10874msgstr "注解内容到一个文件中"
10875
10876#: builtin/notes.c:409 builtin/notes.c:572
10877msgid "reuse and edit specified note object"
10878msgstr "重用和编辑指定的注解对象"
10879
10880#: builtin/notes.c:412 builtin/notes.c:575
10881msgid "reuse specified note object"
10882msgstr "重用指定的注解对象"
10883
10884#: builtin/notes.c:415 builtin/notes.c:578
10885msgid "allow storing empty note"
10886msgstr "允许保存空白注释"
10887
10888#: builtin/notes.c:416 builtin/notes.c:487
10889msgid "replace existing notes"
10890msgstr "替换已存在的注解"
10891
10892#: builtin/notes.c:441
10893#, c-format
10894msgid ""
10895"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
10896"existing notes"
10897msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10898
10899#: builtin/notes.c:456 builtin/notes.c:535
10900#, c-format
10901msgid "Overwriting existing notes for object %s\n"
10902msgstr "覆盖对象 %s 现存注解\n"
10903
10904#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
10905#, c-format
10906msgid "Removing note for object %s\n"
10907msgstr "删除对象 %s 的注解\n"
10908
10909#: builtin/notes.c:488
10910msgid "read objects from stdin"
10911msgstr "从标准输入读取对象"
10912
10913#: builtin/notes.c:490
10914msgid "load rewriting config for <command> (implies --stdin)"
10915msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
10916
10917#: builtin/notes.c:508
10918msgid "too few parameters"
10919msgstr "参数太少"
10920
10921#: builtin/notes.c:529
10922#, c-format
10923msgid ""
10924"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
10925"existing notes"
10926msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10927
10928#: builtin/notes.c:541
10929#, c-format
10930msgid "missing notes on source object %s. Cannot copy."
10931msgstr "源对象 %s 缺少注解。不能拷贝。"
10932
10933#: builtin/notes.c:593
10934#, c-format
10935msgid ""
10936"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
10937"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
10938msgstr ""
10939"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
10940"请换用 'git notes add -f -m/-F/-c/-C'。\n"
10941
10942#: builtin/notes.c:688
10943msgid "failed to delete ref NOTES_MERGE_PARTIAL"
10944msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
10945
10946#: builtin/notes.c:690
10947msgid "failed to delete ref NOTES_MERGE_REF"
10948msgstr "无法删除引用 NOTES_MERGE_REF"
10949
10950#: builtin/notes.c:692
10951msgid "failed to remove 'git notes merge' worktree"
10952msgstr "无法删除 'git notes merge' 工作区"
10953
10954#: builtin/notes.c:712
10955msgid "failed to read ref NOTES_MERGE_PARTIAL"
10956msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10957
10958#: builtin/notes.c:714
10959msgid "could not find commit from NOTES_MERGE_PARTIAL."
10960msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10961
10962#: builtin/notes.c:716
10963msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10964msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10965
10966#: builtin/notes.c:729
10967msgid "failed to resolve NOTES_MERGE_REF"
10968msgstr "无法解析 NOTES_MERGE_REF"
10969
10970#: builtin/notes.c:732
10971msgid "failed to finalize notes merge"
10972msgstr "无法完成注解合并"
10973
10974#: builtin/notes.c:758
10975#, c-format
10976msgid "unknown notes merge strategy %s"
10977msgstr "未知的注解合并策略 %s"
10978
10979#: builtin/notes.c:774
10980msgid "General options"
10981msgstr "通用选项"
10982
10983#: builtin/notes.c:776
10984msgid "Merge options"
10985msgstr "合并选项"
10986
10987#: builtin/notes.c:778
10988msgid ""
10989"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10990"cat_sort_uniq)"
10991msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
10992
10993#: builtin/notes.c:780
10994msgid "Committing unmerged notes"
10995msgstr "提交未合并的注解"
10996
10997#: builtin/notes.c:782
10998msgid "finalize notes merge by committing unmerged notes"
10999msgstr "通过提交未合并的注解来完成注解合并"
11000
11001#: builtin/notes.c:784
11002msgid "Aborting notes merge resolution"
11003msgstr "中止注解合并的方案"
11004
11005#: builtin/notes.c:786
11006msgid "abort notes merge"
11007msgstr "中止注解合并"
11008
11009#: builtin/notes.c:797
11010msgid "cannot mix --commit, --abort or -s/--strategy"
11011msgstr "不能混用 --commit、--abort 或 -s/--strategy"
11012
11013#: builtin/notes.c:802
11014msgid "must specify a notes ref to merge"
11015msgstr "必须指定一个注解引用来合并"
11016
11017#: builtin/notes.c:826
11018#, c-format
11019msgid "unknown -s/--strategy: %s"
11020msgstr "未知的 -s/--strategy:%s"
11021
11022#: builtin/notes.c:863
11023#, c-format
11024msgid "a notes merge into %s is already in-progress at %s"
11025msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
11026
11027#: builtin/notes.c:866
11028#, c-format
11029msgid "failed to store link to current notes ref (%s)"
11030msgstr "无法存储链接到当前的注解引用(%s)"
11031
11032#: builtin/notes.c:868
11033#, c-format
11034msgid ""
11035"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
11036"'git notes merge --commit', or abort the merge with 'git notes merge --"
11037"abort'.\n"
11038msgstr ""
11039"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
11040"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
11041
11042#: builtin/notes.c:890
11043#, c-format
11044msgid "Object %s has no note\n"
11045msgstr "对象 %s 没有注解\n"
11046
11047#: builtin/notes.c:902
11048msgid "attempt to remove non-existent note is not an error"
11049msgstr "尝试删除不存在的注解不是一个错误"
11050
11051#: builtin/notes.c:905
11052msgid "read object names from the standard input"
11053msgstr "从标准输入读取对象名称"
11054
11055#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
11056msgid "do not remove, show only"
11057msgstr "不删除,只显示"
11058
11059#: builtin/notes.c:944
11060msgid "report pruned notes"
11061msgstr "报告清除的注解"
11062
11063#: builtin/notes.c:986
11064msgid "notes-ref"
11065msgstr "注解引用"
11066
11067#: builtin/notes.c:987
11068msgid "use notes from <notes-ref>"
11069msgstr "从 <注解引用> 使用注解"
11070
11071#: builtin/notes.c:1022
11072#, c-format
11073msgid "unknown subcommand: %s"
11074msgstr "未知子命令:%s"
11075
11076#: builtin/pack-objects.c:31
11077msgid ""
11078"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
11079msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
11080
11081#: builtin/pack-objects.c:32
11082msgid ""
11083"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
11084msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
11085
11086#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
11087#, c-format
11088msgid "deflate error (%d)"
11089msgstr "压缩错误 (%d)"
11090
11091#: builtin/pack-objects.c:777
11092msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
11093msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
11094
11095#: builtin/pack-objects.c:790
11096msgid "Writing objects"
11097msgstr "写入对象中"
11098
11099#: builtin/pack-objects.c:1070
11100msgid "disabling bitmap writing, as some objects are not being packed"
11101msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
11102
11103#: builtin/pack-objects.c:2440
11104msgid "Compressing objects"
11105msgstr "压缩对象中"
11106
11107#: builtin/pack-objects.c:2849
11108#, c-format
11109msgid "unsupported index version %s"
11110msgstr "不支持的索引版本 %s"
11111
11112#: builtin/pack-objects.c:2853
11113#, c-format
11114msgid "bad index version '%s'"
11115msgstr "坏的索引版本 '%s'"
11116
11117#: builtin/pack-objects.c:2883
11118msgid "do not show progress meter"
11119msgstr "不显示进度表"
11120
11121#: builtin/pack-objects.c:2885
11122msgid "show progress meter"
11123msgstr "显示进度表"
11124
11125#: builtin/pack-objects.c:2887
11126msgid "show progress meter during object writing phase"
11127msgstr "在对象写入阶段显示进度表"
11128
11129#: builtin/pack-objects.c:2890
11130msgid "similar to --all-progress when progress meter is shown"
11131msgstr "当进度表显示时类似于 --all-progress"
11132
11133#: builtin/pack-objects.c:2891
11134msgid "version[,offset]"
11135msgstr "版本[,偏移]"
11136
11137#: builtin/pack-objects.c:2892
11138msgid "write the pack index file in the specified idx format version"
11139msgstr "用指定的 idx 格式版本来写包索引文件"
11140
11141#: builtin/pack-objects.c:2895
11142msgid "maximum size of each output pack file"
11143msgstr "每个输出包的最大尺寸"
11144
11145#: builtin/pack-objects.c:2897
11146msgid "ignore borrowed objects from alternate object store"
11147msgstr "忽略从备用对象存储里借用对象"
11148
11149#: builtin/pack-objects.c:2899
11150msgid "ignore packed objects"
11151msgstr "忽略包对象"
11152
11153#: builtin/pack-objects.c:2901
11154msgid "limit pack window by objects"
11155msgstr "限制打包窗口的对象数"
11156
11157#: builtin/pack-objects.c:2903
11158msgid "limit pack window by memory in addition to object limit"
11159msgstr "除对象数量限制外设置打包窗口的内存限制"
11160
11161#: builtin/pack-objects.c:2905
11162msgid "maximum length of delta chain allowed in the resulting pack"
11163msgstr "打包允许的 delta 链的最大长度"
11164
11165#: builtin/pack-objects.c:2907
11166msgid "reuse existing deltas"
11167msgstr "重用已存在的 deltas"
11168
11169#: builtin/pack-objects.c:2909
11170msgid "reuse existing objects"
11171msgstr "重用已存在的对象"
11172
11173#: builtin/pack-objects.c:2911
11174msgid "use OFS_DELTA objects"
11175msgstr "使用 OFS_DELTA 对象"
11176
11177#: builtin/pack-objects.c:2913
11178msgid "use threads when searching for best delta matches"
11179msgstr "使用线程查询最佳 delta 匹配"
11180
11181#: builtin/pack-objects.c:2915
11182msgid "do not create an empty pack output"
11183msgstr "不创建空的包输出"
11184
11185#: builtin/pack-objects.c:2917
11186msgid "read revision arguments from standard input"
11187msgstr "从标准输入读取版本号参数"
11188
11189#: builtin/pack-objects.c:2919
11190msgid "limit the objects to those that are not yet packed"
11191msgstr "限制那些尚未打包的对象"
11192
11193#: builtin/pack-objects.c:2922
11194msgid "include objects reachable from any reference"
11195msgstr "包括可以从任何引用访问到的对象"
11196
11197#: builtin/pack-objects.c:2925
11198msgid "include objects referred by reflog entries"
11199msgstr "包括被引用日志引用到的对象"
11200
11201#: builtin/pack-objects.c:2928
11202msgid "include objects referred to by the index"
11203msgstr "包括被索引引用到的对象"
11204
11205#: builtin/pack-objects.c:2931
11206msgid "output pack to stdout"
11207msgstr "输出包到标准输出"
11208
11209#: builtin/pack-objects.c:2933
11210msgid "include tag objects that refer to objects to be packed"
11211msgstr "包括那些引用了待打包对象的标签对象"
11212
11213#: builtin/pack-objects.c:2935
11214msgid "keep unreachable objects"
11215msgstr "维持不可达的对象"
11216
11217#: builtin/pack-objects.c:2937
11218msgid "pack loose unreachable objects"
11219msgstr "打包松散的不可达对象"
11220
11221#: builtin/pack-objects.c:2939
11222msgid "unpack unreachable objects newer than <time>"
11223msgstr "将比给定 <时间> 新的无法访问的对象解包"
11224
11225#: builtin/pack-objects.c:2942
11226msgid "create thin packs"
11227msgstr "创建精简包"
11228
11229#: builtin/pack-objects.c:2944
11230msgid "create packs suitable for shallow fetches"
11231msgstr "创建适合浅克隆仓库获取的包"
11232
11233#: builtin/pack-objects.c:2946
11234msgid "ignore packs that have companion .keep file"
11235msgstr "忽略配有 .keep 文件的包"
11236
11237#: builtin/pack-objects.c:2948
11238msgid "pack compression level"
11239msgstr "打包压缩级别"
11240
11241#: builtin/pack-objects.c:2950
11242msgid "do not hide commits by grafts"
11243msgstr "显示被嫁接隐藏的提交"
11244
11245#: builtin/pack-objects.c:2952
11246msgid "use a bitmap index if available to speed up counting objects"
11247msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
11248
11249#: builtin/pack-objects.c:2954
11250msgid "write a bitmap index together with the pack index"
11251msgstr "在建立包索引的同时创建 bitmap 索引"
11252
11253#: builtin/pack-objects.c:3081
11254msgid "Counting objects"
11255msgstr "对象计数中"
11256
11257#: builtin/pack-refs.c:6
11258msgid "git pack-refs [<options>]"
11259msgstr "git pack-refs [<选项>]"
11260
11261#: builtin/pack-refs.c:14
11262msgid "pack everything"
11263msgstr "打包一切"
11264
11265#: builtin/pack-refs.c:15
11266msgid "prune loose refs (default)"
11267msgstr "清除松散的引用(默认)"
11268
11269#: builtin/prune-packed.c:8
11270msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
11271msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
11272
11273#: builtin/prune-packed.c:41
11274msgid "Removing duplicate objects"
11275msgstr "正在删除重复对象"
11276
11277#: builtin/prune.c:11
11278msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
11279msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
11280
11281#: builtin/prune.c:106
11282msgid "report pruned objects"
11283msgstr "报告清除的对象"
11284
11285#: builtin/prune.c:109
11286msgid "expire objects older than <time>"
11287msgstr "使早于给定时间的对象过期"
11288
11289#: builtin/prune.c:123
11290msgid "cannot prune in a precious-objects repo"
11291msgstr "不能在珍品仓库中执行清理操作"
11292
11293#: builtin/pull.c:54 builtin/pull.c:56
11294#, c-format
11295msgid "Invalid value for %s: %s"
11296msgstr "%s 的值无效:%s"
11297
11298#: builtin/pull.c:76
11299msgid "git pull [<options>] [<repository> [<refspec>...]]"
11300msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
11301
11302#: builtin/pull.c:124
11303msgid "control for recursive fetching of submodules"
11304msgstr "控制子模组的递归获取"
11305
11306#: builtin/pull.c:128
11307msgid "Options related to merging"
11308msgstr "和合并相关的选项"
11309
11310#: builtin/pull.c:131
11311msgid "incorporate changes by rebasing rather than merging"
11312msgstr "使用变基操作取代合并操作以合入修改"
11313
11314#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
11315msgid "allow fast-forward"
11316msgstr "允许快进式"
11317
11318#: builtin/pull.c:164
11319msgid "automatically stash/stash pop before and after rebase"
11320msgstr "变基操作前后执行自动贮藏和弹出贮藏"
11321
11322#: builtin/pull.c:180
11323msgid "Options related to fetching"
11324msgstr "和获取相关的参数"
11325
11326#: builtin/pull.c:198
11327msgid "number of submodules pulled in parallel"
11328msgstr "并发拉取的子模组的数量"
11329
11330#: builtin/pull.c:287
11331#, c-format
11332msgid "Invalid value for pull.ff: %s"
11333msgstr "pull.ff 的取值无效:%s"
11334
11335#: builtin/pull.c:403
11336msgid ""
11337"There is no candidate for rebasing against among the refs that you just "
11338"fetched."
11339msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
11340
11341#: builtin/pull.c:405
11342msgid ""
11343"There are no candidates for merging among the refs that you just fetched."
11344msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
11345
11346#: builtin/pull.c:406
11347msgid ""
11348"Generally this means that you provided a wildcard refspec which had no\n"
11349"matches on the remote end."
11350msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
11351
11352#: builtin/pull.c:409
11353#, c-format
11354msgid ""
11355"You asked to pull from the remote '%s', but did not specify\n"
11356"a branch. Because this is not the default configured remote\n"
11357"for your current branch, you must specify a branch on the command line."
11358msgstr ""
11359"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
11360"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
11361
11362#: builtin/pull.c:414 git-parse-remote.sh:73
11363msgid "You are not currently on a branch."
11364msgstr "您当前不在一个分支上。"
11365
11366#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
11367msgid "Please specify which branch you want to rebase against."
11368msgstr "请指定您要变基到哪一个分支。"
11369
11370#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
11371msgid "Please specify which branch you want to merge with."
11372msgstr "请指定您要合并哪一个分支。"
11373
11374#: builtin/pull.c:419 builtin/pull.c:434
11375msgid "See git-pull(1) for details."
11376msgstr "详见 git-pull(1)。"
11377
11378#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
11379#: git-parse-remote.sh:64
11380msgid "<remote>"
11381msgstr "<远程>"
11382
11383#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
11384#: git-parse-remote.sh:65
11385msgid "<branch>"
11386msgstr "<分支>"
11387
11388#: builtin/pull.c:429 git-parse-remote.sh:75
11389msgid "There is no tracking information for the current branch."
11390msgstr "当前分支没有跟踪信息。"
11391
11392#: builtin/pull.c:438 git-parse-remote.sh:95
11393msgid ""
11394"If you wish to set tracking information for this branch you can do so with:"
11395msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
11396
11397#: builtin/pull.c:443
11398#, c-format
11399msgid ""
11400"Your configuration specifies to merge with the ref '%s'\n"
11401"from the remote, but no such ref was fetched."
11402msgstr ""
11403"您的配置中指定要合并远程的引用 '%s',\n"
11404"但是没有获取到这个引用。"
11405
11406#: builtin/pull.c:796
11407msgid "ignoring --verify-signatures for rebase"
11408msgstr "为变基操作忽略 --verify-signatures"
11409
11410#: builtin/pull.c:844
11411msgid "--[no-]autostash option is only valid with --rebase."
11412msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
11413
11414#: builtin/pull.c:852
11415msgid "Updating an unborn branch with changes added to the index."
11416msgstr "更新尚未诞生的分支,变更添加至索引。"
11417
11418#: builtin/pull.c:855
11419msgid "pull with rebase"
11420msgstr "变基式拉取"
11421
11422#: builtin/pull.c:856
11423msgid "please commit or stash them."
11424msgstr "请提交或贮藏它们。"
11425
11426#: builtin/pull.c:881
11427#, c-format
11428msgid ""
11429"fetch updated the current branch head.\n"
11430"fast-forwarding your working tree from\n"
11431"commit %s."
11432msgstr ""
11433"fetch 更新了当前的分支。快进您的工作区\n"
11434"至提交 %s。"
11435
11436#: builtin/pull.c:886
11437#, c-format
11438msgid ""
11439"Cannot fast-forward your working tree.\n"
11440"After making sure that you saved anything precious from\n"
11441"$ git diff %s\n"
11442"output, run\n"
11443"$ git reset --hard\n"
11444"to recover."
11445msgstr ""
11446"您当前的工作区无法执行快进操作。\n"
11447"首先执行如下命令:\n"
11448"$ git diff %s\n"
11449"以确认所有有用的数据均已保存。然后执行下面的命令\n"
11450"$ git reset --hard\n"
11451"恢复之前的状态。"
11452
11453#: builtin/pull.c:901
11454msgid "Cannot merge multiple branches into empty head."
11455msgstr "无法将多个分支合并到空分支。"
11456
11457#: builtin/pull.c:905
11458msgid "Cannot rebase onto multiple branches."
11459msgstr "无法变基到多个分支。"
11460
11461#: builtin/pull.c:912
11462msgid "cannot rebase with locally recorded submodule modifications"
11463msgstr "本地子模组中有修改,无法变基"
11464
11465#: builtin/push.c:17
11466msgid "git push [<options>] [<repository> [<refspec>...]]"
11467msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
11468
11469#: builtin/push.c:90
11470msgid "tag shorthand without <tag>"
11471msgstr "标签后面未提供 <标签> 参数"
11472
11473#: builtin/push.c:100
11474msgid "--delete only accepts plain target ref names"
11475msgstr "--delete 只接受简单的目标引用名"
11476
11477#: builtin/push.c:144
11478msgid ""
11479"\n"
11480"To choose either option permanently, see push.default in 'git help config'."
11481msgstr ""
11482"\n"
11483"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
11484
11485#: builtin/push.c:147
11486#, c-format
11487msgid ""
11488"The upstream branch of your current branch does not match\n"
11489"the name of your current branch.  To push to the upstream branch\n"
11490"on the remote, use\n"
11491"\n"
11492"    git push %s HEAD:%s\n"
11493"\n"
11494"To push to the branch of the same name on the remote, use\n"
11495"\n"
11496"    git push %s %s\n"
11497"%s"
11498msgstr ""
11499"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
11500"上游分支,使用\n"
11501"\n"
11502"    git push %s HEAD:%s\n"
11503"\n"
11504"为推送至远程同名分支,使用\n"
11505"\n"
11506"    git push %s %s\n"
11507"%s"
11508
11509#: builtin/push.c:162
11510#, c-format
11511msgid ""
11512"You are not currently on a branch.\n"
11513"To push the history leading to the current (detached HEAD)\n"
11514"state now, use\n"
11515"\n"
11516"    git push %s HEAD:<name-of-remote-branch>\n"
11517msgstr ""
11518"您当前不在一个分支上。\n"
11519"现在为推送当前(分离头指针)的历史,使用\n"
11520"\n"
11521"    git push %s HEAD:<远程分支名字>\n"
11522
11523#: builtin/push.c:176
11524#, c-format
11525msgid ""
11526"The current branch %s has no upstream branch.\n"
11527"To push the current branch and set the remote as upstream, use\n"
11528"\n"
11529"    git push --set-upstream %s %s\n"
11530msgstr ""
11531"当前分支 %s 没有对应的上游分支。\n"
11532"为推送当前分支并建立与远程上游的跟踪,使用\n"
11533"\n"
11534"    git push --set-upstream %s %s\n"
11535
11536#: builtin/push.c:184
11537#, c-format
11538msgid "The current branch %s has multiple upstream branches, refusing to push."
11539msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
11540
11541#: builtin/push.c:187
11542#, c-format
11543msgid ""
11544"You are pushing to remote '%s', which is not the upstream of\n"
11545"your current branch '%s', without telling me what to push\n"
11546"to update which remote branch."
11547msgstr ""
11548"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
11549"而没有告诉我要推送什么、更新哪个远程分支。"
11550
11551#: builtin/push.c:246
11552msgid ""
11553"You didn't specify any refspecs to push, and push.default is \"nothing\"."
11554msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
11555
11556#: builtin/push.c:253
11557msgid ""
11558"Updates were rejected because the tip of your current branch is behind\n"
11559"its remote counterpart. Integrate the remote changes (e.g.\n"
11560"'git pull ...') before pushing again.\n"
11561"See the 'Note about fast-forwards' in 'git push --help' for details."
11562msgstr ""
11563"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
11564"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
11565"'git push --help' 中的 'Note about fast-forwards' 小节。"
11566
11567#: builtin/push.c:259
11568msgid ""
11569"Updates were rejected because a pushed branch tip is behind its remote\n"
11570"counterpart. Check out this branch and integrate the remote changes\n"
11571"(e.g. 'git pull ...') before pushing again.\n"
11572"See the 'Note about fast-forwards' in 'git push --help' for details."
11573msgstr ""
11574"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11575"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
11576"'git push --help' 中的 'Note about fast-forwards' 小节。"
11577
11578#: builtin/push.c:265
11579msgid ""
11580"Updates were rejected because the remote contains work that you do\n"
11581"not have locally. This is usually caused by another repository pushing\n"
11582"to the same ref. You may want to first integrate the remote changes\n"
11583"(e.g., 'git pull ...') before pushing again.\n"
11584"See the 'Note about fast-forwards' in 'git push --help' for details."
11585msgstr ""
11586"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
11587"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
11588"(如 'git pull ...')。\n"
11589"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
11590
11591#: builtin/push.c:272
11592msgid "Updates were rejected because the tag already exists in the remote."
11593msgstr "更新被拒绝,因为该标签在远程已经存在。"
11594
11595#: builtin/push.c:275
11596msgid ""
11597"You cannot update a remote ref that points at a non-commit object,\n"
11598"or update a remote ref to make it point at a non-commit object,\n"
11599"without using the '--force' option.\n"
11600msgstr ""
11601"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
11602"也不能更新远程引用让其指向一个非提交对象。\n"
11603
11604#: builtin/push.c:335
11605#, c-format
11606msgid "Pushing to %s\n"
11607msgstr "推送到 %s\n"
11608
11609#: builtin/push.c:339
11610#, c-format
11611msgid "failed to push some refs to '%s'"
11612msgstr "无法推送一些引用到 '%s'"
11613
11614#: builtin/push.c:370
11615#, c-format
11616msgid "bad repository '%s'"
11617msgstr "坏的仓库 '%s'"
11618
11619#: builtin/push.c:371
11620msgid ""
11621"No configured push destination.\n"
11622"Either specify the URL from the command-line or configure a remote "
11623"repository using\n"
11624"\n"
11625"    git remote add <name> <url>\n"
11626"\n"
11627"and then push using the remote name\n"
11628"\n"
11629"    git push <name>\n"
11630msgstr ""
11631"没有配置推送目标。\n"
11632"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
11633"\n"
11634"    git remote add <名称> <地址>\n"
11635"\n"
11636"然后使用该远程仓库名执行推送\n"
11637"\n"
11638"    git push <名称>\n"
11639
11640#: builtin/push.c:389
11641msgid "--all and --tags are incompatible"
11642msgstr "--all 和 --tags 不兼容"
11643
11644#: builtin/push.c:390
11645msgid "--all can't be combined with refspecs"
11646msgstr "--all 不能和引用规格同时使用"
11647
11648#: builtin/push.c:395
11649msgid "--mirror and --tags are incompatible"
11650msgstr "--mirror 和 --tags 不兼容"
11651
11652#: builtin/push.c:396
11653msgid "--mirror can't be combined with refspecs"
11654msgstr "--mirror 不能和引用规格同时使用"
11655
11656#: builtin/push.c:401
11657msgid "--all and --mirror are incompatible"
11658msgstr "--all 和 --mirror 不兼容"
11659
11660#: builtin/push.c:523
11661msgid "repository"
11662msgstr "仓库"
11663
11664#: builtin/push.c:524 builtin/send-pack.c:163
11665msgid "push all refs"
11666msgstr "推送所有引用"
11667
11668#: builtin/push.c:525 builtin/send-pack.c:165
11669msgid "mirror all refs"
11670msgstr "镜像所有引用"
11671
11672#: builtin/push.c:527
11673msgid "delete refs"
11674msgstr "删除引用"
11675
11676#: builtin/push.c:528
11677msgid "push tags (can't be used with --all or --mirror)"
11678msgstr "推送标签(不能使用 --all or --mirror)"
11679
11680#: builtin/push.c:531 builtin/send-pack.c:166
11681msgid "force updates"
11682msgstr "强制更新"
11683
11684#: builtin/push.c:533 builtin/send-pack.c:180
11685msgid "refname>:<expect"
11686msgstr "引用名>:<期望值"
11687
11688#: builtin/push.c:534 builtin/send-pack.c:181
11689msgid "require old value of ref to be at this value"
11690msgstr "要求引用旧的取值为设定值"
11691
11692#: builtin/push.c:537
11693msgid "control recursive pushing of submodules"
11694msgstr "控制子模组的递归推送"
11695
11696#: builtin/push.c:539 builtin/send-pack.c:174
11697msgid "use thin pack"
11698msgstr "使用精简打包"
11699
11700#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
11701#: builtin/send-pack.c:161
11702msgid "receive pack program"
11703msgstr "接收包程序"
11704
11705#: builtin/push.c:542
11706msgid "set upstream for git pull/status"
11707msgstr "设置 git pull/status 的上游"
11708
11709#: builtin/push.c:545
11710msgid "prune locally removed refs"
11711msgstr "清除本地删除的引用"
11712
11713#: builtin/push.c:547
11714msgid "bypass pre-push hook"
11715msgstr "绕过 pre-push 钩子"
11716
11717#: builtin/push.c:548
11718msgid "push missing but relevant tags"
11719msgstr "推送缺失但有关的标签"
11720
11721#: builtin/push.c:551 builtin/send-pack.c:168
11722msgid "GPG sign the push"
11723msgstr "用 GPG 为推送签名"
11724
11725#: builtin/push.c:553 builtin/send-pack.c:175
11726msgid "request atomic transaction on remote side"
11727msgstr "需要远端支持原子事务"
11728
11729#: builtin/push.c:554 builtin/send-pack.c:171
11730msgid "server-specific"
11731msgstr "server-specific"
11732
11733#: builtin/push.c:554 builtin/send-pack.c:172
11734msgid "option to transmit"
11735msgstr "传输选项"
11736
11737#: builtin/push.c:568
11738msgid "--delete is incompatible with --all, --mirror and --tags"
11739msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
11740
11741#: builtin/push.c:570
11742msgid "--delete doesn't make sense without any refs"
11743msgstr "--delete 未接任何引用没有意义"
11744
11745#: builtin/push.c:589
11746msgid "push options must not have new line characters"
11747msgstr "推送选项不能有换行符"
11748
11749#: builtin/read-tree.c:40
11750msgid ""
11751"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
11752"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11753"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
11754msgstr ""
11755"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
11756"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11757"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
11758
11759#: builtin/read-tree.c:121
11760msgid "write resulting index to <file>"
11761msgstr "将索引结果写入 <文件>"
11762
11763#: builtin/read-tree.c:124
11764msgid "only empty the index"
11765msgstr "只是清空索引"
11766
11767#: builtin/read-tree.c:126
11768msgid "Merging"
11769msgstr "合并"
11770
11771#: builtin/read-tree.c:128
11772msgid "perform a merge in addition to a read"
11773msgstr "读取之余再执行一个合并"
11774
11775#: builtin/read-tree.c:130
11776msgid "3-way merge if no file level merging required"
11777msgstr "如果没有文件级合并需要,执行三方合并"
11778
11779#: builtin/read-tree.c:132
11780msgid "3-way merge in presence of adds and removes"
11781msgstr "存在添加和删除时,也执行三方合并"
11782
11783#: builtin/read-tree.c:134
11784msgid "same as -m, but discard unmerged entries"
11785msgstr "类似于 -m,但丢弃未合并的条目"
11786
11787#: builtin/read-tree.c:135
11788msgid "<subdirectory>/"
11789msgstr "<子目录>/"
11790
11791#: builtin/read-tree.c:136
11792msgid "read the tree into the index under <subdirectory>/"
11793msgstr "读取树对象到索引的 <子目录>/ 下"
11794
11795#: builtin/read-tree.c:139
11796msgid "update working tree with merge result"
11797msgstr "用合并的结果更新工作区"
11798
11799#: builtin/read-tree.c:141
11800msgid "gitignore"
11801msgstr "gitignore"
11802
11803#: builtin/read-tree.c:142
11804msgid "allow explicitly ignored files to be overwritten"
11805msgstr "允许忽略文件中设定的文件可以被覆盖"
11806
11807#: builtin/read-tree.c:145
11808msgid "don't check the working tree after merging"
11809msgstr "合并后不检查工作区"
11810
11811#: builtin/read-tree.c:146
11812msgid "don't update the index or the work tree"
11813msgstr "不更新索引区和工作区"
11814
11815#: builtin/read-tree.c:148
11816msgid "skip applying sparse checkout filter"
11817msgstr "跳过应用稀疏检出过滤器"
11818
11819#: builtin/read-tree.c:150
11820msgid "debug unpack-trees"
11821msgstr "调试 unpack-trees"
11822
11823#: builtin/rebase--helper.c:8
11824msgid "git rebase--helper [<options>]"
11825msgstr "git rebase--helper [<选项>]"
11826
11827#: builtin/rebase--helper.c:22
11828msgid "keep empty commits"
11829msgstr "保持空提交"
11830
11831#: builtin/rebase--helper.c:23
11832msgid "continue rebase"
11833msgstr "继续变基"
11834
11835#: builtin/rebase--helper.c:25
11836msgid "abort rebase"
11837msgstr "中止变基"
11838
11839#: builtin/rebase--helper.c:28
11840msgid "make rebase script"
11841msgstr "制作变基脚本"
11842
11843#: builtin/rebase--helper.c:30
11844msgid "shorten SHA-1s in the todo list"
11845msgstr "缩短待办列表中的哈希值"
11846
11847#: builtin/rebase--helper.c:32
11848msgid "expand SHA-1s in the todo list"
11849msgstr "扩展待办列表中的哈希值"
11850
11851#: builtin/rebase--helper.c:34
11852msgid "check the todo list"
11853msgstr "检查待办列表"
11854
11855#: builtin/rebase--helper.c:36
11856msgid "skip unnecessary picks"
11857msgstr "跳过不必要的拣选"
11858
11859#: builtin/rebase--helper.c:38
11860msgid "rearrange fixup/squash lines"
11861msgstr "重新排列 fixup/squash 行"
11862
11863#: builtin/receive-pack.c:29
11864msgid "git receive-pack <git-dir>"
11865msgstr "git receive-pack <git-dir>"
11866
11867#: builtin/receive-pack.c:839
11868msgid ""
11869"By default, updating the current branch in a non-bare repository\n"
11870"is denied, because it will make the index and work tree inconsistent\n"
11871"with what you pushed, and will require 'git reset --hard' to match\n"
11872"the work tree to HEAD.\n"
11873"\n"
11874"You can set the 'receive.denyCurrentBranch' configuration variable\n"
11875"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
11876"its current branch; however, this is not recommended unless you\n"
11877"arranged to update its work tree to match what you pushed in some\n"
11878"other way.\n"
11879"\n"
11880"To squelch this message and still keep the default behaviour, set\n"
11881"'receive.denyCurrentBranch' configuration variable to 'refuse'."
11882msgstr ""
11883"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
11884"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
11885"\n"
11886"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
11887"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
11888"用某种方式将其工作区更新至您推送的状态。\n"
11889"\n"
11890"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
11891"配置变量为 'refuse'。"
11892
11893#: builtin/receive-pack.c:859
11894msgid ""
11895"By default, deleting the current branch is denied, because the next\n"
11896"'git clone' won't result in any file checked out, causing confusion.\n"
11897"\n"
11898"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
11899"'warn' or 'ignore' in the remote repository to allow deleting the\n"
11900"current branch, with or without a warning message.\n"
11901"\n"
11902"To squelch this message, you can set it to 'refuse'."
11903msgstr ""
11904"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
11905"导致困惑。\n"
11906"\n"
11907"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
11908"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
11909"\n"
11910"若要屏蔽此信息,您可以设置它为 'refuse'。"
11911
11912#: builtin/receive-pack.c:1932
11913msgid "quiet"
11914msgstr "静默模式"
11915
11916#: builtin/receive-pack.c:1946
11917msgid "You must specify a directory."
11918msgstr "您必须指定一个目录。"
11919
11920#: builtin/reflog.c:424
11921#, c-format
11922msgid "'%s' for '%s' is not a valid timestamp"
11923msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
11924
11925#: builtin/reflog.c:541 builtin/reflog.c:546
11926#, c-format
11927msgid "'%s' is not a valid timestamp"
11928msgstr "'%s' 不是一个有效的时间戳"
11929
11930#: builtin/remote.c:13
11931msgid "git remote [-v | --verbose]"
11932msgstr "git remote [-v | --verbose]"
11933
11934#: builtin/remote.c:14
11935msgid ""
11936"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
11937"mirror=<fetch|push>] <name> <url>"
11938msgstr ""
11939"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
11940"mirror=<fetch|push>] <名称> <地址>"
11941
11942#: builtin/remote.c:15 builtin/remote.c:35
11943msgid "git remote rename <old> <new>"
11944msgstr "git remote rename <旧名称> <新名称>"
11945
11946#: builtin/remote.c:16 builtin/remote.c:40
11947msgid "git remote remove <name>"
11948msgstr "git remote remove <名称>"
11949
11950#: builtin/remote.c:17 builtin/remote.c:45
11951msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
11952msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
11953
11954#: builtin/remote.c:18
11955msgid "git remote [-v | --verbose] show [-n] <name>"
11956msgstr "git remote [-v | --verbose] show [-n] <名称>"
11957
11958#: builtin/remote.c:19
11959msgid "git remote prune [-n | --dry-run] <name>"
11960msgstr "git remote prune [-n | --dry-run] <名称>"
11961
11962#: builtin/remote.c:20
11963msgid ""
11964"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
11965msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
11966
11967#: builtin/remote.c:21
11968msgid "git remote set-branches [--add] <name> <branch>..."
11969msgstr "git remote set-branches [--add] <名称> <分支>..."
11970
11971#: builtin/remote.c:22 builtin/remote.c:71
11972msgid "git remote get-url [--push] [--all] <name>"
11973msgstr "git remote get-url [--push] [--all] <名称>"
11974
11975#: builtin/remote.c:23 builtin/remote.c:76
11976msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
11977msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
11978
11979#: builtin/remote.c:24 builtin/remote.c:77
11980msgid "git remote set-url --add <name> <newurl>"
11981msgstr "git remote set-url --add <名称> <新的地址>"
11982
11983#: builtin/remote.c:25 builtin/remote.c:78
11984msgid "git remote set-url --delete <name> <url>"
11985msgstr "git remote set-url --delete <名称> <地址>"
11986
11987#: builtin/remote.c:30
11988msgid "git remote add [<options>] <name> <url>"
11989msgstr "git remote add [<选项>] <名称> <地址>"
11990
11991#: builtin/remote.c:50
11992msgid "git remote set-branches <name> <branch>..."
11993msgstr "git remote set-branches <名称> <分支>..."
11994
11995#: builtin/remote.c:51
11996msgid "git remote set-branches --add <name> <branch>..."
11997msgstr "git remote set-branches --add <名称> <分支>..."
11998
11999#: builtin/remote.c:56
12000msgid "git remote show [<options>] <name>"
12001msgstr "git remote show [<选项>] <名称>"
12002
12003#: builtin/remote.c:61
12004msgid "git remote prune [<options>] <name>"
12005msgstr "git remote prune [<选项>] <名称>"
12006
12007#: builtin/remote.c:66
12008msgid "git remote update [<options>] [<group> | <remote>]..."
12009msgstr "git remote update [<选项>] [<组> | <远程>]..."
12010
12011#: builtin/remote.c:95
12012#, c-format
12013msgid "Updating %s"
12014msgstr "更新 %s 中"
12015
12016#: builtin/remote.c:127
12017msgid ""
12018"--mirror is dangerous and deprecated; please\n"
12019"\t use --mirror=fetch or --mirror=push instead"
12020msgstr ""
12021"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
12022"\t 或 --mirror=push"
12023
12024#: builtin/remote.c:144
12025#, c-format
12026msgid "unknown mirror argument: %s"
12027msgstr "未知的镜像参数:%s"
12028
12029#: builtin/remote.c:160
12030msgid "fetch the remote branches"
12031msgstr "抓取远程的分支"
12032
12033#: builtin/remote.c:162
12034msgid "import all tags and associated objects when fetching"
12035msgstr "抓取时导入所有的标签和关联对象"
12036
12037#: builtin/remote.c:165
12038msgid "or do not fetch any tag at all (--no-tags)"
12039msgstr "或不抓取任何标签(--no-tags)"
12040
12041#: builtin/remote.c:167
12042msgid "branch(es) to track"
12043msgstr "跟踪的分支"
12044
12045#: builtin/remote.c:168
12046msgid "master branch"
12047msgstr "主线分支"
12048
12049#: builtin/remote.c:169
12050msgid "push|fetch"
12051msgstr "push|fetch"
12052
12053#: builtin/remote.c:170
12054msgid "set up remote as a mirror to push to or fetch from"
12055msgstr "把远程设置为用以推送或抓取的镜像"
12056
12057#: builtin/remote.c:182
12058msgid "specifying a master branch makes no sense with --mirror"
12059msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
12060
12061#: builtin/remote.c:184
12062msgid "specifying branches to track makes sense only with fetch mirrors"
12063msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
12064
12065#: builtin/remote.c:191 builtin/remote.c:631
12066#, c-format
12067msgid "remote %s already exists."
12068msgstr "远程 %s 已经存在。"
12069
12070#: builtin/remote.c:195 builtin/remote.c:635
12071#, c-format
12072msgid "'%s' is not a valid remote name"
12073msgstr "'%s' 不是一个有效的远程名称"
12074
12075#: builtin/remote.c:235
12076#, c-format
12077msgid "Could not setup master '%s'"
12078msgstr "无法设置 master '%s'"
12079
12080#: builtin/remote.c:337
12081#, c-format
12082msgid "Could not get fetch map for refspec %s"
12083msgstr "无法得到引用规格 %s 的获取列表"
12084
12085#: builtin/remote.c:438 builtin/remote.c:446
12086msgid "(matching)"
12087msgstr "(匹配)"
12088
12089#: builtin/remote.c:450
12090msgid "(delete)"
12091msgstr "(删除)"
12092
12093#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
12094#, c-format
12095msgid "No such remote: %s"
12096msgstr "没有这样的远程:%s"
12097
12098#: builtin/remote.c:641
12099#, c-format
12100msgid "Could not rename config section '%s' to '%s'"
12101msgstr "不能重命名配置小节 '%s' 到 '%s'"
12102
12103#: builtin/remote.c:661
12104#, c-format
12105msgid ""
12106"Not updating non-default fetch refspec\n"
12107"\t%s\n"
12108"\tPlease update the configuration manually if necessary."
12109msgstr ""
12110"没有更新非默认的获取引用规格\n"
12111"\t%s\n"
12112"\t如果必要请手动更新配置。"
12113
12114#: builtin/remote.c:697
12115#, c-format
12116msgid "deleting '%s' failed"
12117msgstr "删除 '%s' 失败"
12118
12119#: builtin/remote.c:731
12120#, c-format
12121msgid "creating '%s' failed"
12122msgstr "创建 '%s' 失败"
12123
12124#: builtin/remote.c:796
12125msgid ""
12126"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
12127"to delete it, use:"
12128msgid_plural ""
12129"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
12130"to delete them, use:"
12131msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
12132msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
12133
12134#: builtin/remote.c:810
12135#, c-format
12136msgid "Could not remove config section '%s'"
12137msgstr "不能移除配置小节 '%s'"
12138
12139#: builtin/remote.c:911
12140#, c-format
12141msgid " new (next fetch will store in remotes/%s)"
12142msgstr " 新的(下一次获取将存储于 remotes/%s)"
12143
12144#: builtin/remote.c:914
12145msgid " tracked"
12146msgstr " 已跟踪"
12147
12148#: builtin/remote.c:916
12149msgid " stale (use 'git remote prune' to remove)"
12150msgstr " 过时(使用 'git remote prune' 来移除)"
12151
12152#: builtin/remote.c:918
12153msgid " ???"
12154msgstr " ???"
12155
12156#: builtin/remote.c:959
12157#, c-format
12158msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
12159msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
12160
12161#: builtin/remote.c:967
12162#, c-format
12163msgid "rebases interactively onto remote %s"
12164msgstr "交互式变基到远程 %s"
12165
12166#: builtin/remote.c:968
12167#, c-format
12168msgid "rebases onto remote %s"
12169msgstr "变基到远程 %s"
12170
12171#: builtin/remote.c:971
12172#, c-format
12173msgid " merges with remote %s"
12174msgstr " 与远程 %s 合并"
12175
12176#: builtin/remote.c:974
12177#, c-format
12178msgid "merges with remote %s"
12179msgstr "与远程 %s 合并"
12180
12181#: builtin/remote.c:977
12182#, c-format
12183msgid "%-*s    and with remote %s\n"
12184msgstr "%-*s    以及和远程 %s\n"
12185
12186#: builtin/remote.c:1020
12187msgid "create"
12188msgstr "创建"
12189
12190#: builtin/remote.c:1023
12191msgid "delete"
12192msgstr "删除"
12193
12194#: builtin/remote.c:1027
12195msgid "up to date"
12196msgstr "最新"
12197
12198#: builtin/remote.c:1030
12199msgid "fast-forwardable"
12200msgstr "可快进"
12201
12202#: builtin/remote.c:1033
12203msgid "local out of date"
12204msgstr "本地已过时"
12205
12206#: builtin/remote.c:1040
12207#, c-format
12208msgid "    %-*s forces to %-*s (%s)"
12209msgstr "    %-*s 强制推送至 %-*s (%s)"
12210
12211#: builtin/remote.c:1043
12212#, c-format
12213msgid "    %-*s pushes to %-*s (%s)"
12214msgstr "    %-*s 推送至 %-*s (%s)"
12215
12216#: builtin/remote.c:1047
12217#, c-format
12218msgid "    %-*s forces to %s"
12219msgstr "    %-*s 强制推送至 %s"
12220
12221#: builtin/remote.c:1050
12222#, c-format
12223msgid "    %-*s pushes to %s"
12224msgstr "    %-*s 推送至 %s"
12225
12226#: builtin/remote.c:1118
12227msgid "do not query remotes"
12228msgstr "不查询远程"
12229
12230#: builtin/remote.c:1145
12231#, c-format
12232msgid "* remote %s"
12233msgstr "* 远程 %s"
12234
12235#: builtin/remote.c:1146
12236#, c-format
12237msgid "  Fetch URL: %s"
12238msgstr "  获取地址:%s"
12239
12240#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
12241msgid "(no URL)"
12242msgstr "(无 URL)"
12243
12244#. TRANSLATORS: the colon ':' should align
12245#. with the one in " Fetch URL: %s"
12246#. translation.
12247#.
12248#: builtin/remote.c:1161 builtin/remote.c:1163
12249#, c-format
12250msgid "  Push  URL: %s"
12251msgstr "  推送地址:%s"
12252
12253#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
12254#, c-format
12255msgid "  HEAD branch: %s"
12256msgstr "  HEAD 分支:%s"
12257
12258#  译者:中文字符串拼接,可删除前导空格
12259#: builtin/remote.c:1165
12260msgid "(not queried)"
12261msgstr "(未查询)"
12262
12263#: builtin/remote.c:1167
12264msgid "(unknown)"
12265msgstr "(未知)"
12266
12267#: builtin/remote.c:1171
12268#, c-format
12269msgid ""
12270"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
12271msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
12272
12273#: builtin/remote.c:1183
12274#, c-format
12275msgid "  Remote branch:%s"
12276msgid_plural "  Remote branches:%s"
12277msgstr[0] "  远程分支:%s"
12278msgstr[1] "  远程分支:%s"
12279
12280#  译者:中文字符串拼接,可删除前导空格
12281#: builtin/remote.c:1186 builtin/remote.c:1212
12282msgid " (status not queried)"
12283msgstr "(状态未查询)"
12284
12285#: builtin/remote.c:1195
12286msgid "  Local branch configured for 'git pull':"
12287msgid_plural "  Local branches configured for 'git pull':"
12288msgstr[0] "  为 'git pull' 配置的本地分支:"
12289msgstr[1] "  为 'git pull' 配置的本地分支:"
12290
12291#: builtin/remote.c:1203
12292msgid "  Local refs will be mirrored by 'git push'"
12293msgstr "  本地引用将在 'git push' 时被镜像"
12294
12295#: builtin/remote.c:1209
12296#, c-format
12297msgid "  Local ref configured for 'git push'%s:"
12298msgid_plural "  Local refs configured for 'git push'%s:"
12299msgstr[0] "  为 'git push' 配置的本地引用%s:"
12300msgstr[1] "  为 'git push' 配置的本地引用%s:"
12301
12302#: builtin/remote.c:1230
12303msgid "set refs/remotes/<name>/HEAD according to remote"
12304msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
12305
12306#: builtin/remote.c:1232
12307msgid "delete refs/remotes/<name>/HEAD"
12308msgstr "删除 refs/remotes/<名称>/HEAD"
12309
12310#: builtin/remote.c:1247
12311msgid "Cannot determine remote HEAD"
12312msgstr "无法确定远程 HEAD"
12313
12314#: builtin/remote.c:1249
12315msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
12316msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
12317
12318#: builtin/remote.c:1259
12319#, c-format
12320msgid "Could not delete %s"
12321msgstr "无法删除 %s"
12322
12323#: builtin/remote.c:1267
12324#, c-format
12325msgid "Not a valid ref: %s"
12326msgstr "不是一个有效引用:%s"
12327
12328#: builtin/remote.c:1269
12329#, c-format
12330msgid "Could not setup %s"
12331msgstr "不能设置 %s"
12332
12333#  译者:注意保持前导空格
12334#: builtin/remote.c:1287
12335#, c-format
12336msgid " %s will become dangling!"
12337msgstr " %s 将成为摇摆状态!"
12338
12339#  译者:注意保持前导空格
12340#: builtin/remote.c:1288
12341#, c-format
12342msgid " %s has become dangling!"
12343msgstr " %s 已成为摇摆状态!"
12344
12345#: builtin/remote.c:1298
12346#, c-format
12347msgid "Pruning %s"
12348msgstr "修剪 %s"
12349
12350#: builtin/remote.c:1299
12351#, c-format
12352msgid "URL: %s"
12353msgstr "URL:%s"
12354
12355#: builtin/remote.c:1315
12356#, c-format
12357msgid " * [would prune] %s"
12358msgstr " * [将删除] %s"
12359
12360#: builtin/remote.c:1318
12361#, c-format
12362msgid " * [pruned] %s"
12363msgstr " * [已删除] %s"
12364
12365#: builtin/remote.c:1363
12366msgid "prune remotes after fetching"
12367msgstr "抓取后清除远程"
12368
12369#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
12370#, c-format
12371msgid "No such remote '%s'"
12372msgstr "没有此远程 '%s'"
12373
12374#: builtin/remote.c:1442
12375msgid "add branch"
12376msgstr "添加分支"
12377
12378#: builtin/remote.c:1449
12379msgid "no remote specified"
12380msgstr "未指定远程"
12381
12382#: builtin/remote.c:1466
12383msgid "query push URLs rather than fetch URLs"
12384msgstr "查询推送 URL 地址,而非获取 URL 地址"
12385
12386#: builtin/remote.c:1468
12387msgid "return all URLs"
12388msgstr "返回所有 URL 地址"
12389
12390#: builtin/remote.c:1496
12391#, c-format
12392msgid "no URLs configured for remote '%s'"
12393msgstr "没有给远程仓库 '%s' 设定 URL"
12394
12395#: builtin/remote.c:1522
12396msgid "manipulate push URLs"
12397msgstr "操作推送 URLS"
12398
12399#: builtin/remote.c:1524
12400msgid "add URL"
12401msgstr "添加 URL"
12402
12403#: builtin/remote.c:1526
12404msgid "delete URLs"
12405msgstr "删除 URLS"
12406
12407#: builtin/remote.c:1533
12408msgid "--add --delete doesn't make sense"
12409msgstr "--add --delete 无意义"
12410
12411#: builtin/remote.c:1572
12412#, c-format
12413msgid "Invalid old URL pattern: %s"
12414msgstr "无效的旧 URL 匹配模版:%s"
12415
12416#: builtin/remote.c:1580
12417#, c-format
12418msgid "No such URL found: %s"
12419msgstr "未找到此 URL:%s"
12420
12421#: builtin/remote.c:1582
12422msgid "Will not delete all non-push URLs"
12423msgstr "将不会删除所有非推送 URL 地址"
12424
12425#: builtin/remote.c:1598
12426msgid "be verbose; must be placed before a subcommand"
12427msgstr "冗长输出;必须置于子命令之前"
12428
12429#: builtin/remote.c:1629
12430#, c-format
12431msgid "Unknown subcommand: %s"
12432msgstr "未知子命令:%s"
12433
12434#: builtin/repack.c:18
12435msgid "git repack [<options>]"
12436msgstr "git repack [<选项>]"
12437
12438#: builtin/repack.c:23
12439msgid ""
12440"Incremental repacks are incompatible with bitmap indexes.  Use\n"
12441"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
12442msgstr ""
12443"增量 repack 和 bitmap 索引不兼容。  使用 --no-write-bitmap-index\n"
12444"或禁用 pack.writebitmaps 配置。"
12445
12446#: builtin/repack.c:168
12447msgid "pack everything in a single pack"
12448msgstr "所有内容打包到一个包文件中"
12449
12450#: builtin/repack.c:170
12451msgid "same as -a, and turn unreachable objects loose"
12452msgstr "和 -a 相同,并将不可达的对象设为松散对象"
12453
12454#: builtin/repack.c:173
12455msgid "remove redundant packs, and run git-prune-packed"
12456msgstr "删除多余的包,运行 git-prune-packed"
12457
12458#: builtin/repack.c:175
12459msgid "pass --no-reuse-delta to git-pack-objects"
12460msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
12461
12462#: builtin/repack.c:177
12463msgid "pass --no-reuse-object to git-pack-objects"
12464msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
12465
12466#: builtin/repack.c:179
12467msgid "do not run git-update-server-info"
12468msgstr "不运行 git-update-server-info"
12469
12470#: builtin/repack.c:182
12471msgid "pass --local to git-pack-objects"
12472msgstr "向 git-pack-objects 传递参数 --local"
12473
12474#: builtin/repack.c:184
12475msgid "write bitmap index"
12476msgstr "写 bitmap 索引"
12477
12478#: builtin/repack.c:185
12479msgid "approxidate"
12480msgstr "近似日期"
12481
12482#: builtin/repack.c:186
12483msgid "with -A, do not loosen objects older than this"
12484msgstr "使用 -A,不要将早于给定时间的对象过期"
12485
12486#: builtin/repack.c:188
12487msgid "with -a, repack unreachable objects"
12488msgstr "使用 -a ,重新对不可达对象打包"
12489
12490#: builtin/repack.c:190
12491msgid "size of the window used for delta compression"
12492msgstr "用于增量压缩的窗口值"
12493
12494#: builtin/repack.c:191 builtin/repack.c:197
12495msgid "bytes"
12496msgstr "字节"
12497
12498#: builtin/repack.c:192
12499msgid "same as the above, but limit memory size instead of entries count"
12500msgstr "和上面的相似,但限制内存大小而非条目数"
12501
12502#: builtin/repack.c:194
12503msgid "limits the maximum delta depth"
12504msgstr "限制最大增量深度"
12505
12506#: builtin/repack.c:196
12507msgid "limits the maximum number of threads"
12508msgstr "限制最大线程数"
12509
12510#: builtin/repack.c:198
12511msgid "maximum size of each packfile"
12512msgstr "每个包文件的最大尺寸"
12513
12514#: builtin/repack.c:200
12515msgid "repack objects in packs marked with .keep"
12516msgstr "对标记为 .keep 的包中的对象重新打包"
12517
12518#: builtin/repack.c:210
12519msgid "cannot delete packs in a precious-objects repo"
12520msgstr "不能删除珍品仓库中的打包文件"
12521
12522#: builtin/repack.c:214
12523msgid "--keep-unreachable and -A are incompatible"
12524msgstr "--keep-unreachable 和 -A 不兼容"
12525
12526#: builtin/repack.c:406 builtin/worktree.c:134
12527#, c-format
12528msgid "failed to remove '%s'"
12529msgstr "无法删除 '%s'"
12530
12531#: builtin/replace.c:20
12532msgid "git replace [-f] <object> <replacement>"
12533msgstr "git replace [-f] <对象> <替换物>"
12534
12535#: builtin/replace.c:21
12536msgid "git replace [-f] --edit <object>"
12537msgstr "git replace [-f] --edit <对象>"
12538
12539#: builtin/replace.c:22
12540msgid "git replace [-f] --graft <commit> [<parent>...]"
12541msgstr "git replace [-f] --graft <提交> [<父提交>...]"
12542
12543#: builtin/replace.c:23
12544msgid "git replace -d <object>..."
12545msgstr "git replace -d <对象>..."
12546
12547#: builtin/replace.c:24
12548msgid "git replace [--format=<format>] [-l [<pattern>]]"
12549msgstr "git replace [--format=<格式>] [-l [<模式>]]"
12550
12551#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
12552#, c-format
12553msgid "Not a valid object name: '%s'"
12554msgstr "不是一个有效的对象名:'%s'"
12555
12556#: builtin/replace.c:361
12557#, c-format
12558msgid "bad mergetag in commit '%s'"
12559msgstr "提交 '%s' 中含有损坏的合并标签"
12560
12561#: builtin/replace.c:363
12562#, c-format
12563msgid "malformed mergetag in commit '%s'"
12564msgstr "提交 '%s' 中含有非法的合并标签"
12565
12566#: builtin/replace.c:374
12567#, c-format
12568msgid ""
12569"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
12570"instead of --graft"
12571msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
12572
12573#: builtin/replace.c:407
12574#, c-format
12575msgid "the original commit '%s' has a gpg signature."
12576msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12577
12578#: builtin/replace.c:408
12579msgid "the signature will be removed in the replacement commit!"
12580msgstr "在替换的提交中签名将被移除!"
12581
12582#: builtin/replace.c:414
12583#, c-format
12584msgid "could not write replacement commit for: '%s'"
12585msgstr "不能为 '%s' 写替换提交"
12586
12587#: builtin/replace.c:438
12588msgid "list replace refs"
12589msgstr "列出替换的引用"
12590
12591#: builtin/replace.c:439
12592msgid "delete replace refs"
12593msgstr "删除替换的引用"
12594
12595#: builtin/replace.c:440
12596msgid "edit existing object"
12597msgstr "编辑现存的对象"
12598
12599#: builtin/replace.c:441
12600msgid "change a commit's parents"
12601msgstr "修改一个提交的父提交"
12602
12603#: builtin/replace.c:442
12604msgid "replace the ref if it exists"
12605msgstr "如果存在则替换引用"
12606
12607#: builtin/replace.c:443
12608msgid "do not pretty-print contents for --edit"
12609msgstr "不要为 --edit 操作美观显示内容"
12610
12611#: builtin/replace.c:444
12612msgid "use this format"
12613msgstr "使用此格式"
12614
12615#: builtin/rerere.c:13
12616msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
12617msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
12618
12619#: builtin/rerere.c:59
12620msgid "register clean resolutions in index"
12621msgstr "在索引中注册干净的解决方案"
12622
12623#: builtin/reset.c:29
12624msgid ""
12625"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
12626msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
12627
12628#: builtin/reset.c:30
12629msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
12630msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
12631
12632#: builtin/reset.c:31
12633msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
12634msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
12635
12636#: builtin/reset.c:37
12637msgid "mixed"
12638msgstr "混杂"
12639
12640#: builtin/reset.c:37
12641msgid "soft"
12642msgstr "软性"
12643
12644#: builtin/reset.c:37
12645msgid "hard"
12646msgstr "硬性"
12647
12648#: builtin/reset.c:37
12649msgid "merge"
12650msgstr "合并"
12651
12652#: builtin/reset.c:37
12653msgid "keep"
12654msgstr "保持"
12655
12656#: builtin/reset.c:78
12657msgid "You do not have a valid HEAD."
12658msgstr "您没有一个有效的 HEAD。"
12659
12660#: builtin/reset.c:80
12661msgid "Failed to find tree of HEAD."
12662msgstr "无法找到 HEAD 指向的树。"
12663
12664#: builtin/reset.c:86
12665#, c-format
12666msgid "Failed to find tree of %s."
12667msgstr "无法找到 %s 指向的树。"
12668
12669#: builtin/reset.c:113
12670#, c-format
12671msgid "HEAD is now at %s"
12672msgstr "HEAD 现在位于 %s"
12673
12674#  译者:汉字之间无空格,故删除%s前后空格
12675#: builtin/reset.c:197
12676#, c-format
12677msgid "Cannot do a %s reset in the middle of a merge."
12678msgstr "在合并过程中不能做%s重置操作。"
12679
12680#: builtin/reset.c:297
12681msgid "be quiet, only report errors"
12682msgstr "安静模式,只报告错误"
12683
12684#: builtin/reset.c:299
12685msgid "reset HEAD and index"
12686msgstr "重置 HEAD 和索引"
12687
12688#: builtin/reset.c:300
12689msgid "reset only HEAD"
12690msgstr "只重置 HEAD"
12691
12692#: builtin/reset.c:302 builtin/reset.c:304
12693msgid "reset HEAD, index and working tree"
12694msgstr "重置 HEAD、索引和工作区"
12695
12696#: builtin/reset.c:306
12697msgid "reset HEAD but keep local changes"
12698msgstr "重置 HEAD 但保存本地变更"
12699
12700#: builtin/reset.c:312
12701msgid "record only the fact that removed paths will be added later"
12702msgstr "将删除的路径标记为稍后添加"
12703
12704#: builtin/reset.c:329
12705#, c-format
12706msgid "Failed to resolve '%s' as a valid revision."
12707msgstr "无法将 '%s' 解析为一个有效的版本。"
12708
12709#: builtin/reset.c:337
12710#, c-format
12711msgid "Failed to resolve '%s' as a valid tree."
12712msgstr "无法将 '%s' 解析为一个有效的树对象。"
12713
12714#: builtin/reset.c:346
12715msgid "--patch is incompatible with --{hard,mixed,soft}"
12716msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
12717
12718#: builtin/reset.c:355
12719msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
12720msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
12721
12722#  译者:汉字之间无空格,故删除%s前后空格
12723#: builtin/reset.c:357
12724#, c-format
12725msgid "Cannot do %s reset with paths."
12726msgstr "不能带路径进行%s重置。"
12727
12728#  译者:汉字之间无空格,故删除%s前后空格
12729#: builtin/reset.c:367
12730#, c-format
12731msgid "%s reset is not allowed in a bare repository"
12732msgstr "不能对纯仓库进行%s重置"
12733
12734#: builtin/reset.c:371
12735msgid "-N can only be used with --mixed"
12736msgstr "-N 只能和 --mixed 同时使用"
12737
12738#: builtin/reset.c:388
12739msgid "Unstaged changes after reset:"
12740msgstr "重置后取消暂存的变更:"
12741
12742#: builtin/reset.c:394
12743#, c-format
12744msgid "Could not reset index file to revision '%s'."
12745msgstr "不能重置索引文件至版本 '%s'。"
12746
12747#: builtin/reset.c:398
12748msgid "Could not write new index file."
12749msgstr "不能写入新的索引文件。"
12750
12751#: builtin/rev-list.c:361
12752msgid "rev-list does not support display of notes"
12753msgstr "rev-list 不支持显示注解"
12754
12755#: builtin/rev-parse.c:402
12756msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12757msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
12758
12759#: builtin/rev-parse.c:407
12760msgid "keep the `--` passed as an arg"
12761msgstr "保持 `--` 作为一个参数传递"
12762
12763#: builtin/rev-parse.c:409
12764msgid "stop parsing after the first non-option argument"
12765msgstr "遇到第一个非选项参数后停止解析"
12766
12767#: builtin/rev-parse.c:412
12768msgid "output in stuck long form"
12769msgstr "以固定长格式输出"
12770
12771#: builtin/rev-parse.c:545
12772msgid ""
12773"git rev-parse --parseopt [<options>] -- [<args>...]\n"
12774"   or: git rev-parse --sq-quote [<arg>...]\n"
12775"   or: git rev-parse [<options>] [<arg>...]\n"
12776"\n"
12777"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
12778msgstr ""
12779"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
12780"   或者:git rev-parse --sq-quote [<参数>...]\n"
12781"   或者:git rev-parse [<选项>] [<参数>...]\n"
12782"\n"
12783"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
12784
12785#: builtin/revert.c:23
12786msgid "git revert [<options>] <commit-ish>..."
12787msgstr "git revert [<选项>] <提交号>..."
12788
12789#: builtin/revert.c:24
12790msgid "git revert <subcommand>"
12791msgstr "git revert <子命令>"
12792
12793#: builtin/revert.c:29
12794msgid "git cherry-pick [<options>] <commit-ish>..."
12795msgstr "git cherry-pick [<选项>] <提交号>..."
12796
12797#: builtin/revert.c:30
12798msgid "git cherry-pick <subcommand>"
12799msgstr "git cherry-pick <子命令>"
12800
12801#: builtin/revert.c:90
12802#, c-format
12803msgid "%s: %s cannot be used with %s"
12804msgstr "%s:%s 不能和 %s 同时使用"
12805
12806#: builtin/revert.c:99
12807msgid "end revert or cherry-pick sequence"
12808msgstr "终止反转或拣选操作"
12809
12810#: builtin/revert.c:100
12811msgid "resume revert or cherry-pick sequence"
12812msgstr "继续反转或拣选操作"
12813
12814#: builtin/revert.c:101
12815msgid "cancel revert or cherry-pick sequence"
12816msgstr "取消反转或拣选操作"
12817
12818#: builtin/revert.c:102
12819msgid "don't automatically commit"
12820msgstr "不要自动提交"
12821
12822#: builtin/revert.c:103
12823msgid "edit the commit message"
12824msgstr "编辑提交说明"
12825
12826#: builtin/revert.c:106
12827msgid "parent-number"
12828msgstr "父编号"
12829
12830#: builtin/revert.c:107
12831msgid "select mainline parent"
12832msgstr "选择主干父提交编号"
12833
12834#: builtin/revert.c:109
12835msgid "merge strategy"
12836msgstr "合并策略"
12837
12838#: builtin/revert.c:110
12839msgid "option"
12840msgstr "选项"
12841
12842#: builtin/revert.c:111
12843msgid "option for merge strategy"
12844msgstr "合并策略的选项"
12845
12846#: builtin/revert.c:120
12847msgid "append commit name"
12848msgstr "追加提交名称"
12849
12850#: builtin/revert.c:122
12851msgid "preserve initially empty commits"
12852msgstr "保留初始化的空提交"
12853
12854#: builtin/revert.c:123
12855msgid "allow commits with empty messages"
12856msgstr "允许提交说明为空"
12857
12858#: builtin/revert.c:124
12859msgid "keep redundant, empty commits"
12860msgstr "保持多余的、空的提交"
12861
12862#: builtin/revert.c:214
12863msgid "revert failed"
12864msgstr "还原失败"
12865
12866#: builtin/revert.c:227
12867msgid "cherry-pick failed"
12868msgstr "拣选失败"
12869
12870#: builtin/rm.c:18
12871msgid "git rm [<options>] [--] <file>..."
12872msgstr "git rm [<选项>] [--] <文件>..."
12873
12874#: builtin/rm.c:206
12875msgid ""
12876"the following file has staged content different from both the\n"
12877"file and the HEAD:"
12878msgid_plural ""
12879"the following files have staged content different from both the\n"
12880"file and the HEAD:"
12881msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12882msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12883
12884#: builtin/rm.c:211
12885msgid ""
12886"\n"
12887"(use -f to force removal)"
12888msgstr ""
12889"\n"
12890"(使用 -f 强制删除)"
12891
12892#: builtin/rm.c:215
12893msgid "the following file has changes staged in the index:"
12894msgid_plural "the following files have changes staged in the index:"
12895msgstr[0] "下列文件索引中有变更"
12896msgstr[1] "下列文件索引中有变更"
12897
12898#: builtin/rm.c:219 builtin/rm.c:228
12899msgid ""
12900"\n"
12901"(use --cached to keep the file, or -f to force removal)"
12902msgstr ""
12903"\n"
12904"(使用 --cached 保留本地文件,或用 -f 强制删除)"
12905
12906#: builtin/rm.c:225
12907msgid "the following file has local modifications:"
12908msgid_plural "the following files have local modifications:"
12909msgstr[0] "如下文件有本地修改:"
12910msgstr[1] "如下文件有本地修改:"
12911
12912#: builtin/rm.c:243
12913msgid "do not list removed files"
12914msgstr "不列出删除的文件"
12915
12916#: builtin/rm.c:244
12917msgid "only remove from the index"
12918msgstr "只从索引区删除"
12919
12920#: builtin/rm.c:245
12921msgid "override the up-to-date check"
12922msgstr "忽略文件更新状态检查"
12923
12924#: builtin/rm.c:246
12925msgid "allow recursive removal"
12926msgstr "允许递归删除"
12927
12928#: builtin/rm.c:248
12929msgid "exit with a zero status even if nothing matched"
12930msgstr "即使没有匹配,也以零状态退出"
12931
12932#: builtin/rm.c:307
12933#, c-format
12934msgid "not removing '%s' recursively without -r"
12935msgstr "未提供 -r 选项不会递归删除 '%s'"
12936
12937#: builtin/rm.c:346
12938#, c-format
12939msgid "git rm: unable to remove %s"
12940msgstr "git rm:不能删除 %s"
12941
12942#: builtin/rm.c:369
12943#, c-format
12944msgid "could not remove '%s'"
12945msgstr "无法删除 '%s'"
12946
12947#: builtin/send-pack.c:19
12948msgid ""
12949"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12950"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
12951"[<ref>...]\n"
12952"  --all and explicit <ref> specification are mutually exclusive."
12953msgstr ""
12954"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12955"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
12956"  --all 和明确的 <引用> 互斥。"
12957
12958#: builtin/send-pack.c:162
12959msgid "remote name"
12960msgstr "远程名称"
12961
12962#: builtin/send-pack.c:176
12963msgid "use stateless RPC protocol"
12964msgstr "使用无状态的 RPC 协议"
12965
12966#: builtin/send-pack.c:177
12967msgid "read refs from stdin"
12968msgstr "从标准输入读取引用"
12969
12970#: builtin/send-pack.c:178
12971msgid "print status from remote helper"
12972msgstr "打印来自远程 helper 的状态"
12973
12974#: builtin/shortlog.c:14
12975msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
12976msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
12977
12978#: builtin/shortlog.c:263
12979msgid "Group by committer rather than author"
12980msgstr "按照提交者分组而不是作者"
12981
12982#: builtin/shortlog.c:265
12983msgid "sort output according to the number of commits per author"
12984msgstr "根据每个作者的提交数量排序"
12985
12986#: builtin/shortlog.c:267
12987msgid "Suppress commit descriptions, only provides commit count"
12988msgstr "隐藏提交说明,只提供提交数量"
12989
12990#: builtin/shortlog.c:269
12991msgid "Show the email address of each author"
12992msgstr "显示每个作者的电子邮件地址"
12993
12994#: builtin/shortlog.c:270
12995msgid "w[,i1[,i2]]"
12996msgstr "w[,i1[,i2]]"
12997
12998#: builtin/shortlog.c:271
12999msgid "Linewrap output"
13000msgstr "折行输出"
13001
13002#: builtin/show-branch.c:12
13003msgid ""
13004"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
13005"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
13006"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13007"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
13008msgstr ""
13009"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
13010"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
13011"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13012"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
13013
13014#: builtin/show-branch.c:16
13015msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
13016msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
13017
13018#: builtin/show-branch.c:376
13019#, c-format
13020msgid "ignoring %s; cannot handle more than %d ref"
13021msgid_plural "ignoring %s; cannot handle more than %d refs"
13022msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
13023msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
13024
13025#: builtin/show-branch.c:530
13026#, c-format
13027msgid "no matching refs with %s"
13028msgstr "没有和 %s 匹配的引用"
13029
13030#: builtin/show-branch.c:626
13031msgid "show remote-tracking and local branches"
13032msgstr "显示远程跟踪的和本地的分支"
13033
13034#: builtin/show-branch.c:628
13035msgid "show remote-tracking branches"
13036msgstr "显示远程跟踪的分支"
13037
13038#: builtin/show-branch.c:630
13039msgid "color '*!+-' corresponding to the branch"
13040msgstr "着色 '*!+-' 到相应的分支"
13041
13042#: builtin/show-branch.c:632
13043msgid "show <n> more commits after the common ancestor"
13044msgstr "显示共同祖先后的 <n> 个提交"
13045
13046#: builtin/show-branch.c:634
13047msgid "synonym to more=-1"
13048msgstr "和 more=-1 同义"
13049
13050#: builtin/show-branch.c:635
13051msgid "suppress naming strings"
13052msgstr "不显示字符串命名"
13053
13054#: builtin/show-branch.c:637
13055msgid "include the current branch"
13056msgstr "包括当前分支"
13057
13058#: builtin/show-branch.c:639
13059msgid "name commits with their object names"
13060msgstr "以对象名字命名提交"
13061
13062#: builtin/show-branch.c:641
13063msgid "show possible merge bases"
13064msgstr "显示可能合并的基线"
13065
13066#: builtin/show-branch.c:643
13067msgid "show refs unreachable from any other ref"
13068msgstr "显示没有任何引用的的引用"
13069
13070#: builtin/show-branch.c:645
13071msgid "show commits in topological order"
13072msgstr "以拓扑顺序显示提交"
13073
13074#: builtin/show-branch.c:648
13075msgid "show only commits not on the first branch"
13076msgstr "只显示不在第一个分支上的提交"
13077
13078#: builtin/show-branch.c:650
13079msgid "show merges reachable from only one tip"
13080msgstr "显示仅一个分支可访问的合并提交"
13081
13082#: builtin/show-branch.c:652
13083msgid "topologically sort, maintaining date order where possible"
13084msgstr "拓扑方式排序,并尽可能地保持日期顺序"
13085
13086#: builtin/show-branch.c:655
13087msgid "<n>[,<base>]"
13088msgstr "<n>[,<base>]"
13089
13090#: builtin/show-branch.c:656
13091msgid "show <n> most recent ref-log entries starting at base"
13092msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
13093
13094#: builtin/show-branch.c:690
13095msgid ""
13096"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
13097msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
13098
13099#: builtin/show-branch.c:714
13100msgid "no branches given, and HEAD is not valid"
13101msgstr "未提供分支,且 HEAD 无效"
13102
13103#: builtin/show-branch.c:717
13104msgid "--reflog option needs one branch name"
13105msgstr "选项 --reflog 需要一个分支名"
13106
13107#: builtin/show-branch.c:720
13108#, c-format
13109msgid "only %d entry can be shown at one time."
13110msgid_plural "only %d entries can be shown at one time."
13111msgstr[0] "一次只能显示 %d 个条目。"
13112msgstr[1] "一次只能显示 %d 个条目。"
13113
13114#: builtin/show-branch.c:724
13115#, c-format
13116msgid "no such ref %s"
13117msgstr "无此引用 %s"
13118
13119#: builtin/show-branch.c:808
13120#, c-format
13121msgid "cannot handle more than %d rev."
13122msgid_plural "cannot handle more than %d revs."
13123msgstr[0] "不能处理 %d 个以上的版本。"
13124msgstr[1] "不能处理 %d 个以上的版本。"
13125
13126#: builtin/show-branch.c:812
13127#, c-format
13128msgid "'%s' is not a valid ref."
13129msgstr "'%s' 不是一个有效的引用。"
13130
13131#: builtin/show-branch.c:815
13132#, c-format
13133msgid "cannot find commit %s (%s)"
13134msgstr "不能找到提交 %s(%s)"
13135
13136#: builtin/show-ref.c:10
13137msgid ""
13138"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13139"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
13140msgstr ""
13141"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13142"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
13143
13144#: builtin/show-ref.c:11
13145msgid "git show-ref --exclude-existing[=<pattern>]"
13146msgstr "git show-ref --exclude-existing[=<模式>]"
13147
13148#: builtin/show-ref.c:159
13149msgid "only show tags (can be combined with heads)"
13150msgstr "只显示标签(可以和头共用)"
13151
13152#: builtin/show-ref.c:160
13153msgid "only show heads (can be combined with tags)"
13154msgstr "只显示头(可以和标签共用)"
13155
13156#: builtin/show-ref.c:161
13157msgid "stricter reference checking, requires exact ref path"
13158msgstr "更严格的引用检测,需要精确的引用路径"
13159
13160#: builtin/show-ref.c:164 builtin/show-ref.c:166
13161msgid "show the HEAD reference, even if it would be filtered out"
13162msgstr "显示 HEAD 引用,即使被过滤掉"
13163
13164#: builtin/show-ref.c:168
13165msgid "dereference tags into object IDs"
13166msgstr "转换标签到对象 ID"
13167
13168#: builtin/show-ref.c:170
13169msgid "only show SHA1 hash using <n> digits"
13170msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
13171
13172#: builtin/show-ref.c:174
13173msgid "do not print results to stdout (useful with --verify)"
13174msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
13175
13176#: builtin/show-ref.c:176
13177msgid "show refs from stdin that aren't in local repository"
13178msgstr "显示从标准输入中读入的不在本地仓库中的引用"
13179
13180#: builtin/stripspace.c:18
13181msgid "git stripspace [-s | --strip-comments]"
13182msgstr "git stripspace [-s | --strip-comments]"
13183
13184#: builtin/stripspace.c:19
13185msgid "git stripspace [-c | --comment-lines]"
13186msgstr "git stripspace [-c | --comment-lines]"
13187
13188#: builtin/stripspace.c:36
13189msgid "skip and remove all lines starting with comment character"
13190msgstr "跳过和移除所有的注释行"
13191
13192#: builtin/stripspace.c:39
13193msgid "prepend comment character and space to each line"
13194msgstr "为每一行的行首添加注释符和空格"
13195
13196#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
13197#, c-format
13198msgid "No such ref: %s"
13199msgstr "没有这样的引用:%s"
13200
13201#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
13202#, c-format
13203msgid "Expecting a full ref name, got %s"
13204msgstr "期望一个完整的引用名称,却得到 %s"
13205
13206#: builtin/submodule--helper.c:71
13207#, c-format
13208msgid "cannot strip one component off url '%s'"
13209msgstr "无法从 url '%s' 剥离一个组件"
13210
13211#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
13212msgid "alternative anchor for relative paths"
13213msgstr "相对路径的替代锚记(anchor)"
13214
13215#: builtin/submodule--helper.c:307
13216msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
13217msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
13218
13219#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
13220#, c-format
13221msgid "No url found for submodule path '%s' in .gitmodules"
13222msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
13223
13224#: builtin/submodule--helper.c:389
13225#, c-format
13226msgid ""
13227"could not lookup configuration '%s'. Assuming this repository is its own "
13228"authoritative upstream."
13229msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
13230
13231#: builtin/submodule--helper.c:400
13232#, c-format
13233msgid "Failed to register url for submodule path '%s'"
13234msgstr "无法为子模组 '%s' 注册 url"
13235
13236#: builtin/submodule--helper.c:404
13237#, c-format
13238msgid "Submodule '%s' (%s) registered for path '%s'\n"
13239msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
13240
13241#
13242#: builtin/submodule--helper.c:414
13243#, c-format
13244msgid "warning: command update mode suggested for submodule '%s'\n"
13245msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
13246
13247#: builtin/submodule--helper.c:421
13248#, c-format
13249msgid "Failed to register update mode for submodule path '%s'"
13250msgstr "无法为子模组 '%s' 注册更新模式"
13251
13252#: builtin/submodule--helper.c:437
13253msgid "Suppress output for initializing a submodule"
13254msgstr "初始化子模组时抑制输出"
13255
13256#: builtin/submodule--helper.c:442
13257msgid "git submodule--helper init [<path>]"
13258msgstr "git submodule--helper init [<路径>]"
13259
13260#: builtin/submodule--helper.c:470
13261msgid "git submodule--helper name <path>"
13262msgstr "git submodule--helper name <路径>"
13263
13264#: builtin/submodule--helper.c:475
13265#, c-format
13266msgid "no submodule mapping found in .gitmodules for path '%s'"
13267msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
13268
13269#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
13270#, c-format
13271msgid "submodule '%s' cannot add alternate: %s"
13272msgstr "子模组 '%s' 不能添加仓库备选:%s"
13273
13274#: builtin/submodule--helper.c:597
13275#, c-format
13276msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
13277msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
13278
13279#: builtin/submodule--helper.c:604
13280#, c-format
13281msgid "Value '%s' for submodule.alternateLocation is not recognized"
13282msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
13283
13284#: builtin/submodule--helper.c:626
13285msgid "where the new submodule will be cloned to"
13286msgstr "新的子模组将要克隆的路径"
13287
13288#: builtin/submodule--helper.c:629
13289msgid "name of the new submodule"
13290msgstr "新子模组的名称"
13291
13292#: builtin/submodule--helper.c:632
13293msgid "url where to clone the submodule from"
13294msgstr "克隆子模组的 url 地址"
13295
13296#: builtin/submodule--helper.c:638
13297msgid "depth for shallow clones"
13298msgstr "浅克隆的深度"
13299
13300#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
13301msgid "force cloning progress"
13302msgstr "强制显示克隆进度"
13303
13304#: builtin/submodule--helper.c:646
13305msgid ""
13306"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
13307"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
13308msgstr ""
13309"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
13310"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
13311
13312#: builtin/submodule--helper.c:677
13313#, c-format
13314msgid "clone of '%s' into submodule path '%s' failed"
13315msgstr "无法克隆 '%s' 到子模组路径 '%s'"
13316
13317#: builtin/submodule--helper.c:692
13318#, c-format
13319msgid "could not get submodule directory for '%s'"
13320msgstr "无法得到 '%s' 的子模组目录"
13321
13322#: builtin/submodule--helper.c:757
13323#, c-format
13324msgid "Submodule path '%s' not initialized"
13325msgstr "子模组 '%s' 尚未初始化"
13326
13327#: builtin/submodule--helper.c:761
13328msgid "Maybe you want to use 'update --init'?"
13329msgstr "也许您想要执行 'update --init'?"
13330
13331#: builtin/submodule--helper.c:790
13332#, c-format
13333msgid "Skipping unmerged submodule %s"
13334msgstr "略过未合并的子模组 %s"
13335
13336#: builtin/submodule--helper.c:819
13337#, c-format
13338msgid "Skipping submodule '%s'"
13339msgstr "略过子模组 '%s'"
13340
13341#: builtin/submodule--helper.c:952
13342#, c-format
13343msgid "Failed to clone '%s'. Retry scheduled"
13344msgstr "克隆 '%s' 失败。按计划重试"
13345
13346#: builtin/submodule--helper.c:963
13347#, c-format
13348msgid "Failed to clone '%s' a second time, aborting"
13349msgstr "第二次尝试克隆 '%s' 失败,退出"
13350
13351#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
13352msgid "path into the working tree"
13353msgstr "到工作区的路径"
13354
13355#: builtin/submodule--helper.c:996
13356msgid "path into the working tree, across nested submodule boundaries"
13357msgstr "工作区中的路径,递归嵌套子模组"
13358
13359#: builtin/submodule--helper.c:1000
13360msgid "rebase, merge, checkout or none"
13361msgstr "rebase、merge、checkout 或 none"
13362
13363#: builtin/submodule--helper.c:1004
13364msgid "Create a shallow clone truncated to the specified number of revisions"
13365msgstr "创建一个指定深度的浅克隆"
13366
13367#: builtin/submodule--helper.c:1007
13368msgid "parallel jobs"
13369msgstr "并发任务"
13370
13371#: builtin/submodule--helper.c:1009
13372msgid "whether the initial clone should follow the shallow recommendation"
13373msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
13374
13375#: builtin/submodule--helper.c:1010
13376msgid "don't print cloning progress"
13377msgstr "不要输出克隆进度"
13378
13379#: builtin/submodule--helper.c:1017
13380msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
13381msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
13382
13383#: builtin/submodule--helper.c:1030
13384msgid "bad value for update parameter"
13385msgstr "update 参数取值错误"
13386
13387#: builtin/submodule--helper.c:1098
13388#, c-format
13389msgid ""
13390"Submodule (%s) branch configured to inherit branch from superproject, but "
13391"the superproject is not on any branch"
13392msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
13393
13394#: builtin/submodule--helper.c:1214
13395msgid "recurse into submodules"
13396msgstr "在子模组中递归"
13397
13398#: builtin/submodule--helper.c:1220
13399msgid "git submodule--helper embed-git-dir [<path>...]"
13400msgstr "git submodule--helper embed-git-dir [<路径>...]"
13401
13402#: builtin/submodule--helper.c:1278
13403#, c-format
13404msgid "%s doesn't support --super-prefix"
13405msgstr "%s 不支持 --super-prefix"
13406
13407#: builtin/submodule--helper.c:1284
13408#, c-format
13409msgid "'%s' is not a valid submodule--helper subcommand"
13410msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
13411
13412#: builtin/symbolic-ref.c:8
13413msgid "git symbolic-ref [<options>] <name> [<ref>]"
13414msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
13415
13416#: builtin/symbolic-ref.c:9
13417msgid "git symbolic-ref -d [-q] <name>"
13418msgstr "git symbolic-ref -d [-q] <名称>"
13419
13420#: builtin/symbolic-ref.c:40
13421msgid "suppress error message for non-symbolic (detached) refs"
13422msgstr "不显示非符号(分离的)引用的错误信息"
13423
13424#: builtin/symbolic-ref.c:41
13425msgid "delete symbolic ref"
13426msgstr "删除符号引用"
13427
13428#: builtin/symbolic-ref.c:42
13429msgid "shorten ref output"
13430msgstr "缩短引用输出"
13431
13432#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
13433msgid "reason"
13434msgstr "原因"
13435
13436#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
13437msgid "reason of the update"
13438msgstr "更新的原因"
13439
13440#: builtin/tag.c:24
13441msgid ""
13442"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
13443"[<head>]"
13444msgstr ""
13445"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
13446
13447#: builtin/tag.c:25
13448msgid "git tag -d <tagname>..."
13449msgstr "git tag -d <标签名>..."
13450
13451#: builtin/tag.c:26
13452msgid ""
13453"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
13454"points-at <object>]\n"
13455"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
13456msgstr ""
13457"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
13458"at <对象>]\n"
13459"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
13460
13461#: builtin/tag.c:28
13462msgid "git tag -v [--format=<format>] <tagname>..."
13463msgstr "git tag -v [--format=<格式>] <标签名>..."
13464
13465#: builtin/tag.c:86
13466#, c-format
13467msgid "tag '%s' not found."
13468msgstr "未发现标签 '%s'。"
13469
13470#: builtin/tag.c:102
13471#, c-format
13472msgid "Deleted tag '%s' (was %s)\n"
13473msgstr "已删除标签 '%s'(曾为 %s)\n"
13474
13475#: builtin/tag.c:131
13476#, c-format
13477msgid ""
13478"\n"
13479"Write a message for tag:\n"
13480"  %s\n"
13481"Lines starting with '%c' will be ignored.\n"
13482msgstr ""
13483"\n"
13484"输入一个标签说明:\n"
13485"  %s\n"
13486"以 '%c' 开头的行将被忽略。\n"
13487
13488#: builtin/tag.c:135
13489#, c-format
13490msgid ""
13491"\n"
13492"Write a message for tag:\n"
13493"  %s\n"
13494"Lines starting with '%c' will be kept; you may remove them yourself if you "
13495"want to.\n"
13496msgstr ""
13497"\n"
13498"输入一个标签说明:\n"
13499"  %s\n"
13500"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
13501
13502#: builtin/tag.c:189
13503msgid "unable to sign the tag"
13504msgstr "无法签署标签"
13505
13506#: builtin/tag.c:191
13507msgid "unable to write tag file"
13508msgstr "无法写标签文件"
13509
13510#: builtin/tag.c:215
13511msgid "bad object type."
13512msgstr "坏的对象类型。"
13513
13514#: builtin/tag.c:261
13515msgid "no tag message?"
13516msgstr "无标签说明?"
13517
13518#: builtin/tag.c:268
13519#, c-format
13520msgid "The tag message has been left in %s\n"
13521msgstr "标签说明被保留在 %s\n"
13522
13523#: builtin/tag.c:376
13524msgid "list tag names"
13525msgstr "列出标签名称"
13526
13527#: builtin/tag.c:378
13528msgid "print <n> lines of each tag message"
13529msgstr "每个标签信息打印 <n> 行"
13530
13531#: builtin/tag.c:380
13532msgid "delete tags"
13533msgstr "删除标签"
13534
13535#: builtin/tag.c:381
13536msgid "verify tags"
13537msgstr "验证标签"
13538
13539#: builtin/tag.c:383
13540msgid "Tag creation options"
13541msgstr "标签创建选项"
13542
13543#: builtin/tag.c:385
13544msgid "annotated tag, needs a message"
13545msgstr "附注标签,需要一个说明"
13546
13547#: builtin/tag.c:387
13548msgid "tag message"
13549msgstr "标签说明"
13550
13551#: builtin/tag.c:389
13552msgid "annotated and GPG-signed tag"
13553msgstr "附注并附加 GPG 签名的标签"
13554
13555#: builtin/tag.c:393
13556msgid "use another key to sign the tag"
13557msgstr "使用另外的私钥签名该标签"
13558
13559#: builtin/tag.c:394
13560msgid "replace the tag if exists"
13561msgstr "如果存在,替换现有的标签"
13562
13563#: builtin/tag.c:395 builtin/update-ref.c:368
13564msgid "create a reflog"
13565msgstr "创建引用日志"
13566
13567#: builtin/tag.c:397
13568msgid "Tag listing options"
13569msgstr "标签列表选项"
13570
13571#: builtin/tag.c:398
13572msgid "show tag list in columns"
13573msgstr "以列的方式显示标签列表"
13574
13575#: builtin/tag.c:399 builtin/tag.c:401
13576msgid "print only tags that contain the commit"
13577msgstr "只打印包含该提交的标签"
13578
13579#: builtin/tag.c:400 builtin/tag.c:402
13580msgid "print only tags that don't contain the commit"
13581msgstr "只打印不包含该提交的标签"
13582
13583#: builtin/tag.c:403
13584msgid "print only tags that are merged"
13585msgstr "只打印已经合并的标签"
13586
13587#: builtin/tag.c:404
13588msgid "print only tags that are not merged"
13589msgstr "只打印尚未合并的标签"
13590
13591#: builtin/tag.c:409
13592msgid "print only tags of the object"
13593msgstr "只打印指向该对象的标签"
13594
13595#: builtin/tag.c:453
13596msgid "--column and -n are incompatible"
13597msgstr "--column 和 -n 不兼容"
13598
13599#: builtin/tag.c:475
13600msgid "-n option is only allowed in list mode"
13601msgstr "-n 选项只允许用在列表显示模式"
13602
13603#: builtin/tag.c:477
13604msgid "--contains option is only allowed in list mode"
13605msgstr "--contains 选项只允许用在列表显示模式"
13606
13607#: builtin/tag.c:479
13608msgid "--no-contains option is only allowed in list mode"
13609msgstr "--no-contains 选项只允许用在列表显示模式"
13610
13611#: builtin/tag.c:481
13612msgid "--points-at option is only allowed in list mode"
13613msgstr "--points-at 选项只允许用在列表显示模式"
13614
13615#: builtin/tag.c:483
13616msgid "--merged and --no-merged options are only allowed in list mode"
13617msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
13618
13619#: builtin/tag.c:494
13620msgid "only one -F or -m option is allowed."
13621msgstr "只允许一个 -F 或 -m 选项。"
13622
13623#: builtin/tag.c:513
13624msgid "too many params"
13625msgstr "太多参数"
13626
13627#: builtin/tag.c:519
13628#, c-format
13629msgid "'%s' is not a valid tag name."
13630msgstr "'%s' 不是一个有效的标签名称。"
13631
13632#: builtin/tag.c:524
13633#, c-format
13634msgid "tag '%s' already exists"
13635msgstr "标签 '%s' 已存在"
13636
13637#: builtin/tag.c:554
13638#, c-format
13639msgid "Updated tag '%s' (was %s)\n"
13640msgstr "已更新标签 '%s'(曾为 %s)\n"
13641
13642#: builtin/unpack-objects.c:494
13643msgid "Unpacking objects"
13644msgstr "展开对象中"
13645
13646#: builtin/update-index.c:80
13647#, c-format
13648msgid "failed to create directory %s"
13649msgstr "无法创建目录 %s"
13650
13651#: builtin/update-index.c:86
13652#, c-format
13653msgid "failed to stat %s"
13654msgstr "对 %s 调用 stat 失败"
13655
13656#: builtin/update-index.c:96
13657#, c-format
13658msgid "failed to create file %s"
13659msgstr "无法创建文件 %s"
13660
13661#: builtin/update-index.c:104
13662#, c-format
13663msgid "failed to delete file %s"
13664msgstr "无法删除文件 %s"
13665
13666#: builtin/update-index.c:111 builtin/update-index.c:217
13667#, c-format
13668msgid "failed to delete directory %s"
13669msgstr "无法删除目录 %s"
13670
13671#: builtin/update-index.c:136
13672#, c-format
13673msgid "Testing mtime in '%s' "
13674msgstr "在 '%s' 中测试 mtime "
13675
13676#: builtin/update-index.c:150
13677msgid "directory stat info does not change after adding a new file"
13678msgstr "添加一个新文件后,目录的状态信息未改变"
13679
13680#: builtin/update-index.c:163
13681msgid "directory stat info does not change after adding a new directory"
13682msgstr "添加一个新目录后,目录的状态信息未改变"
13683
13684#: builtin/update-index.c:176
13685msgid "directory stat info changes after updating a file"
13686msgstr "更新一个文件后,目录的状态信息被修改"
13687
13688#: builtin/update-index.c:187
13689msgid "directory stat info changes after adding a file inside subdirectory"
13690msgstr "在子目录中添加文件后,目录的状态信息被修改"
13691
13692#: builtin/update-index.c:198
13693msgid "directory stat info does not change after deleting a file"
13694msgstr "删除一个文件后,目录的状态信息未改变"
13695
13696#: builtin/update-index.c:211
13697msgid "directory stat info does not change after deleting a directory"
13698msgstr "删除一个目录后,目录的状态信息未改变"
13699
13700#: builtin/update-index.c:218
13701msgid " OK"
13702msgstr " OK"
13703
13704#: builtin/update-index.c:571
13705msgid "git update-index [<options>] [--] [<file>...]"
13706msgstr "git update-index [<选项>] [--] [<文件>...]"
13707
13708#: builtin/update-index.c:926
13709msgid "continue refresh even when index needs update"
13710msgstr "当索引需要更新时继续刷新"
13711
13712#: builtin/update-index.c:929
13713msgid "refresh: ignore submodules"
13714msgstr "刷新:忽略子模组"
13715
13716#: builtin/update-index.c:932
13717msgid "do not ignore new files"
13718msgstr "不忽略新的文件"
13719
13720#: builtin/update-index.c:934
13721msgid "let files replace directories and vice-versa"
13722msgstr "让文件替换目录(反之亦然)"
13723
13724#: builtin/update-index.c:936
13725msgid "notice files missing from worktree"
13726msgstr "通知文件从工作区丢失"
13727
13728#: builtin/update-index.c:938
13729msgid "refresh even if index contains unmerged entries"
13730msgstr "即使索引区包含未合并的条目也执行刷新"
13731
13732#: builtin/update-index.c:941
13733msgid "refresh stat information"
13734msgstr "刷新统计信息"
13735
13736#: builtin/update-index.c:945
13737msgid "like --refresh, but ignore assume-unchanged setting"
13738msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
13739
13740#: builtin/update-index.c:949
13741msgid "<mode>,<object>,<path>"
13742msgstr "<存取模式>,<对象>,<路径>"
13743
13744#: builtin/update-index.c:950
13745msgid "add the specified entry to the index"
13746msgstr "添加指定的条目到索引区"
13747
13748#: builtin/update-index.c:959
13749msgid "mark files as \"not changing\""
13750msgstr "把文件标记为 \"没有变更\""
13751
13752#: builtin/update-index.c:962
13753msgid "clear assumed-unchanged bit"
13754msgstr "清除 assumed-unchanged 位"
13755
13756#: builtin/update-index.c:965
13757msgid "mark files as \"index-only\""
13758msgstr "把文件标记为 \"仅索引\""
13759
13760#: builtin/update-index.c:968
13761msgid "clear skip-worktree bit"
13762msgstr "清除 skip-worktree 位"
13763
13764#: builtin/update-index.c:971
13765msgid "add to index only; do not add content to object database"
13766msgstr "只添加到索引区;不添加对象到对象库"
13767
13768#: builtin/update-index.c:973
13769msgid "remove named paths even if present in worktree"
13770msgstr "即使存在工作区里,也删除路径"
13771
13772#: builtin/update-index.c:975
13773msgid "with --stdin: input lines are terminated by null bytes"
13774msgstr "携带 --stdin:输入的行以 null 字符终止"
13775
13776#: builtin/update-index.c:977
13777msgid "read list of paths to be updated from standard input"
13778msgstr "从标准输入中读取需要更新的路径列表"
13779
13780#: builtin/update-index.c:981
13781msgid "add entries from standard input to the index"
13782msgstr "从标准输入添加条目到索引区"
13783
13784#: builtin/update-index.c:985
13785msgid "repopulate stages #2 and #3 for the listed paths"
13786msgstr "为指定文件重新生成第2和第3暂存区"
13787
13788#: builtin/update-index.c:989
13789msgid "only update entries that differ from HEAD"
13790msgstr "只更新与 HEAD 不同的条目"
13791
13792#: builtin/update-index.c:993
13793msgid "ignore files missing from worktree"
13794msgstr "忽略工作区丢失的文件"
13795
13796#: builtin/update-index.c:996
13797msgid "report actions to standard output"
13798msgstr "在标准输出显示操作"
13799
13800#: builtin/update-index.c:998
13801msgid "(for porcelains) forget saved unresolved conflicts"
13802msgstr "(for porcelains) 忘记保存的未解决的冲突"
13803
13804#: builtin/update-index.c:1002
13805msgid "write index in this format"
13806msgstr "以这种格式写入索引区"
13807
13808#: builtin/update-index.c:1004
13809msgid "enable or disable split index"
13810msgstr "启用或禁用索引拆分"
13811
13812#: builtin/update-index.c:1006
13813msgid "enable/disable untracked cache"
13814msgstr "启用/禁用对未跟踪文件的缓存"
13815
13816#: builtin/update-index.c:1008
13817msgid "test if the filesystem supports untracked cache"
13818msgstr "测试文件系统是否支持未跟踪文件缓存"
13819
13820#: builtin/update-index.c:1010
13821msgid "enable untracked cache without testing the filesystem"
13822msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
13823
13824#: builtin/update-index.c:1107
13825msgid ""
13826"core.splitIndex is set to false; remove or change it, if you really want to "
13827"enable split index"
13828msgstr ""
13829"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
13830
13831#: builtin/update-index.c:1116
13832msgid ""
13833"core.splitIndex is set to true; remove or change it, if you really want to "
13834"disable split index"
13835msgstr ""
13836"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
13837
13838#: builtin/update-index.c:1127
13839msgid ""
13840"core.untrackedCache is set to true; remove or change it, if you really want "
13841"to disable the untracked cache"
13842msgstr ""
13843"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
13844"改它。"
13845
13846#: builtin/update-index.c:1131
13847msgid "Untracked cache disabled"
13848msgstr "缓存未跟踪文件被禁用"
13849
13850#: builtin/update-index.c:1139
13851msgid ""
13852"core.untrackedCache is set to false; remove or change it, if you really want "
13853"to enable the untracked cache"
13854msgstr ""
13855"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
13856"修改它。"
13857
13858#: builtin/update-index.c:1143
13859#, c-format
13860msgid "Untracked cache enabled for '%s'"
13861msgstr "缓存未跟踪文件在 '%s' 启用"
13862
13863#: builtin/update-ref.c:10
13864msgid "git update-ref [<options>] -d <refname> [<old-val>]"
13865msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
13866
13867#: builtin/update-ref.c:11
13868msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
13869msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
13870
13871#: builtin/update-ref.c:12
13872msgid "git update-ref [<options>] --stdin [-z]"
13873msgstr "git update-ref [<选项>] --stdin [-z]"
13874
13875#: builtin/update-ref.c:363
13876msgid "delete the reference"
13877msgstr "删除引用"
13878
13879#: builtin/update-ref.c:365
13880msgid "update <refname> not the one it points to"
13881msgstr "更新 <引用名> 本身而不是它指向的引用"
13882
13883#: builtin/update-ref.c:366
13884msgid "stdin has NUL-terminated arguments"
13885msgstr "标准输入有以 NUL 字符终止的参数"
13886
13887#: builtin/update-ref.c:367
13888msgid "read updates from stdin"
13889msgstr "从标准输入读取更新"
13890
13891#: builtin/update-server-info.c:7
13892msgid "git update-server-info [--force]"
13893msgstr "git update-server-info [--force]"
13894
13895#: builtin/update-server-info.c:15
13896msgid "update the info files from scratch"
13897msgstr "从头开始更新文件信息"
13898
13899#: builtin/verify-commit.c:18
13900msgid "git verify-commit [-v | --verbose] <commit>..."
13901msgstr "git verify-commit [-v | --verbose] <提交>..."
13902
13903#: builtin/verify-commit.c:73
13904msgid "print commit contents"
13905msgstr "打印提交内容"
13906
13907#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
13908msgid "print raw gpg status output"
13909msgstr "打印原始 gpg 状态输出"
13910
13911#: builtin/verify-pack.c:55
13912msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
13913msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
13914
13915#: builtin/verify-pack.c:65
13916msgid "verbose"
13917msgstr "冗长输出"
13918
13919#: builtin/verify-pack.c:67
13920msgid "show statistics only"
13921msgstr "只显示统计"
13922
13923#: builtin/verify-tag.c:19
13924msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
13925msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
13926
13927#: builtin/verify-tag.c:37
13928msgid "print tag contents"
13929msgstr "打印标签内容"
13930
13931#: builtin/worktree.c:16
13932msgid "git worktree add [<options>] <path> [<branch>]"
13933msgstr "git worktree add [<选项>] <路径> [<分支>]"
13934
13935#: builtin/worktree.c:17
13936msgid "git worktree list [<options>]"
13937msgstr "git worktree list [<选项>]"
13938
13939#: builtin/worktree.c:18
13940msgid "git worktree lock [<options>] <path>"
13941msgstr "git worktree lock [<选项>] <路径>"
13942
13943#: builtin/worktree.c:19
13944msgid "git worktree prune [<options>]"
13945msgstr "git worktree prune [<选项>]"
13946
13947#: builtin/worktree.c:20
13948msgid "git worktree unlock <path>"
13949msgstr "git worktree unlock <路径>"
13950
13951#: builtin/worktree.c:46
13952#, c-format
13953msgid "Removing worktrees/%s: not a valid directory"
13954msgstr "删除工作区/%s:不是一个有效的目录"
13955
13956#: builtin/worktree.c:52
13957#, c-format
13958msgid "Removing worktrees/%s: gitdir file does not exist"
13959msgstr "删除 worktrees/%s:gitdir 文件不存在"
13960
13961#: builtin/worktree.c:57 builtin/worktree.c:66
13962#, c-format
13963msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
13964msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
13965
13966#: builtin/worktree.c:76
13967#, c-format
13968msgid ""
13969"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
13970"%<PRIuMAX>)"
13971msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
13972
13973#: builtin/worktree.c:84
13974#, c-format
13975msgid "Removing worktrees/%s: invalid gitdir file"
13976msgstr "删除 worktrees/%s:无效的 gitdir 文件"
13977
13978#: builtin/worktree.c:100
13979#, c-format
13980msgid "Removing worktrees/%s: gitdir file points to non-existent location"
13981msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
13982
13983#: builtin/worktree.c:147
13984msgid "report pruned working trees"
13985msgstr "报告清除的工作区"
13986
13987#: builtin/worktree.c:149
13988msgid "expire working trees older than <time>"
13989msgstr "将早于 <time> 的工作区过期"
13990
13991#: builtin/worktree.c:223
13992#, c-format
13993msgid "'%s' already exists"
13994msgstr "'%s' 已经存在"
13995
13996#: builtin/worktree.c:254
13997#, c-format
13998msgid "could not create directory of '%s'"
13999msgstr "不能创建目录 '%s'"
14000
14001#: builtin/worktree.c:293
14002#, c-format
14003msgid "Preparing %s (identifier %s)"
14004msgstr "准备 %s(标识符 %s)"
14005
14006#: builtin/worktree.c:345
14007msgid "checkout <branch> even if already checked out in other worktree"
14008msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
14009
14010#: builtin/worktree.c:347
14011msgid "create a new branch"
14012msgstr "创建一个新分支"
14013
14014#: builtin/worktree.c:349
14015msgid "create or reset a branch"
14016msgstr "创建或重置一个分支"
14017
14018#: builtin/worktree.c:351
14019msgid "populate the new working tree"
14020msgstr "生成新的工作区"
14021
14022#: builtin/worktree.c:352
14023msgid "keep the new working tree locked"
14024msgstr "锁定新工作区"
14025
14026#: builtin/worktree.c:360
14027msgid "-b, -B, and --detach are mutually exclusive"
14028msgstr "-b、-B 和 --detach 是互斥的"
14029
14030#: builtin/worktree.c:499
14031msgid "reason for locking"
14032msgstr "锁定原因"
14033
14034#: builtin/worktree.c:511 builtin/worktree.c:544
14035#, c-format
14036msgid "'%s' is not a working tree"
14037msgstr "'%s' 不是一个工作区"
14038
14039#: builtin/worktree.c:513 builtin/worktree.c:546
14040msgid "The main working tree cannot be locked or unlocked"
14041msgstr "主工作区无法被加锁或解锁"
14042
14043#: builtin/worktree.c:518
14044#, c-format
14045msgid "'%s' is already locked, reason: %s"
14046msgstr "'%s' 已被锁定,原因:%s"
14047
14048#: builtin/worktree.c:520
14049#, c-format
14050msgid "'%s' is already locked"
14051msgstr "'%s' 已被锁定"
14052
14053#: builtin/worktree.c:548
14054#, c-format
14055msgid "'%s' is not locked"
14056msgstr "'%s' 未被锁定"
14057
14058#: builtin/write-tree.c:14
14059msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
14060msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
14061
14062#: builtin/write-tree.c:27
14063msgid "<prefix>/"
14064msgstr "<前缀>/"
14065
14066#: builtin/write-tree.c:28
14067msgid "write tree object for a subdirectory <prefix>"
14068msgstr "将 <前缀> 子目录内容写到一个树对象"
14069
14070#: builtin/write-tree.c:31
14071msgid "only useful for debugging"
14072msgstr "只对调试有用"
14073
14074#: upload-pack.c:23
14075msgid "git upload-pack [<options>] <dir>"
14076msgstr "git upload-pack [<选项>] <目录>"
14077
14078#: upload-pack.c:1040
14079msgid "quit after a single request/response exchange"
14080msgstr "在一次单独的请求/响应(request/response)交换后退出"
14081
14082#: upload-pack.c:1042
14083msgid "exit immediately after initial ref advertisement"
14084msgstr "在初始的引用广告后立即退出"
14085
14086#: upload-pack.c:1044
14087msgid "do not try <directory>/.git/ if <directory> is no Git directory"
14088msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
14089
14090#: upload-pack.c:1046
14091msgid "interrupt transfer after <n> seconds of inactivity"
14092msgstr "不活动 <n> 秒钟后终止传输"
14093
14094#: credential-cache--daemon.c:222
14095#, c-format
14096msgid ""
14097"The permissions on your socket directory are too loose; other\n"
14098"users may be able to read your cached credentials. Consider running:\n"
14099"\n"
14100"\tchmod 0700 %s"
14101msgstr ""
14102"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
14103"行:\n"
14104"\n"
14105"\tchmod 0700 %s"
14106
14107#: credential-cache--daemon.c:271
14108msgid "print debugging messages to stderr"
14109msgstr "调试信息输出到标准错误"
14110
14111#: git.c:15
14112msgid ""
14113"'git help -a' and 'git help -g' list available subcommands and some\n"
14114"concept guides. See 'git help <command>' or 'git help <concept>'\n"
14115"to read about a specific subcommand or concept."
14116msgstr ""
14117"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
14118"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
14119"帮助。"
14120
14121#: http.c:338
14122#, c-format
14123msgid "negative value for http.postbuffer; defaulting to %d"
14124msgstr "http.postbuffer 为负值,默认为 %d"
14125
14126#: http.c:359
14127msgid "Delegation control is not supported with cURL < 7.22.0"
14128msgstr "当 cURL < 7.22.0 时,不支持委托控制"
14129
14130#: http.c:368
14131msgid "Public key pinning not supported with cURL < 7.44.0"
14132msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
14133
14134#: http.c:1768
14135#, c-format
14136msgid ""
14137"unable to update url base from redirection:\n"
14138"  asked for: %s\n"
14139"   redirect: %s"
14140msgstr ""
14141"不能更新重定向的 url base:\n"
14142"     请求:%s\n"
14143"   重定向:%s"
14144
14145#: remote-curl.c:324
14146#, c-format
14147msgid "redirecting to %s"
14148msgstr "重定向到 %s"
14149
14150#: common-cmds.h:9
14151msgid "start a working area (see also: git help tutorial)"
14152msgstr "开始一个工作区(参见:git help tutorial)"
14153
14154#: common-cmds.h:10
14155msgid "work on the current change (see also: git help everyday)"
14156msgstr "在当前变更上工作(参见:git help everyday)"
14157
14158#: common-cmds.h:11
14159msgid "examine the history and state (see also: git help revisions)"
14160msgstr "检查历史和状态(参见:git help revisions)"
14161
14162#: common-cmds.h:12
14163msgid "grow, mark and tweak your common history"
14164msgstr "扩展、标记和调校您的历史记录"
14165
14166#: common-cmds.h:13
14167msgid "collaborate (see also: git help workflows)"
14168msgstr "协同(参见:git help workflows)"
14169
14170#: common-cmds.h:17
14171msgid "Add file contents to the index"
14172msgstr "添加文件内容至索引"
14173
14174#: common-cmds.h:18
14175msgid "Use binary search to find the commit that introduced a bug"
14176msgstr "通过二分查找定位引入 bug 的提交"
14177
14178#: common-cmds.h:19
14179msgid "List, create, or delete branches"
14180msgstr "列出、创建或删除分支"
14181
14182#: common-cmds.h:20
14183msgid "Switch branches or restore working tree files"
14184msgstr "切换分支或恢复工作区文件"
14185
14186#: common-cmds.h:21
14187msgid "Clone a repository into a new directory"
14188msgstr "克隆一个仓库到一个新目录"
14189
14190#: common-cmds.h:22
14191msgid "Record changes to the repository"
14192msgstr "记录变更到仓库"
14193
14194#: common-cmds.h:23
14195msgid "Show changes between commits, commit and working tree, etc"
14196msgstr "显示提交之间、提交和工作区之间等的差异"
14197
14198#: common-cmds.h:24
14199msgid "Download objects and refs from another repository"
14200msgstr "从另外一个仓库下载对象和引用"
14201
14202#: common-cmds.h:25
14203msgid "Print lines matching a pattern"
14204msgstr "输出和模式匹配的行"
14205
14206#: common-cmds.h:26
14207msgid "Create an empty Git repository or reinitialize an existing one"
14208msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
14209
14210#: common-cmds.h:27
14211msgid "Show commit logs"
14212msgstr "显示提交日志"
14213
14214#: common-cmds.h:28
14215msgid "Join two or more development histories together"
14216msgstr "合并两个或更多开发历史"
14217
14218#: common-cmds.h:29
14219msgid "Move or rename a file, a directory, or a symlink"
14220msgstr "移动或重命名一个文件、目录或符号链接"
14221
14222#: common-cmds.h:30
14223msgid "Fetch from and integrate with another repository or a local branch"
14224msgstr "获取并整合另外的仓库或一个本地分支"
14225
14226#: common-cmds.h:31
14227msgid "Update remote refs along with associated objects"
14228msgstr "更新远程引用和相关的对象"
14229
14230#: common-cmds.h:32
14231msgid "Reapply commits on top of another base tip"
14232msgstr "在另一个分支上重新应用提交"
14233
14234#: common-cmds.h:33
14235msgid "Reset current HEAD to the specified state"
14236msgstr "重置当前 HEAD 到指定状态"
14237
14238#: common-cmds.h:34
14239msgid "Remove files from the working tree and from the index"
14240msgstr "从工作区和索引中删除文件"
14241
14242#: common-cmds.h:35
14243msgid "Show various types of objects"
14244msgstr "显示各种类型的对象"
14245
14246#: common-cmds.h:36
14247msgid "Show the working tree status"
14248msgstr "显示工作区状态"
14249
14250#: common-cmds.h:37
14251msgid "Create, list, delete or verify a tag object signed with GPG"
14252msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
14253
14254#: parse-options.h:145
14255msgid "expiry-date"
14256msgstr "到期时间"
14257
14258#: parse-options.h:160
14259msgid "no-op (backward compatibility)"
14260msgstr "空操作(向后兼容)"
14261
14262#: parse-options.h:238
14263msgid "be more verbose"
14264msgstr "更加详细"
14265
14266#: parse-options.h:240
14267msgid "be more quiet"
14268msgstr "更加安静"
14269
14270#: parse-options.h:246
14271msgid "use <n> digits to display SHA-1s"
14272msgstr "用 <n> 位数字显示 SHA-1 哈希值"
14273
14274#: rerere.h:40
14275msgid "update the index with reused conflict resolution if possible"
14276msgstr "如果可能,重用冲突解决更新索引"
14277
14278#: git-bisect.sh:54
14279msgid "You need to start by \"git bisect start\""
14280msgstr "您需要执行 \"git bisect start\" 来开始"
14281
14282#  译者:注意保持句尾空格
14283#. TRANSLATORS: Make sure to include [Y] and [n] in your
14284#. translation. The program will only accept English input
14285#. at this point.
14286#: git-bisect.sh:60
14287msgid "Do you want me to do it for you [Y/n]? "
14288msgstr "您想让我为您这样做么[Y/n]? "
14289
14290#: git-bisect.sh:121
14291#, sh-format
14292msgid "unrecognised option: '$arg'"
14293msgstr "未能识别的选项:'$arg'"
14294
14295#: git-bisect.sh:125
14296#, sh-format
14297msgid "'$arg' does not appear to be a valid revision"
14298msgstr "'$arg' 看起来不像是一个有效的版本"
14299
14300#: git-bisect.sh:154
14301msgid "Bad HEAD - I need a HEAD"
14302msgstr "坏的 HEAD - 我需要一个 HEAD"
14303
14304#: git-bisect.sh:167
14305#, sh-format
14306msgid ""
14307"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
14308msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
14309
14310#: git-bisect.sh:177
14311msgid "won't bisect on cg-seek'ed tree"
14312msgstr "不会在做了 cg-seek 的树上做二分查找"
14313
14314#: git-bisect.sh:181
14315msgid "Bad HEAD - strange symbolic ref"
14316msgstr "坏的 HEAD - 奇怪的符号引用"
14317
14318#: git-bisect.sh:233
14319#, sh-format
14320msgid "Bad bisect_write argument: $state"
14321msgstr "坏的 bisect_write 参数:$state"
14322
14323#: git-bisect.sh:262
14324#, sh-format
14325msgid "Bad rev input: $arg"
14326msgstr "坏的输入版本:$arg"
14327
14328#: git-bisect.sh:281
14329#, sh-format
14330msgid "Bad rev input: $bisected_head"
14331msgstr "坏的输入版本:$bisected_head"
14332
14333#: git-bisect.sh:290
14334#, sh-format
14335msgid "Bad rev input: $rev"
14336msgstr "坏的输入版本:$rev"
14337
14338#: git-bisect.sh:299
14339#, sh-format
14340msgid "'git bisect $TERM_BAD' can take only one argument."
14341msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
14342
14343#: git-bisect.sh:322
14344#, sh-format
14345msgid "Warning: bisecting only with a $TERM_BAD commit."
14346msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
14347
14348#  译者:注意保持句尾空格
14349#. TRANSLATORS: Make sure to include [Y] and [n] in your
14350#. translation. The program will only accept English input
14351#. at this point.
14352#: git-bisect.sh:328
14353msgid "Are you sure [Y/n]? "
14354msgstr "您确认么[Y/n]? "
14355
14356#: git-bisect.sh:340
14357#, sh-format
14358msgid ""
14359"You need to give me at least one $bad_syn and one $good_syn revision.\n"
14360"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14361msgstr ""
14362"您需要给我至少一个好版本和一个坏版本。\n"
14363"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14364
14365#: git-bisect.sh:343
14366#, sh-format
14367msgid ""
14368"You need to start by \"git bisect start\".\n"
14369"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
14370"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14371msgstr ""
14372"您需要执行 \"git bisect start\" 来开始。\n"
14373"然后需要提供我至少一个好版本和一个坏版本。\n"
14374"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14375
14376#: git-bisect.sh:414 git-bisect.sh:546
14377msgid "We are not bisecting."
14378msgstr "我们没有在二分查找。"
14379
14380#: git-bisect.sh:421
14381#, sh-format
14382msgid "'$invalid' is not a valid commit"
14383msgstr "'$invalid' 不是一个有效的提交"
14384
14385#: git-bisect.sh:430
14386#, sh-format
14387msgid ""
14388"Could not check out original HEAD '$branch'.\n"
14389"Try 'git bisect reset <commit>'."
14390msgstr ""
14391"不能检出原始 HEAD '$branch'。\n"
14392"尝试 'git bisect reset <提交>'。"
14393
14394#: git-bisect.sh:458
14395msgid "No logfile given"
14396msgstr "未提供日志文件"
14397
14398#: git-bisect.sh:459
14399#, sh-format
14400msgid "cannot read $file for replaying"
14401msgstr "不能读取 $file 来重放"
14402
14403#: git-bisect.sh:480
14404msgid "?? what are you talking about?"
14405msgstr "?? 您在说什么?"
14406
14407#: git-bisect.sh:492
14408#, sh-format
14409msgid "running $command"
14410msgstr "运行 $command"
14411
14412#: git-bisect.sh:499
14413#, sh-format
14414msgid ""
14415"bisect run failed:\n"
14416"exit code $res from '$command' is < 0 or >= 128"
14417msgstr ""
14418"二分查找运行失败:\n"
14419"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
14420
14421#: git-bisect.sh:525
14422msgid "bisect run cannot continue any more"
14423msgstr "二分查找不能继续运行"
14424
14425#: git-bisect.sh:531
14426#, sh-format
14427msgid ""
14428"bisect run failed:\n"
14429"'bisect_state $state' exited with error code $res"
14430msgstr ""
14431"二分查找运行失败:\n"
14432"'bisect_state $state' 退出码为 $res"
14433
14434#: git-bisect.sh:538
14435msgid "bisect run success"
14436msgstr "二分查找运行成功"
14437
14438#: git-bisect.sh:565
14439msgid "please use two different terms"
14440msgstr "请使用两个不同的术语"
14441
14442#: git-bisect.sh:575
14443#, sh-format
14444msgid "'$term' is not a valid term"
14445msgstr "'$term' 不是一个有效的名称"
14446
14447#: git-bisect.sh:578
14448#, sh-format
14449msgid "can't use the builtin command '$term' as a term"
14450msgstr "不能使用内置命令 '$term' 作为术语"
14451
14452#: git-bisect.sh:587 git-bisect.sh:593
14453#, sh-format
14454msgid "can't change the meaning of term '$term'"
14455msgstr "不能修改术语 '$term' 的含义"
14456
14457#: git-bisect.sh:606
14458#, sh-format
14459msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
14460msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
14461
14462#: git-bisect.sh:636
14463msgid "no terms defined"
14464msgstr "未定义术语"
14465
14466#: git-bisect.sh:653
14467#, sh-format
14468msgid ""
14469"invalid argument $arg for 'git bisect terms'.\n"
14470"Supported options are: --term-good|--term-old and --term-bad|--term-new."
14471msgstr ""
14472"参数 $arg 对命令 'git bisect terms' 无效。\n"
14473"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
14474
14475#: git-merge-octopus.sh:46
14476msgid ""
14477"Error: Your local changes to the following files would be overwritten by "
14478"merge"
14479msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
14480
14481#: git-merge-octopus.sh:61
14482msgid "Automated merge did not work."
14483msgstr "自动合并未生效。"
14484
14485#: git-merge-octopus.sh:62
14486msgid "Should not be doing an octopus."
14487msgstr "不应该执行章鱼式合并。"
14488
14489#: git-merge-octopus.sh:73
14490#, sh-format
14491msgid "Unable to find common commit with $pretty_name"
14492msgstr "无法找到和 $pretty_name 的基线提交"
14493
14494#: git-merge-octopus.sh:77
14495#, sh-format
14496msgid "Already up to date with $pretty_name"
14497msgstr "已经和 $pretty_name 保持一致"
14498
14499#: git-merge-octopus.sh:89
14500#, sh-format
14501msgid "Fast-forwarding to: $pretty_name"
14502msgstr "快进至:$pretty_name"
14503
14504#: git-merge-octopus.sh:97
14505#, sh-format
14506msgid "Trying simple merge with $pretty_name"
14507msgstr "尝试和 $pretty_name 的简单合并"
14508
14509#: git-merge-octopus.sh:102
14510msgid "Simple merge did not work, trying automatic merge."
14511msgstr "简单合并未生效,尝试自动合并。"
14512
14513#: git-rebase.sh:58
14514msgid ""
14515"Resolve all conflicts manually, mark them as resolved with\n"
14516"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
14517"You can instead skip this commit: run \"git rebase --skip\".\n"
14518"To abort and get back to the state before \"git rebase\", run \"git rebase --"
14519"abort\"."
14520msgstr ""
14521"手工解决所有冲突,执行 \"git add/rm <conflicted_files>\" 标记\n"
14522"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
14523"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
14524"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
14525
14526#: git-rebase.sh:160 git-rebase.sh:402
14527#, sh-format
14528msgid "Could not move back to $head_name"
14529msgstr "无法移回 $head_name"
14530
14531#: git-rebase.sh:171
14532msgid "Applied autostash."
14533msgstr "成功应用 autostash。"
14534
14535#: git-rebase.sh:174
14536#, sh-format
14537msgid "Cannot store $stash_sha1"
14538msgstr "无法保存 $stash_sha1"
14539
14540#: git-rebase.sh:214
14541msgid "The pre-rebase hook refused to rebase."
14542msgstr "钩子 pre-rebase 拒绝变基操作。"
14543
14544#: git-rebase.sh:219
14545msgid "It looks like git-am is in progress. Cannot rebase."
14546msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
14547
14548#: git-rebase.sh:363
14549msgid "No rebase in progress?"
14550msgstr "没有正在进行的变基?"
14551
14552#: git-rebase.sh:374
14553msgid "The --edit-todo action can only be used during interactive rebase."
14554msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
14555
14556#: git-rebase.sh:381
14557msgid "Cannot read HEAD"
14558msgstr "不能读取 HEAD"
14559
14560#: git-rebase.sh:384
14561msgid ""
14562"You must edit all merge conflicts and then\n"
14563"mark them as resolved using git add"
14564msgstr ""
14565"您必须编辑所有的合并冲突,然后通过 git add\n"
14566"命令将它们标记为已解决"
14567
14568#: git-rebase.sh:424
14569#, sh-format
14570msgid ""
14571"It seems that there is already a $state_dir_base directory, and\n"
14572"I wonder if you are in the middle of another rebase.  If that is the\n"
14573"case, please try\n"
14574"\t$cmd_live_rebase\n"
14575"If that is not the case, please\n"
14576"\t$cmd_clear_stale_rebase\n"
14577"and run me again.  I am stopping in case you still have something\n"
14578"valuable there."
14579msgstr ""
14580"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
14581"过程中。 如果是这样,请执行\n"
14582"\t$cmd_live_rebase\n"
14583"如果不是这样,请执行\n"
14584"\t$cmd_clear_stale_rebase\n"
14585"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
14586
14587#: git-rebase.sh:480
14588#, sh-format
14589msgid "invalid upstream $upstream_name"
14590msgstr "无效的上游 $upstream_name"
14591
14592#: git-rebase.sh:504
14593#, sh-format
14594msgid "$onto_name: there are more than one merge bases"
14595msgstr "$onto_name: 有一个以上的合并基准"
14596
14597#: git-rebase.sh:507 git-rebase.sh:511
14598#, sh-format
14599msgid "$onto_name: there is no merge base"
14600msgstr "$onto_name: 没有合并基准"
14601
14602#: git-rebase.sh:516
14603#, sh-format
14604msgid "Does not point to a valid commit: $onto_name"
14605msgstr "没有指向一个有效的提交:$onto_name"
14606
14607#: git-rebase.sh:539
14608#, sh-format
14609msgid "fatal: no such branch: $branch_name"
14610msgstr "严重错误:无此分支:$branch_name"
14611
14612#: git-rebase.sh:572
14613msgid "Cannot autostash"
14614msgstr "无法 autostash"
14615
14616#: git-rebase.sh:577
14617#, sh-format
14618msgid "Created autostash: $stash_abbrev"
14619msgstr "创建了 autostash: $stash_abbrev"
14620
14621#: git-rebase.sh:581
14622msgid "Please commit or stash them."
14623msgstr "请提交或贮藏修改。"
14624
14625#: git-rebase.sh:601
14626#, sh-format
14627msgid "Current branch $branch_name is up to date."
14628msgstr "当前分支 $branch_name 是最新的。"
14629
14630#: git-rebase.sh:605
14631#, sh-format
14632msgid "Current branch $branch_name is up to date, rebase forced."
14633msgstr "当前分支 $branch_name 是最新的,强制变基。"
14634
14635#: git-rebase.sh:616
14636#, sh-format
14637msgid "Changes from $mb to $onto:"
14638msgstr "变更从 $mb 到 $onto:"
14639
14640#: git-rebase.sh:625
14641msgid "First, rewinding head to replay your work on top of it..."
14642msgstr "首先,回退分支以便在上面重放您的工作..."
14643
14644#: git-rebase.sh:635
14645#, sh-format
14646msgid "Fast-forwarded $branch_name to $onto_name."
14647msgstr "快进 $branch_name 至 $onto_name。"
14648
14649#: git-stash.sh:61
14650msgid "git stash clear with parameters is unimplemented"
14651msgstr "git stash clear 不支持参数"
14652
14653#: git-stash.sh:102
14654msgid "You do not have the initial commit yet"
14655msgstr "您尚未建立初始提交"
14656
14657#: git-stash.sh:117
14658msgid "Cannot save the current index state"
14659msgstr "无法保存当前索引状态"
14660
14661#: git-stash.sh:132
14662msgid "Cannot save the untracked files"
14663msgstr "无法保存未跟踪文件"
14664
14665#: git-stash.sh:152 git-stash.sh:165
14666msgid "Cannot save the current worktree state"
14667msgstr "无法保存当前工作区状态"
14668
14669#: git-stash.sh:169
14670msgid "No changes selected"
14671msgstr "没有选择变更"
14672
14673#: git-stash.sh:172
14674msgid "Cannot remove temporary index (can't happen)"
14675msgstr "无法删除临时索引(不应发生)"
14676
14677#: git-stash.sh:185
14678msgid "Cannot record working tree state"
14679msgstr "不能记录工作区状态"
14680
14681#: git-stash.sh:217
14682#, sh-format
14683msgid "Cannot update $ref_stash with $w_commit"
14684msgstr "无法用 $w_commit 更新 $ref_stash"
14685
14686#. TRANSLATORS: $option is an invalid option, like
14687#. `--blah-blah'. The 7 spaces at the beginning of the
14688#. second line correspond to "error: ". So you should line
14689#. up the second line with however many characters the
14690#. translation of "error: " takes in your language. E.g. in
14691#. English this is:
14692#.
14693#. $ git stash save --blah-blah 2>&1 | head -n 2
14694#. error: unknown option for 'stash save': --blah-blah
14695#. To provide a message, use git stash save -- '--blah-blah'
14696#: git-stash.sh:273
14697#, sh-format
14698msgid ""
14699"error: unknown option for 'stash save': $option\n"
14700"       To provide a message, use git stash save -- '$option'"
14701msgstr ""
14702"错误:'stash save' 的未知选项:$option\n"
14703"      要提供一个描述信息,使用 git stash save -- '$option'"
14704
14705#: git-stash.sh:288
14706msgid "Can't use --patch and --include-untracked or --all at the same time"
14707msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
14708
14709#: git-stash.sh:296
14710msgid "No local changes to save"
14711msgstr "没有要保存的本地修改"
14712
14713#: git-stash.sh:301
14714msgid "Cannot initialize stash"
14715msgstr "无法初始化贮藏"
14716
14717#: git-stash.sh:305
14718msgid "Cannot save the current status"
14719msgstr "无法保存当前状态"
14720
14721#: git-stash.sh:306
14722#, sh-format
14723msgid "Saved working directory and index state $stash_msg"
14724msgstr "保存工作目录和索引状态 $stash_msg"
14725
14726#: git-stash.sh:334
14727msgid "Cannot remove worktree changes"
14728msgstr "无法删除工作区变更"
14729
14730#: git-stash.sh:482
14731#, sh-format
14732msgid "unknown option: $opt"
14733msgstr "未知选项: $opt"
14734
14735#: git-stash.sh:495
14736msgid "No stash entries found."
14737msgstr "未发现贮藏条目。"
14738
14739#: git-stash.sh:502
14740#, sh-format
14741msgid "Too many revisions specified: $REV"
14742msgstr "指定了太多的版本:$REV"
14743
14744#: git-stash.sh:517
14745#, sh-format
14746msgid "$reference is not a valid reference"
14747msgstr "$reference 不是一个有效的引用"
14748
14749#: git-stash.sh:545
14750#, sh-format
14751msgid "'$args' is not a stash-like commit"
14752msgstr "'$args' 不是贮藏式提交"
14753
14754#: git-stash.sh:556
14755#, sh-format
14756msgid "'$args' is not a stash reference"
14757msgstr "'$args' 不是一个贮藏引用"
14758
14759#: git-stash.sh:564
14760msgid "unable to refresh index"
14761msgstr "无法刷新索引"
14762
14763#: git-stash.sh:568
14764msgid "Cannot apply a stash in the middle of a merge"
14765msgstr "无法在合并过程应用贮藏"
14766
14767#: git-stash.sh:576
14768msgid "Conflicts in index. Try without --index."
14769msgstr "索引中有冲突。尝试不使用 --index。"
14770
14771#: git-stash.sh:578
14772msgid "Could not save index tree"
14773msgstr "不能保存索引树"
14774
14775#: git-stash.sh:587
14776msgid "Could not restore untracked files from stash entry"
14777msgstr "无法从贮藏条目中恢复未跟踪文件"
14778
14779#: git-stash.sh:612
14780msgid "Cannot unstage modified files"
14781msgstr "无法将修改的文件取消暂存"
14782
14783#: git-stash.sh:627
14784msgid "Index was not unstashed."
14785msgstr "索引未从贮藏中恢复。"
14786
14787#: git-stash.sh:641
14788msgid "The stash entry is kept in case you need it again."
14789msgstr "贮藏条目被保留以备您再次需要。"
14790
14791#: git-stash.sh:650
14792#, sh-format
14793msgid "Dropped ${REV} ($s)"
14794msgstr "丢弃了 ${REV} ($s)"
14795
14796#: git-stash.sh:651
14797#, sh-format
14798msgid "${REV}: Could not drop stash entry"
14799msgstr "${REV}:无法丢弃贮藏条目"
14800
14801#: git-stash.sh:659
14802msgid "No branch name specified"
14803msgstr "未指定分支名"
14804
14805#: git-stash.sh:738
14806msgid "(To restore them type \"git stash apply\")"
14807msgstr "(为恢复数据输入 \"git stash apply\")"
14808
14809#: git-submodule.sh:181
14810msgid "Relative path can only be used from the toplevel of the working tree"
14811msgstr "只能在工作区的顶级目录中使用相对路径"
14812
14813#: git-submodule.sh:191
14814#, sh-format
14815msgid "repo URL: '$repo' must be absolute or begin with ./|../"
14816msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
14817
14818#: git-submodule.sh:210
14819#, sh-format
14820msgid "'$sm_path' already exists in the index"
14821msgstr "'$sm_path' 已经存在于索引中"
14822
14823#: git-submodule.sh:213
14824#, sh-format
14825msgid "'$sm_path' already exists in the index and is not a submodule"
14826msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
14827
14828#: git-submodule.sh:219
14829#, sh-format
14830msgid ""
14831"The following path is ignored by one of your .gitignore files:\n"
14832"$sm_path\n"
14833"Use -f if you really want to add it."
14834msgstr ""
14835"以下路径被您的一个 .gitignore 文件所忽略:\n"
14836"$sm_path\n"
14837"如果您确实想添加它,使用 -f 参数。"
14838
14839#: git-submodule.sh:237
14840#, sh-format
14841msgid "Adding existing repo at '$sm_path' to the index"
14842msgstr "添加位于 '$sm_path' 的现存仓库到索引"
14843
14844#: git-submodule.sh:239
14845#, sh-format
14846msgid "'$sm_path' already exists and is not a valid git repo"
14847msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
14848
14849#: git-submodule.sh:247
14850#, sh-format
14851msgid "A git directory for '$sm_name' is found locally with remote(s):"
14852msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
14853
14854#: git-submodule.sh:249
14855#, sh-format
14856msgid ""
14857"If you want to reuse this local git directory instead of cloning again from\n"
14858"  $realrepo\n"
14859"use the '--force' option. If the local git directory is not the correct "
14860"repo\n"
14861"or you are unsure what this means choose another name with the '--name' "
14862"option."
14863msgstr ""
14864"如果您想要重用这个本地 git 目录而非重新克隆自\n"
14865"  $realrepo\n"
14866"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
14867"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
14868
14869#: git-submodule.sh:255
14870#, sh-format
14871msgid "Reactivating local git directory for submodule '$sm_name'."
14872msgstr "激活本地 git 目录到子模组 '$sm_name'。"
14873
14874#: git-submodule.sh:267
14875#, sh-format
14876msgid "Unable to checkout submodule '$sm_path'"
14877msgstr "不能检出子模组 '$sm_path'"
14878
14879#: git-submodule.sh:272
14880#, sh-format
14881msgid "Failed to add submodule '$sm_path'"
14882msgstr "无法添加子模组 '$sm_path'"
14883
14884#: git-submodule.sh:281
14885#, sh-format
14886msgid "Failed to register submodule '$sm_path'"
14887msgstr "无法注册子模组 '$sm_path'"
14888
14889#: git-submodule.sh:342
14890#, sh-format
14891msgid "Entering '$displaypath'"
14892msgstr "正在进入 '$displaypath'"
14893
14894#: git-submodule.sh:362
14895#, sh-format
14896msgid "Stopping at '$displaypath'; script returned non-zero status."
14897msgstr "停止于 '$displaypath';脚本返回非零值。"
14898
14899#: git-submodule.sh:433
14900#, sh-format
14901msgid "pathspec and --all are incompatible"
14902msgstr "pathspec 和 --all 不兼容"
14903
14904#: git-submodule.sh:438
14905#, sh-format
14906msgid "Use '--all' if you really want to deinitialize all submodules"
14907msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
14908
14909#: git-submodule.sh:458
14910#, sh-format
14911msgid ""
14912"Submodule work tree '$displaypath' contains a .git directory\n"
14913"(use 'rm -rf' if you really want to remove it including all of its history)"
14914msgstr ""
14915"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
14916"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
14917
14918#: git-submodule.sh:466
14919#, sh-format
14920msgid ""
14921"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
14922"discard them"
14923msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
14924
14925#: git-submodule.sh:469
14926#, sh-format
14927msgid "Cleared directory '$displaypath'"
14928msgstr "已清除目录 '$displaypath'"
14929
14930#: git-submodule.sh:470
14931#, sh-format
14932msgid "Could not remove submodule work tree '$displaypath'"
14933msgstr "无法移除子模组工作区 '$displaypath'"
14934
14935#: git-submodule.sh:473
14936#, sh-format
14937msgid "Could not create empty submodule directory '$displaypath'"
14938msgstr "不能创建空的子模组目录 '$displaypath'"
14939
14940#: git-submodule.sh:482
14941#, sh-format
14942msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
14943msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
14944
14945#: git-submodule.sh:637
14946#, sh-format
14947msgid "Unable to find current revision in submodule path '$displaypath'"
14948msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
14949
14950#: git-submodule.sh:647
14951#, sh-format
14952msgid "Unable to fetch in submodule path '$sm_path'"
14953msgstr "无法在子模组路径 '$sm_path' 中获取"
14954
14955#: git-submodule.sh:652
14956#, sh-format
14957msgid ""
14958"Unable to find current ${remote_name}/${branch} revision in submodule path "
14959"'$sm_path'"
14960msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
14961
14962#: git-submodule.sh:670
14963#, sh-format
14964msgid "Unable to fetch in submodule path '$displaypath'"
14965msgstr "无法在子模组路径 '$displaypath' 中获取"
14966
14967#: git-submodule.sh:676
14968#, sh-format
14969msgid ""
14970"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
14971"Direct fetching of that commit failed."
14972msgstr ""
14973"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
14974
14975#: git-submodule.sh:683
14976#, sh-format
14977msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
14978msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
14979
14980#: git-submodule.sh:684
14981#, sh-format
14982msgid "Submodule path '$displaypath': checked out '$sha1'"
14983msgstr "子模组路径 '$displaypath':检出 '$sha1'"
14984
14985#: git-submodule.sh:688
14986#, sh-format
14987msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
14988msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
14989
14990#: git-submodule.sh:689
14991#, sh-format
14992msgid "Submodule path '$displaypath': rebased into '$sha1'"
14993msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
14994
14995#: git-submodule.sh:694
14996#, sh-format
14997msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
14998msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
14999
15000#: git-submodule.sh:695
15001#, sh-format
15002msgid "Submodule path '$displaypath': merged in '$sha1'"
15003msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
15004
15005#: git-submodule.sh:700
15006#, sh-format
15007msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
15008msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
15009
15010#: git-submodule.sh:701
15011#, sh-format
15012msgid "Submodule path '$displaypath': '$command $sha1'"
15013msgstr "子模组 '$displaypath':'$command $sha1'"
15014
15015#: git-submodule.sh:732
15016#, sh-format
15017msgid "Failed to recurse into submodule path '$displaypath'"
15018msgstr "无法递归进子模组路径 '$displaypath'"
15019
15020#: git-submodule.sh:840
15021msgid "The --cached option cannot be used with the --files option"
15022msgstr "选项 --cached 不能和选项 --files 同时使用"
15023
15024#: git-submodule.sh:892
15025#, sh-format
15026msgid "unexpected mode $mod_dst"
15027msgstr "意外的模式 $mod_dst"
15028
15029#  译者:注意保持前导空格
15030#: git-submodule.sh:912
15031#, sh-format
15032msgid "  Warn: $display_name doesn't contain commit $sha1_src"
15033msgstr "  警告:$display_name 未包含提交 $sha1_src"
15034
15035#  译者:注意保持前导空格
15036#: git-submodule.sh:915
15037#, sh-format
15038msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
15039msgstr "  警告:$display_name 未包含提交 $sha1_dst"
15040
15041#  译者:注意保持前导空格
15042#: git-submodule.sh:918
15043#, sh-format
15044msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
15045msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
15046
15047#: git-submodule.sh:1064
15048#, sh-format
15049msgid "Failed to recurse into submodule path '$sm_path'"
15050msgstr "无法递归进子模组路径 '$sm_path'"
15051
15052#: git-submodule.sh:1136
15053#, sh-format
15054msgid "Synchronizing submodule url for '$displaypath'"
15055msgstr "为 '$displaypath' 同步子模组 url"
15056
15057#: git-parse-remote.sh:89
15058#, sh-format
15059msgid "See git-${cmd}(1) for details."
15060msgstr "详见 git-${cmd}(1)。"
15061
15062#: git-rebase--interactive.sh:140
15063#, sh-format
15064msgid "Rebasing ($new_count/$total)"
15065msgstr "变基中($new_count/$total)"
15066
15067#: git-rebase--interactive.sh:156
15068msgid ""
15069"\n"
15070"Commands:\n"
15071"p, pick = use commit\n"
15072"r, reword = use commit, but edit the commit message\n"
15073"e, edit = use commit, but stop for amending\n"
15074"s, squash = use commit, but meld into previous commit\n"
15075"f, fixup = like \"squash\", but discard this commit's log message\n"
15076"x, exec = run command (the rest of the line) using shell\n"
15077"d, drop = remove commit\n"
15078"\n"
15079"These lines can be re-ordered; they are executed from top to bottom.\n"
15080msgstr ""
15081"\n"
15082"命令:\n"
15083"p, pick = 使用提交\n"
15084"r, reword = 使用提交,但修改提交说明\n"
15085"e, edit = 使用提交,但停止以便进行提交修补\n"
15086"s, squash = 使用提交,但和前一个版本融合\n"
15087"f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
15088"x, exec = 使用 shell 运行命令(此行剩余部分)\n"
15089"d, drop = 删除提交\n"
15090"\n"
15091"这些行可以被重新排序;它们会被从上至下地执行。\n"
15092
15093#: git-rebase--interactive.sh:171
15094msgid ""
15095"\n"
15096"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
15097msgstr ""
15098"\n"
15099"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
15100
15101#: git-rebase--interactive.sh:175
15102msgid ""
15103"\n"
15104"If you remove a line here THAT COMMIT WILL BE LOST.\n"
15105msgstr ""
15106"\n"
15107"如果您在这里删除一行,对应的提交将会丢失。\n"
15108
15109#: git-rebase--interactive.sh:211
15110#, sh-format
15111msgid ""
15112"You can amend the commit now, with\n"
15113"\n"
15114"\tgit commit --amend $gpg_sign_opt_quoted\n"
15115"\n"
15116"Once you are satisfied with your changes, run\n"
15117"\n"
15118"\tgit rebase --continue"
15119msgstr ""
15120"您现在可以修补这个提交,使用\n"
15121"\n"
15122"\tgit commit --amend $gpg_sign_opt_quoted\n"
15123"\n"
15124"当您对变更感到满意,执行\n"
15125"\n"
15126"\tgit rebase --continue"
15127
15128#: git-rebase--interactive.sh:236
15129#, sh-format
15130msgid "$sha1: not a commit that can be picked"
15131msgstr "$sha1:不是一个可以被拣选的提交"
15132
15133#: git-rebase--interactive.sh:275
15134#, sh-format
15135msgid "Invalid commit name: $sha1"
15136msgstr "无效的提交名:$sha1"
15137
15138#: git-rebase--interactive.sh:317
15139msgid "Cannot write current commit's replacement sha1"
15140msgstr "不能写入当前提交的替代 sha1"
15141
15142#: git-rebase--interactive.sh:369
15143#, sh-format
15144msgid "Fast-forward to $sha1"
15145msgstr "快进到 $sha1"
15146
15147#: git-rebase--interactive.sh:371
15148#, sh-format
15149msgid "Cannot fast-forward to $sha1"
15150msgstr "不能快进到 $sha1"
15151
15152#: git-rebase--interactive.sh:380
15153#, sh-format
15154msgid "Cannot move HEAD to $first_parent"
15155msgstr "不能移动 HEAD 到 $first_parent"
15156
15157#: git-rebase--interactive.sh:385
15158#, sh-format
15159msgid "Refusing to squash a merge: $sha1"
15160msgstr "拒绝压缩一个合并:$sha1"
15161
15162#: git-rebase--interactive.sh:400
15163#, sh-format
15164msgid "Error redoing merge $sha1"
15165msgstr "无法重做合并 $sha1"
15166
15167#: git-rebase--interactive.sh:408
15168#, sh-format
15169msgid "Could not pick $sha1"
15170msgstr "不能拣选 $sha1"
15171
15172#: git-rebase--interactive.sh:417
15173#, sh-format
15174msgid "This is the commit message #${n}:"
15175msgstr "这是提交说明 #${n}:"
15176
15177#: git-rebase--interactive.sh:422
15178#, sh-format
15179msgid "The commit message #${n} will be skipped:"
15180msgstr "提交说明 #${n} 将被跳过:"
15181
15182#: git-rebase--interactive.sh:433
15183#, sh-format
15184msgid "This is a combination of $count commit."
15185msgid_plural "This is a combination of $count commits."
15186msgstr[0] "这是一个 $count 个提交的组合。"
15187msgstr[1] "这是一个 $count 个提交的组合。"
15188
15189#: git-rebase--interactive.sh:442
15190#, sh-format
15191msgid "Cannot write $fixup_msg"
15192msgstr "不能写入 $fixup_msg"
15193
15194#: git-rebase--interactive.sh:445
15195msgid "This is a combination of 2 commits."
15196msgstr "这是一个 2 个提交的组合。"
15197
15198#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
15199#: git-rebase--interactive.sh:532
15200#, sh-format
15201msgid "Could not apply $sha1... $rest"
15202msgstr "不能应用 $sha1... $rest"
15203
15204#: git-rebase--interactive.sh:560
15205#, sh-format
15206msgid ""
15207"Could not amend commit after successfully picking $sha1... $rest\n"
15208"This is most likely due to an empty commit message, or the pre-commit hook\n"
15209"failed. If the pre-commit hook failed, you may need to resolve the issue "
15210"before\n"
15211"you are able to reword the commit."
15212msgstr ""
15213"不能在成功拣选 $sha1... $rest 之后修补提交\n"
15214"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
15215"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
15216
15217#: git-rebase--interactive.sh:575
15218#, sh-format
15219msgid "Stopped at $sha1_abbrev... $rest"
15220msgstr "停止在 $sha1_abbrev... $rest"
15221
15222#: git-rebase--interactive.sh:590
15223#, sh-format
15224msgid "Cannot '$squash_style' without a previous commit"
15225msgstr "没有父提交的情况下不能 '$squash_style'"
15226
15227#: git-rebase--interactive.sh:632
15228#, sh-format
15229msgid "Executing: $rest"
15230msgstr "执行:$rest"
15231
15232#: git-rebase--interactive.sh:640
15233#, sh-format
15234msgid "Execution failed: $rest"
15235msgstr "执行失败:$rest"
15236
15237#: git-rebase--interactive.sh:642
15238msgid "and made changes to the index and/or the working tree"
15239msgstr "并且修改索引和/或工作区"
15240
15241#  译者:注意保持前导空格
15242#: git-rebase--interactive.sh:644
15243msgid ""
15244"You can fix the problem, and then run\n"
15245"\n"
15246"\tgit rebase --continue"
15247msgstr ""
15248"您可以解决这个问题,然后运行\n"
15249"\n"
15250"\tgit rebase --continue"
15251
15252#. TRANSLATORS: after these lines is a command to be issued by the user
15253#: git-rebase--interactive.sh:657
15254#, sh-format
15255msgid ""
15256"Execution succeeded: $rest\n"
15257"but left changes to the index and/or the working tree\n"
15258"Commit or stash your changes, and then run\n"
15259"\n"
15260"\tgit rebase --continue"
15261msgstr ""
15262"执行成功:$rest\n"
15263"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
15264"\n"
15265"\tgit rebase --continue"
15266
15267#: git-rebase--interactive.sh:668
15268#, sh-format
15269msgid "Unknown command: $command $sha1 $rest"
15270msgstr "未知命令:$command $sha1 $rest"
15271
15272#: git-rebase--interactive.sh:669
15273msgid "Please fix this using 'git rebase --edit-todo'."
15274msgstr "要修改请使用命令 'git rebase --edit-todo'。"
15275
15276#: git-rebase--interactive.sh:704
15277#, sh-format
15278msgid "Successfully rebased and updated $head_name."
15279msgstr "成功变基并更新 $head_name。"
15280
15281#: git-rebase--interactive.sh:749
15282msgid "could not detach HEAD"
15283msgstr "不能检出为分离头指针"
15284
15285#: git-rebase--interactive.sh:784
15286msgid "Could not remove CHERRY_PICK_HEAD"
15287msgstr "不能删除 CHERRY_PICK_HEAD"
15288
15289#: git-rebase--interactive.sh:789
15290#, sh-format
15291msgid ""
15292"You have staged changes in your working tree.\n"
15293"If these changes are meant to be\n"
15294"squashed into the previous commit, run:\n"
15295"\n"
15296"  git commit --amend $gpg_sign_opt_quoted\n"
15297"\n"
15298"If they are meant to go into a new commit, run:\n"
15299"\n"
15300"  git commit $gpg_sign_opt_quoted\n"
15301"\n"
15302"In both cases, once you're done, continue with:\n"
15303"\n"
15304"  git rebase --continue\n"
15305msgstr ""
15306"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
15307"\n"
15308"  git commit --amend $gpg_sign_opt_quoted\n"
15309"\n"
15310"如果这些变更要形成一个新提交,执行:\n"
15311"\n"
15312"  git commit $gpg_sign_opt_quoted\n"
15313"\n"
15314"无论哪种情况,当您完成提交,继续执行:\n"
15315"\n"
15316"  git rebase --continue\n"
15317
15318#: git-rebase--interactive.sh:806
15319msgid "Error trying to find the author identity to amend commit"
15320msgstr "在修补提交中查找作者信息时遇到错误"
15321
15322#: git-rebase--interactive.sh:811
15323msgid ""
15324"You have uncommitted changes in your working tree. Please commit them\n"
15325"first and then run 'git rebase --continue' again."
15326msgstr ""
15327"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
15328
15329#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
15330msgid "Could not commit staged changes."
15331msgstr "不能提交暂存的修改。"
15332
15333#: git-rebase--interactive.sh:848
15334msgid ""
15335"\n"
15336"You are editing the todo file of an ongoing interactive rebase.\n"
15337"To continue rebase after editing, run:\n"
15338"    git rebase --continue\n"
15339"\n"
15340msgstr ""
15341"\n"
15342"您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
15343"请执行:\n"
15344"    git rebase --continue\n"
15345"\n"
15346
15347#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
15348msgid "Could not execute editor"
15349msgstr "无法运行编辑器"
15350
15351#: git-rebase--interactive.sh:869
15352#, sh-format
15353msgid "Could not checkout $switch_to"
15354msgstr "不能检出 $switch_to"
15355
15356#: git-rebase--interactive.sh:874
15357msgid "No HEAD?"
15358msgstr "没有 HEAD?"
15359
15360#: git-rebase--interactive.sh:875
15361#, sh-format
15362msgid "Could not create temporary $state_dir"
15363msgstr "不能创建临时 $state_dir"
15364
15365#: git-rebase--interactive.sh:877
15366msgid "Could not mark as interactive"
15367msgstr "不能标记为交互式"
15368
15369#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
15370msgid "Could not init rewritten commits"
15371msgstr "不能对重写提交进行初始化"
15372
15373#: git-rebase--interactive.sh:993
15374#, sh-format
15375msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
15376msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
15377msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15378msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15379
15380#: git-rebase--interactive.sh:998
15381msgid ""
15382"\n"
15383"However, if you remove everything, the rebase will be aborted.\n"
15384"\n"
15385msgstr ""
15386"\n"
15387"然而,如果您删除全部内容,变基操作将会终止。\n"
15388"\n"
15389
15390#: git-rebase--interactive.sh:1005
15391msgid "Note that empty commits are commented out"
15392msgstr "注意空提交已被注释掉"
15393
15394#: git-sh-setup.sh:89 git-sh-setup.sh:94
15395#, sh-format
15396msgid "usage: $dashless $USAGE"
15397msgstr "用法:$dashless $USAGE"
15398
15399#: git-sh-setup.sh:190
15400#, sh-format
15401msgid "Cannot chdir to $cdup, the toplevel of the working tree"
15402msgstr "不能切换目录到 $cdup,工作区的顶级目录"
15403
15404#: git-sh-setup.sh:199 git-sh-setup.sh:206
15405#, sh-format
15406msgid "fatal: $program_name cannot be used without a working tree."
15407msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
15408
15409#: git-sh-setup.sh:220
15410msgid "Cannot rebase: You have unstaged changes."
15411msgstr "不能变基:您有未暂存的变更。"
15412
15413#: git-sh-setup.sh:223
15414msgid "Cannot rewrite branches: You have unstaged changes."
15415msgstr "不能重写分支:您有未暂存的变更。"
15416
15417#: git-sh-setup.sh:226
15418msgid "Cannot pull with rebase: You have unstaged changes."
15419msgstr "无法通过变基方式拉取:您有未暂存的变更。"
15420
15421#: git-sh-setup.sh:229
15422#, sh-format
15423msgid "Cannot $action: You have unstaged changes."
15424msgstr "不能 $action:您有未暂存的变更。"
15425
15426#: git-sh-setup.sh:242
15427msgid "Cannot rebase: Your index contains uncommitted changes."
15428msgstr "不能变基:您的索引中包含未提交的变更。"
15429
15430#: git-sh-setup.sh:245
15431msgid "Cannot pull with rebase: Your index contains uncommitted changes."
15432msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
15433
15434#: git-sh-setup.sh:248
15435#, sh-format
15436msgid "Cannot $action: Your index contains uncommitted changes."
15437msgstr "不能 $action:您的索引中包含未提交的变更。"
15438
15439#: git-sh-setup.sh:252
15440msgid "Additionally, your index contains uncommitted changes."
15441msgstr "而且您的索引中包含未提交的变更。"
15442
15443#: git-sh-setup.sh:372
15444msgid "You need to run this command from the toplevel of the working tree."
15445msgstr "您需要在工作区的顶级目录中运行这个命令。"
15446
15447#: git-sh-setup.sh:377
15448msgid "Unable to determine absolute path of git directory"
15449msgstr "不能确定 git 目录的绝对路径"
15450
15451#. TRANSLATORS: you can adjust this to align "git add -i" status menu
15452#: git-add--interactive.perl:196
15453#, perl-format
15454msgid "%12s %12s %s"
15455msgstr "%12s %12s %s"
15456
15457#: git-add--interactive.perl:197
15458msgid "staged"
15459msgstr "缓存"
15460
15461#: git-add--interactive.perl:197
15462msgid "unstaged"
15463msgstr "未缓存"
15464
15465#: git-add--interactive.perl:246 git-add--interactive.perl:271
15466msgid "binary"
15467msgstr "二进制"
15468
15469#: git-add--interactive.perl:255 git-add--interactive.perl:309
15470msgid "nothing"
15471msgstr "无"
15472
15473#: git-add--interactive.perl:291 git-add--interactive.perl:306
15474msgid "unchanged"
15475msgstr "没有修改"
15476
15477#: git-add--interactive.perl:602
15478#, perl-format
15479msgid "added %d path\n"
15480msgid_plural "added %d paths\n"
15481msgstr[0] "增加了 %d 个路径\n"
15482msgstr[1] "增加了 %d 个路径\n"
15483
15484#: git-add--interactive.perl:605
15485#, perl-format
15486msgid "updated %d path\n"
15487msgid_plural "updated %d paths\n"
15488msgstr[0] "更新了 %d 个路径\n"
15489msgstr[1] "更新了 %d 个路径\n"
15490
15491#: git-add--interactive.perl:608
15492#, perl-format
15493msgid "reverted %d path\n"
15494msgid_plural "reverted %d paths\n"
15495msgstr[0] "还原了 %d 个路径\n"
15496msgstr[1] "还原了 %d 个路径\n"
15497
15498#: git-add--interactive.perl:611
15499#, perl-format
15500msgid "touched %d path\n"
15501msgid_plural "touched %d paths\n"
15502msgstr[0] "触碰了 %d 个路径\n"
15503msgstr[1] "触碰了 %d 个路径\n"
15504
15505#: git-add--interactive.perl:620
15506msgid "Update"
15507msgstr "更新"
15508
15509#: git-add--interactive.perl:632
15510msgid "Revert"
15511msgstr "还原"
15512
15513#: git-add--interactive.perl:655
15514#, perl-format
15515msgid "note: %s is untracked now.\n"
15516msgstr "说明:%s 现已成为未跟踪的。\n"
15517
15518#: git-add--interactive.perl:666
15519msgid "Add untracked"
15520msgstr "添加未跟踪的"
15521
15522#: git-add--interactive.perl:672
15523msgid "No untracked files.\n"
15524msgstr "没有未跟踪的文件。\n"
15525
15526#: git-add--interactive.perl:985
15527msgid ""
15528"If the patch applies cleanly, the edited hunk will immediately be\n"
15529"marked for staging."
15530msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
15531
15532#: git-add--interactive.perl:988
15533msgid ""
15534"If the patch applies cleanly, the edited hunk will immediately be\n"
15535"marked for stashing."
15536msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
15537
15538#: git-add--interactive.perl:991
15539msgid ""
15540"If the patch applies cleanly, the edited hunk will immediately be\n"
15541"marked for unstaging."
15542msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
15543
15544#: git-add--interactive.perl:994 git-add--interactive.perl:1003
15545msgid ""
15546"If the patch applies cleanly, the edited hunk will immediately be\n"
15547"marked for applying."
15548msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
15549
15550#: git-add--interactive.perl:997 git-add--interactive.perl:1000
15551msgid ""
15552"If the patch applies cleanly, the edited hunk will immediately be\n"
15553"marked for discarding."
15554msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
15555
15556#: git-add--interactive.perl:1013
15557#, perl-format
15558msgid "failed to open hunk edit file for writing: %s"
15559msgstr "无法写入块编辑文件:%s"
15560
15561#: git-add--interactive.perl:1014
15562msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
15563msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
15564
15565#: git-add--interactive.perl:1020
15566#, perl-format
15567msgid ""
15568"---\n"
15569"To remove '%s' lines, make them ' ' lines (context).\n"
15570"To remove '%s' lines, delete them.\n"
15571"Lines starting with %s will be removed.\n"
15572msgstr ""
15573"---\n"
15574"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
15575"要删除 '%s' 开始的行,删除它们。\n"
15576"以 %s 开始的行将被删除。\n"
15577
15578#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
15579#: git-add--interactive.perl:1028
15580msgid ""
15581"If it does not apply cleanly, you will be given an opportunity to\n"
15582"edit again.  If all lines of the hunk are removed, then the edit is\n"
15583"aborted and the hunk is left unchanged.\n"
15584msgstr ""
15585"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
15586"此次编辑被终止,该块不会被修改。\n"
15587
15588#: git-add--interactive.perl:1042
15589#, perl-format
15590msgid "failed to open hunk edit file for reading: %s"
15591msgstr "无法读取块编辑文件:%s"
15592
15593#. TRANSLATORS: do not translate [y/n]
15594#. The program will only accept that input
15595#. at this point.
15596#. Consider translating (saying "no" discards!) as
15597#. (saying "n" for "no" discards!) if the translation
15598#. of the word "no" does not start with n.
15599#: git-add--interactive.perl:1134
15600msgid ""
15601"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
15602msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
15603
15604#: git-add--interactive.perl:1143
15605msgid ""
15606"y - stage this hunk\n"
15607"n - do not stage this hunk\n"
15608"q - quit; do not stage this hunk or any of the remaining ones\n"
15609"a - stage this hunk and all later hunks in the file\n"
15610"d - do not stage this hunk or any of the later hunks in the file"
15611msgstr ""
15612"y - 暂存该块\n"
15613"n - 不要暂存该块\n"
15614"q - 退出。不暂存该块及后面的全部块\n"
15615"a - 暂存该块和本文件中后面的全部块\n"
15616"d - 不暂存该块和本文件中后面的全部块"
15617
15618#: git-add--interactive.perl:1149
15619msgid ""
15620"y - stash this hunk\n"
15621"n - do not stash this hunk\n"
15622"q - quit; do not stash this hunk or any of the remaining ones\n"
15623"a - stash this hunk and all later hunks in the file\n"
15624"d - do not stash this hunk or any of the later hunks in the file"
15625msgstr ""
15626"y - 贮藏该块\n"
15627"n - 不要贮藏该块\n"
15628"q - 退出。不贮藏该块及后面的全部块\n"
15629"a - 贮藏该块和本文件中后面的全部块\n"
15630"d - 不贮藏该块和本文件中后面的全部块"
15631
15632#: git-add--interactive.perl:1155
15633msgid ""
15634"y - unstage this hunk\n"
15635"n - do not unstage this hunk\n"
15636"q - quit; do not unstage this hunk or any of the remaining ones\n"
15637"a - unstage this hunk and all later hunks in the file\n"
15638"d - do not unstage this hunk or any of the later hunks in the file"
15639msgstr ""
15640"y - 不暂存该块\n"
15641"n - 不要不暂存该块\n"
15642"q - 退出。不要不暂存该块及后面的全部块\n"
15643"a - 不暂存该块和本文件中后面的全部块\n"
15644"d - 不要不暂存该块和本文件中后面的全部块"
15645
15646#: git-add--interactive.perl:1161
15647msgid ""
15648"y - apply this hunk to index\n"
15649"n - do not apply this hunk to index\n"
15650"q - quit; do not apply this hunk or any of the remaining ones\n"
15651"a - apply this hunk and all later hunks in the file\n"
15652"d - do not apply this hunk or any of the later hunks in the file"
15653msgstr ""
15654"y - 在索引中应用该块\n"
15655"n - 不要在索引中应用该块\n"
15656"q - 退出。不要应用该块及后面的全部块\n"
15657"a - 应用该块和本文件中后面的全部块\n"
15658"d - 不要应用该块和本文件中后面的全部块"
15659
15660#: git-add--interactive.perl:1167
15661msgid ""
15662"y - discard this hunk from worktree\n"
15663"n - do not discard this hunk from worktree\n"
15664"q - quit; do not discard this hunk or any of the remaining ones\n"
15665"a - discard this hunk and all later hunks in the file\n"
15666"d - do not discard this hunk or any of the later hunks in the file"
15667msgstr ""
15668"y - 在工作区中丢弃该块\n"
15669"n - 不要在工作区中丢弃该块\n"
15670"q - 退出。不要丢弃该块及后面的全部块\n"
15671"a - 丢弃该块和本文件中后面的全部块\n"
15672"d - 不要丢弃该块和本文件中后面的全部块"
15673
15674#: git-add--interactive.perl:1173
15675msgid ""
15676"y - discard this hunk from index and worktree\n"
15677"n - do not discard this hunk from index and worktree\n"
15678"q - quit; do not discard this hunk or any of the remaining ones\n"
15679"a - discard this hunk and all later hunks in the file\n"
15680"d - do not discard this hunk or any of the later hunks in the file"
15681msgstr ""
15682"y - 在索引和工作区中丢弃该块\n"
15683"n - 不要在索引和工作区中丢弃该块\n"
15684"q - 退出。不要丢弃该块及后面的全部块\n"
15685"a - 丢弃该块和本文件中后面的全部块\n"
15686"d - 不要丢弃该块和本文件中后面的全部块"
15687
15688#: git-add--interactive.perl:1179
15689msgid ""
15690"y - apply this hunk to index and worktree\n"
15691"n - do not apply this hunk to index and worktree\n"
15692"q - quit; do not apply this hunk or any of the remaining ones\n"
15693"a - apply this hunk and all later hunks in the file\n"
15694"d - do not apply this hunk or any of the later hunks in the file"
15695msgstr ""
15696"y - 在索引和工作区中应用该块\n"
15697"n - 不要在索引和工作区中应用该块\n"
15698"q - 退出。不要应用该块及后面的全部块\n"
15699"a - 应用该块和本文件中后面的全部块\n"
15700"d - 不要应用该块和本文件中后面的全部块"
15701
15702#: git-add--interactive.perl:1188
15703msgid ""
15704"g - select a hunk to go to\n"
15705"/ - search for a hunk matching the given regex\n"
15706"j - leave this hunk undecided, see next undecided hunk\n"
15707"J - leave this hunk undecided, see next hunk\n"
15708"k - leave this hunk undecided, see previous undecided hunk\n"
15709"K - leave this hunk undecided, see previous hunk\n"
15710"s - split the current hunk into smaller hunks\n"
15711"e - manually edit the current hunk\n"
15712"? - print help\n"
15713msgstr ""
15714"g - 选择跳转到一个块\n"
15715"/ - 查找和给定正则表达式匹配的块\n"
15716"j - 维持该块未决状态,查看下一个未决块\n"
15717"J - 维持该块未决状态,查看下一个块\n"
15718"k - 维持该块未决状态,查看上一个未决块\n"
15719"K - 维持该块未决状态,查看上一个块\n"
15720"s - 拆分当前块为更小的块\n"
15721"e - 手动编辑当前块\n"
15722"? - 显示帮助\n"
15723
15724#: git-add--interactive.perl:1219
15725msgid "The selected hunks do not apply to the index!\n"
15726msgstr "选中的块不能应用到索引!\n"
15727
15728#: git-add--interactive.perl:1220
15729msgid "Apply them to the worktree anyway? "
15730msgstr "无论如何都要应用到工作区么?"
15731
15732#: git-add--interactive.perl:1223
15733msgid "Nothing was applied.\n"
15734msgstr "未应用。\n"
15735
15736#: git-add--interactive.perl:1234
15737#, perl-format
15738msgid "ignoring unmerged: %s\n"
15739msgstr "忽略未合入的:%s\n"
15740
15741#: git-add--interactive.perl:1243
15742msgid "Only binary files changed.\n"
15743msgstr "只有二进制文件被修改。\n"
15744
15745#: git-add--interactive.perl:1245
15746msgid "No changes.\n"
15747msgstr "没有修改。\n"
15748
15749#: git-add--interactive.perl:1253
15750msgid "Patch update"
15751msgstr "补丁更新"
15752
15753#: git-add--interactive.perl:1305
15754#, perl-format
15755msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
15756msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
15757
15758#: git-add--interactive.perl:1306
15759#, perl-format
15760msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
15761msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
15762
15763#: git-add--interactive.perl:1307
15764#, perl-format
15765msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
15766msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
15767
15768#: git-add--interactive.perl:1310
15769#, perl-format
15770msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
15771msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
15772
15773#: git-add--interactive.perl:1311
15774#, perl-format
15775msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
15776msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
15777
15778#: git-add--interactive.perl:1312
15779#, perl-format
15780msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
15781msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
15782
15783#: git-add--interactive.perl:1315
15784#, perl-format
15785msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
15786msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
15787
15788#: git-add--interactive.perl:1316
15789#, perl-format
15790msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
15791msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
15792
15793#: git-add--interactive.perl:1317
15794#, perl-format
15795msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
15796msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
15797
15798#: git-add--interactive.perl:1320
15799#, perl-format
15800msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
15801msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
15802
15803#: git-add--interactive.perl:1321
15804#, perl-format
15805msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
15806msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
15807
15808#: git-add--interactive.perl:1322
15809#, perl-format
15810msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
15811msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
15812
15813#: git-add--interactive.perl:1325
15814#, perl-format
15815msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
15816msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15817
15818#: git-add--interactive.perl:1326
15819#, perl-format
15820msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
15821msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15822
15823#: git-add--interactive.perl:1327
15824#, perl-format
15825msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
15826msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15827
15828#: git-add--interactive.perl:1330
15829#, perl-format
15830msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
15831msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15832
15833#: git-add--interactive.perl:1331
15834#, perl-format
15835msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
15836msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15837
15838#: git-add--interactive.perl:1332
15839#, perl-format
15840msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
15841msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15842
15843#: git-add--interactive.perl:1335
15844#, perl-format
15845msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
15846msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
15847
15848#: git-add--interactive.perl:1336
15849#, perl-format
15850msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
15851msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
15852
15853#: git-add--interactive.perl:1337
15854#, perl-format
15855msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
15856msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
15857
15858#: git-add--interactive.perl:1440
15859msgid "go to which hunk (<ret> to see more)? "
15860msgstr "跳转到哪个块(<回车> 查看更多)? "
15861
15862#: git-add--interactive.perl:1442
15863msgid "go to which hunk? "
15864msgstr "跳转到哪个块?"
15865
15866#: git-add--interactive.perl:1451
15867#, perl-format
15868msgid "Invalid number: '%s'\n"
15869msgstr "无效数字:'%s'\n"
15870
15871#: git-add--interactive.perl:1456
15872#, perl-format
15873msgid "Sorry, only %d hunk available.\n"
15874msgid_plural "Sorry, only %d hunks available.\n"
15875msgstr[0] "对不起,只有 %d 个可用块。\n"
15876msgstr[1] "对不起,只有 %d 个可用块。\n"
15877
15878#: git-add--interactive.perl:1482
15879msgid "search for regex? "
15880msgstr "使用正则表达式搜索?"
15881
15882#: git-add--interactive.perl:1495
15883#, perl-format
15884msgid "Malformed search regexp %s: %s\n"
15885msgstr "错误的正则表达式 %s:%s\n"
15886
15887#: git-add--interactive.perl:1505
15888msgid "No hunk matches the given pattern\n"
15889msgstr "没有和给定模式相匹配的快\n"
15890
15891#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
15892msgid "No previous hunk\n"
15893msgstr "没有前一个块\n"
15894
15895#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
15896msgid "No next hunk\n"
15897msgstr "没有下一个块\n"
15898
15899#: git-add--interactive.perl:1553
15900#, perl-format
15901msgid "Split into %d hunk.\n"
15902msgid_plural "Split into %d hunks.\n"
15903msgstr[0] "拆分为 %d 块。\n"
15904msgstr[1] "拆分为 %d 块。\n"
15905
15906#: git-add--interactive.perl:1605
15907msgid "Review diff"
15908msgstr "检视 diff"
15909
15910#. TRANSLATORS: please do not translate the command names
15911#. 'status', 'update', 'revert', etc.
15912#: git-add--interactive.perl:1624
15913msgid ""
15914"status        - show paths with changes\n"
15915"update        - add working tree state to the staged set of changes\n"
15916"revert        - revert staged set of changes back to the HEAD version\n"
15917"patch         - pick hunks and update selectively\n"
15918"diff          - view diff between HEAD and index\n"
15919"add untracked - add contents of untracked files to the staged set of "
15920"changes\n"
15921msgstr ""
15922"status        - 显示含变更的路径\n"
15923"update        - 添加工作区状态至暂存列表\n"
15924"revert        - 还原修改的暂存集至 HEAD 版本\n"
15925"patch         - 挑选块并且有选择地更新\n"
15926"diff          - 显示 HEAD 和索引间差异\n"
15927"add untracked - 添加未跟踪文件的内容至暂存列表\n"
15928
15929#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
15930#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
15931#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
15932msgid "missing --"
15933msgstr "缺失 --"
15934
15935#: git-add--interactive.perl:1662
15936#, perl-format
15937msgid "unknown --patch mode: %s"
15938msgstr "未知的 --patch 模式:%s"
15939
15940#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
15941#, perl-format
15942msgid "invalid argument %s, expecting --"
15943msgstr "无效的参数 %s,期望是 --"
15944
15945#: git-send-email.perl:126
15946msgid "local zone differs from GMT by a non-minute interval\n"
15947msgstr "本地时间和 GMT 有不到一分钟间隔\n"
15948
15949#: git-send-email.perl:133 git-send-email.perl:139
15950msgid "local time offset greater than or equal to 24 hours\n"
15951msgstr "本地时间偏移量大于等于 24 小时\n"
15952
15953#: git-send-email.perl:207 git-send-email.perl:213
15954msgid "the editor exited uncleanly, aborting everything"
15955msgstr "编辑器非正常退出,终止所有操作"
15956
15957#: git-send-email.perl:290
15958#, perl-format
15959msgid ""
15960"'%s' contains an intermediate version of the email you were composing.\n"
15961msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
15962
15963#: git-send-email.perl:295
15964#, perl-format
15965msgid "'%s.final' contains the composed email.\n"
15966msgstr "'%s.final' 包含编辑的邮件。\n"
15967
15968#: git-send-email.perl:313
15969msgid "--dump-aliases incompatible with other options\n"
15970msgstr "--dump-aliases 和其它选项不兼容\n"
15971
15972#: git-send-email.perl:378 git-send-email.perl:629
15973msgid "Cannot run git format-patch from outside a repository\n"
15974msgstr "不能在仓库之外运行 git format-patch\n"
15975
15976#: git-send-email.perl:447
15977#, perl-format
15978msgid "Unknown --suppress-cc field: '%s'\n"
15979msgstr "未知的 --suppress-cc 字段:'%s'\n"
15980
15981#: git-send-email.perl:476
15982#, perl-format
15983msgid "Unknown --confirm setting: '%s'\n"
15984msgstr "未知的 --confirm 设置:'%s'\n"
15985
15986#: git-send-email.perl:504
15987#, perl-format
15988msgid "warning: sendmail alias with quotes is not supported: %s\n"
15989msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
15990
15991#: git-send-email.perl:506
15992#, perl-format
15993msgid "warning: `:include:` not supported: %s\n"
15994msgstr "警告:不支持 `:include:`:%s\n"
15995
15996#: git-send-email.perl:508
15997#, perl-format
15998msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
15999msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
16000
16001#: git-send-email.perl:513
16002#, perl-format
16003msgid "warning: sendmail line is not recognized: %s\n"
16004msgstr "警告:不能识别的 sendmail 行:%s\n"
16005
16006#: git-send-email.perl:595
16007#, perl-format
16008msgid ""
16009"File '%s' exists but it could also be the range of commits\n"
16010"to produce patches for.  Please disambiguate by...\n"
16011"\n"
16012"    * Saying \"./%s\" if you mean a file; or\n"
16013"    * Giving --format-patch option if you mean a range.\n"
16014msgstr ""
16015"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
16016"歧义:\n"
16017"\n"
16018"    * 如果含义为一个文件,使用 \"./%s\",或者\n"
16019"    * 如果含义为一个范围,使用 --format-patch 选项。\n"
16020
16021#: git-send-email.perl:616
16022#, perl-format
16023msgid "Failed to opendir %s: %s"
16024msgstr "无法打开目录 %s: %s"
16025
16026#: git-send-email.perl:640
16027#, perl-format
16028msgid ""
16029"fatal: %s: %s\n"
16030"warning: no patches were sent\n"
16031msgstr ""
16032"严重:%s:%s\n"
16033"警告:补丁未能发送\n"
16034
16035#: git-send-email.perl:651
16036msgid ""
16037"\n"
16038"No patch files specified!\n"
16039"\n"
16040msgstr ""
16041"\n"
16042"未指定补丁文件!\n"
16043"\n"
16044
16045#: git-send-email.perl:664
16046#, perl-format
16047msgid "No subject line in %s?"
16048msgstr "在 %s 中没有标题行?"
16049
16050#: git-send-email.perl:674
16051#, perl-format
16052msgid "Failed to open for writing %s: %s"
16053msgstr "无法写入 %s: %s"
16054
16055#: git-send-email.perl:684
16056msgid ""
16057"Lines beginning in \"GIT:\" will be removed.\n"
16058"Consider including an overall diffstat or table of contents\n"
16059"for the patch you are writing.\n"
16060"\n"
16061"Clear the body content if you don't wish to send a summary.\n"
16062msgstr ""
16063"以 \"GIT:\" 开头的行将被删除。\n"
16064"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
16065"\n"
16066"如果您不想发送摘要,清除内容。\n"
16067
16068#: git-send-email.perl:707
16069#, perl-format
16070msgid "Failed to open %s.final: %s"
16071msgstr "无法打开 %s.final: %s"
16072
16073#: git-send-email.perl:710
16074#, perl-format
16075msgid "Failed to open %s: %s"
16076msgstr "无法打开 %s: %s"
16077
16078#: git-send-email.perl:745
16079msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
16080msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
16081
16082#: git-send-email.perl:754
16083msgid "Summary email is empty, skipping it\n"
16084msgstr "摘要邮件为空,跳过\n"
16085
16086#. TRANSLATORS: please keep [y/N] as is.
16087#: git-send-email.perl:786
16088#, perl-format
16089msgid "Are you sure you want to use <%s> [y/N]? "
16090msgstr "您确认要使用 <%s> [y/N]?"
16091
16092#: git-send-email.perl:815
16093msgid ""
16094"The following files are 8bit, but do not declare a Content-Transfer-"
16095"Encoding.\n"
16096msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
16097
16098#: git-send-email.perl:820
16099msgid "Which 8bit encoding should I declare [UTF-8]? "
16100msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
16101
16102#: git-send-email.perl:828
16103#, perl-format
16104msgid ""
16105"Refusing to send because the patch\n"
16106"\t%s\n"
16107"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
16108"want to send.\n"
16109msgstr ""
16110"拒绝发送,因为补丁\n"
16111"\t%s\n"
16112"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
16113
16114#: git-send-email.perl:847
16115msgid "To whom should the emails be sent (if anyone)?"
16116msgstr "邮件将要发送给谁?"
16117
16118#: git-send-email.perl:865
16119#, perl-format
16120msgid "fatal: alias '%s' expands to itself\n"
16121msgstr "严重:别名 '%s' 扩展为它自己\n"
16122
16123#: git-send-email.perl:877
16124msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
16125msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
16126
16127#: git-send-email.perl:927 git-send-email.perl:935
16128#, perl-format
16129msgid "error: unable to extract a valid address from: %s\n"
16130msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
16131
16132#. TRANSLATORS: Make sure to include [q] [d] [e] in your
16133#. translation. The program will only accept English input
16134#. at this point.
16135#: git-send-email.perl:939
16136msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
16137msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
16138
16139#: git-send-email.perl:1260
16140#, perl-format
16141msgid "CA path \"%s\" does not exist"
16142msgstr "CA 路径 \"%s\" 不存在"
16143
16144#: git-send-email.perl:1335
16145msgid ""
16146"    The Cc list above has been expanded by additional\n"
16147"    addresses found in the patch commit message. By default\n"
16148"    send-email prompts before sending whenever this occurs.\n"
16149"    This behavior is controlled by the sendemail.confirm\n"
16150"    configuration setting.\n"
16151"\n"
16152"    For additional information, run 'git send-email --help'.\n"
16153"    To retain the current behavior, but squelch this message,\n"
16154"    run 'git config --global sendemail.confirm auto'.\n"
16155"\n"
16156msgstr ""
16157"    以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
16158"    了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
16159"    sendemail.confirm 配置设置。\n"
16160"\n"
16161"    更多信息,执行 'git send-email --help'。\n"
16162"    要保持当前行为,但不显示此信息,运行 'git config --global\n"
16163"    sendemail.confirm auto'。\n"
16164"\n"
16165
16166#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
16167#. translation. The program will only accept English input
16168#. at this point.
16169#: git-send-email.perl:1350
16170msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
16171msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):"
16172
16173#: git-send-email.perl:1353
16174msgid "Send this email reply required"
16175msgstr "发送要求的邮件回复"
16176
16177#: git-send-email.perl:1379
16178msgid "The required SMTP server is not properly defined."
16179msgstr "要求的 SMTP 服务器未被正确定义。"
16180
16181#: git-send-email.perl:1426
16182#, perl-format
16183msgid "Server does not support STARTTLS! %s"
16184msgstr "服务器不支持 STARTTLS!%s"
16185
16186#: git-send-email.perl:1431 git-send-email.perl:1435
16187#, perl-format
16188msgid "STARTTLS failed! %s"
16189msgstr "STARTTLS 失败!%s"
16190
16191#: git-send-email.perl:1445
16192msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
16193msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
16194
16195#: git-send-email.perl:1463
16196#, perl-format
16197msgid "Failed to send %s\n"
16198msgstr "无法发送 %s\n"
16199
16200#: git-send-email.perl:1466
16201#, perl-format
16202msgid "Dry-Sent %s\n"
16203msgstr "演习发送 %s\n"
16204
16205#: git-send-email.perl:1466
16206#, perl-format
16207msgid "Sent %s\n"
16208msgstr "正发送 %s\n"
16209
16210#: git-send-email.perl:1468
16211msgid "Dry-OK. Log says:\n"
16212msgstr "演习成功。日志说:\n"
16213
16214#: git-send-email.perl:1468
16215msgid "OK. Log says:\n"
16216msgstr "OK。日志说:\n"
16217
16218#: git-send-email.perl:1480
16219msgid "Result: "
16220msgstr "结果:"
16221
16222#: git-send-email.perl:1483
16223msgid "Result: OK\n"
16224msgstr "结果:OK\n"
16225
16226#: git-send-email.perl:1496
16227#, perl-format
16228msgid "can't open file %s"
16229msgstr "无法打开文件 %s"
16230
16231#: git-send-email.perl:1543 git-send-email.perl:1563
16232#, perl-format
16233msgid "(mbox) Adding cc: %s from line '%s'\n"
16234msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
16235
16236#: git-send-email.perl:1549
16237#, perl-format
16238msgid "(mbox) Adding to: %s from line '%s'\n"
16239msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
16240
16241#: git-send-email.perl:1597
16242#, perl-format
16243msgid "(non-mbox) Adding cc: %s from line '%s'\n"
16244msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
16245
16246#: git-send-email.perl:1622
16247#, perl-format
16248msgid "(body) Adding cc: %s from line '%s'\n"
16249msgstr "(body) 添加 cc: %s 自行 '%s'\n"
16250
16251#: git-send-email.perl:1728
16252#, perl-format
16253msgid "(%s) Could not execute '%s'"
16254msgstr "(%s) 不能执行 '%s'"
16255
16256#: git-send-email.perl:1735
16257#, perl-format
16258msgid "(%s) Adding %s: %s from: '%s'\n"
16259msgstr "(%s) 添加 %s: %s 自:'%s'\n"
16260
16261#: git-send-email.perl:1739
16262#, perl-format
16263msgid "(%s) failed to close pipe to '%s'"
16264msgstr "(%s) 无法关闭管道至 '%s'"
16265
16266#: git-send-email.perl:1766
16267msgid "cannot send message as 7bit"
16268msgstr "不能以 7bit 形式发送信息"
16269
16270#: git-send-email.perl:1774
16271msgid "invalid transfer encoding"
16272msgstr "无效的传送编码"
16273
16274#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
16275#, perl-format
16276msgid "unable to open %s: %s\n"
16277msgstr "不能打开 %s:%s\n"
16278
16279#: git-send-email.perl:1815
16280#, perl-format
16281msgid "%s: patch contains a line longer than 998 characters"
16282msgstr "%s:补丁包含一个超过 998 字符的行"
16283
16284#: git-send-email.perl:1831
16285#, perl-format
16286msgid "Skipping %s with backup suffix '%s'.\n"
16287msgstr "略过 %s 含备份后缀 '%s'。\n"
16288
16289#. TRANSLATORS: please keep "[y|N]" as is.
16290#: git-send-email.perl:1835
16291#, perl-format
16292msgid "Do you really want to send %s? [y|N]: "
16293msgstr "您真的要发送 %s?[y|N]:"