po / zh_CN.poon commit l10n: zh_CN: Update Git Glossary: "commit message" (667599e)
   1# Chinese translations for Git package
   2# Git 软件包的简体中文翻译.
   3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
   4# This file is distributed under the same license as the Git package.
   5# Contributors:
   6#   - Jiang Xin <worldhello.net AT gmail.com>
   7#   - Lian Cheng <rhythm.mail AT gmail.com>
   8#   - Ray Chen <oldsharp AT gmail.com>
   9#   - Riku <lu.riku AT gmail.com>
  10#   - Thynson <lanxingcan AT gmail.com>
  11#   - ws3389 <willsmith3389 AT gmail.com>
  12#   - Wang Sheng <wangsheng2008love AT 163.com>
  13#   - Yichao Yu <yyc1992 AT gmail.com>
  14#   - Zhuang Ya <zhuangya AT me.com>
  15#
  16#  Git glossary for Chinese translators
  17#
  18#   English                          |  Chinese
  19#   ---------------------------------+--------------------------------------
  20#   3-way merge                      |  三方合并
  21#   abbreviate                       |  简写(的 SHA-1 值)
  22#   alternate object database        |  备用对象库
  23#   amend                            |  修补
  24#   ancestor                         |  祖先,祖先提交
  25#   annotated tag                    |  附注标签
  26#   bare repository                  |  纯仓库
  27#   bisect                           |  二分查找
  28#   blob object                      |  数据对象
  29#   branch                           |  分支
  30#   bundle                           |  包
  31#   bypass                           |  绕过
  32#   cache                            |  索引(的别称)
  33#   chain                            |  (提交)链
  34#   changeset                        |  变更集
  35#   checkout                         |  检出
  36#   checksum                         |  校验,校验和
  37#   cherry-picking                   |  拣选
  38#   clean                            |  干净(的工作区)
  39#   clone                            |  克隆
  40#   commit                           |  提交
  41#   commit message                   |  提交说明
  42#   commit object                    |  提交对象
  43#   commit-ish (also committish)     |  提交号
  44#   conflict                         |  冲突
  45#   core Git                         |  核心 Git 工具
  46#   DAG                              |  有向无环图
  47#   dangling object                  |  摇摆对象
  48#   detached HEAD                    |  分离头指针
  49#   directory                        |  目录
  50#   dirty                            |  脏(的工作区)
  51#   dumb HTTP protocol               |  哑 HTTP 协议
  52#   evil merge                       |  坏合并(合并引入了父提交没有的修改)
  53#   fast-forward                     |  快进
  54#   fetch                            |  获取
  55#   file system                      |  文件系统
  56#   fork                             |  派生
  57#   Git archive                      |  仓库(对于 arch 用户)
  58#   gitfile                          |  gitfile(仓库链接文件)
  59#   grafts                           |  (提交)嫁接
  60#   hash                             |  哈希值
  61#   HEAD                             |  HEAD(头指针,亦即当前分支)
  62#   head                             |  头、分支
  63#   head ref                         |  分支
  64#   header                           |  头信息
  65#   hook                             |  钩子
  66#   hunk                             |  补丁片段
  67#   index                            |  索引
  68#   index entry                      |  索引条目
  69#   loose object                     |  松散对象
  70#   loose refs                       |  松散引用
  71#   master                           |  master(默认分支名)
  72#   merge                            |  合并
  73#   object                           |  对象
  74#   object database                  |  对象库
  75#   object identifier                |  对象标识符
  76#   object name                      |  对象名称
  77#   object type                      |  对象类型
  78#   octopus                          |  章鱼式合并(两分支以上的合并)
  79#   origin                           |  origin(默认的远程名称)
  80#   pack                             |  包
  81#   pack index                       |  包索引
  82#   packfile                         |  包文件
  83#   parent                           |  父提交
  84#   patch                            |  补丁
  85#   pathspec                         |  路径规格
  86#   pattern                          |  模式
  87#   pickaxe                          |  挖掘
  88#   plumbing                         |  管件(Git 底层核心命令的别称)
  89#   porcelain                        |  瓷件(Git 上层封装命令的别称)
  90#   prune                            |  清除
  91#   pull                             |  拉,拉取
  92#   push                             |  推,推送
  93#   reachable                        |  可达
  94#   rebase                           |  变基
  95#   ref                              |  引用
  96#   reflog                           |  引用日志
  97#   refspec                          |  引用规格
  98#   remote                           |  远程,远程仓库
  99#   remote-tracking branch           |  远程跟踪分支
 100#   replay                           |  重放
 101#   repo                             |  仓库
 102#   repository                       |  仓库
 103#   resolve                          |  (冲突)解决
 104#   revert                           |  还原
 105#   revision                         |  版本
 106#   rewind                           |  回退
 107#   SCM                              |  源代码管理(工具)
 108#   SHA-1                            |  SHA-1(安全哈希算法1)
 109#   shallow repository               |  浅(克隆)仓库
 110#   signed tag                       |  签名标签
 111#   smart HTTP protocol              |  智能 HTTP 协议
 112#   squash                           |  压缩
 113#   stage                            |  n. 暂存区(即索引); v. 暂存
 114#   stash                            |  n. 进度保存; v. 保存进度
 115#   submodule                        |  子模组
 116#   symref                           |  符号引用
 117#   tag                              |  n. 标签; v. 打标签
 118#   tag object                       |  标签对象
 119#   tagger                           |  打标签者
 120#   topic branch                     |  主题分支
 121#   track                            |  跟踪
 122#   tree                             |  树(工作区或树对象)
 123#   tree object                      |  树对象
 124#   tree-ish (also treeish)          |  树对象(或可以解析为一树对象)
 125#   unmerged index                   |  未合并索引
 126#   unpack                           |  解包
 127#   unreachable object               |  不可达对象
 128#   unstage                          |  取消暂存
 129#   upstream                         |  上游
 130#   upstream branch                  |  上游分支
 131#   working tree                     |  工作区
 132#
 133msgid ""
 134msgstr ""
 135"Project-Id-Version: Git\n"
 136"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 137"POT-Creation-Date: 2015-07-14 07:19+0800\n"
 138"PO-Revision-Date: 2015-08-04 00:43+0800\n"
 139"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 140"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 141"Language: zh_CN\n"
 142"MIME-Version: 1.0\n"
 143"Content-Type: text/plain; charset=UTF-8\n"
 144"Content-Transfer-Encoding: 8bit\n"
 145"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 146
 147#: advice.c:55
 148#, c-format
 149msgid "hint: %.*s\n"
 150msgstr "提示:%.*s\n"
 151
 152#: advice.c:88
 153msgid ""
 154"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 155"as appropriate to mark resolution and make a commit."
 156msgstr ""
 157"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
 158"解决方案并提交。"
 159
 160#: archive.c:11
 161msgid "git archive [<options>] <tree-ish> [<path>...]"
 162msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 163
 164#: archive.c:12
 165msgid "git archive --list"
 166msgstr "git archive --list"
 167
 168#: archive.c:13
 169msgid ""
 170"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 171msgstr ""
 172"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 173
 174#: archive.c:14
 175msgid "git archive --remote <repo> [--exec <cmd>] --list"
 176msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 177
 178#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
 179#, c-format
 180msgid "pathspec '%s' did not match any files"
 181msgstr "路径规格 '%s' 未匹配任何文件"
 182
 183#: archive.c:427
 184msgid "fmt"
 185msgstr "格式"
 186
 187#: archive.c:427
 188msgid "archive format"
 189msgstr "归档格式"
 190
 191#: archive.c:428 builtin/log.c:1204
 192msgid "prefix"
 193msgstr "前缀"
 194
 195#: archive.c:429
 196msgid "prepend prefix to each pathname in the archive"
 197msgstr "为归档中每个路径名加上前缀"
 198
 199#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
 200#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
 201#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
 202#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
 203#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
 204msgid "file"
 205msgstr "文件"
 206
 207#: archive.c:431 builtin/archive.c:89
 208msgid "write the archive to this file"
 209msgstr "归档写入此文件"
 210
 211#: archive.c:433
 212msgid "read .gitattributes in working directory"
 213msgstr "读取工作区中的 .gitattributes"
 214
 215#: archive.c:434
 216msgid "report archived files on stderr"
 217msgstr "在标准错误上报告归档文件"
 218
 219#: archive.c:435
 220msgid "store only"
 221msgstr "只存储"
 222
 223#: archive.c:436
 224msgid "compress faster"
 225msgstr "压缩速度更快"
 226
 227#: archive.c:444
 228msgid "compress better"
 229msgstr "压缩效果更好"
 230
 231#: archive.c:447
 232msgid "list supported archive formats"
 233msgstr "列出支持的归档格式"
 234
 235#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
 236msgid "repo"
 237msgstr "仓库"
 238
 239#: archive.c:450 builtin/archive.c:91
 240msgid "retrieve the archive from remote repository <repo>"
 241msgstr "从远程仓库(<仓库>)提取归档文件"
 242
 243#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
 244msgid "command"
 245msgstr "命令"
 246
 247#: archive.c:452 builtin/archive.c:93
 248msgid "path to the remote git-upload-archive command"
 249msgstr "远程 git-upload-archive 命令的路径"
 250
 251#: attr.c:265
 252msgid ""
 253"Negative patterns are ignored in git attributes\n"
 254"Use '\\!' for literal leading exclamation."
 255msgstr ""
 256"负值模版在 git attributes 中被忽略\n"
 257"当字符串确实要以感叹号开始时,使用 '\\!'。"
 258
 259#: branch.c:60
 260#, c-format
 261msgid "Not setting branch %s as its own upstream."
 262msgstr "未设置分支 %s 作为它自己的上游。"
 263
 264#: branch.c:83
 265#, c-format
 266msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 267msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 268
 269#: branch.c:84
 270#, c-format
 271msgid "Branch %s set up to track remote branch %s from %s."
 272msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 273
 274#: branch.c:88
 275#, c-format
 276msgid "Branch %s set up to track local branch %s by rebasing."
 277msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 278
 279#: branch.c:89
 280#, c-format
 281msgid "Branch %s set up to track local branch %s."
 282msgstr "分支 %s 设置为跟踪本地分支 %s。"
 283
 284#: branch.c:94
 285#, c-format
 286msgid "Branch %s set up to track remote ref %s by rebasing."
 287msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 288
 289#: branch.c:95
 290#, c-format
 291msgid "Branch %s set up to track remote ref %s."
 292msgstr "分支 %s 设置为跟踪远程引用 %s。"
 293
 294#: branch.c:99
 295#, c-format
 296msgid "Branch %s set up to track local ref %s by rebasing."
 297msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 298
 299#: branch.c:100
 300#, c-format
 301msgid "Branch %s set up to track local ref %s."
 302msgstr "分支 %s 设置为跟踪本地引用 %s。"
 303
 304#: branch.c:133
 305#, c-format
 306msgid "Not tracking: ambiguous information for ref %s"
 307msgstr "未跟踪:引用 %s 有歧义"
 308
 309#: branch.c:162
 310#, c-format
 311msgid "'%s' is not a valid branch name."
 312msgstr "'%s' 不是一个有效的分支名称。"
 313
 314#: branch.c:167
 315#, c-format
 316msgid "A branch named '%s' already exists."
 317msgstr "一个分支名 '%s' 已经存在。"
 318
 319#: branch.c:175
 320msgid "Cannot force update the current branch."
 321msgstr "无法强制更新当前分支。"
 322
 323#: branch.c:195
 324#, c-format
 325msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 326msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
 327
 328#: branch.c:197
 329#, c-format
 330msgid "the requested upstream branch '%s' does not exist"
 331msgstr "请求的上游分支 '%s' 不存在"
 332
 333#: branch.c:199
 334msgid ""
 335"\n"
 336"If you are planning on basing your work on an upstream\n"
 337"branch that already exists at the remote, you may need to\n"
 338"run \"git fetch\" to retrieve it.\n"
 339"\n"
 340"If you are planning to push out a new local branch that\n"
 341"will track its remote counterpart, you may want to use\n"
 342"\"git push -u\" to set the upstream config as you push."
 343msgstr ""
 344"\n"
 345"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
 346"您可能需要执行 \"git fetch\" 来获取分支。\n"
 347"\n"
 348"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
 349"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 350
 351#: branch.c:243
 352#, c-format
 353msgid "Not a valid object name: '%s'."
 354msgstr "不是一个有效的对象名:'%s'。"
 355
 356#: branch.c:263
 357#, c-format
 358msgid "Ambiguous object name: '%s'."
 359msgstr "歧义的对象名:'%s'。"
 360
 361#: branch.c:268
 362#, c-format
 363msgid "Not a valid branch point: '%s'."
 364msgstr "无效的分支点:'%s'。"
 365
 366#: bundle.c:34
 367#, c-format
 368msgid "'%s' does not look like a v2 bundle file"
 369msgstr "'%s' 不像是一个 v2 版本的包文件"
 370
 371#: bundle.c:61
 372#, c-format
 373msgid "unrecognized header: %s%s (%d)"
 374msgstr "未能识别的包头:%s%s (%d)"
 375
 376#: bundle.c:87 builtin/commit.c:766
 377#, c-format
 378msgid "could not open '%s'"
 379msgstr "不能打开 '%s'"
 380
 381#: bundle.c:139
 382msgid "Repository lacks these prerequisite commits:"
 383msgstr "仓库中缺少这些必备的提交:"
 384
 385#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
 386#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
 387#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
 388#: builtin/shortlog.c:158
 389msgid "revision walk setup failed"
 390msgstr "版本遍历设置失败"
 391
 392#: bundle.c:185
 393#, c-format
 394msgid "The bundle contains this ref:"
 395msgid_plural "The bundle contains these %d refs:"
 396msgstr[0] "这个包中含有这个引用:"
 397msgstr[1] "这个包中含有 %d 个引用:"
 398
 399#: bundle.c:192
 400msgid "The bundle records a complete history."
 401msgstr "这个包记录一个完整历史。"
 402
 403#: bundle.c:194
 404#, c-format
 405msgid "The bundle requires this ref:"
 406msgid_plural "The bundle requires these %d refs:"
 407msgstr[0] "这个包需要这个引用:"
 408msgstr[1] "这个包需要 %d 个引用:"
 409
 410#: bundle.c:251
 411msgid "Could not spawn pack-objects"
 412msgstr "不能生成 pack-objects 进程"
 413
 414#: bundle.c:269
 415msgid "pack-objects died"
 416msgstr "pack-objects 终止"
 417
 418#: bundle.c:309
 419msgid "rev-list died"
 420msgstr "rev-list 终止"
 421
 422#: bundle.c:358
 423#, c-format
 424msgid "ref '%s' is excluded by the rev-list options"
 425msgstr "引用 '%s' 被 rev-list 选项排除"
 426
 427#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
 428#, c-format
 429msgid "unrecognized argument: %s"
 430msgstr "未能识别的参数:%s"
 431
 432#: bundle.c:443
 433msgid "Refusing to create empty bundle."
 434msgstr "不能创建空包。"
 435
 436#: bundle.c:453
 437#, c-format
 438msgid "cannot create '%s'"
 439msgstr "不能创建 '%s'"
 440
 441#: bundle.c:474
 442msgid "index-pack died"
 443msgstr "index-pack 终止"
 444
 445#: color.c:260
 446#, c-format
 447msgid "invalid color value: %.*s"
 448msgstr "无效的颜色值:%.*s"
 449
 450#: commit.c:40
 451#, c-format
 452msgid "could not parse %s"
 453msgstr "不能解析 %s"
 454
 455#: commit.c:42
 456#, c-format
 457msgid "%s %s is not a commit!"
 458msgstr "%s %s 不是一个提交!"
 459
 460#: compat/obstack.c:406 compat/obstack.c:408
 461msgid "memory exhausted"
 462msgstr "内存耗尽"
 463
 464#: config.c:474 config.c:476
 465#, c-format
 466msgid "bad config file line %d in %s"
 467msgstr "配置文件 %2$s 出错于第 %1$d 行"
 468
 469#: config.c:592
 470#, c-format
 471msgid "bad numeric config value '%s' for '%s' in %s: %s"
 472msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
 473
 474#: config.c:594
 475#, c-format
 476msgid "bad numeric config value '%s' for '%s': %s"
 477msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
 478
 479#: config.c:679
 480#, c-format
 481msgid "failed to expand user dir in: '%s'"
 482msgstr "无法扩展 '%s' 中的用户目录"
 483
 484#: config.c:757 config.c:768
 485#, c-format
 486msgid "bad zlib compression level %d"
 487msgstr "错误的 zlib 压缩级别 %d"
 488
 489#: config.c:890
 490#, c-format
 491msgid "invalid mode for object creation: %s"
 492msgstr "无效的对象创建模式:%s"
 493
 494#: config.c:1216
 495msgid "unable to parse command-line config"
 496msgstr "无法解析命令行中的配置"
 497
 498#: config.c:1277
 499msgid "unknown error occured while reading the configuration files"
 500msgstr "在读取配置文件时遇到未知错误"
 501
 502#: config.c:1601
 503#, c-format
 504msgid "unable to parse '%s' from command-line config"
 505msgstr "无法解析命令行配置中的 '%s'"
 506
 507#: config.c:1603
 508#, c-format
 509msgid "bad config variable '%s' in file '%s' at line %d"
 510msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 511
 512#: config.c:1662
 513#, c-format
 514msgid "%s has multiple values"
 515msgstr "%s 有多个取值"
 516
 517#: connected.c:69
 518msgid "Could not run 'git rev-list'"
 519msgstr "不能执行 'git rev-list'"
 520
 521#: connected.c:89
 522#, c-format
 523msgid "failed write to rev-list: %s"
 524msgstr "无法写入 rev-list:%s"
 525
 526#: connected.c:97
 527#, c-format
 528msgid "failed to close rev-list's stdin: %s"
 529msgstr "无法关闭 rev-list 的标准输入:%s"
 530
 531#: date.c:95
 532msgid "in the future"
 533msgstr "在将来"
 534
 535#: date.c:101
 536#, c-format
 537msgid "%lu second ago"
 538msgid_plural "%lu seconds ago"
 539msgstr[0] "%lu 秒钟前"
 540msgstr[1] "%lu 秒钟前"
 541
 542#: date.c:108
 543#, c-format
 544msgid "%lu minute ago"
 545msgid_plural "%lu minutes ago"
 546msgstr[0] "%lu 分钟前"
 547msgstr[1] "%lu 分钟前"
 548
 549#: date.c:115
 550#, c-format
 551msgid "%lu hour ago"
 552msgid_plural "%lu hours ago"
 553msgstr[0] "%lu 小时前"
 554msgstr[1] "%lu 小时前"
 555
 556#: date.c:122
 557#, c-format
 558msgid "%lu day ago"
 559msgid_plural "%lu days ago"
 560msgstr[0] "%lu 天前"
 561msgstr[1] "%lu 天前"
 562
 563#: date.c:128
 564#, c-format
 565msgid "%lu week ago"
 566msgid_plural "%lu weeks ago"
 567msgstr[0] "%lu 周前"
 568msgstr[1] "%lu 周前"
 569
 570#: date.c:135
 571#, c-format
 572msgid "%lu month ago"
 573msgid_plural "%lu months ago"
 574msgstr[0] "%lu 个月前"
 575msgstr[1] "%lu 个月前"
 576
 577#: date.c:146
 578#, c-format
 579msgid "%lu year"
 580msgid_plural "%lu years"
 581msgstr[0] "%lu 年"
 582msgstr[1] "%lu 年"
 583
 584#. TRANSLATORS: "%s" is "<n> years"
 585#: date.c:149
 586#, c-format
 587msgid "%s, %lu month ago"
 588msgid_plural "%s, %lu months ago"
 589msgstr[0] "%s %lu 个月前"
 590msgstr[1] "%s %lu 个月前"
 591
 592#: date.c:154 date.c:159
 593#, c-format
 594msgid "%lu year ago"
 595msgid_plural "%lu years ago"
 596msgstr[0] "%lu 年前"
 597msgstr[1] "%lu 年前"
 598
 599#: diffcore-order.c:24
 600#, c-format
 601msgid "failed to read orderfile '%s'"
 602msgstr "无法读取排序文件 '%s'"
 603
 604#: diffcore-rename.c:536
 605msgid "Performing inexact rename detection"
 606msgstr "正在进行非精确的重命名检测"
 607
 608#  译者:注意保持前导空格
 609#: diff.c:114
 610#, c-format
 611msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 612msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 613
 614#  译者:注意保持前导空格
 615#: diff.c:119
 616#, c-format
 617msgid "  Unknown dirstat parameter '%s'\n"
 618msgstr "  未知的 dirstat 参数 '%s'\n"
 619
 620#: diff.c:214
 621#, c-format
 622msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 623msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 624
 625#: diff.c:266
 626#, c-format
 627msgid ""
 628"Found errors in 'diff.dirstat' config variable:\n"
 629"%s"
 630msgstr ""
 631"发现配置变量 'diff.dirstat' 中的错误:\n"
 632"%s"
 633
 634#: diff.c:2997
 635#, c-format
 636msgid "external diff died, stopping at %s"
 637msgstr "外部 diff 退出,停止在 %s"
 638
 639#: diff.c:3393
 640msgid "--follow requires exactly one pathspec"
 641msgstr "--follow 参数后只跟一个 pathspec"
 642
 643#: diff.c:3556
 644#, c-format
 645msgid ""
 646"Failed to parse --dirstat/-X option parameter:\n"
 647"%s"
 648msgstr ""
 649"无法解析 --dirstat/-X 选项的参数:\n"
 650"%s"
 651
 652#: diff.c:3570
 653#, c-format
 654msgid "Failed to parse --submodule option parameter: '%s'"
 655msgstr "无法解析 --submodule 选项的参数:'%s'"
 656
 657#: dir.c:1852
 658msgid "failed to get kernel name and information"
 659msgstr "无法获得内核名称和信息"
 660
 661#: dir.c:1945
 662msgid "Untracked cache is disabled on this system."
 663msgstr "缓存未跟踪文件在本系统被禁用"
 664
 665#: gpg-interface.c:129 gpg-interface.c:200
 666msgid "could not run gpg."
 667msgstr "不能执行 gpg。"
 668
 669#: gpg-interface.c:141
 670msgid "gpg did not accept the data"
 671msgstr "gpg 没有接受数据"
 672
 673#: gpg-interface.c:152
 674msgid "gpg failed to sign the data"
 675msgstr "gpg 无法为数据签名"
 676
 677#: gpg-interface.c:185
 678#, c-format
 679msgid "could not create temporary file '%s': %s"
 680msgstr "不能创建临时文件 '%s':%s"
 681
 682#: gpg-interface.c:188
 683#, c-format
 684msgid "failed writing detached signature to '%s': %s"
 685msgstr "无法将分离式签名写入 '%s':%s"
 686
 687#: grep.c:1718
 688#, c-format
 689msgid "'%s': unable to read %s"
 690msgstr "'%s':无法读取 %s"
 691
 692#: grep.c:1735
 693#, c-format
 694msgid "'%s': %s"
 695msgstr "'%s':%s"
 696
 697#: grep.c:1746
 698#, c-format
 699msgid "'%s': short read %s"
 700msgstr "'%s':读取不完整 %s"
 701
 702#: help.c:207
 703#, c-format
 704msgid "available git commands in '%s'"
 705msgstr "在 '%s' 下可用的 git 命令"
 706
 707#: help.c:214
 708msgid "git commands available from elsewhere on your $PATH"
 709msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 710
 711#: help.c:246
 712msgid "These are common Git commands used in various situations:"
 713msgstr "这些是各种场合常见的 Git 命令:"
 714
 715#: help.c:311
 716#, c-format
 717msgid ""
 718"'%s' appears to be a git command, but we were not\n"
 719"able to execute it. Maybe git-%s is broken?"
 720msgstr ""
 721"'%s' 像是一个 git 命令,但却无法运行。\n"
 722"可能是 git-%s 受损?"
 723
 724#: help.c:368
 725msgid "Uh oh. Your system reports no Git commands at all."
 726msgstr "唉呀,您的系统中未发现 Git 命令。"
 727
 728#: help.c:390
 729#, c-format
 730msgid ""
 731"WARNING: You called a Git command named '%s', which does not exist.\n"
 732"Continuing under the assumption that you meant '%s'"
 733msgstr ""
 734"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 735"是 '%s'"
 736
 737#: help.c:395
 738#, c-format
 739msgid "in %0.1f seconds automatically..."
 740msgstr "在 %0.1f 秒钟后自动运行..."
 741
 742#: help.c:402
 743#, c-format
 744msgid "git: '%s' is not a git command. See 'git --help'."
 745msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
 746
 747#: help.c:406 help.c:466
 748msgid ""
 749"\n"
 750"Did you mean this?"
 751msgid_plural ""
 752"\n"
 753"Did you mean one of these?"
 754msgstr[0] ""
 755"\n"
 756"您指的是这个么?"
 757msgstr[1] ""
 758"\n"
 759"您指的是这其中的某一个么?"
 760
 761#: help.c:462
 762#, c-format
 763msgid "%s: %s - %s"
 764msgstr "%s:%s - %s"
 765
 766#: lockfile.c:345
 767msgid "BUG: reopen a lockfile that is still open"
 768msgstr "BUG: 重新打开一个仍打开着的锁文件"
 769
 770#: lockfile.c:347
 771msgid "BUG: reopen a lockfile that has been committed"
 772msgstr "BUG: 重新打开一个已提交的锁文件"
 773
 774#: merge.c:41
 775msgid "failed to read the cache"
 776msgstr "无法读取缓存"
 777
 778#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
 779#: builtin/clone.c:647
 780msgid "unable to write new index file"
 781msgstr "无法写新的索引文件"
 782
 783#: merge-recursive.c:189
 784#, c-format
 785msgid "(bad commit)\n"
 786msgstr "(坏提交)\n"
 787
 788#: merge-recursive.c:209
 789#, c-format
 790msgid "addinfo_cache failed for path '%s'"
 791msgstr "为路径 '%s' addinfo_cache 失败"
 792
 793#: merge-recursive.c:270
 794msgid "error building trees"
 795msgstr "无法创建树"
 796
 797#: merge-recursive.c:687
 798#, c-format
 799msgid "failed to create path '%s'%s"
 800msgstr "无法创建路径 '%s'%s"
 801
 802#: merge-recursive.c:698
 803#, c-format
 804msgid "Removing %s to make room for subdirectory\n"
 805msgstr "删除 %s 以便为子目录留出空间\n"
 806
 807#: merge-recursive.c:712 merge-recursive.c:733
 808msgid ": perhaps a D/F conflict?"
 809msgstr ":可能是一个目录/文件冲突?"
 810
 811#: merge-recursive.c:723
 812#, c-format
 813msgid "refusing to lose untracked file at '%s'"
 814msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 815
 816#: merge-recursive.c:763
 817#, c-format
 818msgid "cannot read object %s '%s'"
 819msgstr "不能读取对象 %s '%s'"
 820
 821#: merge-recursive.c:765
 822#, c-format
 823msgid "blob expected for %s '%s'"
 824msgstr "%s '%s' 应为数据对象"
 825
 826#: merge-recursive.c:788 builtin/clone.c:306
 827#, c-format
 828msgid "failed to open '%s'"
 829msgstr "无法打开 '%s'"
 830
 831#: merge-recursive.c:796
 832#, c-format
 833msgid "failed to symlink '%s'"
 834msgstr "无法创建符号链接 '%s'"
 835
 836#: merge-recursive.c:799
 837#, c-format
 838msgid "do not know what to do with %06o %s '%s'"
 839msgstr "不知道如何处理 %06o %s '%s'"
 840
 841#: merge-recursive.c:937
 842msgid "Failed to execute internal merge"
 843msgstr "无法执行内部合并"
 844
 845#: merge-recursive.c:941
 846#, c-format
 847msgid "Unable to add %s to database"
 848msgstr "不能添加 %s 至对象库"
 849
 850#: merge-recursive.c:957
 851msgid "unsupported object type in the tree"
 852msgstr "在树中有不支持的对象类型"
 853
 854#: merge-recursive.c:1032 merge-recursive.c:1046
 855#, c-format
 856msgid ""
 857"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 858"in tree."
 859msgstr ""
 860"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 861"的版本被保留。"
 862
 863#: merge-recursive.c:1038 merge-recursive.c:1051
 864#, c-format
 865msgid ""
 866"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 867"in tree at %s."
 868msgstr ""
 869"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 870"的版本保留于 %8$s 中。"
 871
 872#: merge-recursive.c:1092
 873msgid "rename"
 874msgstr "重命名"
 875
 876#: merge-recursive.c:1092
 877msgid "renamed"
 878msgstr "重命名"
 879
 880#: merge-recursive.c:1148
 881#, c-format
 882msgid "%s is a directory in %s adding as %s instead"
 883msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 884
 885#: merge-recursive.c:1170
 886#, c-format
 887msgid ""
 888"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 889"\"->\"%s\" in \"%s\"%s"
 890msgstr ""
 891"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
 892"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 893
 894#: merge-recursive.c:1175
 895msgid " (left unresolved)"
 896msgstr "(留下未解决)"
 897
 898#: merge-recursive.c:1229
 899#, c-format
 900msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 901msgstr ""
 902"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
 903"%5$s"
 904
 905#: merge-recursive.c:1259
 906#, c-format
 907msgid "Renaming %s to %s and %s to %s instead"
 908msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
 909
 910#: merge-recursive.c:1458
 911#, c-format
 912msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 913msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 914
 915#: merge-recursive.c:1468
 916#, c-format
 917msgid "Adding merged %s"
 918msgstr "添加合并后的 %s"
 919
 920#: merge-recursive.c:1473 merge-recursive.c:1671
 921#, c-format
 922msgid "Adding as %s instead"
 923msgstr "而是以 %s 为名添加"
 924
 925#: merge-recursive.c:1524
 926#, c-format
 927msgid "cannot read object %s"
 928msgstr "不能读取对象 %s"
 929
 930#: merge-recursive.c:1527
 931#, c-format
 932msgid "object %s is not a blob"
 933msgstr "对象 %s 不是一个数据对象"
 934
 935#: merge-recursive.c:1575
 936msgid "modify"
 937msgstr "修改"
 938
 939#: merge-recursive.c:1575
 940msgid "modified"
 941msgstr "修改"
 942
 943#: merge-recursive.c:1585
 944msgid "content"
 945msgstr "内容"
 946
 947#: merge-recursive.c:1592
 948msgid "add/add"
 949msgstr "添加/添加"
 950
 951#: merge-recursive.c:1626
 952#, c-format
 953msgid "Skipped %s (merged same as existing)"
 954msgstr "略过 %s(已经做过相同合并)"
 955
 956#: merge-recursive.c:1640
 957#, c-format
 958msgid "Auto-merging %s"
 959msgstr "自动合并 %s"
 960
 961#: merge-recursive.c:1644 git-submodule.sh:1150
 962msgid "submodule"
 963msgstr "子模组"
 964
 965#: merge-recursive.c:1645
 966#, c-format
 967msgid "CONFLICT (%s): Merge conflict in %s"
 968msgstr "冲突(%s):合并冲突于 %s"
 969
 970#: merge-recursive.c:1731
 971#, c-format
 972msgid "Removing %s"
 973msgstr "删除 %s"
 974
 975#: merge-recursive.c:1756
 976msgid "file/directory"
 977msgstr "文件/目录"
 978
 979#: merge-recursive.c:1762
 980msgid "directory/file"
 981msgstr "目录/文件"
 982
 983#: merge-recursive.c:1767
 984#, c-format
 985msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 986msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 987
 988#: merge-recursive.c:1777
 989#, c-format
 990msgid "Adding %s"
 991msgstr "添加 %s"
 992
 993#: merge-recursive.c:1794
 994msgid "Fatal merge failure, shouldn't happen."
 995msgstr "严重的合并错误,不应发生。"
 996
 997#: merge-recursive.c:1813
 998msgid "Already up-to-date!"
 999msgstr "已经是最新的!"
1000
1001#: merge-recursive.c:1822
1002#, c-format
1003msgid "merging of trees %s and %s failed"
1004msgstr "无法合并树 %s 和 %s"
1005
1006#: merge-recursive.c:1852
1007#, c-format
1008msgid "Unprocessed path??? %s"
1009msgstr "未处理的路径??? %s"
1010
1011#: merge-recursive.c:1900
1012msgid "Merging:"
1013msgstr "合并:"
1014
1015#: merge-recursive.c:1913
1016#, c-format
1017msgid "found %u common ancestor:"
1018msgid_plural "found %u common ancestors:"
1019msgstr[0] "发现 %u 个共同祖先:"
1020msgstr[1] "发现 %u 个共同祖先:"
1021
1022#: merge-recursive.c:1950
1023msgid "merge returned no commit"
1024msgstr "合并未返回提交"
1025
1026#: merge-recursive.c:2007
1027#, c-format
1028msgid "Could not parse object '%s'"
1029msgstr "不能解析对象 '%s'"
1030
1031#: merge-recursive.c:2018 builtin/merge.c:645
1032msgid "Unable to write index."
1033msgstr "不能写入索引。"
1034
1035#: notes-utils.c:41
1036msgid "Cannot commit uninitialized/unreferenced notes tree"
1037msgstr "不能提交未初始化/未引用的注解树"
1038
1039#: notes-utils.c:82
1040#, c-format
1041msgid "Bad notes.rewriteMode value: '%s'"
1042msgstr "坏的 notes.rewriteMode 值:'%s'"
1043
1044#: notes-utils.c:92
1045#, c-format
1046msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1047msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1048
1049#. TRANSLATORS: The first %s is the name of the
1050#. environment variable, the second %s is its value
1051#: notes-utils.c:119
1052#, c-format
1053msgid "Bad %s value: '%s'"
1054msgstr "坏的 %s 值:'%s'"
1055
1056#: object.c:242
1057#, c-format
1058msgid "unable to parse object: %s"
1059msgstr "不能解析对象:%s"
1060
1061#: parse-options.c:546
1062msgid "..."
1063msgstr "..."
1064
1065#: parse-options.c:564
1066#, c-format
1067msgid "usage: %s"
1068msgstr "用法:%s"
1069
1070#. TRANSLATORS: the colon here should align with the
1071#. one in "usage: %s" translation
1072#: parse-options.c:568
1073#, c-format
1074msgid "   or: %s"
1075msgstr "  或:%s"
1076
1077#  译者:为保证在输出中对齐,注意调整句中空格!
1078#: parse-options.c:571
1079#, c-format
1080msgid "    %s"
1081msgstr "    %s"
1082
1083#: parse-options.c:605
1084msgid "-NUM"
1085msgstr "-数字"
1086
1087#: pathspec.c:133
1088msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1089msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1090
1091#: pathspec.c:143
1092msgid ""
1093"global 'literal' pathspec setting is incompatible with all other global "
1094"pathspec settings"
1095msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1096
1097#: pathspec.c:177
1098msgid "invalid parameter for pathspec magic 'prefix'"
1099msgstr "路径规格包含无效的神奇前缀"
1100
1101#: pathspec.c:183
1102#, c-format
1103msgid "Invalid pathspec magic '%.*s' in '%s'"
1104msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1105
1106#: pathspec.c:187
1107#, c-format
1108msgid "Missing ')' at the end of pathspec magic in '%s'"
1109msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1110
1111#: pathspec.c:205
1112#, c-format
1113msgid "Unimplemented pathspec magic '%c' in '%s'"
1114msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1115
1116#: pathspec.c:230
1117#, c-format
1118msgid "%s: 'literal' and 'glob' are incompatible"
1119msgstr "%s:'literal' 和 'glob' 不兼容"
1120
1121#: pathspec.c:241
1122#, c-format
1123msgid "%s: '%s' is outside repository"
1124msgstr "%s:'%s' 在仓库之外"
1125
1126#: pathspec.c:291
1127#, c-format
1128msgid "Pathspec '%s' is in submodule '%.*s'"
1129msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1130
1131#: pathspec.c:353
1132#, c-format
1133msgid "%s: pathspec magic not supported by this command: %s"
1134msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1135
1136#: pathspec.c:432
1137#, c-format
1138msgid "pathspec '%s' is beyond a symbolic link"
1139msgstr "路径规格 '%s' 位于符号链接中"
1140
1141#: pathspec.c:441
1142msgid ""
1143"There is nothing to exclude from by :(exclude) patterns.\n"
1144"Perhaps you forgot to add either ':/' or '.' ?"
1145msgstr ""
1146"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1147"添加 ':/' 或 '.' ?"
1148
1149#: pretty.c:968
1150msgid "unable to parse --pretty format"
1151msgstr "不能解析 --pretty 格式"
1152
1153#: progress.c:236
1154msgid "done"
1155msgstr "完成"
1156
1157#: read-cache.c:1295
1158#, c-format
1159msgid ""
1160"index.version set, but the value is invalid.\n"
1161"Using version %i"
1162msgstr ""
1163"设置了 index.version,但是取值无效。\n"
1164"使用版本 %i"
1165
1166#: read-cache.c:1305
1167#, c-format
1168msgid ""
1169"GIT_INDEX_VERSION set, but the value is invalid.\n"
1170"Using version %i"
1171msgstr ""
1172"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1173"使用版本 %i"
1174
1175#: remote.c:792
1176#, c-format
1177msgid "Cannot fetch both %s and %s to %s"
1178msgstr "不能同时获取 %s 和 %s 至 %s"
1179
1180#: remote.c:796
1181#, c-format
1182msgid "%s usually tracks %s, not %s"
1183msgstr "%s 通常跟踪 %s,而非 %s"
1184
1185#: remote.c:800
1186#, c-format
1187msgid "%s tracks both %s and %s"
1188msgstr "%s 同时跟踪 %s 和 %s"
1189
1190#: remote.c:808
1191msgid "Internal error"
1192msgstr "内部错误"
1193
1194#: remote.c:1723 remote.c:1766
1195msgid "HEAD does not point to a branch"
1196msgstr "HEAD 没有指向一个分支"
1197
1198#: remote.c:1732
1199#, c-format
1200msgid "no such branch: '%s'"
1201msgstr "没有此分支:'%s'"
1202
1203#: remote.c:1735
1204#, c-format
1205msgid "no upstream configured for branch '%s'"
1206msgstr "尚未给分支 '%s' 设置上游"
1207
1208#: remote.c:1741
1209#, c-format
1210msgid "upstream branch '%s' not stored as a remote-tracking branch"
1211msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1212
1213#: remote.c:1756
1214#, c-format
1215msgid "push destination '%s' on remote '%s' has no local tracking branch"
1216msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1217
1218#: remote.c:1771
1219#, c-format
1220msgid "branch '%s' has no remote for pushing"
1221msgstr "分支 '%s' 没有设置要推送的远程服务器"
1222
1223#: remote.c:1782
1224#, c-format
1225msgid "push refspecs for '%s' do not include '%s'"
1226msgstr "向 '%s' 推送引用规格未包含 '%s'"
1227
1228#: remote.c:1795
1229msgid "push has no destination (push.default is 'nothing')"
1230msgstr "推送无目标(push.default 是 'nothing')"
1231
1232#: remote.c:1817
1233msgid "cannot resolve 'simple' push to a single destination"
1234msgstr "无法解析 'simple' 推送至一个单独的目标"
1235
1236#: remote.c:2124
1237#, c-format
1238msgid "Your branch is based on '%s', but the upstream is gone.\n"
1239msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1240
1241#: remote.c:2128
1242msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1243msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
1244
1245#: remote.c:2131
1246#, c-format
1247msgid "Your branch is up-to-date with '%s'.\n"
1248msgstr "您的分支与上游分支 '%s' 一致。\n"
1249
1250#: remote.c:2135
1251#, c-format
1252msgid "Your branch is ahead of '%s' by %d commit.\n"
1253msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1254msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1255msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1256
1257#: remote.c:2141
1258msgid "  (use \"git push\" to publish your local commits)\n"
1259msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
1260
1261#: remote.c:2144
1262#, c-format
1263msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1264msgid_plural ""
1265"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1266msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1267msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1268
1269#  译者:注意保持前导空格
1270#: remote.c:2152
1271msgid "  (use \"git pull\" to update your local branch)\n"
1272msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
1273
1274#: remote.c:2155
1275#, c-format
1276msgid ""
1277"Your branch and '%s' have diverged,\n"
1278"and have %d and %d different commit each, respectively.\n"
1279msgid_plural ""
1280"Your branch and '%s' have diverged,\n"
1281"and have %d and %d different commits each, respectively.\n"
1282msgstr[0] ""
1283"您的分支和 '%s' 出现了偏离,\n"
1284"并且分别有 %d 和 %d 处不同的提交。\n"
1285msgstr[1] ""
1286"您的分支和 '%s' 出现了偏离,\n"
1287"并且分别有 %d 和 %d 处不同的提交。\n"
1288
1289#  译者:注意保持前导空格
1290#: remote.c:2165
1291msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1292msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
1293
1294#: revision.c:2366
1295msgid "--first-parent is incompatible with --bisect"
1296msgstr "--first-parent 与 --bisect 不兼容"
1297
1298#: run-command.c:83
1299msgid "open /dev/null failed"
1300msgstr "不能打开 /dev/null"
1301
1302#: run-command.c:85
1303#, c-format
1304msgid "dup2(%d,%d) failed"
1305msgstr "不能调用 dup2(%d,%d)"
1306
1307#: send-pack.c:272
1308msgid "failed to sign the push certificate"
1309msgstr "无法为推送证书签名"
1310
1311#: send-pack.c:378
1312msgid "the receiving end does not support --signed push"
1313msgstr "接收端不支持签名推送"
1314
1315#: send-pack.c:389
1316msgid "the receiving end does not support --atomic push"
1317msgstr "接收端不支持原子推送"
1318
1319#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1320#: builtin/merge.c:983
1321#, c-format
1322msgid "Could not open '%s' for writing"
1323msgstr "不能为写入打开 '%s'"
1324
1325#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1326#: builtin/merge.c:988
1327#, c-format
1328msgid "Could not write to '%s'"
1329msgstr "不能写入 '%s'"
1330
1331#: sequencer.c:195
1332msgid ""
1333"after resolving the conflicts, mark the corrected paths\n"
1334"with 'git add <paths>' or 'git rm <paths>'"
1335msgstr ""
1336"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1337"命令标记修正后的文件"
1338
1339#: sequencer.c:198
1340msgid ""
1341"after resolving the conflicts, mark the corrected paths\n"
1342"with 'git add <paths>' or 'git rm <paths>'\n"
1343"and commit the result with 'git commit'"
1344msgstr ""
1345"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1346"对修正后的文件做标记,然后用 'git commit' 提交"
1347
1348#: sequencer.c:211 sequencer.c:861 sequencer.c:944
1349#, c-format
1350msgid "Could not write to %s"
1351msgstr "不能写入 %s"
1352
1353#: sequencer.c:214
1354#, c-format
1355msgid "Error wrapping up %s"
1356msgstr "错误收尾 %s"
1357
1358#: sequencer.c:229
1359msgid "Your local changes would be overwritten by cherry-pick."
1360msgstr "您的本地修改将被拣选操作覆盖。"
1361
1362#: sequencer.c:231
1363msgid "Your local changes would be overwritten by revert."
1364msgstr "您的本地修改将被还原操作覆盖。"
1365
1366#: sequencer.c:234
1367msgid "Commit your changes or stash them to proceed."
1368msgstr "提交您的修改或保存进度后再继续。"
1369
1370#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1371#: sequencer.c:321
1372#, c-format
1373msgid "%s: Unable to write new index file"
1374msgstr "%s:无法写入新索引文件"
1375
1376#: sequencer.c:339
1377msgid "Could not resolve HEAD commit\n"
1378msgstr "不能解析 HEAD 提交\n"
1379
1380#: sequencer.c:359
1381msgid "Unable to update cache tree\n"
1382msgstr "不能更新缓存\n"
1383
1384#: sequencer.c:411
1385#, c-format
1386msgid "Could not parse commit %s\n"
1387msgstr "不能解析提交 %s\n"
1388
1389#: sequencer.c:416
1390#, c-format
1391msgid "Could not parse parent commit %s\n"
1392msgstr "不能解析父提交 %s\n"
1393
1394#: sequencer.c:482
1395msgid "Your index file is unmerged."
1396msgstr "您的索引文件未完成合并。"
1397
1398#: sequencer.c:501
1399#, c-format
1400msgid "Commit %s is a merge but no -m option was given."
1401msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1402
1403#: sequencer.c:509
1404#, c-format
1405msgid "Commit %s does not have parent %d"
1406msgstr "提交 %s 没有父提交 %d"
1407
1408#: sequencer.c:513
1409#, c-format
1410msgid "Mainline was specified but commit %s is not a merge."
1411msgstr "指定了主线但提交 %s 不是一个合并。"
1412
1413#. TRANSLATORS: The first %s will be "revert" or
1414#. "cherry-pick", the second %s a SHA1
1415#: sequencer.c:526
1416#, c-format
1417msgid "%s: cannot parse parent commit %s"
1418msgstr "%s:不能解析父提交 %s"
1419
1420#: sequencer.c:530
1421#, c-format
1422msgid "Cannot get commit message for %s"
1423msgstr "不能得到 %s 的提交说明"
1424
1425#: sequencer.c:616
1426#, c-format
1427msgid "could not revert %s... %s"
1428msgstr "不能还原 %s... %s"
1429
1430#: sequencer.c:617
1431#, c-format
1432msgid "could not apply %s... %s"
1433msgstr "不能应用 %s... %s"
1434
1435#: sequencer.c:653
1436msgid "empty commit set passed"
1437msgstr "提供了空的提交集"
1438
1439#: sequencer.c:661
1440#, c-format
1441msgid "git %s: failed to read the index"
1442msgstr "git %s:无法读取索引"
1443
1444#: sequencer.c:665
1445#, c-format
1446msgid "git %s: failed to refresh the index"
1447msgstr "git %s:无法刷新索引"
1448
1449#: sequencer.c:725
1450#, c-format
1451msgid "Cannot %s during a %s"
1452msgstr "无法 %s 在一个 %s 过程中"
1453
1454#: sequencer.c:747
1455#, c-format
1456msgid "Could not parse line %d."
1457msgstr "不能解析第 %d 行。"
1458
1459#: sequencer.c:752
1460msgid "No commits parsed."
1461msgstr "没有提交被解析。"
1462
1463#: sequencer.c:765
1464#, c-format
1465msgid "Could not open %s"
1466msgstr "不能打开 %s"
1467
1468#: sequencer.c:769
1469#, c-format
1470msgid "Could not read %s."
1471msgstr "不能读取 %s。"
1472
1473#: sequencer.c:776
1474#, c-format
1475msgid "Unusable instruction sheet: %s"
1476msgstr "无用的指令表单:%s"
1477
1478#: sequencer.c:806
1479#, c-format
1480msgid "Invalid key: %s"
1481msgstr "无效键名:%s"
1482
1483#: sequencer.c:809
1484#, c-format
1485msgid "Invalid value for %s: %s"
1486msgstr "%s 的值无效:%s"
1487
1488#: sequencer.c:821
1489#, c-format
1490msgid "Malformed options sheet: %s"
1491msgstr "非法的选项表单:%s"
1492
1493#: sequencer.c:842
1494msgid "a cherry-pick or revert is already in progress"
1495msgstr "一个拣选或还原操作已在进行"
1496
1497#: sequencer.c:843
1498msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1499msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1500
1501#: sequencer.c:847
1502#, c-format
1503msgid "Could not create sequencer directory %s"
1504msgstr "不能创建序列目录 %s"
1505
1506#: sequencer.c:863 sequencer.c:948
1507#, c-format
1508msgid "Error wrapping up %s."
1509msgstr "错误收尾 %s。"
1510
1511#: sequencer.c:882 sequencer.c:1018
1512msgid "no cherry-pick or revert in progress"
1513msgstr "拣选或还原操作并未进行"
1514
1515#: sequencer.c:884
1516msgid "cannot resolve HEAD"
1517msgstr "不能解析 HEAD"
1518
1519#: sequencer.c:886
1520msgid "cannot abort from a branch yet to be born"
1521msgstr "不能从尚未建立的分支终止"
1522
1523#: sequencer.c:908 builtin/apply.c:4291
1524#, c-format
1525msgid "cannot open %s: %s"
1526msgstr "不能打开 %s:%s"
1527
1528#: sequencer.c:911
1529#, c-format
1530msgid "cannot read %s: %s"
1531msgstr "不能读取 %s:%s"
1532
1533#: sequencer.c:912
1534msgid "unexpected end of file"
1535msgstr "意外的文件结束"
1536
1537#: sequencer.c:918
1538#, c-format
1539msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1540msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1541
1542#: sequencer.c:941
1543#, c-format
1544msgid "Could not format %s."
1545msgstr "不能格式化 %s。"
1546
1547#: sequencer.c:1086
1548#, c-format
1549msgid "%s: can't cherry-pick a %s"
1550msgstr "%s:不能拣选一个%s"
1551
1552#: sequencer.c:1089
1553#, c-format
1554msgid "%s: bad revision"
1555msgstr "%s:错误的版本"
1556
1557#: sequencer.c:1123
1558msgid "Can't revert as initial commit"
1559msgstr "不能作为初始提交还原"
1560
1561#: sequencer.c:1124
1562msgid "Can't cherry-pick into empty head"
1563msgstr "不能拣选到空分支"
1564
1565#: setup.c:243
1566#, c-format
1567msgid "failed to read %s"
1568msgstr "无法读取 %s"
1569
1570#: sha1_name.c:453
1571msgid ""
1572"Git normally never creates a ref that ends with 40 hex characters\n"
1573"because it will be ignored when you just specify 40-hex. These refs\n"
1574"may be created by mistake. For example,\n"
1575"\n"
1576"  git checkout -b $br $(git rev-parse ...)\n"
1577"\n"
1578"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1579"examine these refs and maybe delete them. Turn this message off by\n"
1580"running \"git config advice.objectNameWarning false\""
1581msgstr ""
1582"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1583"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1584"\n"
1585"  git checkout -b $br $(git rev-parse ...)\n"
1586"\n"
1587"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1588"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1589"命令关闭本消息通知。"
1590
1591#: submodule.c:64 submodule.c:98
1592msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1593msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1594
1595#: submodule.c:68 submodule.c:102
1596#, c-format
1597msgid "Could not find section in .gitmodules where path=%s"
1598msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1599
1600#: submodule.c:76
1601#, c-format
1602msgid "Could not update .gitmodules entry %s"
1603msgstr "不能更新 .gitmodules 条目 %s"
1604
1605#: submodule.c:109
1606#, c-format
1607msgid "Could not remove .gitmodules entry for %s"
1608msgstr "无法移除 %s 的 .gitmodules 条目"
1609
1610#: submodule.c:120
1611msgid "staging updated .gitmodules failed"
1612msgstr "将更新后 .gitmodules 添加暂存区失败"
1613
1614#: submodule.c:1115
1615#, c-format
1616msgid "Could not set core.worktree in %s"
1617msgstr "不能在 %s 中设置 core.worktree"
1618
1619#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1620#: trailer.c:561
1621#, c-format
1622msgid "unknown value '%s' for key '%s'"
1623msgstr "键 '%2$s' 的未知取值 '%1$s'"
1624
1625#: trailer.c:543 trailer.c:548 builtin/remote.c:290
1626#, c-format
1627msgid "more than one %s"
1628msgstr "多于一个 %s"
1629
1630#: trailer.c:581
1631#, c-format
1632msgid "empty trailer token in trailer '%.*s'"
1633msgstr "签名 '%.*s' 的键为空"
1634
1635#: trailer.c:701
1636#, c-format
1637msgid "could not read input file '%s'"
1638msgstr "不能读取输入文件 '%s'"
1639
1640#: trailer.c:704
1641msgid "could not read from stdin"
1642msgstr "不能自标准输入读取"
1643
1644#: unpack-trees.c:203
1645msgid "Checking out files"
1646msgstr "正在检出文件"
1647
1648#: urlmatch.c:120
1649msgid "invalid URL scheme name or missing '://' suffix"
1650msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1651
1652#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1653#, c-format
1654msgid "invalid %XX escape sequence"
1655msgstr "无效的 %XX 转义序列"
1656
1657#: urlmatch.c:172
1658msgid "missing host and scheme is not 'file:'"
1659msgstr "缺失主机名且 URL 方案不是 'file:'"
1660
1661#: urlmatch.c:189
1662msgid "a 'file:' URL may not have a port number"
1663msgstr "一个 'file:' URL 不应该包含端口号"
1664
1665#: urlmatch.c:199
1666msgid "invalid characters in host name"
1667msgstr "主机名中包含无效的字符"
1668
1669#: urlmatch.c:244 urlmatch.c:255
1670msgid "invalid port number"
1671msgstr "无效的端口号"
1672
1673#: urlmatch.c:322
1674msgid "invalid '..' path segment"
1675msgstr "无效的 '..' 路径片段"
1676
1677#: wrapper.c:523
1678#, c-format
1679msgid "unable to access '%s': %s"
1680msgstr "不能访问 '%s':%s"
1681
1682#: wrapper.c:544
1683#, c-format
1684msgid "unable to access '%s'"
1685msgstr "不能访问 '%s'"
1686
1687#: wrapper.c:555
1688#, c-format
1689msgid "unable to look up current user in the passwd file: %s"
1690msgstr "无法在口令文件中查询到当前用户:%s"
1691
1692#: wrapper.c:556
1693msgid "no such user"
1694msgstr "无此用户"
1695
1696#: wrapper.c:564
1697msgid "unable to get current working directory"
1698msgstr "不能获取当前工作目录"
1699
1700#: wrapper.c:575
1701#, c-format
1702msgid "could not open %s for writing"
1703msgstr "不能写入 %s"
1704
1705#: wrapper.c:587
1706#, c-format
1707msgid "could not write to %s"
1708msgstr "不能写入 %s"
1709
1710#: wrapper.c:593
1711#, c-format
1712msgid "could not close %s"
1713msgstr "不能关闭 %s"
1714
1715#: wt-status.c:150
1716msgid "Unmerged paths:"
1717msgstr "未合并的路径:"
1718
1719#  译者:注意保持前导空格
1720#: wt-status.c:177 wt-status.c:204
1721#, c-format
1722msgid "  (use \"git reset %s <file>...\" to unstage)"
1723msgstr "  (使用 \"git reset %s <文件>...\" 以取消暂存)"
1724
1725#  译者:注意保持前导空格
1726#: wt-status.c:179 wt-status.c:206
1727msgid "  (use \"git rm --cached <file>...\" to unstage)"
1728msgstr "  (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1729
1730#  译者:注意保持前导空格
1731#: wt-status.c:183
1732msgid "  (use \"git add <file>...\" to mark resolution)"
1733msgstr "  (使用 \"git add <文件>...\" 标记解决方案)"
1734
1735#  译者:注意保持前导空格
1736#: wt-status.c:185 wt-status.c:189
1737msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1738msgstr "  (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1739
1740#  译者:注意保持前导空格
1741#: wt-status.c:187
1742msgid "  (use \"git rm <file>...\" to mark resolution)"
1743msgstr "  (使用 \"git rm <文件>...\" 标记解决方案)"
1744
1745#: wt-status.c:198 wt-status.c:881
1746msgid "Changes to be committed:"
1747msgstr "要提交的变更:"
1748
1749#: wt-status.c:216 wt-status.c:890
1750msgid "Changes not staged for commit:"
1751msgstr "尚未暂存以备提交的变更:"
1752
1753#  译者:注意保持前导空格
1754#: wt-status.c:220
1755msgid "  (use \"git add <file>...\" to update what will be committed)"
1756msgstr "  (使用 \"git add <文件>...\" 更新要提交的内容)"
1757
1758#  译者:注意保持前导空格
1759#: wt-status.c:222
1760msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1761msgstr "  (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1762
1763#  译者:注意保持前导空格
1764#: wt-status.c:223
1765msgid ""
1766"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1767msgstr "  (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1768
1769#  译者:注意保持前导空格
1770#: wt-status.c:225
1771msgid "  (commit or discard the untracked or modified content in submodules)"
1772msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
1773
1774#  译者:注意保持前导空格
1775#: wt-status.c:237
1776#, c-format
1777msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1778msgstr "  (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1779
1780#: wt-status.c:252
1781msgid "both deleted:"
1782msgstr "双方删除:"
1783
1784#: wt-status.c:254
1785msgid "added by us:"
1786msgstr "由我们添加:"
1787
1788#: wt-status.c:256
1789msgid "deleted by them:"
1790msgstr "由他们删除:"
1791
1792#: wt-status.c:258
1793msgid "added by them:"
1794msgstr "由他们添加:"
1795
1796#: wt-status.c:260
1797msgid "deleted by us:"
1798msgstr "由我们删除:"
1799
1800#: wt-status.c:262
1801msgid "both added:"
1802msgstr "双方添加:"
1803
1804#: wt-status.c:264
1805msgid "both modified:"
1806msgstr "双方修改:"
1807
1808#: wt-status.c:266
1809#, c-format
1810msgid "bug: unhandled unmerged status %x"
1811msgstr "bug:无法处理的未合并状态 %x"
1812
1813#: wt-status.c:274
1814msgid "new file:"
1815msgstr "新文件:"
1816
1817#: wt-status.c:276
1818msgid "copied:"
1819msgstr "拷贝:"
1820
1821#: wt-status.c:278
1822msgid "deleted:"
1823msgstr "删除:"
1824
1825#: wt-status.c:280
1826msgid "modified:"
1827msgstr "修改:"
1828
1829#: wt-status.c:282
1830msgid "renamed:"
1831msgstr "重命名:"
1832
1833#: wt-status.c:284
1834msgid "typechange:"
1835msgstr "类型变更:"
1836
1837#: wt-status.c:286
1838msgid "unknown:"
1839msgstr "未知:"
1840
1841#: wt-status.c:288
1842msgid "unmerged:"
1843msgstr "未合并:"
1844
1845#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1846#: wt-status.c:370
1847msgid "new commits, "
1848msgstr "新提交, "
1849
1850#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1851#: wt-status.c:372
1852msgid "modified content, "
1853msgstr "修改的内容, "
1854
1855#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1856#: wt-status.c:374
1857msgid "untracked content, "
1858msgstr "未跟踪的内容, "
1859
1860#: wt-status.c:391
1861#, c-format
1862msgid "bug: unhandled diff status %c"
1863msgstr "bug:无法处理的差异状态 %c"
1864
1865#: wt-status.c:755
1866msgid "Submodules changed but not updated:"
1867msgstr "子模组已修改但尚未更新:"
1868
1869#: wt-status.c:757
1870msgid "Submodule changes to be committed:"
1871msgstr "要提交的子模组变更:"
1872
1873#: wt-status.c:838
1874msgid ""
1875"Do not touch the line above.\n"
1876"Everything below will be removed."
1877msgstr ""
1878"不要改动上面的一行。\n"
1879"下面的所有内容均将被删除。"
1880
1881#: wt-status.c:949
1882msgid "You have unmerged paths."
1883msgstr "您有尚未合并的路径。"
1884
1885#  译者:注意保持前导空格
1886#: wt-status.c:952
1887msgid "  (fix conflicts and run \"git commit\")"
1888msgstr "  (解决冲突并运行 \"git commit\")"
1889
1890#: wt-status.c:955
1891msgid "All conflicts fixed but you are still merging."
1892msgstr "所有冲突已解决但您仍处于合并中。"
1893
1894#  译者:注意保持前导空格
1895#: wt-status.c:958
1896msgid "  (use \"git commit\" to conclude merge)"
1897msgstr "  (使用 \"git commit\" 结束合并)"
1898
1899#: wt-status.c:968
1900msgid "You are in the middle of an am session."
1901msgstr "您正处于 am 操作过程中。"
1902
1903#: wt-status.c:971
1904msgid "The current patch is empty."
1905msgstr "当前的补丁为空。"
1906
1907#  译者:注意保持前导空格
1908#: wt-status.c:975
1909msgid "  (fix conflicts and then run \"git am --continue\")"
1910msgstr "  (解决冲突,然后运行 \"git am --continue\")"
1911
1912#  译者:注意保持前导空格
1913#: wt-status.c:977
1914msgid "  (use \"git am --skip\" to skip this patch)"
1915msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
1916
1917#  译者:注意保持前导空格
1918#: wt-status.c:979
1919msgid "  (use \"git am --abort\" to restore the original branch)"
1920msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
1921
1922#: wt-status.c:1039 wt-status.c:1056
1923#, c-format
1924msgid "You are currently rebasing branch '%s' on '%s'."
1925msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1926
1927#: wt-status.c:1044 wt-status.c:1061
1928msgid "You are currently rebasing."
1929msgstr "您在执行变基操作。"
1930
1931#  译者:注意保持前导空格
1932#: wt-status.c:1047
1933msgid "  (fix conflicts and then run \"git rebase --continue\")"
1934msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
1935
1936#  译者:注意保持前导空格
1937#: wt-status.c:1049
1938msgid "  (use \"git rebase --skip\" to skip this patch)"
1939msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
1940
1941#  译者:注意保持前导空格
1942#: wt-status.c:1051
1943msgid "  (use \"git rebase --abort\" to check out the original branch)"
1944msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
1945
1946#  译者:注意保持前导空格
1947#: wt-status.c:1064
1948msgid "  (all conflicts fixed: run \"git rebase --continue\")"
1949msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
1950
1951#: wt-status.c:1068
1952#, c-format
1953msgid ""
1954"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1955msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1956
1957#: wt-status.c:1073
1958msgid "You are currently splitting a commit during a rebase."
1959msgstr "您在执行变基操作时拆分提交。"
1960
1961#  译者:注意保持前导空格
1962#: wt-status.c:1076
1963msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
1964msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1965
1966#: wt-status.c:1080
1967#, c-format
1968msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1969msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1970
1971#: wt-status.c:1085
1972msgid "You are currently editing a commit during a rebase."
1973msgstr "您在执行变基操作时编辑提交。"
1974
1975#  译者:注意保持前导空格
1976#: wt-status.c:1088
1977msgid "  (use \"git commit --amend\" to amend the current commit)"
1978msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
1979
1980#  译者:注意保持前导空格
1981#: wt-status.c:1090
1982msgid ""
1983"  (use \"git rebase --continue\" once you are satisfied with your changes)"
1984msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
1985
1986#: wt-status.c:1100
1987#, c-format
1988msgid "You are currently cherry-picking commit %s."
1989msgstr "您在执行拣选提交 %s 的操作。"
1990
1991#  译者:注意保持前导空格
1992#: wt-status.c:1105
1993msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
1994msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
1995
1996#  译者:注意保持前导空格
1997#: wt-status.c:1108
1998msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
1999msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2000
2001#  译者:注意保持前导空格
2002#: wt-status.c:1110
2003msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2004msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2005
2006#: wt-status.c:1119
2007#, c-format
2008msgid "You are currently reverting commit %s."
2009msgstr "您在执行反转提交 %s 的操作。"
2010
2011#  译者:注意保持前导空格
2012#: wt-status.c:1124
2013msgid "  (fix conflicts and run \"git revert --continue\")"
2014msgstr "  (解决冲突并运行 \"git revert --continue\")"
2015
2016#  译者:注意保持前导空格
2017#: wt-status.c:1127
2018msgid "  (all conflicts fixed: run \"git revert --continue\")"
2019msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
2020
2021#  译者:注意保持前导空格
2022#: wt-status.c:1129
2023msgid "  (use \"git revert --abort\" to cancel the revert operation)"
2024msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
2025
2026#: wt-status.c:1140
2027#, c-format
2028msgid "You are currently bisecting, started from branch '%s'."
2029msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2030
2031#: wt-status.c:1144
2032msgid "You are currently bisecting."
2033msgstr "您在执行二分查找操作。"
2034
2035#  译者:注意保持前导空格
2036#: wt-status.c:1147
2037msgid "  (use \"git bisect reset\" to get back to the original branch)"
2038msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
2039
2040#: wt-status.c:1324
2041msgid "On branch "
2042msgstr "位于分支 "
2043
2044#: wt-status.c:1331
2045msgid "rebase in progress; onto "
2046msgstr "变基操作正在进行中;至 "
2047
2048#: wt-status.c:1336
2049msgid "HEAD detached at "
2050msgstr "头指针分离于 "
2051
2052#: wt-status.c:1338
2053msgid "HEAD detached from "
2054msgstr "头指针分离自 "
2055
2056#: wt-status.c:1341
2057msgid "Not currently on any branch."
2058msgstr "当前不在任何分支上。"
2059
2060#: wt-status.c:1358
2061msgid "Initial commit"
2062msgstr "初始提交"
2063
2064#: wt-status.c:1372
2065msgid "Untracked files"
2066msgstr "未跟踪的文件"
2067
2068#: wt-status.c:1374
2069msgid "Ignored files"
2070msgstr "忽略的文件"
2071
2072#: wt-status.c:1378
2073#, c-format
2074msgid ""
2075"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2076"may speed it up, but you have to be careful not to forget to add\n"
2077"new files yourself (see 'git help status')."
2078msgstr ""
2079"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2080"但您需要小心不要忘了添加新文件(参见 'git help status')。"
2081
2082#: wt-status.c:1384
2083#, c-format
2084msgid "Untracked files not listed%s"
2085msgstr "未跟踪的文件没有列出%s"
2086
2087#  译者:中文字符串拼接,可删除前导空格
2088#: wt-status.c:1386
2089msgid " (use -u option to show untracked files)"
2090msgstr "(使用 -u 参数显示未跟踪的文件)"
2091
2092#: wt-status.c:1392
2093msgid "No changes"
2094msgstr "没有修改"
2095
2096#: wt-status.c:1397
2097#, c-format
2098msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2099msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2100
2101#: wt-status.c:1400
2102#, c-format
2103msgid "no changes added to commit\n"
2104msgstr "修改尚未加入提交\n"
2105
2106#: wt-status.c:1403
2107#, c-format
2108msgid ""
2109"nothing added to commit but untracked files present (use \"git add\" to "
2110"track)\n"
2111msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2112
2113#: wt-status.c:1406
2114#, c-format
2115msgid "nothing added to commit but untracked files present\n"
2116msgstr "提交为空,但是存在尚未跟踪的文件\n"
2117
2118#  译者:中文字符串拼接,可删除前导空格
2119#: wt-status.c:1409
2120#, c-format
2121msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2122msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2123
2124#: wt-status.c:1412 wt-status.c:1417
2125#, c-format
2126msgid "nothing to commit\n"
2127msgstr "无文件要提交\n"
2128
2129#  译者:中文字符串拼接,可删除前导空格
2130#: wt-status.c:1415
2131#, c-format
2132msgid "nothing to commit (use -u to show untracked files)\n"
2133msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2134
2135#  译者:中文字符串拼接,可删除前导空格
2136#: wt-status.c:1419
2137#, c-format
2138msgid "nothing to commit, working directory clean\n"
2139msgstr "无文件要提交,干净的工作区\n"
2140
2141#: wt-status.c:1528
2142msgid "HEAD (no branch)"
2143msgstr "HEAD(非分支)"
2144
2145#  译者:注意保持句尾空格
2146#: wt-status.c:1534
2147msgid "Initial commit on "
2148msgstr "初始提交于 "
2149
2150#: wt-status.c:1561
2151msgid "gone"
2152msgstr "丢失"
2153
2154#  译者:注意保持句尾空格
2155#: wt-status.c:1563 wt-status.c:1571
2156msgid "behind "
2157msgstr "落后 "
2158
2159#: compat/precompose_utf8.c:55 builtin/clone.c:345
2160#, c-format
2161msgid "failed to unlink '%s'"
2162msgstr "无法删除 '%s'"
2163
2164#: builtin/add.c:22
2165msgid "git add [<options>] [--] <pathspec>..."
2166msgstr "git add [<选项>] [--] <路径规格>..."
2167
2168#: builtin/add.c:65
2169#, c-format
2170msgid "unexpected diff status %c"
2171msgstr "意外的差异状态 %c"
2172
2173#: builtin/add.c:70 builtin/commit.c:277
2174msgid "updating files failed"
2175msgstr "更新文件失败"
2176
2177#: builtin/add.c:80
2178#, c-format
2179msgid "remove '%s'\n"
2180msgstr "删除 '%s'\n"
2181
2182#: builtin/add.c:134
2183msgid "Unstaged changes after refreshing the index:"
2184msgstr "刷新索引之后尚未被暂存的变更:"
2185
2186#: builtin/add.c:194 builtin/rev-parse.c:796
2187msgid "Could not read the index"
2188msgstr "不能读取索引"
2189
2190#: builtin/add.c:205
2191#, c-format
2192msgid "Could not open '%s' for writing."
2193msgstr "不能打开 '%s' 以写入。"
2194
2195#: builtin/add.c:209
2196msgid "Could not write patch"
2197msgstr "不能生成补丁"
2198
2199#: builtin/add.c:212
2200msgid "editing patch failed"
2201msgstr "编辑补丁失败"
2202
2203#: builtin/add.c:215
2204#, c-format
2205msgid "Could not stat '%s'"
2206msgstr "不能查看文件状态 '%s'"
2207
2208#: builtin/add.c:217
2209msgid "Empty patch. Aborted."
2210msgstr "空补丁。异常终止。"
2211
2212#: builtin/add.c:222
2213#, c-format
2214msgid "Could not apply '%s'"
2215msgstr "不能应用 '%s'"
2216
2217#: builtin/add.c:232
2218msgid "The following paths are ignored by one of your .gitignore files:\n"
2219msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2220
2221#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2222#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2223#: builtin/rm.c:268
2224msgid "dry run"
2225msgstr "演习"
2226
2227#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2228#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
2229#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2230msgid "be verbose"
2231msgstr "冗长输出"
2232
2233#: builtin/add.c:252
2234msgid "interactive picking"
2235msgstr "交互式拣选"
2236
2237#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
2238msgid "select hunks interactively"
2239msgstr "交互式挑选数据块"
2240
2241#: builtin/add.c:254
2242msgid "edit current diff and apply"
2243msgstr "编辑当前差异并应用"
2244
2245#: builtin/add.c:255
2246msgid "allow adding otherwise ignored files"
2247msgstr "允许添加忽略的文件"
2248
2249#: builtin/add.c:256
2250msgid "update tracked files"
2251msgstr "更新已跟踪的文件"
2252
2253#: builtin/add.c:257
2254msgid "record only the fact that the path will be added later"
2255msgstr "只记录,该路径稍后再添加"
2256
2257#: builtin/add.c:258
2258msgid "add changes from all tracked and untracked files"
2259msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2260
2261#: builtin/add.c:261
2262msgid "ignore paths removed in the working tree (same as --no-all)"
2263msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2264
2265#: builtin/add.c:263
2266msgid "don't add, only refresh the index"
2267msgstr "不添加,只刷新索引"
2268
2269#: builtin/add.c:264
2270msgid "just skip files which cannot be added because of errors"
2271msgstr "跳过因出错不能添加的文件"
2272
2273#: builtin/add.c:265
2274msgid "check if - even missing - files are ignored in dry run"
2275msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2276
2277#: builtin/add.c:287
2278#, c-format
2279msgid "Use -f if you really want to add them.\n"
2280msgstr "使用 -f 参数如果您确实要添加它们。\n"
2281
2282#: builtin/add.c:294
2283msgid "adding files failed"
2284msgstr "添加文件失败"
2285
2286#: builtin/add.c:330
2287msgid "-A and -u are mutually incompatible"
2288msgstr "-A 和 -u 选项互斥"
2289
2290#: builtin/add.c:337
2291msgid "Option --ignore-missing can only be used together with --dry-run"
2292msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2293
2294#: builtin/add.c:358
2295#, c-format
2296msgid "Nothing specified, nothing added.\n"
2297msgstr "没有指定文件,也没有文件被添加。\n"
2298
2299#: builtin/add.c:359
2300#, c-format
2301msgid "Maybe you wanted to say 'git add .'?\n"
2302msgstr "也许您想要执行 'git add .'?\n"
2303
2304#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2305#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2306msgid "index file corrupt"
2307msgstr "索引文件损坏"
2308
2309#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
2310msgid "Unable to write new index file"
2311msgstr "无法写入新索引文件"
2312
2313#: builtin/apply.c:59
2314msgid "git apply [<options>] [<patch>...]"
2315msgstr "git apply [<选项>] [<补丁>...]"
2316
2317#: builtin/apply.c:112
2318#, c-format
2319msgid "unrecognized whitespace option '%s'"
2320msgstr "未能识别的空白字符选项 '%s'"
2321
2322#: builtin/apply.c:127
2323#, c-format
2324msgid "unrecognized whitespace ignore option '%s'"
2325msgstr "未能识别的空白字符忽略选项 '%s'"
2326
2327#: builtin/apply.c:822
2328#, c-format
2329msgid "Cannot prepare timestamp regexp %s"
2330msgstr "无法准备时间戳正则表达式 %s"
2331
2332#: builtin/apply.c:831
2333#, c-format
2334msgid "regexec returned %d for input: %s"
2335msgstr "regexec 返回 %d,输入为:%s"
2336
2337#: builtin/apply.c:912
2338#, c-format
2339msgid "unable to find filename in patch at line %d"
2340msgstr "不能在补丁的第 %d 行找到文件名"
2341
2342#: builtin/apply.c:944
2343#, c-format
2344msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2345msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2346
2347#: builtin/apply.c:948
2348#, c-format
2349msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2350msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2351
2352#: builtin/apply.c:949
2353#, c-format
2354msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2355msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2356
2357#: builtin/apply.c:956
2358#, c-format
2359msgid "git apply: bad git-diff - expected /dev/null on line %d"
2360msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2361
2362#: builtin/apply.c:1419
2363#, c-format
2364msgid "recount: unexpected line: %.*s"
2365msgstr "recount:意外的行:%.*s"
2366
2367#: builtin/apply.c:1476
2368#, c-format
2369msgid "patch fragment without header at line %d: %.*s"
2370msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2371
2372#: builtin/apply.c:1493
2373#, c-format
2374msgid ""
2375"git diff header lacks filename information when removing %d leading pathname "
2376"component (line %d)"
2377msgid_plural ""
2378"git diff header lacks filename information when removing %d leading pathname "
2379"components (line %d)"
2380msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2381msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2382
2383#: builtin/apply.c:1659
2384msgid "new file depends on old contents"
2385msgstr "新文件依赖旧内容"
2386
2387#: builtin/apply.c:1661
2388msgid "deleted file still has contents"
2389msgstr "删除的文件仍有内容"
2390
2391#: builtin/apply.c:1687
2392#, c-format
2393msgid "corrupt patch at line %d"
2394msgstr "补丁在第 %d 行损坏"
2395
2396#: builtin/apply.c:1723
2397#, c-format
2398msgid "new file %s depends on old contents"
2399msgstr "新文件 %s 依赖旧内容"
2400
2401#: builtin/apply.c:1725
2402#, c-format
2403msgid "deleted file %s still has contents"
2404msgstr "删除的文件 %s 仍有内容"
2405
2406#: builtin/apply.c:1728
2407#, c-format
2408msgid "** warning: file %s becomes empty but is not deleted"
2409msgstr "** 警告:文件 %s 成为空文件但并未删除"
2410
2411#: builtin/apply.c:1874
2412#, c-format
2413msgid "corrupt binary patch at line %d: %.*s"
2414msgstr "二进制补丁在第 %d 行损坏:%.*s"
2415
2416#: builtin/apply.c:1903
2417#, c-format
2418msgid "unrecognized binary patch at line %d"
2419msgstr "未能识别的二进制补丁位于第 %d 行"
2420
2421#: builtin/apply.c:2054
2422#, c-format
2423msgid "patch with only garbage at line %d"
2424msgstr "补丁文件的第 %d 行只有垃圾数据"
2425
2426#: builtin/apply.c:2144
2427#, c-format
2428msgid "unable to read symlink %s"
2429msgstr "无法读取符号链接 %s"
2430
2431#: builtin/apply.c:2148
2432#, c-format
2433msgid "unable to open or read %s"
2434msgstr "不能打开或读取 %s"
2435
2436#: builtin/apply.c:2781
2437#, c-format
2438msgid "invalid start of line: '%c'"
2439msgstr "无效的行首字符:'%c'"
2440
2441#: builtin/apply.c:2900
2442#, c-format
2443msgid "Hunk #%d succeeded at %d (offset %d line)."
2444msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2445msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2446msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2447
2448#: builtin/apply.c:2912
2449#, c-format
2450msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2451msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2452
2453#: builtin/apply.c:2918
2454#, c-format
2455msgid ""
2456"while searching for:\n"
2457"%.*s"
2458msgstr ""
2459"当查询:\n"
2460"%.*s"
2461
2462#: builtin/apply.c:2938
2463#, c-format
2464msgid "missing binary patch data for '%s'"
2465msgstr "缺失 '%s' 的二进制补丁数据"
2466
2467#: builtin/apply.c:3039
2468#, c-format
2469msgid "binary patch does not apply to '%s'"
2470msgstr "二进制补丁未应用到 '%s'"
2471
2472#: builtin/apply.c:3045
2473#, c-format
2474msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2475msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2476
2477#: builtin/apply.c:3066
2478#, c-format
2479msgid "patch failed: %s:%ld"
2480msgstr "打补丁失败:%s:%ld"
2481
2482#: builtin/apply.c:3190
2483#, c-format
2484msgid "cannot checkout %s"
2485msgstr "不能检出 %s"
2486
2487#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
2488#, c-format
2489msgid "read of %s failed"
2490msgstr "读取 %s 失败"
2491
2492#: builtin/apply.c:3243
2493#, c-format
2494msgid "reading from '%s' beyond a symbolic link"
2495msgstr "读取位于符号链接中的 '%s'"
2496
2497#: builtin/apply.c:3271 builtin/apply.c:3493
2498#, c-format
2499msgid "path %s has been renamed/deleted"
2500msgstr "路径 %s 已经被重命名/删除"
2501
2502#: builtin/apply.c:3352 builtin/apply.c:3507
2503#, c-format
2504msgid "%s: does not exist in index"
2505msgstr "%s:不存在于索引中"
2506
2507#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
2508#, c-format
2509msgid "%s: %s"
2510msgstr "%s:%s"
2511
2512#: builtin/apply.c:3361 builtin/apply.c:3515
2513#, c-format
2514msgid "%s: does not match index"
2515msgstr "%s:和索引不匹配"
2516
2517#: builtin/apply.c:3463
2518msgid "removal patch leaves file contents"
2519msgstr "移除补丁仍留下了文件内容"
2520
2521#: builtin/apply.c:3532
2522#, c-format
2523msgid "%s: wrong type"
2524msgstr "%s:错误类型"
2525
2526#: builtin/apply.c:3534
2527#, c-format
2528msgid "%s has type %o, expected %o"
2529msgstr "%s 的类型是 %o,应为 %o"
2530
2531#: builtin/apply.c:3693 builtin/apply.c:3695
2532#, c-format
2533msgid "invalid path '%s'"
2534msgstr "无效路径 '%s'"
2535
2536#: builtin/apply.c:3750
2537#, c-format
2538msgid "%s: already exists in index"
2539msgstr "%s:已经存在于索引中"
2540
2541#: builtin/apply.c:3753
2542#, c-format
2543msgid "%s: already exists in working directory"
2544msgstr "%s:已经存在于工作区中"
2545
2546#: builtin/apply.c:3773
2547#, c-format
2548msgid "new mode (%o) of %s does not match old mode (%o)"
2549msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2550
2551#: builtin/apply.c:3778
2552#, c-format
2553msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2554msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2555
2556#: builtin/apply.c:3798
2557#, c-format
2558msgid "affected file '%s' is beyond a symbolic link"
2559msgstr "受影响的文件 '%s' 位于符号链接中"
2560
2561#: builtin/apply.c:3802
2562#, c-format
2563msgid "%s: patch does not apply"
2564msgstr "%s:补丁未应用"
2565
2566#: builtin/apply.c:3816
2567#, c-format
2568msgid "Checking patch %s..."
2569msgstr "检查补丁 %s..."
2570
2571#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
2572#, c-format
2573msgid "make_cache_entry failed for path '%s'"
2574msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2575
2576#: builtin/apply.c:4052
2577#, c-format
2578msgid "unable to remove %s from index"
2579msgstr "不能从索引中移除 %s"
2580
2581#: builtin/apply.c:4081
2582#, c-format
2583msgid "corrupt patch for submodule %s"
2584msgstr "子模组 %s 损坏的补丁"
2585
2586#: builtin/apply.c:4085
2587#, c-format
2588msgid "unable to stat newly created file '%s'"
2589msgstr "不能枚举新建文件 '%s' 的状态"
2590
2591#: builtin/apply.c:4090
2592#, c-format
2593msgid "unable to create backing store for newly created file %s"
2594msgstr "不能为新建文件 %s 创建后端存储"
2595
2596#: builtin/apply.c:4093 builtin/apply.c:4201
2597#, c-format
2598msgid "unable to add cache entry for %s"
2599msgstr "无法为 %s 添加缓存条目"
2600
2601#: builtin/apply.c:4126
2602#, c-format
2603msgid "closing file '%s'"
2604msgstr "关闭文件 '%s'"
2605
2606#: builtin/apply.c:4175
2607#, c-format
2608msgid "unable to write file '%s' mode %o"
2609msgstr "不能写文件 '%s' 权限 %o"
2610
2611#: builtin/apply.c:4262
2612#, c-format
2613msgid "Applied patch %s cleanly."
2614msgstr "成功应用补丁 %s。"
2615
2616#: builtin/apply.c:4270
2617msgid "internal error"
2618msgstr "内部错误"
2619
2620#: builtin/apply.c:4273
2621#, c-format
2622msgid "Applying patch %%s with %d reject..."
2623msgid_plural "Applying patch %%s with %d rejects..."
2624msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2625msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2626
2627#: builtin/apply.c:4283
2628#, c-format
2629msgid "truncating .rej filename to %.*s.rej"
2630msgstr "截短 .rej 文件名为 %.*s.rej"
2631
2632#: builtin/apply.c:4304
2633#, c-format
2634msgid "Hunk #%d applied cleanly."
2635msgstr "第 #%d 个片段成功应用。"
2636
2637#: builtin/apply.c:4307
2638#, c-format
2639msgid "Rejected hunk #%d."
2640msgstr "拒绝第 #%d 个片段。"
2641
2642#: builtin/apply.c:4397
2643msgid "unrecognized input"
2644msgstr "未能识别的输入"
2645
2646#: builtin/apply.c:4408
2647msgid "unable to read index file"
2648msgstr "无法读取索引文件"
2649
2650#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
2651#: builtin/fetch.c:92
2652msgid "path"
2653msgstr "路径"
2654
2655#: builtin/apply.c:4526
2656msgid "don't apply changes matching the given path"
2657msgstr "不要应用与给出路径向匹配的变更"
2658
2659#: builtin/apply.c:4529
2660msgid "apply changes matching the given path"
2661msgstr "应用与给出路径向匹配的变更"
2662
2663#: builtin/apply.c:4531
2664msgid "num"
2665msgstr "数字"
2666
2667#: builtin/apply.c:4532
2668msgid "remove <num> leading slashes from traditional diff paths"
2669msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2670
2671#: builtin/apply.c:4535
2672msgid "ignore additions made by the patch"
2673msgstr "忽略补丁中的添加的文件"
2674
2675#: builtin/apply.c:4537
2676msgid "instead of applying the patch, output diffstat for the input"
2677msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2678
2679#: builtin/apply.c:4541
2680msgid "show number of added and deleted lines in decimal notation"
2681msgstr "以十进制数显示添加和删除的行数"
2682
2683#: builtin/apply.c:4543
2684msgid "instead of applying the patch, output a summary for the input"
2685msgstr "不应用补丁,而是显示输入的概要"
2686
2687#: builtin/apply.c:4545
2688msgid "instead of applying the patch, see if the patch is applicable"
2689msgstr "不应用补丁,而是查看补丁是否可应用"
2690
2691#: builtin/apply.c:4547
2692msgid "make sure the patch is applicable to the current index"
2693msgstr "确认补丁可以应用到当前索引"
2694
2695#: builtin/apply.c:4549
2696msgid "apply a patch without touching the working tree"
2697msgstr "应用补丁而不修改工作区"
2698
2699#: builtin/apply.c:4551
2700msgid "accept a patch that touches outside the working area"
2701msgstr "接受修改工作区之外文件的补丁"
2702
2703#: builtin/apply.c:4553
2704msgid "also apply the patch (use with --stat/--summary/--check)"
2705msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2706
2707#: builtin/apply.c:4555
2708msgid "attempt three-way merge if a patch does not apply"
2709msgstr "如果一个补丁不能应用则尝试三方合并"
2710
2711#: builtin/apply.c:4557
2712msgid "build a temporary index based on embedded index information"
2713msgstr "创建一个临时索引基于嵌入的索引信息"
2714
2715#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
2716msgid "paths are separated with NUL character"
2717msgstr "路径以 NUL 字符分隔"
2718
2719#: builtin/apply.c:4562
2720msgid "ensure at least <n> lines of context match"
2721msgstr "确保至少匹配 <n> 行上下文"
2722
2723#: builtin/apply.c:4563
2724msgid "action"
2725msgstr "动作"
2726
2727#: builtin/apply.c:4564
2728msgid "detect new or modified lines that have whitespace errors"
2729msgstr "检查新增和修改的行中间的空白字符滥用"
2730
2731#: builtin/apply.c:4567 builtin/apply.c:4570
2732msgid "ignore changes in whitespace when finding context"
2733msgstr "查找上下文时忽略空白字符的变更"
2734
2735#: builtin/apply.c:4573
2736msgid "apply the patch in reverse"
2737msgstr "反向应用补丁"
2738
2739#: builtin/apply.c:4575
2740msgid "don't expect at least one line of context"
2741msgstr "无需至少一行上下文"
2742
2743#: builtin/apply.c:4577
2744msgid "leave the rejected hunks in corresponding *.rej files"
2745msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2746
2747#: builtin/apply.c:4579
2748msgid "allow overlapping hunks"
2749msgstr "允许重叠的补丁片段"
2750
2751#: builtin/apply.c:4582
2752msgid "tolerate incorrectly detected missing new-line at the end of file"
2753msgstr "允许不正确的文件末尾换行符"
2754
2755#: builtin/apply.c:4585
2756msgid "do not trust the line counts in the hunk headers"
2757msgstr "不信任补丁片段的头信息中的行号"
2758
2759#: builtin/apply.c:4587
2760msgid "root"
2761msgstr "根目录"
2762
2763#: builtin/apply.c:4588
2764msgid "prepend <root> to all filenames"
2765msgstr "为所有文件名前添加 <根目录>"
2766
2767#: builtin/apply.c:4610
2768msgid "--3way outside a repository"
2769msgstr "--3way 在一个仓库之外"
2770
2771#: builtin/apply.c:4618
2772msgid "--index outside a repository"
2773msgstr "--index 在一个仓库之外"
2774
2775#: builtin/apply.c:4621
2776msgid "--cached outside a repository"
2777msgstr "--cached 在一个仓库之外"
2778
2779#: builtin/apply.c:4640
2780#, c-format
2781msgid "can't open patch '%s'"
2782msgstr "不能打开补丁 '%s'"
2783
2784#: builtin/apply.c:4654
2785#, c-format
2786msgid "squelched %d whitespace error"
2787msgid_plural "squelched %d whitespace errors"
2788msgstr[0] "抑制下仍有 %d 个空白字符误用"
2789msgstr[1] "抑制下仍有 %d 个空白字符误用"
2790
2791#: builtin/apply.c:4660 builtin/apply.c:4670
2792#, c-format
2793msgid "%d line adds whitespace errors."
2794msgid_plural "%d lines add whitespace errors."
2795msgstr[0] "%d 行有空白字符误用。"
2796msgstr[1] "%d 行有空白字符误用。"
2797
2798#: builtin/archive.c:17
2799#, c-format
2800msgid "could not create archive file '%s'"
2801msgstr "不能创建归档文件 '%s'"
2802
2803#: builtin/archive.c:20
2804msgid "could not redirect output"
2805msgstr "不能重定向输出"
2806
2807#: builtin/archive.c:37
2808msgid "git archive: Remote with no URL"
2809msgstr "git archive:未提供远程 URL"
2810
2811#: builtin/archive.c:58
2812msgid "git archive: expected ACK/NAK, got EOF"
2813msgstr "git archive:应为 ACK/NACK,却得到 EOF"
2814
2815#: builtin/archive.c:61
2816#, c-format
2817msgid "git archive: NACK %s"
2818msgstr "git archive:NACK %s"
2819
2820#: builtin/archive.c:63
2821#, c-format
2822msgid "remote error: %s"
2823msgstr "远程错误:%s"
2824
2825#: builtin/archive.c:64
2826msgid "git archive: protocol error"
2827msgstr "git archive:协议错误"
2828
2829#: builtin/archive.c:68
2830msgid "git archive: expected a flush"
2831msgstr "git archive:应为刷新"
2832
2833#: builtin/bisect--helper.c:7
2834msgid "git bisect--helper --next-all [--no-checkout]"
2835msgstr "git bisect--helper --next-all [--no-checkout]"
2836
2837#: builtin/bisect--helper.c:17
2838msgid "perform 'git bisect next'"
2839msgstr "执行 'git bisect next'"
2840
2841#: builtin/bisect--helper.c:19
2842msgid "update BISECT_HEAD instead of checking out the current commit"
2843msgstr "更新 BISECT_HEAD 而非检出当前提交"
2844
2845#: builtin/blame.c:31
2846msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2847msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
2848
2849#: builtin/blame.c:36
2850msgid "<rev-opts> are documented in git-rev-list(1)"
2851msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2852
2853#: builtin/blame.c:2500
2854msgid "Show blame entries as we find them, incrementally"
2855msgstr "增量式地显示发现的 blame 条目"
2856
2857#: builtin/blame.c:2501
2858msgid "Show blank SHA-1 for boundary commits (Default: off)"
2859msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2860
2861#: builtin/blame.c:2502
2862msgid "Do not treat root commits as boundaries (Default: off)"
2863msgstr "不把根提交作为边界(默认:关闭)"
2864
2865#: builtin/blame.c:2503
2866msgid "Show work cost statistics"
2867msgstr "显示命令消耗统计"
2868
2869#: builtin/blame.c:2504
2870msgid "Show output score for blame entries"
2871msgstr "显示判断 blame 条目位移的得分诊断信息"
2872
2873#: builtin/blame.c:2505
2874msgid "Show original filename (Default: auto)"
2875msgstr "显示原始文件名(默认:自动)"
2876
2877#: builtin/blame.c:2506
2878msgid "Show original linenumber (Default: off)"
2879msgstr "显示原始的行号(默认:关闭)"
2880
2881#: builtin/blame.c:2507
2882msgid "Show in a format designed for machine consumption"
2883msgstr "显示为一个适合机器读取的格式"
2884
2885#: builtin/blame.c:2508
2886msgid "Show porcelain format with per-line commit information"
2887msgstr "为每一行显示机器适用的提交信息"
2888
2889#: builtin/blame.c:2509
2890msgid "Use the same output mode as git-annotate (Default: off)"
2891msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2892
2893#: builtin/blame.c:2510
2894msgid "Show raw timestamp (Default: off)"
2895msgstr "显示原始时间戳(默认:关闭)"
2896
2897#: builtin/blame.c:2511
2898msgid "Show long commit SHA1 (Default: off)"
2899msgstr "显示长的 SHA1 提交号(默认:关闭)"
2900
2901#: builtin/blame.c:2512
2902msgid "Suppress author name and timestamp (Default: off)"
2903msgstr "隐藏作者名字和时间戳(默认:关闭)"
2904
2905#: builtin/blame.c:2513
2906msgid "Show author email instead of name (Default: off)"
2907msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2908
2909#: builtin/blame.c:2514
2910msgid "Ignore whitespace differences"
2911msgstr "忽略空白差异"
2912
2913#: builtin/blame.c:2515
2914msgid "Spend extra cycles to find better match"
2915msgstr "花费额外的循环来找到更好的匹配"
2916
2917#: builtin/blame.c:2516
2918msgid "Use revisions from <file> instead of calling git-rev-list"
2919msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2920
2921#: builtin/blame.c:2517
2922msgid "Use <file>'s contents as the final image"
2923msgstr "使用 <文件> 的内容作为最终的图片"
2924
2925#: builtin/blame.c:2518 builtin/blame.c:2519
2926msgid "score"
2927msgstr "得分"
2928
2929#: builtin/blame.c:2518
2930msgid "Find line copies within and across files"
2931msgstr "找到文件内及跨文件的行拷贝"
2932
2933#: builtin/blame.c:2519
2934msgid "Find line movements within and across files"
2935msgstr "找到文件内及跨文件的行移动"
2936
2937#: builtin/blame.c:2520
2938msgid "n,m"
2939msgstr "n,m"
2940
2941#: builtin/blame.c:2520
2942msgid "Process only line range n,m, counting from 1"
2943msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2944
2945#. TRANSLATORS: This string is used to tell us the maximum
2946#. display width for a relative timestamp in "git blame"
2947#. output.  For C locale, "4 years, 11 months ago", which
2948#. takes 22 places, is the longest among various forms of
2949#. relative timestamps, but your language may need more or
2950#. fewer display columns.
2951#: builtin/blame.c:2601
2952msgid "4 years, 11 months ago"
2953msgstr "4 年 11 个月前"
2954
2955#: builtin/branch.c:24
2956msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2957msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2958
2959#: builtin/branch.c:25
2960msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2961msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2962
2963#: builtin/branch.c:26
2964msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2965msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2966
2967#: builtin/branch.c:27
2968msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2969msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2970
2971#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2972#: builtin/branch.c:150
2973#, c-format
2974msgid ""
2975"deleting branch '%s' that has been merged to\n"
2976"         '%s', but not yet merged to HEAD."
2977msgstr ""
2978"将要删除的分支 '%s' 已经被合并到\n"
2979"         '%s',但未合并到 HEAD。"
2980
2981#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2982#: builtin/branch.c:154
2983#, c-format
2984msgid ""
2985"not deleting branch '%s' that is not yet merged to\n"
2986"         '%s', even though it is merged to HEAD."
2987msgstr ""
2988"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2989"         然而却尚未被合并到分支 '%s' 。"
2990
2991#: builtin/branch.c:168
2992#, c-format
2993msgid "Couldn't look up commit object for '%s'"
2994msgstr "无法查询 '%s' 指向的提交对象"
2995
2996#: builtin/branch.c:172
2997#, c-format
2998msgid ""
2999"The branch '%s' is not fully merged.\n"
3000"If you are sure you want to delete it, run 'git branch -D %s'."
3001msgstr ""
3002"分支 '%s' 没有完全合并。\n"
3003"如果您确认要删除它,执行 'git branch -D %s'。"
3004
3005#: builtin/branch.c:185
3006msgid "Update of config-file failed"
3007msgstr "无法更新 config 文件"
3008
3009#: builtin/branch.c:213
3010msgid "cannot use -a with -d"
3011msgstr "不能将 -a 和 -d 同时使用"
3012
3013#: builtin/branch.c:219
3014msgid "Couldn't look up commit object for HEAD"
3015msgstr "无法查询 HEAD 指向的提交对象"
3016
3017#: builtin/branch.c:227
3018#, c-format
3019msgid "Cannot delete the branch '%s' which you are currently on."
3020msgstr "无法删除您当前所在的分支 '%s'。"
3021
3022#: builtin/branch.c:243
3023#, c-format
3024msgid "remote-tracking branch '%s' not found."
3025msgstr "未能找到远程跟踪分支 '%s'。"
3026
3027#: builtin/branch.c:244
3028#, c-format
3029msgid "branch '%s' not found."
3030msgstr "分支 '%s' 未发现。"
3031
3032#: builtin/branch.c:258
3033#, c-format
3034msgid "Error deleting remote-tracking branch '%s'"
3035msgstr "无法删除远程跟踪分支 '%s'"
3036
3037#: builtin/branch.c:259
3038#, c-format
3039msgid "Error deleting branch '%s'"
3040msgstr "无法删除分支 '%s'"
3041
3042#: builtin/branch.c:266
3043#, c-format
3044msgid "Deleted remote-tracking branch %s (was %s).\n"
3045msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3046
3047#: builtin/branch.c:267
3048#, c-format
3049msgid "Deleted branch %s (was %s).\n"
3050msgstr "已删除分支 %s(曾为 %s)。\n"
3051
3052#: builtin/branch.c:368
3053#, c-format
3054msgid "branch '%s' does not point at a commit"
3055msgstr "分支 '%s' 未指向一个提交"
3056
3057#: builtin/branch.c:451
3058#, c-format
3059msgid "[%s: gone]"
3060msgstr "[%s: 丢失]"
3061
3062#: builtin/branch.c:456
3063#, c-format
3064msgid "[%s]"
3065msgstr "[%s]"
3066
3067#: builtin/branch.c:461
3068#, c-format
3069msgid "[%s: behind %d]"
3070msgstr "[%s:落后 %d]"
3071
3072#: builtin/branch.c:463
3073#, c-format
3074msgid "[behind %d]"
3075msgstr "[落后 %d]"
3076
3077#: builtin/branch.c:467
3078#, c-format
3079msgid "[%s: ahead %d]"
3080msgstr "[%s:领先 %d]"
3081
3082#: builtin/branch.c:469
3083#, c-format
3084msgid "[ahead %d]"
3085msgstr "[领先 %d]"
3086
3087#: builtin/branch.c:472
3088#, c-format
3089msgid "[%s: ahead %d, behind %d]"
3090msgstr "[%s:领先 %d,落后 %d]"
3091
3092#: builtin/branch.c:475
3093#, c-format
3094msgid "[ahead %d, behind %d]"
3095msgstr "[领先 %d,落后 %d]"
3096
3097#: builtin/branch.c:488
3098msgid " **** invalid ref ****"
3099msgstr " **** 无效引用 ****"
3100
3101#: builtin/branch.c:579
3102#, c-format
3103msgid "(no branch, rebasing %s)"
3104msgstr "(非分支,正变基 %s)"
3105
3106#: builtin/branch.c:582
3107#, c-format
3108msgid "(no branch, bisect started on %s)"
3109msgstr "(非分支,二分查找开始于 %s)"
3110
3111#: builtin/branch.c:588
3112#, c-format
3113msgid "(HEAD detached at %s)"
3114msgstr "(头指针分离于 %s)"
3115
3116#: builtin/branch.c:591
3117#, c-format
3118msgid "(HEAD detached from %s)"
3119msgstr "(头指针分离自 %s)"
3120
3121#: builtin/branch.c:595
3122msgid "(no branch)"
3123msgstr "(非分支)"
3124
3125#: builtin/branch.c:642
3126#, c-format
3127msgid "object '%s' does not point to a commit"
3128msgstr "对象 '%s' 没有指向一个提交"
3129
3130#: builtin/branch.c:690
3131msgid "some refs could not be read"
3132msgstr "一些引用不能读取"
3133
3134#: builtin/branch.c:703
3135msgid "cannot rename the current branch while not on any."
3136msgstr "无法重命名当前分支因为不处于任何分支上。"
3137
3138#: builtin/branch.c:713
3139#, c-format
3140msgid "Invalid branch name: '%s'"
3141msgstr "无效的分支名:'%s'"
3142
3143#: builtin/branch.c:728
3144msgid "Branch rename failed"
3145msgstr "分支重命名失败"
3146
3147#: builtin/branch.c:732
3148#, c-format
3149msgid "Renamed a misnamed branch '%s' away"
3150msgstr "重命名掉一个错误命名的旧分支 '%s'"
3151
3152#: builtin/branch.c:736
3153#, c-format
3154msgid "Branch renamed to %s, but HEAD is not updated!"
3155msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3156
3157#: builtin/branch.c:743
3158msgid "Branch is renamed, but update of config-file failed"
3159msgstr "分支被重命名,但更新 config 文件失败"
3160
3161#: builtin/branch.c:758
3162#, c-format
3163msgid "malformed object name %s"
3164msgstr "非法的对象名 %s"
3165
3166#: builtin/branch.c:780
3167#, c-format
3168msgid "could not write branch description template: %s"
3169msgstr "不能写分支描述模版:%s"
3170
3171#: builtin/branch.c:810
3172msgid "Generic options"
3173msgstr "通用选项"
3174
3175#: builtin/branch.c:812
3176msgid "show hash and subject, give twice for upstream branch"
3177msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3178
3179#: builtin/branch.c:813
3180msgid "suppress informational messages"
3181msgstr "不显示信息"
3182
3183#: builtin/branch.c:814
3184msgid "set up tracking mode (see git-pull(1))"
3185msgstr "设置跟踪模式(参见 git-pull(1))"
3186
3187#: builtin/branch.c:816
3188msgid "change upstream info"
3189msgstr "改变上游信息"
3190
3191#: builtin/branch.c:820
3192msgid "use colored output"
3193msgstr "使用彩色输出"
3194
3195#: builtin/branch.c:821
3196msgid "act on remote-tracking branches"
3197msgstr "作用于远程跟踪分支"
3198
3199#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3200#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3201#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
3202#: builtin/tag.c:622
3203msgid "commit"
3204msgstr "提交"
3205
3206#: builtin/branch.c:825 builtin/branch.c:831
3207msgid "print only branches that contain the commit"
3208msgstr "只打印包含该提交的分支"
3209
3210#: builtin/branch.c:837
3211msgid "Specific git-branch actions:"
3212msgstr "具体的 git-branch 动作:"
3213
3214#: builtin/branch.c:838
3215msgid "list both remote-tracking and local branches"
3216msgstr "列出远程跟踪及本地分支"
3217
3218#: builtin/branch.c:840
3219msgid "delete fully merged branch"
3220msgstr "删除完全合并的分支"
3221
3222#: builtin/branch.c:841
3223msgid "delete branch (even if not merged)"
3224msgstr "删除分支(即使没有合并)"
3225
3226#: builtin/branch.c:842
3227msgid "move/rename a branch and its reflog"
3228msgstr "移动/重命名一个分支,以及它的引用日志"
3229
3230#: builtin/branch.c:843
3231msgid "move/rename a branch, even if target exists"
3232msgstr "移动/重命名一个分支,即使目标已存在"
3233
3234#: builtin/branch.c:844
3235msgid "list branch names"
3236msgstr "列出分支名"
3237
3238#: builtin/branch.c:845
3239msgid "create the branch's reflog"
3240msgstr "创建分支的引用日志"
3241
3242#: builtin/branch.c:847
3243msgid "edit the description for the branch"
3244msgstr "标记分支的描述"
3245
3246#: builtin/branch.c:848
3247msgid "force creation, move/rename, deletion"
3248msgstr "强制创建、移动/重命名、删除"
3249
3250#: builtin/branch.c:851
3251msgid "print only not merged branches"
3252msgstr "只打印没有合并的分支"
3253
3254#: builtin/branch.c:857
3255msgid "print only merged branches"
3256msgstr "只打印合并的分支"
3257
3258#: builtin/branch.c:861
3259msgid "list branches in columns"
3260msgstr "以列的方式显示分支"
3261
3262#: builtin/branch.c:874
3263msgid "Failed to resolve HEAD as a valid ref."
3264msgstr "无法将 HEAD 解析为有效引用。"
3265
3266#: builtin/branch.c:878 builtin/clone.c:622
3267msgid "HEAD not found below refs/heads!"
3268msgstr "HEAD 没有位于 /refs/heads 之下!"
3269
3270#: builtin/branch.c:900
3271msgid "--column and --verbose are incompatible"
3272msgstr "--column 和 --verbose 不兼容"
3273
3274#: builtin/branch.c:911 builtin/branch.c:950
3275msgid "branch name required"
3276msgstr "必须提供分支名"
3277
3278#: builtin/branch.c:926
3279msgid "Cannot give description to detached HEAD"
3280msgstr "不能向分离头指针提供描述"
3281
3282#: builtin/branch.c:931
3283msgid "cannot edit description of more than one branch"
3284msgstr "不能为一个以上的分支编辑描述"
3285
3286#: builtin/branch.c:938
3287#, c-format
3288msgid "No commit on branch '%s' yet."
3289msgstr "分支 '%s' 尚无提交。"
3290
3291#: builtin/branch.c:941
3292#, c-format
3293msgid "No branch named '%s'."
3294msgstr "没有分支 '%s'。"
3295
3296#: builtin/branch.c:956
3297msgid "too many branches for a rename operation"
3298msgstr "为重命名操作提供了太多的分支名"
3299
3300#: builtin/branch.c:961
3301msgid "too many branches to set new upstream"
3302msgstr "为设置新上游提供了太多的分支名"
3303
3304#: builtin/branch.c:965
3305#, c-format
3306msgid ""
3307"could not set upstream of HEAD to %s when it does not point to any branch."
3308msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3309
3310#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
3311#, c-format
3312msgid "no such branch '%s'"
3313msgstr "没有此分支 '%s'"
3314
3315#: builtin/branch.c:972
3316#, c-format
3317msgid "branch '%s' does not exist"
3318msgstr "分支 '%s' 不存在"
3319
3320#: builtin/branch.c:984
3321msgid "too many branches to unset upstream"
3322msgstr "为取消上游设置操作提供了太多的分支名"
3323
3324#: builtin/branch.c:988
3325msgid "could not unset upstream of HEAD when it does not point to any branch."
3326msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3327
3328#: builtin/branch.c:994
3329#, c-format
3330msgid "Branch '%s' has no upstream information"
3331msgstr "分支 '%s' 没有上游信息"
3332
3333#: builtin/branch.c:1008
3334msgid "it does not make sense to create 'HEAD' manually"
3335msgstr "手工创建 'HEAD' 没有意义"
3336
3337#: builtin/branch.c:1014
3338msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3339msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3340
3341#: builtin/branch.c:1017
3342#, c-format
3343msgid ""
3344"The --set-upstream flag is deprecated and will be removed. Consider using --"
3345"track or --set-upstream-to\n"
3346msgstr ""
3347"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3348
3349#: builtin/branch.c:1034
3350#, c-format
3351msgid ""
3352"\n"
3353"If you wanted to make '%s' track '%s', do this:\n"
3354"\n"
3355msgstr ""
3356"\n"
3357"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3358"\n"
3359
3360#: builtin/branch.c:1035
3361#, c-format
3362msgid "    git branch -d %s\n"
3363msgstr "    git branch -d %s\n"
3364
3365#: builtin/branch.c:1036
3366#, c-format
3367msgid "    git branch --set-upstream-to %s\n"
3368msgstr "    git branch --set-upstream-to %s\n"
3369
3370#: builtin/bundle.c:51
3371#, c-format
3372msgid "%s is okay\n"
3373msgstr "%s 可以\n"
3374
3375#: builtin/bundle.c:64
3376msgid "Need a repository to create a bundle."
3377msgstr "需要一个仓库来创建包。"
3378
3379#: builtin/bundle.c:68
3380msgid "Need a repository to unbundle."
3381msgstr "需要一个仓库来解包。"
3382
3383#: builtin/cat-file.c:369
3384msgid ""
3385"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3386"<type>|--textconv) <object>"
3387msgstr ""
3388"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3389">|--textconv) <对象>"
3390
3391#: builtin/cat-file.c:370
3392msgid ""
3393"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3394"objects>"
3395msgstr ""
3396"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
3397
3398#: builtin/cat-file.c:407
3399msgid "<type> can be one of: blob, tree, commit, tag"
3400msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3401
3402#: builtin/cat-file.c:408
3403msgid "show object type"
3404msgstr "显示对象类型"
3405
3406#: builtin/cat-file.c:409
3407msgid "show object size"
3408msgstr "显示对象大小"
3409
3410#: builtin/cat-file.c:411
3411msgid "exit with zero when there's no error"
3412msgstr "当没有错误时退出并返回零"
3413
3414#: builtin/cat-file.c:412
3415msgid "pretty-print object's content"
3416msgstr "美观地打印对象的内容"
3417
3418#: builtin/cat-file.c:414
3419msgid "for blob objects, run textconv on object's content"
3420msgstr "对于数据对象,对其内容执行 textconv"
3421
3422#: builtin/cat-file.c:416
3423msgid "allow -s and -t to work with broken/corrupt objects"
3424msgstr "允许 -s 和 -t 对损坏的对象生效"
3425
3426#: builtin/cat-file.c:418
3427msgid "show info and content of objects fed from the standard input"
3428msgstr "显示从标准输入提供的对象的信息和内容"
3429
3430#: builtin/cat-file.c:421
3431msgid "show info about objects fed from the standard input"
3432msgstr "显示从标准输入提供的对象的信息"
3433
3434#: builtin/cat-file.c:424
3435msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3436msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3437
3438#: builtin/check-attr.c:11
3439msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3440msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3441
3442#: builtin/check-attr.c:12
3443msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3444msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3445
3446#: builtin/check-attr.c:19
3447msgid "report all attributes set on file"
3448msgstr "报告设置在文件上的所有属性"
3449
3450#: builtin/check-attr.c:20
3451msgid "use .gitattributes only from the index"
3452msgstr "只使用索引中的 .gitattributes"
3453
3454#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3455msgid "read file names from stdin"
3456msgstr "从标准输入读出文件名"
3457
3458#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3459msgid "terminate input and output records by a NUL character"
3460msgstr "输入和输出的记录使用 NUL 字符终结"
3461
3462#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
3463msgid "suppress progress reporting"
3464msgstr "不显示进度报告"
3465
3466#: builtin/check-ignore.c:26
3467msgid "show non-matching input paths"
3468msgstr "显示未匹配的输入路径"
3469
3470#: builtin/check-ignore.c:28
3471msgid "ignore index when checking"
3472msgstr "检查时忽略索引"
3473
3474#: builtin/check-ignore.c:154
3475msgid "cannot specify pathnames with --stdin"
3476msgstr "不能同时提供路径及 --stdin 参数"
3477
3478#: builtin/check-ignore.c:157
3479msgid "-z only makes sense with --stdin"
3480msgstr "-z 需要和 --stdin 参数共用才有意义"
3481
3482#: builtin/check-ignore.c:159
3483msgid "no path specified"
3484msgstr "未指定路径"
3485
3486#: builtin/check-ignore.c:163
3487msgid "--quiet is only valid with a single pathname"
3488msgstr "参数 --quiet 只在提供一个路径名时有效"
3489
3490#: builtin/check-ignore.c:165
3491msgid "cannot have both --quiet and --verbose"
3492msgstr "不能同时提供 --quiet 和 --verbose 参数"
3493
3494#: builtin/check-ignore.c:168
3495msgid "--non-matching is only valid with --verbose"
3496msgstr "--non-matching 选项只在使用 --verbose 时有效"
3497
3498#: builtin/check-mailmap.c:8
3499msgid "git check-mailmap [<options>] <contact>..."
3500msgstr "git check-mailmap [<选项>] <联系地址>..."
3501
3502#: builtin/check-mailmap.c:13
3503msgid "also read contacts from stdin"
3504msgstr "还从标准输入读取联系地址"
3505
3506#: builtin/check-mailmap.c:24
3507#, c-format
3508msgid "unable to parse contact: %s"
3509msgstr "不能解析联系地址:%s"
3510
3511#: builtin/check-mailmap.c:47
3512msgid "no contacts specified"
3513msgstr "未指定联系地址"
3514
3515#: builtin/checkout-index.c:126
3516msgid "git checkout-index [<options>] [--] [<file>...]"
3517msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3518
3519#: builtin/checkout-index.c:188
3520msgid "check out all files in the index"
3521msgstr "检出索引区的所有文件"
3522
3523#: builtin/checkout-index.c:189
3524msgid "force overwrite of existing files"
3525msgstr "强制覆盖现有的文件"
3526
3527#: builtin/checkout-index.c:191
3528msgid "no warning for existing files and files not in index"
3529msgstr "存在或不在索引中的文件都没有警告"
3530
3531#: builtin/checkout-index.c:193
3532msgid "don't checkout new files"
3533msgstr "不检出新文件"
3534
3535#: builtin/checkout-index.c:195
3536msgid "update stat information in the index file"
3537msgstr "更新索引中文件的状态信息"
3538
3539#: builtin/checkout-index.c:201
3540msgid "read list of paths from the standard input"
3541msgstr "从标准输入读取路径列表"
3542
3543#: builtin/checkout-index.c:203
3544msgid "write the content to temporary files"
3545msgstr "将内容写入临时文件"
3546
3547#: builtin/checkout-index.c:204 builtin/column.c:30
3548msgid "string"
3549msgstr "字符串"
3550
3551#: builtin/checkout-index.c:205
3552msgid "when creating files, prepend <string>"
3553msgstr "在创建文件时,在前面加上 <字符串>"
3554
3555#: builtin/checkout-index.c:208
3556msgid "copy out the files from named stage"
3557msgstr "从指定暂存区中拷出文件"
3558
3559#: builtin/checkout.c:24
3560msgid "git checkout [<options>] <branch>"
3561msgstr "git checkout [<选项>] <分支>"
3562
3563#: builtin/checkout.c:25
3564msgid "git checkout [<options>] [<branch>] -- <file>..."
3565msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3566
3567#: builtin/checkout.c:134 builtin/checkout.c:167
3568#, c-format
3569msgid "path '%s' does not have our version"
3570msgstr "路径 '%s' 没有我们的版本"
3571
3572#: builtin/checkout.c:136 builtin/checkout.c:169
3573#, c-format
3574msgid "path '%s' does not have their version"
3575msgstr "路径 '%s' 没有他们的版本"
3576
3577#: builtin/checkout.c:152
3578#, c-format
3579msgid "path '%s' does not have all necessary versions"
3580msgstr "路径 '%s' 没有全部必须的版本"
3581
3582#: builtin/checkout.c:196
3583#, c-format
3584msgid "path '%s' does not have necessary versions"
3585msgstr "路径 '%s' 没有必须的版本"
3586
3587#: builtin/checkout.c:213
3588#, c-format
3589msgid "path '%s': cannot merge"
3590msgstr "path '%s':无法合并"
3591
3592#: builtin/checkout.c:230
3593#, c-format
3594msgid "Unable to add merge result for '%s'"
3595msgstr "无法为 '%s' 添加合并结果"
3596
3597#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3598#: builtin/checkout.c:260
3599#, c-format
3600msgid "'%s' cannot be used with updating paths"
3601msgstr "'%s' 不能在更新路径时使用"
3602
3603#: builtin/checkout.c:263 builtin/checkout.c:266
3604#, c-format
3605msgid "'%s' cannot be used with %s"
3606msgstr "'%s' 不能和 %s 同时使用"
3607
3608#: builtin/checkout.c:269
3609#, c-format
3610msgid "Cannot update paths and switch to branch '%s' at the same time."
3611msgstr "不能同时更新路径并切换到分支'%s'。"
3612
3613#: builtin/checkout.c:280 builtin/checkout.c:474
3614msgid "corrupt index file"
3615msgstr "损坏的索引文件"
3616
3617#: builtin/checkout.c:340 builtin/checkout.c:347
3618#, c-format
3619msgid "path '%s' is unmerged"
3620msgstr "路径 '%s' 未合并"
3621
3622#: builtin/checkout.c:496
3623msgid "you need to resolve your current index first"
3624msgstr "您需要先解决当前索引的冲突"
3625
3626#: builtin/checkout.c:627
3627#, c-format
3628msgid "Can not do reflog for '%s'\n"
3629msgstr "不能对 '%s' 执行 reflog 操作\n"
3630
3631#: builtin/checkout.c:663
3632msgid "HEAD is now at"
3633msgstr "HEAD 目前位于"
3634
3635#: builtin/checkout.c:670
3636#, c-format
3637msgid "Reset branch '%s'\n"
3638msgstr "重置分支 '%s'\n"
3639
3640#: builtin/checkout.c:673
3641#, c-format
3642msgid "Already on '%s'\n"
3643msgstr "已经位于 '%s'\n"
3644
3645#: builtin/checkout.c:677
3646#, c-format
3647msgid "Switched to and reset branch '%s'\n"
3648msgstr "切换并重置分支 '%s'\n"
3649
3650#: builtin/checkout.c:679 builtin/checkout.c:1134
3651#, c-format
3652msgid "Switched to a new branch '%s'\n"
3653msgstr "切换到一个新分支 '%s'\n"
3654
3655#: builtin/checkout.c:681
3656#, c-format
3657msgid "Switched to branch '%s'\n"
3658msgstr "切换到分支 '%s'\n"
3659
3660#  译者:注意保持前导空格
3661#: builtin/checkout.c:733
3662#, c-format
3663msgid " ... and %d more.\n"
3664msgstr " ... 及其它 %d 个。\n"
3665
3666#: builtin/checkout.c:739
3667#, c-format
3668msgid ""
3669"Warning: you are leaving %d commit behind, not connected to\n"
3670"any of your branches:\n"
3671"\n"
3672"%s\n"
3673msgid_plural ""
3674"Warning: you are leaving %d commits behind, not connected to\n"
3675"any of your branches:\n"
3676"\n"
3677"%s\n"
3678msgstr[0] ""
3679"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3680"\n"
3681"%s\n"
3682msgstr[1] ""
3683"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3684"\n"
3685"%s\n"
3686
3687#: builtin/checkout.c:758
3688#, c-format
3689msgid ""
3690"If you want to keep it by creating a new branch, this may be a good time\n"
3691"to do so with:\n"
3692"\n"
3693" git branch <new-branch-name> %s\n"
3694"\n"
3695msgid_plural ""
3696"If you want to keep them by creating a new branch, this may be a good time\n"
3697"to do so with:\n"
3698"\n"
3699" git branch <new-branch-name> %s\n"
3700"\n"
3701msgstr[0] ""
3702"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3703"如下操作:\n"
3704"\n"
3705" git branch <新分支名> %s\n"
3706"\n"
3707msgstr[1] ""
3708"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
3709"如下操作:\n"
3710"\n"
3711" git branch <新分支名> %s\n"
3712"\n"
3713
3714#: builtin/checkout.c:794
3715msgid "internal error in revision walk"
3716msgstr "在版本遍历时遇到内部错误"
3717
3718#: builtin/checkout.c:798
3719msgid "Previous HEAD position was"
3720msgstr "之前的 HEAD 位置是"
3721
3722#: builtin/checkout.c:825 builtin/checkout.c:1129
3723msgid "You are on a branch yet to be born"
3724msgstr "您位于一个尚未初始化的分支"
3725
3726#: builtin/checkout.c:931
3727#, c-format
3728msgid "'%s' is already checked out at '%s'"
3729msgstr "'%s' 已经检出到 '%s'"
3730
3731#: builtin/checkout.c:1036
3732#, c-format
3733msgid "only one reference expected, %d given."
3734msgstr "只要一个引用,却给出了 %d 个"
3735
3736#: builtin/checkout.c:1075
3737#, c-format
3738msgid "invalid reference: %s"
3739msgstr "无效引用:%s"
3740
3741#: builtin/checkout.c:1104
3742#, c-format
3743msgid "reference is not a tree: %s"
3744msgstr "引用不是一个树:%s"
3745
3746#: builtin/checkout.c:1143
3747msgid "paths cannot be used with switching branches"
3748msgstr "路径不能和切换分支同时使用"
3749
3750#: builtin/checkout.c:1146 builtin/checkout.c:1150
3751#, c-format
3752msgid "'%s' cannot be used with switching branches"
3753msgstr "'%s' 不能和切换分支同时使用"
3754
3755#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3756#: builtin/checkout.c:1165
3757#, c-format
3758msgid "'%s' cannot be used with '%s'"
3759msgstr "'%s' 不能和 '%s' 同时使用"
3760
3761#: builtin/checkout.c:1170
3762#, c-format
3763msgid "Cannot switch branch to a non-commit '%s'"
3764msgstr "不能切换分支到一个非提交 '%s'"
3765
3766#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3767#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3768#: builtin/worktree.c:284
3769msgid "branch"
3770msgstr "分支"
3771
3772#: builtin/checkout.c:1204
3773msgid "create and checkout a new branch"
3774msgstr "创建并检出一个新的分支"
3775
3776#: builtin/checkout.c:1206
3777msgid "create/reset and checkout a branch"
3778msgstr "创建/重置并检出一个分支"
3779
3780#: builtin/checkout.c:1207
3781msgid "create reflog for new branch"
3782msgstr "为新的分支创建引用日志"
3783
3784#: builtin/checkout.c:1208
3785msgid "detach the HEAD at named commit"
3786msgstr "成为指向该提交的分离头指针"
3787
3788#: builtin/checkout.c:1209
3789msgid "set upstream info for new branch"
3790msgstr "为新的分支设置上游信息"
3791
3792#: builtin/checkout.c:1211
3793msgid "new-branch"
3794msgstr "新分支"
3795
3796#: builtin/checkout.c:1211
3797msgid "new unparented branch"
3798msgstr "新的没有父提交的分支"
3799
3800#: builtin/checkout.c:1212
3801msgid "checkout our version for unmerged files"
3802msgstr "对尚未合并的文件检出我们的版本"
3803
3804#: builtin/checkout.c:1214
3805msgid "checkout their version for unmerged files"
3806msgstr "对尚未合并的文件检出他们的版本"
3807
3808#: builtin/checkout.c:1216
3809msgid "force checkout (throw away local modifications)"
3810msgstr "强制检出(丢弃本地修改)"
3811
3812#: builtin/checkout.c:1217
3813msgid "perform a 3-way merge with the new branch"
3814msgstr "和新的分支执行三方合并"
3815
3816#: builtin/checkout.c:1218 builtin/merge.c:227
3817msgid "update ignored files (default)"
3818msgstr "更新忽略的文件(默认)"
3819
3820#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
3821msgid "style"
3822msgstr "风格"
3823
3824#: builtin/checkout.c:1220
3825msgid "conflict style (merge or diff3)"
3826msgstr "冲突输出风格(merge 或 diff3)"
3827
3828#: builtin/checkout.c:1223
3829msgid "do not limit pathspecs to sparse entries only"
3830msgstr "对路径不做稀疏检出的限制"
3831
3832#: builtin/checkout.c:1225
3833msgid "second guess 'git checkout <no-such-branch>'"
3834msgstr "二次猜测'git checkout <无此分支>'"
3835
3836#: builtin/checkout.c:1227
3837msgid "do not check if another worktree is holding the given ref"
3838msgstr "不检查指定的引用是否被其他工作区所占用"
3839
3840#: builtin/checkout.c:1252
3841msgid "-b, -B and --orphan are mutually exclusive"
3842msgstr "-b、-B 和 --orphan 是互斥的"
3843
3844#: builtin/checkout.c:1269
3845msgid "--track needs a branch name"
3846msgstr "--track 需要一个分支名"
3847
3848#: builtin/checkout.c:1274
3849msgid "Missing branch name; try -b"
3850msgstr "缺少分支名;尝试 -b"
3851
3852#: builtin/checkout.c:1310
3853msgid "invalid path specification"
3854msgstr "无效的路径规格"
3855
3856#: builtin/checkout.c:1317
3857#, c-format
3858msgid ""
3859"Cannot update paths and switch to branch '%s' at the same time.\n"
3860"Did you intend to checkout '%s' which can not be resolved as commit?"
3861msgstr ""
3862"不能同时更新路径并切换到分支'%s'。\n"
3863"您是想要检出 '%s' 但其未能解析为提交么?"
3864
3865#: builtin/checkout.c:1322
3866#, c-format
3867msgid "git checkout: --detach does not take a path argument '%s'"
3868msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3869
3870#: builtin/checkout.c:1326
3871msgid ""
3872"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3873"checking out of the index."
3874msgstr ""
3875"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3876
3877#: builtin/clean.c:26
3878msgid ""
3879"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3880msgstr ""
3881"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3882
3883#: builtin/clean.c:30
3884#, c-format
3885msgid "Removing %s\n"
3886msgstr "正删除 %s\n"
3887
3888#: builtin/clean.c:31
3889#, c-format
3890msgid "Would remove %s\n"
3891msgstr "将删除 %s\n"
3892
3893#: builtin/clean.c:32
3894#, c-format
3895msgid "Skipping repository %s\n"
3896msgstr "忽略仓库 %s\n"
3897
3898#: builtin/clean.c:33
3899#, c-format
3900msgid "Would skip repository %s\n"
3901msgstr "将忽略仓库 %s\n"
3902
3903#: builtin/clean.c:34
3904#, c-format
3905msgid "failed to remove %s"
3906msgstr "无法删除 %s"
3907
3908#: builtin/clean.c:295
3909msgid ""
3910"Prompt help:\n"
3911"1          - select a numbered item\n"
3912"foo        - select item based on unique prefix\n"
3913"           - (empty) select nothing"
3914msgstr ""
3915"帮助:\n"
3916"1          - 通过编号选择一个选项\n"
3917"foo        - 通过标题选择一个选项\n"
3918"           - (空)什么也不选择"
3919
3920#: builtin/clean.c:299
3921msgid ""
3922"Prompt help:\n"
3923"1          - select a single item\n"
3924"3-5        - select a range of items\n"
3925"2-3,6-9    - select multiple ranges\n"
3926"foo        - select item based on unique prefix\n"
3927"-...       - unselect specified items\n"
3928"*          - choose all items\n"
3929"           - (empty) finish selecting"
3930msgstr ""
3931"帮助:\n"
3932"1          - 选择一个选项\n"
3933"3-5        - 选择一个范围内的所有选项\n"
3934"2-3,6-9    - 选择多个范围内的所有选项\n"
3935"foo        - 通过标题选择一个选项\n"
3936"-...       - 反选特定的选项\n"
3937"*          - 选择所有选项\n"
3938"           - (空)结束选择"
3939
3940#: builtin/clean.c:515
3941#, c-format
3942msgid "Huh (%s)?"
3943msgstr "嗯(%s)?"
3944
3945#: builtin/clean.c:657
3946#, c-format
3947msgid "Input ignore patterns>> "
3948msgstr "输入模版以排除条目>> "
3949
3950#: builtin/clean.c:694
3951#, c-format
3952msgid "WARNING: Cannot find items matched by: %s"
3953msgstr "警告:无法找到和 %s 匹配的条目"
3954
3955#: builtin/clean.c:715
3956msgid "Select items to delete"
3957msgstr "选择要删除的条目"
3958
3959#. TRANSLATORS: Make sure to keep [y/N] as is
3960#: builtin/clean.c:756
3961#, c-format
3962msgid "Remove %s [y/N]? "
3963msgstr "删除 %s [y/N]?"
3964
3965#: builtin/clean.c:781
3966msgid "Bye."
3967msgstr "再见。"
3968
3969#: builtin/clean.c:789
3970msgid ""
3971"clean               - start cleaning\n"
3972"filter by pattern   - exclude items from deletion\n"
3973"select by numbers   - select items to be deleted by numbers\n"
3974"ask each            - confirm each deletion (like \"rm -i\")\n"
3975"quit                - stop cleaning\n"
3976"help                - this screen\n"
3977"?                   - help for prompt selection"
3978msgstr ""
3979"clean               - 开始清理\n"
3980"filter by pattern   - 通过模版排除要删除的条目\n"
3981"select by numbers   - 通过数字选择要删除的条目\n"
3982"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
3983"quit                - 停止删除并退出\n"
3984"help                - 显示本帮助\n"
3985"?                   - 显示如何在提示符下选择的帮助"
3986
3987#: builtin/clean.c:816
3988msgid "*** Commands ***"
3989msgstr "*** 命令 ***"
3990
3991#: builtin/clean.c:817
3992msgid "What now"
3993msgstr "请选择"
3994
3995#: builtin/clean.c:825
3996msgid "Would remove the following item:"
3997msgid_plural "Would remove the following items:"
3998msgstr[0] "将删除如下条目:"
3999msgstr[1] "将删除如下条目:"
4000
4001#: builtin/clean.c:842
4002msgid "No more files to clean, exiting."
4003msgstr "没有要清理的文件,退出。"
4004
4005#: builtin/clean.c:873
4006msgid "do not print names of files removed"
4007msgstr "不打印删除文件的名称"
4008
4009#: builtin/clean.c:875
4010msgid "force"
4011msgstr "强制"
4012
4013#: builtin/clean.c:876
4014msgid "interactive cleaning"
4015msgstr "交互式清除"
4016
4017#: builtin/clean.c:878
4018msgid "remove whole directories"
4019msgstr "删除整个目录"
4020
4021#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
4022#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
4023msgid "pattern"
4024msgstr "模式"
4025
4026#: builtin/clean.c:880
4027msgid "add <pattern> to ignore rules"
4028msgstr "添加 <模式> 到忽略规则"
4029
4030#: builtin/clean.c:881
4031msgid "remove ignored files, too"
4032msgstr "也删除忽略的文件"
4033
4034#: builtin/clean.c:883
4035msgid "remove only ignored files"
4036msgstr "只删除忽略的文件"
4037
4038#: builtin/clean.c:901
4039msgid "-x and -X cannot be used together"
4040msgstr "-x 和 -X 不能同时使用"
4041
4042#: builtin/clean.c:905
4043msgid ""
4044"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4045"clean"
4046msgstr ""
4047"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4048
4049#: builtin/clean.c:908
4050msgid ""
4051"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4052"refusing to clean"
4053msgstr ""
4054"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4055
4056#: builtin/clone.c:37
4057msgid "git clone [<options>] [--] <repo> [<dir>]"
4058msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4059
4060#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
4061#: builtin/push.c:523
4062msgid "force progress reporting"
4063msgstr "强制显示进度报告"
4064
4065#: builtin/clone.c:59
4066msgid "don't create a checkout"
4067msgstr "不创建一个检出"
4068
4069#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
4070msgid "create a bare repository"
4071msgstr "创建一个纯仓库"
4072
4073#: builtin/clone.c:64
4074msgid "create a mirror repository (implies bare)"
4075msgstr "创建一个镜像仓库(也是纯仓库)"
4076
4077#: builtin/clone.c:66
4078msgid "to clone from a local repository"
4079msgstr "从本地仓库克隆"
4080
4081#: builtin/clone.c:68
4082msgid "don't use local hardlinks, always copy"
4083msgstr "不使用本地硬链接,始终复制"
4084
4085#: builtin/clone.c:70
4086msgid "setup as shared repository"
4087msgstr "设置为共享仓库"
4088
4089#: builtin/clone.c:72 builtin/clone.c:74
4090msgid "initialize submodules in the clone"
4091msgstr "在克隆时初始化子模组"
4092
4093#: builtin/clone.c:75 builtin/init-db.c:500
4094msgid "template-directory"
4095msgstr "模板目录"
4096
4097#: builtin/clone.c:76 builtin/init-db.c:501
4098msgid "directory from which templates will be used"
4099msgstr "模板目录将被使用"
4100
4101#: builtin/clone.c:78
4102msgid "reference repository"
4103msgstr "参考仓库"
4104
4105#: builtin/clone.c:80
4106msgid "use --reference only while cloning"
4107msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4108
4109#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4110msgid "name"
4111msgstr "名称"
4112
4113#: builtin/clone.c:82
4114msgid "use <name> instead of 'origin' to track upstream"
4115msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4116
4117#: builtin/clone.c:84
4118msgid "checkout <branch> instead of the remote's HEAD"
4119msgstr "检出 <分支> 而不是远程 HEAD"
4120
4121#: builtin/clone.c:86
4122msgid "path to git-upload-pack on the remote"
4123msgstr "远程 git-upload-pack 路径"
4124
4125#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
4126msgid "depth"
4127msgstr "深度"
4128
4129#: builtin/clone.c:88
4130msgid "create a shallow clone of that depth"
4131msgstr "创建一个指定深度的浅克隆"
4132
4133#: builtin/clone.c:90
4134msgid "clone only one branch, HEAD or --branch"
4135msgstr "只克隆一个分支、HEAD 或 --branch"
4136
4137#: builtin/clone.c:91 builtin/init-db.c:509
4138msgid "gitdir"
4139msgstr "git目录"
4140
4141#: builtin/clone.c:92 builtin/init-db.c:510
4142msgid "separate git dir from working tree"
4143msgstr "git目录和工作区分离"
4144
4145#: builtin/clone.c:93
4146msgid "key=value"
4147msgstr "key=value"
4148
4149#: builtin/clone.c:94
4150msgid "set config inside the new repository"
4151msgstr "在新仓库中设置配置信息"
4152
4153#: builtin/clone.c:240
4154#, c-format
4155msgid "reference repository '%s' is not a local repository."
4156msgstr "参考仓库 '%s' 不是一个本地仓库。"
4157
4158#: builtin/clone.c:244
4159#, c-format
4160msgid "reference repository '%s' is shallow"
4161msgstr "参考仓库 '%s' 是一个浅克隆"
4162
4163#: builtin/clone.c:247
4164#, c-format
4165msgid "reference repository '%s' is grafted"
4166msgstr "参考仓库 '%s' 已被嫁接"
4167
4168#: builtin/clone.c:310
4169#, c-format
4170msgid "failed to create directory '%s'"
4171msgstr "无法创建目录 '%s'"
4172
4173#: builtin/clone.c:312 builtin/diff.c:84
4174#, c-format
4175msgid "failed to stat '%s'"
4176msgstr "无法枚举 '%s' 状态"
4177
4178#: builtin/clone.c:314
4179#, c-format
4180msgid "%s exists and is not a directory"
4181msgstr "%s 存在且不是一个目录"
4182
4183#: builtin/clone.c:328
4184#, c-format
4185msgid "failed to stat %s\n"
4186msgstr "无法枚举 %s 状态\n"
4187
4188#: builtin/clone.c:350
4189#, c-format
4190msgid "failed to create link '%s'"
4191msgstr "无法创建链接 '%s'"
4192
4193#: builtin/clone.c:354
4194#, c-format
4195msgid "failed to copy file to '%s'"
4196msgstr "无法拷贝文件至 '%s'"
4197
4198#: builtin/clone.c:377 builtin/clone.c:551
4199#, c-format
4200msgid "done.\n"
4201msgstr "完成。\n"
4202
4203#: builtin/clone.c:389
4204msgid ""
4205"Clone succeeded, but checkout failed.\n"
4206"You can inspect what was checked out with 'git status'\n"
4207"and retry the checkout with 'git checkout -f HEAD'\n"
4208msgstr ""
4209"克隆成功,但是检出失败。\n"
4210"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4211"'git checkout -f HEAD' 重试\n"
4212
4213#: builtin/clone.c:466
4214#, c-format
4215msgid "Could not find remote branch %s to clone."
4216msgstr "不能发现要克隆的远程分支 %s。"
4217
4218#: builtin/clone.c:546
4219#, c-format
4220msgid "Checking connectivity... "
4221msgstr "检查连接... "
4222
4223#: builtin/clone.c:549
4224msgid "remote did not send all necessary objects"
4225msgstr "远程没有发送所有必须的对象"
4226
4227#: builtin/clone.c:613
4228msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4229msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4230
4231#: builtin/clone.c:644
4232msgid "unable to checkout working tree"
4233msgstr "不能检出工作区"
4234
4235#: builtin/clone.c:731
4236msgid "cannot repack to clean up"
4237msgstr "无法执行 repack 来清理"
4238
4239#: builtin/clone.c:733
4240msgid "cannot unlink temporary alternates file"
4241msgstr "无法删除临时的 alternates 文件"
4242
4243#: builtin/clone.c:763
4244msgid "Too many arguments."
4245msgstr "太多参数。"
4246
4247#: builtin/clone.c:767
4248msgid "You must specify a repository to clone."
4249msgstr "您必须指定一个仓库来克隆。"
4250
4251#: builtin/clone.c:778
4252#, c-format
4253msgid "--bare and --origin %s options are incompatible."
4254msgstr "--bare 和 --origin %s 选项不兼容。"
4255
4256#: builtin/clone.c:781
4257msgid "--bare and --separate-git-dir are incompatible."
4258msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4259
4260#: builtin/clone.c:794
4261#, c-format
4262msgid "repository '%s' does not exist"
4263msgstr "仓库 '%s' 不存在"
4264
4265#: builtin/clone.c:800 builtin/fetch.c:1160
4266#, c-format
4267msgid "depth %s is not a positive number"
4268msgstr "深度 %s 不是一个正数"
4269
4270#: builtin/clone.c:810
4271#, c-format
4272msgid "destination path '%s' already exists and is not an empty directory."
4273msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4274
4275#: builtin/clone.c:820
4276#, c-format
4277msgid "working tree '%s' already exists."
4278msgstr "工作区 '%s' 已经存在。"
4279
4280#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
4281#: builtin/worktree.c:220
4282#, c-format
4283msgid "could not create leading directories of '%s'"
4284msgstr "不能为 '%s' 创建先导目录"
4285
4286#: builtin/clone.c:838
4287#, c-format
4288msgid "could not create work tree dir '%s'"
4289msgstr "不能创建工作区目录 '%s'"
4290
4291#: builtin/clone.c:856
4292#, c-format
4293msgid "Cloning into bare repository '%s'...\n"
4294msgstr "克隆到纯仓库 '%s'...\n"
4295
4296#: builtin/clone.c:858
4297#, c-format
4298msgid "Cloning into '%s'...\n"
4299msgstr "正克隆到 '%s'...\n"
4300
4301#: builtin/clone.c:883
4302msgid "--dissociate given, but there is no --reference"
4303msgstr "提供了参数 --dissociate,但未提供 --reference"
4304
4305#: builtin/clone.c:900
4306msgid "--depth is ignored in local clones; use file:// instead."
4307msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4308
4309#: builtin/clone.c:903
4310msgid "source repository is shallow, ignoring --local"
4311msgstr "源仓库是浅克隆,忽略 --local"
4312
4313#: builtin/clone.c:908
4314msgid "--local is ignored"
4315msgstr "--local 被忽略"
4316
4317#: builtin/clone.c:912
4318#, c-format
4319msgid "Don't know how to clone %s"
4320msgstr "不知道如何克隆 %s"
4321
4322#: builtin/clone.c:961 builtin/clone.c:969
4323#, c-format
4324msgid "Remote branch %s not found in upstream %s"
4325msgstr "远程分支 %s 在上游 %s 未发现"
4326
4327#: builtin/clone.c:972
4328msgid "You appear to have cloned an empty repository."
4329msgstr "您似乎克隆了一个空仓库。"
4330
4331#: builtin/column.c:9
4332msgid "git column [<options>]"
4333msgstr "git column [<选项>]"
4334
4335#: builtin/column.c:26
4336msgid "lookup config vars"
4337msgstr "查找配置变量"
4338
4339#: builtin/column.c:27 builtin/column.c:28
4340msgid "layout to use"
4341msgstr "要使用的布局"
4342
4343#: builtin/column.c:29
4344msgid "Maximum width"
4345msgstr "最大宽度"
4346
4347#: builtin/column.c:30
4348msgid "Padding space on left border"
4349msgstr "左边框的填充空间"
4350
4351#: builtin/column.c:31
4352msgid "Padding space on right border"
4353msgstr "右边框的填充空间"
4354
4355#: builtin/column.c:32
4356msgid "Padding space between columns"
4357msgstr "两列之间的填充空间"
4358
4359#: builtin/column.c:51
4360msgid "--command must be the first argument"
4361msgstr "--command 必须是第一个参数"
4362
4363#: builtin/commit.c:37
4364msgid "git commit [<options>] [--] <pathspec>..."
4365msgstr "git commit [<选项>] [--] <路径规格>..."
4366
4367#: builtin/commit.c:42
4368msgid "git status [<options>] [--] <pathspec>..."
4369msgstr "git status [<选项>] [--] <路径规格>..."
4370
4371#: builtin/commit.c:47
4372msgid ""
4373"Your name and email address were configured automatically based\n"
4374"on your username and hostname. Please check that they are accurate.\n"
4375"You can suppress this message by setting them explicitly. Run the\n"
4376"following command and follow the instructions in your editor to edit\n"
4377"your configuration file:\n"
4378"\n"
4379"    git config --global --edit\n"
4380"\n"
4381"After doing this, you may fix the identity used for this commit with:\n"
4382"\n"
4383"    git commit --amend --reset-author\n"
4384msgstr ""
4385"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4386"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4387"中编辑您的配置文件:\n"
4388"\n"
4389"    git config --global --edit\n"
4390"\n"
4391"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4392"\n"
4393"    git commit --amend --reset-author\n"
4394
4395#: builtin/commit.c:60
4396msgid ""
4397"Your name and email address were configured automatically based\n"
4398"on your username and hostname. Please check that they are accurate.\n"
4399"You can suppress this message by setting them explicitly:\n"
4400"\n"
4401"    git config --global user.name \"Your Name\"\n"
4402"    git config --global user.email you@example.com\n"
4403"\n"
4404"After doing this, you may fix the identity used for this commit with:\n"
4405"\n"
4406"    git commit --amend --reset-author\n"
4407msgstr ""
4408"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4409"与否。您可以对其进行设置以免再出现本提示信息:\n"
4410"\n"
4411"    git config --global user.name \"Your Name\"\n"
4412"    git config --global user.email you@example.com\n"
4413"\n"
4414"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4415"\n"
4416"    git commit --amend --reset-author\n"
4417
4418#: builtin/commit.c:72
4419msgid ""
4420"You asked to amend the most recent commit, but doing so would make\n"
4421"it empty. You can repeat your command with --allow-empty, or you can\n"
4422"remove the commit entirely with \"git reset HEAD^\".\n"
4423msgstr ""
4424"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4425"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4426
4427#: builtin/commit.c:77
4428msgid ""
4429"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4430"If you wish to commit it anyway, use:\n"
4431"\n"
4432"    git commit --allow-empty\n"
4433"\n"
4434msgstr ""
4435"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4436"也要提交,使用命令:\n"
4437"\n"
4438"    git commit --allow-empty\n"
4439"\n"
4440
4441#: builtin/commit.c:84
4442msgid "Otherwise, please use 'git reset'\n"
4443msgstr "否则,请使用命令 'git reset'\n"
4444
4445#: builtin/commit.c:87
4446msgid ""
4447"If you wish to skip this commit, use:\n"
4448"\n"
4449"    git reset\n"
4450"\n"
4451"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4452"the remaining commits.\n"
4453msgstr ""
4454"如果您想跳过这个提交,使用命令:\n"
4455"\n"
4456"    git reset\n"
4457"\n"
4458"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4459"操作。\n"
4460
4461#: builtin/commit.c:304
4462msgid "failed to unpack HEAD tree object"
4463msgstr "无法解包 HEAD 树对象"
4464
4465#: builtin/commit.c:344
4466msgid "unable to create temporary index"
4467msgstr "不能创建临时索引"
4468
4469#: builtin/commit.c:350
4470msgid "interactive add failed"
4471msgstr "交互式添加失败"
4472
4473#: builtin/commit.c:361
4474msgid "unable to write index file"
4475msgstr "无法写入索引文件"
4476
4477#: builtin/commit.c:363
4478msgid "unable to update temporary index"
4479msgstr "无法更新临时索引"
4480
4481#: builtin/commit.c:365
4482msgid "Failed to update main cache tree"
4483msgstr "不能更新树的主缓存"
4484
4485#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4486msgid "unable to write new_index file"
4487msgstr "无法写 new_index 文件"
4488
4489#: builtin/commit.c:445
4490msgid "cannot do a partial commit during a merge."
4491msgstr "在合并过程中不能做部分提交。"
4492
4493#: builtin/commit.c:447
4494msgid "cannot do a partial commit during a cherry-pick."
4495msgstr "在拣选过程中不能做部分提交。"
4496
4497#: builtin/commit.c:456
4498msgid "cannot read the index"
4499msgstr "无法读取索引"
4500
4501#: builtin/commit.c:475
4502msgid "unable to write temporary index file"
4503msgstr "无法写临时索引文件"
4504
4505#: builtin/commit.c:580
4506#, c-format
4507msgid "commit '%s' lacks author header"
4508msgstr "提交 '%s' 缺少作者信息"
4509
4510#: builtin/commit.c:582
4511#, c-format
4512msgid "commit '%s' has malformed author line"
4513msgstr "提交 '%s' 有非法的作者信息"
4514
4515#: builtin/commit.c:601
4516msgid "malformed --author parameter"
4517msgstr "非法的 --author 参数"
4518
4519#: builtin/commit.c:609
4520#, c-format
4521msgid "invalid date format: %s"
4522msgstr "无效的日期格式:%s"
4523
4524#: builtin/commit.c:653
4525msgid ""
4526"unable to select a comment character that is not used\n"
4527"in the current commit message"
4528msgstr "无法选择一个未被当前提交说明使用的注释字符"
4529
4530#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4531#, c-format
4532msgid "could not lookup commit %s"
4533msgstr "不能查询提交 %s"
4534
4535#: builtin/commit.c:702 builtin/shortlog.c:273
4536#, c-format
4537msgid "(reading log message from standard input)\n"
4538msgstr "(正从标准输入中读取日志信息)\n"
4539
4540#: builtin/commit.c:704
4541msgid "could not read log from standard input"
4542msgstr "不能从标准输入中读取日志信息"
4543
4544#: builtin/commit.c:708
4545#, c-format
4546msgid "could not read log file '%s'"
4547msgstr "不能读取日志文件 '%s'"
4548
4549#: builtin/commit.c:730
4550msgid "could not read MERGE_MSG"
4551msgstr "不能读取 MERGE_MSG"
4552
4553#: builtin/commit.c:734
4554msgid "could not read SQUASH_MSG"
4555msgstr "不能读取 SQUASH_MSG"
4556
4557#: builtin/commit.c:738 builtin/merge.c:1079
4558#, c-format
4559msgid "could not read '%s'"
4560msgstr "不能读取 '%s'"
4561
4562#: builtin/commit.c:785
4563msgid "could not write commit template"
4564msgstr "不能写提交模版"
4565
4566#: builtin/commit.c:803
4567#, c-format
4568msgid ""
4569"\n"
4570"It looks like you may be committing a merge.\n"
4571"If this is not correct, please remove the file\n"
4572"\t%s\n"
4573"and try again.\n"
4574msgstr ""
4575"\n"
4576"似乎您正在做一个合并提交。如果不对,请删除文件\n"
4577"\t%s\n"
4578"然后重试。\n"
4579
4580#: builtin/commit.c:808
4581#, c-format
4582msgid ""
4583"\n"
4584"It looks like you may be committing a cherry-pick.\n"
4585"If this is not correct, please remove the file\n"
4586"\t%s\n"
4587"and try again.\n"
4588msgstr ""
4589"\n"
4590"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4591"\t%s\n"
4592"然后重试。\n"
4593
4594#: builtin/commit.c:821
4595#, c-format
4596msgid ""
4597"Please enter the commit message for your changes. Lines starting\n"
4598"with '%c' will be ignored, and an empty message aborts the commit.\n"
4599msgstr ""
4600"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4601"说明将会终止提交。\n"
4602
4603#: builtin/commit.c:828
4604#, c-format
4605msgid ""
4606"Please enter the commit message for your changes. Lines starting\n"
4607"with '%c' will be kept; you may remove them yourself if you want to.\n"
4608"An empty message aborts the commit.\n"
4609msgstr ""
4610"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4611"也可以删除它们。一个空的提交说明将会终止提交。\n"
4612
4613#  译者:为保证在输出中对齐,注意调整句中空格!
4614#: builtin/commit.c:848
4615#, c-format
4616msgid "%sAuthor:    %.*s <%.*s>"
4617msgstr "%s作者:  %.*s <%.*s>"
4618
4619#  译者:为保证在输出中对齐,注意调整句中空格!
4620#: builtin/commit.c:856
4621#, c-format
4622msgid "%sDate:      %s"
4623msgstr "%s日期:  %s"
4624
4625#  译者:为保证在输出中对齐,注意调整句中空格!
4626#: builtin/commit.c:863
4627#, c-format
4628msgid "%sCommitter: %.*s <%.*s>"
4629msgstr "%s提交者:%.*s <%.*s>"
4630
4631#: builtin/commit.c:881
4632msgid "Cannot read index"
4633msgstr "无法读取索引"
4634
4635#: builtin/commit.c:938
4636msgid "Error building trees"
4637msgstr "无法创建树对象"
4638
4639#: builtin/commit.c:953 builtin/tag.c:495
4640#, c-format
4641msgid "Please supply the message using either -m or -F option.\n"
4642msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4643
4644#: builtin/commit.c:1055
4645#, c-format
4646msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4647msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
4648
4649#: builtin/commit.c:1070 builtin/commit.c:1310
4650#, c-format
4651msgid "Invalid untracked files mode '%s'"
4652msgstr "无效的未追踪文件参数 '%s'"
4653
4654#: builtin/commit.c:1107
4655msgid "--long and -z are incompatible"
4656msgstr "--long 和 -z 选项不兼容"
4657
4658#: builtin/commit.c:1137
4659msgid "Using both --reset-author and --author does not make sense"
4660msgstr "同时使用 --reset-author 和 --author 没有意义"
4661
4662#: builtin/commit.c:1146
4663msgid "You have nothing to amend."
4664msgstr "您没有可修补的提交。"
4665
4666#: builtin/commit.c:1149
4667msgid "You are in the middle of a merge -- cannot amend."
4668msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4669
4670#: builtin/commit.c:1151
4671msgid "You are in the middle of a cherry-pick -- cannot amend."
4672msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4673
4674#: builtin/commit.c:1154
4675msgid "Options --squash and --fixup cannot be used together"
4676msgstr "选项 --squash 和 --fixup 不能同时使用"
4677
4678#: builtin/commit.c:1164
4679msgid "Only one of -c/-C/-F/--fixup can be used."
4680msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4681
4682#: builtin/commit.c:1166
4683msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4684msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4685
4686#: builtin/commit.c:1174
4687msgid "--reset-author can be used only with -C, -c or --amend."
4688msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4689
4690#: builtin/commit.c:1191
4691msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4692msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4693
4694#: builtin/commit.c:1193
4695msgid "No paths with --include/--only does not make sense."
4696msgstr "参数 --include/--only 不跟路径没有意义。"
4697
4698#: builtin/commit.c:1195
4699msgid "Clever... amending the last one with dirty index."
4700msgstr "聪明... 用脏索引修补最后一个提交。"
4701
4702#: builtin/commit.c:1197
4703msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4704msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4705
4706#: builtin/commit.c:1209 builtin/tag.c:728
4707#, c-format
4708msgid "Invalid cleanup mode %s"
4709msgstr "无效的清理模式 %s"
4710
4711#: builtin/commit.c:1214
4712msgid "Paths with -a does not make sense."
4713msgstr "路径和 -a 选项同时使用没有意义。"
4714
4715#: builtin/commit.c:1324 builtin/commit.c:1603
4716msgid "show status concisely"
4717msgstr "以简洁的格式显示状态"
4718
4719#: builtin/commit.c:1326 builtin/commit.c:1605
4720msgid "show branch information"
4721msgstr "显示分支信息"
4722
4723#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
4724msgid "machine-readable output"
4725msgstr "机器可读的输出"
4726
4727#: builtin/commit.c:1331 builtin/commit.c:1609
4728msgid "show status in long format (default)"
4729msgstr "以长格式显示状态(默认)"
4730
4731#: builtin/commit.c:1334 builtin/commit.c:1612
4732msgid "terminate entries with NUL"
4733msgstr "条目以 NUL 字符结尾"
4734
4735#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
4736#: builtin/fast-export.c:983 builtin/tag.c:603
4737msgid "mode"
4738msgstr "模式"
4739
4740#: builtin/commit.c:1337 builtin/commit.c:1615
4741msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4742msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4743
4744#: builtin/commit.c:1340
4745msgid "show ignored files"
4746msgstr "显示忽略的文件"
4747
4748#: builtin/commit.c:1341 parse-options.h:152
4749msgid "when"
4750msgstr "何时"
4751
4752#: builtin/commit.c:1342
4753msgid ""
4754"ignore changes to submodules, optional when: all, dirty, untracked. "
4755"(Default: all)"
4756msgstr ""
4757"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4758
4759#: builtin/commit.c:1344
4760msgid "list untracked files in columns"
4761msgstr "以列的方式显示未跟踪的文件"
4762
4763#: builtin/commit.c:1430
4764msgid "couldn't look up newly created commit"
4765msgstr "无法找到新创建的提交"
4766
4767#: builtin/commit.c:1432
4768msgid "could not parse newly created commit"
4769msgstr "不能解析新创建的提交"
4770
4771#: builtin/commit.c:1477
4772msgid "detached HEAD"
4773msgstr "分离头指针"
4774
4775#  译者:中文字符串拼接,可删除前导空格
4776#: builtin/commit.c:1480
4777msgid " (root-commit)"
4778msgstr "(根提交)"
4779
4780#: builtin/commit.c:1573
4781msgid "suppress summary after successful commit"
4782msgstr "提交成功后不显示概述信息"
4783
4784#: builtin/commit.c:1574
4785msgid "show diff in commit message template"
4786msgstr "在提交说明模板里显示差异"
4787
4788#: builtin/commit.c:1576
4789msgid "Commit message options"
4790msgstr "提交说明选项"
4791
4792#: builtin/commit.c:1577 builtin/tag.c:601
4793msgid "read message from file"
4794msgstr "从文件中读取提交说明"
4795
4796#: builtin/commit.c:1578
4797msgid "author"
4798msgstr "作者"
4799
4800#: builtin/commit.c:1578
4801msgid "override author for commit"
4802msgstr "提交时覆盖作者"
4803
4804#: builtin/commit.c:1579 builtin/gc.c:280
4805msgid "date"
4806msgstr "日期"
4807
4808#: builtin/commit.c:1579
4809msgid "override date for commit"
4810msgstr "提交时覆盖日期"
4811
4812#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
4813#: builtin/notes.c:554 builtin/tag.c:599
4814msgid "message"
4815msgstr "说明"
4816
4817#: builtin/commit.c:1580
4818msgid "commit message"
4819msgstr "提交说明"
4820
4821#: builtin/commit.c:1581
4822msgid "reuse and edit message from specified commit"
4823msgstr "重用并编辑指定提交的提交说明"
4824
4825#: builtin/commit.c:1582
4826msgid "reuse message from specified commit"
4827msgstr "重用指定提交的提交说明"
4828
4829#: builtin/commit.c:1583
4830msgid "use autosquash formatted message to fixup specified commit"
4831msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4832
4833#: builtin/commit.c:1584
4834msgid "use autosquash formatted message to squash specified commit"
4835msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4836
4837#: builtin/commit.c:1585
4838msgid "the commit is authored by me now (used with -C/-c/--amend)"
4839msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4840
4841#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
4842msgid "add Signed-off-by:"
4843msgstr "添加 Signed-off-by: 签名"
4844
4845#: builtin/commit.c:1587
4846msgid "use specified template file"
4847msgstr "使用指定的模板文件"
4848
4849#: builtin/commit.c:1588
4850msgid "force edit of commit"
4851msgstr "强制编辑提交"
4852
4853#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4854#: builtin/commit.c:1589
4855msgid "default"
4856msgstr "default"
4857
4858#: builtin/commit.c:1589 builtin/tag.c:604
4859msgid "how to strip spaces and #comments from message"
4860msgstr "设置如何删除提交说明里的空格和#注释"
4861
4862#: builtin/commit.c:1590
4863msgid "include status in commit message template"
4864msgstr "在提交说明模板里包含状态信息"
4865
4866#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
4867#: builtin/tag.c:605
4868msgid "key-id"
4869msgstr "key-id"
4870
4871#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
4872msgid "GPG sign commit"
4873msgstr "GPG 提交签名"
4874
4875#: builtin/commit.c:1595
4876msgid "Commit contents options"
4877msgstr "提交内容选项"
4878
4879#: builtin/commit.c:1596
4880msgid "commit all changed files"
4881msgstr "提交所有改动的文件"
4882
4883#: builtin/commit.c:1597
4884msgid "add specified files to index for commit"
4885msgstr "添加指定的文件到索引区等待提交"
4886
4887#: builtin/commit.c:1598
4888msgid "interactively add files"
4889msgstr "交互式添加文件"
4890
4891#: builtin/commit.c:1599
4892msgid "interactively add changes"
4893msgstr "交互式添加变更"
4894
4895#: builtin/commit.c:1600
4896msgid "commit only specified files"
4897msgstr "只提交指定的文件"
4898
4899#: builtin/commit.c:1601
4900msgid "bypass pre-commit hook"
4901msgstr "绕过 pre-commit 钩子"
4902
4903#: builtin/commit.c:1602
4904msgid "show what would be committed"
4905msgstr "显示将要提交的内容"
4906
4907#: builtin/commit.c:1613
4908msgid "amend previous commit"
4909msgstr "修改先前的提交"
4910
4911#: builtin/commit.c:1614
4912msgid "bypass post-rewrite hook"
4913msgstr "绕过 post-rewrite 钩子"
4914
4915#: builtin/commit.c:1619
4916msgid "ok to record an empty change"
4917msgstr "允许一个空提交"
4918
4919#: builtin/commit.c:1621
4920msgid "ok to record a change with an empty message"
4921msgstr "允许空的提交说明"
4922
4923#: builtin/commit.c:1650
4924msgid "could not parse HEAD commit"
4925msgstr "不能解析 HEAD 提交"
4926
4927#: builtin/commit.c:1689 builtin/merge.c:1076
4928#, c-format
4929msgid "could not open '%s' for reading"
4930msgstr "不能为读入打开 '%s'"
4931
4932#: builtin/commit.c:1696
4933#, c-format
4934msgid "Corrupt MERGE_HEAD file (%s)"
4935msgstr "损坏的 MERGE_HEAD 文件(%s)"
4936
4937#: builtin/commit.c:1703
4938msgid "could not read MERGE_MODE"
4939msgstr "不能读取 MERGE_MODE"
4940
4941#: builtin/commit.c:1722
4942#, c-format
4943msgid "could not read commit message: %s"
4944msgstr "不能读取提交说明:%s"
4945
4946#: builtin/commit.c:1733
4947#, c-format
4948msgid "Aborting commit; you did not edit the message.\n"
4949msgstr "终止提交;您未更改来自模版的提交说明。\n"
4950
4951#: builtin/commit.c:1738
4952#, c-format
4953msgid "Aborting commit due to empty commit message.\n"
4954msgstr "终止提交因为提交说明为空。\n"
4955
4956#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
4957msgid "failed to write commit object"
4958msgstr "无法写提交对象"
4959
4960#: builtin/commit.c:1786
4961msgid ""
4962"Repository has been updated, but unable to write\n"
4963"new_index file. Check that disk is not full and quota is\n"
4964"not exceeded, and then \"git reset HEAD\" to recover."
4965msgstr ""
4966"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4967"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4968
4969#: builtin/config.c:8
4970msgid "git config [<options>]"
4971msgstr "git config [<选项>]"
4972
4973#: builtin/config.c:53
4974msgid "Config file location"
4975msgstr "配置文件位置"
4976
4977#: builtin/config.c:54
4978msgid "use global config file"
4979msgstr "使用全局配置文件"
4980
4981#: builtin/config.c:55
4982msgid "use system config file"
4983msgstr "使用系统级配置文件"
4984
4985#: builtin/config.c:56
4986msgid "use repository config file"
4987msgstr "使用仓库级配置文件"
4988
4989#: builtin/config.c:57
4990msgid "use given config file"
4991msgstr "使用指定的配置文件"
4992
4993#: builtin/config.c:58
4994msgid "blob-id"
4995msgstr "数据对象 ID"
4996
4997#: builtin/config.c:58
4998msgid "read config from given blob object"
4999msgstr "从给定的数据对象读取配置"
5000
5001#: builtin/config.c:59
5002msgid "Action"
5003msgstr "操作"
5004
5005#: builtin/config.c:60
5006msgid "get value: name [value-regex]"
5007msgstr "获取值:name [value-regex]"
5008
5009#: builtin/config.c:61
5010msgid "get all values: key [value-regex]"
5011msgstr "获得所有的值:key [value-regex]"
5012
5013#: builtin/config.c:62
5014msgid "get values for regexp: name-regex [value-regex]"
5015msgstr "根据正则表达式获得值:name-regex [value-regex]"
5016
5017#: builtin/config.c:63
5018msgid "get value specific for the URL: section[.var] URL"
5019msgstr "获得 URL 取值:section[.var] URL"
5020
5021#: builtin/config.c:64
5022msgid "replace all matching variables: name value [value_regex]"
5023msgstr "替换所有匹配的变量:name value [value_regex]"
5024
5025#: builtin/config.c:65
5026msgid "add a new variable: name value"
5027msgstr "添加一个新的变量:name value"
5028
5029#: builtin/config.c:66
5030msgid "remove a variable: name [value-regex]"
5031msgstr "删除一个变量:name [value-regex]"
5032
5033#: builtin/config.c:67
5034msgid "remove all matches: name [value-regex]"
5035msgstr "删除所有匹配项:name [value-regex]"
5036
5037#: builtin/config.c:68
5038msgid "rename section: old-name new-name"
5039msgstr "重命名小节:old-name new-name"
5040
5041#: builtin/config.c:69
5042msgid "remove a section: name"
5043msgstr "删除一个小节:name"
5044
5045#: builtin/config.c:70
5046msgid "list all"
5047msgstr "列出所有"
5048
5049#: builtin/config.c:71
5050msgid "open an editor"
5051msgstr "打开一个编辑器"
5052
5053#: builtin/config.c:72
5054msgid "find the color configured: slot [default]"
5055msgstr "获得配置的颜色:配置 [默认]"
5056
5057#: builtin/config.c:73
5058msgid "find the color setting: slot [stdout-is-tty]"
5059msgstr "获得颜色设置:配置 [stdout-is-tty]"
5060
5061#: builtin/config.c:74
5062msgid "Type"
5063msgstr "类型"
5064
5065#: builtin/config.c:75
5066msgid "value is \"true\" or \"false\""
5067msgstr "值是 \"true\" 或 \"false\""
5068
5069#: builtin/config.c:76
5070msgid "value is decimal number"
5071msgstr "值是十进制数"
5072
5073#: builtin/config.c:77
5074msgid "value is --bool or --int"
5075msgstr "值是 --bool or --int"
5076
5077#: builtin/config.c:78
5078msgid "value is a path (file or directory name)"
5079msgstr "值是一个路径(文件或目录名)"
5080
5081#: builtin/config.c:79
5082msgid "Other"
5083msgstr "其它"
5084
5085#: builtin/config.c:80
5086msgid "terminate values with NUL byte"
5087msgstr "终止值是 NUL 字节"
5088
5089#: builtin/config.c:81
5090msgid "respect include directives on lookup"
5091msgstr "查询时参照 include 指令递归查找"
5092
5093#: builtin/config.c:316
5094msgid "unable to parse default color value"
5095msgstr "不能解析默认颜色值"
5096
5097#: builtin/config.c:457
5098#, c-format
5099msgid ""
5100"# This is Git's per-user configuration file.\n"
5101"[user]\n"
5102"# Please adapt and uncomment the following lines:\n"
5103"#\tname = %s\n"
5104"#\temail = %s\n"
5105msgstr ""
5106"# This is Git's per-user configuration file.\n"
5107"[user]\n"
5108"# Please adapt and uncomment the following lines:\n"
5109"#\tname = %s\n"
5110"#\temail = %s\n"
5111
5112#: builtin/config.c:587
5113#, c-format
5114msgid "cannot create configuration file %s"
5115msgstr "不能创建配置文件 %s"
5116
5117#: builtin/count-objects.c:55
5118msgid "git count-objects [-v] [-H | --human-readable]"
5119msgstr "git count-objects [-v] [-H | --human-readable]"
5120
5121#: builtin/count-objects.c:65
5122msgid "print sizes in human readable format"
5123msgstr "以用户可读的格式显示大小"
5124
5125#: builtin/describe.c:17
5126msgid "git describe [<options>] [<commit-ish>...]"
5127msgstr "git describe [<选项>] [<提交号>...]"
5128
5129#: builtin/describe.c:18
5130msgid "git describe [<options>] --dirty"
5131msgstr "git describe [<选项>] --dirty"
5132
5133#: builtin/describe.c:217
5134#, c-format
5135msgid "annotated tag %s not available"
5136msgstr "附注标签 %s 无效"
5137
5138#: builtin/describe.c:221
5139#, c-format
5140msgid "annotated tag %s has no embedded name"
5141msgstr "附注标签 %s 没有嵌入名称"
5142
5143#: builtin/describe.c:223
5144#, c-format
5145msgid "tag '%s' is really '%s' here"
5146msgstr "标签 '%s' 的确是在 '%s'"
5147
5148#: builtin/describe.c:250 builtin/log.c:452
5149#, c-format
5150msgid "Not a valid object name %s"
5151msgstr "不是一个有效的对象名 %s"
5152
5153#: builtin/describe.c:253
5154#, c-format
5155msgid "%s is not a valid '%s' object"
5156msgstr "%s 不是一个有效的 '%s' 对象"
5157
5158#: builtin/describe.c:270
5159#, c-format
5160msgid "no tag exactly matches '%s'"
5161msgstr "没有标签准确匹配 '%s'"
5162
5163#: builtin/describe.c:272
5164#, c-format
5165msgid "searching to describe %s\n"
5166msgstr "搜索描述 %s\n"
5167
5168#: builtin/describe.c:319
5169#, c-format
5170msgid "finished search at %s\n"
5171msgstr "完成搜索 %s\n"
5172
5173#: builtin/describe.c:346
5174#, c-format
5175msgid ""
5176"No annotated tags can describe '%s'.\n"
5177"However, there were unannotated tags: try --tags."
5178msgstr ""
5179"没有附注标签能描述 '%s'。\n"
5180"然而,存在未附注标签:尝试 --tags。"
5181
5182#: builtin/describe.c:350
5183#, c-format
5184msgid ""
5185"No tags can describe '%s'.\n"
5186"Try --always, or create some tags."
5187msgstr ""
5188"没有标签能描述 '%s'。\n"
5189"尝试 --always,或者创建一些标签。"
5190
5191#: builtin/describe.c:371
5192#, c-format
5193msgid "traversed %lu commits\n"
5194msgstr "已遍历 %lu 个提交\n"
5195
5196#: builtin/describe.c:374
5197#, c-format
5198msgid ""
5199"more than %i tags found; listed %i most recent\n"
5200"gave up search at %s\n"
5201msgstr ""
5202"发现多于 %i 个标签,列出最近的 %i 个\n"
5203"在 %s 放弃搜索\n"
5204
5205#: builtin/describe.c:396
5206msgid "find the tag that comes after the commit"
5207msgstr "寻找该提交之后的标签"
5208
5209#: builtin/describe.c:397
5210msgid "debug search strategy on stderr"
5211msgstr "在标准错误上调试搜索策略"
5212
5213#: builtin/describe.c:398
5214msgid "use any ref"
5215msgstr "使用任意引用"
5216
5217#: builtin/describe.c:399
5218msgid "use any tag, even unannotated"
5219msgstr "使用任意标签,即使未附带注释"
5220
5221#: builtin/describe.c:400
5222msgid "always use long format"
5223msgstr "始终使用长提交号格式"
5224
5225#: builtin/describe.c:401
5226msgid "only follow first parent"
5227msgstr "只跟随第一个父提交"
5228
5229#: builtin/describe.c:404
5230msgid "only output exact matches"
5231msgstr "只输出精确匹配"
5232
5233#: builtin/describe.c:406
5234msgid "consider <n> most recent tags (default: 10)"
5235msgstr "考虑最近 <n> 个标签(默认:10)"
5236
5237#: builtin/describe.c:408
5238msgid "only consider tags matching <pattern>"
5239msgstr "只考虑匹配 <模式> 的标签"
5240
5241#: builtin/describe.c:410 builtin/name-rev.c:318
5242msgid "show abbreviated commit object as fallback"
5243msgstr "显示简写的提交号作为后备"
5244
5245#: builtin/describe.c:411
5246msgid "mark"
5247msgstr "标记"
5248
5249#: builtin/describe.c:412
5250msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5251msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5252
5253#: builtin/describe.c:430
5254msgid "--long is incompatible with --abbrev=0"
5255msgstr "--long 与 --abbrev=0 不兼容"
5256
5257#: builtin/describe.c:456
5258msgid "No names found, cannot describe anything."
5259msgstr "没有发现名称,无法描述任何东西。"
5260
5261#: builtin/describe.c:476
5262msgid "--dirty is incompatible with commit-ishes"
5263msgstr "--dirty 不能与提交同时使用"
5264
5265#: builtin/diff.c:86
5266#, c-format
5267msgid "'%s': not a regular file or symlink"
5268msgstr "'%s':不是一个正规文件或符号链接"
5269
5270#: builtin/diff.c:237
5271#, c-format
5272msgid "invalid option: %s"
5273msgstr "无效选项:%s"
5274
5275#: builtin/diff.c:358
5276msgid "Not a git repository"
5277msgstr "不是一个 git 仓库"
5278
5279#: builtin/diff.c:401
5280#, c-format
5281msgid "invalid object '%s' given."
5282msgstr "提供了无效对象 '%s'。"
5283
5284#: builtin/diff.c:410
5285#, c-format
5286msgid "more than two blobs given: '%s'"
5287msgstr "提供了超过两个数据对象:'%s'"
5288
5289#: builtin/diff.c:417
5290#, c-format
5291msgid "unhandled object '%s' given."
5292msgstr "无法处理的对象 '%s'。"
5293
5294#: builtin/fast-export.c:24
5295msgid "git fast-export [rev-list-opts]"
5296msgstr "git fast-export [rev-list-opts]"
5297
5298#: builtin/fast-export.c:979
5299msgid "show progress after <n> objects"
5300msgstr "在 <n> 个对象之后显示进度"
5301
5302#: builtin/fast-export.c:981
5303msgid "select handling of signed tags"
5304msgstr "选择如何处理签名标签"
5305
5306#: builtin/fast-export.c:984
5307msgid "select handling of tags that tag filtered objects"
5308msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5309
5310#: builtin/fast-export.c:987
5311msgid "Dump marks to this file"
5312msgstr "把标记存储到这个文件"
5313
5314#: builtin/fast-export.c:989
5315msgid "Import marks from this file"
5316msgstr "从这个文件导入标记"
5317
5318#: builtin/fast-export.c:991
5319msgid "Fake a tagger when tags lack one"
5320msgstr "当标签缺少标记者字段时,假装提供一个"
5321
5322#: builtin/fast-export.c:993
5323msgid "Output full tree for each commit"
5324msgstr "每次提交都输出整个树"
5325
5326#: builtin/fast-export.c:995
5327msgid "Use the done feature to terminate the stream"
5328msgstr "使用 done 功能来终止流"
5329
5330#: builtin/fast-export.c:996
5331msgid "Skip output of blob data"
5332msgstr "跳过数据对象的输出"
5333
5334#: builtin/fast-export.c:997
5335msgid "refspec"
5336msgstr "引用规格"
5337
5338#: builtin/fast-export.c:998
5339msgid "Apply refspec to exported refs"
5340msgstr "对导出的引用应用引用规格"
5341
5342#: builtin/fast-export.c:999
5343msgid "anonymize output"
5344msgstr "匿名输出"
5345
5346#: builtin/fetch.c:19
5347msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5348msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5349
5350#: builtin/fetch.c:20
5351msgid "git fetch [<options>] <group>"
5352msgstr "git fetch [<选项>] <组>"
5353
5354#: builtin/fetch.c:21
5355msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5356msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5357
5358#: builtin/fetch.c:22
5359msgid "git fetch --all [<options>]"
5360msgstr "git fetch --all [<选项>]"
5361
5362#: builtin/fetch.c:89
5363msgid "fetch from all remotes"
5364msgstr "从所有的远程抓取"
5365
5366#: builtin/fetch.c:91
5367msgid "append to .git/FETCH_HEAD instead of overwriting"
5368msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5369
5370#: builtin/fetch.c:93
5371msgid "path to upload pack on remote end"
5372msgstr "上传包到远程的路径"
5373
5374#: builtin/fetch.c:94
5375msgid "force overwrite of local branch"
5376msgstr "强制覆盖本地分支"
5377
5378#: builtin/fetch.c:96
5379msgid "fetch from multiple remotes"
5380msgstr "从多个远程抓取"
5381
5382#: builtin/fetch.c:98
5383msgid "fetch all tags and associated objects"
5384msgstr "抓取所有的标签和关联对象"
5385
5386#: builtin/fetch.c:100
5387msgid "do not fetch all tags (--no-tags)"
5388msgstr "不抓取任何标签(--no-tags)"
5389
5390#: builtin/fetch.c:102
5391msgid "prune remote-tracking branches no longer on remote"
5392msgstr "清除远程已经不存在的分支的跟踪分支"
5393
5394#  译者:可选值,不能翻译
5395#: builtin/fetch.c:103
5396msgid "on-demand"
5397msgstr "on-demand"
5398
5399#: builtin/fetch.c:104
5400msgid "control recursive fetching of submodules"
5401msgstr "控制子模组的递归抓取"
5402
5403#: builtin/fetch.c:108
5404msgid "keep downloaded pack"
5405msgstr "保持下载包"
5406
5407#: builtin/fetch.c:110
5408msgid "allow updating of HEAD ref"
5409msgstr "允许更新 HEAD 引用"
5410
5411#: builtin/fetch.c:113
5412msgid "deepen history of shallow clone"
5413msgstr "深化浅克隆的历史"
5414
5415#: builtin/fetch.c:115
5416msgid "convert to a complete repository"
5417msgstr "转换为一个完整的仓库"
5418
5419#: builtin/fetch.c:117 builtin/log.c:1208
5420msgid "dir"
5421msgstr "目录"
5422
5423#: builtin/fetch.c:118
5424msgid "prepend this to submodule path output"
5425msgstr "在子模组路径输出的前面加上此目录"
5426
5427#: builtin/fetch.c:121
5428msgid "default mode for recursion"
5429msgstr "递归的默认模式"
5430
5431#: builtin/fetch.c:123
5432msgid "accept refs that update .git/shallow"
5433msgstr "接受更新 .git/shallow 的引用"
5434
5435#: builtin/fetch.c:124
5436msgid "refmap"
5437msgstr "引用映射"
5438
5439#: builtin/fetch.c:125
5440msgid "specify fetch refmap"
5441msgstr "指定获取操作的引用映射"
5442
5443#: builtin/fetch.c:377
5444msgid "Couldn't find remote ref HEAD"
5445msgstr "无法发现远程 HEAD 引用"
5446
5447#: builtin/fetch.c:457
5448#, c-format
5449msgid "object %s not found"
5450msgstr "对象 %s 未发现"
5451
5452#: builtin/fetch.c:462
5453msgid "[up to date]"
5454msgstr "[最新]"
5455
5456#: builtin/fetch.c:476
5457#, c-format
5458msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
5459msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
5460
5461#: builtin/fetch.c:477 builtin/fetch.c:563
5462msgid "[rejected]"
5463msgstr "[已拒绝]"
5464
5465#: builtin/fetch.c:488
5466msgid "[tag update]"
5467msgstr "[标签更新]"
5468
5469#  译者:注意保持前导空格
5470#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
5471msgid "  (unable to update local ref)"
5472msgstr "  (不能更新本地引用)"
5473
5474#: builtin/fetch.c:508
5475msgid "[new tag]"
5476msgstr "[新标签]"
5477
5478#: builtin/fetch.c:511
5479msgid "[new branch]"
5480msgstr "[新分支]"
5481
5482#: builtin/fetch.c:514
5483msgid "[new ref]"
5484msgstr "[新引用]"
5485
5486#: builtin/fetch.c:559
5487msgid "unable to update local ref"
5488msgstr "不能更新本地引用"
5489
5490#: builtin/fetch.c:559
5491msgid "forced update"
5492msgstr "强制更新"
5493
5494#: builtin/fetch.c:565
5495msgid "(non-fast-forward)"
5496msgstr "(非快进式)"
5497
5498#: builtin/fetch.c:599 builtin/fetch.c:832
5499#, c-format
5500msgid "cannot open %s: %s\n"
5501msgstr "无法打开 %s:%s\n"
5502
5503#: builtin/fetch.c:608
5504#, c-format
5505msgid "%s did not send all necessary objects\n"
5506msgstr "%s 未发送所有必须的对象\n"
5507
5508#: builtin/fetch.c:626
5509#, c-format
5510msgid "reject %s because shallow roots are not allowed to be updated"
5511msgstr "拒绝 %s 因为浅克隆不允许被更新"
5512
5513#: builtin/fetch.c:714 builtin/fetch.c:797
5514#, c-format
5515msgid "From %.*s\n"
5516msgstr "来自 %.*s\n"
5517
5518#: builtin/fetch.c:725
5519#, c-format
5520msgid ""
5521"some local refs could not be updated; try running\n"
5522" 'git remote prune %s' to remove any old, conflicting branches"
5523msgstr ""
5524"一些本地引用不能被更新;尝试运行\n"
5525" 'git remote prune %s' 来删除旧的、有冲突的分支"
5526
5527#  译者:注意保持前导空格
5528#: builtin/fetch.c:777
5529#, c-format
5530msgid "   (%s will become dangling)"
5531msgstr "   (%s 将成为摇摆状态)"
5532
5533#  译者:注意保持前导空格
5534#: builtin/fetch.c:778
5535#, c-format
5536msgid "   (%s has become dangling)"
5537msgstr "   (%s 已成为摇摆状态)"
5538
5539#: builtin/fetch.c:802
5540msgid "[deleted]"
5541msgstr "[已删除]"
5542
5543#: builtin/fetch.c:803 builtin/remote.c:1057
5544msgid "(none)"
5545msgstr "(无)"
5546
5547#: builtin/fetch.c:822
5548#, c-format
5549msgid "Refusing to fetch into current branch %s of non-bare repository"
5550msgstr "拒绝获取到非纯仓库的当前分支 %s"
5551
5552#: builtin/fetch.c:841
5553#, c-format
5554msgid "Option \"%s\" value \"%s\" is not valid for %s"
5555msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5556
5557#: builtin/fetch.c:844
5558#, c-format
5559msgid "Option \"%s\" is ignored for %s\n"
5560msgstr "选项 \"%s\" 为 %s 所忽略\n"
5561
5562#: builtin/fetch.c:900
5563#, c-format
5564msgid "Don't know how to fetch from %s"
5565msgstr "不知道如何从 %s 获取"
5566
5567#: builtin/fetch.c:1063
5568#, c-format
5569msgid "Fetching %s\n"
5570msgstr "正在获取 %s\n"
5571
5572#: builtin/fetch.c:1065 builtin/remote.c:90
5573#, c-format
5574msgid "Could not fetch %s"
5575msgstr "不能获取 %s"
5576
5577#: builtin/fetch.c:1083
5578msgid ""
5579"No remote repository specified.  Please, specify either a URL or a\n"
5580"remote name from which new revisions should be fetched."
5581msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
5582
5583#: builtin/fetch.c:1106
5584msgid "You need to specify a tag name."
5585msgstr "您需要指定一个标签名称。"
5586
5587#: builtin/fetch.c:1148
5588msgid "--depth and --unshallow cannot be used together"
5589msgstr "--depth 和 --unshallow 不能同时使用"
5590
5591#: builtin/fetch.c:1150
5592msgid "--unshallow on a complete repository does not make sense"
5593msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
5594
5595#: builtin/fetch.c:1173
5596msgid "fetch --all does not take a repository argument"
5597msgstr "fetch --all 不能带一个仓库参数"
5598
5599#: builtin/fetch.c:1175
5600msgid "fetch --all does not make sense with refspecs"
5601msgstr "fetch --all 带引用规格没有任何意义"
5602
5603#: builtin/fetch.c:1186
5604#, c-format
5605msgid "No such remote or remote group: %s"
5606msgstr "没有这样的远程或远程组:%s"
5607
5608#: builtin/fetch.c:1194
5609msgid "Fetching a group and specifying refspecs does not make sense"
5610msgstr "获取组并指定引用规格没有意义"
5611
5612#: builtin/fmt-merge-msg.c:13
5613msgid ""
5614"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5615msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5616
5617#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
5618#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5619#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5620#: parse-options.h:131 parse-options.h:238
5621msgid "n"
5622msgstr "n"
5623
5624#: builtin/fmt-merge-msg.c:669
5625msgid "populate log with at most <n> entries from shortlog"
5626msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5627
5628#: builtin/fmt-merge-msg.c:672
5629msgid "alias for --log (deprecated)"
5630msgstr "参数 --log 的别名(已弃用)"
5631
5632#: builtin/fmt-merge-msg.c:675
5633msgid "text"
5634msgstr "文本"
5635
5636#: builtin/fmt-merge-msg.c:676
5637msgid "use <text> as start of message"
5638msgstr "使用 <文本> 作为提交说明的开始"
5639
5640#: builtin/fmt-merge-msg.c:677
5641msgid "file to read from"
5642msgstr "从文件中读取"
5643
5644#: builtin/for-each-ref.c:687
5645msgid "unable to parse format"
5646msgstr "不能解析格式"
5647
5648#: builtin/for-each-ref.c:1083
5649msgid "git for-each-ref [<options>] [<pattern>]"
5650msgstr "git for-each-ref [<选项>] [<模式>]"
5651
5652#: builtin/for-each-ref.c:1098
5653msgid "quote placeholders suitably for shells"
5654msgstr "引用占位符适用于 shells"
5655
5656#: builtin/for-each-ref.c:1100
5657msgid "quote placeholders suitably for perl"
5658msgstr "引用占位符适用于 perl"
5659
5660#: builtin/for-each-ref.c:1102
5661msgid "quote placeholders suitably for python"
5662msgstr "引用占位符适用于 python"
5663
5664#: builtin/for-each-ref.c:1104
5665msgid "quote placeholders suitably for Tcl"
5666msgstr "引用占位符适用于 Tcl"
5667
5668#: builtin/for-each-ref.c:1107
5669msgid "show only <n> matched refs"
5670msgstr "只显示 <n> 个匹配的引用"
5671
5672#: builtin/for-each-ref.c:1108 builtin/replace.c:438
5673msgid "format"
5674msgstr "格式"
5675
5676#: builtin/for-each-ref.c:1108
5677msgid "format to use for the output"
5678msgstr "输出格式"
5679
5680#: builtin/for-each-ref.c:1109
5681msgid "key"
5682msgstr "key"
5683
5684#: builtin/for-each-ref.c:1110
5685msgid "field name to sort on"
5686msgstr "排序的字段名"
5687
5688#: builtin/fsck.c:147 builtin/prune.c:137
5689msgid "Checking connectivity"
5690msgstr "检查连接中"
5691
5692#: builtin/fsck.c:548
5693msgid "Checking object directories"
5694msgstr "检查对象目录中"
5695
5696#: builtin/fsck.c:611
5697msgid "git fsck [<options>] [<object>...]"
5698msgstr "git fsck [<选项>] [<对象>...]"
5699
5700#: builtin/fsck.c:617
5701msgid "show unreachable objects"
5702msgstr "显示不可达的对象"
5703
5704#: builtin/fsck.c:618
5705msgid "show dangling objects"
5706msgstr "显示摇摆的对象"
5707
5708#: builtin/fsck.c:619
5709msgid "report tags"
5710msgstr "报告标签"
5711
5712#: builtin/fsck.c:620
5713msgid "report root nodes"
5714msgstr "报告根节点"
5715
5716#: builtin/fsck.c:621
5717msgid "make index objects head nodes"
5718msgstr "将索引亦作为检查的头节点"
5719
5720#: builtin/fsck.c:622
5721msgid "make reflogs head nodes (default)"
5722msgstr "将引用日志作为检查的头节点(默认)"
5723
5724#: builtin/fsck.c:623
5725msgid "also consider packs and alternate objects"
5726msgstr "也考虑包和备用对象"
5727
5728#: builtin/fsck.c:624
5729msgid "enable more strict checking"
5730msgstr "启用更严格的检查"
5731
5732#: builtin/fsck.c:626
5733msgid "write dangling objects in .git/lost-found"
5734msgstr "将摇摆对象写入 .git/lost-found 中"
5735
5736#: builtin/fsck.c:627 builtin/prune.c:107
5737msgid "show progress"
5738msgstr "显示进度"
5739
5740#: builtin/fsck.c:677
5741msgid "Checking objects"
5742msgstr "检查对象中"
5743
5744#: builtin/gc.c:24
5745msgid "git gc [<options>]"
5746msgstr "git gc [<选项>]"
5747
5748#: builtin/gc.c:67
5749#, c-format
5750msgid "Invalid %s: '%s'"
5751msgstr "无效 %s:'%s'"
5752
5753#: builtin/gc.c:112
5754#, c-format
5755msgid "insanely long object directory %.*s"
5756msgstr "不正常的长对象目录 %.*s"
5757
5758#: builtin/gc.c:281
5759msgid "prune unreferenced objects"
5760msgstr "清除未引用的对象"
5761
5762#: builtin/gc.c:283
5763msgid "be more thorough (increased runtime)"
5764msgstr "更彻底(增加运行时间)"
5765
5766#: builtin/gc.c:284
5767msgid "enable auto-gc mode"
5768msgstr "启用自动垃圾回收模式"
5769
5770#: builtin/gc.c:285
5771msgid "force running gc even if there may be another gc running"
5772msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5773
5774#: builtin/gc.c:327
5775#, c-format
5776msgid "Auto packing the repository in background for optimum performance.\n"
5777msgstr "自动在后台执行仓库打包以求最佳性能。\n"
5778
5779#: builtin/gc.c:329
5780#, c-format
5781msgid "Auto packing the repository for optimum performance.\n"
5782msgstr "自动打包仓库以求最佳性能。\n"
5783
5784#: builtin/gc.c:330
5785#, c-format
5786msgid "See \"git help gc\" for manual housekeeping.\n"
5787msgstr "手工维护参见 \"git help gc\"。\n"
5788
5789#: builtin/gc.c:348
5790#, c-format
5791msgid ""
5792"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5793msgstr ""
5794"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5795
5796#: builtin/gc.c:376
5797msgid ""
5798"There are too many unreachable loose objects; run 'git prune' to remove them."
5799msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5800
5801#: builtin/grep.c:23
5802msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5803msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5804
5805#: builtin/grep.c:218
5806#, c-format
5807msgid "grep: failed to create thread: %s"
5808msgstr "grep:无法创建线程:%s"
5809
5810#: builtin/grep.c:441 builtin/grep.c:476
5811#, c-format
5812msgid "unable to read tree (%s)"
5813msgstr "无法读取树(%s)"
5814
5815#: builtin/grep.c:491
5816#, c-format
5817msgid "unable to grep from object of type %s"
5818msgstr "无法抓取来自于 %s 类型的对象"
5819
5820#: builtin/grep.c:547
5821#, c-format
5822msgid "switch `%c' expects a numerical value"
5823msgstr "开关 `%c' 期望一个数字值"
5824
5825#: builtin/grep.c:564
5826#, c-format
5827msgid "cannot open '%s'"
5828msgstr "不能打开 '%s'"
5829
5830#: builtin/grep.c:638
5831msgid "search in index instead of in the work tree"
5832msgstr "在索引区搜索而不是在工作区"
5833
5834#: builtin/grep.c:640
5835msgid "find in contents not managed by git"
5836msgstr "在未被 git 管理的内容中查找"
5837
5838#  译者:中文字符串拼接,可删除前导空格
5839#: builtin/grep.c:642
5840msgid "search in both tracked and untracked files"
5841msgstr "在跟踪和未跟踪的文件中搜索"
5842
5843#: builtin/grep.c:644
5844msgid "ignore files specified via '.gitignore'"
5845msgstr "忽略 '.gitignore' 包含的文件"
5846
5847#: builtin/grep.c:647
5848msgid "show non-matching lines"
5849msgstr "显示未匹配的行"
5850
5851#: builtin/grep.c:649
5852msgid "case insensitive matching"
5853msgstr "不区分大小写匹配"
5854
5855#: builtin/grep.c:651
5856msgid "match patterns only at word boundaries"
5857msgstr "只在单词边界匹配模式"
5858
5859#: builtin/grep.c:653
5860msgid "process binary files as text"
5861msgstr "把二进制文件当做文本处理"
5862
5863#: builtin/grep.c:655
5864msgid "don't match patterns in binary files"
5865msgstr "不在二进制文件中匹配模式"
5866
5867#: builtin/grep.c:658
5868msgid "process binary files with textconv filters"
5869msgstr "用 textconv 过滤器处理二进制文件"
5870
5871#: builtin/grep.c:660
5872msgid "descend at most <depth> levels"
5873msgstr "最多以指定的深度向下寻找"
5874
5875#: builtin/grep.c:664
5876msgid "use extended POSIX regular expressions"
5877msgstr "使用扩展的 POSIX 正则表达式"
5878
5879#: builtin/grep.c:667
5880msgid "use basic POSIX regular expressions (default)"
5881msgstr "使用基本的 POSIX 正则表达式(默认)"
5882
5883#: builtin/grep.c:670
5884msgid "interpret patterns as fixed strings"
5885msgstr "把模式解析为固定的字符串"
5886
5887#: builtin/grep.c:673
5888msgid "use Perl-compatible regular expressions"
5889msgstr "使用 Perl 兼容的正则表达式"
5890
5891#: builtin/grep.c:676
5892msgid "show line numbers"
5893msgstr "显示行号"
5894
5895#: builtin/grep.c:677
5896msgid "don't show filenames"
5897msgstr "不显示文件名"
5898
5899#: builtin/grep.c:678
5900msgid "show filenames"
5901msgstr "显示文件名"
5902
5903#: builtin/grep.c:680
5904msgid "show filenames relative to top directory"
5905msgstr "显示相对于顶级目录的文件名"
5906
5907#: builtin/grep.c:682
5908msgid "show only filenames instead of matching lines"
5909msgstr "只显示文件名而不显示匹配的行"
5910
5911#: builtin/grep.c:684
5912msgid "synonym for --files-with-matches"
5913msgstr "和 --files-with-matches 同义"
5914
5915#: builtin/grep.c:687
5916msgid "show only the names of files without match"
5917msgstr "只显示未匹配的文件名"
5918
5919#: builtin/grep.c:689
5920msgid "print NUL after filenames"
5921msgstr "在文件名后输出 NUL 字符"
5922
5923#: builtin/grep.c:691
5924msgid "show the number of matches instead of matching lines"
5925msgstr "显示总匹配行数,而不显示匹配的行"
5926
5927#: builtin/grep.c:692
5928msgid "highlight matches"
5929msgstr "高亮显示匹配项"
5930
5931#: builtin/grep.c:694
5932msgid "print empty line between matches from different files"
5933msgstr "在不同文件的匹配项之间打印空行"
5934
5935#: builtin/grep.c:696
5936msgid "show filename only once above matches from same file"
5937msgstr "只在同一文件的匹配项的上面显示一次文件名"
5938
5939#: builtin/grep.c:699
5940msgid "show <n> context lines before and after matches"
5941msgstr "显示匹配项前后的 <n> 行上下文"
5942
5943#: builtin/grep.c:702
5944msgid "show <n> context lines before matches"
5945msgstr "显示匹配项前 <n> 行上下文"
5946
5947#: builtin/grep.c:704
5948msgid "show <n> context lines after matches"
5949msgstr "显示匹配项后 <n> 行上下文"
5950
5951#: builtin/grep.c:705
5952msgid "shortcut for -C NUM"
5953msgstr "快捷键 -C 数字"
5954
5955#: builtin/grep.c:708
5956msgid "show a line with the function name before matches"
5957msgstr "在匹配的前面显示一行函数名"
5958
5959#: builtin/grep.c:710
5960msgid "show the surrounding function"
5961msgstr "显示所在函数的前后内容"
5962
5963#: builtin/grep.c:713
5964msgid "read patterns from file"
5965msgstr "从文件读取模式"
5966
5967#: builtin/grep.c:715
5968msgid "match <pattern>"
5969msgstr "匹配 <模式>"
5970
5971#: builtin/grep.c:717
5972msgid "combine patterns specified with -e"
5973msgstr "组合用 -e 参数设定的模式"
5974
5975#: builtin/grep.c:729
5976msgid "indicate hit with exit status without output"
5977msgstr "不输出,而用退出码标识命中状态"
5978
5979#: builtin/grep.c:731
5980msgid "show only matches from files that match all patterns"
5981msgstr "只显示匹配所有模式的文件中的匹配"
5982
5983#: builtin/grep.c:733
5984msgid "show parse tree for grep expression"
5985msgstr "显示 grep 表达式的解析树"
5986
5987#: builtin/grep.c:737
5988msgid "pager"
5989msgstr "分页"
5990
5991#: builtin/grep.c:737
5992msgid "show matching files in the pager"
5993msgstr "分页显示匹配的文件"
5994
5995#: builtin/grep.c:740
5996msgid "allow calling of grep(1) (ignored by this build)"
5997msgstr "允许调用 grep(1)(本次构建忽略)"
5998
5999#: builtin/grep.c:741 builtin/show-ref.c:189
6000msgid "show usage"
6001msgstr "显示用法"
6002
6003#: builtin/grep.c:808
6004msgid "no pattern given."
6005msgstr "未提供模式匹配。"
6006
6007#: builtin/grep.c:866
6008msgid "--open-files-in-pager only works on the worktree"
6009msgstr "--open-files-in-pager 仅用于工作区"
6010
6011#: builtin/grep.c:892
6012msgid "--cached or --untracked cannot be used with --no-index."
6013msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6014
6015#: builtin/grep.c:897
6016msgid "--no-index or --untracked cannot be used with revs."
6017msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6018
6019#: builtin/grep.c:900
6020msgid "--[no-]exclude-standard cannot be used for tracked contents."
6021msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6022
6023#: builtin/grep.c:908
6024msgid "both --cached and trees are given."
6025msgstr "同时给出了 --cached 和树对象。"
6026
6027#: builtin/hash-object.c:80
6028msgid ""
6029"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6030"[--] <file>..."
6031msgstr ""
6032"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6033"[--] <文件>..."
6034
6035#: builtin/hash-object.c:81
6036msgid "git hash-object  --stdin-paths < <list-of-paths>"
6037msgstr "git hash-object  --stdin-paths < <路径列表>"
6038
6039#: builtin/hash-object.c:92 builtin/tag.c:612
6040msgid "type"
6041msgstr "类型"
6042
6043#: builtin/hash-object.c:92
6044msgid "object type"
6045msgstr "对象类型"
6046
6047#: builtin/hash-object.c:93
6048msgid "write the object into the object database"
6049msgstr "将对象写入对象数据库"
6050
6051#: builtin/hash-object.c:95
6052msgid "read the object from stdin"
6053msgstr "从标准输入读取对象"
6054
6055#: builtin/hash-object.c:97
6056msgid "store file as is without filters"
6057msgstr "原样存储文件不使用过滤器"
6058
6059#: builtin/hash-object.c:98
6060msgid ""
6061"just hash any random garbage to create corrupt objects for debugging Git"
6062msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6063
6064#: builtin/hash-object.c:99
6065msgid "process file as it were from this path"
6066msgstr "处理文件并假设其来自于此路径"
6067
6068#: builtin/help.c:41
6069msgid "print all available commands"
6070msgstr "打印所有可用的命令"
6071
6072#: builtin/help.c:42
6073msgid "print list of useful guides"
6074msgstr "显示有用的指南列表"
6075
6076#: builtin/help.c:43
6077msgid "show man page"
6078msgstr "显示 man 手册"
6079
6080#: builtin/help.c:44
6081msgid "show manual in web browser"
6082msgstr "在 web 浏览器中显示手册"
6083
6084#: builtin/help.c:46
6085msgid "show info page"
6086msgstr "显示 info 手册"
6087
6088#: builtin/help.c:52
6089msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6090msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6091
6092#: builtin/help.c:64
6093#, c-format
6094msgid "unrecognized help format '%s'"
6095msgstr "未能识别的帮助格式 '%s'"
6096
6097#: builtin/help.c:91
6098msgid "Failed to start emacsclient."
6099msgstr "无法启动 emacsclient。"
6100
6101#: builtin/help.c:104
6102msgid "Failed to parse emacsclient version."
6103msgstr "无法解析 emacsclient 版本。"
6104
6105#: builtin/help.c:112
6106#, c-format
6107msgid "emacsclient version '%d' too old (< 22)."
6108msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6109
6110#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
6111#, c-format
6112msgid "failed to exec '%s': %s"
6113msgstr "无法执行 '%s':%s"
6114
6115#: builtin/help.c:215
6116#, c-format
6117msgid ""
6118"'%s': path for unsupported man viewer.\n"
6119"Please consider using 'man.<tool>.cmd' instead."
6120msgstr ""
6121"'%s':不支持的 man 手册查看器的路径。\n"
6122"请使用 'man.<工具>.cmd'。"
6123
6124#: builtin/help.c:227
6125#, c-format
6126msgid ""
6127"'%s': cmd for supported man viewer.\n"
6128"Please consider using 'man.<tool>.path' instead."
6129msgstr ""
6130"'%s': 支持的 man 手册查看器命令。\n"
6131"请使用 'man.<工具>.path'。"
6132
6133#: builtin/help.c:354
6134#, c-format
6135msgid "'%s': unknown man viewer."
6136msgstr "'%s':未知的 man 查看器。"
6137
6138#: builtin/help.c:371
6139msgid "no man viewer handled the request"
6140msgstr "没有 man 查看器处理此请求"
6141
6142#: builtin/help.c:379
6143msgid "no info viewer handled the request"
6144msgstr "没有 info 查看器处理此请求"
6145
6146#: builtin/help.c:428
6147msgid "Defining attributes per path"
6148msgstr "定义路径的属性"
6149
6150#: builtin/help.c:429
6151msgid "Everyday Git With 20 Commands Or So"
6152msgstr "每一天 Git 常用的约 20 条命令"
6153
6154#: builtin/help.c:430
6155msgid "A Git glossary"
6156msgstr "Git 词汇表"
6157
6158#: builtin/help.c:431
6159msgid "Specifies intentionally untracked files to ignore"
6160msgstr "忽略指定的未跟踪文件"
6161
6162#: builtin/help.c:432
6163msgid "Defining submodule properties"
6164msgstr "定义子模组属性"
6165
6166#: builtin/help.c:433
6167msgid "Specifying revisions and ranges for Git"
6168msgstr "指定 Git 的版本和版本范围"
6169
6170#: builtin/help.c:434
6171msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6172msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6173
6174#: builtin/help.c:435
6175msgid "An overview of recommended workflows with Git"
6176msgstr "Git 推荐的工作流概览"
6177
6178#: builtin/help.c:447
6179msgid "The common Git guides are:\n"
6180msgstr "最常用的 Git 向导有:\n"
6181
6182#: builtin/help.c:468 builtin/help.c:485
6183#, c-format
6184msgid "usage: %s%s"
6185msgstr "用法:%s%s"
6186
6187#: builtin/help.c:501
6188#, c-format
6189msgid "`git %s' is aliased to `%s'"
6190msgstr "`git %s' 是 `%s' 的别名"
6191
6192#: builtin/index-pack.c:151
6193#, c-format
6194msgid "unable to open %s"
6195msgstr "不能打开 %s"
6196
6197#: builtin/index-pack.c:201
6198#, c-format
6199msgid "object type mismatch at %s"
6200msgstr "%s 的对象类型不匹配"
6201
6202#: builtin/index-pack.c:221
6203#, c-format
6204msgid "did not receive expected object %s"
6205msgstr "未能获取期望的对象 %s"
6206
6207#: builtin/index-pack.c:224
6208#, c-format
6209msgid "object %s: expected type %s, found %s"
6210msgstr "对象 %s:期待类型 %s,却是 %s"
6211
6212#: builtin/index-pack.c:266
6213#, c-format
6214msgid "cannot fill %d byte"
6215msgid_plural "cannot fill %d bytes"
6216msgstr[0] "无法填充 %d 字节"
6217msgstr[1] "无法填充 %d 字节"
6218
6219#: builtin/index-pack.c:276
6220msgid "early EOF"
6221msgstr "过早的文件结束符(EOF)"
6222
6223#: builtin/index-pack.c:277
6224msgid "read error on input"
6225msgstr "输入上的读错误"
6226
6227#: builtin/index-pack.c:289
6228msgid "used more bytes than were available"
6229msgstr "用掉了超过可用的字节"
6230
6231#: builtin/index-pack.c:296
6232msgid "pack too large for current definition of off_t"
6233msgstr "包太大超过了当前 off_t 的定义"
6234
6235#: builtin/index-pack.c:312
6236#, c-format
6237msgid "unable to create '%s'"
6238msgstr "不能创建 '%s'"
6239
6240#: builtin/index-pack.c:317
6241#, c-format
6242msgid "cannot open packfile '%s'"
6243msgstr "无法打开包文件 '%s'"
6244
6245#: builtin/index-pack.c:331
6246msgid "pack signature mismatch"
6247msgstr "包签名不匹配"
6248
6249#: builtin/index-pack.c:333
6250#, c-format
6251msgid "pack version %<PRIu32> unsupported"
6252msgstr "不支持包版本 %<PRIu32>"
6253
6254#: builtin/index-pack.c:351
6255#, c-format
6256msgid "pack has bad object at offset %lu: %s"
6257msgstr "包中有错误的对象位于 %lu:%s"
6258
6259#: builtin/index-pack.c:472
6260#, c-format
6261msgid "inflate returned %d"
6262msgstr "解压缩返回 %d"
6263
6264#: builtin/index-pack.c:521
6265msgid "offset value overflow for delta base object"
6266msgstr "偏移值覆盖了 delta 基准对象"
6267
6268#: builtin/index-pack.c:529
6269msgid "delta base offset is out of bound"
6270msgstr "delta 基准偏移越界"
6271
6272#: builtin/index-pack.c:537
6273#, c-format
6274msgid "unknown object type %d"
6275msgstr "未知对象类型 %d"
6276
6277#: builtin/index-pack.c:568
6278msgid "cannot pread pack file"
6279msgstr "无法读取包文件"
6280
6281#: builtin/index-pack.c:570
6282#, c-format
6283msgid "premature end of pack file, %lu byte missing"
6284msgid_plural "premature end of pack file, %lu bytes missing"
6285msgstr[0] "包文件过早结束,缺少 %lu 字节"
6286msgstr[1] "包文件过早结束,缺少 %lu 字节"
6287
6288#: builtin/index-pack.c:596
6289msgid "serious inflate inconsistency"
6290msgstr "解压缩严重的不一致"
6291
6292#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6293#: builtin/index-pack.c:805 builtin/index-pack.c:814
6294#, c-format
6295msgid "SHA1 COLLISION FOUND WITH %s !"
6296msgstr "发现 %s 出现 SHA1 冲突!"
6297
6298#: builtin/index-pack.c:745 builtin/pack-objects.c:162
6299#: builtin/pack-objects.c:254
6300#, c-format
6301msgid "unable to read %s"
6302msgstr "不能读 %s"
6303
6304#: builtin/index-pack.c:811
6305#, c-format
6306msgid "cannot read existing object %s"
6307msgstr "不能读取现存对象 %s"
6308
6309#: builtin/index-pack.c:825
6310#, c-format
6311msgid "invalid blob object %s"
6312msgstr "无效的数据对象 %s"
6313
6314#: builtin/index-pack.c:839
6315#, c-format
6316msgid "invalid %s"
6317msgstr "无效的 %s"
6318
6319#: builtin/index-pack.c:843
6320msgid "Error in object"
6321msgstr "对象中出错"
6322
6323#: builtin/index-pack.c:845
6324#, c-format
6325msgid "Not all child objects of %s are reachable"
6326msgstr "%s 的所有子对象并非都可达"
6327
6328#: builtin/index-pack.c:917 builtin/index-pack.c:948
6329msgid "failed to apply delta"
6330msgstr "无法应用 delta"
6331
6332#: builtin/index-pack.c:1118
6333msgid "Receiving objects"
6334msgstr "接收对象中"
6335
6336#: builtin/index-pack.c:1118
6337msgid "Indexing objects"
6338msgstr "索引对象中"
6339
6340#: builtin/index-pack.c:1150
6341msgid "pack is corrupted (SHA1 mismatch)"
6342msgstr "包冲突(SHA1 不匹配)"
6343
6344#: builtin/index-pack.c:1155
6345msgid "cannot fstat packfile"
6346msgstr "不能枚举包文件状态"
6347
6348#: builtin/index-pack.c:1158
6349msgid "pack has junk at the end"
6350msgstr "包的结尾有垃圾数据"
6351
6352#: builtin/index-pack.c:1169
6353msgid "confusion beyond insanity in parse_pack_objects()"
6354msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6355
6356#: builtin/index-pack.c:1194
6357msgid "Resolving deltas"
6358msgstr "处理 delta 中"
6359
6360#: builtin/index-pack.c:1205
6361#, c-format
6362msgid "unable to create thread: %s"
6363msgstr "不能创建线程:%s"
6364
6365#: builtin/index-pack.c:1247
6366msgid "confusion beyond insanity"
6367msgstr "不可理喻"
6368
6369#: builtin/index-pack.c:1253
6370#, c-format
6371msgid "completed with %d local objects"
6372msgstr "完成 %d 个本地对象"
6373
6374#: builtin/index-pack.c:1263
6375#, c-format
6376msgid "Unexpected tail checksum for %s (disk corruption?)"
6377msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6378
6379#: builtin/index-pack.c:1267
6380#, c-format
6381msgid "pack has %d unresolved delta"
6382msgid_plural "pack has %d unresolved deltas"
6383msgstr[0] "包有 %d 个未解决的 delta"
6384msgstr[1] "包有 %d 个未解决的 delta"
6385
6386#: builtin/index-pack.c:1291
6387#, c-format
6388msgid "unable to deflate appended object (%d)"
6389msgstr "不能压缩附加对象(%d)"
6390
6391#: builtin/index-pack.c:1367
6392#, c-format
6393msgid "local object %s is corrupt"
6394msgstr "本地对象 %s 已损坏"
6395
6396#: builtin/index-pack.c:1391
6397msgid "error while closing pack file"
6398msgstr "关闭包文件时出错"
6399
6400#: builtin/index-pack.c:1404
6401#, c-format
6402msgid "cannot write keep file '%s'"
6403msgstr "无法写保留文件 '%s'"
6404
6405#: builtin/index-pack.c:1412
6406#, c-format
6407msgid "cannot close written keep file '%s'"
6408msgstr "无法关闭保留文件 '%s'"
6409
6410#: builtin/index-pack.c:1425
6411msgid "cannot store pack file"
6412msgstr "无法存储包文件"
6413
6414#: builtin/index-pack.c:1436
6415msgid "cannot store index file"
6416msgstr "无法存储索引文件"
6417
6418#: builtin/index-pack.c:1469
6419#, c-format
6420msgid "bad pack.indexversion=%<PRIu32>"
6421msgstr "坏的 pack.indexversion=%<PRIu32>"
6422
6423#: builtin/index-pack.c:1475
6424#, c-format
6425msgid "invalid number of threads specified (%d)"
6426msgstr "指定的线程数无效(%d)"
6427
6428#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
6429#, c-format
6430msgid "no threads support, ignoring %s"
6431msgstr "没有线程支持,忽略 %s"
6432
6433#: builtin/index-pack.c:1537
6434#, c-format
6435msgid "Cannot open existing pack file '%s'"
6436msgstr "无法打开现存包文件 '%s'"
6437
6438#: builtin/index-pack.c:1539
6439#, c-format
6440msgid "Cannot open existing pack idx file for '%s'"
6441msgstr "无法为 %s 打开包索引文件"
6442
6443#: builtin/index-pack.c:1586
6444#, c-format
6445msgid "non delta: %d object"
6446msgid_plural "non delta: %d objects"
6447msgstr[0] "非 delta:%d 个对象"
6448msgstr[1] "非 delta:%d 个对象"
6449
6450#: builtin/index-pack.c:1593
6451#, c-format
6452msgid "chain length = %d: %lu object"
6453msgid_plural "chain length = %d: %lu objects"
6454msgstr[0] "链长 = %d: %lu 对象"
6455msgstr[1] "链长 = %d: %lu 对象"
6456
6457#: builtin/index-pack.c:1622
6458msgid "Cannot come back to cwd"
6459msgstr "无法返回当前工作目录"
6460
6461#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6462#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
6463#, c-format
6464msgid "bad %s"
6465msgstr "错误选项 %s"
6466
6467#: builtin/index-pack.c:1703
6468msgid "--fix-thin cannot be used without --stdin"
6469msgstr "--fix-thin 不能和 --stdin 同时使用"
6470
6471#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
6472#, c-format
6473msgid "packfile name '%s' does not end with '.pack'"
6474msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
6475
6476#: builtin/index-pack.c:1724
6477msgid "--verify with no packfile name given"
6478msgstr "--verify 没有提供包文件名参数"
6479
6480#: builtin/init-db.c:35
6481#, c-format
6482msgid "Could not make %s writable by group"
6483msgstr "不能设置 %s 为组可写"
6484
6485#: builtin/init-db.c:62
6486#, c-format
6487msgid "insanely long template name %s"
6488msgstr "太长的模版名 %s"
6489
6490#: builtin/init-db.c:67
6491#, c-format
6492msgid "cannot stat '%s'"
6493msgstr "不能枚举 '%s' 状态"
6494
6495#: builtin/init-db.c:73
6496#, c-format
6497msgid "cannot stat template '%s'"
6498msgstr "不能枚举模版 '%s' 状态"
6499
6500#: builtin/init-db.c:80
6501#, c-format
6502msgid "cannot opendir '%s'"
6503msgstr "不能打开目录 '%s'"
6504
6505#: builtin/init-db.c:97
6506#, c-format
6507msgid "cannot readlink '%s'"
6508msgstr "不能读取链接 '%s'"
6509
6510#: builtin/init-db.c:99
6511#, c-format
6512msgid "insanely long symlink %s"
6513msgstr "太长的符号链接 %s"
6514
6515#: builtin/init-db.c:102
6516#, c-format
6517msgid "cannot symlink '%s' '%s'"
6518msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6519
6520#: builtin/init-db.c:106
6521#, c-format
6522msgid "cannot copy '%s' to '%s'"
6523msgstr "不能拷贝 '%s' 至 '%s'"
6524
6525#: builtin/init-db.c:110
6526#, c-format
6527msgid "ignoring template %s"
6528msgstr "忽略模版 %s"
6529
6530#: builtin/init-db.c:136
6531#, c-format
6532msgid "insanely long template path %s"
6533msgstr "太长的模版路径 %s"
6534
6535#: builtin/init-db.c:144
6536#, c-format
6537msgid "templates not found %s"
6538msgstr "模版未找到 %s"
6539
6540#: builtin/init-db.c:157
6541#, c-format
6542msgid "not copying templates of a wrong format version %d from '%s'"
6543msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6544
6545#: builtin/init-db.c:211
6546#, c-format
6547msgid "insane git directory %s"
6548msgstr "不正常的 git 目录 %s"
6549
6550#: builtin/init-db.c:343 builtin/init-db.c:346
6551#, c-format
6552msgid "%s already exists"
6553msgstr "%s 已经存在"
6554
6555#: builtin/init-db.c:374
6556#, c-format
6557msgid "unable to handle file type %d"
6558msgstr "不能处理 %d 类型的文件"
6559
6560#: builtin/init-db.c:377
6561#, c-format
6562msgid "unable to move %s to %s"
6563msgstr "不能移动 %s 至 %s"
6564
6565#. TRANSLATORS: The first '%s' is either "Reinitialized
6566#. existing" or "Initialized empty", the second " shared" or
6567#. "", and the last '%s%s' is the verbatim directory name.
6568#: builtin/init-db.c:433
6569#, c-format
6570msgid "%s%s Git repository in %s%s\n"
6571msgstr "%s%s Git 仓库于 %s%s\n"
6572
6573#: builtin/init-db.c:434
6574msgid "Reinitialized existing"
6575msgstr "重新初始化现存的"
6576
6577#: builtin/init-db.c:434
6578msgid "Initialized empty"
6579msgstr "初始化空的"
6580
6581#  译者:中文字符串拼接,可删除前导空格
6582#: builtin/init-db.c:435
6583msgid " shared"
6584msgstr "共享"
6585
6586#: builtin/init-db.c:482
6587msgid ""
6588"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6589"shared[=<permissions>]] [<directory>]"
6590msgstr ""
6591"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6592"[<目录>]"
6593
6594#: builtin/init-db.c:505
6595msgid "permissions"
6596msgstr "权限"
6597
6598#: builtin/init-db.c:506
6599msgid "specify that the git repository is to be shared amongst several users"
6600msgstr "指定 git 仓库是多个用户之间共享的"
6601
6602#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
6603msgid "be quiet"
6604msgstr "保持安静"
6605
6606#: builtin/init-db.c:540 builtin/init-db.c:545
6607#, c-format
6608msgid "cannot mkdir %s"
6609msgstr "不能创建目录 %s"
6610
6611#: builtin/init-db.c:549
6612#, c-format
6613msgid "cannot chdir to %s"
6614msgstr "不能切换目录到 %s"
6615
6616#: builtin/init-db.c:570
6617#, c-format
6618msgid ""
6619"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6620"dir=<directory>)"
6621msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6622
6623#: builtin/init-db.c:598
6624#, c-format
6625msgid "Cannot access work tree '%s'"
6626msgstr "不能访问工作区 '%s'"
6627
6628#: builtin/interpret-trailers.c:15
6629msgid ""
6630"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6631"[<file>...]"
6632msgstr ""
6633"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6634">...]"
6635
6636#: builtin/interpret-trailers.c:25
6637msgid "trim empty trailers"
6638msgstr "删除空签名"
6639
6640#: builtin/interpret-trailers.c:26
6641msgid "trailer"
6642msgstr "签名"
6643
6644#: builtin/interpret-trailers.c:27
6645msgid "trailer(s) to add"
6646msgstr "要添加的签名"
6647
6648#: builtin/log.c:41
6649msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6650msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6651
6652#: builtin/log.c:42
6653msgid "git show [<options>] <object>..."
6654msgstr "git show [<选项>] <对象>..."
6655
6656#: builtin/log.c:81
6657#, c-format
6658msgid "invalid --decorate option: %s"
6659msgstr "无效的 --decorate 选项:%s"
6660
6661#: builtin/log.c:127
6662msgid "suppress diff output"
6663msgstr "不显示差异输出"
6664
6665#: builtin/log.c:128
6666msgid "show source"
6667msgstr "显示源"
6668
6669#: builtin/log.c:129
6670msgid "Use mail map file"
6671msgstr "使用邮件映射文件"
6672
6673#: builtin/log.c:130
6674msgid "decorate options"
6675msgstr "修饰选项"
6676
6677#: builtin/log.c:133
6678msgid "Process line range n,m in file, counting from 1"
6679msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6680
6681#: builtin/log.c:229
6682#, c-format
6683msgid "Final output: %d %s\n"
6684msgstr "最终输出:%d %s\n"
6685
6686#: builtin/log.c:458
6687#, c-format
6688msgid "git show %s: bad file"
6689msgstr "git show %s: 损坏的文件"
6690
6691#: builtin/log.c:472 builtin/log.c:564
6692#, c-format
6693msgid "Could not read object %s"
6694msgstr "不能读取对象 %s"
6695
6696#: builtin/log.c:588
6697#, c-format
6698msgid "Unknown type: %d"
6699msgstr "未知类型:%d"
6700
6701#: builtin/log.c:689
6702msgid "format.headers without value"
6703msgstr "format.headers 没有值"
6704
6705#: builtin/log.c:773
6706msgid "name of output directory is too long"
6707msgstr "输出目录名太长"
6708
6709#: builtin/log.c:789
6710#, c-format
6711msgid "Cannot open patch file %s"
6712msgstr "无法打开补丁文件 %s"
6713
6714#: builtin/log.c:803
6715msgid "Need exactly one range."
6716msgstr "只需要一个范围。"
6717
6718#: builtin/log.c:813
6719msgid "Not a range."
6720msgstr "不是一个范围。"
6721
6722#: builtin/log.c:919
6723msgid "Cover letter needs email format"
6724msgstr "信封需要邮件地址格式"
6725
6726#: builtin/log.c:998
6727#, c-format
6728msgid "insane in-reply-to: %s"
6729msgstr "不正常的 in-reply-to:%s"
6730
6731#: builtin/log.c:1026
6732msgid "git format-patch [<options>] [<since> | <revision-range>]"
6733msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6734
6735#: builtin/log.c:1071
6736msgid "Two output directories?"
6737msgstr "两个输出目录?"
6738
6739#: builtin/log.c:1186
6740msgid "use [PATCH n/m] even with a single patch"
6741msgstr "使用 [PATCH n/m],即使只有一个补丁"
6742
6743#: builtin/log.c:1189
6744msgid "use [PATCH] even with multiple patches"
6745msgstr "使用 [PATCH],即使有多个补丁"
6746
6747#: builtin/log.c:1193
6748msgid "print patches to standard out"
6749msgstr "打印补丁到标准输出"
6750
6751#: builtin/log.c:1195
6752msgid "generate a cover letter"
6753msgstr "生成一封附信"
6754
6755#: builtin/log.c:1197
6756msgid "use simple number sequence for output file names"
6757msgstr "使用简单的数字序列作为输出文件名"
6758
6759#: builtin/log.c:1198
6760msgid "sfx"
6761msgstr "后缀"
6762
6763#: builtin/log.c:1199
6764msgid "use <sfx> instead of '.patch'"
6765msgstr "使用 <后缀> 代替 '.patch'"
6766
6767#: builtin/log.c:1201
6768msgid "start numbering patches at <n> instead of 1"
6769msgstr "补丁以 <n> 开始编号,而不是1"
6770
6771#: builtin/log.c:1203
6772msgid "mark the series as Nth re-roll"
6773msgstr "标记补丁系列是第几次重制"
6774
6775#: builtin/log.c:1205
6776msgid "Use [<prefix>] instead of [PATCH]"
6777msgstr "使用 [<前缀>] 代替 [PATCH]"
6778
6779#: builtin/log.c:1208
6780msgid "store resulting files in <dir>"
6781msgstr "把结果文件存储在 <目录>"
6782
6783#: builtin/log.c:1211
6784msgid "don't strip/add [PATCH]"
6785msgstr "不删除/添加 [PATCH]"
6786
6787#: builtin/log.c:1214
6788msgid "don't output binary diffs"
6789msgstr "不输出二进制差异"
6790
6791#: builtin/log.c:1216
6792msgid "don't include a patch matching a commit upstream"
6793msgstr "不包含已在上游提交中的补丁"
6794
6795#: builtin/log.c:1218
6796msgid "show patch format instead of default (patch + stat)"
6797msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6798
6799#: builtin/log.c:1220
6800msgid "Messaging"
6801msgstr "邮件发送"
6802
6803#: builtin/log.c:1221
6804msgid "header"
6805msgstr "header"
6806
6807#: builtin/log.c:1222
6808msgid "add email header"
6809msgstr "添加邮件头"
6810
6811#: builtin/log.c:1223 builtin/log.c:1225
6812msgid "email"
6813msgstr "邮件地址"
6814
6815#: builtin/log.c:1223
6816msgid "add To: header"
6817msgstr "添加收件人"
6818
6819#: builtin/log.c:1225
6820msgid "add Cc: header"
6821msgstr "添加抄送"
6822
6823#: builtin/log.c:1227
6824msgid "ident"
6825msgstr "标识"
6826
6827#: builtin/log.c:1228
6828msgid "set From address to <ident> (or committer ident if absent)"
6829msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
6830
6831#: builtin/log.c:1230
6832msgid "message-id"
6833msgstr "邮件标识"
6834
6835#: builtin/log.c:1231
6836msgid "make first mail a reply to <message-id>"
6837msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6838
6839#: builtin/log.c:1232 builtin/log.c:1235
6840msgid "boundary"
6841msgstr "边界"
6842
6843#: builtin/log.c:1233
6844msgid "attach the patch"
6845msgstr "附件方式添加补丁"
6846
6847#: builtin/log.c:1236
6848msgid "inline the patch"
6849msgstr "内联显示补丁"
6850
6851#: builtin/log.c:1240
6852msgid "enable message threading, styles: shallow, deep"
6853msgstr "启用邮件线索,风格:浅,深"
6854
6855#: builtin/log.c:1242
6856msgid "signature"
6857msgstr "签名"
6858
6859#: builtin/log.c:1243
6860msgid "add a signature"
6861msgstr "添加一个签名"
6862
6863#: builtin/log.c:1245
6864msgid "add a signature from a file"
6865msgstr "从文件添加一个签名"
6866
6867#: builtin/log.c:1246
6868msgid "don't print the patch filenames"
6869msgstr "不要打印补丁文件名"
6870
6871#: builtin/log.c:1320
6872#, c-format
6873msgid "invalid ident line: %s"
6874msgstr "包含无效的身份标识:%s"
6875
6876#: builtin/log.c:1335
6877msgid "-n and -k are mutually exclusive."
6878msgstr "-n 和 -k 互斥。"
6879
6880#: builtin/log.c:1337
6881msgid "--subject-prefix and -k are mutually exclusive."
6882msgstr "--subject-prefix 和 -k 互斥。"
6883
6884#: builtin/log.c:1345
6885msgid "--name-only does not make sense"
6886msgstr "--name-only 无意义"
6887
6888#: builtin/log.c:1347
6889msgid "--name-status does not make sense"
6890msgstr "--name-status 无意义"
6891
6892#: builtin/log.c:1349
6893msgid "--check does not make sense"
6894msgstr "--check 无意义"
6895
6896#: builtin/log.c:1372
6897msgid "standard output, or directory, which one?"
6898msgstr "标准输出或目录,哪一个?"
6899
6900#: builtin/log.c:1374
6901#, c-format
6902msgid "Could not create directory '%s'"
6903msgstr "不能创建目录 '%s'"
6904
6905#: builtin/log.c:1472
6906#, c-format
6907msgid "unable to read signature file '%s'"
6908msgstr "无法读取签名文件 '%s'"
6909
6910#: builtin/log.c:1535
6911msgid "Failed to create output files"
6912msgstr "无法创建输出文件"
6913
6914#: builtin/log.c:1583
6915msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6916msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6917
6918#: builtin/log.c:1637
6919#, c-format
6920msgid ""
6921"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6922msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6923
6924#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
6925#, c-format
6926msgid "Unknown commit %s"
6927msgstr "未知提交 %s"
6928
6929#: builtin/ls-files.c:358
6930msgid "git ls-files [<options>] [<file>...]"
6931msgstr "git ls-files [<选项>] [<文件>...]"
6932
6933#: builtin/ls-files.c:415
6934msgid "identify the file status with tags"
6935msgstr "用标签标识文件的状态"
6936
6937#: builtin/ls-files.c:417
6938msgid "use lowercase letters for 'assume unchanged' files"
6939msgstr "使用小写字母表示 '假设未改变的' 文件"
6940
6941#: builtin/ls-files.c:419
6942msgid "show cached files in the output (default)"
6943msgstr "显示缓存的文件(默认)"
6944
6945#: builtin/ls-files.c:421
6946msgid "show deleted files in the output"
6947msgstr "显示已删除的文件"
6948
6949#: builtin/ls-files.c:423
6950msgid "show modified files in the output"
6951msgstr "显示已修改的文件"
6952
6953#: builtin/ls-files.c:425
6954msgid "show other files in the output"
6955msgstr "显示其它文件"
6956
6957#: builtin/ls-files.c:427
6958msgid "show ignored files in the output"
6959msgstr "显示忽略的文件"
6960
6961#: builtin/ls-files.c:430
6962msgid "show staged contents' object name in the output"
6963msgstr "显示暂存区内容的对象名称"
6964
6965#: builtin/ls-files.c:432
6966msgid "show files on the filesystem that need to be removed"
6967msgstr "显示文件系统需要删除的文件"
6968
6969#: builtin/ls-files.c:434
6970msgid "show 'other' directories' names only"
6971msgstr "只显示“其他”目录的名称"
6972
6973#: builtin/ls-files.c:437
6974msgid "don't show empty directories"
6975msgstr "不显示空目录"
6976
6977#: builtin/ls-files.c:440
6978msgid "show unmerged files in the output"
6979msgstr "显示未合并的文件"
6980
6981#: builtin/ls-files.c:442
6982msgid "show resolve-undo information"
6983msgstr "显示 resolve-undo 信息"
6984
6985#: builtin/ls-files.c:444
6986msgid "skip files matching pattern"
6987msgstr "匹配排除文件的模式"
6988
6989#: builtin/ls-files.c:447
6990msgid "exclude patterns are read from <file>"
6991msgstr "从 <文件> 中读取排除模式"
6992
6993#: builtin/ls-files.c:450
6994msgid "read additional per-directory exclude patterns in <file>"
6995msgstr "从 <文件> 读取额外的每个目录的排除模式"
6996
6997#: builtin/ls-files.c:452
6998msgid "add the standard git exclusions"
6999msgstr "添加标准的 git 排除"
7000
7001#: builtin/ls-files.c:455
7002msgid "make the output relative to the project top directory"
7003msgstr "显示相对于顶级目录的文件名"
7004
7005#: builtin/ls-files.c:458
7006msgid "if any <file> is not in the index, treat this as an error"
7007msgstr "如果任何 <文件> 都不在索引区,视为错误"
7008
7009#: builtin/ls-files.c:459
7010msgid "tree-ish"
7011msgstr "树或提交"
7012
7013#: builtin/ls-files.c:460
7014msgid "pretend that paths removed since <tree-ish> are still present"
7015msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7016
7017#: builtin/ls-files.c:462
7018msgid "show debugging data"
7019msgstr "显示调试数据"
7020
7021#: builtin/ls-tree.c:28
7022msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7023msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7024
7025#: builtin/ls-tree.c:127
7026msgid "only show trees"
7027msgstr "只显示树"
7028
7029#: builtin/ls-tree.c:129
7030msgid "recurse into subtrees"
7031msgstr "递归到子树"
7032
7033#: builtin/ls-tree.c:131
7034msgid "show trees when recursing"
7035msgstr "当递归时显示树"
7036
7037#: builtin/ls-tree.c:134
7038msgid "terminate entries with NUL byte"
7039msgstr "条目以 NUL 字符终止"
7040
7041#: builtin/ls-tree.c:135
7042msgid "include object size"
7043msgstr "包括对象大小"
7044
7045#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
7046msgid "list only filenames"
7047msgstr "只列出文件名"
7048
7049#: builtin/ls-tree.c:142
7050msgid "use full path names"
7051msgstr "使用文件的全路径"
7052
7053#: builtin/ls-tree.c:144
7054msgid "list entire tree; not just current directory (implies --full-name)"
7055msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7056
7057#: builtin/merge.c:45
7058msgid "git merge [<options>] [<commit>...]"
7059msgstr "git merge [<选项>] [<提交>...]"
7060
7061#: builtin/merge.c:46
7062msgid "git merge [<options>] <msg> HEAD <commit>"
7063msgstr "git merge [<选项>] <说明> HEAD <提交>"
7064
7065#: builtin/merge.c:47
7066msgid "git merge --abort"
7067msgstr "git merge --abort"
7068
7069#: builtin/merge.c:100
7070msgid "switch `m' requires a value"
7071msgstr "开关 `m' 需要一个值"
7072
7073#: builtin/merge.c:137
7074#, c-format
7075msgid "Could not find merge strategy '%s'.\n"
7076msgstr "不能找到合并策略 '%s'。\n"
7077
7078#: builtin/merge.c:138
7079#, c-format
7080msgid "Available strategies are:"
7081msgstr "可用的策略有:"
7082
7083#: builtin/merge.c:143
7084#, c-format
7085msgid "Available custom strategies are:"
7086msgstr "可用的自定义策略有:"
7087
7088#: builtin/merge.c:193
7089msgid "do not show a diffstat at the end of the merge"
7090msgstr "在合并的最后不显示差异统计"
7091
7092#: builtin/merge.c:196
7093msgid "show a diffstat at the end of the merge"
7094msgstr "在合并的最后显示差异统计"
7095
7096#: builtin/merge.c:197
7097msgid "(synonym to --stat)"
7098msgstr "(和 --stat 同义)"
7099
7100#: builtin/merge.c:199
7101msgid "add (at most <n>) entries from shortlog to merge commit message"
7102msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7103
7104#: builtin/merge.c:202
7105msgid "create a single commit instead of doing a merge"
7106msgstr "创建一个单独的提交而不是做一次合并"
7107
7108#: builtin/merge.c:204
7109msgid "perform a commit if the merge succeeds (default)"
7110msgstr "如果合并成功,执行一次提交(默认)"
7111
7112#: builtin/merge.c:206
7113msgid "edit message before committing"
7114msgstr "在提交前编辑提交说明"
7115
7116#: builtin/merge.c:207
7117msgid "allow fast-forward (default)"
7118msgstr "允许快进(默认)"
7119
7120#: builtin/merge.c:209
7121msgid "abort if fast-forward is not possible"
7122msgstr "如果不能快进就放弃合并"
7123
7124#: builtin/merge.c:213
7125msgid "Verify that the named commit has a valid GPG signature"
7126msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7127
7128#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
7129msgid "strategy"
7130msgstr "策略"
7131
7132#: builtin/merge.c:215
7133msgid "merge strategy to use"
7134msgstr "要使用的合并策略"
7135
7136#: builtin/merge.c:216
7137msgid "option=value"
7138msgstr "option=value"
7139
7140#: builtin/merge.c:217
7141msgid "option for selected merge strategy"
7142msgstr "所选的合并策略的选项"
7143
7144#: builtin/merge.c:219
7145msgid "merge commit message (for a non-fast-forward merge)"
7146msgstr "合并的提交说明(针对非快进式合并)"
7147
7148#: builtin/merge.c:223
7149msgid "abort the current in-progress merge"
7150msgstr "放弃当前正在进行的合并"
7151
7152#: builtin/merge.c:251
7153msgid "could not run stash."
7154msgstr "不能进行进度保存。"
7155
7156#: builtin/merge.c:256
7157msgid "stash failed"
7158msgstr "进度保存失败"
7159
7160#: builtin/merge.c:261
7161#, c-format
7162msgid "not a valid object: %s"
7163msgstr "不是一个有效对象:%s"
7164
7165#: builtin/merge.c:280 builtin/merge.c:297
7166msgid "read-tree failed"
7167msgstr "读取树失败"
7168
7169#  译者:注意保持前导空格
7170#: builtin/merge.c:327
7171msgid " (nothing to squash)"
7172msgstr " (无可压缩)"
7173
7174#: builtin/merge.c:340
7175#, c-format
7176msgid "Squash commit -- not updating HEAD\n"
7177msgstr "压缩提交 -- 未更新 HEAD\n"
7178
7179#: builtin/merge.c:372
7180msgid "Writing SQUASH_MSG"
7181msgstr "写入 SQUASH_MSG"
7182
7183#: builtin/merge.c:374
7184msgid "Finishing SQUASH_MSG"
7185msgstr "完成 SQUASH_MSG"
7186
7187#: builtin/merge.c:397
7188#, c-format
7189msgid "No merge message -- not updating HEAD\n"
7190msgstr "无合并信息 -- 未更新 HEAD\n"
7191
7192#: builtin/merge.c:447
7193#, c-format
7194msgid "'%s' does not point to a commit"
7195msgstr "'%s' 没有指向一个提交"
7196
7197#: builtin/merge.c:537
7198#, c-format
7199msgid "Bad branch.%s.mergeoptions string: %s"
7200msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7201
7202#: builtin/merge.c:632
7203msgid "git write-tree failed to write a tree"
7204msgstr "git write-tree 无法写入一树对象"
7205
7206#: builtin/merge.c:656
7207msgid "Not handling anything other than two heads merge."
7208msgstr "不能处理两个头合并之外的任何操作。"
7209
7210#: builtin/merge.c:670
7211#, c-format
7212msgid "Unknown option for merge-recursive: -X%s"
7213msgstr "merge-recursive 的未知选项:-X%s"
7214
7215#: builtin/merge.c:683
7216#, c-format
7217msgid "unable to write %s"
7218msgstr "不能写 %s"
7219
7220#: builtin/merge.c:772
7221#, c-format
7222msgid "Could not read from '%s'"
7223msgstr "不能从 '%s' 读取"
7224
7225#: builtin/merge.c:781
7226#, c-format
7227msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7228msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7229
7230#: builtin/merge.c:787
7231#, c-format
7232msgid ""
7233"Please enter a commit message to explain why this merge is necessary,\n"
7234"especially if it merges an updated upstream into a topic branch.\n"
7235"\n"
7236"Lines starting with '%c' will be ignored, and an empty message aborts\n"
7237"the commit.\n"
7238msgstr ""
7239"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7240"合并到主题分支。\n"
7241"\n"
7242"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7243
7244#: builtin/merge.c:811
7245msgid "Empty commit message."
7246msgstr "空提交信息。"
7247
7248#: builtin/merge.c:823
7249#, c-format
7250msgid "Wonderful.\n"
7251msgstr "太棒了。\n"
7252
7253#: builtin/merge.c:878
7254#, c-format
7255msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7256msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7257
7258#: builtin/merge.c:894
7259#, c-format
7260msgid "'%s' is not a commit"
7261msgstr "'%s' 不是一个提交"
7262
7263#: builtin/merge.c:935
7264msgid "No current branch."
7265msgstr "没有当前分支。"
7266
7267#: builtin/merge.c:937
7268msgid "No remote for the current branch."
7269msgstr "当前分支没有对应的远程仓库。"
7270
7271#: builtin/merge.c:939
7272msgid "No default upstream defined for the current branch."
7273msgstr "当前分支没有定义默认的上游分支。"
7274
7275#: builtin/merge.c:944
7276#, c-format
7277msgid "No remote-tracking branch for %s from %s"
7278msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7279
7280#: builtin/merge.c:1081
7281#, c-format
7282msgid "could not close '%s'"
7283msgstr "不能关闭 '%s'"
7284
7285#: builtin/merge.c:1208
7286msgid "There is no merge to abort (MERGE_HEAD missing)."
7287msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7288
7289#: builtin/merge.c:1224
7290msgid ""
7291"You have not concluded your merge (MERGE_HEAD exists).\n"
7292"Please, commit your changes before you merge."
7293msgstr ""
7294"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7295"请在合并前先提交您的修改。"
7296
7297#: builtin/merge.c:1227 git-pull.sh:74
7298msgid "You have not concluded your merge (MERGE_HEAD exists)."
7299msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7300
7301#: builtin/merge.c:1231
7302msgid ""
7303"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7304"Please, commit your changes before you merge."
7305msgstr ""
7306"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7307"请在合并前先提交您的修改。"
7308
7309#: builtin/merge.c:1234
7310msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7311msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7312
7313#: builtin/merge.c:1243
7314msgid "You cannot combine --squash with --no-ff."
7315msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7316
7317#: builtin/merge.c:1251
7318msgid "No commit specified and merge.defaultToUpstream not set."
7319msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7320
7321#: builtin/merge.c:1268
7322msgid "Squash commit into empty head not supported yet"
7323msgstr "尚不支持到空分支的压缩提交"
7324
7325#: builtin/merge.c:1270
7326msgid "Non-fast-forward commit does not make sense into an empty head"
7327msgstr "到空分支的非快进式提交没有意义"
7328
7329#: builtin/merge.c:1276
7330#, c-format
7331msgid "%s - not something we can merge"
7332msgstr "%s - 不能被合并"
7333
7334#: builtin/merge.c:1278
7335msgid "Can merge only exactly one commit into empty head"
7336msgstr "只能将一个提交合并到空分支上"
7337
7338#: builtin/merge.c:1333
7339#, c-format
7340msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7341msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7342
7343#: builtin/merge.c:1336
7344#, c-format
7345msgid "Commit %s has a bad GPG signature allegedly by %s."
7346msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7347
7348#: builtin/merge.c:1339
7349#, c-format
7350msgid "Commit %s does not have a GPG signature."
7351msgstr "提交 %s 没有一个 GPG 签名。"
7352
7353#: builtin/merge.c:1342
7354#, c-format
7355msgid "Commit %s has a good GPG signature by %s\n"
7356msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7357
7358#: builtin/merge.c:1423
7359#, c-format
7360msgid "Updating %s..%s\n"
7361msgstr "更新 %s..%s\n"
7362
7363#: builtin/merge.c:1462
7364#, c-format
7365msgid "Trying really trivial in-index merge...\n"
7366msgstr "尝试非常小的索引内合并...\n"
7367
7368#: builtin/merge.c:1469
7369#, c-format
7370msgid "Nope.\n"
7371msgstr "无。\n"
7372
7373#: builtin/merge.c:1501
7374msgid "Not possible to fast-forward, aborting."
7375msgstr "无法快进,终止。"
7376
7377#: builtin/merge.c:1524 builtin/merge.c:1603
7378#, c-format
7379msgid "Rewinding the tree to pristine...\n"
7380msgstr "将树回滚至原始状态...\n"
7381
7382#: builtin/merge.c:1528
7383#, c-format
7384msgid "Trying merge strategy %s...\n"
7385msgstr "尝试合并策略 %s...\n"
7386
7387#: builtin/merge.c:1594
7388#, c-format
7389msgid "No merge strategy handled the merge.\n"
7390msgstr "没有合并策略处理此合并。\n"
7391
7392#: builtin/merge.c:1596
7393#, c-format
7394msgid "Merge with strategy %s failed.\n"
7395msgstr "使用策略 %s 合并失败。\n"
7396
7397#: builtin/merge.c:1605
7398#, c-format
7399msgid "Using the %s to prepare resolving by hand.\n"
7400msgstr "使用 %s 以准备手工解决。\n"
7401
7402#: builtin/merge.c:1617
7403#, c-format
7404msgid "Automatic merge went well; stopped before committing as requested\n"
7405msgstr "自动合并进展顺利,按要求在提交前停止\n"
7406
7407#: builtin/merge-base.c:29
7408msgid "git merge-base [-a | --all] <commit> <commit>..."
7409msgstr "git merge-base [-a | --all] <提交> <提交>..."
7410
7411#: builtin/merge-base.c:30
7412msgid "git merge-base [-a | --all] --octopus <commit>..."
7413msgstr "git merge-base [-a | --all] --octopus <提交>..."
7414
7415#: builtin/merge-base.c:31
7416msgid "git merge-base --independent <commit>..."
7417msgstr "git merge-base --independent <提交>..."
7418
7419#: builtin/merge-base.c:32
7420msgid "git merge-base --is-ancestor <commit> <commit>"
7421msgstr "git merge-base --is-ancestor <提交> <提交>"
7422
7423#: builtin/merge-base.c:33
7424msgid "git merge-base --fork-point <ref> [<commit>]"
7425msgstr "git merge-base --fork-point <引用> [<提交>]"
7426
7427#: builtin/merge-base.c:214
7428msgid "output all common ancestors"
7429msgstr "输出所有共同的祖先"
7430
7431#: builtin/merge-base.c:216
7432msgid "find ancestors for a single n-way merge"
7433msgstr "查找一个多路合并的祖先提交"
7434
7435#: builtin/merge-base.c:218
7436msgid "list revs not reachable from others"
7437msgstr "显示不能被其他访问到的版本"
7438
7439#: builtin/merge-base.c:220
7440msgid "is the first one ancestor of the other?"
7441msgstr "第一个是其他的祖先提交么?"
7442
7443#: builtin/merge-base.c:222
7444msgid "find where <commit> forked from reflog of <ref>"
7445msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
7446
7447#: builtin/merge-file.c:8
7448msgid ""
7449"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7450"<orig-file> <file2>"
7451msgstr ""
7452"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7453"件> <文件2>"
7454
7455#: builtin/merge-file.c:33
7456msgid "send results to standard output"
7457msgstr "将结果发送到标准输出"
7458
7459#: builtin/merge-file.c:34
7460msgid "use a diff3 based merge"
7461msgstr "使用基于 diff3 的合并"
7462
7463#: builtin/merge-file.c:35
7464msgid "for conflicts, use our version"
7465msgstr "如果冲突,使用我们的版本"
7466
7467#: builtin/merge-file.c:37
7468msgid "for conflicts, use their version"
7469msgstr "如果冲突,使用他们的版本"
7470
7471#: builtin/merge-file.c:39
7472msgid "for conflicts, use a union version"
7473msgstr "如果冲突,使用联合版本"
7474
7475#: builtin/merge-file.c:42
7476msgid "for conflicts, use this marker size"
7477msgstr "如果冲突,使用指定长度的标记"
7478
7479#: builtin/merge-file.c:43
7480msgid "do not warn about conflicts"
7481msgstr "不要警告冲突"
7482
7483#: builtin/merge-file.c:45
7484msgid "set labels for file1/orig-file/file2"
7485msgstr "为 文件1/初始文件/文件2 设置标签"
7486
7487#: builtin/mktree.c:64
7488msgid "git mktree [-z] [--missing] [--batch]"
7489msgstr "git mktree [-z] [--missing] [--batch]"
7490
7491#: builtin/mktree.c:150
7492msgid "input is NUL terminated"
7493msgstr "输入以 NUL 字符终止"
7494
7495#: builtin/mktree.c:151 builtin/write-tree.c:24
7496msgid "allow missing objects"
7497msgstr "允许丢失的对象"
7498
7499#: builtin/mktree.c:152
7500msgid "allow creation of more than one tree"
7501msgstr "允许创建一个以上的树"
7502
7503#: builtin/mv.c:15
7504msgid "git mv [<options>] <source>... <destination>"
7505msgstr "git mv [<选项>] <源>... <目标>"
7506
7507#: builtin/mv.c:69
7508#, c-format
7509msgid "Directory %s is in index and no submodule?"
7510msgstr "目录 %s 在索引中并且不是子模组?"
7511
7512#: builtin/mv.c:71
7513msgid "Please stage your changes to .gitmodules or stash them to proceed"
7514msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
7515
7516#: builtin/mv.c:89
7517#, c-format
7518msgid "%.*s is in index"
7519msgstr "%.*s 在索引中"
7520
7521#: builtin/mv.c:111
7522msgid "force move/rename even if target exists"
7523msgstr "强制移动/重命令,即使目标存在"
7524
7525#: builtin/mv.c:112
7526msgid "skip move/rename errors"
7527msgstr "跳过移动/重命名错误"
7528
7529#: builtin/mv.c:151
7530#, c-format
7531msgid "destination '%s' is not a directory"
7532msgstr "目标 '%s' 不是一个目录"
7533
7534#: builtin/mv.c:162
7535#, c-format
7536msgid "Checking rename of '%s' to '%s'\n"
7537msgstr "检查 '%s' 到 '%s' 的重命名\n"
7538
7539#: builtin/mv.c:166
7540msgid "bad source"
7541msgstr "坏的源"
7542
7543#: builtin/mv.c:169
7544msgid "can not move directory into itself"
7545msgstr "不能将目录移动到自身"
7546
7547#: builtin/mv.c:172
7548msgid "cannot move directory over file"
7549msgstr "不能将目录移动到文件"
7550
7551#: builtin/mv.c:181
7552msgid "source directory is empty"
7553msgstr "源目录为空"
7554
7555#: builtin/mv.c:206
7556msgid "not under version control"
7557msgstr "不在版本控制之下"
7558
7559#: builtin/mv.c:209
7560msgid "destination exists"
7561msgstr "目标已存在"
7562
7563#: builtin/mv.c:217
7564#, c-format
7565msgid "overwriting '%s'"
7566msgstr "覆盖 '%s'"
7567
7568#: builtin/mv.c:220
7569msgid "Cannot overwrite"
7570msgstr "不能覆盖"
7571
7572#: builtin/mv.c:223
7573msgid "multiple sources for the same target"
7574msgstr "同一目标具有多个源"
7575
7576#: builtin/mv.c:225
7577msgid "destination directory does not exist"
7578msgstr "目标目录不存在"
7579
7580#: builtin/mv.c:232
7581#, c-format
7582msgid "%s, source=%s, destination=%s"
7583msgstr "%s,源=%s,目标=%s"
7584
7585#: builtin/mv.c:253
7586#, c-format
7587msgid "Renaming %s to %s\n"
7588msgstr "重命名 %s 至 %s\n"
7589
7590#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
7591#, c-format
7592msgid "renaming '%s' failed"
7593msgstr "重命名 '%s' 失败"
7594
7595#: builtin/name-rev.c:255
7596msgid "git name-rev [<options>] <commit>..."
7597msgstr "git name-rev [<选项>] <提交>..."
7598
7599#: builtin/name-rev.c:256
7600msgid "git name-rev [<options>] --all"
7601msgstr "git name-rev [<选项>] --all"
7602
7603#: builtin/name-rev.c:257
7604msgid "git name-rev [<options>] --stdin"
7605msgstr "git name-rev [<选项>] --stdin"
7606
7607#: builtin/name-rev.c:309
7608msgid "print only names (no SHA-1)"
7609msgstr "只打印名称(无 SHA-1)"
7610
7611#: builtin/name-rev.c:310
7612msgid "only use tags to name the commits"
7613msgstr "只使用标签来命名提交"
7614
7615#: builtin/name-rev.c:312
7616msgid "only use refs matching <pattern>"
7617msgstr "只使用和 <模式> 相匹配的引用"
7618
7619#: builtin/name-rev.c:314
7620msgid "list all commits reachable from all refs"
7621msgstr "列出可以从所有引用访问的提交"
7622
7623#: builtin/name-rev.c:315
7624msgid "read from stdin"
7625msgstr "从标准输入读取"
7626
7627#: builtin/name-rev.c:316
7628msgid "allow to print `undefined` names (default)"
7629msgstr "允许打印 `未定义` 的名称(默认)"
7630
7631#: builtin/name-rev.c:322
7632msgid "dereference tags in the input (internal use)"
7633msgstr "反向解析输入中的标签(内部使用)"
7634
7635#: builtin/notes.c:24
7636msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7637msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7638
7639#: builtin/notes.c:25
7640msgid ""
7641"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7642"| (-c | -C) <object>] [<object>]"
7643msgstr ""
7644"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7645"| (-c | -C) <对象>] [<对象>]"
7646
7647#: builtin/notes.c:26
7648msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7649msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7650
7651#: builtin/notes.c:27
7652msgid ""
7653"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7654"(-c | -C) <object>] [<object>]"
7655msgstr ""
7656"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7657"(-c | -C) <对象>] [<对象>]"
7658
7659#: builtin/notes.c:28
7660msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7661msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7662
7663#: builtin/notes.c:29
7664msgid "git notes [--ref <notes-ref>] show [<object>]"
7665msgstr "git notes [--ref <注解引用>] show [<对象>]"
7666
7667#: builtin/notes.c:30
7668msgid ""
7669"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7670msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7671
7672#: builtin/notes.c:31
7673msgid "git notes merge --commit [-v | -q]"
7674msgstr "git notes merge --commit [-v | -q]"
7675
7676#: builtin/notes.c:32
7677msgid "git notes merge --abort [-v | -q]"
7678msgstr "git notes merge --abort [-v | -q]"
7679
7680#: builtin/notes.c:33
7681msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7682msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7683
7684#: builtin/notes.c:34
7685msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7686msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7687
7688#: builtin/notes.c:35
7689msgid "git notes [--ref <notes-ref>] get-ref"
7690msgstr "git notes [--ref <注解引用>] get-ref"
7691
7692#: builtin/notes.c:40
7693msgid "git notes [list [<object>]]"
7694msgstr "git notes [list [<对象>]]"
7695
7696#: builtin/notes.c:45
7697msgid "git notes add [<options>] [<object>]"
7698msgstr "git notes add [<选项>] [<对象>]"
7699
7700#: builtin/notes.c:50
7701msgid "git notes copy [<options>] <from-object> <to-object>"
7702msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7703
7704#: builtin/notes.c:51
7705msgid "git notes copy --stdin [<from-object> <to-object>]..."
7706msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7707
7708#: builtin/notes.c:56
7709msgid "git notes append [<options>] [<object>]"
7710msgstr "git notes append [<选项>] [<对象>]"
7711
7712#: builtin/notes.c:61
7713msgid "git notes edit [<object>]"
7714msgstr "git notes edit [<对象>]"
7715
7716#: builtin/notes.c:66
7717msgid "git notes show [<object>]"
7718msgstr "git notes show [<对象>]"
7719
7720#: builtin/notes.c:71
7721msgid "git notes merge [<options>] <notes-ref>"
7722msgstr "git notes merge [<选项>] <注解引用>"
7723
7724#: builtin/notes.c:72
7725msgid "git notes merge --commit [<options>]"
7726msgstr "git notes merge --commit [<选项>]"
7727
7728#: builtin/notes.c:73
7729msgid "git notes merge --abort [<options>]"
7730msgstr "git notes merge --abort [<选项>]"
7731
7732#: builtin/notes.c:78
7733msgid "git notes remove [<object>]"
7734msgstr "git notes remove [<对象>]"
7735
7736#: builtin/notes.c:83
7737msgid "git notes prune [<options>]"
7738msgstr "git notes prune [<选项>]"
7739
7740#: builtin/notes.c:88
7741msgid "git notes get-ref"
7742msgstr "git notes get-ref"
7743
7744#: builtin/notes.c:146
7745#, c-format
7746msgid "unable to start 'show' for object '%s'"
7747msgstr "不能为对象 '%s' 开始 'show'"
7748
7749#: builtin/notes.c:150
7750msgid "could not read 'show' output"
7751msgstr "不能读取 'show' 的输出"
7752
7753#: builtin/notes.c:158
7754#, c-format
7755msgid "failed to finish 'show' for object '%s'"
7756msgstr "无法为对象 '%s' 完成 'show'"
7757
7758#: builtin/notes.c:173 builtin/tag.c:477
7759#, c-format
7760msgid "could not create file '%s'"
7761msgstr "不能创建文件 '%s'"
7762
7763#: builtin/notes.c:192
7764msgid "Please supply the note contents using either -m or -F option"
7765msgstr "请通过 -m 或 -F 选项为注解提供内容"
7766
7767#: builtin/notes.c:201
7768msgid "unable to write note object"
7769msgstr "不能写注解对象"
7770
7771#: builtin/notes.c:203
7772#, c-format
7773msgid "The note contents have been left in %s"
7774msgstr "注解内容被留在 %s 中"
7775
7776#: builtin/notes.c:231 builtin/tag.c:693
7777#, c-format
7778msgid "cannot read '%s'"
7779msgstr "不能读取 '%s'"
7780
7781#: builtin/notes.c:233 builtin/tag.c:696
7782#, c-format
7783msgid "could not open or read '%s'"
7784msgstr "不能打开或读取 '%s'"
7785
7786#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7787#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7788#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7789#: builtin/notes.c:854 builtin/tag.c:709
7790#, c-format
7791msgid "Failed to resolve '%s' as a valid ref."
7792msgstr "无法解析 '%s' 为一个有效引用。"
7793
7794#: builtin/notes.c:255
7795#, c-format
7796msgid "Failed to read object '%s'."
7797msgstr "无法读取对象 '%s'。"
7798
7799#: builtin/notes.c:259
7800#, c-format
7801msgid "Cannot read note data from non-blob object '%s'."
7802msgstr "不能从非数据对象 '%s' 中读取注解数据"
7803
7804#: builtin/notes.c:299
7805#, c-format
7806msgid "Malformed input line: '%s'."
7807msgstr "非法的输入行:'%s'。"
7808
7809#: builtin/notes.c:314
7810#, c-format
7811msgid "Failed to copy notes from '%s' to '%s'"
7812msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7813
7814#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7815#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7816#: builtin/notes.c:919
7817msgid "too many parameters"
7818msgstr "参数太多"
7819
7820#: builtin/notes.c:371 builtin/notes.c:658
7821#, c-format
7822msgid "No note found for object %s."
7823msgstr "未发现对象 %s 的注解。"
7824
7825#: builtin/notes.c:392 builtin/notes.c:555
7826msgid "note contents as a string"
7827msgstr "注解内容作为一个字符串"
7828
7829#: builtin/notes.c:395 builtin/notes.c:558
7830msgid "note contents in a file"
7831msgstr "注解内容到一个文件中"
7832
7833#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7834#: builtin/notes.c:563 builtin/tag.c:628
7835msgid "object"
7836msgstr "对象"
7837
7838#: builtin/notes.c:398 builtin/notes.c:561
7839msgid "reuse and edit specified note object"
7840msgstr "重用和编辑指定的注解对象"
7841
7842#: builtin/notes.c:401 builtin/notes.c:564
7843msgid "reuse specified note object"
7844msgstr "重用指定的注解对象"
7845
7846#: builtin/notes.c:404 builtin/notes.c:567
7847msgid "allow storing empty note"
7848msgstr "允许保存空白注释"
7849
7850#: builtin/notes.c:405 builtin/notes.c:476
7851msgid "replace existing notes"
7852msgstr "替换已存在的注解"
7853
7854#: builtin/notes.c:430
7855#, c-format
7856msgid ""
7857"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7858"existing notes"
7859msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7860
7861#: builtin/notes.c:445 builtin/notes.c:524
7862#, c-format
7863msgid "Overwriting existing notes for object %s\n"
7864msgstr "覆盖对象 %s 现存注解\n"
7865
7866#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7867#, c-format
7868msgid "Removing note for object %s\n"
7869msgstr "删除对象 %s 的注解\n"
7870
7871#: builtin/notes.c:477
7872msgid "read objects from stdin"
7873msgstr "从标准输入读取对象"
7874
7875#: builtin/notes.c:479
7876msgid "load rewriting config for <command> (implies --stdin)"
7877msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7878
7879#: builtin/notes.c:497
7880msgid "too few parameters"
7881msgstr "参数太少"
7882
7883#: builtin/notes.c:518
7884#, c-format
7885msgid ""
7886"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7887"existing notes"
7888msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7889
7890#: builtin/notes.c:530
7891#, c-format
7892msgid "Missing notes on source object %s. Cannot copy."
7893msgstr "源对象 %s 缺少注解。不能拷贝。"
7894
7895#: builtin/notes.c:582
7896#, c-format
7897msgid ""
7898"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7899"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7900msgstr ""
7901"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7902"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7903
7904#: builtin/notes.c:750
7905msgid "General options"
7906msgstr "通用选项"
7907
7908#: builtin/notes.c:752
7909msgid "Merge options"
7910msgstr "合并选项"
7911
7912#: builtin/notes.c:754
7913msgid ""
7914"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7915"cat_sort_uniq)"
7916msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7917
7918#: builtin/notes.c:756
7919msgid "Committing unmerged notes"
7920msgstr "提交未合并的注解"
7921
7922#: builtin/notes.c:758
7923msgid "finalize notes merge by committing unmerged notes"
7924msgstr "通过提交未合并的注解来完成注解合并"
7925
7926#: builtin/notes.c:760
7927msgid "Aborting notes merge resolution"
7928msgstr "中止注解合并的方案"
7929
7930#: builtin/notes.c:762
7931msgid "abort notes merge"
7932msgstr "中止注解合并"
7933
7934#: builtin/notes.c:857
7935#, c-format
7936msgid "Object %s has no note\n"
7937msgstr "对象 %s 没有注解\n"
7938
7939#: builtin/notes.c:869
7940msgid "attempt to remove non-existent note is not an error"
7941msgstr "尝试删除不存在的注解不是一个错误"
7942
7943#: builtin/notes.c:872
7944msgid "read object names from the standard input"
7945msgstr "从标准输入读取对象名称"
7946
7947#: builtin/notes.c:953
7948msgid "notes-ref"
7949msgstr "注解引用"
7950
7951#: builtin/notes.c:954
7952msgid "use notes from <notes-ref>"
7953msgstr "从 <注解引用> 使用注解"
7954
7955#: builtin/notes.c:989 builtin/remote.c:1618
7956#, c-format
7957msgid "Unknown subcommand: %s"
7958msgstr "未知子命令:%s"
7959
7960#: builtin/pack-objects.c:28
7961msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7962msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7963
7964#: builtin/pack-objects.c:29
7965msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7966msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7967
7968#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7969#, c-format
7970msgid "deflate error (%d)"
7971msgstr "压缩错误 (%d)"
7972
7973#: builtin/pack-objects.c:771
7974msgid "Writing objects"
7975msgstr "写入对象中"
7976
7977#: builtin/pack-objects.c:1011
7978msgid "disabling bitmap writing, as some objects are not being packed"
7979msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7980
7981#: builtin/pack-objects.c:2171
7982msgid "Compressing objects"
7983msgstr "压缩对象中"
7984
7985#: builtin/pack-objects.c:2568
7986#, c-format
7987msgid "unsupported index version %s"
7988msgstr "不支持的索引版本 %s"
7989
7990#: builtin/pack-objects.c:2572
7991#, c-format
7992msgid "bad index version '%s'"
7993msgstr "坏的索引版本 '%s'"
7994
7995#: builtin/pack-objects.c:2595
7996#, c-format
7997msgid "option %s does not accept negative form"
7998msgstr "选项 %s 不接受否定格式"
7999
8000#: builtin/pack-objects.c:2599
8001#, c-format
8002msgid "unable to parse value '%s' for option %s"
8003msgstr "不能解析选项 %1$s 的值 '%2$s'"
8004
8005#: builtin/pack-objects.c:2619
8006msgid "do not show progress meter"
8007msgstr "不显示进度表"
8008
8009#: builtin/pack-objects.c:2621
8010msgid "show progress meter"
8011msgstr "显示进度表"
8012
8013#: builtin/pack-objects.c:2623
8014msgid "show progress meter during object writing phase"
8015msgstr "在对象写入阶段显示进度表"
8016
8017#: builtin/pack-objects.c:2626
8018msgid "similar to --all-progress when progress meter is shown"
8019msgstr "当进度表显示时类似于 --all-progress"
8020
8021#: builtin/pack-objects.c:2627
8022msgid "version[,offset]"
8023msgstr "版本[,偏移]"
8024
8025#: builtin/pack-objects.c:2628
8026msgid "write the pack index file in the specified idx format version"
8027msgstr "用指定的 idx 格式版本来写包索引文件"
8028
8029#: builtin/pack-objects.c:2631
8030msgid "maximum size of each output pack file"
8031msgstr "每个输出包的最大尺寸"
8032
8033#: builtin/pack-objects.c:2633
8034msgid "ignore borrowed objects from alternate object store"
8035msgstr "忽略从备用对象存储里借用对象"
8036
8037#: builtin/pack-objects.c:2635
8038msgid "ignore packed objects"
8039msgstr "忽略包对象"
8040
8041#: builtin/pack-objects.c:2637
8042msgid "limit pack window by objects"
8043msgstr "限制打包窗口的对象数"
8044
8045#: builtin/pack-objects.c:2639
8046msgid "limit pack window by memory in addition to object limit"
8047msgstr "除对象数量限制外设置打包窗口的内存限制"
8048
8049#: builtin/pack-objects.c:2641
8050msgid "maximum length of delta chain allowed in the resulting pack"
8051msgstr "打包允许的 delta 链的最大长度"
8052
8053#: builtin/pack-objects.c:2643
8054msgid "reuse existing deltas"
8055msgstr "重用已存在的 deltas"
8056
8057#: builtin/pack-objects.c:2645
8058msgid "reuse existing objects"
8059msgstr "重用已存在的对象"
8060
8061#: builtin/pack-objects.c:2647
8062msgid "use OFS_DELTA objects"
8063msgstr "使用 OFS_DELTA 对象"
8064
8065#: builtin/pack-objects.c:2649
8066msgid "use threads when searching for best delta matches"
8067msgstr "使用线程查询最佳 delta 匹配"
8068
8069#: builtin/pack-objects.c:2651
8070msgid "do not create an empty pack output"
8071msgstr "不创建空的包输出"
8072
8073#: builtin/pack-objects.c:2653
8074msgid "read revision arguments from standard input"
8075msgstr "从标准输入读取版本号参数"
8076
8077#: builtin/pack-objects.c:2655
8078msgid "limit the objects to those that are not yet packed"
8079msgstr "限制那些尚未打包的对象"
8080
8081#: builtin/pack-objects.c:2658
8082msgid "include objects reachable from any reference"
8083msgstr "包括可以从任何引用访问到的对象"
8084
8085#: builtin/pack-objects.c:2661
8086msgid "include objects referred by reflog entries"
8087msgstr "包括被引用日志引用到的对象"
8088
8089#: builtin/pack-objects.c:2664
8090msgid "include objects referred to by the index"
8091msgstr "包括被索引引用到的对象"
8092
8093#: builtin/pack-objects.c:2667
8094msgid "output pack to stdout"
8095msgstr "输出包到标准输出"
8096
8097#: builtin/pack-objects.c:2669
8098msgid "include tag objects that refer to objects to be packed"
8099msgstr "包括那些引用了待打包对象的标签对象"
8100
8101#: builtin/pack-objects.c:2671
8102msgid "keep unreachable objects"
8103msgstr "维持不可达的对象"
8104
8105#: builtin/pack-objects.c:2672 parse-options.h:139
8106msgid "time"
8107msgstr "时间"
8108
8109#: builtin/pack-objects.c:2673
8110msgid "unpack unreachable objects newer than <time>"
8111msgstr "将比给定 <时间> 新的无法访问的对象解包"
8112
8113#: builtin/pack-objects.c:2676
8114msgid "create thin packs"
8115msgstr "创建精简包"
8116
8117#: builtin/pack-objects.c:2678
8118msgid "create packs suitable for shallow fetches"
8119msgstr "创建适合浅克隆仓库获取的包"
8120
8121#: builtin/pack-objects.c:2680
8122msgid "ignore packs that have companion .keep file"
8123msgstr "忽略配有 .keep 文件的包"
8124
8125#: builtin/pack-objects.c:2682
8126msgid "pack compression level"
8127msgstr "打包压缩级别"
8128
8129#: builtin/pack-objects.c:2684
8130msgid "do not hide commits by grafts"
8131msgstr "显示被嫁接隐藏的提交"
8132
8133#: builtin/pack-objects.c:2686
8134msgid "use a bitmap index if available to speed up counting objects"
8135msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8136
8137#: builtin/pack-objects.c:2688
8138msgid "write a bitmap index together with the pack index"
8139msgstr "在建立包索引的同时创建 bitmap 索引"
8140
8141#: builtin/pack-objects.c:2779
8142msgid "Counting objects"
8143msgstr "对象计数中"
8144
8145#: builtin/pack-refs.c:6
8146msgid "git pack-refs [<options>]"
8147msgstr "git pack-refs [<选项>]"
8148
8149#: builtin/pack-refs.c:14
8150msgid "pack everything"
8151msgstr "打包一切"
8152
8153#: builtin/pack-refs.c:15
8154msgid "prune loose refs (default)"
8155msgstr "清除松散的引用(默认)"
8156
8157#: builtin/prune-packed.c:7
8158msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8159msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8160
8161#: builtin/prune-packed.c:40
8162msgid "Removing duplicate objects"
8163msgstr "正在删除重复对象"
8164
8165#: builtin/prune.c:11
8166msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8167msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8168
8169#: builtin/prune.c:105 builtin/worktree.c:112
8170msgid "do not remove, show only"
8171msgstr "不删除,只显示"
8172
8173#: builtin/prune.c:106 builtin/worktree.c:113
8174msgid "report pruned objects"
8175msgstr "报告清除的对象"
8176
8177#: builtin/prune.c:109 builtin/worktree.c:115
8178msgid "expire objects older than <time>"
8179msgstr "使早于给定时间的对象过期"
8180
8181#: builtin/push.c:14
8182msgid "git push [<options>] [<repository> [<refspec>...]]"
8183msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8184
8185#: builtin/push.c:85
8186msgid "tag shorthand without <tag>"
8187msgstr "标签后面未提供 <标签> 参数"
8188
8189#: builtin/push.c:95
8190msgid "--delete only accepts plain target ref names"
8191msgstr "--delete 只接受简单的目标引用名"
8192
8193#: builtin/push.c:139
8194msgid ""
8195"\n"
8196"To choose either option permanently, see push.default in 'git help config'."
8197msgstr ""
8198"\n"
8199"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8200
8201#: builtin/push.c:142
8202#, c-format
8203msgid ""
8204"The upstream branch of your current branch does not match\n"
8205"the name of your current branch.  To push to the upstream branch\n"
8206"on the remote, use\n"
8207"\n"
8208"    git push %s HEAD:%s\n"
8209"\n"
8210"To push to the branch of the same name on the remote, use\n"
8211"\n"
8212"    git push %s %s\n"
8213"%s"
8214msgstr ""
8215"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8216"上游分支,使用\n"
8217"\n"
8218"    git push %s HEAD:%s\n"
8219"\n"
8220"为推送至远程同名分支,使用\n"
8221"\n"
8222"    git push %s %s\n"
8223"%s"
8224
8225#: builtin/push.c:157
8226#, c-format
8227msgid ""
8228"You are not currently on a branch.\n"
8229"To push the history leading to the current (detached HEAD)\n"
8230"state now, use\n"
8231"\n"
8232"    git push %s HEAD:<name-of-remote-branch>\n"
8233msgstr ""
8234"您当前不在一个分支上。\n"
8235"现在为推送当前(分离头指针)的历史,使用\n"
8236"\n"
8237"    git push %s HEAD:<远程分支名字>\n"
8238
8239#: builtin/push.c:171
8240#, c-format
8241msgid ""
8242"The current branch %s has no upstream branch.\n"
8243"To push the current branch and set the remote as upstream, use\n"
8244"\n"
8245"    git push --set-upstream %s %s\n"
8246msgstr ""
8247"当前分支 %s 没有对应的上游分支。\n"
8248"为推送当前分支并建立与远程上游的跟踪,使用\n"
8249"\n"
8250"    git push --set-upstream %s %s\n"
8251
8252#: builtin/push.c:179
8253#, c-format
8254msgid "The current branch %s has multiple upstream branches, refusing to push."
8255msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8256
8257#: builtin/push.c:182
8258#, c-format
8259msgid ""
8260"You are pushing to remote '%s', which is not the upstream of\n"
8261"your current branch '%s', without telling me what to push\n"
8262"to update which remote branch."
8263msgstr ""
8264"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8265"而没有告诉我要推送什么、更新哪个远程分支。"
8266
8267#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8268#: builtin/push.c:205
8269msgid ""
8270"push.default is unset; its implicit value has changed in\n"
8271"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8272"and maintain the traditional behavior, use:\n"
8273"\n"
8274"  git config --global push.default matching\n"
8275"\n"
8276"To squelch this message and adopt the new behavior now, use:\n"
8277"\n"
8278"  git config --global push.default simple\n"
8279"\n"
8280"When push.default is set to 'matching', git will push local branches\n"
8281"to the remote branches that already exist with the same name.\n"
8282"\n"
8283"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8284"behavior, which only pushes the current branch to the corresponding\n"
8285"remote branch that 'git pull' uses to update the current branch.\n"
8286"\n"
8287"See 'git help config' and search for 'push.default' for further "
8288"information.\n"
8289"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8290"'current' instead of 'simple' if you sometimes use older versions of Git)"
8291msgstr ""
8292"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8293"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8294"\n"
8295"  git config --global push.default matching\n"
8296"\n"
8297"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8298"\n"
8299"  git config --global push.default simple\n"
8300"\n"
8301"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8302"本地分支。\n"
8303"\n"
8304"从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
8305"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8306"\n"
8307"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8308"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8309"为保持兼容,请用 'current' 代替 'simple')"
8310
8311#: builtin/push.c:272
8312msgid ""
8313"You didn't specify any refspecs to push, and push.default is \"nothing\"."
8314msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
8315
8316#: builtin/push.c:279
8317msgid ""
8318"Updates were rejected because the tip of your current branch is behind\n"
8319"its remote counterpart. Integrate the remote changes (e.g.\n"
8320"'git pull ...') before pushing again.\n"
8321"See the 'Note about fast-forwards' in 'git push --help' for details."
8322msgstr ""
8323"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8324"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8325"'git push --help' 中的 'Note about fast-forwards' 小节。"
8326
8327#: builtin/push.c:285
8328msgid ""
8329"Updates were rejected because a pushed branch tip is behind its remote\n"
8330"counterpart. Check out this branch and integrate the remote changes\n"
8331"(e.g. 'git pull ...') before pushing again.\n"
8332"See the 'Note about fast-forwards' in 'git push --help' for details."
8333msgstr ""
8334"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8335"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8336"'git push --help' 中的 'Note about fast-forwards' 小节。"
8337
8338#: builtin/push.c:291
8339msgid ""
8340"Updates were rejected because the remote contains work that you do\n"
8341"not have locally. This is usually caused by another repository pushing\n"
8342"to the same ref. You may want to first integrate the remote changes\n"
8343"(e.g., 'git pull ...') before pushing again.\n"
8344"See the 'Note about fast-forwards' in 'git push --help' for details."
8345msgstr ""
8346"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8347"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8348"(如 'git pull ...')。\n"
8349"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8350
8351#: builtin/push.c:298
8352msgid "Updates were rejected because the tag already exists in the remote."
8353msgstr "更新被拒绝,因为该标签在远程已经存在。"
8354
8355#: builtin/push.c:301
8356msgid ""
8357"You cannot update a remote ref that points at a non-commit object,\n"
8358"or update a remote ref to make it point at a non-commit object,\n"
8359"without using the '--force' option.\n"
8360msgstr ""
8361"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8362"也不能更新远程引用让其指向一个非提交对象。\n"
8363
8364#: builtin/push.c:360
8365#, c-format
8366msgid "Pushing to %s\n"
8367msgstr "推送到 %s\n"
8368
8369#: builtin/push.c:364
8370#, c-format
8371msgid "failed to push some refs to '%s'"
8372msgstr "无法推送一些引用到 '%s'"
8373
8374#: builtin/push.c:394
8375#, c-format
8376msgid "bad repository '%s'"
8377msgstr "坏的仓库 '%s'"
8378
8379#: builtin/push.c:395
8380msgid ""
8381"No configured push destination.\n"
8382"Either specify the URL from the command-line or configure a remote "
8383"repository using\n"
8384"\n"
8385"    git remote add <name> <url>\n"
8386"\n"
8387"and then push using the remote name\n"
8388"\n"
8389"    git push <name>\n"
8390msgstr ""
8391"没有配置推送目标。\n"
8392"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
8393"\n"
8394"    git remote add <名称> <地址>\n"
8395"\n"
8396"然后使用该远程仓库名执行推送\n"
8397"\n"
8398"    git push <名称>\n"
8399
8400#: builtin/push.c:410
8401msgid "--all and --tags are incompatible"
8402msgstr "--all 和 --tags 不兼容"
8403
8404#: builtin/push.c:411
8405msgid "--all can't be combined with refspecs"
8406msgstr "--all 不能和引用规格同时使用"
8407
8408#: builtin/push.c:416
8409msgid "--mirror and --tags are incompatible"
8410msgstr "--mirror 和 --tags 不兼容"
8411
8412#: builtin/push.c:417
8413msgid "--mirror can't be combined with refspecs"
8414msgstr "--mirror 不能和引用规格同时使用"
8415
8416#: builtin/push.c:422
8417msgid "--all and --mirror are incompatible"
8418msgstr "--all 和 --mirror 不兼容"
8419
8420#: builtin/push.c:502
8421msgid "repository"
8422msgstr "仓库"
8423
8424#: builtin/push.c:503
8425msgid "push all refs"
8426msgstr "推送所有引用"
8427
8428#: builtin/push.c:504
8429msgid "mirror all refs"
8430msgstr "镜像所有引用"
8431
8432#: builtin/push.c:506
8433msgid "delete refs"
8434msgstr "删除引用"
8435
8436#: builtin/push.c:507
8437msgid "push tags (can't be used with --all or --mirror)"
8438msgstr "推送标签(不能使用 --all or --mirror)"
8439
8440#: builtin/push.c:510
8441msgid "force updates"
8442msgstr "强制更新"
8443
8444#: builtin/push.c:512
8445msgid "refname>:<expect"
8446msgstr "引用名>:<期望值"
8447
8448#: builtin/push.c:513
8449msgid "require old value of ref to be at this value"
8450msgstr "要求引用旧的取值为设定值"
8451
8452#: builtin/push.c:516
8453msgid "control recursive pushing of submodules"
8454msgstr "控制子模组的递归推送"
8455
8456#: builtin/push.c:518
8457msgid "use thin pack"
8458msgstr "使用精简打包"
8459
8460#: builtin/push.c:519 builtin/push.c:520
8461msgid "receive pack program"
8462msgstr "接收包程序"
8463
8464#: builtin/push.c:521
8465msgid "set upstream for git pull/status"
8466msgstr "设置 git pull/status 的上游"
8467
8468#: builtin/push.c:524
8469msgid "prune locally removed refs"
8470msgstr "清除本地删除的引用"
8471
8472#: builtin/push.c:526
8473msgid "bypass pre-push hook"
8474msgstr "绕过 pre-push 钩子"
8475
8476#: builtin/push.c:527
8477msgid "push missing but relevant tags"
8478msgstr "推送缺失但有关的标签"
8479
8480#: builtin/push.c:529
8481msgid "GPG sign the push"
8482msgstr "用 GPG 为推送签名"
8483
8484#: builtin/push.c:530
8485msgid "request atomic transaction on remote side"
8486msgstr "需要远端支持原子事务"
8487
8488#: builtin/push.c:539
8489msgid "--delete is incompatible with --all, --mirror and --tags"
8490msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8491
8492#: builtin/push.c:541
8493msgid "--delete doesn't make sense without any refs"
8494msgstr "--delete 未接任何引用没有意义"
8495
8496#: builtin/read-tree.c:37
8497msgid ""
8498"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8499"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8500"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8501msgstr ""
8502"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8503"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8504"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8505
8506#: builtin/read-tree.c:110
8507msgid "write resulting index to <file>"
8508msgstr "将索引结果写入 <文件>"
8509
8510#: builtin/read-tree.c:113
8511msgid "only empty the index"
8512msgstr "只是清空索引"
8513
8514#: builtin/read-tree.c:115
8515msgid "Merging"
8516msgstr "合并"
8517
8518#: builtin/read-tree.c:117
8519msgid "perform a merge in addition to a read"
8520msgstr "读取之余再执行一个合并"
8521
8522#: builtin/read-tree.c:119
8523msgid "3-way merge if no file level merging required"
8524msgstr "如果没有文件级合并需要,执行三方合并"
8525
8526#: builtin/read-tree.c:121
8527msgid "3-way merge in presence of adds and removes"
8528msgstr "存在添加和删除时,也执行三方合并"
8529
8530#: builtin/read-tree.c:123
8531msgid "same as -m, but discard unmerged entries"
8532msgstr "类似于 -m,但丢弃未合并的条目"
8533
8534#: builtin/read-tree.c:124
8535msgid "<subdirectory>/"
8536msgstr "<子目录>/"
8537
8538#: builtin/read-tree.c:125
8539msgid "read the tree into the index under <subdirectory>/"
8540msgstr "读取树对象到索引的 <子目录>/ 下"
8541
8542#: builtin/read-tree.c:128
8543msgid "update working tree with merge result"
8544msgstr "用合并的结果更新工作区"
8545
8546#: builtin/read-tree.c:130
8547msgid "gitignore"
8548msgstr "gitignore"
8549
8550#: builtin/read-tree.c:131
8551msgid "allow explicitly ignored files to be overwritten"
8552msgstr "允许忽略文件中设定的文件可以被覆盖"
8553
8554#: builtin/read-tree.c:134
8555msgid "don't check the working tree after merging"
8556msgstr "合并后不检查工作区"
8557
8558#: builtin/read-tree.c:135
8559msgid "don't update the index or the work tree"
8560msgstr "不更新索引区和工作区"
8561
8562#: builtin/read-tree.c:137
8563msgid "skip applying sparse checkout filter"
8564msgstr "跳过应用稀疏检出过滤器"
8565
8566#: builtin/read-tree.c:139
8567msgid "debug unpack-trees"
8568msgstr "调试 unpack-trees"
8569
8570#: builtin/reflog.c:430
8571#, c-format
8572msgid "%s' for '%s' is not a valid timestamp"
8573msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8574
8575#: builtin/reflog.c:547 builtin/reflog.c:552
8576#, c-format
8577msgid "'%s' is not a valid timestamp"
8578msgstr "'%s' 不是一个有效的时间戳"
8579
8580#: builtin/remote.c:12
8581msgid "git remote [-v | --verbose]"
8582msgstr "git remote [-v | --verbose]"
8583
8584#: builtin/remote.c:13
8585msgid ""
8586"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8587"mirror=<fetch|push>] <name> <url>"
8588msgstr ""
8589"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8590"mirror=<fetch|push>] <名称> <地址>"
8591
8592#: builtin/remote.c:14 builtin/remote.c:33
8593msgid "git remote rename <old> <new>"
8594msgstr "git remote rename <旧名称> <新名称>"
8595
8596#: builtin/remote.c:15 builtin/remote.c:38
8597msgid "git remote remove <name>"
8598msgstr "git remote remove <名称>"
8599
8600#: builtin/remote.c:16 builtin/remote.c:43
8601msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8602msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8603
8604#: builtin/remote.c:17
8605msgid "git remote [-v | --verbose] show [-n] <name>"
8606msgstr "git remote [-v | --verbose] show [-n] <名称>"
8607
8608#: builtin/remote.c:18
8609msgid "git remote prune [-n | --dry-run] <name>"
8610msgstr "git remote prune [-n | --dry-run] <名称>"
8611
8612#: builtin/remote.c:19
8613msgid ""
8614"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8615msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8616
8617#: builtin/remote.c:20
8618msgid "git remote set-branches [--add] <name> <branch>..."
8619msgstr "git remote set-branches [--add] <名称> <分支>..."
8620
8621#: builtin/remote.c:21 builtin/remote.c:69
8622msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8623msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8624
8625#: builtin/remote.c:22 builtin/remote.c:70
8626msgid "git remote set-url --add <name> <newurl>"
8627msgstr "git remote set-url --add <名称> <新的地址>"
8628
8629#: builtin/remote.c:23 builtin/remote.c:71
8630msgid "git remote set-url --delete <name> <url>"
8631msgstr "git remote set-url --delete <名称> <地址>"
8632
8633#: builtin/remote.c:28
8634msgid "git remote add [<options>] <name> <url>"
8635msgstr "git remote add [<选项>] <名称> <地址>"
8636
8637#: builtin/remote.c:48
8638msgid "git remote set-branches <name> <branch>..."
8639msgstr "git remote set-branches <名称> <分支>..."
8640
8641#: builtin/remote.c:49
8642msgid "git remote set-branches --add <name> <branch>..."
8643msgstr "git remote set-branches --add <名称> <分支>..."
8644
8645#: builtin/remote.c:54
8646msgid "git remote show [<options>] <name>"
8647msgstr "git remote show [<选项>] <名称>"
8648
8649#: builtin/remote.c:59
8650msgid "git remote prune [<options>] <name>"
8651msgstr "git remote prune [<选项>] <名称>"
8652
8653#: builtin/remote.c:64
8654msgid "git remote update [<options>] [<group> | <remote>]..."
8655msgstr "git remote update [<选项>] [<组> | <远程>]..."
8656
8657#: builtin/remote.c:88
8658#, c-format
8659msgid "Updating %s"
8660msgstr "更新 %s 中"
8661
8662#: builtin/remote.c:120
8663msgid ""
8664"--mirror is dangerous and deprecated; please\n"
8665"\t use --mirror=fetch or --mirror=push instead"
8666msgstr ""
8667"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8668"\t 或 --mirror=push"
8669
8670#: builtin/remote.c:137
8671#, c-format
8672msgid "unknown mirror argument: %s"
8673msgstr "未知的镜像参数:%s"
8674
8675#: builtin/remote.c:153
8676msgid "fetch the remote branches"
8677msgstr "抓取远程的分支"
8678
8679#: builtin/remote.c:155
8680msgid "import all tags and associated objects when fetching"
8681msgstr "抓取时导入所有的标签和关联对象"
8682
8683#: builtin/remote.c:158
8684msgid "or do not fetch any tag at all (--no-tags)"
8685msgstr "或不抓取任何标签(--no-tags)"
8686
8687#: builtin/remote.c:160
8688msgid "branch(es) to track"
8689msgstr "跟踪的分支"
8690
8691#: builtin/remote.c:161
8692msgid "master branch"
8693msgstr "主线分支"
8694
8695#: builtin/remote.c:162
8696msgid "push|fetch"
8697msgstr "push|fetch"
8698
8699#: builtin/remote.c:163
8700msgid "set up remote as a mirror to push to or fetch from"
8701msgstr "把远程设置为用以推送或抓取的镜像"
8702
8703#: builtin/remote.c:175
8704msgid "specifying a master branch makes no sense with --mirror"
8705msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8706
8707#: builtin/remote.c:177
8708msgid "specifying branches to track makes sense only with fetch mirrors"
8709msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8710
8711#: builtin/remote.c:187 builtin/remote.c:640
8712#, c-format
8713msgid "remote %s already exists."
8714msgstr "远程 %s 已经存在。"
8715
8716#: builtin/remote.c:191 builtin/remote.c:644
8717#, c-format
8718msgid "'%s' is not a valid remote name"
8719msgstr "'%s' 不是一个有效的远程名称"
8720
8721#: builtin/remote.c:235
8722#, c-format
8723msgid "Could not setup master '%s'"
8724msgstr "无法设置 master '%s'"
8725
8726#: builtin/remote.c:335
8727#, c-format
8728msgid "Could not get fetch map for refspec %s"
8729msgstr "无法得到引用规格 %s 的获取列表"
8730
8731#: builtin/remote.c:436 builtin/remote.c:444
8732msgid "(matching)"
8733msgstr "(匹配)"
8734
8735#: builtin/remote.c:448
8736msgid "(delete)"
8737msgstr "(删除)"
8738
8739#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
8740#, c-format
8741msgid "Could not append '%s' to '%s'"
8742msgstr "不能添加 '%s' 至 '%s'"
8743
8744#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
8745#, c-format
8746msgid "No such remote: %s"
8747msgstr "没有这样的远程:%s"
8748
8749#: builtin/remote.c:650
8750#, c-format
8751msgid "Could not rename config section '%s' to '%s'"
8752msgstr "不能重命名配置小节 '%s' 到 '%s'"
8753
8754#: builtin/remote.c:656 builtin/remote.c:844
8755#, c-format
8756msgid "Could not remove config section '%s'"
8757msgstr "不能移除配置小节 '%s'"
8758
8759#: builtin/remote.c:671
8760#, c-format
8761msgid ""
8762"Not updating non-default fetch refspec\n"
8763"\t%s\n"
8764"\tPlease update the configuration manually if necessary."
8765msgstr ""
8766"没有更新非默认的获取引用规格\n"
8767"\t%s\n"
8768"\t如果必要请手动更新配置。"
8769
8770#: builtin/remote.c:677
8771#, c-format
8772msgid "Could not append '%s'"
8773msgstr "不能追加 '%s'"
8774
8775#: builtin/remote.c:688
8776#, c-format
8777msgid "Could not set '%s'"
8778msgstr "不能设置 '%s'"
8779
8780#: builtin/remote.c:710
8781#, c-format
8782msgid "deleting '%s' failed"
8783msgstr "删除 '%s' 失败"
8784
8785#: builtin/remote.c:744
8786#, c-format
8787msgid "creating '%s' failed"
8788msgstr "创建 '%s' 失败"
8789
8790#: builtin/remote.c:763
8791#, c-format
8792msgid "Could not remove branch %s"
8793msgstr "无法移除分支 %s"
8794
8795#: builtin/remote.c:830
8796msgid ""
8797"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8798"to delete it, use:"
8799msgid_plural ""
8800"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8801"to delete them, use:"
8802msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8803msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8804
8805#: builtin/remote.c:945
8806#, c-format
8807msgid " new (next fetch will store in remotes/%s)"
8808msgstr " 新的(下一次获取将存储于 remotes/%s)"
8809
8810#: builtin/remote.c:948
8811msgid " tracked"
8812msgstr " 已跟踪"
8813
8814#: builtin/remote.c:950
8815msgid " stale (use 'git remote prune' to remove)"
8816msgstr " 过时(使用 'git remote prune' 来移除)"
8817
8818#: builtin/remote.c:952
8819msgid " ???"
8820msgstr " ???"
8821
8822#: builtin/remote.c:993
8823#, c-format
8824msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8825msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8826
8827#: builtin/remote.c:1000
8828#, c-format
8829msgid "rebases onto remote %s"
8830msgstr "变基到远程 %s"
8831
8832#: builtin/remote.c:1003
8833#, c-format
8834msgid " merges with remote %s"
8835msgstr " 与远程 %s 合并"
8836
8837#: builtin/remote.c:1004
8838msgid "    and with remote"
8839msgstr "    且有远程"
8840
8841#: builtin/remote.c:1006
8842#, c-format
8843msgid "merges with remote %s"
8844msgstr "与远程 %s 合并"
8845
8846#: builtin/remote.c:1007
8847msgid "   and with remote"
8848msgstr "   且有远程"
8849
8850#: builtin/remote.c:1053
8851msgid "create"
8852msgstr "创建"
8853
8854#: builtin/remote.c:1056
8855msgid "delete"
8856msgstr "删除"
8857
8858#: builtin/remote.c:1060
8859msgid "up to date"
8860msgstr "最新"
8861
8862#: builtin/remote.c:1063
8863msgid "fast-forwardable"
8864msgstr "可快进"
8865
8866#: builtin/remote.c:1066
8867msgid "local out of date"
8868msgstr "本地已过时"
8869
8870#: builtin/remote.c:1073
8871#, c-format
8872msgid "    %-*s forces to %-*s (%s)"
8873msgstr "    %-*s 强制推送至 %-*s (%s)"
8874
8875#: builtin/remote.c:1076
8876#, c-format
8877msgid "    %-*s pushes to %-*s (%s)"
8878msgstr "    %-*s 推送至 %-*s (%s)"
8879
8880#: builtin/remote.c:1080
8881#, c-format
8882msgid "    %-*s forces to %s"
8883msgstr "    %-*s 强制推送至 %s"
8884
8885#: builtin/remote.c:1083
8886#, c-format
8887msgid "    %-*s pushes to %s"
8888msgstr "    %-*s 推送至 %s"
8889
8890#: builtin/remote.c:1151
8891msgid "do not query remotes"
8892msgstr "不查询远程"
8893
8894#: builtin/remote.c:1178
8895#, c-format
8896msgid "* remote %s"
8897msgstr "* 远程 %s"
8898
8899#: builtin/remote.c:1179
8900#, c-format
8901msgid "  Fetch URL: %s"
8902msgstr "  获取地址:%s"
8903
8904#: builtin/remote.c:1180 builtin/remote.c:1331
8905msgid "(no URL)"
8906msgstr "(无 URL)"
8907
8908#: builtin/remote.c:1189 builtin/remote.c:1191
8909#, c-format
8910msgid "  Push  URL: %s"
8911msgstr "  推送地址:%s"
8912
8913#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
8914#, c-format
8915msgid "  HEAD branch: %s"
8916msgstr "  HEAD 分支:%s"
8917
8918#: builtin/remote.c:1199
8919#, c-format
8920msgid ""
8921"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8922msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8923
8924#: builtin/remote.c:1211
8925#, c-format
8926msgid "  Remote branch:%s"
8927msgid_plural "  Remote branches:%s"
8928msgstr[0] "  远程分支:%s"
8929msgstr[1] "  远程分支:%s"
8930
8931#  译者:中文字符串拼接,可删除前导空格
8932#: builtin/remote.c:1214 builtin/remote.c:1241
8933msgid " (status not queried)"
8934msgstr "(状态未查询)"
8935
8936#: builtin/remote.c:1223
8937msgid "  Local branch configured for 'git pull':"
8938msgid_plural "  Local branches configured for 'git pull':"
8939msgstr[0] "  为 'git pull' 配置的本地分支:"
8940msgstr[1] "  为 'git pull' 配置的本地分支:"
8941
8942#: builtin/remote.c:1231
8943msgid "  Local refs will be mirrored by 'git push'"
8944msgstr "  本地引用将在 'git push' 时被镜像"
8945
8946#: builtin/remote.c:1238
8947#, c-format
8948msgid "  Local ref configured for 'git push'%s:"
8949msgid_plural "  Local refs configured for 'git push'%s:"
8950msgstr[0] "  为 'git push' 配置的本地引用%s:"
8951msgstr[1] "  为 'git push' 配置的本地引用%s:"
8952
8953#: builtin/remote.c:1259
8954msgid "set refs/remotes/<name>/HEAD according to remote"
8955msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8956
8957#: builtin/remote.c:1261
8958msgid "delete refs/remotes/<name>/HEAD"
8959msgstr "删除 refs/remotes/<名称>/HEAD"
8960
8961#: builtin/remote.c:1276
8962msgid "Cannot determine remote HEAD"
8963msgstr "无法确定远程 HEAD"
8964
8965#: builtin/remote.c:1278
8966msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8967msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8968
8969#: builtin/remote.c:1288
8970#, c-format
8971msgid "Could not delete %s"
8972msgstr "无法删除 %s"
8973
8974#: builtin/remote.c:1296
8975#, c-format
8976msgid "Not a valid ref: %s"
8977msgstr "不是一个有效引用:%s"
8978
8979#: builtin/remote.c:1298
8980#, c-format
8981msgid "Could not setup %s"
8982msgstr "不能设置 %s"
8983
8984#  译者:注意保持前导空格
8985#: builtin/remote.c:1316
8986#, c-format
8987msgid " %s will become dangling!"
8988msgstr " %s 将成为摇摆状态!"
8989
8990#  译者:注意保持前导空格
8991#: builtin/remote.c:1317
8992#, c-format
8993msgid " %s has become dangling!"
8994msgstr " %s 已成为摇摆状态!"
8995
8996#: builtin/remote.c:1327
8997#, c-format
8998msgid "Pruning %s"
8999msgstr "修剪 %s"
9000
9001#: builtin/remote.c:1328
9002#, c-format
9003msgid "URL: %s"
9004msgstr "URL:%s"
9005
9006#: builtin/remote.c:1351
9007#, c-format
9008msgid " * [would prune] %s"
9009msgstr " * [将删除] %s"
9010
9011#: builtin/remote.c:1354
9012#, c-format
9013msgid " * [pruned] %s"
9014msgstr " * [已删除] %s"
9015
9016#: builtin/remote.c:1399
9017msgid "prune remotes after fetching"
9018msgstr "抓取后清除远程"
9019
9020#: builtin/remote.c:1465 builtin/remote.c:1539
9021#, c-format
9022msgid "No such remote '%s'"
9023msgstr "没有此远程 '%s'"
9024
9025#: builtin/remote.c:1485
9026msgid "add branch"
9027msgstr "添加分支"
9028
9029#: builtin/remote.c:1492
9030msgid "no remote specified"
9031msgstr "未指定远程"
9032
9033#: builtin/remote.c:1514
9034msgid "manipulate push URLs"
9035msgstr "操作推送 URLS"
9036
9037#: builtin/remote.c:1516
9038msgid "add URL"
9039msgstr "添加 URL"
9040
9041#: builtin/remote.c:1518
9042msgid "delete URLs"
9043msgstr "删除 URLS"
9044
9045#: builtin/remote.c:1525
9046msgid "--add --delete doesn't make sense"
9047msgstr "--add --delete 无意义"
9048
9049#: builtin/remote.c:1565
9050#, c-format
9051msgid "Invalid old URL pattern: %s"
9052msgstr "无效的旧 URL 匹配模版:%s"
9053
9054#: builtin/remote.c:1573
9055#, c-format
9056msgid "No such URL found: %s"
9057msgstr "未找到此 URL:%s"
9058
9059#: builtin/remote.c:1575
9060msgid "Will not delete all non-push URLs"
9061msgstr "将不会删除所有非推送 URL 地址"
9062
9063#: builtin/remote.c:1589
9064msgid "be verbose; must be placed before a subcommand"
9065msgstr "冗长输出;必须置于子命令之前"
9066
9067#: builtin/repack.c:17
9068msgid "git repack [<options>]"
9069msgstr "git repack [<选项>]"
9070
9071#: builtin/repack.c:159
9072msgid "pack everything in a single pack"
9073msgstr "所有内容打包到一个包文件中"
9074
9075#: builtin/repack.c:161
9076msgid "same as -a, and turn unreachable objects loose"
9077msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9078
9079#: builtin/repack.c:164
9080msgid "remove redundant packs, and run git-prune-packed"
9081msgstr "删除多余的包,运行 git-prune-packed"
9082
9083#: builtin/repack.c:166
9084msgid "pass --no-reuse-delta to git-pack-objects"
9085msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9086
9087#: builtin/repack.c:168
9088msgid "pass --no-reuse-object to git-pack-objects"
9089msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9090
9091#: builtin/repack.c:170
9092msgid "do not run git-update-server-info"
9093msgstr "不运行 git-update-server-info"
9094
9095#: builtin/repack.c:173
9096msgid "pass --local to git-pack-objects"
9097msgstr "向 git-pack-objects 传递参数 --local"
9098
9099#: builtin/repack.c:175
9100msgid "write bitmap index"
9101msgstr "写 bitmap 索引"
9102
9103#: builtin/repack.c:176
9104msgid "approxidate"
9105msgstr "近似日期"
9106
9107#: builtin/repack.c:177
9108msgid "with -A, do not loosen objects older than this"
9109msgstr "使用 -A,不要将早于给定时间的对象过期"
9110
9111#: builtin/repack.c:179
9112msgid "size of the window used for delta compression"
9113msgstr "用于增量压缩的窗口值"
9114
9115#: builtin/repack.c:180 builtin/repack.c:184
9116msgid "bytes"
9117msgstr "字节"
9118
9119#: builtin/repack.c:181
9120msgid "same as the above, but limit memory size instead of entries count"
9121msgstr "和上面的相似,但限制内存大小而非条目数"
9122
9123#: builtin/repack.c:183
9124msgid "limits the maximum delta depth"
9125msgstr "限制最大增量深度"
9126
9127#: builtin/repack.c:185
9128msgid "maximum size of each packfile"
9129msgstr "每个包文件的最大尺寸"
9130
9131#: builtin/repack.c:187
9132msgid "repack objects in packs marked with .keep"
9133msgstr "对标记为 .keep 的包中的对象重新打包"
9134
9135#: builtin/repack.c:377
9136#, c-format
9137msgid "removing '%s' failed"
9138msgstr "删除 '%s' 失败"
9139
9140#: builtin/replace.c:19
9141msgid "git replace [-f] <object> <replacement>"
9142msgstr "git replace [-f] <对象> <替换物>"
9143
9144#: builtin/replace.c:20
9145msgid "git replace [-f] --edit <object>"
9146msgstr "git replace [-f] --edit <对象>"
9147
9148#: builtin/replace.c:21
9149msgid "git replace [-f] --graft <commit> [<parent>...]"
9150msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9151
9152#: builtin/replace.c:22
9153msgid "git replace -d <object>..."
9154msgstr "git replace -d <对象>..."
9155
9156#: builtin/replace.c:23
9157msgid "git replace [--format=<format>] [-l [<pattern>]]"
9158msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9159
9160#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9161#, c-format
9162msgid "Not a valid object name: '%s'"
9163msgstr "不是一个有效的对象名:'%s'"
9164
9165#: builtin/replace.c:355
9166#, c-format
9167msgid "bad mergetag in commit '%s'"
9168msgstr "提交 '%s' 中含有损坏的合并标签"
9169
9170#: builtin/replace.c:357
9171#, c-format
9172msgid "malformed mergetag in commit '%s'"
9173msgstr "提交 '%s' 中含有非法的合并标签"
9174
9175#: builtin/replace.c:368
9176#, c-format
9177msgid ""
9178"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9179"instead of --graft"
9180msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
9181
9182#: builtin/replace.c:401
9183#, c-format
9184msgid "the original commit '%s' has a gpg signature."
9185msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9186
9187#: builtin/replace.c:402
9188msgid "the signature will be removed in the replacement commit!"
9189msgstr "在替换的提交中签名将被移除!"
9190
9191#: builtin/replace.c:408
9192#, c-format
9193msgid "could not write replacement commit for: '%s'"
9194msgstr "不能为 '%s' 写替换提交"
9195
9196#: builtin/replace.c:432
9197msgid "list replace refs"
9198msgstr "列出替换的引用"
9199
9200#: builtin/replace.c:433
9201msgid "delete replace refs"
9202msgstr "删除替换的引用"
9203
9204#: builtin/replace.c:434
9205msgid "edit existing object"
9206msgstr "编辑现存的对象"
9207
9208#: builtin/replace.c:435
9209msgid "change a commit's parents"
9210msgstr "修改一个提交的父提交"
9211
9212#: builtin/replace.c:436
9213msgid "replace the ref if it exists"
9214msgstr "如果存在则替换引用"
9215
9216#: builtin/replace.c:437
9217msgid "do not pretty-print contents for --edit"
9218msgstr "不要为 --edit 操作美观显示内容"
9219
9220#: builtin/replace.c:438
9221msgid "use this format"
9222msgstr "使用此格式"
9223
9224#: builtin/rerere.c:12
9225msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9226msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9227
9228#: builtin/rerere.c:57
9229msgid "register clean resolutions in index"
9230msgstr "在索引中注册干净的解决方案"
9231
9232#: builtin/reset.c:26
9233msgid ""
9234"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9235msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9236
9237#: builtin/reset.c:27
9238msgid "git reset [-q] <tree-ish> [--] <paths>..."
9239msgstr "git reset [-q] <树或提交> [--] <路径>..."
9240
9241#: builtin/reset.c:28
9242msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9243msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9244
9245#: builtin/reset.c:34
9246msgid "mixed"
9247msgstr "混杂"
9248
9249#: builtin/reset.c:34
9250msgid "soft"
9251msgstr "软性"
9252
9253#: builtin/reset.c:34
9254msgid "hard"
9255msgstr "硬性"
9256
9257#: builtin/reset.c:34
9258msgid "merge"
9259msgstr "合并"
9260
9261#: builtin/reset.c:34
9262msgid "keep"
9263msgstr "保持"
9264
9265#: builtin/reset.c:74
9266msgid "You do not have a valid HEAD."
9267msgstr "您没有一个有效的 HEAD。"
9268
9269#: builtin/reset.c:76
9270msgid "Failed to find tree of HEAD."
9271msgstr "无法找到 HEAD 指向的树。"
9272
9273#: builtin/reset.c:82
9274#, c-format
9275msgid "Failed to find tree of %s."
9276msgstr "无法找到 %s 指向的树。"
9277
9278#: builtin/reset.c:100
9279#, c-format
9280msgid "HEAD is now at %s"
9281msgstr "HEAD 现在位于 %s"
9282
9283#  译者:汉字之间无空格,故删除%s前后空格
9284#: builtin/reset.c:183
9285#, c-format
9286msgid "Cannot do a %s reset in the middle of a merge."
9287msgstr "在合并过程中不能做%s重置操作。"
9288
9289#: builtin/reset.c:276
9290msgid "be quiet, only report errors"
9291msgstr "安静模式,只报告错误"
9292
9293#: builtin/reset.c:278
9294msgid "reset HEAD and index"
9295msgstr "重置 HEAD 和索引"
9296
9297#: builtin/reset.c:279
9298msgid "reset only HEAD"
9299msgstr "只重置 HEAD"
9300
9301#: builtin/reset.c:281 builtin/reset.c:283
9302msgid "reset HEAD, index and working tree"
9303msgstr "重置 HEAD、索引和工作区"
9304
9305#: builtin/reset.c:285
9306msgid "reset HEAD but keep local changes"
9307msgstr "重置 HEAD 但保存本地变更"
9308
9309#: builtin/reset.c:288
9310msgid "record only the fact that removed paths will be added later"
9311msgstr "将删除的路径标记为稍后添加"
9312
9313#: builtin/reset.c:305
9314#, c-format
9315msgid "Failed to resolve '%s' as a valid revision."
9316msgstr "无法将 '%s' 解析为一个有效的版本。"
9317
9318#: builtin/reset.c:308 builtin/reset.c:316
9319#, c-format
9320msgid "Could not parse object '%s'."
9321msgstr "不能解析对象 '%s'。"
9322
9323#: builtin/reset.c:313
9324#, c-format
9325msgid "Failed to resolve '%s' as a valid tree."
9326msgstr "无法将 '%s' 解析为一个有效的树对象。"
9327
9328#: builtin/reset.c:322
9329msgid "--patch is incompatible with --{hard,mixed,soft}"
9330msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9331
9332#: builtin/reset.c:331
9333msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9334msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9335
9336#  译者:汉字之间无空格,故删除%s前后空格
9337#: builtin/reset.c:333
9338#, c-format
9339msgid "Cannot do %s reset with paths."
9340msgstr "不能带路径进行%s重置。"
9341
9342#  译者:汉字之间无空格,故删除%s前后空格
9343#: builtin/reset.c:343
9344#, c-format
9345msgid "%s reset is not allowed in a bare repository"
9346msgstr "不能对纯仓库进行%s重置"
9347
9348#: builtin/reset.c:347
9349msgid "-N can only be used with --mixed"
9350msgstr "-N 只能和 --mixed 同时使用"
9351
9352#: builtin/reset.c:364
9353msgid "Unstaged changes after reset:"
9354msgstr "重置后取消暂存的变更:"
9355
9356#: builtin/reset.c:370
9357#, c-format
9358msgid "Could not reset index file to revision '%s'."
9359msgstr "不能重置索引文件至版本 '%s'。"
9360
9361#: builtin/reset.c:374
9362msgid "Could not write new index file."
9363msgstr "不能写入新的索引文件。"
9364
9365#: builtin/rev-parse.c:361
9366msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9367msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9368
9369#: builtin/rev-parse.c:366
9370msgid "keep the `--` passed as an arg"
9371msgstr "保持 `--` 作为一个参数传递"
9372
9373#: builtin/rev-parse.c:368
9374msgid "stop parsing after the first non-option argument"
9375msgstr "遇到第一个非选项参数后停止解析"
9376
9377#: builtin/rev-parse.c:371
9378msgid "output in stuck long form"
9379msgstr "以固定长格式输出"
9380
9381#: builtin/rev-parse.c:499
9382msgid ""
9383"git rev-parse --parseopt [<options>] -- [<args>...]\n"
9384"   or: git rev-parse --sq-quote [<arg>...]\n"
9385"   or: git rev-parse [<options>] [<arg>...]\n"
9386"\n"
9387"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9388msgstr ""
9389"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9390"   或者:git rev-parse --sq-quote [<参数>...]\n"
9391"   或者:git rev-parse [<选项>] [<参数>...]\n"
9392"\n"
9393"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9394
9395#: builtin/revert.c:22
9396msgid "git revert [<options>] <commit-ish>..."
9397msgstr "git revert [<选项>] <提交号>..."
9398
9399#: builtin/revert.c:23
9400msgid "git revert <subcommand>"
9401msgstr "git revert <子命令>"
9402
9403#: builtin/revert.c:28
9404msgid "git cherry-pick [<options>] <commit-ish>..."
9405msgstr "git cherry-pick [<选项>] <提交号>..."
9406
9407#: builtin/revert.c:29
9408msgid "git cherry-pick <subcommand>"
9409msgstr "git cherry-pick <子命令>"
9410
9411#: builtin/revert.c:71
9412#, c-format
9413msgid "%s: %s cannot be used with %s"
9414msgstr "%s:%s 不能和 %s 同时使用"
9415
9416#: builtin/revert.c:80
9417msgid "end revert or cherry-pick sequence"
9418msgstr "终止反转或拣选操作"
9419
9420#: builtin/revert.c:81
9421msgid "resume revert or cherry-pick sequence"
9422msgstr "继续反转或拣选操作"
9423
9424#: builtin/revert.c:82
9425msgid "cancel revert or cherry-pick sequence"
9426msgstr "取消反转或拣选操作"
9427
9428#: builtin/revert.c:83
9429msgid "don't automatically commit"
9430msgstr "不要自动提交"
9431
9432#: builtin/revert.c:84
9433msgid "edit the commit message"
9434msgstr "编辑提交说明"
9435
9436#: builtin/revert.c:87
9437msgid "parent number"
9438msgstr "父编号"
9439
9440#: builtin/revert.c:89
9441msgid "merge strategy"
9442msgstr "合并策略"
9443
9444#: builtin/revert.c:90
9445msgid "option"
9446msgstr "选项"
9447
9448#: builtin/revert.c:91
9449msgid "option for merge strategy"
9450msgstr "合并策略的选项"
9451
9452#: builtin/revert.c:104
9453msgid "append commit name"
9454msgstr "追加提交名称"
9455
9456#: builtin/revert.c:105
9457msgid "allow fast-forward"
9458msgstr "允许快进式"
9459
9460#: builtin/revert.c:106
9461msgid "preserve initially empty commits"
9462msgstr "保留初始化的空提交"
9463
9464#: builtin/revert.c:107
9465msgid "allow commits with empty messages"
9466msgstr "允许提交说明为空"
9467
9468#: builtin/revert.c:108
9469msgid "keep redundant, empty commits"
9470msgstr "保持多余的、空的提交"
9471
9472#: builtin/revert.c:112
9473msgid "program error"
9474msgstr "程序错误"
9475
9476#: builtin/revert.c:197
9477msgid "revert failed"
9478msgstr "还原失败"
9479
9480#: builtin/revert.c:212
9481msgid "cherry-pick failed"
9482msgstr "拣选失败"
9483
9484#: builtin/rm.c:17
9485msgid "git rm [<options>] [--] <file>..."
9486msgstr "git rm [<选项>] [--] <文件>..."
9487
9488#: builtin/rm.c:65
9489msgid ""
9490"the following submodule (or one of its nested submodules)\n"
9491"uses a .git directory:"
9492msgid_plural ""
9493"the following submodules (or one of their nested submodules)\n"
9494"use a .git directory:"
9495msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9496msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9497
9498#: builtin/rm.c:71
9499msgid ""
9500"\n"
9501"(use 'rm -rf' if you really want to remove it including all of its history)"
9502msgstr ""
9503"\n"
9504"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9505
9506#: builtin/rm.c:230
9507msgid ""
9508"the following file has staged content different from both the\n"
9509"file and the HEAD:"
9510msgid_plural ""
9511"the following files have staged content different from both the\n"
9512"file and the HEAD:"
9513msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9514msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9515
9516#: builtin/rm.c:235
9517msgid ""
9518"\n"
9519"(use -f to force removal)"
9520msgstr ""
9521"\n"
9522"(使用 -f 强制删除)"
9523
9524#: builtin/rm.c:239
9525msgid "the following file has changes staged in the index:"
9526msgid_plural "the following files have changes staged in the index:"
9527msgstr[0] "下列文件索引中有变更"
9528msgstr[1] "下列文件索引中有变更"
9529
9530#: builtin/rm.c:243 builtin/rm.c:254
9531msgid ""
9532"\n"
9533"(use --cached to keep the file, or -f to force removal)"
9534msgstr ""
9535"\n"
9536"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9537
9538#: builtin/rm.c:251
9539msgid "the following file has local modifications:"
9540msgid_plural "the following files have local modifications:"
9541msgstr[0] "如下文件有本地修改:"
9542msgstr[1] "如下文件有本地修改:"
9543
9544#: builtin/rm.c:269
9545msgid "do not list removed files"
9546msgstr "不列出删除的文件"
9547
9548#: builtin/rm.c:270
9549msgid "only remove from the index"
9550msgstr "只从索引区删除"
9551
9552#: builtin/rm.c:271
9553msgid "override the up-to-date check"
9554msgstr "忽略文件更新状态检查"
9555
9556#: builtin/rm.c:272
9557msgid "allow recursive removal"
9558msgstr "允许递归删除"
9559
9560#: builtin/rm.c:274
9561msgid "exit with a zero status even if nothing matched"
9562msgstr "即使没有匹配,也以零状态退出"
9563
9564#: builtin/rm.c:317
9565msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9566msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9567
9568#: builtin/rm.c:335
9569#, c-format
9570msgid "not removing '%s' recursively without -r"
9571msgstr "未提供 -r 选项不会递归删除 '%s'"
9572
9573#: builtin/rm.c:374
9574#, c-format
9575msgid "git rm: unable to remove %s"
9576msgstr "git rm:不能删除 %s"
9577
9578#: builtin/shortlog.c:13
9579msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9580msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9581
9582#: builtin/shortlog.c:131
9583#, c-format
9584msgid "Missing author: %s"
9585msgstr "缺少作者:%s"
9586
9587#: builtin/shortlog.c:230
9588msgid "sort output according to the number of commits per author"
9589msgstr "根据每个作者的提交数量排序"
9590
9591#: builtin/shortlog.c:232
9592msgid "Suppress commit descriptions, only provides commit count"
9593msgstr "隐藏提交说明,只提供提交数量"
9594
9595#: builtin/shortlog.c:234
9596msgid "Show the email address of each author"
9597msgstr "显示每个作者的电子邮件地址"
9598
9599#: builtin/shortlog.c:235
9600msgid "w[,i1[,i2]]"
9601msgstr "w[,i1[,i2]]"
9602
9603#: builtin/shortlog.c:236
9604msgid "Linewrap output"
9605msgstr "折行输出"
9606
9607#: builtin/show-branch.c:9
9608msgid ""
9609"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9610"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9611"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9612"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9613msgstr ""
9614"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9615"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9616"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9617"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9618
9619#: builtin/show-branch.c:13
9620msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9621msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9622
9623#: builtin/show-branch.c:659
9624msgid "show remote-tracking and local branches"
9625msgstr "显示远程跟踪的和本地的分支"
9626
9627#: builtin/show-branch.c:661
9628msgid "show remote-tracking branches"
9629msgstr "显示远程跟踪的分支"
9630
9631#: builtin/show-branch.c:663
9632msgid "color '*!+-' corresponding to the branch"
9633msgstr "着色 '*!+-' 到相应的分支"
9634
9635#: builtin/show-branch.c:665
9636msgid "show <n> more commits after the common ancestor"
9637msgstr "显示共同祖先后的 <n> 个提交"
9638
9639#: builtin/show-branch.c:667
9640msgid "synonym to more=-1"
9641msgstr "和 more=-1 同义"
9642
9643#: builtin/show-branch.c:668
9644msgid "suppress naming strings"
9645msgstr "不显示字符串命名"
9646
9647#: builtin/show-branch.c:670
9648msgid "include the current branch"
9649msgstr "包括当前分支"
9650
9651#: builtin/show-branch.c:672
9652msgid "name commits with their object names"
9653msgstr "以对象名字命名提交"
9654
9655#: builtin/show-branch.c:674
9656msgid "show possible merge bases"
9657msgstr "显示可能合并的基线"
9658
9659#: builtin/show-branch.c:676
9660msgid "show refs unreachable from any other ref"
9661msgstr "显示没有任何引用的的引用"
9662
9663#: builtin/show-branch.c:678
9664msgid "show commits in topological order"
9665msgstr "以拓扑顺序显示提交"
9666
9667#: builtin/show-branch.c:681
9668msgid "show only commits not on the first branch"
9669msgstr "只显示不在第一个分支上的提交"
9670
9671#: builtin/show-branch.c:683
9672msgid "show merges reachable from only one tip"
9673msgstr "显示仅一个分支可访问的合并提交"
9674
9675#: builtin/show-branch.c:685
9676msgid "topologically sort, maintaining date order where possible"
9677msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9678
9679#: builtin/show-branch.c:688
9680msgid "<n>[,<base>]"
9681msgstr "<n>[,<base>]"
9682
9683#: builtin/show-branch.c:689
9684msgid "show <n> most recent ref-log entries starting at base"
9685msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9686
9687#: builtin/show-ref.c:10
9688msgid ""
9689"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9690"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9691msgstr ""
9692"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9693"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9694
9695#: builtin/show-ref.c:11
9696msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9697msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9698
9699#: builtin/show-ref.c:170
9700msgid "only show tags (can be combined with heads)"
9701msgstr "只显示标签(可以和头共用)"
9702
9703#: builtin/show-ref.c:171
9704msgid "only show heads (can be combined with tags)"
9705msgstr "只显示头(可以和标签共用)"
9706
9707#: builtin/show-ref.c:172
9708msgid "stricter reference checking, requires exact ref path"
9709msgstr "更严格的引用检测,需要精确的引用路径"
9710
9711#: builtin/show-ref.c:175 builtin/show-ref.c:177
9712msgid "show the HEAD reference, even if it would be filtered out"
9713msgstr "显示 HEAD 引用,即使被过滤掉"
9714
9715#: builtin/show-ref.c:179
9716msgid "dereference tags into object IDs"
9717msgstr "转换标签到对象 ID"
9718
9719#: builtin/show-ref.c:181
9720msgid "only show SHA1 hash using <n> digits"
9721msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9722
9723#: builtin/show-ref.c:185
9724msgid "do not print results to stdout (useful with --verify)"
9725msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9726
9727#: builtin/show-ref.c:187
9728msgid "show refs from stdin that aren't in local repository"
9729msgstr "显示从标准输入中读入的不在本地仓库中的引用"
9730
9731#: builtin/symbolic-ref.c:7
9732msgid "git symbolic-ref [<options>] <name> [<ref>]"
9733msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9734
9735#: builtin/symbolic-ref.c:8
9736msgid "git symbolic-ref -d [-q] <name>"
9737msgstr "git symbolic-ref -d [-q] <名称>"
9738
9739#: builtin/symbolic-ref.c:40
9740msgid "suppress error message for non-symbolic (detached) refs"
9741msgstr "不显示非符号(分离的)引用的错误信息"
9742
9743#: builtin/symbolic-ref.c:41
9744msgid "delete symbolic ref"
9745msgstr "删除符号引用"
9746
9747#: builtin/symbolic-ref.c:42
9748msgid "shorten ref output"
9749msgstr "简短的引用输出"
9750
9751#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9752msgid "reason"
9753msgstr "原因"
9754
9755#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9756msgid "reason of the update"
9757msgstr "更新的原因"
9758
9759#: builtin/tag.c:22
9760msgid ""
9761"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9762"[<head>]"
9763msgstr ""
9764"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9765
9766#: builtin/tag.c:23
9767msgid "git tag -d <tagname>..."
9768msgstr "git tag -d <标签名>..."
9769
9770#: builtin/tag.c:24
9771msgid ""
9772"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9773"\t\t[<pattern>...]"
9774msgstr ""
9775"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9776
9777#: builtin/tag.c:26
9778msgid "git tag -v <tagname>..."
9779msgstr "git tag -v <标签名>..."
9780
9781#: builtin/tag.c:69
9782#, c-format
9783msgid "malformed object at '%s'"
9784msgstr "非法的对象于 '%s'"
9785
9786#: builtin/tag.c:301
9787#, c-format
9788msgid "tag name too long: %.*s..."
9789msgstr "标签名称太长:%.*s..."
9790
9791#: builtin/tag.c:306
9792#, c-format
9793msgid "tag '%s' not found."
9794msgstr "未发现标签 '%s'。"
9795
9796#: builtin/tag.c:321
9797#, c-format
9798msgid "Deleted tag '%s' (was %s)\n"
9799msgstr "已删除标签 '%s'(曾为 %s)\n"
9800
9801#: builtin/tag.c:333
9802#, c-format
9803msgid "could not verify the tag '%s'"
9804msgstr "不能校验该标签 '%s'"
9805
9806#: builtin/tag.c:343
9807#, c-format
9808msgid ""
9809"\n"
9810"Write a message for tag:\n"
9811"  %s\n"
9812"Lines starting with '%c' will be ignored.\n"
9813msgstr ""
9814"\n"
9815"输入一个标签说明:\n"
9816"  %s\n"
9817"以 '%c' 开头的行将被忽略。\n"
9818
9819#: builtin/tag.c:347
9820#, c-format
9821msgid ""
9822"\n"
9823"Write a message for tag:\n"
9824"  %s\n"
9825"Lines starting with '%c' will be kept; you may remove them yourself if you "
9826"want to.\n"
9827msgstr ""
9828"\n"
9829"输入一个标签说明:\n"
9830"  %s\n"
9831"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9832
9833#: builtin/tag.c:371
9834#, c-format
9835msgid "unsupported sort specification '%s'"
9836msgstr "不支持的排序规格 '%s'"
9837
9838#: builtin/tag.c:373
9839#, c-format
9840msgid "unsupported sort specification '%s' in variable '%s'"
9841msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9842
9843#: builtin/tag.c:428
9844msgid "unable to sign the tag"
9845msgstr "无法签署标签"
9846
9847#: builtin/tag.c:430
9848msgid "unable to write tag file"
9849msgstr "无法写标签文件"
9850
9851#: builtin/tag.c:455
9852msgid "bad object type."
9853msgstr "坏的对象类型。"
9854
9855#: builtin/tag.c:468
9856msgid "tag header too big."
9857msgstr "标签头信息太大。"
9858
9859#: builtin/tag.c:504
9860msgid "no tag message?"
9861msgstr "无标签说明?"
9862
9863#: builtin/tag.c:510
9864#, c-format
9865msgid "The tag message has been left in %s\n"
9866msgstr "标签说明被保留在 %s\n"
9867
9868#: builtin/tag.c:559
9869msgid "switch 'points-at' requires an object"
9870msgstr "开关 'points-at' 需要一个对象"
9871
9872#: builtin/tag.c:561
9873#, c-format
9874msgid "malformed object name '%s'"
9875msgstr "非法的对象名 '%s'"
9876
9877#: builtin/tag.c:589
9878msgid "list tag names"
9879msgstr "列出标签名称"
9880
9881#: builtin/tag.c:591
9882msgid "print <n> lines of each tag message"
9883msgstr "每个标签信息打印 <n> 行"
9884
9885#: builtin/tag.c:593
9886msgid "delete tags"
9887msgstr "删除标签"
9888
9889#: builtin/tag.c:594
9890msgid "verify tags"
9891msgstr "验证标签"
9892
9893#: builtin/tag.c:596
9894msgid "Tag creation options"
9895msgstr "标签创建选项"
9896
9897#: builtin/tag.c:598
9898msgid "annotated tag, needs a message"
9899msgstr "附注标签,需要一个说明"
9900
9901#: builtin/tag.c:600
9902msgid "tag message"
9903msgstr "标签说明"
9904
9905#: builtin/tag.c:602
9906msgid "annotated and GPG-signed tag"
9907msgstr "附注并附加 GPG 签名的标签"
9908
9909#: builtin/tag.c:606
9910msgid "use another key to sign the tag"
9911msgstr "使用另外的私钥签名该标签"
9912
9913#: builtin/tag.c:607
9914msgid "replace the tag if exists"
9915msgstr "如果存在,替换现有的标签"
9916
9917#: builtin/tag.c:609
9918msgid "Tag listing options"
9919msgstr "标签列表选项"
9920
9921#: builtin/tag.c:610
9922msgid "show tag list in columns"
9923msgstr "以列的方式显示标签列表"
9924
9925#: builtin/tag.c:612
9926msgid "sort tags"
9927msgstr "排序标签"
9928
9929#: builtin/tag.c:617 builtin/tag.c:623
9930msgid "print only tags that contain the commit"
9931msgstr "只打印包含提交的标签"
9932
9933#: builtin/tag.c:629
9934msgid "print only tags of the object"
9935msgstr "只打印对象的标签"
9936
9937#: builtin/tag.c:655
9938msgid "--column and -n are incompatible"
9939msgstr "--column 和 -n 不兼容"
9940
9941#: builtin/tag.c:667
9942msgid "--sort and -n are incompatible"
9943msgstr "--sort 和 -n 不兼容"
9944
9945#: builtin/tag.c:674
9946msgid "-n option is only allowed with -l."
9947msgstr "-n 选项只允许和 -l 同时使用。"
9948
9949#: builtin/tag.c:676
9950msgid "--contains option is only allowed with -l."
9951msgstr "--contains 选项只允许和 -l 同时使用。"
9952
9953#: builtin/tag.c:678
9954msgid "--points-at option is only allowed with -l."
9955msgstr "--points-at 选项只允许和 -l 同时使用。"
9956
9957#: builtin/tag.c:686
9958msgid "only one -F or -m option is allowed."
9959msgstr "只允许一个 -F 或 -m 选项。"
9960
9961#: builtin/tag.c:706
9962msgid "too many params"
9963msgstr "太多参数"
9964
9965#: builtin/tag.c:712
9966#, c-format
9967msgid "'%s' is not a valid tag name."
9968msgstr "'%s' 不是一个有效的标签名称。"
9969
9970#: builtin/tag.c:717
9971#, c-format
9972msgid "tag '%s' already exists"
9973msgstr "标签 '%s' 已存在"
9974
9975#: builtin/tag.c:741
9976#, c-format
9977msgid "Updated tag '%s' (was %s)\n"
9978msgstr "已更新标签 '%s'(曾为 %s)\n"
9979
9980#: builtin/unpack-objects.c:489
9981msgid "Unpacking objects"
9982msgstr "展开对象中"
9983
9984#: builtin/update-index.c:70
9985#, c-format
9986msgid "failed to create directory %s"
9987msgstr "无法创建目录 %s"
9988
9989#: builtin/update-index.c:76
9990#, c-format
9991msgid "failed to stat %s"
9992msgstr "无法枚举 %s 状态"
9993
9994#: builtin/update-index.c:86
9995#, c-format
9996msgid "failed to create file %s"
9997msgstr "无法创建文件 %s"
9998
9999#: builtin/update-index.c:94
10000#, c-format
10001msgid "failed to delete file %s"
10002msgstr "无法删除文件 %s"
10003
10004#: builtin/update-index.c:101 builtin/update-index.c:203
10005#, c-format
10006msgid "failed to delete directory %s"
10007msgstr "无法删除目录 %s"
10008
10009#: builtin/update-index.c:124
10010#, c-format
10011msgid "Testing "
10012msgstr "正在测试 "
10013
10014#: builtin/update-index.c:136
10015msgid "directory stat info does not change after adding a new file"
10016msgstr "添加一个新文件后,目录的状态信息未改变"
10017
10018#: builtin/update-index.c:149
10019msgid "directory stat info does not change after adding a new directory"
10020msgstr "添加一个新目录后,目录的状态信息未改变"
10021
10022#: builtin/update-index.c:162
10023msgid "directory stat info changes after updating a file"
10024msgstr "更新一个文件后,目录的状态信息被修改"
10025
10026#: builtin/update-index.c:173
10027msgid "directory stat info changes after adding a file inside subdirectory"
10028msgstr "在子目录中添加文件后,目录的状态信息被修改"
10029
10030#: builtin/update-index.c:184
10031msgid "directory stat info does not change after deleting a file"
10032msgstr "删除一个文件后,目录的状态信息未改变"
10033
10034#: builtin/update-index.c:197
10035msgid "directory stat info does not change after deleting a directory"
10036msgstr "删除一个目录后,目录的状态信息未改变"
10037
10038#: builtin/update-index.c:204
10039msgid " OK"
10040msgstr " OK"
10041
10042#: builtin/update-index.c:564
10043msgid "git update-index [<options>] [--] [<file>...]"
10044msgstr "git update-index [<选项>] [--] [<文件>...]"
10045
10046#: builtin/update-index.c:918
10047msgid "continue refresh even when index needs update"
10048msgstr "当索引需要更新时继续刷新"
10049
10050#: builtin/update-index.c:921
10051msgid "refresh: ignore submodules"
10052msgstr "刷新:忽略子模组"
10053
10054#: builtin/update-index.c:924
10055msgid "do not ignore new files"
10056msgstr "不忽略新的文件"
10057
10058#: builtin/update-index.c:926
10059msgid "let files replace directories and vice-versa"
10060msgstr "让文件替换目录(反之亦然)"
10061
10062#: builtin/update-index.c:928
10063msgid "notice files missing from worktree"
10064msgstr "通知文件从工作区丢失"
10065
10066#: builtin/update-index.c:930
10067msgid "refresh even if index contains unmerged entries"
10068msgstr "即使索引区包含未合并的条目也执行刷新"
10069
10070#: builtin/update-index.c:933
10071msgid "refresh stat information"
10072msgstr "刷新统计信息"
10073
10074#: builtin/update-index.c:937
10075msgid "like --refresh, but ignore assume-unchanged setting"
10076msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
10077
10078#: builtin/update-index.c:941
10079msgid "<mode>,<object>,<path>"
10080msgstr "<存取模式>,<对象>,<路径>"
10081
10082#: builtin/update-index.c:942
10083msgid "add the specified entry to the index"
10084msgstr "添加指定的条目到索引区"
10085
10086#: builtin/update-index.c:946
10087msgid "(+/-)x"
10088msgstr "(+/-)x"
10089
10090#: builtin/update-index.c:947
10091msgid "override the executable bit of the listed files"
10092msgstr "覆盖列表里文件的可执行位"
10093
10094#: builtin/update-index.c:951
10095msgid "mark files as \"not changing\""
10096msgstr "把文件标记为 \"没有变更\""
10097
10098#: builtin/update-index.c:954
10099msgid "clear assumed-unchanged bit"
10100msgstr "清除 assumed-unchanged 位"
10101
10102#: builtin/update-index.c:957
10103msgid "mark files as \"index-only\""
10104msgstr "把文件标记为 \"仅索引\""
10105
10106#: builtin/update-index.c:960
10107msgid "clear skip-worktree bit"
10108msgstr "清除 skip-worktree 位"
10109
10110#: builtin/update-index.c:963
10111msgid "add to index only; do not add content to object database"
10112msgstr "只添加到索引区;不添加对象到对象库"
10113
10114#: builtin/update-index.c:965
10115msgid "remove named paths even if present in worktree"
10116msgstr "即使存在工作区里,也删除路径"
10117
10118#: builtin/update-index.c:967
10119msgid "with --stdin: input lines are terminated by null bytes"
10120msgstr "携带 --stdin:输入的行以 null 字符终止"
10121
10122#: builtin/update-index.c:969
10123msgid "read list of paths to be updated from standard input"
10124msgstr "从标准输入中读取需要更新的路径列表"
10125
10126#: builtin/update-index.c:973
10127msgid "add entries from standard input to the index"
10128msgstr "从标准输入添加条目到索引区"
10129
10130#: builtin/update-index.c:977
10131msgid "repopulate stages #2 and #3 for the listed paths"
10132msgstr "为指定文件重新生成第2和第3暂存区"
10133
10134#: builtin/update-index.c:981
10135msgid "only update entries that differ from HEAD"
10136msgstr "只更新与 HEAD 不同的条目"
10137
10138#: builtin/update-index.c:985
10139msgid "ignore files missing from worktree"
10140msgstr "忽略工作区丢失的文件"
10141
10142#: builtin/update-index.c:988
10143msgid "report actions to standard output"
10144msgstr "在标准输出显示操作"
10145
10146#: builtin/update-index.c:990
10147msgid "(for porcelains) forget saved unresolved conflicts"
10148msgstr "(for porcelains) 忘记保存的未解决的冲突"
10149
10150#: builtin/update-index.c:994
10151msgid "write index in this format"
10152msgstr "以这种格式写入索引区"
10153
10154#: builtin/update-index.c:996
10155msgid "enable or disable split index"
10156msgstr "启用或禁用索引拆分"
10157
10158#: builtin/update-index.c:998
10159msgid "enable/disable untracked cache"
10160msgstr "启用/禁用对未跟踪文件的缓存"
10161
10162#: builtin/update-index.c:1000
10163msgid "enable untracked cache without testing the filesystem"
10164msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10165
10166#: builtin/update-ref.c:9
10167msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10168msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10169
10170#: builtin/update-ref.c:10
10171msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
10172msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
10173
10174#: builtin/update-ref.c:11
10175msgid "git update-ref [<options>] --stdin [-z]"
10176msgstr "git update-ref [<选项>] --stdin [-z]"
10177
10178#: builtin/update-ref.c:359
10179msgid "delete the reference"
10180msgstr "删除引用"
10181
10182#: builtin/update-ref.c:361
10183msgid "update <refname> not the one it points to"
10184msgstr "更新 <引用名> 本身而不是它指向的引用"
10185
10186#: builtin/update-ref.c:362
10187msgid "stdin has NUL-terminated arguments"
10188msgstr "标准输入有以 NUL 字符终止的参数"
10189
10190#: builtin/update-ref.c:363
10191msgid "read updates from stdin"
10192msgstr "从标准输入读取更新"
10193
10194#: builtin/update-server-info.c:6
10195msgid "git update-server-info [--force]"
10196msgstr "git update-server-info [--force]"
10197
10198#: builtin/update-server-info.c:14
10199msgid "update the info files from scratch"
10200msgstr "从头开始更新文件信息"
10201
10202#: builtin/verify-commit.c:17
10203msgid "git verify-commit [-v | --verbose] <commit>..."
10204msgstr "git verify-commit [-v | --verbose] <提交>..."
10205
10206#: builtin/verify-commit.c:75
10207msgid "print commit contents"
10208msgstr "打印提交内容"
10209
10210#: builtin/verify-pack.c:54
10211msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10212msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10213
10214#: builtin/verify-pack.c:64
10215msgid "verbose"
10216msgstr "冗长输出"
10217
10218#: builtin/verify-pack.c:66
10219msgid "show statistics only"
10220msgstr "只显示统计"
10221
10222#: builtin/verify-tag.c:17
10223msgid "git verify-tag [-v | --verbose] <tag>..."
10224msgstr "git verify-tag [-v | --verbose] <标签>..."
10225
10226#: builtin/verify-tag.c:73
10227msgid "print tag contents"
10228msgstr "打印标签内容"
10229
10230#: builtin/worktree.c:11
10231msgid "git worktree add [<options>] <path> <branch>"
10232msgstr "git worktree add [<选项>] <路径> <分支>"
10233
10234#: builtin/worktree.c:12
10235msgid "git worktree prune [<options>]"
10236msgstr "git worktree prune [<选项>]"
10237
10238#: builtin/worktree.c:27
10239#, c-format
10240msgid "Removing worktrees/%s: not a valid directory"
10241msgstr "删除工作区/%s:不是一个有效的目录"
10242
10243#: builtin/worktree.c:33
10244#, c-format
10245msgid "Removing worktrees/%s: gitdir file does not exist"
10246msgstr "删除 worktrees/%s:gitdir 文件不存在"
10247
10248#: builtin/worktree.c:38
10249#, c-format
10250msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10251msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10252
10253#: builtin/worktree.c:49
10254#, c-format
10255msgid "Removing worktrees/%s: invalid gitdir file"
10256msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10257
10258#: builtin/worktree.c:65
10259#, c-format
10260msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10261msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10262
10263#: builtin/worktree.c:100
10264#, c-format
10265msgid "failed to remove: %s"
10266msgstr "无法删除:%s"
10267
10268#: builtin/worktree.c:186
10269#, c-format
10270msgid "'%s' already exists"
10271msgstr "'%s' 已经存在"
10272
10273#: builtin/worktree.c:207
10274#, c-format
10275msgid "could not create directory of '%s'"
10276msgstr "不能创建目录 '%s'"
10277
10278#: builtin/worktree.c:241
10279msgid "unable to resolve HEAD"
10280msgstr "不能解析 HEAD"
10281
10282#: builtin/worktree.c:249
10283#, c-format
10284msgid "Enter %s (identifier %s)"
10285msgstr "输入 %s (标识符 %s)"
10286
10287#: builtin/worktree.c:281
10288msgid "checkout <branch> even if already checked out in other worktree"
10289msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10290
10291#: builtin/worktree.c:283
10292msgid "create a new branch"
10293msgstr "创建一个新分支"
10294
10295#: builtin/worktree.c:285
10296msgid "create or reset a branch"
10297msgstr "创建或重置一个分支"
10298
10299#: builtin/worktree.c:286
10300msgid "detach HEAD at named commit"
10301msgstr "HEAD 从指定的提交分离"
10302
10303#: builtin/worktree.c:292
10304msgid "-b and -B are mutually exclusive"
10305msgstr "-b 和 -B 互斥"
10306
10307#: builtin/write-tree.c:13
10308msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10309msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
10310
10311#: builtin/write-tree.c:26
10312msgid "<prefix>/"
10313msgstr "<前缀>/"
10314
10315#: builtin/write-tree.c:27
10316msgid "write tree object for a subdirectory <prefix>"
10317msgstr "将 <前缀> 子目录内容写到一个树对象"
10318
10319#: builtin/write-tree.c:30
10320msgid "only useful for debugging"
10321msgstr "只对调试有用"
10322
10323#: credential-cache--daemon.c:267
10324msgid "print debugging messages to stderr"
10325msgstr "调试信息输出到标准错误"
10326
10327#: git.c:14
10328msgid ""
10329"'git help -a' and 'git help -g' list available subcommands and some\n"
10330"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10331"to read about a specific subcommand or concept."
10332msgstr ""
10333"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10334"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10335"帮助。"
10336
10337#: common-cmds.h:10
10338msgid "start a working area (see also: git help tutorial)"
10339msgstr "开始一个工作区(参见:git help tutorial)"
10340
10341#: common-cmds.h:11
10342msgid "work on the current change (see also: git help everyday)"
10343msgstr "在当前变更上工作(参见:git help everyday)"
10344
10345#: common-cmds.h:12
10346msgid "examine the history and state (see also: git help revisions)"
10347msgstr "检查历史和状态(参见:git help revisions)"
10348
10349#: common-cmds.h:13
10350msgid "grow, mark and tweak your common history"
10351msgstr "扩展、标记和调校您的历史记录"
10352
10353#: common-cmds.h:14
10354msgid "collaborate (see also: git help workflows)"
10355msgstr "协同(参见:git help workflows)"
10356
10357#: common-cmds.h:18
10358msgid "Add file contents to the index"
10359msgstr "添加文件内容至索引"
10360
10361#: common-cmds.h:19
10362msgid "Find by binary search the change that introduced a bug"
10363msgstr "通过二分查找定位引入 bug 的变更"
10364
10365#: common-cmds.h:20
10366msgid "List, create, or delete branches"
10367msgstr "列出、创建或删除分支"
10368
10369#: common-cmds.h:21
10370msgid "Switch branches or restore working tree files"
10371msgstr "切换分支或恢复工作区文件"
10372
10373#: common-cmds.h:22
10374msgid "Clone a repository into a new directory"
10375msgstr "克隆一个仓库到一个新目录"
10376
10377#: common-cmds.h:23
10378msgid "Record changes to the repository"
10379msgstr "记录变更到仓库"
10380
10381#: common-cmds.h:24
10382msgid "Show changes between commits, commit and working tree, etc"
10383msgstr "显示提交之间、提交和工作区之间等的差异"
10384
10385#: common-cmds.h:25
10386msgid "Download objects and refs from another repository"
10387msgstr "从另外一个仓库下载对象和引用"
10388
10389#: common-cmds.h:26
10390msgid "Print lines matching a pattern"
10391msgstr "输出和模式匹配的行"
10392
10393#: common-cmds.h:27
10394msgid "Create an empty Git repository or reinitialize an existing one"
10395msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
10396
10397#: common-cmds.h:28
10398msgid "Show commit logs"
10399msgstr "显示提交日志"
10400
10401#: common-cmds.h:29
10402msgid "Join two or more development histories together"
10403msgstr "合并两个或更多开发历史"
10404
10405#: common-cmds.h:30
10406msgid "Move or rename a file, a directory, or a symlink"
10407msgstr "移动或重命名一个文件、目录或符号链接"
10408
10409#: common-cmds.h:31
10410msgid "Fetch from and integrate with another repository or a local branch"
10411msgstr "获取并整合另外的仓库或一个本地分支"
10412
10413#: common-cmds.h:32
10414msgid "Update remote refs along with associated objects"
10415msgstr "更新远程引用和相关的对象"
10416
10417#: common-cmds.h:33
10418msgid "Forward-port local commits to the updated upstream head"
10419msgstr "本地提交转移至更新后的上游分支中"
10420
10421#: common-cmds.h:34
10422msgid "Reset current HEAD to the specified state"
10423msgstr "重置当前 HEAD 到指定状态"
10424
10425#: common-cmds.h:35
10426msgid "Remove files from the working tree and from the index"
10427msgstr "从工作区和索引中删除文件"
10428
10429#: common-cmds.h:36
10430msgid "Show various types of objects"
10431msgstr "显示各种类型的对象"
10432
10433#: common-cmds.h:37
10434msgid "Show the working tree status"
10435msgstr "显示工作区状态"
10436
10437#: common-cmds.h:38
10438msgid "Create, list, delete or verify a tag object signed with GPG"
10439msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
10440
10441#: parse-options.h:142
10442msgid "expiry-date"
10443msgstr "到期时间"
10444
10445#: parse-options.h:157
10446msgid "no-op (backward compatibility)"
10447msgstr "空操作(向后兼容)"
10448
10449#: parse-options.h:231
10450msgid "be more verbose"
10451msgstr "更加详细"
10452
10453#: parse-options.h:233
10454msgid "be more quiet"
10455msgstr "更加安静"
10456
10457#: parse-options.h:239
10458msgid "use <n> digits to display SHA-1s"
10459msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10460
10461#: rerere.h:27
10462msgid "update the index with reused conflict resolution if possible"
10463msgstr "如果可能,重用冲突解决更新索引"
10464
10465#: git-am.sh:53
10466msgid "You need to set your committer info first"
10467msgstr "您需要先设置你的提交者信息"
10468
10469#: git-am.sh:100
10470msgid ""
10471"You seem to have moved HEAD since the last 'am' failure.\n"
10472"Not rewinding to ORIG_HEAD"
10473msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10474
10475#: git-am.sh:110
10476#, sh-format
10477msgid ""
10478"When you have resolved this problem, run \"$cmdline --continue\".\n"
10479"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10480"To restore the original branch and stop patching, run \"$cmdline --abort\"."
10481msgstr ""
10482"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10483"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10484"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10485
10486#: git-am.sh:126
10487msgid "Cannot fall back to three-way merge."
10488msgstr "无法求助于三方合并。"
10489
10490#: git-am.sh:142
10491msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10492msgstr "仓库缺乏必要的数据对象以进行三方合并。"
10493
10494#: git-am.sh:144
10495msgid "Using index info to reconstruct a base tree..."
10496msgstr "使用索引来重建一个(三方合并的)基础目录树..."
10497
10498#: git-am.sh:159
10499msgid ""
10500"Did you hand edit your patch?\n"
10501"It does not apply to blobs recorded in its index."
10502msgstr ""
10503"您是否曾手动编辑过您的补丁?\n"
10504"无法应用补丁到索引中的数据对象上。"
10505
10506#: git-am.sh:168
10507msgid "Falling back to patching base and 3-way merge..."
10508msgstr "转而在基础版本上打补丁及进行三方合并..."
10509
10510#: git-am.sh:185
10511msgid "Failed to merge in the changes."
10512msgstr "无法合并变更。"
10513
10514#: git-am.sh:280
10515msgid "Only one StGIT patch series can be applied at once"
10516msgstr "一次只能有一个 StGIT 补丁队列被应用"
10517
10518#: git-am.sh:367
10519#, sh-format
10520msgid "Patch format $patch_format is not supported."
10521msgstr "不支持 $patch_format 补丁格式。"
10522
10523#: git-am.sh:369
10524msgid "Patch format detection failed."
10525msgstr "补丁格式检测失败。"
10526
10527#: git-am.sh:407
10528msgid ""
10529"The -b/--binary option has been a no-op for long time, and\n"
10530"it will be removed. Please do not use it anymore."
10531msgstr ""
10532"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10533"请不要再使用它了。"
10534
10535#: git-am.sh:507
10536#, sh-format
10537msgid "previous rebase directory $dotest still exists but mbox given."
10538msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10539
10540#: git-am.sh:512
10541msgid "Please make up your mind. --skip or --abort?"
10542msgstr "请下决心。--skip 或是 --abort ?"
10543
10544#: git-am.sh:560
10545#, sh-format
10546msgid ""
10547"Stray $dotest directory found.\n"
10548"Use \"git am --abort\" to remove it."
10549msgstr ""
10550"发现了错误的 $dotest 目录。\n"
10551"使用 \"git am --abort\" 删除它。"
10552
10553#: git-am.sh:568
10554msgid "Resolve operation not in progress, we are not resuming."
10555msgstr "解决操作未进行,我们不会继续。"
10556
10557#: git-am.sh:635
10558#, sh-format
10559msgid "Dirty index: cannot apply patches (dirty: $files)"
10560msgstr "脏索引:不能应用补丁(脏文件:$files)"
10561
10562#: git-am.sh:747
10563#, sh-format
10564msgid ""
10565"Patch is empty.  Was it split wrong?\n"
10566"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10567"To restore the original branch and stop patching run \"$cmdline --abort\"."
10568msgstr ""
10569"补丁为空。是不是切分错误?\n"
10570"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10571"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10572
10573#: git-am.sh:774
10574msgid "Patch does not have a valid e-mail address."
10575msgstr "补丁中没有一个有效的邮件地址。"
10576
10577#: git-am.sh:821
10578msgid "cannot be interactive without stdin connected to a terminal."
10579msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10580
10581#: git-am.sh:825
10582msgid "Commit Body is:"
10583msgstr "提交内容为:"
10584
10585#  译者:注意保持句尾空格
10586#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10587#. in your translation. The program will only accept English
10588#. input at this point.
10589#: git-am.sh:832
10590msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10591msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10592
10593#: git-am.sh:868
10594#, sh-format
10595msgid "Applying: $FIRSTLINE"
10596msgstr "正应用:$FIRSTLINE"
10597
10598#: git-am.sh:889
10599msgid ""
10600"No changes - did you forget to use 'git add'?\n"
10601"If there is nothing left to stage, chances are that something else\n"
10602"already introduced the same changes; you might want to skip this patch."
10603msgstr ""
10604"没有变更 —— 您是不是忘了执行 'git add'?\n"
10605"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10606"您也许想要跳过这个补丁。"
10607
10608#: git-am.sh:897
10609msgid ""
10610"You still have unmerged paths in your index\n"
10611"did you forget to use 'git add'?"
10612msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10613
10614#: git-am.sh:913
10615msgid "No changes -- Patch already applied."
10616msgstr "没有变更 —— 补丁已经应用过。"
10617
10618#: git-am.sh:923
10619#, sh-format
10620msgid "Patch failed at $msgnum $FIRSTLINE"
10621msgstr "补丁失败于 $msgnum $FIRSTLINE"
10622
10623#: git-am.sh:926
10624#, sh-format
10625msgid ""
10626"The copy of the patch that failed is found in:\n"
10627"   $dotest/patch"
10628msgstr ""
10629"失败的补丁文件副本位于:\n"
10630"   $dotest/patch"
10631
10632#: git-am.sh:945
10633msgid "applying to an empty history"
10634msgstr "正应用到一个空历史上"
10635
10636#: git-bisect.sh:48
10637msgid "You need to start by \"git bisect start\""
10638msgstr "您需要执行 \"git bisect start\" 来开始"
10639
10640#  译者:注意保持句尾空格
10641#. TRANSLATORS: Make sure to include [Y] and [n] in your
10642#. translation. The program will only accept English input
10643#. at this point.
10644#: git-bisect.sh:54
10645msgid "Do you want me to do it for you [Y/n]? "
10646msgstr "您想让我为您这样做么[Y/n]? "
10647
10648#: git-bisect.sh:95
10649#, sh-format
10650msgid "unrecognised option: '$arg'"
10651msgstr "未能识别的选项:'$arg'"
10652
10653#: git-bisect.sh:99
10654#, sh-format
10655msgid "'$arg' does not appear to be a valid revision"
10656msgstr "'$arg' 看起来不像是一个有效的版本"
10657
10658#: git-bisect.sh:117
10659msgid "Bad HEAD - I need a HEAD"
10660msgstr "坏的 HEAD - 我需要一个 HEAD"
10661
10662#: git-bisect.sh:130
10663#, sh-format
10664msgid ""
10665"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10666msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10667
10668#: git-bisect.sh:140
10669msgid "won't bisect on cg-seek'ed tree"
10670msgstr "不会在做了 cg-seek 的树上做二分查找"
10671
10672#: git-bisect.sh:144
10673msgid "Bad HEAD - strange symbolic ref"
10674msgstr "坏的 HEAD - 奇怪的符号引用"
10675
10676#: git-bisect.sh:189
10677#, sh-format
10678msgid "Bad bisect_write argument: $state"
10679msgstr "坏的 bisect_write 参数:$state"
10680
10681#: git-bisect.sh:218
10682#, sh-format
10683msgid "Bad rev input: $arg"
10684msgstr "输入坏的版本:$arg"
10685
10686#: git-bisect.sh:232
10687msgid "Please call 'bisect_state' with at least one argument."
10688msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10689
10690#: git-bisect.sh:244
10691#, sh-format
10692msgid "Bad rev input: $rev"
10693msgstr "输入坏的版本:$rev"
10694
10695#: git-bisect.sh:253
10696msgid "'git bisect bad' can take only one argument."
10697msgstr "'git bisect bad' 只能带一个参数。"
10698
10699#: git-bisect.sh:276
10700msgid "Warning: bisecting only with a bad commit."
10701msgstr "警告:在仅有一个坏提交下进行二分查找。"
10702
10703#  译者:注意保持句尾空格
10704#. TRANSLATORS: Make sure to include [Y] and [n] in your
10705#. translation. The program will only accept English input
10706#. at this point.
10707#: git-bisect.sh:282
10708msgid "Are you sure [Y/n]? "
10709msgstr "您确认么[Y/n]? "
10710
10711#: git-bisect.sh:292
10712msgid ""
10713"You need to give me at least one good and one bad revision.\n"
10714"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10715msgstr ""
10716"您需要给我至少一个好版本和一个坏版本。\n"
10717"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10718
10719#: git-bisect.sh:295
10720msgid ""
10721"You need to start by \"git bisect start\".\n"
10722"You then need to give me at least one good and one bad revision.\n"
10723"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10724msgstr ""
10725"您需要执行 \"git bisect start\" 来开始。\n"
10726"然后需要提供我至少一个好版本和一个坏版本。\n"
10727"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10728
10729#: git-bisect.sh:366 git-bisect.sh:493
10730msgid "We are not bisecting."
10731msgstr "我们没有在二分查找。"
10732
10733#: git-bisect.sh:373
10734#, sh-format
10735msgid "'$invalid' is not a valid commit"
10736msgstr "'$invalid' 不是一个有效的提交"
10737
10738#: git-bisect.sh:382
10739#, sh-format
10740msgid ""
10741"Could not check out original HEAD '$branch'.\n"
10742"Try 'git bisect reset <commit>'."
10743msgstr ""
10744"不能检出原始 HEAD '$branch'。\n"
10745"尝试 'git bisect reset <提交>'。"
10746
10747#: git-bisect.sh:409
10748msgid "No logfile given"
10749msgstr "未提供日志文件"
10750
10751#: git-bisect.sh:410
10752#, sh-format
10753msgid "cannot read $file for replaying"
10754msgstr "不能读取 $file 来重放"
10755
10756#: git-bisect.sh:427
10757msgid "?? what are you talking about?"
10758msgstr "?? 您在说什么?"
10759
10760#: git-bisect.sh:439
10761#, sh-format
10762msgid "running $command"
10763msgstr "运行 $command"
10764
10765#: git-bisect.sh:446
10766#, sh-format
10767msgid ""
10768"bisect run failed:\n"
10769"exit code $res from '$command' is < 0 or >= 128"
10770msgstr ""
10771"二分查找运行失败:\n"
10772"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10773
10774#: git-bisect.sh:472
10775msgid "bisect run cannot continue any more"
10776msgstr "二分查找不能继续运行"
10777
10778#: git-bisect.sh:478
10779#, sh-format
10780msgid ""
10781"bisect run failed:\n"
10782"'bisect_state $state' exited with error code $res"
10783msgstr ""
10784"二分查找运行失败:\n"
10785"'bisect_state $state' 退出码为 $res"
10786
10787#: git-bisect.sh:485
10788msgid "bisect run success"
10789msgstr "二分查找运行成功"
10790
10791#: git-pull.sh:61
10792msgid ""
10793"Pull is not possible because you have unmerged files.\n"
10794"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10795"as appropriate to mark resolution and make a commit."
10796msgstr ""
10797"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10798"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10799
10800#: git-pull.sh:65
10801msgid "Pull is not possible because you have unmerged files."
10802msgstr "Pull 不可用,因为您尚有未合并的文件。"
10803
10804#: git-pull.sh:71
10805msgid ""
10806"You have not concluded your merge (MERGE_HEAD exists).\n"
10807"Please, commit your changes before you can merge."
10808msgstr ""
10809"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10810"请在合并前先提交您的修改。"
10811
10812#: git-pull.sh:285
10813msgid "updating an unborn branch with changes added to the index"
10814msgstr "更新尚未诞生的分支,变更添加至索引"
10815
10816#: git-pull.sh:311
10817#, sh-format
10818msgid ""
10819"Warning: fetch updated the current branch head.\n"
10820"Warning: fast-forwarding your working tree from\n"
10821"Warning: commit $orig_head."
10822msgstr ""
10823"警告:fetch 更新了当前的分支。您的工作区\n"
10824"警告:从原提交 $orig_head 快进。"
10825
10826#: git-pull.sh:336
10827msgid "Cannot merge multiple branches into empty head"
10828msgstr "无法将多个分支合并到空分支"
10829
10830#: git-pull.sh:340
10831msgid "Cannot rebase onto multiple branches"
10832msgstr "无法变基到多个分支"
10833
10834#: git-rebase.sh:57
10835msgid ""
10836"When you have resolved this problem, run \"git rebase --continue\".\n"
10837"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10838"To check out the original branch and stop rebasing, run \"git rebase --abort"
10839"\"."
10840msgstr ""
10841"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10842"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10843"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10844
10845#: git-rebase.sh:165
10846msgid "Applied autostash."
10847msgstr "成功应用 autostash。"
10848
10849#: git-rebase.sh:168
10850#, sh-format
10851msgid "Cannot store $stash_sha1"
10852msgstr "无法保存 $stash_sha1"
10853
10854#: git-rebase.sh:169
10855msgid ""
10856"Applying autostash resulted in conflicts.\n"
10857"Your changes are safe in the stash.\n"
10858"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10859msgstr ""
10860"应用 autostash 导致冲突。\n"
10861"您的修改安全地保存在 stash 中。\n"
10862"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10863
10864#: git-rebase.sh:208
10865msgid "The pre-rebase hook refused to rebase."
10866msgstr "钩子 pre-rebase 拒绝变基操作。"
10867
10868#: git-rebase.sh:213
10869msgid "It looks like git-am is in progress. Cannot rebase."
10870msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10871
10872#: git-rebase.sh:351
10873msgid "The --exec option must be used with the --interactive option"
10874msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10875
10876#: git-rebase.sh:356
10877msgid "No rebase in progress?"
10878msgstr "没有正在进行的变基?"
10879
10880#: git-rebase.sh:367
10881msgid "The --edit-todo action can only be used during interactive rebase."
10882msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10883
10884#: git-rebase.sh:374
10885msgid "Cannot read HEAD"
10886msgstr "不能读取 HEAD"
10887
10888#: git-rebase.sh:377
10889msgid ""
10890"You must edit all merge conflicts and then\n"
10891"mark them as resolved using git add"
10892msgstr ""
10893"您必须编辑所有的合并冲突,然后通过 git add\n"
10894"命令将它们标记为已解决"
10895
10896#: git-rebase.sh:395
10897#, sh-format
10898msgid "Could not move back to $head_name"
10899msgstr "无法移回 $head_name"
10900
10901#: git-rebase.sh:414
10902#, sh-format
10903msgid ""
10904"It seems that there is already a $state_dir_base directory, and\n"
10905"I wonder if you are in the middle of another rebase.  If that is the\n"
10906"case, please try\n"
10907"\t$cmd_live_rebase\n"
10908"If that is not the case, please\n"
10909"\t$cmd_clear_stale_rebase\n"
10910"and run me again.  I am stopping in case you still have something\n"
10911"valuable there."
10912msgstr ""
10913"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10914"过程中。 如果是这样,请执行\n"
10915"\t$cmd_live_rebase\n"
10916"如果不是这样,请执行\n"
10917"\t$cmd_clear_stale_rebase\n"
10918"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10919
10920#: git-rebase.sh:465
10921#, sh-format
10922msgid "invalid upstream $upstream_name"
10923msgstr "无效的上游 $upstream_name"
10924
10925#: git-rebase.sh:489
10926#, sh-format
10927msgid "$onto_name: there are more than one merge bases"
10928msgstr "$onto_name: 有一个以上的合并基准"
10929
10930#: git-rebase.sh:492 git-rebase.sh:496
10931#, sh-format
10932msgid "$onto_name: there is no merge base"
10933msgstr "$onto_name: 没有合并基准"
10934
10935#: git-rebase.sh:501
10936#, sh-format
10937msgid "Does not point to a valid commit: $onto_name"
10938msgstr "没有指向一个有效的提交:$onto_name"
10939
10940#: git-rebase.sh:524
10941#, sh-format
10942msgid "fatal: no such branch: $branch_name"
10943msgstr "严重错误:无此分支:$branch_name"
10944
10945#: git-rebase.sh:557
10946msgid "Cannot autostash"
10947msgstr "无法 autostash"
10948
10949#: git-rebase.sh:562
10950#, sh-format
10951msgid "Created autostash: $stash_abbrev"
10952msgstr "创建了 autostash: $stash_abbrev"
10953
10954#: git-rebase.sh:566
10955msgid "Please commit or stash them."
10956msgstr "请提交或为它们保存进度。"
10957
10958#: git-rebase.sh:586
10959#, sh-format
10960msgid "Current branch $branch_name is up to date."
10961msgstr "当前分支 $branch_name 是最新的。"
10962
10963#: git-rebase.sh:590
10964#, sh-format
10965msgid "Current branch $branch_name is up to date, rebase forced."
10966msgstr "当前分支 $branch_name 是最新的,强制变基。"
10967
10968#: git-rebase.sh:601
10969#, sh-format
10970msgid "Changes from $mb to $onto:"
10971msgstr "变更从 $mb 到 $onto:"
10972
10973#: git-rebase.sh:610
10974msgid "First, rewinding head to replay your work on top of it..."
10975msgstr "首先,回退分支以便在上面重放您的工作..."
10976
10977#: git-rebase.sh:620
10978#, sh-format
10979msgid "Fast-forwarded $branch_name to $onto_name."
10980msgstr "快进 $branch_name 至 $onto_name。"
10981
10982#: git-stash.sh:51
10983msgid "git stash clear with parameters is unimplemented"
10984msgstr "git stash clear 不支持参数"
10985
10986#: git-stash.sh:74
10987msgid "You do not have the initial commit yet"
10988msgstr "您尚未建立初始提交"
10989
10990#: git-stash.sh:89
10991msgid "Cannot save the current index state"
10992msgstr "无法保存当前索引状态"
10993
10994#: git-stash.sh:124 git-stash.sh:137
10995msgid "Cannot save the current worktree state"
10996msgstr "无法保存当前工作区状态"
10997
10998#: git-stash.sh:141
10999msgid "No changes selected"
11000msgstr "没有选择变更"
11001
11002#: git-stash.sh:144
11003msgid "Cannot remove temporary index (can't happen)"
11004msgstr "无法删除临时索引(不应发生)"
11005
11006#: git-stash.sh:157
11007msgid "Cannot record working tree state"
11008msgstr "不能记录工作区状态"
11009
11010#: git-stash.sh:191
11011#, sh-format
11012msgid "Cannot update $ref_stash with $w_commit"
11013msgstr "无法用 $w_commit 更新 $ref_stash"
11014
11015#. TRANSLATORS: $option is an invalid option, like
11016#. `--blah-blah'. The 7 spaces at the beginning of the
11017#. second line correspond to "error: ". So you should line
11018#. up the second line with however many characters the
11019#. translation of "error: " takes in your language. E.g. in
11020#. English this is:
11021#.
11022#. $ git stash save --blah-blah 2>&1 | head -n 2
11023#. error: unknown option for 'stash save': --blah-blah
11024#. To provide a message, use git stash save -- '--blah-blah'
11025#: git-stash.sh:241
11026#, sh-format
11027msgid ""
11028"error: unknown option for 'stash save': $option\n"
11029"       To provide a message, use git stash save -- '$option'"
11030msgstr ""
11031"错误:'stash save' 的未知选项:$option\n"
11032"      要提供一个描述信息,使用 git stash save -- '$option'"
11033
11034#: git-stash.sh:262
11035msgid "No local changes to save"
11036msgstr "没有要保存的本地修改"
11037
11038#: git-stash.sh:266
11039msgid "Cannot initialize stash"
11040msgstr "无法初始化 stash"
11041
11042#: git-stash.sh:270
11043msgid "Cannot save the current status"
11044msgstr "无法保存当前状态"
11045
11046#: git-stash.sh:288
11047msgid "Cannot remove worktree changes"
11048msgstr "无法删除工作区变更"
11049
11050#: git-stash.sh:389
11051#, sh-format
11052msgid "unknown option: $opt"
11053msgstr "未知选项: $opt"
11054
11055#: git-stash.sh:399
11056msgid "No stash found."
11057msgstr "未发现 stash。"
11058
11059#: git-stash.sh:406
11060#, sh-format
11061msgid "Too many revisions specified: $REV"
11062msgstr "指定了太多的版本:$REV"
11063
11064#: git-stash.sh:412
11065#, sh-format
11066msgid "$reference is not a valid reference"
11067msgstr "$reference 不是一个有效的引用"
11068
11069#: git-stash.sh:440
11070#, sh-format
11071msgid "'$args' is not a stash-like commit"
11072msgstr "'$args' 不是 stash 样提交"
11073
11074#: git-stash.sh:451
11075#, sh-format
11076msgid "'$args' is not a stash reference"
11077msgstr "'$args' 不是一个 stash 引用"
11078
11079#: git-stash.sh:459
11080msgid "unable to refresh index"
11081msgstr "无法刷新索引"
11082
11083#: git-stash.sh:463
11084msgid "Cannot apply a stash in the middle of a merge"
11085msgstr "无法在合并过程中恢复进度"
11086
11087#: git-stash.sh:471
11088msgid "Conflicts in index. Try without --index."
11089msgstr "索引中有冲突。尝试不使用 --index。"
11090
11091#: git-stash.sh:473
11092msgid "Could not save index tree"
11093msgstr "不能保存索引树"
11094
11095#: git-stash.sh:507
11096msgid "Cannot unstage modified files"
11097msgstr "无法将修改的文件取消暂存"
11098
11099#: git-stash.sh:522
11100msgid "Index was not unstashed."
11101msgstr "索引的进度没有被恢复。"
11102
11103#: git-stash.sh:545
11104#, sh-format
11105msgid "Dropped ${REV} ($s)"
11106msgstr "丢弃了 ${REV} ($s)"
11107
11108#: git-stash.sh:546
11109#, sh-format
11110msgid "${REV}: Could not drop stash entry"
11111msgstr "${REV}:不能丢弃进度条目"
11112
11113#: git-stash.sh:554
11114msgid "No branch name specified"
11115msgstr "未指定分支名"
11116
11117#: git-stash.sh:626
11118msgid "(To restore them type \"git stash apply\")"
11119msgstr "(为恢复数据输入 \"git stash apply\")"
11120
11121#: git-submodule.sh:95
11122#, sh-format
11123msgid "cannot strip one component off url '$remoteurl'"
11124msgstr "无法从 url '$remoteurl' 剥离一个组件"
11125
11126#: git-submodule.sh:237
11127#, sh-format
11128msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11129msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
11130
11131#: git-submodule.sh:287
11132#, sh-format
11133msgid "Clone of '$url' into submodule path '$sm_path' failed"
11134msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
11135
11136#: git-submodule.sh:296
11137#, sh-format
11138msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
11139msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
11140
11141#: git-submodule.sh:406
11142msgid "Relative path can only be used from the toplevel of the working tree"
11143msgstr "只能在工作区的顶级目录中使用相对路径"
11144
11145#: git-submodule.sh:416
11146#, sh-format
11147msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11148msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11149
11150#: git-submodule.sh:433
11151#, sh-format
11152msgid "'$sm_path' already exists in the index"
11153msgstr "'$sm_path' 已经存在于索引中"
11154
11155#: git-submodule.sh:437
11156#, sh-format
11157msgid ""
11158"The following path is ignored by one of your .gitignore files:\n"
11159"$sm_path\n"
11160"Use -f if you really want to add it."
11161msgstr ""
11162"以下路径被您的一个 .gitignore 文件所忽略:\n"
11163"$sm_path\n"
11164"如果您确实想添加它,使用 -f 参数。"
11165
11166#: git-submodule.sh:455
11167#, sh-format
11168msgid "Adding existing repo at '$sm_path' to the index"
11169msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11170
11171#: git-submodule.sh:457
11172#, sh-format
11173msgid "'$sm_path' already exists and is not a valid git repo"
11174msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11175
11176#: git-submodule.sh:465
11177#, sh-format
11178msgid "A git directory for '$sm_name' is found locally with remote(s):"
11179msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11180
11181#: git-submodule.sh:467
11182#, sh-format
11183msgid ""
11184"If you want to reuse this local git directory instead of cloning again from"
11185msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11186
11187#: git-submodule.sh:469
11188#, sh-format
11189msgid ""
11190"use the '--force' option. If the local git directory is not the correct repo"
11191msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11192
11193#: git-submodule.sh:470
11194#, sh-format
11195msgid ""
11196"or you are unsure what this means choose another name with the '--name' "
11197"option."
11198msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11199
11200#: git-submodule.sh:472
11201#, sh-format
11202msgid "Reactivating local git directory for submodule '$sm_name'."
11203msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11204
11205#: git-submodule.sh:484
11206#, sh-format
11207msgid "Unable to checkout submodule '$sm_path'"
11208msgstr "不能检出子模组 '$sm_path'"
11209
11210#: git-submodule.sh:489
11211#, sh-format
11212msgid "Failed to add submodule '$sm_path'"
11213msgstr "无法添加子模组 '$sm_path'"
11214
11215#: git-submodule.sh:498
11216#, sh-format
11217msgid "Failed to register submodule '$sm_path'"
11218msgstr "无法注册子模组 '$sm_path'"
11219
11220#: git-submodule.sh:542
11221#, sh-format
11222msgid "Entering '$prefix$displaypath'"
11223msgstr "正在进入 '$prefix$displaypath'"
11224
11225#: git-submodule.sh:562
11226#, sh-format
11227msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11228msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11229
11230#: git-submodule.sh:608
11231#, sh-format
11232msgid "No url found for submodule path '$displaypath' in .gitmodules"
11233msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11234
11235#: git-submodule.sh:617
11236#, sh-format
11237msgid "Failed to register url for submodule path '$displaypath'"
11238msgstr "无法为子模组路径 '$displaypath' 注册 url"
11239
11240#: git-submodule.sh:619
11241#, sh-format
11242msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11243msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11244
11245#: git-submodule.sh:636
11246#, sh-format
11247msgid "Failed to register update mode for submodule path '$displaypath'"
11248msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11249
11250#: git-submodule.sh:674
11251#, sh-format
11252msgid "Use '.' if you really want to deinitialize all submodules"
11253msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11254
11255#: git-submodule.sh:691
11256#, sh-format
11257msgid "Submodule work tree '$displaypath' contains a .git directory"
11258msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11259
11260#: git-submodule.sh:692
11261#, sh-format
11262msgid ""
11263"(use 'rm -rf' if you really want to remove it including all of its history)"
11264msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11265
11266#: git-submodule.sh:698
11267#, sh-format
11268msgid ""
11269"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11270"discard them"
11271msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11272
11273#: git-submodule.sh:701
11274#, sh-format
11275msgid "Cleared directory '$displaypath'"
11276msgstr "已清除目录 '$displaypath'"
11277
11278#: git-submodule.sh:702
11279#, sh-format
11280msgid "Could not remove submodule work tree '$displaypath'"
11281msgstr "无法移除子模组工作区 '$displaypath'"
11282
11283#: git-submodule.sh:705
11284#, sh-format
11285msgid "Could not create empty submodule directory '$displaypath'"
11286msgstr "不能创建空的子模组目录 '$displaypath'"
11287
11288#: git-submodule.sh:714
11289#, sh-format
11290msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11291msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11292
11293#: git-submodule.sh:830
11294#, sh-format
11295msgid ""
11296"Submodule path '$displaypath' not initialized\n"
11297"Maybe you want to use 'update --init'?"
11298msgstr ""
11299"子模组路径 '$displaypath' 没有初始化\n"
11300"也许您想用 'update --init'?"
11301
11302#: git-submodule.sh:843
11303#, sh-format
11304msgid "Unable to find current revision in submodule path '$displaypath'"
11305msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11306
11307#: git-submodule.sh:852
11308#, sh-format
11309msgid "Unable to fetch in submodule path '$sm_path'"
11310msgstr "无法在子模组路径 '$sm_path' 中获取"
11311
11312#: git-submodule.sh:876
11313#, sh-format
11314msgid "Unable to fetch in submodule path '$displaypath'"
11315msgstr "无法在子模组路径 '$displaypath' 中获取"
11316
11317#: git-submodule.sh:890
11318#, sh-format
11319msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11320msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11321
11322#: git-submodule.sh:891
11323#, sh-format
11324msgid "Submodule path '$displaypath': checked out '$sha1'"
11325msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11326
11327#: git-submodule.sh:895
11328#, sh-format
11329msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11330msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11331
11332#: git-submodule.sh:896
11333#, sh-format
11334msgid "Submodule path '$displaypath': rebased into '$sha1'"
11335msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
11336
11337#: git-submodule.sh:901
11338#, sh-format
11339msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11340msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11341
11342#: git-submodule.sh:902
11343#, sh-format
11344msgid "Submodule path '$displaypath': merged in '$sha1'"
11345msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
11346
11347#: git-submodule.sh:907
11348#, sh-format
11349msgid ""
11350"Execution of '$command $sha1' failed in submodule  path '$prefix$sm_path'"
11351msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11352
11353#: git-submodule.sh:908
11354#, sh-format
11355msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11356msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11357
11358#: git-submodule.sh:938
11359#, sh-format
11360msgid "Failed to recurse into submodule path '$displaypath'"
11361msgstr "无法递归进子模组路径 '$displaypath'"
11362
11363#: git-submodule.sh:1046
11364msgid "The --cached option cannot be used with the --files option"
11365msgstr "选项 --cached 不能和选项 --files 同时使用"
11366
11367#: git-submodule.sh:1098
11368#, sh-format
11369msgid "unexpected mode $mod_dst"
11370msgstr "意外的模式 $mod_dst"
11371
11372#  译者:注意保持前导空格
11373#: git-submodule.sh:1118
11374#, sh-format
11375msgid "  Warn: $display_name doesn't contain commit $sha1_src"
11376msgstr "  警告:$display_name 未包含提交 $sha1_src"
11377
11378#  译者:注意保持前导空格
11379#: git-submodule.sh:1121
11380#, sh-format
11381msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
11382msgstr "  警告:$display_name 未包含提交 $sha1_dst"
11383
11384#  译者:注意保持前导空格
11385#: git-submodule.sh:1124
11386#, sh-format
11387msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11388msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11389
11390#: git-submodule.sh:1149
11391msgid "blob"
11392msgstr "数据对象"
11393
11394#: git-submodule.sh:1267
11395#, sh-format
11396msgid "Failed to recurse into submodule path '$sm_path'"
11397msgstr "无法递归进子模组路径 '$sm_path'"
11398
11399#: git-submodule.sh:1331
11400#, sh-format
11401msgid "Synchronizing submodule url for '$displaypath'"
11402msgstr "为 '$displaypath' 同步子模组 url"