po / zh_CN.poon commit Merge branch 'mh/packed-ref-store-prep' into maint (6b89503)
   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#   tree                             |  树(工作区或树对象)
 125#   tree object                      |  树对象
 126#   tree-ish (also treeish)          |  树对象(或可以解析为一树对象)
 127#   unmerged index                   |  未合并索引
 128#   unpack                           |  解包
 129#   unreachable object               |  不可达对象
 130#   unstage                          |  取消暂存
 131#   upstream                         |  上游
 132#   upstream branch                  |  上游分支
 133#   working tree                     |  工作区
 134#
 135msgid ""
 136msgstr ""
 137"Project-Id-Version: Git\n"
 138"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 139"POT-Creation-Date: 2017-07-24 21:54+0800\n"
 140"PO-Revision-Date: 2017-08-02 08:00+0800\n"
 141"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 142"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 143"Language: zh_CN\n"
 144"MIME-Version: 1.0\n"
 145"Content-Type: text/plain; charset=UTF-8\n"
 146"Content-Transfer-Encoding: 8bit\n"
 147"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 148
 149#: advice.c:58
 150#, c-format
 151msgid "hint: %.*s\n"
 152msgstr "提示:%.*s\n"
 153
 154#: advice.c:86
 155msgid "Cherry-picking is not possible because you have unmerged files."
 156msgstr "无法拣选,因为您有未合并的文件。"
 157
 158#: advice.c:88
 159msgid "Committing is not possible because you have unmerged files."
 160msgstr "无法提交,因为您有未合并的文件。"
 161
 162#: advice.c:90
 163msgid "Merging is not possible because you have unmerged files."
 164msgstr "无法合并,因为您有未合并的文件。"
 165
 166#: advice.c:92
 167msgid "Pulling is not possible because you have unmerged files."
 168msgstr "无法拉取,因为您有未合并的文件。"
 169
 170#: advice.c:94
 171msgid "Reverting is not possible because you have unmerged files."
 172msgstr "无法回退,因为您有未合并的文件。"
 173
 174#: advice.c:96
 175#, c-format
 176msgid "It is not possible to %s because you have unmerged files."
 177msgstr "无法 %s,因为您有未合并的文件。"
 178
 179#: advice.c:104
 180msgid ""
 181"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 182"as appropriate to mark resolution and make a commit."
 183msgstr ""
 184"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
 185"解决方案并提交。"
 186
 187#: advice.c:112
 188msgid "Exiting because of an unresolved conflict."
 189msgstr "因为存在未解决的冲突而退出。"
 190
 191#: advice.c:117 builtin/merge.c:1184
 192msgid "You have not concluded your merge (MERGE_HEAD exists)."
 193msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
 194
 195#: advice.c:119
 196msgid "Please, commit your changes before merging."
 197msgstr "请在合并前先提交您的修改。"
 198
 199#: advice.c:120
 200msgid "Exiting because of unfinished merge."
 201msgstr "因为存在未完成的合并而退出。"
 202
 203#: advice.c:126
 204#, c-format
 205msgid ""
 206"Note: checking out '%s'.\n"
 207"\n"
 208"You are in 'detached HEAD' state. You can look around, make experimental\n"
 209"changes and commit them, and you can discard any commits you make in this\n"
 210"state without impacting any branches by performing another checkout.\n"
 211"\n"
 212"If you want to create a new branch to retain commits you create, you may\n"
 213"do so (now or later) by using -b with the checkout command again. Example:\n"
 214"\n"
 215"  git checkout -b <new-branch-name>\n"
 216"\n"
 217msgstr ""
 218"注意:正在检出 '%s'。\n"
 219"\n"
 220"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
 221"外\n"
 222"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
 223"\n"
 224"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
 225"参数 -b 来实现(现在或稍后)。例如:\n"
 226"\n"
 227"  git checkout -b <new-branch-name>\n"
 228"\n"
 229
 230#: apply.c:58
 231#, c-format
 232msgid "unrecognized whitespace option '%s'"
 233msgstr "未能识别的空白字符选项 '%s'"
 234
 235#: apply.c:74
 236#, c-format
 237msgid "unrecognized whitespace ignore option '%s'"
 238msgstr "未能识别的空白字符忽略选项 '%s'"
 239
 240#: apply.c:126
 241msgid "--reject and --3way cannot be used together."
 242msgstr "--reject 和 --3say 不能同时使用。"
 243
 244#: apply.c:128
 245msgid "--cached and --3way cannot be used together."
 246msgstr "--cached 和 --3way 不能同时使用。"
 247
 248#: apply.c:131
 249msgid "--3way outside a repository"
 250msgstr "--3way 在一个仓库之外"
 251
 252#: apply.c:142
 253msgid "--index outside a repository"
 254msgstr "--index 在一个仓库之外"
 255
 256#: apply.c:145
 257msgid "--cached outside a repository"
 258msgstr "--cached 在一个仓库之外"
 259
 260#: apply.c:836
 261#, c-format
 262msgid "Cannot prepare timestamp regexp %s"
 263msgstr "无法准备时间戳正则表达式 %s"
 264
 265#: apply.c:845
 266#, c-format
 267msgid "regexec returned %d for input: %s"
 268msgstr "regexec 返回 %d,输入为:%s"
 269
 270#: apply.c:929
 271#, c-format
 272msgid "unable to find filename in patch at line %d"
 273msgstr "不能在补丁的第 %d 行找到文件名"
 274
 275#: apply.c:967
 276#, c-format
 277msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 278msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
 279
 280#: apply.c:973
 281#, c-format
 282msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 283msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
 284
 285#: apply.c:974
 286#, c-format
 287msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 288msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
 289
 290#: apply.c:979
 291#, c-format
 292msgid "git apply: bad git-diff - expected /dev/null on line %d"
 293msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
 294
 295#: apply.c:1008
 296#, c-format
 297msgid "invalid mode on line %d: %s"
 298msgstr "第 %d 行包含无效文件模式:%s"
 299
 300#: apply.c:1326
 301#, c-format
 302msgid "inconsistent header lines %d and %d"
 303msgstr "不一致的文件头,%d 行和 %d 行"
 304
 305#: apply.c:1498
 306#, c-format
 307msgid "recount: unexpected line: %.*s"
 308msgstr "recount:意外的行:%.*s"
 309
 310#: apply.c:1567
 311#, c-format
 312msgid "patch fragment without header at line %d: %.*s"
 313msgstr "第 %d 行的补丁片段没有头信息:%.*s"
 314
 315#: apply.c:1587
 316#, c-format
 317msgid ""
 318"git diff header lacks filename information when removing %d leading pathname "
 319"component (line %d)"
 320msgid_plural ""
 321"git diff header lacks filename information when removing %d leading pathname "
 322"components (line %d)"
 323msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
 324msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
 325
 326#: apply.c:1600
 327#, c-format
 328msgid "git diff header lacks filename information (line %d)"
 329msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
 330
 331#: apply.c:1770
 332msgid "new file depends on old contents"
 333msgstr "新文件依赖旧内容"
 334
 335#: apply.c:1772
 336msgid "deleted file still has contents"
 337msgstr "删除的文件仍有内容"
 338
 339#: apply.c:1806
 340#, c-format
 341msgid "corrupt patch at line %d"
 342msgstr "补丁在第 %d 行损坏"
 343
 344#: apply.c:1843
 345#, c-format
 346msgid "new file %s depends on old contents"
 347msgstr "新文件 %s 依赖旧内容"
 348
 349#: apply.c:1845
 350#, c-format
 351msgid "deleted file %s still has contents"
 352msgstr "删除的文件 %s 仍有内容"
 353
 354#: apply.c:1848
 355#, c-format
 356msgid "** warning: file %s becomes empty but is not deleted"
 357msgstr "** 警告:文件 %s 成为空文件但并未删除"
 358
 359#: apply.c:1995
 360#, c-format
 361msgid "corrupt binary patch at line %d: %.*s"
 362msgstr "二进制补丁在第 %d 行损坏:%.*s"
 363
 364#: apply.c:2032
 365#, c-format
 366msgid "unrecognized binary patch at line %d"
 367msgstr "未能识别的二进制补丁位于第 %d 行"
 368
 369#: apply.c:2193
 370#, c-format
 371msgid "patch with only garbage at line %d"
 372msgstr "补丁文件的第 %d 行只有垃圾数据"
 373
 374#: apply.c:2276
 375#, c-format
 376msgid "unable to read symlink %s"
 377msgstr "无法读取符号链接 %s"
 378
 379#: apply.c:2280
 380#, c-format
 381msgid "unable to open or read %s"
 382msgstr "不能打开或读取 %s"
 383
 384#: apply.c:2933
 385#, c-format
 386msgid "invalid start of line: '%c'"
 387msgstr "无效的行首字符:'%c'"
 388
 389#: apply.c:3052
 390#, c-format
 391msgid "Hunk #%d succeeded at %d (offset %d line)."
 392msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 393msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
 394msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
 395
 396#: apply.c:3064
 397#, c-format
 398msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 399msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
 400
 401#: apply.c:3070
 402#, c-format
 403msgid ""
 404"while searching for:\n"
 405"%.*s"
 406msgstr ""
 407"当查询:\n"
 408"%.*s"
 409
 410#: apply.c:3092
 411#, c-format
 412msgid "missing binary patch data for '%s'"
 413msgstr "缺失 '%s' 的二进制补丁数据"
 414
 415#: apply.c:3100
 416#, c-format
 417msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 418msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
 419
 420#: apply.c:3146
 421#, c-format
 422msgid "cannot apply binary patch to '%s' without full index line"
 423msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 424
 425#: apply.c:3156
 426#, c-format
 427msgid ""
 428"the patch applies to '%s' (%s), which does not match the current contents."
 429msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
 430
 431#: apply.c:3164
 432#, c-format
 433msgid "the patch applies to an empty '%s' but it is not empty"
 434msgstr "补丁应用到空文件 '%s',但其并非空文件"
 435
 436#: apply.c:3182
 437#, c-format
 438msgid "the necessary postimage %s for '%s' cannot be read"
 439msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
 440
 441#: apply.c:3195
 442#, c-format
 443msgid "binary patch does not apply to '%s'"
 444msgstr "二进制补丁未应用到 '%s'"
 445
 446#: apply.c:3201
 447#, c-format
 448msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 449msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
 450
 451#: apply.c:3222
 452#, c-format
 453msgid "patch failed: %s:%ld"
 454msgstr "打补丁失败:%s:%ld"
 455
 456#: apply.c:3344
 457#, c-format
 458msgid "cannot checkout %s"
 459msgstr "不能检出 %s"
 460
 461#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
 462#, c-format
 463msgid "failed to read %s"
 464msgstr "无法读取 %s"
 465
 466#: apply.c:3400
 467#, c-format
 468msgid "reading from '%s' beyond a symbolic link"
 469msgstr "读取位于符号链接中的 '%s'"
 470
 471#: apply.c:3429 apply.c:3669
 472#, c-format
 473msgid "path %s has been renamed/deleted"
 474msgstr "路径 %s 已经被重命名/删除"
 475
 476#: apply.c:3512 apply.c:3683
 477#, c-format
 478msgid "%s: does not exist in index"
 479msgstr "%s:不存在于索引中"
 480
 481#: apply.c:3521 apply.c:3691
 482#, c-format
 483msgid "%s: does not match index"
 484msgstr "%s:和索引不匹配"
 485
 486#: apply.c:3556
 487msgid "repository lacks the necessary blob to fall back on 3-way merge."
 488msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 489
 490#: apply.c:3559
 491#, c-format
 492msgid "Falling back to three-way merge...\n"
 493msgstr "回落到三方合并...\n"
 494
 495#: apply.c:3575 apply.c:3579
 496#, c-format
 497msgid "cannot read the current contents of '%s'"
 498msgstr "无法读取 '%s' 的当前内容"
 499
 500#: apply.c:3591
 501#, c-format
 502msgid "Failed to fall back on three-way merge...\n"
 503msgstr "无法回落到三方合并...\n"
 504
 505#: apply.c:3605
 506#, c-format
 507msgid "Applied patch to '%s' with conflicts.\n"
 508msgstr "应用补丁到 '%s' 存在冲突。\n"
 509
 510#: apply.c:3610
 511#, c-format
 512msgid "Applied patch to '%s' cleanly.\n"
 513msgstr "成功应用补丁到 '%s'。\n"
 514
 515#: apply.c:3636
 516msgid "removal patch leaves file contents"
 517msgstr "移除补丁仍留下了文件内容"
 518
 519#: apply.c:3708
 520#, c-format
 521msgid "%s: wrong type"
 522msgstr "%s:错误类型"
 523
 524#: apply.c:3710
 525#, c-format
 526msgid "%s has type %o, expected %o"
 527msgstr "%s 的类型是 %o,应为 %o"
 528
 529#: apply.c:3860 apply.c:3862
 530#, c-format
 531msgid "invalid path '%s'"
 532msgstr "无效路径 '%s'"
 533
 534#: apply.c:3918
 535#, c-format
 536msgid "%s: already exists in index"
 537msgstr "%s:已经存在于索引中"
 538
 539#: apply.c:3921
 540#, c-format
 541msgid "%s: already exists in working directory"
 542msgstr "%s:已经存在于工作区中"
 543
 544#: apply.c:3941
 545#, c-format
 546msgid "new mode (%o) of %s does not match old mode (%o)"
 547msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
 548
 549#: apply.c:3946
 550#, c-format
 551msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 552msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
 553
 554#: apply.c:3966
 555#, c-format
 556msgid "affected file '%s' is beyond a symbolic link"
 557msgstr "受影响的文件 '%s' 位于符号链接中"
 558
 559#: apply.c:3970
 560#, c-format
 561msgid "%s: patch does not apply"
 562msgstr "%s:补丁未应用"
 563
 564#: apply.c:3985
 565#, c-format
 566msgid "Checking patch %s..."
 567msgstr "检查补丁 %s..."
 568
 569#: apply.c:4076
 570#, c-format
 571msgid "sha1 information is lacking or useless for submodule %s"
 572msgstr "子模组 %s 的 sha1 信息缺失或无效"
 573
 574#: apply.c:4083
 575#, c-format
 576msgid "mode change for %s, which is not in current HEAD"
 577msgstr "%s 的模式被改变,但它不在当前 HEAD 中"
 578
 579#: apply.c:4086
 580#, c-format
 581msgid "sha1 information is lacking or useless (%s)."
 582msgstr "sha1 信息缺失或无效(%s)。"
 583
 584#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
 585#, c-format
 586msgid "make_cache_entry failed for path '%s'"
 587msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 588
 589#: apply.c:4095
 590#, c-format
 591msgid "could not add %s to temporary index"
 592msgstr "不能在临时索引中添加 %s"
 593
 594#: apply.c:4105
 595#, c-format
 596msgid "could not write temporary index to %s"
 597msgstr "不能把临时索引写入到 %s"
 598
 599#: apply.c:4243
 600#, c-format
 601msgid "unable to remove %s from index"
 602msgstr "不能从索引中移除 %s"
 603
 604#: apply.c:4278
 605#, c-format
 606msgid "corrupt patch for submodule %s"
 607msgstr "子模组 %s 损坏的补丁"
 608
 609#: apply.c:4284
 610#, c-format
 611msgid "unable to stat newly created file '%s'"
 612msgstr "不能对新建文件 '%s' 调用 stat"
 613
 614#: apply.c:4292
 615#, c-format
 616msgid "unable to create backing store for newly created file %s"
 617msgstr "不能为新建文件 %s 创建后端存储"
 618
 619#: apply.c:4298 apply.c:4442
 620#, c-format
 621msgid "unable to add cache entry for %s"
 622msgstr "无法为 %s 添加缓存条目"
 623
 624#: apply.c:4339
 625#, c-format
 626msgid "failed to write to '%s'"
 627msgstr "无法写入 '%s'"
 628
 629#: apply.c:4343
 630#, c-format
 631msgid "closing file '%s'"
 632msgstr "关闭文件 '%s'"
 633
 634#: apply.c:4413
 635#, c-format
 636msgid "unable to write file '%s' mode %o"
 637msgstr "不能写文件 '%s' 权限 %o"
 638
 639#: apply.c:4511
 640#, c-format
 641msgid "Applied patch %s cleanly."
 642msgstr "成功应用补丁 %s。"
 643
 644#: apply.c:4519
 645msgid "internal error"
 646msgstr "内部错误"
 647
 648#: apply.c:4522
 649#, c-format
 650msgid "Applying patch %%s with %d reject..."
 651msgid_plural "Applying patch %%s with %d rejects..."
 652msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
 653msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
 654
 655#: apply.c:4533
 656#, c-format
 657msgid "truncating .rej filename to %.*s.rej"
 658msgstr "截短 .rej 文件名为 %.*s.rej"
 659
 660#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
 661#, c-format
 662msgid "cannot open %s"
 663msgstr "不能打开 %s"
 664
 665#: apply.c:4555
 666#, c-format
 667msgid "Hunk #%d applied cleanly."
 668msgstr "第 #%d 个片段成功应用。"
 669
 670#: apply.c:4559
 671#, c-format
 672msgid "Rejected hunk #%d."
 673msgstr "拒绝第 #%d 个片段。"
 674
 675#: apply.c:4669
 676#, c-format
 677msgid "Skipped patch '%s'."
 678msgstr "略过补丁 '%s'。"
 679
 680#: apply.c:4677
 681msgid "unrecognized input"
 682msgstr "未能识别的输入"
 683
 684#: apply.c:4696
 685msgid "unable to read index file"
 686msgstr "无法读取索引文件"
 687
 688#: apply.c:4833
 689#, c-format
 690msgid "can't open patch '%s': %s"
 691msgstr "不能打开补丁 '%s':%s"
 692
 693#: apply.c:4860
 694#, c-format
 695msgid "squelched %d whitespace error"
 696msgid_plural "squelched %d whitespace errors"
 697msgstr[0] "抑制下仍有 %d 个空白字符误用"
 698msgstr[1] "抑制下仍有 %d 个空白字符误用"
 699
 700#: apply.c:4866 apply.c:4881
 701#, c-format
 702msgid "%d line adds whitespace errors."
 703msgid_plural "%d lines add whitespace errors."
 704msgstr[0] "%d 行新增了空白字符误用。"
 705msgstr[1] "%d 行新增了空白字符误用。"
 706
 707#: apply.c:4874
 708#, c-format
 709msgid "%d line applied after fixing whitespace errors."
 710msgid_plural "%d lines applied after fixing whitespace errors."
 711msgstr[0] "修复空白错误后,应用了 %d 行。"
 712msgstr[1] "修复空白错误后,应用了 %d 行。"
 713
 714#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
 715msgid "Unable to write new index file"
 716msgstr "无法写入新索引文件"
 717
 718#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
 719#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
 720#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
 721#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
 722#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
 723#: git-add--interactive.perl:197
 724msgid "path"
 725msgstr "路径"
 726
 727#: apply.c:4922
 728msgid "don't apply changes matching the given path"
 729msgstr "不要应用与给出路径向匹配的变更"
 730
 731#: apply.c:4925
 732msgid "apply changes matching the given path"
 733msgstr "应用与给出路径向匹配的变更"
 734
 735#: apply.c:4927 builtin/am.c:2266
 736msgid "num"
 737msgstr "数字"
 738
 739#: apply.c:4928
 740msgid "remove <num> leading slashes from traditional diff paths"
 741msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
 742
 743#: apply.c:4931
 744msgid "ignore additions made by the patch"
 745msgstr "忽略补丁中的添加的文件"
 746
 747#: apply.c:4933
 748msgid "instead of applying the patch, output diffstat for the input"
 749msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
 750
 751#: apply.c:4937
 752msgid "show number of added and deleted lines in decimal notation"
 753msgstr "以十进制数显示添加和删除的行数"
 754
 755#: apply.c:4939
 756msgid "instead of applying the patch, output a summary for the input"
 757msgstr "不应用补丁,而是显示输入的概要"
 758
 759#: apply.c:4941
 760msgid "instead of applying the patch, see if the patch is applicable"
 761msgstr "不应用补丁,而是查看补丁是否可应用"
 762
 763#: apply.c:4943
 764msgid "make sure the patch is applicable to the current index"
 765msgstr "确认补丁可以应用到当前索引"
 766
 767#: apply.c:4945
 768msgid "apply a patch without touching the working tree"
 769msgstr "应用补丁而不修改工作区"
 770
 771#: apply.c:4947
 772msgid "accept a patch that touches outside the working area"
 773msgstr "接受修改工作区之外文件的补丁"
 774
 775#: apply.c:4949
 776msgid "also apply the patch (use with --stat/--summary/--check)"
 777msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
 778
 779#: apply.c:4951
 780msgid "attempt three-way merge if a patch does not apply"
 781msgstr "如果一个补丁不能应用则尝试三方合并"
 782
 783#: apply.c:4953
 784msgid "build a temporary index based on embedded index information"
 785msgstr "创建一个临时索引基于嵌入的索引信息"
 786
 787#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
 788msgid "paths are separated with NUL character"
 789msgstr "路径以 NUL 字符分隔"
 790
 791#: apply.c:4958
 792msgid "ensure at least <n> lines of context match"
 793msgstr "确保至少匹配 <n> 行上下文"
 794
 795#: apply.c:4959 builtin/am.c:2245
 796msgid "action"
 797msgstr "动作"
 798
 799#: apply.c:4960
 800msgid "detect new or modified lines that have whitespace errors"
 801msgstr "检查新增和修改的行中间的空白字符滥用"
 802
 803#: apply.c:4963 apply.c:4966
 804msgid "ignore changes in whitespace when finding context"
 805msgstr "查找上下文时忽略空白字符的变更"
 806
 807#: apply.c:4969
 808msgid "apply the patch in reverse"
 809msgstr "反向应用补丁"
 810
 811#: apply.c:4971
 812msgid "don't expect at least one line of context"
 813msgstr "无需至少一行上下文"
 814
 815#: apply.c:4973
 816msgid "leave the rejected hunks in corresponding *.rej files"
 817msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
 818
 819#: apply.c:4975
 820msgid "allow overlapping hunks"
 821msgstr "允许重叠的补丁片段"
 822
 823#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
 824#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
 825#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
 826msgid "be verbose"
 827msgstr "冗长输出"
 828
 829#: apply.c:4978
 830msgid "tolerate incorrectly detected missing new-line at the end of file"
 831msgstr "允许不正确的文件末尾换行符"
 832
 833#: apply.c:4981
 834msgid "do not trust the line counts in the hunk headers"
 835msgstr "不信任补丁片段的头信息中的行号"
 836
 837#: apply.c:4983 builtin/am.c:2254
 838msgid "root"
 839msgstr "根目录"
 840
 841#: apply.c:4984
 842msgid "prepend <root> to all filenames"
 843msgstr "为所有文件名前添加 <根目录>"
 844
 845#: archive.c:13
 846msgid "git archive [<options>] <tree-ish> [<path>...]"
 847msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 848
 849#: archive.c:14
 850msgid "git archive --list"
 851msgstr "git archive --list"
 852
 853#: archive.c:15
 854msgid ""
 855"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 856msgstr ""
 857"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 858
 859#: archive.c:16
 860msgid "git archive --remote <repo> [--exec <cmd>] --list"
 861msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 862
 863#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
 864#, c-format
 865msgid "pathspec '%s' did not match any files"
 866msgstr "路径规格 '%s' 未匹配任何文件"
 867
 868#: archive.c:418
 869msgid "fmt"
 870msgstr "格式"
 871
 872#: archive.c:418
 873msgid "archive format"
 874msgstr "归档格式"
 875
 876#: archive.c:419 builtin/log.c:1446
 877msgid "prefix"
 878msgstr "前缀"
 879
 880#: archive.c:420
 881msgid "prepend prefix to each pathname in the archive"
 882msgstr "为归档中每个路径名加上前缀"
 883
 884#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
 885#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
 886#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
 887#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
 888#: parse-options.h:153
 889msgid "file"
 890msgstr "文件"
 891
 892#: archive.c:422 builtin/archive.c:89
 893msgid "write the archive to this file"
 894msgstr "归档写入此文件"
 895
 896#: archive.c:424
 897msgid "read .gitattributes in working directory"
 898msgstr "读取工作区中的 .gitattributes"
 899
 900#: archive.c:425
 901msgid "report archived files on stderr"
 902msgstr "在标准错误上报告归档文件"
 903
 904#: archive.c:426
 905msgid "store only"
 906msgstr "只存储"
 907
 908#: archive.c:427
 909msgid "compress faster"
 910msgstr "压缩速度更快"
 911
 912#: archive.c:435
 913msgid "compress better"
 914msgstr "压缩效果更好"
 915
 916#: archive.c:438
 917msgid "list supported archive formats"
 918msgstr "列出支持的归档格式"
 919
 920#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
 921#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
 922msgid "repo"
 923msgstr "仓库"
 924
 925#: archive.c:441 builtin/archive.c:91
 926msgid "retrieve the archive from remote repository <repo>"
 927msgstr "从远程仓库(<仓库>)提取归档文件"
 928
 929#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
 930msgid "command"
 931msgstr "命令"
 932
 933#: archive.c:443 builtin/archive.c:93
 934msgid "path to the remote git-upload-archive command"
 935msgstr "远程 git-upload-archive 命令的路径"
 936
 937#: archive.c:450
 938msgid "Unexpected option --remote"
 939msgstr "未知参数 --remote"
 940
 941#: archive.c:452
 942msgid "Option --exec can only be used together with --remote"
 943msgstr "选项 --exec 只能和 --remote 同时使用"
 944
 945#: archive.c:454
 946msgid "Unexpected option --output"
 947msgstr "未知参数 --output"
 948
 949#: archive.c:476
 950#, c-format
 951msgid "Unknown archive format '%s'"
 952msgstr "未知归档格式 '%s'"
 953
 954#: archive.c:483
 955#, c-format
 956msgid "Argument not supported for format '%s': -%d"
 957msgstr "参数不支持此格式 '%s':-%d"
 958
 959#: attr.c:214
 960#, c-format
 961msgid "%.*s is not a valid attribute name"
 962msgstr "%.*s 不是一个有效的属性名"
 963
 964#: attr.c:410
 965msgid ""
 966"Negative patterns are ignored in git attributes\n"
 967"Use '\\!' for literal leading exclamation."
 968msgstr ""
 969"负值模版在 git attributes 中被忽略\n"
 970"当字符串确实要以感叹号开始时,使用 '\\!'。"
 971
 972#: bisect.c:447
 973#, c-format
 974msgid "Badly quoted content in file '%s': %s"
 975msgstr "文件 '%s' 包含错误的引用格式:%s"
 976
 977#: bisect.c:655
 978#, c-format
 979msgid "We cannot bisect more!\n"
 980msgstr "我们无法进行更多的二分查找!\n"
 981
 982#: bisect.c:708
 983#, c-format
 984msgid "Not a valid commit name %s"
 985msgstr "不是一个有效的提交名 %s"
 986
 987#: bisect.c:732
 988#, c-format
 989msgid ""
 990"The merge base %s is bad.\n"
 991"This means the bug has been fixed between %s and [%s].\n"
 992msgstr ""
 993"合并基线 %s 是坏的。\n"
 994"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 995
 996#: bisect.c:737
 997#, c-format
 998msgid ""
 999"The merge base %s is new.\n"
1000"The property has changed between %s and [%s].\n"
1001msgstr ""
1002"合并基线 %s 是新的。\n"
1003"介于 %s 和 [%s] 之间的属性已经被修改。\n"
1004
1005#: bisect.c:742
1006#, c-format
1007msgid ""
1008"The merge base %s is %s.\n"
1009"This means the first '%s' commit is between %s and [%s].\n"
1010msgstr ""
1011"合并基线 %s 是 %s。\n"
1012"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1013
1014#: bisect.c:750
1015#, c-format
1016msgid ""
1017"Some %s revs are not ancestors of the %s rev.\n"
1018"git bisect cannot work properly in this case.\n"
1019"Maybe you mistook %s and %s revs?\n"
1020msgstr ""
1021"一些 %s 版本不是 %s 版本的祖先。\n"
1022"这种情况下 git 二分查找无法正常工作。\n"
1023"您可能弄错了 %s 和 %s 版本?\n"
1024
1025#: bisect.c:763
1026#, c-format
1027msgid ""
1028"the merge base between %s and [%s] must be skipped.\n"
1029"So we cannot be sure the first %s commit is between %s and %s.\n"
1030"We continue anyway."
1031msgstr ""
1032"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1033"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1034"我们仍旧继续。"
1035
1036#: bisect.c:798
1037#, c-format
1038msgid "Bisecting: a merge base must be tested\n"
1039msgstr "二分查找中:合并基线必须是经过测试的\n"
1040
1041#: bisect.c:849
1042#, c-format
1043msgid "a %s revision is needed"
1044msgstr "需要一个 %s 版本"
1045
1046#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
1047#, c-format
1048msgid "could not create file '%s'"
1049msgstr "不能创建文件 '%s'"
1050
1051#: bisect.c:917
1052#, c-format
1053msgid "could not read file '%s'"
1054msgstr "不能读取文件 '%s'"
1055
1056#: bisect.c:947
1057msgid "reading bisect refs failed"
1058msgstr "读取二分查找引用失败"
1059
1060#: bisect.c:967
1061#, c-format
1062msgid "%s was both %s and %s\n"
1063msgstr "%s 同时为 %s 和 %s\n"
1064
1065#: bisect.c:975
1066#, c-format
1067msgid ""
1068"No testable commit found.\n"
1069"Maybe you started with bad path parameters?\n"
1070msgstr ""
1071"没有发现可测试的提交。\n"
1072"可能您在运行时使用了错误的路径参数?\n"
1073
1074#: bisect.c:994
1075#, c-format
1076msgid "(roughly %d step)"
1077msgid_plural "(roughly %d steps)"
1078msgstr[0] "(大概 %d 步)"
1079msgstr[1] "(大概 %d 步)"
1080
1081#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1082#. steps)" translation.
1083#.
1084#: bisect.c:1000
1085#, c-format
1086msgid "Bisecting: %d revision left to test after this %s\n"
1087msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1088msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1089msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1090
1091#: blame.c:1757
1092msgid "--contents and --reverse do not blend well."
1093msgstr "--contents 和 --reverse 不能混用。"
1094
1095#: blame.c:1768
1096msgid "cannot use --contents with final commit object name"
1097msgstr "不能将 --contents 和最终的提交对象名共用"
1098
1099#: blame.c:1788
1100msgid "--reverse and --first-parent together require specified latest commit"
1101msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1102
1103#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
1104#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
1105#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
1106#: builtin/shortlog.c:177
1107msgid "revision walk setup failed"
1108msgstr "版本遍历设置失败"
1109
1110#: blame.c:1815
1111msgid ""
1112"--reverse --first-parent together require range along first-parent chain"
1113msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1114
1115#: blame.c:1826
1116#, c-format
1117msgid "no such path %s in %s"
1118msgstr "在 %2$s 中无此路径 %1$s"
1119
1120#: blame.c:1837
1121#, c-format
1122msgid "cannot read blob %s for path %s"
1123msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1124
1125#: branch.c:53
1126#, c-format
1127msgid ""
1128"\n"
1129"After fixing the error cause you may try to fix up\n"
1130"the remote tracking information by invoking\n"
1131"\"git branch --set-upstream-to=%s%s%s\"."
1132msgstr ""
1133"\n"
1134"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1135"\"git branch --set-upstream-to=%s%s%s\" 。"
1136
1137#: branch.c:67
1138#, c-format
1139msgid "Not setting branch %s as its own upstream."
1140msgstr "未设置分支 %s 作为它自己的上游。"
1141
1142#: branch.c:93
1143#, c-format
1144msgid "Branch %s set up to track remote branch %s from %s by rebasing."
1145msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
1146
1147#: branch.c:94
1148#, c-format
1149msgid "Branch %s set up to track remote branch %s from %s."
1150msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
1151
1152#: branch.c:98
1153#, c-format
1154msgid "Branch %s set up to track local branch %s by rebasing."
1155msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
1156
1157#: branch.c:99
1158#, c-format
1159msgid "Branch %s set up to track local branch %s."
1160msgstr "分支 %s 设置为跟踪本地分支 %s。"
1161
1162#: branch.c:104
1163#, c-format
1164msgid "Branch %s set up to track remote ref %s by rebasing."
1165msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
1166
1167#: branch.c:105
1168#, c-format
1169msgid "Branch %s set up to track remote ref %s."
1170msgstr "分支 %s 设置为跟踪远程引用 %s。"
1171
1172#: branch.c:109
1173#, c-format
1174msgid "Branch %s set up to track local ref %s by rebasing."
1175msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
1176
1177#: branch.c:110
1178#, c-format
1179msgid "Branch %s set up to track local ref %s."
1180msgstr "分支 %s 设置为跟踪本地引用 %s。"
1181
1182#: branch.c:119
1183msgid "Unable to write upstream branch configuration"
1184msgstr "无法写入上游分支配置"
1185
1186#: branch.c:156
1187#, c-format
1188msgid "Not tracking: ambiguous information for ref %s"
1189msgstr "未跟踪:引用 %s 有歧义"
1190
1191#: branch.c:185
1192#, c-format
1193msgid "'%s' is not a valid branch name."
1194msgstr "'%s' 不是一个有效的分支名称。"
1195
1196#: branch.c:190
1197#, c-format
1198msgid "A branch named '%s' already exists."
1199msgstr "一个分支名 '%s' 已经存在。"
1200
1201#: branch.c:198
1202msgid "Cannot force update the current branch."
1203msgstr "无法强制更新当前分支。"
1204
1205#: branch.c:218
1206#, c-format
1207msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1208msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1209
1210#: branch.c:220
1211#, c-format
1212msgid "the requested upstream branch '%s' does not exist"
1213msgstr "请求的上游分支 '%s' 不存在"
1214
1215#: branch.c:222
1216msgid ""
1217"\n"
1218"If you are planning on basing your work on an upstream\n"
1219"branch that already exists at the remote, you may need to\n"
1220"run \"git fetch\" to retrieve it.\n"
1221"\n"
1222"If you are planning to push out a new local branch that\n"
1223"will track its remote counterpart, you may want to use\n"
1224"\"git push -u\" to set the upstream config as you push."
1225msgstr ""
1226"\n"
1227"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1228"您可能需要执行 \"git fetch\" 来获取分支。\n"
1229"\n"
1230"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1231"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1232
1233#: branch.c:265
1234#, c-format
1235msgid "Not a valid object name: '%s'."
1236msgstr "不是一个有效的对象名:'%s'。"
1237
1238#: branch.c:285
1239#, c-format
1240msgid "Ambiguous object name: '%s'."
1241msgstr "歧义的对象名:'%s'。"
1242
1243#: branch.c:290
1244#, c-format
1245msgid "Not a valid branch point: '%s'."
1246msgstr "无效的分支点:'%s'。"
1247
1248#: branch.c:344
1249#, c-format
1250msgid "'%s' is already checked out at '%s'"
1251msgstr "'%s' 已经检出到 '%s'"
1252
1253#: branch.c:366
1254#, c-format
1255msgid "HEAD of working tree %s is not updated"
1256msgstr "工作区 %s 的 HEAD 指向没有被更新"
1257
1258#: bundle.c:34
1259#, c-format
1260msgid "'%s' does not look like a v2 bundle file"
1261msgstr "'%s' 不像是一个 v2 版本的包文件"
1262
1263#: bundle.c:62
1264#, c-format
1265msgid "unrecognized header: %s%s (%d)"
1266msgstr "未能识别的包头:%s%s (%d)"
1267
1268#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
1269#, c-format
1270msgid "could not open '%s'"
1271msgstr "不能打开 '%s'"
1272
1273#: bundle.c:140
1274msgid "Repository lacks these prerequisite commits:"
1275msgstr "仓库中缺少这些必备的提交:"
1276
1277#: bundle.c:186
1278#, c-format
1279msgid "The bundle contains this ref:"
1280msgid_plural "The bundle contains these %d refs:"
1281msgstr[0] "这个包中含有这个引用:"
1282msgstr[1] "这个包中含有 %d 个引用:"
1283
1284#: bundle.c:193
1285msgid "The bundle records a complete history."
1286msgstr "这个包记录一个完整历史。"
1287
1288#: bundle.c:195
1289#, c-format
1290msgid "The bundle requires this ref:"
1291msgid_plural "The bundle requires these %d refs:"
1292msgstr[0] "这个包需要这个引用:"
1293msgstr[1] "这个包需要 %d 个引用:"
1294
1295#: bundle.c:254
1296msgid "Could not spawn pack-objects"
1297msgstr "不能生成 pack-objects 进程"
1298
1299#: bundle.c:265
1300msgid "pack-objects died"
1301msgstr "pack-objects 终止"
1302
1303#: bundle.c:307
1304msgid "rev-list died"
1305msgstr "rev-list 终止"
1306
1307#: bundle.c:356
1308#, c-format
1309msgid "ref '%s' is excluded by the rev-list options"
1310msgstr "引用 '%s' 被 rev-list 选项排除"
1311
1312#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
1313#, c-format
1314msgid "unrecognized argument: %s"
1315msgstr "未能识别的参数:%s"
1316
1317#: bundle.c:454
1318msgid "Refusing to create empty bundle."
1319msgstr "不能创建空包。"
1320
1321#: bundle.c:466
1322#, c-format
1323msgid "cannot create '%s'"
1324msgstr "不能创建 '%s'"
1325
1326#: bundle.c:494
1327msgid "index-pack died"
1328msgstr "index-pack 终止"
1329
1330#: color.c:301
1331#, c-format
1332msgid "invalid color value: %.*s"
1333msgstr "无效的颜色值:%.*s"
1334
1335#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
1336#: builtin/am.c:1469 builtin/am.c:2107
1337#, c-format
1338msgid "could not parse %s"
1339msgstr "不能解析 %s"
1340
1341#: commit.c:43
1342#, c-format
1343msgid "%s %s is not a commit!"
1344msgstr "%s %s 不是一个提交!"
1345
1346#: commit.c:1511
1347msgid ""
1348"Warning: commit message did not conform to UTF-8.\n"
1349"You may want to amend it after fixing the message, or set the config\n"
1350"variable i18n.commitencoding to the encoding your project uses.\n"
1351msgstr ""
1352"警告:提交说明不符合 UTF-8 字符编码。\n"
1353"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
1354"设置为您项目所用的字符编码。\n"
1355
1356#: compat/obstack.c:406 compat/obstack.c:408
1357msgid "memory exhausted"
1358msgstr "内存耗尽"
1359
1360#: config.c:186
1361msgid "relative config include conditionals must come from files"
1362msgstr "包含相对路径的条件引用必须来自于文件"
1363
1364#: config.c:720
1365#, c-format
1366msgid "bad config line %d in blob %s"
1367msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1368
1369#: config.c:724
1370#, c-format
1371msgid "bad config line %d in file %s"
1372msgstr "文件 %2$s 中错误的配置行 %1$d"
1373
1374#: config.c:728
1375#, c-format
1376msgid "bad config line %d in standard input"
1377msgstr "标准输入中错误的配置行 %d"
1378
1379#: config.c:732
1380#, c-format
1381msgid "bad config line %d in submodule-blob %s"
1382msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1383
1384#: config.c:736
1385#, c-format
1386msgid "bad config line %d in command line %s"
1387msgstr "命令行 %2$s 中错误的配置行 %1$d"
1388
1389#: config.c:740
1390#, c-format
1391msgid "bad config line %d in %s"
1392msgstr "在 %2$s 中错误的配置行 %1$d"
1393
1394#: config.c:868
1395msgid "out of range"
1396msgstr "超出范围"
1397
1398#: config.c:868
1399msgid "invalid unit"
1400msgstr "无效的单位"
1401
1402#: config.c:874
1403#, c-format
1404msgid "bad numeric config value '%s' for '%s': %s"
1405msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
1406
1407#: config.c:879
1408#, c-format
1409msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1410msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1411
1412#: config.c:882
1413#, c-format
1414msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1415msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1416
1417#: config.c:885
1418#, c-format
1419msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1420msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1421
1422#: config.c:888
1423#, c-format
1424msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1425msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1426
1427#: config.c:891
1428#, c-format
1429msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1430msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1431
1432#: config.c:894
1433#, c-format
1434msgid "bad numeric config value '%s' for '%s' in %s: %s"
1435msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1436
1437#: config.c:989
1438#, c-format
1439msgid "failed to expand user dir in: '%s'"
1440msgstr "无法扩展 '%s' 中的用户目录"
1441
1442#: config.c:1084 config.c:1095
1443#, c-format
1444msgid "bad zlib compression level %d"
1445msgstr "错误的 zlib 压缩级别 %d"
1446
1447#: config.c:1212
1448#, c-format
1449msgid "invalid mode for object creation: %s"
1450msgstr "无效的对象创建模式:%s"
1451
1452#: config.c:1368
1453#, c-format
1454msgid "bad pack compression level %d"
1455msgstr "错误的打包压缩级别 %d"
1456
1457#: config.c:1564
1458msgid "unable to parse command-line config"
1459msgstr "无法解析命令行中的配置"
1460
1461#: config.c:1894
1462msgid "unknown error occurred while reading the configuration files"
1463msgstr "在读取配置文件时遇到未知错误"
1464
1465#: config.c:2064
1466#, c-format
1467msgid "Invalid %s: '%s'"
1468msgstr "无效 %s:'%s'"
1469
1470#: config.c:2085
1471#, c-format
1472msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1473msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1474
1475#: config.c:2111
1476#, c-format
1477msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1478msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1479
1480#: config.c:2122
1481#, c-format
1482msgid "unable to parse '%s' from command-line config"
1483msgstr "无法解析命令行配置中的 '%s'"
1484
1485#: config.c:2124
1486#, c-format
1487msgid "bad config variable '%s' in file '%s' at line %d"
1488msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1489
1490#: config.c:2183
1491#, c-format
1492msgid "%s has multiple values"
1493msgstr "%s 有多个取值"
1494
1495#: config.c:2517 config.c:2745
1496#, c-format
1497msgid "fstat on %s failed"
1498msgstr "对 %s 调用 fstat 失败"
1499
1500#: config.c:2635
1501#, c-format
1502msgid "could not set '%s' to '%s'"
1503msgstr "不能设置 '%s' 为 '%s'"
1504
1505#: config.c:2637 builtin/remote.c:775
1506#, c-format
1507msgid "could not unset '%s'"
1508msgstr "不能取消设置 '%s'"
1509
1510#: connect.c:50
1511msgid "The remote end hung up upon initial contact"
1512msgstr "远端在连接发起时即挂断"
1513
1514#: connect.c:52
1515msgid ""
1516"Could not read from remote repository.\n"
1517"\n"
1518"Please make sure you have the correct access rights\n"
1519"and the repository exists."
1520msgstr ""
1521"无法读取远程仓库。\n"
1522"\n"
1523"请确认您有正确的访问权限并且仓库存在。"
1524
1525#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
1526msgid "Checking connectivity"
1527msgstr "检查连接中"
1528
1529#: connected.c:75
1530msgid "Could not run 'git rev-list'"
1531msgstr "不能执行 'git rev-list'"
1532
1533#: connected.c:95
1534msgid "failed write to rev-list"
1535msgstr "无法写入 rev-list"
1536
1537#: connected.c:102
1538msgid "failed to close rev-list's stdin"
1539msgstr "无法关闭 rev-list 的标准输入"
1540
1541#: convert.c:205
1542#, c-format
1543msgid ""
1544"CRLF will be replaced by LF in %s.\n"
1545"The file will have its original line endings in your working directory."
1546msgstr ""
1547"文件 %s 中的 CRLF 将被 LF 替换。\n"
1548"在工作区中该文件仍保持原有的换行符。"
1549
1550#: convert.c:209
1551#, c-format
1552msgid "CRLF would be replaced by LF in %s."
1553msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1554
1555#: convert.c:215
1556#, c-format
1557msgid ""
1558"LF will be replaced by CRLF in %s.\n"
1559"The file will have its original line endings in your working directory."
1560msgstr ""
1561"文件 %s 中的 LF 将被 CRLF 替换。\n"
1562"在工作区中该文件仍保持原有的换行符。"
1563
1564#: convert.c:219
1565#, c-format
1566msgid "LF would be replaced by CRLF in %s"
1567msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1568
1569#: date.c:116
1570msgid "in the future"
1571msgstr "在将来"
1572
1573#: date.c:122
1574#, c-format
1575msgid "%<PRIuMAX> second ago"
1576msgid_plural "%<PRIuMAX> seconds ago"
1577msgstr[0] "%<PRIuMAX> 秒钟前"
1578msgstr[1] "%<PRIuMAX> 秒钟前"
1579
1580#: date.c:129
1581#, c-format
1582msgid "%<PRIuMAX> minute ago"
1583msgid_plural "%<PRIuMAX> minutes ago"
1584msgstr[0] "%<PRIuMAX> 分钟前"
1585msgstr[1] "%<PRIuMAX> 分钟前"
1586
1587#: date.c:136
1588#, c-format
1589msgid "%<PRIuMAX> hour ago"
1590msgid_plural "%<PRIuMAX> hours ago"
1591msgstr[0] "%<PRIuMAX> 小时前"
1592msgstr[1] "%<PRIuMAX> 小时前"
1593
1594#: date.c:143
1595#, c-format
1596msgid "%<PRIuMAX> day ago"
1597msgid_plural "%<PRIuMAX> days ago"
1598msgstr[0] "%<PRIuMAX> 天前"
1599msgstr[1] "%<PRIuMAX> 天前"
1600
1601#: date.c:149
1602#, c-format
1603msgid "%<PRIuMAX> week ago"
1604msgid_plural "%<PRIuMAX> weeks ago"
1605msgstr[0] "%<PRIuMAX> 周前"
1606msgstr[1] "%<PRIuMAX> 周前"
1607
1608#: date.c:156
1609#, c-format
1610msgid "%<PRIuMAX> month ago"
1611msgid_plural "%<PRIuMAX> months ago"
1612msgstr[0] "%<PRIuMAX> 个月前"
1613msgstr[1] "%<PRIuMAX> 个月前"
1614
1615#: date.c:167
1616#, c-format
1617msgid "%<PRIuMAX> year"
1618msgid_plural "%<PRIuMAX> years"
1619msgstr[0] "%<PRIuMAX> 年"
1620msgstr[1] "%<PRIuMAX> 年"
1621
1622#. TRANSLATORS: "%s" is "<n> years"
1623#: date.c:170
1624#, c-format
1625msgid "%s, %<PRIuMAX> month ago"
1626msgid_plural "%s, %<PRIuMAX> months ago"
1627msgstr[0] "%s %<PRIuMAX> 个月前"
1628msgstr[1] "%s %<PRIuMAX> 个月前"
1629
1630#: date.c:175 date.c:180
1631#, c-format
1632msgid "%<PRIuMAX> year ago"
1633msgid_plural "%<PRIuMAX> years ago"
1634msgstr[0] "%<PRIuMAX> 年前"
1635msgstr[1] "%<PRIuMAX> 年前"
1636
1637#: diffcore-order.c:24
1638#, c-format
1639msgid "failed to read orderfile '%s'"
1640msgstr "无法读取排序文件 '%s'"
1641
1642#: diffcore-rename.c:536
1643msgid "Performing inexact rename detection"
1644msgstr "正在进行非精确的重命名探测"
1645
1646#: diff.c:63
1647#, c-format
1648msgid "option '%s' requires a value"
1649msgstr "选项 '%s'  需要一个值"
1650
1651#  译者:注意保持前导空格
1652#: diff.c:125
1653#, c-format
1654msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
1655msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
1656
1657#  译者:注意保持前导空格
1658#: diff.c:130
1659#, c-format
1660msgid "  Unknown dirstat parameter '%s'\n"
1661msgstr "  未知的 dirstat 参数 '%s'\n"
1662
1663#: diff.c:282
1664#, c-format
1665msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1666msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1667
1668#: diff.c:342
1669#, c-format
1670msgid ""
1671"Found errors in 'diff.dirstat' config variable:\n"
1672"%s"
1673msgstr ""
1674"发现配置变量 'diff.dirstat' 中的错误:\n"
1675"%s"
1676
1677#: diff.c:3101
1678#, c-format
1679msgid "external diff died, stopping at %s"
1680msgstr "外部 diff 退出,停止在 %s"
1681
1682#: diff.c:3427
1683msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1684msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1685
1686#: diff.c:3517
1687msgid "--follow requires exactly one pathspec"
1688msgstr "--follow 明确要求只跟一个路径规格"
1689
1690#: diff.c:3680
1691#, c-format
1692msgid ""
1693"Failed to parse --dirstat/-X option parameter:\n"
1694"%s"
1695msgstr ""
1696"无法解析 --dirstat/-X 选项的参数:\n"
1697"%s"
1698
1699#: diff.c:3694
1700#, c-format
1701msgid "Failed to parse --submodule option parameter: '%s'"
1702msgstr "无法解析 --submodule 选项的参数:'%s'"
1703
1704#: diff.c:4716
1705msgid "inexact rename detection was skipped due to too many files."
1706msgstr "因为文件太多,略过不严格的重命名检查。"
1707
1708#: diff.c:4719
1709msgid "only found copies from modified paths due to too many files."
1710msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1711
1712#: diff.c:4722
1713#, c-format
1714msgid ""
1715"you may want to set your %s variable to at least %d and retry the command."
1716msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
1717
1718#: dir.c:1948
1719msgid "failed to get kernel name and information"
1720msgstr "无法获得内核名称和信息"
1721
1722#: dir.c:2067
1723msgid "Untracked cache is disabled on this system or location."
1724msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
1725
1726#: dir.c:2846 dir.c:2851
1727#, c-format
1728msgid "could not create directories for %s"
1729msgstr "不能为 %s 创建目录"
1730
1731#: dir.c:2876
1732#, c-format
1733msgid "could not migrate git directory from '%s' to '%s'"
1734msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1735
1736#: entry.c:281
1737#, c-format
1738msgid "could not stat file '%s'"
1739msgstr "不能对文件 '%s' 调用 stat"
1740
1741#: fetch-pack.c:251
1742msgid "git fetch-pack: expected shallow list"
1743msgstr "git fetch-pack:应为 shallow 列表"
1744
1745#: fetch-pack.c:263
1746msgid "git fetch-pack: expected ACK/NAK, got EOF"
1747msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1748
1749#: fetch-pack.c:282 builtin/archive.c:63
1750#, c-format
1751msgid "remote error: %s"
1752msgstr "远程错误:%s"
1753
1754#: fetch-pack.c:283
1755#, c-format
1756msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1757msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1758
1759#: fetch-pack.c:335
1760msgid "--stateless-rpc requires multi_ack_detailed"
1761msgstr "--stateless-rpc 需要 multi_ack_detailed"
1762
1763#: fetch-pack.c:421
1764#, c-format
1765msgid "invalid shallow line: %s"
1766msgstr "无效的 shallow 信息:%s"
1767
1768#: fetch-pack.c:427
1769#, c-format
1770msgid "invalid unshallow line: %s"
1771msgstr "无效的 unshallow 信息:%s"
1772
1773#: fetch-pack.c:429
1774#, c-format
1775msgid "object not found: %s"
1776msgstr "对象未找到:%s"
1777
1778#: fetch-pack.c:432
1779#, c-format
1780msgid "error in object: %s"
1781msgstr "对象中出错:%s"
1782
1783#: fetch-pack.c:434
1784#, c-format
1785msgid "no shallow found: %s"
1786msgstr "未发现 shallow:%s"
1787
1788#: fetch-pack.c:437
1789#, c-format
1790msgid "expected shallow/unshallow, got %s"
1791msgstr "应为 shallow/unshallow,却得到 %s"
1792
1793#: fetch-pack.c:476
1794#, c-format
1795msgid "got %s %d %s"
1796msgstr "得到 %s %d %s"
1797
1798#: fetch-pack.c:490
1799#, c-format
1800msgid "invalid commit %s"
1801msgstr "无效提交 %s"
1802
1803#: fetch-pack.c:523
1804msgid "giving up"
1805msgstr "放弃"
1806
1807#: fetch-pack.c:533 progress.c:237
1808msgid "done"
1809msgstr "完成"
1810
1811#: fetch-pack.c:545
1812#, c-format
1813msgid "got %s (%d) %s"
1814msgstr "得到 %s (%d) %s"
1815
1816#: fetch-pack.c:591
1817#, c-format
1818msgid "Marking %s as complete"
1819msgstr "标记 %s 为完成"
1820
1821#: fetch-pack.c:775
1822#, c-format
1823msgid "already have %s (%s)"
1824msgstr "已经有 %s(%s)"
1825
1826#: fetch-pack.c:813
1827msgid "fetch-pack: unable to fork off sideband demultiplexer"
1828msgstr "fetch-pack:无法派生 sideband 多路输出"
1829
1830#: fetch-pack.c:821
1831msgid "protocol error: bad pack header"
1832msgstr "协议错误:坏的包头"
1833
1834#: fetch-pack.c:877
1835#, c-format
1836msgid "fetch-pack: unable to fork off %s"
1837msgstr "fetch-pack:无法派生进程 %s"
1838
1839#: fetch-pack.c:893
1840#, c-format
1841msgid "%s failed"
1842msgstr "%s 失败"
1843
1844#: fetch-pack.c:895
1845msgid "error in sideband demultiplexer"
1846msgstr "sideband 多路输出出错"
1847
1848#: fetch-pack.c:922
1849msgid "Server does not support shallow clients"
1850msgstr "服务器不支持 shalllow 客户端"
1851
1852#: fetch-pack.c:926
1853msgid "Server supports multi_ack_detailed"
1854msgstr "服务器支持 multi_ack_detailed"
1855
1856#: fetch-pack.c:929
1857msgid "Server supports no-done"
1858msgstr "服务器支持 no-done"
1859
1860#: fetch-pack.c:935
1861msgid "Server supports multi_ack"
1862msgstr "服务器支持 multi_ack"
1863
1864#: fetch-pack.c:939
1865msgid "Server supports side-band-64k"
1866msgstr "服务器支持 side-band-64k"
1867
1868#: fetch-pack.c:943
1869msgid "Server supports side-band"
1870msgstr "服务器支持 side-band"
1871
1872#: fetch-pack.c:947
1873msgid "Server supports allow-tip-sha1-in-want"
1874msgstr "服务器支持 allow-tip-sha1-in-want"
1875
1876#: fetch-pack.c:951
1877msgid "Server supports allow-reachable-sha1-in-want"
1878msgstr "服务器支持 allow-reachable-sha1-in-want"
1879
1880#: fetch-pack.c:961
1881msgid "Server supports ofs-delta"
1882msgstr "服务器支持 ofs-delta"
1883
1884#: fetch-pack.c:968
1885#, c-format
1886msgid "Server version is %.*s"
1887msgstr "服务器版本 %.*s"
1888
1889#: fetch-pack.c:974
1890msgid "Server does not support --shallow-since"
1891msgstr "服务器不支持 --shallow-since"
1892
1893#: fetch-pack.c:978
1894msgid "Server does not support --shallow-exclude"
1895msgstr "服务器不支持 --shallow-exclude"
1896
1897#: fetch-pack.c:980
1898msgid "Server does not support --deepen"
1899msgstr "服务器不支持 --deepen"
1900
1901#: fetch-pack.c:991
1902msgid "no common commits"
1903msgstr "没有共同的提交"
1904
1905#: fetch-pack.c:1003
1906msgid "git fetch-pack: fetch failed."
1907msgstr "git fetch-pack:获取失败。"
1908
1909#: fetch-pack.c:1165
1910msgid "no matching remote head"
1911msgstr "没有匹配的远程分支"
1912
1913#: fetch-pack.c:1187
1914#, c-format
1915msgid "no such remote ref %s"
1916msgstr "没有这样的远程引用 %s"
1917
1918#: fetch-pack.c:1190
1919#, c-format
1920msgid "Server does not allow request for unadvertised object %s"
1921msgstr "服务器不允许请求未公开的对象 %s"
1922
1923#: gpg-interface.c:181
1924msgid "gpg failed to sign the data"
1925msgstr "gpg 无法为数据签名"
1926
1927#: gpg-interface.c:211
1928msgid "could not create temporary file"
1929msgstr "不能创建临时文件"
1930
1931#: gpg-interface.c:213
1932#, c-format
1933msgid "failed writing detached signature to '%s'"
1934msgstr "无法将分离式签名写入 '%s'"
1935
1936#: graph.c:97
1937#, c-format
1938msgid "ignore invalid color '%.*s' in log.graphColors"
1939msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
1940
1941#: grep.c:1981
1942#, c-format
1943msgid "'%s': unable to read %s"
1944msgstr "'%s':无法读取 %s"
1945
1946#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
1947#, c-format
1948msgid "failed to stat '%s'"
1949msgstr "对 '%s' 调用 stat 失败"
1950
1951#: grep.c:2009
1952#, c-format
1953msgid "'%s': short read"
1954msgstr "'%s':读取不完整"
1955
1956#: help.c:179
1957#, c-format
1958msgid "available git commands in '%s'"
1959msgstr "在 '%s' 下可用的 git 命令"
1960
1961#: help.c:186
1962msgid "git commands available from elsewhere on your $PATH"
1963msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1964
1965#: help.c:217
1966msgid "These are common Git commands used in various situations:"
1967msgstr "这些是各种场合常见的 Git 命令:"
1968
1969#: help.c:281
1970#, c-format
1971msgid ""
1972"'%s' appears to be a git command, but we were not\n"
1973"able to execute it. Maybe git-%s is broken?"
1974msgstr ""
1975"'%s' 像是一个 git 命令,但却无法运行。\n"
1976"可能是 git-%s 受损?"
1977
1978#: help.c:336
1979msgid "Uh oh. Your system reports no Git commands at all."
1980msgstr "唉呀,您的系统中未发现 Git 命令。"
1981
1982#: help.c:358
1983#, c-format
1984msgid "WARNING: You called a Git command named '%s', which does not exist."
1985msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
1986
1987#: help.c:363
1988#, c-format
1989msgid "Continuing under the assumption that you meant '%s'."
1990msgstr "假定你想要的是 '%s' 并继续。"
1991
1992#: help.c:368
1993#, c-format
1994msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
1995msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
1996
1997#: help.c:376
1998#, c-format
1999msgid "git: '%s' is not a git command. See 'git --help'."
2000msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
2001
2002#: help.c:380
2003msgid ""
2004"\n"
2005"The most similar command is"
2006msgid_plural ""
2007"\n"
2008"The most similar commands are"
2009msgstr[0] "\n最相似的命令是"
2010msgstr[1] "\n最相似的命令是"
2011
2012#: help.c:395
2013msgid "git version [<options>]"
2014msgstr "git version [<选项>]"
2015
2016#: help.c:456
2017#, c-format
2018msgid "%s: %s - %s"
2019msgstr "%s:%s - %s"
2020
2021#: help.c:460
2022msgid ""
2023"\n"
2024"Did you mean this?"
2025msgid_plural ""
2026"\n"
2027"Did you mean one of these?"
2028msgstr[0] ""
2029"\n"
2030"您指的是这个么?"
2031msgstr[1] ""
2032"\n"
2033"您指的是这其中的某一个么?"
2034
2035#: ident.c:342
2036msgid ""
2037"\n"
2038"*** Please tell me who you are.\n"
2039"\n"
2040"Run\n"
2041"\n"
2042"  git config --global user.email \"you@example.com\"\n"
2043"  git config --global user.name \"Your Name\"\n"
2044"\n"
2045"to set your account's default identity.\n"
2046"Omit --global to set the identity only in this repository.\n"
2047"\n"
2048msgstr ""
2049"\n"
2050"*** 请告诉我你是谁。\n"
2051"\n"
2052"运行\n"
2053"\n"
2054"  git config --global user.email \"you@example.com\"\n"
2055"  git config --global user.name \"Your Name\"\n"
2056"\n"
2057"来设置您账号的缺省身份标识。\n"
2058"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
2059
2060#: ident.c:366
2061msgid "no email was given and auto-detection is disabled"
2062msgstr "未提供邮件地址且自动探测被禁用"
2063
2064#: ident.c:371
2065#, c-format
2066msgid "unable to auto-detect email address (got '%s')"
2067msgstr "无法自动探测邮件地址(得到 '%s')"
2068
2069#: ident.c:381
2070msgid "no name was given and auto-detection is disabled"
2071msgstr "未提供姓名且自动探测被禁用"
2072
2073#: ident.c:387
2074#, c-format
2075msgid "unable to auto-detect name (got '%s')"
2076msgstr "无法自动探测姓名(得到 '%s')"
2077
2078#: ident.c:395
2079#, c-format
2080msgid "empty ident name (for <%s>) not allowed"
2081msgstr "不允许空的姓名(对于 <%s>)"
2082
2083#: ident.c:401
2084#, c-format
2085msgid "name consists only of disallowed characters: %s"
2086msgstr "姓名中仅包含禁用字符:%s"
2087
2088#: ident.c:416 builtin/commit.c:612
2089#, c-format
2090msgid "invalid date format: %s"
2091msgstr "无效的日期格式:%s"
2092
2093#: lockfile.c:152
2094#, c-format
2095msgid ""
2096"Unable to create '%s.lock': %s.\n"
2097"\n"
2098"Another git process seems to be running in this repository, e.g.\n"
2099"an editor opened by 'git commit'. Please make sure all processes\n"
2100"are terminated then try again. If it still fails, a git process\n"
2101"may have crashed in this repository earlier:\n"
2102"remove the file manually to continue."
2103msgstr ""
2104"无法创建 '%s.lock':%s。\n"
2105"\n"
2106"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2107"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2108"可能之前有一个 git 进程在这个仓库中异常退出:\n"
2109"手动删除这个文件再继续。"
2110
2111#: lockfile.c:160
2112#, c-format
2113msgid "Unable to create '%s.lock': %s"
2114msgstr "不能创建 '%s.lock':%s"
2115
2116#: merge.c:41
2117msgid "failed to read the cache"
2118msgstr "无法读取缓存"
2119
2120#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
2121#: builtin/checkout.c:591 builtin/clone.c:753
2122msgid "unable to write new index file"
2123msgstr "无法写新的索引文件"
2124
2125#: merge-recursive.c:210
2126msgid "(bad commit)\n"
2127msgstr "(坏提交)\n"
2128
2129#: merge-recursive.c:232 merge-recursive.c:240
2130#, c-format
2131msgid "addinfo_cache failed for path '%s'"
2132msgstr "为路径 '%s' addinfo_cache 失败"
2133
2134#: merge-recursive.c:304
2135msgid "error building trees"
2136msgstr "无法创建树"
2137
2138#: merge-recursive.c:728
2139#, c-format
2140msgid "failed to create path '%s'%s"
2141msgstr "无法创建路径 '%s'%s"
2142
2143#: merge-recursive.c:739
2144#, c-format
2145msgid "Removing %s to make room for subdirectory\n"
2146msgstr "删除 %s 以便为子目录留出空间\n"
2147
2148#: merge-recursive.c:753 merge-recursive.c:772
2149msgid ": perhaps a D/F conflict?"
2150msgstr ":可能是一个目录/文件冲突?"
2151
2152#: merge-recursive.c:762
2153#, c-format
2154msgid "refusing to lose untracked file at '%s'"
2155msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2156
2157#: merge-recursive.c:804 builtin/cat-file.c:36
2158#, c-format
2159msgid "cannot read object %s '%s'"
2160msgstr "不能读取对象 %s '%s'"
2161
2162#: merge-recursive.c:806
2163#, c-format
2164msgid "blob expected for %s '%s'"
2165msgstr "%s '%s' 应为数据对象"
2166
2167#: merge-recursive.c:830
2168#, c-format
2169msgid "failed to open '%s': %s"
2170msgstr "无法打开 '%s':%s"
2171
2172#: merge-recursive.c:841
2173#, c-format
2174msgid "failed to symlink '%s': %s"
2175msgstr "无法创建符号链接 '%s':%s"
2176
2177#: merge-recursive.c:846
2178#, c-format
2179msgid "do not know what to do with %06o %s '%s'"
2180msgstr "不知道如何处理 %06o %s '%s'"
2181
2182#: merge-recursive.c:986
2183msgid "Failed to execute internal merge"
2184msgstr "无法执行内部合并"
2185
2186#: merge-recursive.c:990
2187#, c-format
2188msgid "Unable to add %s to database"
2189msgstr "不能添加 %s 至对象库"
2190
2191#: merge-recursive.c:1093
2192#, c-format
2193msgid ""
2194"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2195"in tree."
2196msgstr ""
2197"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2198"本被保留。"
2199
2200#: merge-recursive.c:1098
2201#, c-format
2202msgid ""
2203"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2204"left in tree."
2205msgstr ""
2206"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2207"%7$s 版本被保留。"
2208
2209#: merge-recursive.c:1105
2210#, c-format
2211msgid ""
2212"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2213"in tree at %s."
2214msgstr ""
2215"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2216"本保留在 %8$s 中。"
2217
2218#: merge-recursive.c:1110
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 at %s."
2223msgstr ""
2224"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2225"%7$s 版本保留在 %9$s 中。"
2226
2227#: merge-recursive.c:1144
2228msgid "rename"
2229msgstr "重命名"
2230
2231#: merge-recursive.c:1144
2232msgid "renamed"
2233msgstr "重命名"
2234
2235#: merge-recursive.c:1201
2236#, c-format
2237msgid "%s is a directory in %s adding as %s instead"
2238msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2239
2240#: merge-recursive.c:1226
2241#, c-format
2242msgid ""
2243"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2244"\"->\"%s\" in \"%s\"%s"
2245msgstr ""
2246"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2247"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2248
2249#: merge-recursive.c:1231
2250msgid " (left unresolved)"
2251msgstr "(留下未解决)"
2252
2253#: merge-recursive.c:1293
2254#, c-format
2255msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2256msgstr ""
2257"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2258"%5$s"
2259
2260#: merge-recursive.c:1326
2261#, c-format
2262msgid "Renaming %s to %s and %s to %s instead"
2263msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
2264
2265#: merge-recursive.c:1529
2266#, c-format
2267msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2268msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2269
2270#: merge-recursive.c:1544
2271#, c-format
2272msgid "Adding merged %s"
2273msgstr "添加合并后的 %s"
2274
2275#: merge-recursive.c:1551 merge-recursive.c:1781
2276#, c-format
2277msgid "Adding as %s instead"
2278msgstr "而是以 %s 为名添加"
2279
2280#: merge-recursive.c:1608
2281#, c-format
2282msgid "cannot read object %s"
2283msgstr "不能读取对象 %s"
2284
2285#: merge-recursive.c:1611
2286#, c-format
2287msgid "object %s is not a blob"
2288msgstr "对象 %s 不是一个数据对象"
2289
2290#: merge-recursive.c:1680
2291msgid "modify"
2292msgstr "修改"
2293
2294#: merge-recursive.c:1680
2295msgid "modified"
2296msgstr "修改"
2297
2298#: merge-recursive.c:1690
2299msgid "content"
2300msgstr "内容"
2301
2302#: merge-recursive.c:1697
2303msgid "add/add"
2304msgstr "添加/添加"
2305
2306#: merge-recursive.c:1733
2307#, c-format
2308msgid "Skipped %s (merged same as existing)"
2309msgstr "略过 %s(已经做过相同合并)"
2310
2311#: merge-recursive.c:1747
2312#, c-format
2313msgid "Auto-merging %s"
2314msgstr "自动合并 %s"
2315
2316#: merge-recursive.c:1751 git-submodule.sh:945
2317msgid "submodule"
2318msgstr "子模组"
2319
2320#: merge-recursive.c:1752
2321#, c-format
2322msgid "CONFLICT (%s): Merge conflict in %s"
2323msgstr "冲突(%s):合并冲突于 %s"
2324
2325#: merge-recursive.c:1846
2326#, c-format
2327msgid "Removing %s"
2328msgstr "删除 %s"
2329
2330#: merge-recursive.c:1872
2331msgid "file/directory"
2332msgstr "文件/目录"
2333
2334#: merge-recursive.c:1878
2335msgid "directory/file"
2336msgstr "目录/文件"
2337
2338#: merge-recursive.c:1884
2339#, c-format
2340msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2341msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2342
2343#: merge-recursive.c:1893
2344#, c-format
2345msgid "Adding %s"
2346msgstr "添加 %s"
2347
2348#: merge-recursive.c:1930
2349msgid "Already up-to-date!"
2350msgstr "已经是最新的!"
2351
2352#: merge-recursive.c:1939
2353#, c-format
2354msgid "merging of trees %s and %s failed"
2355msgstr "无法合并树 %s 和 %s"
2356
2357#: merge-recursive.c:2022
2358msgid "Merging:"
2359msgstr "合并:"
2360
2361#: merge-recursive.c:2035
2362#, c-format
2363msgid "found %u common ancestor:"
2364msgid_plural "found %u common ancestors:"
2365msgstr[0] "发现 %u 个共同祖先:"
2366msgstr[1] "发现 %u 个共同祖先:"
2367
2368#: merge-recursive.c:2074
2369msgid "merge returned no commit"
2370msgstr "合并未返回提交"
2371
2372#: merge-recursive.c:2137
2373#, c-format
2374msgid "Could not parse object '%s'"
2375msgstr "不能解析对象 '%s'"
2376
2377#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
2378msgid "Unable to write index."
2379msgstr "不能写入索引。"
2380
2381#: notes-merge.c:273
2382#, c-format
2383msgid ""
2384"You have not concluded your previous notes merge (%s exists).\n"
2385"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2386"commit/abort the previous merge before you start a new notes merge."
2387msgstr ""
2388"您的前一次注释合并尚未结束(存在 %s)。\n"
2389"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2390"notes merge --abort' 来提交/终止前一次合并。"
2391
2392#: notes-merge.c:280
2393#, c-format
2394msgid "You have not concluded your notes merge (%s exists)."
2395msgstr "您尚未结束注释合并(存在 %s)。"
2396
2397#: notes-utils.c:42
2398msgid "Cannot commit uninitialized/unreferenced notes tree"
2399msgstr "不能提交未初始化/未引用的注解树"
2400
2401#: notes-utils.c:101
2402#, c-format
2403msgid "Bad notes.rewriteMode value: '%s'"
2404msgstr "坏的 notes.rewriteMode 值:'%s'"
2405
2406#: notes-utils.c:111
2407#, c-format
2408msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2409msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2410
2411#. TRANSLATORS: The first %s is the name of
2412#. the environment variable, the second %s is
2413#. its value.
2414#.
2415#: notes-utils.c:141
2416#, c-format
2417msgid "Bad %s value: '%s'"
2418msgstr "坏的 %s 值:'%s'"
2419
2420#: object.c:240
2421#, c-format
2422msgid "unable to parse object: %s"
2423msgstr "不能解析对象:%s"
2424
2425#: parse-options.c:573
2426msgid "..."
2427msgstr "..."
2428
2429#: parse-options.c:591
2430#, c-format
2431msgid "usage: %s"
2432msgstr "用法:%s"
2433
2434#. TRANSLATORS: the colon here should align with the
2435#. one in "usage: %s" translation.
2436#.
2437#: parse-options.c:597
2438#, c-format
2439msgid "   or: %s"
2440msgstr "  或:%s"
2441
2442#  译者:为保证在输出中对齐,注意调整句中空格!
2443#: parse-options.c:600
2444#, c-format
2445msgid "    %s"
2446msgstr "    %s"
2447
2448#: parse-options.c:634
2449msgid "-NUM"
2450msgstr "-数字"
2451
2452#: parse-options-cb.c:108
2453#, c-format
2454msgid "malformed object name '%s'"
2455msgstr "非法的对象名 '%s'"
2456
2457#: path.c:890
2458#, c-format
2459msgid "Could not make %s writable by group"
2460msgstr "不能设置 %s 为组可写"
2461
2462#: pathspec.c:129
2463msgid "Escape character '\\' not allowed as last character in attr value"
2464msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2465
2466#: pathspec.c:147
2467msgid "Only one 'attr:' specification is allowed."
2468msgstr "只允许一个 'attr:' 规格。"
2469
2470#: pathspec.c:150
2471msgid "attr spec must not be empty"
2472msgstr "属性规格不能为空"
2473
2474#: pathspec.c:193
2475#, c-format
2476msgid "invalid attribute name %s"
2477msgstr "无效的属性名 %s"
2478
2479#: pathspec.c:258
2480msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2481msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2482
2483#: pathspec.c:265
2484msgid ""
2485"global 'literal' pathspec setting is incompatible with all other global "
2486"pathspec settings"
2487msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
2488
2489#: pathspec.c:305
2490msgid "invalid parameter for pathspec magic 'prefix'"
2491msgstr "路径规格包含无效的神奇前缀"
2492
2493#: pathspec.c:326
2494#, c-format
2495msgid "Invalid pathspec magic '%.*s' in '%s'"
2496msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
2497
2498#: pathspec.c:331
2499#, c-format
2500msgid "Missing ')' at the end of pathspec magic in '%s'"
2501msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
2502
2503#: pathspec.c:369
2504#, c-format
2505msgid "Unimplemented pathspec magic '%c' in '%s'"
2506msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
2507
2508#: pathspec.c:428
2509#, c-format
2510msgid "%s: 'literal' and 'glob' are incompatible"
2511msgstr "%s:'literal' 和 'glob' 不兼容"
2512
2513#: pathspec.c:441
2514#, c-format
2515msgid "%s: '%s' is outside repository"
2516msgstr "%s:'%s' 在仓库之外"
2517
2518#: pathspec.c:515
2519#, c-format
2520msgid "'%s' (mnemonic: '%c')"
2521msgstr "'%s'(助记符:'%c')"
2522
2523#: pathspec.c:525
2524#, c-format
2525msgid "%s: pathspec magic not supported by this command: %s"
2526msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2527
2528#: pathspec.c:575
2529msgid ""
2530"empty strings as pathspecs will be made invalid in upcoming releases. please "
2531"use . instead if you meant to match all paths"
2532msgstr ""
2533"在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n"
2534"请代之以 ."
2535
2536#: pathspec.c:599
2537#, c-format
2538msgid "pathspec '%s' is beyond a symbolic link"
2539msgstr "路径规格 '%s' 位于符号链接中"
2540
2541#: pretty.c:963
2542msgid "unable to parse --pretty format"
2543msgstr "不能解析 --pretty 格式"
2544
2545#: read-cache.c:1443
2546#, c-format
2547msgid ""
2548"index.version set, but the value is invalid.\n"
2549"Using version %i"
2550msgstr ""
2551"设置了 index.version,但是取值无效。\n"
2552"使用版本 %i"
2553
2554#: read-cache.c:1453
2555#, c-format
2556msgid ""
2557"GIT_INDEX_VERSION set, but the value is invalid.\n"
2558"Using version %i"
2559msgstr ""
2560"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2561"使用版本 %i"
2562
2563#: read-cache.c:2308 builtin/merge.c:1019
2564#, c-format
2565msgid "could not close '%s'"
2566msgstr "不能关闭 '%s'"
2567
2568#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
2569#, c-format
2570msgid "could not stat '%s'"
2571msgstr "不能对 '%s' 调用 stat"
2572
2573#: read-cache.c:2396
2574#, c-format
2575msgid "unable to open git dir: %s"
2576msgstr "不能打开 git 目录:%s"
2577
2578#: read-cache.c:2408
2579#, c-format
2580msgid "unable to unlink: %s"
2581msgstr "无法删除:%s"
2582
2583#: refs.c:622
2584#, c-format
2585msgid "Could not open '%s' for writing"
2586msgstr "无法打开 '%s' 进行写入"
2587
2588#: refs.c:1769
2589msgid "ref updates forbidden inside quarantine environment"
2590msgstr "在隔离环境中禁止更新引用"
2591
2592#: refs/files-backend.c:1664
2593#, c-format
2594msgid "could not delete reference %s: %s"
2595msgstr "无法删除引用 %s:%s"
2596
2597#: refs/files-backend.c:1667
2598#, c-format
2599msgid "could not delete references: %s"
2600msgstr "无法删除引用:%s"
2601
2602#: refs/files-backend.c:1676
2603#, c-format
2604msgid "could not remove reference %s"
2605msgstr "无法删除引用 %s"
2606
2607#: ref-filter.c:35 wt-status.c:1811
2608msgid "gone"
2609msgstr "丢失"
2610
2611#: ref-filter.c:36
2612#, c-format
2613msgid "ahead %d"
2614msgstr "领先 %d"
2615
2616#: ref-filter.c:37
2617#, c-format
2618msgid "behind %d"
2619msgstr "落后 %d"
2620
2621#: ref-filter.c:38
2622#, c-format
2623msgid "ahead %d, behind %d"
2624msgstr "领先 %d,落后 %d"
2625
2626#: ref-filter.c:105
2627#, c-format
2628msgid "expected format: %%(color:<color>)"
2629msgstr "期望的格式:%%(color:<color>)"
2630
2631#: ref-filter.c:107
2632#, c-format
2633msgid "unrecognized color: %%(color:%s)"
2634msgstr "未能识别的颜色:%%(color:%s)"
2635
2636#: ref-filter.c:121
2637#, c-format
2638msgid "Integer value expected refname:lstrip=%s"
2639msgstr "期望整数值 refname:lstrip=%s"
2640
2641#: ref-filter.c:125
2642#, c-format
2643msgid "Integer value expected refname:rstrip=%s"
2644msgstr "期望整数值 refname:rstrip=%s"
2645
2646#: ref-filter.c:127
2647#, c-format
2648msgid "unrecognized %%(%s) argument: %s"
2649msgstr "未能识别的 %%(%s) 参数:%s"
2650
2651#: ref-filter.c:167
2652#, c-format
2653msgid "%%(body) does not take arguments"
2654msgstr "%%(body) 不带参数"
2655
2656#: ref-filter.c:174
2657#, c-format
2658msgid "%%(subject) does not take arguments"
2659msgstr "%%(subject) 不带参数"
2660
2661#: ref-filter.c:181
2662#, c-format
2663msgid "%%(trailers) does not take arguments"
2664msgstr "%%(trailers) 不带参数"
2665
2666#: ref-filter.c:200
2667#, c-format
2668msgid "positive value expected contents:lines=%s"
2669msgstr "期望一个正数 contents:lines=%s"
2670
2671#: ref-filter.c:202
2672#, c-format
2673msgid "unrecognized %%(contents) argument: %s"
2674msgstr "未能识别的 %%(contents) 参数:%s"
2675
2676#: ref-filter.c:215
2677#, c-format
2678msgid "positive value expected objectname:short=%s"
2679msgstr "期望一个正数 objectname:short=%s"
2680
2681#: ref-filter.c:219
2682#, c-format
2683msgid "unrecognized %%(objectname) argument: %s"
2684msgstr "未能识别的 %%(objectname) 参数:%s"
2685
2686#: ref-filter.c:246
2687#, c-format
2688msgid "expected format: %%(align:<width>,<position>)"
2689msgstr "期望的格式:%%(align:<width>,<position>)"
2690
2691#: ref-filter.c:258
2692#, c-format
2693msgid "unrecognized position:%s"
2694msgstr "未能识别的位置:%s"
2695
2696#: ref-filter.c:262
2697#, c-format
2698msgid "unrecognized width:%s"
2699msgstr "未能识别的宽度:%s"
2700
2701#: ref-filter.c:268
2702#, c-format
2703msgid "unrecognized %%(align) argument: %s"
2704msgstr "未能识别的 %%(align) 参数:%s"
2705
2706#: ref-filter.c:272
2707#, c-format
2708msgid "positive width expected with the %%(align) atom"
2709msgstr "元素 %%(align) 需要一个正数的宽度"
2710
2711#: ref-filter.c:287
2712#, c-format
2713msgid "unrecognized %%(if) argument: %s"
2714msgstr "未能识别的 %%(if) 参数:%s"
2715
2716#: ref-filter.c:378
2717#, c-format
2718msgid "malformed field name: %.*s"
2719msgstr "非法的字段名:%.*s"
2720
2721#: ref-filter.c:404
2722#, c-format
2723msgid "unknown field name: %.*s"
2724msgstr "未知的字段名:%.*s"
2725
2726#: ref-filter.c:508
2727#, c-format
2728msgid "format: %%(if) atom used without a %%(then) atom"
2729msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
2730
2731#: ref-filter.c:568
2732#, c-format
2733msgid "format: %%(then) atom used without an %%(if) atom"
2734msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
2735
2736#: ref-filter.c:570
2737#, c-format
2738msgid "format: %%(then) atom used more than once"
2739msgstr "格式:%%(then) 元素用了多次"
2740
2741#: ref-filter.c:572
2742#, c-format
2743msgid "format: %%(then) atom used after %%(else)"
2744msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
2745
2746#: ref-filter.c:598
2747#, c-format
2748msgid "format: %%(else) atom used without an %%(if) atom"
2749msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
2750
2751#: ref-filter.c:600
2752#, c-format
2753msgid "format: %%(else) atom used without a %%(then) atom"
2754msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
2755
2756#: ref-filter.c:602
2757#, c-format
2758msgid "format: %%(else) atom used more than once"
2759msgstr "格式:%%(else) 元素用了多次"
2760
2761#: ref-filter.c:615
2762#, c-format
2763msgid "format: %%(end) atom used without corresponding atom"
2764msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
2765
2766#: ref-filter.c:670
2767#, c-format
2768msgid "malformed format string %s"
2769msgstr "非法的格式化字符串 %s"
2770
2771#: ref-filter.c:1254
2772#, c-format
2773msgid "(no branch, rebasing %s)"
2774msgstr "(非分支,正变基 %s)"
2775
2776#: ref-filter.c:1257
2777#, c-format
2778msgid "(no branch, bisect started on %s)"
2779msgstr "(非分支,二分查找开始于 %s)"
2780
2781#. TRANSLATORS: make sure this matches "HEAD
2782#. detached at " in wt-status.c
2783#.
2784#: ref-filter.c:1265
2785#, c-format
2786msgid "(HEAD detached at %s)"
2787msgstr "(头指针分离于 %s)"
2788
2789#. TRANSLATORS: make sure this matches "HEAD
2790#. detached from " in wt-status.c
2791#.
2792#: ref-filter.c:1272
2793#, c-format
2794msgid "(HEAD detached from %s)"
2795msgstr "(头指针分离自 %s)"
2796
2797#: ref-filter.c:1276
2798msgid "(no branch)"
2799msgstr "(非分支)"
2800
2801#: ref-filter.c:1426 ref-filter.c:1457
2802#, c-format
2803msgid "missing object %s for %s"
2804msgstr "缺失 %2$s 的对象 %1$s"
2805
2806#: ref-filter.c:1429 ref-filter.c:1460
2807#, c-format
2808msgid "parse_object_buffer failed on %s for %s"
2809msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
2810
2811#: ref-filter.c:1760
2812#, c-format
2813msgid "malformed object at '%s'"
2814msgstr "非法的对象于 '%s'"
2815
2816#: ref-filter.c:1827
2817#, c-format
2818msgid "ignoring ref with broken name %s"
2819msgstr "忽略带有错误名称 %s 的引用"
2820
2821#: ref-filter.c:1832
2822#, c-format
2823msgid "ignoring broken ref %s"
2824msgstr "忽略损坏的引用 %s"
2825
2826#: ref-filter.c:2095
2827#, c-format
2828msgid "format: %%(end) atom missing"
2829msgstr "格式:缺少 %%(end) 元素"
2830
2831#: ref-filter.c:2176
2832#, c-format
2833msgid "malformed object name %s"
2834msgstr "非法的对象名 %s"
2835
2836#: remote.c:747
2837#, c-format
2838msgid "Cannot fetch both %s and %s to %s"
2839msgstr "不能同时获取 %s 和 %s 至 %s"
2840
2841#: remote.c:751
2842#, c-format
2843msgid "%s usually tracks %s, not %s"
2844msgstr "%s 通常跟踪 %s,而非 %s"
2845
2846#: remote.c:755
2847#, c-format
2848msgid "%s tracks both %s and %s"
2849msgstr "%s 同时跟踪 %s 和 %s"
2850
2851#: remote.c:763
2852msgid "Internal error"
2853msgstr "内部错误"
2854
2855#: remote.c:1680 remote.c:1782
2856msgid "HEAD does not point to a branch"
2857msgstr "HEAD 没有指向一个分支"
2858
2859#: remote.c:1689
2860#, c-format
2861msgid "no such branch: '%s'"
2862msgstr "没有此分支:'%s'"
2863
2864#: remote.c:1692
2865#, c-format
2866msgid "no upstream configured for branch '%s'"
2867msgstr "尚未给分支 '%s' 设置上游"
2868
2869#: remote.c:1698
2870#, c-format
2871msgid "upstream branch '%s' not stored as a remote-tracking branch"
2872msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
2873
2874#: remote.c:1713
2875#, c-format
2876msgid "push destination '%s' on remote '%s' has no local tracking branch"
2877msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
2878
2879#: remote.c:1725
2880#, c-format
2881msgid "branch '%s' has no remote for pushing"
2882msgstr "分支 '%s' 没有设置要推送的远程服务器"
2883
2884#: remote.c:1736
2885#, c-format
2886msgid "push refspecs for '%s' do not include '%s'"
2887msgstr "向 '%s' 推送引用规格未包含 '%s'"
2888
2889#: remote.c:1749
2890msgid "push has no destination (push.default is 'nothing')"
2891msgstr "推送无目标(push.default 是 'nothing')"
2892
2893#: remote.c:1771
2894msgid "cannot resolve 'simple' push to a single destination"
2895msgstr "无法解析 'simple' 推送至一个单独的目标"
2896
2897#: remote.c:2076
2898#, c-format
2899msgid "Your branch is based on '%s', but the upstream is gone.\n"
2900msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
2901
2902#: remote.c:2080
2903msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
2904msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
2905
2906#: remote.c:2083
2907#, c-format
2908msgid "Your branch is up-to-date with '%s'.\n"
2909msgstr "您的分支与上游分支 '%s' 一致。\n"
2910
2911#: remote.c:2087
2912#, c-format
2913msgid "Your branch is ahead of '%s' by %d commit.\n"
2914msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2915msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2916msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
2917
2918#: remote.c:2093
2919msgid "  (use \"git push\" to publish your local commits)\n"
2920msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
2921
2922#: remote.c:2096
2923#, c-format
2924msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2925msgid_plural ""
2926"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2927msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2928msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2929
2930#  译者:注意保持前导空格
2931#: remote.c:2104
2932msgid "  (use \"git pull\" to update your local branch)\n"
2933msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
2934
2935#: remote.c:2107
2936#, c-format
2937msgid ""
2938"Your branch and '%s' have diverged,\n"
2939"and have %d and %d different commit each, respectively.\n"
2940msgid_plural ""
2941"Your branch and '%s' have diverged,\n"
2942"and have %d and %d different commits each, respectively.\n"
2943msgstr[0] ""
2944"您的分支和 '%s' 出现了偏离,\n"
2945"并且分别有 %d 和 %d 处不同的提交。\n"
2946msgstr[1] ""
2947"您的分支和 '%s' 出现了偏离,\n"
2948"并且分别有 %d 和 %d 处不同的提交。\n"
2949
2950#  译者:注意保持前导空格
2951#: remote.c:2117
2952msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
2953msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
2954
2955#: revision.c:2187
2956msgid "your current branch appears to be broken"
2957msgstr "您的当前分支好像被损坏"
2958
2959#: revision.c:2190
2960#, c-format
2961msgid "your current branch '%s' does not have any commits yet"
2962msgstr "您的当前分支 '%s' 尚无任何提交"
2963
2964#: revision.c:2384
2965msgid "--first-parent is incompatible with --bisect"
2966msgstr "--first-parent 与 --bisect 不兼容"
2967
2968#: run-command.c:644
2969msgid "open /dev/null failed"
2970msgstr "不能打开 /dev/null"
2971
2972#: send-pack.c:151
2973#, c-format
2974msgid "unable to parse remote unpack status: %s"
2975msgstr "不能解析远程解包状态:%s"
2976
2977#: send-pack.c:153
2978#, c-format
2979msgid "remote unpack failed: %s"
2980msgstr "远程解包失败:%s"
2981
2982#: send-pack.c:316
2983msgid "failed to sign the push certificate"
2984msgstr "无法为推送证书签名"
2985
2986#: send-pack.c:429
2987msgid "the receiving end does not support --signed push"
2988msgstr "接收端不支持签名推送"
2989
2990#: send-pack.c:431
2991msgid ""
2992"not sending a push certificate since the receiving end does not support --"
2993"signed push"
2994msgstr "未发送推送证书,因为接收端不支持签名推送"
2995
2996#: send-pack.c:443
2997msgid "the receiving end does not support --atomic push"
2998msgstr "接收端不支持原子推送"
2999
3000#: send-pack.c:448
3001msgid "the receiving end does not support push options"
3002msgstr "接收端不支持推送选项"
3003
3004#: sequencer.c:216
3005msgid "revert"
3006msgstr "还原"
3007
3008#: sequencer.c:218
3009msgid "cherry-pick"
3010msgstr "拣选"
3011
3012#: sequencer.c:220
3013msgid "rebase -i"
3014msgstr "rebase -i"
3015
3016#: sequencer.c:222
3017#, c-format
3018msgid "Unknown action: %d"
3019msgstr "未知动作:%d"
3020
3021#: sequencer.c:279
3022msgid ""
3023"after resolving the conflicts, mark the corrected paths\n"
3024"with 'git add <paths>' or 'git rm <paths>'"
3025msgstr ""
3026"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3027"命令标记修正后的文件"
3028
3029#: sequencer.c:282
3030msgid ""
3031"after resolving the conflicts, mark the corrected paths\n"
3032"with 'git add <paths>' or 'git rm <paths>'\n"
3033"and commit the result with 'git commit'"
3034msgstr ""
3035"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3036"对修正后的文件做标记,然后用 'git commit' 提交"
3037
3038#: sequencer.c:295 sequencer.c:1685
3039#, c-format
3040msgid "could not lock '%s'"
3041msgstr "不能锁定 '%s'"
3042
3043#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
3044#, c-format
3045msgid "could not write to '%s'"
3046msgstr "不能写入 '%s'"
3047
3048#: sequencer.c:302
3049#, c-format
3050msgid "could not write eol to '%s'"
3051msgstr "不能将换行符写入 '%s'"
3052
3053#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
3054#, c-format
3055msgid "failed to finalize '%s'."
3056msgstr "无法完成 '%s'。"
3057
3058#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
3059#: builtin/commit.c:750 builtin/merge.c:1017
3060#, c-format
3061msgid "could not read '%s'"
3062msgstr "不能读取 '%s'"
3063
3064#: sequencer.c:356
3065#, c-format
3066msgid "your local changes would be overwritten by %s."
3067msgstr "您的本地修改将被%s覆盖。"
3068
3069#: sequencer.c:360
3070msgid "commit your changes or stash them to proceed."
3071msgstr "提交您的修改或贮藏后再继续。"
3072
3073#: sequencer.c:389
3074#, c-format
3075msgid "%s: fast-forward"
3076msgstr "%s:快进"
3077
3078#. TRANSLATORS: %s will be "revert", "cherry-pick" or
3079#. "rebase -i".
3080#.
3081#: sequencer.c:472
3082#, c-format
3083msgid "%s: Unable to write new index file"
3084msgstr "%s:无法写入新索引文件"
3085
3086#: sequencer.c:491
3087msgid "could not resolve HEAD commit\n"
3088msgstr "不能解析 HEAD 提交\n"
3089
3090#: sequencer.c:511
3091msgid "unable to update cache tree\n"
3092msgstr "不能更新缓存树\n"
3093
3094#: sequencer.c:595
3095#, c-format
3096msgid ""
3097"you have staged changes in your working tree\n"
3098"If these changes are meant to be squashed into the previous commit, run:\n"
3099"\n"
3100"  git commit --amend %s\n"
3101"\n"
3102"If they are meant to go into a new commit, run:\n"
3103"\n"
3104"  git commit %s\n"
3105"\n"
3106"In both cases, once you're done, continue with:\n"
3107"\n"
3108"  git rebase --continue\n"
3109msgstr ""
3110"您的工作区中存在已暂存的修改\n"
3111"如果这些修改需要被并入前一个提交,执行:\n"
3112"\n"
3113"  git commit --amend %s\n"
3114"\n"
3115"如果这些修改要形成一个新提交,执行:\n"
3116"\n"
3117"  git commit %s\n"
3118"\n"
3119"无论哪种情况,当您完成提交,继续执行:\n"
3120"\n"
3121"  git rebase --continue\n"
3122
3123#: sequencer.c:697
3124#, c-format
3125msgid "could not parse commit %s\n"
3126msgstr "不能解析提交 %s\n"
3127
3128#: sequencer.c:702
3129#, c-format
3130msgid "could not parse parent commit %s\n"
3131msgstr "不能解析父提交 %s\n"
3132
3133#: sequencer.c:824
3134#, c-format
3135msgid ""
3136"unexpected 1st line of squash message:\n"
3137"\n"
3138"\t%.*s"
3139msgstr ""
3140"意外的压缩提交首行提交信息:\n"
3141"\n"
3142"\t%.*s"
3143
3144#: sequencer.c:830
3145#, c-format
3146msgid ""
3147"invalid 1st line of squash message:\n"
3148"\n"
3149"\t%.*s"
3150msgstr ""
3151"压缩提交的首行提交信息无效:\n"
3152"\n"
3153"\t%.*s"
3154
3155#: sequencer.c:836 sequencer.c:861
3156#, c-format
3157msgid "This is a combination of %d commits."
3158msgstr "这是一个 %d 个提交的组合。"
3159
3160#: sequencer.c:845
3161msgid "need a HEAD to fixup"
3162msgstr "需要一个 HEAD 来修复"
3163
3164#: sequencer.c:847
3165msgid "could not read HEAD"
3166msgstr "不能读取 HEAD"
3167
3168#: sequencer.c:849
3169msgid "could not read HEAD's commit message"
3170msgstr "不能读取 HEAD 的提交说明"
3171
3172#: sequencer.c:855
3173#, c-format
3174msgid "cannot write '%s'"
3175msgstr "不能写 '%s'"
3176
3177#: sequencer.c:864 git-rebase--interactive.sh:445
3178msgid "This is the 1st commit message:"
3179msgstr "这是第一个提交说明:"
3180
3181#: sequencer.c:872
3182#, c-format
3183msgid "could not read commit message of %s"
3184msgstr "不能读取 %s 的提交说明"
3185
3186#: sequencer.c:879
3187#, c-format
3188msgid "This is the commit message #%d:"
3189msgstr "这是提交说明 #%d:"
3190
3191#: sequencer.c:884
3192#, c-format
3193msgid "The commit message #%d will be skipped:"
3194msgstr "提交说明 #%d 将被跳过:"
3195
3196#: sequencer.c:889
3197#, c-format
3198msgid "unknown command: %d"
3199msgstr "未知命令:%d"
3200
3201#: sequencer.c:955
3202msgid "your index file is unmerged."
3203msgstr "您的索引文件未完成合并。"
3204
3205#: sequencer.c:973
3206#, c-format
3207msgid "commit %s is a merge but no -m option was given."
3208msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
3209
3210#: sequencer.c:981
3211#, c-format
3212msgid "commit %s does not have parent %d"
3213msgstr "提交 %s 没有第 %d 个父提交"
3214
3215#: sequencer.c:985
3216#, c-format
3217msgid "mainline was specified but commit %s is not a merge."
3218msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3219
3220#: sequencer.c:991
3221#, c-format
3222msgid "cannot get commit message for %s"
3223msgstr "不能得到 %s 的提交说明"
3224
3225#. TRANSLATORS: The first %s will be a "todo" command like
3226#. "revert" or "pick", the second %s a SHA1.
3227#: sequencer.c:1012
3228#, c-format
3229msgid "%s: cannot parse parent commit %s"
3230msgstr "%s:不能解析父提交 %s"
3231
3232#: sequencer.c:1075 sequencer.c:1830
3233#, c-format
3234msgid "could not rename '%s' to '%s'"
3235msgstr "不能将 '%s' 重命名为 '%s'"
3236
3237#: sequencer.c:1126
3238#, c-format
3239msgid "could not revert %s... %s"
3240msgstr "不能还原 %s... %s"
3241
3242#: sequencer.c:1127
3243#, c-format
3244msgid "could not apply %s... %s"
3245msgstr "不能应用 %s... %s"
3246
3247#: sequencer.c:1169
3248msgid "empty commit set passed"
3249msgstr "提供了空的提交集"
3250
3251#: sequencer.c:1179
3252#, c-format
3253msgid "git %s: failed to read the index"
3254msgstr "git %s:无法读取索引"
3255
3256#: sequencer.c:1186
3257#, c-format
3258msgid "git %s: failed to refresh the index"
3259msgstr "git %s:无法刷新索引"
3260
3261#: sequencer.c:1306
3262#, c-format
3263msgid "invalid line %d: %.*s"
3264msgstr "无效行 %d:%.*s"
3265
3266#: sequencer.c:1314
3267#, c-format
3268msgid "cannot '%s' without a previous commit"
3269msgstr "没有父提交的情况下不能 '%s'"
3270
3271#: sequencer.c:1347
3272#, c-format
3273msgid "could not read '%s'."
3274msgstr "不能读取 '%s'。"
3275
3276#: sequencer.c:1359
3277msgid "please fix this using 'git rebase --edit-todo'."
3278msgstr "请用 'git rebase --edit-todo' 来修改。"
3279
3280#: sequencer.c:1361
3281#, c-format
3282msgid "unusable instruction sheet: '%s'"
3283msgstr "不可用的指令清单:'%s'"
3284
3285#: sequencer.c:1366
3286msgid "no commits parsed."
3287msgstr "没有解析提交。"
3288
3289#: sequencer.c:1377
3290msgid "cannot cherry-pick during a revert."
3291msgstr "不能在回退中执行拣选。"
3292
3293#: sequencer.c:1379
3294msgid "cannot revert during a cherry-pick."
3295msgstr "不能在拣选中执行回退。"
3296
3297#: sequencer.c:1442
3298#, c-format
3299msgid "invalid key: %s"
3300msgstr "无效键名:%s"
3301
3302#: sequencer.c:1445
3303#, c-format
3304msgid "invalid value for %s: %s"
3305msgstr "%s 的值无效:%s"
3306
3307#: sequencer.c:1502
3308#, c-format
3309msgid "malformed options sheet: '%s'"
3310msgstr "非法的选项清单:'%s'"
3311
3312#: sequencer.c:1540
3313msgid "a cherry-pick or revert is already in progress"
3314msgstr "一个拣选或还原操作已在进行"
3315
3316#: sequencer.c:1541
3317msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3318msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3319
3320#: sequencer.c:1544
3321#, c-format
3322msgid "could not create sequencer directory '%s'"
3323msgstr "不能创建序列目录 '%s'"
3324
3325#: sequencer.c:1558
3326msgid "could not lock HEAD"
3327msgstr "不能锁定 HEAD"
3328
3329#: sequencer.c:1614 sequencer.c:2188
3330msgid "no cherry-pick or revert in progress"
3331msgstr "拣选或还原操作并未进行"
3332
3333#: sequencer.c:1616
3334msgid "cannot resolve HEAD"
3335msgstr "不能解析 HEAD"
3336
3337#: sequencer.c:1618 sequencer.c:1652
3338msgid "cannot abort from a branch yet to be born"
3339msgstr "不能从尚未建立的分支终止"
3340
3341#: sequencer.c:1638 builtin/grep.c:929
3342#, c-format
3343msgid "cannot open '%s'"
3344msgstr "不能打开 '%s'"
3345
3346#: sequencer.c:1640
3347#, c-format
3348msgid "cannot read '%s': %s"
3349msgstr "不能读取 '%s':%s"
3350
3351#: sequencer.c:1641
3352msgid "unexpected end of file"
3353msgstr "意外的文件结束"
3354
3355#: sequencer.c:1647
3356#, c-format
3357msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3358msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3359
3360#: sequencer.c:1658
3361msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3362msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3363
3364#: sequencer.c:1795 sequencer.c:2086
3365msgid "cannot read HEAD"
3366msgstr "不能读取 HEAD"
3367
3368#: sequencer.c:1835 builtin/difftool.c:633
3369#, c-format
3370msgid "could not copy '%s' to '%s'"
3371msgstr "不能拷贝 '%s' 至 '%s'"
3372
3373#: sequencer.c:1851
3374msgid "could not read index"
3375msgstr "不能读取索引"
3376
3377#  译者:注意保持前导空格
3378#: sequencer.c:1856
3379#, c-format
3380msgid ""
3381"execution failed: %s\n"
3382"%sYou can fix the problem, and then run\n"
3383"\n"
3384"  git rebase --continue\n"
3385"\n"
3386msgstr ""
3387"执行失败:%s\n"
3388"%s您可以改正该问题,然后运行\n"
3389"\n"
3390"  git rebase --continue\n"
3391"\n"
3392
3393#: sequencer.c:1862
3394msgid "and made changes to the index and/or the working tree\n"
3395msgstr "并且修改索引和/或工作区\n"
3396
3397#: sequencer.c:1868
3398#, c-format
3399msgid ""
3400"execution succeeded: %s\n"
3401"but left changes to the index and/or the working tree\n"
3402"Commit or stash your changes, and then run\n"
3403"\n"
3404"  git rebase --continue\n"
3405"\n"
3406msgstr ""
3407"执行成功:%s\n"
3408"但是在索引和/或工作区中存在变更\n"
3409"提交或贮藏修改,然后运行\n"
3410"\n"
3411"  git rebase --continue\n"
3412"\n"
3413
3414#: sequencer.c:1925
3415#, c-format
3416msgid "Applied autostash.\n"
3417msgstr "已应用 autostash。\n"
3418
3419#: sequencer.c:1937
3420#, c-format
3421msgid "cannot store %s"
3422msgstr "不能存储 %s"
3423
3424#: sequencer.c:1940 git-rebase.sh:173
3425#, c-format
3426msgid ""
3427"Applying autostash resulted in conflicts.\n"
3428"Your changes are safe in the stash.\n"
3429"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3430msgstr ""
3431"应用 autostash 导致冲突。\n"
3432"您的修改安全地保存在贮藏区中。\n"
3433"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3434
3435#: sequencer.c:2022
3436#, c-format
3437msgid "Stopped at %s...  %.*s\n"
3438msgstr "停止在 %s... %.*s\n"
3439
3440#: sequencer.c:2064
3441#, c-format
3442msgid "unknown command %d"
3443msgstr "未知命令 %d"
3444
3445#: sequencer.c:2094
3446msgid "could not read orig-head"
3447msgstr "不能读取 orig-head"
3448
3449#: sequencer.c:2099
3450msgid "could not read 'onto'"
3451msgstr "不能读取 'onto'"
3452
3453#: sequencer.c:2106
3454#, c-format
3455msgid "could not update %s"
3456msgstr "不能更新 %s"
3457
3458#: sequencer.c:2113
3459#, c-format
3460msgid "could not update HEAD to %s"
3461msgstr "不能更新 HEAD 为 %s"
3462
3463#: sequencer.c:2197
3464msgid "cannot rebase: You have unstaged changes."
3465msgstr "不能变基:您有未暂存的变更。"
3466
3467#: sequencer.c:2202
3468msgid "could not remove CHERRY_PICK_HEAD"
3469msgstr "不能删除 CHERRY_PICK_HEAD"
3470
3471#: sequencer.c:2211
3472msgid "cannot amend non-existing commit"
3473msgstr "不能修补不存在的提交"
3474
3475#: sequencer.c:2213
3476#, c-format
3477msgid "invalid file: '%s'"
3478msgstr "无效文件:'%s'"
3479
3480#: sequencer.c:2215
3481#, c-format
3482msgid "invalid contents: '%s'"
3483msgstr "无效内容:'%s'"
3484
3485#: sequencer.c:2218
3486msgid ""
3487"\n"
3488"You have uncommitted changes in your working tree. Please, commit them\n"
3489"first and then run 'git rebase --continue' again."
3490msgstr ""
3491"\n"
3492"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
3493
3494#: sequencer.c:2228
3495msgid "could not commit staged changes."
3496msgstr "不能提交暂存的修改。"
3497
3498#: sequencer.c:2308
3499#, c-format
3500msgid "%s: can't cherry-pick a %s"
3501msgstr "%s:不能拣选一个%s"
3502
3503#: sequencer.c:2312
3504#, c-format
3505msgid "%s: bad revision"
3506msgstr "%s:错误的版本"
3507
3508#: sequencer.c:2345
3509msgid "can't revert as initial commit"
3510msgstr "不能作为初始提交回退"
3511
3512#: setup.c:171
3513#, c-format
3514msgid ""
3515"%s: no such path in the working tree.\n"
3516"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
3517msgstr ""
3518"%s:工作区中无此路径。\n"
3519"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
3520
3521#: setup.c:184
3522#, c-format
3523msgid ""
3524"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
3525"Use '--' to separate paths from revisions, like this:\n"
3526"'git <command> [<revision>...] -- [<file>...]'"
3527msgstr ""
3528"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
3529"使用 '--' 来分隔版本和路径,例如:\n"
3530"'git <command> [<revision>...] -- [<file>...]'"
3531
3532#: setup.c:252
3533#, c-format
3534msgid ""
3535"ambiguous argument '%s': both revision and filename\n"
3536"Use '--' to separate paths from revisions, like this:\n"
3537"'git <command> [<revision>...] -- [<file>...]'"
3538msgstr ""
3539"有歧义的参数 '%s':可同时是版本和文件\n"
3540"使用 '--' 来分隔版本和路径,例如:\n"
3541"'git <command> [<revision>...] -- [<file>...]'"
3542
3543#: setup.c:504
3544#, c-format
3545msgid "Expected git repo version <= %d, found %d"
3546msgstr "期望 git 仓库版本 <= %d,却得到 %d"
3547
3548#: setup.c:512
3549msgid "unknown repository extensions found:"
3550msgstr "发现未知的仓库扩展:"
3551
3552#: setup.c:810
3553#, c-format
3554msgid "Not a git repository (or any of the parent directories): %s"
3555msgstr "不是一个 git 仓库(或者任何父目录):%s"
3556
3557#: setup.c:812 builtin/index-pack.c:1652
3558msgid "Cannot come back to cwd"
3559msgstr "无法返回当前工作目录"
3560
3561#: setup.c:1050
3562msgid "Unable to read current working directory"
3563msgstr "不能读取当前工作目录"
3564
3565#: setup.c:1062 setup.c:1068
3566#, c-format
3567msgid "Cannot change to '%s'"
3568msgstr "不能切换到 '%s'"
3569
3570#: setup.c:1081
3571#, c-format
3572msgid ""
3573"Not a git repository (or any parent up to mount point %s)\n"
3574"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3575msgstr ""
3576"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3577"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
3578
3579#: setup.c:1173
3580#, c-format
3581msgid ""
3582"Problem with core.sharedRepository filemode value (0%.3o).\n"
3583"The owner of files must always have read and write permissions."
3584msgstr ""
3585"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3586"文件属主必须始终拥有读写权限。"
3587
3588#: sha1_file.c:560
3589#, c-format
3590msgid "path '%s' does not exist"
3591msgstr "路径 '%s' 不存在"
3592
3593#: sha1_file.c:586
3594#, c-format
3595msgid "reference repository '%s' as a linked checkout is not supported yet."
3596msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3597
3598#: sha1_file.c:592
3599#, c-format
3600msgid "reference repository '%s' is not a local repository."
3601msgstr "参考仓库 '%s' 不是一个本地仓库。"
3602
3603#: sha1_file.c:598
3604#, c-format
3605msgid "reference repository '%s' is shallow"
3606msgstr "参考仓库 '%s' 是一个浅克隆"
3607
3608#: sha1_file.c:606
3609#, c-format
3610msgid "reference repository '%s' is grafted"
3611msgstr "参考仓库 '%s' 已被嫁接"
3612
3613#: sha1_file.c:1245
3614msgid "offset before end of packfile (broken .idx?)"
3615msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
3616
3617#: sha1_file.c:2729
3618#, c-format
3619msgid "offset before start of pack index for %s (corrupt index?)"
3620msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
3621
3622#: sha1_file.c:2733
3623#, c-format
3624msgid "offset beyond end of pack index for %s (truncated index?)"
3625msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
3626
3627#: sha1_name.c:419
3628#, c-format
3629msgid "short SHA1 %s is ambiguous"
3630msgstr "短 SHA1 %s 存在歧义"
3631
3632#: sha1_name.c:430
3633msgid "The candidates are:"
3634msgstr "候选者有:"
3635
3636#: sha1_name.c:589
3637msgid ""
3638"Git normally never creates a ref that ends with 40 hex characters\n"
3639"because it will be ignored when you just specify 40-hex. These refs\n"
3640"may be created by mistake. For example,\n"
3641"\n"
3642"  git checkout -b $br $(git rev-parse ...)\n"
3643"\n"
3644"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3645"examine these refs and maybe delete them. Turn this message off by\n"
3646"running \"git config advice.objectNameWarning false\""
3647msgstr ""
3648"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3649"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3650"\n"
3651"  git checkout -b $br $(git rev-parse ...)\n"
3652"\n"
3653"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3654"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3655"命令关闭本消息通知。"
3656
3657#: submodule.c:70 submodule.c:104
3658msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3659msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3660
3661#: submodule.c:74 submodule.c:108
3662#, c-format
3663msgid "Could not find section in .gitmodules where path=%s"
3664msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3665
3666#: submodule.c:82
3667#, c-format
3668msgid "Could not update .gitmodules entry %s"
3669msgstr "不能更新 .gitmodules 条目 %s"
3670
3671#: submodule.c:115
3672#, c-format
3673msgid "Could not remove .gitmodules entry for %s"
3674msgstr "无法移除 %s 的 .gitmodules 条目"
3675
3676#: submodule.c:126
3677msgid "staging updated .gitmodules failed"
3678msgstr "将更新后 .gitmodules 添加暂存区失败"
3679
3680#: submodule.c:165
3681msgid "negative values not allowed for submodule.fetchJobs"
3682msgstr "submodule.fetchJobs 不允许为负值"
3683
3684#: submodule.c:376
3685#, c-format
3686msgid "in unpopulated submodule '%s'"
3687msgstr "位于未检出的子模组 '%s'"
3688
3689#: submodule.c:407
3690#, c-format
3691msgid "Pathspec '%s' is in submodule '%.*s'"
3692msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
3693
3694#: submodule.c:1337
3695#, c-format
3696msgid "'%s' not recognized as a git repository"
3697msgstr "无法将 '%s' 识别为一个 git 仓库"
3698
3699#: submodule.c:1475
3700#, c-format
3701msgid "could not start 'git status' in submodule '%s'"
3702msgstr "无法在子模组 '%s' 中启动 'git status'"
3703
3704#: submodule.c:1488
3705#, c-format
3706msgid "could not run 'git status' in submodule '%s'"
3707msgstr "无法在子模组 '%s' 中执行 'git status'"
3708
3709#: submodule.c:1581
3710#, c-format
3711msgid "submodule '%s' has dirty index"
3712msgstr "子模组 '%s' 中有脏索引"
3713
3714#: submodule.c:1845
3715#, c-format
3716msgid ""
3717"relocate_gitdir for submodule '%s' with more than one worktree not supported"
3718msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3719
3720#: submodule.c:1857 submodule.c:1913
3721#, c-format
3722msgid "could not lookup name for submodule '%s'"
3723msgstr "不能查询子模组 '%s' 的名称"
3724
3725#: submodule.c:1861 builtin/submodule--helper.c:678
3726#: builtin/submodule--helper.c:688
3727#, c-format
3728msgid "could not create directory '%s'"
3729msgstr "不能创建目录 '%s'"
3730
3731#: submodule.c:1864
3732#, c-format
3733msgid ""
3734"Migrating git directory of '%s%s' from\n"
3735"'%s' to\n"
3736"'%s'\n"
3737msgstr ""
3738"将 '%s%s' 的 git 目录从\n"
3739"'%s' 迁移至\n"
3740"'%s'\n"
3741
3742#: submodule.c:1948
3743#, c-format
3744msgid "could not recurse into submodule '%s'"
3745msgstr "无法递归进子模组路径 '%s'"
3746
3747#: submodule.c:1992
3748msgid "could not start ls-files in .."
3749msgstr "无法在 .. 中启动 ls-files"
3750
3751#: submodule.c:2012
3752msgid "BUG: returned path string doesn't match cwd?"
3753msgstr "BUG:返回的路径和当前路径不匹配?"
3754
3755#: submodule.c:2031
3756#, c-format
3757msgid "ls-tree returned unexpected return code %d"
3758msgstr "ls-tree 返回未知返回值 %d"
3759
3760#: submodule-config.c:420
3761#, c-format
3762msgid "invalid value for %s"
3763msgstr "%s 的值无效"
3764
3765#: trailer.c:241
3766#, c-format
3767msgid "running trailer command '%s' failed"
3768msgstr "执行 trailer 命令 '%s' 失败"
3769
3770#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
3771#: trailer.c:544
3772#, c-format
3773msgid "unknown value '%s' for key '%s'"
3774msgstr "键 '%2$s' 的未知取值 '%1$s'"
3775
3776#: trailer.c:526 trailer.c:531 builtin/remote.c:290
3777#, c-format
3778msgid "more than one %s"
3779msgstr "多于一个 %s"
3780
3781#: trailer.c:703
3782#, c-format
3783msgid "empty trailer token in trailer '%.*s'"
3784msgstr "签名 '%.*s' 的键为空"
3785
3786#: trailer.c:723
3787#, c-format
3788msgid "could not read input file '%s'"
3789msgstr "不能读取输入文件 '%s'"
3790
3791#: trailer.c:726
3792msgid "could not read from stdin"
3793msgstr "不能自标准输入读取"
3794
3795#: trailer.c:950 builtin/am.c:45
3796#, c-format
3797msgid "could not stat %s"
3798msgstr "不能对 %s 调用 stat"
3799
3800#: trailer.c:952
3801#, c-format
3802msgid "file %s is not a regular file"
3803msgstr "文件 %s 不是一个正规文件"
3804
3805#: trailer.c:954
3806#, c-format
3807msgid "file %s is not writable by user"
3808msgstr "文件 %s 用户不可写"
3809
3810#: trailer.c:966
3811msgid "could not open temporary file"
3812msgstr "不能打开临时文件"
3813
3814#: trailer.c:1002
3815#, c-format
3816msgid "could not rename temporary file to %s"
3817msgstr "不能重命名临时文件为 %s"
3818
3819#: transport.c:63
3820#, c-format
3821msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3822msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3823
3824#: transport.c:152
3825#, c-format
3826msgid "transport: invalid depth option '%s'"
3827msgstr "传输:无效的深度选项 '%s'"
3828
3829#: transport.c:890
3830#, c-format
3831msgid ""
3832"The following submodule paths contain changes that can\n"
3833"not be found on any remote:\n"
3834msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3835
3836#: transport.c:894
3837#, c-format
3838msgid ""
3839"\n"
3840"Please try\n"
3841"\n"
3842"\tgit push --recurse-submodules=on-demand\n"
3843"\n"
3844"or cd to the path and use\n"
3845"\n"
3846"\tgit push\n"
3847"\n"
3848"to push them to a remote.\n"
3849"\n"
3850msgstr ""
3851"\n"
3852"请尝试\n"
3853"\n"
3854"\tgit push --recurse-submodules=on-demand\n"
3855"\n"
3856"或者进入到子目录执行\n"
3857"\n"
3858"\tgit push\n"
3859"\n"
3860"以推送至远程。\n"
3861"\n"
3862
3863#: transport.c:902
3864msgid "Aborting."
3865msgstr "正在终止。"
3866
3867#: transport-helper.c:1071
3868#, c-format
3869msgid "Could not read ref %s"
3870msgstr "不能读取引用 %s"
3871
3872#: tree-walk.c:31
3873msgid "too-short tree object"
3874msgstr "太短的树对象"
3875
3876#: tree-walk.c:37
3877msgid "malformed mode in tree entry"
3878msgstr "树对象中的条目模式错误"
3879
3880#: tree-walk.c:41
3881msgid "empty filename in tree entry"
3882msgstr "树对象条目中空的文件名"
3883
3884#: tree-walk.c:113
3885msgid "too-short tree file"
3886msgstr "太短的树文件"
3887
3888#: unpack-trees.c:105
3889#, c-format
3890msgid ""
3891"Your local changes to the following files would be overwritten by checkout:\n"
3892"%%sPlease commit your changes or stash them before you switch branches."
3893msgstr ""
3894"您对下列文件的本地修改将被检出操作覆盖:\n"
3895"%%s请在切换分支前提交或贮藏您的修改。"
3896
3897#: unpack-trees.c:107
3898#, c-format
3899msgid ""
3900"Your local changes to the following files would be overwritten by checkout:\n"
3901"%%s"
3902msgstr ""
3903"您对下列文件的本地修改将被检出操作覆盖:\n"
3904"%%s"
3905
3906#: unpack-trees.c:110
3907#, c-format
3908msgid ""
3909"Your local changes to the following files would be overwritten by merge:\n"
3910"%%sPlease commit your changes or stash them before you merge."
3911msgstr ""
3912"您对下列文件的本地修改将被合并操作覆盖:\n"
3913"%%s请在合并前提交或贮藏您的修改。"
3914
3915#: unpack-trees.c:112
3916#, c-format
3917msgid ""
3918"Your local changes to the following files would be overwritten by merge:\n"
3919"%%s"
3920msgstr ""
3921"您对下列文件的本地修改将被合并操作覆盖:\n"
3922"%%s"
3923
3924#: unpack-trees.c:115
3925#, c-format
3926msgid ""
3927"Your local changes to the following files would be overwritten by %s:\n"
3928"%%sPlease commit your changes or stash them before you %s."
3929msgstr ""
3930"您对下列文件的本地修改将被 %s 覆盖:\n"
3931"%%s请在 %s 之前提交或贮藏您的修改。"
3932
3933#: unpack-trees.c:117
3934#, c-format
3935msgid ""
3936"Your local changes to the following files would be overwritten by %s:\n"
3937"%%s"
3938msgstr ""
3939"您对下列文件的本地修改将被 %s 覆盖:\n"
3940"%%s"
3941
3942#: unpack-trees.c:122
3943#, c-format
3944msgid ""
3945"Updating the following directories would lose untracked files in them:\n"
3946"%s"
3947msgstr ""
3948"更新如下目录将会丢失其中未跟踪的文件:\n"
3949"%s"
3950
3951#: unpack-trees.c:126
3952#, c-format
3953msgid ""
3954"The following untracked working tree files would be removed by checkout:\n"
3955"%%sPlease move or remove them before you switch branches."
3956msgstr ""
3957"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3958"%%s请在切换分支之前移动或删除。"
3959
3960#: unpack-trees.c:128
3961#, c-format
3962msgid ""
3963"The following untracked working tree files would be removed by checkout:\n"
3964"%%s"
3965msgstr ""
3966"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3967"%%s"
3968
3969#: unpack-trees.c:131
3970#, c-format
3971msgid ""
3972"The following untracked working tree files would be removed by merge:\n"
3973"%%sPlease move or remove them before you merge."
3974msgstr ""
3975"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3976"%%s请在合并前移动或删除。"
3977
3978#: unpack-trees.c:133
3979#, c-format
3980msgid ""
3981"The following untracked working tree files would be removed by merge:\n"
3982"%%s"
3983msgstr ""
3984"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3985"%%s"
3986
3987#: unpack-trees.c:136
3988#, c-format
3989msgid ""
3990"The following untracked working tree files would be removed by %s:\n"
3991"%%sPlease move or remove them before you %s."
3992msgstr ""
3993"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3994"%%s请在 %s 前移动或删除。"
3995
3996#: unpack-trees.c:138
3997#, c-format
3998msgid ""
3999"The following untracked working tree files would be removed by %s:\n"
4000"%%s"
4001msgstr ""
4002"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4003"%%s"
4004
4005#: unpack-trees.c:143
4006#, c-format
4007msgid ""
4008"The following untracked working tree files would be overwritten by "
4009"checkout:\n"
4010"%%sPlease move or remove them before you switch branches."
4011msgstr ""
4012"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4013"%%s请在切换分支前移动或删除。"
4014
4015#: unpack-trees.c:145
4016#, c-format
4017msgid ""
4018"The following untracked working tree files would be overwritten by "
4019"checkout:\n"
4020"%%s"
4021msgstr ""
4022"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4023"%%s"
4024
4025#: unpack-trees.c:148
4026#, c-format
4027msgid ""
4028"The following untracked working tree files would be overwritten by merge:\n"
4029"%%sPlease move or remove them before you merge."
4030msgstr ""
4031"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4032"%%s请在合并前移动或删除。"
4033
4034#: unpack-trees.c:150
4035#, c-format
4036msgid ""
4037"The following untracked working tree files would be overwritten by merge:\n"
4038"%%s"
4039msgstr ""
4040"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4041"%%s"
4042
4043#: unpack-trees.c:153
4044#, c-format
4045msgid ""
4046"The following untracked working tree files would be overwritten by %s:\n"
4047"%%sPlease move or remove them before you %s."
4048msgstr ""
4049"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4050"%%s请在 %s 前移动或删除。"
4051
4052#: unpack-trees.c:155
4053#, c-format
4054msgid ""
4055"The following untracked working tree files would be overwritten by %s:\n"
4056"%%s"
4057msgstr ""
4058"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4059"%%s"
4060
4061#: unpack-trees.c:162
4062#, c-format
4063msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
4064msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
4065
4066#: unpack-trees.c:165
4067#, c-format
4068msgid ""
4069"Cannot update sparse checkout: the following entries are not up-to-date:\n"
4070"%s"
4071msgstr ""
4072"无法更新稀疏检出:如下条目不是最新:\n"
4073"%s"
4074
4075#: unpack-trees.c:167
4076#, c-format
4077msgid ""
4078"The following working tree files would be overwritten by sparse checkout "
4079"update:\n"
4080"%s"
4081msgstr ""
4082"工作区中下列文件将被稀疏检出更新所覆盖:\n"
4083"%s"
4084
4085#: unpack-trees.c:169
4086#, c-format
4087msgid ""
4088"The following working tree files would be removed by sparse checkout "
4089"update:\n"
4090"%s"
4091msgstr ""
4092"工作区中下列文件将被稀疏检出更新所删除:\n"
4093"%s"
4094
4095#: unpack-trees.c:171
4096#, c-format
4097msgid ""
4098"Cannot update submodule:\n"
4099"%s"
4100msgstr ""
4101"无法更新子模组:\n"
4102"%s"
4103
4104#: unpack-trees.c:248
4105#, c-format
4106msgid "Aborting\n"
4107msgstr "终止中\n"
4108
4109#: unpack-trees.c:277
4110#, c-format
4111msgid "submodule update strategy not supported for submodule '%s'"
4112msgstr "子模组 %s 不支持子模组更新策略"
4113
4114#: unpack-trees.c:346
4115msgid "Checking out files"
4116msgstr "正在检出文件"
4117
4118#: urlmatch.c:163
4119msgid "invalid URL scheme name or missing '://' suffix"
4120msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4121
4122#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
4123#, c-format
4124msgid "invalid %XX escape sequence"
4125msgstr "无效的 %XX 转义序列"
4126
4127#: urlmatch.c:215
4128msgid "missing host and scheme is not 'file:'"
4129msgstr "缺失主机名且 URL 方案不是 'file:'"
4130
4131#: urlmatch.c:232
4132msgid "a 'file:' URL may not have a port number"
4133msgstr "一个 'file:' URL 不应该包含端口号"
4134
4135#: urlmatch.c:247
4136msgid "invalid characters in host name"
4137msgstr "主机名中包含无效的字符"
4138
4139#: urlmatch.c:292 urlmatch.c:303
4140msgid "invalid port number"
4141msgstr "无效的端口号"
4142
4143#: urlmatch.c:371
4144msgid "invalid '..' path segment"
4145msgstr "无效的 '..' 路径片段"
4146
4147#: worktree.c:245
4148#, c-format
4149msgid "failed to read '%s'"
4150msgstr "无法读取 '%s'"
4151
4152#: wrapper.c:223 wrapper.c:393
4153#, c-format
4154msgid "could not open '%s' for reading and writing"
4155msgstr "无法打开 '%s' 进行读写"
4156
4157#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
4158#, c-format
4159msgid "could not open '%s' for writing"
4160msgstr "无法打开 '%s' 进行写入"
4161
4162#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
4163#: builtin/am.c:849 builtin/merge.c:1014
4164#, c-format
4165msgid "could not open '%s' for reading"
4166msgstr "无法打开 '%s' 进行读取"
4167
4168#: wrapper.c:424 wrapper.c:624
4169#, c-format
4170msgid "unable to access '%s'"
4171msgstr "不能访问 '%s'"
4172
4173#: wrapper.c:632
4174msgid "unable to get current working directory"
4175msgstr "不能获取当前工作目录"
4176
4177#: wrapper.c:656
4178#, c-format
4179msgid "could not write to %s"
4180msgstr "不能写入 %s"
4181
4182#: wrapper.c:658
4183#, c-format
4184msgid "could not close %s"
4185msgstr "不能关闭 %s"
4186
4187#: wt-status.c:152
4188msgid "Unmerged paths:"
4189msgstr "未合并的路径:"
4190
4191#  译者:注意保持前导空格
4192#: wt-status.c:179 wt-status.c:206
4193#, c-format
4194msgid "  (use \"git reset %s <file>...\" to unstage)"
4195msgstr "  (使用 \"git reset %s <文件>...\" 以取消暂存)"
4196
4197#  译者:注意保持前导空格
4198#: wt-status.c:181 wt-status.c:208
4199msgid "  (use \"git rm --cached <file>...\" to unstage)"
4200msgstr "  (使用 \"git rm --cached <文件>...\" 以取消暂存)"
4201
4202#  译者:注意保持前导空格
4203#: wt-status.c:185
4204msgid "  (use \"git add <file>...\" to mark resolution)"
4205msgstr "  (使用 \"git add <文件>...\" 标记解决方案)"
4206
4207#  译者:注意保持前导空格
4208#: wt-status.c:187 wt-status.c:191
4209msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4210msgstr "  (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
4211
4212#  译者:注意保持前导空格
4213#: wt-status.c:189
4214msgid "  (use \"git rm <file>...\" to mark resolution)"
4215msgstr "  (使用 \"git rm <文件>...\" 标记解决方案)"
4216
4217#: wt-status.c:200 wt-status.c:981
4218msgid "Changes to be committed:"
4219msgstr "要提交的变更:"
4220
4221#: wt-status.c:218 wt-status.c:990
4222msgid "Changes not staged for commit:"
4223msgstr "尚未暂存以备提交的变更:"
4224
4225#  译者:注意保持前导空格
4226#: wt-status.c:222
4227msgid "  (use \"git add <file>...\" to update what will be committed)"
4228msgstr "  (使用 \"git add <文件>...\" 更新要提交的内容)"
4229
4230#  译者:注意保持前导空格
4231#: wt-status.c:224
4232msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
4233msgstr "  (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
4234
4235#  译者:注意保持前导空格
4236#: wt-status.c:225
4237msgid ""
4238"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
4239msgstr "  (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
4240
4241#  译者:注意保持前导空格
4242#: wt-status.c:227
4243msgid "  (commit or discard the untracked or modified content in submodules)"
4244msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
4245
4246#  译者:注意保持前导空格
4247#: wt-status.c:239
4248#, c-format
4249msgid "  (use \"git %s <file>...\" to include in what will be committed)"
4250msgstr "  (使用 \"git %s <文件>...\" 以包含要提交的内容)"
4251
4252#: wt-status.c:254
4253msgid "both deleted:"
4254msgstr "双方删除:"
4255
4256#: wt-status.c:256
4257msgid "added by us:"
4258msgstr "由我们添加:"
4259
4260#: wt-status.c:258
4261msgid "deleted by them:"
4262msgstr "由他们删除:"
4263
4264#: wt-status.c:260
4265msgid "added by them:"
4266msgstr "由他们添加:"
4267
4268#: wt-status.c:262
4269msgid "deleted by us:"
4270msgstr "由我们删除:"
4271
4272#: wt-status.c:264
4273msgid "both added:"
4274msgstr "双方添加:"
4275
4276#: wt-status.c:266
4277msgid "both modified:"
4278msgstr "双方修改:"
4279
4280#: wt-status.c:276
4281msgid "new file:"
4282msgstr "新文件:"
4283
4284#: wt-status.c:278
4285msgid "copied:"
4286msgstr "拷贝:"
4287
4288#: wt-status.c:280
4289msgid "deleted:"
4290msgstr "删除:"
4291
4292#: wt-status.c:282
4293msgid "modified:"
4294msgstr "修改:"
4295
4296#: wt-status.c:284
4297msgid "renamed:"
4298msgstr "重命名:"
4299
4300#: wt-status.c:286
4301msgid "typechange:"
4302msgstr "类型变更:"
4303
4304#: wt-status.c:288
4305msgid "unknown:"
4306msgstr "未知:"
4307
4308#: wt-status.c:290
4309msgid "unmerged:"
4310msgstr "未合并:"
4311
4312#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4313#: wt-status.c:372
4314msgid "new commits, "
4315msgstr "新提交, "
4316
4317#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4318#: wt-status.c:374
4319msgid "modified content, "
4320msgstr "修改的内容, "
4321
4322#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
4323#: wt-status.c:376
4324msgid "untracked content, "
4325msgstr "未跟踪的内容, "
4326
4327#: wt-status.c:821
4328#, c-format
4329msgid "Your stash currently has %d entry"
4330msgid_plural "Your stash currently has %d entries"
4331msgstr[0] "您的贮藏区当前有 %d 条记录"
4332msgstr[1] "您的贮藏区当前有 %d 条记录"
4333
4334#: wt-status.c:853
4335msgid "Submodules changed but not updated:"
4336msgstr "子模组已修改但尚未更新:"
4337
4338#: wt-status.c:855
4339msgid "Submodule changes to be committed:"
4340msgstr "要提交的子模组变更:"
4341
4342#: wt-status.c:937
4343msgid ""
4344"Do not touch the line above.\n"
4345"Everything below will be removed."
4346msgstr ""
4347"不要改动上面的一行。\n"
4348"下面的所有内容均将被删除。"
4349
4350#: wt-status.c:1049
4351msgid "You have unmerged paths."
4352msgstr "您有尚未合并的路径。"
4353
4354#  译者:注意保持前导空格
4355#: wt-status.c:1052
4356msgid "  (fix conflicts and run \"git commit\")"
4357msgstr "  (解决冲突并运行 \"git commit\")"
4358
4359#  译者:注意保持前导空格
4360#: wt-status.c:1054
4361msgid "  (use \"git merge --abort\" to abort the merge)"
4362msgstr "  (使用 \"git merge --abort\" 终止合并)"
4363
4364#: wt-status.c:1059
4365msgid "All conflicts fixed but you are still merging."
4366msgstr "所有冲突已解决但您仍处于合并中。"
4367
4368#  译者:注意保持前导空格
4369#: wt-status.c:1062
4370msgid "  (use \"git commit\" to conclude merge)"
4371msgstr "  (使用 \"git commit\" 结束合并)"
4372
4373#: wt-status.c:1072
4374msgid "You are in the middle of an am session."
4375msgstr "您正处于 am 操作过程中。"
4376
4377#: wt-status.c:1075
4378msgid "The current patch is empty."
4379msgstr "当前的补丁为空。"
4380
4381#  译者:注意保持前导空格
4382#: wt-status.c:1079
4383msgid "  (fix conflicts and then run \"git am --continue\")"
4384msgstr "  (解决冲突,然后运行 \"git am --continue\")"
4385
4386#  译者:注意保持前导空格
4387#: wt-status.c:1081
4388msgid "  (use \"git am --skip\" to skip this patch)"
4389msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
4390
4391#  译者:注意保持前导空格
4392#: wt-status.c:1083
4393msgid "  (use \"git am --abort\" to restore the original branch)"
4394msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
4395
4396#: wt-status.c:1214
4397msgid "git-rebase-todo is missing."
4398msgstr "git-rebase-todo 丢失。"
4399
4400#: wt-status.c:1216
4401msgid "No commands done."
4402msgstr "没有命令被执行。"
4403
4404#: wt-status.c:1219
4405#, c-format
4406msgid "Last command done (%d command done):"
4407msgid_plural "Last commands done (%d commands done):"
4408msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
4409msgstr[1] "最后的命令已完成(%d 条命令被执行):"
4410
4411#: wt-status.c:1230
4412#, c-format
4413msgid "  (see more in file %s)"
4414msgstr "  (更多参见文件 %s)"
4415
4416#: wt-status.c:1235
4417msgid "No commands remaining."
4418msgstr "未剩下任何命令。"
4419
4420#: wt-status.c:1238
4421#, c-format
4422msgid "Next command to do (%d remaining command):"
4423msgid_plural "Next commands to do (%d remaining commands):"
4424msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
4425msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
4426
4427#  译者:注意保持前导空格
4428#: wt-status.c:1246
4429msgid "  (use \"git rebase --edit-todo\" to view and edit)"
4430msgstr "  (使用 \"git rebase --edit-todo\" 来查看和编辑)"
4431
4432#: wt-status.c:1259
4433#, c-format
4434msgid "You are currently rebasing branch '%s' on '%s'."
4435msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
4436
4437#: wt-status.c:1264
4438msgid "You are currently rebasing."
4439msgstr "您在执行变基操作。"
4440
4441#  译者:注意保持前导空格
4442#: wt-status.c:1278
4443msgid "  (fix conflicts and then run \"git rebase --continue\")"
4444msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
4445
4446#  译者:注意保持前导空格
4447#: wt-status.c:1280
4448msgid "  (use \"git rebase --skip\" to skip this patch)"
4449msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
4450
4451#  译者:注意保持前导空格
4452#: wt-status.c:1282
4453msgid "  (use \"git rebase --abort\" to check out the original branch)"
4454msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
4455
4456#  译者:注意保持前导空格
4457#: wt-status.c:1288
4458msgid "  (all conflicts fixed: run \"git rebase --continue\")"
4459msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
4460
4461#: wt-status.c:1292
4462#, c-format
4463msgid ""
4464"You are currently splitting a commit while rebasing branch '%s' on '%s'."
4465msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
4466
4467#: wt-status.c:1297
4468msgid "You are currently splitting a commit during a rebase."
4469msgstr "您在执行变基操作时拆分提交。"
4470
4471#  译者:注意保持前导空格
4472#: wt-status.c:1300
4473msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
4474msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
4475
4476#: wt-status.c:1304
4477#, c-format
4478msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
4479msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
4480
4481#: wt-status.c:1309
4482msgid "You are currently editing a commit during a rebase."
4483msgstr "您在执行变基操作时编辑提交。"
4484
4485#  译者:注意保持前导空格
4486#: wt-status.c:1312
4487msgid "  (use \"git commit --amend\" to amend the current commit)"
4488msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
4489
4490#  译者:注意保持前导空格
4491#: wt-status.c:1314
4492msgid ""
4493"  (use \"git rebase --continue\" once you are satisfied with your changes)"
4494msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
4495
4496#: wt-status.c:1324
4497#, c-format
4498msgid "You are currently cherry-picking commit %s."
4499msgstr "您在执行拣选提交 %s 的操作。"
4500
4501#  译者:注意保持前导空格
4502#: wt-status.c:1329
4503msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
4504msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
4505
4506#  译者:注意保持前导空格
4507#: wt-status.c:1332
4508msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
4509msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
4510
4511#  译者:注意保持前导空格
4512#: wt-status.c:1334
4513msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
4514msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
4515
4516#: wt-status.c:1343
4517#, c-format
4518msgid "You are currently reverting commit %s."
4519msgstr "您在执行反转提交 %s 的操作。"
4520
4521#  译者:注意保持前导空格
4522#: wt-status.c:1348
4523msgid "  (fix conflicts and run \"git revert --continue\")"
4524msgstr "  (解决冲突并运行 \"git revert --continue\")"
4525
4526#  译者:注意保持前导空格
4527#: wt-status.c:1351
4528msgid "  (all conflicts fixed: run \"git revert --continue\")"
4529msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
4530
4531#  译者:注意保持前导空格
4532#: wt-status.c:1353
4533msgid "  (use \"git revert --abort\" to cancel the revert operation)"
4534msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
4535
4536#: wt-status.c:1364
4537#, c-format
4538msgid "You are currently bisecting, started from branch '%s'."
4539msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
4540
4541#: wt-status.c:1368
4542msgid "You are currently bisecting."
4543msgstr "您在执行二分查找操作。"
4544
4545#  译者:注意保持前导空格
4546#: wt-status.c:1371
4547msgid "  (use \"git bisect reset\" to get back to the original branch)"
4548msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
4549
4550#: wt-status.c:1568
4551msgid "On branch "
4552msgstr "位于分支 "
4553
4554#: wt-status.c:1574
4555msgid "interactive rebase in progress; onto "
4556msgstr "交互式变基操作正在进行中;至 "
4557
4558#: wt-status.c:1576
4559msgid "rebase in progress; onto "
4560msgstr "变基操作正在进行中;至 "
4561
4562#: wt-status.c:1581
4563msgid "HEAD detached at "
4564msgstr "头指针分离于 "
4565
4566#: wt-status.c:1583
4567msgid "HEAD detached from "
4568msgstr "头指针分离自 "
4569
4570#: wt-status.c:1586
4571msgid "Not currently on any branch."
4572msgstr "当前不在任何分支上。"
4573
4574#: wt-status.c:1606
4575msgid "Initial commit"
4576msgstr "初始提交"
4577
4578#: wt-status.c:1607
4579msgid "No commits yet"
4580msgstr "尚无提交"
4581
4582#: wt-status.c:1621
4583msgid "Untracked files"
4584msgstr "未跟踪的文件"
4585
4586#: wt-status.c:1623
4587msgid "Ignored files"
4588msgstr "忽略的文件"
4589
4590#: wt-status.c:1627
4591#, c-format
4592msgid ""
4593"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
4594"may speed it up, but you have to be careful not to forget to add\n"
4595"new files yourself (see 'git help status')."
4596msgstr ""
4597"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
4598"但您需要小心不要忘了添加新文件(参见 'git help status')。"
4599
4600#: wt-status.c:1633
4601#, c-format
4602msgid "Untracked files not listed%s"
4603msgstr "未跟踪的文件没有列出%s"
4604
4605#  译者:中文字符串拼接,可删除前导空格
4606#: wt-status.c:1635
4607msgid " (use -u option to show untracked files)"
4608msgstr "(使用 -u 参数显示未跟踪的文件)"
4609
4610#: wt-status.c:1641
4611msgid "No changes"
4612msgstr "没有修改"
4613
4614#: wt-status.c:1646
4615#, c-format
4616msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
4617msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
4618
4619#: wt-status.c:1649
4620#, c-format
4621msgid "no changes added to commit\n"
4622msgstr "修改尚未加入提交\n"
4623
4624#: wt-status.c:1652
4625#, c-format
4626msgid ""
4627"nothing added to commit but untracked files present (use \"git add\" to "
4628"track)\n"
4629msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
4630
4631#: wt-status.c:1655
4632#, c-format
4633msgid "nothing added to commit but untracked files present\n"
4634msgstr "提交为空,但是存在尚未跟踪的文件\n"
4635
4636#  译者:中文字符串拼接,可删除前导空格
4637#: wt-status.c:1658
4638#, c-format
4639msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
4640msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
4641
4642#: wt-status.c:1661 wt-status.c:1666
4643#, c-format
4644msgid "nothing to commit\n"
4645msgstr "无文件要提交\n"
4646
4647#  译者:中文字符串拼接,可删除前导空格
4648#: wt-status.c:1664
4649#, c-format
4650msgid "nothing to commit (use -u to show untracked files)\n"
4651msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
4652
4653#  译者:中文字符串拼接,可删除前导空格
4654#: wt-status.c:1668
4655#, c-format
4656msgid "nothing to commit, working tree clean\n"
4657msgstr "无文件要提交,干净的工作区\n"
4658
4659#: wt-status.c:1780
4660msgid "No commits yet on "
4661msgstr "尚无提交在 "
4662
4663#: wt-status.c:1784
4664msgid "HEAD (no branch)"
4665msgstr "HEAD(非分支)"
4666
4667#  译者:注意保持句尾空格
4668#: wt-status.c:1813 wt-status.c:1821
4669msgid "behind "
4670msgstr "落后 "
4671
4672#: wt-status.c:1816 wt-status.c:1819
4673msgid "ahead "
4674msgstr "领先 "
4675
4676#. TRANSLATORS: the action is e.g. "pull with rebase"
4677#: wt-status.c:2311
4678#, c-format
4679msgid "cannot %s: You have unstaged changes."
4680msgstr "不能%s:您有未暂存的变更。"
4681
4682#: wt-status.c:2317
4683msgid "additionally, your index contains uncommitted changes."
4684msgstr "另外,您的索引中包含未提交的变更。"
4685
4686#: wt-status.c:2319
4687#, c-format
4688msgid "cannot %s: Your index contains uncommitted changes."
4689msgstr "不能%s:您的索引中包含未提交的变更。"
4690
4691#: compat/precompose_utf8.c:58 builtin/clone.c:436
4692#, c-format
4693msgid "failed to unlink '%s'"
4694msgstr "无法删除 '%s'"
4695
4696#: builtin/add.c:24
4697msgid "git add [<options>] [--] <pathspec>..."
4698msgstr "git add [<选项>] [--] <路径规格>..."
4699
4700#: builtin/add.c:82
4701#, c-format
4702msgid "unexpected diff status %c"
4703msgstr "意外的差异状态 %c"
4704
4705#: builtin/add.c:87 builtin/commit.c:292
4706msgid "updating files failed"
4707msgstr "更新文件失败"
4708
4709#: builtin/add.c:97
4710#, c-format
4711msgid "remove '%s'\n"
4712msgstr "删除 '%s'\n"
4713
4714#: builtin/add.c:151
4715msgid "Unstaged changes after refreshing the index:"
4716msgstr "刷新索引之后尚未被暂存的变更:"
4717
4718#: builtin/add.c:211 builtin/rev-parse.c:873
4719msgid "Could not read the index"
4720msgstr "不能读取索引"
4721
4722#: builtin/add.c:222
4723#, c-format
4724msgid "Could not open '%s' for writing."
4725msgstr "无法打开 '%s' 进行写入。"
4726
4727#: builtin/add.c:226
4728msgid "Could not write patch"
4729msgstr "不能生成补丁"
4730
4731#: builtin/add.c:229
4732msgid "editing patch failed"
4733msgstr "编辑补丁失败"
4734
4735#: builtin/add.c:232
4736#, c-format
4737msgid "Could not stat '%s'"
4738msgstr "不能对 '%s' 调用 stat"
4739
4740#: builtin/add.c:234
4741msgid "Empty patch. Aborted."
4742msgstr "空补丁。异常终止。"
4743
4744#: builtin/add.c:239
4745#, c-format
4746msgid "Could not apply '%s'"
4747msgstr "不能应用 '%s'"
4748
4749#: builtin/add.c:249
4750msgid "The following paths are ignored by one of your .gitignore files:\n"
4751msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
4752
4753#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
4754#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
4755#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
4756msgid "dry run"
4757msgstr "演习"
4758
4759#: builtin/add.c:272
4760msgid "interactive picking"
4761msgstr "交互式拣选"
4762
4763#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
4764msgid "select hunks interactively"
4765msgstr "交互式挑选数据块"
4766
4767#: builtin/add.c:274
4768msgid "edit current diff and apply"
4769msgstr "编辑当前差异并应用"
4770
4771#: builtin/add.c:275
4772msgid "allow adding otherwise ignored files"
4773msgstr "允许添加忽略的文件"
4774
4775#: builtin/add.c:276
4776msgid "update tracked files"
4777msgstr "更新已跟踪的文件"
4778
4779#: builtin/add.c:277
4780msgid "record only the fact that the path will be added later"
4781msgstr "只记录,该路径稍后再添加"
4782
4783#: builtin/add.c:278
4784msgid "add changes from all tracked and untracked files"
4785msgstr "添加所有改变的已跟踪文件和未跟踪文件"
4786
4787#: builtin/add.c:281
4788msgid "ignore paths removed in the working tree (same as --no-all)"
4789msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
4790
4791#: builtin/add.c:283
4792msgid "don't add, only refresh the index"
4793msgstr "不添加,只刷新索引"
4794
4795#: builtin/add.c:284
4796msgid "just skip files which cannot be added because of errors"
4797msgstr "跳过因出错不能添加的文件"
4798
4799#: builtin/add.c:285
4800msgid "check if - even missing - files are ignored in dry run"
4801msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
4802
4803#: builtin/add.c:286 builtin/update-index.c:952
4804msgid "(+/-)x"
4805msgstr "(+/-)x"
4806
4807#: builtin/add.c:286 builtin/update-index.c:953
4808msgid "override the executable bit of the listed files"
4809msgstr "覆盖列表里文件的可执行位"
4810
4811#: builtin/add.c:288
4812msgid "warn when adding an embedded repository"
4813msgstr "创建一个嵌入式仓库时给予警告"
4814
4815#: builtin/add.c:303
4816#, c-format
4817msgid ""
4818"You've added another git repository inside your current repository.\n"
4819"Clones of the outer repository will not contain the contents of\n"
4820"the embedded repository and will not know how to obtain it.\n"
4821"If you meant to add a submodule, use:\n"
4822"\n"
4823"\tgit submodule add <url> %s\n"
4824"\n"
4825"If you added this path by mistake, you can remove it from the\n"
4826"index with:\n"
4827"\n"
4828"\tgit rm --cached %s\n"
4829"\n"
4830"See \"git help submodule\" for more information."
4831msgstr ""
4832"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并且不知道该如何获取它。\n"
4833"如果您要添加一个子模组,使用:\n"
4834"\n"
4835"\tgit submodule add <url> %s\n"
4836"\n"
4837"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
4838"\n"
4839"\tgit rm --cached %s\n"
4840"\n"
4841"参见 \"git help submodule\" 获取更多信息。"
4842
4843#: builtin/add.c:331
4844#, c-format
4845msgid "adding embedded git repository: %s"
4846msgstr "正在添加嵌入式 git 仓库:%s"
4847
4848#: builtin/add.c:349
4849#, c-format
4850msgid "Use -f if you really want to add them.\n"
4851msgstr "使用 -f 参数如果您确实要添加它们。\n"
4852
4853#: builtin/add.c:357
4854msgid "adding files failed"
4855msgstr "添加文件失败"
4856
4857#: builtin/add.c:394
4858msgid "-A and -u are mutually incompatible"
4859msgstr "-A 和 -u 选项互斥"
4860
4861#: builtin/add.c:401
4862msgid "Option --ignore-missing can only be used together with --dry-run"
4863msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
4864
4865#: builtin/add.c:405
4866#, c-format
4867msgid "--chmod param '%s' must be either -x or +x"
4868msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
4869
4870#: builtin/add.c:420
4871#, c-format
4872msgid "Nothing specified, nothing added.\n"
4873msgstr "没有指定文件,也没有文件被添加。\n"
4874
4875#: builtin/add.c:421
4876#, c-format
4877msgid "Maybe you wanted to say 'git add .'?\n"
4878msgstr "也许您想要执行 'git add .'?\n"
4879
4880#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
4881#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
4882#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
4883#: builtin/submodule--helper.c:244
4884msgid "index file corrupt"
4885msgstr "索引文件损坏"
4886
4887#: builtin/am.c:413
4888msgid "could not parse author script"
4889msgstr "不能解析作者脚本"
4890
4891#: builtin/am.c:489
4892#, c-format
4893msgid "'%s' was deleted by the applypatch-msg hook"
4894msgstr "'%s' 被 applypatch-msg 钩子删除"
4895
4896#: builtin/am.c:530
4897#, c-format
4898msgid "Malformed input line: '%s'."
4899msgstr "非法的输入行:'%s'。"
4900
4901#: builtin/am.c:567
4902#, c-format
4903msgid "Failed to copy notes from '%s' to '%s'"
4904msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
4905
4906#: builtin/am.c:593
4907msgid "fseek failed"
4908msgstr "fseek 失败"
4909
4910#: builtin/am.c:777
4911#, c-format
4912msgid "could not parse patch '%s'"
4913msgstr "无法解析补丁 '%s'"
4914
4915#: builtin/am.c:842
4916msgid "Only one StGIT patch series can be applied at once"
4917msgstr "一次只能有一个 StGIT 补丁队列被应用"
4918
4919#: builtin/am.c:889
4920msgid "invalid timestamp"
4921msgstr "无效的时间戳"
4922
4923#: builtin/am.c:892 builtin/am.c:900
4924msgid "invalid Date line"
4925msgstr "无效的日期行"
4926
4927#: builtin/am.c:897
4928msgid "invalid timezone offset"
4929msgstr "无效的时区偏移值"
4930
4931#: builtin/am.c:986
4932msgid "Patch format detection failed."
4933msgstr "补丁格式探测失败。"
4934
4935#: builtin/am.c:991 builtin/clone.c:401
4936#, c-format
4937msgid "failed to create directory '%s'"
4938msgstr "无法创建目录 '%s'"
4939
4940#: builtin/am.c:995
4941msgid "Failed to split patches."
4942msgstr "无法拆分补丁。"
4943
4944#: builtin/am.c:1120 builtin/commit.c:377
4945msgid "unable to write index file"
4946msgstr "无法写入索引文件"
4947
4948#: builtin/am.c:1171
4949#, c-format
4950msgid "When you have resolved this problem, run \"%s --continue\"."
4951msgstr "当您解决这一问题,执行 \"%s --continue\"。"
4952
4953#: builtin/am.c:1172
4954#, c-format
4955msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4956msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
4957
4958#: builtin/am.c:1173
4959#, c-format
4960msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4961msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
4962
4963#: builtin/am.c:1304
4964msgid "Patch is empty."
4965msgstr "补丁为空。"
4966
4967#: builtin/am.c:1370
4968#, c-format
4969msgid "invalid ident line: %.*s"
4970msgstr "无效的身份标识:%.*s"
4971
4972#: builtin/am.c:1392
4973#, c-format
4974msgid "unable to parse commit %s"
4975msgstr "不能解析提交 %s"
4976
4977#: builtin/am.c:1586
4978msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4979msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4980
4981#: builtin/am.c:1588
4982msgid "Using index info to reconstruct a base tree..."
4983msgstr "使用索引来重建一个(三方合并的)基础目录树..."
4984
4985#: builtin/am.c:1607
4986msgid ""
4987"Did you hand edit your patch?\n"
4988"It does not apply to blobs recorded in its index."
4989msgstr ""
4990"您是否曾手动编辑过您的补丁?\n"
4991"无法应用补丁到索引中的数据对象上。"
4992
4993#: builtin/am.c:1613
4994msgid "Falling back to patching base and 3-way merge..."
4995msgstr "回落到基础版本上打补丁及进行三方合并..."
4996
4997#: builtin/am.c:1638
4998msgid "Failed to merge in the changes."
4999msgstr "无法合并变更。"
5000
5001#: builtin/am.c:1662 builtin/merge.c:632
5002msgid "git write-tree failed to write a tree"
5003msgstr "git write-tree 无法写入一树对象"
5004
5005#: builtin/am.c:1669
5006msgid "applying to an empty history"
5007msgstr "正应用到一个空历史上"
5008
5009#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
5010#: builtin/merge.c:828
5011msgid "failed to write commit object"
5012msgstr "无法写提交对象"
5013
5014#: builtin/am.c:1715 builtin/am.c:1719
5015#, c-format
5016msgid "cannot resume: %s does not exist."
5017msgstr "无法继续:%s 不存在。"
5018
5019#: builtin/am.c:1735
5020msgid "cannot be interactive without stdin connected to a terminal."
5021msgstr "标准输入没有和终端关联,不能进行交互式操作。"
5022
5023#: builtin/am.c:1740
5024msgid "Commit Body is:"
5025msgstr "提交内容为:"
5026
5027#  译者:注意保持句尾空格
5028#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5029#. in your translation. The program will only accept English
5030#. input at this point.
5031#.
5032#: builtin/am.c:1750
5033msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5034msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
5035
5036#: builtin/am.c:1800
5037#, c-format
5038msgid "Dirty index: cannot apply patches (dirty: %s)"
5039msgstr "脏索引:不能应用补丁(脏文件:%s)"
5040
5041#: builtin/am.c:1840 builtin/am.c:1912
5042#, c-format
5043msgid "Applying: %.*s"
5044msgstr "应用:%.*s"
5045
5046#: builtin/am.c:1856
5047msgid "No changes -- Patch already applied."
5048msgstr "没有变更 —— 补丁已经应用过。"
5049
5050#: builtin/am.c:1864
5051#, c-format
5052msgid "Patch failed at %s %.*s"
5053msgstr "打补丁失败于 %s %.*s"
5054
5055#: builtin/am.c:1870
5056#, c-format
5057msgid "The copy of the patch that failed is found in: %s"
5058msgstr "失败的补丁文件副本位于:%s"
5059
5060#: builtin/am.c:1915
5061msgid ""
5062"No changes - did you forget to use 'git add'?\n"
5063"If there is nothing left to stage, chances are that something else\n"
5064"already introduced the same changes; you might want to skip this patch."
5065msgstr ""
5066"没有变更 —— 您是不是忘了执行 'git add'?\n"
5067"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5068"您也许想要跳过这个补丁。"
5069
5070#: builtin/am.c:1922
5071msgid ""
5072"You still have unmerged paths in your index.\n"
5073"You should 'git add' each file with resolved conflicts to mark them as "
5074"such.\n"
5075"You might run `git rm` on a file to accept \"deleted by them\" for it."
5076msgstr ""
5077"在您的索引中仍存在未合并的路径。\n"
5078"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
5079"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
5080
5081#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
5082#: builtin/reset.c:331
5083#, c-format
5084msgid "Could not parse object '%s'."
5085msgstr "不能解析对象 '%s'。"
5086
5087#: builtin/am.c:2083
5088msgid "failed to clean index"
5089msgstr "无法清空索引"
5090
5091#: builtin/am.c:2117
5092msgid ""
5093"You seem to have moved HEAD since the last 'am' failure.\n"
5094"Not rewinding to ORIG_HEAD"
5095msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
5096
5097#: builtin/am.c:2180
5098#, c-format
5099msgid "Invalid value for --patch-format: %s"
5100msgstr "无效的 --patch-format 值:%s"
5101
5102#: builtin/am.c:2213
5103msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
5104msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5105
5106#: builtin/am.c:2214
5107msgid "git am [<options>] (--continue | --skip | --abort)"
5108msgstr "git am [<选项>] (--continue | --skip | --abort)"
5109
5110#: builtin/am.c:2220
5111msgid "run interactively"
5112msgstr "以交互式方式运行"
5113
5114#: builtin/am.c:2222
5115msgid "historical option -- no-op"
5116msgstr "老的参数 —— 无作用"
5117
5118#: builtin/am.c:2224
5119msgid "allow fall back on 3way merging if needed"
5120msgstr "如果必要,允许使用三方合并。"
5121
5122#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
5123#: builtin/repack.c:180
5124msgid "be quiet"
5125msgstr "静默模式"
5126
5127#: builtin/am.c:2227
5128msgid "add a Signed-off-by line to the commit message"
5129msgstr "在提交说明中添加一个 Signed-off-by 签名"
5130
5131#: builtin/am.c:2230
5132msgid "recode into utf8 (default)"
5133msgstr "使用 utf8 字符集(默认)"
5134
5135#: builtin/am.c:2232
5136msgid "pass -k flag to git-mailinfo"
5137msgstr "向 git-mailinfo 传递 -k 参数"
5138
5139#: builtin/am.c:2234
5140msgid "pass -b flag to git-mailinfo"
5141msgstr "向 git-mailinfo 传递 -b 参数"
5142
5143#: builtin/am.c:2236
5144msgid "pass -m flag to git-mailinfo"
5145msgstr "向 git-mailinfo 传递 -m 参数"
5146
5147#: builtin/am.c:2238
5148msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5149msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5150
5151#: builtin/am.c:2241
5152msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5153msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
5154
5155#: builtin/am.c:2244
5156msgid "strip everything before a scissors line"
5157msgstr "丢弃裁切线前的所有内容"
5158
5159#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
5160#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
5161#: builtin/am.c:2273
5162msgid "pass it through git-apply"
5163msgstr "传递给 git-apply"
5164
5165#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
5166#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
5167#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
5168#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
5169#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
5170#: parse-options.h:245
5171msgid "n"
5172msgstr "n"
5173
5174#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
5175#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
5176msgid "format"
5177msgstr "格式"
5178
5179#: builtin/am.c:2270
5180msgid "format the patch(es) are in"
5181msgstr "补丁的格式"
5182
5183#: builtin/am.c:2276
5184msgid "override error message when patch failure occurs"
5185msgstr "打补丁失败时显示的错误信息"
5186
5187#: builtin/am.c:2278
5188msgid "continue applying patches after resolving a conflict"
5189msgstr "冲突解决后继续应用补丁"
5190
5191#: builtin/am.c:2281
5192msgid "synonyms for --continue"
5193msgstr "和 --continue 同义"
5194
5195#: builtin/am.c:2284
5196msgid "skip the current patch"
5197msgstr "跳过当前补丁"
5198
5199#: builtin/am.c:2287
5200msgid "restore the original branch and abort the patching operation."
5201msgstr "恢复原始分支并终止打补丁操作。"
5202
5203#: builtin/am.c:2291
5204msgid "lie about committer date"
5205msgstr "将作者日期作为提交日期"
5206
5207#: builtin/am.c:2293
5208msgid "use current timestamp for author date"
5209msgstr "用当前时间作为作者日期"
5210
5211#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
5212#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
5213msgid "key-id"
5214msgstr "key-id"
5215
5216#: builtin/am.c:2296
5217msgid "GPG-sign commits"
5218msgstr "使用 GPG 签名提交"
5219
5220#: builtin/am.c:2299
5221msgid "(internal use for git-rebase)"
5222msgstr "(内部使用,用于 git-rebase)"
5223
5224#: builtin/am.c:2317
5225msgid ""
5226"The -b/--binary option has been a no-op for long time, and\n"
5227"it will be removed. Please do not use it anymore."
5228msgstr ""
5229"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5230"请不要再使用它了。"
5231
5232#: builtin/am.c:2324
5233msgid "failed to read the index"
5234msgstr "无法读取索引"
5235
5236#: builtin/am.c:2339
5237#, c-format
5238msgid "previous rebase directory %s still exists but mbox given."
5239msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
5240
5241#: builtin/am.c:2363
5242#, c-format
5243msgid ""
5244"Stray %s directory found.\n"
5245"Use \"git am --abort\" to remove it."
5246msgstr ""
5247"发现了错误的 %s 目录。\n"
5248"使用 \"git am --abort\" 删除它。"
5249
5250#: builtin/am.c:2369
5251msgid "Resolve operation not in progress, we are not resuming."
5252msgstr "解决操作未进行,我们不会继续。"
5253
5254#: builtin/apply.c:8
5255msgid "git apply [<options>] [<patch>...]"
5256msgstr "git apply [<选项>] [<补丁>...]"
5257
5258#: builtin/archive.c:17
5259#, c-format
5260msgid "could not create archive file '%s'"
5261msgstr "不能创建归档文件 '%s'"
5262
5263#: builtin/archive.c:20
5264msgid "could not redirect output"
5265msgstr "不能重定向输出"
5266
5267#: builtin/archive.c:37
5268msgid "git archive: Remote with no URL"
5269msgstr "git archive:未提供远程 URL"
5270
5271#: builtin/archive.c:58
5272msgid "git archive: expected ACK/NAK, got EOF"
5273msgstr "git archive:应为 ACK/NACK,却得到 EOF"
5274
5275#: builtin/archive.c:61
5276#, c-format
5277msgid "git archive: NACK %s"
5278msgstr "git archive:NACK %s"
5279
5280#: builtin/archive.c:64
5281msgid "git archive: protocol error"
5282msgstr "git archive:协议错误"
5283
5284#: builtin/archive.c:68
5285msgid "git archive: expected a flush"
5286msgstr "git archive:应有一个 flush 刷新"
5287
5288#: builtin/bisect--helper.c:7
5289msgid "git bisect--helper --next-all [--no-checkout]"
5290msgstr "git bisect--helper --next-all [--no-checkout]"
5291
5292#: builtin/bisect--helper.c:17
5293msgid "perform 'git bisect next'"
5294msgstr "执行 'git bisect next'"
5295
5296#: builtin/bisect--helper.c:19
5297msgid "update BISECT_HEAD instead of checking out the current commit"
5298msgstr "更新 BISECT_HEAD 而非检出当前提交"
5299
5300#: builtin/blame.c:27
5301msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
5302msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
5303
5304#: builtin/blame.c:32
5305msgid "<rev-opts> are documented in git-rev-list(1)"
5306msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
5307
5308#: builtin/blame.c:668
5309msgid "Show blame entries as we find them, incrementally"
5310msgstr "增量式地显示发现的 blame 条目"
5311
5312#: builtin/blame.c:669
5313msgid "Show blank SHA-1 for boundary commits (Default: off)"
5314msgstr "边界提交显示空的 SHA-1(默认:关闭)"
5315
5316#: builtin/blame.c:670
5317msgid "Do not treat root commits as boundaries (Default: off)"
5318msgstr "不把根提交作为边界(默认:关闭)"
5319
5320#: builtin/blame.c:671
5321msgid "Show work cost statistics"
5322msgstr "显示命令消耗统计"
5323
5324#: builtin/blame.c:672
5325msgid "Force progress reporting"
5326msgstr "强制进度显示"
5327
5328#: builtin/blame.c:673
5329msgid "Show output score for blame entries"
5330msgstr "显示判断 blame 条目位移的得分诊断信息"
5331
5332#: builtin/blame.c:674
5333msgid "Show original filename (Default: auto)"
5334msgstr "显示原始文件名(默认:自动)"
5335
5336#: builtin/blame.c:675
5337msgid "Show original linenumber (Default: off)"
5338msgstr "显示原始的行号(默认:关闭)"
5339
5340#: builtin/blame.c:676
5341msgid "Show in a format designed for machine consumption"
5342msgstr "显示为一个适合机器读取的格式"
5343
5344#: builtin/blame.c:677
5345msgid "Show porcelain format with per-line commit information"
5346msgstr "为每一行显示机器适用的提交信息"
5347
5348#: builtin/blame.c:678
5349msgid "Use the same output mode as git-annotate (Default: off)"
5350msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
5351
5352#: builtin/blame.c:679
5353msgid "Show raw timestamp (Default: off)"
5354msgstr "显示原始时间戳(默认:关闭)"
5355
5356#: builtin/blame.c:680
5357msgid "Show long commit SHA1 (Default: off)"
5358msgstr "显示长的 SHA1 提交号(默认:关闭)"
5359
5360#: builtin/blame.c:681
5361msgid "Suppress author name and timestamp (Default: off)"
5362msgstr "隐藏作者名字和时间戳(默认:关闭)"
5363
5364#: builtin/blame.c:682
5365msgid "Show author email instead of name (Default: off)"
5366msgstr "显示作者的邮箱而不是名字(默认:关闭)"
5367
5368#: builtin/blame.c:683
5369msgid "Ignore whitespace differences"
5370msgstr "忽略空白差异"
5371
5372#: builtin/blame.c:690
5373msgid "Use an experimental heuristic to improve diffs"
5374msgstr "使用一个试验性的启发式算法改进差异显示"
5375
5376#: builtin/blame.c:692
5377msgid "Spend extra cycles to find better match"
5378msgstr "花费额外的循环来找到更好的匹配"
5379
5380#: builtin/blame.c:693
5381msgid "Use revisions from <file> instead of calling git-rev-list"
5382msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
5383
5384#: builtin/blame.c:694
5385msgid "Use <file>'s contents as the final image"
5386msgstr "使用 <文件> 的内容作为最终的图片"
5387
5388#: builtin/blame.c:695 builtin/blame.c:696
5389msgid "score"
5390msgstr "得分"
5391
5392#: builtin/blame.c:695
5393msgid "Find line copies within and across files"
5394msgstr "找到文件内及跨文件的行拷贝"
5395
5396#: builtin/blame.c:696
5397msgid "Find line movements within and across files"
5398msgstr "找到文件内及跨文件的行移动"
5399
5400#: builtin/blame.c:697
5401msgid "n,m"
5402msgstr "n,m"
5403
5404#: builtin/blame.c:697
5405msgid "Process only line range n,m, counting from 1"
5406msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
5407
5408#: builtin/blame.c:744
5409msgid "--progress can't be used with --incremental or porcelain formats"
5410msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
5411
5412#. TRANSLATORS: This string is used to tell us the
5413#. maximum display width for a relative timestamp in
5414#. "git blame" output.  For C locale, "4 years, 11
5415#. months ago", which takes 22 places, is the longest
5416#. among various forms of relative timestamps, but
5417#. your language may need more or fewer display
5418#. columns.
5419#.
5420#: builtin/blame.c:795
5421msgid "4 years, 11 months ago"
5422msgstr "4 年 11 个月前"
5423
5424#: builtin/blame.c:882
5425#, c-format
5426msgid "file %s has only %lu line"
5427msgid_plural "file %s has only %lu lines"
5428msgstr[0] "文件 %s 只有 %lu 行"
5429msgstr[1] "文件 %s 只有 %lu 行"
5430
5431#: builtin/blame.c:928
5432msgid "Blaming lines"
5433msgstr "追踪代码行"
5434
5435#: builtin/branch.c:27
5436msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
5437msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
5438
5439#: builtin/branch.c:28
5440msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
5441msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
5442
5443#: builtin/branch.c:29
5444msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
5445msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
5446
5447#: builtin/branch.c:30
5448msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
5449msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
5450
5451#: builtin/branch.c:31
5452msgid "git branch [<options>] [-r | -a] [--points-at]"
5453msgstr "git branch [<选项>] [-r | -a] [--points-at]"
5454
5455#: builtin/branch.c:32
5456msgid "git branch [<options>] [-r | -a] [--format]"
5457msgstr "git branch [<选项>] [-r | -a] [--format]"
5458
5459#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5460#: builtin/branch.c:145
5461#, c-format
5462msgid ""
5463"deleting branch '%s' that has been merged to\n"
5464"         '%s', but not yet merged to HEAD."
5465msgstr ""
5466"将要删除的分支 '%s' 已经被合并到\n"
5467"         '%s',但未合并到 HEAD。"
5468
5469#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
5470#: builtin/branch.c:149
5471#, c-format
5472msgid ""
5473"not deleting branch '%s' that is not yet merged to\n"
5474"         '%s', even though it is merged to HEAD."
5475msgstr ""
5476"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
5477"         然而却尚未被合并到分支 '%s' 。"
5478
5479#: builtin/branch.c:163
5480#, c-format
5481msgid "Couldn't look up commit object for '%s'"
5482msgstr "无法查询 '%s' 指向的提交对象"
5483
5484#: builtin/branch.c:167
5485#, c-format
5486msgid ""
5487"The branch '%s' is not fully merged.\n"
5488"If you are sure you want to delete it, run 'git branch -D %s'."
5489msgstr ""
5490"分支 '%s' 没有完全合并。\n"
5491"如果您确认要删除它,执行 'git branch -D %s'。"
5492
5493#: builtin/branch.c:180
5494msgid "Update of config-file failed"
5495msgstr "无法更新 config 文件"
5496
5497#: builtin/branch.c:211
5498msgid "cannot use -a with -d"
5499msgstr "不能将 -a 和 -d 同时使用"
5500
5501#: builtin/branch.c:217
5502msgid "Couldn't look up commit object for HEAD"
5503msgstr "无法查询 HEAD 指向的提交对象"
5504
5505#: builtin/branch.c:231
5506#, c-format
5507msgid "Cannot delete branch '%s' checked out at '%s'"
5508msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
5509
5510#: builtin/branch.c:246
5511#, c-format
5512msgid "remote-tracking branch '%s' not found."
5513msgstr "未能找到远程跟踪分支 '%s'。"
5514
5515#: builtin/branch.c:247
5516#, c-format
5517msgid "branch '%s' not found."
5518msgstr "分支 '%s' 未发现。"
5519
5520#: builtin/branch.c:262
5521#, c-format
5522msgid "Error deleting remote-tracking branch '%s'"
5523msgstr "无法删除远程跟踪分支 '%s'"
5524
5525#: builtin/branch.c:263
5526#, c-format
5527msgid "Error deleting branch '%s'"
5528msgstr "无法删除分支 '%s'"
5529
5530#: builtin/branch.c:270
5531#, c-format
5532msgid "Deleted remote-tracking branch %s (was %s).\n"
5533msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
5534
5535#: builtin/branch.c:271
5536#, c-format
5537msgid "Deleted branch %s (was %s).\n"
5538msgstr "已删除分支 %s(曾为 %s)。\n"
5539
5540#: builtin/branch.c:445
5541#, c-format
5542msgid "Branch %s is being rebased at %s"
5543msgstr "分支 %s 正被变基到 %s"
5544
5545#: builtin/branch.c:449
5546#, c-format
5547msgid "Branch %s is being bisected at %s"
5548msgstr "分支 %s 正被二分查找于 %s"
5549
5550#: builtin/branch.c:464
5551msgid "cannot rename the current branch while not on any."
5552msgstr "无法重命名当前分支因为不处于任何分支上。"
5553
5554#: builtin/branch.c:474
5555#, c-format
5556msgid "Invalid branch name: '%s'"
5557msgstr "无效的分支名:'%s'"
5558
5559#: builtin/branch.c:491
5560msgid "Branch rename failed"
5561msgstr "分支重命名失败"
5562
5563#: builtin/branch.c:494
5564#, c-format
5565msgid "Renamed a misnamed branch '%s' away"
5566msgstr "重命名掉一个错误命名的旧分支 '%s'"
5567
5568#: builtin/branch.c:497
5569#, c-format
5570msgid "Branch renamed to %s, but HEAD is not updated!"
5571msgstr "分支重命名为 %s,但 HEAD 没有更新!"
5572
5573#: builtin/branch.c:506
5574msgid "Branch is renamed, but update of config-file failed"
5575msgstr "分支被重命名,但更新 config 文件失败"
5576
5577#: builtin/branch.c:522
5578#, c-format
5579msgid ""
5580"Please edit the description for the branch\n"
5581"  %s\n"
5582"Lines starting with '%c' will be stripped.\n"
5583msgstr ""
5584"请编辑分支的描述\n"
5585"  %s\n"
5586"以 '%c' 开头的行将被过滤。\n"
5587
5588#: builtin/branch.c:555
5589msgid "Generic options"
5590msgstr "通用选项"
5591
5592#: builtin/branch.c:557
5593msgid "show hash and subject, give twice for upstream branch"
5594msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
5595
5596#: builtin/branch.c:558
5597msgid "suppress informational messages"
5598msgstr "不显示信息"
5599
5600#: builtin/branch.c:559
5601msgid "set up tracking mode (see git-pull(1))"
5602msgstr "设置跟踪模式(参见 git-pull(1))"
5603
5604#: builtin/branch.c:561
5605msgid "change upstream info"
5606msgstr "改变上游信息"
5607
5608#: builtin/branch.c:563
5609msgid "upstream"
5610msgstr "上游"
5611
5612#: builtin/branch.c:563
5613msgid "change the upstream info"
5614msgstr "改变上游信息"
5615
5616#: builtin/branch.c:564
5617msgid "Unset the upstream info"
5618msgstr "取消上游信息的设置"
5619
5620#: builtin/branch.c:565
5621msgid "use colored output"
5622msgstr "使用彩色输出"
5623
5624#: builtin/branch.c:566
5625msgid "act on remote-tracking branches"
5626msgstr "作用于远程跟踪分支"
5627
5628#: builtin/branch.c:568 builtin/branch.c:570
5629msgid "print only branches that contain the commit"
5630msgstr "只打印包含该提交的分支"
5631
5632#: builtin/branch.c:569 builtin/branch.c:571
5633msgid "print only branches that don't contain the commit"
5634msgstr "只打印不包含该提交的分支"
5635
5636#: builtin/branch.c:574
5637msgid "Specific git-branch actions:"
5638msgstr "具体的 git-branch 动作:"
5639
5640#: builtin/branch.c:575
5641msgid "list both remote-tracking and local branches"
5642msgstr "列出远程跟踪及本地分支"
5643
5644#: builtin/branch.c:577
5645msgid "delete fully merged branch"
5646msgstr "删除完全合并的分支"
5647
5648#: builtin/branch.c:578
5649msgid "delete branch (even if not merged)"
5650msgstr "删除分支(即使没有合并)"
5651
5652#: builtin/branch.c:579
5653msgid "move/rename a branch and its reflog"
5654msgstr "移动/重命名一个分支,以及它的引用日志"
5655
5656#: builtin/branch.c:580
5657msgid "move/rename a branch, even if target exists"
5658msgstr "移动/重命名一个分支,即使目标已存在"
5659
5660#: builtin/branch.c:581
5661msgid "list branch names"
5662msgstr "列出分支名"
5663
5664#: builtin/branch.c:582
5665msgid "create the branch's reflog"
5666msgstr "创建分支的引用日志"
5667
5668#: builtin/branch.c:584
5669msgid "edit the description for the branch"
5670msgstr "标记分支的描述"
5671
5672#: builtin/branch.c:585
5673msgid "force creation, move/rename, deletion"
5674msgstr "强制创建、移动/重命名、删除"
5675
5676#: builtin/branch.c:586
5677msgid "print only branches that are merged"
5678msgstr "只打印已经合并的分支"
5679
5680#: builtin/branch.c:587
5681msgid "print only branches that are not merged"
5682msgstr "只打印尚未合并的分支"
5683
5684#: builtin/branch.c:588
5685msgid "list branches in columns"
5686msgstr "以列的方式显示分支"
5687
5688#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
5689msgid "key"
5690msgstr "key"
5691
5692#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
5693msgid "field name to sort on"
5694msgstr "排序的字段名"
5695
5696#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
5697#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
5698#: builtin/tag.c:430
5699msgid "object"
5700msgstr "对象"
5701
5702#: builtin/branch.c:593
5703msgid "print only branches of the object"
5704msgstr "只打印指向该对象的分支"
5705
5706#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
5707msgid "sorting and filtering are case insensitive"
5708msgstr "排序和过滤属于大小写不敏感"
5709
5710#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
5711#: builtin/verify-tag.c:39
5712msgid "format to use for the output"
5713msgstr "输出格式"
5714
5715#: builtin/branch.c:615
5716msgid "Failed to resolve HEAD as a valid ref."
5717msgstr "无法将 HEAD 解析为有效引用。"
5718
5719#: builtin/branch.c:619 builtin/clone.c:728
5720msgid "HEAD not found below refs/heads!"
5721msgstr "HEAD 没有位于 /refs/heads 之下!"
5722
5723#: builtin/branch.c:642
5724msgid "--column and --verbose are incompatible"
5725msgstr "--column 和 --verbose 不兼容"
5726
5727#: builtin/branch.c:653 builtin/branch.c:705
5728msgid "branch name required"
5729msgstr "必须提供分支名"
5730
5731#: builtin/branch.c:681
5732msgid "Cannot give description to detached HEAD"
5733msgstr "不能向分离头指针提供描述"
5734
5735#: builtin/branch.c:686
5736msgid "cannot edit description of more than one branch"
5737msgstr "不能为一个以上的分支编辑描述"
5738
5739#: builtin/branch.c:693
5740#, c-format
5741msgid "No commit on branch '%s' yet."
5742msgstr "分支 '%s' 尚无提交。"
5743
5744#: builtin/branch.c:696
5745#, c-format
5746msgid "No branch named '%s'."
5747msgstr "没有分支 '%s'。"
5748
5749#: builtin/branch.c:711
5750msgid "too many branches for a rename operation"
5751msgstr "为重命名操作提供了太多的分支名"
5752
5753#: builtin/branch.c:716
5754msgid "too many branches to set new upstream"
5755msgstr "为设置新上游提供了太多的分支名"
5756
5757#: builtin/branch.c:720
5758#, c-format
5759msgid ""
5760"could not set upstream of HEAD to %s when it does not point to any branch."
5761msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5762
5763#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
5764#, c-format
5765msgid "no such branch '%s'"
5766msgstr "没有此分支 '%s'"
5767
5768#: builtin/branch.c:727
5769#, c-format
5770msgid "branch '%s' does not exist"
5771msgstr "分支 '%s' 不存在"
5772
5773#: builtin/branch.c:739
5774msgid "too many branches to unset upstream"
5775msgstr "为取消上游设置操作提供了太多的分支名"
5776
5777#: builtin/branch.c:743
5778msgid "could not unset upstream of HEAD when it does not point to any branch."
5779msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5780
5781#: builtin/branch.c:749
5782#, c-format
5783msgid "Branch '%s' has no upstream information"
5784msgstr "分支 '%s' 没有上游信息"
5785
5786#: builtin/branch.c:763
5787msgid "it does not make sense to create 'HEAD' manually"
5788msgstr "手工创建 'HEAD' 没有意义"
5789
5790#: builtin/branch.c:769
5791msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5792msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5793
5794#: builtin/branch.c:772
5795#, c-format
5796msgid ""
5797"The --set-upstream flag is deprecated and will be removed. Consider using --"
5798"track or --set-upstream-to\n"
5799msgstr ""
5800"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
5801
5802#: builtin/branch.c:789
5803#, c-format
5804msgid ""
5805"\n"
5806"If you wanted to make '%s' track '%s', do this:\n"
5807"\n"
5808msgstr ""
5809"\n"
5810"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
5811"\n"
5812
5813#: builtin/bundle.c:45
5814#, c-format
5815msgid "%s is okay\n"
5816msgstr "%s 可以\n"
5817
5818#: builtin/bundle.c:58
5819msgid "Need a repository to create a bundle."
5820msgstr "需要一个仓库来创建包。"
5821
5822#: builtin/bundle.c:62
5823msgid "Need a repository to unbundle."
5824msgstr "需要一个仓库来解包。"
5825
5826#: builtin/cat-file.c:519
5827msgid ""
5828"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5829"p | <type> | --textconv | --filters) [--path=<path>] <object>"
5830msgstr ""
5831"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5832"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5833
5834#: builtin/cat-file.c:520
5835msgid ""
5836"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5837"filters]"
5838msgstr ""
5839"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5840"filters]"
5841
5842#: builtin/cat-file.c:557
5843msgid "<type> can be one of: blob, tree, commit, tag"
5844msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
5845
5846#: builtin/cat-file.c:558
5847msgid "show object type"
5848msgstr "显示对象类型"
5849
5850#: builtin/cat-file.c:559
5851msgid "show object size"
5852msgstr "显示对象大小"
5853
5854#: builtin/cat-file.c:561
5855msgid "exit with zero when there's no error"
5856msgstr "当没有错误时退出并返回零"
5857
5858#: builtin/cat-file.c:562
5859msgid "pretty-print object's content"
5860msgstr "美观地打印对象的内容"
5861
5862#: builtin/cat-file.c:564
5863msgid "for blob objects, run textconv on object's content"
5864msgstr "对于数据对象,对其内容做文本转换"
5865
5866#: builtin/cat-file.c:566
5867msgid "for blob objects, run filters on object's content"
5868msgstr "对于数据对象,对其内容做过滤"
5869
5870#: builtin/cat-file.c:567 git-submodule.sh:944
5871msgid "blob"
5872msgstr "数据对象"
5873
5874#: builtin/cat-file.c:568
5875msgid "use a specific path for --textconv/--filters"
5876msgstr "对于 --textconv/--filters 使用一个特定的路径"
5877
5878#: builtin/cat-file.c:570
5879msgid "allow -s and -t to work with broken/corrupt objects"
5880msgstr "允许 -s 和 -t 对损坏的对象生效"
5881
5882#: builtin/cat-file.c:571
5883msgid "buffer --batch output"
5884msgstr "缓冲 --batch 的输出"
5885
5886#: builtin/cat-file.c:573
5887msgid "show info and content of objects fed from the standard input"
5888msgstr "显示从标准输入提供的对象的信息和内容"
5889
5890#: builtin/cat-file.c:576
5891msgid "show info about objects fed from the standard input"
5892msgstr "显示从标准输入提供的对象的信息"
5893
5894#: builtin/cat-file.c:579
5895msgid "follow in-tree symlinks (used with --batch or --batch-check)"
5896msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
5897
5898#: builtin/cat-file.c:581
5899msgid "show all objects with --batch or --batch-check"
5900msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
5901
5902#: builtin/check-attr.c:12
5903msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
5904msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
5905
5906#: builtin/check-attr.c:13
5907msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
5908msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
5909
5910#: builtin/check-attr.c:20
5911msgid "report all attributes set on file"
5912msgstr "报告设置在文件上的所有属性"
5913
5914#: builtin/check-attr.c:21
5915msgid "use .gitattributes only from the index"
5916msgstr "只使用索引中的 .gitattributes"
5917
5918#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
5919msgid "read file names from stdin"
5920msgstr "从标准输入读出文件名"
5921
5922#: builtin/check-attr.c:24 builtin/check-ignore.c:26
5923msgid "terminate input and output records by a NUL character"
5924msgstr "输入和输出的记录使用 NUL 字符终结"
5925
5926#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
5927msgid "suppress progress reporting"
5928msgstr "不显示进度报告"
5929
5930#: builtin/check-ignore.c:28
5931msgid "show non-matching input paths"
5932msgstr "显示未匹配的输入路径"
5933
5934#: builtin/check-ignore.c:30
5935msgid "ignore index when checking"
5936msgstr "检查时忽略索引"
5937
5938#: builtin/check-ignore.c:158
5939msgid "cannot specify pathnames with --stdin"
5940msgstr "不能同时指定路径及 --stdin 参数"
5941
5942#: builtin/check-ignore.c:161
5943msgid "-z only makes sense with --stdin"
5944msgstr "-z 需要和 --stdin 参数共用才有意义"
5945
5946#: builtin/check-ignore.c:163
5947msgid "no path specified"
5948msgstr "未指定路径"
5949
5950#: builtin/check-ignore.c:167
5951msgid "--quiet is only valid with a single pathname"
5952msgstr "参数 --quiet 只在提供一个路径名时有效"
5953
5954#: builtin/check-ignore.c:169
5955msgid "cannot have both --quiet and --verbose"
5956msgstr "不能同时提供 --quiet 和 --verbose 参数"
5957
5958#: builtin/check-ignore.c:172
5959msgid "--non-matching is only valid with --verbose"
5960msgstr "--non-matching 选项只在使用 --verbose 时有效"
5961
5962#: builtin/check-mailmap.c:9
5963msgid "git check-mailmap [<options>] <contact>..."
5964msgstr "git check-mailmap [<选项>] <联系地址>..."
5965
5966#: builtin/check-mailmap.c:14
5967msgid "also read contacts from stdin"
5968msgstr "还从标准输入读取联系地址"
5969
5970#: builtin/check-mailmap.c:25
5971#, c-format
5972msgid "unable to parse contact: %s"
5973msgstr "不能解析联系地址:%s"
5974
5975#: builtin/check-mailmap.c:48
5976msgid "no contacts specified"
5977msgstr "未指定联系地址"
5978
5979#: builtin/checkout-index.c:128
5980msgid "git checkout-index [<options>] [--] [<file>...]"
5981msgstr "git checkout-index [<选项>] [--] [<文件>...]"
5982
5983#: builtin/checkout-index.c:145
5984msgid "stage should be between 1 and 3 or all"
5985msgstr "索引值应该取值 1 到 3 或者 all"
5986
5987#: builtin/checkout-index.c:161
5988msgid "check out all files in the index"
5989msgstr "检出索引区的所有文件"
5990
5991#: builtin/checkout-index.c:162
5992msgid "force overwrite of existing files"
5993msgstr "强制覆盖现有的文件"
5994
5995#: builtin/checkout-index.c:164
5996msgid "no warning for existing files and files not in index"
5997msgstr "存在或不在索引中的文件都没有警告"
5998
5999#: builtin/checkout-index.c:166
6000msgid "don't checkout new files"
6001msgstr "不检出新文件"
6002
6003#: builtin/checkout-index.c:168
6004msgid "update stat information in the index file"
6005msgstr "更新索引中文件的状态信息"
6006
6007#: builtin/checkout-index.c:172
6008msgid "read list of paths from the standard input"
6009msgstr "从标准输入读取路径列表"
6010
6011#: builtin/checkout-index.c:174
6012msgid "write the content to temporary files"
6013msgstr "将内容写入临时文件"
6014
6015#: builtin/checkout-index.c:175 builtin/column.c:31
6016#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
6017#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
6018#: builtin/worktree.c:478
6019msgid "string"
6020msgstr "字符串"
6021
6022#: builtin/checkout-index.c:176
6023msgid "when creating files, prepend <string>"
6024msgstr "在创建文件时,在前面加上 <字符串>"
6025
6026#: builtin/checkout-index.c:178
6027msgid "copy out the files from named stage"
6028msgstr "从指定暂存区中拷出文件"
6029
6030#: builtin/checkout.c:26
6031msgid "git checkout [<options>] <branch>"
6032msgstr "git checkout [<选项>] <分支>"
6033
6034#: builtin/checkout.c:27
6035msgid "git checkout [<options>] [<branch>] -- <file>..."
6036msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
6037
6038#: builtin/checkout.c:135 builtin/checkout.c:168
6039#, c-format
6040msgid "path '%s' does not have our version"
6041msgstr "路径 '%s' 没有我们的版本"
6042
6043#: builtin/checkout.c:137 builtin/checkout.c:170
6044#, c-format
6045msgid "path '%s' does not have their version"
6046msgstr "路径 '%s' 没有他们的版本"
6047
6048#: builtin/checkout.c:153
6049#, c-format
6050msgid "path '%s' does not have all necessary versions"
6051msgstr "路径 '%s' 没有全部必须的版本"
6052
6053#: builtin/checkout.c:197
6054#, c-format
6055msgid "path '%s' does not have necessary versions"
6056msgstr "路径 '%s' 没有必须的版本"
6057
6058#: builtin/checkout.c:214
6059#, c-format
6060msgid "path '%s': cannot merge"
6061msgstr "path '%s':无法合并"
6062
6063#: builtin/checkout.c:231
6064#, c-format
6065msgid "Unable to add merge result for '%s'"
6066msgstr "无法为 '%s' 添加合并结果"
6067
6068#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
6069#: builtin/checkout.c:262
6070#, c-format
6071msgid "'%s' cannot be used with updating paths"
6072msgstr "'%s' 不能在更新路径时使用"
6073
6074#: builtin/checkout.c:265 builtin/checkout.c:268
6075#, c-format
6076msgid "'%s' cannot be used with %s"
6077msgstr "'%s' 不能和 %s 同时使用"
6078
6079#: builtin/checkout.c:271
6080#, c-format
6081msgid "Cannot update paths and switch to branch '%s' at the same time."
6082msgstr "不能同时更新路径并切换到分支'%s'。"
6083
6084#: builtin/checkout.c:342 builtin/checkout.c:349
6085#, c-format
6086msgid "path '%s' is unmerged"
6087msgstr "路径 '%s' 未合并"
6088
6089#: builtin/checkout.c:497
6090msgid "you need to resolve your current index first"
6091msgstr "您需要先解决当前索引的冲突"
6092
6093#: builtin/checkout.c:628
6094#, c-format
6095msgid "Can not do reflog for '%s': %s\n"
6096msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
6097
6098#: builtin/checkout.c:669
6099msgid "HEAD is now at"
6100msgstr "HEAD 目前位于"
6101
6102#: builtin/checkout.c:673 builtin/clone.c:682
6103msgid "unable to update HEAD"
6104msgstr "不能更新 HEAD"
6105
6106#: builtin/checkout.c:677
6107#, c-format
6108msgid "Reset branch '%s'\n"
6109msgstr "重置分支 '%s'\n"
6110
6111#: builtin/checkout.c:680
6112#, c-format
6113msgid "Already on '%s'\n"
6114msgstr "已经位于 '%s'\n"
6115
6116#: builtin/checkout.c:684
6117#, c-format
6118msgid "Switched to and reset branch '%s'\n"
6119msgstr "切换并重置分支 '%s'\n"
6120
6121#: builtin/checkout.c:686 builtin/checkout.c:1075
6122#, c-format
6123msgid "Switched to a new branch '%s'\n"
6124msgstr "切换到一个新分支 '%s'\n"
6125
6126#: builtin/checkout.c:688
6127#, c-format
6128msgid "Switched to branch '%s'\n"
6129msgstr "切换到分支 '%s'\n"
6130
6131#  译者:注意保持前导空格
6132#: builtin/checkout.c:739
6133#, c-format
6134msgid " ... and %d more.\n"
6135msgstr " ... 及其它 %d 个。\n"
6136
6137#: builtin/checkout.c:745
6138#, c-format
6139msgid ""
6140"Warning: you are leaving %d commit behind, not connected to\n"
6141"any of your branches:\n"
6142"\n"
6143"%s\n"
6144msgid_plural ""
6145"Warning: you are leaving %d commits behind, not connected to\n"
6146"any of your branches:\n"
6147"\n"
6148"%s\n"
6149msgstr[0] ""
6150"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6151"\n"
6152"%s\n"
6153msgstr[1] ""
6154"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6155"\n"
6156"%s\n"
6157
6158#: builtin/checkout.c:764
6159#, c-format
6160msgid ""
6161"If you want to keep it by creating a new branch, this may be a good time\n"
6162"to do so with:\n"
6163"\n"
6164" git branch <new-branch-name> %s\n"
6165"\n"
6166msgid_plural ""
6167"If you want to keep them by creating a new branch, this may be a good time\n"
6168"to do so with:\n"
6169"\n"
6170" git branch <new-branch-name> %s\n"
6171"\n"
6172msgstr[0] ""
6173"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6174"如下操作:\n"
6175"\n"
6176" git branch <新分支名> %s\n"
6177"\n"
6178msgstr[1] ""
6179"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
6180"如下操作:\n"
6181"\n"
6182" git branch <新分支名> %s\n"
6183"\n"
6184
6185#: builtin/checkout.c:800
6186msgid "internal error in revision walk"
6187msgstr "在版本遍历时遇到内部错误"
6188
6189#: builtin/checkout.c:804
6190msgid "Previous HEAD position was"
6191msgstr "之前的 HEAD 位置是"
6192
6193#: builtin/checkout.c:832 builtin/checkout.c:1070
6194msgid "You are on a branch yet to be born"
6195msgstr "您位于一个尚未初始化的分支"
6196
6197#: builtin/checkout.c:976
6198#, c-format
6199msgid "only one reference expected, %d given."
6200msgstr "应只有一个引用,却给出了 %d 个"
6201
6202#: builtin/checkout.c:1016 builtin/worktree.c:215
6203#, c-format
6204msgid "invalid reference: %s"
6205msgstr "无效引用:%s"
6206
6207#: builtin/checkout.c:1045
6208#, c-format
6209msgid "reference is not a tree: %s"
6210msgstr "引用不是一个树:%s"
6211
6212#: builtin/checkout.c:1084
6213msgid "paths cannot be used with switching branches"
6214msgstr "路径不能和切换分支同时使用"
6215
6216#: builtin/checkout.c:1087 builtin/checkout.c:1091
6217#, c-format
6218msgid "'%s' cannot be used with switching branches"
6219msgstr "'%s' 不能和切换分支同时使用"
6220
6221#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
6222#: builtin/checkout.c:1106
6223#, c-format
6224msgid "'%s' cannot be used with '%s'"
6225msgstr "'%s' 不能和 '%s' 同时使用"
6226
6227#: builtin/checkout.c:1111
6228#, c-format
6229msgid "Cannot switch branch to a non-commit '%s'"
6230msgstr "不能切换分支到一个非提交 '%s'"
6231
6232#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
6233#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
6234#: builtin/worktree.c:330
6235msgid "branch"
6236msgstr "分支"
6237
6238#: builtin/checkout.c:1145
6239msgid "create and checkout a new branch"
6240msgstr "创建并检出一个新的分支"
6241
6242#: builtin/checkout.c:1147
6243msgid "create/reset and checkout a branch"
6244msgstr "创建/重置并检出一个分支"
6245
6246#: builtin/checkout.c:1148
6247msgid "create reflog for new branch"
6248msgstr "为新的分支创建引用日志"
6249
6250#: builtin/checkout.c:1149 builtin/worktree.c:332
6251msgid "detach HEAD at named commit"
6252msgstr "HEAD 从指定的提交分离"
6253
6254#: builtin/checkout.c:1150
6255msgid "set upstream info for new branch"
6256msgstr "为新的分支设置上游信息"
6257
6258#: builtin/checkout.c:1152
6259msgid "new-branch"
6260msgstr "新分支"
6261
6262#: builtin/checkout.c:1152
6263msgid "new unparented branch"
6264msgstr "新的没有父提交的分支"
6265
6266#: builtin/checkout.c:1153
6267msgid "checkout our version for unmerged files"
6268msgstr "对尚未合并的文件检出我们的版本"
6269
6270#: builtin/checkout.c:1155
6271msgid "checkout their version for unmerged files"
6272msgstr "对尚未合并的文件检出他们的版本"
6273
6274#: builtin/checkout.c:1157
6275msgid "force checkout (throw away local modifications)"
6276msgstr "强制检出(丢弃本地修改)"
6277
6278#: builtin/checkout.c:1158
6279msgid "perform a 3-way merge with the new branch"
6280msgstr "和新的分支执行三方合并"
6281
6282#: builtin/checkout.c:1159 builtin/merge.c:235
6283msgid "update ignored files (default)"
6284msgstr "更新忽略的文件(默认)"
6285
6286#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
6287msgid "style"
6288msgstr "风格"
6289
6290#: builtin/checkout.c:1161
6291msgid "conflict style (merge or diff3)"
6292msgstr "冲突输出风格(merge 或 diff3)"
6293
6294#: builtin/checkout.c:1164
6295msgid "do not limit pathspecs to sparse entries only"
6296msgstr "对路径不做稀疏检出的限制"
6297
6298#: builtin/checkout.c:1166
6299msgid "second guess 'git checkout <no-such-branch>'"
6300msgstr "二次猜测'git checkout <无此分支>'"
6301
6302#: builtin/checkout.c:1168
6303msgid "do not check if another worktree is holding the given ref"
6304msgstr "不检查指定的引用是否被其他工作区所占用"
6305
6306#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
6307#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
6308#: builtin/send-pack.c:173
6309msgid "force progress reporting"
6310msgstr "强制显示进度报告"
6311
6312#: builtin/checkout.c:1203
6313msgid "-b, -B and --orphan are mutually exclusive"
6314msgstr "-b、-B 和 --orphan 是互斥的"
6315
6316#: builtin/checkout.c:1220
6317msgid "--track needs a branch name"
6318msgstr "--track 需要一个分支名"
6319
6320#: builtin/checkout.c:1225
6321msgid "Missing branch name; try -b"
6322msgstr "缺少分支名;尝试 -b"
6323
6324#: builtin/checkout.c:1261
6325msgid "invalid path specification"
6326msgstr "无效的路径规格"
6327
6328#: builtin/checkout.c:1268
6329#, c-format
6330msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
6331msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
6332
6333#: builtin/checkout.c:1272
6334#, c-format
6335msgid "git checkout: --detach does not take a path argument '%s'"
6336msgstr "git checkout:--detach 不能接收路径参数 '%s'"
6337
6338#: builtin/checkout.c:1276
6339msgid ""
6340"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
6341"checking out of the index."
6342msgstr ""
6343"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
6344
6345#: builtin/clean.c:26
6346msgid ""
6347"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
6348msgstr ""
6349"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
6350
6351#: builtin/clean.c:30
6352#, c-format
6353msgid "Removing %s\n"
6354msgstr "正删除 %s\n"
6355
6356#: builtin/clean.c:31
6357#, c-format
6358msgid "Would remove %s\n"
6359msgstr "将删除 %s\n"
6360
6361#: builtin/clean.c:32
6362#, c-format
6363msgid "Skipping repository %s\n"
6364msgstr "忽略仓库 %s\n"
6365
6366#: builtin/clean.c:33
6367#, c-format
6368msgid "Would skip repository %s\n"
6369msgstr "将忽略仓库 %s\n"
6370
6371#: builtin/clean.c:34
6372#, c-format
6373msgid "failed to remove %s"
6374msgstr "无法删除 %s"
6375
6376#: builtin/clean.c:298 git-add--interactive.perl:572
6377#, c-format
6378msgid ""
6379"Prompt help:\n"
6380"1          - select a numbered item\n"
6381"foo        - select item based on unique prefix\n"
6382"           - (empty) select nothing\n"
6383msgstr ""
6384"帮助:\n"
6385"1          - 通过编号选择一个选项\n"
6386"foo        - 通过唯一前缀选择一个选项\n"
6387"           - (空)什么也不选择\n"
6388
6389#: builtin/clean.c:302 git-add--interactive.perl:581
6390#, c-format
6391msgid ""
6392"Prompt help:\n"
6393"1          - select a single item\n"
6394"3-5        - select a range of items\n"
6395"2-3,6-9    - select multiple ranges\n"
6396"foo        - select item based on unique prefix\n"
6397"-...       - unselect specified items\n"
6398"*          - choose all items\n"
6399"           - (empty) finish selecting\n"
6400msgstr ""
6401"帮助:\n"
6402"1          - 选择一个选项\n"
6403"3-5        - 选择一个范围内的所有选项\n"
6404"2-3,6-9    - 选择多个范围内的所有选项\n"
6405"foo        - 通过唯一前缀选择一个选项\n"
6406"-...       - 反选特定的选项\n"
6407"*          - 选择所有选项\n"
6408"           - (空)结束选择\n"
6409
6410#: builtin/clean.c:518 git-add--interactive.perl:547
6411#: git-add--interactive.perl:552
6412#, c-format, perl-format
6413msgid "Huh (%s)?\n"
6414msgstr "嗯(%s)?\n"
6415
6416#: builtin/clean.c:660
6417#, c-format
6418msgid "Input ignore patterns>> "
6419msgstr "输入模版以排除条目>> "
6420
6421#: builtin/clean.c:697
6422#, c-format
6423msgid "WARNING: Cannot find items matched by: %s"
6424msgstr "警告:无法找到和 %s 匹配的条目"
6425
6426#: builtin/clean.c:718
6427msgid "Select items to delete"
6428msgstr "选择要删除的条目"
6429
6430#. TRANSLATORS: Make sure to keep [y/N] as is
6431#: builtin/clean.c:759
6432#, c-format
6433msgid "Remove %s [y/N]? "
6434msgstr "删除 %s [y/N]?"
6435
6436#: builtin/clean.c:784 git-add--interactive.perl:1616
6437#, c-format
6438msgid "Bye.\n"
6439msgstr "再见。\n"
6440
6441#: builtin/clean.c:792
6442msgid ""
6443"clean               - start cleaning\n"
6444"filter by pattern   - exclude items from deletion\n"
6445"select by numbers   - select items to be deleted by numbers\n"
6446"ask each            - confirm each deletion (like \"rm -i\")\n"
6447"quit                - stop cleaning\n"
6448"help                - this screen\n"
6449"?                   - help for prompt selection"
6450msgstr ""
6451"clean               - 开始清理\n"
6452"filter by pattern   - 通过模版排除要删除的条目\n"
6453"select by numbers   - 通过数字选择要删除的条目\n"
6454"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
6455"quit                - 停止删除并退出\n"
6456"help                - 显示本帮助\n"
6457"?                   - 显示如何在提示符下选择的帮助"
6458
6459#: builtin/clean.c:819 git-add--interactive.perl:1692
6460msgid "*** Commands ***"
6461msgstr "*** 命令 ***"
6462
6463#: builtin/clean.c:820 git-add--interactive.perl:1689
6464msgid "What now"
6465msgstr "请选择"
6466
6467#: builtin/clean.c:828
6468msgid "Would remove the following item:"
6469msgid_plural "Would remove the following items:"
6470msgstr[0] "将删除如下条目:"
6471msgstr[1] "将删除如下条目:"
6472
6473#: builtin/clean.c:844
6474msgid "No more files to clean, exiting."
6475msgstr "没有要清理的文件,退出。"
6476
6477#: builtin/clean.c:906
6478msgid "do not print names of files removed"
6479msgstr "不打印删除文件的名称"
6480
6481#: builtin/clean.c:908
6482msgid "force"
6483msgstr "强制"
6484
6485#: builtin/clean.c:909
6486msgid "interactive cleaning"
6487msgstr "交互式清除"
6488
6489#: builtin/clean.c:911
6490msgid "remove whole directories"
6491msgstr "删除整个目录"
6492
6493#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
6494#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
6495#: builtin/name-rev.c:399 builtin/show-ref.c:176
6496msgid "pattern"
6497msgstr "模式"
6498
6499#: builtin/clean.c:913
6500msgid "add <pattern> to ignore rules"
6501msgstr "添加 <模式> 到忽略规则"
6502
6503#: builtin/clean.c:914
6504msgid "remove ignored files, too"
6505msgstr "也删除忽略的文件"
6506
6507#: builtin/clean.c:916
6508msgid "remove only ignored files"
6509msgstr "只删除忽略的文件"
6510
6511#: builtin/clean.c:934
6512msgid "-x and -X cannot be used together"
6513msgstr "-x 和 -X 不能同时使用"
6514
6515#: builtin/clean.c:938
6516msgid ""
6517"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
6518"clean"
6519msgstr ""
6520"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6521
6522#: builtin/clean.c:941
6523msgid ""
6524"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
6525"refusing to clean"
6526msgstr ""
6527"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6528
6529#: builtin/clone.c:38
6530msgid "git clone [<options>] [--] <repo> [<dir>]"
6531msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
6532
6533#: builtin/clone.c:82
6534msgid "don't create a checkout"
6535msgstr "不创建一个检出"
6536
6537#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
6538msgid "create a bare repository"
6539msgstr "创建一个纯仓库"
6540
6541#: builtin/clone.c:87
6542msgid "create a mirror repository (implies bare)"
6543msgstr "创建一个镜像仓库(也是纯仓库)"
6544
6545#: builtin/clone.c:89
6546msgid "to clone from a local repository"
6547msgstr "从本地仓库克隆"
6548
6549#: builtin/clone.c:91
6550msgid "don't use local hardlinks, always copy"
6551msgstr "不使用本地硬链接,始终复制"
6552
6553#: builtin/clone.c:93
6554msgid "setup as shared repository"
6555msgstr "设置为共享仓库"
6556
6557#: builtin/clone.c:95 builtin/clone.c:99
6558msgid "pathspec"
6559msgstr "路径规格"
6560
6561#: builtin/clone.c:95 builtin/clone.c:99
6562msgid "initialize submodules in the clone"
6563msgstr "在克隆时初始化子模组"
6564
6565#: builtin/clone.c:102
6566msgid "number of submodules cloned in parallel"
6567msgstr "并发克隆的子模组的数量"
6568
6569#: builtin/clone.c:103 builtin/init-db.c:476
6570msgid "template-directory"
6571msgstr "模板目录"
6572
6573#: builtin/clone.c:104 builtin/init-db.c:477
6574msgid "directory from which templates will be used"
6575msgstr "模板目录将被使用"
6576
6577#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
6578#: builtin/submodule--helper.c:983
6579msgid "reference repository"
6580msgstr "参考仓库"
6581
6582#: builtin/clone.c:110
6583msgid "use --reference only while cloning"
6584msgstr "仅在克隆时参考 --reference 指向的本地仓库"
6585
6586#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
6587msgid "name"
6588msgstr "名称"
6589
6590#: builtin/clone.c:112
6591msgid "use <name> instead of 'origin' to track upstream"
6592msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
6593
6594#: builtin/clone.c:114
6595msgid "checkout <branch> instead of the remote's HEAD"
6596msgstr "检出 <分支> 而不是远程 HEAD"
6597
6598#: builtin/clone.c:116
6599msgid "path to git-upload-pack on the remote"
6600msgstr "远程 git-upload-pack 路径"
6601
6602#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
6603#: builtin/pull.c:205
6604msgid "depth"
6605msgstr "深度"
6606
6607#: builtin/clone.c:118
6608msgid "create a shallow clone of that depth"
6609msgstr "创建一个指定深度的浅克隆"
6610
6611#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
6612#: parse-options.h:142
6613msgid "time"
6614msgstr "时间"
6615
6616#: builtin/clone.c:120
6617msgid "create a shallow clone since a specific time"
6618msgstr "从一个特定时间创建一个浅克隆"
6619
6620#: builtin/clone.c:121 builtin/fetch.c:119
6621msgid "revision"
6622msgstr "版本"
6623
6624#: builtin/clone.c:122 builtin/fetch.c:120
6625msgid "deepen history of shallow clone, excluding rev"
6626msgstr "深化浅克隆的历史,除了特定版本"
6627
6628#: builtin/clone.c:124
6629msgid "clone only one branch, HEAD or --branch"
6630msgstr "只克隆一个分支、HEAD 或 --branch"
6631
6632#: builtin/clone.c:126
6633msgid "don't clone any tags, and make later fetches not to follow them"
6634msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
6635
6636#: builtin/clone.c:128
6637msgid "any cloned submodules will be shallow"
6638msgstr "子模组将以浅下载模式克隆"
6639
6640#: builtin/clone.c:129 builtin/init-db.c:485
6641msgid "gitdir"
6642msgstr "git目录"
6643
6644#: builtin/clone.c:130 builtin/init-db.c:486
6645msgid "separate git dir from working tree"
6646msgstr "git目录和工作区分离"
6647
6648#: builtin/clone.c:131
6649msgid "key=value"
6650msgstr "key=value"
6651
6652#: builtin/clone.c:132
6653msgid "set config inside the new repository"
6654msgstr "在新仓库中设置配置信息"
6655
6656#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
6657msgid "use IPv4 addresses only"
6658msgstr "只使用 IPv4 地址"
6659
6660#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
6661msgid "use IPv6 addresses only"
6662msgstr "只使用 IPv6 地址"
6663
6664#: builtin/clone.c:272
6665msgid ""
6666"No directory name could be guessed.\n"
6667"Please specify a directory on the command line"
6668msgstr ""
6669"无法猜到目录名。\n"
6670"请在命令行指定一个目录"
6671
6672#: builtin/clone.c:325
6673#, c-format
6674msgid "info: Could not add alternate for '%s': %s\n"
6675msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
6676
6677#: builtin/clone.c:397
6678#, c-format
6679msgid "failed to open '%s'"
6680msgstr "无法打开 '%s'"
6681
6682#: builtin/clone.c:405
6683#, c-format
6684msgid "%s exists and is not a directory"
6685msgstr "%s 存在且不是一个目录"
6686
6687#: builtin/clone.c:419
6688#, c-format
6689msgid "failed to stat %s\n"
6690msgstr "对 %s 调用 stat 失败\n"
6691
6692#: builtin/clone.c:441
6693#, c-format
6694msgid "failed to create link '%s'"
6695msgstr "无法创建链接 '%s'"
6696
6697#: builtin/clone.c:445
6698#, c-format
6699msgid "failed to copy file to '%s'"
6700msgstr "无法拷贝文件至 '%s'"
6701
6702#: builtin/clone.c:470
6703#, c-format
6704msgid "done.\n"
6705msgstr "完成。\n"
6706
6707#: builtin/clone.c:482
6708msgid ""
6709"Clone succeeded, but checkout failed.\n"
6710"You can inspect what was checked out with 'git status'\n"
6711"and retry the checkout with 'git checkout -f HEAD'\n"
6712msgstr ""
6713"克隆成功,但是检出失败。\n"
6714"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6715"'git checkout -f HEAD' 重试\n"
6716
6717#: builtin/clone.c:559
6718#, c-format
6719msgid "Could not find remote branch %s to clone."
6720msgstr "不能发现要克隆的远程分支 %s。"
6721
6722#: builtin/clone.c:654
6723msgid "remote did not send all necessary objects"
6724msgstr "远程没有发送所有必须的对象"
6725
6726#: builtin/clone.c:670
6727#, c-format
6728msgid "unable to update %s"
6729msgstr "不能更新 %s"
6730
6731#: builtin/clone.c:719
6732msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6733msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6734
6735#: builtin/clone.c:750
6736msgid "unable to checkout working tree"
6737msgstr "不能检出工作区"
6738
6739#: builtin/clone.c:792
6740msgid "unable to write parameters to config file"
6741msgstr "无法将参数写入配置文件"
6742
6743#: builtin/clone.c:855
6744msgid "cannot repack to clean up"
6745msgstr "无法执行 repack 来清理"
6746
6747#: builtin/clone.c:857
6748msgid "cannot unlink temporary alternates file"
6749msgstr "无法删除临时的 alternates 文件"
6750
6751#: builtin/clone.c:890 builtin/receive-pack.c:1945
6752msgid "Too many arguments."
6753msgstr "太多参数。"
6754
6755#: builtin/clone.c:894
6756msgid "You must specify a repository to clone."
6757msgstr "您必须指定一个仓库来克隆。"
6758
6759#: builtin/clone.c:907
6760#, c-format
6761msgid "--bare and --origin %s options are incompatible."
6762msgstr "--bare 和 --origin %s 选项不兼容。"
6763
6764#: builtin/clone.c:910
6765msgid "--bare and --separate-git-dir are incompatible."
6766msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6767
6768#: builtin/clone.c:923
6769#, c-format
6770msgid "repository '%s' does not exist"
6771msgstr "仓库 '%s' 不存在"
6772
6773#: builtin/clone.c:929 builtin/fetch.c:1337
6774#, c-format
6775msgid "depth %s is not a positive number"
6776msgstr "深度 %s 不是一个正数"
6777
6778#: builtin/clone.c:939
6779#, c-format
6780msgid "destination path '%s' already exists and is not an empty directory."
6781msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
6782
6783#: builtin/clone.c:949
6784#, c-format
6785msgid "working tree '%s' already exists."
6786msgstr "工作区 '%s' 已经存在。"
6787
6788#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
6789#: builtin/worktree.c:222 builtin/worktree.c:252
6790#, c-format
6791msgid "could not create leading directories of '%s'"
6792msgstr "不能为 '%s' 创建先导目录"
6793
6794#: builtin/clone.c:967
6795#, c-format
6796msgid "could not create work tree dir '%s'"
6797msgstr "不能创建工作区目录 '%s'"
6798
6799#: builtin/clone.c:979
6800#, c-format
6801msgid "Cloning into bare repository '%s'...\n"
6802msgstr "克隆到纯仓库 '%s'...\n"
6803
6804#: builtin/clone.c:981
6805#, c-format
6806msgid "Cloning into '%s'...\n"
6807msgstr "正克隆到 '%s'...\n"
6808
6809#: builtin/clone.c:1005
6810msgid ""
6811"clone --recursive is not compatible with both --reference and --reference-if-"
6812"able"
6813msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
6814
6815#: builtin/clone.c:1067
6816msgid "--depth is ignored in local clones; use file:// instead."
6817msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6818
6819#: builtin/clone.c:1069
6820msgid "--shallow-since is ignored in local clones; use file:// instead."
6821msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6822
6823#: builtin/clone.c:1071
6824msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6825msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6826
6827#: builtin/clone.c:1074
6828msgid "source repository is shallow, ignoring --local"
6829msgstr "源仓库是浅克隆,忽略 --local"
6830
6831#: builtin/clone.c:1079
6832msgid "--local is ignored"
6833msgstr "--local 被忽略"
6834
6835#: builtin/clone.c:1083
6836#, c-format
6837msgid "Don't know how to clone %s"
6838msgstr "不知道如何克隆 %s"
6839
6840#: builtin/clone.c:1138 builtin/clone.c:1146
6841#, c-format
6842msgid "Remote branch %s not found in upstream %s"
6843msgstr "远程分支 %s 在上游 %s 未发现"
6844
6845#: builtin/clone.c:1149
6846msgid "You appear to have cloned an empty repository."
6847msgstr "您似乎克隆了一个空仓库。"
6848
6849#: builtin/column.c:10
6850msgid "git column [<options>]"
6851msgstr "git column [<选项>]"
6852
6853#: builtin/column.c:27
6854msgid "lookup config vars"
6855msgstr "查找配置变量"
6856
6857#: builtin/column.c:28 builtin/column.c:29
6858msgid "layout to use"
6859msgstr "要使用的布局"
6860
6861#: builtin/column.c:30
6862msgid "Maximum width"
6863msgstr "最大宽度"
6864
6865#: builtin/column.c:31
6866msgid "Padding space on left border"
6867msgstr "左边框的填充空间"
6868
6869#: builtin/column.c:32
6870msgid "Padding space on right border"
6871msgstr "右边框的填充空间"
6872
6873#: builtin/column.c:33
6874msgid "Padding space between columns"
6875msgstr "两列之间的填充空间"
6876
6877#: builtin/column.c:52
6878msgid "--command must be the first argument"
6879msgstr "--command 必须是第一个参数"
6880
6881#: builtin/commit.c:39
6882msgid "git commit [<options>] [--] <pathspec>..."
6883msgstr "git commit [<选项>] [--] <路径规格>..."
6884
6885#: builtin/commit.c:44
6886msgid "git status [<options>] [--] <pathspec>..."
6887msgstr "git status [<选项>] [--] <路径规格>..."
6888
6889#: builtin/commit.c:49
6890msgid ""
6891"Your name and email address were configured automatically based\n"
6892"on your username and hostname. Please check that they are accurate.\n"
6893"You can suppress this message by setting them explicitly. Run the\n"
6894"following command and follow the instructions in your editor to edit\n"
6895"your configuration file:\n"
6896"\n"
6897"    git config --global --edit\n"
6898"\n"
6899"After doing this, you may fix the identity used for this commit with:\n"
6900"\n"
6901"    git commit --amend --reset-author\n"
6902msgstr ""
6903"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6904"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6905"中编辑您的配置文件:\n"
6906"\n"
6907"    git config --global --edit\n"
6908"\n"
6909"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6910"\n"
6911"    git commit --amend --reset-author\n"
6912
6913#: builtin/commit.c:62
6914msgid ""
6915"Your name and email address were configured automatically based\n"
6916"on your username and hostname. Please check that they are accurate.\n"
6917"You can suppress this message by setting them explicitly:\n"
6918"\n"
6919"    git config --global user.name \"Your Name\"\n"
6920"    git config --global user.email you@example.com\n"
6921"\n"
6922"After doing this, you may fix the identity used for this commit with:\n"
6923"\n"
6924"    git commit --amend --reset-author\n"
6925msgstr ""
6926"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6927"与否。您可以对其进行设置以免再出现本提示信息:\n"
6928"\n"
6929"    git config --global user.name \"Your Name\"\n"
6930"    git config --global user.email you@example.com\n"
6931"\n"
6932"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6933"\n"
6934"    git commit --amend --reset-author\n"
6935
6936#: builtin/commit.c:74
6937msgid ""
6938"You asked to amend the most recent commit, but doing so would make\n"
6939"it empty. You can repeat your command with --allow-empty, or you can\n"
6940"remove the commit entirely with \"git reset HEAD^\".\n"
6941msgstr ""
6942"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
6943"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
6944
6945#: builtin/commit.c:79
6946msgid ""
6947"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
6948"If you wish to commit it anyway, use:\n"
6949"\n"
6950"    git commit --allow-empty\n"
6951"\n"
6952msgstr ""
6953"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
6954"也要提交,使用命令:\n"
6955"\n"
6956"    git commit --allow-empty\n"
6957"\n"
6958
6959#: builtin/commit.c:86
6960msgid "Otherwise, please use 'git reset'\n"
6961msgstr "否则,请使用命令 'git reset'\n"
6962
6963#: builtin/commit.c:89
6964msgid ""
6965"If you wish to skip this commit, use:\n"
6966"\n"
6967"    git reset\n"
6968"\n"
6969"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
6970"the remaining commits.\n"
6971msgstr ""
6972"如果您想跳过这个提交,使用命令:\n"
6973"\n"
6974"    git reset\n"
6975"\n"
6976"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
6977"操作。\n"
6978
6979#: builtin/commit.c:319
6980msgid "failed to unpack HEAD tree object"
6981msgstr "无法解包 HEAD 树对象"
6982
6983#: builtin/commit.c:360
6984msgid "unable to create temporary index"
6985msgstr "不能创建临时索引"
6986
6987#: builtin/commit.c:366
6988msgid "interactive add failed"
6989msgstr "交互式添加失败"
6990
6991#: builtin/commit.c:379
6992msgid "unable to update temporary index"
6993msgstr "无法更新临时索引"
6994
6995#: builtin/commit.c:381
6996msgid "Failed to update main cache tree"
6997msgstr "不能更新树的主缓存"
6998
6999#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
7000msgid "unable to write new_index file"
7001msgstr "无法写 new_index 文件"
7002
7003#: builtin/commit.c:459
7004msgid "cannot do a partial commit during a merge."
7005msgstr "在合并过程中不能做部分提交。"
7006
7007#: builtin/commit.c:461
7008msgid "cannot do a partial commit during a cherry-pick."
7009msgstr "在拣选过程中不能做部分提交。"
7010
7011#: builtin/commit.c:470
7012msgid "cannot read the index"
7013msgstr "无法读取索引"
7014
7015#: builtin/commit.c:489
7016msgid "unable to write temporary index file"
7017msgstr "无法写临时索引文件"
7018
7019#: builtin/commit.c:583
7020#, c-format
7021msgid "commit '%s' lacks author header"
7022msgstr "提交 '%s' 缺少作者信息"
7023
7024#: builtin/commit.c:585
7025#, c-format
7026msgid "commit '%s' has malformed author line"
7027msgstr "提交 '%s' 有非法的作者信息"
7028
7029#: builtin/commit.c:604
7030msgid "malformed --author parameter"
7031msgstr "非法的 --author 参数"
7032
7033#: builtin/commit.c:656
7034msgid ""
7035"unable to select a comment character that is not used\n"
7036"in the current commit message"
7037msgstr "无法选择一个未被当前提交说明使用的注释字符"
7038
7039#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
7040#, c-format
7041msgid "could not lookup commit %s"
7042msgstr "不能查询提交 %s"
7043
7044#: builtin/commit.c:705 builtin/shortlog.c:295
7045#, c-format
7046msgid "(reading log message from standard input)\n"
7047msgstr "(正从标准输入中读取日志信息)\n"
7048
7049#: builtin/commit.c:707
7050msgid "could not read log from standard input"
7051msgstr "不能从标准输入中读取日志信息"
7052
7053#: builtin/commit.c:711
7054#, c-format
7055msgid "could not read log file '%s'"
7056msgstr "不能读取日志文件 '%s'"
7057
7058#: builtin/commit.c:738 builtin/commit.c:746
7059msgid "could not read SQUASH_MSG"
7060msgstr "不能读取 SQUASH_MSG"
7061
7062#: builtin/commit.c:743
7063msgid "could not read MERGE_MSG"
7064msgstr "不能读取 MERGE_MSG"
7065
7066#: builtin/commit.c:797
7067msgid "could not write commit template"
7068msgstr "不能写提交模版"
7069
7070#: builtin/commit.c:815
7071#, c-format
7072msgid ""
7073"\n"
7074"It looks like you may be committing a merge.\n"
7075"If this is not correct, please remove the file\n"
7076"\t%s\n"
7077"and try again.\n"
7078msgstr ""
7079"\n"
7080"似乎您正在做一个合并提交。如果不对,请删除文件\n"
7081"\t%s\n"
7082"然后重试。\n"
7083
7084#: builtin/commit.c:820
7085#, c-format
7086msgid ""
7087"\n"
7088"It looks like you may be committing a cherry-pick.\n"
7089"If this is not correct, please remove the file\n"
7090"\t%s\n"
7091"and try again.\n"
7092msgstr ""
7093"\n"
7094"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
7095"\t%s\n"
7096"然后重试。\n"
7097
7098#: builtin/commit.c:833
7099#, c-format
7100msgid ""
7101"Please enter the commit message for your changes. Lines starting\n"
7102"with '%c' will be ignored, and an empty message aborts the commit.\n"
7103msgstr ""
7104"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
7105"说明将会终止提交。\n"
7106
7107#: builtin/commit.c:840
7108#, c-format
7109msgid ""
7110"Please enter the commit message for your changes. Lines starting\n"
7111"with '%c' will be kept; you may remove them yourself if you want to.\n"
7112"An empty message aborts the commit.\n"
7113msgstr ""
7114"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7115"也可以删除它们。一个空的提交说明将会终止提交。\n"
7116
7117#  译者:为保证在输出中对齐,注意调整句中空格!
7118#: builtin/commit.c:857
7119#, c-format
7120msgid "%sAuthor:    %.*s <%.*s>"
7121msgstr "%s作者:  %.*s <%.*s>"
7122
7123#  译者:为保证在输出中对齐,注意调整句中空格!
7124#: builtin/commit.c:865
7125#, c-format
7126msgid "%sDate:      %s"
7127msgstr "%s日期:  %s"
7128
7129#  译者:为保证在输出中对齐,注意调整句中空格!
7130#: builtin/commit.c:872
7131#, c-format
7132msgid "%sCommitter: %.*s <%.*s>"
7133msgstr "%s提交者:%.*s <%.*s>"
7134
7135#: builtin/commit.c:889
7136msgid "Cannot read index"
7137msgstr "无法读取索引"
7138
7139#: builtin/commit.c:951
7140msgid "Error building trees"
7141msgstr "无法创建树对象"
7142
7143#: builtin/commit.c:965 builtin/tag.c:274
7144#, c-format
7145msgid "Please supply the message using either -m or -F option.\n"
7146msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
7147
7148#: builtin/commit.c:1068
7149#, c-format
7150msgid "--author '%s' is not 'Name <email>' and matches no existing author"
7151msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
7152
7153#: builtin/commit.c:1083 builtin/commit.c:1328
7154#, c-format
7155msgid "Invalid untracked files mode '%s'"
7156msgstr "无效的未追踪文件参数 '%s'"
7157
7158#: builtin/commit.c:1121
7159msgid "--long and -z are incompatible"
7160msgstr "--long 和 -z 选项不兼容"
7161
7162#: builtin/commit.c:1151
7163msgid "Using both --reset-author and --author does not make sense"
7164msgstr "同时使用 --reset-author 和 --author 没有意义"
7165
7166#: builtin/commit.c:1160
7167msgid "You have nothing to amend."
7168msgstr "您没有可修补的提交。"
7169
7170#: builtin/commit.c:1163
7171msgid "You are in the middle of a merge -- cannot amend."
7172msgstr "您正处于一个合并过程中 -- 无法修补提交。"
7173
7174#: builtin/commit.c:1165
7175msgid "You are in the middle of a cherry-pick -- cannot amend."
7176msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
7177
7178#: builtin/commit.c:1168
7179msgid "Options --squash and --fixup cannot be used together"
7180msgstr "选项 --squash 和 --fixup 不能同时使用"
7181
7182#: builtin/commit.c:1178
7183msgid "Only one of -c/-C/-F/--fixup can be used."
7184msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7185
7186#: builtin/commit.c:1180
7187msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
7188msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
7189
7190#: builtin/commit.c:1188
7191msgid "--reset-author can be used only with -C, -c or --amend."
7192msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
7193
7194#: builtin/commit.c:1205
7195msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7196msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7197
7198#: builtin/commit.c:1207
7199msgid "No paths with --include/--only does not make sense."
7200msgstr "参数 --include/--only 不跟路径没有意义。"
7201
7202#: builtin/commit.c:1219 builtin/tag.c:552
7203#, c-format
7204msgid "Invalid cleanup mode %s"
7205msgstr "无效的清理模式 %s"
7206
7207#: builtin/commit.c:1224
7208msgid "Paths with -a does not make sense."
7209msgstr "路径和 -a 选项同时使用没有意义。"
7210
7211#: builtin/commit.c:1342 builtin/commit.c:1617
7212msgid "show status concisely"
7213msgstr "以简洁的格式显示状态"
7214
7215#: builtin/commit.c:1344 builtin/commit.c:1619
7216msgid "show branch information"
7217msgstr "显示分支信息"
7218
7219#: builtin/commit.c:1346
7220msgid "show stash information"
7221msgstr "显示贮藏区信息"
7222
7223#: builtin/commit.c:1348
7224msgid "version"
7225msgstr "版本"
7226
7227#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
7228#: builtin/worktree.c:449
7229msgid "machine-readable output"
7230msgstr "机器可读的输出"
7231
7232#: builtin/commit.c:1351 builtin/commit.c:1623
7233msgid "show status in long format (default)"
7234msgstr "以长格式显示状态(默认)"
7235
7236#: builtin/commit.c:1354 builtin/commit.c:1626
7237msgid "terminate entries with NUL"
7238msgstr "条目以 NUL 字符结尾"
7239
7240#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
7241#: builtin/fast-export.c:986 builtin/tag.c:412
7242msgid "mode"
7243msgstr "模式"
7244
7245#: builtin/commit.c:1357 builtin/commit.c:1629
7246msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
7247msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
7248
7249#: builtin/commit.c:1360
7250msgid "show ignored files"
7251msgstr "显示忽略的文件"
7252
7253#: builtin/commit.c:1361 parse-options.h:155
7254msgid "when"
7255msgstr "何时"
7256
7257#: builtin/commit.c:1362
7258msgid ""
7259"ignore changes to submodules, optional when: all, dirty, untracked. "
7260"(Default: all)"
7261msgstr ""
7262"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
7263
7264#: builtin/commit.c:1364
7265msgid "list untracked files in columns"
7266msgstr "以列的方式显示未跟踪的文件"
7267
7268#: builtin/commit.c:1440
7269msgid "couldn't look up newly created commit"
7270msgstr "无法找到新创建的提交"
7271
7272#: builtin/commit.c:1442
7273msgid "could not parse newly created commit"
7274msgstr "不能解析新创建的提交"
7275
7276#: builtin/commit.c:1487
7277msgid "detached HEAD"
7278msgstr "分离头指针"
7279
7280#  译者:中文字符串拼接,可删除前导空格
7281#: builtin/commit.c:1490
7282msgid " (root-commit)"
7283msgstr "(根提交)"
7284
7285#: builtin/commit.c:1587
7286msgid "suppress summary after successful commit"
7287msgstr "提交成功后不显示概述信息"
7288
7289#: builtin/commit.c:1588
7290msgid "show diff in commit message template"
7291msgstr "在提交说明模板里显示差异"
7292
7293#: builtin/commit.c:1590
7294msgid "Commit message options"
7295msgstr "提交说明选项"
7296
7297#: builtin/commit.c:1591 builtin/tag.c:410
7298msgid "read message from file"
7299msgstr "从文件中读取提交说明"
7300
7301#: builtin/commit.c:1592
7302msgid "author"
7303msgstr "作者"
7304
7305#: builtin/commit.c:1592
7306msgid "override author for commit"
7307msgstr "提交时覆盖作者"
7308
7309#: builtin/commit.c:1593 builtin/gc.c:358
7310msgid "date"
7311msgstr "日期"
7312
7313#: builtin/commit.c:1593
7314msgid "override date for commit"
7315msgstr "提交时覆盖日期"
7316
7317#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
7318#: builtin/notes.c:564 builtin/tag.c:408
7319msgid "message"
7320msgstr "说明"
7321
7322#: builtin/commit.c:1594
7323msgid "commit message"
7324msgstr "提交说明"
7325
7326#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
7327#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
7328msgid "commit"
7329msgstr "提交"
7330
7331#: builtin/commit.c:1595
7332msgid "reuse and edit message from specified commit"
7333msgstr "重用并编辑指定提交的提交说明"
7334
7335#: builtin/commit.c:1596
7336msgid "reuse message from specified commit"
7337msgstr "重用指定提交的提交说明"
7338
7339#: builtin/commit.c:1597
7340msgid "use autosquash formatted message to fixup specified commit"
7341msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
7342
7343#: builtin/commit.c:1598
7344msgid "use autosquash formatted message to squash specified commit"
7345msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
7346
7347#: builtin/commit.c:1599
7348msgid "the commit is authored by me now (used with -C/-c/--amend)"
7349msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
7350
7351#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
7352msgid "add Signed-off-by:"
7353msgstr "添加 Signed-off-by: 签名"
7354
7355#: builtin/commit.c:1601
7356msgid "use specified template file"
7357msgstr "使用指定的模板文件"
7358
7359#: builtin/commit.c:1602
7360msgid "force edit of commit"
7361msgstr "强制编辑提交"
7362
7363#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7364#: builtin/commit.c:1603
7365msgid "default"
7366msgstr "default"
7367
7368#: builtin/commit.c:1603 builtin/tag.c:413
7369msgid "how to strip spaces and #comments from message"
7370msgstr "设置如何删除提交说明里的空格和#注释"
7371
7372#: builtin/commit.c:1604
7373msgid "include status in commit message template"
7374msgstr "在提交说明模板里包含状态信息"
7375
7376#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
7377#: builtin/revert.c:113
7378msgid "GPG sign commit"
7379msgstr "GPG 提交签名"
7380
7381#: builtin/commit.c:1609
7382msgid "Commit contents options"
7383msgstr "提交内容选项"
7384
7385#: builtin/commit.c:1610
7386msgid "commit all changed files"
7387msgstr "提交所有改动的文件"
7388
7389#: builtin/commit.c:1611
7390msgid "add specified files to index for commit"
7391msgstr "添加指定的文件到索引区等待提交"
7392
7393#: builtin/commit.c:1612
7394msgid "interactively add files"
7395msgstr "交互式添加文件"
7396
7397#: builtin/commit.c:1613
7398msgid "interactively add changes"
7399msgstr "交互式添加变更"
7400
7401#: builtin/commit.c:1614
7402msgid "commit only specified files"
7403msgstr "只提交指定的文件"
7404
7405#: builtin/commit.c:1615
7406msgid "bypass pre-commit and commit-msg hooks"
7407msgstr "绕过 pre-commit 和 commit-msg 钩子"
7408
7409#: builtin/commit.c:1616
7410msgid "show what would be committed"
7411msgstr "显示将要提交的内容"
7412
7413#: builtin/commit.c:1627
7414msgid "amend previous commit"
7415msgstr "修改先前的提交"
7416
7417#: builtin/commit.c:1628
7418msgid "bypass post-rewrite hook"
7419msgstr "绕过 post-rewrite 钩子"
7420
7421#: builtin/commit.c:1633
7422msgid "ok to record an empty change"
7423msgstr "允许一个空提交"
7424
7425#: builtin/commit.c:1635
7426msgid "ok to record a change with an empty message"
7427msgstr "允许空的提交说明"
7428
7429#: builtin/commit.c:1665
7430msgid "could not parse HEAD commit"
7431msgstr "不能解析 HEAD 提交"
7432
7433#: builtin/commit.c:1710
7434#, c-format
7435msgid "Corrupt MERGE_HEAD file (%s)"
7436msgstr "损坏的 MERGE_HEAD 文件(%s)"
7437
7438#: builtin/commit.c:1717
7439msgid "could not read MERGE_MODE"
7440msgstr "不能读取 MERGE_MODE"
7441
7442#: builtin/commit.c:1736
7443#, c-format
7444msgid "could not read commit message: %s"
7445msgstr "不能读取提交说明:%s"
7446
7447#: builtin/commit.c:1747
7448#, c-format
7449msgid "Aborting commit; you did not edit the message.\n"
7450msgstr "终止提交;您未更改来自模版的提交说明。\n"
7451
7452#: builtin/commit.c:1752
7453#, c-format
7454msgid "Aborting commit due to empty commit message.\n"
7455msgstr "终止提交因为提交说明为空。\n"
7456
7457#: builtin/commit.c:1800
7458msgid ""
7459"Repository has been updated, but unable to write\n"
7460"new_index file. Check that disk is not full and quota is\n"
7461"not exceeded, and then \"git reset HEAD\" to recover."
7462msgstr ""
7463"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
7464"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
7465
7466#: builtin/config.c:10
7467msgid "git config [<options>]"
7468msgstr "git config [<选项>]"
7469
7470#: builtin/config.c:57
7471msgid "Config file location"
7472msgstr "配置文件位置"
7473
7474#: builtin/config.c:58
7475msgid "use global config file"
7476msgstr "使用全局配置文件"
7477
7478#: builtin/config.c:59
7479msgid "use system config file"
7480msgstr "使用系统级配置文件"
7481
7482#: builtin/config.c:60
7483msgid "use repository config file"
7484msgstr "使用仓库级配置文件"
7485
7486#: builtin/config.c:61
7487msgid "use given config file"
7488msgstr "使用指定的配置文件"
7489
7490#: builtin/config.c:62
7491msgid "blob-id"
7492msgstr "数据对象 ID"
7493
7494#: builtin/config.c:62
7495msgid "read config from given blob object"
7496msgstr "从给定的数据对象读取配置"
7497
7498#: builtin/config.c:63
7499msgid "Action"
7500msgstr "操作"
7501
7502#: builtin/config.c:64
7503msgid "get value: name [value-regex]"
7504msgstr "获取值:name [value-regex]"
7505
7506#: builtin/config.c:65
7507msgid "get all values: key [value-regex]"
7508msgstr "获得所有的值:key [value-regex]"
7509
7510#: builtin/config.c:66
7511msgid "get values for regexp: name-regex [value-regex]"
7512msgstr "根据正则表达式获得值:name-regex [value-regex]"
7513
7514#: builtin/config.c:67
7515msgid "get value specific for the URL: section[.var] URL"
7516msgstr "获得 URL 取值:section[.var] URL"
7517
7518#: builtin/config.c:68
7519msgid "replace all matching variables: name value [value_regex]"
7520msgstr "替换所有匹配的变量:name value [value_regex]"
7521
7522#: builtin/config.c:69
7523msgid "add a new variable: name value"
7524msgstr "添加一个新的变量:name value"
7525
7526#: builtin/config.c:70
7527msgid "remove a variable: name [value-regex]"
7528msgstr "删除一个变量:name [value-regex]"
7529
7530#: builtin/config.c:71
7531msgid "remove all matches: name [value-regex]"
7532msgstr "删除所有匹配项:name [value-regex]"
7533
7534#: builtin/config.c:72
7535msgid "rename section: old-name new-name"
7536msgstr "重命名小节:old-name new-name"
7537
7538#: builtin/config.c:73
7539msgid "remove a section: name"
7540msgstr "删除一个小节:name"
7541
7542#: builtin/config.c:74
7543msgid "list all"
7544msgstr "列出所有"
7545
7546#: builtin/config.c:75
7547msgid "open an editor"
7548msgstr "打开一个编辑器"
7549
7550#: builtin/config.c:76
7551msgid "find the color configured: slot [default]"
7552msgstr "获得配置的颜色:配置 [默认]"
7553
7554#: builtin/config.c:77
7555msgid "find the color setting: slot [stdout-is-tty]"
7556msgstr "获得颜色设置:配置 [stdout-is-tty]"
7557
7558#: builtin/config.c:78
7559msgid "Type"
7560msgstr "类型"
7561
7562#: builtin/config.c:79
7563msgid "value is \"true\" or \"false\""
7564msgstr "值是 \"true\" 或 \"false\""
7565
7566#: builtin/config.c:80
7567msgid "value is decimal number"
7568msgstr "值是十进制数"
7569
7570#: builtin/config.c:81
7571msgid "value is --bool or --int"
7572msgstr "值是 --bool or --int"
7573
7574#: builtin/config.c:82
7575msgid "value is a path (file or directory name)"
7576msgstr "值是一个路径(文件或目录名)"
7577
7578#: builtin/config.c:83
7579msgid "Other"
7580msgstr "其它"
7581
7582#: builtin/config.c:84
7583msgid "terminate values with NUL byte"
7584msgstr "终止值是 NUL 字节"
7585
7586#: builtin/config.c:85
7587msgid "show variable names only"
7588msgstr "只显示变量名"
7589
7590#: builtin/config.c:86
7591msgid "respect include directives on lookup"
7592msgstr "查询时参照 include 指令递归查找"
7593
7594#: builtin/config.c:87
7595msgid "show origin of config (file, standard input, blob, command line)"
7596msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7597
7598#: builtin/config.c:327
7599msgid "unable to parse default color value"
7600msgstr "不能解析默认颜色值"
7601
7602#: builtin/config.c:471
7603#, c-format
7604msgid ""
7605"# This is Git's per-user configuration file.\n"
7606"[user]\n"
7607"# Please adapt and uncomment the following lines:\n"
7608"#\tname = %s\n"
7609"#\temail = %s\n"
7610msgstr ""
7611"# This is Git's per-user configuration file.\n"
7612"[user]\n"
7613"# Please adapt and uncomment the following lines:\n"
7614"#\tname = %s\n"
7615"#\temail = %s\n"
7616
7617#: builtin/config.c:499
7618msgid "--local can only be used inside a git repository"
7619msgstr "--local 只能在一个仓库内使用"
7620
7621#: builtin/config.c:621
7622#, c-format
7623msgid "cannot create configuration file %s"
7624msgstr "不能创建配置文件 %s"
7625
7626#: builtin/config.c:633
7627#, c-format
7628msgid ""
7629"cannot overwrite multiple values with a single value\n"
7630"       Use a regexp, --add or --replace-all to change %s."
7631msgstr ""
7632"无法用一个值覆盖多个值\n"
7633"       使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7634
7635#: builtin/count-objects.c:87
7636msgid "git count-objects [-v] [-H | --human-readable]"
7637msgstr "git count-objects [-v] [-H | --human-readable]"
7638
7639#: builtin/count-objects.c:97
7640msgid "print sizes in human readable format"
7641msgstr "以用户可读的格式显示大小"
7642
7643#: builtin/describe.c:19
7644msgid "git describe [<options>] [<commit-ish>...]"
7645msgstr "git describe [<选项>] [<提交号>...]"
7646
7647#: builtin/describe.c:20
7648msgid "git describe [<options>] --dirty"
7649msgstr "git describe [<选项>] --dirty"
7650
7651#: builtin/describe.c:54
7652msgid "head"
7653msgstr "头"
7654
7655#: builtin/describe.c:54
7656msgid "lightweight"
7657msgstr "轻量级的"
7658
7659#: builtin/describe.c:54
7660msgid "annotated"
7661msgstr "附注的"
7662
7663#: builtin/describe.c:253
7664#, c-format
7665msgid "annotated tag %s not available"
7666msgstr "附注标签 %s 无效"
7667
7668#: builtin/describe.c:257
7669#, c-format
7670msgid "annotated tag %s has no embedded name"
7671msgstr "附注标签 %s 没有嵌入名称"
7672
7673#: builtin/describe.c:259
7674#, c-format
7675msgid "tag '%s' is really '%s' here"
7676msgstr "标签 '%s' 的确是在 '%s'"
7677
7678#: builtin/describe.c:286 builtin/log.c:489
7679#, c-format
7680msgid "Not a valid object name %s"
7681msgstr "不是一个有效的对象名 %s"
7682
7683#: builtin/describe.c:289
7684#, c-format
7685msgid "%s is not a valid '%s' object"
7686msgstr "%s 不是一个有效的 '%s' 对象"
7687
7688#: builtin/describe.c:306
7689#, c-format
7690msgid "no tag exactly matches '%s'"
7691msgstr "没有标签准确匹配 '%s'"
7692
7693#: builtin/describe.c:308
7694#, c-format
7695msgid "searching to describe %s\n"
7696msgstr "搜索描述 %s\n"
7697
7698#: builtin/describe.c:355
7699#, c-format
7700msgid "finished search at %s\n"
7701msgstr "完成搜索 %s\n"
7702
7703#: builtin/describe.c:382
7704#, c-format
7705msgid ""
7706"No annotated tags can describe '%s'.\n"
7707"However, there were unannotated tags: try --tags."
7708msgstr ""
7709"没有附注标签能描述 '%s'。\n"
7710"然而,存在未附注标签:尝试 --tags。"
7711
7712#: builtin/describe.c:386
7713#, c-format
7714msgid ""
7715"No tags can describe '%s'.\n"
7716"Try --always, or create some tags."
7717msgstr ""
7718"没有标签能描述 '%s'。\n"
7719"尝试 --always,或者创建一些标签。"
7720
7721#: builtin/describe.c:416
7722#, c-format
7723msgid "traversed %lu commits\n"
7724msgstr "已遍历 %lu 个提交\n"
7725
7726#: builtin/describe.c:419
7727#, c-format
7728msgid ""
7729"more than %i tags found; listed %i most recent\n"
7730"gave up search at %s\n"
7731msgstr ""
7732"发现多于 %i 个标签,列出最近的 %i 个\n"
7733"在 %s 放弃搜索\n"
7734
7735#: builtin/describe.c:441
7736msgid "find the tag that comes after the commit"
7737msgstr "寻找该提交之后的标签"
7738
7739#: builtin/describe.c:442
7740msgid "debug search strategy on stderr"
7741msgstr "在标准错误上调试搜索策略"
7742
7743#: builtin/describe.c:443
7744msgid "use any ref"
7745msgstr "使用任意引用"
7746
7747#: builtin/describe.c:444
7748msgid "use any tag, even unannotated"
7749msgstr "使用任意标签,即使未附带注释"
7750
7751#: builtin/describe.c:445
7752msgid "always use long format"
7753msgstr "始终使用长提交号格式"
7754
7755#: builtin/describe.c:446
7756msgid "only follow first parent"
7757msgstr "只跟随第一个父提交"
7758
7759#: builtin/describe.c:449
7760msgid "only output exact matches"
7761msgstr "只输出精确匹配"
7762
7763#: builtin/describe.c:451
7764msgid "consider <n> most recent tags (default: 10)"
7765msgstr "考虑最近 <n> 个标签(默认:10)"
7766
7767#: builtin/describe.c:453
7768msgid "only consider tags matching <pattern>"
7769msgstr "只考虑匹配 <模式> 的标签"
7770
7771#: builtin/describe.c:455
7772msgid "do not consider tags matching <pattern>"
7773msgstr "不考虑匹配 <模式> 的标签"
7774
7775#: builtin/describe.c:457 builtin/name-rev.c:406
7776msgid "show abbreviated commit object as fallback"
7777msgstr "显示简写的提交号作为后备"
7778
7779#: builtin/describe.c:458 builtin/describe.c:461
7780msgid "mark"
7781msgstr "标记"
7782
7783#: builtin/describe.c:459
7784msgid "append <mark> on dirty working tree (default: \"-dirty\")"
7785msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
7786
7787#: builtin/describe.c:462
7788msgid "append <mark> on broken working tree (default: \"-broken\")"
7789msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
7790
7791#: builtin/describe.c:480
7792msgid "--long is incompatible with --abbrev=0"
7793msgstr "--long 与 --abbrev=0 不兼容"
7794
7795#: builtin/describe.c:509
7796msgid "No names found, cannot describe anything."
7797msgstr "没有发现名称,无法描述任何东西。"
7798
7799#: builtin/describe.c:552
7800msgid "--dirty is incompatible with commit-ishes"
7801msgstr "--dirty 与提交号不兼容"
7802
7803#: builtin/describe.c:554
7804msgid "--broken is incompatible with commit-ishes"
7805msgstr "--broken 与提交号不兼容"
7806
7807#: builtin/diff.c:83
7808#, c-format
7809msgid "'%s': not a regular file or symlink"
7810msgstr "'%s':不是一个正规文件或符号链接"
7811
7812#: builtin/diff.c:235
7813#, c-format
7814msgid "invalid option: %s"
7815msgstr "无效选项:%s"
7816
7817#: builtin/diff.c:359
7818msgid "Not a git repository"
7819msgstr "不是一个 git 仓库"
7820
7821#: builtin/diff.c:402
7822#, c-format
7823msgid "invalid object '%s' given."
7824msgstr "提供了无效对象 '%s'。"
7825
7826#: builtin/diff.c:411
7827#, c-format
7828msgid "more than two blobs given: '%s'"
7829msgstr "提供了超过两个数据对象:'%s'"
7830
7831#: builtin/diff.c:416
7832#, c-format
7833msgid "unhandled object '%s' given."
7834msgstr "无法处理的对象 '%s'。"
7835
7836#: builtin/difftool.c:29
7837msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
7838msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
7839
7840#: builtin/difftool.c:249
7841#, c-format
7842msgid "failed: %d"
7843msgstr "失败:%d"
7844
7845#: builtin/difftool.c:291
7846#, c-format
7847msgid "could not read symlink %s"
7848msgstr "无法读取符号链接 %s"
7849
7850#: builtin/difftool.c:293
7851#, c-format
7852msgid "could not read symlink file %s"
7853msgstr "无法读取符号链接文件 %s"
7854
7855#: builtin/difftool.c:301
7856#, c-format
7857msgid "could not read object %s for symlink %s"
7858msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
7859
7860#: builtin/difftool.c:403
7861msgid ""
7862"combined diff formats('-c' and '--cc') are not supported in\n"
7863"directory diff mode('-d' and '--dir-diff')."
7864msgstr ""
7865"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
7866"cc')。"
7867
7868#: builtin/difftool.c:626
7869#, c-format
7870msgid "both files modified: '%s' and '%s'."
7871msgstr "两个文件都被修改:'%s' 和 '%s'。"
7872
7873#: builtin/difftool.c:628
7874msgid "working tree file has been left."
7875msgstr "工作区文件被留了下来。"
7876
7877#: builtin/difftool.c:639
7878#, c-format
7879msgid "temporary files exist in '%s'."
7880msgstr "临时文件存在于 '%s'。"
7881
7882#: builtin/difftool.c:640
7883msgid "you may want to cleanup or recover these."
7884msgstr "您可能想要清理或者恢复它们。"
7885
7886#: builtin/difftool.c:689
7887msgid "use `diff.guitool` instead of `diff.tool`"
7888msgstr "使用 `diff.guitool` 代替 `diff.tool`"
7889
7890#: builtin/difftool.c:691
7891msgid "perform a full-directory diff"
7892msgstr "执行一个全目录差异比较"
7893
7894#: builtin/difftool.c:693
7895msgid "do not prompt before launching a diff tool"
7896msgstr "启动差异比较工具之前不提示"
7897
7898#: builtin/difftool.c:699
7899msgid "use symlinks in dir-diff mode"
7900msgstr "在 dir-diff 模式中使用符号链接"
7901
7902#: builtin/difftool.c:700
7903msgid "<tool>"
7904msgstr "<工具>"
7905
7906#: builtin/difftool.c:701
7907msgid "use the specified diff tool"
7908msgstr "使用指定的差异比较工具"
7909
7910#: builtin/difftool.c:703
7911msgid "print a list of diff tools that may be used with `--tool`"
7912msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
7913
7914#: builtin/difftool.c:706
7915msgid ""
7916"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
7917"code"
7918msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
7919
7920#: builtin/difftool.c:708
7921msgid "<command>"
7922msgstr "<命令>"
7923
7924#: builtin/difftool.c:709
7925msgid "specify a custom command for viewing diffs"
7926msgstr "指定一个用于查看差异的自定义命令"
7927
7928#: builtin/difftool.c:733
7929msgid "no <tool> given for --tool=<tool>"
7930msgstr "没有为 --tool=<工具> 参数提供 <工具>"
7931
7932#: builtin/difftool.c:740
7933msgid "no <cmd> given for --extcmd=<cmd>"
7934msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
7935
7936#: builtin/fast-export.c:26
7937msgid "git fast-export [rev-list-opts]"
7938msgstr "git fast-export [rev-list-opts]"
7939
7940#: builtin/fast-export.c:982
7941msgid "show progress after <n> objects"
7942msgstr "在 <n> 个对象之后显示进度"
7943
7944#: builtin/fast-export.c:984
7945msgid "select handling of signed tags"
7946msgstr "选择如何处理签名标签"
7947
7948#: builtin/fast-export.c:987
7949msgid "select handling of tags that tag filtered objects"
7950msgstr "选择当标签指向被过滤对象时该标签的处理方式"
7951
7952#: builtin/fast-export.c:990
7953msgid "Dump marks to this file"
7954msgstr "把标记存储到这个文件"
7955
7956#: builtin/fast-export.c:992
7957msgid "Import marks from this file"
7958msgstr "从这个文件导入标记"
7959
7960#: builtin/fast-export.c:994
7961msgid "Fake a tagger when tags lack one"
7962msgstr "当标签缺少标记者字段时,假装提供一个"
7963
7964#: builtin/fast-export.c:996
7965msgid "Output full tree for each commit"
7966msgstr "每次提交都输出整个树"
7967
7968#: builtin/fast-export.c:998
7969msgid "Use the done feature to terminate the stream"
7970msgstr "使用 done 功能来终止流"
7971
7972#: builtin/fast-export.c:999
7973msgid "Skip output of blob data"
7974msgstr "跳过数据对象的输出"
7975
7976#: builtin/fast-export.c:1000
7977msgid "refspec"
7978msgstr "引用规格"
7979
7980#: builtin/fast-export.c:1001
7981msgid "Apply refspec to exported refs"
7982msgstr "对导出的引用应用引用规格"
7983
7984#: builtin/fast-export.c:1002
7985msgid "anonymize output"
7986msgstr "匿名输出"
7987
7988#: builtin/fetch.c:22
7989msgid "git fetch [<options>] [<repository> [<refspec>...]]"
7990msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
7991
7992#: builtin/fetch.c:23
7993msgid "git fetch [<options>] <group>"
7994msgstr "git fetch [<选项>] <组>"
7995
7996#: builtin/fetch.c:24
7997msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
7998msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
7999
8000#: builtin/fetch.c:25
8001msgid "git fetch --all [<options>]"
8002msgstr "git fetch --all [<选项>]"
8003
8004#: builtin/fetch.c:90 builtin/pull.c:182
8005msgid "fetch from all remotes"
8006msgstr "从所有的远程抓取"
8007
8008#: builtin/fetch.c:92 builtin/pull.c:185
8009msgid "append to .git/FETCH_HEAD instead of overwriting"
8010msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
8011
8012#: builtin/fetch.c:94 builtin/pull.c:188
8013msgid "path to upload pack on remote end"
8014msgstr "上传包到远程的路径"
8015
8016#: builtin/fetch.c:95 builtin/pull.c:190
8017msgid "force overwrite of local branch"
8018msgstr "强制覆盖本地分支"
8019
8020#: builtin/fetch.c:97
8021msgid "fetch from multiple remotes"
8022msgstr "从多个远程抓取"
8023
8024#: builtin/fetch.c:99 builtin/pull.c:192
8025msgid "fetch all tags and associated objects"
8026msgstr "抓取所有的标签和关联对象"
8027
8028#: builtin/fetch.c:101
8029msgid "do not fetch all tags (--no-tags)"
8030msgstr "不抓取任何标签(--no-tags)"
8031
8032#: builtin/fetch.c:103
8033msgid "number of submodules fetched in parallel"
8034msgstr "子模组获取的并发数"
8035
8036#: builtin/fetch.c:105 builtin/pull.c:195
8037msgid "prune remote-tracking branches no longer on remote"
8038msgstr "清除远程已经不存在的分支的跟踪分支"
8039
8040#  译者:可选值,不能翻译
8041#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
8042msgid "on-demand"
8043msgstr "on-demand"
8044
8045#: builtin/fetch.c:107
8046msgid "control recursive fetching of submodules"
8047msgstr "控制子模组的递归抓取"
8048
8049#: builtin/fetch.c:111 builtin/pull.c:203
8050msgid "keep downloaded pack"
8051msgstr "保持下载包"
8052
8053#: builtin/fetch.c:113
8054msgid "allow updating of HEAD ref"
8055msgstr "允许更新 HEAD 引用"
8056
8057#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
8058msgid "deepen history of shallow clone"
8059msgstr "深化浅克隆的历史"
8060
8061#: builtin/fetch.c:118
8062msgid "deepen history of shallow repository based on time"
8063msgstr "基于时间来深化浅克隆的历史"
8064
8065#: builtin/fetch.c:124 builtin/pull.c:209
8066msgid "convert to a complete repository"
8067msgstr "转换为一个完整的仓库"
8068
8069#: builtin/fetch.c:126 builtin/log.c:1450
8070msgid "dir"
8071msgstr "目录"
8072
8073#: builtin/fetch.c:127
8074msgid "prepend this to submodule path output"
8075msgstr "在子模组路径输出的前面加上此目录"
8076
8077#: builtin/fetch.c:130
8078msgid ""
8079"default for recursive fetching of submodules (lower priority than config "
8080"files)"
8081msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
8082
8083#: builtin/fetch.c:134 builtin/pull.c:212
8084msgid "accept refs that update .git/shallow"
8085msgstr "接受更新 .git/shallow 的引用"
8086
8087#: builtin/fetch.c:135 builtin/pull.c:214
8088msgid "refmap"
8089msgstr "引用映射"
8090
8091#: builtin/fetch.c:136 builtin/pull.c:215
8092msgid "specify fetch refmap"
8093msgstr "指定获取操作的引用映射"
8094
8095#: builtin/fetch.c:394
8096msgid "Couldn't find remote ref HEAD"
8097msgstr "无法发现远程 HEAD 引用"
8098
8099#: builtin/fetch.c:512
8100#, c-format
8101msgid "configuration fetch.output contains invalid value %s"
8102msgstr "配置变量 fetch.output 包含无效值 %s"
8103
8104#: builtin/fetch.c:605
8105#, c-format
8106msgid "object %s not found"
8107msgstr "对象 %s 未发现"
8108
8109#: builtin/fetch.c:609
8110msgid "[up to date]"
8111msgstr "[最新]"
8112
8113#: builtin/fetch.c:622 builtin/fetch.c:702
8114msgid "[rejected]"
8115msgstr "[已拒绝]"
8116
8117#: builtin/fetch.c:623
8118msgid "can't fetch in current branch"
8119msgstr "当前分支下不能执行获取操作"
8120
8121#: builtin/fetch.c:632
8122msgid "[tag update]"
8123msgstr "[标签更新]"
8124
8125#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
8126#: builtin/fetch.c:697
8127msgid "unable to update local ref"
8128msgstr "不能更新本地引用"
8129
8130#: builtin/fetch.c:652
8131msgid "[new tag]"
8132msgstr "[新标签]"
8133
8134#: builtin/fetch.c:655
8135msgid "[new branch]"
8136msgstr "[新分支]"
8137
8138#: builtin/fetch.c:658
8139msgid "[new ref]"
8140msgstr "[新引用]"
8141
8142#: builtin/fetch.c:697
8143msgid "forced update"
8144msgstr "强制更新"
8145
8146#: builtin/fetch.c:702
8147msgid "non-fast-forward"
8148msgstr "非快进"
8149
8150#: builtin/fetch.c:747
8151#, c-format
8152msgid "%s did not send all necessary objects\n"
8153msgstr "%s 未发送所有必须的对象\n"
8154
8155#: builtin/fetch.c:767
8156#, c-format
8157msgid "reject %s because shallow roots are not allowed to be updated"
8158msgstr "拒绝 %s 因为浅克隆不允许被更新"
8159
8160#: builtin/fetch.c:855 builtin/fetch.c:951
8161#, c-format
8162msgid "From %.*s\n"
8163msgstr "来自 %.*s\n"
8164
8165#: builtin/fetch.c:866
8166#, c-format
8167msgid ""
8168"some local refs could not be updated; try running\n"
8169" 'git remote prune %s' to remove any old, conflicting branches"
8170msgstr ""
8171"一些本地引用不能被更新;尝试运行\n"
8172" 'git remote prune %s' 来删除旧的、有冲突的分支"
8173
8174#  译者:注意保持前导空格
8175#: builtin/fetch.c:921
8176#, c-format
8177msgid "   (%s will become dangling)"
8178msgstr "   (%s 将成为摇摆状态)"
8179
8180#  译者:注意保持前导空格
8181#: builtin/fetch.c:922
8182#, c-format
8183msgid "   (%s has become dangling)"
8184msgstr "   (%s 已成为摇摆状态)"
8185
8186#: builtin/fetch.c:954
8187msgid "[deleted]"
8188msgstr "[已删除]"
8189
8190#: builtin/fetch.c:955 builtin/remote.c:1023
8191msgid "(none)"
8192msgstr "(无)"
8193
8194#: builtin/fetch.c:978
8195#, c-format
8196msgid "Refusing to fetch into current branch %s of non-bare repository"
8197msgstr "拒绝获取到非纯仓库的当前分支 %s"
8198
8199#: builtin/fetch.c:997
8200#, c-format
8201msgid "Option \"%s\" value \"%s\" is not valid for %s"
8202msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
8203
8204#: builtin/fetch.c:1000
8205#, c-format
8206msgid "Option \"%s\" is ignored for %s\n"
8207msgstr "选项 \"%s\" 为 %s 所忽略\n"
8208
8209#: builtin/fetch.c:1076
8210#, c-format
8211msgid "Don't know how to fetch from %s"
8212msgstr "不知道如何从 %s 获取"
8213
8214#: builtin/fetch.c:1236
8215#, c-format
8216msgid "Fetching %s\n"
8217msgstr "正在获取 %s\n"
8218
8219#: builtin/fetch.c:1238 builtin/remote.c:97
8220#, c-format
8221msgid "Could not fetch %s"
8222msgstr "不能获取 %s"
8223
8224#: builtin/fetch.c:1256
8225msgid ""
8226"No remote repository specified.  Please, specify either a URL or a\n"
8227"remote name from which new revisions should be fetched."
8228msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
8229
8230#: builtin/fetch.c:1279
8231msgid "You need to specify a tag name."
8232msgstr "您需要指定一个标签名称。"
8233
8234#: builtin/fetch.c:1321
8235msgid "Negative depth in --deepen is not supported"
8236msgstr "--deepen 不支持负数深度"
8237
8238#: builtin/fetch.c:1323
8239msgid "--deepen and --depth are mutually exclusive"
8240msgstr "--deepen 和 --depth 是互斥的"
8241
8242#: builtin/fetch.c:1328
8243msgid "--depth and --unshallow cannot be used together"
8244msgstr "--depth 和 --unshallow 不能同时使用"
8245
8246#: builtin/fetch.c:1330
8247msgid "--unshallow on a complete repository does not make sense"
8248msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
8249
8250#: builtin/fetch.c:1349
8251msgid "fetch --all does not take a repository argument"
8252msgstr "fetch --all 不能带一个仓库参数"
8253
8254#: builtin/fetch.c:1351
8255msgid "fetch --all does not make sense with refspecs"
8256msgstr "fetch --all 带引用规格没有任何意义"
8257
8258#: builtin/fetch.c:1362
8259#, c-format
8260msgid "No such remote or remote group: %s"
8261msgstr "没有这样的远程或远程组:%s"
8262
8263#: builtin/fetch.c:1370
8264msgid "Fetching a group and specifying refspecs does not make sense"
8265msgstr "获取组并指定引用规格没有意义"
8266
8267#: builtin/fmt-merge-msg.c:15
8268msgid ""
8269"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
8270msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
8271
8272#: builtin/fmt-merge-msg.c:664
8273msgid "populate log with at most <n> entries from shortlog"
8274msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
8275
8276#: builtin/fmt-merge-msg.c:667
8277msgid "alias for --log (deprecated)"
8278msgstr "参数 --log 的别名(已弃用)"
8279
8280#: builtin/fmt-merge-msg.c:670
8281msgid "text"
8282msgstr "文本"
8283
8284#: builtin/fmt-merge-msg.c:671
8285msgid "use <text> as start of message"
8286msgstr "使用 <文本> 作为提交说明的开始"
8287
8288#: builtin/fmt-merge-msg.c:672
8289msgid "file to read from"
8290msgstr "从文件中读取"
8291
8292#: builtin/for-each-ref.c:10
8293msgid "git for-each-ref [<options>] [<pattern>]"
8294msgstr "git for-each-ref [<选项>] [<模式>]"
8295
8296#: builtin/for-each-ref.c:11
8297msgid "git for-each-ref [--points-at <object>]"
8298msgstr "git for-each-ref [--points-at <对象>]"
8299
8300#: builtin/for-each-ref.c:12
8301msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
8302msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
8303
8304#: builtin/for-each-ref.c:13
8305msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
8306msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
8307
8308#: builtin/for-each-ref.c:28
8309msgid "quote placeholders suitably for shells"
8310msgstr "引用占位符适用于 shells"
8311
8312#: builtin/for-each-ref.c:30
8313msgid "quote placeholders suitably for perl"
8314msgstr "引用占位符适用于 perl"
8315
8316#: builtin/for-each-ref.c:32
8317msgid "quote placeholders suitably for python"
8318msgstr "引用占位符适用于 python"
8319
8320#: builtin/for-each-ref.c:34
8321msgid "quote placeholders suitably for Tcl"
8322msgstr "引用占位符适用于 Tcl"
8323
8324#: builtin/for-each-ref.c:37
8325msgid "show only <n> matched refs"
8326msgstr "只显示 <n> 个匹配的引用"
8327
8328#: builtin/for-each-ref.c:42
8329msgid "print only refs which points at the given object"
8330msgstr "只打印指向给定对象的引用"
8331
8332#: builtin/for-each-ref.c:44
8333msgid "print only refs that are merged"
8334msgstr "只打印已经合并的引用"
8335
8336#: builtin/for-each-ref.c:45
8337msgid "print only refs that are not merged"
8338msgstr "只打印没有合并的引用"
8339
8340#: builtin/for-each-ref.c:46
8341msgid "print only refs which contain the commit"
8342msgstr "只打印包含该提交的引用"
8343
8344#: builtin/for-each-ref.c:47
8345msgid "print only refs which don't contain the commit"
8346msgstr "只打印不包含该提交的引用"
8347
8348#: builtin/fsck.c:554
8349msgid "Checking object directories"
8350msgstr "检查对象目录中"
8351
8352#: builtin/fsck.c:646
8353msgid "git fsck [<options>] [<object>...]"
8354msgstr "git fsck [<选项>] [<对象>...]"
8355
8356#: builtin/fsck.c:652
8357msgid "show unreachable objects"
8358msgstr "显示不可达的对象"
8359
8360#: builtin/fsck.c:653
8361msgid "show dangling objects"
8362msgstr "显示摇摆的对象"
8363
8364#: builtin/fsck.c:654
8365msgid "report tags"
8366msgstr "报告标签"
8367
8368#: builtin/fsck.c:655
8369msgid "report root nodes"
8370msgstr "报告根节点"
8371
8372#: builtin/fsck.c:656
8373msgid "make index objects head nodes"
8374msgstr "将索引亦作为检查的头节点"
8375
8376#: builtin/fsck.c:657
8377msgid "make reflogs head nodes (default)"
8378msgstr "将引用日志作为检查的头节点(默认)"
8379
8380#: builtin/fsck.c:658
8381msgid "also consider packs and alternate objects"
8382msgstr "也考虑包和备用对象"
8383
8384#: builtin/fsck.c:659
8385msgid "check only connectivity"
8386msgstr "仅检查连通性"
8387
8388#: builtin/fsck.c:660
8389msgid "enable more strict checking"
8390msgstr "启用更严格的检查"
8391
8392#: builtin/fsck.c:662
8393msgid "write dangling objects in .git/lost-found"
8394msgstr "将摇摆对象写入 .git/lost-found 中"
8395
8396#: builtin/fsck.c:663 builtin/prune.c:107
8397msgid "show progress"
8398msgstr "显示进度"
8399
8400#: builtin/fsck.c:664
8401msgid "show verbose names for reachable objects"
8402msgstr "显示可达对象的详细名称"
8403
8404#: builtin/fsck.c:725
8405msgid "Checking objects"
8406msgstr "检查对象中"
8407
8408#: builtin/gc.c:26
8409msgid "git gc [<options>]"
8410msgstr "git gc [<选项>]"
8411
8412#: builtin/gc.c:79
8413#, c-format
8414msgid "Failed to fstat %s: %s"
8415msgstr "对 %s 调用 fstat 失败:%s"
8416
8417#: builtin/gc.c:311
8418#, c-format
8419msgid "Can't stat %s"
8420msgstr "不能对 %s 调用 stat"
8421
8422#: builtin/gc.c:320
8423#, c-format
8424msgid ""
8425"The last gc run reported the following. Please correct the root cause\n"
8426"and remove %s.\n"
8427"Automatic cleanup will not be performed until the file is removed.\n"
8428"\n"
8429"%s"
8430msgstr ""
8431"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
8432"在该文件被删除之前,自动清理将不会执行。\n"
8433"\n"
8434"%s"
8435
8436#: builtin/gc.c:359
8437msgid "prune unreferenced objects"
8438msgstr "清除未引用的对象"
8439
8440#: builtin/gc.c:361
8441msgid "be more thorough (increased runtime)"
8442msgstr "更彻底(增加运行时间)"
8443
8444#: builtin/gc.c:362
8445msgid "enable auto-gc mode"
8446msgstr "启用自动垃圾回收模式"
8447
8448#: builtin/gc.c:363
8449msgid "force running gc even if there may be another gc running"
8450msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8451
8452#: builtin/gc.c:380
8453#, c-format
8454msgid "Failed to parse gc.logexpiry value %s"
8455msgstr "无法解析 gc.logexpiry 的值 %s"
8456
8457#: builtin/gc.c:408
8458#, c-format
8459msgid "Auto packing the repository in background for optimum performance.\n"
8460msgstr "自动在后台执行仓库打包以求最佳性能。\n"
8461
8462#: builtin/gc.c:410
8463#, c-format
8464msgid "Auto packing the repository for optimum performance.\n"
8465msgstr "自动打包仓库以求最佳性能。\n"
8466
8467#: builtin/gc.c:411
8468#, c-format
8469msgid "See \"git help gc\" for manual housekeeping.\n"
8470msgstr "手工维护参见 \"git help gc\"。\n"
8471
8472#: builtin/gc.c:436
8473#, c-format
8474msgid ""
8475"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8476msgstr ""
8477"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
8478
8479#: builtin/gc.c:480
8480msgid ""
8481"There are too many unreachable loose objects; run 'git prune' to remove them."
8482msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
8483
8484#: builtin/grep.c:27
8485msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8486msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
8487
8488#: builtin/grep.c:235
8489#, c-format
8490msgid "grep: failed to create thread: %s"
8491msgstr "grep:无法创建线程:%s"
8492
8493#: builtin/grep.c:293
8494#, c-format
8495msgid "invalid number of threads specified (%d) for %s"
8496msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8497
8498#. TRANSLATORS: %s is the configuration
8499#. variable for tweaking threads, currently
8500#. grep.threads
8501#.
8502#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
8503#, c-format
8504msgid "no threads support, ignoring %s"
8505msgstr "没有线程支持,忽略 %s"
8506
8507#: builtin/grep.c:788 builtin/grep.c:829
8508#, c-format
8509msgid "unable to read tree (%s)"
8510msgstr "无法读取树(%s)"
8511
8512#: builtin/grep.c:848
8513#, c-format
8514msgid "unable to grep from object of type %s"
8515msgstr "无法抓取来自于 %s 类型的对象"
8516
8517#: builtin/grep.c:912
8518#, c-format
8519msgid "switch `%c' expects a numerical value"
8520msgstr "开关 `%c' 期望一个数字值"
8521
8522#: builtin/grep.c:999
8523msgid "search in index instead of in the work tree"
8524msgstr "在索引区搜索而不是在工作区"
8525
8526#: builtin/grep.c:1001
8527msgid "find in contents not managed by git"
8528msgstr "在未被 git 管理的内容中查找"
8529
8530#  译者:中文字符串拼接,可删除前导空格
8531#: builtin/grep.c:1003
8532msgid "search in both tracked and untracked files"
8533msgstr "在跟踪和未跟踪的文件中搜索"
8534
8535#: builtin/grep.c:1005
8536msgid "ignore files specified via '.gitignore'"
8537msgstr "忽略 '.gitignore' 包含的文件"
8538
8539#: builtin/grep.c:1007
8540msgid "recursively search in each submodule"
8541msgstr "在每一个子模组中递归搜索"
8542
8543#: builtin/grep.c:1009
8544msgid "basename"
8545msgstr "基本名"
8546
8547#: builtin/grep.c:1010
8548msgid "prepend parent project's basename to output"
8549msgstr "在输出中以父项目的基本名为前缀"
8550
8551#: builtin/grep.c:1013
8552msgid "show non-matching lines"
8553msgstr "显示未匹配的行"
8554
8555#: builtin/grep.c:1015
8556msgid "case insensitive matching"
8557msgstr "不区分大小写匹配"
8558
8559#: builtin/grep.c:1017
8560msgid "match patterns only at word boundaries"
8561msgstr "只在单词边界匹配模式"
8562
8563#: builtin/grep.c:1019
8564msgid "process binary files as text"
8565msgstr "把二进制文件当做文本处理"
8566
8567#: builtin/grep.c:1021
8568msgid "don't match patterns in binary files"
8569msgstr "不在二进制文件中匹配模式"
8570
8571#: builtin/grep.c:1024
8572msgid "process binary files with textconv filters"
8573msgstr "用 textconv 过滤器处理二进制文件"
8574
8575#: builtin/grep.c:1026
8576msgid "descend at most <depth> levels"
8577msgstr "最多以指定的深度向下寻找"
8578
8579#: builtin/grep.c:1030
8580msgid "use extended POSIX regular expressions"
8581msgstr "使用扩展的 POSIX 正则表达式"
8582
8583#: builtin/grep.c:1033
8584msgid "use basic POSIX regular expressions (default)"
8585msgstr "使用基本的 POSIX 正则表达式(默认)"
8586
8587#: builtin/grep.c:1036
8588msgid "interpret patterns as fixed strings"
8589msgstr "把模式解析为固定的字符串"
8590
8591#: builtin/grep.c:1039
8592msgid "use Perl-compatible regular expressions"
8593msgstr "使用 Perl 兼容的正则表达式"
8594
8595#: builtin/grep.c:1042
8596msgid "show line numbers"
8597msgstr "显示行号"
8598
8599#: builtin/grep.c:1043
8600msgid "don't show filenames"
8601msgstr "不显示文件名"
8602
8603#: builtin/grep.c:1044
8604msgid "show filenames"
8605msgstr "显示文件名"
8606
8607#: builtin/grep.c:1046
8608msgid "show filenames relative to top directory"
8609msgstr "显示相对于顶级目录的文件名"
8610
8611#: builtin/grep.c:1048
8612msgid "show only filenames instead of matching lines"
8613msgstr "只显示文件名而不显示匹配的行"
8614
8615#: builtin/grep.c:1050
8616msgid "synonym for --files-with-matches"
8617msgstr "和 --files-with-matches 同义"
8618
8619#: builtin/grep.c:1053
8620msgid "show only the names of files without match"
8621msgstr "只显示未匹配的文件名"
8622
8623#: builtin/grep.c:1055
8624msgid "print NUL after filenames"
8625msgstr "在文件名后输出 NUL 字符"
8626
8627#: builtin/grep.c:1057
8628msgid "show the number of matches instead of matching lines"
8629msgstr "显示总匹配行数,而不显示匹配的行"
8630
8631#: builtin/grep.c:1058
8632msgid "highlight matches"
8633msgstr "高亮显示匹配项"
8634
8635#: builtin/grep.c:1060
8636msgid "print empty line between matches from different files"
8637msgstr "在不同文件的匹配项之间打印空行"
8638
8639#: builtin/grep.c:1062
8640msgid "show filename only once above matches from same file"
8641msgstr "只在同一文件的匹配项的上面显示一次文件名"
8642
8643#: builtin/grep.c:1065
8644msgid "show <n> context lines before and after matches"
8645msgstr "显示匹配项前后的 <n> 行上下文"
8646
8647#: builtin/grep.c:1068
8648msgid "show <n> context lines before matches"
8649msgstr "显示匹配项前 <n> 行上下文"
8650
8651#: builtin/grep.c:1070
8652msgid "show <n> context lines after matches"
8653msgstr "显示匹配项后 <n> 行上下文"
8654
8655#: builtin/grep.c:1072
8656msgid "use <n> worker threads"
8657msgstr "使用 <n> 个工作线程"
8658
8659#: builtin/grep.c:1073
8660msgid "shortcut for -C NUM"
8661msgstr "快捷键 -C 数字"
8662
8663#: builtin/grep.c:1076
8664msgid "show a line with the function name before matches"
8665msgstr "在匹配的前面显示一行函数名"
8666
8667#: builtin/grep.c:1078
8668msgid "show the surrounding function"
8669msgstr "显示所在函数的前后内容"
8670
8671#: builtin/grep.c:1081
8672msgid "read patterns from file"
8673msgstr "从文件读取模式"
8674
8675#: builtin/grep.c:1083
8676msgid "match <pattern>"
8677msgstr "匹配 <模式>"
8678
8679#: builtin/grep.c:1085
8680msgid "combine patterns specified with -e"
8681msgstr "组合用 -e 参数设定的模式"
8682
8683#: builtin/grep.c:1097
8684msgid "indicate hit with exit status without output"
8685msgstr "不输出,而用退出码标识命中状态"
8686
8687#: builtin/grep.c:1099
8688msgid "show only matches from files that match all patterns"
8689msgstr "只显示匹配所有模式的文件中的匹配"
8690
8691#: builtin/grep.c:1101
8692msgid "show parse tree for grep expression"
8693msgstr "显示 grep 表达式的解析树"
8694
8695#: builtin/grep.c:1105
8696msgid "pager"
8697msgstr "分页"
8698
8699#: builtin/grep.c:1105
8700msgid "show matching files in the pager"
8701msgstr "分页显示匹配的文件"
8702
8703#: builtin/grep.c:1108
8704msgid "allow calling of grep(1) (ignored by this build)"
8705msgstr "允许调用 grep(1)(本次构建忽略)"
8706
8707#: builtin/grep.c:1172
8708msgid "no pattern given."
8709msgstr "未提供模式匹配。"
8710
8711#: builtin/grep.c:1204
8712msgid "--no-index or --untracked cannot be used with revs"
8713msgstr "--no-index 或 --untracked 不能和版本同时使用"
8714
8715#: builtin/grep.c:1211
8716#, c-format
8717msgid "unable to resolve revision: %s"
8718msgstr "不能解析版本:%s"
8719
8720#: builtin/grep.c:1245 builtin/index-pack.c:1490
8721#, c-format
8722msgid "invalid number of threads specified (%d)"
8723msgstr "指定的线程数无效(%d)"
8724
8725#: builtin/grep.c:1250
8726msgid "no threads support, ignoring --threads"
8727msgstr "没有线程支持,忽略 --threads"
8728
8729#: builtin/grep.c:1281
8730msgid "--open-files-in-pager only works on the worktree"
8731msgstr "--open-files-in-pager 仅用于工作区"
8732
8733#: builtin/grep.c:1304
8734msgid "option not supported with --recurse-submodules."
8735msgstr "选项不支持和 --recurse-submodules 共用。"
8736
8737#: builtin/grep.c:1310
8738msgid "--cached or --untracked cannot be used with --no-index."
8739msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
8740
8741#: builtin/grep.c:1316
8742msgid "--[no-]exclude-standard cannot be used for tracked contents."
8743msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
8744
8745#: builtin/grep.c:1324
8746msgid "both --cached and trees are given."
8747msgstr "同时给出了 --cached 和树对象。"
8748
8749#: builtin/hash-object.c:82
8750msgid ""
8751"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8752"[--] <file>..."
8753msgstr ""
8754"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8755"[--] <文件>..."
8756
8757#: builtin/hash-object.c:83
8758msgid "git hash-object  --stdin-paths"
8759msgstr "git hash-object  --stdin-paths"
8760
8761#: builtin/hash-object.c:95
8762msgid "type"
8763msgstr "类型"
8764
8765#: builtin/hash-object.c:95
8766msgid "object type"
8767msgstr "对象类型"
8768
8769#: builtin/hash-object.c:96
8770msgid "write the object into the object database"
8771msgstr "将对象写入对象数据库"
8772
8773#: builtin/hash-object.c:98
8774msgid "read the object from stdin"
8775msgstr "从标准输入读取对象"
8776
8777#: builtin/hash-object.c:100
8778msgid "store file as is without filters"
8779msgstr "原样存储文件不使用过滤器"
8780
8781#: builtin/hash-object.c:101
8782msgid ""
8783"just hash any random garbage to create corrupt objects for debugging Git"
8784msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8785
8786#: builtin/hash-object.c:102
8787msgid "process file as it were from this path"
8788msgstr "处理文件并假设其来自于此路径"
8789
8790#: builtin/help.c:43
8791msgid "print all available commands"
8792msgstr "打印所有可用的命令"
8793
8794#: builtin/help.c:44
8795msgid "exclude guides"
8796msgstr "排除向导"
8797
8798#: builtin/help.c:45
8799msgid "print list of useful guides"
8800msgstr "显示有用的指南列表"
8801
8802#: builtin/help.c:46
8803msgid "show man page"
8804msgstr "显示 man 手册"
8805
8806#: builtin/help.c:47
8807msgid "show manual in web browser"
8808msgstr "在 web 浏览器中显示手册"
8809
8810#: builtin/help.c:49
8811msgid "show info page"
8812msgstr "显示 info 手册"
8813
8814#: builtin/help.c:55
8815msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8816msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
8817
8818#: builtin/help.c:67
8819#, c-format
8820msgid "unrecognized help format '%s'"
8821msgstr "未能识别的帮助格式 '%s'"
8822
8823#: builtin/help.c:94
8824msgid "Failed to start emacsclient."
8825msgstr "无法启动 emacsclient。"
8826
8827#: builtin/help.c:107
8828msgid "Failed to parse emacsclient version."
8829msgstr "无法解析 emacsclient 版本。"
8830
8831#: builtin/help.c:115
8832#, c-format
8833msgid "emacsclient version '%d' too old (< 22)."
8834msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8835
8836#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
8837#, c-format
8838msgid "failed to exec '%s'"
8839msgstr "无法执行 '%s'"
8840
8841#: builtin/help.c:208
8842#, c-format
8843msgid ""
8844"'%s': path for unsupported man viewer.\n"
8845"Please consider using 'man.<tool>.cmd' instead."
8846msgstr ""
8847"'%s':不支持的 man 手册查看器的路径。\n"
8848"请使用 'man.<工具>.cmd'。"
8849
8850#: builtin/help.c:220
8851#, c-format
8852msgid ""
8853"'%s': cmd for supported man viewer.\n"
8854"Please consider using 'man.<tool>.path' instead."
8855msgstr ""
8856"'%s': 支持的 man 手册查看器命令。\n"
8857"请使用 'man.<工具>.path'。"
8858
8859#: builtin/help.c:337
8860#, c-format
8861msgid "'%s': unknown man viewer."
8862msgstr "'%s':未知的 man 查看器。"
8863
8864#: builtin/help.c:354
8865msgid "no man viewer handled the request"
8866msgstr "没有 man 查看器处理此请求"
8867
8868#: builtin/help.c:362
8869msgid "no info viewer handled the request"
8870msgstr "没有 info 查看器处理此请求"
8871
8872#: builtin/help.c:404
8873msgid "Defining attributes per path"
8874msgstr "定义路径的属性"
8875
8876#: builtin/help.c:405
8877msgid "Everyday Git With 20 Commands Or So"
8878msgstr "每一天 Git 常用的约 20 条命令"
8879
8880#: builtin/help.c:406
8881msgid "A Git glossary"
8882msgstr "Git 词汇表"
8883
8884#: builtin/help.c:407
8885msgid "Specifies intentionally untracked files to ignore"
8886msgstr "忽略指定的未跟踪文件"
8887
8888#: builtin/help.c:408
8889msgid "Defining submodule properties"
8890msgstr "定义子模组属性"
8891
8892#: builtin/help.c:409
8893msgid "Specifying revisions and ranges for Git"
8894msgstr "指定 Git 的版本和版本范围"
8895
8896#: builtin/help.c:410
8897msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
8898msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
8899
8900#: builtin/help.c:411
8901msgid "An overview of recommended workflows with Git"
8902msgstr "Git 推荐的工作流概览"
8903
8904#: builtin/help.c:423
8905msgid "The common Git guides are:\n"
8906msgstr "最常用的 Git 向导有:\n"
8907
8908#: builtin/help.c:441
8909#, c-format
8910msgid "`git %s' is aliased to `%s'"
8911msgstr "`git %s' 是 `%s' 的别名"
8912
8913#: builtin/help.c:463 builtin/help.c:480
8914#, c-format
8915msgid "usage: %s%s"
8916msgstr "用法:%s%s"
8917
8918#: builtin/index-pack.c:155
8919#, c-format
8920msgid "unable to open %s"
8921msgstr "不能打开 %s"
8922
8923#: builtin/index-pack.c:205
8924#, c-format
8925msgid "object type mismatch at %s"
8926msgstr "%s 的对象类型不匹配"
8927
8928#: builtin/index-pack.c:225
8929#, c-format
8930msgid "did not receive expected object %s"
8931msgstr "未能获取预期的对象 %s"
8932
8933#: builtin/index-pack.c:228
8934#, c-format
8935msgid "object %s: expected type %s, found %s"
8936msgstr "对象 %s:应为类型 %s,却是 %s"
8937
8938#: builtin/index-pack.c:270
8939#, c-format
8940msgid "cannot fill %d byte"
8941msgid_plural "cannot fill %d bytes"
8942msgstr[0] "无法填充 %d 字节"
8943msgstr[1] "无法填充 %d 字节"
8944
8945#: builtin/index-pack.c:280
8946msgid "early EOF"
8947msgstr "过早的文件结束符(EOF)"
8948
8949#: builtin/index-pack.c:281
8950msgid "read error on input"
8951msgstr "输入上的读错误"
8952
8953#: builtin/index-pack.c:293
8954msgid "used more bytes than were available"
8955msgstr "用掉了超过可用的字节"
8956
8957#: builtin/index-pack.c:300
8958msgid "pack too large for current definition of off_t"
8959msgstr "包太大超过了当前 off_t 的定义"
8960
8961#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
8962msgid "pack exceeds maximum allowed size"
8963msgstr "包超过了最大允许值"
8964
8965#: builtin/index-pack.c:318
8966#, c-format
8967msgid "unable to create '%s'"
8968msgstr "不能创建 '%s'"
8969
8970#: builtin/index-pack.c:324
8971#, c-format
8972msgid "cannot open packfile '%s'"
8973msgstr "无法打开包文件 '%s'"
8974
8975#: builtin/index-pack.c:338
8976msgid "pack signature mismatch"
8977msgstr "包签名不匹配"
8978
8979#: builtin/index-pack.c:340
8980#, c-format
8981msgid "pack version %<PRIu32> unsupported"
8982msgstr "不支持包版本 %<PRIu32>"
8983
8984#: builtin/index-pack.c:358
8985#, c-format
8986msgid "pack has bad object at offset %<PRIuMAX>: %s"
8987msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8988
8989#: builtin/index-pack.c:479
8990#, c-format
8991msgid "inflate returned %d"
8992msgstr "解压缩返回 %d"
8993
8994#: builtin/index-pack.c:528
8995msgid "offset value overflow for delta base object"
8996msgstr "偏移值覆盖了 delta 基准对象"
8997
8998#: builtin/index-pack.c:536
8999msgid "delta base offset is out of bound"
9000msgstr "delta 基准偏移越界"
9001
9002#: builtin/index-pack.c:544
9003#, c-format
9004msgid "unknown object type %d"
9005msgstr "未知对象类型 %d"
9006
9007#: builtin/index-pack.c:575
9008msgid "cannot pread pack file"
9009msgstr "无法读取包文件"
9010
9011#: builtin/index-pack.c:577
9012#, c-format
9013msgid "premature end of pack file, %<PRIuMAX> byte missing"
9014msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
9015msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9016msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9017
9018#: builtin/index-pack.c:603
9019msgid "serious inflate inconsistency"
9020msgstr "解压缩严重的不一致"
9021
9022#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
9023#: builtin/index-pack.c:816 builtin/index-pack.c:825
9024#, c-format
9025msgid "SHA1 COLLISION FOUND WITH %s !"
9026msgstr "发现 %s 出现 SHA1 冲突!"
9027
9028#: builtin/index-pack.c:751 builtin/pack-objects.c:167
9029#: builtin/pack-objects.c:261
9030#, c-format
9031msgid "unable to read %s"
9032msgstr "不能读 %s"
9033
9034#: builtin/index-pack.c:814
9035#, c-format
9036msgid "cannot read existing object info %s"
9037msgstr "不能读取现存对象信息 %s"
9038
9039#: builtin/index-pack.c:822
9040#, c-format
9041msgid "cannot read existing object %s"
9042msgstr "不能读取现存对象 %s"
9043
9044#: builtin/index-pack.c:836
9045#, c-format
9046msgid "invalid blob object %s"
9047msgstr "无效的数据对象 %s"
9048
9049#: builtin/index-pack.c:851
9050#, c-format
9051msgid "invalid %s"
9052msgstr "无效的 %s"
9053
9054#: builtin/index-pack.c:854
9055msgid "Error in object"
9056msgstr "对象中出错"
9057
9058#: builtin/index-pack.c:856
9059#, c-format
9060msgid "Not all child objects of %s are reachable"
9061msgstr "%s 的所有子对象并非都可达"
9062
9063#: builtin/index-pack.c:928 builtin/index-pack.c:959
9064msgid "failed to apply delta"
9065msgstr "无法应用 delta"
9066
9067#: builtin/index-pack.c:1130
9068msgid "Receiving objects"
9069msgstr "接收对象中"
9070
9071#: builtin/index-pack.c:1130
9072msgid "Indexing objects"
9073msgstr "索引对象中"
9074
9075#: builtin/index-pack.c:1164
9076msgid "pack is corrupted (SHA1 mismatch)"
9077msgstr "包冲突(SHA1 不匹配)"
9078
9079#: builtin/index-pack.c:1169
9080msgid "cannot fstat packfile"
9081msgstr "不能对包文件调用 fstat"
9082
9083#: builtin/index-pack.c:1172
9084msgid "pack has junk at the end"
9085msgstr "包的结尾有垃圾数据"
9086
9087#: builtin/index-pack.c:1184
9088msgid "confusion beyond insanity in parse_pack_objects()"
9089msgstr "parse_pack_objects() 中遇到不可理喻的问题"
9090
9091#: builtin/index-pack.c:1207
9092msgid "Resolving deltas"
9093msgstr "处理 delta 中"
9094
9095#: builtin/index-pack.c:1218
9096#, c-format
9097msgid "unable to create thread: %s"
9098msgstr "不能创建线程:%s"
9099
9100#: builtin/index-pack.c:1260
9101msgid "confusion beyond insanity"
9102msgstr "不可理喻"
9103
9104#: builtin/index-pack.c:1266
9105#, c-format
9106msgid "completed with %d local object"
9107msgid_plural "completed with %d local objects"
9108msgstr[0] "完成 %d 个本地对象"
9109msgstr[1] "完成 %d 个本地对象"
9110
9111#: builtin/index-pack.c:1278
9112#, c-format
9113msgid "Unexpected tail checksum for %s (disk corruption?)"
9114msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
9115
9116#: builtin/index-pack.c:1282
9117#, c-format
9118msgid "pack has %d unresolved delta"
9119msgid_plural "pack has %d unresolved deltas"
9120msgstr[0] "包有 %d 个未解决的 delta"
9121msgstr[1] "包有 %d 个未解决的 delta"
9122
9123#: builtin/index-pack.c:1306
9124#, c-format
9125msgid "unable to deflate appended object (%d)"
9126msgstr "不能压缩附加对象(%d)"
9127
9128#: builtin/index-pack.c:1382
9129#, c-format
9130msgid "local object %s is corrupt"
9131msgstr "本地对象 %s 已损坏"
9132
9133#: builtin/index-pack.c:1408
9134msgid "error while closing pack file"
9135msgstr "关闭包文件时出错"
9136
9137#: builtin/index-pack.c:1420
9138#, c-format
9139msgid "cannot write keep file '%s'"
9140msgstr "无法写保留文件 '%s'"
9141
9142#: builtin/index-pack.c:1428
9143#, c-format
9144msgid "cannot close written keep file '%s'"
9145msgstr "无法关闭保留文件 '%s'"
9146
9147#: builtin/index-pack.c:1438
9148msgid "cannot store pack file"
9149msgstr "无法存储包文件"
9150
9151#: builtin/index-pack.c:1446
9152msgid "cannot store index file"
9153msgstr "无法存储索引文件"
9154
9155#: builtin/index-pack.c:1484
9156#, c-format
9157msgid "bad pack.indexversion=%<PRIu32>"
9158msgstr "坏的 pack.indexversion=%<PRIu32>"
9159
9160#: builtin/index-pack.c:1552
9161#, c-format
9162msgid "Cannot open existing pack file '%s'"
9163msgstr "无法打开现存包文件 '%s'"
9164
9165#: builtin/index-pack.c:1554
9166#, c-format
9167msgid "Cannot open existing pack idx file for '%s'"
9168msgstr "无法为 %s 打开包索引文件"
9169
9170#: builtin/index-pack.c:1602
9171#, c-format
9172msgid "non delta: %d object"
9173msgid_plural "non delta: %d objects"
9174msgstr[0] "非 delta:%d 个对象"
9175msgstr[1] "非 delta:%d 个对象"
9176
9177#: builtin/index-pack.c:1609
9178#, c-format
9179msgid "chain length = %d: %lu object"
9180msgid_plural "chain length = %d: %lu objects"
9181msgstr[0] "链长 = %d: %lu 对象"
9182msgstr[1] "链长 = %d: %lu 对象"
9183
9184#: builtin/index-pack.c:1622
9185#, c-format
9186msgid "packfile name '%s' does not end with '.pack'"
9187msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
9188
9189#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
9190#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
9191#, c-format
9192msgid "bad %s"
9193msgstr "错误选项 %s"
9194
9195#: builtin/index-pack.c:1743
9196msgid "--fix-thin cannot be used without --stdin"
9197msgstr "--fix-thin 不能和 --stdin 同时使用"
9198
9199#: builtin/index-pack.c:1745
9200msgid "--stdin requires a git repository"
9201msgstr "--stdin 需要一个 git 仓库"
9202
9203#: builtin/index-pack.c:1753
9204msgid "--verify with no packfile name given"
9205msgstr "--verify 没有提供包文件名参数"
9206
9207#: builtin/init-db.c:55
9208#, c-format
9209msgid "cannot stat '%s'"
9210msgstr "不能对 '%s' 调用 stat"
9211
9212#: builtin/init-db.c:61
9213#, c-format
9214msgid "cannot stat template '%s'"
9215msgstr "不能对模版 '%s' 调用 stat"
9216
9217#: builtin/init-db.c:66
9218#, c-format
9219msgid "cannot opendir '%s'"
9220msgstr "不能打开目录 '%s'"
9221
9222#: builtin/init-db.c:77
9223#, c-format
9224msgid "cannot readlink '%s'"
9225msgstr "不能读取链接 '%s'"
9226
9227#: builtin/init-db.c:79
9228#, c-format
9229msgid "cannot symlink '%s' '%s'"
9230msgstr "不能自 '%s' 到 '%s' 创建符号链接"
9231
9232#: builtin/init-db.c:85
9233#, c-format
9234msgid "cannot copy '%s' to '%s'"
9235msgstr "不能拷贝 '%s' 至 '%s'"
9236
9237#: builtin/init-db.c:89
9238#, c-format
9239msgid "ignoring template %s"
9240msgstr "忽略模版 %s"
9241
9242#: builtin/init-db.c:120
9243#, c-format
9244msgid "templates not found %s"
9245msgstr "模版未找到 %s"
9246
9247#: builtin/init-db.c:135
9248#, c-format
9249msgid "not copying templates from '%s': %s"
9250msgstr "没有从 '%s' 复制模版:%s"
9251
9252#: builtin/init-db.c:328
9253#, c-format
9254msgid "unable to handle file type %d"
9255msgstr "不能处理 %d 类型的文件"
9256
9257#: builtin/init-db.c:331
9258#, c-format
9259msgid "unable to move %s to %s"
9260msgstr "不能移动 %s 至 %s"
9261
9262#: builtin/init-db.c:348 builtin/init-db.c:351
9263#, c-format
9264msgid "%s already exists"
9265msgstr "%s 已经存在"
9266
9267#: builtin/init-db.c:404
9268#, c-format
9269msgid "Reinitialized existing shared Git repository in %s%s\n"
9270msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
9271
9272#: builtin/init-db.c:405
9273#, c-format
9274msgid "Reinitialized existing Git repository in %s%s\n"
9275msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
9276
9277#: builtin/init-db.c:409
9278#, c-format
9279msgid "Initialized empty shared Git repository in %s%s\n"
9280msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
9281
9282#: builtin/init-db.c:410
9283#, c-format
9284msgid "Initialized empty Git repository in %s%s\n"
9285msgstr "已初始化空的 Git 仓库于 %s%s\n"
9286
9287#: builtin/init-db.c:458
9288msgid ""
9289"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
9290"shared[=<permissions>]] [<directory>]"
9291msgstr ""
9292"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
9293"[<目录>]"
9294
9295#: builtin/init-db.c:481
9296msgid "permissions"
9297msgstr "权限"
9298
9299#: builtin/init-db.c:482
9300msgid "specify that the git repository is to be shared amongst several users"
9301msgstr "指定 git 仓库是多个用户之间共享的"
9302
9303#: builtin/init-db.c:516 builtin/init-db.c:521
9304#, c-format
9305msgid "cannot mkdir %s"
9306msgstr "不能创建目录 %s"
9307
9308#: builtin/init-db.c:525
9309#, c-format
9310msgid "cannot chdir to %s"
9311msgstr "不能切换目录到 %s"
9312
9313#: builtin/init-db.c:546
9314#, c-format
9315msgid ""
9316"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
9317"dir=<directory>)"
9318msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
9319
9320#: builtin/init-db.c:574
9321#, c-format
9322msgid "Cannot access work tree '%s'"
9323msgstr "不能访问工作区 '%s'"
9324
9325#: builtin/interpret-trailers.c:15
9326msgid ""
9327"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
9328"<token>[(=|:)<value>])...] [<file>...]"
9329msgstr ""
9330"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
9331">])...] [<文件>...]"
9332
9333#: builtin/interpret-trailers.c:26
9334msgid "edit files in place"
9335msgstr "在原位编辑文件"
9336
9337#: builtin/interpret-trailers.c:27
9338msgid "trim empty trailers"
9339msgstr "删除空签名"
9340
9341#: builtin/interpret-trailers.c:28
9342msgid "trailer"
9343msgstr "签名"
9344
9345#: builtin/interpret-trailers.c:29
9346msgid "trailer(s) to add"
9347msgstr "要添加的签名"
9348
9349#: builtin/interpret-trailers.c:42
9350msgid "no input file given for in-place editing"
9351msgstr "没有给出要原位编辑的文件"
9352
9353#: builtin/log.c:45
9354msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
9355msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
9356
9357#: builtin/log.c:46
9358msgid "git show [<options>] <object>..."
9359msgstr "git show [<选项>] <对象>..."
9360
9361#: builtin/log.c:90
9362#, c-format
9363msgid "invalid --decorate option: %s"
9364msgstr "无效的 --decorate 选项:%s"
9365
9366#: builtin/log.c:147
9367msgid "suppress diff output"
9368msgstr "不显示差异输出"
9369
9370#: builtin/log.c:148
9371msgid "show source"
9372msgstr "显示源"
9373
9374#: builtin/log.c:149
9375msgid "Use mail map file"
9376msgstr "使用邮件映射文件"
9377
9378#: builtin/log.c:150
9379msgid "decorate options"
9380msgstr "修饰选项"
9381
9382#: builtin/log.c:153
9383msgid "Process line range n,m in file, counting from 1"
9384msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
9385
9386#: builtin/log.c:249
9387#, c-format
9388msgid "Final output: %d %s\n"
9389msgstr "最终输出:%d %s\n"
9390
9391#: builtin/log.c:497
9392#, c-format
9393msgid "git show %s: bad file"
9394msgstr "git show %s: 损坏的文件"
9395
9396#: builtin/log.c:512 builtin/log.c:606
9397#, c-format
9398msgid "Could not read object %s"
9399msgstr "不能读取对象 %s"
9400
9401#: builtin/log.c:630
9402#, c-format
9403msgid "Unknown type: %d"
9404msgstr "未知类型:%d"
9405
9406#: builtin/log.c:751
9407msgid "format.headers without value"
9408msgstr "format.headers 没有值"
9409
9410#: builtin/log.c:852
9411msgid "name of output directory is too long"
9412msgstr "输出目录名太长"
9413
9414#: builtin/log.c:868
9415#, c-format
9416msgid "Cannot open patch file %s"
9417msgstr "无法打开补丁文件 %s"
9418
9419#: builtin/log.c:885
9420msgid "Need exactly one range."
9421msgstr "只需要一个范围。"
9422
9423#: builtin/log.c:895
9424msgid "Not a range."
9425msgstr "不是一个范围。"
9426
9427#: builtin/log.c:1001
9428msgid "Cover letter needs email format"
9429msgstr "信封需要邮件地址格式"
9430
9431#: builtin/log.c:1081
9432#, c-format
9433msgid "insane in-reply-to: %s"
9434msgstr "不正常的 in-reply-to:%s"
9435
9436#: builtin/log.c:1108
9437msgid "git format-patch [<options>] [<since> | <revision-range>]"
9438msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
9439
9440#: builtin/log.c:1158
9441msgid "Two output directories?"
9442msgstr "两个输出目录?"
9443
9444#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
9445#, c-format
9446msgid "Unknown commit %s"
9447msgstr "未知提交 %s"
9448
9449#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
9450#, c-format
9451msgid "Failed to resolve '%s' as a valid ref."
9452msgstr "无法解析 '%s' 为一个有效引用。"
9453
9454#: builtin/log.c:1280
9455msgid "Could not find exact merge base."
9456msgstr "不能找到准确的合并基线。"
9457
9458#: builtin/log.c:1284
9459msgid ""
9460"Failed to get upstream, if you want to record base commit automatically,\n"
9461"please use git branch --set-upstream-to to track a remote branch.\n"
9462"Or you could specify base commit by --base=<base-commit-id> manually."
9463msgstr ""
9464"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
9465"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
9466"参数 --base=<base-commit-id> 手动指定一个基线提交。"
9467
9468#: builtin/log.c:1304
9469msgid "Failed to find exact merge base"
9470msgstr "无法找到准确的合并基线"
9471
9472#: builtin/log.c:1315
9473msgid "base commit should be the ancestor of revision list"
9474msgstr "基线提交应该是版本列表的祖先"
9475
9476#: builtin/log.c:1319
9477msgid "base commit shouldn't be in revision list"
9478msgstr "基线提交不应该出现在版本列表中"
9479
9480#: builtin/log.c:1368
9481msgid "cannot get patch id"
9482msgstr "无法得到补丁 id"
9483
9484#: builtin/log.c:1425
9485msgid "use [PATCH n/m] even with a single patch"
9486msgstr "使用 [PATCH n/m],即使只有一个补丁"
9487
9488#: builtin/log.c:1428
9489msgid "use [PATCH] even with multiple patches"
9490msgstr "使用 [PATCH],即使有多个补丁"
9491
9492#: builtin/log.c:1432
9493msgid "print patches to standard out"
9494msgstr "打印补丁到标准输出"
9495
9496#: builtin/log.c:1434
9497msgid "generate a cover letter"
9498msgstr "生成一封附信"
9499
9500#: builtin/log.c:1436
9501msgid "use simple number sequence for output file names"
9502msgstr "使用简单的数字序列作为输出文件名"
9503
9504#: builtin/log.c:1437
9505msgid "sfx"
9506msgstr "后缀"
9507
9508#: builtin/log.c:1438
9509msgid "use <sfx> instead of '.patch'"
9510msgstr "使用 <后缀> 代替 '.patch'"
9511
9512#: builtin/log.c:1440
9513msgid "start numbering patches at <n> instead of 1"
9514msgstr "补丁以 <n> 开始编号,而不是1"
9515
9516#: builtin/log.c:1442
9517msgid "mark the series as Nth re-roll"
9518msgstr "标记补丁系列是第几次重制"
9519
9520#: builtin/log.c:1444
9521msgid "Use [RFC PATCH] instead of [PATCH]"
9522msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9523
9524#: builtin/log.c:1447
9525msgid "Use [<prefix>] instead of [PATCH]"
9526msgstr "使用 [<前缀>] 代替 [PATCH]"
9527
9528#: builtin/log.c:1450
9529msgid "store resulting files in <dir>"
9530msgstr "把结果文件存储在 <目录>"
9531
9532#: builtin/log.c:1453
9533msgid "don't strip/add [PATCH]"
9534msgstr "不删除/添加 [PATCH]"
9535
9536#: builtin/log.c:1456
9537msgid "don't output binary diffs"
9538msgstr "不输出二进制差异"
9539
9540#: builtin/log.c:1458
9541msgid "output all-zero hash in From header"
9542msgstr "在 From 头信息中输出全为零的哈希值"
9543
9544#: builtin/log.c:1460
9545msgid "don't include a patch matching a commit upstream"
9546msgstr "不包含已在上游提交中的补丁"
9547
9548#: builtin/log.c:1462
9549msgid "show patch format instead of default (patch + stat)"
9550msgstr "显示纯补丁格式而非默认的(补丁+状态)"
9551
9552#: builtin/log.c:1464
9553msgid "Messaging"
9554msgstr "邮件发送"
9555
9556#: builtin/log.c:1465
9557msgid "header"
9558msgstr "header"
9559
9560#: builtin/log.c:1466
9561msgid "add email header"
9562msgstr "添加邮件头"
9563
9564#: builtin/log.c:1467 builtin/log.c:1469
9565msgid "email"
9566msgstr "邮件地址"
9567
9568#: builtin/log.c:1467
9569msgid "add To: header"
9570msgstr "添加收件人"
9571
9572#: builtin/log.c:1469
9573msgid "add Cc: header"
9574msgstr "添加抄送"
9575
9576#: builtin/log.c:1471
9577msgid "ident"
9578msgstr "标识"
9579
9580#: builtin/log.c:1472
9581msgid "set From address to <ident> (or committer ident if absent)"
9582msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
9583
9584#: builtin/log.c:1474
9585msgid "message-id"
9586msgstr "邮件标识"
9587
9588#: builtin/log.c:1475
9589msgid "make first mail a reply to <message-id>"
9590msgstr "使第一封邮件作为对 <邮件标识> 的回复"
9591
9592#: builtin/log.c:1476 builtin/log.c:1479
9593msgid "boundary"
9594msgstr "边界"
9595
9596#: builtin/log.c:1477
9597msgid "attach the patch"
9598msgstr "附件方式添加补丁"
9599
9600#: builtin/log.c:1480
9601msgid "inline the patch"
9602msgstr "内联显示补丁"
9603
9604#: builtin/log.c:1484
9605msgid "enable message threading, styles: shallow, deep"
9606msgstr "启用邮件线索,风格:浅,深"
9607
9608#: builtin/log.c:1486
9609msgid "signature"
9610msgstr "签名"
9611
9612#: builtin/log.c:1487
9613msgid "add a signature"
9614msgstr "添加一个签名"
9615
9616#: builtin/log.c:1488
9617msgid "base-commit"
9618msgstr "基线提交"
9619
9620#: builtin/log.c:1489
9621msgid "add prerequisite tree info to the patch series"
9622msgstr "为补丁列表添加前置树信息"
9623
9624#: builtin/log.c:1491
9625msgid "add a signature from a file"
9626msgstr "从文件添加一个签名"
9627
9628#: builtin/log.c:1492
9629msgid "don't print the patch filenames"
9630msgstr "不要打印补丁文件名"
9631
9632#: builtin/log.c:1567
9633#, c-format
9634msgid "invalid ident line: %s"
9635msgstr "包含无效的身份标识:%s"
9636
9637#: builtin/log.c:1582
9638msgid "-n and -k are mutually exclusive."
9639msgstr "-n 和 -k 互斥。"
9640
9641#: builtin/log.c:1584
9642msgid "--subject-prefix/--rfc and -k are mutually exclusive."
9643msgstr "--subject-prefix/--rfc 和 -k 互斥。"
9644
9645#: builtin/log.c:1592
9646msgid "--name-only does not make sense"
9647msgstr "--name-only 无意义"
9648
9649#: builtin/log.c:1594
9650msgid "--name-status does not make sense"
9651msgstr "--name-status 无意义"
9652
9653#: builtin/log.c:1596
9654msgid "--check does not make sense"
9655msgstr "--check 无意义"
9656
9657#: builtin/log.c:1626
9658msgid "standard output, or directory, which one?"
9659msgstr "标准输出或目录,哪一个?"
9660
9661#: builtin/log.c:1628
9662#, c-format
9663msgid "Could not create directory '%s'"
9664msgstr "不能创建目录 '%s'"
9665
9666#: builtin/log.c:1722
9667#, c-format
9668msgid "unable to read signature file '%s'"
9669msgstr "无法读取签名文件 '%s'"
9670
9671#: builtin/log.c:1794
9672msgid "Failed to create output files"
9673msgstr "无法创建输出文件"
9674
9675#: builtin/log.c:1843
9676msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
9677msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
9678
9679#: builtin/log.c:1897
9680#, c-format
9681msgid ""
9682"Could not find a tracked remote branch, please specify <upstream> manually.\n"
9683msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
9684
9685#: builtin/ls-files.c:468
9686msgid "git ls-files [<options>] [<file>...]"
9687msgstr "git ls-files [<选项>] [<文件>...]"
9688
9689#: builtin/ls-files.c:517
9690msgid "identify the file status with tags"
9691msgstr "用标签标识文件的状态"
9692
9693#: builtin/ls-files.c:519
9694msgid "use lowercase letters for 'assume unchanged' files"
9695msgstr "使用小写字母表示 '假设未改变的' 文件"
9696
9697#: builtin/ls-files.c:521
9698msgid "show cached files in the output (default)"
9699msgstr "显示缓存的文件(默认)"
9700
9701#: builtin/ls-files.c:523
9702msgid "show deleted files in the output"
9703msgstr "显示已删除的文件"
9704
9705#: builtin/ls-files.c:525
9706msgid "show modified files in the output"
9707msgstr "显示已修改的文件"
9708
9709#: builtin/ls-files.c:527
9710msgid "show other files in the output"
9711msgstr "显示其它文件"
9712
9713#: builtin/ls-files.c:529
9714msgid "show ignored files in the output"
9715msgstr "显示忽略的文件"
9716
9717#: builtin/ls-files.c:532
9718msgid "show staged contents' object name in the output"
9719msgstr "显示暂存区内容的对象名称"
9720
9721#: builtin/ls-files.c:534
9722msgid "show files on the filesystem that need to be removed"
9723msgstr "显示文件系统需要删除的文件"
9724
9725#: builtin/ls-files.c:536
9726msgid "show 'other' directories' names only"
9727msgstr "只显示“其他”目录的名称"
9728
9729#: builtin/ls-files.c:538
9730msgid "show line endings of files"
9731msgstr "显示文件换行符格式"
9732
9733#: builtin/ls-files.c:540
9734msgid "don't show empty directories"
9735msgstr "不显示空目录"
9736
9737#: builtin/ls-files.c:543
9738msgid "show unmerged files in the output"
9739msgstr "显示未合并的文件"
9740
9741#: builtin/ls-files.c:545
9742msgid "show resolve-undo information"
9743msgstr "显示 resolve-undo 信息"
9744
9745#: builtin/ls-files.c:547
9746msgid "skip files matching pattern"
9747msgstr "匹配排除文件的模式"
9748
9749#: builtin/ls-files.c:550
9750msgid "exclude patterns are read from <file>"
9751msgstr "从 <文件> 中读取排除模式"
9752
9753#: builtin/ls-files.c:553
9754msgid "read additional per-directory exclude patterns in <file>"
9755msgstr "从 <文件> 读取额外的每个目录的排除模式"
9756
9757#: builtin/ls-files.c:555
9758msgid "add the standard git exclusions"
9759msgstr "添加标准的 git 排除"
9760
9761#: builtin/ls-files.c:558
9762msgid "make the output relative to the project top directory"
9763msgstr "显示相对于顶级目录的文件名"
9764
9765#: builtin/ls-files.c:561
9766msgid "recurse through submodules"
9767msgstr "在子模组中递归"
9768
9769#: builtin/ls-files.c:563
9770msgid "if any <file> is not in the index, treat this as an error"
9771msgstr "如果任何 <文件> 都不在索引区,视为错误"
9772
9773#: builtin/ls-files.c:564
9774msgid "tree-ish"
9775msgstr "树或提交"
9776
9777#: builtin/ls-files.c:565
9778msgid "pretend that paths removed since <tree-ish> are still present"
9779msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
9780
9781#: builtin/ls-files.c:567
9782msgid "show debugging data"
9783msgstr "显示调试数据"
9784
9785#: builtin/ls-remote.c:7
9786msgid ""
9787"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9788"                     [-q | --quiet] [--exit-code] [--get-url]\n"
9789"                     [--symref] [<repository> [<refs>...]]"
9790msgstr ""
9791"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9792"                     [-q | --quiet] [--exit-code] [--get-url]\n"
9793"                     [--symref] [<仓库> [<引用>...]]"
9794
9795#: builtin/ls-remote.c:52
9796msgid "do not print remote URL"
9797msgstr "不打印远程 URL"
9798
9799#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
9800msgid "exec"
9801msgstr "exec"
9802
9803#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
9804msgid "path of git-upload-pack on the remote host"
9805msgstr "远程主机上的 git-upload-pack 路径"
9806
9807#: builtin/ls-remote.c:58
9808msgid "limit to tags"
9809msgstr "仅限于标签"
9810
9811#: builtin/ls-remote.c:59
9812msgid "limit to heads"
9813msgstr "仅限于分支"
9814
9815#: builtin/ls-remote.c:60
9816msgid "do not show peeled tags"
9817msgstr "不显示已解析的标签"
9818
9819#: builtin/ls-remote.c:62
9820msgid "take url.<base>.insteadOf into account"
9821msgstr "参考 url.<base>.insteadOf 设置"
9822
9823#: builtin/ls-remote.c:64
9824msgid "exit with exit code 2 if no matching refs are found"
9825msgstr "若未找到匹配的引用则以退出码2退出"
9826
9827#: builtin/ls-remote.c:66
9828msgid "show underlying ref in addition to the object pointed by it"
9829msgstr "除了显示指向的对象外,显示指向的引用名"
9830
9831#: builtin/ls-tree.c:29
9832msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9833msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
9834
9835#: builtin/ls-tree.c:127
9836msgid "only show trees"
9837msgstr "只显示树"
9838
9839#: builtin/ls-tree.c:129
9840msgid "recurse into subtrees"
9841msgstr "递归到子树"
9842
9843#: builtin/ls-tree.c:131
9844msgid "show trees when recursing"
9845msgstr "当递归时显示树"
9846
9847#: builtin/ls-tree.c:134
9848msgid "terminate entries with NUL byte"
9849msgstr "条目以 NUL 字符终止"
9850
9851#: builtin/ls-tree.c:135
9852msgid "include object size"
9853msgstr "包括对象大小"
9854
9855#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
9856msgid "list only filenames"
9857msgstr "只列出文件名"
9858
9859#: builtin/ls-tree.c:142
9860msgid "use full path names"
9861msgstr "使用文件的全路径"
9862
9863#: builtin/ls-tree.c:144
9864msgid "list entire tree; not just current directory (implies --full-name)"
9865msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
9866
9867#: builtin/mailsplit.c:241
9868#, c-format
9869msgid "empty mbox: '%s'"
9870msgstr "空的 mbox:'%s'"
9871
9872#: builtin/merge.c:47
9873msgid "git merge [<options>] [<commit>...]"
9874msgstr "git merge [<选项>] [<提交>...]"
9875
9876#: builtin/merge.c:48
9877msgid "git merge --abort"
9878msgstr "git merge --abort"
9879
9880#: builtin/merge.c:49
9881msgid "git merge --continue"
9882msgstr "git merge --continue"
9883
9884#: builtin/merge.c:104
9885msgid "switch `m' requires a value"
9886msgstr "开关 `m' 需要一个值"
9887
9888#: builtin/merge.c:141
9889#, c-format
9890msgid "Could not find merge strategy '%s'.\n"
9891msgstr "不能找到合并策略 '%s'。\n"
9892
9893#: builtin/merge.c:142
9894#, c-format
9895msgid "Available strategies are:"
9896msgstr "可用的策略有:"
9897
9898#: builtin/merge.c:147
9899#, c-format
9900msgid "Available custom strategies are:"
9901msgstr "可用的自定义策略有:"
9902
9903#: builtin/merge.c:197 builtin/pull.c:134
9904msgid "do not show a diffstat at the end of the merge"
9905msgstr "在合并的最后不显示差异统计"
9906
9907#: builtin/merge.c:200 builtin/pull.c:137
9908msgid "show a diffstat at the end of the merge"
9909msgstr "在合并的最后显示差异统计"
9910
9911#: builtin/merge.c:201 builtin/pull.c:140
9912msgid "(synonym to --stat)"
9913msgstr "(和 --stat 同义)"
9914
9915#: builtin/merge.c:203 builtin/pull.c:143
9916msgid "add (at most <n>) entries from shortlog to merge commit message"
9917msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
9918
9919#: builtin/merge.c:206 builtin/pull.c:146
9920msgid "create a single commit instead of doing a merge"
9921msgstr "创建一个单独的提交而不是做一次合并"
9922
9923#: builtin/merge.c:208 builtin/pull.c:149
9924msgid "perform a commit if the merge succeeds (default)"
9925msgstr "如果合并成功,执行一次提交(默认)"
9926
9927#: builtin/merge.c:210 builtin/pull.c:152
9928msgid "edit message before committing"
9929msgstr "在提交前编辑提交说明"
9930
9931#: builtin/merge.c:211
9932msgid "allow fast-forward (default)"
9933msgstr "允许快进(默认)"
9934
9935#: builtin/merge.c:213 builtin/pull.c:158
9936msgid "abort if fast-forward is not possible"
9937msgstr "如果不能快进就放弃合并"
9938
9939#: builtin/merge.c:217 builtin/pull.c:161
9940msgid "verify that the named commit has a valid GPG signature"
9941msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9942
9943#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
9944#: builtin/revert.c:109
9945msgid "strategy"
9946msgstr "策略"
9947
9948#: builtin/merge.c:219 builtin/pull.c:166
9949msgid "merge strategy to use"
9950msgstr "要使用的合并策略"
9951
9952#: builtin/merge.c:220 builtin/pull.c:169
9953msgid "option=value"
9954msgstr "option=value"
9955
9956#: builtin/merge.c:221 builtin/pull.c:170
9957msgid "option for selected merge strategy"
9958msgstr "所选的合并策略的选项"
9959
9960#: builtin/merge.c:223
9961msgid "merge commit message (for a non-fast-forward merge)"
9962msgstr "合并的提交说明(针对非快进式合并)"
9963
9964#: builtin/merge.c:227
9965msgid "abort the current in-progress merge"
9966msgstr "放弃当前正在进行的合并"
9967
9968#: builtin/merge.c:229
9969msgid "continue the current in-progress merge"
9970msgstr "继续当前正在进行的合并"
9971
9972#: builtin/merge.c:231 builtin/pull.c:177
9973msgid "allow merging unrelated histories"
9974msgstr "允许合并不相关的历史"
9975
9976#: builtin/merge.c:259
9977msgid "could not run stash."
9978msgstr "不能运行贮藏。"
9979
9980#: builtin/merge.c:264
9981msgid "stash failed"
9982msgstr "贮藏失败"
9983
9984#: builtin/merge.c:269
9985#, c-format
9986msgid "not a valid object: %s"
9987msgstr "不是一个有效对象:%s"
9988
9989#: builtin/merge.c:288 builtin/merge.c:305
9990msgid "read-tree failed"
9991msgstr "读取树失败"
9992
9993#  译者:注意保持前导空格
9994#: builtin/merge.c:335
9995msgid " (nothing to squash)"
9996msgstr " (无可压缩)"
9997
9998#: builtin/merge.c:346
9999#, c-format
10000msgid "Squash commit -- not updating HEAD\n"
10001msgstr "压缩提交 -- 未更新 HEAD\n"
10002
10003#: builtin/merge.c:396
10004#, c-format
10005msgid "No merge message -- not updating HEAD\n"
10006msgstr "无合并信息 -- 未更新 HEAD\n"
10007
10008#: builtin/merge.c:447
10009#, c-format
10010msgid "'%s' does not point to a commit"
10011msgstr "'%s' 没有指向一个提交"
10012
10013#: builtin/merge.c:537
10014#, c-format
10015msgid "Bad branch.%s.mergeoptions string: %s"
10016msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
10017
10018#: builtin/merge.c:657
10019msgid "Not handling anything other than two heads merge."
10020msgstr "未处理两个头合并之外的任何操作。"
10021
10022#: builtin/merge.c:671
10023#, c-format
10024msgid "Unknown option for merge-recursive: -X%s"
10025msgstr "merge-recursive 的未知选项:-X%s"
10026
10027#: builtin/merge.c:686
10028#, c-format
10029msgid "unable to write %s"
10030msgstr "不能写 %s"
10031
10032#: builtin/merge.c:738
10033#, c-format
10034msgid "Could not read from '%s'"
10035msgstr "不能从 '%s' 读取"
10036
10037#: builtin/merge.c:747
10038#, c-format
10039msgid "Not committing merge; use 'git commit' to complete the merge.\n"
10040msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
10041
10042#: builtin/merge.c:753
10043#, c-format
10044msgid ""
10045"Please enter a commit message to explain why this merge is necessary,\n"
10046"especially if it merges an updated upstream into a topic branch.\n"
10047"\n"
10048"Lines starting with '%c' will be ignored, and an empty message aborts\n"
10049"the commit.\n"
10050msgstr ""
10051"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
10052"合并到主题分支。\n"
10053"\n"
10054"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
10055
10056#: builtin/merge.c:777
10057msgid "Empty commit message."
10058msgstr "空提交信息。"
10059
10060#: builtin/merge.c:797
10061#, c-format
10062msgid "Wonderful.\n"
10063msgstr "太棒了。\n"
10064
10065#: builtin/merge.c:850
10066#, c-format
10067msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
10068msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
10069
10070#: builtin/merge.c:889
10071msgid "No current branch."
10072msgstr "没有当前分支。"
10073
10074#: builtin/merge.c:891
10075msgid "No remote for the current branch."
10076msgstr "当前分支没有对应的远程仓库。"
10077
10078#: builtin/merge.c:893
10079msgid "No default upstream defined for the current branch."
10080msgstr "当前分支没有定义默认的上游分支。"
10081
10082#: builtin/merge.c:898
10083#, c-format
10084msgid "No remote-tracking branch for %s from %s"
10085msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
10086
10087#: builtin/merge.c:945
10088#, c-format
10089msgid "Bad value '%s' in environment '%s'"
10090msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
10091
10092#: builtin/merge.c:1046
10093#, c-format
10094msgid "not something we can merge in %s: %s"
10095msgstr "不能在 %s 中合并:%s"
10096
10097#: builtin/merge.c:1080
10098msgid "not something we can merge"
10099msgstr "不能合并"
10100
10101#: builtin/merge.c:1145
10102msgid "--abort expects no arguments"
10103msgstr "--abort 不带参数"
10104
10105#: builtin/merge.c:1149
10106msgid "There is no merge to abort (MERGE_HEAD missing)."
10107msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
10108
10109#: builtin/merge.c:1161
10110msgid "--continue expects no arguments"
10111msgstr "--continue 不带参数"
10112
10113#: builtin/merge.c:1165
10114msgid "There is no merge in progress (MERGE_HEAD missing)."
10115msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
10116
10117#: builtin/merge.c:1181
10118msgid ""
10119"You have not concluded your merge (MERGE_HEAD exists).\n"
10120"Please, commit your changes before you merge."
10121msgstr ""
10122"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10123"请在合并前先提交您的修改。"
10124
10125#: builtin/merge.c:1188
10126msgid ""
10127"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
10128"Please, commit your changes before you merge."
10129msgstr ""
10130"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
10131"请在合并前先提交您的修改。"
10132
10133#: builtin/merge.c:1191
10134msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
10135msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
10136
10137#: builtin/merge.c:1200
10138msgid "You cannot combine --squash with --no-ff."
10139msgstr "您不能将 --squash 与 --no-ff 同时使用。"
10140
10141#: builtin/merge.c:1208
10142msgid "No commit specified and merge.defaultToUpstream not set."
10143msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
10144
10145#: builtin/merge.c:1225
10146msgid "Squash commit into empty head not supported yet"
10147msgstr "尚不支持到空分支的压缩提交"
10148
10149#: builtin/merge.c:1227
10150msgid "Non-fast-forward commit does not make sense into an empty head"
10151msgstr "到空分支的非快进式提交没有意义"
10152
10153#: builtin/merge.c:1232
10154#, c-format
10155msgid "%s - not something we can merge"
10156msgstr "%s - 不能被合并"
10157
10158#: builtin/merge.c:1234
10159msgid "Can merge only exactly one commit into empty head"
10160msgstr "只能将一个提交合并到空分支上"
10161
10162#: builtin/merge.c:1268
10163#, c-format
10164msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
10165msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
10166
10167#: builtin/merge.c:1271
10168#, c-format
10169msgid "Commit %s has a bad GPG signature allegedly by %s."
10170msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
10171
10172#: builtin/merge.c:1274
10173#, c-format
10174msgid "Commit %s does not have a GPG signature."
10175msgstr "提交 %s 没有一个 GPG 签名。"
10176
10177#: builtin/merge.c:1277
10178#, c-format
10179msgid "Commit %s has a good GPG signature by %s\n"
10180msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
10181
10182#: builtin/merge.c:1339
10183msgid "refusing to merge unrelated histories"
10184msgstr "拒绝合并无关的历史"
10185
10186#: builtin/merge.c:1348
10187msgid "Already up-to-date."
10188msgstr "已经是最新的。"
10189
10190#: builtin/merge.c:1358
10191#, c-format
10192msgid "Updating %s..%s\n"
10193msgstr "更新 %s..%s\n"
10194
10195#: builtin/merge.c:1399
10196#, c-format
10197msgid "Trying really trivial in-index merge...\n"
10198msgstr "尝试非常小的索引内合并...\n"
10199
10200#: builtin/merge.c:1406
10201#, c-format
10202msgid "Nope.\n"
10203msgstr "无。\n"
10204
10205#: builtin/merge.c:1431
10206msgid "Already up-to-date. Yeeah!"
10207msgstr "已经是最新的。耶!"
10208
10209#: builtin/merge.c:1437
10210msgid "Not possible to fast-forward, aborting."
10211msgstr "无法快进,终止。"
10212
10213#: builtin/merge.c:1460 builtin/merge.c:1539
10214#, c-format
10215msgid "Rewinding the tree to pristine...\n"
10216msgstr "将树回滚至原始状态...\n"
10217
10218#: builtin/merge.c:1464
10219#, c-format
10220msgid "Trying merge strategy %s...\n"
10221msgstr "尝试合并策略 %s...\n"
10222
10223#: builtin/merge.c:1530
10224#, c-format
10225msgid "No merge strategy handled the merge.\n"
10226msgstr "没有合并策略处理此合并。\n"
10227
10228#: builtin/merge.c:1532
10229#, c-format
10230msgid "Merge with strategy %s failed.\n"
10231msgstr "使用策略 %s 合并失败。\n"
10232
10233#: builtin/merge.c:1541
10234#, c-format
10235msgid "Using the %s to prepare resolving by hand.\n"
10236msgstr "使用 %s 以准备手工解决。\n"
10237
10238#: builtin/merge.c:1553
10239#, c-format
10240msgid "Automatic merge went well; stopped before committing as requested\n"
10241msgstr "自动合并进展顺利,按要求在提交前停止\n"
10242
10243#: builtin/merge-base.c:30
10244msgid "git merge-base [-a | --all] <commit> <commit>..."
10245msgstr "git merge-base [-a | --all] <提交> <提交>..."
10246
10247#: builtin/merge-base.c:31
10248msgid "git merge-base [-a | --all] --octopus <commit>..."
10249msgstr "git merge-base [-a | --all] --octopus <提交>..."
10250
10251#: builtin/merge-base.c:32
10252msgid "git merge-base --independent <commit>..."
10253msgstr "git merge-base --independent <提交>..."
10254
10255#: builtin/merge-base.c:33
10256msgid "git merge-base --is-ancestor <commit> <commit>"
10257msgstr "git merge-base --is-ancestor <提交> <提交>"
10258
10259#: builtin/merge-base.c:34
10260msgid "git merge-base --fork-point <ref> [<commit>]"
10261msgstr "git merge-base --fork-point <引用> [<提交>]"
10262
10263#: builtin/merge-base.c:218
10264msgid "output all common ancestors"
10265msgstr "输出所有共同的祖先"
10266
10267#: builtin/merge-base.c:220
10268msgid "find ancestors for a single n-way merge"
10269msgstr "查找一个多路合并的祖先提交"
10270
10271#: builtin/merge-base.c:222
10272msgid "list revs not reachable from others"
10273msgstr "显示不能被其他访问到的版本"
10274
10275#: builtin/merge-base.c:224
10276msgid "is the first one ancestor of the other?"
10277msgstr "第一个是其他的祖先提交么?"
10278
10279#: builtin/merge-base.c:226
10280msgid "find where <commit> forked from reflog of <ref>"
10281msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
10282
10283#: builtin/merge-file.c:9
10284msgid ""
10285"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
10286"<orig-file> <file2>"
10287msgstr ""
10288"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
10289"件> <文件2>"
10290
10291#: builtin/merge-file.c:33
10292msgid "send results to standard output"
10293msgstr "将结果发送到标准输出"
10294
10295#: builtin/merge-file.c:34
10296msgid "use a diff3 based merge"
10297msgstr "使用基于 diff3 的合并"
10298
10299#: builtin/merge-file.c:35
10300msgid "for conflicts, use our version"
10301msgstr "如果冲突,使用我们的版本"
10302
10303#: builtin/merge-file.c:37
10304msgid "for conflicts, use their version"
10305msgstr "如果冲突,使用他们的版本"
10306
10307#: builtin/merge-file.c:39
10308msgid "for conflicts, use a union version"
10309msgstr "如果冲突,使用联合版本"
10310
10311#: builtin/merge-file.c:42
10312msgid "for conflicts, use this marker size"
10313msgstr "如果冲突,使用指定长度的标记"
10314
10315#: builtin/merge-file.c:43
10316msgid "do not warn about conflicts"
10317msgstr "不要警告冲突"
10318
10319#: builtin/merge-file.c:45
10320msgid "set labels for file1/orig-file/file2"
10321msgstr "为 文件1/初始文件/文件2 设置标签"
10322
10323#: builtin/merge-recursive.c:45
10324#, c-format
10325msgid "unknown option %s"
10326msgstr "未知选项 %s"
10327
10328#: builtin/merge-recursive.c:51
10329#, c-format
10330msgid "could not parse object '%s'"
10331msgstr "不能解析对象 '%s'"
10332
10333#: builtin/merge-recursive.c:55
10334#, c-format
10335msgid "cannot handle more than %d base. Ignoring %s."
10336msgid_plural "cannot handle more than %d bases. Ignoring %s."
10337msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
10338msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
10339
10340#: builtin/merge-recursive.c:63
10341msgid "not handling anything other than two heads merge."
10342msgstr "不能处理两个头合并之外的任何操作。"
10343
10344#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
10345#, c-format
10346msgid "could not resolve ref '%s'"
10347msgstr "无法解析引用 '%s'"
10348
10349#: builtin/merge-recursive.c:77
10350#, c-format
10351msgid "Merging %s with %s\n"
10352msgstr "合并 %s 和 %s\n"
10353
10354#: builtin/mktree.c:65
10355msgid "git mktree [-z] [--missing] [--batch]"
10356msgstr "git mktree [-z] [--missing] [--batch]"
10357
10358#: builtin/mktree.c:153
10359msgid "input is NUL terminated"
10360msgstr "输入以 NUL 字符终止"
10361
10362#: builtin/mktree.c:154 builtin/write-tree.c:25
10363msgid "allow missing objects"
10364msgstr "允许丢失的对象"
10365
10366#: builtin/mktree.c:155
10367msgid "allow creation of more than one tree"
10368msgstr "允许创建一个以上的树"
10369
10370#: builtin/mv.c:17
10371msgid "git mv [<options>] <source>... <destination>"
10372msgstr "git mv [<选项>] <源>... <目标>"
10373
10374#: builtin/mv.c:83
10375#, c-format
10376msgid "Directory %s is in index and no submodule?"
10377msgstr "目录 %s 在索引中并且不是子模组?"
10378
10379#: builtin/mv.c:85 builtin/rm.c:290
10380msgid "Please stage your changes to .gitmodules or stash them to proceed"
10381msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
10382
10383#: builtin/mv.c:103
10384#, c-format
10385msgid "%.*s is in index"
10386msgstr "%.*s 在索引中"
10387
10388#: builtin/mv.c:125
10389msgid "force move/rename even if target exists"
10390msgstr "强制移动/重命令,即使目标存在"
10391
10392#: builtin/mv.c:126
10393msgid "skip move/rename errors"
10394msgstr "跳过移动/重命名错误"
10395
10396#: builtin/mv.c:168
10397#, c-format
10398msgid "destination '%s' is not a directory"
10399msgstr "目标 '%s' 不是一个目录"
10400
10401#: builtin/mv.c:179
10402#, c-format
10403msgid "Checking rename of '%s' to '%s'\n"
10404msgstr "检查 '%s' 到 '%s' 的重命名\n"
10405
10406#: builtin/mv.c:183
10407msgid "bad source"
10408msgstr "坏的源"
10409
10410#: builtin/mv.c:186
10411msgid "can not move directory into itself"
10412msgstr "不能将目录移动到自身"
10413
10414#: builtin/mv.c:189
10415msgid "cannot move directory over file"
10416msgstr "不能将目录移动到文件"
10417
10418#: builtin/mv.c:198
10419msgid "source directory is empty"
10420msgstr "源目录为空"
10421
10422#: builtin/mv.c:223
10423msgid "not under version control"
10424msgstr "不在版本控制之下"
10425
10426#: builtin/mv.c:226
10427msgid "destination exists"
10428msgstr "目标已存在"
10429
10430#: builtin/mv.c:234
10431#, c-format
10432msgid "overwriting '%s'"
10433msgstr "覆盖 '%s'"
10434
10435#: builtin/mv.c:237
10436msgid "Cannot overwrite"
10437msgstr "不能覆盖"
10438
10439#: builtin/mv.c:240
10440msgid "multiple sources for the same target"
10441msgstr "同一目标具有多个源"
10442
10443#: builtin/mv.c:242
10444msgid "destination directory does not exist"
10445msgstr "目标目录不存在"
10446
10447#: builtin/mv.c:249
10448#, c-format
10449msgid "%s, source=%s, destination=%s"
10450msgstr "%s,源=%s,目标=%s"
10451
10452#: builtin/mv.c:270
10453#, c-format
10454msgid "Renaming %s to %s\n"
10455msgstr "重命名 %s 至 %s\n"
10456
10457#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
10458#, c-format
10459msgid "renaming '%s' failed"
10460msgstr "重命名 '%s' 失败"
10461
10462#: builtin/name-rev.c:338
10463msgid "git name-rev [<options>] <commit>..."
10464msgstr "git name-rev [<选项>] <提交>..."
10465
10466#: builtin/name-rev.c:339
10467msgid "git name-rev [<options>] --all"
10468msgstr "git name-rev [<选项>] --all"
10469
10470#: builtin/name-rev.c:340
10471msgid "git name-rev [<options>] --stdin"
10472msgstr "git name-rev [<选项>] --stdin"
10473
10474#: builtin/name-rev.c:395
10475msgid "print only names (no SHA-1)"
10476msgstr "只打印名称(无 SHA-1)"
10477
10478#: builtin/name-rev.c:396
10479msgid "only use tags to name the commits"
10480msgstr "只使用标签来命名提交"
10481
10482#: builtin/name-rev.c:398
10483msgid "only use refs matching <pattern>"
10484msgstr "只使用和 <模式> 相匹配的引用"
10485
10486#: builtin/name-rev.c:400
10487msgid "ignore refs matching <pattern>"
10488msgstr "忽略和 <模式> 相匹配的引用"
10489
10490#: builtin/name-rev.c:402
10491msgid "list all commits reachable from all refs"
10492msgstr "列出可以从所有引用访问的提交"
10493
10494#: builtin/name-rev.c:403
10495msgid "read from stdin"
10496msgstr "从标准输入读取"
10497
10498#: builtin/name-rev.c:404
10499msgid "allow to print `undefined` names (default)"
10500msgstr "允许打印 `未定义` 的名称(默认)"
10501
10502#: builtin/name-rev.c:410
10503msgid "dereference tags in the input (internal use)"
10504msgstr "反向解析输入中的标签(内部使用)"
10505
10506#: builtin/notes.c:26
10507msgid "git notes [--ref <notes-ref>] [list [<object>]]"
10508msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
10509
10510#: builtin/notes.c:27
10511msgid ""
10512"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
10513"| (-c | -C) <object>] [<object>]"
10514msgstr ""
10515"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
10516"| (-c | -C) <对象>] [<对象>]"
10517
10518#: builtin/notes.c:28
10519msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
10520msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
10521
10522#: builtin/notes.c:29
10523msgid ""
10524"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
10525"(-c | -C) <object>] [<object>]"
10526msgstr ""
10527"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
10528"(-c | -C) <对象>] [<对象>]"
10529
10530#: builtin/notes.c:30
10531msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
10532msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
10533
10534#: builtin/notes.c:31
10535msgid "git notes [--ref <notes-ref>] show [<object>]"
10536msgstr "git notes [--ref <注解引用>] show [<对象>]"
10537
10538#: builtin/notes.c:32
10539msgid ""
10540"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
10541msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
10542
10543#: builtin/notes.c:33
10544msgid "git notes merge --commit [-v | -q]"
10545msgstr "git notes merge --commit [-v | -q]"
10546
10547#: builtin/notes.c:34
10548msgid "git notes merge --abort [-v | -q]"
10549msgstr "git notes merge --abort [-v | -q]"
10550
10551#: builtin/notes.c:35
10552msgid "git notes [--ref <notes-ref>] remove [<object>...]"
10553msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
10554
10555#: builtin/notes.c:36
10556msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
10557msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
10558
10559#: builtin/notes.c:37
10560msgid "git notes [--ref <notes-ref>] get-ref"
10561msgstr "git notes [--ref <注解引用>] get-ref"
10562
10563#: builtin/notes.c:42
10564msgid "git notes [list [<object>]]"
10565msgstr "git notes [list [<对象>]]"
10566
10567#: builtin/notes.c:47
10568msgid "git notes add [<options>] [<object>]"
10569msgstr "git notes add [<选项>] [<对象>]"
10570
10571#: builtin/notes.c:52
10572msgid "git notes copy [<options>] <from-object> <to-object>"
10573msgstr "git notes copy [<选项>] <源对象> <目标对象>"
10574
10575#: builtin/notes.c:53
10576msgid "git notes copy --stdin [<from-object> <to-object>]..."
10577msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
10578
10579#: builtin/notes.c:58
10580msgid "git notes append [<options>] [<object>]"
10581msgstr "git notes append [<选项>] [<对象>]"
10582
10583#: builtin/notes.c:63
10584msgid "git notes edit [<object>]"
10585msgstr "git notes edit [<对象>]"
10586
10587#: builtin/notes.c:68
10588msgid "git notes show [<object>]"
10589msgstr "git notes show [<对象>]"
10590
10591#: builtin/notes.c:73
10592msgid "git notes merge [<options>] <notes-ref>"
10593msgstr "git notes merge [<选项>] <注解引用>"
10594
10595#: builtin/notes.c:74
10596msgid "git notes merge --commit [<options>]"
10597msgstr "git notes merge --commit [<选项>]"
10598
10599#: builtin/notes.c:75
10600msgid "git notes merge --abort [<options>]"
10601msgstr "git notes merge --abort [<选项>]"
10602
10603#: builtin/notes.c:80
10604msgid "git notes remove [<object>]"
10605msgstr "git notes remove [<对象>]"
10606
10607#: builtin/notes.c:85
10608msgid "git notes prune [<options>]"
10609msgstr "git notes prune [<选项>]"
10610
10611#: builtin/notes.c:90
10612msgid "git notes get-ref"
10613msgstr "git notes get-ref"
10614
10615#: builtin/notes.c:95
10616msgid "Write/edit the notes for the following object:"
10617msgstr "为下面的对象写/编辑说明:"
10618
10619#: builtin/notes.c:148
10620#, c-format
10621msgid "unable to start 'show' for object '%s'"
10622msgstr "不能为对象 '%s' 开始 'show'"
10623
10624#: builtin/notes.c:152
10625msgid "could not read 'show' output"
10626msgstr "不能读取 'show' 的输出"
10627
10628#: builtin/notes.c:160
10629#, c-format
10630msgid "failed to finish 'show' for object '%s'"
10631msgstr "无法为对象 '%s' 完成 'show'"
10632
10633#: builtin/notes.c:195
10634msgid "please supply the note contents using either -m or -F option"
10635msgstr "请通过 -m 或 -F 选项为注解提供内容"
10636
10637#: builtin/notes.c:204
10638msgid "unable to write note object"
10639msgstr "不能写注解对象"
10640
10641#: builtin/notes.c:206
10642#, c-format
10643msgid "the note contents have been left in %s"
10644msgstr "注解内容被留在 %s 中"
10645
10646#: builtin/notes.c:234 builtin/tag.c:517
10647#, c-format
10648msgid "cannot read '%s'"
10649msgstr "不能读取 '%s'"
10650
10651#: builtin/notes.c:236 builtin/tag.c:520
10652#, c-format
10653msgid "could not open or read '%s'"
10654msgstr "不能打开或读取 '%s'"
10655
10656#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
10657#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
10658#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
10659#, c-format
10660msgid "failed to resolve '%s' as a valid ref."
10661msgstr "无法解析 '%s' 为一个有效引用。"
10662
10663#: builtin/notes.c:258
10664#, c-format
10665msgid "failed to read object '%s'."
10666msgstr "无法读取对象 '%s'。"
10667
10668#: builtin/notes.c:262
10669#, c-format
10670msgid "cannot read note data from non-blob object '%s'."
10671msgstr "不能从非数据对象 '%s' 中读取注解数据。"
10672
10673#: builtin/notes.c:302
10674#, c-format
10675msgid "malformed input line: '%s'."
10676msgstr "非法的输入行:'%s'。"
10677
10678#: builtin/notes.c:317
10679#, c-format
10680msgid "failed to copy notes from '%s' to '%s'"
10681msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
10682
10683#. TRANSLATORS: the first %s will be replaced by a git
10684#. notes command: 'add', 'merge', 'remove', etc.
10685#.
10686#: builtin/notes.c:348
10687#, c-format
10688msgid "refusing to %s notes in %s (outside of refs/notes/)"
10689msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
10690
10691#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
10692#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
10693#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
10694msgid "too many parameters"
10695msgstr "参数太多"
10696
10697#: builtin/notes.c:381 builtin/notes.c:667
10698#, c-format
10699msgid "no note found for object %s."
10700msgstr "未发现对象 %s 的注解。"
10701
10702#: builtin/notes.c:402 builtin/notes.c:565
10703msgid "note contents as a string"
10704msgstr "注解内容作为一个字符串"
10705
10706#: builtin/notes.c:405 builtin/notes.c:568
10707msgid "note contents in a file"
10708msgstr "注解内容到一个文件中"
10709
10710#: builtin/notes.c:408 builtin/notes.c:571
10711msgid "reuse and edit specified note object"
10712msgstr "重用和编辑指定的注解对象"
10713
10714#: builtin/notes.c:411 builtin/notes.c:574
10715msgid "reuse specified note object"
10716msgstr "重用指定的注解对象"
10717
10718#: builtin/notes.c:414 builtin/notes.c:577
10719msgid "allow storing empty note"
10720msgstr "允许保存空白注释"
10721
10722#: builtin/notes.c:415 builtin/notes.c:486
10723msgid "replace existing notes"
10724msgstr "替换已存在的注解"
10725
10726#: builtin/notes.c:440
10727#, c-format
10728msgid ""
10729"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
10730"existing notes"
10731msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10732
10733#: builtin/notes.c:455 builtin/notes.c:534
10734#, c-format
10735msgid "Overwriting existing notes for object %s\n"
10736msgstr "覆盖对象 %s 现存注解\n"
10737
10738#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
10739#, c-format
10740msgid "Removing note for object %s\n"
10741msgstr "删除对象 %s 的注解\n"
10742
10743#: builtin/notes.c:487
10744msgid "read objects from stdin"
10745msgstr "从标准输入读取对象"
10746
10747#: builtin/notes.c:489
10748msgid "load rewriting config for <command> (implies --stdin)"
10749msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
10750
10751#: builtin/notes.c:507
10752msgid "too few parameters"
10753msgstr "参数太少"
10754
10755#: builtin/notes.c:528
10756#, c-format
10757msgid ""
10758"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
10759"existing notes"
10760msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10761
10762#: builtin/notes.c:540
10763#, c-format
10764msgid "missing notes on source object %s. Cannot copy."
10765msgstr "源对象 %s 缺少注解。不能拷贝。"
10766
10767#: builtin/notes.c:592
10768#, c-format
10769msgid ""
10770"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
10771"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
10772msgstr ""
10773"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
10774"请换用 'git notes add -f -m/-F/-c/-C'。\n"
10775
10776#: builtin/notes.c:687
10777msgid "failed to delete ref NOTES_MERGE_PARTIAL"
10778msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
10779
10780#: builtin/notes.c:689
10781msgid "failed to delete ref NOTES_MERGE_REF"
10782msgstr "无法删除引用 NOTES_MERGE_REF"
10783
10784#: builtin/notes.c:691
10785msgid "failed to remove 'git notes merge' worktree"
10786msgstr "无法删除 'git notes merge' 工作区"
10787
10788#: builtin/notes.c:711
10789msgid "failed to read ref NOTES_MERGE_PARTIAL"
10790msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10791
10792#: builtin/notes.c:713
10793msgid "could not find commit from NOTES_MERGE_PARTIAL."
10794msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10795
10796#: builtin/notes.c:715
10797msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10798msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10799
10800#: builtin/notes.c:728
10801msgid "failed to resolve NOTES_MERGE_REF"
10802msgstr "无法解析 NOTES_MERGE_REF"
10803
10804#: builtin/notes.c:731
10805msgid "failed to finalize notes merge"
10806msgstr "无法完成注解合并"
10807
10808#: builtin/notes.c:757
10809#, c-format
10810msgid "unknown notes merge strategy %s"
10811msgstr "未知的注解合并策略 %s"
10812
10813#: builtin/notes.c:773
10814msgid "General options"
10815msgstr "通用选项"
10816
10817#: builtin/notes.c:775
10818msgid "Merge options"
10819msgstr "合并选项"
10820
10821#: builtin/notes.c:777
10822msgid ""
10823"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10824"cat_sort_uniq)"
10825msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
10826
10827#: builtin/notes.c:779
10828msgid "Committing unmerged notes"
10829msgstr "提交未合并的注解"
10830
10831#: builtin/notes.c:781
10832msgid "finalize notes merge by committing unmerged notes"
10833msgstr "通过提交未合并的注解来完成注解合并"
10834
10835#: builtin/notes.c:783
10836msgid "Aborting notes merge resolution"
10837msgstr "中止注解合并的方案"
10838
10839#: builtin/notes.c:785
10840msgid "abort notes merge"
10841msgstr "中止注解合并"
10842
10843#: builtin/notes.c:796
10844msgid "cannot mix --commit, --abort or -s/--strategy"
10845msgstr "不能混用 --commit、--abort 或 -s/--strategy"
10846
10847#: builtin/notes.c:801
10848msgid "must specify a notes ref to merge"
10849msgstr "必须指定一个注解引用来合并"
10850
10851#: builtin/notes.c:825
10852#, c-format
10853msgid "unknown -s/--strategy: %s"
10854msgstr "未知的 -s/--strategy:%s"
10855
10856#: builtin/notes.c:862
10857#, c-format
10858msgid "a notes merge into %s is already in-progress at %s"
10859msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
10860
10861#: builtin/notes.c:865
10862#, c-format
10863msgid "failed to store link to current notes ref (%s)"
10864msgstr "无法存储链接到当前的注解引用(%s)"
10865
10866#: builtin/notes.c:867
10867#, c-format
10868msgid ""
10869"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
10870"'git notes merge --commit', or abort the merge with 'git notes merge --"
10871"abort'.\n"
10872msgstr ""
10873"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
10874"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
10875
10876#: builtin/notes.c:889
10877#, c-format
10878msgid "Object %s has no note\n"
10879msgstr "对象 %s 没有注解\n"
10880
10881#: builtin/notes.c:901
10882msgid "attempt to remove non-existent note is not an error"
10883msgstr "尝试删除不存在的注解不是一个错误"
10884
10885#: builtin/notes.c:904
10886msgid "read object names from the standard input"
10887msgstr "从标准输入读取对象名称"
10888
10889#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
10890msgid "do not remove, show only"
10891msgstr "不删除,只显示"
10892
10893#: builtin/notes.c:943
10894msgid "report pruned notes"
10895msgstr "报告清除的注解"
10896
10897#: builtin/notes.c:985
10898msgid "notes-ref"
10899msgstr "注解引用"
10900
10901#: builtin/notes.c:986
10902msgid "use notes from <notes-ref>"
10903msgstr "从 <注解引用> 使用注解"
10904
10905#: builtin/notes.c:1021
10906#, c-format
10907msgid "unknown subcommand: %s"
10908msgstr "未知子命令:%s"
10909
10910#: builtin/pack-objects.c:30
10911msgid ""
10912"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
10913msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
10914
10915#: builtin/pack-objects.c:31
10916msgid ""
10917"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
10918msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
10919
10920#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
10921#, c-format
10922msgid "deflate error (%d)"
10923msgstr "压缩错误 (%d)"
10924
10925#: builtin/pack-objects.c:776
10926msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
10927msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
10928
10929#: builtin/pack-objects.c:789
10930msgid "Writing objects"
10931msgstr "写入对象中"
10932
10933#: builtin/pack-objects.c:1069
10934msgid "disabling bitmap writing, as some objects are not being packed"
10935msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
10936
10937#: builtin/pack-objects.c:2434
10938msgid "Compressing objects"
10939msgstr "压缩对象中"
10940
10941#: builtin/pack-objects.c:2843
10942#, c-format
10943msgid "unsupported index version %s"
10944msgstr "不支持的索引版本 %s"
10945
10946#: builtin/pack-objects.c:2847
10947#, c-format
10948msgid "bad index version '%s'"
10949msgstr "坏的索引版本 '%s'"
10950
10951#: builtin/pack-objects.c:2877
10952msgid "do not show progress meter"
10953msgstr "不显示进度表"
10954
10955#: builtin/pack-objects.c:2879
10956msgid "show progress meter"
10957msgstr "显示进度表"
10958
10959#: builtin/pack-objects.c:2881
10960msgid "show progress meter during object writing phase"
10961msgstr "在对象写入阶段显示进度表"
10962
10963#: builtin/pack-objects.c:2884
10964msgid "similar to --all-progress when progress meter is shown"
10965msgstr "当进度表显示时类似于 --all-progress"
10966
10967#: builtin/pack-objects.c:2885
10968msgid "version[,offset]"
10969msgstr "版本[,偏移]"
10970
10971#: builtin/pack-objects.c:2886
10972msgid "write the pack index file in the specified idx format version"
10973msgstr "用指定的 idx 格式版本来写包索引文件"
10974
10975#: builtin/pack-objects.c:2889
10976msgid "maximum size of each output pack file"
10977msgstr "每个输出包的最大尺寸"
10978
10979#: builtin/pack-objects.c:2891
10980msgid "ignore borrowed objects from alternate object store"
10981msgstr "忽略从备用对象存储里借用对象"
10982
10983#: builtin/pack-objects.c:2893
10984msgid "ignore packed objects"
10985msgstr "忽略包对象"
10986
10987#: builtin/pack-objects.c:2895
10988msgid "limit pack window by objects"
10989msgstr "限制打包窗口的对象数"
10990
10991#: builtin/pack-objects.c:2897
10992msgid "limit pack window by memory in addition to object limit"
10993msgstr "除对象数量限制外设置打包窗口的内存限制"
10994
10995#: builtin/pack-objects.c:2899
10996msgid "maximum length of delta chain allowed in the resulting pack"
10997msgstr "打包允许的 delta 链的最大长度"
10998
10999#: builtin/pack-objects.c:2901
11000msgid "reuse existing deltas"
11001msgstr "重用已存在的 deltas"
11002
11003#: builtin/pack-objects.c:2903
11004msgid "reuse existing objects"
11005msgstr "重用已存在的对象"
11006
11007#: builtin/pack-objects.c:2905
11008msgid "use OFS_DELTA objects"
11009msgstr "使用 OFS_DELTA 对象"
11010
11011#: builtin/pack-objects.c:2907
11012msgid "use threads when searching for best delta matches"
11013msgstr "使用线程查询最佳 delta 匹配"
11014
11015#: builtin/pack-objects.c:2909
11016msgid "do not create an empty pack output"
11017msgstr "不创建空的包输出"
11018
11019#: builtin/pack-objects.c:2911
11020msgid "read revision arguments from standard input"
11021msgstr "从标准输入读取版本号参数"
11022
11023#: builtin/pack-objects.c:2913
11024msgid "limit the objects to those that are not yet packed"
11025msgstr "限制那些尚未打包的对象"
11026
11027#: builtin/pack-objects.c:2916
11028msgid "include objects reachable from any reference"
11029msgstr "包括可以从任何引用访问到的对象"
11030
11031#: builtin/pack-objects.c:2919
11032msgid "include objects referred by reflog entries"
11033msgstr "包括被引用日志引用到的对象"
11034
11035#: builtin/pack-objects.c:2922
11036msgid "include objects referred to by the index"
11037msgstr "包括被索引引用到的对象"
11038
11039#: builtin/pack-objects.c:2925
11040msgid "output pack to stdout"
11041msgstr "输出包到标准输出"
11042
11043#: builtin/pack-objects.c:2927
11044msgid "include tag objects that refer to objects to be packed"
11045msgstr "包括那些引用了待打包对象的标签对象"
11046
11047#: builtin/pack-objects.c:2929
11048msgid "keep unreachable objects"
11049msgstr "维持不可达的对象"
11050
11051#: builtin/pack-objects.c:2931
11052msgid "pack loose unreachable objects"
11053msgstr "打包松散的不可达对象"
11054
11055#: builtin/pack-objects.c:2933
11056msgid "unpack unreachable objects newer than <time>"
11057msgstr "将比给定 <时间> 新的无法访问的对象解包"
11058
11059#: builtin/pack-objects.c:2936
11060msgid "create thin packs"
11061msgstr "创建精简包"
11062
11063#: builtin/pack-objects.c:2938
11064msgid "create packs suitable for shallow fetches"
11065msgstr "创建适合浅克隆仓库获取的包"
11066
11067#: builtin/pack-objects.c:2940
11068msgid "ignore packs that have companion .keep file"
11069msgstr "忽略配有 .keep 文件的包"
11070
11071#: builtin/pack-objects.c:2942
11072msgid "pack compression level"
11073msgstr "打包压缩级别"
11074
11075#: builtin/pack-objects.c:2944
11076msgid "do not hide commits by grafts"
11077msgstr "显示被嫁接隐藏的提交"
11078
11079#: builtin/pack-objects.c:2946
11080msgid "use a bitmap index if available to speed up counting objects"
11081msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
11082
11083#: builtin/pack-objects.c:2948
11084msgid "write a bitmap index together with the pack index"
11085msgstr "在建立包索引的同时创建 bitmap 索引"
11086
11087#: builtin/pack-objects.c:3075
11088msgid "Counting objects"
11089msgstr "对象计数中"
11090
11091#: builtin/pack-refs.c:6
11092msgid "git pack-refs [<options>]"
11093msgstr "git pack-refs [<选项>]"
11094
11095#: builtin/pack-refs.c:14
11096msgid "pack everything"
11097msgstr "打包一切"
11098
11099#: builtin/pack-refs.c:15
11100msgid "prune loose refs (default)"
11101msgstr "清除松散的引用(默认)"
11102
11103#: builtin/prune-packed.c:7
11104msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
11105msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
11106
11107#: builtin/prune-packed.c:40
11108msgid "Removing duplicate objects"
11109msgstr "正在删除重复对象"
11110
11111#: builtin/prune.c:11
11112msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
11113msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
11114
11115#: builtin/prune.c:106
11116msgid "report pruned objects"
11117msgstr "报告清除的对象"
11118
11119#: builtin/prune.c:109
11120msgid "expire objects older than <time>"
11121msgstr "使早于给定时间的对象过期"
11122
11123#: builtin/prune.c:123
11124msgid "cannot prune in a precious-objects repo"
11125msgstr "不能在珍品仓库中执行清理操作"
11126
11127#: builtin/pull.c:54 builtin/pull.c:56
11128#, c-format
11129msgid "Invalid value for %s: %s"
11130msgstr "%s 的值无效:%s"
11131
11132#: builtin/pull.c:76
11133msgid "git pull [<options>] [<repository> [<refspec>...]]"
11134msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
11135
11136#: builtin/pull.c:124
11137msgid "control for recursive fetching of submodules"
11138msgstr "控制子模组的递归获取"
11139
11140#: builtin/pull.c:128
11141msgid "Options related to merging"
11142msgstr "和合并相关的选项"
11143
11144#: builtin/pull.c:131
11145msgid "incorporate changes by rebasing rather than merging"
11146msgstr "使用变基操作取代合并操作以合入修改"
11147
11148#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
11149msgid "allow fast-forward"
11150msgstr "允许快进式"
11151
11152#: builtin/pull.c:164
11153msgid "automatically stash/stash pop before and after rebase"
11154msgstr "变基操作前后执行自动贮藏和弹出贮藏"
11155
11156#: builtin/pull.c:180
11157msgid "Options related to fetching"
11158msgstr "和获取相关的参数"
11159
11160#: builtin/pull.c:198
11161msgid "number of submodules pulled in parallel"
11162msgstr "并发拉取的子模组的数量"
11163
11164#: builtin/pull.c:287
11165#, c-format
11166msgid "Invalid value for pull.ff: %s"
11167msgstr "pull.ff 的取值无效:%s"
11168
11169#: builtin/pull.c:399
11170msgid ""
11171"There is no candidate for rebasing against among the refs that you just "
11172"fetched."
11173msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
11174
11175#: builtin/pull.c:401
11176msgid ""
11177"There are no candidates for merging among the refs that you just fetched."
11178msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
11179
11180#: builtin/pull.c:402
11181msgid ""
11182"Generally this means that you provided a wildcard refspec which had no\n"
11183"matches on the remote end."
11184msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
11185
11186#: builtin/pull.c:405
11187#, c-format
11188msgid ""
11189"You asked to pull from the remote '%s', but did not specify\n"
11190"a branch. Because this is not the default configured remote\n"
11191"for your current branch, you must specify a branch on the command line."
11192msgstr ""
11193"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
11194"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
11195
11196#: builtin/pull.c:410 git-parse-remote.sh:73
11197msgid "You are not currently on a branch."
11198msgstr "您当前不在一个分支上。"
11199
11200#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
11201msgid "Please specify which branch you want to rebase against."
11202msgstr "请指定您要变基到哪一个分支。"
11203
11204#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
11205msgid "Please specify which branch you want to merge with."
11206msgstr "请指定您要合并哪一个分支。"
11207
11208#: builtin/pull.c:415 builtin/pull.c:430
11209msgid "See git-pull(1) for details."
11210msgstr "详见 git-pull(1)。"
11211
11212#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
11213#: git-parse-remote.sh:64
11214msgid "<remote>"
11215msgstr "<远程>"
11216
11217#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
11218#: git-parse-remote.sh:65
11219msgid "<branch>"
11220msgstr "<分支>"
11221
11222#: builtin/pull.c:425 git-parse-remote.sh:75
11223msgid "There is no tracking information for the current branch."
11224msgstr "当前分支没有跟踪信息。"
11225
11226#: builtin/pull.c:434 git-parse-remote.sh:95
11227msgid ""
11228"If you wish to set tracking information for this branch you can do so with:"
11229msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
11230
11231#: builtin/pull.c:439
11232#, c-format
11233msgid ""
11234"Your configuration specifies to merge with the ref '%s'\n"
11235"from the remote, but no such ref was fetched."
11236msgstr ""
11237"您的配置中指定要合并远程的引用 '%s',\n"
11238"但是没有获取到这个引用。"
11239
11240#: builtin/pull.c:792
11241msgid "ignoring --verify-signatures for rebase"
11242msgstr "为变基操作忽略 --verify-signatures"
11243
11244#: builtin/pull.c:840
11245msgid "--[no-]autostash option is only valid with --rebase."
11246msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
11247
11248#: builtin/pull.c:848
11249msgid "Updating an unborn branch with changes added to the index."
11250msgstr "更新尚未诞生的分支,变更添加至索引。"
11251
11252#: builtin/pull.c:851
11253msgid "pull with rebase"
11254msgstr "变基式拉取"
11255
11256#: builtin/pull.c:852
11257msgid "please commit or stash them."
11258msgstr "请提交或贮藏它们。"
11259
11260#: builtin/pull.c:877
11261#, c-format
11262msgid ""
11263"fetch updated the current branch head.\n"
11264"fast-forwarding your working tree from\n"
11265"commit %s."
11266msgstr ""
11267"fetch 更新了当前的分支。快进您的工作区\n"
11268"至提交 %s。"
11269
11270#: builtin/pull.c:882
11271#, c-format
11272msgid ""
11273"Cannot fast-forward your working tree.\n"
11274"After making sure that you saved anything precious from\n"
11275"$ git diff %s\n"
11276"output, run\n"
11277"$ git reset --hard\n"
11278"to recover."
11279msgstr ""
11280"您当前的工作区无法执行快进操作。\n"
11281"首先执行如下命令:\n"
11282"$ git diff %s\n"
11283"以确认所有有用的数据均已保存。然后执行下面的命令\n"
11284"$ git reset --hard\n"
11285"恢复之前的状态。"
11286
11287#: builtin/pull.c:897
11288msgid "Cannot merge multiple branches into empty head."
11289msgstr "无法将多个分支合并到空分支。"
11290
11291#: builtin/pull.c:901
11292msgid "Cannot rebase onto multiple branches."
11293msgstr "无法变基到多个分支。"
11294
11295#: builtin/pull.c:908
11296msgid "cannot rebase with locally recorded submodule modifications"
11297msgstr "本地子模组中有修改,无法变基"
11298
11299#: builtin/push.c:17
11300msgid "git push [<options>] [<repository> [<refspec>...]]"
11301msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
11302
11303#: builtin/push.c:90
11304msgid "tag shorthand without <tag>"
11305msgstr "标签后面未提供 <标签> 参数"
11306
11307#: builtin/push.c:100
11308msgid "--delete only accepts plain target ref names"
11309msgstr "--delete 只接受简单的目标引用名"
11310
11311#: builtin/push.c:144
11312msgid ""
11313"\n"
11314"To choose either option permanently, see push.default in 'git help config'."
11315msgstr ""
11316"\n"
11317"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
11318
11319#: builtin/push.c:147
11320#, c-format
11321msgid ""
11322"The upstream branch of your current branch does not match\n"
11323"the name of your current branch.  To push to the upstream branch\n"
11324"on the remote, use\n"
11325"\n"
11326"    git push %s HEAD:%s\n"
11327"\n"
11328"To push to the branch of the same name on the remote, use\n"
11329"\n"
11330"    git push %s %s\n"
11331"%s"
11332msgstr ""
11333"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
11334"上游分支,使用\n"
11335"\n"
11336"    git push %s HEAD:%s\n"
11337"\n"
11338"为推送至远程同名分支,使用\n"
11339"\n"
11340"    git push %s %s\n"
11341"%s"
11342
11343#: builtin/push.c:162
11344#, c-format
11345msgid ""
11346"You are not currently on a branch.\n"
11347"To push the history leading to the current (detached HEAD)\n"
11348"state now, use\n"
11349"\n"
11350"    git push %s HEAD:<name-of-remote-branch>\n"
11351msgstr ""
11352"您当前不在一个分支上。\n"
11353"现在为推送当前(分离头指针)的历史,使用\n"
11354"\n"
11355"    git push %s HEAD:<远程分支名字>\n"
11356
11357#: builtin/push.c:176
11358#, c-format
11359msgid ""
11360"The current branch %s has no upstream branch.\n"
11361"To push the current branch and set the remote as upstream, use\n"
11362"\n"
11363"    git push --set-upstream %s %s\n"
11364msgstr ""
11365"当前分支 %s 没有对应的上游分支。\n"
11366"为推送当前分支并建立与远程上游的跟踪,使用\n"
11367"\n"
11368"    git push --set-upstream %s %s\n"
11369
11370#: builtin/push.c:184
11371#, c-format
11372msgid "The current branch %s has multiple upstream branches, refusing to push."
11373msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
11374
11375#: builtin/push.c:187
11376#, c-format
11377msgid ""
11378"You are pushing to remote '%s', which is not the upstream of\n"
11379"your current branch '%s', without telling me what to push\n"
11380"to update which remote branch."
11381msgstr ""
11382"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
11383"而没有告诉我要推送什么、更新哪个远程分支。"
11384
11385#: builtin/push.c:246
11386msgid ""
11387"You didn't specify any refspecs to push, and push.default is \"nothing\"."
11388msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
11389
11390#: builtin/push.c:253
11391msgid ""
11392"Updates were rejected because the tip of your current branch is behind\n"
11393"its remote counterpart. Integrate the remote changes (e.g.\n"
11394"'git pull ...') before pushing again.\n"
11395"See the 'Note about fast-forwards' in 'git push --help' for details."
11396msgstr ""
11397"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
11398"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
11399"'git push --help' 中的 'Note about fast-forwards' 小节。"
11400
11401#: builtin/push.c:259
11402msgid ""
11403"Updates were rejected because a pushed branch tip is behind its remote\n"
11404"counterpart. Check out this branch and integrate the remote changes\n"
11405"(e.g. 'git pull ...') before pushing again.\n"
11406"See the 'Note about fast-forwards' in 'git push --help' for details."
11407msgstr ""
11408"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11409"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
11410"'git push --help' 中的 'Note about fast-forwards' 小节。"
11411
11412#: builtin/push.c:265
11413msgid ""
11414"Updates were rejected because the remote contains work that you do\n"
11415"not have locally. This is usually caused by another repository pushing\n"
11416"to the same ref. You may want to first integrate the remote changes\n"
11417"(e.g., 'git pull ...') before pushing again.\n"
11418"See the 'Note about fast-forwards' in 'git push --help' for details."
11419msgstr ""
11420"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
11421"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
11422"(如 'git pull ...')。\n"
11423"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
11424
11425#: builtin/push.c:272
11426msgid "Updates were rejected because the tag already exists in the remote."
11427msgstr "更新被拒绝,因为该标签在远程已经存在。"
11428
11429#: builtin/push.c:275
11430msgid ""
11431"You cannot update a remote ref that points at a non-commit object,\n"
11432"or update a remote ref to make it point at a non-commit object,\n"
11433"without using the '--force' option.\n"
11434msgstr ""
11435"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
11436"也不能更新远程引用让其指向一个非提交对象。\n"
11437
11438#: builtin/push.c:335
11439#, c-format
11440msgid "Pushing to %s\n"
11441msgstr "推送到 %s\n"
11442
11443#: builtin/push.c:339
11444#, c-format
11445msgid "failed to push some refs to '%s'"
11446msgstr "无法推送一些引用到 '%s'"
11447
11448#: builtin/push.c:370
11449#, c-format
11450msgid "bad repository '%s'"
11451msgstr "坏的仓库 '%s'"
11452
11453#: builtin/push.c:371
11454msgid ""
11455"No configured push destination.\n"
11456"Either specify the URL from the command-line or configure a remote "
11457"repository using\n"
11458"\n"
11459"    git remote add <name> <url>\n"
11460"\n"
11461"and then push using the remote name\n"
11462"\n"
11463"    git push <name>\n"
11464msgstr ""
11465"没有配置推送目标。\n"
11466"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
11467"\n"
11468"    git remote add <名称> <地址>\n"
11469"\n"
11470"然后使用该远程仓库名执行推送\n"
11471"\n"
11472"    git push <名称>\n"
11473
11474#: builtin/push.c:389
11475msgid "--all and --tags are incompatible"
11476msgstr "--all 和 --tags 不兼容"
11477
11478#: builtin/push.c:390
11479msgid "--all can't be combined with refspecs"
11480msgstr "--all 不能和引用规格同时使用"
11481
11482#: builtin/push.c:395
11483msgid "--mirror and --tags are incompatible"
11484msgstr "--mirror 和 --tags 不兼容"
11485
11486#: builtin/push.c:396
11487msgid "--mirror can't be combined with refspecs"
11488msgstr "--mirror 不能和引用规格同时使用"
11489
11490#: builtin/push.c:401
11491msgid "--all and --mirror are incompatible"
11492msgstr "--all 和 --mirror 不兼容"
11493
11494#: builtin/push.c:523
11495msgid "repository"
11496msgstr "仓库"
11497
11498#: builtin/push.c:524 builtin/send-pack.c:163
11499msgid "push all refs"
11500msgstr "推送所有引用"
11501
11502#: builtin/push.c:525 builtin/send-pack.c:165
11503msgid "mirror all refs"
11504msgstr "镜像所有引用"
11505
11506#: builtin/push.c:527
11507msgid "delete refs"
11508msgstr "删除引用"
11509
11510#: builtin/push.c:528
11511msgid "push tags (can't be used with --all or --mirror)"
11512msgstr "推送标签(不能使用 --all or --mirror)"
11513
11514#: builtin/push.c:531 builtin/send-pack.c:166
11515msgid "force updates"
11516msgstr "强制更新"
11517
11518#: builtin/push.c:533 builtin/send-pack.c:180
11519msgid "refname>:<expect"
11520msgstr "引用名>:<期望值"
11521
11522#: builtin/push.c:534 builtin/send-pack.c:181
11523msgid "require old value of ref to be at this value"
11524msgstr "要求引用旧的取值为设定值"
11525
11526#: builtin/push.c:537
11527msgid "control recursive pushing of submodules"
11528msgstr "控制子模组的递归推送"
11529
11530#: builtin/push.c:539 builtin/send-pack.c:174
11531msgid "use thin pack"
11532msgstr "使用精简打包"
11533
11534#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
11535#: builtin/send-pack.c:161
11536msgid "receive pack program"
11537msgstr "接收包程序"
11538
11539#: builtin/push.c:542
11540msgid "set upstream for git pull/status"
11541msgstr "设置 git pull/status 的上游"
11542
11543#: builtin/push.c:545
11544msgid "prune locally removed refs"
11545msgstr "清除本地删除的引用"
11546
11547#: builtin/push.c:547
11548msgid "bypass pre-push hook"
11549msgstr "绕过 pre-push 钩子"
11550
11551#: builtin/push.c:548
11552msgid "push missing but relevant tags"
11553msgstr "推送缺失但有关的标签"
11554
11555#: builtin/push.c:551 builtin/send-pack.c:168
11556msgid "GPG sign the push"
11557msgstr "用 GPG 为推送签名"
11558
11559#: builtin/push.c:553 builtin/send-pack.c:175
11560msgid "request atomic transaction on remote side"
11561msgstr "需要远端支持原子事务"
11562
11563#: builtin/push.c:554 builtin/send-pack.c:171
11564msgid "server-specific"
11565msgstr "server-specific"
11566
11567#: builtin/push.c:554 builtin/send-pack.c:172
11568msgid "option to transmit"
11569msgstr "传输选项"
11570
11571#: builtin/push.c:568
11572msgid "--delete is incompatible with --all, --mirror and --tags"
11573msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
11574
11575#: builtin/push.c:570
11576msgid "--delete doesn't make sense without any refs"
11577msgstr "--delete 未接任何引用没有意义"
11578
11579#: builtin/push.c:589
11580msgid "push options must not have new line characters"
11581msgstr "推送选项不能有换行符"
11582
11583#: builtin/read-tree.c:40
11584msgid ""
11585"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
11586"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11587"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
11588msgstr ""
11589"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
11590"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11591"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
11592
11593#: builtin/read-tree.c:121
11594msgid "write resulting index to <file>"
11595msgstr "将索引结果写入 <文件>"
11596
11597#: builtin/read-tree.c:124
11598msgid "only empty the index"
11599msgstr "只是清空索引"
11600
11601#: builtin/read-tree.c:126
11602msgid "Merging"
11603msgstr "合并"
11604
11605#: builtin/read-tree.c:128
11606msgid "perform a merge in addition to a read"
11607msgstr "读取之余再执行一个合并"
11608
11609#: builtin/read-tree.c:130
11610msgid "3-way merge if no file level merging required"
11611msgstr "如果没有文件级合并需要,执行三方合并"
11612
11613#: builtin/read-tree.c:132
11614msgid "3-way merge in presence of adds and removes"
11615msgstr "存在添加和删除时,也执行三方合并"
11616
11617#: builtin/read-tree.c:134
11618msgid "same as -m, but discard unmerged entries"
11619msgstr "类似于 -m,但丢弃未合并的条目"
11620
11621#: builtin/read-tree.c:135
11622msgid "<subdirectory>/"
11623msgstr "<子目录>/"
11624
11625#: builtin/read-tree.c:136
11626msgid "read the tree into the index under <subdirectory>/"
11627msgstr "读取树对象到索引的 <子目录>/ 下"
11628
11629#: builtin/read-tree.c:139
11630msgid "update working tree with merge result"
11631msgstr "用合并的结果更新工作区"
11632
11633#: builtin/read-tree.c:141
11634msgid "gitignore"
11635msgstr "gitignore"
11636
11637#: builtin/read-tree.c:142
11638msgid "allow explicitly ignored files to be overwritten"
11639msgstr "允许忽略文件中设定的文件可以被覆盖"
11640
11641#: builtin/read-tree.c:145
11642msgid "don't check the working tree after merging"
11643msgstr "合并后不检查工作区"
11644
11645#: builtin/read-tree.c:146
11646msgid "don't update the index or the work tree"
11647msgstr "不更新索引区和工作区"
11648
11649#: builtin/read-tree.c:148
11650msgid "skip applying sparse checkout filter"
11651msgstr "跳过应用稀疏检出过滤器"
11652
11653#: builtin/read-tree.c:150
11654msgid "debug unpack-trees"
11655msgstr "调试 unpack-trees"
11656
11657#: builtin/rebase--helper.c:8
11658msgid "git rebase--helper [<options>]"
11659msgstr "git rebase--helper [<选项>]"
11660
11661#: builtin/rebase--helper.c:20
11662msgid "continue rebase"
11663msgstr "继续变基"
11664
11665#: builtin/rebase--helper.c:22
11666msgid "abort rebase"
11667msgstr "中止变基"
11668
11669#: builtin/receive-pack.c:28
11670msgid "git receive-pack <git-dir>"
11671msgstr "git receive-pack <git-dir>"
11672
11673#: builtin/receive-pack.c:838
11674msgid ""
11675"By default, updating the current branch in a non-bare repository\n"
11676"is denied, because it will make the index and work tree inconsistent\n"
11677"with what you pushed, and will require 'git reset --hard' to match\n"
11678"the work tree to HEAD.\n"
11679"\n"
11680"You can set the 'receive.denyCurrentBranch' configuration variable\n"
11681"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
11682"its current branch; however, this is not recommended unless you\n"
11683"arranged to update its work tree to match what you pushed in some\n"
11684"other way.\n"
11685"\n"
11686"To squelch this message and still keep the default behaviour, set\n"
11687"'receive.denyCurrentBranch' configuration variable to 'refuse'."
11688msgstr ""
11689"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
11690"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
11691"\n"
11692"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
11693"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
11694"用某种方式将其工作区更新至您推送的状态。\n"
11695"\n"
11696"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
11697"配置变量为 'refuse'。"
11698
11699#: builtin/receive-pack.c:858
11700msgid ""
11701"By default, deleting the current branch is denied, because the next\n"
11702"'git clone' won't result in any file checked out, causing confusion.\n"
11703"\n"
11704"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
11705"'warn' or 'ignore' in the remote repository to allow deleting the\n"
11706"current branch, with or without a warning message.\n"
11707"\n"
11708"To squelch this message, you can set it to 'refuse'."
11709msgstr ""
11710"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
11711"导致困惑。\n"
11712"\n"
11713"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
11714"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
11715"\n"
11716"若要屏蔽此信息,您可以设置它为 'refuse'。"
11717
11718#: builtin/receive-pack.c:1933
11719msgid "quiet"
11720msgstr "静默模式"
11721
11722#: builtin/receive-pack.c:1947
11723msgid "You must specify a directory."
11724msgstr "您必须指定一个目录。"
11725
11726#: builtin/reflog.c:424
11727#, c-format
11728msgid "'%s' for '%s' is not a valid timestamp"
11729msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
11730
11731#: builtin/reflog.c:541 builtin/reflog.c:546
11732#, c-format
11733msgid "'%s' is not a valid timestamp"
11734msgstr "'%s' 不是一个有效的时间戳"
11735
11736#: builtin/remote.c:13
11737msgid "git remote [-v | --verbose]"
11738msgstr "git remote [-v | --verbose]"
11739
11740#: builtin/remote.c:14
11741msgid ""
11742"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
11743"mirror=<fetch|push>] <name> <url>"
11744msgstr ""
11745"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
11746"mirror=<fetch|push>] <名称> <地址>"
11747
11748#: builtin/remote.c:15 builtin/remote.c:35
11749msgid "git remote rename <old> <new>"
11750msgstr "git remote rename <旧名称> <新名称>"
11751
11752#: builtin/remote.c:16 builtin/remote.c:40
11753msgid "git remote remove <name>"
11754msgstr "git remote remove <名称>"
11755
11756#: builtin/remote.c:17 builtin/remote.c:45
11757msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
11758msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
11759
11760#: builtin/remote.c:18
11761msgid "git remote [-v | --verbose] show [-n] <name>"
11762msgstr "git remote [-v | --verbose] show [-n] <名称>"
11763
11764#: builtin/remote.c:19
11765msgid "git remote prune [-n | --dry-run] <name>"
11766msgstr "git remote prune [-n | --dry-run] <名称>"
11767
11768#: builtin/remote.c:20
11769msgid ""
11770"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
11771msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
11772
11773#: builtin/remote.c:21
11774msgid "git remote set-branches [--add] <name> <branch>..."
11775msgstr "git remote set-branches [--add] <名称> <分支>..."
11776
11777#: builtin/remote.c:22 builtin/remote.c:71
11778msgid "git remote get-url [--push] [--all] <name>"
11779msgstr "git remote get-url [--push] [--all] <名称>"
11780
11781#: builtin/remote.c:23 builtin/remote.c:76
11782msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
11783msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
11784
11785#: builtin/remote.c:24 builtin/remote.c:77
11786msgid "git remote set-url --add <name> <newurl>"
11787msgstr "git remote set-url --add <名称> <新的地址>"
11788
11789#: builtin/remote.c:25 builtin/remote.c:78
11790msgid "git remote set-url --delete <name> <url>"
11791msgstr "git remote set-url --delete <名称> <地址>"
11792
11793#: builtin/remote.c:30
11794msgid "git remote add [<options>] <name> <url>"
11795msgstr "git remote add [<选项>] <名称> <地址>"
11796
11797#: builtin/remote.c:50
11798msgid "git remote set-branches <name> <branch>..."
11799msgstr "git remote set-branches <名称> <分支>..."
11800
11801#: builtin/remote.c:51
11802msgid "git remote set-branches --add <name> <branch>..."
11803msgstr "git remote set-branches --add <名称> <分支>..."
11804
11805#: builtin/remote.c:56
11806msgid "git remote show [<options>] <name>"
11807msgstr "git remote show [<选项>] <名称>"
11808
11809#: builtin/remote.c:61
11810msgid "git remote prune [<options>] <name>"
11811msgstr "git remote prune [<选项>] <名称>"
11812
11813#: builtin/remote.c:66
11814msgid "git remote update [<options>] [<group> | <remote>]..."
11815msgstr "git remote update [<选项>] [<组> | <远程>]..."
11816
11817#: builtin/remote.c:95
11818#, c-format
11819msgid "Updating %s"
11820msgstr "更新 %s 中"
11821
11822#: builtin/remote.c:127
11823msgid ""
11824"--mirror is dangerous and deprecated; please\n"
11825"\t use --mirror=fetch or --mirror=push instead"
11826msgstr ""
11827"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
11828"\t 或 --mirror=push"
11829
11830#: builtin/remote.c:144
11831#, c-format
11832msgid "unknown mirror argument: %s"
11833msgstr "未知的镜像参数:%s"
11834
11835#: builtin/remote.c:160
11836msgid "fetch the remote branches"
11837msgstr "抓取远程的分支"
11838
11839#: builtin/remote.c:162
11840msgid "import all tags and associated objects when fetching"
11841msgstr "抓取时导入所有的标签和关联对象"
11842
11843#: builtin/remote.c:165
11844msgid "or do not fetch any tag at all (--no-tags)"
11845msgstr "或不抓取任何标签(--no-tags)"
11846
11847#: builtin/remote.c:167
11848msgid "branch(es) to track"
11849msgstr "跟踪的分支"
11850
11851#: builtin/remote.c:168
11852msgid "master branch"
11853msgstr "主线分支"
11854
11855#: builtin/remote.c:169
11856msgid "push|fetch"
11857msgstr "push|fetch"
11858
11859#: builtin/remote.c:170
11860msgid "set up remote as a mirror to push to or fetch from"
11861msgstr "把远程设置为用以推送或抓取的镜像"
11862
11863#: builtin/remote.c:182
11864msgid "specifying a master branch makes no sense with --mirror"
11865msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
11866
11867#: builtin/remote.c:184
11868msgid "specifying branches to track makes sense only with fetch mirrors"
11869msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
11870
11871#: builtin/remote.c:191 builtin/remote.c:630
11872#, c-format
11873msgid "remote %s already exists."
11874msgstr "远程 %s 已经存在。"
11875
11876#: builtin/remote.c:195 builtin/remote.c:634
11877#, c-format
11878msgid "'%s' is not a valid remote name"
11879msgstr "'%s' 不是一个有效的远程名称"
11880
11881#: builtin/remote.c:235
11882#, c-format
11883msgid "Could not setup master '%s'"
11884msgstr "无法设置 master '%s'"
11885
11886#: builtin/remote.c:337
11887#, c-format
11888msgid "Could not get fetch map for refspec %s"
11889msgstr "无法得到引用规格 %s 的获取列表"
11890
11891#: builtin/remote.c:438 builtin/remote.c:446
11892msgid "(matching)"
11893msgstr "(匹配)"
11894
11895#: builtin/remote.c:450
11896msgid "(delete)"
11897msgstr "(删除)"
11898
11899#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
11900#, c-format
11901msgid "No such remote: %s"
11902msgstr "没有这样的远程:%s"
11903
11904#: builtin/remote.c:640
11905#, c-format
11906msgid "Could not rename config section '%s' to '%s'"
11907msgstr "不能重命名配置小节 '%s' 到 '%s'"
11908
11909#: builtin/remote.c:660
11910#, c-format
11911msgid ""
11912"Not updating non-default fetch refspec\n"
11913"\t%s\n"
11914"\tPlease update the configuration manually if necessary."
11915msgstr ""
11916"没有更新非默认的获取引用规格\n"
11917"\t%s\n"
11918"\t如果必要请手动更新配置。"
11919
11920#: builtin/remote.c:696
11921#, c-format
11922msgid "deleting '%s' failed"
11923msgstr "删除 '%s' 失败"
11924
11925#: builtin/remote.c:730
11926#, c-format
11927msgid "creating '%s' failed"
11928msgstr "创建 '%s' 失败"
11929
11930#: builtin/remote.c:795
11931msgid ""
11932"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
11933"to delete it, use:"
11934msgid_plural ""
11935"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
11936"to delete them, use:"
11937msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
11938msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
11939
11940#: builtin/remote.c:809
11941#, c-format
11942msgid "Could not remove config section '%s'"
11943msgstr "不能移除配置小节 '%s'"
11944
11945#: builtin/remote.c:910
11946#, c-format
11947msgid " new (next fetch will store in remotes/%s)"
11948msgstr " 新的(下一次获取将存储于 remotes/%s)"
11949
11950#: builtin/remote.c:913
11951msgid " tracked"
11952msgstr " 已跟踪"
11953
11954#: builtin/remote.c:915
11955msgid " stale (use 'git remote prune' to remove)"
11956msgstr " 过时(使用 'git remote prune' 来移除)"
11957
11958#: builtin/remote.c:917
11959msgid " ???"
11960msgstr " ???"
11961
11962#: builtin/remote.c:958
11963#, c-format
11964msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
11965msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
11966
11967#: builtin/remote.c:966
11968#, c-format
11969msgid "rebases interactively onto remote %s"
11970msgstr "交互式变基到远程 %s"
11971
11972#: builtin/remote.c:967
11973#, c-format
11974msgid "rebases onto remote %s"
11975msgstr "变基到远程 %s"
11976
11977#: builtin/remote.c:970
11978#, c-format
11979msgid " merges with remote %s"
11980msgstr " 与远程 %s 合并"
11981
11982#: builtin/remote.c:973
11983#, c-format
11984msgid "merges with remote %s"
11985msgstr "与远程 %s 合并"
11986
11987#: builtin/remote.c:976
11988#, c-format
11989msgid "%-*s    and with remote %s\n"
11990msgstr "%-*s    以及和远程 %s\n"
11991
11992#: builtin/remote.c:1019
11993msgid "create"
11994msgstr "创建"
11995
11996#: builtin/remote.c:1022
11997msgid "delete"
11998msgstr "删除"
11999
12000#: builtin/remote.c:1026
12001msgid "up to date"
12002msgstr "最新"
12003
12004#: builtin/remote.c:1029
12005msgid "fast-forwardable"
12006msgstr "可快进"
12007
12008#: builtin/remote.c:1032
12009msgid "local out of date"
12010msgstr "本地已过时"
12011
12012#: builtin/remote.c:1039
12013#, c-format
12014msgid "    %-*s forces to %-*s (%s)"
12015msgstr "    %-*s 强制推送至 %-*s (%s)"
12016
12017#: builtin/remote.c:1042
12018#, c-format
12019msgid "    %-*s pushes to %-*s (%s)"
12020msgstr "    %-*s 推送至 %-*s (%s)"
12021
12022#: builtin/remote.c:1046
12023#, c-format
12024msgid "    %-*s forces to %s"
12025msgstr "    %-*s 强制推送至 %s"
12026
12027#: builtin/remote.c:1049
12028#, c-format
12029msgid "    %-*s pushes to %s"
12030msgstr "    %-*s 推送至 %s"
12031
12032#: builtin/remote.c:1117
12033msgid "do not query remotes"
12034msgstr "不查询远程"
12035
12036#: builtin/remote.c:1144
12037#, c-format
12038msgid "* remote %s"
12039msgstr "* 远程 %s"
12040
12041#: builtin/remote.c:1145
12042#, c-format
12043msgid "  Fetch URL: %s"
12044msgstr "  获取地址:%s"
12045
12046#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
12047msgid "(no URL)"
12048msgstr "(无 URL)"
12049
12050#. TRANSLATORS: the colon ':' should align
12051#. with the one in " Fetch URL: %s"
12052#. translation.
12053#.
12054#: builtin/remote.c:1160 builtin/remote.c:1162
12055#, c-format
12056msgid "  Push  URL: %s"
12057msgstr "  推送地址:%s"
12058
12059#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
12060#, c-format
12061msgid "  HEAD branch: %s"
12062msgstr "  HEAD 分支:%s"
12063
12064#  译者:中文字符串拼接,可删除前导空格
12065#: builtin/remote.c:1164
12066msgid "(not queried)"
12067msgstr "(未查询)"
12068
12069#: builtin/remote.c:1166
12070msgid "(unknown)"
12071msgstr "(未知)"
12072
12073#: builtin/remote.c:1170
12074#, c-format
12075msgid ""
12076"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
12077msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
12078
12079#: builtin/remote.c:1182
12080#, c-format
12081msgid "  Remote branch:%s"
12082msgid_plural "  Remote branches:%s"
12083msgstr[0] "  远程分支:%s"
12084msgstr[1] "  远程分支:%s"
12085
12086#  译者:中文字符串拼接,可删除前导空格
12087#: builtin/remote.c:1185 builtin/remote.c:1211
12088msgid " (status not queried)"
12089msgstr "(状态未查询)"
12090
12091#: builtin/remote.c:1194
12092msgid "  Local branch configured for 'git pull':"
12093msgid_plural "  Local branches configured for 'git pull':"
12094msgstr[0] "  为 'git pull' 配置的本地分支:"
12095msgstr[1] "  为 'git pull' 配置的本地分支:"
12096
12097#: builtin/remote.c:1202
12098msgid "  Local refs will be mirrored by 'git push'"
12099msgstr "  本地引用将在 'git push' 时被镜像"
12100
12101#: builtin/remote.c:1208
12102#, c-format
12103msgid "  Local ref configured for 'git push'%s:"
12104msgid_plural "  Local refs configured for 'git push'%s:"
12105msgstr[0] "  为 'git push' 配置的本地引用%s:"
12106msgstr[1] "  为 'git push' 配置的本地引用%s:"
12107
12108#: builtin/remote.c:1229
12109msgid "set refs/remotes/<name>/HEAD according to remote"
12110msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
12111
12112#: builtin/remote.c:1231
12113msgid "delete refs/remotes/<name>/HEAD"
12114msgstr "删除 refs/remotes/<名称>/HEAD"
12115
12116#: builtin/remote.c:1246
12117msgid "Cannot determine remote HEAD"
12118msgstr "无法确定远程 HEAD"
12119
12120#: builtin/remote.c:1248
12121msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
12122msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
12123
12124#: builtin/remote.c:1258
12125#, c-format
12126msgid "Could not delete %s"
12127msgstr "无法删除 %s"
12128
12129#: builtin/remote.c:1266
12130#, c-format
12131msgid "Not a valid ref: %s"
12132msgstr "不是一个有效引用:%s"
12133
12134#: builtin/remote.c:1268
12135#, c-format
12136msgid "Could not setup %s"
12137msgstr "不能设置 %s"
12138
12139#  译者:注意保持前导空格
12140#: builtin/remote.c:1286
12141#, c-format
12142msgid " %s will become dangling!"
12143msgstr " %s 将成为摇摆状态!"
12144
12145#  译者:注意保持前导空格
12146#: builtin/remote.c:1287
12147#, c-format
12148msgid " %s has become dangling!"
12149msgstr " %s 已成为摇摆状态!"
12150
12151#: builtin/remote.c:1297
12152#, c-format
12153msgid "Pruning %s"
12154msgstr "修剪 %s"
12155
12156#: builtin/remote.c:1298
12157#, c-format
12158msgid "URL: %s"
12159msgstr "URL:%s"
12160
12161#: builtin/remote.c:1314
12162#, c-format
12163msgid " * [would prune] %s"
12164msgstr " * [将删除] %s"
12165
12166#: builtin/remote.c:1317
12167#, c-format
12168msgid " * [pruned] %s"
12169msgstr " * [已删除] %s"
12170
12171#: builtin/remote.c:1362
12172msgid "prune remotes after fetching"
12173msgstr "抓取后清除远程"
12174
12175#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
12176#, c-format
12177msgid "No such remote '%s'"
12178msgstr "没有此远程 '%s'"
12179
12180#: builtin/remote.c:1441
12181msgid "add branch"
12182msgstr "添加分支"
12183
12184#: builtin/remote.c:1448
12185msgid "no remote specified"
12186msgstr "未指定远程"
12187
12188#: builtin/remote.c:1465
12189msgid "query push URLs rather than fetch URLs"
12190msgstr "查询推送 URL 地址,而非获取 URL 地址"
12191
12192#: builtin/remote.c:1467
12193msgid "return all URLs"
12194msgstr "返回所有 URL 地址"
12195
12196#: builtin/remote.c:1495
12197#, c-format
12198msgid "no URLs configured for remote '%s'"
12199msgstr "没有给远程仓库 '%s' 设定 URL"
12200
12201#: builtin/remote.c:1521
12202msgid "manipulate push URLs"
12203msgstr "操作推送 URLS"
12204
12205#: builtin/remote.c:1523
12206msgid "add URL"
12207msgstr "添加 URL"
12208
12209#: builtin/remote.c:1525
12210msgid "delete URLs"
12211msgstr "删除 URLS"
12212
12213#: builtin/remote.c:1532
12214msgid "--add --delete doesn't make sense"
12215msgstr "--add --delete 无意义"
12216
12217#: builtin/remote.c:1573
12218#, c-format
12219msgid "Invalid old URL pattern: %s"
12220msgstr "无效的旧 URL 匹配模版:%s"
12221
12222#: builtin/remote.c:1581
12223#, c-format
12224msgid "No such URL found: %s"
12225msgstr "未找到此 URL:%s"
12226
12227#: builtin/remote.c:1583
12228msgid "Will not delete all non-push URLs"
12229msgstr "将不会删除所有非推送 URL 地址"
12230
12231#: builtin/remote.c:1597
12232msgid "be verbose; must be placed before a subcommand"
12233msgstr "冗长输出;必须置于子命令之前"
12234
12235#: builtin/remote.c:1628
12236#, c-format
12237msgid "Unknown subcommand: %s"
12238msgstr "未知子命令:%s"
12239
12240#: builtin/repack.c:18
12241msgid "git repack [<options>]"
12242msgstr "git repack [<选项>]"
12243
12244#: builtin/repack.c:23
12245msgid ""
12246"Incremental repacks are incompatible with bitmap indexes.  Use\n"
12247"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
12248msgstr ""
12249"增量 repack 和 bitmap 索引不兼容。  使用 --no-write-bitmap-index\n"
12250"或禁用 pack.writebitmaps 配置。"
12251
12252#: builtin/repack.c:168
12253msgid "pack everything in a single pack"
12254msgstr "所有内容打包到一个包文件中"
12255
12256#: builtin/repack.c:170
12257msgid "same as -a, and turn unreachable objects loose"
12258msgstr "和 -a 相同,并将不可达的对象设为松散对象"
12259
12260#: builtin/repack.c:173
12261msgid "remove redundant packs, and run git-prune-packed"
12262msgstr "删除多余的包,运行 git-prune-packed"
12263
12264#: builtin/repack.c:175
12265msgid "pass --no-reuse-delta to git-pack-objects"
12266msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
12267
12268#: builtin/repack.c:177
12269msgid "pass --no-reuse-object to git-pack-objects"
12270msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
12271
12272#: builtin/repack.c:179
12273msgid "do not run git-update-server-info"
12274msgstr "不运行 git-update-server-info"
12275
12276#: builtin/repack.c:182
12277msgid "pass --local to git-pack-objects"
12278msgstr "向 git-pack-objects 传递参数 --local"
12279
12280#: builtin/repack.c:184
12281msgid "write bitmap index"
12282msgstr "写 bitmap 索引"
12283
12284#: builtin/repack.c:185
12285msgid "approxidate"
12286msgstr "近似日期"
12287
12288#: builtin/repack.c:186
12289msgid "with -A, do not loosen objects older than this"
12290msgstr "使用 -A,不要将早于给定时间的对象过期"
12291
12292#: builtin/repack.c:188
12293msgid "with -a, repack unreachable objects"
12294msgstr "使用 -a ,重新对不可达对象打包"
12295
12296#: builtin/repack.c:190
12297msgid "size of the window used for delta compression"
12298msgstr "用于增量压缩的窗口值"
12299
12300#: builtin/repack.c:191 builtin/repack.c:197
12301msgid "bytes"
12302msgstr "字节"
12303
12304#: builtin/repack.c:192
12305msgid "same as the above, but limit memory size instead of entries count"
12306msgstr "和上面的相似,但限制内存大小而非条目数"
12307
12308#: builtin/repack.c:194
12309msgid "limits the maximum delta depth"
12310msgstr "限制最大增量深度"
12311
12312#: builtin/repack.c:196
12313msgid "limits the maximum number of threads"
12314msgstr "限制最大线程数"
12315
12316#: builtin/repack.c:198
12317msgid "maximum size of each packfile"
12318msgstr "每个包文件的最大尺寸"
12319
12320#: builtin/repack.c:200
12321msgid "repack objects in packs marked with .keep"
12322msgstr "对标记为 .keep 的包中的对象重新打包"
12323
12324#: builtin/repack.c:210
12325msgid "cannot delete packs in a precious-objects repo"
12326msgstr "不能删除珍品仓库中的打包文件"
12327
12328#: builtin/repack.c:214
12329msgid "--keep-unreachable and -A are incompatible"
12330msgstr "--keep-unreachable 和 -A 不兼容"
12331
12332#: builtin/repack.c:406 builtin/worktree.c:116
12333#, c-format
12334msgid "failed to remove '%s'"
12335msgstr "无法删除 '%s'"
12336
12337#: builtin/replace.c:20
12338msgid "git replace [-f] <object> <replacement>"
12339msgstr "git replace [-f] <对象> <替换物>"
12340
12341#: builtin/replace.c:21
12342msgid "git replace [-f] --edit <object>"
12343msgstr "git replace [-f] --edit <对象>"
12344
12345#: builtin/replace.c:22
12346msgid "git replace [-f] --graft <commit> [<parent>...]"
12347msgstr "git replace [-f] --graft <提交> [<父提交>...]"
12348
12349#: builtin/replace.c:23
12350msgid "git replace -d <object>..."
12351msgstr "git replace -d <对象>..."
12352
12353#: builtin/replace.c:24
12354msgid "git replace [--format=<format>] [-l [<pattern>]]"
12355msgstr "git replace [--format=<格式>] [-l [<模式>]]"
12356
12357#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
12358#, c-format
12359msgid "Not a valid object name: '%s'"
12360msgstr "不是一个有效的对象名:'%s'"
12361
12362#: builtin/replace.c:361
12363#, c-format
12364msgid "bad mergetag in commit '%s'"
12365msgstr "提交 '%s' 中含有损坏的合并标签"
12366
12367#: builtin/replace.c:363
12368#, c-format
12369msgid "malformed mergetag in commit '%s'"
12370msgstr "提交 '%s' 中含有非法的合并标签"
12371
12372#: builtin/replace.c:374
12373#, c-format
12374msgid ""
12375"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
12376"instead of --graft"
12377msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
12378
12379#: builtin/replace.c:407
12380#, c-format
12381msgid "the original commit '%s' has a gpg signature."
12382msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12383
12384#: builtin/replace.c:408
12385msgid "the signature will be removed in the replacement commit!"
12386msgstr "在替换的提交中签名将被移除!"
12387
12388#: builtin/replace.c:414
12389#, c-format
12390msgid "could not write replacement commit for: '%s'"
12391msgstr "不能为 '%s' 写替换提交"
12392
12393#: builtin/replace.c:438
12394msgid "list replace refs"
12395msgstr "列出替换的引用"
12396
12397#: builtin/replace.c:439
12398msgid "delete replace refs"
12399msgstr "删除替换的引用"
12400
12401#: builtin/replace.c:440
12402msgid "edit existing object"
12403msgstr "编辑现存的对象"
12404
12405#: builtin/replace.c:441
12406msgid "change a commit's parents"
12407msgstr "修改一个提交的父提交"
12408
12409#: builtin/replace.c:442
12410msgid "replace the ref if it exists"
12411msgstr "如果存在则替换引用"
12412
12413#: builtin/replace.c:443
12414msgid "do not pretty-print contents for --edit"
12415msgstr "不要为 --edit 操作美观显示内容"
12416
12417#: builtin/replace.c:444
12418msgid "use this format"
12419msgstr "使用此格式"
12420
12421#: builtin/rerere.c:13
12422msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
12423msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
12424
12425#: builtin/rerere.c:59
12426msgid "register clean resolutions in index"
12427msgstr "在索引中注册干净的解决方案"
12428
12429#: builtin/reset.c:29
12430msgid ""
12431"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
12432msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
12433
12434#: builtin/reset.c:30
12435msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
12436msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
12437
12438#: builtin/reset.c:31
12439msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
12440msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
12441
12442#: builtin/reset.c:37
12443msgid "mixed"
12444msgstr "混杂"
12445
12446#: builtin/reset.c:37
12447msgid "soft"
12448msgstr "软性"
12449
12450#: builtin/reset.c:37
12451msgid "hard"
12452msgstr "硬性"
12453
12454#: builtin/reset.c:37
12455msgid "merge"
12456msgstr "合并"
12457
12458#: builtin/reset.c:37
12459msgid "keep"
12460msgstr "保持"
12461
12462#: builtin/reset.c:77
12463msgid "You do not have a valid HEAD."
12464msgstr "您没有一个有效的 HEAD。"
12465
12466#: builtin/reset.c:79
12467msgid "Failed to find tree of HEAD."
12468msgstr "无法找到 HEAD 指向的树。"
12469
12470#: builtin/reset.c:85
12471#, c-format
12472msgid "Failed to find tree of %s."
12473msgstr "无法找到 %s 指向的树。"
12474
12475#: builtin/reset.c:103
12476#, c-format
12477msgid "HEAD is now at %s"
12478msgstr "HEAD 现在位于 %s"
12479
12480#  译者:汉字之间无空格,故删除%s前后空格
12481#: builtin/reset.c:186
12482#, c-format
12483msgid "Cannot do a %s reset in the middle of a merge."
12484msgstr "在合并过程中不能做%s重置操作。"
12485
12486#: builtin/reset.c:286
12487msgid "be quiet, only report errors"
12488msgstr "安静模式,只报告错误"
12489
12490#: builtin/reset.c:288
12491msgid "reset HEAD and index"
12492msgstr "重置 HEAD 和索引"
12493
12494#: builtin/reset.c:289
12495msgid "reset only HEAD"
12496msgstr "只重置 HEAD"
12497
12498#: builtin/reset.c:291 builtin/reset.c:293
12499msgid "reset HEAD, index and working tree"
12500msgstr "重置 HEAD、索引和工作区"
12501
12502#: builtin/reset.c:295
12503msgid "reset HEAD but keep local changes"
12504msgstr "重置 HEAD 但保存本地变更"
12505
12506#: builtin/reset.c:301
12507msgid "record only the fact that removed paths will be added later"
12508msgstr "将删除的路径标记为稍后添加"
12509
12510#: builtin/reset.c:320
12511#, c-format
12512msgid "Failed to resolve '%s' as a valid revision."
12513msgstr "无法将 '%s' 解析为一个有效的版本。"
12514
12515#: builtin/reset.c:328
12516#, c-format
12517msgid "Failed to resolve '%s' as a valid tree."
12518msgstr "无法将 '%s' 解析为一个有效的树对象。"
12519
12520#: builtin/reset.c:337
12521msgid "--patch is incompatible with --{hard,mixed,soft}"
12522msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
12523
12524#: builtin/reset.c:346
12525msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
12526msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
12527
12528#  译者:汉字之间无空格,故删除%s前后空格
12529#: builtin/reset.c:348
12530#, c-format
12531msgid "Cannot do %s reset with paths."
12532msgstr "不能带路径进行%s重置。"
12533
12534#  译者:汉字之间无空格,故删除%s前后空格
12535#: builtin/reset.c:358
12536#, c-format
12537msgid "%s reset is not allowed in a bare repository"
12538msgstr "不能对纯仓库进行%s重置"
12539
12540#: builtin/reset.c:362
12541msgid "-N can only be used with --mixed"
12542msgstr "-N 只能和 --mixed 同时使用"
12543
12544#: builtin/reset.c:379
12545msgid "Unstaged changes after reset:"
12546msgstr "重置后取消暂存的变更:"
12547
12548#: builtin/reset.c:385
12549#, c-format
12550msgid "Could not reset index file to revision '%s'."
12551msgstr "不能重置索引文件至版本 '%s'。"
12552
12553#: builtin/reset.c:389
12554msgid "Could not write new index file."
12555msgstr "不能写入新的索引文件。"
12556
12557#: builtin/rev-list.c:358
12558msgid "rev-list does not support display of notes"
12559msgstr "rev-list 不支持显示注解"
12560
12561#: builtin/rev-parse.c:394
12562msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12563msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
12564
12565#: builtin/rev-parse.c:399
12566msgid "keep the `--` passed as an arg"
12567msgstr "保持 `--` 作为一个参数传递"
12568
12569#: builtin/rev-parse.c:401
12570msgid "stop parsing after the first non-option argument"
12571msgstr "遇到第一个非选项参数后停止解析"
12572
12573#: builtin/rev-parse.c:404
12574msgid "output in stuck long form"
12575msgstr "以固定长格式输出"
12576
12577#: builtin/rev-parse.c:535
12578msgid ""
12579"git rev-parse --parseopt [<options>] -- [<args>...]\n"
12580"   or: git rev-parse --sq-quote [<arg>...]\n"
12581"   or: git rev-parse [<options>] [<arg>...]\n"
12582"\n"
12583"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
12584msgstr ""
12585"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
12586"   或者:git rev-parse --sq-quote [<参数>...]\n"
12587"   或者:git rev-parse [<选项>] [<参数>...]\n"
12588"\n"
12589"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
12590
12591#: builtin/revert.c:23
12592msgid "git revert [<options>] <commit-ish>..."
12593msgstr "git revert [<选项>] <提交号>..."
12594
12595#: builtin/revert.c:24
12596msgid "git revert <subcommand>"
12597msgstr "git revert <子命令>"
12598
12599#: builtin/revert.c:29
12600msgid "git cherry-pick [<options>] <commit-ish>..."
12601msgstr "git cherry-pick [<选项>] <提交号>..."
12602
12603#: builtin/revert.c:30
12604msgid "git cherry-pick <subcommand>"
12605msgstr "git cherry-pick <子命令>"
12606
12607#: builtin/revert.c:90
12608#, c-format
12609msgid "%s: %s cannot be used with %s"
12610msgstr "%s:%s 不能和 %s 同时使用"
12611
12612#: builtin/revert.c:99
12613msgid "end revert or cherry-pick sequence"
12614msgstr "终止反转或拣选操作"
12615
12616#: builtin/revert.c:100
12617msgid "resume revert or cherry-pick sequence"
12618msgstr "继续反转或拣选操作"
12619
12620#: builtin/revert.c:101
12621msgid "cancel revert or cherry-pick sequence"
12622msgstr "取消反转或拣选操作"
12623
12624#: builtin/revert.c:102
12625msgid "don't automatically commit"
12626msgstr "不要自动提交"
12627
12628#: builtin/revert.c:103
12629msgid "edit the commit message"
12630msgstr "编辑提交说明"
12631
12632#: builtin/revert.c:106
12633msgid "parent-number"
12634msgstr "父编号"
12635
12636#: builtin/revert.c:107
12637msgid "select mainline parent"
12638msgstr "选择主干父提交编号"
12639
12640#: builtin/revert.c:109
12641msgid "merge strategy"
12642msgstr "合并策略"
12643
12644#: builtin/revert.c:110
12645msgid "option"
12646msgstr "选项"
12647
12648#: builtin/revert.c:111
12649msgid "option for merge strategy"
12650msgstr "合并策略的选项"
12651
12652#: builtin/revert.c:120
12653msgid "append commit name"
12654msgstr "追加提交名称"
12655
12656#: builtin/revert.c:122
12657msgid "preserve initially empty commits"
12658msgstr "保留初始化的空提交"
12659
12660#: builtin/revert.c:123
12661msgid "allow commits with empty messages"
12662msgstr "允许提交说明为空"
12663
12664#: builtin/revert.c:124
12665msgid "keep redundant, empty commits"
12666msgstr "保持多余的、空的提交"
12667
12668#: builtin/revert.c:212
12669msgid "revert failed"
12670msgstr "还原失败"
12671
12672#: builtin/revert.c:225
12673msgid "cherry-pick failed"
12674msgstr "拣选失败"
12675
12676#: builtin/rm.c:18
12677msgid "git rm [<options>] [--] <file>..."
12678msgstr "git rm [<选项>] [--] <文件>..."
12679
12680#: builtin/rm.c:206
12681msgid ""
12682"the following file has staged content different from both the\n"
12683"file and the HEAD:"
12684msgid_plural ""
12685"the following files have staged content different from both the\n"
12686"file and the HEAD:"
12687msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12688msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12689
12690#: builtin/rm.c:211
12691msgid ""
12692"\n"
12693"(use -f to force removal)"
12694msgstr ""
12695"\n"
12696"(使用 -f 强制删除)"
12697
12698#: builtin/rm.c:215
12699msgid "the following file has changes staged in the index:"
12700msgid_plural "the following files have changes staged in the index:"
12701msgstr[0] "下列文件索引中有变更"
12702msgstr[1] "下列文件索引中有变更"
12703
12704#: builtin/rm.c:219 builtin/rm.c:228
12705msgid ""
12706"\n"
12707"(use --cached to keep the file, or -f to force removal)"
12708msgstr ""
12709"\n"
12710"(使用 --cached 保留本地文件,或用 -f 强制删除)"
12711
12712#: builtin/rm.c:225
12713msgid "the following file has local modifications:"
12714msgid_plural "the following files have local modifications:"
12715msgstr[0] "如下文件有本地修改:"
12716msgstr[1] "如下文件有本地修改:"
12717
12718#: builtin/rm.c:243
12719msgid "do not list removed files"
12720msgstr "不列出删除的文件"
12721
12722#: builtin/rm.c:244
12723msgid "only remove from the index"
12724msgstr "只从索引区删除"
12725
12726#: builtin/rm.c:245
12727msgid "override the up-to-date check"
12728msgstr "忽略文件更新状态检查"
12729
12730#: builtin/rm.c:246
12731msgid "allow recursive removal"
12732msgstr "允许递归删除"
12733
12734#: builtin/rm.c:248
12735msgid "exit with a zero status even if nothing matched"
12736msgstr "即使没有匹配,也以零状态退出"
12737
12738#: builtin/rm.c:308
12739#, c-format
12740msgid "not removing '%s' recursively without -r"
12741msgstr "未提供 -r 选项不会递归删除 '%s'"
12742
12743#: builtin/rm.c:347
12744#, c-format
12745msgid "git rm: unable to remove %s"
12746msgstr "git rm:不能删除 %s"
12747
12748#: builtin/rm.c:370
12749#, c-format
12750msgid "could not remove '%s'"
12751msgstr "无法删除 '%s'"
12752
12753#: builtin/send-pack.c:19
12754msgid ""
12755"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12756"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
12757"[<ref>...]\n"
12758"  --all and explicit <ref> specification are mutually exclusive."
12759msgstr ""
12760"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12761"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
12762"  --all 和明确的 <引用> 互斥。"
12763
12764#: builtin/send-pack.c:162
12765msgid "remote name"
12766msgstr "远程名称"
12767
12768#: builtin/send-pack.c:176
12769msgid "use stateless RPC protocol"
12770msgstr "使用无状态的 RPC 协议"
12771
12772#: builtin/send-pack.c:177
12773msgid "read refs from stdin"
12774msgstr "从标准输入读取引用"
12775
12776#: builtin/send-pack.c:178
12777msgid "print status from remote helper"
12778msgstr "打印来自远程 helper 的状态"
12779
12780#: builtin/shortlog.c:14
12781msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
12782msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
12783
12784#: builtin/shortlog.c:249
12785msgid "Group by committer rather than author"
12786msgstr "按照提交者分组而不是作者"
12787
12788#: builtin/shortlog.c:251
12789msgid "sort output according to the number of commits per author"
12790msgstr "根据每个作者的提交数量排序"
12791
12792#: builtin/shortlog.c:253
12793msgid "Suppress commit descriptions, only provides commit count"
12794msgstr "隐藏提交说明,只提供提交数量"
12795
12796#: builtin/shortlog.c:255
12797msgid "Show the email address of each author"
12798msgstr "显示每个作者的电子邮件地址"
12799
12800#: builtin/shortlog.c:256
12801msgid "w[,i1[,i2]]"
12802msgstr "w[,i1[,i2]]"
12803
12804#: builtin/shortlog.c:257
12805msgid "Linewrap output"
12806msgstr "折行输出"
12807
12808#: builtin/show-branch.c:12
12809msgid ""
12810"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
12811"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
12812"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12813"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
12814msgstr ""
12815"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
12816"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
12817"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12818"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
12819
12820#: builtin/show-branch.c:16
12821msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
12822msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
12823
12824#: builtin/show-branch.c:376
12825#, c-format
12826msgid "ignoring %s; cannot handle more than %d ref"
12827msgid_plural "ignoring %s; cannot handle more than %d refs"
12828msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
12829msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
12830
12831#: builtin/show-branch.c:530
12832#, c-format
12833msgid "no matching refs with %s"
12834msgstr "没有和 %s 匹配的引用"
12835
12836#: builtin/show-branch.c:626
12837msgid "show remote-tracking and local branches"
12838msgstr "显示远程跟踪的和本地的分支"
12839
12840#: builtin/show-branch.c:628
12841msgid "show remote-tracking branches"
12842msgstr "显示远程跟踪的分支"
12843
12844#: builtin/show-branch.c:630
12845msgid "color '*!+-' corresponding to the branch"
12846msgstr "着色 '*!+-' 到相应的分支"
12847
12848#: builtin/show-branch.c:632
12849msgid "show <n> more commits after the common ancestor"
12850msgstr "显示共同祖先后的 <n> 个提交"
12851
12852#: builtin/show-branch.c:634
12853msgid "synonym to more=-1"
12854msgstr "和 more=-1 同义"
12855
12856#: builtin/show-branch.c:635
12857msgid "suppress naming strings"
12858msgstr "不显示字符串命名"
12859
12860#: builtin/show-branch.c:637
12861msgid "include the current branch"
12862msgstr "包括当前分支"
12863
12864#: builtin/show-branch.c:639
12865msgid "name commits with their object names"
12866msgstr "以对象名字命名提交"
12867
12868#: builtin/show-branch.c:641
12869msgid "show possible merge bases"
12870msgstr "显示可能合并的基线"
12871
12872#: builtin/show-branch.c:643
12873msgid "show refs unreachable from any other ref"
12874msgstr "显示没有任何引用的的引用"
12875
12876#: builtin/show-branch.c:645
12877msgid "show commits in topological order"
12878msgstr "以拓扑顺序显示提交"
12879
12880#: builtin/show-branch.c:648
12881msgid "show only commits not on the first branch"
12882msgstr "只显示不在第一个分支上的提交"
12883
12884#: builtin/show-branch.c:650
12885msgid "show merges reachable from only one tip"
12886msgstr "显示仅一个分支可访问的合并提交"
12887
12888#: builtin/show-branch.c:652
12889msgid "topologically sort, maintaining date order where possible"
12890msgstr "拓扑方式排序,并尽可能地保持日期顺序"
12891
12892#: builtin/show-branch.c:655
12893msgid "<n>[,<base>]"
12894msgstr "<n>[,<base>]"
12895
12896#: builtin/show-branch.c:656
12897msgid "show <n> most recent ref-log entries starting at base"
12898msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
12899
12900#: builtin/show-branch.c:690
12901msgid ""
12902"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12903msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
12904
12905#: builtin/show-branch.c:714
12906msgid "no branches given, and HEAD is not valid"
12907msgstr "未提供分支,且 HEAD 无效"
12908
12909#: builtin/show-branch.c:717
12910msgid "--reflog option needs one branch name"
12911msgstr "选项 --reflog 需要一个分支名"
12912
12913#: builtin/show-branch.c:720
12914#, c-format
12915msgid "only %d entry can be shown at one time."
12916msgid_plural "only %d entries can be shown at one time."
12917msgstr[0] "一次只能显示 %d 个条目。"
12918msgstr[1] "一次只能显示 %d 个条目。"
12919
12920#: builtin/show-branch.c:724
12921#, c-format
12922msgid "no such ref %s"
12923msgstr "无此引用 %s"
12924
12925#: builtin/show-branch.c:808
12926#, c-format
12927msgid "cannot handle more than %d rev."
12928msgid_plural "cannot handle more than %d revs."
12929msgstr[0] "不能处理 %d 个以上的版本。"
12930msgstr[1] "不能处理 %d 个以上的版本。"
12931
12932#: builtin/show-branch.c:812
12933#, c-format
12934msgid "'%s' is not a valid ref."
12935msgstr "'%s' 不是一个有效的引用。"
12936
12937#: builtin/show-branch.c:815
12938#, c-format
12939msgid "cannot find commit %s (%s)"
12940msgstr "不能找到提交 %s(%s)"
12941
12942#: builtin/show-ref.c:10
12943msgid ""
12944"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12945"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
12946msgstr ""
12947"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12948"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
12949
12950#: builtin/show-ref.c:11
12951msgid "git show-ref --exclude-existing[=<pattern>]"
12952msgstr "git show-ref --exclude-existing[=<模式>]"
12953
12954#: builtin/show-ref.c:159
12955msgid "only show tags (can be combined with heads)"
12956msgstr "只显示标签(可以和头共用)"
12957
12958#: builtin/show-ref.c:160
12959msgid "only show heads (can be combined with tags)"
12960msgstr "只显示头(可以和标签共用)"
12961
12962#: builtin/show-ref.c:161
12963msgid "stricter reference checking, requires exact ref path"
12964msgstr "更严格的引用检测,需要精确的引用路径"
12965
12966#: builtin/show-ref.c:164 builtin/show-ref.c:166
12967msgid "show the HEAD reference, even if it would be filtered out"
12968msgstr "显示 HEAD 引用,即使被过滤掉"
12969
12970#: builtin/show-ref.c:168
12971msgid "dereference tags into object IDs"
12972msgstr "转换标签到对象 ID"
12973
12974#: builtin/show-ref.c:170
12975msgid "only show SHA1 hash using <n> digits"
12976msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
12977
12978#: builtin/show-ref.c:174
12979msgid "do not print results to stdout (useful with --verify)"
12980msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
12981
12982#: builtin/show-ref.c:176
12983msgid "show refs from stdin that aren't in local repository"
12984msgstr "显示从标准输入中读入的不在本地仓库中的引用"
12985
12986#: builtin/stripspace.c:18
12987msgid "git stripspace [-s | --strip-comments]"
12988msgstr "git stripspace [-s | --strip-comments]"
12989
12990#: builtin/stripspace.c:19
12991msgid "git stripspace [-c | --comment-lines]"
12992msgstr "git stripspace [-c | --comment-lines]"
12993
12994#: builtin/stripspace.c:36
12995msgid "skip and remove all lines starting with comment character"
12996msgstr "跳过和移除所有的注释行"
12997
12998#: builtin/stripspace.c:39
12999msgid "prepend comment character and space to each line"
13000msgstr "为每一行的行首添加注释符和空格"
13001
13002#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
13003#, c-format
13004msgid "No such ref: %s"
13005msgstr "没有这样的引用:%s"
13006
13007#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
13008#, c-format
13009msgid "Expecting a full ref name, got %s"
13010msgstr "期望一个完整的引用名称,却得到 %s"
13011
13012#: builtin/submodule--helper.c:72
13013#, c-format
13014msgid "cannot strip one component off url '%s'"
13015msgstr "无法从 url '%s' 剥离一个组件"
13016
13017#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
13018msgid "alternative anchor for relative paths"
13019msgstr "相对路径的替代锚记(anchor)"
13020
13021#: builtin/submodule--helper.c:310
13022msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
13023msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
13024
13025#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
13026#, c-format
13027msgid "No url found for submodule path '%s' in .gitmodules"
13028msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
13029
13030#: builtin/submodule--helper.c:395
13031#, c-format
13032msgid ""
13033"could not lookup configuration '%s'. Assuming this repository is its own "
13034"authoritative upstream."
13035msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
13036
13037#: builtin/submodule--helper.c:406
13038#, c-format
13039msgid "Failed to register url for submodule path '%s'"
13040msgstr "无法为子模组 '%s' 注册 url"
13041
13042#: builtin/submodule--helper.c:410
13043#, c-format
13044msgid "Submodule '%s' (%s) registered for path '%s'\n"
13045msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
13046
13047#
13048#: builtin/submodule--helper.c:420
13049#, c-format
13050msgid "warning: command update mode suggested for submodule '%s'\n"
13051msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
13052
13053#: builtin/submodule--helper.c:427
13054#, c-format
13055msgid "Failed to register update mode for submodule path '%s'"
13056msgstr "无法为子模组 '%s' 注册更新模式"
13057
13058#: builtin/submodule--helper.c:443
13059msgid "Suppress output for initializing a submodule"
13060msgstr "初始化子模组时抑制输出"
13061
13062#: builtin/submodule--helper.c:448
13063msgid "git submodule--helper init [<path>]"
13064msgstr "git submodule--helper init [<路径>]"
13065
13066#: builtin/submodule--helper.c:476
13067msgid "git submodule--helper name <path>"
13068msgstr "git submodule--helper name <路径>"
13069
13070#: builtin/submodule--helper.c:482
13071#, c-format
13072msgid "no submodule mapping found in .gitmodules for path '%s'"
13073msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
13074
13075#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
13076#, c-format
13077msgid "submodule '%s' cannot add alternate: %s"
13078msgstr "子模组 '%s' 不能添加仓库备选:%s"
13079
13080#: builtin/submodule--helper.c:604
13081#, c-format
13082msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
13083msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
13084
13085#: builtin/submodule--helper.c:611
13086#, c-format
13087msgid "Value '%s' for submodule.alternateLocation is not recognized"
13088msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
13089
13090#: builtin/submodule--helper.c:633
13091msgid "where the new submodule will be cloned to"
13092msgstr "新的子模组将要克隆的路径"
13093
13094#: builtin/submodule--helper.c:636
13095msgid "name of the new submodule"
13096msgstr "新子模组的名称"
13097
13098#: builtin/submodule--helper.c:639
13099msgid "url where to clone the submodule from"
13100msgstr "克隆子模组的 url 地址"
13101
13102#: builtin/submodule--helper.c:645
13103msgid "depth for shallow clones"
13104msgstr "浅克隆的深度"
13105
13106#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
13107msgid "force cloning progress"
13108msgstr "强制显示克隆进度"
13109
13110#: builtin/submodule--helper.c:653
13111msgid ""
13112"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
13113"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
13114msgstr ""
13115"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
13116"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
13117
13118#: builtin/submodule--helper.c:684
13119#, c-format
13120msgid "clone of '%s' into submodule path '%s' failed"
13121msgstr "无法克隆 '%s' 到子模组路径 '%s'"
13122
13123#: builtin/submodule--helper.c:699
13124#, c-format
13125msgid "could not get submodule directory for '%s'"
13126msgstr "无法得到 '%s' 的子模组目录"
13127
13128#: builtin/submodule--helper.c:764
13129#, c-format
13130msgid "Submodule path '%s' not initialized"
13131msgstr "子模组 '%s' 尚未初始化"
13132
13133#: builtin/submodule--helper.c:768
13134msgid "Maybe you want to use 'update --init'?"
13135msgstr "也许您想要执行 'update --init'?"
13136
13137#: builtin/submodule--helper.c:793
13138#, c-format
13139msgid "Skipping unmerged submodule %s"
13140msgstr "略过未合并的子模组 %s"
13141
13142#: builtin/submodule--helper.c:814
13143#, c-format
13144msgid "Skipping submodule '%s'"
13145msgstr "略过子模组 '%s'"
13146
13147#: builtin/submodule--helper.c:942
13148#, c-format
13149msgid "Failed to clone '%s'. Retry scheduled"
13150msgstr "克隆 '%s' 失败。按计划重试"
13151
13152#: builtin/submodule--helper.c:953
13153#, c-format
13154msgid "Failed to clone '%s' a second time, aborting"
13155msgstr "第二次尝试克隆 '%s' 失败,退出"
13156
13157#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
13158msgid "path into the working tree"
13159msgstr "到工作区的路径"
13160
13161#: builtin/submodule--helper.c:977
13162msgid "path into the working tree, across nested submodule boundaries"
13163msgstr "工作区中的路径,递归嵌套子模组"
13164
13165#: builtin/submodule--helper.c:981
13166msgid "rebase, merge, checkout or none"
13167msgstr "rebase、merge、checkout 或 none"
13168
13169#: builtin/submodule--helper.c:985
13170msgid "Create a shallow clone truncated to the specified number of revisions"
13171msgstr "创建一个指定深度的浅克隆"
13172
13173#: builtin/submodule--helper.c:988
13174msgid "parallel jobs"
13175msgstr "并发任务"
13176
13177#: builtin/submodule--helper.c:990
13178msgid "whether the initial clone should follow the shallow recommendation"
13179msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
13180
13181#: builtin/submodule--helper.c:991
13182msgid "don't print cloning progress"
13183msgstr "不要输出克隆进度"
13184
13185#: builtin/submodule--helper.c:998
13186msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
13187msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
13188
13189#: builtin/submodule--helper.c:1008
13190msgid "bad value for update parameter"
13191msgstr "update 参数取值错误"
13192
13193#: builtin/submodule--helper.c:1079
13194#, c-format
13195msgid ""
13196"Submodule (%s) branch configured to inherit branch from superproject, but "
13197"the superproject is not on any branch"
13198msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
13199
13200#: builtin/submodule--helper.c:1163
13201msgid "recurse into submodules"
13202msgstr "在子模组中递归"
13203
13204#: builtin/submodule--helper.c:1169
13205msgid "git submodule--helper embed-git-dir [<path>...]"
13206msgstr "git submodule--helper embed-git-dir [<路径>...]"
13207
13208#: builtin/submodule--helper.c:1232
13209#, c-format
13210msgid "%s doesn't support --super-prefix"
13211msgstr "%s 不支持 --super-prefix"
13212
13213#: builtin/submodule--helper.c:1238
13214#, c-format
13215msgid "'%s' is not a valid submodule--helper subcommand"
13216msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
13217
13218#: builtin/symbolic-ref.c:8
13219msgid "git symbolic-ref [<options>] <name> [<ref>]"
13220msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
13221
13222#: builtin/symbolic-ref.c:9
13223msgid "git symbolic-ref -d [-q] <name>"
13224msgstr "git symbolic-ref -d [-q] <名称>"
13225
13226#: builtin/symbolic-ref.c:41
13227msgid "suppress error message for non-symbolic (detached) refs"
13228msgstr "不显示非符号(分离的)引用的错误信息"
13229
13230#: builtin/symbolic-ref.c:42
13231msgid "delete symbolic ref"
13232msgstr "删除符号引用"
13233
13234#: builtin/symbolic-ref.c:43
13235msgid "shorten ref output"
13236msgstr "简短的引用输出"
13237
13238#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
13239msgid "reason"
13240msgstr "原因"
13241
13242#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
13243msgid "reason of the update"
13244msgstr "更新的原因"
13245
13246#: builtin/tag.c:24
13247msgid ""
13248"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
13249"[<head>]"
13250msgstr ""
13251"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
13252
13253#: builtin/tag.c:25
13254msgid "git tag -d <tagname>..."
13255msgstr "git tag -d <标签名>..."
13256
13257#: builtin/tag.c:26
13258msgid ""
13259"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
13260"points-at <object>]\n"
13261"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
13262msgstr ""
13263"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
13264"at <对象>]\n"
13265"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
13266
13267#: builtin/tag.c:28
13268msgid "git tag -v [--format=<format>] <tagname>..."
13269msgstr "git tag -v [--format=<格式>] <标签名>..."
13270
13271#: builtin/tag.c:84
13272#, c-format
13273msgid "tag '%s' not found."
13274msgstr "未发现标签 '%s'。"
13275
13276#: builtin/tag.c:100
13277#, c-format
13278msgid "Deleted tag '%s' (was %s)\n"
13279msgstr "已删除标签 '%s'(曾为 %s)\n"
13280
13281#: builtin/tag.c:129
13282#, c-format
13283msgid ""
13284"\n"
13285"Write a message for tag:\n"
13286"  %s\n"
13287"Lines starting with '%c' will be ignored.\n"
13288msgstr ""
13289"\n"
13290"输入一个标签说明:\n"
13291"  %s\n"
13292"以 '%c' 开头的行将被忽略。\n"
13293
13294#: builtin/tag.c:133
13295#, c-format
13296msgid ""
13297"\n"
13298"Write a message for tag:\n"
13299"  %s\n"
13300"Lines starting with '%c' will be kept; you may remove them yourself if you "
13301"want to.\n"
13302msgstr ""
13303"\n"
13304"输入一个标签说明:\n"
13305"  %s\n"
13306"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
13307
13308#: builtin/tag.c:211
13309msgid "unable to sign the tag"
13310msgstr "无法签署标签"
13311
13312#: builtin/tag.c:213
13313msgid "unable to write tag file"
13314msgstr "无法写标签文件"
13315
13316#: builtin/tag.c:237
13317msgid "bad object type."
13318msgstr "坏的对象类型。"
13319
13320#: builtin/tag.c:283
13321msgid "no tag message?"
13322msgstr "无标签说明?"
13323
13324#: builtin/tag.c:290
13325#, c-format
13326msgid "The tag message has been left in %s\n"
13327msgstr "标签说明被保留在 %s\n"
13328
13329#: builtin/tag.c:398
13330msgid "list tag names"
13331msgstr "列出标签名称"
13332
13333#: builtin/tag.c:400
13334msgid "print <n> lines of each tag message"
13335msgstr "每个标签信息打印 <n> 行"
13336
13337#: builtin/tag.c:402
13338msgid "delete tags"
13339msgstr "删除标签"
13340
13341#: builtin/tag.c:403
13342msgid "verify tags"
13343msgstr "验证标签"
13344
13345#: builtin/tag.c:405
13346msgid "Tag creation options"
13347msgstr "标签创建选项"
13348
13349#: builtin/tag.c:407
13350msgid "annotated tag, needs a message"
13351msgstr "附注标签,需要一个说明"
13352
13353#: builtin/tag.c:409
13354msgid "tag message"
13355msgstr "标签说明"
13356
13357#: builtin/tag.c:411
13358msgid "annotated and GPG-signed tag"
13359msgstr "附注并附加 GPG 签名的标签"
13360
13361#: builtin/tag.c:415
13362msgid "use another key to sign the tag"
13363msgstr "使用另外的私钥签名该标签"
13364
13365#: builtin/tag.c:416
13366msgid "replace the tag if exists"
13367msgstr "如果存在,替换现有的标签"
13368
13369#: builtin/tag.c:417 builtin/update-ref.c:369
13370msgid "create a reflog"
13371msgstr "创建引用日志"
13372
13373#: builtin/tag.c:419
13374msgid "Tag listing options"
13375msgstr "标签列表选项"
13376
13377#: builtin/tag.c:420
13378msgid "show tag list in columns"
13379msgstr "以列的方式显示标签列表"
13380
13381#: builtin/tag.c:421 builtin/tag.c:423
13382msgid "print only tags that contain the commit"
13383msgstr "只打印包含该提交的标签"
13384
13385#: builtin/tag.c:422 builtin/tag.c:424
13386msgid "print only tags that don't contain the commit"
13387msgstr "只打印不包含该提交的标签"
13388
13389#: builtin/tag.c:425
13390msgid "print only tags that are merged"
13391msgstr "只打印已经合并的标签"
13392
13393#: builtin/tag.c:426
13394msgid "print only tags that are not merged"
13395msgstr "只打印尚未合并的标签"
13396
13397#: builtin/tag.c:431
13398msgid "print only tags of the object"
13399msgstr "只打印指向该对象的标签"
13400
13401#: builtin/tag.c:470
13402msgid "--column and -n are incompatible"
13403msgstr "--column 和 -n 不兼容"
13404
13405#: builtin/tag.c:492
13406msgid "-n option is only allowed in list mode"
13407msgstr "-n 选项只允许用在列表显示模式"
13408
13409#: builtin/tag.c:494
13410msgid "--contains option is only allowed in list mode"
13411msgstr "--contains 选项只允许用在列表显示模式"
13412
13413#: builtin/tag.c:496
13414msgid "--no-contains option is only allowed in list mode"
13415msgstr "--no-contains 选项只允许用在列表显示模式"
13416
13417#: builtin/tag.c:498
13418msgid "--points-at option is only allowed in list mode"
13419msgstr "--points-at 选项只允许用在列表显示模式"
13420
13421#: builtin/tag.c:500
13422msgid "--merged and --no-merged options are only allowed in list mode"
13423msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
13424
13425#: builtin/tag.c:511
13426msgid "only one -F or -m option is allowed."
13427msgstr "只允许一个 -F 或 -m 选项。"
13428
13429#: builtin/tag.c:530
13430msgid "too many params"
13431msgstr "太多参数"
13432
13433#: builtin/tag.c:536
13434#, c-format
13435msgid "'%s' is not a valid tag name."
13436msgstr "'%s' 不是一个有效的标签名称。"
13437
13438#: builtin/tag.c:541
13439#, c-format
13440msgid "tag '%s' already exists"
13441msgstr "标签 '%s' 已存在"
13442
13443#: builtin/tag.c:571
13444#, c-format
13445msgid "Updated tag '%s' (was %s)\n"
13446msgstr "已更新标签 '%s'(曾为 %s)\n"
13447
13448#: builtin/unpack-objects.c:494
13449msgid "Unpacking objects"
13450msgstr "展开对象中"
13451
13452#: builtin/update-index.c:80
13453#, c-format
13454msgid "failed to create directory %s"
13455msgstr "无法创建目录 %s"
13456
13457#: builtin/update-index.c:86
13458#, c-format
13459msgid "failed to stat %s"
13460msgstr "对 %s 调用 stat 失败"
13461
13462#: builtin/update-index.c:96
13463#, c-format
13464msgid "failed to create file %s"
13465msgstr "无法创建文件 %s"
13466
13467#: builtin/update-index.c:104
13468#, c-format
13469msgid "failed to delete file %s"
13470msgstr "无法删除文件 %s"
13471
13472#: builtin/update-index.c:111 builtin/update-index.c:217
13473#, c-format
13474msgid "failed to delete directory %s"
13475msgstr "无法删除目录 %s"
13476
13477#: builtin/update-index.c:136
13478#, c-format
13479msgid "Testing mtime in '%s' "
13480msgstr "在 '%s' 中测试 mtime "
13481
13482#: builtin/update-index.c:150
13483msgid "directory stat info does not change after adding a new file"
13484msgstr "添加一个新文件后,目录的状态信息未改变"
13485
13486#: builtin/update-index.c:163
13487msgid "directory stat info does not change after adding a new directory"
13488msgstr "添加一个新目录后,目录的状态信息未改变"
13489
13490#: builtin/update-index.c:176
13491msgid "directory stat info changes after updating a file"
13492msgstr "更新一个文件后,目录的状态信息被修改"
13493
13494#: builtin/update-index.c:187
13495msgid "directory stat info changes after adding a file inside subdirectory"
13496msgstr "在子目录中添加文件后,目录的状态信息被修改"
13497
13498#: builtin/update-index.c:198
13499msgid "directory stat info does not change after deleting a file"
13500msgstr "删除一个文件后,目录的状态信息未改变"
13501
13502#: builtin/update-index.c:211
13503msgid "directory stat info does not change after deleting a directory"
13504msgstr "删除一个目录后,目录的状态信息未改变"
13505
13506#: builtin/update-index.c:218
13507msgid " OK"
13508msgstr " OK"
13509
13510#: builtin/update-index.c:569
13511msgid "git update-index [<options>] [--] [<file>...]"
13512msgstr "git update-index [<选项>] [--] [<文件>...]"
13513
13514#: builtin/update-index.c:924
13515msgid "continue refresh even when index needs update"
13516msgstr "当索引需要更新时继续刷新"
13517
13518#: builtin/update-index.c:927
13519msgid "refresh: ignore submodules"
13520msgstr "刷新:忽略子模组"
13521
13522#: builtin/update-index.c:930
13523msgid "do not ignore new files"
13524msgstr "不忽略新的文件"
13525
13526#: builtin/update-index.c:932
13527msgid "let files replace directories and vice-versa"
13528msgstr "让文件替换目录(反之亦然)"
13529
13530#: builtin/update-index.c:934
13531msgid "notice files missing from worktree"
13532msgstr "通知文件从工作区丢失"
13533
13534#: builtin/update-index.c:936
13535msgid "refresh even if index contains unmerged entries"
13536msgstr "即使索引区包含未合并的条目也执行刷新"
13537
13538#: builtin/update-index.c:939
13539msgid "refresh stat information"
13540msgstr "刷新统计信息"
13541
13542#: builtin/update-index.c:943
13543msgid "like --refresh, but ignore assume-unchanged setting"
13544msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
13545
13546#: builtin/update-index.c:947
13547msgid "<mode>,<object>,<path>"
13548msgstr "<存取模式>,<对象>,<路径>"
13549
13550#: builtin/update-index.c:948
13551msgid "add the specified entry to the index"
13552msgstr "添加指定的条目到索引区"
13553
13554#: builtin/update-index.c:957
13555msgid "mark files as \"not changing\""
13556msgstr "把文件标记为 \"没有变更\""
13557
13558#: builtin/update-index.c:960
13559msgid "clear assumed-unchanged bit"
13560msgstr "清除 assumed-unchanged 位"
13561
13562#: builtin/update-index.c:963
13563msgid "mark files as \"index-only\""
13564msgstr "把文件标记为 \"仅索引\""
13565
13566#: builtin/update-index.c:966
13567msgid "clear skip-worktree bit"
13568msgstr "清除 skip-worktree 位"
13569
13570#: builtin/update-index.c:969
13571msgid "add to index only; do not add content to object database"
13572msgstr "只添加到索引区;不添加对象到对象库"
13573
13574#: builtin/update-index.c:971
13575msgid "remove named paths even if present in worktree"
13576msgstr "即使存在工作区里,也删除路径"
13577
13578#: builtin/update-index.c:973
13579msgid "with --stdin: input lines are terminated by null bytes"
13580msgstr "携带 --stdin:输入的行以 null 字符终止"
13581
13582#: builtin/update-index.c:975
13583msgid "read list of paths to be updated from standard input"
13584msgstr "从标准输入中读取需要更新的路径列表"
13585
13586#: builtin/update-index.c:979
13587msgid "add entries from standard input to the index"
13588msgstr "从标准输入添加条目到索引区"
13589
13590#: builtin/update-index.c:983
13591msgid "repopulate stages #2 and #3 for the listed paths"
13592msgstr "为指定文件重新生成第2和第3暂存区"
13593
13594#: builtin/update-index.c:987
13595msgid "only update entries that differ from HEAD"
13596msgstr "只更新与 HEAD 不同的条目"
13597
13598#: builtin/update-index.c:991
13599msgid "ignore files missing from worktree"
13600msgstr "忽略工作区丢失的文件"
13601
13602#: builtin/update-index.c:994
13603msgid "report actions to standard output"
13604msgstr "在标准输出显示操作"
13605
13606#: builtin/update-index.c:996
13607msgid "(for porcelains) forget saved unresolved conflicts"
13608msgstr "(for porcelains) 忘记保存的未解决的冲突"
13609
13610#: builtin/update-index.c:1000
13611msgid "write index in this format"
13612msgstr "以这种格式写入索引区"
13613
13614#: builtin/update-index.c:1002
13615msgid "enable or disable split index"
13616msgstr "启用或禁用索引拆分"
13617
13618#: builtin/update-index.c:1004
13619msgid "enable/disable untracked cache"
13620msgstr "启用/禁用对未跟踪文件的缓存"
13621
13622#: builtin/update-index.c:1006
13623msgid "test if the filesystem supports untracked cache"
13624msgstr "测试文件系统是否支持未跟踪文件缓存"
13625
13626#: builtin/update-index.c:1008
13627msgid "enable untracked cache without testing the filesystem"
13628msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
13629
13630#: builtin/update-index.c:1108
13631msgid ""
13632"core.splitIndex is set to false; remove or change it, if you really want to "
13633"enable split index"
13634msgstr ""
13635"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
13636
13637#: builtin/update-index.c:1117
13638msgid ""
13639"core.splitIndex is set to true; remove or change it, if you really want to "
13640"disable split index"
13641msgstr ""
13642"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
13643
13644#: builtin/update-index.c:1128
13645msgid ""
13646"core.untrackedCache is set to true; remove or change it, if you really want "
13647"to disable the untracked cache"
13648msgstr ""
13649"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
13650"改它。"
13651
13652#: builtin/update-index.c:1132
13653msgid "Untracked cache disabled"
13654msgstr "缓存未跟踪文件被禁用"
13655
13656#: builtin/update-index.c:1140
13657msgid ""
13658"core.untrackedCache is set to false; remove or change it, if you really want "
13659"to enable the untracked cache"
13660msgstr ""
13661"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
13662"修改它。"
13663
13664#: builtin/update-index.c:1144
13665#, c-format
13666msgid "Untracked cache enabled for '%s'"
13667msgstr "缓存未跟踪文件在 '%s' 启用"
13668
13669#: builtin/update-ref.c:10
13670msgid "git update-ref [<options>] -d <refname> [<old-val>]"
13671msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
13672
13673#: builtin/update-ref.c:11
13674msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
13675msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
13676
13677#: builtin/update-ref.c:12
13678msgid "git update-ref [<options>] --stdin [-z]"
13679msgstr "git update-ref [<选项>] --stdin [-z]"
13680
13681#: builtin/update-ref.c:364
13682msgid "delete the reference"
13683msgstr "删除引用"
13684
13685#: builtin/update-ref.c:366
13686msgid "update <refname> not the one it points to"
13687msgstr "更新 <引用名> 本身而不是它指向的引用"
13688
13689#: builtin/update-ref.c:367
13690msgid "stdin has NUL-terminated arguments"
13691msgstr "标准输入有以 NUL 字符终止的参数"
13692
13693#: builtin/update-ref.c:368
13694msgid "read updates from stdin"
13695msgstr "从标准输入读取更新"
13696
13697#: builtin/update-server-info.c:7
13698msgid "git update-server-info [--force]"
13699msgstr "git update-server-info [--force]"
13700
13701#: builtin/update-server-info.c:15
13702msgid "update the info files from scratch"
13703msgstr "从头开始更新文件信息"
13704
13705#: builtin/verify-commit.c:18
13706msgid "git verify-commit [-v | --verbose] <commit>..."
13707msgstr "git verify-commit [-v | --verbose] <提交>..."
13708
13709#: builtin/verify-commit.c:73
13710msgid "print commit contents"
13711msgstr "打印提交内容"
13712
13713#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
13714msgid "print raw gpg status output"
13715msgstr "打印原始 gpg 状态输出"
13716
13717#: builtin/verify-pack.c:55
13718msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
13719msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
13720
13721#: builtin/verify-pack.c:65
13722msgid "verbose"
13723msgstr "冗长输出"
13724
13725#: builtin/verify-pack.c:67
13726msgid "show statistics only"
13727msgstr "只显示统计"
13728
13729#: builtin/verify-tag.c:19
13730msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
13731msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
13732
13733#: builtin/verify-tag.c:37
13734msgid "print tag contents"
13735msgstr "打印标签内容"
13736
13737#: builtin/worktree.c:16
13738msgid "git worktree add [<options>] <path> [<branch>]"
13739msgstr "git worktree add [<选项>] <路径> [<分支>]"
13740
13741#: builtin/worktree.c:17
13742msgid "git worktree list [<options>]"
13743msgstr "git worktree list [<选项>]"
13744
13745#: builtin/worktree.c:18
13746msgid "git worktree lock [<options>] <path>"
13747msgstr "git worktree lock [<选项>] <路径>"
13748
13749#: builtin/worktree.c:19
13750msgid "git worktree prune [<options>]"
13751msgstr "git worktree prune [<选项>]"
13752
13753#: builtin/worktree.c:20
13754msgid "git worktree unlock <path>"
13755msgstr "git worktree unlock <路径>"
13756
13757#: builtin/worktree.c:44
13758#, c-format
13759msgid "Removing worktrees/%s: not a valid directory"
13760msgstr "删除工作区/%s:不是一个有效的目录"
13761
13762#: builtin/worktree.c:50
13763#, c-format
13764msgid "Removing worktrees/%s: gitdir file does not exist"
13765msgstr "删除 worktrees/%s:gitdir 文件不存在"
13766
13767#: builtin/worktree.c:55
13768#, c-format
13769msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
13770msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
13771
13772#: builtin/worktree.c:66
13773#, c-format
13774msgid "Removing worktrees/%s: invalid gitdir file"
13775msgstr "删除 worktrees/%s:无效的 gitdir 文件"
13776
13777#: builtin/worktree.c:82
13778#, c-format
13779msgid "Removing worktrees/%s: gitdir file points to non-existent location"
13780msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
13781
13782#: builtin/worktree.c:129
13783msgid "report pruned working trees"
13784msgstr "报告清除的工作区"
13785
13786#: builtin/worktree.c:131
13787msgid "expire working trees older than <time>"
13788msgstr "将早于 <time> 的工作区过期"
13789
13790#: builtin/worktree.c:205
13791#, c-format
13792msgid "'%s' already exists"
13793msgstr "'%s' 已经存在"
13794
13795#: builtin/worktree.c:236
13796#, c-format
13797msgid "could not create directory of '%s'"
13798msgstr "不能创建目录 '%s'"
13799
13800#: builtin/worktree.c:275
13801#, c-format
13802msgid "Preparing %s (identifier %s)"
13803msgstr "准备 %s(标识符 %s)"
13804
13805#: builtin/worktree.c:327
13806msgid "checkout <branch> even if already checked out in other worktree"
13807msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
13808
13809#: builtin/worktree.c:329
13810msgid "create a new branch"
13811msgstr "创建一个新分支"
13812
13813#: builtin/worktree.c:331
13814msgid "create or reset a branch"
13815msgstr "创建或重置一个分支"
13816
13817#: builtin/worktree.c:333
13818msgid "populate the new working tree"
13819msgstr "生成新的工作区"
13820
13821#: builtin/worktree.c:334
13822msgid "keep the new working tree locked"
13823msgstr "锁定新工作区"
13824
13825#: builtin/worktree.c:342
13826msgid "-b, -B, and --detach are mutually exclusive"
13827msgstr "-b、-B 和 --detach 是互斥的"
13828
13829#: builtin/worktree.c:479
13830msgid "reason for locking"
13831msgstr "锁定原因"
13832
13833#: builtin/worktree.c:491 builtin/worktree.c:524
13834#, c-format
13835msgid "'%s' is not a working tree"
13836msgstr "'%s' 不是一个工作区"
13837
13838#: builtin/worktree.c:493 builtin/worktree.c:526
13839msgid "The main working tree cannot be locked or unlocked"
13840msgstr "主工作区无法被加锁或解锁"
13841
13842#: builtin/worktree.c:498
13843#, c-format
13844msgid "'%s' is already locked, reason: %s"
13845msgstr "'%s' 已被锁定,原因:%s"
13846
13847#: builtin/worktree.c:500
13848#, c-format
13849msgid "'%s' is already locked"
13850msgstr "'%s' 已被锁定"
13851
13852#: builtin/worktree.c:528
13853#, c-format
13854msgid "'%s' is not locked"
13855msgstr "'%s' 未被锁定"
13856
13857#: builtin/write-tree.c:14
13858msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
13859msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
13860
13861#: builtin/write-tree.c:27
13862msgid "<prefix>/"
13863msgstr "<前缀>/"
13864
13865#: builtin/write-tree.c:28
13866msgid "write tree object for a subdirectory <prefix>"
13867msgstr "将 <前缀> 子目录内容写到一个树对象"
13868
13869#: builtin/write-tree.c:31
13870msgid "only useful for debugging"
13871msgstr "只对调试有用"
13872
13873#: upload-pack.c:23
13874msgid "git upload-pack [<options>] <dir>"
13875msgstr "git upload-pack [<选项>] <目录>"
13876
13877#: upload-pack.c:1041
13878msgid "quit after a single request/response exchange"
13879msgstr "在一次单独的请求/响应(request/response)交换后退出"
13880
13881#: upload-pack.c:1043
13882msgid "exit immediately after initial ref advertisement"
13883msgstr "在初始的引用广告后立即退出"
13884
13885#: upload-pack.c:1045
13886msgid "do not try <directory>/.git/ if <directory> is no Git directory"
13887msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
13888
13889#: upload-pack.c:1047
13890msgid "interrupt transfer after <n> seconds of inactivity"
13891msgstr "不活动 <n> 秒钟后终止传输"
13892
13893#: credential-cache--daemon.c:224
13894#, c-format
13895msgid ""
13896"The permissions on your socket directory are too loose; other\n"
13897"users may be able to read your cached credentials. Consider running:\n"
13898"\n"
13899"\tchmod 0700 %s"
13900msgstr ""
13901"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
13902"行:\n"
13903"\n"
13904"\tchmod 0700 %s"
13905
13906#: credential-cache--daemon.c:272
13907msgid "print debugging messages to stderr"
13908msgstr "调试信息输出到标准错误"
13909
13910#: git.c:15
13911msgid ""
13912"'git help -a' and 'git help -g' list available subcommands and some\n"
13913"concept guides. See 'git help <command>' or 'git help <concept>'\n"
13914"to read about a specific subcommand or concept."
13915msgstr ""
13916"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
13917"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
13918"帮助。"
13919
13920#: http.c:337
13921#, c-format
13922msgid "negative value for http.postbuffer; defaulting to %d"
13923msgstr "http.postbuffer 为负值,默认为 %d"
13924
13925#: http.c:358
13926msgid "Delegation control is not supported with cURL < 7.22.0"
13927msgstr "当 cURL < 7.22.0 时,不支持委托控制"
13928
13929#: http.c:367
13930msgid "Public key pinning not supported with cURL < 7.44.0"
13931msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
13932
13933#: http.c:1764
13934#, c-format
13935msgid ""
13936"unable to update url base from redirection:\n"
13937"  asked for: %s\n"
13938"   redirect: %s"
13939msgstr ""
13940"不能更新重定向的 url base:\n"
13941"     请求:%s\n"
13942"   重定向:%s"
13943
13944#: remote-curl.c:324
13945#, c-format
13946msgid "redirecting to %s"
13947msgstr "重定向到 %s"
13948
13949#: common-cmds.h:9
13950msgid "start a working area (see also: git help tutorial)"
13951msgstr "开始一个工作区(参见:git help tutorial)"
13952
13953#: common-cmds.h:10
13954msgid "work on the current change (see also: git help everyday)"
13955msgstr "在当前变更上工作(参见:git help everyday)"
13956
13957#: common-cmds.h:11
13958msgid "examine the history and state (see also: git help revisions)"
13959msgstr "检查历史和状态(参见:git help revisions)"
13960
13961#: common-cmds.h:12
13962msgid "grow, mark and tweak your common history"
13963msgstr "扩展、标记和调校您的历史记录"
13964
13965#: common-cmds.h:13
13966msgid "collaborate (see also: git help workflows)"
13967msgstr "协同(参见:git help workflows)"
13968
13969#: common-cmds.h:17
13970msgid "Add file contents to the index"
13971msgstr "添加文件内容至索引"
13972
13973#: common-cmds.h:18
13974msgid "Use binary search to find the commit that introduced a bug"
13975msgstr "通过二分查找定位引入 bug 的提交"
13976
13977#: common-cmds.h:19
13978msgid "List, create, or delete branches"
13979msgstr "列出、创建或删除分支"
13980
13981#: common-cmds.h:20
13982msgid "Switch branches or restore working tree files"
13983msgstr "切换分支或恢复工作区文件"
13984
13985#: common-cmds.h:21
13986msgid "Clone a repository into a new directory"
13987msgstr "克隆一个仓库到一个新目录"
13988
13989#: common-cmds.h:22
13990msgid "Record changes to the repository"
13991msgstr "记录变更到仓库"
13992
13993#: common-cmds.h:23
13994msgid "Show changes between commits, commit and working tree, etc"
13995msgstr "显示提交之间、提交和工作区之间等的差异"
13996
13997#: common-cmds.h:24
13998msgid "Download objects and refs from another repository"
13999msgstr "从另外一个仓库下载对象和引用"
14000
14001#: common-cmds.h:25
14002msgid "Print lines matching a pattern"
14003msgstr "输出和模式匹配的行"
14004
14005#: common-cmds.h:26
14006msgid "Create an empty Git repository or reinitialize an existing one"
14007msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
14008
14009#: common-cmds.h:27
14010msgid "Show commit logs"
14011msgstr "显示提交日志"
14012
14013#: common-cmds.h:28
14014msgid "Join two or more development histories together"
14015msgstr "合并两个或更多开发历史"
14016
14017#: common-cmds.h:29
14018msgid "Move or rename a file, a directory, or a symlink"
14019msgstr "移动或重命名一个文件、目录或符号链接"
14020
14021#: common-cmds.h:30
14022msgid "Fetch from and integrate with another repository or a local branch"
14023msgstr "获取并整合另外的仓库或一个本地分支"
14024
14025#: common-cmds.h:31
14026msgid "Update remote refs along with associated objects"
14027msgstr "更新远程引用和相关的对象"
14028
14029#: common-cmds.h:32
14030msgid "Reapply commits on top of another base tip"
14031msgstr "在另一个分支上重新应用提交"
14032
14033#: common-cmds.h:33
14034msgid "Reset current HEAD to the specified state"
14035msgstr "重置当前 HEAD 到指定状态"
14036
14037#: common-cmds.h:34
14038msgid "Remove files from the working tree and from the index"
14039msgstr "从工作区和索引中删除文件"
14040
14041#: common-cmds.h:35
14042msgid "Show various types of objects"
14043msgstr "显示各种类型的对象"
14044
14045#: common-cmds.h:36
14046msgid "Show the working tree status"
14047msgstr "显示工作区状态"
14048
14049#: common-cmds.h:37
14050msgid "Create, list, delete or verify a tag object signed with GPG"
14051msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
14052
14053#: parse-options.h:145
14054msgid "expiry-date"
14055msgstr "到期时间"
14056
14057#: parse-options.h:160
14058msgid "no-op (backward compatibility)"
14059msgstr "空操作(向后兼容)"
14060
14061#: parse-options.h:238
14062msgid "be more verbose"
14063msgstr "更加详细"
14064
14065#: parse-options.h:240
14066msgid "be more quiet"
14067msgstr "更加安静"
14068
14069#: parse-options.h:246
14070msgid "use <n> digits to display SHA-1s"
14071msgstr "用 <n> 位数字显示 SHA-1 哈希值"
14072
14073#: rerere.h:40
14074msgid "update the index with reused conflict resolution if possible"
14075msgstr "如果可能,重用冲突解决更新索引"
14076
14077#: git-bisect.sh:54
14078msgid "You need to start by \"git bisect start\""
14079msgstr "您需要执行 \"git bisect start\" 来开始"
14080
14081#  译者:注意保持句尾空格
14082#. TRANSLATORS: Make sure to include [Y] and [n] in your
14083#. translation. The program will only accept English input
14084#. at this point.
14085#: git-bisect.sh:60
14086msgid "Do you want me to do it for you [Y/n]? "
14087msgstr "您想让我为您这样做么[Y/n]? "
14088
14089#: git-bisect.sh:121
14090#, sh-format
14091msgid "unrecognised option: '$arg'"
14092msgstr "未能识别的选项:'$arg'"
14093
14094#: git-bisect.sh:125
14095#, sh-format
14096msgid "'$arg' does not appear to be a valid revision"
14097msgstr "'$arg' 看起来不像是一个有效的版本"
14098
14099#: git-bisect.sh:154
14100msgid "Bad HEAD - I need a HEAD"
14101msgstr "坏的 HEAD - 我需要一个 HEAD"
14102
14103#: git-bisect.sh:167
14104#, sh-format
14105msgid ""
14106"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
14107msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
14108
14109#: git-bisect.sh:177
14110msgid "won't bisect on cg-seek'ed tree"
14111msgstr "不会在做了 cg-seek 的树上做二分查找"
14112
14113#: git-bisect.sh:181
14114msgid "Bad HEAD - strange symbolic ref"
14115msgstr "坏的 HEAD - 奇怪的符号引用"
14116
14117#: git-bisect.sh:233
14118#, sh-format
14119msgid "Bad bisect_write argument: $state"
14120msgstr "坏的 bisect_write 参数:$state"
14121
14122#: git-bisect.sh:262
14123#, sh-format
14124msgid "Bad rev input: $arg"
14125msgstr "坏的输入版本:$arg"
14126
14127#: git-bisect.sh:281
14128#, sh-format
14129msgid "Bad rev input: $bisected_head"
14130msgstr "坏的输入版本:$bisected_head"
14131
14132#: git-bisect.sh:290
14133#, sh-format
14134msgid "Bad rev input: $rev"
14135msgstr "坏的输入版本:$rev"
14136
14137#: git-bisect.sh:299
14138#, sh-format
14139msgid "'git bisect $TERM_BAD' can take only one argument."
14140msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
14141
14142#: git-bisect.sh:322
14143#, sh-format
14144msgid "Warning: bisecting only with a $TERM_BAD commit."
14145msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
14146
14147#  译者:注意保持句尾空格
14148#. TRANSLATORS: Make sure to include [Y] and [n] in your
14149#. translation. The program will only accept English input
14150#. at this point.
14151#: git-bisect.sh:328
14152msgid "Are you sure [Y/n]? "
14153msgstr "您确认么[Y/n]? "
14154
14155#: git-bisect.sh:340
14156#, sh-format
14157msgid ""
14158"You need to give me at least one $bad_syn and one $good_syn revision.\n"
14159"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14160msgstr ""
14161"您需要给我至少一个好版本和一个坏版本。\n"
14162"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14163
14164#: git-bisect.sh:343
14165#, sh-format
14166msgid ""
14167"You need to start by \"git bisect start\".\n"
14168"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
14169"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
14170msgstr ""
14171"您需要执行 \"git bisect start\" 来开始。\n"
14172"然后需要提供我至少一个好版本和一个坏版本。\n"
14173"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
14174
14175#: git-bisect.sh:414 git-bisect.sh:546
14176msgid "We are not bisecting."
14177msgstr "我们没有在二分查找。"
14178
14179#: git-bisect.sh:421
14180#, sh-format
14181msgid "'$invalid' is not a valid commit"
14182msgstr "'$invalid' 不是一个有效的提交"
14183
14184#: git-bisect.sh:430
14185#, sh-format
14186msgid ""
14187"Could not check out original HEAD '$branch'.\n"
14188"Try 'git bisect reset <commit>'."
14189msgstr ""
14190"不能检出原始 HEAD '$branch'。\n"
14191"尝试 'git bisect reset <提交>'。"
14192
14193#: git-bisect.sh:458
14194msgid "No logfile given"
14195msgstr "未提供日志文件"
14196
14197#: git-bisect.sh:459
14198#, sh-format
14199msgid "cannot read $file for replaying"
14200msgstr "不能读取 $file 来重放"
14201
14202#: git-bisect.sh:480
14203msgid "?? what are you talking about?"
14204msgstr "?? 您在说什么?"
14205
14206#: git-bisect.sh:492
14207#, sh-format
14208msgid "running $command"
14209msgstr "运行 $command"
14210
14211#: git-bisect.sh:499
14212#, sh-format
14213msgid ""
14214"bisect run failed:\n"
14215"exit code $res from '$command' is < 0 or >= 128"
14216msgstr ""
14217"二分查找运行失败:\n"
14218"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
14219
14220#: git-bisect.sh:525
14221msgid "bisect run cannot continue any more"
14222msgstr "二分查找不能继续运行"
14223
14224#: git-bisect.sh:531
14225#, sh-format
14226msgid ""
14227"bisect run failed:\n"
14228"'bisect_state $state' exited with error code $res"
14229msgstr ""
14230"二分查找运行失败:\n"
14231"'bisect_state $state' 退出码为 $res"
14232
14233#: git-bisect.sh:538
14234msgid "bisect run success"
14235msgstr "二分查找运行成功"
14236
14237#: git-bisect.sh:565
14238msgid "please use two different terms"
14239msgstr "请使用两个不同的术语"
14240
14241#: git-bisect.sh:575
14242#, sh-format
14243msgid "'$term' is not a valid term"
14244msgstr "'$term' 不是一个有效的名称"
14245
14246#: git-bisect.sh:578
14247#, sh-format
14248msgid "can't use the builtin command '$term' as a term"
14249msgstr "不能使用内置命令 '$term' 作为术语"
14250
14251#: git-bisect.sh:587 git-bisect.sh:593
14252#, sh-format
14253msgid "can't change the meaning of term '$term'"
14254msgstr "不能修改术语 '$term' 的含义"
14255
14256#: git-bisect.sh:606
14257#, sh-format
14258msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
14259msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
14260
14261#: git-bisect.sh:636
14262msgid "no terms defined"
14263msgstr "未定义术语"
14264
14265#: git-bisect.sh:653
14266#, sh-format
14267msgid ""
14268"invalid argument $arg for 'git bisect terms'.\n"
14269"Supported options are: --term-good|--term-old and --term-bad|--term-new."
14270msgstr ""
14271"参数 $arg 对命令 'git bisect terms' 无效。\n"
14272"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
14273
14274#: git-merge-octopus.sh:46
14275msgid ""
14276"Error: Your local changes to the following files would be overwritten by "
14277"merge"
14278msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
14279
14280#: git-merge-octopus.sh:61
14281msgid "Automated merge did not work."
14282msgstr "自动合并未生效。"
14283
14284#: git-merge-octopus.sh:62
14285msgid "Should not be doing an octopus."
14286msgstr "不应该执行章鱼式合并。"
14287
14288#: git-merge-octopus.sh:73
14289#, sh-format
14290msgid "Unable to find common commit with $pretty_name"
14291msgstr "无法找到和 $pretty_name 的基线提交"
14292
14293#: git-merge-octopus.sh:77
14294#, sh-format
14295msgid "Already up-to-date with $pretty_name"
14296msgstr "已经和 $pretty_name 保持一致"
14297
14298#: git-merge-octopus.sh:89
14299#, sh-format
14300msgid "Fast-forwarding to: $pretty_name"
14301msgstr "快进至:$pretty_name"
14302
14303#: git-merge-octopus.sh:97
14304#, sh-format
14305msgid "Trying simple merge with $pretty_name"
14306msgstr "尝试和 $pretty_name 的简单合并"
14307
14308#: git-merge-octopus.sh:102
14309msgid "Simple merge did not work, trying automatic merge."
14310msgstr "简单合并未生效,尝试自动合并。"
14311
14312#: git-rebase.sh:58
14313msgid ""
14314"When you have resolved this problem, run \"git rebase --continue\".\n"
14315"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
14316"To check out the original branch and stop rebasing, run \"git rebase --abort"
14317"\"."
14318msgstr ""
14319"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
14320"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
14321"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
14322
14323#: git-rebase.sh:158 git-rebase.sh:397
14324#, sh-format
14325msgid "Could not move back to $head_name"
14326msgstr "无法移回 $head_name"
14327
14328#: git-rebase.sh:169
14329msgid "Applied autostash."
14330msgstr "成功应用 autostash。"
14331
14332#: git-rebase.sh:172
14333#, sh-format
14334msgid "Cannot store $stash_sha1"
14335msgstr "无法保存 $stash_sha1"
14336
14337#: git-rebase.sh:212
14338msgid "The pre-rebase hook refused to rebase."
14339msgstr "钩子 pre-rebase 拒绝变基操作。"
14340
14341#: git-rebase.sh:217
14342msgid "It looks like git-am is in progress. Cannot rebase."
14343msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
14344
14345#: git-rebase.sh:358
14346msgid "No rebase in progress?"
14347msgstr "没有正在进行的变基?"
14348
14349#: git-rebase.sh:369
14350msgid "The --edit-todo action can only be used during interactive rebase."
14351msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
14352
14353#: git-rebase.sh:376
14354msgid "Cannot read HEAD"
14355msgstr "不能读取 HEAD"
14356
14357#: git-rebase.sh:379
14358msgid ""
14359"You must edit all merge conflicts and then\n"
14360"mark them as resolved using git add"
14361msgstr ""
14362"您必须编辑所有的合并冲突,然后通过 git add\n"
14363"命令将它们标记为已解决"
14364
14365#: git-rebase.sh:419
14366#, sh-format
14367msgid ""
14368"It seems that there is already a $state_dir_base directory, and\n"
14369"I wonder if you are in the middle of another rebase.  If that is the\n"
14370"case, please try\n"
14371"\t$cmd_live_rebase\n"
14372"If that is not the case, please\n"
14373"\t$cmd_clear_stale_rebase\n"
14374"and run me again.  I am stopping in case you still have something\n"
14375"valuable there."
14376msgstr ""
14377"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
14378"过程中。 如果是这样,请执行\n"
14379"\t$cmd_live_rebase\n"
14380"如果不是这样,请执行\n"
14381"\t$cmd_clear_stale_rebase\n"
14382"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
14383
14384#: git-rebase.sh:470
14385#, sh-format
14386msgid "invalid upstream $upstream_name"
14387msgstr "无效的上游 $upstream_name"
14388
14389#: git-rebase.sh:494
14390#, sh-format
14391msgid "$onto_name: there are more than one merge bases"
14392msgstr "$onto_name: 有一个以上的合并基准"
14393
14394#: git-rebase.sh:497 git-rebase.sh:501
14395#, sh-format
14396msgid "$onto_name: there is no merge base"
14397msgstr "$onto_name: 没有合并基准"
14398
14399#: git-rebase.sh:506
14400#, sh-format
14401msgid "Does not point to a valid commit: $onto_name"
14402msgstr "没有指向一个有效的提交:$onto_name"
14403
14404#: git-rebase.sh:529
14405#, sh-format
14406msgid "fatal: no such branch: $branch_name"
14407msgstr "严重错误:无此分支:$branch_name"
14408
14409#: git-rebase.sh:562
14410msgid "Cannot autostash"
14411msgstr "无法 autostash"
14412
14413#: git-rebase.sh:567
14414#, sh-format
14415msgid "Created autostash: $stash_abbrev"
14416msgstr "创建了 autostash: $stash_abbrev"
14417
14418#: git-rebase.sh:571
14419msgid "Please commit or stash them."
14420msgstr "请提交或贮藏修改。"
14421
14422#: git-rebase.sh:591
14423#, sh-format
14424msgid "Current branch $branch_name is up to date."
14425msgstr "当前分支 $branch_name 是最新的。"
14426
14427#: git-rebase.sh:595
14428#, sh-format
14429msgid "Current branch $branch_name is up to date, rebase forced."
14430msgstr "当前分支 $branch_name 是最新的,强制变基。"
14431
14432#: git-rebase.sh:606
14433#, sh-format
14434msgid "Changes from $mb to $onto:"
14435msgstr "变更从 $mb 到 $onto:"
14436
14437#: git-rebase.sh:615
14438msgid "First, rewinding head to replay your work on top of it..."
14439msgstr "首先,回退分支以便在上面重放您的工作..."
14440
14441#: git-rebase.sh:625
14442#, sh-format
14443msgid "Fast-forwarded $branch_name to $onto_name."
14444msgstr "快进 $branch_name 至 $onto_name。"
14445
14446#: git-stash.sh:54
14447msgid "git stash clear with parameters is unimplemented"
14448msgstr "git stash clear 不支持参数"
14449
14450#: git-stash.sh:95
14451msgid "You do not have the initial commit yet"
14452msgstr "您尚未建立初始提交"
14453
14454#: git-stash.sh:110
14455msgid "Cannot save the current index state"
14456msgstr "无法保存当前索引状态"
14457
14458#: git-stash.sh:125
14459msgid "Cannot save the untracked files"
14460msgstr "无法保存未跟踪文件"
14461
14462#: git-stash.sh:145 git-stash.sh:158
14463msgid "Cannot save the current worktree state"
14464msgstr "无法保存当前工作区状态"
14465
14466#: git-stash.sh:162
14467msgid "No changes selected"
14468msgstr "没有选择变更"
14469
14470#: git-stash.sh:165
14471msgid "Cannot remove temporary index (can't happen)"
14472msgstr "无法删除临时索引(不应发生)"
14473
14474#: git-stash.sh:178
14475msgid "Cannot record working tree state"
14476msgstr "不能记录工作区状态"
14477
14478#: git-stash.sh:210
14479#, sh-format
14480msgid "Cannot update $ref_stash with $w_commit"
14481msgstr "无法用 $w_commit 更新 $ref_stash"
14482
14483#. TRANSLATORS: $option is an invalid option, like
14484#. `--blah-blah'. The 7 spaces at the beginning of the
14485#. second line correspond to "error: ". So you should line
14486#. up the second line with however many characters the
14487#. translation of "error: " takes in your language. E.g. in
14488#. English this is:
14489#.
14490#. $ git stash save --blah-blah 2>&1 | head -n 2
14491#. error: unknown option for 'stash save': --blah-blah
14492#. To provide a message, use git stash save -- '--blah-blah'
14493#: git-stash.sh:266
14494#, sh-format
14495msgid ""
14496"error: unknown option for 'stash save': $option\n"
14497"       To provide a message, use git stash save -- '$option'"
14498msgstr ""
14499"错误:'stash save' 的未知选项:$option\n"
14500"      要提供一个描述信息,使用 git stash save -- '$option'"
14501
14502#: git-stash.sh:281
14503msgid "Can't use --patch and --include-untracked or --all at the same time"
14504msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
14505
14506#: git-stash.sh:289
14507msgid "No local changes to save"
14508msgstr "没有要保存的本地修改"
14509
14510#: git-stash.sh:294
14511msgid "Cannot initialize stash"
14512msgstr "无法初始化贮藏"
14513
14514#: git-stash.sh:298
14515msgid "Cannot save the current status"
14516msgstr "无法保存当前状态"
14517
14518#: git-stash.sh:299
14519#, sh-format
14520msgid "Saved working directory and index state $stash_msg"
14521msgstr "保存工作目录和索引状态 $stash_msg"
14522
14523#: git-stash.sh:326
14524msgid "Cannot remove worktree changes"
14525msgstr "无法删除工作区变更"
14526
14527#: git-stash.sh:474
14528#, sh-format
14529msgid "unknown option: $opt"
14530msgstr "未知选项: $opt"
14531
14532#: git-stash.sh:487
14533msgid "No stash entries found."
14534msgstr "未发现贮藏条目。"
14535
14536#: git-stash.sh:494
14537#, sh-format
14538msgid "Too many revisions specified: $REV"
14539msgstr "指定了太多的版本:$REV"
14540
14541#: git-stash.sh:509
14542#, sh-format
14543msgid "$reference is not a valid reference"
14544msgstr "$reference 不是一个有效的引用"
14545
14546#: git-stash.sh:537
14547#, sh-format
14548msgid "'$args' is not a stash-like commit"
14549msgstr "'$args' 不是贮藏式提交"
14550
14551#: git-stash.sh:548
14552#, sh-format
14553msgid "'$args' is not a stash reference"
14554msgstr "'$args' 不是一个贮藏引用"
14555
14556#: git-stash.sh:556
14557msgid "unable to refresh index"
14558msgstr "无法刷新索引"
14559
14560#: git-stash.sh:560
14561msgid "Cannot apply a stash in the middle of a merge"
14562msgstr "无法在合并过程应用贮藏"
14563
14564#: git-stash.sh:568
14565msgid "Conflicts in index. Try without --index."
14566msgstr "索引中有冲突。尝试不使用 --index。"
14567
14568#: git-stash.sh:570
14569msgid "Could not save index tree"
14570msgstr "不能保存索引树"
14571
14572#: git-stash.sh:579
14573msgid "Could not restore untracked files from stash entry"
14574msgstr "无法从贮藏条目中恢复未跟踪文件"
14575
14576#: git-stash.sh:604
14577msgid "Cannot unstage modified files"
14578msgstr "无法将修改的文件取消暂存"
14579
14580#: git-stash.sh:619
14581msgid "Index was not unstashed."
14582msgstr "索引未从贮藏中恢复。"
14583
14584#: git-stash.sh:633
14585msgid "The stash entry is kept in case you need it again."
14586msgstr "贮藏条目被保留以备您再次需要。"
14587
14588#: git-stash.sh:642
14589#, sh-format
14590msgid "Dropped ${REV} ($s)"
14591msgstr "丢弃了 ${REV} ($s)"
14592
14593#: git-stash.sh:643
14594#, sh-format
14595msgid "${REV}: Could not drop stash entry"
14596msgstr "${REV}:无法丢弃贮藏条目"
14597
14598#: git-stash.sh:651
14599msgid "No branch name specified"
14600msgstr "未指定分支名"
14601
14602#: git-stash.sh:730
14603msgid "(To restore them type \"git stash apply\")"
14604msgstr "(为恢复数据输入 \"git stash apply\")"
14605
14606#: git-submodule.sh:181
14607msgid "Relative path can only be used from the toplevel of the working tree"
14608msgstr "只能在工作区的顶级目录中使用相对路径"
14609
14610#: git-submodule.sh:191
14611#, sh-format
14612msgid "repo URL: '$repo' must be absolute or begin with ./|../"
14613msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
14614
14615#: git-submodule.sh:210
14616#, sh-format
14617msgid "'$sm_path' already exists in the index"
14618msgstr "'$sm_path' 已经存在于索引中"
14619
14620#: git-submodule.sh:213
14621#, sh-format
14622msgid "'$sm_path' already exists in the index and is not a submodule"
14623msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
14624
14625#: git-submodule.sh:219
14626#, sh-format
14627msgid ""
14628"The following path is ignored by one of your .gitignore files:\n"
14629"$sm_path\n"
14630"Use -f if you really want to add it."
14631msgstr ""
14632"以下路径被您的一个 .gitignore 文件所忽略:\n"
14633"$sm_path\n"
14634"如果您确实想添加它,使用 -f 参数。"
14635
14636#: git-submodule.sh:237
14637#, sh-format
14638msgid "Adding existing repo at '$sm_path' to the index"
14639msgstr "添加位于 '$sm_path' 的现存仓库到索引"
14640
14641#: git-submodule.sh:239
14642#, sh-format
14643msgid "'$sm_path' already exists and is not a valid git repo"
14644msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
14645
14646#: git-submodule.sh:247
14647#, sh-format
14648msgid "A git directory for '$sm_name' is found locally with remote(s):"
14649msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
14650
14651#: git-submodule.sh:249
14652#, sh-format
14653msgid ""
14654"If you want to reuse this local git directory instead of cloning again from\n"
14655"  $realrepo\n"
14656"use the '--force' option. If the local git directory is not the correct "
14657"repo\n"
14658"or you are unsure what this means choose another name with the '--name' "
14659"option."
14660msgstr ""
14661"如果您想要重用这个本地 git 目录而非重新克隆自\n"
14662"  $realrepo\n"
14663"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
14664"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
14665
14666#: git-submodule.sh:255
14667#, sh-format
14668msgid "Reactivating local git directory for submodule '$sm_name'."
14669msgstr "激活本地 git 目录到子模组 '$sm_name'。"
14670
14671#: git-submodule.sh:267
14672#, sh-format
14673msgid "Unable to checkout submodule '$sm_path'"
14674msgstr "不能检出子模组 '$sm_path'"
14675
14676#: git-submodule.sh:272
14677#, sh-format
14678msgid "Failed to add submodule '$sm_path'"
14679msgstr "无法添加子模组 '$sm_path'"
14680
14681#: git-submodule.sh:281
14682#, sh-format
14683msgid "Failed to register submodule '$sm_path'"
14684msgstr "无法注册子模组 '$sm_path'"
14685
14686#: git-submodule.sh:342
14687#, sh-format
14688msgid "Entering '$displaypath'"
14689msgstr "正在进入 '$displaypath'"
14690
14691#: git-submodule.sh:362
14692#, sh-format
14693msgid "Stopping at '$displaypath'; script returned non-zero status."
14694msgstr "停止于 '$displaypath';脚本返回非零值。"
14695
14696#: git-submodule.sh:433
14697#, sh-format
14698msgid "pathspec and --all are incompatible"
14699msgstr "pathspec 和 --all 不兼容"
14700
14701#: git-submodule.sh:438
14702#, sh-format
14703msgid "Use '--all' if you really want to deinitialize all submodules"
14704msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
14705
14706#: git-submodule.sh:458
14707#, sh-format
14708msgid ""
14709"Submodule work tree '$displaypath' contains a .git directory\n"
14710"(use 'rm -rf' if you really want to remove it including all of its history)"
14711msgstr ""
14712"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
14713"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
14714
14715#: git-submodule.sh:466
14716#, sh-format
14717msgid ""
14718"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
14719"discard them"
14720msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
14721
14722#: git-submodule.sh:469
14723#, sh-format
14724msgid "Cleared directory '$displaypath'"
14725msgstr "已清除目录 '$displaypath'"
14726
14727#: git-submodule.sh:470
14728#, sh-format
14729msgid "Could not remove submodule work tree '$displaypath'"
14730msgstr "无法移除子模组工作区 '$displaypath'"
14731
14732#: git-submodule.sh:473
14733#, sh-format
14734msgid "Could not create empty submodule directory '$displaypath'"
14735msgstr "不能创建空的子模组目录 '$displaypath'"
14736
14737#: git-submodule.sh:482
14738#, sh-format
14739msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
14740msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
14741
14742#: git-submodule.sh:638
14743#, sh-format
14744msgid "Unable to find current revision in submodule path '$displaypath'"
14745msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
14746
14747#: git-submodule.sh:648
14748#, sh-format
14749msgid "Unable to fetch in submodule path '$sm_path'"
14750msgstr "无法在子模组路径 '$sm_path' 中获取"
14751
14752#: git-submodule.sh:653
14753#, sh-format
14754msgid ""
14755"Unable to find current ${remote_name}/${branch} revision in submodule path "
14756"'$sm_path'"
14757msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
14758
14759#: git-submodule.sh:671
14760#, sh-format
14761msgid "Unable to fetch in submodule path '$displaypath'"
14762msgstr "无法在子模组路径 '$displaypath' 中获取"
14763
14764#: git-submodule.sh:677
14765#, sh-format
14766msgid ""
14767"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
14768"Direct fetching of that commit failed."
14769msgstr ""
14770"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
14771
14772#: git-submodule.sh:684
14773#, sh-format
14774msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
14775msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
14776
14777#: git-submodule.sh:685
14778#, sh-format
14779msgid "Submodule path '$displaypath': checked out '$sha1'"
14780msgstr "子模组路径 '$displaypath':检出 '$sha1'"
14781
14782#: git-submodule.sh:689
14783#, sh-format
14784msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
14785msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
14786
14787#: git-submodule.sh:690
14788#, sh-format
14789msgid "Submodule path '$displaypath': rebased into '$sha1'"
14790msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
14791
14792#: git-submodule.sh:695
14793#, sh-format
14794msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
14795msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
14796
14797#: git-submodule.sh:696
14798#, sh-format
14799msgid "Submodule path '$displaypath': merged in '$sha1'"
14800msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
14801
14802#: git-submodule.sh:701
14803#, sh-format
14804msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
14805msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
14806
14807#: git-submodule.sh:702
14808#, sh-format
14809msgid "Submodule path '$displaypath': '$command $sha1'"
14810msgstr "子模组 '$displaypath':'$command $sha1'"
14811
14812#: git-submodule.sh:733
14813#, sh-format
14814msgid "Failed to recurse into submodule path '$displaypath'"
14815msgstr "无法递归进子模组路径 '$displaypath'"
14816
14817#: git-submodule.sh:841
14818msgid "The --cached option cannot be used with the --files option"
14819msgstr "选项 --cached 不能和选项 --files 同时使用"
14820
14821#: git-submodule.sh:893
14822#, sh-format
14823msgid "unexpected mode $mod_dst"
14824msgstr "意外的模式 $mod_dst"
14825
14826#  译者:注意保持前导空格
14827#: git-submodule.sh:913
14828#, sh-format
14829msgid "  Warn: $display_name doesn't contain commit $sha1_src"
14830msgstr "  警告:$display_name 未包含提交 $sha1_src"
14831
14832#  译者:注意保持前导空格
14833#: git-submodule.sh:916
14834#, sh-format
14835msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
14836msgstr "  警告:$display_name 未包含提交 $sha1_dst"
14837
14838#  译者:注意保持前导空格
14839#: git-submodule.sh:919
14840#, sh-format
14841msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
14842msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
14843
14844#: git-submodule.sh:1065
14845#, sh-format
14846msgid "Failed to recurse into submodule path '$sm_path'"
14847msgstr "无法递归进子模组路径 '$sm_path'"
14848
14849#: git-submodule.sh:1137
14850#, sh-format
14851msgid "Synchronizing submodule url for '$displaypath'"
14852msgstr "为 '$displaypath' 同步子模组 url"
14853
14854#: git-parse-remote.sh:89
14855#, sh-format
14856msgid "See git-${cmd}(1) for details."
14857msgstr "详见 git-${cmd}(1)。"
14858
14859#: git-rebase--interactive.sh:140
14860#, sh-format
14861msgid "Rebasing ($new_count/$total)"
14862msgstr "变基中($new_count/$total)"
14863
14864#: git-rebase--interactive.sh:156
14865msgid ""
14866"\n"
14867"Commands:\n"
14868" p, pick = use commit\n"
14869" r, reword = use commit, but edit the commit message\n"
14870" e, edit = use commit, but stop for amending\n"
14871" s, squash = use commit, but meld into previous commit\n"
14872" f, fixup = like \"squash\", but discard this commit's log message\n"
14873" x, exec = run command (the rest of the line) using shell\n"
14874" d, drop = remove commit\n"
14875"\n"
14876"These lines can be re-ordered; they are executed from top to bottom.\n"
14877msgstr ""
14878"\n"
14879"命令:\n"
14880" p, pick = 使用提交\n"
14881" r, reword = 使用提交,但修改提交说明\n"
14882" e, edit = 使用提交,但停止以便进行提交修补\n"
14883" s, squash = 使用提交,但和前一个版本融合\n"
14884" f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
14885" x, exec = 使用 shell 运行命令(此行剩余部分)\n"
14886" d, drop = 删除提交\n"
14887"\n"
14888"这些行可以被重新排序;它们会被从上至下地执行。\n"
14889"\n"
14890
14891#: git-rebase--interactive.sh:171
14892msgid ""
14893"\n"
14894"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
14895msgstr ""
14896"\n"
14897"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
14898
14899#: git-rebase--interactive.sh:175
14900msgid ""
14901"\n"
14902"If you remove a line here THAT COMMIT WILL BE LOST.\n"
14903msgstr ""
14904"\n"
14905"如果您在这里删除一行,对应的提交将会丢失。\n"
14906
14907#: git-rebase--interactive.sh:211
14908#, sh-format
14909msgid ""
14910"You can amend the commit now, with\n"
14911"\n"
14912"\tgit commit --amend $gpg_sign_opt_quoted\n"
14913"\n"
14914"Once you are satisfied with your changes, run\n"
14915"\n"
14916"\tgit rebase --continue"
14917msgstr ""
14918"您现在可以修补这个提交,使用\n"
14919"\n"
14920"\tgit commit --amend $gpg_sign_opt_quoted\n"
14921"\n"
14922"当您对变更感到满意,执行\n"
14923"\n"
14924"\tgit rebase --continue"
14925
14926#: git-rebase--interactive.sh:236
14927#, sh-format
14928msgid "$sha1: not a commit that can be picked"
14929msgstr "$sha1:不是一个可以被拣选的提交"
14930
14931#: git-rebase--interactive.sh:275
14932#, sh-format
14933msgid "Invalid commit name: $sha1"
14934msgstr "无效的提交名:$sha1"
14935
14936#: git-rebase--interactive.sh:317
14937msgid "Cannot write current commit's replacement sha1"
14938msgstr "不能写入当前提交的替代 sha1"
14939
14940#: git-rebase--interactive.sh:369
14941#, sh-format
14942msgid "Fast-forward to $sha1"
14943msgstr "快进到 $sha1"
14944
14945#: git-rebase--interactive.sh:371
14946#, sh-format
14947msgid "Cannot fast-forward to $sha1"
14948msgstr "不能快进到 $sha1"
14949
14950#: git-rebase--interactive.sh:380
14951#, sh-format
14952msgid "Cannot move HEAD to $first_parent"
14953msgstr "不能移动 HEAD 到 $first_parent"
14954
14955#: git-rebase--interactive.sh:385
14956#, sh-format
14957msgid "Refusing to squash a merge: $sha1"
14958msgstr "拒绝压缩一个合并:$sha1"
14959
14960#: git-rebase--interactive.sh:399
14961#, sh-format
14962msgid "Error redoing merge $sha1"
14963msgstr "无法重做合并 $sha1"
14964
14965#: git-rebase--interactive.sh:407
14966#, sh-format
14967msgid "Could not pick $sha1"
14968msgstr "不能拣选 $sha1"
14969
14970#: git-rebase--interactive.sh:416
14971#, sh-format
14972msgid "This is the commit message #${n}:"
14973msgstr "这是提交说明 #${n}:"
14974
14975#: git-rebase--interactive.sh:421
14976#, sh-format
14977msgid "The commit message #${n} will be skipped:"
14978msgstr "提交说明 #${n} 将被跳过:"
14979
14980#: git-rebase--interactive.sh:432
14981#, sh-format
14982msgid "This is a combination of $count commit."
14983msgid_plural "This is a combination of $count commits."
14984msgstr[0] "这是一个 $count 个提交的组合。"
14985msgstr[1] "这是一个 $count 个提交的组合。"
14986
14987#: git-rebase--interactive.sh:441
14988#, sh-format
14989msgid "Cannot write $fixup_msg"
14990msgstr "不能写入 $fixup_msg"
14991
14992#: git-rebase--interactive.sh:444
14993msgid "This is a combination of 2 commits."
14994msgstr "这是一个 2 个提交的组合。"
14995
14996#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
14997#: git-rebase--interactive.sh:531
14998#, sh-format
14999msgid "Could not apply $sha1... $rest"
15000msgstr "不能应用 $sha1... $rest"
15001
15002#: git-rebase--interactive.sh:559
15003#, sh-format
15004msgid ""
15005"Could not amend commit after successfully picking $sha1... $rest\n"
15006"This is most likely due to an empty commit message, or the pre-commit hook\n"
15007"failed. If the pre-commit hook failed, you may need to resolve the issue "
15008"before\n"
15009"you are able to reword the commit."
15010msgstr ""
15011"不能在成功拣选 $sha1... $rest 之后修补提交\n"
15012"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
15013"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
15014
15015#: git-rebase--interactive.sh:574
15016#, sh-format
15017msgid "Stopped at $sha1_abbrev... $rest"
15018msgstr "停止在 $sha1_abbrev... $rest"
15019
15020#: git-rebase--interactive.sh:589
15021#, sh-format
15022msgid "Cannot '$squash_style' without a previous commit"
15023msgstr "没有父提交的情况下不能 '$squash_style'"
15024
15025#: git-rebase--interactive.sh:631
15026#, sh-format
15027msgid "Executing: $rest"
15028msgstr "执行:$rest"
15029
15030#: git-rebase--interactive.sh:639
15031#, sh-format
15032msgid "Execution failed: $rest"
15033msgstr "执行失败:$rest"
15034
15035#: git-rebase--interactive.sh:641
15036msgid "and made changes to the index and/or the working tree"
15037msgstr "并且修改索引和/或工作区"
15038
15039#  译者:注意保持前导空格
15040#: git-rebase--interactive.sh:643
15041msgid ""
15042"You can fix the problem, and then run\n"
15043"\n"
15044"\tgit rebase --continue"
15045msgstr ""
15046"您可以解决这个问题,然后运行\n"
15047"\n"
15048"\tgit rebase --continue"
15049
15050#. TRANSLATORS: after these lines is a command to be issued by the user
15051#: git-rebase--interactive.sh:656
15052#, sh-format
15053msgid ""
15054"Execution succeeded: $rest\n"
15055"but left changes to the index and/or the working tree\n"
15056"Commit or stash your changes, and then run\n"
15057"\n"
15058"\tgit rebase --continue"
15059msgstr ""
15060"执行成功:$rest\n"
15061"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
15062"\n"
15063"\tgit rebase --continue"
15064
15065#: git-rebase--interactive.sh:667
15066#, sh-format
15067msgid "Unknown command: $command $sha1 $rest"
15068msgstr "未知命令:$command $sha1 $rest"
15069
15070#: git-rebase--interactive.sh:668
15071msgid "Please fix this using 'git rebase --edit-todo'."
15072msgstr "要修改请使用命令 'git rebase --edit-todo'。"
15073
15074#: git-rebase--interactive.sh:703
15075#, sh-format
15076msgid "Successfully rebased and updated $head_name."
15077msgstr "成功变基并更新 $head_name。"
15078
15079#: git-rebase--interactive.sh:750
15080msgid "Could not skip unnecessary pick commands"
15081msgstr "不能跳过不必要的拣选命令"
15082
15083#: git-rebase--interactive.sh:908
15084#, sh-format
15085msgid ""
15086"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
15087" - $line"
15088msgstr ""
15089"警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
15090" - $line"
15091
15092#: git-rebase--interactive.sh:941
15093#, sh-format
15094msgid ""
15095"Warning: the command isn't recognized in the following line:\n"
15096" - $line"
15097msgstr ""
15098"警告:下面一行中的命令未能被识别:\n"
15099" - $line"
15100
15101#: git-rebase--interactive.sh:980
15102msgid "could not detach HEAD"
15103msgstr "不能检出为分离头指针"
15104
15105#: git-rebase--interactive.sh:1018
15106msgid ""
15107"Warning: some commits may have been dropped accidentally.\n"
15108"Dropped commits (newer to older):"
15109msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
15110
15111#: git-rebase--interactive.sh:1026
15112msgid ""
15113"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
15114"\n"
15115"Use 'git config rebase.missingCommitsCheck' to change the level of "
15116"warnings.\n"
15117"The possible behaviours are: ignore, warn, error."
15118msgstr ""
15119"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
15120"\n"
15121"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
15122"可选值有:ignore、warn、error。"
15123
15124#: git-rebase--interactive.sh:1037
15125#, sh-format
15126msgid ""
15127"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
15128"Ignoring."
15129msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
15130
15131#: git-rebase--interactive.sh:1054
15132msgid ""
15133"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
15134"continue'."
15135msgstr ""
15136"您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"
15137
15138#: git-rebase--interactive.sh:1055
15139msgid "Or you can abort the rebase with 'git rebase --abort'."
15140msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
15141
15142#: git-rebase--interactive.sh:1083
15143msgid "Could not remove CHERRY_PICK_HEAD"
15144msgstr "不能删除 CHERRY_PICK_HEAD"
15145
15146#: git-rebase--interactive.sh:1088
15147#, sh-format
15148msgid ""
15149"You have staged changes in your working tree.\n"
15150"If these changes are meant to be\n"
15151"squashed into the previous commit, run:\n"
15152"\n"
15153"  git commit --amend $gpg_sign_opt_quoted\n"
15154"\n"
15155"If they are meant to go into a new commit, run:\n"
15156"\n"
15157"  git commit $gpg_sign_opt_quoted\n"
15158"\n"
15159"In both cases, once you're done, continue with:\n"
15160"\n"
15161"  git rebase --continue\n"
15162msgstr ""
15163"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
15164"\n"
15165"  git commit --amend $gpg_sign_opt_quoted\n"
15166"\n"
15167"如果这些变更要形成一个新提交,执行:\n"
15168"\n"
15169"  git commit $gpg_sign_opt_quoted\n"
15170"\n"
15171"无论哪种情况,当您完成提交,继续执行:\n"
15172"\n"
15173"  git rebase --continue\n"
15174
15175#: git-rebase--interactive.sh:1105
15176msgid "Error trying to find the author identity to amend commit"
15177msgstr "在修补提交中查找作者信息时遇到错误"
15178
15179#: git-rebase--interactive.sh:1110
15180msgid ""
15181"You have uncommitted changes in your working tree. Please commit them\n"
15182"first and then run 'git rebase --continue' again."
15183msgstr ""
15184"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
15185
15186#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
15187msgid "Could not commit staged changes."
15188msgstr "不能提交暂存的修改。"
15189
15190#: git-rebase--interactive.sh:1147
15191msgid ""
15192"\n"
15193"You are editing the todo file of an ongoing interactive rebase.\n"
15194"To continue rebase after editing, run:\n"
15195"    git rebase --continue\n"
15196"\n"
15197msgstr ""
15198"\n"
15199"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
15200"请执行:\n"
15201"    git rebase --continue\n"
15202"\n"
15203
15204#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
15205msgid "Could not execute editor"
15206msgstr "无法运行编辑器"
15207
15208#: git-rebase--interactive.sh:1168
15209#, sh-format
15210msgid "Could not checkout $switch_to"
15211msgstr "不能检出 $switch_to"
15212
15213#: git-rebase--interactive.sh:1173
15214msgid "No HEAD?"
15215msgstr "没有 HEAD?"
15216
15217#: git-rebase--interactive.sh:1174
15218#, sh-format
15219msgid "Could not create temporary $state_dir"
15220msgstr "不能创建临时 $state_dir"
15221
15222#: git-rebase--interactive.sh:1176
15223msgid "Could not mark as interactive"
15224msgstr "不能标记为交互式"
15225
15226#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
15227msgid "Could not init rewritten commits"
15228msgstr "不能对重写提交进行初始化"
15229
15230#: git-rebase--interactive.sh:1291
15231#, sh-format
15232msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
15233msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
15234msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15235msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15236
15237#: git-rebase--interactive.sh:1296
15238msgid ""
15239"\n"
15240"However, if you remove everything, the rebase will be aborted.\n"
15241"\n"
15242msgstr ""
15243"\n"
15244"然而,如果您删除全部内容,变基操作将会终止。\n"
15245"\n"
15246
15247#: git-rebase--interactive.sh:1303
15248msgid "Note that empty commits are commented out"
15249msgstr "注意空提交已被注释掉"
15250
15251#: git-sh-setup.sh:89 git-sh-setup.sh:94
15252#, sh-format
15253msgid "usage: $dashless $USAGE"
15254msgstr "用法:$dashless $USAGE"
15255
15256#: git-sh-setup.sh:190
15257#, sh-format
15258msgid "Cannot chdir to $cdup, the toplevel of the working tree"
15259msgstr "不能切换目录到 $cdup,工作区的顶级目录"
15260
15261#: git-sh-setup.sh:199 git-sh-setup.sh:206
15262#, sh-format
15263msgid "fatal: $program_name cannot be used without a working tree."
15264msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
15265
15266#: git-sh-setup.sh:220
15267msgid "Cannot rebase: You have unstaged changes."
15268msgstr "不能变基:您有未暂存的变更。"
15269
15270#: git-sh-setup.sh:223
15271msgid "Cannot rewrite branches: You have unstaged changes."
15272msgstr "不能重写分支:您有未暂存的变更。"
15273
15274#: git-sh-setup.sh:226
15275msgid "Cannot pull with rebase: You have unstaged changes."
15276msgstr "无法通过变基方式拉取:您有未暂存的变更。"
15277
15278#: git-sh-setup.sh:229
15279#, sh-format
15280msgid "Cannot $action: You have unstaged changes."
15281msgstr "不能 $action:您有未暂存的变更。"
15282
15283#: git-sh-setup.sh:242
15284msgid "Cannot rebase: Your index contains uncommitted changes."
15285msgstr "不能变基:您的索引中包含未提交的变更。"
15286
15287#: git-sh-setup.sh:245
15288msgid "Cannot pull with rebase: Your index contains uncommitted changes."
15289msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
15290
15291#: git-sh-setup.sh:248
15292#, sh-format
15293msgid "Cannot $action: Your index contains uncommitted changes."
15294msgstr "不能 $action:您的索引中包含未提交的变更。"
15295
15296#: git-sh-setup.sh:252
15297msgid "Additionally, your index contains uncommitted changes."
15298msgstr "而且您的索引中包含未提交的变更。"
15299
15300#: git-sh-setup.sh:372
15301msgid "You need to run this command from the toplevel of the working tree."
15302msgstr "您需要在工作区的顶级目录中运行这个命令。"
15303
15304#: git-sh-setup.sh:377
15305msgid "Unable to determine absolute path of git directory"
15306msgstr "不能确定 git 目录的绝对路径"
15307
15308#. TRANSLATORS: you can adjust this to align "git add -i" status menu
15309#: git-add--interactive.perl:196
15310#, perl-format
15311msgid "%12s %12s %s"
15312msgstr "%12s %12s %s"
15313
15314#: git-add--interactive.perl:197
15315msgid "staged"
15316msgstr "缓存"
15317
15318#: git-add--interactive.perl:197
15319msgid "unstaged"
15320msgstr "未缓存"
15321
15322#: git-add--interactive.perl:246 git-add--interactive.perl:271
15323msgid "binary"
15324msgstr "二进制"
15325
15326#: git-add--interactive.perl:255 git-add--interactive.perl:309
15327msgid "nothing"
15328msgstr "无"
15329
15330#: git-add--interactive.perl:291 git-add--interactive.perl:306
15331msgid "unchanged"
15332msgstr "没有修改"
15333
15334#: git-add--interactive.perl:602
15335#, perl-format
15336msgid "added %d path\n"
15337msgid_plural "added %d paths\n"
15338msgstr[0] "增加了 %d 个路径\n"
15339msgstr[1] "增加了 %d 个路径\n"
15340
15341#: git-add--interactive.perl:605
15342#, perl-format
15343msgid "updated %d path\n"
15344msgid_plural "updated %d paths\n"
15345msgstr[0] "更新了 %d 个路径\n"
15346msgstr[1] "更新了 %d 个路径\n"
15347
15348#: git-add--interactive.perl:608
15349#, perl-format
15350msgid "reverted %d path\n"
15351msgid_plural "reverted %d paths\n"
15352msgstr[0] "还原了 %d 个路径\n"
15353msgstr[1] "还原了 %d 个路径\n"
15354
15355#: git-add--interactive.perl:611
15356#, perl-format
15357msgid "touched %d path\n"
15358msgid_plural "touched %d paths\n"
15359msgstr[0] "触碰了 %d 个路径\n"
15360msgstr[1] "触碰了 %d 个路径\n"
15361
15362#: git-add--interactive.perl:620
15363msgid "Update"
15364msgstr "更新"
15365
15366#: git-add--interactive.perl:632
15367msgid "Revert"
15368msgstr "还原"
15369
15370#: git-add--interactive.perl:655
15371#, perl-format
15372msgid "note: %s is untracked now.\n"
15373msgstr "说明:%s 现已成为未跟踪的。\n"
15374
15375#: git-add--interactive.perl:666
15376msgid "Add untracked"
15377msgstr "添加未跟踪的"
15378
15379#: git-add--interactive.perl:672
15380msgid "No untracked files.\n"
15381msgstr "没有未跟踪的文件。\n"
15382
15383#: git-add--interactive.perl:985
15384msgid ""
15385"If the patch applies cleanly, the edited hunk will immediately be\n"
15386"marked for staging."
15387msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
15388
15389#: git-add--interactive.perl:988
15390msgid ""
15391"If the patch applies cleanly, the edited hunk will immediately be\n"
15392"marked for stashing."
15393msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
15394
15395#: git-add--interactive.perl:991
15396msgid ""
15397"If the patch applies cleanly, the edited hunk will immediately be\n"
15398"marked for unstaging."
15399msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
15400
15401#: git-add--interactive.perl:994 git-add--interactive.perl:1003
15402msgid ""
15403"If the patch applies cleanly, the edited hunk will immediately be\n"
15404"marked for applying."
15405msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
15406
15407#: git-add--interactive.perl:997 git-add--interactive.perl:1000
15408msgid ""
15409"If the patch applies cleanly, the edited hunk will immediately be\n"
15410"marked for discarding."
15411msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
15412
15413#: git-add--interactive.perl:1013
15414#, perl-format
15415msgid "failed to open hunk edit file for writing: %s"
15416msgstr "无法写入块编辑文件:%s"
15417
15418#: git-add--interactive.perl:1014
15419msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
15420msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
15421
15422#: git-add--interactive.perl:1020
15423#, perl-format
15424msgid ""
15425"---\n"
15426"To remove '%s' lines, make them ' ' lines (context).\n"
15427"To remove '%s' lines, delete them.\n"
15428"Lines starting with %s will be removed.\n"
15429msgstr ""
15430"---\n"
15431"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
15432"要删除 '%s' 开始的行,删除它们。\n"
15433"以 %s 开始的行将被删除。\n"
15434
15435#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
15436#: git-add--interactive.perl:1028
15437msgid ""
15438"If it does not apply cleanly, you will be given an opportunity to\n"
15439"edit again.  If all lines of the hunk are removed, then the edit is\n"
15440"aborted and the hunk is left unchanged.\n"
15441msgstr ""
15442"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
15443"此次编辑被终止,该块不会被修改。\n"
15444
15445#: git-add--interactive.perl:1042
15446#, perl-format
15447msgid "failed to open hunk edit file for reading: %s"
15448msgstr "无法读取块编辑文件:%s"
15449
15450#. TRANSLATORS: do not translate [y/n]
15451#. The program will only accept that input
15452#. at this point.
15453#. Consider translating (saying "no" discards!) as
15454#. (saying "n" for "no" discards!) if the translation
15455#. of the word "no" does not start with n.
15456#: git-add--interactive.perl:1134
15457msgid ""
15458"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
15459msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
15460
15461#: git-add--interactive.perl:1143
15462msgid ""
15463"y - stage this hunk\n"
15464"n - do not stage this hunk\n"
15465"q - quit; do not stage this hunk or any of the remaining ones\n"
15466"a - stage this hunk and all later hunks in the file\n"
15467"d - do not stage this hunk or any of the later hunks in the file"
15468msgstr ""
15469"y - 暂存该块\n"
15470"n - 不要暂存该块\n"
15471"q - 退出。不暂存该块及后面的全部块\n"
15472"a - 暂存该块和本文件中后面的全部块\n"
15473"d - 不暂存该块和本文件中后面的全部块"
15474
15475#: git-add--interactive.perl:1149
15476msgid ""
15477"y - stash this hunk\n"
15478"n - do not stash this hunk\n"
15479"q - quit; do not stash this hunk or any of the remaining ones\n"
15480"a - stash this hunk and all later hunks in the file\n"
15481"d - do not stash this hunk or any of the later hunks in the file"
15482msgstr ""
15483"y - 贮藏该块\n"
15484"n - 不要贮藏该块\n"
15485"q - 退出。不贮藏该块及后面的全部块\n"
15486"a - 贮藏该块和本文件中后面的全部块\n"
15487"d - 不贮藏该块和本文件中后面的全部块"
15488
15489#: git-add--interactive.perl:1155
15490msgid ""
15491"y - unstage this hunk\n"
15492"n - do not unstage this hunk\n"
15493"q - quit; do not unstage this hunk or any of the remaining ones\n"
15494"a - unstage this hunk and all later hunks in the file\n"
15495"d - do not unstage this hunk or any of the later hunks in the file"
15496msgstr ""
15497"y - 不暂存该块\n"
15498"n - 不要不暂存该块\n"
15499"q - 退出。不要不暂存该块及后面的全部块\n"
15500"a - 不暂存该块和本文件中后面的全部块\n"
15501"d - 不要不暂存该块和本文件中后面的全部块"
15502
15503#: git-add--interactive.perl:1161
15504msgid ""
15505"y - apply this hunk to index\n"
15506"n - do not apply this hunk to index\n"
15507"q - quit; do not apply this hunk or any of the remaining ones\n"
15508"a - apply this hunk and all later hunks in the file\n"
15509"d - do not apply this hunk or any of the later hunks in the file"
15510msgstr ""
15511"y - 在索引中应用该块\n"
15512"n - 不要在索引中应用该块\n"
15513"q - 退出。不要应用该块及后面的全部块\n"
15514"a - 应用该块和本文件中后面的全部块\n"
15515"d - 不要应用该块和本文件中后面的全部块"
15516
15517#: git-add--interactive.perl:1167
15518msgid ""
15519"y - discard this hunk from worktree\n"
15520"n - do not discard this hunk from worktree\n"
15521"q - quit; do not discard this hunk or any of the remaining ones\n"
15522"a - discard this hunk and all later hunks in the file\n"
15523"d - do not discard this hunk or any of the later hunks in the file"
15524msgstr ""
15525"y - 在工作区中丢弃该块\n"
15526"n - 不要在工作区中丢弃该块\n"
15527"q - 退出。不要丢弃该块及后面的全部块\n"
15528"a - 丢弃该块和本文件中后面的全部块\n"
15529"d - 不要丢弃该块和本文件中后面的全部块"
15530
15531#: git-add--interactive.perl:1173
15532msgid ""
15533"y - discard this hunk from index and worktree\n"
15534"n - do not discard this hunk from index and worktree\n"
15535"q - quit; do not discard this hunk or any of the remaining ones\n"
15536"a - discard this hunk and all later hunks in the file\n"
15537"d - do not discard this hunk or any of the later hunks in the file"
15538msgstr ""
15539"y - 在索引和工作区中丢弃该块\n"
15540"n - 不要在索引和工作区中丢弃该块\n"
15541"q - 退出。不要丢弃该块及后面的全部块\n"
15542"a - 丢弃该块和本文件中后面的全部块\n"
15543"d - 不要丢弃该块和本文件中后面的全部块"
15544
15545#: git-add--interactive.perl:1179
15546msgid ""
15547"y - apply this hunk to index and worktree\n"
15548"n - do not apply this hunk to index and worktree\n"
15549"q - quit; do not apply this hunk or any of the remaining ones\n"
15550"a - apply this hunk and all later hunks in the file\n"
15551"d - do not apply this hunk or any of the later hunks in the file"
15552msgstr ""
15553"y - 在索引和工作区中应用该块\n"
15554"n - 不要在索引和工作区中应用该块\n"
15555"q - 退出。不要应用该块及后面的全部块\n"
15556"a - 应用该块和本文件中后面的全部块\n"
15557"d - 不要应用该块和本文件中后面的全部块"
15558
15559#: git-add--interactive.perl:1188
15560msgid ""
15561"g - select a hunk to go to\n"
15562"/ - search for a hunk matching the given regex\n"
15563"j - leave this hunk undecided, see next undecided hunk\n"
15564"J - leave this hunk undecided, see next hunk\n"
15565"k - leave this hunk undecided, see previous undecided hunk\n"
15566"K - leave this hunk undecided, see previous hunk\n"
15567"s - split the current hunk into smaller hunks\n"
15568"e - manually edit the current hunk\n"
15569"? - print help\n"
15570msgstr ""
15571"g - 选择跳转到一个块\n"
15572"/ - 查找和给定正则表达式匹配的块\n"
15573"j - 维持该块未决状态,查看下一个未决块\n"
15574"J - 维持该块未决状态,查看下一个块\n"
15575"k - 维持该块未决状态,查看上一个未决块\n"
15576"K - 维持该块未决状态,查看上一个块\n"
15577"s - 拆分当前块为更小的块\n"
15578"e - 手动编辑当前块\n"
15579"? - 显示帮助\n"
15580
15581#: git-add--interactive.perl:1219
15582msgid "The selected hunks do not apply to the index!\n"
15583msgstr "选中的块不能应用到索引!\n"
15584
15585#: git-add--interactive.perl:1220
15586msgid "Apply them to the worktree anyway? "
15587msgstr "无论如何都要应用到工作区么?"
15588
15589#: git-add--interactive.perl:1223
15590msgid "Nothing was applied.\n"
15591msgstr "未应用。\n"
15592
15593#: git-add--interactive.perl:1234
15594#, perl-format
15595msgid "ignoring unmerged: %s\n"
15596msgstr "忽略未合入的:%s\n"
15597
15598#: git-add--interactive.perl:1243
15599msgid "Only binary files changed.\n"
15600msgstr "只有二进制文件被修改。\n"
15601
15602#: git-add--interactive.perl:1245
15603msgid "No changes.\n"
15604msgstr "没有修改。\n"
15605
15606#: git-add--interactive.perl:1253
15607msgid "Patch update"
15608msgstr "补丁更新"
15609
15610#: git-add--interactive.perl:1305
15611#, perl-format
15612msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
15613msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
15614
15615#: git-add--interactive.perl:1306
15616#, perl-format
15617msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
15618msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
15619
15620#: git-add--interactive.perl:1307
15621#, perl-format
15622msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
15623msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
15624
15625#: git-add--interactive.perl:1310
15626#, perl-format
15627msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
15628msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
15629
15630#: git-add--interactive.perl:1311
15631#, perl-format
15632msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
15633msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
15634
15635#: git-add--interactive.perl:1312
15636#, perl-format
15637msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
15638msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
15639
15640#: git-add--interactive.perl:1315
15641#, perl-format
15642msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
15643msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
15644
15645#: git-add--interactive.perl:1316
15646#, perl-format
15647msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
15648msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
15649
15650#: git-add--interactive.perl:1317
15651#, perl-format
15652msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
15653msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
15654
15655#: git-add--interactive.perl:1320
15656#, perl-format
15657msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
15658msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
15659
15660#: git-add--interactive.perl:1321
15661#, perl-format
15662msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
15663msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
15664
15665#: git-add--interactive.perl:1322
15666#, perl-format
15667msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
15668msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
15669
15670#: git-add--interactive.perl:1325
15671#, perl-format
15672msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
15673msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15674
15675#: git-add--interactive.perl:1326
15676#, perl-format
15677msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
15678msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15679
15680#: git-add--interactive.perl:1327
15681#, perl-format
15682msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
15683msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15684
15685#: git-add--interactive.perl:1330
15686#, perl-format
15687msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
15688msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15689
15690#: git-add--interactive.perl:1331
15691#, perl-format
15692msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
15693msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15694
15695#: git-add--interactive.perl:1332
15696#, perl-format
15697msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
15698msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15699
15700#: git-add--interactive.perl:1335
15701#, perl-format
15702msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
15703msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
15704
15705#: git-add--interactive.perl:1336
15706#, perl-format
15707msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
15708msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
15709
15710#: git-add--interactive.perl:1337
15711#, perl-format
15712msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
15713msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
15714
15715#: git-add--interactive.perl:1440
15716msgid "go to which hunk (<ret> to see more)? "
15717msgstr "跳转到哪个块(<回车> 查看更多)? "
15718
15719#: git-add--interactive.perl:1442
15720msgid "go to which hunk? "
15721msgstr "跳转到哪个块?"
15722
15723#: git-add--interactive.perl:1451
15724#, perl-format
15725msgid "Invalid number: '%s'\n"
15726msgstr "无效数字:'%s'\n"
15727
15728#: git-add--interactive.perl:1456
15729#, perl-format
15730msgid "Sorry, only %d hunk available.\n"
15731msgid_plural "Sorry, only %d hunks available.\n"
15732msgstr[0] "对不起,只有 %d 个可用块。\n"
15733msgstr[1] "对不起,只有 %d 个可用块。\n"
15734
15735#: git-add--interactive.perl:1482
15736msgid "search for regex? "
15737msgstr "使用正则表达式搜索?"
15738
15739#: git-add--interactive.perl:1495
15740#, perl-format
15741msgid "Malformed search regexp %s: %s\n"
15742msgstr "错误的正则表达式 %s:%s\n"
15743
15744#: git-add--interactive.perl:1505
15745msgid "No hunk matches the given pattern\n"
15746msgstr "没有和给定模式相匹配的快\n"
15747
15748#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
15749msgid "No previous hunk\n"
15750msgstr "没有前一个块\n"
15751
15752#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
15753msgid "No next hunk\n"
15754msgstr "没有下一个块\n"
15755
15756#: git-add--interactive.perl:1553
15757#, perl-format
15758msgid "Split into %d hunk.\n"
15759msgid_plural "Split into %d hunks.\n"
15760msgstr[0] "拆分为 %d 块。\n"
15761msgstr[1] "拆分为 %d 块。\n"
15762
15763#: git-add--interactive.perl:1605
15764msgid "Review diff"
15765msgstr "检视 diff"
15766
15767#. TRANSLATORS: please do not translate the command names
15768#. 'status', 'update', 'revert', etc.
15769#: git-add--interactive.perl:1624
15770msgid ""
15771"status        - show paths with changes\n"
15772"update        - add working tree state to the staged set of changes\n"
15773"revert        - revert staged set of changes back to the HEAD version\n"
15774"patch         - pick hunks and update selectively\n"
15775"diff          - view diff between HEAD and index\n"
15776"add untracked - add contents of untracked files to the staged set of "
15777"changes\n"
15778msgstr ""
15779"status        - 显示含变更的路径\n"
15780"update        - 添加工作区状态至暂存列表\n"
15781"revert        - 还原修改的暂存集至 HEAD 版本\n"
15782"patch         - 挑选块并且有选择地更新\n"
15783"diff          - 显示 HEAD 和索引间差异\n"
15784"add untracked - 添加未跟踪文件的内容至暂存列表\n"
15785
15786#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
15787#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
15788#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
15789msgid "missing --"
15790msgstr "缺失 --"
15791
15792#: git-add--interactive.perl:1662
15793#, perl-format
15794msgid "unknown --patch mode: %s"
15795msgstr "未知的 --patch 模式:%s"
15796
15797#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
15798#, perl-format
15799msgid "invalid argument %s, expecting --"
15800msgstr "无效的参数 %s,期望是 --"
15801
15802#: git-send-email.perl:126
15803msgid "local zone differs from GMT by a non-minute interval\n"
15804msgstr "本地时间和 GMT 有不到一分钟间隔\n"
15805
15806#: git-send-email.perl:133 git-send-email.perl:139
15807msgid "local time offset greater than or equal to 24 hours\n"
15808msgstr "本地时间偏移量大于等于 24 小时\n"
15809
15810#: git-send-email.perl:208 git-send-email.perl:214
15811msgid "the editor exited uncleanly, aborting everything"
15812msgstr "编辑器非正常退出,终止所有操作"
15813
15814#: git-send-email.perl:291
15815#, perl-format
15816msgid ""
15817"'%s' contains an intermediate version of the email you were composing.\n"
15818msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
15819
15820#: git-send-email.perl:296
15821#, perl-format
15822msgid "'%s.final' contains the composed email.\n"
15823msgstr "'%s.final' 包含编辑的邮件。\n"
15824
15825#: git-send-email.perl:314
15826msgid "--dump-aliases incompatible with other options\n"
15827msgstr "--dump-aliases 和其它选项不兼容\n"
15828
15829#: git-send-email.perl:379 git-send-email.perl:634
15830msgid "Cannot run git format-patch from outside a repository\n"
15831msgstr "不能在仓库之外运行 git format-patch\n"
15832
15833#: git-send-email.perl:448
15834#, perl-format
15835msgid "Unknown --suppress-cc field: '%s'\n"
15836msgstr "未知的 --suppress-cc 字段:'%s'\n"
15837
15838#: git-send-email.perl:477
15839#, perl-format
15840msgid "Unknown --confirm setting: '%s'\n"
15841msgstr "未知的 --confirm 设置:'%s'\n"
15842
15843#: git-send-email.perl:509
15844#, perl-format
15845msgid "warning: sendmail alias with quotes is not supported: %s\n"
15846msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
15847
15848#: git-send-email.perl:511
15849#, perl-format
15850msgid "warning: `:include:` not supported: %s\n"
15851msgstr "警告:不支持 `:include:`:%s\n"
15852
15853#: git-send-email.perl:513
15854#, perl-format
15855msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
15856msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
15857
15858#: git-send-email.perl:518
15859#, perl-format
15860msgid "warning: sendmail line is not recognized: %s\n"
15861msgstr "警告:不能识别的 sendmail 行:%s\n"
15862
15863#: git-send-email.perl:600
15864#, perl-format
15865msgid ""
15866"File '%s' exists but it could also be the range of commits\n"
15867"to produce patches for.  Please disambiguate by...\n"
15868"\n"
15869"    * Saying \"./%s\" if you mean a file; or\n"
15870"    * Giving --format-patch option if you mean a range.\n"
15871msgstr ""
15872"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
15873"歧义:\n"
15874"\n"
15875"    * 如果含义为一个文件,使用 \"./%s\",或者\n"
15876"    * 如果含义为一个范围,使用 --format-patch 选项。\n"
15877
15878#: git-send-email.perl:621
15879#, perl-format
15880msgid "Failed to opendir %s: %s"
15881msgstr "无法打开目录 %s: %s"
15882
15883#: git-send-email.perl:645
15884#, perl-format
15885msgid ""
15886"fatal: %s: %s\n"
15887"warning: no patches were sent\n"
15888msgstr ""
15889"严重:%s:%s\n"
15890"警告:补丁未能发送\n"
15891
15892#: git-send-email.perl:656
15893msgid ""
15894"\n"
15895"No patch files specified!\n"
15896"\n"
15897msgstr ""
15898"\n"
15899"未指定补丁文件!\n"
15900"\n"
15901
15902#: git-send-email.perl:669
15903#, perl-format
15904msgid "No subject line in %s?"
15905msgstr "在 %s 中没有标题行?"
15906
15907#: git-send-email.perl:679
15908#, perl-format
15909msgid "Failed to open for writing %s: %s"
15910msgstr "无法写入 %s: %s"
15911
15912#: git-send-email.perl:689
15913msgid ""
15914"Lines beginning in \"GIT:\" will be removed.\n"
15915"Consider including an overall diffstat or table of contents\n"
15916"for the patch you are writing.\n"
15917"\n"
15918"Clear the body content if you don't wish to send a summary.\n"
15919msgstr ""
15920"以 \"GIT:\" 开头的行将被删除。\n"
15921"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
15922"\n"
15923"如果您不想发送摘要,清除内容。\n"
15924
15925#: git-send-email.perl:712
15926#, perl-format
15927msgid "Failed to open %s.final: %s"
15928msgstr "无法打开 %s.final: %s"
15929
15930#: git-send-email.perl:715
15931#, perl-format
15932msgid "Failed to open %s: %s"
15933msgstr "无法打开 %s: %s"
15934
15935#: git-send-email.perl:750
15936msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
15937msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
15938
15939#: git-send-email.perl:759
15940msgid "Summary email is empty, skipping it\n"
15941msgstr "摘要邮件为空,跳过\n"
15942
15943#. TRANSLATORS: please keep [y/N] as is.
15944#: git-send-email.perl:791
15945#, perl-format
15946msgid "Are you sure you want to use <%s> [y/N]? "
15947msgstr "您确认要使用 <%s> [y/N]?"
15948
15949#: git-send-email.perl:820
15950msgid ""
15951"The following files are 8bit, but do not declare a Content-Transfer-"
15952"Encoding.\n"
15953msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
15954
15955#: git-send-email.perl:825
15956msgid "Which 8bit encoding should I declare [UTF-8]? "
15957msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
15958
15959#: git-send-email.perl:833
15960#, perl-format
15961msgid ""
15962"Refusing to send because the patch\n"
15963"\t%s\n"
15964"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
15965"want to send.\n"
15966msgstr ""
15967"拒绝发送,因为补丁\n"
15968"\t%s\n"
15969"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
15970
15971#: git-send-email.perl:852
15972msgid "To whom should the emails be sent (if anyone)?"
15973msgstr "邮件将要发送给谁?"
15974
15975#: git-send-email.perl:870
15976#, perl-format
15977msgid "fatal: alias '%s' expands to itself\n"
15978msgstr "严重:别名 '%s' 扩展为它自己\n"
15979
15980#: git-send-email.perl:882
15981msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
15982msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
15983
15984#: git-send-email.perl:932 git-send-email.perl:940
15985#, perl-format
15986msgid "error: unable to extract a valid address from: %s\n"
15987msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
15988
15989#. TRANSLATORS: Make sure to include [q] [d] [e] in your
15990#. translation. The program will only accept English input
15991#. at this point.
15992#: git-send-email.perl:944
15993msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
15994msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
15995
15996#: git-send-email.perl:1245
15997#, perl-format
15998msgid "CA path \"%s\" does not exist"
15999msgstr "CA 路径 \"%s\" 不存在"
16000
16001#: git-send-email.perl:1320
16002msgid ""
16003"    The Cc list above has been expanded by additional\n"
16004"    addresses found in the patch commit message. By default\n"
16005"    send-email prompts before sending whenever this occurs.\n"
16006"    This behavior is controlled by the sendemail.confirm\n"
16007"    configuration setting.\n"
16008"\n"
16009"    For additional information, run 'git send-email --help'.\n"
16010"    To retain the current behavior, but squelch this message,\n"
16011"    run 'git config --global sendemail.confirm auto'.\n"
16012"\n"
16013msgstr ""
16014"    以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
16015"    了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
16016"    sendemail.confirm 配置设置。\n"
16017"\n"
16018"    更多信息,执行 'git send-email --help'。\n"
16019"    要保持当前行为,但不显示此信息,运行 'git config --global\n"
16020"    sendemail.confirm auto'。\n"
16021"\n"
16022
16023#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
16024#. translation. The program will only accept English input
16025#. at this point.
16026#: git-send-email.perl:1335
16027msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
16028msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):"
16029
16030#: git-send-email.perl:1338
16031msgid "Send this email reply required"
16032msgstr "发送要求的邮件回复"
16033
16034#: git-send-email.perl:1364
16035msgid "The required SMTP server is not properly defined."
16036msgstr "要求的 SMTP 服务器未被正确定义。"
16037
16038#: git-send-email.perl:1411
16039#, perl-format
16040msgid "Server does not support STARTTLS! %s"
16041msgstr "服务器不支持 STARTTLS!%s"
16042
16043#: git-send-email.perl:1416 git-send-email.perl:1420
16044#, perl-format
16045msgid "STARTTLS failed! %s"
16046msgstr "STARTTLS 失败!%s"
16047
16048#: git-send-email.perl:1430
16049msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
16050msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
16051
16052#: git-send-email.perl:1448
16053#, perl-format
16054msgid "Failed to send %s\n"
16055msgstr "无法发送 %s\n"
16056
16057#: git-send-email.perl:1451
16058#, perl-format
16059msgid "Dry-Sent %s\n"
16060msgstr "演习发送 %s\n"
16061
16062#: git-send-email.perl:1451
16063#, perl-format
16064msgid "Sent %s\n"
16065msgstr "正发送 %s\n"
16066
16067#: git-send-email.perl:1453
16068msgid "Dry-OK. Log says:\n"
16069msgstr "演习成功。日志说:\n"
16070
16071#: git-send-email.perl:1453
16072msgid "OK. Log says:\n"
16073msgstr "OK。日志说:\n"
16074
16075#: git-send-email.perl:1465
16076msgid "Result: "
16077msgstr "结果:"
16078
16079#: git-send-email.perl:1468
16080msgid "Result: OK\n"
16081msgstr "结果:OK\n"
16082
16083#: git-send-email.perl:1481
16084#, perl-format
16085msgid "can't open file %s"
16086msgstr "无法打开文件 %s"
16087
16088#: git-send-email.perl:1528 git-send-email.perl:1548
16089#, perl-format
16090msgid "(mbox) Adding cc: %s from line '%s'\n"
16091msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
16092
16093#: git-send-email.perl:1534
16094#, perl-format
16095msgid "(mbox) Adding to: %s from line '%s'\n"
16096msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
16097
16098#: git-send-email.perl:1582
16099#, perl-format
16100msgid "(non-mbox) Adding cc: %s from line '%s'\n"
16101msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
16102
16103#: git-send-email.perl:1605
16104#, perl-format
16105msgid "(body) Adding cc: %s from line '%s'\n"
16106msgstr "(body) 添加 cc: %s 自行 '%s'\n"
16107
16108#: git-send-email.perl:1711
16109#, perl-format
16110msgid "(%s) Could not execute '%s'"
16111msgstr "(%s) 不能执行 '%s'"
16112
16113#: git-send-email.perl:1718
16114#, perl-format
16115msgid "(%s) Adding %s: %s from: '%s'\n"
16116msgstr "(%s) 添加 %s: %s 自:'%s'\n"
16117
16118#: git-send-email.perl:1722
16119#, perl-format
16120msgid "(%s) failed to close pipe to '%s'"
16121msgstr "(%s) 无法关闭管道至 '%s'"
16122
16123#: git-send-email.perl:1749
16124msgid "cannot send message as 7bit"
16125msgstr "不能以 7bit 形式发送信息"
16126
16127#: git-send-email.perl:1757
16128msgid "invalid transfer encoding"
16129msgstr "无效的传送编码"
16130
16131#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
16132#, perl-format
16133msgid "unable to open %s: %s\n"
16134msgstr "不能打开 %s:%s\n"
16135
16136#: git-send-email.perl:1798
16137#, perl-format
16138msgid "%s: patch contains a line longer than 998 characters"
16139msgstr "%s:补丁包含一个超过 998 字符的行"
16140
16141#: git-send-email.perl:1814
16142#, perl-format
16143msgid "Skipping %s with backup suffix '%s'.\n"
16144msgstr "略过 %s 含备份后缀 '%s'。\n"
16145
16146#. TRANSLATORS: please keep "[y|N]" as is.
16147#: git-send-email.perl:1818
16148#, perl-format
16149msgid "Do you really want to send %s? [y|N]: "
16150msgstr "您真的要发送 %s?[y|N]:"