po / zh_CN.poon commit Merge branch 'master' of git://github.com/git-l10n/git-po (070d108)
   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-09-05 09:16+0800\n"
 138"PO-Revision-Date: 2015-09-08 23:00+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#: advice.c:101 builtin/merge.c:1227
 161msgid "You have not concluded your merge (MERGE_HEAD exists)."
 162msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
 163
 164#: advice.c:103
 165msgid "Please, commit your changes before you can merge."
 166msgstr "请在合并前先提交您的修改。"
 167
 168#: advice.c:104
 169msgid "Exiting because of unfinished merge."
 170msgstr "因为存在未完成的合并而退出。"
 171
 172#: archive.c:12
 173msgid "git archive [<options>] <tree-ish> [<path>...]"
 174msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 175
 176#: archive.c:13
 177msgid "git archive --list"
 178msgstr "git archive --list"
 179
 180#: archive.c:14
 181msgid ""
 182"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 183msgstr ""
 184"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 185
 186#: archive.c:15
 187msgid "git archive --remote <repo> [--exec <cmd>] --list"
 188msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 189
 190#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
 191#, c-format
 192msgid "pathspec '%s' did not match any files"
 193msgstr "路径规格 '%s' 未匹配任何文件"
 194
 195#: archive.c:428
 196msgid "fmt"
 197msgstr "格式"
 198
 199#: archive.c:428
 200msgid "archive format"
 201msgstr "归档格式"
 202
 203#: archive.c:429 builtin/log.c:1229
 204msgid "prefix"
 205msgstr "前缀"
 206
 207#: archive.c:430
 208msgid "prepend prefix to each pathname in the archive"
 209msgstr "为归档中每个路径名加上前缀"
 210
 211#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
 212#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
 213#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
 214#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
 215#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
 216msgid "file"
 217msgstr "文件"
 218
 219#: archive.c:432 builtin/archive.c:89
 220msgid "write the archive to this file"
 221msgstr "归档写入此文件"
 222
 223#: archive.c:434
 224msgid "read .gitattributes in working directory"
 225msgstr "读取工作区中的 .gitattributes"
 226
 227#: archive.c:435
 228msgid "report archived files on stderr"
 229msgstr "在标准错误上报告归档文件"
 230
 231#: archive.c:436
 232msgid "store only"
 233msgstr "只存储"
 234
 235#: archive.c:437
 236msgid "compress faster"
 237msgstr "压缩速度更快"
 238
 239#: archive.c:445
 240msgid "compress better"
 241msgstr "压缩效果更好"
 242
 243#: archive.c:448
 244msgid "list supported archive formats"
 245msgstr "列出支持的归档格式"
 246
 247#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
 248msgid "repo"
 249msgstr "仓库"
 250
 251#: archive.c:451 builtin/archive.c:91
 252msgid "retrieve the archive from remote repository <repo>"
 253msgstr "从远程仓库(<仓库>)提取归档文件"
 254
 255#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
 256msgid "command"
 257msgstr "命令"
 258
 259#: archive.c:453 builtin/archive.c:93
 260msgid "path to the remote git-upload-archive command"
 261msgstr "远程 git-upload-archive 命令的路径"
 262
 263#: attr.c:265
 264msgid ""
 265"Negative patterns are ignored in git attributes\n"
 266"Use '\\!' for literal leading exclamation."
 267msgstr ""
 268"负值模版在 git attributes 中被忽略\n"
 269"当字符串确实要以感叹号开始时,使用 '\\!'。"
 270
 271#: branch.c:60
 272#, c-format
 273msgid "Not setting branch %s as its own upstream."
 274msgstr "未设置分支 %s 作为它自己的上游。"
 275
 276#: branch.c:83
 277#, c-format
 278msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 279msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 280
 281#: branch.c:84
 282#, c-format
 283msgid "Branch %s set up to track remote branch %s from %s."
 284msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 285
 286#: branch.c:88
 287#, c-format
 288msgid "Branch %s set up to track local branch %s by rebasing."
 289msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 290
 291#: branch.c:89
 292#, c-format
 293msgid "Branch %s set up to track local branch %s."
 294msgstr "分支 %s 设置为跟踪本地分支 %s。"
 295
 296#: branch.c:94
 297#, c-format
 298msgid "Branch %s set up to track remote ref %s by rebasing."
 299msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 300
 301#: branch.c:95
 302#, c-format
 303msgid "Branch %s set up to track remote ref %s."
 304msgstr "分支 %s 设置为跟踪远程引用 %s。"
 305
 306#: branch.c:99
 307#, c-format
 308msgid "Branch %s set up to track local ref %s by rebasing."
 309msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 310
 311#: branch.c:100
 312#, c-format
 313msgid "Branch %s set up to track local ref %s."
 314msgstr "分支 %s 设置为跟踪本地引用 %s。"
 315
 316#: branch.c:133
 317#, c-format
 318msgid "Not tracking: ambiguous information for ref %s"
 319msgstr "未跟踪:引用 %s 有歧义"
 320
 321#: branch.c:162
 322#, c-format
 323msgid "'%s' is not a valid branch name."
 324msgstr "'%s' 不是一个有效的分支名称。"
 325
 326#: branch.c:167
 327#, c-format
 328msgid "A branch named '%s' already exists."
 329msgstr "一个分支名 '%s' 已经存在。"
 330
 331#: branch.c:175
 332msgid "Cannot force update the current branch."
 333msgstr "无法强制更新当前分支。"
 334
 335#: branch.c:195
 336#, c-format
 337msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 338msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
 339
 340#: branch.c:197
 341#, c-format
 342msgid "the requested upstream branch '%s' does not exist"
 343msgstr "请求的上游分支 '%s' 不存在"
 344
 345#: branch.c:199
 346msgid ""
 347"\n"
 348"If you are planning on basing your work on an upstream\n"
 349"branch that already exists at the remote, you may need to\n"
 350"run \"git fetch\" to retrieve it.\n"
 351"\n"
 352"If you are planning to push out a new local branch that\n"
 353"will track its remote counterpart, you may want to use\n"
 354"\"git push -u\" to set the upstream config as you push."
 355msgstr ""
 356"\n"
 357"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
 358"您可能需要执行 \"git fetch\" 来获取分支。\n"
 359"\n"
 360"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
 361"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 362
 363#: branch.c:243
 364#, c-format
 365msgid "Not a valid object name: '%s'."
 366msgstr "不是一个有效的对象名:'%s'。"
 367
 368#: branch.c:263
 369#, c-format
 370msgid "Ambiguous object name: '%s'."
 371msgstr "歧义的对象名:'%s'。"
 372
 373#: branch.c:268
 374#, c-format
 375msgid "Not a valid branch point: '%s'."
 376msgstr "无效的分支点:'%s'。"
 377
 378#: branch.c:399
 379#, c-format
 380msgid "'%s' is already checked out at '%s'"
 381msgstr "'%s' 已经检出到 '%s'"
 382
 383#: bundle.c:34
 384#, c-format
 385msgid "'%s' does not look like a v2 bundle file"
 386msgstr "'%s' 不像是一个 v2 版本的包文件"
 387
 388#: bundle.c:61
 389#, c-format
 390msgid "unrecognized header: %s%s (%d)"
 391msgstr "未能识别的包头:%s%s (%d)"
 392
 393#: bundle.c:87 builtin/commit.c:765
 394#, c-format
 395msgid "could not open '%s'"
 396msgstr "不能打开 '%s'"
 397
 398#: bundle.c:139
 399msgid "Repository lacks these prerequisite commits:"
 400msgstr "仓库中缺少这些必备的提交:"
 401
 402#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
 403#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
 404#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
 405#: builtin/shortlog.c:158
 406msgid "revision walk setup failed"
 407msgstr "版本遍历设置失败"
 408
 409#: bundle.c:185
 410#, c-format
 411msgid "The bundle contains this ref:"
 412msgid_plural "The bundle contains these %d refs:"
 413msgstr[0] "这个包中含有这个引用:"
 414msgstr[1] "这个包中含有 %d 个引用:"
 415
 416#: bundle.c:192
 417msgid "The bundle records a complete history."
 418msgstr "这个包记录一个完整历史。"
 419
 420#: bundle.c:194
 421#, c-format
 422msgid "The bundle requires this ref:"
 423msgid_plural "The bundle requires these %d refs:"
 424msgstr[0] "这个包需要这个引用:"
 425msgstr[1] "这个包需要 %d 个引用:"
 426
 427#: bundle.c:253
 428msgid "Could not spawn pack-objects"
 429msgstr "不能生成 pack-objects 进程"
 430
 431#: bundle.c:264
 432msgid "pack-objects died"
 433msgstr "pack-objects 终止"
 434
 435#: bundle.c:304
 436msgid "rev-list died"
 437msgstr "rev-list 终止"
 438
 439#: bundle.c:353
 440#, c-format
 441msgid "ref '%s' is excluded by the rev-list options"
 442msgstr "引用 '%s' 被 rev-list 选项排除"
 443
 444#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
 445#, c-format
 446msgid "unrecognized argument: %s"
 447msgstr "未能识别的参数:%s"
 448
 449#: bundle.c:449
 450msgid "Refusing to create empty bundle."
 451msgstr "不能创建空包。"
 452
 453#: bundle.c:459
 454#, c-format
 455msgid "cannot create '%s'"
 456msgstr "不能创建 '%s'"
 457
 458#: bundle.c:480
 459msgid "index-pack died"
 460msgstr "index-pack 终止"
 461
 462#: color.c:260
 463#, c-format
 464msgid "invalid color value: %.*s"
 465msgstr "无效的颜色值:%.*s"
 466
 467#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489
 468#: builtin/am.c:2101
 469#, c-format
 470msgid "could not parse %s"
 471msgstr "不能解析 %s"
 472
 473#: commit.c:42
 474#, c-format
 475msgid "%s %s is not a commit!"
 476msgstr "%s %s 不是一个提交!"
 477
 478#: compat/obstack.c:406 compat/obstack.c:408
 479msgid "memory exhausted"
 480msgstr "内存耗尽"
 481
 482#: config.c:474 config.c:476
 483#, c-format
 484msgid "bad config file line %d in %s"
 485msgstr "配置文件 %2$s 出错于第 %1$d 行"
 486
 487#: config.c:592
 488#, c-format
 489msgid "bad numeric config value '%s' for '%s' in %s: %s"
 490msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
 491
 492#: config.c:594
 493#, c-format
 494msgid "bad numeric config value '%s' for '%s': %s"
 495msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
 496
 497#: config.c:679
 498#, c-format
 499msgid "failed to expand user dir in: '%s'"
 500msgstr "无法扩展 '%s' 中的用户目录"
 501
 502#: config.c:757 config.c:768
 503#, c-format
 504msgid "bad zlib compression level %d"
 505msgstr "错误的 zlib 压缩级别 %d"
 506
 507#: config.c:890
 508#, c-format
 509msgid "invalid mode for object creation: %s"
 510msgstr "无效的对象创建模式:%s"
 511
 512#: config.c:1216
 513msgid "unable to parse command-line config"
 514msgstr "无法解析命令行中的配置"
 515
 516#: config.c:1277
 517msgid "unknown error occured while reading the configuration files"
 518msgstr "在读取配置文件时遇到未知错误"
 519
 520#: config.c:1601
 521#, c-format
 522msgid "unable to parse '%s' from command-line config"
 523msgstr "无法解析命令行配置中的 '%s'"
 524
 525#: config.c:1603
 526#, c-format
 527msgid "bad config variable '%s' in file '%s' at line %d"
 528msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 529
 530#: config.c:1662
 531#, c-format
 532msgid "%s has multiple values"
 533msgstr "%s 有多个取值"
 534
 535#: connected.c:69
 536msgid "Could not run 'git rev-list'"
 537msgstr "不能执行 'git rev-list'"
 538
 539#: connected.c:89
 540#, c-format
 541msgid "failed write to rev-list: %s"
 542msgstr "无法写入 rev-list:%s"
 543
 544#: connected.c:97
 545#, c-format
 546msgid "failed to close rev-list's stdin: %s"
 547msgstr "无法关闭 rev-list 的标准输入:%s"
 548
 549#: date.c:95
 550msgid "in the future"
 551msgstr "在将来"
 552
 553#: date.c:101
 554#, c-format
 555msgid "%lu second ago"
 556msgid_plural "%lu seconds ago"
 557msgstr[0] "%lu 秒钟前"
 558msgstr[1] "%lu 秒钟前"
 559
 560#: date.c:108
 561#, c-format
 562msgid "%lu minute ago"
 563msgid_plural "%lu minutes ago"
 564msgstr[0] "%lu 分钟前"
 565msgstr[1] "%lu 分钟前"
 566
 567#: date.c:115
 568#, c-format
 569msgid "%lu hour ago"
 570msgid_plural "%lu hours ago"
 571msgstr[0] "%lu 小时前"
 572msgstr[1] "%lu 小时前"
 573
 574#: date.c:122
 575#, c-format
 576msgid "%lu day ago"
 577msgid_plural "%lu days ago"
 578msgstr[0] "%lu 天前"
 579msgstr[1] "%lu 天前"
 580
 581#: date.c:128
 582#, c-format
 583msgid "%lu week ago"
 584msgid_plural "%lu weeks ago"
 585msgstr[0] "%lu 周前"
 586msgstr[1] "%lu 周前"
 587
 588#: date.c:135
 589#, c-format
 590msgid "%lu month ago"
 591msgid_plural "%lu months ago"
 592msgstr[0] "%lu 个月前"
 593msgstr[1] "%lu 个月前"
 594
 595#: date.c:146
 596#, c-format
 597msgid "%lu year"
 598msgid_plural "%lu years"
 599msgstr[0] "%lu 年"
 600msgstr[1] "%lu 年"
 601
 602#. TRANSLATORS: "%s" is "<n> years"
 603#: date.c:149
 604#, c-format
 605msgid "%s, %lu month ago"
 606msgid_plural "%s, %lu months ago"
 607msgstr[0] "%s %lu 个月前"
 608msgstr[1] "%s %lu 个月前"
 609
 610#: date.c:154 date.c:159
 611#, c-format
 612msgid "%lu year ago"
 613msgid_plural "%lu years ago"
 614msgstr[0] "%lu 年前"
 615msgstr[1] "%lu 年前"
 616
 617#: diffcore-order.c:24
 618#, c-format
 619msgid "failed to read orderfile '%s'"
 620msgstr "无法读取排序文件 '%s'"
 621
 622#: diffcore-rename.c:536
 623msgid "Performing inexact rename detection"
 624msgstr "正在进行非精确的重命名检测"
 625
 626#  译者:注意保持前导空格
 627#: diff.c:116
 628#, c-format
 629msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 630msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 631
 632#  译者:注意保持前导空格
 633#: diff.c:121
 634#, c-format
 635msgid "  Unknown dirstat parameter '%s'\n"
 636msgstr "  未知的 dirstat 参数 '%s'\n"
 637
 638#: diff.c:216
 639#, c-format
 640msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 641msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 642
 643#: diff.c:268
 644#, c-format
 645msgid ""
 646"Found errors in 'diff.dirstat' config variable:\n"
 647"%s"
 648msgstr ""
 649"发现配置变量 'diff.dirstat' 中的错误:\n"
 650"%s"
 651
 652#: diff.c:2998
 653#, c-format
 654msgid "external diff died, stopping at %s"
 655msgstr "外部 diff 退出,停止在 %s"
 656
 657#: diff.c:3394
 658msgid "--follow requires exactly one pathspec"
 659msgstr "--follow 参数后只跟一个 pathspec"
 660
 661#: diff.c:3557
 662#, c-format
 663msgid ""
 664"Failed to parse --dirstat/-X option parameter:\n"
 665"%s"
 666msgstr ""
 667"无法解析 --dirstat/-X 选项的参数:\n"
 668"%s"
 669
 670#: diff.c:3571
 671#, c-format
 672msgid "Failed to parse --submodule option parameter: '%s'"
 673msgstr "无法解析 --submodule 选项的参数:'%s'"
 674
 675#: dir.c:1853
 676msgid "failed to get kernel name and information"
 677msgstr "无法获得内核名称和信息"
 678
 679#: dir.c:1936
 680msgid "Untracked cache is disabled on this system."
 681msgstr "缓存未跟踪文件在本系统被禁用"
 682
 683#: gpg-interface.c:166 gpg-interface.c:237
 684msgid "could not run gpg."
 685msgstr "不能执行 gpg。"
 686
 687#: gpg-interface.c:178
 688msgid "gpg did not accept the data"
 689msgstr "gpg 没有接受数据"
 690
 691#: gpg-interface.c:189
 692msgid "gpg failed to sign the data"
 693msgstr "gpg 无法为数据签名"
 694
 695#: gpg-interface.c:222
 696#, c-format
 697msgid "could not create temporary file '%s': %s"
 698msgstr "不能创建临时文件 '%s':%s"
 699
 700#: gpg-interface.c:225
 701#, c-format
 702msgid "failed writing detached signature to '%s': %s"
 703msgstr "无法将分离式签名写入 '%s':%s"
 704
 705#: grep.c:1718
 706#, c-format
 707msgid "'%s': unable to read %s"
 708msgstr "'%s':无法读取 %s"
 709
 710#: grep.c:1735
 711#, c-format
 712msgid "'%s': %s"
 713msgstr "'%s':%s"
 714
 715#: grep.c:1746
 716#, c-format
 717msgid "'%s': short read %s"
 718msgstr "'%s':读取不完整 %s"
 719
 720#: help.c:207
 721#, c-format
 722msgid "available git commands in '%s'"
 723msgstr "在 '%s' 下可用的 git 命令"
 724
 725#: help.c:214
 726msgid "git commands available from elsewhere on your $PATH"
 727msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 728
 729#: help.c:246
 730msgid "These are common Git commands used in various situations:"
 731msgstr "这些是各种场合常见的 Git 命令:"
 732
 733#: help.c:311
 734#, c-format
 735msgid ""
 736"'%s' appears to be a git command, but we were not\n"
 737"able to execute it. Maybe git-%s is broken?"
 738msgstr ""
 739"'%s' 像是一个 git 命令,但却无法运行。\n"
 740"可能是 git-%s 受损?"
 741
 742#: help.c:368
 743msgid "Uh oh. Your system reports no Git commands at all."
 744msgstr "唉呀,您的系统中未发现 Git 命令。"
 745
 746#: help.c:390
 747#, c-format
 748msgid ""
 749"WARNING: You called a Git command named '%s', which does not exist.\n"
 750"Continuing under the assumption that you meant '%s'"
 751msgstr ""
 752"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 753"是 '%s'"
 754
 755#: help.c:395
 756#, c-format
 757msgid "in %0.1f seconds automatically..."
 758msgstr "在 %0.1f 秒钟后自动运行..."
 759
 760#: help.c:402
 761#, c-format
 762msgid "git: '%s' is not a git command. See 'git --help'."
 763msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
 764
 765#: help.c:406 help.c:466
 766msgid ""
 767"\n"
 768"Did you mean this?"
 769msgid_plural ""
 770"\n"
 771"Did you mean one of these?"
 772msgstr[0] ""
 773"\n"
 774"您指的是这个么?"
 775msgstr[1] ""
 776"\n"
 777"您指的是这其中的某一个么?"
 778
 779#: help.c:462
 780#, c-format
 781msgid "%s: %s - %s"
 782msgstr "%s:%s - %s"
 783
 784#: merge.c:41
 785msgid "failed to read the cache"
 786msgstr "无法读取缓存"
 787
 788#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375
 789#: builtin/checkout.c:586 builtin/clone.c:715
 790msgid "unable to write new index file"
 791msgstr "无法写新的索引文件"
 792
 793#: merge-recursive.c:189
 794#, c-format
 795msgid "(bad commit)\n"
 796msgstr "(坏提交)\n"
 797
 798#: merge-recursive.c:209
 799#, c-format
 800msgid "addinfo_cache failed for path '%s'"
 801msgstr "为路径 '%s' addinfo_cache 失败"
 802
 803#: merge-recursive.c:270
 804msgid "error building trees"
 805msgstr "无法创建树"
 806
 807#: merge-recursive.c:687
 808#, c-format
 809msgid "failed to create path '%s'%s"
 810msgstr "无法创建路径 '%s'%s"
 811
 812#: merge-recursive.c:698
 813#, c-format
 814msgid "Removing %s to make room for subdirectory\n"
 815msgstr "删除 %s 以便为子目录留出空间\n"
 816
 817#: merge-recursive.c:712 merge-recursive.c:733
 818msgid ": perhaps a D/F conflict?"
 819msgstr ":可能是一个目录/文件冲突?"
 820
 821#: merge-recursive.c:723
 822#, c-format
 823msgid "refusing to lose untracked file at '%s'"
 824msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 825
 826#: merge-recursive.c:763
 827#, c-format
 828msgid "cannot read object %s '%s'"
 829msgstr "不能读取对象 %s '%s'"
 830
 831#: merge-recursive.c:765
 832#, c-format
 833msgid "blob expected for %s '%s'"
 834msgstr "%s '%s' 应为数据对象"
 835
 836#: merge-recursive.c:788 builtin/clone.c:364
 837#, c-format
 838msgid "failed to open '%s'"
 839msgstr "无法打开 '%s'"
 840
 841#: merge-recursive.c:796
 842#, c-format
 843msgid "failed to symlink '%s'"
 844msgstr "无法创建符号链接 '%s'"
 845
 846#: merge-recursive.c:799
 847#, c-format
 848msgid "do not know what to do with %06o %s '%s'"
 849msgstr "不知道如何处理 %06o %s '%s'"
 850
 851#: merge-recursive.c:937
 852msgid "Failed to execute internal merge"
 853msgstr "无法执行内部合并"
 854
 855#: merge-recursive.c:941
 856#, c-format
 857msgid "Unable to add %s to database"
 858msgstr "不能添加 %s 至对象库"
 859
 860#: merge-recursive.c:957
 861msgid "unsupported object type in the tree"
 862msgstr "在树中有不支持的对象类型"
 863
 864#: merge-recursive.c:1032 merge-recursive.c:1046
 865#, c-format
 866msgid ""
 867"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 868"in tree."
 869msgstr ""
 870"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 871"的版本被保留。"
 872
 873#: merge-recursive.c:1038 merge-recursive.c:1051
 874#, c-format
 875msgid ""
 876"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 877"in tree at %s."
 878msgstr ""
 879"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 880"的版本保留于 %8$s 中。"
 881
 882#: merge-recursive.c:1092
 883msgid "rename"
 884msgstr "重命名"
 885
 886#: merge-recursive.c:1092
 887msgid "renamed"
 888msgstr "重命名"
 889
 890#: merge-recursive.c:1148
 891#, c-format
 892msgid "%s is a directory in %s adding as %s instead"
 893msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 894
 895#: merge-recursive.c:1170
 896#, c-format
 897msgid ""
 898"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 899"\"->\"%s\" in \"%s\"%s"
 900msgstr ""
 901"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
 902"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 903
 904#: merge-recursive.c:1175
 905msgid " (left unresolved)"
 906msgstr "(留下未解决)"
 907
 908#: merge-recursive.c:1229
 909#, c-format
 910msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 911msgstr ""
 912"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
 913"%5$s"
 914
 915#: merge-recursive.c:1259
 916#, c-format
 917msgid "Renaming %s to %s and %s to %s instead"
 918msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
 919
 920#: merge-recursive.c:1458
 921#, c-format
 922msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 923msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 924
 925#: merge-recursive.c:1468
 926#, c-format
 927msgid "Adding merged %s"
 928msgstr "添加合并后的 %s"
 929
 930#: merge-recursive.c:1473 merge-recursive.c:1671
 931#, c-format
 932msgid "Adding as %s instead"
 933msgstr "而是以 %s 为名添加"
 934
 935#: merge-recursive.c:1524
 936#, c-format
 937msgid "cannot read object %s"
 938msgstr "不能读取对象 %s"
 939
 940#: merge-recursive.c:1527
 941#, c-format
 942msgid "object %s is not a blob"
 943msgstr "对象 %s 不是一个数据对象"
 944
 945#: merge-recursive.c:1575
 946msgid "modify"
 947msgstr "修改"
 948
 949#: merge-recursive.c:1575
 950msgid "modified"
 951msgstr "修改"
 952
 953#: merge-recursive.c:1585
 954msgid "content"
 955msgstr "内容"
 956
 957#: merge-recursive.c:1592
 958msgid "add/add"
 959msgstr "添加/添加"
 960
 961#: merge-recursive.c:1626
 962#, c-format
 963msgid "Skipped %s (merged same as existing)"
 964msgstr "略过 %s(已经做过相同合并)"
 965
 966#: merge-recursive.c:1640
 967#, c-format
 968msgid "Auto-merging %s"
 969msgstr "自动合并 %s"
 970
 971#: merge-recursive.c:1644 git-submodule.sh:1150
 972msgid "submodule"
 973msgstr "子模组"
 974
 975#: merge-recursive.c:1645
 976#, c-format
 977msgid "CONFLICT (%s): Merge conflict in %s"
 978msgstr "冲突(%s):合并冲突于 %s"
 979
 980#: merge-recursive.c:1731
 981#, c-format
 982msgid "Removing %s"
 983msgstr "删除 %s"
 984
 985#: merge-recursive.c:1756
 986msgid "file/directory"
 987msgstr "文件/目录"
 988
 989#: merge-recursive.c:1762
 990msgid "directory/file"
 991msgstr "目录/文件"
 992
 993#: merge-recursive.c:1767
 994#, c-format
 995msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 996msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 997
 998#: merge-recursive.c:1777
 999#, c-format
1000msgid "Adding %s"
1001msgstr "添加 %s"
1002
1003#: merge-recursive.c:1794
1004msgid "Fatal merge failure, shouldn't happen."
1005msgstr "严重的合并错误,不应发生。"
1006
1007#: merge-recursive.c:1813
1008msgid "Already up-to-date!"
1009msgstr "已经是最新的!"
1010
1011#: merge-recursive.c:1822
1012#, c-format
1013msgid "merging of trees %s and %s failed"
1014msgstr "无法合并树 %s 和 %s"
1015
1016#: merge-recursive.c:1852
1017#, c-format
1018msgid "Unprocessed path??? %s"
1019msgstr "未处理的路径??? %s"
1020
1021#: merge-recursive.c:1900
1022msgid "Merging:"
1023msgstr "合并:"
1024
1025#: merge-recursive.c:1913
1026#, c-format
1027msgid "found %u common ancestor:"
1028msgid_plural "found %u common ancestors:"
1029msgstr[0] "发现 %u 个共同祖先:"
1030msgstr[1] "发现 %u 个共同祖先:"
1031
1032#: merge-recursive.c:1950
1033msgid "merge returned no commit"
1034msgstr "合并未返回提交"
1035
1036#: merge-recursive.c:2007
1037#, c-format
1038msgid "Could not parse object '%s'"
1039msgstr "不能解析对象 '%s'"
1040
1041#: merge-recursive.c:2018 builtin/merge.c:645
1042msgid "Unable to write index."
1043msgstr "不能写入索引。"
1044
1045#: notes-utils.c:41
1046msgid "Cannot commit uninitialized/unreferenced notes tree"
1047msgstr "不能提交未初始化/未引用的注解树"
1048
1049#: notes-utils.c:100
1050#, c-format
1051msgid "Bad notes.rewriteMode value: '%s'"
1052msgstr "坏的 notes.rewriteMode 值:'%s'"
1053
1054#: notes-utils.c:110
1055#, c-format
1056msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1057msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1058
1059#. TRANSLATORS: The first %s is the name of the
1060#. environment variable, the second %s is its value
1061#: notes-utils.c:137
1062#, c-format
1063msgid "Bad %s value: '%s'"
1064msgstr "坏的 %s 值:'%s'"
1065
1066#: object.c:242
1067#, c-format
1068msgid "unable to parse object: %s"
1069msgstr "不能解析对象:%s"
1070
1071#: parse-options.c:563
1072msgid "..."
1073msgstr "..."
1074
1075#: parse-options.c:581
1076#, c-format
1077msgid "usage: %s"
1078msgstr "用法:%s"
1079
1080#. TRANSLATORS: the colon here should align with the
1081#. one in "usage: %s" translation
1082#: parse-options.c:585
1083#, c-format
1084msgid "   or: %s"
1085msgstr "  或:%s"
1086
1087#  译者:为保证在输出中对齐,注意调整句中空格!
1088#: parse-options.c:588
1089#, c-format
1090msgid "    %s"
1091msgstr "    %s"
1092
1093#: parse-options.c:622
1094msgid "-NUM"
1095msgstr "-数字"
1096
1097#: pathspec.c:133
1098msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1099msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1100
1101#: pathspec.c:143
1102msgid ""
1103"global 'literal' pathspec setting is incompatible with all other global "
1104"pathspec settings"
1105msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1106
1107#: pathspec.c:177
1108msgid "invalid parameter for pathspec magic 'prefix'"
1109msgstr "路径规格包含无效的神奇前缀"
1110
1111#: pathspec.c:183
1112#, c-format
1113msgid "Invalid pathspec magic '%.*s' in '%s'"
1114msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1115
1116#: pathspec.c:187
1117#, c-format
1118msgid "Missing ')' at the end of pathspec magic in '%s'"
1119msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1120
1121#: pathspec.c:205
1122#, c-format
1123msgid "Unimplemented pathspec magic '%c' in '%s'"
1124msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1125
1126#: pathspec.c:230
1127#, c-format
1128msgid "%s: 'literal' and 'glob' are incompatible"
1129msgstr "%s:'literal' 和 'glob' 不兼容"
1130
1131#: pathspec.c:241
1132#, c-format
1133msgid "%s: '%s' is outside repository"
1134msgstr "%s:'%s' 在仓库之外"
1135
1136#: pathspec.c:291
1137#, c-format
1138msgid "Pathspec '%s' is in submodule '%.*s'"
1139msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1140
1141#: pathspec.c:353
1142#, c-format
1143msgid "%s: pathspec magic not supported by this command: %s"
1144msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1145
1146#: pathspec.c:432
1147#, c-format
1148msgid "pathspec '%s' is beyond a symbolic link"
1149msgstr "路径规格 '%s' 位于符号链接中"
1150
1151#: pathspec.c:441
1152msgid ""
1153"There is nothing to exclude from by :(exclude) patterns.\n"
1154"Perhaps you forgot to add either ':/' or '.' ?"
1155msgstr ""
1156"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1157"添加 ':/' 或 '.' ?"
1158
1159#: pretty.c:969
1160msgid "unable to parse --pretty format"
1161msgstr "不能解析 --pretty 格式"
1162
1163#: progress.c:236
1164msgid "done"
1165msgstr "完成"
1166
1167#: read-cache.c:1296
1168#, c-format
1169msgid ""
1170"index.version set, but the value is invalid.\n"
1171"Using version %i"
1172msgstr ""
1173"设置了 index.version,但是取值无效。\n"
1174"使用版本 %i"
1175
1176#: read-cache.c:1306
1177#, c-format
1178msgid ""
1179"GIT_INDEX_VERSION set, but the value is invalid.\n"
1180"Using version %i"
1181msgstr ""
1182"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1183"使用版本 %i"
1184
1185#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1186#: builtin/merge.c:983
1187#, c-format
1188msgid "Could not open '%s' for writing"
1189msgstr "无法打开 '%s' 进行写入"
1190
1191#: refs.c:3001
1192#, c-format
1193msgid "could not delete reference %s: %s"
1194msgstr "无法删除引用 %s:%s"
1195
1196#: refs.c:3004
1197#, c-format
1198msgid "could not delete references: %s"
1199msgstr "无法删除引用:%s"
1200
1201#: refs.c:3013
1202#, c-format
1203msgid "could not remove reference %s"
1204msgstr "无法删除引用 %s"
1205
1206#: ref-filter.c:660
1207msgid "unable to parse format"
1208msgstr "不能解析格式"
1209
1210#: remote.c:792
1211#, c-format
1212msgid "Cannot fetch both %s and %s to %s"
1213msgstr "不能同时获取 %s 和 %s 至 %s"
1214
1215#: remote.c:796
1216#, c-format
1217msgid "%s usually tracks %s, not %s"
1218msgstr "%s 通常跟踪 %s,而非 %s"
1219
1220#: remote.c:800
1221#, c-format
1222msgid "%s tracks both %s and %s"
1223msgstr "%s 同时跟踪 %s 和 %s"
1224
1225#: remote.c:808
1226msgid "Internal error"
1227msgstr "内部错误"
1228
1229#: remote.c:1723 remote.c:1766
1230msgid "HEAD does not point to a branch"
1231msgstr "HEAD 没有指向一个分支"
1232
1233#: remote.c:1732
1234#, c-format
1235msgid "no such branch: '%s'"
1236msgstr "没有此分支:'%s'"
1237
1238#: remote.c:1735
1239#, c-format
1240msgid "no upstream configured for branch '%s'"
1241msgstr "尚未给分支 '%s' 设置上游"
1242
1243#: remote.c:1741
1244#, c-format
1245msgid "upstream branch '%s' not stored as a remote-tracking branch"
1246msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1247
1248#: remote.c:1756
1249#, c-format
1250msgid "push destination '%s' on remote '%s' has no local tracking branch"
1251msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1252
1253#: remote.c:1771
1254#, c-format
1255msgid "branch '%s' has no remote for pushing"
1256msgstr "分支 '%s' 没有设置要推送的远程服务器"
1257
1258#: remote.c:1782
1259#, c-format
1260msgid "push refspecs for '%s' do not include '%s'"
1261msgstr "向 '%s' 推送引用规格未包含 '%s'"
1262
1263#: remote.c:1795
1264msgid "push has no destination (push.default is 'nothing')"
1265msgstr "推送无目标(push.default 是 'nothing')"
1266
1267#: remote.c:1817
1268msgid "cannot resolve 'simple' push to a single destination"
1269msgstr "无法解析 'simple' 推送至一个单独的目标"
1270
1271#: remote.c:2124
1272#, c-format
1273msgid "Your branch is based on '%s', but the upstream is gone.\n"
1274msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1275
1276#: remote.c:2128
1277msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1278msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
1279
1280#: remote.c:2131
1281#, c-format
1282msgid "Your branch is up-to-date with '%s'.\n"
1283msgstr "您的分支与上游分支 '%s' 一致。\n"
1284
1285#: remote.c:2135
1286#, c-format
1287msgid "Your branch is ahead of '%s' by %d commit.\n"
1288msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1289msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1290msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1291
1292#: remote.c:2141
1293msgid "  (use \"git push\" to publish your local commits)\n"
1294msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
1295
1296#: remote.c:2144
1297#, c-format
1298msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1299msgid_plural ""
1300"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1301msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1302msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1303
1304#  译者:注意保持前导空格
1305#: remote.c:2152
1306msgid "  (use \"git pull\" to update your local branch)\n"
1307msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
1308
1309#: remote.c:2155
1310#, c-format
1311msgid ""
1312"Your branch and '%s' have diverged,\n"
1313"and have %d and %d different commit each, respectively.\n"
1314msgid_plural ""
1315"Your branch and '%s' have diverged,\n"
1316"and have %d and %d different commits each, respectively.\n"
1317msgstr[0] ""
1318"您的分支和 '%s' 出现了偏离,\n"
1319"并且分别有 %d 和 %d 处不同的提交。\n"
1320msgstr[1] ""
1321"您的分支和 '%s' 出现了偏离,\n"
1322"并且分别有 %d 和 %d 处不同的提交。\n"
1323
1324#  译者:注意保持前导空格
1325#: remote.c:2165
1326msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1327msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
1328
1329#: revision.c:2198
1330msgid "your current branch appears to be broken"
1331msgstr "您的当前分支好像被损坏"
1332
1333#: revision.c:2201
1334#, c-format
1335msgid "your current branch '%s' does not have any commits yet"
1336msgstr "您的当前分支 '%s' 尚无任何提交"
1337
1338#: revision.c:2395
1339msgid "--first-parent is incompatible with --bisect"
1340msgstr "--first-parent 与 --bisect 不兼容"
1341
1342#: run-command.c:83
1343msgid "open /dev/null failed"
1344msgstr "不能打开 /dev/null"
1345
1346#: run-command.c:85
1347#, c-format
1348msgid "dup2(%d,%d) failed"
1349msgstr "不能调用 dup2(%d,%d)"
1350
1351#: send-pack.c:295
1352msgid "failed to sign the push certificate"
1353msgstr "无法为推送证书签名"
1354
1355#: send-pack.c:404
1356msgid "the receiving end does not support --signed push"
1357msgstr "接收端不支持签名推送"
1358
1359#: send-pack.c:406
1360msgid ""
1361"not sending a push certificate since the receiving end does not support --"
1362"signed push"
1363msgstr "未发送推送证书,因为接收端不支持签名推送"
1364
1365#: send-pack.c:418
1366msgid "the receiving end does not support --atomic push"
1367msgstr "接收端不支持原子推送"
1368
1369#: sequencer.c:183
1370msgid ""
1371"after resolving the conflicts, mark the corrected paths\n"
1372"with 'git add <paths>' or 'git rm <paths>'"
1373msgstr ""
1374"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1375"命令标记修正后的文件"
1376
1377#: sequencer.c:186
1378msgid ""
1379"after resolving the conflicts, mark the corrected paths\n"
1380"with 'git add <paths>' or 'git rm <paths>'\n"
1381"and commit the result with 'git commit'"
1382msgstr ""
1383"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1384"对修正后的文件做标记,然后用 'git commit' 提交"
1385
1386#: sequencer.c:199 sequencer.c:842 sequencer.c:922
1387#, c-format
1388msgid "Could not write to %s"
1389msgstr "不能写入 %s"
1390
1391#: sequencer.c:202
1392#, c-format
1393msgid "Error wrapping up %s"
1394msgstr "错误收尾 %s"
1395
1396#: sequencer.c:217
1397msgid "Your local changes would be overwritten by cherry-pick."
1398msgstr "您的本地修改将被拣选操作覆盖。"
1399
1400#: sequencer.c:219
1401msgid "Your local changes would be overwritten by revert."
1402msgstr "您的本地修改将被还原操作覆盖。"
1403
1404#: sequencer.c:222
1405msgid "Commit your changes or stash them to proceed."
1406msgstr "提交您的修改或保存进度后再继续。"
1407
1408#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1409#: sequencer.c:309
1410#, c-format
1411msgid "%s: Unable to write new index file"
1412msgstr "%s:无法写入新索引文件"
1413
1414#: sequencer.c:327
1415msgid "Could not resolve HEAD commit\n"
1416msgstr "不能解析 HEAD 提交\n"
1417
1418#: sequencer.c:347
1419msgid "Unable to update cache tree\n"
1420msgstr "不能更新缓存\n"
1421
1422#: sequencer.c:399
1423#, c-format
1424msgid "Could not parse commit %s\n"
1425msgstr "不能解析提交 %s\n"
1426
1427#: sequencer.c:404
1428#, c-format
1429msgid "Could not parse parent commit %s\n"
1430msgstr "不能解析父提交 %s\n"
1431
1432#: sequencer.c:469
1433msgid "Your index file is unmerged."
1434msgstr "您的索引文件未完成合并。"
1435
1436#: sequencer.c:488
1437#, c-format
1438msgid "Commit %s is a merge but no -m option was given."
1439msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1440
1441#: sequencer.c:496
1442#, c-format
1443msgid "Commit %s does not have parent %d"
1444msgstr "提交 %s 没有父提交 %d"
1445
1446#: sequencer.c:500
1447#, c-format
1448msgid "Mainline was specified but commit %s is not a merge."
1449msgstr "指定了主线但提交 %s 不是一个合并。"
1450
1451#. TRANSLATORS: The first %s will be "revert" or
1452#. "cherry-pick", the second %s a SHA1
1453#: sequencer.c:513
1454#, c-format
1455msgid "%s: cannot parse parent commit %s"
1456msgstr "%s:不能解析父提交 %s"
1457
1458#: sequencer.c:517
1459#, c-format
1460msgid "Cannot get commit message for %s"
1461msgstr "不能得到 %s 的提交说明"
1462
1463#: sequencer.c:603
1464#, c-format
1465msgid "could not revert %s... %s"
1466msgstr "不能还原 %s... %s"
1467
1468#: sequencer.c:604
1469#, c-format
1470msgid "could not apply %s... %s"
1471msgstr "不能应用 %s... %s"
1472
1473#: sequencer.c:639
1474msgid "empty commit set passed"
1475msgstr "提供了空的提交集"
1476
1477#: sequencer.c:647
1478#, c-format
1479msgid "git %s: failed to read the index"
1480msgstr "git %s:无法读取索引"
1481
1482#: sequencer.c:651
1483#, c-format
1484msgid "git %s: failed to refresh the index"
1485msgstr "git %s:无法刷新索引"
1486
1487#: sequencer.c:711
1488#, c-format
1489msgid "Cannot %s during a %s"
1490msgstr "无法 %s 在一个 %s 过程中"
1491
1492#: sequencer.c:733
1493#, c-format
1494msgid "Could not parse line %d."
1495msgstr "不能解析第 %d 行。"
1496
1497#: sequencer.c:738
1498msgid "No commits parsed."
1499msgstr "没有提交被解析。"
1500
1501#: sequencer.c:750
1502#, c-format
1503msgid "Could not open %s"
1504msgstr "不能打开 %s"
1505
1506#: sequencer.c:754
1507#, c-format
1508msgid "Could not read %s."
1509msgstr "不能读取 %s。"
1510
1511#: sequencer.c:761
1512#, c-format
1513msgid "Unusable instruction sheet: %s"
1514msgstr "无用的指令表单:%s"
1515
1516#: sequencer.c:791
1517#, c-format
1518msgid "Invalid key: %s"
1519msgstr "无效键名:%s"
1520
1521#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
1522#, c-format
1523msgid "Invalid value for %s: %s"
1524msgstr "%s 的值无效:%s"
1525
1526#: sequencer.c:804
1527#, c-format
1528msgid "Malformed options sheet: %s"
1529msgstr "非法的选项表单:%s"
1530
1531#: sequencer.c:823
1532msgid "a cherry-pick or revert is already in progress"
1533msgstr "一个拣选或还原操作已在进行"
1534
1535#: sequencer.c:824
1536msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1537msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1538
1539#: sequencer.c:828
1540#, c-format
1541msgid "Could not create sequencer directory %s"
1542msgstr "不能创建序列目录 %s"
1543
1544#: sequencer.c:844 sequencer.c:926
1545#, c-format
1546msgid "Error wrapping up %s."
1547msgstr "错误收尾 %s。"
1548
1549#: sequencer.c:863 sequencer.c:996
1550msgid "no cherry-pick or revert in progress"
1551msgstr "拣选或还原操作并未进行"
1552
1553#: sequencer.c:865
1554msgid "cannot resolve HEAD"
1555msgstr "不能解析 HEAD"
1556
1557#: sequencer.c:867
1558msgid "cannot abort from a branch yet to be born"
1559msgstr "不能从尚未建立的分支终止"
1560
1561#: sequencer.c:887 builtin/apply.c:4291
1562#, c-format
1563msgid "cannot open %s: %s"
1564msgstr "不能打开 %s:%s"
1565
1566#: sequencer.c:890
1567#, c-format
1568msgid "cannot read %s: %s"
1569msgstr "不能读取 %s:%s"
1570
1571#: sequencer.c:891
1572msgid "unexpected end of file"
1573msgstr "意外的文件结束"
1574
1575#: sequencer.c:897
1576#, c-format
1577msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1578msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1579
1580#: sequencer.c:919
1581#, c-format
1582msgid "Could not format %s."
1583msgstr "不能格式化 %s。"
1584
1585#: sequencer.c:1064
1586#, c-format
1587msgid "%s: can't cherry-pick a %s"
1588msgstr "%s:不能拣选一个%s"
1589
1590#: sequencer.c:1067
1591#, c-format
1592msgid "%s: bad revision"
1593msgstr "%s:错误的版本"
1594
1595#: sequencer.c:1101
1596msgid "Can't revert as initial commit"
1597msgstr "不能作为初始提交还原"
1598
1599#: sequencer.c:1102
1600msgid "Can't cherry-pick into empty head"
1601msgstr "不能拣选到空分支"
1602
1603#: setup.c:243
1604#, c-format
1605msgid "failed to read %s"
1606msgstr "无法读取 %s"
1607
1608#: sha1_name.c:453
1609msgid ""
1610"Git normally never creates a ref that ends with 40 hex characters\n"
1611"because it will be ignored when you just specify 40-hex. These refs\n"
1612"may be created by mistake. For example,\n"
1613"\n"
1614"  git checkout -b $br $(git rev-parse ...)\n"
1615"\n"
1616"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1617"examine these refs and maybe delete them. Turn this message off by\n"
1618"running \"git config advice.objectNameWarning false\""
1619msgstr ""
1620"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1621"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1622"\n"
1623"  git checkout -b $br $(git rev-parse ...)\n"
1624"\n"
1625"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1626"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1627"命令关闭本消息通知。"
1628
1629#: submodule.c:61 submodule.c:95
1630msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1631msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1632
1633#: submodule.c:65 submodule.c:99
1634#, c-format
1635msgid "Could not find section in .gitmodules where path=%s"
1636msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1637
1638#: submodule.c:73
1639#, c-format
1640msgid "Could not update .gitmodules entry %s"
1641msgstr "不能更新 .gitmodules 条目 %s"
1642
1643#: submodule.c:106
1644#, c-format
1645msgid "Could not remove .gitmodules entry for %s"
1646msgstr "无法移除 %s 的 .gitmodules 条目"
1647
1648#: submodule.c:117
1649msgid "staging updated .gitmodules failed"
1650msgstr "将更新后 .gitmodules 添加暂存区失败"
1651
1652#: submodule.c:1045
1653#, c-format
1654msgid "Could not set core.worktree in %s"
1655msgstr "不能在 %s 中设置 core.worktree"
1656
1657#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1658#: trailer.c:561
1659#, c-format
1660msgid "unknown value '%s' for key '%s'"
1661msgstr "键 '%2$s' 的未知取值 '%1$s'"
1662
1663#: trailer.c:543 trailer.c:548 builtin/remote.c:290
1664#, c-format
1665msgid "more than one %s"
1666msgstr "多于一个 %s"
1667
1668#: trailer.c:581
1669#, c-format
1670msgid "empty trailer token in trailer '%.*s'"
1671msgstr "签名 '%.*s' 的键为空"
1672
1673#: trailer.c:701
1674#, c-format
1675msgid "could not read input file '%s'"
1676msgstr "不能读取输入文件 '%s'"
1677
1678#: trailer.c:704
1679msgid "could not read from stdin"
1680msgstr "不能自标准输入读取"
1681
1682#: transport-helper.c:1025
1683#, c-format
1684msgid "Could not read ref %s"
1685msgstr "不能读取引用 %s"
1686
1687#: unpack-trees.c:203
1688msgid "Checking out files"
1689msgstr "正在检出文件"
1690
1691#: urlmatch.c:120
1692msgid "invalid URL scheme name or missing '://' suffix"
1693msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1694
1695#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1696#, c-format
1697msgid "invalid %XX escape sequence"
1698msgstr "无效的 %XX 转义序列"
1699
1700#: urlmatch.c:172
1701msgid "missing host and scheme is not 'file:'"
1702msgstr "缺失主机名且 URL 方案不是 'file:'"
1703
1704#: urlmatch.c:189
1705msgid "a 'file:' URL may not have a port number"
1706msgstr "一个 'file:' URL 不应该包含端口号"
1707
1708#: urlmatch.c:199
1709msgid "invalid characters in host name"
1710msgstr "主机名中包含无效的字符"
1711
1712#: urlmatch.c:244 urlmatch.c:255
1713msgid "invalid port number"
1714msgstr "无效的端口号"
1715
1716#: urlmatch.c:322
1717msgid "invalid '..' path segment"
1718msgstr "无效的 '..' 路径片段"
1719
1720#: wrapper.c:219 wrapper.c:362
1721#, c-format
1722msgid "could not open '%s' for reading and writing"
1723msgstr "无法打开 '%s' 进行读写"
1724
1725#: wrapper.c:221 wrapper.c:364
1726#, c-format
1727msgid "could not open '%s' for writing"
1728msgstr "无法打开 '%s' 进行写入"
1729
1730#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
1731#: builtin/merge.c:1076 builtin/pull.c:380
1732#, c-format
1733msgid "could not open '%s' for reading"
1734msgstr "无法打开 '%s' 进行读取"
1735
1736#: wrapper.c:579
1737#, c-format
1738msgid "unable to access '%s': %s"
1739msgstr "不能访问 '%s':%s"
1740
1741#: wrapper.c:600
1742#, c-format
1743msgid "unable to access '%s'"
1744msgstr "不能访问 '%s'"
1745
1746#: wrapper.c:611
1747#, c-format
1748msgid "unable to look up current user in the passwd file: %s"
1749msgstr "无法在口令文件中查询到当前用户:%s"
1750
1751#: wrapper.c:612
1752msgid "no such user"
1753msgstr "无此用户"
1754
1755#: wrapper.c:620
1756msgid "unable to get current working directory"
1757msgstr "不能获取当前工作目录"
1758
1759#: wrapper.c:631
1760#, c-format
1761msgid "could not open %s for writing"
1762msgstr "不能写入 %s"
1763
1764#: wrapper.c:642 builtin/am.c:424
1765#, c-format
1766msgid "could not write to %s"
1767msgstr "不能写入 %s"
1768
1769#: wrapper.c:648
1770#, c-format
1771msgid "could not close %s"
1772msgstr "不能关闭 %s"
1773
1774#: wt-status.c:149
1775msgid "Unmerged paths:"
1776msgstr "未合并的路径:"
1777
1778#  译者:注意保持前导空格
1779#: wt-status.c:176 wt-status.c:203
1780#, c-format
1781msgid "  (use \"git reset %s <file>...\" to unstage)"
1782msgstr "  (使用 \"git reset %s <文件>...\" 以取消暂存)"
1783
1784#  译者:注意保持前导空格
1785#: wt-status.c:178 wt-status.c:205
1786msgid "  (use \"git rm --cached <file>...\" to unstage)"
1787msgstr "  (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1788
1789#  译者:注意保持前导空格
1790#: wt-status.c:182
1791msgid "  (use \"git add <file>...\" to mark resolution)"
1792msgstr "  (使用 \"git add <文件>...\" 标记解决方案)"
1793
1794#  译者:注意保持前导空格
1795#: wt-status.c:184 wt-status.c:188
1796msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1797msgstr "  (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1798
1799#  译者:注意保持前导空格
1800#: wt-status.c:186
1801msgid "  (use \"git rm <file>...\" to mark resolution)"
1802msgstr "  (使用 \"git rm <文件>...\" 标记解决方案)"
1803
1804#: wt-status.c:197 wt-status.c:880
1805msgid "Changes to be committed:"
1806msgstr "要提交的变更:"
1807
1808#: wt-status.c:215 wt-status.c:889
1809msgid "Changes not staged for commit:"
1810msgstr "尚未暂存以备提交的变更:"
1811
1812#  译者:注意保持前导空格
1813#: wt-status.c:219
1814msgid "  (use \"git add <file>...\" to update what will be committed)"
1815msgstr "  (使用 \"git add <文件>...\" 更新要提交的内容)"
1816
1817#  译者:注意保持前导空格
1818#: wt-status.c:221
1819msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1820msgstr "  (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1821
1822#  译者:注意保持前导空格
1823#: wt-status.c:222
1824msgid ""
1825"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1826msgstr "  (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1827
1828#  译者:注意保持前导空格
1829#: wt-status.c:224
1830msgid "  (commit or discard the untracked or modified content in submodules)"
1831msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
1832
1833#  译者:注意保持前导空格
1834#: wt-status.c:236
1835#, c-format
1836msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1837msgstr "  (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1838
1839#: wt-status.c:251
1840msgid "both deleted:"
1841msgstr "双方删除:"
1842
1843#: wt-status.c:253
1844msgid "added by us:"
1845msgstr "由我们添加:"
1846
1847#: wt-status.c:255
1848msgid "deleted by them:"
1849msgstr "由他们删除:"
1850
1851#: wt-status.c:257
1852msgid "added by them:"
1853msgstr "由他们添加:"
1854
1855#: wt-status.c:259
1856msgid "deleted by us:"
1857msgstr "由我们删除:"
1858
1859#: wt-status.c:261
1860msgid "both added:"
1861msgstr "双方添加:"
1862
1863#: wt-status.c:263
1864msgid "both modified:"
1865msgstr "双方修改:"
1866
1867#: wt-status.c:265
1868#, c-format
1869msgid "bug: unhandled unmerged status %x"
1870msgstr "bug:无法处理的未合并状态 %x"
1871
1872#: wt-status.c:273
1873msgid "new file:"
1874msgstr "新文件:"
1875
1876#: wt-status.c:275
1877msgid "copied:"
1878msgstr "拷贝:"
1879
1880#: wt-status.c:277
1881msgid "deleted:"
1882msgstr "删除:"
1883
1884#: wt-status.c:279
1885msgid "modified:"
1886msgstr "修改:"
1887
1888#: wt-status.c:281
1889msgid "renamed:"
1890msgstr "重命名:"
1891
1892#: wt-status.c:283
1893msgid "typechange:"
1894msgstr "类型变更:"
1895
1896#: wt-status.c:285
1897msgid "unknown:"
1898msgstr "未知:"
1899
1900#: wt-status.c:287
1901msgid "unmerged:"
1902msgstr "未合并:"
1903
1904#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1905#: wt-status.c:369
1906msgid "new commits, "
1907msgstr "新提交, "
1908
1909#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1910#: wt-status.c:371
1911msgid "modified content, "
1912msgstr "修改的内容, "
1913
1914#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1915#: wt-status.c:373
1916msgid "untracked content, "
1917msgstr "未跟踪的内容, "
1918
1919#: wt-status.c:390
1920#, c-format
1921msgid "bug: unhandled diff status %c"
1922msgstr "bug:无法处理的差异状态 %c"
1923
1924#: wt-status.c:754
1925msgid "Submodules changed but not updated:"
1926msgstr "子模组已修改但尚未更新:"
1927
1928#: wt-status.c:756
1929msgid "Submodule changes to be committed:"
1930msgstr "要提交的子模组变更:"
1931
1932#: wt-status.c:837
1933msgid ""
1934"Do not touch the line above.\n"
1935"Everything below will be removed."
1936msgstr ""
1937"不要改动上面的一行。\n"
1938"下面的所有内容均将被删除。"
1939
1940#: wt-status.c:948
1941msgid "You have unmerged paths."
1942msgstr "您有尚未合并的路径。"
1943
1944#  译者:注意保持前导空格
1945#: wt-status.c:951
1946msgid "  (fix conflicts and run \"git commit\")"
1947msgstr "  (解决冲突并运行 \"git commit\")"
1948
1949#: wt-status.c:954
1950msgid "All conflicts fixed but you are still merging."
1951msgstr "所有冲突已解决但您仍处于合并中。"
1952
1953#  译者:注意保持前导空格
1954#: wt-status.c:957
1955msgid "  (use \"git commit\" to conclude merge)"
1956msgstr "  (使用 \"git commit\" 结束合并)"
1957
1958#: wt-status.c:967
1959msgid "You are in the middle of an am session."
1960msgstr "您正处于 am 操作过程中。"
1961
1962#: wt-status.c:970
1963msgid "The current patch is empty."
1964msgstr "当前的补丁为空。"
1965
1966#  译者:注意保持前导空格
1967#: wt-status.c:974
1968msgid "  (fix conflicts and then run \"git am --continue\")"
1969msgstr "  (解决冲突,然后运行 \"git am --continue\")"
1970
1971#  译者:注意保持前导空格
1972#: wt-status.c:976
1973msgid "  (use \"git am --skip\" to skip this patch)"
1974msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
1975
1976#  译者:注意保持前导空格
1977#: wt-status.c:978
1978msgid "  (use \"git am --abort\" to restore the original branch)"
1979msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
1980
1981#: wt-status.c:1105
1982msgid "No commands done."
1983msgstr "没有命令被执行。"
1984
1985#: wt-status.c:1108
1986#, c-format
1987msgid "Last command done (%d command done):"
1988msgid_plural "Last commands done (%d commands done):"
1989msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
1990msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1991
1992#: wt-status.c:1119
1993#, c-format
1994msgid "  (see more in file %s)"
1995msgstr "  (更多参见文件 %s)"
1996
1997#: wt-status.c:1124
1998msgid "No commands remaining."
1999msgstr "未剩下任何命令。"
2000
2001#: wt-status.c:1127
2002#, c-format
2003msgid "Next command to do (%d remaining command):"
2004msgid_plural "Next commands to do (%d remaining commands):"
2005msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2006msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2007
2008#  译者:注意保持前导空格
2009#: wt-status.c:1135
2010msgid "  (use \"git rebase --edit-todo\" to view and edit)"
2011msgstr "  (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2012
2013#: wt-status.c:1148
2014#, c-format
2015msgid "You are currently rebasing branch '%s' on '%s'."
2016msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2017
2018#: wt-status.c:1153
2019msgid "You are currently rebasing."
2020msgstr "您在执行变基操作。"
2021
2022#  译者:注意保持前导空格
2023#: wt-status.c:1167
2024msgid "  (fix conflicts and then run \"git rebase --continue\")"
2025msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
2026
2027#  译者:注意保持前导空格
2028#: wt-status.c:1169
2029msgid "  (use \"git rebase --skip\" to skip this patch)"
2030msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
2031
2032#  译者:注意保持前导空格
2033#: wt-status.c:1171
2034msgid "  (use \"git rebase --abort\" to check out the original branch)"
2035msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
2036
2037#  译者:注意保持前导空格
2038#: wt-status.c:1177
2039msgid "  (all conflicts fixed: run \"git rebase --continue\")"
2040msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
2041
2042#: wt-status.c:1181
2043#, c-format
2044msgid ""
2045"You are currently splitting a commit while rebasing branch '%s' on '%s'."
2046msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2047
2048#: wt-status.c:1186
2049msgid "You are currently splitting a commit during a rebase."
2050msgstr "您在执行变基操作时拆分提交。"
2051
2052#  译者:注意保持前导空格
2053#: wt-status.c:1189
2054msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
2055msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2056
2057#: wt-status.c:1193
2058#, c-format
2059msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2060msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2061
2062#: wt-status.c:1198
2063msgid "You are currently editing a commit during a rebase."
2064msgstr "您在执行变基操作时编辑提交。"
2065
2066#  译者:注意保持前导空格
2067#: wt-status.c:1201
2068msgid "  (use \"git commit --amend\" to amend the current commit)"
2069msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
2070
2071#  译者:注意保持前导空格
2072#: wt-status.c:1203
2073msgid ""
2074"  (use \"git rebase --continue\" once you are satisfied with your changes)"
2075msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
2076
2077#: wt-status.c:1213
2078#, c-format
2079msgid "You are currently cherry-picking commit %s."
2080msgstr "您在执行拣选提交 %s 的操作。"
2081
2082#  译者:注意保持前导空格
2083#: wt-status.c:1218
2084msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
2085msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
2086
2087#  译者:注意保持前导空格
2088#: wt-status.c:1221
2089msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
2090msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2091
2092#  译者:注意保持前导空格
2093#: wt-status.c:1223
2094msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2095msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2096
2097#: wt-status.c:1232
2098#, c-format
2099msgid "You are currently reverting commit %s."
2100msgstr "您在执行反转提交 %s 的操作。"
2101
2102#  译者:注意保持前导空格
2103#: wt-status.c:1237
2104msgid "  (fix conflicts and run \"git revert --continue\")"
2105msgstr "  (解决冲突并运行 \"git revert --continue\")"
2106
2107#  译者:注意保持前导空格
2108#: wt-status.c:1240
2109msgid "  (all conflicts fixed: run \"git revert --continue\")"
2110msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
2111
2112#  译者:注意保持前导空格
2113#: wt-status.c:1242
2114msgid "  (use \"git revert --abort\" to cancel the revert operation)"
2115msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
2116
2117#: wt-status.c:1253
2118#, c-format
2119msgid "You are currently bisecting, started from branch '%s'."
2120msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2121
2122#: wt-status.c:1257
2123msgid "You are currently bisecting."
2124msgstr "您在执行二分查找操作。"
2125
2126#  译者:注意保持前导空格
2127#: wt-status.c:1260
2128msgid "  (use \"git bisect reset\" to get back to the original branch)"
2129msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
2130
2131#: wt-status.c:1437
2132msgid "On branch "
2133msgstr "位于分支 "
2134
2135#: wt-status.c:1445
2136msgid "interactive rebase in progress; onto "
2137msgstr "交互式变基操作正在进行中;至 "
2138
2139#: wt-status.c:1447
2140msgid "rebase in progress; onto "
2141msgstr "变基操作正在进行中;至 "
2142
2143#: wt-status.c:1452
2144msgid "HEAD detached at "
2145msgstr "头指针分离于 "
2146
2147#: wt-status.c:1454
2148msgid "HEAD detached from "
2149msgstr "头指针分离自 "
2150
2151#: wt-status.c:1457
2152msgid "Not currently on any branch."
2153msgstr "当前不在任何分支上。"
2154
2155#: wt-status.c:1474
2156msgid "Initial commit"
2157msgstr "初始提交"
2158
2159#: wt-status.c:1488
2160msgid "Untracked files"
2161msgstr "未跟踪的文件"
2162
2163#: wt-status.c:1490
2164msgid "Ignored files"
2165msgstr "忽略的文件"
2166
2167#: wt-status.c:1494
2168#, c-format
2169msgid ""
2170"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2171"may speed it up, but you have to be careful not to forget to add\n"
2172"new files yourself (see 'git help status')."
2173msgstr ""
2174"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2175"但您需要小心不要忘了添加新文件(参见 'git help status')。"
2176
2177#: wt-status.c:1500
2178#, c-format
2179msgid "Untracked files not listed%s"
2180msgstr "未跟踪的文件没有列出%s"
2181
2182#  译者:中文字符串拼接,可删除前导空格
2183#: wt-status.c:1502
2184msgid " (use -u option to show untracked files)"
2185msgstr "(使用 -u 参数显示未跟踪的文件)"
2186
2187#: wt-status.c:1508
2188msgid "No changes"
2189msgstr "没有修改"
2190
2191#: wt-status.c:1513
2192#, c-format
2193msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2194msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2195
2196#: wt-status.c:1516
2197#, c-format
2198msgid "no changes added to commit\n"
2199msgstr "修改尚未加入提交\n"
2200
2201#: wt-status.c:1519
2202#, c-format
2203msgid ""
2204"nothing added to commit but untracked files present (use \"git add\" to "
2205"track)\n"
2206msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2207
2208#: wt-status.c:1522
2209#, c-format
2210msgid "nothing added to commit but untracked files present\n"
2211msgstr "提交为空,但是存在尚未跟踪的文件\n"
2212
2213#  译者:中文字符串拼接,可删除前导空格
2214#: wt-status.c:1525
2215#, c-format
2216msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2217msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2218
2219#: wt-status.c:1528 wt-status.c:1533
2220#, c-format
2221msgid "nothing to commit\n"
2222msgstr "无文件要提交\n"
2223
2224#  译者:中文字符串拼接,可删除前导空格
2225#: wt-status.c:1531
2226#, c-format
2227msgid "nothing to commit (use -u to show untracked files)\n"
2228msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2229
2230#  译者:中文字符串拼接,可删除前导空格
2231#: wt-status.c:1535
2232#, c-format
2233msgid "nothing to commit, working directory clean\n"
2234msgstr "无文件要提交,干净的工作区\n"
2235
2236#: wt-status.c:1644
2237msgid "HEAD (no branch)"
2238msgstr "HEAD(非分支)"
2239
2240#  译者:注意保持句尾空格
2241#: wt-status.c:1650
2242msgid "Initial commit on "
2243msgstr "初始提交于 "
2244
2245#: wt-status.c:1677
2246msgid "gone"
2247msgstr "丢失"
2248
2249#  译者:注意保持句尾空格
2250#: wt-status.c:1679 wt-status.c:1687
2251msgid "behind "
2252msgstr "落后 "
2253
2254#: compat/precompose_utf8.c:55 builtin/clone.c:403
2255#, c-format
2256msgid "failed to unlink '%s'"
2257msgstr "无法删除 '%s'"
2258
2259#: builtin/add.c:22
2260msgid "git add [<options>] [--] <pathspec>..."
2261msgstr "git add [<选项>] [--] <路径规格>..."
2262
2263#: builtin/add.c:65
2264#, c-format
2265msgid "unexpected diff status %c"
2266msgstr "意外的差异状态 %c"
2267
2268#: builtin/add.c:70 builtin/commit.c:277
2269msgid "updating files failed"
2270msgstr "更新文件失败"
2271
2272#: builtin/add.c:80
2273#, c-format
2274msgid "remove '%s'\n"
2275msgstr "删除 '%s'\n"
2276
2277#: builtin/add.c:134
2278msgid "Unstaged changes after refreshing the index:"
2279msgstr "刷新索引之后尚未被暂存的变更:"
2280
2281#: builtin/add.c:194 builtin/rev-parse.c:799
2282msgid "Could not read the index"
2283msgstr "不能读取索引"
2284
2285#: builtin/add.c:205
2286#, c-format
2287msgid "Could not open '%s' for writing."
2288msgstr "无法打开 '%s' 进行写入。"
2289
2290#: builtin/add.c:209
2291msgid "Could not write patch"
2292msgstr "不能生成补丁"
2293
2294#: builtin/add.c:212
2295msgid "editing patch failed"
2296msgstr "编辑补丁失败"
2297
2298#: builtin/add.c:215
2299#, c-format
2300msgid "Could not stat '%s'"
2301msgstr "不能查看文件状态 '%s'"
2302
2303#: builtin/add.c:217
2304msgid "Empty patch. Aborted."
2305msgstr "空补丁。异常终止。"
2306
2307#: builtin/add.c:222
2308#, c-format
2309msgid "Could not apply '%s'"
2310msgstr "不能应用 '%s'"
2311
2312#: builtin/add.c:232
2313msgid "The following paths are ignored by one of your .gitignore files:\n"
2314msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2315
2316#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
2317#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
2318#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
2319msgid "dry run"
2320msgstr "演习"
2321
2322#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2323#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
2324#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
2325msgid "be verbose"
2326msgstr "冗长输出"
2327
2328#: builtin/add.c:252
2329msgid "interactive picking"
2330msgstr "交互式拣选"
2331
2332#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
2333msgid "select hunks interactively"
2334msgstr "交互式挑选数据块"
2335
2336#: builtin/add.c:254
2337msgid "edit current diff and apply"
2338msgstr "编辑当前差异并应用"
2339
2340#: builtin/add.c:255
2341msgid "allow adding otherwise ignored files"
2342msgstr "允许添加忽略的文件"
2343
2344#: builtin/add.c:256
2345msgid "update tracked files"
2346msgstr "更新已跟踪的文件"
2347
2348#: builtin/add.c:257
2349msgid "record only the fact that the path will be added later"
2350msgstr "只记录,该路径稍后再添加"
2351
2352#: builtin/add.c:258
2353msgid "add changes from all tracked and untracked files"
2354msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2355
2356#: builtin/add.c:261
2357msgid "ignore paths removed in the working tree (same as --no-all)"
2358msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2359
2360#: builtin/add.c:263
2361msgid "don't add, only refresh the index"
2362msgstr "不添加,只刷新索引"
2363
2364#: builtin/add.c:264
2365msgid "just skip files which cannot be added because of errors"
2366msgstr "跳过因出错不能添加的文件"
2367
2368#: builtin/add.c:265
2369msgid "check if - even missing - files are ignored in dry run"
2370msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2371
2372#: builtin/add.c:287
2373#, c-format
2374msgid "Use -f if you really want to add them.\n"
2375msgstr "使用 -f 参数如果您确实要添加它们。\n"
2376
2377#: builtin/add.c:294
2378msgid "adding files failed"
2379msgstr "添加文件失败"
2380
2381#: builtin/add.c:330
2382msgid "-A and -u are mutually incompatible"
2383msgstr "-A 和 -u 选项互斥"
2384
2385#: builtin/add.c:337
2386msgid "Option --ignore-missing can only be used together with --dry-run"
2387msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2388
2389#: builtin/add.c:358
2390#, c-format
2391msgid "Nothing specified, nothing added.\n"
2392msgstr "没有指定文件,也没有文件被添加。\n"
2393
2394#: builtin/add.c:359
2395#, c-format
2396msgid "Maybe you wanted to say 'git add .'?\n"
2397msgstr "也许您想要执行 'git add .'?\n"
2398
2399#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
2400#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2401msgid "index file corrupt"
2402msgstr "索引文件损坏"
2403
2404#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
2405msgid "Unable to write new index file"
2406msgstr "无法写入新索引文件"
2407
2408#: builtin/am.c:41
2409#, c-format
2410msgid "could not stat %s"
2411msgstr "不能获取 %s 的文件状态"
2412
2413#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737
2414#: builtin/merge.c:1079
2415#, c-format
2416msgid "could not read '%s'"
2417msgstr "不能读取 '%s'"
2418
2419#: builtin/am.c:444
2420msgid "could not parse author script"
2421msgstr "不能解析作者脚本"
2422
2423#: builtin/am.c:521
2424#, c-format
2425msgid "'%s' was deleted by the applypatch-msg hook"
2426msgstr "'%s' 被 applypatch-msg 钩子删除"
2427
2428#: builtin/am.c:562 builtin/notes.c:300
2429#, c-format
2430msgid "Malformed input line: '%s'."
2431msgstr "非法的输入行:'%s'。"
2432
2433#: builtin/am.c:599 builtin/notes.c:315
2434#, c-format
2435msgid "Failed to copy notes from '%s' to '%s'"
2436msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2437
2438#: builtin/am.c:625
2439msgid "fseek failed"
2440msgstr "fseek 失败"
2441
2442#: builtin/am.c:786 builtin/am.c:874
2443#, c-format
2444msgid "could not open '%s' for reading: %s"
2445msgstr "无法打开 '%s' 进行读取:%s"
2446
2447#: builtin/am.c:793
2448#, c-format
2449msgid "could not open '%s' for writing: %s"
2450msgstr "无法打开 '%s' 进行写入:%s"
2451
2452#: builtin/am.c:802
2453#, c-format
2454msgid "could not parse patch '%s'"
2455msgstr "无法解析补丁 '%s'"
2456
2457#: builtin/am.c:867
2458msgid "Only one StGIT patch series can be applied at once"
2459msgstr "一次只能有一个 StGIT 补丁队列被应用"
2460
2461#: builtin/am.c:915
2462msgid "invalid timestamp"
2463msgstr "无效的时间戳"
2464
2465#: builtin/am.c:918 builtin/am.c:926
2466msgid "invalid Date line"
2467msgstr "无效的日期行"
2468
2469#: builtin/am.c:923
2470msgid "invalid timezone offset"
2471msgstr "无效的时区偏移值"
2472
2473#: builtin/am.c:1010
2474msgid "Patch format detection failed."
2475msgstr "补丁格式检测失败。"
2476
2477#: builtin/am.c:1015 builtin/clone.c:368
2478#, c-format
2479msgid "failed to create directory '%s'"
2480msgstr "无法创建目录 '%s'"
2481
2482#: builtin/am.c:1019
2483msgid "Failed to split patches."
2484msgstr "无法拆分补丁。"
2485
2486#: builtin/am.c:1151 builtin/commit.c:362
2487msgid "unable to write index file"
2488msgstr "无法写入索引文件"
2489
2490#: builtin/am.c:1202
2491#, c-format
2492msgid "When you have resolved this problem, run \"%s --continue\"."
2493msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2494
2495#: builtin/am.c:1203
2496#, c-format
2497msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2498msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2499
2500#: builtin/am.c:1204
2501#, c-format
2502msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2503msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2504
2505#: builtin/am.c:1312
2506msgid "Patch is empty. Was it split wrong?"
2507msgstr "补丁为空。是不是切分错误?"
2508
2509#: builtin/am.c:1386 builtin/log.c:1345
2510#, c-format
2511msgid "invalid ident line: %s"
2512msgstr "包含无效的身份标识:%s"
2513
2514#: builtin/am.c:1413
2515#, c-format
2516msgid "unable to parse commit %s"
2517msgstr "不能解析提交 %s"
2518
2519#: builtin/am.c:1587
2520msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2521msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2522
2523#: builtin/am.c:1589
2524msgid "Using index info to reconstruct a base tree..."
2525msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2526
2527#: builtin/am.c:1608
2528msgid ""
2529"Did you hand edit your patch?\n"
2530"It does not apply to blobs recorded in its index."
2531msgstr ""
2532"您是否曾手动编辑过您的补丁?\n"
2533"无法应用补丁到索引中的数据对象上。"
2534
2535#: builtin/am.c:1614
2536msgid "Falling back to patching base and 3-way merge..."
2537msgstr "回落到基础版本上打补丁及进行三方合并..."
2538
2539#: builtin/am.c:1639
2540msgid "Failed to merge in the changes."
2541msgstr "无法合并变更。"
2542
2543#: builtin/am.c:1664 builtin/merge.c:632
2544msgid "git write-tree failed to write a tree"
2545msgstr "git write-tree 无法写入一树对象"
2546
2547#: builtin/am.c:1671
2548msgid "applying to an empty history"
2549msgstr "正应用到一个空历史上"
2550
2551#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829
2552#: builtin/merge.c:854
2553msgid "failed to write commit object"
2554msgstr "无法写提交对象"
2555
2556#: builtin/am.c:1716 builtin/am.c:1720
2557#, c-format
2558msgid "cannot resume: %s does not exist."
2559msgstr "无法继续:%s 不存在。"
2560
2561#: builtin/am.c:1736
2562msgid "cannot be interactive without stdin connected to a terminal."
2563msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2564
2565#: builtin/am.c:1741
2566msgid "Commit Body is:"
2567msgstr "提交内容为:"
2568
2569#  译者:注意保持句尾空格
2570#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2571#. in your translation. The program will only accept English
2572#. input at this point.
2573#.
2574#: builtin/am.c:1751
2575msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2576msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2577
2578#: builtin/am.c:1801
2579#, c-format
2580msgid "Dirty index: cannot apply patches (dirty: %s)"
2581msgstr "脏索引:不能应用补丁(脏文件:%s)"
2582
2583#: builtin/am.c:1836 builtin/am.c:1907
2584#, c-format
2585msgid "Applying: %.*s"
2586msgstr "应用:%.*s"
2587
2588#: builtin/am.c:1852
2589msgid "No changes -- Patch already applied."
2590msgstr "没有变更 —— 补丁已经应用过。"
2591
2592#: builtin/am.c:1860
2593#, c-format
2594msgid "Patch failed at %s %.*s"
2595msgstr "打补丁失败于 %s %.*s"
2596
2597#: builtin/am.c:1866
2598#, c-format
2599msgid "The copy of the patch that failed is found in: %s"
2600msgstr "失败的补丁文件副本位于:%s"
2601
2602#: builtin/am.c:1910
2603msgid ""
2604"No changes - did you forget to use 'git add'?\n"
2605"If there is nothing left to stage, chances are that something else\n"
2606"already introduced the same changes; you might want to skip this patch."
2607msgstr ""
2608"没有变更 —— 您是不是忘了执行 'git add'?\n"
2609"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2610"您也许想要跳过这个补丁。"
2611
2612#: builtin/am.c:1917
2613msgid ""
2614"You still have unmerged paths in your index.\n"
2615"Did you forget to use 'git add'?"
2616msgstr ""
2617"您的索引中仍有未合并的路径。\n"
2618"您是否忘了执行 'git add'?"
2619
2620#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308
2621#: builtin/reset.c:316
2622#, c-format
2623msgid "Could not parse object '%s'."
2624msgstr "不能解析对象 '%s'。"
2625
2626#: builtin/am.c:2077
2627msgid "failed to clean index"
2628msgstr "无法清空索引"
2629
2630#: builtin/am.c:2111
2631msgid ""
2632"You seem to have moved HEAD since the last 'am' failure.\n"
2633"Not rewinding to ORIG_HEAD"
2634msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2635
2636#: builtin/am.c:2172
2637#, c-format
2638msgid "Invalid value for --patch-format: %s"
2639msgstr "无效的 --patch-format 值:%s"
2640
2641#: builtin/am.c:2194
2642msgid "git am [options] [(<mbox>|<Maildir>)...]"
2643msgstr "git am [选项] [(<mbox>|<Maildir>)...]"
2644
2645#: builtin/am.c:2195
2646msgid "git am [options] (--continue | --skip | --abort)"
2647msgstr "git am [选项] (--continue | --skip | --abort)"
2648
2649#: builtin/am.c:2201
2650msgid "run interactively"
2651msgstr "以交互式方式运行"
2652
2653#: builtin/am.c:2203
2654msgid "historical option -- no-op"
2655msgstr "老的参数 —— 无作用"
2656
2657#: builtin/am.c:2205
2658msgid "allow fall back on 3way merging if needed"
2659msgstr "如果必要,允许使用三方合并。"
2660
2661#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57
2662#: builtin/repack.c:171
2663msgid "be quiet"
2664msgstr "静默模式"
2665
2666#: builtin/am.c:2208
2667msgid "add a Signed-off-by line to the commit message"
2668msgstr "在提交说明中添加一个 Signed-off-by 签名"
2669
2670#: builtin/am.c:2211
2671msgid "recode into utf8 (default)"
2672msgstr "使用 utf8 字符集(默认)"
2673
2674#: builtin/am.c:2213
2675msgid "pass -k flag to git-mailinfo"
2676msgstr "向 git-mailinfo 传递 -k 参数"
2677
2678#: builtin/am.c:2215
2679msgid "pass -b flag to git-mailinfo"
2680msgstr "向 git-mailinfo 传递 -b 参数"
2681
2682#: builtin/am.c:2217
2683msgid "pass -m flag to git-mailinfo"
2684msgstr "向 git-mailinfo 传递 -m 参数"
2685
2686#: builtin/am.c:2219
2687msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2688msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2689
2690#: builtin/am.c:2222
2691msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2692msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2693
2694#: builtin/am.c:2225
2695msgid "strip everything before a scissors line"
2696msgstr "丢弃裁切线前的所有内容"
2697
2698#: builtin/am.c:2226 builtin/apply.c:4563
2699msgid "action"
2700msgstr "动作"
2701
2702#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236
2703#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
2704#: builtin/am.c:2254
2705msgid "pass it through git-apply"
2706msgstr "传递给 git-apply"
2707
2708#: builtin/am.c:2235 builtin/apply.c:4587
2709msgid "root"
2710msgstr "根目录"
2711
2712#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525
2713#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
2714#: builtin/pull.c:167
2715msgid "path"
2716msgstr "路径"
2717
2718#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
2719#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
2720#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
2721#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
2722#: parse-options.h:134 parse-options.h:243
2723msgid "n"
2724msgstr "n"
2725
2726#: builtin/am.c:2247 builtin/apply.c:4531
2727msgid "num"
2728msgstr "数字"
2729
2730#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438
2731msgid "format"
2732msgstr "格式"
2733
2734#: builtin/am.c:2251
2735msgid "format the patch(es) are in"
2736msgstr "补丁的格式"
2737
2738#: builtin/am.c:2257
2739msgid "override error message when patch failure occurs"
2740msgstr "打补丁失败时显示的错误信息"
2741
2742#: builtin/am.c:2259
2743msgid "continue applying patches after resolving a conflict"
2744msgstr "冲突解决后继续应用补丁"
2745
2746#: builtin/am.c:2262
2747msgid "synonyms for --continue"
2748msgstr "和 --continue 同义"
2749
2750#: builtin/am.c:2265
2751msgid "skip the current patch"
2752msgstr "跳过当前补丁"
2753
2754#: builtin/am.c:2268
2755msgid "restore the original branch and abort the patching operation."
2756msgstr "恢复原始分支并终止打补丁操作。"
2757
2758#: builtin/am.c:2272
2759msgid "lie about committer date"
2760msgstr "将作者日期作为提交日期"
2761
2762#: builtin/am.c:2274
2763msgid "use current timestamp for author date"
2764msgstr "用当前时间作为作者日期"
2765
2766#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225
2767#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
2768msgid "key-id"
2769msgstr "key-id"
2770
2771#: builtin/am.c:2277
2772msgid "GPG-sign commits"
2773msgstr "使用 GPG 签名提交"
2774
2775#: builtin/am.c:2280
2776msgid "(internal use for git-rebase)"
2777msgstr "(内部使用,用于 git-rebase)"
2778
2779#: builtin/am.c:2295
2780msgid ""
2781"The -b/--binary option has been a no-op for long time, and\n"
2782"it will be removed. Please do not use it anymore."
2783msgstr ""
2784"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2785"请不要再使用它了。"
2786
2787#: builtin/am.c:2302
2788msgid "failed to read the index"
2789msgstr "无法读取索引"
2790
2791#: builtin/am.c:2317
2792#, c-format
2793msgid "previous rebase directory %s still exists but mbox given."
2794msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2795
2796#: builtin/am.c:2341
2797#, c-format
2798msgid ""
2799"Stray %s directory found.\n"
2800"Use \"git am --abort\" to remove it."
2801msgstr ""
2802"发现了错误的 %s 目录。\n"
2803"使用 \"git am --abort\" 删除它。"
2804
2805#: builtin/am.c:2347
2806msgid "Resolve operation not in progress, we are not resuming."
2807msgstr "解决操作未进行,我们不会继续。"
2808
2809#: builtin/apply.c:59
2810msgid "git apply [<options>] [<patch>...]"
2811msgstr "git apply [<选项>] [<补丁>...]"
2812
2813#: builtin/apply.c:112
2814#, c-format
2815msgid "unrecognized whitespace option '%s'"
2816msgstr "未能识别的空白字符选项 '%s'"
2817
2818#: builtin/apply.c:127
2819#, c-format
2820msgid "unrecognized whitespace ignore option '%s'"
2821msgstr "未能识别的空白字符忽略选项 '%s'"
2822
2823#: builtin/apply.c:822
2824#, c-format
2825msgid "Cannot prepare timestamp regexp %s"
2826msgstr "无法准备时间戳正则表达式 %s"
2827
2828#: builtin/apply.c:831
2829#, c-format
2830msgid "regexec returned %d for input: %s"
2831msgstr "regexec 返回 %d,输入为:%s"
2832
2833#: builtin/apply.c:912
2834#, c-format
2835msgid "unable to find filename in patch at line %d"
2836msgstr "不能在补丁的第 %d 行找到文件名"
2837
2838#: builtin/apply.c:944
2839#, c-format
2840msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2841msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2842
2843#: builtin/apply.c:948
2844#, c-format
2845msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2846msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2847
2848#: builtin/apply.c:949
2849#, c-format
2850msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2851msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2852
2853#: builtin/apply.c:956
2854#, c-format
2855msgid "git apply: bad git-diff - expected /dev/null on line %d"
2856msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2857
2858#: builtin/apply.c:1419
2859#, c-format
2860msgid "recount: unexpected line: %.*s"
2861msgstr "recount:意外的行:%.*s"
2862
2863#: builtin/apply.c:1476
2864#, c-format
2865msgid "patch fragment without header at line %d: %.*s"
2866msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2867
2868#: builtin/apply.c:1493
2869#, c-format
2870msgid ""
2871"git diff header lacks filename information when removing %d leading pathname "
2872"component (line %d)"
2873msgid_plural ""
2874"git diff header lacks filename information when removing %d leading pathname "
2875"components (line %d)"
2876msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2877msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2878
2879#: builtin/apply.c:1659
2880msgid "new file depends on old contents"
2881msgstr "新文件依赖旧内容"
2882
2883#: builtin/apply.c:1661
2884msgid "deleted file still has contents"
2885msgstr "删除的文件仍有内容"
2886
2887#: builtin/apply.c:1687
2888#, c-format
2889msgid "corrupt patch at line %d"
2890msgstr "补丁在第 %d 行损坏"
2891
2892#: builtin/apply.c:1723
2893#, c-format
2894msgid "new file %s depends on old contents"
2895msgstr "新文件 %s 依赖旧内容"
2896
2897#: builtin/apply.c:1725
2898#, c-format
2899msgid "deleted file %s still has contents"
2900msgstr "删除的文件 %s 仍有内容"
2901
2902#: builtin/apply.c:1728
2903#, c-format
2904msgid "** warning: file %s becomes empty but is not deleted"
2905msgstr "** 警告:文件 %s 成为空文件但并未删除"
2906
2907#: builtin/apply.c:1874
2908#, c-format
2909msgid "corrupt binary patch at line %d: %.*s"
2910msgstr "二进制补丁在第 %d 行损坏:%.*s"
2911
2912#: builtin/apply.c:1903
2913#, c-format
2914msgid "unrecognized binary patch at line %d"
2915msgstr "未能识别的二进制补丁位于第 %d 行"
2916
2917#: builtin/apply.c:2054
2918#, c-format
2919msgid "patch with only garbage at line %d"
2920msgstr "补丁文件的第 %d 行只有垃圾数据"
2921
2922#: builtin/apply.c:2144
2923#, c-format
2924msgid "unable to read symlink %s"
2925msgstr "无法读取符号链接 %s"
2926
2927#: builtin/apply.c:2148
2928#, c-format
2929msgid "unable to open or read %s"
2930msgstr "不能打开或读取 %s"
2931
2932#: builtin/apply.c:2781
2933#, c-format
2934msgid "invalid start of line: '%c'"
2935msgstr "无效的行首字符:'%c'"
2936
2937#: builtin/apply.c:2900
2938#, c-format
2939msgid "Hunk #%d succeeded at %d (offset %d line)."
2940msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2941msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2942msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2943
2944#: builtin/apply.c:2912
2945#, c-format
2946msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2947msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2948
2949#: builtin/apply.c:2918
2950#, c-format
2951msgid ""
2952"while searching for:\n"
2953"%.*s"
2954msgstr ""
2955"当查询:\n"
2956"%.*s"
2957
2958#: builtin/apply.c:2938
2959#, c-format
2960msgid "missing binary patch data for '%s'"
2961msgstr "缺失 '%s' 的二进制补丁数据"
2962
2963#: builtin/apply.c:3039
2964#, c-format
2965msgid "binary patch does not apply to '%s'"
2966msgstr "二进制补丁未应用到 '%s'"
2967
2968#: builtin/apply.c:3045
2969#, c-format
2970msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2971msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2972
2973#: builtin/apply.c:3066
2974#, c-format
2975msgid "patch failed: %s:%ld"
2976msgstr "打补丁失败:%s:%ld"
2977
2978#: builtin/apply.c:3190
2979#, c-format
2980msgid "cannot checkout %s"
2981msgstr "不能检出 %s"
2982
2983#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
2984#, c-format
2985msgid "read of %s failed"
2986msgstr "读取 %s 失败"
2987
2988#: builtin/apply.c:3243
2989#, c-format
2990msgid "reading from '%s' beyond a symbolic link"
2991msgstr "读取位于符号链接中的 '%s'"
2992
2993#: builtin/apply.c:3271 builtin/apply.c:3493
2994#, c-format
2995msgid "path %s has been renamed/deleted"
2996msgstr "路径 %s 已经被重命名/删除"
2997
2998#: builtin/apply.c:3352 builtin/apply.c:3507
2999#, c-format
3000msgid "%s: does not exist in index"
3001msgstr "%s:不存在于索引中"
3002
3003#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
3004#, c-format
3005msgid "%s: %s"
3006msgstr "%s:%s"
3007
3008#: builtin/apply.c:3361 builtin/apply.c:3515
3009#, c-format
3010msgid "%s: does not match index"
3011msgstr "%s:和索引不匹配"
3012
3013#: builtin/apply.c:3463
3014msgid "removal patch leaves file contents"
3015msgstr "移除补丁仍留下了文件内容"
3016
3017#: builtin/apply.c:3532
3018#, c-format
3019msgid "%s: wrong type"
3020msgstr "%s:错误类型"
3021
3022#: builtin/apply.c:3534
3023#, c-format
3024msgid "%s has type %o, expected %o"
3025msgstr "%s 的类型是 %o,应为 %o"
3026
3027#: builtin/apply.c:3693 builtin/apply.c:3695
3028#, c-format
3029msgid "invalid path '%s'"
3030msgstr "无效路径 '%s'"
3031
3032#: builtin/apply.c:3750
3033#, c-format
3034msgid "%s: already exists in index"
3035msgstr "%s:已经存在于索引中"
3036
3037#: builtin/apply.c:3753
3038#, c-format
3039msgid "%s: already exists in working directory"
3040msgstr "%s:已经存在于工作区中"
3041
3042#: builtin/apply.c:3773
3043#, c-format
3044msgid "new mode (%o) of %s does not match old mode (%o)"
3045msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3046
3047#: builtin/apply.c:3778
3048#, c-format
3049msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3050msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3051
3052#: builtin/apply.c:3798
3053#, c-format
3054msgid "affected file '%s' is beyond a symbolic link"
3055msgstr "受影响的文件 '%s' 位于符号链接中"
3056
3057#: builtin/apply.c:3802
3058#, c-format
3059msgid "%s: patch does not apply"
3060msgstr "%s:补丁未应用"
3061
3062#: builtin/apply.c:3816
3063#, c-format
3064msgid "Checking patch %s..."
3065msgstr "检查补丁 %s..."
3066
3067#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
3068#, c-format
3069msgid "make_cache_entry failed for path '%s'"
3070msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3071
3072#: builtin/apply.c:4052
3073#, c-format
3074msgid "unable to remove %s from index"
3075msgstr "不能从索引中移除 %s"
3076
3077#: builtin/apply.c:4081
3078#, c-format
3079msgid "corrupt patch for submodule %s"
3080msgstr "子模组 %s 损坏的补丁"
3081
3082#: builtin/apply.c:4085
3083#, c-format
3084msgid "unable to stat newly created file '%s'"
3085msgstr "不能枚举新建文件 '%s' 的状态"
3086
3087#: builtin/apply.c:4090
3088#, c-format
3089msgid "unable to create backing store for newly created file %s"
3090msgstr "不能为新建文件 %s 创建后端存储"
3091
3092#: builtin/apply.c:4093 builtin/apply.c:4201
3093#, c-format
3094msgid "unable to add cache entry for %s"
3095msgstr "无法为 %s 添加缓存条目"
3096
3097#: builtin/apply.c:4126
3098#, c-format
3099msgid "closing file '%s'"
3100msgstr "关闭文件 '%s'"
3101
3102#: builtin/apply.c:4175
3103#, c-format
3104msgid "unable to write file '%s' mode %o"
3105msgstr "不能写文件 '%s' 权限 %o"
3106
3107#: builtin/apply.c:4262
3108#, c-format
3109msgid "Applied patch %s cleanly."
3110msgstr "成功应用补丁 %s。"
3111
3112#: builtin/apply.c:4270
3113msgid "internal error"
3114msgstr "内部错误"
3115
3116#: builtin/apply.c:4273
3117#, c-format
3118msgid "Applying patch %%s with %d reject..."
3119msgid_plural "Applying patch %%s with %d rejects..."
3120msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3121msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3122
3123#: builtin/apply.c:4283
3124#, c-format
3125msgid "truncating .rej filename to %.*s.rej"
3126msgstr "截短 .rej 文件名为 %.*s.rej"
3127
3128#: builtin/apply.c:4304
3129#, c-format
3130msgid "Hunk #%d applied cleanly."
3131msgstr "第 #%d 个片段成功应用。"
3132
3133#: builtin/apply.c:4307
3134#, c-format
3135msgid "Rejected hunk #%d."
3136msgstr "拒绝第 #%d 个片段。"
3137
3138#: builtin/apply.c:4397
3139msgid "unrecognized input"
3140msgstr "未能识别的输入"
3141
3142#: builtin/apply.c:4408
3143msgid "unable to read index file"
3144msgstr "无法读取索引文件"
3145
3146#: builtin/apply.c:4526
3147msgid "don't apply changes matching the given path"
3148msgstr "不要应用与给出路径向匹配的变更"
3149
3150#: builtin/apply.c:4529
3151msgid "apply changes matching the given path"
3152msgstr "应用与给出路径向匹配的变更"
3153
3154#: builtin/apply.c:4532
3155msgid "remove <num> leading slashes from traditional diff paths"
3156msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3157
3158#: builtin/apply.c:4535
3159msgid "ignore additions made by the patch"
3160msgstr "忽略补丁中的添加的文件"
3161
3162#: builtin/apply.c:4537
3163msgid "instead of applying the patch, output diffstat for the input"
3164msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3165
3166#: builtin/apply.c:4541
3167msgid "show number of added and deleted lines in decimal notation"
3168msgstr "以十进制数显示添加和删除的行数"
3169
3170#: builtin/apply.c:4543
3171msgid "instead of applying the patch, output a summary for the input"
3172msgstr "不应用补丁,而是显示输入的概要"
3173
3174#: builtin/apply.c:4545
3175msgid "instead of applying the patch, see if the patch is applicable"
3176msgstr "不应用补丁,而是查看补丁是否可应用"
3177
3178#: builtin/apply.c:4547
3179msgid "make sure the patch is applicable to the current index"
3180msgstr "确认补丁可以应用到当前索引"
3181
3182#: builtin/apply.c:4549
3183msgid "apply a patch without touching the working tree"
3184msgstr "应用补丁而不修改工作区"
3185
3186#: builtin/apply.c:4551
3187msgid "accept a patch that touches outside the working area"
3188msgstr "接受修改工作区之外文件的补丁"
3189
3190#: builtin/apply.c:4553
3191msgid "also apply the patch (use with --stat/--summary/--check)"
3192msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3193
3194#: builtin/apply.c:4555
3195msgid "attempt three-way merge if a patch does not apply"
3196msgstr "如果一个补丁不能应用则尝试三方合并"
3197
3198#: builtin/apply.c:4557
3199msgid "build a temporary index based on embedded index information"
3200msgstr "创建一个临时索引基于嵌入的索引信息"
3201
3202#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
3203msgid "paths are separated with NUL character"
3204msgstr "路径以 NUL 字符分隔"
3205
3206#: builtin/apply.c:4562
3207msgid "ensure at least <n> lines of context match"
3208msgstr "确保至少匹配 <n> 行上下文"
3209
3210#: builtin/apply.c:4564
3211msgid "detect new or modified lines that have whitespace errors"
3212msgstr "检查新增和修改的行中间的空白字符滥用"
3213
3214#: builtin/apply.c:4567 builtin/apply.c:4570
3215msgid "ignore changes in whitespace when finding context"
3216msgstr "查找上下文时忽略空白字符的变更"
3217
3218#: builtin/apply.c:4573
3219msgid "apply the patch in reverse"
3220msgstr "反向应用补丁"
3221
3222#: builtin/apply.c:4575
3223msgid "don't expect at least one line of context"
3224msgstr "无需至少一行上下文"
3225
3226#: builtin/apply.c:4577
3227msgid "leave the rejected hunks in corresponding *.rej files"
3228msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3229
3230#: builtin/apply.c:4579
3231msgid "allow overlapping hunks"
3232msgstr "允许重叠的补丁片段"
3233
3234#: builtin/apply.c:4582
3235msgid "tolerate incorrectly detected missing new-line at the end of file"
3236msgstr "允许不正确的文件末尾换行符"
3237
3238#: builtin/apply.c:4585
3239msgid "do not trust the line counts in the hunk headers"
3240msgstr "不信任补丁片段的头信息中的行号"
3241
3242#: builtin/apply.c:4588
3243msgid "prepend <root> to all filenames"
3244msgstr "为所有文件名前添加 <根目录>"
3245
3246#: builtin/apply.c:4610
3247msgid "--3way outside a repository"
3248msgstr "--3way 在一个仓库之外"
3249
3250#: builtin/apply.c:4618
3251msgid "--index outside a repository"
3252msgstr "--index 在一个仓库之外"
3253
3254#: builtin/apply.c:4621
3255msgid "--cached outside a repository"
3256msgstr "--cached 在一个仓库之外"
3257
3258#: builtin/apply.c:4640
3259#, c-format
3260msgid "can't open patch '%s'"
3261msgstr "不能打开补丁 '%s'"
3262
3263#: builtin/apply.c:4654
3264#, c-format
3265msgid "squelched %d whitespace error"
3266msgid_plural "squelched %d whitespace errors"
3267msgstr[0] "抑制下仍有 %d 个空白字符误用"
3268msgstr[1] "抑制下仍有 %d 个空白字符误用"
3269
3270#: builtin/apply.c:4660 builtin/apply.c:4670
3271#, c-format
3272msgid "%d line adds whitespace errors."
3273msgid_plural "%d lines add whitespace errors."
3274msgstr[0] "%d 行有空白字符误用。"
3275msgstr[1] "%d 行有空白字符误用。"
3276
3277#: builtin/archive.c:17
3278#, c-format
3279msgid "could not create archive file '%s'"
3280msgstr "不能创建归档文件 '%s'"
3281
3282#: builtin/archive.c:20
3283msgid "could not redirect output"
3284msgstr "不能重定向输出"
3285
3286#: builtin/archive.c:37
3287msgid "git archive: Remote with no URL"
3288msgstr "git archive:未提供远程 URL"
3289
3290#: builtin/archive.c:58
3291msgid "git archive: expected ACK/NAK, got EOF"
3292msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3293
3294#: builtin/archive.c:61
3295#, c-format
3296msgid "git archive: NACK %s"
3297msgstr "git archive:NACK %s"
3298
3299#: builtin/archive.c:63
3300#, c-format
3301msgid "remote error: %s"
3302msgstr "远程错误:%s"
3303
3304#: builtin/archive.c:64
3305msgid "git archive: protocol error"
3306msgstr "git archive:协议错误"
3307
3308#: builtin/archive.c:68
3309msgid "git archive: expected a flush"
3310msgstr "git archive:应为刷新"
3311
3312#: builtin/bisect--helper.c:7
3313msgid "git bisect--helper --next-all [--no-checkout]"
3314msgstr "git bisect--helper --next-all [--no-checkout]"
3315
3316#: builtin/bisect--helper.c:17
3317msgid "perform 'git bisect next'"
3318msgstr "执行 'git bisect next'"
3319
3320#: builtin/bisect--helper.c:19
3321msgid "update BISECT_HEAD instead of checking out the current commit"
3322msgstr "更新 BISECT_HEAD 而非检出当前提交"
3323
3324#: builtin/blame.c:32
3325msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3326msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3327
3328#: builtin/blame.c:37
3329msgid "<rev-opts> are documented in git-rev-list(1)"
3330msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3331
3332#: builtin/blame.c:2500
3333msgid "Show blame entries as we find them, incrementally"
3334msgstr "增量式地显示发现的 blame 条目"
3335
3336#: builtin/blame.c:2501
3337msgid "Show blank SHA-1 for boundary commits (Default: off)"
3338msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3339
3340#: builtin/blame.c:2502
3341msgid "Do not treat root commits as boundaries (Default: off)"
3342msgstr "不把根提交作为边界(默认:关闭)"
3343
3344#: builtin/blame.c:2503
3345msgid "Show work cost statistics"
3346msgstr "显示命令消耗统计"
3347
3348#: builtin/blame.c:2504
3349msgid "Show output score for blame entries"
3350msgstr "显示判断 blame 条目位移的得分诊断信息"
3351
3352#: builtin/blame.c:2505
3353msgid "Show original filename (Default: auto)"
3354msgstr "显示原始文件名(默认:自动)"
3355
3356#: builtin/blame.c:2506
3357msgid "Show original linenumber (Default: off)"
3358msgstr "显示原始的行号(默认:关闭)"
3359
3360#: builtin/blame.c:2507
3361msgid "Show in a format designed for machine consumption"
3362msgstr "显示为一个适合机器读取的格式"
3363
3364#: builtin/blame.c:2508
3365msgid "Show porcelain format with per-line commit information"
3366msgstr "为每一行显示机器适用的提交信息"
3367
3368#: builtin/blame.c:2509
3369msgid "Use the same output mode as git-annotate (Default: off)"
3370msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3371
3372#: builtin/blame.c:2510
3373msgid "Show raw timestamp (Default: off)"
3374msgstr "显示原始时间戳(默认:关闭)"
3375
3376#: builtin/blame.c:2511
3377msgid "Show long commit SHA1 (Default: off)"
3378msgstr "显示长的 SHA1 提交号(默认:关闭)"
3379
3380#: builtin/blame.c:2512
3381msgid "Suppress author name and timestamp (Default: off)"
3382msgstr "隐藏作者名字和时间戳(默认:关闭)"
3383
3384#: builtin/blame.c:2513
3385msgid "Show author email instead of name (Default: off)"
3386msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3387
3388#: builtin/blame.c:2514
3389msgid "Ignore whitespace differences"
3390msgstr "忽略空白差异"
3391
3392#: builtin/blame.c:2515
3393msgid "Spend extra cycles to find better match"
3394msgstr "花费额外的循环来找到更好的匹配"
3395
3396#: builtin/blame.c:2516
3397msgid "Use revisions from <file> instead of calling git-rev-list"
3398msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3399
3400#: builtin/blame.c:2517
3401msgid "Use <file>'s contents as the final image"
3402msgstr "使用 <文件> 的内容作为最终的图片"
3403
3404#: builtin/blame.c:2518 builtin/blame.c:2519
3405msgid "score"
3406msgstr "得分"
3407
3408#: builtin/blame.c:2518
3409msgid "Find line copies within and across files"
3410msgstr "找到文件内及跨文件的行拷贝"
3411
3412#: builtin/blame.c:2519
3413msgid "Find line movements within and across files"
3414msgstr "找到文件内及跨文件的行移动"
3415
3416#: builtin/blame.c:2520
3417msgid "n,m"
3418msgstr "n,m"
3419
3420#: builtin/blame.c:2520
3421msgid "Process only line range n,m, counting from 1"
3422msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3423
3424#. TRANSLATORS: This string is used to tell us the maximum
3425#. display width for a relative timestamp in "git blame"
3426#. output.  For C locale, "4 years, 11 months ago", which
3427#. takes 22 places, is the longest among various forms of
3428#. relative timestamps, but your language may need more or
3429#. fewer display columns.
3430#: builtin/blame.c:2601
3431msgid "4 years, 11 months ago"
3432msgstr "4 年 11 个月前"
3433
3434#: builtin/branch.c:24
3435msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3436msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3437
3438#: builtin/branch.c:25
3439msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3440msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3441
3442#: builtin/branch.c:26
3443msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3444msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3445
3446#: builtin/branch.c:27
3447msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3448msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3449
3450#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3451#: builtin/branch.c:150
3452#, c-format
3453msgid ""
3454"deleting branch '%s' that has been merged to\n"
3455"         '%s', but not yet merged to HEAD."
3456msgstr ""
3457"将要删除的分支 '%s' 已经被合并到\n"
3458"         '%s',但未合并到 HEAD。"
3459
3460#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3461#: builtin/branch.c:154
3462#, c-format
3463msgid ""
3464"not deleting branch '%s' that is not yet merged to\n"
3465"         '%s', even though it is merged to HEAD."
3466msgstr ""
3467"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3468"         然而却尚未被合并到分支 '%s' 。"
3469
3470#: builtin/branch.c:168
3471#, c-format
3472msgid "Couldn't look up commit object for '%s'"
3473msgstr "无法查询 '%s' 指向的提交对象"
3474
3475#: builtin/branch.c:172
3476#, c-format
3477msgid ""
3478"The branch '%s' is not fully merged.\n"
3479"If you are sure you want to delete it, run 'git branch -D %s'."
3480msgstr ""
3481"分支 '%s' 没有完全合并。\n"
3482"如果您确认要删除它,执行 'git branch -D %s'。"
3483
3484#: builtin/branch.c:185
3485msgid "Update of config-file failed"
3486msgstr "无法更新 config 文件"
3487
3488#: builtin/branch.c:213
3489msgid "cannot use -a with -d"
3490msgstr "不能将 -a 和 -d 同时使用"
3491
3492#: builtin/branch.c:219
3493msgid "Couldn't look up commit object for HEAD"
3494msgstr "无法查询 HEAD 指向的提交对象"
3495
3496#: builtin/branch.c:227
3497#, c-format
3498msgid "Cannot delete the branch '%s' which you are currently on."
3499msgstr "无法删除您当前所在的分支 '%s'。"
3500
3501#: builtin/branch.c:243
3502#, c-format
3503msgid "remote-tracking branch '%s' not found."
3504msgstr "未能找到远程跟踪分支 '%s'。"
3505
3506#: builtin/branch.c:244
3507#, c-format
3508msgid "branch '%s' not found."
3509msgstr "分支 '%s' 未发现。"
3510
3511#: builtin/branch.c:259
3512#, c-format
3513msgid "Error deleting remote-tracking branch '%s'"
3514msgstr "无法删除远程跟踪分支 '%s'"
3515
3516#: builtin/branch.c:260
3517#, c-format
3518msgid "Error deleting branch '%s'"
3519msgstr "无法删除分支 '%s'"
3520
3521#: builtin/branch.c:267
3522#, c-format
3523msgid "Deleted remote-tracking branch %s (was %s).\n"
3524msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3525
3526#: builtin/branch.c:268
3527#, c-format
3528msgid "Deleted branch %s (was %s).\n"
3529msgstr "已删除分支 %s(曾为 %s)。\n"
3530
3531#: builtin/branch.c:369
3532#, c-format
3533msgid "branch '%s' does not point at a commit"
3534msgstr "分支 '%s' 未指向一个提交"
3535
3536#: builtin/branch.c:452
3537#, c-format
3538msgid "[%s: gone]"
3539msgstr "[%s: 丢失]"
3540
3541#: builtin/branch.c:457
3542#, c-format
3543msgid "[%s]"
3544msgstr "[%s]"
3545
3546#: builtin/branch.c:462
3547#, c-format
3548msgid "[%s: behind %d]"
3549msgstr "[%s:落后 %d]"
3550
3551#: builtin/branch.c:464
3552#, c-format
3553msgid "[behind %d]"
3554msgstr "[落后 %d]"
3555
3556#: builtin/branch.c:468
3557#, c-format
3558msgid "[%s: ahead %d]"
3559msgstr "[%s:领先 %d]"
3560
3561#: builtin/branch.c:470
3562#, c-format
3563msgid "[ahead %d]"
3564msgstr "[领先 %d]"
3565
3566#: builtin/branch.c:473
3567#, c-format
3568msgid "[%s: ahead %d, behind %d]"
3569msgstr "[%s:领先 %d,落后 %d]"
3570
3571#: builtin/branch.c:476
3572#, c-format
3573msgid "[ahead %d, behind %d]"
3574msgstr "[领先 %d,落后 %d]"
3575
3576#: builtin/branch.c:489
3577msgid " **** invalid ref ****"
3578msgstr " **** 无效引用 ****"
3579
3580#: builtin/branch.c:580
3581#, c-format
3582msgid "(no branch, rebasing %s)"
3583msgstr "(非分支,正变基 %s)"
3584
3585#: builtin/branch.c:583
3586#, c-format
3587msgid "(no branch, bisect started on %s)"
3588msgstr "(非分支,二分查找开始于 %s)"
3589
3590#: builtin/branch.c:589
3591#, c-format
3592msgid "(HEAD detached at %s)"
3593msgstr "(头指针分离于 %s)"
3594
3595#: builtin/branch.c:592
3596#, c-format
3597msgid "(HEAD detached from %s)"
3598msgstr "(头指针分离自 %s)"
3599
3600#: builtin/branch.c:596
3601msgid "(no branch)"
3602msgstr "(非分支)"
3603
3604#: builtin/branch.c:643
3605#, c-format
3606msgid "object '%s' does not point to a commit"
3607msgstr "对象 '%s' 没有指向一个提交"
3608
3609#: builtin/branch.c:691
3610msgid "some refs could not be read"
3611msgstr "一些引用不能读取"
3612
3613#: builtin/branch.c:704
3614msgid "cannot rename the current branch while not on any."
3615msgstr "无法重命名当前分支因为不处于任何分支上。"
3616
3617#: builtin/branch.c:714
3618#, c-format
3619msgid "Invalid branch name: '%s'"
3620msgstr "无效的分支名:'%s'"
3621
3622#: builtin/branch.c:729
3623msgid "Branch rename failed"
3624msgstr "分支重命名失败"
3625
3626#: builtin/branch.c:733
3627#, c-format
3628msgid "Renamed a misnamed branch '%s' away"
3629msgstr "重命名掉一个错误命名的旧分支 '%s'"
3630
3631#: builtin/branch.c:737
3632#, c-format
3633msgid "Branch renamed to %s, but HEAD is not updated!"
3634msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3635
3636#: builtin/branch.c:744
3637msgid "Branch is renamed, but update of config-file failed"
3638msgstr "分支被重命名,但更新 config 文件失败"
3639
3640#: builtin/branch.c:759
3641#, c-format
3642msgid "malformed object name %s"
3643msgstr "非法的对象名 %s"
3644
3645#: builtin/branch.c:781
3646#, c-format
3647msgid "could not write branch description template: %s"
3648msgstr "不能写分支描述模版:%s"
3649
3650#: builtin/branch.c:811
3651msgid "Generic options"
3652msgstr "通用选项"
3653
3654#: builtin/branch.c:813
3655msgid "show hash and subject, give twice for upstream branch"
3656msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3657
3658#: builtin/branch.c:814
3659msgid "suppress informational messages"
3660msgstr "不显示信息"
3661
3662#: builtin/branch.c:815
3663msgid "set up tracking mode (see git-pull(1))"
3664msgstr "设置跟踪模式(参见 git-pull(1))"
3665
3666#: builtin/branch.c:817
3667msgid "change upstream info"
3668msgstr "改变上游信息"
3669
3670#: builtin/branch.c:821
3671msgid "use colored output"
3672msgstr "使用彩色输出"
3673
3674#: builtin/branch.c:822
3675msgid "act on remote-tracking branches"
3676msgstr "作用于远程跟踪分支"
3677
3678#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
3679#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
3680#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
3681#: builtin/tag.c:624
3682msgid "commit"
3683msgstr "提交"
3684
3685#: builtin/branch.c:826 builtin/branch.c:832
3686msgid "print only branches that contain the commit"
3687msgstr "只打印包含该提交的分支"
3688
3689#: builtin/branch.c:838
3690msgid "Specific git-branch actions:"
3691msgstr "具体的 git-branch 动作:"
3692
3693#: builtin/branch.c:839
3694msgid "list both remote-tracking and local branches"
3695msgstr "列出远程跟踪及本地分支"
3696
3697#: builtin/branch.c:841
3698msgid "delete fully merged branch"
3699msgstr "删除完全合并的分支"
3700
3701#: builtin/branch.c:842
3702msgid "delete branch (even if not merged)"
3703msgstr "删除分支(即使没有合并)"
3704
3705#: builtin/branch.c:843
3706msgid "move/rename a branch and its reflog"
3707msgstr "移动/重命名一个分支,以及它的引用日志"
3708
3709#: builtin/branch.c:844
3710msgid "move/rename a branch, even if target exists"
3711msgstr "移动/重命名一个分支,即使目标已存在"
3712
3713#: builtin/branch.c:845
3714msgid "list branch names"
3715msgstr "列出分支名"
3716
3717#: builtin/branch.c:846
3718msgid "create the branch's reflog"
3719msgstr "创建分支的引用日志"
3720
3721#: builtin/branch.c:848
3722msgid "edit the description for the branch"
3723msgstr "标记分支的描述"
3724
3725#: builtin/branch.c:849
3726msgid "force creation, move/rename, deletion"
3727msgstr "强制创建、移动/重命名、删除"
3728
3729#: builtin/branch.c:852
3730msgid "print only not merged branches"
3731msgstr "只打印没有合并的分支"
3732
3733#: builtin/branch.c:858
3734msgid "print only merged branches"
3735msgstr "只打印合并的分支"
3736
3737#: builtin/branch.c:862
3738msgid "list branches in columns"
3739msgstr "以列的方式显示分支"
3740
3741#: builtin/branch.c:875
3742msgid "Failed to resolve HEAD as a valid ref."
3743msgstr "无法将 HEAD 解析为有效引用。"
3744
3745#: builtin/branch.c:879 builtin/clone.c:690
3746msgid "HEAD not found below refs/heads!"
3747msgstr "HEAD 没有位于 /refs/heads 之下!"
3748
3749#: builtin/branch.c:901
3750msgid "--column and --verbose are incompatible"
3751msgstr "--column 和 --verbose 不兼容"
3752
3753#: builtin/branch.c:912 builtin/branch.c:951
3754msgid "branch name required"
3755msgstr "必须提供分支名"
3756
3757#: builtin/branch.c:927
3758msgid "Cannot give description to detached HEAD"
3759msgstr "不能向分离头指针提供描述"
3760
3761#: builtin/branch.c:932
3762msgid "cannot edit description of more than one branch"
3763msgstr "不能为一个以上的分支编辑描述"
3764
3765#: builtin/branch.c:939
3766#, c-format
3767msgid "No commit on branch '%s' yet."
3768msgstr "分支 '%s' 尚无提交。"
3769
3770#: builtin/branch.c:942
3771#, c-format
3772msgid "No branch named '%s'."
3773msgstr "没有分支 '%s'。"
3774
3775#: builtin/branch.c:957
3776msgid "too many branches for a rename operation"
3777msgstr "为重命名操作提供了太多的分支名"
3778
3779#: builtin/branch.c:962
3780msgid "too many branches to set new upstream"
3781msgstr "为设置新上游提供了太多的分支名"
3782
3783#: builtin/branch.c:966
3784#, c-format
3785msgid ""
3786"could not set upstream of HEAD to %s when it does not point to any branch."
3787msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3788
3789#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
3790#, c-format
3791msgid "no such branch '%s'"
3792msgstr "没有此分支 '%s'"
3793
3794#: builtin/branch.c:973
3795#, c-format
3796msgid "branch '%s' does not exist"
3797msgstr "分支 '%s' 不存在"
3798
3799#: builtin/branch.c:985
3800msgid "too many branches to unset upstream"
3801msgstr "为取消上游设置操作提供了太多的分支名"
3802
3803#: builtin/branch.c:989
3804msgid "could not unset upstream of HEAD when it does not point to any branch."
3805msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3806
3807#: builtin/branch.c:995
3808#, c-format
3809msgid "Branch '%s' has no upstream information"
3810msgstr "分支 '%s' 没有上游信息"
3811
3812#: builtin/branch.c:1009
3813msgid "it does not make sense to create 'HEAD' manually"
3814msgstr "手工创建 'HEAD' 没有意义"
3815
3816#: builtin/branch.c:1015
3817msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3818msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3819
3820#: builtin/branch.c:1018
3821#, c-format
3822msgid ""
3823"The --set-upstream flag is deprecated and will be removed. Consider using --"
3824"track or --set-upstream-to\n"
3825msgstr ""
3826"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3827
3828#: builtin/branch.c:1035
3829#, c-format
3830msgid ""
3831"\n"
3832"If you wanted to make '%s' track '%s', do this:\n"
3833"\n"
3834msgstr ""
3835"\n"
3836"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3837"\n"
3838
3839#: builtin/branch.c:1036
3840#, c-format
3841msgid "    git branch -d %s\n"
3842msgstr "    git branch -d %s\n"
3843
3844#: builtin/branch.c:1037
3845#, c-format
3846msgid "    git branch --set-upstream-to %s\n"
3847msgstr "    git branch --set-upstream-to %s\n"
3848
3849#: builtin/bundle.c:51
3850#, c-format
3851msgid "%s is okay\n"
3852msgstr "%s 可以\n"
3853
3854#: builtin/bundle.c:64
3855msgid "Need a repository to create a bundle."
3856msgstr "需要一个仓库来创建包。"
3857
3858#: builtin/bundle.c:68
3859msgid "Need a repository to unbundle."
3860msgstr "需要一个仓库来解包。"
3861
3862#: builtin/cat-file.c:428
3863msgid ""
3864"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3865"<type>|--textconv) <object>"
3866msgstr ""
3867"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3868">|--textconv) <对象>"
3869
3870#: builtin/cat-file.c:429
3871msgid ""
3872"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3873"objects>"
3874msgstr ""
3875"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
3876
3877#: builtin/cat-file.c:466
3878msgid "<type> can be one of: blob, tree, commit, tag"
3879msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3880
3881#: builtin/cat-file.c:467
3882msgid "show object type"
3883msgstr "显示对象类型"
3884
3885#: builtin/cat-file.c:468
3886msgid "show object size"
3887msgstr "显示对象大小"
3888
3889#: builtin/cat-file.c:470
3890msgid "exit with zero when there's no error"
3891msgstr "当没有错误时退出并返回零"
3892
3893#: builtin/cat-file.c:471
3894msgid "pretty-print object's content"
3895msgstr "美观地打印对象的内容"
3896
3897#: builtin/cat-file.c:473
3898msgid "for blob objects, run textconv on object's content"
3899msgstr "对于数据对象,对其内容执行 textconv"
3900
3901#: builtin/cat-file.c:475
3902msgid "allow -s and -t to work with broken/corrupt objects"
3903msgstr "允许 -s 和 -t 对损坏的对象生效"
3904
3905#: builtin/cat-file.c:476
3906msgid "buffer --batch output"
3907msgstr "缓冲 --batch 的输出"
3908
3909#: builtin/cat-file.c:478
3910msgid "show info and content of objects fed from the standard input"
3911msgstr "显示从标准输入提供的对象的信息和内容"
3912
3913#: builtin/cat-file.c:481
3914msgid "show info about objects fed from the standard input"
3915msgstr "显示从标准输入提供的对象的信息"
3916
3917#: builtin/cat-file.c:484
3918msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3919msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3920
3921#: builtin/cat-file.c:486
3922msgid "show all objects with --batch or --batch-check"
3923msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
3924
3925#: builtin/check-attr.c:11
3926msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3927msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3928
3929#: builtin/check-attr.c:12
3930msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3931msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3932
3933#: builtin/check-attr.c:19
3934msgid "report all attributes set on file"
3935msgstr "报告设置在文件上的所有属性"
3936
3937#: builtin/check-attr.c:20
3938msgid "use .gitattributes only from the index"
3939msgstr "只使用索引中的 .gitattributes"
3940
3941#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3942msgid "read file names from stdin"
3943msgstr "从标准输入读出文件名"
3944
3945#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3946msgid "terminate input and output records by a NUL character"
3947msgstr "输入和输出的记录使用 NUL 字符终结"
3948
3949#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
3950msgid "suppress progress reporting"
3951msgstr "不显示进度报告"
3952
3953#: builtin/check-ignore.c:26
3954msgid "show non-matching input paths"
3955msgstr "显示未匹配的输入路径"
3956
3957#: builtin/check-ignore.c:28
3958msgid "ignore index when checking"
3959msgstr "检查时忽略索引"
3960
3961#: builtin/check-ignore.c:154
3962msgid "cannot specify pathnames with --stdin"
3963msgstr "不能同时指定路径及 --stdin 参数"
3964
3965#: builtin/check-ignore.c:157
3966msgid "-z only makes sense with --stdin"
3967msgstr "-z 需要和 --stdin 参数共用才有意义"
3968
3969#: builtin/check-ignore.c:159
3970msgid "no path specified"
3971msgstr "未指定路径"
3972
3973#: builtin/check-ignore.c:163
3974msgid "--quiet is only valid with a single pathname"
3975msgstr "参数 --quiet 只在提供一个路径名时有效"
3976
3977#: builtin/check-ignore.c:165
3978msgid "cannot have both --quiet and --verbose"
3979msgstr "不能同时提供 --quiet 和 --verbose 参数"
3980
3981#: builtin/check-ignore.c:168
3982msgid "--non-matching is only valid with --verbose"
3983msgstr "--non-matching 选项只在使用 --verbose 时有效"
3984
3985#: builtin/check-mailmap.c:8
3986msgid "git check-mailmap [<options>] <contact>..."
3987msgstr "git check-mailmap [<选项>] <联系地址>..."
3988
3989#: builtin/check-mailmap.c:13
3990msgid "also read contacts from stdin"
3991msgstr "还从标准输入读取联系地址"
3992
3993#: builtin/check-mailmap.c:24
3994#, c-format
3995msgid "unable to parse contact: %s"
3996msgstr "不能解析联系地址:%s"
3997
3998#: builtin/check-mailmap.c:47
3999msgid "no contacts specified"
4000msgstr "未指定联系地址"
4001
4002#: builtin/checkout-index.c:126
4003msgid "git checkout-index [<options>] [--] [<file>...]"
4004msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4005
4006#: builtin/checkout-index.c:188
4007msgid "check out all files in the index"
4008msgstr "检出索引区的所有文件"
4009
4010#: builtin/checkout-index.c:189
4011msgid "force overwrite of existing files"
4012msgstr "强制覆盖现有的文件"
4013
4014#: builtin/checkout-index.c:191
4015msgid "no warning for existing files and files not in index"
4016msgstr "存在或不在索引中的文件都没有警告"
4017
4018#: builtin/checkout-index.c:193
4019msgid "don't checkout new files"
4020msgstr "不检出新文件"
4021
4022#: builtin/checkout-index.c:195
4023msgid "update stat information in the index file"
4024msgstr "更新索引中文件的状态信息"
4025
4026#: builtin/checkout-index.c:201
4027msgid "read list of paths from the standard input"
4028msgstr "从标准输入读取路径列表"
4029
4030#: builtin/checkout-index.c:203
4031msgid "write the content to temporary files"
4032msgstr "将内容写入临时文件"
4033
4034#: builtin/checkout-index.c:204 builtin/column.c:30
4035msgid "string"
4036msgstr "字符串"
4037
4038#: builtin/checkout-index.c:205
4039msgid "when creating files, prepend <string>"
4040msgstr "在创建文件时,在前面加上 <字符串>"
4041
4042#: builtin/checkout-index.c:208
4043msgid "copy out the files from named stage"
4044msgstr "从指定暂存区中拷出文件"
4045
4046#: builtin/checkout.c:25
4047msgid "git checkout [<options>] <branch>"
4048msgstr "git checkout [<选项>] <分支>"
4049
4050#: builtin/checkout.c:26
4051msgid "git checkout [<options>] [<branch>] -- <file>..."
4052msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4053
4054#: builtin/checkout.c:133 builtin/checkout.c:166
4055#, c-format
4056msgid "path '%s' does not have our version"
4057msgstr "路径 '%s' 没有我们的版本"
4058
4059#: builtin/checkout.c:135 builtin/checkout.c:168
4060#, c-format
4061msgid "path '%s' does not have their version"
4062msgstr "路径 '%s' 没有他们的版本"
4063
4064#: builtin/checkout.c:151
4065#, c-format
4066msgid "path '%s' does not have all necessary versions"
4067msgstr "路径 '%s' 没有全部必须的版本"
4068
4069#: builtin/checkout.c:195
4070#, c-format
4071msgid "path '%s' does not have necessary versions"
4072msgstr "路径 '%s' 没有必须的版本"
4073
4074#: builtin/checkout.c:212
4075#, c-format
4076msgid "path '%s': cannot merge"
4077msgstr "path '%s':无法合并"
4078
4079#: builtin/checkout.c:229
4080#, c-format
4081msgid "Unable to add merge result for '%s'"
4082msgstr "无法为 '%s' 添加合并结果"
4083
4084#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
4085#: builtin/checkout.c:259
4086#, c-format
4087msgid "'%s' cannot be used with updating paths"
4088msgstr "'%s' 不能在更新路径时使用"
4089
4090#: builtin/checkout.c:262 builtin/checkout.c:265
4091#, c-format
4092msgid "'%s' cannot be used with %s"
4093msgstr "'%s' 不能和 %s 同时使用"
4094
4095#: builtin/checkout.c:268
4096#, c-format
4097msgid "Cannot update paths and switch to branch '%s' at the same time."
4098msgstr "不能同时更新路径并切换到分支'%s'。"
4099
4100#: builtin/checkout.c:279 builtin/checkout.c:473
4101msgid "corrupt index file"
4102msgstr "损坏的索引文件"
4103
4104#: builtin/checkout.c:339 builtin/checkout.c:346
4105#, c-format
4106msgid "path '%s' is unmerged"
4107msgstr "路径 '%s' 未合并"
4108
4109#: builtin/checkout.c:495
4110msgid "you need to resolve your current index first"
4111msgstr "您需要先解决当前索引的冲突"
4112
4113#: builtin/checkout.c:622
4114#, c-format
4115msgid "Can not do reflog for '%s': %s\n"
4116msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4117
4118#: builtin/checkout.c:660
4119msgid "HEAD is now at"
4120msgstr "HEAD 目前位于"
4121
4122#: builtin/checkout.c:667
4123#, c-format
4124msgid "Reset branch '%s'\n"
4125msgstr "重置分支 '%s'\n"
4126
4127#: builtin/checkout.c:670
4128#, c-format
4129msgid "Already on '%s'\n"
4130msgstr "已经位于 '%s'\n"
4131
4132#: builtin/checkout.c:674
4133#, c-format
4134msgid "Switched to and reset branch '%s'\n"
4135msgstr "切换并重置分支 '%s'\n"
4136
4137#: builtin/checkout.c:676 builtin/checkout.c:1065
4138#, c-format
4139msgid "Switched to a new branch '%s'\n"
4140msgstr "切换到一个新分支 '%s'\n"
4141
4142#: builtin/checkout.c:678
4143#, c-format
4144msgid "Switched to branch '%s'\n"
4145msgstr "切换到分支 '%s'\n"
4146
4147#  译者:注意保持前导空格
4148#: builtin/checkout.c:730
4149#, c-format
4150msgid " ... and %d more.\n"
4151msgstr " ... 及其它 %d 个。\n"
4152
4153#: builtin/checkout.c:736
4154#, c-format
4155msgid ""
4156"Warning: you are leaving %d commit behind, not connected to\n"
4157"any of your branches:\n"
4158"\n"
4159"%s\n"
4160msgid_plural ""
4161"Warning: you are leaving %d commits behind, not connected to\n"
4162"any of your branches:\n"
4163"\n"
4164"%s\n"
4165msgstr[0] ""
4166"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4167"\n"
4168"%s\n"
4169msgstr[1] ""
4170"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4171"\n"
4172"%s\n"
4173
4174#: builtin/checkout.c:755
4175#, c-format
4176msgid ""
4177"If you want to keep it by creating a new branch, this may be a good time\n"
4178"to do so with:\n"
4179"\n"
4180" git branch <new-branch-name> %s\n"
4181"\n"
4182msgid_plural ""
4183"If you want to keep them by creating a new branch, this may be a good time\n"
4184"to do so with:\n"
4185"\n"
4186" git branch <new-branch-name> %s\n"
4187"\n"
4188msgstr[0] ""
4189"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4190"如下操作:\n"
4191"\n"
4192" git branch <新分支名> %s\n"
4193"\n"
4194msgstr[1] ""
4195"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4196"如下操作:\n"
4197"\n"
4198" git branch <新分支名> %s\n"
4199"\n"
4200
4201#: builtin/checkout.c:791
4202msgid "internal error in revision walk"
4203msgstr "在版本遍历时遇到内部错误"
4204
4205#: builtin/checkout.c:795
4206msgid "Previous HEAD position was"
4207msgstr "之前的 HEAD 位置是"
4208
4209#: builtin/checkout.c:822 builtin/checkout.c:1060
4210msgid "You are on a branch yet to be born"
4211msgstr "您位于一个尚未初始化的分支"
4212
4213#: builtin/checkout.c:967
4214#, c-format
4215msgid "only one reference expected, %d given."
4216msgstr "只要一个引用,却给出了 %d 个"
4217
4218#: builtin/checkout.c:1006 builtin/worktree.c:210
4219#, c-format
4220msgid "invalid reference: %s"
4221msgstr "无效引用:%s"
4222
4223#: builtin/checkout.c:1035
4224#, c-format
4225msgid "reference is not a tree: %s"
4226msgstr "引用不是一个树:%s"
4227
4228#: builtin/checkout.c:1074
4229msgid "paths cannot be used with switching branches"
4230msgstr "路径不能和切换分支同时使用"
4231
4232#: builtin/checkout.c:1077 builtin/checkout.c:1081
4233#, c-format
4234msgid "'%s' cannot be used with switching branches"
4235msgstr "'%s' 不能和切换分支同时使用"
4236
4237#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
4238#: builtin/checkout.c:1096
4239#, c-format
4240msgid "'%s' cannot be used with '%s'"
4241msgstr "'%s' 不能和 '%s' 同时使用"
4242
4243#: builtin/checkout.c:1101
4244#, c-format
4245msgid "Cannot switch branch to a non-commit '%s'"
4246msgstr "不能切换分支到一个非提交 '%s'"
4247
4248#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
4249#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
4250#: builtin/worktree.c:319
4251msgid "branch"
4252msgstr "分支"
4253
4254#: builtin/checkout.c:1135
4255msgid "create and checkout a new branch"
4256msgstr "创建并检出一个新的分支"
4257
4258#: builtin/checkout.c:1137
4259msgid "create/reset and checkout a branch"
4260msgstr "创建/重置并检出一个分支"
4261
4262#: builtin/checkout.c:1138
4263msgid "create reflog for new branch"
4264msgstr "为新的分支创建引用日志"
4265
4266#: builtin/checkout.c:1139
4267msgid "detach the HEAD at named commit"
4268msgstr "成为指向该提交的分离头指针"
4269
4270#: builtin/checkout.c:1140
4271msgid "set upstream info for new branch"
4272msgstr "为新的分支设置上游信息"
4273
4274#: builtin/checkout.c:1142
4275msgid "new-branch"
4276msgstr "新分支"
4277
4278#: builtin/checkout.c:1142
4279msgid "new unparented branch"
4280msgstr "新的没有父提交的分支"
4281
4282#: builtin/checkout.c:1143
4283msgid "checkout our version for unmerged files"
4284msgstr "对尚未合并的文件检出我们的版本"
4285
4286#: builtin/checkout.c:1145
4287msgid "checkout their version for unmerged files"
4288msgstr "对尚未合并的文件检出他们的版本"
4289
4290#: builtin/checkout.c:1147
4291msgid "force checkout (throw away local modifications)"
4292msgstr "强制检出(丢弃本地修改)"
4293
4294#: builtin/checkout.c:1148
4295msgid "perform a 3-way merge with the new branch"
4296msgstr "和新的分支执行三方合并"
4297
4298#: builtin/checkout.c:1149 builtin/merge.c:227
4299msgid "update ignored files (default)"
4300msgstr "更新忽略的文件(默认)"
4301
4302#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
4303msgid "style"
4304msgstr "风格"
4305
4306#: builtin/checkout.c:1151
4307msgid "conflict style (merge or diff3)"
4308msgstr "冲突输出风格(merge 或 diff3)"
4309
4310#: builtin/checkout.c:1154
4311msgid "do not limit pathspecs to sparse entries only"
4312msgstr "对路径不做稀疏检出的限制"
4313
4314#: builtin/checkout.c:1156
4315msgid "second guess 'git checkout <no-such-branch>'"
4316msgstr "二次猜测'git checkout <无此分支>'"
4317
4318#: builtin/checkout.c:1158
4319msgid "do not check if another worktree is holding the given ref"
4320msgstr "不检查指定的引用是否被其他工作区所占用"
4321
4322#: builtin/checkout.c:1181
4323msgid "-b, -B and --orphan are mutually exclusive"
4324msgstr "-b、-B 和 --orphan 是互斥的"
4325
4326#: builtin/checkout.c:1198
4327msgid "--track needs a branch name"
4328msgstr "--track 需要一个分支名"
4329
4330#: builtin/checkout.c:1203
4331msgid "Missing branch name; try -b"
4332msgstr "缺少分支名;尝试 -b"
4333
4334#: builtin/checkout.c:1239
4335msgid "invalid path specification"
4336msgstr "无效的路径规格"
4337
4338#: builtin/checkout.c:1246
4339#, c-format
4340msgid ""
4341"Cannot update paths and switch to branch '%s' at the same time.\n"
4342"Did you intend to checkout '%s' which can not be resolved as commit?"
4343msgstr ""
4344"不能同时更新路径并切换到分支'%s'。\n"
4345"您是想要检出 '%s' 但其未能解析为提交么?"
4346
4347#: builtin/checkout.c:1251
4348#, c-format
4349msgid "git checkout: --detach does not take a path argument '%s'"
4350msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4351
4352#: builtin/checkout.c:1255
4353msgid ""
4354"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4355"checking out of the index."
4356msgstr ""
4357"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4358
4359#: builtin/clean.c:25
4360msgid ""
4361"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4362msgstr ""
4363"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4364
4365#: builtin/clean.c:29
4366#, c-format
4367msgid "Removing %s\n"
4368msgstr "正删除 %s\n"
4369
4370#: builtin/clean.c:30
4371#, c-format
4372msgid "Would remove %s\n"
4373msgstr "将删除 %s\n"
4374
4375#: builtin/clean.c:31
4376#, c-format
4377msgid "Skipping repository %s\n"
4378msgstr "忽略仓库 %s\n"
4379
4380#: builtin/clean.c:32
4381#, c-format
4382msgid "Would skip repository %s\n"
4383msgstr "将忽略仓库 %s\n"
4384
4385#: builtin/clean.c:33
4386#, c-format
4387msgid "failed to remove %s"
4388msgstr "无法删除 %s"
4389
4390#: builtin/clean.c:317
4391msgid ""
4392"Prompt help:\n"
4393"1          - select a numbered item\n"
4394"foo        - select item based on unique prefix\n"
4395"           - (empty) select nothing"
4396msgstr ""
4397"帮助:\n"
4398"1          - 通过编号选择一个选项\n"
4399"foo        - 通过标题选择一个选项\n"
4400"           - (空)什么也不选择"
4401
4402#: builtin/clean.c:321
4403msgid ""
4404"Prompt help:\n"
4405"1          - select a single item\n"
4406"3-5        - select a range of items\n"
4407"2-3,6-9    - select multiple ranges\n"
4408"foo        - select item based on unique prefix\n"
4409"-...       - unselect specified items\n"
4410"*          - choose all items\n"
4411"           - (empty) finish selecting"
4412msgstr ""
4413"帮助:\n"
4414"1          - 选择一个选项\n"
4415"3-5        - 选择一个范围内的所有选项\n"
4416"2-3,6-9    - 选择多个范围内的所有选项\n"
4417"foo        - 通过标题选择一个选项\n"
4418"-...       - 反选特定的选项\n"
4419"*          - 选择所有选项\n"
4420"           - (空)结束选择"
4421
4422#: builtin/clean.c:537
4423#, c-format
4424msgid "Huh (%s)?"
4425msgstr "嗯(%s)?"
4426
4427#: builtin/clean.c:679
4428#, c-format
4429msgid "Input ignore patterns>> "
4430msgstr "输入模版以排除条目>> "
4431
4432#: builtin/clean.c:716
4433#, c-format
4434msgid "WARNING: Cannot find items matched by: %s"
4435msgstr "警告:无法找到和 %s 匹配的条目"
4436
4437#: builtin/clean.c:737
4438msgid "Select items to delete"
4439msgstr "选择要删除的条目"
4440
4441#. TRANSLATORS: Make sure to keep [y/N] as is
4442#: builtin/clean.c:778
4443#, c-format
4444msgid "Remove %s [y/N]? "
4445msgstr "删除 %s [y/N]?"
4446
4447#: builtin/clean.c:803
4448msgid "Bye."
4449msgstr "再见。"
4450
4451#: builtin/clean.c:811
4452msgid ""
4453"clean               - start cleaning\n"
4454"filter by pattern   - exclude items from deletion\n"
4455"select by numbers   - select items to be deleted by numbers\n"
4456"ask each            - confirm each deletion (like \"rm -i\")\n"
4457"quit                - stop cleaning\n"
4458"help                - this screen\n"
4459"?                   - help for prompt selection"
4460msgstr ""
4461"clean               - 开始清理\n"
4462"filter by pattern   - 通过模版排除要删除的条目\n"
4463"select by numbers   - 通过数字选择要删除的条目\n"
4464"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
4465"quit                - 停止删除并退出\n"
4466"help                - 显示本帮助\n"
4467"?                   - 显示如何在提示符下选择的帮助"
4468
4469#: builtin/clean.c:838
4470msgid "*** Commands ***"
4471msgstr "*** 命令 ***"
4472
4473#: builtin/clean.c:839
4474msgid "What now"
4475msgstr "请选择"
4476
4477#: builtin/clean.c:847
4478msgid "Would remove the following item:"
4479msgid_plural "Would remove the following items:"
4480msgstr[0] "将删除如下条目:"
4481msgstr[1] "将删除如下条目:"
4482
4483#: builtin/clean.c:864
4484msgid "No more files to clean, exiting."
4485msgstr "没有要清理的文件,退出。"
4486
4487#: builtin/clean.c:895
4488msgid "do not print names of files removed"
4489msgstr "不打印删除文件的名称"
4490
4491#: builtin/clean.c:897
4492msgid "force"
4493msgstr "强制"
4494
4495#: builtin/clean.c:898
4496msgid "interactive cleaning"
4497msgstr "交互式清除"
4498
4499#: builtin/clean.c:900
4500msgid "remove whole directories"
4501msgstr "删除整个目录"
4502
4503#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
4504#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
4505msgid "pattern"
4506msgstr "模式"
4507
4508#: builtin/clean.c:902
4509msgid "add <pattern> to ignore rules"
4510msgstr "添加 <模式> 到忽略规则"
4511
4512#: builtin/clean.c:903
4513msgid "remove ignored files, too"
4514msgstr "也删除忽略的文件"
4515
4516#: builtin/clean.c:905
4517msgid "remove only ignored files"
4518msgstr "只删除忽略的文件"
4519
4520#: builtin/clean.c:923
4521msgid "-x and -X cannot be used together"
4522msgstr "-x 和 -X 不能同时使用"
4523
4524#: builtin/clean.c:927
4525msgid ""
4526"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4527"clean"
4528msgstr ""
4529"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4530
4531#: builtin/clean.c:930
4532msgid ""
4533"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4534"refusing to clean"
4535msgstr ""
4536"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4537
4538#: builtin/clone.c:37
4539msgid "git clone [<options>] [--] <repo> [<dir>]"
4540msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4541
4542#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
4543#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
4544msgid "force progress reporting"
4545msgstr "强制显示进度报告"
4546
4547#: builtin/clone.c:59
4548msgid "don't create a checkout"
4549msgstr "不创建一个检出"
4550
4551#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
4552msgid "create a bare repository"
4553msgstr "创建一个纯仓库"
4554
4555#: builtin/clone.c:64
4556msgid "create a mirror repository (implies bare)"
4557msgstr "创建一个镜像仓库(也是纯仓库)"
4558
4559#: builtin/clone.c:66
4560msgid "to clone from a local repository"
4561msgstr "从本地仓库克隆"
4562
4563#: builtin/clone.c:68
4564msgid "don't use local hardlinks, always copy"
4565msgstr "不使用本地硬链接,始终复制"
4566
4567#: builtin/clone.c:70
4568msgid "setup as shared repository"
4569msgstr "设置为共享仓库"
4570
4571#: builtin/clone.c:72 builtin/clone.c:74
4572msgid "initialize submodules in the clone"
4573msgstr "在克隆时初始化子模组"
4574
4575#: builtin/clone.c:75 builtin/init-db.c:501
4576msgid "template-directory"
4577msgstr "模板目录"
4578
4579#: builtin/clone.c:76 builtin/init-db.c:502
4580msgid "directory from which templates will be used"
4581msgstr "模板目录将被使用"
4582
4583#: builtin/clone.c:78
4584msgid "reference repository"
4585msgstr "参考仓库"
4586
4587#: builtin/clone.c:80
4588msgid "use --reference only while cloning"
4589msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4590
4591#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4592msgid "name"
4593msgstr "名称"
4594
4595#: builtin/clone.c:82
4596msgid "use <name> instead of 'origin' to track upstream"
4597msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4598
4599#: builtin/clone.c:84
4600msgid "checkout <branch> instead of the remote's HEAD"
4601msgstr "检出 <分支> 而不是远程 HEAD"
4602
4603#: builtin/clone.c:86
4604msgid "path to git-upload-pack on the remote"
4605msgstr "远程 git-upload-pack 路径"
4606
4607#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
4608#: builtin/pull.c:186
4609msgid "depth"
4610msgstr "深度"
4611
4612#: builtin/clone.c:88
4613msgid "create a shallow clone of that depth"
4614msgstr "创建一个指定深度的浅克隆"
4615
4616#: builtin/clone.c:90
4617msgid "clone only one branch, HEAD or --branch"
4618msgstr "只克隆一个分支、HEAD 或 --branch"
4619
4620#: builtin/clone.c:91 builtin/init-db.c:510
4621msgid "gitdir"
4622msgstr "git目录"
4623
4624#: builtin/clone.c:92 builtin/init-db.c:511
4625msgid "separate git dir from working tree"
4626msgstr "git目录和工作区分离"
4627
4628#: builtin/clone.c:93
4629msgid "key=value"
4630msgstr "key=value"
4631
4632#: builtin/clone.c:94
4633msgid "set config inside the new repository"
4634msgstr "在新仓库中设置配置信息"
4635
4636#: builtin/clone.c:298
4637#, c-format
4638msgid "reference repository '%s' is not a local repository."
4639msgstr "参考仓库 '%s' 不是一个本地仓库。"
4640
4641#: builtin/clone.c:302
4642#, c-format
4643msgid "reference repository '%s' is shallow"
4644msgstr "参考仓库 '%s' 是一个浅克隆"
4645
4646#: builtin/clone.c:305
4647#, c-format
4648msgid "reference repository '%s' is grafted"
4649msgstr "参考仓库 '%s' 已被嫁接"
4650
4651#: builtin/clone.c:370 builtin/diff.c:84
4652#, c-format
4653msgid "failed to stat '%s'"
4654msgstr "无法枚举 '%s' 状态"
4655
4656#: builtin/clone.c:372
4657#, c-format
4658msgid "%s exists and is not a directory"
4659msgstr "%s 存在且不是一个目录"
4660
4661#: builtin/clone.c:386
4662#, c-format
4663msgid "failed to stat %s\n"
4664msgstr "无法枚举 %s 状态\n"
4665
4666#: builtin/clone.c:408
4667#, c-format
4668msgid "failed to create link '%s'"
4669msgstr "无法创建链接 '%s'"
4670
4671#: builtin/clone.c:412
4672#, c-format
4673msgid "failed to copy file to '%s'"
4674msgstr "无法拷贝文件至 '%s'"
4675
4676#: builtin/clone.c:435 builtin/clone.c:619
4677#, c-format
4678msgid "done.\n"
4679msgstr "完成。\n"
4680
4681#: builtin/clone.c:447
4682msgid ""
4683"Clone succeeded, but checkout failed.\n"
4684"You can inspect what was checked out with 'git status'\n"
4685"and retry the checkout with 'git checkout -f HEAD'\n"
4686msgstr ""
4687"克隆成功,但是检出失败。\n"
4688"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4689"'git checkout -f HEAD' 重试\n"
4690
4691#: builtin/clone.c:524
4692#, c-format
4693msgid "Could not find remote branch %s to clone."
4694msgstr "不能发现要克隆的远程分支 %s。"
4695
4696#: builtin/clone.c:614
4697#, c-format
4698msgid "Checking connectivity... "
4699msgstr "检查连接... "
4700
4701#: builtin/clone.c:617
4702msgid "remote did not send all necessary objects"
4703msgstr "远程没有发送所有必须的对象"
4704
4705#: builtin/clone.c:681
4706msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4707msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4708
4709#: builtin/clone.c:712
4710msgid "unable to checkout working tree"
4711msgstr "不能检出工作区"
4712
4713#: builtin/clone.c:799
4714msgid "cannot repack to clean up"
4715msgstr "无法执行 repack 来清理"
4716
4717#: builtin/clone.c:801
4718msgid "cannot unlink temporary alternates file"
4719msgstr "无法删除临时的 alternates 文件"
4720
4721#: builtin/clone.c:831
4722msgid "Too many arguments."
4723msgstr "太多参数。"
4724
4725#: builtin/clone.c:835
4726msgid "You must specify a repository to clone."
4727msgstr "您必须指定一个仓库来克隆。"
4728
4729#: builtin/clone.c:846
4730#, c-format
4731msgid "--bare and --origin %s options are incompatible."
4732msgstr "--bare 和 --origin %s 选项不兼容。"
4733
4734#: builtin/clone.c:849
4735msgid "--bare and --separate-git-dir are incompatible."
4736msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4737
4738#: builtin/clone.c:862
4739#, c-format
4740msgid "repository '%s' does not exist"
4741msgstr "仓库 '%s' 不存在"
4742
4743#: builtin/clone.c:868 builtin/fetch.c:1168
4744#, c-format
4745msgid "depth %s is not a positive number"
4746msgstr "深度 %s 不是一个正数"
4747
4748#: builtin/clone.c:878
4749#, c-format
4750msgid "destination path '%s' already exists and is not an empty directory."
4751msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4752
4753#: builtin/clone.c:888
4754#, c-format
4755msgid "working tree '%s' already exists."
4756msgstr "工作区 '%s' 已经存在。"
4757
4758#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
4759#: builtin/worktree.c:245
4760#, c-format
4761msgid "could not create leading directories of '%s'"
4762msgstr "不能为 '%s' 创建先导目录"
4763
4764#: builtin/clone.c:906
4765#, c-format
4766msgid "could not create work tree dir '%s'"
4767msgstr "不能创建工作区目录 '%s'"
4768
4769#: builtin/clone.c:924
4770#, c-format
4771msgid "Cloning into bare repository '%s'...\n"
4772msgstr "克隆到纯仓库 '%s'...\n"
4773
4774#: builtin/clone.c:926
4775#, c-format
4776msgid "Cloning into '%s'...\n"
4777msgstr "正克隆到 '%s'...\n"
4778
4779#: builtin/clone.c:951
4780msgid "--dissociate given, but there is no --reference"
4781msgstr "提供了参数 --dissociate,但未提供 --reference"
4782
4783#: builtin/clone.c:968
4784msgid "--depth is ignored in local clones; use file:// instead."
4785msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4786
4787#: builtin/clone.c:971
4788msgid "source repository is shallow, ignoring --local"
4789msgstr "源仓库是浅克隆,忽略 --local"
4790
4791#: builtin/clone.c:976
4792msgid "--local is ignored"
4793msgstr "--local 被忽略"
4794
4795#: builtin/clone.c:980
4796#, c-format
4797msgid "Don't know how to clone %s"
4798msgstr "不知道如何克隆 %s"
4799
4800#: builtin/clone.c:1029 builtin/clone.c:1037
4801#, c-format
4802msgid "Remote branch %s not found in upstream %s"
4803msgstr "远程分支 %s 在上游 %s 未发现"
4804
4805#: builtin/clone.c:1040
4806msgid "You appear to have cloned an empty repository."
4807msgstr "您似乎克隆了一个空仓库。"
4808
4809#: builtin/column.c:9
4810msgid "git column [<options>]"
4811msgstr "git column [<选项>]"
4812
4813#: builtin/column.c:26
4814msgid "lookup config vars"
4815msgstr "查找配置变量"
4816
4817#: builtin/column.c:27 builtin/column.c:28
4818msgid "layout to use"
4819msgstr "要使用的布局"
4820
4821#: builtin/column.c:29
4822msgid "Maximum width"
4823msgstr "最大宽度"
4824
4825#: builtin/column.c:30
4826msgid "Padding space on left border"
4827msgstr "左边框的填充空间"
4828
4829#: builtin/column.c:31
4830msgid "Padding space on right border"
4831msgstr "右边框的填充空间"
4832
4833#: builtin/column.c:32
4834msgid "Padding space between columns"
4835msgstr "两列之间的填充空间"
4836
4837#: builtin/column.c:51
4838msgid "--command must be the first argument"
4839msgstr "--command 必须是第一个参数"
4840
4841#: builtin/commit.c:37
4842msgid "git commit [<options>] [--] <pathspec>..."
4843msgstr "git commit [<选项>] [--] <路径规格>..."
4844
4845#: builtin/commit.c:42
4846msgid "git status [<options>] [--] <pathspec>..."
4847msgstr "git status [<选项>] [--] <路径规格>..."
4848
4849#: builtin/commit.c:47
4850msgid ""
4851"Your name and email address were configured automatically based\n"
4852"on your username and hostname. Please check that they are accurate.\n"
4853"You can suppress this message by setting them explicitly. Run the\n"
4854"following command and follow the instructions in your editor to edit\n"
4855"your configuration file:\n"
4856"\n"
4857"    git config --global --edit\n"
4858"\n"
4859"After doing this, you may fix the identity used for this commit with:\n"
4860"\n"
4861"    git commit --amend --reset-author\n"
4862msgstr ""
4863"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4864"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4865"中编辑您的配置文件:\n"
4866"\n"
4867"    git config --global --edit\n"
4868"\n"
4869"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4870"\n"
4871"    git commit --amend --reset-author\n"
4872
4873#: builtin/commit.c:60
4874msgid ""
4875"Your name and email address were configured automatically based\n"
4876"on your username and hostname. Please check that they are accurate.\n"
4877"You can suppress this message by setting them explicitly:\n"
4878"\n"
4879"    git config --global user.name \"Your Name\"\n"
4880"    git config --global user.email you@example.com\n"
4881"\n"
4882"After doing this, you may fix the identity used for this commit with:\n"
4883"\n"
4884"    git commit --amend --reset-author\n"
4885msgstr ""
4886"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4887"与否。您可以对其进行设置以免再出现本提示信息:\n"
4888"\n"
4889"    git config --global user.name \"Your Name\"\n"
4890"    git config --global user.email you@example.com\n"
4891"\n"
4892"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4893"\n"
4894"    git commit --amend --reset-author\n"
4895
4896#: builtin/commit.c:72
4897msgid ""
4898"You asked to amend the most recent commit, but doing so would make\n"
4899"it empty. You can repeat your command with --allow-empty, or you can\n"
4900"remove the commit entirely with \"git reset HEAD^\".\n"
4901msgstr ""
4902"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4903"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4904
4905#: builtin/commit.c:77
4906msgid ""
4907"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4908"If you wish to commit it anyway, use:\n"
4909"\n"
4910"    git commit --allow-empty\n"
4911"\n"
4912msgstr ""
4913"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4914"也要提交,使用命令:\n"
4915"\n"
4916"    git commit --allow-empty\n"
4917"\n"
4918
4919#: builtin/commit.c:84
4920msgid "Otherwise, please use 'git reset'\n"
4921msgstr "否则,请使用命令 'git reset'\n"
4922
4923#: builtin/commit.c:87
4924msgid ""
4925"If you wish to skip this commit, use:\n"
4926"\n"
4927"    git reset\n"
4928"\n"
4929"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4930"the remaining commits.\n"
4931msgstr ""
4932"如果您想跳过这个提交,使用命令:\n"
4933"\n"
4934"    git reset\n"
4935"\n"
4936"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4937"操作。\n"
4938
4939#: builtin/commit.c:304
4940msgid "failed to unpack HEAD tree object"
4941msgstr "无法解包 HEAD 树对象"
4942
4943#: builtin/commit.c:345
4944msgid "unable to create temporary index"
4945msgstr "不能创建临时索引"
4946
4947#: builtin/commit.c:351
4948msgid "interactive add failed"
4949msgstr "交互式添加失败"
4950
4951#: builtin/commit.c:364
4952msgid "unable to update temporary index"
4953msgstr "无法更新临时索引"
4954
4955#: builtin/commit.c:366
4956msgid "Failed to update main cache tree"
4957msgstr "不能更新树的主缓存"
4958
4959#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
4960msgid "unable to write new_index file"
4961msgstr "无法写 new_index 文件"
4962
4963#: builtin/commit.c:444
4964msgid "cannot do a partial commit during a merge."
4965msgstr "在合并过程中不能做部分提交。"
4966
4967#: builtin/commit.c:446
4968msgid "cannot do a partial commit during a cherry-pick."
4969msgstr "在拣选过程中不能做部分提交。"
4970
4971#: builtin/commit.c:455
4972msgid "cannot read the index"
4973msgstr "无法读取索引"
4974
4975#: builtin/commit.c:474
4976msgid "unable to write temporary index file"
4977msgstr "无法写临时索引文件"
4978
4979#: builtin/commit.c:579
4980#, c-format
4981msgid "commit '%s' lacks author header"
4982msgstr "提交 '%s' 缺少作者信息"
4983
4984#: builtin/commit.c:581
4985#, c-format
4986msgid "commit '%s' has malformed author line"
4987msgstr "提交 '%s' 有非法的作者信息"
4988
4989#: builtin/commit.c:600
4990msgid "malformed --author parameter"
4991msgstr "非法的 --author 参数"
4992
4993#: builtin/commit.c:608
4994#, c-format
4995msgid "invalid date format: %s"
4996msgstr "无效的日期格式:%s"
4997
4998#: builtin/commit.c:652
4999msgid ""
5000"unable to select a comment character that is not used\n"
5001"in the current commit message"
5002msgstr "无法选择一个未被当前提交说明使用的注释字符"
5003
5004#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
5005#, c-format
5006msgid "could not lookup commit %s"
5007msgstr "不能查询提交 %s"
5008
5009#: builtin/commit.c:701 builtin/shortlog.c:273
5010#, c-format
5011msgid "(reading log message from standard input)\n"
5012msgstr "(正从标准输入中读取日志信息)\n"
5013
5014#: builtin/commit.c:703
5015msgid "could not read log from standard input"
5016msgstr "不能从标准输入中读取日志信息"
5017
5018#: builtin/commit.c:707
5019#, c-format
5020msgid "could not read log file '%s'"
5021msgstr "不能读取日志文件 '%s'"
5022
5023#: builtin/commit.c:729
5024msgid "could not read MERGE_MSG"
5025msgstr "不能读取 MERGE_MSG"
5026
5027#: builtin/commit.c:733
5028msgid "could not read SQUASH_MSG"
5029msgstr "不能读取 SQUASH_MSG"
5030
5031#: builtin/commit.c:784
5032msgid "could not write commit template"
5033msgstr "不能写提交模版"
5034
5035#: builtin/commit.c:802
5036#, c-format
5037msgid ""
5038"\n"
5039"It looks like you may be committing a merge.\n"
5040"If this is not correct, please remove the file\n"
5041"\t%s\n"
5042"and try again.\n"
5043msgstr ""
5044"\n"
5045"似乎您正在做一个合并提交。如果不对,请删除文件\n"
5046"\t%s\n"
5047"然后重试。\n"
5048
5049#: builtin/commit.c:807
5050#, c-format
5051msgid ""
5052"\n"
5053"It looks like you may be committing a cherry-pick.\n"
5054"If this is not correct, please remove the file\n"
5055"\t%s\n"
5056"and try again.\n"
5057msgstr ""
5058"\n"
5059"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5060"\t%s\n"
5061"然后重试。\n"
5062
5063#: builtin/commit.c:820
5064#, c-format
5065msgid ""
5066"Please enter the commit message for your changes. Lines starting\n"
5067"with '%c' will be ignored, and an empty message aborts the commit.\n"
5068msgstr ""
5069"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5070"说明将会终止提交。\n"
5071
5072#: builtin/commit.c:827
5073#, c-format
5074msgid ""
5075"Please enter the commit message for your changes. Lines starting\n"
5076"with '%c' will be kept; you may remove them yourself if you want to.\n"
5077"An empty message aborts the commit.\n"
5078msgstr ""
5079"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5080"也可以删除它们。一个空的提交说明将会终止提交。\n"
5081
5082#  译者:为保证在输出中对齐,注意调整句中空格!
5083#: builtin/commit.c:847
5084#, c-format
5085msgid "%sAuthor:    %.*s <%.*s>"
5086msgstr "%s作者:  %.*s <%.*s>"
5087
5088#  译者:为保证在输出中对齐,注意调整句中空格!
5089#: builtin/commit.c:855
5090#, c-format
5091msgid "%sDate:      %s"
5092msgstr "%s日期:  %s"
5093
5094#  译者:为保证在输出中对齐,注意调整句中空格!
5095#: builtin/commit.c:862
5096#, c-format
5097msgid "%sCommitter: %.*s <%.*s>"
5098msgstr "%s提交者:%.*s <%.*s>"
5099
5100#: builtin/commit.c:880
5101msgid "Cannot read index"
5102msgstr "无法读取索引"
5103
5104#: builtin/commit.c:937
5105msgid "Error building trees"
5106msgstr "无法创建树对象"
5107
5108#: builtin/commit.c:952 builtin/tag.c:495
5109#, c-format
5110msgid "Please supply the message using either -m or -F option.\n"
5111msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5112
5113#: builtin/commit.c:1054
5114#, c-format
5115msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5116msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5117
5118#: builtin/commit.c:1069 builtin/commit.c:1309
5119#, c-format
5120msgid "Invalid untracked files mode '%s'"
5121msgstr "无效的未追踪文件参数 '%s'"
5122
5123#: builtin/commit.c:1106
5124msgid "--long and -z are incompatible"
5125msgstr "--long 和 -z 选项不兼容"
5126
5127#: builtin/commit.c:1136
5128msgid "Using both --reset-author and --author does not make sense"
5129msgstr "同时使用 --reset-author 和 --author 没有意义"
5130
5131#: builtin/commit.c:1145
5132msgid "You have nothing to amend."
5133msgstr "您没有可修补的提交。"
5134
5135#: builtin/commit.c:1148
5136msgid "You are in the middle of a merge -- cannot amend."
5137msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5138
5139#: builtin/commit.c:1150
5140msgid "You are in the middle of a cherry-pick -- cannot amend."
5141msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5142
5143#: builtin/commit.c:1153
5144msgid "Options --squash and --fixup cannot be used together"
5145msgstr "选项 --squash 和 --fixup 不能同时使用"
5146
5147#: builtin/commit.c:1163
5148msgid "Only one of -c/-C/-F/--fixup can be used."
5149msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5150
5151#: builtin/commit.c:1165
5152msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5153msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5154
5155#: builtin/commit.c:1173
5156msgid "--reset-author can be used only with -C, -c or --amend."
5157msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5158
5159#: builtin/commit.c:1190
5160msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5161msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5162
5163#: builtin/commit.c:1192
5164msgid "No paths with --include/--only does not make sense."
5165msgstr "参数 --include/--only 不跟路径没有意义。"
5166
5167#: builtin/commit.c:1194
5168msgid "Clever... amending the last one with dirty index."
5169msgstr "聪明... 用脏索引修补最后一个提交。"
5170
5171#: builtin/commit.c:1196
5172msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5173msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5174
5175#: builtin/commit.c:1208 builtin/tag.c:730
5176#, c-format
5177msgid "Invalid cleanup mode %s"
5178msgstr "无效的清理模式 %s"
5179
5180#: builtin/commit.c:1213
5181msgid "Paths with -a does not make sense."
5182msgstr "路径和 -a 选项同时使用没有意义。"
5183
5184#: builtin/commit.c:1323 builtin/commit.c:1602
5185msgid "show status concisely"
5186msgstr "以简洁的格式显示状态"
5187
5188#: builtin/commit.c:1325 builtin/commit.c:1604
5189msgid "show branch information"
5190msgstr "显示分支信息"
5191
5192#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
5193msgid "machine-readable output"
5194msgstr "机器可读的输出"
5195
5196#: builtin/commit.c:1330 builtin/commit.c:1608
5197msgid "show status in long format (default)"
5198msgstr "以长格式显示状态(默认)"
5199
5200#: builtin/commit.c:1333 builtin/commit.c:1611
5201msgid "terminate entries with NUL"
5202msgstr "条目以 NUL 字符结尾"
5203
5204#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
5205#: builtin/fast-export.c:984 builtin/tag.c:604
5206msgid "mode"
5207msgstr "模式"
5208
5209#: builtin/commit.c:1336 builtin/commit.c:1614
5210msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5211msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5212
5213#: builtin/commit.c:1339
5214msgid "show ignored files"
5215msgstr "显示忽略的文件"
5216
5217#: builtin/commit.c:1340 parse-options.h:155
5218msgid "when"
5219msgstr "何时"
5220
5221#: builtin/commit.c:1341
5222msgid ""
5223"ignore changes to submodules, optional when: all, dirty, untracked. "
5224"(Default: all)"
5225msgstr ""
5226"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5227
5228#: builtin/commit.c:1343
5229msgid "list untracked files in columns"
5230msgstr "以列的方式显示未跟踪的文件"
5231
5232#: builtin/commit.c:1429
5233msgid "couldn't look up newly created commit"
5234msgstr "无法找到新创建的提交"
5235
5236#: builtin/commit.c:1431
5237msgid "could not parse newly created commit"
5238msgstr "不能解析新创建的提交"
5239
5240#: builtin/commit.c:1476
5241msgid "detached HEAD"
5242msgstr "分离头指针"
5243
5244#  译者:中文字符串拼接,可删除前导空格
5245#: builtin/commit.c:1479
5246msgid " (root-commit)"
5247msgstr "(根提交)"
5248
5249#: builtin/commit.c:1572
5250msgid "suppress summary after successful commit"
5251msgstr "提交成功后不显示概述信息"
5252
5253#: builtin/commit.c:1573
5254msgid "show diff in commit message template"
5255msgstr "在提交说明模板里显示差异"
5256
5257#: builtin/commit.c:1575
5258msgid "Commit message options"
5259msgstr "提交说明选项"
5260
5261#: builtin/commit.c:1576 builtin/tag.c:602
5262msgid "read message from file"
5263msgstr "从文件中读取提交说明"
5264
5265#: builtin/commit.c:1577
5266msgid "author"
5267msgstr "作者"
5268
5269#: builtin/commit.c:1577
5270msgid "override author for commit"
5271msgstr "提交时覆盖作者"
5272
5273#: builtin/commit.c:1578 builtin/gc.c:268
5274msgid "date"
5275msgstr "日期"
5276
5277#: builtin/commit.c:1578
5278msgid "override date for commit"
5279msgstr "提交时覆盖日期"
5280
5281#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
5282#: builtin/notes.c:555 builtin/tag.c:600
5283msgid "message"
5284msgstr "说明"
5285
5286#: builtin/commit.c:1579
5287msgid "commit message"
5288msgstr "提交说明"
5289
5290#: builtin/commit.c:1580
5291msgid "reuse and edit message from specified commit"
5292msgstr "重用并编辑指定提交的提交说明"
5293
5294#: builtin/commit.c:1581
5295msgid "reuse message from specified commit"
5296msgstr "重用指定提交的提交说明"
5297
5298#: builtin/commit.c:1582
5299msgid "use autosquash formatted message to fixup specified commit"
5300msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5301
5302#: builtin/commit.c:1583
5303msgid "use autosquash formatted message to squash specified commit"
5304msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5305
5306#: builtin/commit.c:1584
5307msgid "the commit is authored by me now (used with -C/-c/--amend)"
5308msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5309
5310#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
5311msgid "add Signed-off-by:"
5312msgstr "添加 Signed-off-by: 签名"
5313
5314#: builtin/commit.c:1586
5315msgid "use specified template file"
5316msgstr "使用指定的模板文件"
5317
5318#: builtin/commit.c:1587
5319msgid "force edit of commit"
5320msgstr "强制编辑提交"
5321
5322#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5323#: builtin/commit.c:1588
5324msgid "default"
5325msgstr "default"
5326
5327#: builtin/commit.c:1588 builtin/tag.c:605
5328msgid "how to strip spaces and #comments from message"
5329msgstr "设置如何删除提交说明里的空格和#注释"
5330
5331#: builtin/commit.c:1589
5332msgid "include status in commit message template"
5333msgstr "在提交说明模板里包含状态信息"
5334
5335#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
5336#: builtin/revert.c:93
5337msgid "GPG sign commit"
5338msgstr "GPG 提交签名"
5339
5340#: builtin/commit.c:1594
5341msgid "Commit contents options"
5342msgstr "提交内容选项"
5343
5344#: builtin/commit.c:1595
5345msgid "commit all changed files"
5346msgstr "提交所有改动的文件"
5347
5348#: builtin/commit.c:1596
5349msgid "add specified files to index for commit"
5350msgstr "添加指定的文件到索引区等待提交"
5351
5352#: builtin/commit.c:1597
5353msgid "interactively add files"
5354msgstr "交互式添加文件"
5355
5356#: builtin/commit.c:1598
5357msgid "interactively add changes"
5358msgstr "交互式添加变更"
5359
5360#: builtin/commit.c:1599
5361msgid "commit only specified files"
5362msgstr "只提交指定的文件"
5363
5364#: builtin/commit.c:1600
5365msgid "bypass pre-commit hook"
5366msgstr "绕过 pre-commit 钩子"
5367
5368#: builtin/commit.c:1601
5369msgid "show what would be committed"
5370msgstr "显示将要提交的内容"
5371
5372#: builtin/commit.c:1612
5373msgid "amend previous commit"
5374msgstr "修改先前的提交"
5375
5376#: builtin/commit.c:1613
5377msgid "bypass post-rewrite hook"
5378msgstr "绕过 post-rewrite 钩子"
5379
5380#: builtin/commit.c:1618
5381msgid "ok to record an empty change"
5382msgstr "允许一个空提交"
5383
5384#: builtin/commit.c:1620
5385msgid "ok to record a change with an empty message"
5386msgstr "允许空的提交说明"
5387
5388#: builtin/commit.c:1649
5389msgid "could not parse HEAD commit"
5390msgstr "不能解析 HEAD 提交"
5391
5392#: builtin/commit.c:1695
5393#, c-format
5394msgid "Corrupt MERGE_HEAD file (%s)"
5395msgstr "损坏的 MERGE_HEAD 文件(%s)"
5396
5397#: builtin/commit.c:1702
5398msgid "could not read MERGE_MODE"
5399msgstr "不能读取 MERGE_MODE"
5400
5401#: builtin/commit.c:1721
5402#, c-format
5403msgid "could not read commit message: %s"
5404msgstr "不能读取提交说明:%s"
5405
5406#: builtin/commit.c:1732
5407#, c-format
5408msgid "Aborting commit; you did not edit the message.\n"
5409msgstr "终止提交;您未更改来自模版的提交说明。\n"
5410
5411#: builtin/commit.c:1737
5412#, c-format
5413msgid "Aborting commit due to empty commit message.\n"
5414msgstr "终止提交因为提交说明为空。\n"
5415
5416#: builtin/commit.c:1785
5417msgid ""
5418"Repository has been updated, but unable to write\n"
5419"new_index file. Check that disk is not full and quota is\n"
5420"not exceeded, and then \"git reset HEAD\" to recover."
5421msgstr ""
5422"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5423"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5424
5425#: builtin/config.c:8
5426msgid "git config [<options>]"
5427msgstr "git config [<选项>]"
5428
5429#: builtin/config.c:54
5430msgid "Config file location"
5431msgstr "配置文件位置"
5432
5433#: builtin/config.c:55
5434msgid "use global config file"
5435msgstr "使用全局配置文件"
5436
5437#: builtin/config.c:56
5438msgid "use system config file"
5439msgstr "使用系统级配置文件"
5440
5441#: builtin/config.c:57
5442msgid "use repository config file"
5443msgstr "使用仓库级配置文件"
5444
5445#: builtin/config.c:58
5446msgid "use given config file"
5447msgstr "使用指定的配置文件"
5448
5449#: builtin/config.c:59
5450msgid "blob-id"
5451msgstr "数据对象 ID"
5452
5453#: builtin/config.c:59
5454msgid "read config from given blob object"
5455msgstr "从给定的数据对象读取配置"
5456
5457#: builtin/config.c:60
5458msgid "Action"
5459msgstr "操作"
5460
5461#: builtin/config.c:61
5462msgid "get value: name [value-regex]"
5463msgstr "获取值:name [value-regex]"
5464
5465#: builtin/config.c:62
5466msgid "get all values: key [value-regex]"
5467msgstr "获得所有的值:key [value-regex]"
5468
5469#: builtin/config.c:63
5470msgid "get values for regexp: name-regex [value-regex]"
5471msgstr "根据正则表达式获得值:name-regex [value-regex]"
5472
5473#: builtin/config.c:64
5474msgid "get value specific for the URL: section[.var] URL"
5475msgstr "获得 URL 取值:section[.var] URL"
5476
5477#: builtin/config.c:65
5478msgid "replace all matching variables: name value [value_regex]"
5479msgstr "替换所有匹配的变量:name value [value_regex]"
5480
5481#: builtin/config.c:66
5482msgid "add a new variable: name value"
5483msgstr "添加一个新的变量:name value"
5484
5485#: builtin/config.c:67
5486msgid "remove a variable: name [value-regex]"
5487msgstr "删除一个变量:name [value-regex]"
5488
5489#: builtin/config.c:68
5490msgid "remove all matches: name [value-regex]"
5491msgstr "删除所有匹配项:name [value-regex]"
5492
5493#: builtin/config.c:69
5494msgid "rename section: old-name new-name"
5495msgstr "重命名小节:old-name new-name"
5496
5497#: builtin/config.c:70
5498msgid "remove a section: name"
5499msgstr "删除一个小节:name"
5500
5501#: builtin/config.c:71
5502msgid "list all"
5503msgstr "列出所有"
5504
5505#: builtin/config.c:72
5506msgid "open an editor"
5507msgstr "打开一个编辑器"
5508
5509#: builtin/config.c:73
5510msgid "find the color configured: slot [default]"
5511msgstr "获得配置的颜色:配置 [默认]"
5512
5513#: builtin/config.c:74
5514msgid "find the color setting: slot [stdout-is-tty]"
5515msgstr "获得颜色设置:配置 [stdout-is-tty]"
5516
5517#: builtin/config.c:75
5518msgid "Type"
5519msgstr "类型"
5520
5521#: builtin/config.c:76
5522msgid "value is \"true\" or \"false\""
5523msgstr "值是 \"true\" 或 \"false\""
5524
5525#: builtin/config.c:77
5526msgid "value is decimal number"
5527msgstr "值是十进制数"
5528
5529#: builtin/config.c:78
5530msgid "value is --bool or --int"
5531msgstr "值是 --bool or --int"
5532
5533#: builtin/config.c:79
5534msgid "value is a path (file or directory name)"
5535msgstr "值是一个路径(文件或目录名)"
5536
5537#: builtin/config.c:80
5538msgid "Other"
5539msgstr "其它"
5540
5541#: builtin/config.c:81
5542msgid "terminate values with NUL byte"
5543msgstr "终止值是 NUL 字节"
5544
5545#: builtin/config.c:82
5546msgid "show variable names only"
5547msgstr "只显示变量名"
5548
5549#: builtin/config.c:83
5550msgid "respect include directives on lookup"
5551msgstr "查询时参照 include 指令递归查找"
5552
5553#: builtin/config.c:311
5554msgid "unable to parse default color value"
5555msgstr "不能解析默认颜色值"
5556
5557#: builtin/config.c:449
5558#, c-format
5559msgid ""
5560"# This is Git's per-user configuration file.\n"
5561"[user]\n"
5562"# Please adapt and uncomment the following lines:\n"
5563"#\tname = %s\n"
5564"#\temail = %s\n"
5565msgstr ""
5566"# This is Git's per-user configuration file.\n"
5567"[user]\n"
5568"# Please adapt and uncomment the following lines:\n"
5569"#\tname = %s\n"
5570"#\temail = %s\n"
5571
5572#: builtin/config.c:583
5573#, c-format
5574msgid "cannot create configuration file %s"
5575msgstr "不能创建配置文件 %s"
5576
5577#: builtin/count-objects.c:55
5578msgid "git count-objects [-v] [-H | --human-readable]"
5579msgstr "git count-objects [-v] [-H | --human-readable]"
5580
5581#: builtin/count-objects.c:65
5582msgid "print sizes in human readable format"
5583msgstr "以用户可读的格式显示大小"
5584
5585#: builtin/describe.c:17
5586msgid "git describe [<options>] [<commit-ish>...]"
5587msgstr "git describe [<选项>] [<提交号>...]"
5588
5589#: builtin/describe.c:18
5590msgid "git describe [<options>] --dirty"
5591msgstr "git describe [<选项>] --dirty"
5592
5593#: builtin/describe.c:217
5594#, c-format
5595msgid "annotated tag %s not available"
5596msgstr "附注标签 %s 无效"
5597
5598#: builtin/describe.c:221
5599#, c-format
5600msgid "annotated tag %s has no embedded name"
5601msgstr "附注标签 %s 没有嵌入名称"
5602
5603#: builtin/describe.c:223
5604#, c-format
5605msgid "tag '%s' is really '%s' here"
5606msgstr "标签 '%s' 的确是在 '%s'"
5607
5608#: builtin/describe.c:250 builtin/log.c:459
5609#, c-format
5610msgid "Not a valid object name %s"
5611msgstr "不是一个有效的对象名 %s"
5612
5613#: builtin/describe.c:253
5614#, c-format
5615msgid "%s is not a valid '%s' object"
5616msgstr "%s 不是一个有效的 '%s' 对象"
5617
5618#: builtin/describe.c:270
5619#, c-format
5620msgid "no tag exactly matches '%s'"
5621msgstr "没有标签准确匹配 '%s'"
5622
5623#: builtin/describe.c:272
5624#, c-format
5625msgid "searching to describe %s\n"
5626msgstr "搜索描述 %s\n"
5627
5628#: builtin/describe.c:319
5629#, c-format
5630msgid "finished search at %s\n"
5631msgstr "完成搜索 %s\n"
5632
5633#: builtin/describe.c:346
5634#, c-format
5635msgid ""
5636"No annotated tags can describe '%s'.\n"
5637"However, there were unannotated tags: try --tags."
5638msgstr ""
5639"没有附注标签能描述 '%s'。\n"
5640"然而,存在未附注标签:尝试 --tags。"
5641
5642#: builtin/describe.c:350
5643#, c-format
5644msgid ""
5645"No tags can describe '%s'.\n"
5646"Try --always, or create some tags."
5647msgstr ""
5648"没有标签能描述 '%s'。\n"
5649"尝试 --always,或者创建一些标签。"
5650
5651#: builtin/describe.c:371
5652#, c-format
5653msgid "traversed %lu commits\n"
5654msgstr "已遍历 %lu 个提交\n"
5655
5656#: builtin/describe.c:374
5657#, c-format
5658msgid ""
5659"more than %i tags found; listed %i most recent\n"
5660"gave up search at %s\n"
5661msgstr ""
5662"发现多于 %i 个标签,列出最近的 %i 个\n"
5663"在 %s 放弃搜索\n"
5664
5665#: builtin/describe.c:396
5666msgid "find the tag that comes after the commit"
5667msgstr "寻找该提交之后的标签"
5668
5669#: builtin/describe.c:397
5670msgid "debug search strategy on stderr"
5671msgstr "在标准错误上调试搜索策略"
5672
5673#: builtin/describe.c:398
5674msgid "use any ref"
5675msgstr "使用任意引用"
5676
5677#: builtin/describe.c:399
5678msgid "use any tag, even unannotated"
5679msgstr "使用任意标签,即使未附带注释"
5680
5681#: builtin/describe.c:400
5682msgid "always use long format"
5683msgstr "始终使用长提交号格式"
5684
5685#: builtin/describe.c:401
5686msgid "only follow first parent"
5687msgstr "只跟随第一个父提交"
5688
5689#: builtin/describe.c:404
5690msgid "only output exact matches"
5691msgstr "只输出精确匹配"
5692
5693#: builtin/describe.c:406
5694msgid "consider <n> most recent tags (default: 10)"
5695msgstr "考虑最近 <n> 个标签(默认:10)"
5696
5697#: builtin/describe.c:408
5698msgid "only consider tags matching <pattern>"
5699msgstr "只考虑匹配 <模式> 的标签"
5700
5701#: builtin/describe.c:410 builtin/name-rev.c:318
5702msgid "show abbreviated commit object as fallback"
5703msgstr "显示简写的提交号作为后备"
5704
5705#: builtin/describe.c:411
5706msgid "mark"
5707msgstr "标记"
5708
5709#: builtin/describe.c:412
5710msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5711msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5712
5713#: builtin/describe.c:430
5714msgid "--long is incompatible with --abbrev=0"
5715msgstr "--long 与 --abbrev=0 不兼容"
5716
5717#: builtin/describe.c:456
5718msgid "No names found, cannot describe anything."
5719msgstr "没有发现名称,无法描述任何东西。"
5720
5721#: builtin/describe.c:476
5722msgid "--dirty is incompatible with commit-ishes"
5723msgstr "--dirty 不能与提交同时使用"
5724
5725#: builtin/diff.c:86
5726#, c-format
5727msgid "'%s': not a regular file or symlink"
5728msgstr "'%s':不是一个正规文件或符号链接"
5729
5730#: builtin/diff.c:237
5731#, c-format
5732msgid "invalid option: %s"
5733msgstr "无效选项:%s"
5734
5735#: builtin/diff.c:358
5736msgid "Not a git repository"
5737msgstr "不是一个 git 仓库"
5738
5739#: builtin/diff.c:401
5740#, c-format
5741msgid "invalid object '%s' given."
5742msgstr "提供了无效对象 '%s'。"
5743
5744#: builtin/diff.c:410
5745#, c-format
5746msgid "more than two blobs given: '%s'"
5747msgstr "提供了超过两个数据对象:'%s'"
5748
5749#: builtin/diff.c:417
5750#, c-format
5751msgid "unhandled object '%s' given."
5752msgstr "无法处理的对象 '%s'。"
5753
5754#: builtin/fast-export.c:25
5755msgid "git fast-export [rev-list-opts]"
5756msgstr "git fast-export [rev-list-opts]"
5757
5758#: builtin/fast-export.c:980
5759msgid "show progress after <n> objects"
5760msgstr "在 <n> 个对象之后显示进度"
5761
5762#: builtin/fast-export.c:982
5763msgid "select handling of signed tags"
5764msgstr "选择如何处理签名标签"
5765
5766#: builtin/fast-export.c:985
5767msgid "select handling of tags that tag filtered objects"
5768msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5769
5770#: builtin/fast-export.c:988
5771msgid "Dump marks to this file"
5772msgstr "把标记存储到这个文件"
5773
5774#: builtin/fast-export.c:990
5775msgid "Import marks from this file"
5776msgstr "从这个文件导入标记"
5777
5778#: builtin/fast-export.c:992
5779msgid "Fake a tagger when tags lack one"
5780msgstr "当标签缺少标记者字段时,假装提供一个"
5781
5782#: builtin/fast-export.c:994
5783msgid "Output full tree for each commit"
5784msgstr "每次提交都输出整个树"
5785
5786#: builtin/fast-export.c:996
5787msgid "Use the done feature to terminate the stream"
5788msgstr "使用 done 功能来终止流"
5789
5790#: builtin/fast-export.c:997
5791msgid "Skip output of blob data"
5792msgstr "跳过数据对象的输出"
5793
5794#: builtin/fast-export.c:998
5795msgid "refspec"
5796msgstr "引用规格"
5797
5798#: builtin/fast-export.c:999
5799msgid "Apply refspec to exported refs"
5800msgstr "对导出的引用应用引用规格"
5801
5802#: builtin/fast-export.c:1000
5803msgid "anonymize output"
5804msgstr "匿名输出"
5805
5806#: builtin/fetch.c:20
5807msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5808msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5809
5810#: builtin/fetch.c:21
5811msgid "git fetch [<options>] <group>"
5812msgstr "git fetch [<选项>] <组>"
5813
5814#: builtin/fetch.c:22
5815msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5816msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5817
5818#: builtin/fetch.c:23
5819msgid "git fetch --all [<options>]"
5820msgstr "git fetch --all [<选项>]"
5821
5822#: builtin/fetch.c:90 builtin/pull.c:162
5823msgid "fetch from all remotes"
5824msgstr "从所有的远程抓取"
5825
5826#: builtin/fetch.c:92 builtin/pull.c:165
5827msgid "append to .git/FETCH_HEAD instead of overwriting"
5828msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5829
5830#: builtin/fetch.c:94 builtin/pull.c:168
5831msgid "path to upload pack on remote end"
5832msgstr "上传包到远程的路径"
5833
5834#: builtin/fetch.c:95 builtin/pull.c:170
5835msgid "force overwrite of local branch"
5836msgstr "强制覆盖本地分支"
5837
5838#: builtin/fetch.c:97
5839msgid "fetch from multiple remotes"
5840msgstr "从多个远程抓取"
5841
5842#: builtin/fetch.c:99 builtin/pull.c:172
5843msgid "fetch all tags and associated objects"
5844msgstr "抓取所有的标签和关联对象"
5845
5846#: builtin/fetch.c:101
5847msgid "do not fetch all tags (--no-tags)"
5848msgstr "不抓取任何标签(--no-tags)"
5849
5850#: builtin/fetch.c:103 builtin/pull.c:175
5851msgid "prune remote-tracking branches no longer on remote"
5852msgstr "清除远程已经不存在的分支的跟踪分支"
5853
5854#  译者:可选值,不能翻译
5855#: builtin/fetch.c:104 builtin/pull.c:178
5856msgid "on-demand"
5857msgstr "on-demand"
5858
5859#: builtin/fetch.c:105 builtin/pull.c:179
5860msgid "control recursive fetching of submodules"
5861msgstr "控制子模组的递归抓取"
5862
5863#: builtin/fetch.c:109 builtin/pull.c:184
5864msgid "keep downloaded pack"
5865msgstr "保持下载包"
5866
5867#: builtin/fetch.c:111
5868msgid "allow updating of HEAD ref"
5869msgstr "允许更新 HEAD 引用"
5870
5871#: builtin/fetch.c:114 builtin/pull.c:187
5872msgid "deepen history of shallow clone"
5873msgstr "深化浅克隆的历史"
5874
5875#: builtin/fetch.c:116 builtin/pull.c:190
5876msgid "convert to a complete repository"
5877msgstr "转换为一个完整的仓库"
5878
5879#: builtin/fetch.c:118 builtin/log.c:1233
5880msgid "dir"
5881msgstr "目录"
5882
5883#: builtin/fetch.c:119
5884msgid "prepend this to submodule path output"
5885msgstr "在子模组路径输出的前面加上此目录"
5886
5887#: builtin/fetch.c:122
5888msgid "default mode for recursion"
5889msgstr "递归的默认模式"
5890
5891#: builtin/fetch.c:124 builtin/pull.c:193
5892msgid "accept refs that update .git/shallow"
5893msgstr "接受更新 .git/shallow 的引用"
5894
5895#: builtin/fetch.c:125 builtin/pull.c:195
5896msgid "refmap"
5897msgstr "引用映射"
5898
5899#: builtin/fetch.c:126 builtin/pull.c:196
5900msgid "specify fetch refmap"
5901msgstr "指定获取操作的引用映射"
5902
5903#: builtin/fetch.c:378
5904msgid "Couldn't find remote ref HEAD"
5905msgstr "无法发现远程 HEAD 引用"
5906
5907#: builtin/fetch.c:458
5908#, c-format
5909msgid "object %s not found"
5910msgstr "对象 %s 未发现"
5911
5912#: builtin/fetch.c:463
5913msgid "[up to date]"
5914msgstr "[最新]"
5915
5916#: builtin/fetch.c:477
5917#, c-format
5918msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
5919msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
5920
5921#: builtin/fetch.c:478 builtin/fetch.c:564
5922msgid "[rejected]"
5923msgstr "[已拒绝]"
5924
5925#: builtin/fetch.c:489
5926msgid "[tag update]"
5927msgstr "[标签更新]"
5928
5929#  译者:注意保持前导空格
5930#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
5931msgid "  (unable to update local ref)"
5932msgstr "  (不能更新本地引用)"
5933
5934#: builtin/fetch.c:509
5935msgid "[new tag]"
5936msgstr "[新标签]"
5937
5938#: builtin/fetch.c:512
5939msgid "[new branch]"
5940msgstr "[新分支]"
5941
5942#: builtin/fetch.c:515
5943msgid "[new ref]"
5944msgstr "[新引用]"
5945
5946#: builtin/fetch.c:560
5947msgid "unable to update local ref"
5948msgstr "不能更新本地引用"
5949
5950#: builtin/fetch.c:560
5951msgid "forced update"
5952msgstr "强制更新"
5953
5954#: builtin/fetch.c:566
5955msgid "(non-fast-forward)"
5956msgstr "(非快进式)"
5957
5958#: builtin/fetch.c:600 builtin/fetch.c:842
5959#, c-format
5960msgid "cannot open %s: %s\n"
5961msgstr "无法打开 %s:%s\n"
5962
5963#: builtin/fetch.c:609
5964#, c-format
5965msgid "%s did not send all necessary objects\n"
5966msgstr "%s 未发送所有必须的对象\n"
5967
5968#: builtin/fetch.c:627
5969#, c-format
5970msgid "reject %s because shallow roots are not allowed to be updated"
5971msgstr "拒绝 %s 因为浅克隆不允许被更新"
5972
5973#: builtin/fetch.c:715 builtin/fetch.c:807
5974#, c-format
5975msgid "From %.*s\n"
5976msgstr "来自 %.*s\n"
5977
5978#: builtin/fetch.c:726
5979#, c-format
5980msgid ""
5981"some local refs could not be updated; try running\n"
5982" 'git remote prune %s' to remove any old, conflicting branches"
5983msgstr ""
5984"一些本地引用不能被更新;尝试运行\n"
5985" 'git remote prune %s' 来删除旧的、有冲突的分支"
5986
5987#  译者:注意保持前导空格
5988#: builtin/fetch.c:778
5989#, c-format
5990msgid "   (%s will become dangling)"
5991msgstr "   (%s 将成为摇摆状态)"
5992
5993#  译者:注意保持前导空格
5994#: builtin/fetch.c:779
5995#, c-format
5996msgid "   (%s has become dangling)"
5997msgstr "   (%s 已成为摇摆状态)"
5998
5999#: builtin/fetch.c:811
6000msgid "[deleted]"
6001msgstr "[已删除]"
6002
6003#: builtin/fetch.c:812 builtin/remote.c:1034
6004msgid "(none)"
6005msgstr "(无)"
6006
6007#: builtin/fetch.c:832
6008#, c-format
6009msgid "Refusing to fetch into current branch %s of non-bare repository"
6010msgstr "拒绝获取到非纯仓库的当前分支 %s"
6011
6012#: builtin/fetch.c:851
6013#, c-format
6014msgid "Option \"%s\" value \"%s\" is not valid for %s"
6015msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6016
6017#: builtin/fetch.c:854
6018#, c-format
6019msgid "Option \"%s\" is ignored for %s\n"
6020msgstr "选项 \"%s\" 为 %s 所忽略\n"
6021
6022#: builtin/fetch.c:910
6023#, c-format
6024msgid "Don't know how to fetch from %s"
6025msgstr "不知道如何从 %s 获取"
6026
6027#: builtin/fetch.c:1071
6028#, c-format
6029msgid "Fetching %s\n"
6030msgstr "正在获取 %s\n"
6031
6032#: builtin/fetch.c:1073 builtin/remote.c:90
6033#, c-format
6034msgid "Could not fetch %s"
6035msgstr "不能获取 %s"
6036
6037#: builtin/fetch.c:1091
6038msgid ""
6039"No remote repository specified.  Please, specify either a URL or a\n"
6040"remote name from which new revisions should be fetched."
6041msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6042
6043#: builtin/fetch.c:1114
6044msgid "You need to specify a tag name."
6045msgstr "您需要指定一个标签名称。"
6046
6047#: builtin/fetch.c:1156
6048msgid "--depth and --unshallow cannot be used together"
6049msgstr "--depth 和 --unshallow 不能同时使用"
6050
6051#: builtin/fetch.c:1158
6052msgid "--unshallow on a complete repository does not make sense"
6053msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6054
6055#: builtin/fetch.c:1181
6056msgid "fetch --all does not take a repository argument"
6057msgstr "fetch --all 不能带一个仓库参数"
6058
6059#: builtin/fetch.c:1183
6060msgid "fetch --all does not make sense with refspecs"
6061msgstr "fetch --all 带引用规格没有任何意义"
6062
6063#: builtin/fetch.c:1194
6064#, c-format
6065msgid "No such remote or remote group: %s"
6066msgstr "没有这样的远程或远程组:%s"
6067
6068#: builtin/fetch.c:1202
6069msgid "Fetching a group and specifying refspecs does not make sense"
6070msgstr "获取组并指定引用规格没有意义"
6071
6072#: builtin/fmt-merge-msg.c:14
6073msgid ""
6074"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6075msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6076
6077#: builtin/fmt-merge-msg.c:670
6078msgid "populate log with at most <n> entries from shortlog"
6079msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6080
6081#: builtin/fmt-merge-msg.c:673
6082msgid "alias for --log (deprecated)"
6083msgstr "参数 --log 的别名(已弃用)"
6084
6085#: builtin/fmt-merge-msg.c:676
6086msgid "text"
6087msgstr "文本"
6088
6089#: builtin/fmt-merge-msg.c:677
6090msgid "use <text> as start of message"
6091msgstr "使用 <文本> 作为提交说明的开始"
6092
6093#: builtin/fmt-merge-msg.c:678
6094msgid "file to read from"
6095msgstr "从文件中读取"
6096
6097#: builtin/for-each-ref.c:9
6098msgid "git for-each-ref [<options>] [<pattern>]"
6099msgstr "git for-each-ref [<选项>] [<模式>]"
6100
6101#: builtin/for-each-ref.c:24
6102msgid "quote placeholders suitably for shells"
6103msgstr "引用占位符适用于 shells"
6104
6105#: builtin/for-each-ref.c:26
6106msgid "quote placeholders suitably for perl"
6107msgstr "引用占位符适用于 perl"
6108
6109#: builtin/for-each-ref.c:28
6110msgid "quote placeholders suitably for python"
6111msgstr "引用占位符适用于 python"
6112
6113#: builtin/for-each-ref.c:30
6114msgid "quote placeholders suitably for Tcl"
6115msgstr "引用占位符适用于 Tcl"
6116
6117#: builtin/for-each-ref.c:33
6118msgid "show only <n> matched refs"
6119msgstr "只显示 <n> 个匹配的引用"
6120
6121#: builtin/for-each-ref.c:34
6122msgid "format to use for the output"
6123msgstr "输出格式"
6124
6125#: builtin/for-each-ref.c:35
6126msgid "key"
6127msgstr "key"
6128
6129#: builtin/for-each-ref.c:36
6130msgid "field name to sort on"
6131msgstr "排序的字段名"
6132
6133#: builtin/fsck.c:163 builtin/prune.c:137
6134msgid "Checking connectivity"
6135msgstr "检查连接中"
6136
6137#: builtin/fsck.c:568
6138msgid "Checking object directories"
6139msgstr "检查对象目录中"
6140
6141#: builtin/fsck.c:631
6142msgid "git fsck [<options>] [<object>...]"
6143msgstr "git fsck [<选项>] [<对象>...]"
6144
6145#: builtin/fsck.c:637
6146msgid "show unreachable objects"
6147msgstr "显示不可达的对象"
6148
6149#: builtin/fsck.c:638
6150msgid "show dangling objects"
6151msgstr "显示摇摆的对象"
6152
6153#: builtin/fsck.c:639
6154msgid "report tags"
6155msgstr "报告标签"
6156
6157#: builtin/fsck.c:640
6158msgid "report root nodes"
6159msgstr "报告根节点"
6160
6161#: builtin/fsck.c:641
6162msgid "make index objects head nodes"
6163msgstr "将索引亦作为检查的头节点"
6164
6165#: builtin/fsck.c:642
6166msgid "make reflogs head nodes (default)"
6167msgstr "将引用日志作为检查的头节点(默认)"
6168
6169#: builtin/fsck.c:643
6170msgid "also consider packs and alternate objects"
6171msgstr "也考虑包和备用对象"
6172
6173#: builtin/fsck.c:644
6174msgid "check only connectivity"
6175msgstr "仅检查连通性"
6176
6177#: builtin/fsck.c:645
6178msgid "enable more strict checking"
6179msgstr "启用更严格的检查"
6180
6181#: builtin/fsck.c:647
6182msgid "write dangling objects in .git/lost-found"
6183msgstr "将摇摆对象写入 .git/lost-found 中"
6184
6185#: builtin/fsck.c:648 builtin/prune.c:107
6186msgid "show progress"
6187msgstr "显示进度"
6188
6189#: builtin/fsck.c:707
6190msgid "Checking objects"
6191msgstr "检查对象中"
6192
6193#: builtin/gc.c:25
6194msgid "git gc [<options>]"
6195msgstr "git gc [<选项>]"
6196
6197#: builtin/gc.c:55
6198#, c-format
6199msgid "Invalid %s: '%s'"
6200msgstr "无效 %s:'%s'"
6201
6202#: builtin/gc.c:100
6203#, c-format
6204msgid "insanely long object directory %.*s"
6205msgstr "不正常的长对象目录 %.*s"
6206
6207#: builtin/gc.c:269
6208msgid "prune unreferenced objects"
6209msgstr "清除未引用的对象"
6210
6211#: builtin/gc.c:271
6212msgid "be more thorough (increased runtime)"
6213msgstr "更彻底(增加运行时间)"
6214
6215#: builtin/gc.c:272
6216msgid "enable auto-gc mode"
6217msgstr "启用自动垃圾回收模式"
6218
6219#: builtin/gc.c:273
6220msgid "force running gc even if there may be another gc running"
6221msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6222
6223#: builtin/gc.c:315
6224#, c-format
6225msgid "Auto packing the repository in background for optimum performance.\n"
6226msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6227
6228#: builtin/gc.c:317
6229#, c-format
6230msgid "Auto packing the repository for optimum performance.\n"
6231msgstr "自动打包仓库以求最佳性能。\n"
6232
6233#: builtin/gc.c:318
6234#, c-format
6235msgid "See \"git help gc\" for manual housekeeping.\n"
6236msgstr "手工维护参见 \"git help gc\"。\n"
6237
6238#: builtin/gc.c:336
6239#, c-format
6240msgid ""
6241"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6242msgstr ""
6243"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6244
6245#: builtin/gc.c:364
6246msgid ""
6247"There are too many unreachable loose objects; run 'git prune' to remove them."
6248msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6249
6250#: builtin/grep.c:23
6251msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6252msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6253
6254#: builtin/grep.c:218
6255#, c-format
6256msgid "grep: failed to create thread: %s"
6257msgstr "grep:无法创建线程:%s"
6258
6259#: builtin/grep.c:441 builtin/grep.c:476
6260#, c-format
6261msgid "unable to read tree (%s)"
6262msgstr "无法读取树(%s)"
6263
6264#: builtin/grep.c:491
6265#, c-format
6266msgid "unable to grep from object of type %s"
6267msgstr "无法抓取来自于 %s 类型的对象"
6268
6269#: builtin/grep.c:547
6270#, c-format
6271msgid "switch `%c' expects a numerical value"
6272msgstr "开关 `%c' 期望一个数字值"
6273
6274#: builtin/grep.c:564
6275#, c-format
6276msgid "cannot open '%s'"
6277msgstr "不能打开 '%s'"
6278
6279#: builtin/grep.c:638
6280msgid "search in index instead of in the work tree"
6281msgstr "在索引区搜索而不是在工作区"
6282
6283#: builtin/grep.c:640
6284msgid "find in contents not managed by git"
6285msgstr "在未被 git 管理的内容中查找"
6286
6287#  译者:中文字符串拼接,可删除前导空格
6288#: builtin/grep.c:642
6289msgid "search in both tracked and untracked files"
6290msgstr "在跟踪和未跟踪的文件中搜索"
6291
6292#: builtin/grep.c:644
6293msgid "ignore files specified via '.gitignore'"
6294msgstr "忽略 '.gitignore' 包含的文件"
6295
6296#: builtin/grep.c:647
6297msgid "show non-matching lines"
6298msgstr "显示未匹配的行"
6299
6300#: builtin/grep.c:649
6301msgid "case insensitive matching"
6302msgstr "不区分大小写匹配"
6303
6304#: builtin/grep.c:651
6305msgid "match patterns only at word boundaries"
6306msgstr "只在单词边界匹配模式"
6307
6308#: builtin/grep.c:653
6309msgid "process binary files as text"
6310msgstr "把二进制文件当做文本处理"
6311
6312#: builtin/grep.c:655
6313msgid "don't match patterns in binary files"
6314msgstr "不在二进制文件中匹配模式"
6315
6316#: builtin/grep.c:658
6317msgid "process binary files with textconv filters"
6318msgstr "用 textconv 过滤器处理二进制文件"
6319
6320#: builtin/grep.c:660
6321msgid "descend at most <depth> levels"
6322msgstr "最多以指定的深度向下寻找"
6323
6324#: builtin/grep.c:664
6325msgid "use extended POSIX regular expressions"
6326msgstr "使用扩展的 POSIX 正则表达式"
6327
6328#: builtin/grep.c:667
6329msgid "use basic POSIX regular expressions (default)"
6330msgstr "使用基本的 POSIX 正则表达式(默认)"
6331
6332#: builtin/grep.c:670
6333msgid "interpret patterns as fixed strings"
6334msgstr "把模式解析为固定的字符串"
6335
6336#: builtin/grep.c:673
6337msgid "use Perl-compatible regular expressions"
6338msgstr "使用 Perl 兼容的正则表达式"
6339
6340#: builtin/grep.c:676
6341msgid "show line numbers"
6342msgstr "显示行号"
6343
6344#: builtin/grep.c:677
6345msgid "don't show filenames"
6346msgstr "不显示文件名"
6347
6348#: builtin/grep.c:678
6349msgid "show filenames"
6350msgstr "显示文件名"
6351
6352#: builtin/grep.c:680
6353msgid "show filenames relative to top directory"
6354msgstr "显示相对于顶级目录的文件名"
6355
6356#: builtin/grep.c:682
6357msgid "show only filenames instead of matching lines"
6358msgstr "只显示文件名而不显示匹配的行"
6359
6360#: builtin/grep.c:684
6361msgid "synonym for --files-with-matches"
6362msgstr "和 --files-with-matches 同义"
6363
6364#: builtin/grep.c:687
6365msgid "show only the names of files without match"
6366msgstr "只显示未匹配的文件名"
6367
6368#: builtin/grep.c:689
6369msgid "print NUL after filenames"
6370msgstr "在文件名后输出 NUL 字符"
6371
6372#: builtin/grep.c:691
6373msgid "show the number of matches instead of matching lines"
6374msgstr "显示总匹配行数,而不显示匹配的行"
6375
6376#: builtin/grep.c:692
6377msgid "highlight matches"
6378msgstr "高亮显示匹配项"
6379
6380#: builtin/grep.c:694
6381msgid "print empty line between matches from different files"
6382msgstr "在不同文件的匹配项之间打印空行"
6383
6384#: builtin/grep.c:696
6385msgid "show filename only once above matches from same file"
6386msgstr "只在同一文件的匹配项的上面显示一次文件名"
6387
6388#: builtin/grep.c:699
6389msgid "show <n> context lines before and after matches"
6390msgstr "显示匹配项前后的 <n> 行上下文"
6391
6392#: builtin/grep.c:702
6393msgid "show <n> context lines before matches"
6394msgstr "显示匹配项前 <n> 行上下文"
6395
6396#: builtin/grep.c:704
6397msgid "show <n> context lines after matches"
6398msgstr "显示匹配项后 <n> 行上下文"
6399
6400#: builtin/grep.c:705
6401msgid "shortcut for -C NUM"
6402msgstr "快捷键 -C 数字"
6403
6404#: builtin/grep.c:708
6405msgid "show a line with the function name before matches"
6406msgstr "在匹配的前面显示一行函数名"
6407
6408#: builtin/grep.c:710
6409msgid "show the surrounding function"
6410msgstr "显示所在函数的前后内容"
6411
6412#: builtin/grep.c:713
6413msgid "read patterns from file"
6414msgstr "从文件读取模式"
6415
6416#: builtin/grep.c:715
6417msgid "match <pattern>"
6418msgstr "匹配 <模式>"
6419
6420#: builtin/grep.c:717
6421msgid "combine patterns specified with -e"
6422msgstr "组合用 -e 参数设定的模式"
6423
6424#: builtin/grep.c:729
6425msgid "indicate hit with exit status without output"
6426msgstr "不输出,而用退出码标识命中状态"
6427
6428#: builtin/grep.c:731
6429msgid "show only matches from files that match all patterns"
6430msgstr "只显示匹配所有模式的文件中的匹配"
6431
6432#: builtin/grep.c:733
6433msgid "show parse tree for grep expression"
6434msgstr "显示 grep 表达式的解析树"
6435
6436#: builtin/grep.c:737
6437msgid "pager"
6438msgstr "分页"
6439
6440#: builtin/grep.c:737
6441msgid "show matching files in the pager"
6442msgstr "分页显示匹配的文件"
6443
6444#: builtin/grep.c:740
6445msgid "allow calling of grep(1) (ignored by this build)"
6446msgstr "允许调用 grep(1)(本次构建忽略)"
6447
6448#: builtin/grep.c:741 builtin/show-ref.c:189
6449msgid "show usage"
6450msgstr "显示用法"
6451
6452#: builtin/grep.c:808
6453msgid "no pattern given."
6454msgstr "未提供模式匹配。"
6455
6456#: builtin/grep.c:866
6457msgid "--open-files-in-pager only works on the worktree"
6458msgstr "--open-files-in-pager 仅用于工作区"
6459
6460#: builtin/grep.c:892
6461msgid "--cached or --untracked cannot be used with --no-index."
6462msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6463
6464#: builtin/grep.c:897
6465msgid "--no-index or --untracked cannot be used with revs."
6466msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6467
6468#: builtin/grep.c:900
6469msgid "--[no-]exclude-standard cannot be used for tracked contents."
6470msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6471
6472#: builtin/grep.c:908
6473msgid "both --cached and trees are given."
6474msgstr "同时给出了 --cached 和树对象。"
6475
6476#: builtin/hash-object.c:80
6477msgid ""
6478"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6479"[--] <file>..."
6480msgstr ""
6481"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6482"[--] <文件>..."
6483
6484#: builtin/hash-object.c:81
6485msgid "git hash-object  --stdin-paths < <list-of-paths>"
6486msgstr "git hash-object  --stdin-paths < <路径列表>"
6487
6488#: builtin/hash-object.c:92 builtin/tag.c:614
6489msgid "type"
6490msgstr "类型"
6491
6492#: builtin/hash-object.c:92
6493msgid "object type"
6494msgstr "对象类型"
6495
6496#: builtin/hash-object.c:93
6497msgid "write the object into the object database"
6498msgstr "将对象写入对象数据库"
6499
6500#: builtin/hash-object.c:95
6501msgid "read the object from stdin"
6502msgstr "从标准输入读取对象"
6503
6504#: builtin/hash-object.c:97
6505msgid "store file as is without filters"
6506msgstr "原样存储文件不使用过滤器"
6507
6508#: builtin/hash-object.c:98
6509msgid ""
6510"just hash any random garbage to create corrupt objects for debugging Git"
6511msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6512
6513#: builtin/hash-object.c:99
6514msgid "process file as it were from this path"
6515msgstr "处理文件并假设其来自于此路径"
6516
6517#: builtin/help.c:41
6518msgid "print all available commands"
6519msgstr "打印所有可用的命令"
6520
6521#: builtin/help.c:42
6522msgid "print list of useful guides"
6523msgstr "显示有用的指南列表"
6524
6525#: builtin/help.c:43
6526msgid "show man page"
6527msgstr "显示 man 手册"
6528
6529#: builtin/help.c:44
6530msgid "show manual in web browser"
6531msgstr "在 web 浏览器中显示手册"
6532
6533#: builtin/help.c:46
6534msgid "show info page"
6535msgstr "显示 info 手册"
6536
6537#: builtin/help.c:52
6538msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6539msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6540
6541#: builtin/help.c:64
6542#, c-format
6543msgid "unrecognized help format '%s'"
6544msgstr "未能识别的帮助格式 '%s'"
6545
6546#: builtin/help.c:91
6547msgid "Failed to start emacsclient."
6548msgstr "无法启动 emacsclient。"
6549
6550#: builtin/help.c:104
6551msgid "Failed to parse emacsclient version."
6552msgstr "无法解析 emacsclient 版本。"
6553
6554#: builtin/help.c:112
6555#, c-format
6556msgid "emacsclient version '%d' too old (< 22)."
6557msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6558
6559#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
6560#, c-format
6561msgid "failed to exec '%s': %s"
6562msgstr "无法执行 '%s':%s"
6563
6564#: builtin/help.c:215
6565#, c-format
6566msgid ""
6567"'%s': path for unsupported man viewer.\n"
6568"Please consider using 'man.<tool>.cmd' instead."
6569msgstr ""
6570"'%s':不支持的 man 手册查看器的路径。\n"
6571"请使用 'man.<工具>.cmd'。"
6572
6573#: builtin/help.c:227
6574#, c-format
6575msgid ""
6576"'%s': cmd for supported man viewer.\n"
6577"Please consider using 'man.<tool>.path' instead."
6578msgstr ""
6579"'%s': 支持的 man 手册查看器命令。\n"
6580"请使用 'man.<工具>.path'。"
6581
6582#: builtin/help.c:354
6583#, c-format
6584msgid "'%s': unknown man viewer."
6585msgstr "'%s':未知的 man 查看器。"
6586
6587#: builtin/help.c:371
6588msgid "no man viewer handled the request"
6589msgstr "没有 man 查看器处理此请求"
6590
6591#: builtin/help.c:379
6592msgid "no info viewer handled the request"
6593msgstr "没有 info 查看器处理此请求"
6594
6595#: builtin/help.c:428
6596msgid "Defining attributes per path"
6597msgstr "定义路径的属性"
6598
6599#: builtin/help.c:429
6600msgid "Everyday Git With 20 Commands Or So"
6601msgstr "每一天 Git 常用的约 20 条命令"
6602
6603#: builtin/help.c:430
6604msgid "A Git glossary"
6605msgstr "Git 词汇表"
6606
6607#: builtin/help.c:431
6608msgid "Specifies intentionally untracked files to ignore"
6609msgstr "忽略指定的未跟踪文件"
6610
6611#: builtin/help.c:432
6612msgid "Defining submodule properties"
6613msgstr "定义子模组属性"
6614
6615#: builtin/help.c:433
6616msgid "Specifying revisions and ranges for Git"
6617msgstr "指定 Git 的版本和版本范围"
6618
6619#: builtin/help.c:434
6620msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6621msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6622
6623#: builtin/help.c:435
6624msgid "An overview of recommended workflows with Git"
6625msgstr "Git 推荐的工作流概览"
6626
6627#: builtin/help.c:447
6628msgid "The common Git guides are:\n"
6629msgstr "最常用的 Git 向导有:\n"
6630
6631#: builtin/help.c:468 builtin/help.c:485
6632#, c-format
6633msgid "usage: %s%s"
6634msgstr "用法:%s%s"
6635
6636#: builtin/help.c:501
6637#, c-format
6638msgid "`git %s' is aliased to `%s'"
6639msgstr "`git %s' 是 `%s' 的别名"
6640
6641#: builtin/index-pack.c:152
6642#, c-format
6643msgid "unable to open %s"
6644msgstr "不能打开 %s"
6645
6646#: builtin/index-pack.c:202
6647#, c-format
6648msgid "object type mismatch at %s"
6649msgstr "%s 的对象类型不匹配"
6650
6651#: builtin/index-pack.c:222
6652#, c-format
6653msgid "did not receive expected object %s"
6654msgstr "未能获取期望的对象 %s"
6655
6656#: builtin/index-pack.c:225
6657#, c-format
6658msgid "object %s: expected type %s, found %s"
6659msgstr "对象 %s:期待类型 %s,却是 %s"
6660
6661#: builtin/index-pack.c:267
6662#, c-format
6663msgid "cannot fill %d byte"
6664msgid_plural "cannot fill %d bytes"
6665msgstr[0] "无法填充 %d 字节"
6666msgstr[1] "无法填充 %d 字节"
6667
6668#: builtin/index-pack.c:277
6669msgid "early EOF"
6670msgstr "过早的文件结束符(EOF)"
6671
6672#: builtin/index-pack.c:278
6673msgid "read error on input"
6674msgstr "输入上的读错误"
6675
6676#: builtin/index-pack.c:290
6677msgid "used more bytes than were available"
6678msgstr "用掉了超过可用的字节"
6679
6680#: builtin/index-pack.c:297
6681msgid "pack too large for current definition of off_t"
6682msgstr "包太大超过了当前 off_t 的定义"
6683
6684#: builtin/index-pack.c:313
6685#, c-format
6686msgid "unable to create '%s'"
6687msgstr "不能创建 '%s'"
6688
6689#: builtin/index-pack.c:318
6690#, c-format
6691msgid "cannot open packfile '%s'"
6692msgstr "无法打开包文件 '%s'"
6693
6694#: builtin/index-pack.c:332
6695msgid "pack signature mismatch"
6696msgstr "包签名不匹配"
6697
6698#: builtin/index-pack.c:334
6699#, c-format
6700msgid "pack version %<PRIu32> unsupported"
6701msgstr "不支持包版本 %<PRIu32>"
6702
6703#: builtin/index-pack.c:352
6704#, c-format
6705msgid "pack has bad object at offset %lu: %s"
6706msgstr "包中有错误的对象位于 %lu:%s"
6707
6708#: builtin/index-pack.c:473
6709#, c-format
6710msgid "inflate returned %d"
6711msgstr "解压缩返回 %d"
6712
6713#: builtin/index-pack.c:522
6714msgid "offset value overflow for delta base object"
6715msgstr "偏移值覆盖了 delta 基准对象"
6716
6717#: builtin/index-pack.c:530
6718msgid "delta base offset is out of bound"
6719msgstr "delta 基准偏移越界"
6720
6721#: builtin/index-pack.c:538
6722#, c-format
6723msgid "unknown object type %d"
6724msgstr "未知对象类型 %d"
6725
6726#: builtin/index-pack.c:569
6727msgid "cannot pread pack file"
6728msgstr "无法读取包文件"
6729
6730#: builtin/index-pack.c:571
6731#, c-format
6732msgid "premature end of pack file, %lu byte missing"
6733msgid_plural "premature end of pack file, %lu bytes missing"
6734msgstr[0] "包文件过早结束,缺少 %lu 字节"
6735msgstr[1] "包文件过早结束,缺少 %lu 字节"
6736
6737#: builtin/index-pack.c:597
6738msgid "serious inflate inconsistency"
6739msgstr "解压缩严重的不一致"
6740
6741#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6742#: builtin/index-pack.c:806 builtin/index-pack.c:815
6743#, c-format
6744msgid "SHA1 COLLISION FOUND WITH %s !"
6745msgstr "发现 %s 出现 SHA1 冲突!"
6746
6747#: builtin/index-pack.c:746 builtin/pack-objects.c:162
6748#: builtin/pack-objects.c:254
6749#, c-format
6750msgid "unable to read %s"
6751msgstr "不能读 %s"
6752
6753#: builtin/index-pack.c:812
6754#, c-format
6755msgid "cannot read existing object %s"
6756msgstr "不能读取现存对象 %s"
6757
6758#: builtin/index-pack.c:826
6759#, c-format
6760msgid "invalid blob object %s"
6761msgstr "无效的数据对象 %s"
6762
6763#: builtin/index-pack.c:840
6764#, c-format
6765msgid "invalid %s"
6766msgstr "无效的 %s"
6767
6768#: builtin/index-pack.c:843
6769msgid "Error in object"
6770msgstr "对象中出错"
6771
6772#: builtin/index-pack.c:845
6773#, c-format
6774msgid "Not all child objects of %s are reachable"
6775msgstr "%s 的所有子对象并非都可达"
6776
6777#: builtin/index-pack.c:917 builtin/index-pack.c:948
6778msgid "failed to apply delta"
6779msgstr "无法应用 delta"
6780
6781#: builtin/index-pack.c:1118
6782msgid "Receiving objects"
6783msgstr "接收对象中"
6784
6785#: builtin/index-pack.c:1118
6786msgid "Indexing objects"
6787msgstr "索引对象中"
6788
6789#: builtin/index-pack.c:1150
6790msgid "pack is corrupted (SHA1 mismatch)"
6791msgstr "包冲突(SHA1 不匹配)"
6792
6793#: builtin/index-pack.c:1155
6794msgid "cannot fstat packfile"
6795msgstr "不能枚举包文件状态"
6796
6797#: builtin/index-pack.c:1158
6798msgid "pack has junk at the end"
6799msgstr "包的结尾有垃圾数据"
6800
6801#: builtin/index-pack.c:1169
6802msgid "confusion beyond insanity in parse_pack_objects()"
6803msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6804
6805#: builtin/index-pack.c:1194
6806msgid "Resolving deltas"
6807msgstr "处理 delta 中"
6808
6809#: builtin/index-pack.c:1205
6810#, c-format
6811msgid "unable to create thread: %s"
6812msgstr "不能创建线程:%s"
6813
6814#: builtin/index-pack.c:1247
6815msgid "confusion beyond insanity"
6816msgstr "不可理喻"
6817
6818#: builtin/index-pack.c:1253
6819#, c-format
6820msgid "completed with %d local objects"
6821msgstr "完成 %d 个本地对象"
6822
6823#: builtin/index-pack.c:1263
6824#, c-format
6825msgid "Unexpected tail checksum for %s (disk corruption?)"
6826msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6827
6828#: builtin/index-pack.c:1267
6829#, c-format
6830msgid "pack has %d unresolved delta"
6831msgid_plural "pack has %d unresolved deltas"
6832msgstr[0] "包有 %d 个未解决的 delta"
6833msgstr[1] "包有 %d 个未解决的 delta"
6834
6835#: builtin/index-pack.c:1291
6836#, c-format
6837msgid "unable to deflate appended object (%d)"
6838msgstr "不能压缩附加对象(%d)"
6839
6840#: builtin/index-pack.c:1367
6841#, c-format
6842msgid "local object %s is corrupt"
6843msgstr "本地对象 %s 已损坏"
6844
6845#: builtin/index-pack.c:1391
6846msgid "error while closing pack file"
6847msgstr "关闭包文件时出错"
6848
6849#: builtin/index-pack.c:1404
6850#, c-format
6851msgid "cannot write keep file '%s'"
6852msgstr "无法写保留文件 '%s'"
6853
6854#: builtin/index-pack.c:1412
6855#, c-format
6856msgid "cannot close written keep file '%s'"
6857msgstr "无法关闭保留文件 '%s'"
6858
6859#: builtin/index-pack.c:1425
6860msgid "cannot store pack file"
6861msgstr "无法存储包文件"
6862
6863#: builtin/index-pack.c:1436
6864msgid "cannot store index file"
6865msgstr "无法存储索引文件"
6866
6867#: builtin/index-pack.c:1469
6868#, c-format
6869msgid "bad pack.indexversion=%<PRIu32>"
6870msgstr "坏的 pack.indexversion=%<PRIu32>"
6871
6872#: builtin/index-pack.c:1475
6873#, c-format
6874msgid "invalid number of threads specified (%d)"
6875msgstr "指定的线程数无效(%d)"
6876
6877#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
6878#, c-format
6879msgid "no threads support, ignoring %s"
6880msgstr "没有线程支持,忽略 %s"
6881
6882#: builtin/index-pack.c:1537
6883#, c-format
6884msgid "Cannot open existing pack file '%s'"
6885msgstr "无法打开现存包文件 '%s'"
6886
6887#: builtin/index-pack.c:1539
6888#, c-format
6889msgid "Cannot open existing pack idx file for '%s'"
6890msgstr "无法为 %s 打开包索引文件"
6891
6892#: builtin/index-pack.c:1586
6893#, c-format
6894msgid "non delta: %d object"
6895msgid_plural "non delta: %d objects"
6896msgstr[0] "非 delta:%d 个对象"
6897msgstr[1] "非 delta:%d 个对象"
6898
6899#: builtin/index-pack.c:1593
6900#, c-format
6901msgid "chain length = %d: %lu object"
6902msgid_plural "chain length = %d: %lu objects"
6903msgstr[0] "链长 = %d: %lu 对象"
6904msgstr[1] "链长 = %d: %lu 对象"
6905
6906#: builtin/index-pack.c:1623
6907msgid "Cannot come back to cwd"
6908msgstr "无法返回当前工作目录"
6909
6910#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
6911#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
6912#, c-format
6913msgid "bad %s"
6914msgstr "错误选项 %s"
6915
6916#: builtin/index-pack.c:1708
6917msgid "--fix-thin cannot be used without --stdin"
6918msgstr "--fix-thin 不能和 --stdin 同时使用"
6919
6920#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
6921#, c-format
6922msgid "packfile name '%s' does not end with '.pack'"
6923msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
6924
6925#: builtin/index-pack.c:1729
6926msgid "--verify with no packfile name given"
6927msgstr "--verify 没有提供包文件名参数"
6928
6929#: builtin/init-db.c:36
6930#, c-format
6931msgid "Could not make %s writable by group"
6932msgstr "不能设置 %s 为组可写"
6933
6934#: builtin/init-db.c:63
6935#, c-format
6936msgid "insanely long template name %s"
6937msgstr "太长的模版名 %s"
6938
6939#: builtin/init-db.c:68
6940#, c-format
6941msgid "cannot stat '%s'"
6942msgstr "不能枚举 '%s' 状态"
6943
6944#: builtin/init-db.c:74
6945#, c-format
6946msgid "cannot stat template '%s'"
6947msgstr "不能枚举模版 '%s' 状态"
6948
6949#: builtin/init-db.c:81
6950#, c-format
6951msgid "cannot opendir '%s'"
6952msgstr "不能打开目录 '%s'"
6953
6954#: builtin/init-db.c:98
6955#, c-format
6956msgid "cannot readlink '%s'"
6957msgstr "不能读取链接 '%s'"
6958
6959#: builtin/init-db.c:100
6960#, c-format
6961msgid "insanely long symlink %s"
6962msgstr "太长的符号链接 %s"
6963
6964#: builtin/init-db.c:103
6965#, c-format
6966msgid "cannot symlink '%s' '%s'"
6967msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6968
6969#: builtin/init-db.c:107
6970#, c-format
6971msgid "cannot copy '%s' to '%s'"
6972msgstr "不能拷贝 '%s' 至 '%s'"
6973
6974#: builtin/init-db.c:111
6975#, c-format
6976msgid "ignoring template %s"
6977msgstr "忽略模版 %s"
6978
6979#: builtin/init-db.c:137
6980#, c-format
6981msgid "insanely long template path %s"
6982msgstr "太长的模版路径 %s"
6983
6984#: builtin/init-db.c:145
6985#, c-format
6986msgid "templates not found %s"
6987msgstr "模版未找到 %s"
6988
6989#: builtin/init-db.c:158
6990#, c-format
6991msgid "not copying templates of a wrong format version %d from '%s'"
6992msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6993
6994#: builtin/init-db.c:212
6995#, c-format
6996msgid "insane git directory %s"
6997msgstr "不正常的 git 目录 %s"
6998
6999#: builtin/init-db.c:344 builtin/init-db.c:347
7000#, c-format
7001msgid "%s already exists"
7002msgstr "%s 已经存在"
7003
7004#: builtin/init-db.c:375
7005#, c-format
7006msgid "unable to handle file type %d"
7007msgstr "不能处理 %d 类型的文件"
7008
7009#: builtin/init-db.c:378
7010#, c-format
7011msgid "unable to move %s to %s"
7012msgstr "不能移动 %s 至 %s"
7013
7014#. TRANSLATORS: The first '%s' is either "Reinitialized
7015#. existing" or "Initialized empty", the second " shared" or
7016#. "", and the last '%s%s' is the verbatim directory name.
7017#: builtin/init-db.c:434
7018#, c-format
7019msgid "%s%s Git repository in %s%s\n"
7020msgstr "%s%s Git 仓库于 %s%s\n"
7021
7022#: builtin/init-db.c:435
7023msgid "Reinitialized existing"
7024msgstr "重新初始化现存的"
7025
7026#: builtin/init-db.c:435
7027msgid "Initialized empty"
7028msgstr "初始化空的"
7029
7030#  译者:中文字符串拼接,可删除前导空格
7031#: builtin/init-db.c:436
7032msgid " shared"
7033msgstr "共享"
7034
7035#: builtin/init-db.c:483
7036msgid ""
7037"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7038"shared[=<permissions>]] [<directory>]"
7039msgstr ""
7040"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7041"[<目录>]"
7042
7043#: builtin/init-db.c:506
7044msgid "permissions"
7045msgstr "权限"
7046
7047#: builtin/init-db.c:507
7048msgid "specify that the git repository is to be shared amongst several users"
7049msgstr "指定 git 仓库是多个用户之间共享的"
7050
7051#: builtin/init-db.c:541 builtin/init-db.c:546
7052#, c-format
7053msgid "cannot mkdir %s"
7054msgstr "不能创建目录 %s"
7055
7056#: builtin/init-db.c:550
7057#, c-format
7058msgid "cannot chdir to %s"
7059msgstr "不能切换目录到 %s"
7060
7061#: builtin/init-db.c:571
7062#, c-format
7063msgid ""
7064"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7065"dir=<directory>)"
7066msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7067
7068#: builtin/init-db.c:599
7069#, c-format
7070msgid "Cannot access work tree '%s'"
7071msgstr "不能访问工作区 '%s'"
7072
7073#: builtin/interpret-trailers.c:15
7074msgid ""
7075"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
7076"[<file>...]"
7077msgstr ""
7078"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
7079">...]"
7080
7081#: builtin/interpret-trailers.c:25
7082msgid "trim empty trailers"
7083msgstr "删除空签名"
7084
7085#: builtin/interpret-trailers.c:26
7086msgid "trailer"
7087msgstr "签名"
7088
7089#: builtin/interpret-trailers.c:27
7090msgid "trailer(s) to add"
7091msgstr "要添加的签名"
7092
7093#: builtin/log.c:43
7094msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7095msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7096
7097#: builtin/log.c:44
7098msgid "git show [<options>] <object>..."
7099msgstr "git show [<选项>] <对象>..."
7100
7101#: builtin/log.c:83
7102#, c-format
7103msgid "invalid --decorate option: %s"
7104msgstr "无效的 --decorate 选项:%s"
7105
7106#: builtin/log.c:131
7107msgid "suppress diff output"
7108msgstr "不显示差异输出"
7109
7110#: builtin/log.c:132
7111msgid "show source"
7112msgstr "显示源"
7113
7114#: builtin/log.c:133
7115msgid "Use mail map file"
7116msgstr "使用邮件映射文件"
7117
7118#: builtin/log.c:134
7119msgid "decorate options"
7120msgstr "修饰选项"
7121
7122#: builtin/log.c:137
7123msgid "Process line range n,m in file, counting from 1"
7124msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7125
7126#: builtin/log.c:233
7127#, c-format
7128msgid "Final output: %d %s\n"
7129msgstr "最终输出:%d %s\n"
7130
7131#: builtin/log.c:465
7132#, c-format
7133msgid "git show %s: bad file"
7134msgstr "git show %s: 损坏的文件"
7135
7136#: builtin/log.c:479 builtin/log.c:572
7137#, c-format
7138msgid "Could not read object %s"
7139msgstr "不能读取对象 %s"
7140
7141#: builtin/log.c:596
7142#, c-format
7143msgid "Unknown type: %d"
7144msgstr "未知类型:%d"
7145
7146#: builtin/log.c:714
7147msgid "format.headers without value"
7148msgstr "format.headers 没有值"
7149
7150#: builtin/log.c:798
7151msgid "name of output directory is too long"
7152msgstr "输出目录名太长"
7153
7154#: builtin/log.c:814
7155#, c-format
7156msgid "Cannot open patch file %s"
7157msgstr "无法打开补丁文件 %s"
7158
7159#: builtin/log.c:828
7160msgid "Need exactly one range."
7161msgstr "只需要一个范围。"
7162
7163#: builtin/log.c:838
7164msgid "Not a range."
7165msgstr "不是一个范围。"
7166
7167#: builtin/log.c:944
7168msgid "Cover letter needs email format"
7169msgstr "信封需要邮件地址格式"
7170
7171#: builtin/log.c:1023
7172#, c-format
7173msgid "insane in-reply-to: %s"
7174msgstr "不正常的 in-reply-to:%s"
7175
7176#: builtin/log.c:1051
7177msgid "git format-patch [<options>] [<since> | <revision-range>]"
7178msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7179
7180#: builtin/log.c:1096
7181msgid "Two output directories?"
7182msgstr "两个输出目录?"
7183
7184#: builtin/log.c:1211
7185msgid "use [PATCH n/m] even with a single patch"
7186msgstr "使用 [PATCH n/m],即使只有一个补丁"
7187
7188#: builtin/log.c:1214
7189msgid "use [PATCH] even with multiple patches"
7190msgstr "使用 [PATCH],即使有多个补丁"
7191
7192#: builtin/log.c:1218
7193msgid "print patches to standard out"
7194msgstr "打印补丁到标准输出"
7195
7196#: builtin/log.c:1220
7197msgid "generate a cover letter"
7198msgstr "生成一封附信"
7199
7200#: builtin/log.c:1222
7201msgid "use simple number sequence for output file names"
7202msgstr "使用简单的数字序列作为输出文件名"
7203
7204#: builtin/log.c:1223
7205msgid "sfx"
7206msgstr "后缀"
7207
7208#: builtin/log.c:1224
7209msgid "use <sfx> instead of '.patch'"
7210msgstr "使用 <后缀> 代替 '.patch'"
7211
7212#: builtin/log.c:1226
7213msgid "start numbering patches at <n> instead of 1"
7214msgstr "补丁以 <n> 开始编号,而不是1"
7215
7216#: builtin/log.c:1228
7217msgid "mark the series as Nth re-roll"
7218msgstr "标记补丁系列是第几次重制"
7219
7220#: builtin/log.c:1230
7221msgid "Use [<prefix>] instead of [PATCH]"
7222msgstr "使用 [<前缀>] 代替 [PATCH]"
7223
7224#: builtin/log.c:1233
7225msgid "store resulting files in <dir>"
7226msgstr "把结果文件存储在 <目录>"
7227
7228#: builtin/log.c:1236
7229msgid "don't strip/add [PATCH]"
7230msgstr "不删除/添加 [PATCH]"
7231
7232#: builtin/log.c:1239
7233msgid "don't output binary diffs"
7234msgstr "不输出二进制差异"
7235
7236#: builtin/log.c:1241
7237msgid "don't include a patch matching a commit upstream"
7238msgstr "不包含已在上游提交中的补丁"
7239
7240#: builtin/log.c:1243
7241msgid "show patch format instead of default (patch + stat)"
7242msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7243
7244#: builtin/log.c:1245
7245msgid "Messaging"
7246msgstr "邮件发送"
7247
7248#: builtin/log.c:1246
7249msgid "header"
7250msgstr "header"
7251
7252#: builtin/log.c:1247
7253msgid "add email header"
7254msgstr "添加邮件头"
7255
7256#: builtin/log.c:1248 builtin/log.c:1250
7257msgid "email"
7258msgstr "邮件地址"
7259
7260#: builtin/log.c:1248
7261msgid "add To: header"
7262msgstr "添加收件人"
7263
7264#: builtin/log.c:1250
7265msgid "add Cc: header"
7266msgstr "添加抄送"
7267
7268#: builtin/log.c:1252
7269msgid "ident"
7270msgstr "标识"
7271
7272#: builtin/log.c:1253
7273msgid "set From address to <ident> (or committer ident if absent)"
7274msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7275
7276#: builtin/log.c:1255
7277msgid "message-id"
7278msgstr "邮件标识"
7279
7280#: builtin/log.c:1256
7281msgid "make first mail a reply to <message-id>"
7282msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7283
7284#: builtin/log.c:1257 builtin/log.c:1260
7285msgid "boundary"
7286msgstr "边界"
7287
7288#: builtin/log.c:1258
7289msgid "attach the patch"
7290msgstr "附件方式添加补丁"
7291
7292#: builtin/log.c:1261
7293msgid "inline the patch"
7294msgstr "内联显示补丁"
7295
7296#: builtin/log.c:1265
7297msgid "enable message threading, styles: shallow, deep"
7298msgstr "启用邮件线索,风格:浅,深"
7299
7300#: builtin/log.c:1267
7301msgid "signature"
7302msgstr "签名"
7303
7304#: builtin/log.c:1268
7305msgid "add a signature"
7306msgstr "添加一个签名"
7307
7308#: builtin/log.c:1270
7309msgid "add a signature from a file"
7310msgstr "从文件添加一个签名"
7311
7312#: builtin/log.c:1271
7313msgid "don't print the patch filenames"
7314msgstr "不要打印补丁文件名"
7315
7316#: builtin/log.c:1360
7317msgid "-n and -k are mutually exclusive."
7318msgstr "-n 和 -k 互斥。"
7319
7320#: builtin/log.c:1362
7321msgid "--subject-prefix and -k are mutually exclusive."
7322msgstr "--subject-prefix 和 -k 互斥。"
7323
7324#: builtin/log.c:1370
7325msgid "--name-only does not make sense"
7326msgstr "--name-only 无意义"
7327
7328#: builtin/log.c:1372
7329msgid "--name-status does not make sense"
7330msgstr "--name-status 无意义"
7331
7332#: builtin/log.c:1374
7333msgid "--check does not make sense"
7334msgstr "--check 无意义"
7335
7336#: builtin/log.c:1397
7337msgid "standard output, or directory, which one?"
7338msgstr "标准输出或目录,哪一个?"
7339
7340#: builtin/log.c:1399
7341#, c-format
7342msgid "Could not create directory '%s'"
7343msgstr "不能创建目录 '%s'"
7344
7345#: builtin/log.c:1496
7346#, c-format
7347msgid "unable to read signature file '%s'"
7348msgstr "无法读取签名文件 '%s'"
7349
7350#: builtin/log.c:1559
7351msgid "Failed to create output files"
7352msgstr "无法创建输出文件"
7353
7354#: builtin/log.c:1607
7355msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7356msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7357
7358#: builtin/log.c:1661
7359#, c-format
7360msgid ""
7361"Could not find a tracked remote branch, please specify <upstream> manually.\n"
7362msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7363
7364#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
7365#, c-format
7366msgid "Unknown commit %s"
7367msgstr "未知提交 %s"
7368
7369#: builtin/ls-files.c:358
7370msgid "git ls-files [<options>] [<file>...]"
7371msgstr "git ls-files [<选项>] [<文件>...]"
7372
7373#: builtin/ls-files.c:415
7374msgid "identify the file status with tags"
7375msgstr "用标签标识文件的状态"
7376
7377#: builtin/ls-files.c:417
7378msgid "use lowercase letters for 'assume unchanged' files"
7379msgstr "使用小写字母表示 '假设未改变的' 文件"
7380
7381#: builtin/ls-files.c:419
7382msgid "show cached files in the output (default)"
7383msgstr "显示缓存的文件(默认)"
7384
7385#: builtin/ls-files.c:421
7386msgid "show deleted files in the output"
7387msgstr "显示已删除的文件"
7388
7389#: builtin/ls-files.c:423
7390msgid "show modified files in the output"
7391msgstr "显示已修改的文件"
7392
7393#: builtin/ls-files.c:425
7394msgid "show other files in the output"
7395msgstr "显示其它文件"
7396
7397#: builtin/ls-files.c:427
7398msgid "show ignored files in the output"
7399msgstr "显示忽略的文件"
7400
7401#: builtin/ls-files.c:430
7402msgid "show staged contents' object name in the output"
7403msgstr "显示暂存区内容的对象名称"
7404
7405#: builtin/ls-files.c:432
7406msgid "show files on the filesystem that need to be removed"
7407msgstr "显示文件系统需要删除的文件"
7408
7409#: builtin/ls-files.c:434
7410msgid "show 'other' directories' names only"
7411msgstr "只显示“其他”目录的名称"
7412
7413#: builtin/ls-files.c:437
7414msgid "don't show empty directories"
7415msgstr "不显示空目录"
7416
7417#: builtin/ls-files.c:440
7418msgid "show unmerged files in the output"
7419msgstr "显示未合并的文件"
7420
7421#: builtin/ls-files.c:442
7422msgid "show resolve-undo information"
7423msgstr "显示 resolve-undo 信息"
7424
7425#: builtin/ls-files.c:444
7426msgid "skip files matching pattern"
7427msgstr "匹配排除文件的模式"
7428
7429#: builtin/ls-files.c:447
7430msgid "exclude patterns are read from <file>"
7431msgstr "从 <文件> 中读取排除模式"
7432
7433#: builtin/ls-files.c:450
7434msgid "read additional per-directory exclude patterns in <file>"
7435msgstr "从 <文件> 读取额外的每个目录的排除模式"
7436
7437#: builtin/ls-files.c:452
7438msgid "add the standard git exclusions"
7439msgstr "添加标准的 git 排除"
7440
7441#: builtin/ls-files.c:455
7442msgid "make the output relative to the project top directory"
7443msgstr "显示相对于顶级目录的文件名"
7444
7445#: builtin/ls-files.c:458
7446msgid "if any <file> is not in the index, treat this as an error"
7447msgstr "如果任何 <文件> 都不在索引区,视为错误"
7448
7449#: builtin/ls-files.c:459
7450msgid "tree-ish"
7451msgstr "树或提交"
7452
7453#: builtin/ls-files.c:460
7454msgid "pretend that paths removed since <tree-ish> are still present"
7455msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7456
7457#: builtin/ls-files.c:462
7458msgid "show debugging data"
7459msgstr "显示调试数据"
7460
7461#: builtin/ls-tree.c:28
7462msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7463msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7464
7465#: builtin/ls-tree.c:127
7466msgid "only show trees"
7467msgstr "只显示树"
7468
7469#: builtin/ls-tree.c:129
7470msgid "recurse into subtrees"
7471msgstr "递归到子树"
7472
7473#: builtin/ls-tree.c:131
7474msgid "show trees when recursing"
7475msgstr "当递归时显示树"
7476
7477#: builtin/ls-tree.c:134
7478msgid "terminate entries with NUL byte"
7479msgstr "条目以 NUL 字符终止"
7480
7481#: builtin/ls-tree.c:135
7482msgid "include object size"
7483msgstr "包括对象大小"
7484
7485#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
7486msgid "list only filenames"
7487msgstr "只列出文件名"
7488
7489#: builtin/ls-tree.c:142
7490msgid "use full path names"
7491msgstr "使用文件的全路径"
7492
7493#: builtin/ls-tree.c:144
7494msgid "list entire tree; not just current directory (implies --full-name)"
7495msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7496
7497#: builtin/merge.c:45
7498msgid "git merge [<options>] [<commit>...]"
7499msgstr "git merge [<选项>] [<提交>...]"
7500
7501#: builtin/merge.c:46
7502msgid "git merge [<options>] <msg> HEAD <commit>"
7503msgstr "git merge [<选项>] <说明> HEAD <提交>"
7504
7505#: builtin/merge.c:47
7506msgid "git merge --abort"
7507msgstr "git merge --abort"
7508
7509#: builtin/merge.c:100
7510msgid "switch `m' requires a value"
7511msgstr "开关 `m' 需要一个值"
7512
7513#: builtin/merge.c:137
7514#, c-format
7515msgid "Could not find merge strategy '%s'.\n"
7516msgstr "不能找到合并策略 '%s'。\n"
7517
7518#: builtin/merge.c:138
7519#, c-format
7520msgid "Available strategies are:"
7521msgstr "可用的策略有:"
7522
7523#: builtin/merge.c:143
7524#, c-format
7525msgid "Available custom strategies are:"
7526msgstr "可用的自定义策略有:"
7527
7528#: builtin/merge.c:193 builtin/pull.c:119
7529msgid "do not show a diffstat at the end of the merge"
7530msgstr "在合并的最后不显示差异统计"
7531
7532#: builtin/merge.c:196 builtin/pull.c:122
7533msgid "show a diffstat at the end of the merge"
7534msgstr "在合并的最后显示差异统计"
7535
7536#: builtin/merge.c:197 builtin/pull.c:125
7537msgid "(synonym to --stat)"
7538msgstr "(和 --stat 同义)"
7539
7540#: builtin/merge.c:199 builtin/pull.c:128
7541msgid "add (at most <n>) entries from shortlog to merge commit message"
7542msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7543
7544#: builtin/merge.c:202 builtin/pull.c:131
7545msgid "create a single commit instead of doing a merge"
7546msgstr "创建一个单独的提交而不是做一次合并"
7547
7548#: builtin/merge.c:204 builtin/pull.c:134
7549msgid "perform a commit if the merge succeeds (default)"
7550msgstr "如果合并成功,执行一次提交(默认)"
7551
7552#: builtin/merge.c:206 builtin/pull.c:137
7553msgid "edit message before committing"
7554msgstr "在提交前编辑提交说明"
7555
7556#: builtin/merge.c:207
7557msgid "allow fast-forward (default)"
7558msgstr "允许快进(默认)"
7559
7560#: builtin/merge.c:209 builtin/pull.c:143
7561msgid "abort if fast-forward is not possible"
7562msgstr "如果不能快进就放弃合并"
7563
7564#: builtin/merge.c:213
7565msgid "Verify that the named commit has a valid GPG signature"
7566msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7567
7568#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7569#: builtin/revert.c:89
7570msgid "strategy"
7571msgstr "策略"
7572
7573#: builtin/merge.c:215 builtin/pull.c:149
7574msgid "merge strategy to use"
7575msgstr "要使用的合并策略"
7576
7577#: builtin/merge.c:216 builtin/pull.c:152
7578msgid "option=value"
7579msgstr "option=value"
7580
7581#: builtin/merge.c:217 builtin/pull.c:153
7582msgid "option for selected merge strategy"
7583msgstr "所选的合并策略的选项"
7584
7585#: builtin/merge.c:219
7586msgid "merge commit message (for a non-fast-forward merge)"
7587msgstr "合并的提交说明(针对非快进式合并)"
7588
7589#: builtin/merge.c:223
7590msgid "abort the current in-progress merge"
7591msgstr "放弃当前正在进行的合并"
7592
7593#: builtin/merge.c:251
7594msgid "could not run stash."
7595msgstr "不能进行进度保存。"
7596
7597#: builtin/merge.c:256
7598msgid "stash failed"
7599msgstr "进度保存失败"
7600
7601#: builtin/merge.c:261
7602#, c-format
7603msgid "not a valid object: %s"
7604msgstr "不是一个有效对象:%s"
7605
7606#: builtin/merge.c:280 builtin/merge.c:297
7607msgid "read-tree failed"
7608msgstr "读取树失败"
7609
7610#  译者:注意保持前导空格
7611#: builtin/merge.c:327
7612msgid " (nothing to squash)"
7613msgstr " (无可压缩)"
7614
7615#: builtin/merge.c:340
7616#, c-format
7617msgid "Squash commit -- not updating HEAD\n"
7618msgstr "压缩提交 -- 未更新 HEAD\n"
7619
7620#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7621#: builtin/merge.c:988
7622#, c-format
7623msgid "Could not write to '%s'"
7624msgstr "不能写入 '%s'"
7625
7626#: builtin/merge.c:372
7627msgid "Writing SQUASH_MSG"
7628msgstr "写入 SQUASH_MSG"
7629
7630#: builtin/merge.c:374
7631msgid "Finishing SQUASH_MSG"
7632msgstr "完成 SQUASH_MSG"
7633
7634#: builtin/merge.c:397
7635#, c-format
7636msgid "No merge message -- not updating HEAD\n"
7637msgstr "无合并信息 -- 未更新 HEAD\n"
7638
7639#: builtin/merge.c:447
7640#, c-format
7641msgid "'%s' does not point to a commit"
7642msgstr "'%s' 没有指向一个提交"
7643
7644#: builtin/merge.c:537
7645#, c-format
7646msgid "Bad branch.%s.mergeoptions string: %s"
7647msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7648
7649#: builtin/merge.c:656
7650msgid "Not handling anything other than two heads merge."
7651msgstr "不能处理两个头合并之外的任何操作。"
7652
7653#: builtin/merge.c:670
7654#, c-format
7655msgid "Unknown option for merge-recursive: -X%s"
7656msgstr "merge-recursive 的未知选项:-X%s"
7657
7658#: builtin/merge.c:683
7659#, c-format
7660msgid "unable to write %s"
7661msgstr "不能写 %s"
7662
7663#: builtin/merge.c:772
7664#, c-format
7665msgid "Could not read from '%s'"
7666msgstr "不能从 '%s' 读取"
7667
7668#: builtin/merge.c:781
7669#, c-format
7670msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7671msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7672
7673#: builtin/merge.c:787
7674#, c-format
7675msgid ""
7676"Please enter a commit message to explain why this merge is necessary,\n"
7677"especially if it merges an updated upstream into a topic branch.\n"
7678"\n"
7679"Lines starting with '%c' will be ignored, and an empty message aborts\n"
7680"the commit.\n"
7681msgstr ""
7682"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7683"合并到主题分支。\n"
7684"\n"
7685"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7686
7687#: builtin/merge.c:811
7688msgid "Empty commit message."
7689msgstr "空提交信息。"
7690
7691#: builtin/merge.c:823
7692#, c-format
7693msgid "Wonderful.\n"
7694msgstr "太棒了。\n"
7695
7696#: builtin/merge.c:878
7697#, c-format
7698msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7699msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7700
7701#: builtin/merge.c:894
7702#, c-format
7703msgid "'%s' is not a commit"
7704msgstr "'%s' 不是一个提交"
7705
7706#: builtin/merge.c:935
7707msgid "No current branch."
7708msgstr "没有当前分支。"
7709
7710#: builtin/merge.c:937
7711msgid "No remote for the current branch."
7712msgstr "当前分支没有对应的远程仓库。"
7713
7714#: builtin/merge.c:939
7715msgid "No default upstream defined for the current branch."
7716msgstr "当前分支没有定义默认的上游分支。"
7717
7718#: builtin/merge.c:944
7719#, c-format
7720msgid "No remote-tracking branch for %s from %s"
7721msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7722
7723#: builtin/merge.c:1081
7724#, c-format
7725msgid "could not close '%s'"
7726msgstr "不能关闭 '%s'"
7727
7728#: builtin/merge.c:1208
7729msgid "There is no merge to abort (MERGE_HEAD missing)."
7730msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7731
7732#: builtin/merge.c:1224
7733msgid ""
7734"You have not concluded your merge (MERGE_HEAD exists).\n"
7735"Please, commit your changes before you merge."
7736msgstr ""
7737"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7738"请在合并前先提交您的修改。"
7739
7740#: builtin/merge.c:1231
7741msgid ""
7742"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7743"Please, commit your changes before you merge."
7744msgstr ""
7745"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7746"请在合并前先提交您的修改。"
7747
7748#: builtin/merge.c:1234
7749msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7750msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7751
7752#: builtin/merge.c:1243
7753msgid "You cannot combine --squash with --no-ff."
7754msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7755
7756#: builtin/merge.c:1251
7757msgid "No commit specified and merge.defaultToUpstream not set."
7758msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7759
7760#: builtin/merge.c:1268
7761msgid "Squash commit into empty head not supported yet"
7762msgstr "尚不支持到空分支的压缩提交"
7763
7764#: builtin/merge.c:1270
7765msgid "Non-fast-forward commit does not make sense into an empty head"
7766msgstr "到空分支的非快进式提交没有意义"
7767
7768#: builtin/merge.c:1276
7769#, c-format
7770msgid "%s - not something we can merge"
7771msgstr "%s - 不能被合并"
7772
7773#: builtin/merge.c:1278
7774msgid "Can merge only exactly one commit into empty head"
7775msgstr "只能将一个提交合并到空分支上"
7776
7777#: builtin/merge.c:1333
7778#, c-format
7779msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7780msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7781
7782#: builtin/merge.c:1336
7783#, c-format
7784msgid "Commit %s has a bad GPG signature allegedly by %s."
7785msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7786
7787#: builtin/merge.c:1339
7788#, c-format
7789msgid "Commit %s does not have a GPG signature."
7790msgstr "提交 %s 没有一个 GPG 签名。"
7791
7792#: builtin/merge.c:1342
7793#, c-format
7794msgid "Commit %s has a good GPG signature by %s\n"
7795msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7796
7797#: builtin/merge.c:1423
7798#, c-format
7799msgid "Updating %s..%s\n"
7800msgstr "更新 %s..%s\n"
7801
7802#: builtin/merge.c:1462
7803#, c-format
7804msgid "Trying really trivial in-index merge...\n"
7805msgstr "尝试非常小的索引内合并...\n"
7806
7807#: builtin/merge.c:1469
7808#, c-format
7809msgid "Nope.\n"
7810msgstr "无。\n"
7811
7812#: builtin/merge.c:1501
7813msgid "Not possible to fast-forward, aborting."
7814msgstr "无法快进,终止。"
7815
7816#: builtin/merge.c:1524 builtin/merge.c:1603
7817#, c-format
7818msgid "Rewinding the tree to pristine...\n"
7819msgstr "将树回滚至原始状态...\n"
7820
7821#: builtin/merge.c:1528
7822#, c-format
7823msgid "Trying merge strategy %s...\n"
7824msgstr "尝试合并策略 %s...\n"
7825
7826#: builtin/merge.c:1594
7827#, c-format
7828msgid "No merge strategy handled the merge.\n"
7829msgstr "没有合并策略处理此合并。\n"
7830
7831#: builtin/merge.c:1596
7832#, c-format
7833msgid "Merge with strategy %s failed.\n"
7834msgstr "使用策略 %s 合并失败。\n"
7835
7836#: builtin/merge.c:1605
7837#, c-format
7838msgid "Using the %s to prepare resolving by hand.\n"
7839msgstr "使用 %s 以准备手工解决。\n"
7840
7841#: builtin/merge.c:1617
7842#, c-format
7843msgid "Automatic merge went well; stopped before committing as requested\n"
7844msgstr "自动合并进展顺利,按要求在提交前停止\n"
7845
7846#: builtin/merge-base.c:29
7847msgid "git merge-base [-a | --all] <commit> <commit>..."
7848msgstr "git merge-base [-a | --all] <提交> <提交>..."
7849
7850#: builtin/merge-base.c:30
7851msgid "git merge-base [-a | --all] --octopus <commit>..."
7852msgstr "git merge-base [-a | --all] --octopus <提交>..."
7853
7854#: builtin/merge-base.c:31
7855msgid "git merge-base --independent <commit>..."
7856msgstr "git merge-base --independent <提交>..."
7857
7858#: builtin/merge-base.c:32
7859msgid "git merge-base --is-ancestor <commit> <commit>"
7860msgstr "git merge-base --is-ancestor <提交> <提交>"
7861
7862#: builtin/merge-base.c:33
7863msgid "git merge-base --fork-point <ref> [<commit>]"
7864msgstr "git merge-base --fork-point <引用> [<提交>]"
7865
7866#: builtin/merge-base.c:214
7867msgid "output all common ancestors"
7868msgstr "输出所有共同的祖先"
7869
7870#: builtin/merge-base.c:216
7871msgid "find ancestors for a single n-way merge"
7872msgstr "查找一个多路合并的祖先提交"
7873
7874#: builtin/merge-base.c:218
7875msgid "list revs not reachable from others"
7876msgstr "显示不能被其他访问到的版本"
7877
7878#: builtin/merge-base.c:220
7879msgid "is the first one ancestor of the other?"
7880msgstr "第一个是其他的祖先提交么?"
7881
7882#: builtin/merge-base.c:222
7883msgid "find where <commit> forked from reflog of <ref>"
7884msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
7885
7886#: builtin/merge-file.c:8
7887msgid ""
7888"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7889"<orig-file> <file2>"
7890msgstr ""
7891"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7892"件> <文件2>"
7893
7894#: builtin/merge-file.c:33
7895msgid "send results to standard output"
7896msgstr "将结果发送到标准输出"
7897
7898#: builtin/merge-file.c:34
7899msgid "use a diff3 based merge"
7900msgstr "使用基于 diff3 的合并"
7901
7902#: builtin/merge-file.c:35
7903msgid "for conflicts, use our version"
7904msgstr "如果冲突,使用我们的版本"
7905
7906#: builtin/merge-file.c:37
7907msgid "for conflicts, use their version"
7908msgstr "如果冲突,使用他们的版本"
7909
7910#: builtin/merge-file.c:39
7911msgid "for conflicts, use a union version"
7912msgstr "如果冲突,使用联合版本"
7913
7914#: builtin/merge-file.c:42
7915msgid "for conflicts, use this marker size"
7916msgstr "如果冲突,使用指定长度的标记"
7917
7918#: builtin/merge-file.c:43
7919msgid "do not warn about conflicts"
7920msgstr "不要警告冲突"
7921
7922#: builtin/merge-file.c:45
7923msgid "set labels for file1/orig-file/file2"
7924msgstr "为 文件1/初始文件/文件2 设置标签"
7925
7926#: builtin/mktree.c:64
7927msgid "git mktree [-z] [--missing] [--batch]"
7928msgstr "git mktree [-z] [--missing] [--batch]"
7929
7930#: builtin/mktree.c:150
7931msgid "input is NUL terminated"
7932msgstr "输入以 NUL 字符终止"
7933
7934#: builtin/mktree.c:151 builtin/write-tree.c:24
7935msgid "allow missing objects"
7936msgstr "允许丢失的对象"
7937
7938#: builtin/mktree.c:152
7939msgid "allow creation of more than one tree"
7940msgstr "允许创建一个以上的树"
7941
7942#: builtin/mv.c:15
7943msgid "git mv [<options>] <source>... <destination>"
7944msgstr "git mv [<选项>] <源>... <目标>"
7945
7946#: builtin/mv.c:69
7947#, c-format
7948msgid "Directory %s is in index and no submodule?"
7949msgstr "目录 %s 在索引中并且不是子模组?"
7950
7951#: builtin/mv.c:71
7952msgid "Please stage your changes to .gitmodules or stash them to proceed"
7953msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
7954
7955#: builtin/mv.c:89
7956#, c-format
7957msgid "%.*s is in index"
7958msgstr "%.*s 在索引中"
7959
7960#: builtin/mv.c:111
7961msgid "force move/rename even if target exists"
7962msgstr "强制移动/重命令,即使目标存在"
7963
7964#: builtin/mv.c:112
7965msgid "skip move/rename errors"
7966msgstr "跳过移动/重命名错误"
7967
7968#: builtin/mv.c:151
7969#, c-format
7970msgid "destination '%s' is not a directory"
7971msgstr "目标 '%s' 不是一个目录"
7972
7973#: builtin/mv.c:162
7974#, c-format
7975msgid "Checking rename of '%s' to '%s'\n"
7976msgstr "检查 '%s' 到 '%s' 的重命名\n"
7977
7978#: builtin/mv.c:166
7979msgid "bad source"
7980msgstr "坏的源"
7981
7982#: builtin/mv.c:169
7983msgid "can not move directory into itself"
7984msgstr "不能将目录移动到自身"
7985
7986#: builtin/mv.c:172
7987msgid "cannot move directory over file"
7988msgstr "不能将目录移动到文件"
7989
7990#: builtin/mv.c:181
7991msgid "source directory is empty"
7992msgstr "源目录为空"
7993
7994#: builtin/mv.c:206
7995msgid "not under version control"
7996msgstr "不在版本控制之下"
7997
7998#: builtin/mv.c:209
7999msgid "destination exists"
8000msgstr "目标已存在"
8001
8002#: builtin/mv.c:217
8003#, c-format
8004msgid "overwriting '%s'"
8005msgstr "覆盖 '%s'"
8006
8007#: builtin/mv.c:220
8008msgid "Cannot overwrite"
8009msgstr "不能覆盖"
8010
8011#: builtin/mv.c:223
8012msgid "multiple sources for the same target"
8013msgstr "同一目标具有多个源"
8014
8015#: builtin/mv.c:225
8016msgid "destination directory does not exist"
8017msgstr "目标目录不存在"
8018
8019#: builtin/mv.c:232
8020#, c-format
8021msgid "%s, source=%s, destination=%s"
8022msgstr "%s,源=%s,目标=%s"
8023
8024#: builtin/mv.c:253
8025#, c-format
8026msgid "Renaming %s to %s\n"
8027msgstr "重命名 %s 至 %s\n"
8028
8029#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
8030#, c-format
8031msgid "renaming '%s' failed"
8032msgstr "重命名 '%s' 失败"
8033
8034#: builtin/name-rev.c:255
8035msgid "git name-rev [<options>] <commit>..."
8036msgstr "git name-rev [<选项>] <提交>..."
8037
8038#: builtin/name-rev.c:256
8039msgid "git name-rev [<options>] --all"
8040msgstr "git name-rev [<选项>] --all"
8041
8042#: builtin/name-rev.c:257
8043msgid "git name-rev [<options>] --stdin"
8044msgstr "git name-rev [<选项>] --stdin"
8045
8046#: builtin/name-rev.c:309
8047msgid "print only names (no SHA-1)"
8048msgstr "只打印名称(无 SHA-1)"
8049
8050#: builtin/name-rev.c:310
8051msgid "only use tags to name the commits"
8052msgstr "只使用标签来命名提交"
8053
8054#: builtin/name-rev.c:312
8055msgid "only use refs matching <pattern>"
8056msgstr "只使用和 <模式> 相匹配的引用"
8057
8058#: builtin/name-rev.c:314
8059msgid "list all commits reachable from all refs"
8060msgstr "列出可以从所有引用访问的提交"
8061
8062#: builtin/name-rev.c:315
8063msgid "read from stdin"
8064msgstr "从标准输入读取"
8065
8066#: builtin/name-rev.c:316
8067msgid "allow to print `undefined` names (default)"
8068msgstr "允许打印 `未定义` 的名称(默认)"
8069
8070#: builtin/name-rev.c:322
8071msgid "dereference tags in the input (internal use)"
8072msgstr "反向解析输入中的标签(内部使用)"
8073
8074#: builtin/notes.c:25
8075msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8076msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8077
8078#: builtin/notes.c:26
8079msgid ""
8080"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8081"| (-c | -C) <object>] [<object>]"
8082msgstr ""
8083"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8084"| (-c | -C) <对象>] [<对象>]"
8085
8086#: builtin/notes.c:27
8087msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8088msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8089
8090#: builtin/notes.c:28
8091msgid ""
8092"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8093"(-c | -C) <object>] [<object>]"
8094msgstr ""
8095"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8096"(-c | -C) <对象>] [<对象>]"
8097
8098#: builtin/notes.c:29
8099msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8100msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8101
8102#: builtin/notes.c:30
8103msgid "git notes [--ref <notes-ref>] show [<object>]"
8104msgstr "git notes [--ref <注解引用>] show [<对象>]"
8105
8106#: builtin/notes.c:31
8107msgid ""
8108"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8109msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8110
8111#: builtin/notes.c:32
8112msgid "git notes merge --commit [-v | -q]"
8113msgstr "git notes merge --commit [-v | -q]"
8114
8115#: builtin/notes.c:33
8116msgid "git notes merge --abort [-v | -q]"
8117msgstr "git notes merge --abort [-v | -q]"
8118
8119#: builtin/notes.c:34
8120msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8121msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8122
8123#: builtin/notes.c:35
8124msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8125msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8126
8127#: builtin/notes.c:36
8128msgid "git notes [--ref <notes-ref>] get-ref"
8129msgstr "git notes [--ref <注解引用>] get-ref"
8130
8131#: builtin/notes.c:41
8132msgid "git notes [list [<object>]]"
8133msgstr "git notes [list [<对象>]]"
8134
8135#: builtin/notes.c:46
8136msgid "git notes add [<options>] [<object>]"
8137msgstr "git notes add [<选项>] [<对象>]"
8138
8139#: builtin/notes.c:51
8140msgid "git notes copy [<options>] <from-object> <to-object>"
8141msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8142
8143#: builtin/notes.c:52
8144msgid "git notes copy --stdin [<from-object> <to-object>]..."
8145msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8146
8147#: builtin/notes.c:57
8148msgid "git notes append [<options>] [<object>]"
8149msgstr "git notes append [<选项>] [<对象>]"
8150
8151#: builtin/notes.c:62
8152msgid "git notes edit [<object>]"
8153msgstr "git notes edit [<对象>]"
8154
8155#: builtin/notes.c:67
8156msgid "git notes show [<object>]"
8157msgstr "git notes show [<对象>]"
8158
8159#: builtin/notes.c:72
8160msgid "git notes merge [<options>] <notes-ref>"
8161msgstr "git notes merge [<选项>] <注解引用>"
8162
8163#: builtin/notes.c:73
8164msgid "git notes merge --commit [<options>]"
8165msgstr "git notes merge --commit [<选项>]"
8166
8167#: builtin/notes.c:74
8168msgid "git notes merge --abort [<options>]"
8169msgstr "git notes merge --abort [<选项>]"
8170
8171#: builtin/notes.c:79
8172msgid "git notes remove [<object>]"
8173msgstr "git notes remove [<对象>]"
8174
8175#: builtin/notes.c:84
8176msgid "git notes prune [<options>]"
8177msgstr "git notes prune [<选项>]"
8178
8179#: builtin/notes.c:89
8180msgid "git notes get-ref"
8181msgstr "git notes get-ref"
8182
8183#: builtin/notes.c:147
8184#, c-format
8185msgid "unable to start 'show' for object '%s'"
8186msgstr "不能为对象 '%s' 开始 'show'"
8187
8188#: builtin/notes.c:151
8189msgid "could not read 'show' output"
8190msgstr "不能读取 'show' 的输出"
8191
8192#: builtin/notes.c:159
8193#, c-format
8194msgid "failed to finish 'show' for object '%s'"
8195msgstr "无法为对象 '%s' 完成 'show'"
8196
8197#: builtin/notes.c:174 builtin/tag.c:477
8198#, c-format
8199msgid "could not create file '%s'"
8200msgstr "不能创建文件 '%s'"
8201
8202#: builtin/notes.c:193
8203msgid "Please supply the note contents using either -m or -F option"
8204msgstr "请通过 -m 或 -F 选项为注解提供内容"
8205
8206#: builtin/notes.c:202
8207msgid "unable to write note object"
8208msgstr "不能写注解对象"
8209
8210#: builtin/notes.c:204
8211#, c-format
8212msgid "The note contents have been left in %s"
8213msgstr "注解内容被留在 %s 中"
8214
8215#: builtin/notes.c:232 builtin/tag.c:695
8216#, c-format
8217msgid "cannot read '%s'"
8218msgstr "不能读取 '%s'"
8219
8220#: builtin/notes.c:234 builtin/tag.c:698
8221#, c-format
8222msgid "could not open or read '%s'"
8223msgstr "不能打开或读取 '%s'"
8224
8225#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8226#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
8227#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
8228#: builtin/notes.c:877 builtin/tag.c:711
8229#, c-format
8230msgid "Failed to resolve '%s' as a valid ref."
8231msgstr "无法解析 '%s' 为一个有效引用。"
8232
8233#: builtin/notes.c:256
8234#, c-format
8235msgid "Failed to read object '%s'."
8236msgstr "无法读取对象 '%s'。"
8237
8238#: builtin/notes.c:260
8239#, c-format
8240msgid "Cannot read note data from non-blob object '%s'."
8241msgstr "不能从非数据对象 '%s' 中读取注解数据"
8242
8243#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
8244#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
8245#: builtin/notes.c:942
8246msgid "too many parameters"
8247msgstr "参数太多"
8248
8249#: builtin/notes.c:372 builtin/notes.c:659
8250#, c-format
8251msgid "No note found for object %s."
8252msgstr "未发现对象 %s 的注解。"
8253
8254#: builtin/notes.c:393 builtin/notes.c:556
8255msgid "note contents as a string"
8256msgstr "注解内容作为一个字符串"
8257
8258#: builtin/notes.c:396 builtin/notes.c:559
8259msgid "note contents in a file"
8260msgstr "注解内容到一个文件中"
8261
8262#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
8263#: builtin/notes.c:564 builtin/tag.c:630
8264msgid "object"
8265msgstr "对象"
8266
8267#: builtin/notes.c:399 builtin/notes.c:562
8268msgid "reuse and edit specified note object"
8269msgstr "重用和编辑指定的注解对象"
8270
8271#: builtin/notes.c:402 builtin/notes.c:565
8272msgid "reuse specified note object"
8273msgstr "重用指定的注解对象"
8274
8275#: builtin/notes.c:405 builtin/notes.c:568
8276msgid "allow storing empty note"
8277msgstr "允许保存空白注释"
8278
8279#: builtin/notes.c:406 builtin/notes.c:477
8280msgid "replace existing notes"
8281msgstr "替换已存在的注解"
8282
8283#: builtin/notes.c:431
8284#, c-format
8285msgid ""
8286"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8287"existing notes"
8288msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8289
8290#: builtin/notes.c:446 builtin/notes.c:525
8291#, c-format
8292msgid "Overwriting existing notes for object %s\n"
8293msgstr "覆盖对象 %s 现存注解\n"
8294
8295#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
8296#, c-format
8297msgid "Removing note for object %s\n"
8298msgstr "删除对象 %s 的注解\n"
8299
8300#: builtin/notes.c:478
8301msgid "read objects from stdin"
8302msgstr "从标准输入读取对象"
8303
8304#: builtin/notes.c:480
8305msgid "load rewriting config for <command> (implies --stdin)"
8306msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8307
8308#: builtin/notes.c:498
8309msgid "too few parameters"
8310msgstr "参数太少"
8311
8312#: builtin/notes.c:519
8313#, c-format
8314msgid ""
8315"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8316"existing notes"
8317msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8318
8319#: builtin/notes.c:531
8320#, c-format
8321msgid "Missing notes on source object %s. Cannot copy."
8322msgstr "源对象 %s 缺少注解。不能拷贝。"
8323
8324#: builtin/notes.c:583
8325#, c-format
8326msgid ""
8327"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8328"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8329msgstr ""
8330"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8331"请换用 'git notes add -f -m/-F/-c/-C'。\n"
8332
8333#: builtin/notes.c:764
8334msgid "General options"
8335msgstr "通用选项"
8336
8337#: builtin/notes.c:766
8338msgid "Merge options"
8339msgstr "合并选项"
8340
8341#: builtin/notes.c:768
8342msgid ""
8343"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8344"cat_sort_uniq)"
8345msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8346
8347#: builtin/notes.c:770
8348msgid "Committing unmerged notes"
8349msgstr "提交未合并的注解"
8350
8351#: builtin/notes.c:772
8352msgid "finalize notes merge by committing unmerged notes"
8353msgstr "通过提交未合并的注解来完成注解合并"
8354
8355#: builtin/notes.c:774
8356msgid "Aborting notes merge resolution"
8357msgstr "中止注解合并的方案"
8358
8359#: builtin/notes.c:776
8360msgid "abort notes merge"
8361msgstr "中止注解合并"
8362
8363#: builtin/notes.c:853
8364#, c-format
8365msgid "A notes merge into %s is already in-progress at %s"
8366msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8367
8368#: builtin/notes.c:880
8369#, c-format
8370msgid "Object %s has no note\n"
8371msgstr "对象 %s 没有注解\n"
8372
8373#: builtin/notes.c:892
8374msgid "attempt to remove non-existent note is not an error"
8375msgstr "尝试删除不存在的注解不是一个错误"
8376
8377#: builtin/notes.c:895
8378msgid "read object names from the standard input"
8379msgstr "从标准输入读取对象名称"
8380
8381#: builtin/notes.c:976
8382msgid "notes-ref"
8383msgstr "注解引用"
8384
8385#: builtin/notes.c:977
8386msgid "use notes from <notes-ref>"
8387msgstr "从 <注解引用> 使用注解"
8388
8389#: builtin/notes.c:1012 builtin/remote.c:1588
8390#, c-format
8391msgid "Unknown subcommand: %s"
8392msgstr "未知子命令:%s"
8393
8394#: builtin/pack-objects.c:28
8395msgid ""
8396"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8397msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8398
8399#: builtin/pack-objects.c:29
8400msgid ""
8401"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8402msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8403
8404#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8405#, c-format
8406msgid "deflate error (%d)"
8407msgstr "压缩错误 (%d)"
8408
8409#: builtin/pack-objects.c:771
8410msgid "Writing objects"
8411msgstr "写入对象中"
8412
8413#: builtin/pack-objects.c:1011
8414msgid "disabling bitmap writing, as some objects are not being packed"
8415msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8416
8417#: builtin/pack-objects.c:2171
8418msgid "Compressing objects"
8419msgstr "压缩对象中"
8420
8421#: builtin/pack-objects.c:2568
8422#, c-format
8423msgid "unsupported index version %s"
8424msgstr "不支持的索引版本 %s"
8425
8426#: builtin/pack-objects.c:2572
8427#, c-format
8428msgid "bad index version '%s'"
8429msgstr "坏的索引版本 '%s'"
8430
8431#: builtin/pack-objects.c:2602
8432msgid "do not show progress meter"
8433msgstr "不显示进度表"
8434
8435#: builtin/pack-objects.c:2604
8436msgid "show progress meter"
8437msgstr "显示进度表"
8438
8439#: builtin/pack-objects.c:2606
8440msgid "show progress meter during object writing phase"
8441msgstr "在对象写入阶段显示进度表"
8442
8443#: builtin/pack-objects.c:2609
8444msgid "similar to --all-progress when progress meter is shown"
8445msgstr "当进度表显示时类似于 --all-progress"
8446
8447#: builtin/pack-objects.c:2610
8448msgid "version[,offset]"
8449msgstr "版本[,偏移]"
8450
8451#: builtin/pack-objects.c:2611
8452msgid "write the pack index file in the specified idx format version"
8453msgstr "用指定的 idx 格式版本来写包索引文件"
8454
8455#: builtin/pack-objects.c:2614
8456msgid "maximum size of each output pack file"
8457msgstr "每个输出包的最大尺寸"
8458
8459#: builtin/pack-objects.c:2616
8460msgid "ignore borrowed objects from alternate object store"
8461msgstr "忽略从备用对象存储里借用对象"
8462
8463#: builtin/pack-objects.c:2618
8464msgid "ignore packed objects"
8465msgstr "忽略包对象"
8466
8467#: builtin/pack-objects.c:2620
8468msgid "limit pack window by objects"
8469msgstr "限制打包窗口的对象数"
8470
8471#: builtin/pack-objects.c:2622
8472msgid "limit pack window by memory in addition to object limit"
8473msgstr "除对象数量限制外设置打包窗口的内存限制"
8474
8475#: builtin/pack-objects.c:2624
8476msgid "maximum length of delta chain allowed in the resulting pack"
8477msgstr "打包允许的 delta 链的最大长度"
8478
8479#: builtin/pack-objects.c:2626
8480msgid "reuse existing deltas"
8481msgstr "重用已存在的 deltas"
8482
8483#: builtin/pack-objects.c:2628
8484msgid "reuse existing objects"
8485msgstr "重用已存在的对象"
8486
8487#: builtin/pack-objects.c:2630
8488msgid "use OFS_DELTA objects"
8489msgstr "使用 OFS_DELTA 对象"
8490
8491#: builtin/pack-objects.c:2632
8492msgid "use threads when searching for best delta matches"
8493msgstr "使用线程查询最佳 delta 匹配"
8494
8495#: builtin/pack-objects.c:2634
8496msgid "do not create an empty pack output"
8497msgstr "不创建空的包输出"
8498
8499#: builtin/pack-objects.c:2636
8500msgid "read revision arguments from standard input"
8501msgstr "从标准输入读取版本号参数"
8502
8503#: builtin/pack-objects.c:2638
8504msgid "limit the objects to those that are not yet packed"
8505msgstr "限制那些尚未打包的对象"
8506
8507#: builtin/pack-objects.c:2641
8508msgid "include objects reachable from any reference"
8509msgstr "包括可以从任何引用访问到的对象"
8510
8511#: builtin/pack-objects.c:2644
8512msgid "include objects referred by reflog entries"
8513msgstr "包括被引用日志引用到的对象"
8514
8515#: builtin/pack-objects.c:2647
8516msgid "include objects referred to by the index"
8517msgstr "包括被索引引用到的对象"
8518
8519#: builtin/pack-objects.c:2650
8520msgid "output pack to stdout"
8521msgstr "输出包到标准输出"
8522
8523#: builtin/pack-objects.c:2652
8524msgid "include tag objects that refer to objects to be packed"
8525msgstr "包括那些引用了待打包对象的标签对象"
8526
8527#: builtin/pack-objects.c:2654
8528msgid "keep unreachable objects"
8529msgstr "维持不可达的对象"
8530
8531#: builtin/pack-objects.c:2655 parse-options.h:142
8532msgid "time"
8533msgstr "时间"
8534
8535#: builtin/pack-objects.c:2656
8536msgid "unpack unreachable objects newer than <time>"
8537msgstr "将比给定 <时间> 新的无法访问的对象解包"
8538
8539#: builtin/pack-objects.c:2659
8540msgid "create thin packs"
8541msgstr "创建精简包"
8542
8543#: builtin/pack-objects.c:2661
8544msgid "create packs suitable for shallow fetches"
8545msgstr "创建适合浅克隆仓库获取的包"
8546
8547#: builtin/pack-objects.c:2663
8548msgid "ignore packs that have companion .keep file"
8549msgstr "忽略配有 .keep 文件的包"
8550
8551#: builtin/pack-objects.c:2665
8552msgid "pack compression level"
8553msgstr "打包压缩级别"
8554
8555#: builtin/pack-objects.c:2667
8556msgid "do not hide commits by grafts"
8557msgstr "显示被嫁接隐藏的提交"
8558
8559#: builtin/pack-objects.c:2669
8560msgid "use a bitmap index if available to speed up counting objects"
8561msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8562
8563#: builtin/pack-objects.c:2671
8564msgid "write a bitmap index together with the pack index"
8565msgstr "在建立包索引的同时创建 bitmap 索引"
8566
8567#: builtin/pack-objects.c:2762
8568msgid "Counting objects"
8569msgstr "对象计数中"
8570
8571#: builtin/pack-refs.c:6
8572msgid "git pack-refs [<options>]"
8573msgstr "git pack-refs [<选项>]"
8574
8575#: builtin/pack-refs.c:14
8576msgid "pack everything"
8577msgstr "打包一切"
8578
8579#: builtin/pack-refs.c:15
8580msgid "prune loose refs (default)"
8581msgstr "清除松散的引用(默认)"
8582
8583#: builtin/prune-packed.c:7
8584msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8585msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8586
8587#: builtin/prune-packed.c:40
8588msgid "Removing duplicate objects"
8589msgstr "正在删除重复对象"
8590
8591#: builtin/prune.c:11
8592msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8593msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8594
8595#: builtin/prune.c:105 builtin/worktree.c:121
8596msgid "do not remove, show only"
8597msgstr "不删除,只显示"
8598
8599#: builtin/prune.c:106 builtin/worktree.c:122
8600msgid "report pruned objects"
8601msgstr "报告清除的对象"
8602
8603#: builtin/prune.c:109 builtin/worktree.c:124
8604msgid "expire objects older than <time>"
8605msgstr "使早于给定时间的对象过期"
8606
8607#: builtin/pull.c:69
8608msgid "git pull [options] [<repository> [<refspec>...]]"
8609msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8610
8611#: builtin/pull.c:113
8612msgid "Options related to merging"
8613msgstr "和合并相关的选项"
8614
8615#: builtin/pull.c:115
8616msgid "false|true|preserve"
8617msgstr "false|true|preserve"
8618
8619#: builtin/pull.c:116
8620msgid "incorporate changes by rebasing rather than merging"
8621msgstr "使用变基操作取代合并操作以合入修改"
8622
8623#: builtin/pull.c:140 builtin/revert.c:105
8624msgid "allow fast-forward"
8625msgstr "允许快进式"
8626
8627#: builtin/pull.c:146
8628msgid "verify that the named commit has a valid GPG signature"
8629msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8630
8631#: builtin/pull.c:160
8632msgid "Options related to fetching"
8633msgstr "和获取相关的参数"
8634
8635#: builtin/pull.c:268
8636#, c-format
8637msgid "Invalid value for pull.ff: %s"
8638msgstr "pull.ff 的取值无效:%s"
8639
8640#: builtin/pull.c:352
8641msgid "Cannot pull with rebase: You have unstaged changes."
8642msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8643
8644#: builtin/pull.c:358
8645msgid "Additionally, your index contains uncommitted changes."
8646msgstr "而且您的索引中包含未提交的变更。"
8647
8648#: builtin/pull.c:360
8649msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8650msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8651
8652#: builtin/pull.c:436
8653msgid ""
8654"There is no candidate for rebasing against among the refs that you just "
8655"fetched."
8656msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8657
8658#: builtin/pull.c:438
8659msgid ""
8660"There are no candidates for merging among the refs that you just fetched."
8661msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8662
8663#: builtin/pull.c:439
8664msgid ""
8665"Generally this means that you provided a wildcard refspec which had no\n"
8666"matches on the remote end."
8667msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8668
8669#: builtin/pull.c:442
8670#, c-format
8671msgid ""
8672"You asked to pull from the remote '%s', but did not specify\n"
8673"a branch. Because this is not the default configured remote\n"
8674"for your current branch, you must specify a branch on the command line."
8675msgstr ""
8676"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8677"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8678
8679#: builtin/pull.c:447
8680msgid "You are not currently on a branch."
8681msgstr "您当前不在一个分支上。"
8682
8683#: builtin/pull.c:449 builtin/pull.c:464
8684msgid "Please specify which branch you want to rebase against."
8685msgstr "请指定您要变基到哪一个分支。"
8686
8687#: builtin/pull.c:451 builtin/pull.c:466
8688msgid "Please specify which branch you want to merge with."
8689msgstr "请指定您要合并哪一个分支。"
8690
8691#: builtin/pull.c:452 builtin/pull.c:467
8692msgid "See git-pull(1) for details."
8693msgstr "详见 git-pull(1)。"
8694
8695#: builtin/pull.c:462
8696msgid "There is no tracking information for the current branch."
8697msgstr "当前分支没有跟踪信息。"
8698
8699#: builtin/pull.c:471
8700#, c-format
8701msgid ""
8702"If you wish to set tracking information for this branch you can do so with:\n"
8703"\n"
8704"    git branch --set-upstream-to=%s/<branch> %s\n"
8705msgstr ""
8706"如果您想要为此分支创建跟踪信息,您可以执行:\n"
8707"\n"
8708"    git branch --set-upstream-to=%s/<branch> %s\n"
8709
8710#: builtin/pull.c:476
8711#, c-format
8712msgid ""
8713"Your configuration specifies to merge with the ref '%s'\n"
8714"from the remote, but no such ref was fetched."
8715msgstr ""
8716"您的配置中指定要合并远程的引用 '%s',\n"
8717"但是没有获取到这个引用。"
8718
8719#: builtin/pull.c:830
8720msgid "Updating an unborn branch with changes added to the index."
8721msgstr "更新尚未诞生的分支,变更添加至索引。"
8722
8723#: builtin/pull.c:859
8724#, c-format
8725msgid ""
8726"fetch updated the current branch head.\n"
8727"fast-forwarding your working tree from\n"
8728"commit %s."
8729msgstr ""
8730"fetch 更新了当前的分支。快进您的工作区\n"
8731"至提交 %s。"
8732
8733#: builtin/pull.c:864
8734#, c-format
8735msgid ""
8736"Cannot fast-forward your working tree.\n"
8737"After making sure that you saved anything precious from\n"
8738"$ git diff %s\n"
8739"output, run\n"
8740"$ git reset --hard\n"
8741"to recover."
8742msgstr ""
8743"您当前的工作区无法执行快进操作。\n"
8744"首先执行如下命令:\n"
8745"$ git diff %s\n"
8746"以确认所有有用的数据均已保存。然后执行下面的命令\n"
8747"$ git reset --hard\n"
8748"恢复之前的状态。"
8749
8750#: builtin/pull.c:879
8751msgid "Cannot merge multiple branches into empty head."
8752msgstr "无法将多个分支合并到空分支。"
8753
8754#: builtin/pull.c:883
8755msgid "Cannot rebase onto multiple branches."
8756msgstr "无法变基到多个分支。"
8757
8758#: builtin/push.c:15
8759msgid "git push [<options>] [<repository> [<refspec>...]]"
8760msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8761
8762#: builtin/push.c:86
8763msgid "tag shorthand without <tag>"
8764msgstr "标签后面未提供 <标签> 参数"
8765
8766#: builtin/push.c:96
8767msgid "--delete only accepts plain target ref names"
8768msgstr "--delete 只接受简单的目标引用名"
8769
8770#: builtin/push.c:140
8771msgid ""
8772"\n"
8773"To choose either option permanently, see push.default in 'git help config'."
8774msgstr ""
8775"\n"
8776"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8777
8778#: builtin/push.c:143
8779#, c-format
8780msgid ""
8781"The upstream branch of your current branch does not match\n"
8782"the name of your current branch.  To push to the upstream branch\n"
8783"on the remote, use\n"
8784"\n"
8785"    git push %s HEAD:%s\n"
8786"\n"
8787"To push to the branch of the same name on the remote, use\n"
8788"\n"
8789"    git push %s %s\n"
8790"%s"
8791msgstr ""
8792"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8793"上游分支,使用\n"
8794"\n"
8795"    git push %s HEAD:%s\n"
8796"\n"
8797"为推送至远程同名分支,使用\n"
8798"\n"
8799"    git push %s %s\n"
8800"%s"
8801
8802#: builtin/push.c:158
8803#, c-format
8804msgid ""
8805"You are not currently on a branch.\n"
8806"To push the history leading to the current (detached HEAD)\n"
8807"state now, use\n"
8808"\n"
8809"    git push %s HEAD:<name-of-remote-branch>\n"
8810msgstr ""
8811"您当前不在一个分支上。\n"
8812"现在为推送当前(分离头指针)的历史,使用\n"
8813"\n"
8814"    git push %s HEAD:<远程分支名字>\n"
8815
8816#: builtin/push.c:172
8817#, c-format
8818msgid ""
8819"The current branch %s has no upstream branch.\n"
8820"To push the current branch and set the remote as upstream, use\n"
8821"\n"
8822"    git push --set-upstream %s %s\n"
8823msgstr ""
8824"当前分支 %s 没有对应的上游分支。\n"
8825"为推送当前分支并建立与远程上游的跟踪,使用\n"
8826"\n"
8827"    git push --set-upstream %s %s\n"
8828
8829#: builtin/push.c:180
8830#, c-format
8831msgid "The current branch %s has multiple upstream branches, refusing to push."
8832msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8833
8834#: builtin/push.c:183
8835#, c-format
8836msgid ""
8837"You are pushing to remote '%s', which is not the upstream of\n"
8838"your current branch '%s', without telling me what to push\n"
8839"to update which remote branch."
8840msgstr ""
8841"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8842"而没有告诉我要推送什么、更新哪个远程分支。"
8843
8844#  译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8845#: builtin/push.c:206
8846msgid ""
8847"push.default is unset; its implicit value has changed in\n"
8848"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8849"and maintain the traditional behavior, use:\n"
8850"\n"
8851"  git config --global push.default matching\n"
8852"\n"
8853"To squelch this message and adopt the new behavior now, use:\n"
8854"\n"
8855"  git config --global push.default simple\n"
8856"\n"
8857"When push.default is set to 'matching', git will push local branches\n"
8858"to the remote branches that already exist with the same name.\n"
8859"\n"
8860"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8861"behavior, which only pushes the current branch to the corresponding\n"
8862"remote branch that 'git pull' uses to update the current branch.\n"
8863"\n"
8864"See 'git help config' and search for 'push.default' for further "
8865"information.\n"
8866"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8867"'current' instead of 'simple' if you sometimes use older versions of Git)"
8868msgstr ""
8869"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8870"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8871"\n"
8872"  git config --global push.default matching\n"
8873"\n"
8874"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8875"\n"
8876"  git config --global push.default simple\n"
8877"\n"
8878"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8879"本地分支。\n"
8880"\n"
8881"从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
8882"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8883"\n"
8884"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8885"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8886"为保持兼容,请用 'current' 代替 'simple')"
8887
8888#: builtin/push.c:273
8889msgid ""
8890"You didn't specify any refspecs to push, and push.default is \"nothing\"."
8891msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
8892
8893#: builtin/push.c:280
8894msgid ""
8895"Updates were rejected because the tip of your current branch is behind\n"
8896"its remote counterpart. Integrate the remote changes (e.g.\n"
8897"'git pull ...') before pushing again.\n"
8898"See the 'Note about fast-forwards' in 'git push --help' for details."
8899msgstr ""
8900"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8901"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8902"'git push --help' 中的 'Note about fast-forwards' 小节。"
8903
8904#: builtin/push.c:286
8905msgid ""
8906"Updates were rejected because a pushed branch tip is behind its remote\n"
8907"counterpart. Check out this branch and integrate the remote changes\n"
8908"(e.g. 'git pull ...') before pushing again.\n"
8909"See the 'Note about fast-forwards' in 'git push --help' for details."
8910msgstr ""
8911"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8912"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8913"'git push --help' 中的 'Note about fast-forwards' 小节。"
8914
8915#: builtin/push.c:292
8916msgid ""
8917"Updates were rejected because the remote contains work that you do\n"
8918"not have locally. This is usually caused by another repository pushing\n"
8919"to the same ref. You may want to first integrate the remote changes\n"
8920"(e.g., 'git pull ...') before pushing again.\n"
8921"See the 'Note about fast-forwards' in 'git push --help' for details."
8922msgstr ""
8923"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8924"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8925"(如 'git pull ...')。\n"
8926"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8927
8928#: builtin/push.c:299
8929msgid "Updates were rejected because the tag already exists in the remote."
8930msgstr "更新被拒绝,因为该标签在远程已经存在。"
8931
8932#: builtin/push.c:302
8933msgid ""
8934"You cannot update a remote ref that points at a non-commit object,\n"
8935"or update a remote ref to make it point at a non-commit object,\n"
8936"without using the '--force' option.\n"
8937msgstr ""
8938"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8939"也不能更新远程引用让其指向一个非提交对象。\n"
8940
8941#: builtin/push.c:361
8942#, c-format
8943msgid "Pushing to %s\n"
8944msgstr "推送到 %s\n"
8945
8946#: builtin/push.c:365
8947#, c-format
8948msgid "failed to push some refs to '%s'"
8949msgstr "无法推送一些引用到 '%s'"
8950
8951#: builtin/push.c:395
8952#, c-format
8953msgid "bad repository '%s'"
8954msgstr "坏的仓库 '%s'"
8955
8956#: builtin/push.c:396
8957msgid ""
8958"No configured push destination.\n"
8959"Either specify the URL from the command-line or configure a remote "
8960"repository using\n"
8961"\n"
8962"    git remote add <name> <url>\n"
8963"\n"
8964"and then push using the remote name\n"
8965"\n"
8966"    git push <name>\n"
8967msgstr ""
8968"没有配置推送目标。\n"
8969"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
8970"\n"
8971"    git remote add <名称> <地址>\n"
8972"\n"
8973"然后使用该远程仓库名执行推送\n"
8974"\n"
8975"    git push <名称>\n"
8976
8977#: builtin/push.c:411
8978msgid "--all and --tags are incompatible"
8979msgstr "--all 和 --tags 不兼容"
8980
8981#: builtin/push.c:412
8982msgid "--all can't be combined with refspecs"
8983msgstr "--all 不能和引用规格同时使用"
8984
8985#: builtin/push.c:417
8986msgid "--mirror and --tags are incompatible"
8987msgstr "--mirror 和 --tags 不兼容"
8988
8989#: builtin/push.c:418
8990msgid "--mirror can't be combined with refspecs"
8991msgstr "--mirror 不能和引用规格同时使用"
8992
8993#: builtin/push.c:423
8994msgid "--all and --mirror are incompatible"
8995msgstr "--all 和 --mirror 不兼容"
8996
8997#: builtin/push.c:539
8998msgid "repository"
8999msgstr "仓库"
9000
9001#: builtin/push.c:540 builtin/send-pack.c:161
9002msgid "push all refs"
9003msgstr "推送所有引用"
9004
9005#: builtin/push.c:541 builtin/send-pack.c:163
9006msgid "mirror all refs"
9007msgstr "镜像所有引用"
9008
9009#: builtin/push.c:543
9010msgid "delete refs"
9011msgstr "删除引用"
9012
9013#: builtin/push.c:544
9014msgid "push tags (can't be used with --all or --mirror)"
9015msgstr "推送标签(不能使用 --all or --mirror)"
9016
9017#: builtin/push.c:547 builtin/send-pack.c:164
9018msgid "force updates"
9019msgstr "强制更新"
9020
9021#: builtin/push.c:549 builtin/send-pack.c:175
9022msgid "refname>:<expect"
9023msgstr "引用名>:<期望值"
9024
9025#: builtin/push.c:550 builtin/send-pack.c:176
9026msgid "require old value of ref to be at this value"
9027msgstr "要求引用旧的取值为设定值"
9028
9029#: builtin/push.c:553
9030msgid "control recursive pushing of submodules"
9031msgstr "控制子模组的递归推送"
9032
9033#: builtin/push.c:555 builtin/send-pack.c:169
9034msgid "use thin pack"
9035msgstr "使用精简打包"
9036
9037#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
9038#: builtin/send-pack.c:159
9039msgid "receive pack program"
9040msgstr "接收包程序"
9041
9042#: builtin/push.c:558
9043msgid "set upstream for git pull/status"
9044msgstr "设置 git pull/status 的上游"
9045
9046#: builtin/push.c:561
9047msgid "prune locally removed refs"
9048msgstr "清除本地删除的引用"
9049
9050#: builtin/push.c:563
9051msgid "bypass pre-push hook"
9052msgstr "绕过 pre-push 钩子"
9053
9054#: builtin/push.c:564
9055msgid "push missing but relevant tags"
9056msgstr "推送缺失但有关的标签"
9057
9058#: builtin/push.c:567 builtin/send-pack.c:166
9059msgid "GPG sign the push"
9060msgstr "用 GPG 为推送签名"
9061
9062#: builtin/push.c:569 builtin/send-pack.c:170
9063msgid "request atomic transaction on remote side"
9064msgstr "需要远端支持原子事务"
9065
9066#: builtin/push.c:579
9067msgid "--delete is incompatible with --all, --mirror and --tags"
9068msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9069
9070#: builtin/push.c:581
9071msgid "--delete doesn't make sense without any refs"
9072msgstr "--delete 未接任何引用没有意义"
9073
9074#: builtin/read-tree.c:37
9075msgid ""
9076"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9077"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9078"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9079msgstr ""
9080"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9081"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9082"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9083
9084#: builtin/read-tree.c:110
9085msgid "write resulting index to <file>"
9086msgstr "将索引结果写入 <文件>"
9087
9088#: builtin/read-tree.c:113
9089msgid "only empty the index"
9090msgstr "只是清空索引"
9091
9092#: builtin/read-tree.c:115
9093msgid "Merging"
9094msgstr "合并"
9095
9096#: builtin/read-tree.c:117
9097msgid "perform a merge in addition to a read"
9098msgstr "读取之余再执行一个合并"
9099
9100#: builtin/read-tree.c:119
9101msgid "3-way merge if no file level merging required"
9102msgstr "如果没有文件级合并需要,执行三方合并"
9103
9104#: builtin/read-tree.c:121
9105msgid "3-way merge in presence of adds and removes"
9106msgstr "存在添加和删除时,也执行三方合并"
9107
9108#: builtin/read-tree.c:123
9109msgid "same as -m, but discard unmerged entries"
9110msgstr "类似于 -m,但丢弃未合并的条目"
9111
9112#: builtin/read-tree.c:124
9113msgid "<subdirectory>/"
9114msgstr "<子目录>/"
9115
9116#: builtin/read-tree.c:125
9117msgid "read the tree into the index under <subdirectory>/"
9118msgstr "读取树对象到索引的 <子目录>/ 下"
9119
9120#: builtin/read-tree.c:128
9121msgid "update working tree with merge result"
9122msgstr "用合并的结果更新工作区"
9123
9124#: builtin/read-tree.c:130
9125msgid "gitignore"
9126msgstr "gitignore"
9127
9128#: builtin/read-tree.c:131
9129msgid "allow explicitly ignored files to be overwritten"
9130msgstr "允许忽略文件中设定的文件可以被覆盖"
9131
9132#: builtin/read-tree.c:134
9133msgid "don't check the working tree after merging"
9134msgstr "合并后不检查工作区"
9135
9136#: builtin/read-tree.c:135
9137msgid "don't update the index or the work tree"
9138msgstr "不更新索引区和工作区"
9139
9140#: builtin/read-tree.c:137
9141msgid "skip applying sparse checkout filter"
9142msgstr "跳过应用稀疏检出过滤器"
9143
9144#: builtin/read-tree.c:139
9145msgid "debug unpack-trees"
9146msgstr "调试 unpack-trees"
9147
9148#: builtin/reflog.c:432
9149#, c-format
9150msgid "'%s' for '%s' is not a valid timestamp"
9151msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9152
9153#: builtin/reflog.c:549 builtin/reflog.c:554
9154#, c-format
9155msgid "'%s' is not a valid timestamp"
9156msgstr "'%s' 不是一个有效的时间戳"
9157
9158#: builtin/remote.c:12
9159msgid "git remote [-v | --verbose]"
9160msgstr "git remote [-v | --verbose]"
9161
9162#: builtin/remote.c:13
9163msgid ""
9164"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9165"mirror=<fetch|push>] <name> <url>"
9166msgstr ""
9167"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9168"mirror=<fetch|push>] <名称> <地址>"
9169
9170#: builtin/remote.c:14 builtin/remote.c:33
9171msgid "git remote rename <old> <new>"
9172msgstr "git remote rename <旧名称> <新名称>"
9173
9174#: builtin/remote.c:15 builtin/remote.c:38
9175msgid "git remote remove <name>"
9176msgstr "git remote remove <名称>"
9177
9178#: builtin/remote.c:16 builtin/remote.c:43
9179msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9180msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9181
9182#: builtin/remote.c:17
9183msgid "git remote [-v | --verbose] show [-n] <name>"
9184msgstr "git remote [-v | --verbose] show [-n] <名称>"
9185
9186#: builtin/remote.c:18
9187msgid "git remote prune [-n | --dry-run] <name>"
9188msgstr "git remote prune [-n | --dry-run] <名称>"
9189
9190#: builtin/remote.c:19
9191msgid ""
9192"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9193msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9194
9195#: builtin/remote.c:20
9196msgid "git remote set-branches [--add] <name> <branch>..."
9197msgstr "git remote set-branches [--add] <名称> <分支>..."
9198
9199#: builtin/remote.c:21 builtin/remote.c:69
9200msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9201msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9202
9203#: builtin/remote.c:22 builtin/remote.c:70
9204msgid "git remote set-url --add <name> <newurl>"
9205msgstr "git remote set-url --add <名称> <新的地址>"
9206
9207#: builtin/remote.c:23 builtin/remote.c:71
9208msgid "git remote set-url --delete <name> <url>"
9209msgstr "git remote set-url --delete <名称> <地址>"
9210
9211#: builtin/remote.c:28
9212msgid "git remote add [<options>] <name> <url>"
9213msgstr "git remote add [<选项>] <名称> <地址>"
9214
9215#: builtin/remote.c:48
9216msgid "git remote set-branches <name> <branch>..."
9217msgstr "git remote set-branches <名称> <分支>..."
9218
9219#: builtin/remote.c:49
9220msgid "git remote set-branches --add <name> <branch>..."
9221msgstr "git remote set-branches --add <名称> <分支>..."
9222
9223#: builtin/remote.c:54
9224msgid "git remote show [<options>] <name>"
9225msgstr "git remote show [<选项>] <名称>"
9226
9227#: builtin/remote.c:59
9228msgid "git remote prune [<options>] <name>"
9229msgstr "git remote prune [<选项>] <名称>"
9230
9231#: builtin/remote.c:64
9232msgid "git remote update [<options>] [<group> | <remote>]..."
9233msgstr "git remote update [<选项>] [<组> | <远程>]..."
9234
9235#: builtin/remote.c:88
9236#, c-format
9237msgid "Updating %s"
9238msgstr "更新 %s 中"
9239
9240#: builtin/remote.c:120
9241msgid ""
9242"--mirror is dangerous and deprecated; please\n"
9243"\t use --mirror=fetch or --mirror=push instead"
9244msgstr ""
9245"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9246"\t 或 --mirror=push"
9247
9248#: builtin/remote.c:137
9249#, c-format
9250msgid "unknown mirror argument: %s"
9251msgstr "未知的镜像参数:%s"
9252
9253#: builtin/remote.c:153
9254msgid "fetch the remote branches"
9255msgstr "抓取远程的分支"
9256
9257#: builtin/remote.c:155
9258msgid "import all tags and associated objects when fetching"
9259msgstr "抓取时导入所有的标签和关联对象"
9260
9261#: builtin/remote.c:158
9262msgid "or do not fetch any tag at all (--no-tags)"
9263msgstr "或不抓取任何标签(--no-tags)"
9264
9265#: builtin/remote.c:160
9266msgid "branch(es) to track"
9267msgstr "跟踪的分支"
9268
9269#: builtin/remote.c:161
9270msgid "master branch"
9271msgstr "主线分支"
9272
9273#: builtin/remote.c:162
9274msgid "push|fetch"
9275msgstr "push|fetch"
9276
9277#: builtin/remote.c:163
9278msgid "set up remote as a mirror to push to or fetch from"
9279msgstr "把远程设置为用以推送或抓取的镜像"
9280
9281#: builtin/remote.c:175
9282msgid "specifying a master branch makes no sense with --mirror"
9283msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9284
9285#: builtin/remote.c:177
9286msgid "specifying branches to track makes sense only with fetch mirrors"
9287msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9288
9289#: builtin/remote.c:187 builtin/remote.c:637
9290#, c-format
9291msgid "remote %s already exists."
9292msgstr "远程 %s 已经存在。"
9293
9294#: builtin/remote.c:191 builtin/remote.c:641
9295#, c-format
9296msgid "'%s' is not a valid remote name"
9297msgstr "'%s' 不是一个有效的远程名称"
9298
9299#: builtin/remote.c:235
9300#, c-format
9301msgid "Could not setup master '%s'"
9302msgstr "无法设置 master '%s'"
9303
9304#: builtin/remote.c:335
9305#, c-format
9306msgid "Could not get fetch map for refspec %s"
9307msgstr "无法得到引用规格 %s 的获取列表"
9308
9309#: builtin/remote.c:436 builtin/remote.c:444
9310msgid "(matching)"
9311msgstr "(匹配)"
9312
9313#: builtin/remote.c:448
9314msgid "(delete)"
9315msgstr "(删除)"
9316
9317#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
9318#, c-format
9319msgid "Could not append '%s' to '%s'"
9320msgstr "不能添加 '%s' 至 '%s'"
9321
9322#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
9323#, c-format
9324msgid "No such remote: %s"
9325msgstr "没有这样的远程:%s"
9326
9327#: builtin/remote.c:647
9328#, c-format
9329msgid "Could not rename config section '%s' to '%s'"
9330msgstr "不能重命名配置小节 '%s' 到 '%s'"
9331
9332#: builtin/remote.c:653 builtin/remote.c:821
9333#, c-format
9334msgid "Could not remove config section '%s'"
9335msgstr "不能移除配置小节 '%s'"
9336
9337#: builtin/remote.c:668
9338#, c-format
9339msgid ""
9340"Not updating non-default fetch refspec\n"
9341"\t%s\n"
9342"\tPlease update the configuration manually if necessary."
9343msgstr ""
9344"没有更新非默认的获取引用规格\n"
9345"\t%s\n"
9346"\t如果必要请手动更新配置。"
9347
9348#: builtin/remote.c:674
9349#, c-format
9350msgid "Could not append '%s'"
9351msgstr "不能追加 '%s'"
9352
9353#: builtin/remote.c:685
9354#, c-format
9355msgid "Could not set '%s'"
9356msgstr "不能设置 '%s'"
9357
9358#: builtin/remote.c:707
9359#, c-format
9360msgid "deleting '%s' failed"
9361msgstr "删除 '%s' 失败"
9362
9363#: builtin/remote.c:741
9364#, c-format
9365msgid "creating '%s' failed"
9366msgstr "创建 '%s' 失败"
9367
9368#: builtin/remote.c:807
9369msgid ""
9370"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9371"to delete it, use:"
9372msgid_plural ""
9373"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9374"to delete them, use:"
9375msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9376msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9377
9378#: builtin/remote.c:922
9379#, c-format
9380msgid " new (next fetch will store in remotes/%s)"
9381msgstr " 新的(下一次获取将存储于 remotes/%s)"
9382
9383#: builtin/remote.c:925
9384msgid " tracked"
9385msgstr " 已跟踪"
9386
9387#: builtin/remote.c:927
9388msgid " stale (use 'git remote prune' to remove)"
9389msgstr " 过时(使用 'git remote prune' 来移除)"
9390
9391#: builtin/remote.c:929
9392msgid " ???"
9393msgstr " ???"
9394
9395#: builtin/remote.c:970
9396#, c-format
9397msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9398msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
9399
9400#: builtin/remote.c:977
9401#, c-format
9402msgid "rebases onto remote %s"
9403msgstr "变基到远程 %s"
9404
9405#: builtin/remote.c:980
9406#, c-format
9407msgid " merges with remote %s"
9408msgstr " 与远程 %s 合并"
9409
9410#: builtin/remote.c:981
9411msgid "    and with remote"
9412msgstr "    且有远程"
9413
9414#: builtin/remote.c:983
9415#, c-format
9416msgid "merges with remote %s"
9417msgstr "与远程 %s 合并"
9418
9419#: builtin/remote.c:984
9420msgid "   and with remote"
9421msgstr "   且有远程"
9422
9423#: builtin/remote.c:1030
9424msgid "create"
9425msgstr "创建"
9426
9427#: builtin/remote.c:1033
9428msgid "delete"
9429msgstr "删除"
9430
9431#: builtin/remote.c:1037
9432msgid "up to date"
9433msgstr "最新"
9434
9435#: builtin/remote.c:1040
9436msgid "fast-forwardable"
9437msgstr "可快进"
9438
9439#: builtin/remote.c:1043
9440msgid "local out of date"
9441msgstr "本地已过时"
9442
9443#: builtin/remote.c:1050
9444#, c-format
9445msgid "    %-*s forces to %-*s (%s)"
9446msgstr "    %-*s 强制推送至 %-*s (%s)"
9447
9448#: builtin/remote.c:1053
9449#, c-format
9450msgid "    %-*s pushes to %-*s (%s)"
9451msgstr "    %-*s 推送至 %-*s (%s)"
9452
9453#: builtin/remote.c:1057
9454#, c-format
9455msgid "    %-*s forces to %s"
9456msgstr "    %-*s 强制推送至 %s"
9457
9458#: builtin/remote.c:1060
9459#, c-format
9460msgid "    %-*s pushes to %s"
9461msgstr "    %-*s 推送至 %s"
9462
9463#: builtin/remote.c:1128
9464msgid "do not query remotes"
9465msgstr "不查询远程"
9466
9467#: builtin/remote.c:1155
9468#, c-format
9469msgid "* remote %s"
9470msgstr "* 远程 %s"
9471
9472#: builtin/remote.c:1156
9473#, c-format
9474msgid "  Fetch URL: %s"
9475msgstr "  获取地址:%s"
9476
9477#: builtin/remote.c:1157 builtin/remote.c:1308
9478msgid "(no URL)"
9479msgstr "(无 URL)"
9480
9481#: builtin/remote.c:1166 builtin/remote.c:1168
9482#, c-format
9483msgid "  Push  URL: %s"
9484msgstr "  推送地址:%s"
9485
9486#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
9487#, c-format
9488msgid "  HEAD branch: %s"
9489msgstr "  HEAD 分支:%s"
9490
9491#: builtin/remote.c:1176
9492#, c-format
9493msgid ""
9494"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9495msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
9496
9497#: builtin/remote.c:1188
9498#, c-format
9499msgid "  Remote branch:%s"
9500msgid_plural "  Remote branches:%s"
9501msgstr[0] "  远程分支:%s"
9502msgstr[1] "  远程分支:%s"
9503
9504#  译者:中文字符串拼接,可删除前导空格
9505#: builtin/remote.c:1191 builtin/remote.c:1218
9506msgid " (status not queried)"
9507msgstr "(状态未查询)"
9508
9509#: builtin/remote.c:1200
9510msgid "  Local branch configured for 'git pull':"
9511msgid_plural "  Local branches configured for 'git pull':"
9512msgstr[0] "  为 'git pull' 配置的本地分支:"
9513msgstr[1] "  为 'git pull' 配置的本地分支:"
9514
9515#: builtin/remote.c:1208
9516msgid "  Local refs will be mirrored by 'git push'"
9517msgstr "  本地引用将在 'git push' 时被镜像"
9518
9519#: builtin/remote.c:1215
9520#, c-format
9521msgid "  Local ref configured for 'git push'%s:"
9522msgid_plural "  Local refs configured for 'git push'%s:"
9523msgstr[0] "  为 'git push' 配置的本地引用%s:"
9524msgstr[1] "  为 'git push' 配置的本地引用%s:"
9525
9526#: builtin/remote.c:1236
9527msgid "set refs/remotes/<name>/HEAD according to remote"
9528msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9529
9530#: builtin/remote.c:1238
9531msgid "delete refs/remotes/<name>/HEAD"
9532msgstr "删除 refs/remotes/<名称>/HEAD"
9533
9534#: builtin/remote.c:1253
9535msgid "Cannot determine remote HEAD"
9536msgstr "无法确定远程 HEAD"
9537
9538#: builtin/remote.c:1255
9539msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9540msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
9541
9542#: builtin/remote.c:1265
9543#, c-format
9544msgid "Could not delete %s"
9545msgstr "无法删除 %s"
9546
9547#: builtin/remote.c:1273
9548#, c-format
9549msgid "Not a valid ref: %s"
9550msgstr "不是一个有效引用:%s"
9551
9552#: builtin/remote.c:1275
9553#, c-format
9554msgid "Could not setup %s"
9555msgstr "不能设置 %s"
9556
9557#  译者:注意保持前导空格
9558#: builtin/remote.c:1293
9559#, c-format
9560msgid " %s will become dangling!"
9561msgstr " %s 将成为摇摆状态!"
9562
9563#  译者:注意保持前导空格
9564#: builtin/remote.c:1294
9565#, c-format
9566msgid " %s has become dangling!"
9567msgstr " %s 已成为摇摆状态!"
9568
9569#: builtin/remote.c:1304
9570#, c-format
9571msgid "Pruning %s"
9572msgstr "修剪 %s"
9573
9574#: builtin/remote.c:1305
9575#, c-format
9576msgid "URL: %s"
9577msgstr "URL:%s"
9578
9579#: builtin/remote.c:1321
9580#, c-format
9581msgid " * [would prune] %s"
9582msgstr " * [将删除] %s"
9583
9584#: builtin/remote.c:1324
9585#, c-format
9586msgid " * [pruned] %s"
9587msgstr " * [已删除] %s"
9588
9589#: builtin/remote.c:1369
9590msgid "prune remotes after fetching"
9591msgstr "抓取后清除远程"
9592
9593#: builtin/remote.c:1435 builtin/remote.c:1509
9594#, c-format
9595msgid "No such remote '%s'"
9596msgstr "没有此远程 '%s'"
9597
9598#: builtin/remote.c:1455
9599msgid "add branch"
9600msgstr "添加分支"
9601
9602#: builtin/remote.c:1462
9603msgid "no remote specified"
9604msgstr "未指定远程"
9605
9606#: builtin/remote.c:1484
9607msgid "manipulate push URLs"
9608msgstr "操作推送 URLS"
9609
9610#: builtin/remote.c:1486
9611msgid "add URL"
9612msgstr "添加 URL"
9613
9614#: builtin/remote.c:1488
9615msgid "delete URLs"
9616msgstr "删除 URLS"
9617
9618#: builtin/remote.c:1495
9619msgid "--add --delete doesn't make sense"
9620msgstr "--add --delete 无意义"
9621
9622#: builtin/remote.c:1535
9623#, c-format
9624msgid "Invalid old URL pattern: %s"
9625msgstr "无效的旧 URL 匹配模版:%s"
9626
9627#: builtin/remote.c:1543
9628#, c-format
9629msgid "No such URL found: %s"
9630msgstr "未找到此 URL:%s"
9631
9632#: builtin/remote.c:1545
9633msgid "Will not delete all non-push URLs"
9634msgstr "将不会删除所有非推送 URL 地址"
9635
9636#: builtin/remote.c:1559
9637msgid "be verbose; must be placed before a subcommand"
9638msgstr "冗长输出;必须置于子命令之前"
9639
9640#: builtin/repack.c:17
9641msgid "git repack [<options>]"
9642msgstr "git repack [<选项>]"
9643
9644#: builtin/repack.c:159
9645msgid "pack everything in a single pack"
9646msgstr "所有内容打包到一个包文件中"
9647
9648#: builtin/repack.c:161
9649msgid "same as -a, and turn unreachable objects loose"
9650msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9651
9652#: builtin/repack.c:164
9653msgid "remove redundant packs, and run git-prune-packed"
9654msgstr "删除多余的包,运行 git-prune-packed"
9655
9656#: builtin/repack.c:166
9657msgid "pass --no-reuse-delta to git-pack-objects"
9658msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9659
9660#: builtin/repack.c:168
9661msgid "pass --no-reuse-object to git-pack-objects"
9662msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9663
9664#: builtin/repack.c:170
9665msgid "do not run git-update-server-info"
9666msgstr "不运行 git-update-server-info"
9667
9668#: builtin/repack.c:173
9669msgid "pass --local to git-pack-objects"
9670msgstr "向 git-pack-objects 传递参数 --local"
9671
9672#: builtin/repack.c:175
9673msgid "write bitmap index"
9674msgstr "写 bitmap 索引"
9675
9676#: builtin/repack.c:176
9677msgid "approxidate"
9678msgstr "近似日期"
9679
9680#: builtin/repack.c:177
9681msgid "with -A, do not loosen objects older than this"
9682msgstr "使用 -A,不要将早于给定时间的对象过期"
9683
9684#: builtin/repack.c:179
9685msgid "size of the window used for delta compression"
9686msgstr "用于增量压缩的窗口值"
9687
9688#: builtin/repack.c:180 builtin/repack.c:184
9689msgid "bytes"
9690msgstr "字节"
9691
9692#: builtin/repack.c:181
9693msgid "same as the above, but limit memory size instead of entries count"
9694msgstr "和上面的相似,但限制内存大小而非条目数"
9695
9696#: builtin/repack.c:183
9697msgid "limits the maximum delta depth"
9698msgstr "限制最大增量深度"
9699
9700#: builtin/repack.c:185
9701msgid "maximum size of each packfile"
9702msgstr "每个包文件的最大尺寸"
9703
9704#: builtin/repack.c:187
9705msgid "repack objects in packs marked with .keep"
9706msgstr "对标记为 .keep 的包中的对象重新打包"
9707
9708#: builtin/repack.c:378
9709#, c-format
9710msgid "removing '%s' failed"
9711msgstr "删除 '%s' 失败"
9712
9713#: builtin/replace.c:19
9714msgid "git replace [-f] <object> <replacement>"
9715msgstr "git replace [-f] <对象> <替换物>"
9716
9717#: builtin/replace.c:20
9718msgid "git replace [-f] --edit <object>"
9719msgstr "git replace [-f] --edit <对象>"
9720
9721#: builtin/replace.c:21
9722msgid "git replace [-f] --graft <commit> [<parent>...]"
9723msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9724
9725#: builtin/replace.c:22
9726msgid "git replace -d <object>..."
9727msgstr "git replace -d <对象>..."
9728
9729#: builtin/replace.c:23
9730msgid "git replace [--format=<format>] [-l [<pattern>]]"
9731msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9732
9733#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9734#, c-format
9735msgid "Not a valid object name: '%s'"
9736msgstr "不是一个有效的对象名:'%s'"
9737
9738#: builtin/replace.c:355
9739#, c-format
9740msgid "bad mergetag in commit '%s'"
9741msgstr "提交 '%s' 中含有损坏的合并标签"
9742
9743#: builtin/replace.c:357
9744#, c-format
9745msgid "malformed mergetag in commit '%s'"
9746msgstr "提交 '%s' 中含有非法的合并标签"
9747
9748#: builtin/replace.c:368
9749#, c-format
9750msgid ""
9751"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9752"instead of --graft"
9753msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
9754
9755#: builtin/replace.c:401
9756#, c-format
9757msgid "the original commit '%s' has a gpg signature."
9758msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9759
9760#: builtin/replace.c:402
9761msgid "the signature will be removed in the replacement commit!"
9762msgstr "在替换的提交中签名将被移除!"
9763
9764#: builtin/replace.c:408
9765#, c-format
9766msgid "could not write replacement commit for: '%s'"
9767msgstr "不能为 '%s' 写替换提交"
9768
9769#: builtin/replace.c:432
9770msgid "list replace refs"
9771msgstr "列出替换的引用"
9772
9773#: builtin/replace.c:433
9774msgid "delete replace refs"
9775msgstr "删除替换的引用"
9776
9777#: builtin/replace.c:434
9778msgid "edit existing object"
9779msgstr "编辑现存的对象"
9780
9781#: builtin/replace.c:435
9782msgid "change a commit's parents"
9783msgstr "修改一个提交的父提交"
9784
9785#: builtin/replace.c:436
9786msgid "replace the ref if it exists"
9787msgstr "如果存在则替换引用"
9788
9789#: builtin/replace.c:437
9790msgid "do not pretty-print contents for --edit"
9791msgstr "不要为 --edit 操作美观显示内容"
9792
9793#: builtin/replace.c:438
9794msgid "use this format"
9795msgstr "使用此格式"
9796
9797#: builtin/rerere.c:12
9798msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9799msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9800
9801#: builtin/rerere.c:57
9802msgid "register clean resolutions in index"
9803msgstr "在索引中注册干净的解决方案"
9804
9805#: builtin/reset.c:26
9806msgid ""
9807"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9808msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9809
9810#: builtin/reset.c:27
9811msgid "git reset [-q] <tree-ish> [--] <paths>..."
9812msgstr "git reset [-q] <树或提交> [--] <路径>..."
9813
9814#: builtin/reset.c:28
9815msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9816msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9817
9818#: builtin/reset.c:34
9819msgid "mixed"
9820msgstr "混杂"
9821
9822#: builtin/reset.c:34
9823msgid "soft"
9824msgstr "软性"
9825
9826#: builtin/reset.c:34
9827msgid "hard"
9828msgstr "硬性"
9829
9830#: builtin/reset.c:34
9831msgid "merge"
9832msgstr "合并"
9833
9834#: builtin/reset.c:34
9835msgid "keep"
9836msgstr "保持"
9837
9838#: builtin/reset.c:74
9839msgid "You do not have a valid HEAD."
9840msgstr "您没有一个有效的 HEAD。"
9841
9842#: builtin/reset.c:76
9843msgid "Failed to find tree of HEAD."
9844msgstr "无法找到 HEAD 指向的树。"
9845
9846#: builtin/reset.c:82
9847#, c-format
9848msgid "Failed to find tree of %s."
9849msgstr "无法找到 %s 指向的树。"
9850
9851#: builtin/reset.c:100
9852#, c-format
9853msgid "HEAD is now at %s"
9854msgstr "HEAD 现在位于 %s"
9855
9856#  译者:汉字之间无空格,故删除%s前后空格
9857#: builtin/reset.c:183
9858#, c-format
9859msgid "Cannot do a %s reset in the middle of a merge."
9860msgstr "在合并过程中不能做%s重置操作。"
9861
9862#: builtin/reset.c:276
9863msgid "be quiet, only report errors"
9864msgstr "安静模式,只报告错误"
9865
9866#: builtin/reset.c:278
9867msgid "reset HEAD and index"
9868msgstr "重置 HEAD 和索引"
9869
9870#: builtin/reset.c:279
9871msgid "reset only HEAD"
9872msgstr "只重置 HEAD"
9873
9874#: builtin/reset.c:281 builtin/reset.c:283
9875msgid "reset HEAD, index and working tree"
9876msgstr "重置 HEAD、索引和工作区"
9877
9878#: builtin/reset.c:285
9879msgid "reset HEAD but keep local changes"
9880msgstr "重置 HEAD 但保存本地变更"
9881
9882#: builtin/reset.c:288
9883msgid "record only the fact that removed paths will be added later"
9884msgstr "将删除的路径标记为稍后添加"
9885
9886#: builtin/reset.c:305
9887#, c-format
9888msgid "Failed to resolve '%s' as a valid revision."
9889msgstr "无法将 '%s' 解析为一个有效的版本。"
9890
9891#: builtin/reset.c:313
9892#, c-format
9893msgid "Failed to resolve '%s' as a valid tree."
9894msgstr "无法将 '%s' 解析为一个有效的树对象。"
9895
9896#: builtin/reset.c:322
9897msgid "--patch is incompatible with --{hard,mixed,soft}"
9898msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9899
9900#: builtin/reset.c:331
9901msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9902msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9903
9904#  译者:汉字之间无空格,故删除%s前后空格
9905#: builtin/reset.c:333
9906#, c-format
9907msgid "Cannot do %s reset with paths."
9908msgstr "不能带路径进行%s重置。"
9909
9910#  译者:汉字之间无空格,故删除%s前后空格
9911#: builtin/reset.c:343
9912#, c-format
9913msgid "%s reset is not allowed in a bare repository"
9914msgstr "不能对纯仓库进行%s重置"
9915
9916#: builtin/reset.c:347
9917msgid "-N can only be used with --mixed"
9918msgstr "-N 只能和 --mixed 同时使用"
9919
9920#: builtin/reset.c:364
9921msgid "Unstaged changes after reset:"
9922msgstr "重置后取消暂存的变更:"
9923
9924#: builtin/reset.c:370
9925#, c-format
9926msgid "Could not reset index file to revision '%s'."
9927msgstr "不能重置索引文件至版本 '%s'。"
9928
9929#: builtin/reset.c:374
9930msgid "Could not write new index file."
9931msgstr "不能写入新的索引文件。"
9932
9933#: builtin/rev-list.c:354
9934msgid "rev-list does not support display of notes"
9935msgstr "rev-list 不支持显示注解"
9936
9937#: builtin/rev-parse.c:361
9938msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9939msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9940
9941#: builtin/rev-parse.c:366
9942msgid "keep the `--` passed as an arg"
9943msgstr "保持 `--` 作为一个参数传递"
9944
9945#: builtin/rev-parse.c:368
9946msgid "stop parsing after the first non-option argument"
9947msgstr "遇到第一个非选项参数后停止解析"
9948
9949#: builtin/rev-parse.c:371
9950msgid "output in stuck long form"
9951msgstr "以固定长格式输出"
9952
9953#: builtin/rev-parse.c:502
9954msgid ""
9955"git rev-parse --parseopt [<options>] -- [<args>...]\n"
9956"   or: git rev-parse --sq-quote [<arg>...]\n"
9957"   or: git rev-parse [<options>] [<arg>...]\n"
9958"\n"
9959"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9960msgstr ""
9961"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9962"   或者:git rev-parse --sq-quote [<参数>...]\n"
9963"   或者:git rev-parse [<选项>] [<参数>...]\n"
9964"\n"
9965"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9966
9967#: builtin/revert.c:22
9968msgid "git revert [<options>] <commit-ish>..."
9969msgstr "git revert [<选项>] <提交号>..."
9970
9971#: builtin/revert.c:23
9972msgid "git revert <subcommand>"
9973msgstr "git revert <子命令>"
9974
9975#: builtin/revert.c:28
9976msgid "git cherry-pick [<options>] <commit-ish>..."
9977msgstr "git cherry-pick [<选项>] <提交号>..."
9978
9979#: builtin/revert.c:29
9980msgid "git cherry-pick <subcommand>"
9981msgstr "git cherry-pick <子命令>"
9982
9983#: builtin/revert.c:71
9984#, c-format
9985msgid "%s: %s cannot be used with %s"
9986msgstr "%s:%s 不能和 %s 同时使用"
9987
9988#: builtin/revert.c:80
9989msgid "end revert or cherry-pick sequence"
9990msgstr "终止反转或拣选操作"
9991
9992#: builtin/revert.c:81
9993msgid "resume revert or cherry-pick sequence"
9994msgstr "继续反转或拣选操作"
9995
9996#: builtin/revert.c:82
9997msgid "cancel revert or cherry-pick sequence"
9998msgstr "取消反转或拣选操作"
9999
10000#: builtin/revert.c:83
10001msgid "don't automatically commit"
10002msgstr "不要自动提交"
10003
10004#: builtin/revert.c:84
10005msgid "edit the commit message"
10006msgstr "编辑提交说明"
10007
10008#: builtin/revert.c:87
10009msgid "parent number"
10010msgstr "父编号"
10011
10012#: builtin/revert.c:89
10013msgid "merge strategy"
10014msgstr "合并策略"
10015
10016#: builtin/revert.c:90
10017msgid "option"
10018msgstr "选项"
10019
10020#: builtin/revert.c:91
10021msgid "option for merge strategy"
10022msgstr "合并策略的选项"
10023
10024#: builtin/revert.c:104
10025msgid "append commit name"
10026msgstr "追加提交名称"
10027
10028#: builtin/revert.c:106
10029msgid "preserve initially empty commits"
10030msgstr "保留初始化的空提交"
10031
10032#: builtin/revert.c:107
10033msgid "allow commits with empty messages"
10034msgstr "允许提交说明为空"
10035
10036#: builtin/revert.c:108
10037msgid "keep redundant, empty commits"
10038msgstr "保持多余的、空的提交"
10039
10040#: builtin/revert.c:112
10041msgid "program error"
10042msgstr "程序错误"
10043
10044#: builtin/revert.c:197
10045msgid "revert failed"
10046msgstr "还原失败"
10047
10048#: builtin/revert.c:212
10049msgid "cherry-pick failed"
10050msgstr "拣选失败"
10051
10052#: builtin/rm.c:17
10053msgid "git rm [<options>] [--] <file>..."
10054msgstr "git rm [<选项>] [--] <文件>..."
10055
10056#: builtin/rm.c:65
10057msgid ""
10058"the following submodule (or one of its nested submodules)\n"
10059"uses a .git directory:"
10060msgid_plural ""
10061"the following submodules (or one of their nested submodules)\n"
10062"use a .git directory:"
10063msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10064msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10065
10066#: builtin/rm.c:71
10067msgid ""
10068"\n"
10069"(use 'rm -rf' if you really want to remove it including all of its history)"
10070msgstr ""
10071"\n"
10072"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10073
10074#: builtin/rm.c:230
10075msgid ""
10076"the following file has staged content different from both the\n"
10077"file and the HEAD:"
10078msgid_plural ""
10079"the following files have staged content different from both the\n"
10080"file and the HEAD:"
10081msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10082msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10083
10084#: builtin/rm.c:235
10085msgid ""
10086"\n"
10087"(use -f to force removal)"
10088msgstr ""
10089"\n"
10090"(使用 -f 强制删除)"
10091
10092#: builtin/rm.c:239
10093msgid "the following file has changes staged in the index:"
10094msgid_plural "the following files have changes staged in the index:"
10095msgstr[0] "下列文件索引中有变更"
10096msgstr[1] "下列文件索引中有变更"
10097
10098#: builtin/rm.c:243 builtin/rm.c:254
10099msgid ""
10100"\n"
10101"(use --cached to keep the file, or -f to force removal)"
10102msgstr ""
10103"\n"
10104"(使用 --cached 保留本地文件,或用 -f 强制删除)"
10105
10106#: builtin/rm.c:251
10107msgid "the following file has local modifications:"
10108msgid_plural "the following files have local modifications:"
10109msgstr[0] "如下文件有本地修改:"
10110msgstr[1] "如下文件有本地修改:"
10111
10112#: builtin/rm.c:269
10113msgid "do not list removed files"
10114msgstr "不列出删除的文件"
10115
10116#: builtin/rm.c:270
10117msgid "only remove from the index"
10118msgstr "只从索引区删除"
10119
10120#: builtin/rm.c:271
10121msgid "override the up-to-date check"
10122msgstr "忽略文件更新状态检查"
10123
10124#: builtin/rm.c:272
10125msgid "allow recursive removal"
10126msgstr "允许递归删除"
10127
10128#: builtin/rm.c:274
10129msgid "exit with a zero status even if nothing matched"
10130msgstr "即使没有匹配,也以零状态退出"
10131
10132#: builtin/rm.c:317
10133msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10134msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10135
10136#: builtin/rm.c:335
10137#, c-format
10138msgid "not removing '%s' recursively without -r"
10139msgstr "未提供 -r 选项不会递归删除 '%s'"
10140
10141#: builtin/rm.c:374
10142#, c-format
10143msgid "git rm: unable to remove %s"
10144msgstr "git rm:不能删除 %s"
10145
10146#: builtin/send-pack.c:18
10147msgid ""
10148"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10149"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10150"[<ref>...]\n"
10151"  --all and explicit <ref> specification are mutually exclusive."
10152msgstr ""
10153"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10154"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10155"  --all 和明确的 <引用> 互斥。"
10156
10157#: builtin/send-pack.c:160
10158msgid "remote name"
10159msgstr "远程名称"
10160
10161#: builtin/send-pack.c:171
10162msgid "use stateless RPC protocol"
10163msgstr "使用无状态的 RPC 协议"
10164
10165#: builtin/send-pack.c:172
10166msgid "read refs from stdin"
10167msgstr "从标准输入读取引用"
10168
10169#: builtin/send-pack.c:173
10170msgid "print status from remote helper"
10171msgstr "打印来自远程 helper 的状态"
10172
10173#: builtin/shortlog.c:13
10174msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10175msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10176
10177#: builtin/shortlog.c:131
10178#, c-format
10179msgid "Missing author: %s"
10180msgstr "缺少作者:%s"
10181
10182#: builtin/shortlog.c:230
10183msgid "sort output according to the number of commits per author"
10184msgstr "根据每个作者的提交数量排序"
10185
10186#: builtin/shortlog.c:232
10187msgid "Suppress commit descriptions, only provides commit count"
10188msgstr "隐藏提交说明,只提供提交数量"
10189
10190#: builtin/shortlog.c:234
10191msgid "Show the email address of each author"
10192msgstr "显示每个作者的电子邮件地址"
10193
10194#: builtin/shortlog.c:235
10195msgid "w[,i1[,i2]]"
10196msgstr "w[,i1[,i2]]"
10197
10198#: builtin/shortlog.c:236
10199msgid "Linewrap output"
10200msgstr "折行输出"
10201
10202#: builtin/show-branch.c:9
10203msgid ""
10204"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10205"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10206"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10207"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10208msgstr ""
10209"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10210"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10211"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10212"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10213
10214#: builtin/show-branch.c:13
10215msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10216msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10217
10218#: builtin/show-branch.c:659
10219msgid "show remote-tracking and local branches"
10220msgstr "显示远程跟踪的和本地的分支"
10221
10222#: builtin/show-branch.c:661
10223msgid "show remote-tracking branches"
10224msgstr "显示远程跟踪的分支"
10225
10226#: builtin/show-branch.c:663
10227msgid "color '*!+-' corresponding to the branch"
10228msgstr "着色 '*!+-' 到相应的分支"
10229
10230#: builtin/show-branch.c:665
10231msgid "show <n> more commits after the common ancestor"
10232msgstr "显示共同祖先后的 <n> 个提交"
10233
10234#: builtin/show-branch.c:667
10235msgid "synonym to more=-1"
10236msgstr "和 more=-1 同义"
10237
10238#: builtin/show-branch.c:668
10239msgid "suppress naming strings"
10240msgstr "不显示字符串命名"
10241
10242#: builtin/show-branch.c:670
10243msgid "include the current branch"
10244msgstr "包括当前分支"
10245
10246#: builtin/show-branch.c:672
10247msgid "name commits with their object names"
10248msgstr "以对象名字命名提交"
10249
10250#: builtin/show-branch.c:674
10251msgid "show possible merge bases"
10252msgstr "显示可能合并的基线"
10253
10254#: builtin/show-branch.c:676
10255msgid "show refs unreachable from any other ref"
10256msgstr "显示没有任何引用的的引用"
10257
10258#: builtin/show-branch.c:678
10259msgid "show commits in topological order"
10260msgstr "以拓扑顺序显示提交"
10261
10262#: builtin/show-branch.c:681
10263msgid "show only commits not on the first branch"
10264msgstr "只显示不在第一个分支上的提交"
10265
10266#: builtin/show-branch.c:683
10267msgid "show merges reachable from only one tip"
10268msgstr "显示仅一个分支可访问的合并提交"
10269
10270#: builtin/show-branch.c:685
10271msgid "topologically sort, maintaining date order where possible"
10272msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10273
10274#: builtin/show-branch.c:688
10275msgid "<n>[,<base>]"
10276msgstr "<n>[,<base>]"
10277
10278#: builtin/show-branch.c:689
10279msgid "show <n> most recent ref-log entries starting at base"
10280msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10281
10282#: builtin/show-ref.c:10
10283msgid ""
10284"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10285"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10286msgstr ""
10287"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10288"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10289
10290#: builtin/show-ref.c:11
10291msgid "git show-ref --exclude-existing[=pattern] < ref-list"
10292msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
10293
10294#: builtin/show-ref.c:170
10295msgid "only show tags (can be combined with heads)"
10296msgstr "只显示标签(可以和头共用)"
10297
10298#: builtin/show-ref.c:171
10299msgid "only show heads (can be combined with tags)"
10300msgstr "只显示头(可以和标签共用)"
10301
10302#: builtin/show-ref.c:172
10303msgid "stricter reference checking, requires exact ref path"
10304msgstr "更严格的引用检测,需要精确的引用路径"
10305
10306#: builtin/show-ref.c:175 builtin/show-ref.c:177
10307msgid "show the HEAD reference, even if it would be filtered out"
10308msgstr "显示 HEAD 引用,即使被过滤掉"
10309
10310#: builtin/show-ref.c:179
10311msgid "dereference tags into object IDs"
10312msgstr "转换标签到对象 ID"
10313
10314#: builtin/show-ref.c:181
10315msgid "only show SHA1 hash using <n> digits"
10316msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10317
10318#: builtin/show-ref.c:185
10319msgid "do not print results to stdout (useful with --verify)"
10320msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10321
10322#: builtin/show-ref.c:187
10323msgid "show refs from stdin that aren't in local repository"
10324msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10325
10326#: builtin/symbolic-ref.c:7
10327msgid "git symbolic-ref [<options>] <name> [<ref>]"
10328msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10329
10330#: builtin/symbolic-ref.c:8
10331msgid "git symbolic-ref -d [-q] <name>"
10332msgstr "git symbolic-ref -d [-q] <名称>"
10333
10334#: builtin/symbolic-ref.c:40
10335msgid "suppress error message for non-symbolic (detached) refs"
10336msgstr "不显示非符号(分离的)引用的错误信息"
10337
10338#: builtin/symbolic-ref.c:41
10339msgid "delete symbolic ref"
10340msgstr "删除符号引用"
10341
10342#: builtin/symbolic-ref.c:42
10343msgid "shorten ref output"
10344msgstr "简短的引用输出"
10345
10346#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10347msgid "reason"
10348msgstr "原因"
10349
10350#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10351msgid "reason of the update"
10352msgstr "更新的原因"
10353
10354#: builtin/tag.c:22
10355msgid ""
10356"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10357"[<head>]"
10358msgstr ""
10359"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10360
10361#: builtin/tag.c:23
10362msgid "git tag -d <tagname>..."
10363msgstr "git tag -d <标签名>..."
10364
10365#: builtin/tag.c:24
10366msgid ""
10367"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10368"\t\t[<pattern>...]"
10369msgstr ""
10370"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
10371
10372#: builtin/tag.c:26
10373msgid "git tag -v <tagname>..."
10374msgstr "git tag -v <标签名>..."
10375
10376#: builtin/tag.c:69
10377#, c-format
10378msgid "malformed object at '%s'"
10379msgstr "非法的对象于 '%s'"
10380
10381#: builtin/tag.c:301
10382#, c-format
10383msgid "tag name too long: %.*s..."
10384msgstr "标签名称太长:%.*s..."
10385
10386#: builtin/tag.c:306
10387#, c-format
10388msgid "tag '%s' not found."
10389msgstr "未发现标签 '%s'。"
10390
10391#: builtin/tag.c:321
10392#, c-format
10393msgid "Deleted tag '%s' (was %s)\n"
10394msgstr "已删除标签 '%s'(曾为 %s)\n"
10395
10396#: builtin/tag.c:333
10397#, c-format
10398msgid "could not verify the tag '%s'"
10399msgstr "不能校验该标签 '%s'"
10400
10401#: builtin/tag.c:343
10402#, c-format
10403msgid ""
10404"\n"
10405"Write a message for tag:\n"
10406"  %s\n"
10407"Lines starting with '%c' will be ignored.\n"
10408msgstr ""
10409"\n"
10410"输入一个标签说明:\n"
10411"  %s\n"
10412"以 '%c' 开头的行将被忽略。\n"
10413
10414#: builtin/tag.c:347
10415#, c-format
10416msgid ""
10417"\n"
10418"Write a message for tag:\n"
10419"  %s\n"
10420"Lines starting with '%c' will be kept; you may remove them yourself if you "
10421"want to.\n"
10422msgstr ""
10423"\n"
10424"输入一个标签说明:\n"
10425"  %s\n"
10426"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
10427
10428#: builtin/tag.c:371
10429#, c-format
10430msgid "unsupported sort specification '%s'"
10431msgstr "不支持的排序规格 '%s'"
10432
10433#: builtin/tag.c:373
10434#, c-format
10435msgid "unsupported sort specification '%s' in variable '%s'"
10436msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
10437
10438#: builtin/tag.c:428
10439msgid "unable to sign the tag"
10440msgstr "无法签署标签"
10441
10442#: builtin/tag.c:430
10443msgid "unable to write tag file"
10444msgstr "无法写标签文件"
10445
10446#: builtin/tag.c:455
10447msgid "bad object type."
10448msgstr "坏的对象类型。"
10449
10450#: builtin/tag.c:468
10451msgid "tag header too big."
10452msgstr "标签头信息太大。"
10453
10454#: builtin/tag.c:504
10455msgid "no tag message?"
10456msgstr "无标签说明?"
10457
10458#: builtin/tag.c:510
10459#, c-format
10460msgid "The tag message has been left in %s\n"
10461msgstr "标签说明被保留在 %s\n"
10462
10463#: builtin/tag.c:559
10464msgid "switch 'points-at' requires an object"
10465msgstr "开关 'points-at' 需要一个对象"
10466
10467#: builtin/tag.c:561
10468#, c-format
10469msgid "malformed object name '%s'"
10470msgstr "非法的对象名 '%s'"
10471
10472#: builtin/tag.c:590
10473msgid "list tag names"
10474msgstr "列出标签名称"
10475
10476#: builtin/tag.c:592
10477msgid "print <n> lines of each tag message"
10478msgstr "每个标签信息打印 <n> 行"
10479
10480#: builtin/tag.c:594
10481msgid "delete tags"
10482msgstr "删除标签"
10483
10484#: builtin/tag.c:595
10485msgid "verify tags"
10486msgstr "验证标签"
10487
10488#: builtin/tag.c:597
10489msgid "Tag creation options"
10490msgstr "标签创建选项"
10491
10492#: builtin/tag.c:599
10493msgid "annotated tag, needs a message"
10494msgstr "附注标签,需要一个说明"
10495
10496#: builtin/tag.c:601
10497msgid "tag message"
10498msgstr "标签说明"
10499
10500#: builtin/tag.c:603
10501msgid "annotated and GPG-signed tag"
10502msgstr "附注并附加 GPG 签名的标签"
10503
10504#: builtin/tag.c:607
10505msgid "use another key to sign the tag"
10506msgstr "使用另外的私钥签名该标签"
10507
10508#: builtin/tag.c:608
10509msgid "replace the tag if exists"
10510msgstr "如果存在,替换现有的标签"
10511
10512#: builtin/tag.c:609 builtin/update-ref.c:368
10513msgid "create_reflog"
10514msgstr "创建引用日志"
10515
10516#: builtin/tag.c:611
10517msgid "Tag listing options"
10518msgstr "标签列表选项"
10519
10520#: builtin/tag.c:612
10521msgid "show tag list in columns"
10522msgstr "以列的方式显示标签列表"
10523
10524#: builtin/tag.c:614
10525msgid "sort tags"
10526msgstr "排序标签"
10527
10528#: builtin/tag.c:619 builtin/tag.c:625
10529msgid "print only tags that contain the commit"
10530msgstr "只打印包含提交的标签"
10531
10532#: builtin/tag.c:631
10533msgid "print only tags of the object"
10534msgstr "只打印对象的标签"
10535
10536#: builtin/tag.c:657
10537msgid "--column and -n are incompatible"
10538msgstr "--column 和 -n 不兼容"
10539
10540#: builtin/tag.c:669
10541msgid "--sort and -n are incompatible"
10542msgstr "--sort 和 -n 不兼容"
10543
10544#: builtin/tag.c:676
10545msgid "-n option is only allowed with -l."
10546msgstr "-n 选项只允许和 -l 同时使用。"
10547
10548#: builtin/tag.c:678
10549msgid "--contains option is only allowed with -l."
10550msgstr "--contains 选项只允许和 -l 同时使用。"
10551
10552#: builtin/tag.c:680
10553msgid "--points-at option is only allowed with -l."
10554msgstr "--points-at 选项只允许和 -l 同时使用。"
10555
10556#: builtin/tag.c:688
10557msgid "only one -F or -m option is allowed."
10558msgstr "只允许一个 -F 或 -m 选项。"
10559
10560#: builtin/tag.c:708
10561msgid "too many params"
10562msgstr "太多参数"
10563
10564#: builtin/tag.c:714
10565#, c-format
10566msgid "'%s' is not a valid tag name."
10567msgstr "'%s' 不是一个有效的标签名称。"
10568
10569#: builtin/tag.c:719
10570#, c-format
10571msgid "tag '%s' already exists"
10572msgstr "标签 '%s' 已存在"
10573
10574#: builtin/tag.c:744
10575#, c-format
10576msgid "Updated tag '%s' (was %s)\n"
10577msgstr "已更新标签 '%s'(曾为 %s)\n"
10578
10579#: builtin/unpack-objects.c:490
10580msgid "Unpacking objects"
10581msgstr "展开对象中"
10582
10583#: builtin/update-index.c:70
10584#, c-format
10585msgid "failed to create directory %s"
10586msgstr "无法创建目录 %s"
10587
10588#: builtin/update-index.c:76
10589#, c-format
10590msgid "failed to stat %s"
10591msgstr "无法枚举 %s 状态"
10592
10593#: builtin/update-index.c:86
10594#, c-format
10595msgid "failed to create file %s"
10596msgstr "无法创建文件 %s"
10597
10598#: builtin/update-index.c:94
10599#, c-format
10600msgid "failed to delete file %s"
10601msgstr "无法删除文件 %s"
10602
10603#: builtin/update-index.c:101 builtin/update-index.c:203
10604#, c-format
10605msgid "failed to delete directory %s"
10606msgstr "无法删除目录 %s"
10607
10608#: builtin/update-index.c:124
10609#, c-format
10610msgid "Testing "
10611msgstr "正在测试 "
10612
10613#: builtin/update-index.c:136
10614msgid "directory stat info does not change after adding a new file"
10615msgstr "添加一个新文件后,目录的状态信息未改变"
10616
10617#: builtin/update-index.c:149
10618msgid "directory stat info does not change after adding a new directory"
10619msgstr "添加一个新目录后,目录的状态信息未改变"
10620
10621#: builtin/update-index.c:162
10622msgid "directory stat info changes after updating a file"
10623msgstr "更新一个文件后,目录的状态信息被修改"
10624
10625#: builtin/update-index.c:173
10626msgid "directory stat info changes after adding a file inside subdirectory"
10627msgstr "在子目录中添加文件后,目录的状态信息被修改"
10628
10629#: builtin/update-index.c:184
10630msgid "directory stat info does not change after deleting a file"
10631msgstr "删除一个文件后,目录的状态信息未改变"
10632
10633#: builtin/update-index.c:197
10634msgid "directory stat info does not change after deleting a directory"
10635msgstr "删除一个目录后,目录的状态信息未改变"
10636
10637#: builtin/update-index.c:204
10638msgid " OK"
10639msgstr " OK"
10640
10641#: builtin/update-index.c:564
10642msgid "git update-index [<options>] [--] [<file>...]"
10643msgstr "git update-index [<选项>] [--] [<文件>...]"
10644
10645#: builtin/update-index.c:918
10646msgid "continue refresh even when index needs update"
10647msgstr "当索引需要更新时继续刷新"
10648
10649#: builtin/update-index.c:921
10650msgid "refresh: ignore submodules"
10651msgstr "刷新:忽略子模组"
10652
10653#: builtin/update-index.c:924
10654msgid "do not ignore new files"
10655msgstr "不忽略新的文件"
10656
10657#: builtin/update-index.c:926
10658msgid "let files replace directories and vice-versa"
10659msgstr "让文件替换目录(反之亦然)"
10660
10661#: builtin/update-index.c:928
10662msgid "notice files missing from worktree"
10663msgstr "通知文件从工作区丢失"
10664
10665#: builtin/update-index.c:930
10666msgid "refresh even if index contains unmerged entries"
10667msgstr "即使索引区包含未合并的条目也执行刷新"
10668
10669#: builtin/update-index.c:933
10670msgid "refresh stat information"
10671msgstr "刷新统计信息"
10672
10673#: builtin/update-index.c:937
10674msgid "like --refresh, but ignore assume-unchanged setting"
10675msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
10676
10677#: builtin/update-index.c:941
10678msgid "<mode>,<object>,<path>"
10679msgstr "<存取模式>,<对象>,<路径>"
10680
10681#: builtin/update-index.c:942
10682msgid "add the specified entry to the index"
10683msgstr "添加指定的条目到索引区"
10684
10685#: builtin/update-index.c:946
10686msgid "(+/-)x"
10687msgstr "(+/-)x"
10688
10689#: builtin/update-index.c:947
10690msgid "override the executable bit of the listed files"
10691msgstr "覆盖列表里文件的可执行位"
10692
10693#: builtin/update-index.c:951
10694msgid "mark files as \"not changing\""
10695msgstr "把文件标记为 \"没有变更\""
10696
10697#: builtin/update-index.c:954
10698msgid "clear assumed-unchanged bit"
10699msgstr "清除 assumed-unchanged 位"
10700
10701#: builtin/update-index.c:957
10702msgid "mark files as \"index-only\""
10703msgstr "把文件标记为 \"仅索引\""
10704
10705#: builtin/update-index.c:960
10706msgid "clear skip-worktree bit"
10707msgstr "清除 skip-worktree 位"
10708
10709#: builtin/update-index.c:963
10710msgid "add to index only; do not add content to object database"
10711msgstr "只添加到索引区;不添加对象到对象库"
10712
10713#: builtin/update-index.c:965
10714msgid "remove named paths even if present in worktree"
10715msgstr "即使存在工作区里,也删除路径"
10716
10717#: builtin/update-index.c:967
10718msgid "with --stdin: input lines are terminated by null bytes"
10719msgstr "携带 --stdin:输入的行以 null 字符终止"
10720
10721#: builtin/update-index.c:969
10722msgid "read list of paths to be updated from standard input"
10723msgstr "从标准输入中读取需要更新的路径列表"
10724
10725#: builtin/update-index.c:973
10726msgid "add entries from standard input to the index"
10727msgstr "从标准输入添加条目到索引区"
10728
10729#: builtin/update-index.c:977
10730msgid "repopulate stages #2 and #3 for the listed paths"
10731msgstr "为指定文件重新生成第2和第3暂存区"
10732
10733#: builtin/update-index.c:981
10734msgid "only update entries that differ from HEAD"
10735msgstr "只更新与 HEAD 不同的条目"
10736
10737#: builtin/update-index.c:985
10738msgid "ignore files missing from worktree"
10739msgstr "忽略工作区丢失的文件"
10740
10741#: builtin/update-index.c:988
10742msgid "report actions to standard output"
10743msgstr "在标准输出显示操作"
10744
10745#: builtin/update-index.c:990
10746msgid "(for porcelains) forget saved unresolved conflicts"
10747msgstr "(for porcelains) 忘记保存的未解决的冲突"
10748
10749#: builtin/update-index.c:994
10750msgid "write index in this format"
10751msgstr "以这种格式写入索引区"
10752
10753#: builtin/update-index.c:996
10754msgid "enable or disable split index"
10755msgstr "启用或禁用索引拆分"
10756
10757#: builtin/update-index.c:998
10758msgid "enable/disable untracked cache"
10759msgstr "启用/禁用对未跟踪文件的缓存"
10760
10761#: builtin/update-index.c:1000
10762msgid "enable untracked cache without testing the filesystem"
10763msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10764
10765#: builtin/update-ref.c:9
10766msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10767msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10768
10769#: builtin/update-ref.c:10
10770msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
10771msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
10772
10773#: builtin/update-ref.c:11
10774msgid "git update-ref [<options>] --stdin [-z]"
10775msgstr "git update-ref [<选项>] --stdin [-z]"
10776
10777#: builtin/update-ref.c:363
10778msgid "delete the reference"
10779msgstr "删除引用"
10780
10781#: builtin/update-ref.c:365
10782msgid "update <refname> not the one it points to"
10783msgstr "更新 <引用名> 本身而不是它指向的引用"
10784
10785#: builtin/update-ref.c:366
10786msgid "stdin has NUL-terminated arguments"
10787msgstr "标准输入有以 NUL 字符终止的参数"
10788
10789#: builtin/update-ref.c:367
10790msgid "read updates from stdin"
10791msgstr "从标准输入读取更新"
10792
10793#: builtin/update-server-info.c:6
10794msgid "git update-server-info [--force]"
10795msgstr "git update-server-info [--force]"
10796
10797#: builtin/update-server-info.c:14
10798msgid "update the info files from scratch"
10799msgstr "从头开始更新文件信息"
10800
10801#: builtin/verify-commit.c:17
10802msgid "git verify-commit [-v | --verbose] <commit>..."
10803msgstr "git verify-commit [-v | --verbose] <提交>..."
10804
10805#: builtin/verify-commit.c:72
10806msgid "print commit contents"
10807msgstr "打印提交内容"
10808
10809#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10810msgid "print raw gpg status output"
10811msgstr "打印原始 gpg 状态输出"
10812
10813#: builtin/verify-pack.c:54
10814msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10815msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10816
10817#: builtin/verify-pack.c:64
10818msgid "verbose"
10819msgstr "冗长输出"
10820
10821#: builtin/verify-pack.c:66
10822msgid "show statistics only"
10823msgstr "只显示统计"
10824
10825#: builtin/verify-tag.c:17
10826msgid "git verify-tag [-v | --verbose] <tag>..."
10827msgstr "git verify-tag [-v | --verbose] <标签>..."
10828
10829#: builtin/verify-tag.c:83
10830msgid "print tag contents"
10831msgstr "打印标签内容"
10832
10833#: builtin/worktree.c:13
10834msgid "git worktree add [<options>] <path> <branch>"
10835msgstr "git worktree add [<选项>] <路径> <分支>"
10836
10837#: builtin/worktree.c:14
10838msgid "git worktree prune [<options>]"
10839msgstr "git worktree prune [<选项>]"
10840
10841#: builtin/worktree.c:36
10842#, c-format
10843msgid "Removing worktrees/%s: not a valid directory"
10844msgstr "删除工作区/%s:不是一个有效的目录"
10845
10846#: builtin/worktree.c:42
10847#, c-format
10848msgid "Removing worktrees/%s: gitdir file does not exist"
10849msgstr "删除 worktrees/%s:gitdir 文件不存在"
10850
10851#: builtin/worktree.c:47
10852#, c-format
10853msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10854msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10855
10856#: builtin/worktree.c:58
10857#, c-format
10858msgid "Removing worktrees/%s: invalid gitdir file"
10859msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10860
10861#: builtin/worktree.c:74
10862#, c-format
10863msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10864msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10865
10866#: builtin/worktree.c:109
10867#, c-format
10868msgid "failed to remove: %s"
10869msgstr "无法删除:%s"
10870
10871#: builtin/worktree.c:198
10872#, c-format
10873msgid "'%s' already exists"
10874msgstr "'%s' 已经存在"
10875
10876#: builtin/worktree.c:232
10877#, c-format
10878msgid "could not create directory of '%s'"
10879msgstr "不能创建目录 '%s'"
10880
10881#: builtin/worktree.c:268
10882#, c-format
10883msgid "Preparing %s (identifier %s)"
10884msgstr "准备 %s (标识符 %s)"
10885
10886#: builtin/worktree.c:316
10887msgid "checkout <branch> even if already checked out in other worktree"
10888msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10889
10890#: builtin/worktree.c:318
10891msgid "create a new branch"
10892msgstr "创建一个新分支"
10893
10894#: builtin/worktree.c:320
10895msgid "create or reset a branch"
10896msgstr "创建或重置一个分支"
10897
10898#: builtin/worktree.c:321
10899msgid "detach HEAD at named commit"
10900msgstr "HEAD 从指定的提交分离"
10901
10902#: builtin/worktree.c:328
10903msgid "-b, -B, and --detach are mutually exclusive"
10904msgstr "-b、-B 和 --detach 是互斥的"
10905
10906#: builtin/write-tree.c:13
10907msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10908msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
10909
10910#: builtin/write-tree.c:26
10911msgid "<prefix>/"
10912msgstr "<前缀>/"
10913
10914#: builtin/write-tree.c:27
10915msgid "write tree object for a subdirectory <prefix>"
10916msgstr "将 <前缀> 子目录内容写到一个树对象"
10917
10918#: builtin/write-tree.c:30
10919msgid "only useful for debugging"
10920msgstr "只对调试有用"
10921
10922#: credential-cache--daemon.c:255
10923msgid "print debugging messages to stderr"
10924msgstr "调试信息输出到标准错误"
10925
10926#: git.c:14
10927msgid ""
10928"'git help -a' and 'git help -g' list available subcommands and some\n"
10929"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10930"to read about a specific subcommand or concept."
10931msgstr ""
10932"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10933"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10934"帮助。"
10935
10936#: common-cmds.h:9
10937msgid "start a working area (see also: git help tutorial)"
10938msgstr "开始一个工作区(参见:git help tutorial)"
10939
10940#: common-cmds.h:10
10941msgid "work on the current change (see also: git help everyday)"
10942msgstr "在当前变更上工作(参见:git help everyday)"
10943
10944#: common-cmds.h:11
10945msgid "examine the history and state (see also: git help revisions)"
10946msgstr "检查历史和状态(参见:git help revisions)"
10947
10948#: common-cmds.h:12
10949msgid "grow, mark and tweak your common history"
10950msgstr "扩展、标记和调校您的历史记录"
10951
10952#: common-cmds.h:13
10953msgid "collaborate (see also: git help workflows)"
10954msgstr "协同(参见:git help workflows)"
10955
10956#: common-cmds.h:17
10957msgid "Add file contents to the index"
10958msgstr "添加文件内容至索引"
10959
10960#: common-cmds.h:18
10961msgid "Use binary search to find the commit that introduced a bug"
10962msgstr "通过二分查找定位引入 bug 的提交"
10963
10964#: common-cmds.h:19
10965msgid "List, create, or delete branches"
10966msgstr "列出、创建或删除分支"
10967
10968#: common-cmds.h:20
10969msgid "Switch branches or restore working tree files"
10970msgstr "切换分支或恢复工作区文件"
10971
10972#: common-cmds.h:21
10973msgid "Clone a repository into a new directory"
10974msgstr "克隆一个仓库到一个新目录"
10975
10976#: common-cmds.h:22
10977msgid "Record changes to the repository"
10978msgstr "记录变更到仓库"
10979
10980#: common-cmds.h:23
10981msgid "Show changes between commits, commit and working tree, etc"
10982msgstr "显示提交之间、提交和工作区之间等的差异"
10983
10984#: common-cmds.h:24
10985msgid "Download objects and refs from another repository"
10986msgstr "从另外一个仓库下载对象和引用"
10987
10988#: common-cmds.h:25
10989msgid "Print lines matching a pattern"
10990msgstr "输出和模式匹配的行"
10991
10992#: common-cmds.h:26
10993msgid "Create an empty Git repository or reinitialize an existing one"
10994msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
10995
10996#: common-cmds.h:27
10997msgid "Show commit logs"
10998msgstr "显示提交日志"
10999
11000#: common-cmds.h:28
11001msgid "Join two or more development histories together"
11002msgstr "合并两个或更多开发历史"
11003
11004#: common-cmds.h:29
11005msgid "Move or rename a file, a directory, or a symlink"
11006msgstr "移动或重命名一个文件、目录或符号链接"
11007
11008#: common-cmds.h:30
11009msgid "Fetch from and integrate with another repository or a local branch"
11010msgstr "获取并整合另外的仓库或一个本地分支"
11011
11012#: common-cmds.h:31
11013msgid "Update remote refs along with associated objects"
11014msgstr "更新远程引用和相关的对象"
11015
11016#: common-cmds.h:32
11017msgid "Forward-port local commits to the updated upstream head"
11018msgstr "本地提交转移至更新后的上游分支中"
11019
11020#: common-cmds.h:33
11021msgid "Reset current HEAD to the specified state"
11022msgstr "重置当前 HEAD 到指定状态"
11023
11024#: common-cmds.h:34
11025msgid "Remove files from the working tree and from the index"
11026msgstr "从工作区和索引中删除文件"
11027
11028#: common-cmds.h:35
11029msgid "Show various types of objects"
11030msgstr "显示各种类型的对象"
11031
11032#: common-cmds.h:36
11033msgid "Show the working tree status"
11034msgstr "显示工作区状态"
11035
11036#: common-cmds.h:37
11037msgid "Create, list, delete or verify a tag object signed with GPG"
11038msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11039
11040#: parse-options.h:145
11041msgid "expiry-date"
11042msgstr "到期时间"
11043
11044#: parse-options.h:160
11045msgid "no-op (backward compatibility)"
11046msgstr "空操作(向后兼容)"
11047
11048#: parse-options.h:236
11049msgid "be more verbose"
11050msgstr "更加详细"
11051
11052#: parse-options.h:238
11053msgid "be more quiet"
11054msgstr "更加安静"
11055
11056#: parse-options.h:244
11057msgid "use <n> digits to display SHA-1s"
11058msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11059
11060#: rerere.h:28
11061msgid "update the index with reused conflict resolution if possible"
11062msgstr "如果可能,重用冲突解决更新索引"
11063
11064#: git-bisect.sh:50
11065msgid "You need to start by \"git bisect start\""
11066msgstr "您需要执行 \"git bisect start\" 来开始"
11067
11068#  译者:注意保持句尾空格
11069#. TRANSLATORS: Make sure to include [Y] and [n] in your
11070#. translation. The program will only accept English input
11071#. at this point.
11072#: git-bisect.sh:56
11073msgid "Do you want me to do it for you [Y/n]? "
11074msgstr "您想让我为您这样做么[Y/n]? "
11075
11076#: git-bisect.sh:99
11077#, sh-format
11078msgid "unrecognised option: '$arg'"
11079msgstr "未能识别的选项:'$arg'"
11080
11081#: git-bisect.sh:103
11082#, sh-format
11083msgid "'$arg' does not appear to be a valid revision"
11084msgstr "'$arg' 看起来不像是一个有效的版本"
11085
11086#: git-bisect.sh:132
11087msgid "Bad HEAD - I need a HEAD"
11088msgstr "坏的 HEAD - 我需要一个 HEAD"
11089
11090#: git-bisect.sh:145
11091#, sh-format
11092msgid ""
11093"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11094msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11095
11096#: git-bisect.sh:155
11097msgid "won't bisect on cg-seek'ed tree"
11098msgstr "不会在做了 cg-seek 的树上做二分查找"
11099
11100#: git-bisect.sh:159
11101msgid "Bad HEAD - strange symbolic ref"
11102msgstr "坏的 HEAD - 奇怪的符号引用"
11103
11104#: git-bisect.sh:211
11105#, sh-format
11106msgid "Bad bisect_write argument: $state"
11107msgstr "坏的 bisect_write 参数:$state"
11108
11109#: git-bisect.sh:240
11110#, sh-format
11111msgid "Bad rev input: $arg"
11112msgstr "输入坏的版本:$arg"
11113
11114#: git-bisect.sh:255
11115msgid "Please call 'bisect_state' with at least one argument."
11116msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11117
11118#: git-bisect.sh:267
11119#, sh-format
11120msgid "Bad rev input: $rev"
11121msgstr "输入坏的版本:$rev"
11122
11123#: git-bisect.sh:276
11124#, sh-format
11125msgid "'git bisect $TERM_BAD' can take only one argument."
11126msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11127
11128#: git-bisect.sh:299
11129#, sh-format
11130msgid "Warning: bisecting only with a $TERM_BAD commit."
11131msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11132
11133#  译者:注意保持句尾空格
11134#. TRANSLATORS: Make sure to include [Y] and [n] in your
11135#. translation. The program will only accept English input
11136#. at this point.
11137#: git-bisect.sh:305
11138msgid "Are you sure [Y/n]? "
11139msgstr "您确认么[Y/n]? "
11140
11141#: git-bisect.sh:317
11142#, sh-format
11143msgid ""
11144"You need to give me at least one $bad_syn and one $good_syn revision.\n"
11145"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11146msgstr ""
11147"您需要给我至少一个好版本和一个坏版本。\n"
11148"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11149
11150#: git-bisect.sh:320
11151#, sh-format
11152msgid ""
11153"You need to start by \"git bisect start\".\n"
11154"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11155"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11156msgstr ""
11157"您需要执行 \"git bisect start\" 来开始。\n"
11158"然后需要提供我至少一个好版本和一个坏版本。\n"
11159"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11160
11161#: git-bisect.sh:391 git-bisect.sh:521
11162msgid "We are not bisecting."
11163msgstr "我们没有在二分查找。"
11164
11165#: git-bisect.sh:398
11166#, sh-format
11167msgid "'$invalid' is not a valid commit"
11168msgstr "'$invalid' 不是一个有效的提交"
11169
11170#: git-bisect.sh:407
11171#, sh-format
11172msgid ""
11173"Could not check out original HEAD '$branch'.\n"
11174"Try 'git bisect reset <commit>'."
11175msgstr ""
11176"不能检出原始 HEAD '$branch'。\n"
11177"尝试 'git bisect reset <提交>'。"
11178
11179#: git-bisect.sh:435
11180msgid "No logfile given"
11181msgstr "未提供日志文件"
11182
11183#: git-bisect.sh:436
11184#, sh-format
11185msgid "cannot read $file for replaying"
11186msgstr "不能读取 $file 来重放"
11187
11188#: git-bisect.sh:455
11189msgid "?? what are you talking about?"
11190msgstr "?? 您在说什么?"
11191
11192#: git-bisect.sh:467
11193#, sh-format
11194msgid "running $command"
11195msgstr "运行 $command"
11196
11197#: git-bisect.sh:474
11198#, sh-format
11199msgid ""
11200"bisect run failed:\n"
11201"exit code $res from '$command' is < 0 or >= 128"
11202msgstr ""
11203"二分查找运行失败:\n"
11204"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11205
11206#: git-bisect.sh:500
11207msgid "bisect run cannot continue any more"
11208msgstr "二分查找不能继续运行"
11209
11210#: git-bisect.sh:506
11211#, sh-format
11212msgid ""
11213"bisect run failed:\n"
11214"'bisect_state $state' exited with error code $res"
11215msgstr ""
11216"二分查找运行失败:\n"
11217"'bisect_state $state' 退出码为 $res"
11218
11219#: git-bisect.sh:513
11220msgid "bisect run success"
11221msgstr "二分查找运行成功"
11222
11223#: git-bisect.sh:548
11224#, sh-format
11225msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11226msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11227
11228#: git-rebase.sh:57
11229msgid ""
11230"When you have resolved this problem, run \"git rebase --continue\".\n"
11231"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11232"To check out the original branch and stop rebasing, run \"git rebase --abort"
11233"\"."
11234msgstr ""
11235"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11236"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11237"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11238
11239#: git-rebase.sh:165
11240msgid "Applied autostash."
11241msgstr "成功应用 autostash。"
11242
11243#: git-rebase.sh:168
11244#, sh-format
11245msgid "Cannot store $stash_sha1"
11246msgstr "无法保存 $stash_sha1"
11247
11248#: git-rebase.sh:169
11249msgid ""
11250"Applying autostash resulted in conflicts.\n"
11251"Your changes are safe in the stash.\n"
11252"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11253msgstr ""
11254"应用 autostash 导致冲突。\n"
11255"您的修改安全地保存在 stash 中。\n"
11256"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11257
11258#: git-rebase.sh:208
11259msgid "The pre-rebase hook refused to rebase."
11260msgstr "钩子 pre-rebase 拒绝变基操作。"
11261
11262#: git-rebase.sh:213
11263msgid "It looks like git-am is in progress. Cannot rebase."
11264msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11265
11266#: git-rebase.sh:351
11267msgid "The --exec option must be used with the --interactive option"
11268msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11269
11270#: git-rebase.sh:356
11271msgid "No rebase in progress?"
11272msgstr "没有正在进行的变基?"
11273
11274#: git-rebase.sh:367
11275msgid "The --edit-todo action can only be used during interactive rebase."
11276msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11277
11278#: git-rebase.sh:374
11279msgid "Cannot read HEAD"
11280msgstr "不能读取 HEAD"
11281
11282#: git-rebase.sh:377
11283msgid ""
11284"You must edit all merge conflicts and then\n"
11285"mark them as resolved using git add"
11286msgstr ""
11287"您必须编辑所有的合并冲突,然后通过 git add\n"
11288"命令将它们标记为已解决"
11289
11290#: git-rebase.sh:395
11291#, sh-format
11292msgid "Could not move back to $head_name"
11293msgstr "无法移回 $head_name"
11294
11295#: git-rebase.sh:414
11296#, sh-format
11297msgid ""
11298"It seems that there is already a $state_dir_base directory, and\n"
11299"I wonder if you are in the middle of another rebase.  If that is the\n"
11300"case, please try\n"
11301"\t$cmd_live_rebase\n"
11302"If that is not the case, please\n"
11303"\t$cmd_clear_stale_rebase\n"
11304"and run me again.  I am stopping in case you still have something\n"
11305"valuable there."
11306msgstr ""
11307"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11308"过程中。 如果是这样,请执行\n"
11309"\t$cmd_live_rebase\n"
11310"如果不是这样,请执行\n"
11311"\t$cmd_clear_stale_rebase\n"
11312"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
11313
11314#: git-rebase.sh:465
11315#, sh-format
11316msgid "invalid upstream $upstream_name"
11317msgstr "无效的上游 $upstream_name"
11318
11319#: git-rebase.sh:489
11320#, sh-format
11321msgid "$onto_name: there are more than one merge bases"
11322msgstr "$onto_name: 有一个以上的合并基准"
11323
11324#: git-rebase.sh:492 git-rebase.sh:496
11325#, sh-format
11326msgid "$onto_name: there is no merge base"
11327msgstr "$onto_name: 没有合并基准"
11328
11329#: git-rebase.sh:501
11330#, sh-format
11331msgid "Does not point to a valid commit: $onto_name"
11332msgstr "没有指向一个有效的提交:$onto_name"
11333
11334#: git-rebase.sh:524
11335#, sh-format
11336msgid "fatal: no such branch: $branch_name"
11337msgstr "严重错误:无此分支:$branch_name"
11338
11339#: git-rebase.sh:557
11340msgid "Cannot autostash"
11341msgstr "无法 autostash"
11342
11343#: git-rebase.sh:562
11344#, sh-format
11345msgid "Created autostash: $stash_abbrev"
11346msgstr "创建了 autostash: $stash_abbrev"
11347
11348#: git-rebase.sh:566
11349msgid "Please commit or stash them."
11350msgstr "请提交或为它们保存进度。"
11351
11352#: git-rebase.sh:586
11353#, sh-format
11354msgid "Current branch $branch_name is up to date."
11355msgstr "当前分支 $branch_name 是最新的。"
11356
11357#: git-rebase.sh:590
11358#, sh-format
11359msgid "Current branch $branch_name is up to date, rebase forced."
11360msgstr "当前分支 $branch_name 是最新的,强制变基。"
11361
11362#: git-rebase.sh:601
11363#, sh-format
11364msgid "Changes from $mb to $onto:"
11365msgstr "变更从 $mb 到 $onto:"
11366
11367#: git-rebase.sh:610
11368msgid "First, rewinding head to replay your work on top of it..."
11369msgstr "首先,回退分支以便在上面重放您的工作..."
11370
11371#: git-rebase.sh:620
11372#, sh-format
11373msgid "Fast-forwarded $branch_name to $onto_name."
11374msgstr "快进 $branch_name 至 $onto_name。"
11375
11376#: git-stash.sh:51
11377msgid "git stash clear with parameters is unimplemented"
11378msgstr "git stash clear 不支持参数"
11379
11380#: git-stash.sh:74
11381msgid "You do not have the initial commit yet"
11382msgstr "您尚未建立初始提交"
11383
11384#: git-stash.sh:89
11385msgid "Cannot save the current index state"
11386msgstr "无法保存当前索引状态"
11387
11388#: git-stash.sh:124 git-stash.sh:137
11389msgid "Cannot save the current worktree state"
11390msgstr "无法保存当前工作区状态"
11391
11392#: git-stash.sh:141
11393msgid "No changes selected"
11394msgstr "没有选择变更"
11395
11396#: git-stash.sh:144
11397msgid "Cannot remove temporary index (can't happen)"
11398msgstr "无法删除临时索引(不应发生)"
11399
11400#: git-stash.sh:157
11401msgid "Cannot record working tree state"
11402msgstr "不能记录工作区状态"
11403
11404#: git-stash.sh:189
11405#, sh-format
11406msgid "Cannot update $ref_stash with $w_commit"
11407msgstr "无法用 $w_commit 更新 $ref_stash"
11408
11409#. TRANSLATORS: $option is an invalid option, like
11410#. `--blah-blah'. The 7 spaces at the beginning of the
11411#. second line correspond to "error: ". So you should line
11412#. up the second line with however many characters the
11413#. translation of "error: " takes in your language. E.g. in
11414#. English this is:
11415#.
11416#. $ git stash save --blah-blah 2>&1 | head -n 2
11417#. error: unknown option for 'stash save': --blah-blah
11418#. To provide a message, use git stash save -- '--blah-blah'
11419#: git-stash.sh:239
11420#, sh-format
11421msgid ""
11422"error: unknown option for 'stash save': $option\n"
11423"       To provide a message, use git stash save -- '$option'"
11424msgstr ""
11425"错误:'stash save' 的未知选项:$option\n"
11426"      要提供一个描述信息,使用 git stash save -- '$option'"
11427
11428#: git-stash.sh:260
11429msgid "No local changes to save"
11430msgstr "没有要保存的本地修改"
11431
11432#: git-stash.sh:264
11433msgid "Cannot initialize stash"
11434msgstr "无法初始化 stash"
11435
11436#: git-stash.sh:268
11437msgid "Cannot save the current status"
11438msgstr "无法保存当前状态"
11439
11440#: git-stash.sh:286
11441msgid "Cannot remove worktree changes"
11442msgstr "无法删除工作区变更"
11443
11444#: git-stash.sh:387
11445#, sh-format
11446msgid "unknown option: $opt"
11447msgstr "未知选项: $opt"
11448
11449#: git-stash.sh:397
11450msgid "No stash found."
11451msgstr "未发现 stash。"
11452
11453#: git-stash.sh:404
11454#, sh-format
11455msgid "Too many revisions specified: $REV"
11456msgstr "指定了太多的版本:$REV"
11457
11458#: git-stash.sh:410
11459#, sh-format
11460msgid "$reference is not a valid reference"
11461msgstr "$reference 不是一个有效的引用"
11462
11463#: git-stash.sh:438
11464#, sh-format
11465msgid "'$args' is not a stash-like commit"
11466msgstr "'$args' 不是 stash 样提交"
11467
11468#: git-stash.sh:449
11469#, sh-format
11470msgid "'$args' is not a stash reference"
11471msgstr "'$args' 不是一个 stash 引用"
11472
11473#: git-stash.sh:457
11474msgid "unable to refresh index"
11475msgstr "无法刷新索引"
11476
11477#: git-stash.sh:461
11478msgid "Cannot apply a stash in the middle of a merge"
11479msgstr "无法在合并过程中恢复进度"
11480
11481#: git-stash.sh:469
11482msgid "Conflicts in index. Try without --index."
11483msgstr "索引中有冲突。尝试不使用 --index。"
11484
11485#: git-stash.sh:471
11486msgid "Could not save index tree"
11487msgstr "不能保存索引树"
11488
11489#: git-stash.sh:505
11490msgid "Cannot unstage modified files"
11491msgstr "无法将修改的文件取消暂存"
11492
11493#: git-stash.sh:520
11494msgid "Index was not unstashed."
11495msgstr "索引的进度没有被恢复。"
11496
11497#: git-stash.sh:543
11498#, sh-format
11499msgid "Dropped ${REV} ($s)"
11500msgstr "丢弃了 ${REV} ($s)"
11501
11502#: git-stash.sh:544
11503#, sh-format
11504msgid "${REV}: Could not drop stash entry"
11505msgstr "${REV}:不能丢弃进度条目"
11506
11507#: git-stash.sh:552
11508msgid "No branch name specified"
11509msgstr "未指定分支名"
11510
11511#: git-stash.sh:624
11512msgid "(To restore them type \"git stash apply\")"
11513msgstr "(为恢复数据输入 \"git stash apply\")"
11514
11515#: git-submodule.sh:95
11516#, sh-format
11517msgid "cannot strip one component off url '$remoteurl'"
11518msgstr "无法从 url '$remoteurl' 剥离一个组件"
11519
11520#: git-submodule.sh:237
11521#, sh-format
11522msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11523msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
11524
11525#: git-submodule.sh:287
11526#, sh-format
11527msgid "Clone of '$url' into submodule path '$sm_path' failed"
11528msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
11529
11530#: git-submodule.sh:296
11531#, sh-format
11532msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
11533msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
11534
11535#: git-submodule.sh:406
11536msgid "Relative path can only be used from the toplevel of the working tree"
11537msgstr "只能在工作区的顶级目录中使用相对路径"
11538
11539#: git-submodule.sh:416
11540#, sh-format
11541msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11542msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11543
11544#: git-submodule.sh:433
11545#, sh-format
11546msgid "'$sm_path' already exists in the index"
11547msgstr "'$sm_path' 已经存在于索引中"
11548
11549#: git-submodule.sh:437
11550#, sh-format
11551msgid ""
11552"The following path is ignored by one of your .gitignore files:\n"
11553"$sm_path\n"
11554"Use -f if you really want to add it."
11555msgstr ""
11556"以下路径被您的一个 .gitignore 文件所忽略:\n"
11557"$sm_path\n"
11558"如果您确实想添加它,使用 -f 参数。"
11559
11560#: git-submodule.sh:455
11561#, sh-format
11562msgid "Adding existing repo at '$sm_path' to the index"
11563msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11564
11565#: git-submodule.sh:457
11566#, sh-format
11567msgid "'$sm_path' already exists and is not a valid git repo"
11568msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11569
11570#: git-submodule.sh:465
11571#, sh-format
11572msgid "A git directory for '$sm_name' is found locally with remote(s):"
11573msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11574
11575#: git-submodule.sh:467
11576#, sh-format
11577msgid ""
11578"If you want to reuse this local git directory instead of cloning again from"
11579msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11580
11581#: git-submodule.sh:469
11582#, sh-format
11583msgid ""
11584"use the '--force' option. If the local git directory is not the correct repo"
11585msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11586
11587#: git-submodule.sh:470
11588#, sh-format
11589msgid ""
11590"or you are unsure what this means choose another name with the '--name' "
11591"option."
11592msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11593
11594#: git-submodule.sh:472
11595#, sh-format
11596msgid "Reactivating local git directory for submodule '$sm_name'."
11597msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11598
11599#: git-submodule.sh:484
11600#, sh-format
11601msgid "Unable to checkout submodule '$sm_path'"
11602msgstr "不能检出子模组 '$sm_path'"
11603
11604#: git-submodule.sh:489
11605#, sh-format
11606msgid "Failed to add submodule '$sm_path'"
11607msgstr "无法添加子模组 '$sm_path'"
11608
11609#: git-submodule.sh:498
11610#, sh-format
11611msgid "Failed to register submodule '$sm_path'"
11612msgstr "无法注册子模组 '$sm_path'"
11613
11614#: git-submodule.sh:542
11615#, sh-format
11616msgid "Entering '$prefix$displaypath'"
11617msgstr "正在进入 '$prefix$displaypath'"
11618
11619#: git-submodule.sh:562
11620#, sh-format
11621msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11622msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11623
11624#: git-submodule.sh:608
11625#, sh-format
11626msgid "No url found for submodule path '$displaypath' in .gitmodules"
11627msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11628
11629#: git-submodule.sh:617
11630#, sh-format
11631msgid "Failed to register url for submodule path '$displaypath'"
11632msgstr "无法为子模组路径 '$displaypath' 注册 url"
11633
11634#: git-submodule.sh:619
11635#, sh-format
11636msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11637msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11638
11639#: git-submodule.sh:636
11640#, sh-format
11641msgid "Failed to register update mode for submodule path '$displaypath'"
11642msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11643
11644#: git-submodule.sh:674
11645#, sh-format
11646msgid "Use '.' if you really want to deinitialize all submodules"
11647msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11648
11649#: git-submodule.sh:691
11650#, sh-format
11651msgid "Submodule work tree '$displaypath' contains a .git directory"
11652msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11653
11654#: git-submodule.sh:692
11655#, sh-format
11656msgid ""
11657"(use 'rm -rf' if you really want to remove it including all of its history)"
11658msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11659
11660#: git-submodule.sh:698
11661#, sh-format
11662msgid ""
11663"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11664"discard them"
11665msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11666
11667#: git-submodule.sh:701
11668#, sh-format
11669msgid "Cleared directory '$displaypath'"
11670msgstr "已清除目录 '$displaypath'"
11671
11672#: git-submodule.sh:702
11673#, sh-format
11674msgid "Could not remove submodule work tree '$displaypath'"
11675msgstr "无法移除子模组工作区 '$displaypath'"
11676
11677#: git-submodule.sh:705
11678#, sh-format
11679msgid "Could not create empty submodule directory '$displaypath'"
11680msgstr "不能创建空的子模组目录 '$displaypath'"
11681
11682#: git-submodule.sh:714
11683#, sh-format
11684msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11685msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11686
11687#: git-submodule.sh:830
11688#, sh-format
11689msgid ""
11690"Submodule path '$displaypath' not initialized\n"
11691"Maybe you want to use 'update --init'?"
11692msgstr ""
11693"子模组路径 '$displaypath' 没有初始化\n"
11694"也许您想用 'update --init'?"
11695
11696#: git-submodule.sh:843
11697#, sh-format
11698msgid "Unable to find current revision in submodule path '$displaypath'"
11699msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11700
11701#: git-submodule.sh:852
11702#, sh-format
11703msgid "Unable to fetch in submodule path '$sm_path'"
11704msgstr "无法在子模组路径 '$sm_path' 中获取"
11705
11706#: git-submodule.sh:876
11707#, sh-format
11708msgid "Unable to fetch in submodule path '$displaypath'"
11709msgstr "无法在子模组路径 '$displaypath' 中获取"
11710
11711#: git-submodule.sh:890
11712#, sh-format
11713msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11714msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11715
11716#: git-submodule.sh:891
11717#, sh-format
11718msgid "Submodule path '$displaypath': checked out '$sha1'"
11719msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11720
11721#: git-submodule.sh:895
11722#, sh-format
11723msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11724msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11725
11726#: git-submodule.sh:896
11727#, sh-format
11728msgid "Submodule path '$displaypath': rebased into '$sha1'"
11729msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
11730
11731#: git-submodule.sh:901
11732#, sh-format
11733msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11734msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11735
11736#: git-submodule.sh:902
11737#, sh-format
11738msgid "Submodule path '$displaypath': merged in '$sha1'"
11739msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
11740
11741#: git-submodule.sh:907
11742#, sh-format
11743msgid ""
11744"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11745msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11746
11747#: git-submodule.sh:908
11748#, sh-format
11749msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11750msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11751
11752#: git-submodule.sh:938
11753#, sh-format
11754msgid "Failed to recurse into submodule path '$displaypath'"
11755msgstr "无法递归进子模组路径 '$displaypath'"
11756
11757#: git-submodule.sh:1046
11758msgid "The --cached option cannot be used with the --files option"
11759msgstr "选项 --cached 不能和选项 --files 同时使用"
11760
11761#: git-submodule.sh:1098
11762#, sh-format
11763msgid "unexpected mode $mod_dst"
11764msgstr "意外的模式 $mod_dst"
11765
11766#  译者:注意保持前导空格
11767#: git-submodule.sh:1118
11768#, sh-format
11769msgid "  Warn: $display_name doesn't contain commit $sha1_src"
11770msgstr "  警告:$display_name 未包含提交 $sha1_src"
11771
11772#  译者:注意保持前导空格
11773#: git-submodule.sh:1121
11774#, sh-format
11775msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
11776msgstr "  警告:$display_name 未包含提交 $sha1_dst"
11777
11778#  译者:注意保持前导空格
11779#: git-submodule.sh:1124
11780#, sh-format
11781msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11782msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11783
11784#: git-submodule.sh:1149
11785msgid "blob"
11786msgstr "数据对象"
11787
11788#: git-submodule.sh:1267
11789#, sh-format
11790msgid "Failed to recurse into submodule path '$sm_path'"
11791msgstr "无法递归进子模组路径 '$sm_path'"
11792
11793#: git-submodule.sh:1331
11794#, sh-format
11795msgid "Synchronizing submodule url for '$displaypath'"
11796msgstr "为 '$displaypath' 同步子模组 url"
11797
11798#~ msgid "BUG: reopen a lockfile that is still open"
11799#~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
11800
11801#~ msgid "BUG: reopen a lockfile that has been committed"
11802#~ msgstr "BUG: 重新打开一个已提交的锁文件"
11803
11804#~ msgid "option %s does not accept negative form"
11805#~ msgstr "选项 %s 不接受否定格式"
11806
11807#~ msgid "unable to parse value '%s' for option %s"
11808#~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
11809
11810#~ msgid "unable to resolve HEAD"
11811#~ msgstr "不能解析 HEAD"
11812
11813#~ msgid "-b and -B are mutually exclusive"
11814#~ msgstr "-b 和 -B 互斥"
11815
11816#~ msgid "You need to set your committer info first"
11817#~ msgstr "您需要先设置你的提交者信息"
11818
11819#~ msgid ""
11820#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
11821#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
11822#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
11823#~ "\"."
11824#~ msgstr ""
11825#~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
11826#~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
11827#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
11828
11829#~ msgid "Patch format $patch_format is not supported."
11830#~ msgstr "不支持 $patch_format 补丁格式。"
11831
11832#~ msgid "Please make up your mind. --skip or --abort?"
11833#~ msgstr "请下决心。--skip 或是 --abort ?"
11834
11835#~ msgid ""
11836#~ "Patch is empty.  Was it split wrong?\n"
11837#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
11838#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
11839#~ msgstr ""
11840#~ "补丁为空。是不是切分错误?\n"
11841#~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
11842#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
11843
11844#~ msgid "Patch does not have a valid e-mail address."
11845#~ msgstr "补丁中没有一个有效的邮件地址。"
11846
11847#~ msgid "Applying: $FIRSTLINE"
11848#~ msgstr "正应用:$FIRSTLINE"
11849
11850#~ msgid "Patch failed at $msgnum $FIRSTLINE"
11851#~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
11852
11853#~ msgid ""
11854#~ "Pull is not possible because you have unmerged files.\n"
11855#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
11856#~ "as appropriate to mark resolution and make a commit."
11857#~ msgstr ""
11858#~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
11859#~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
11860
11861#~ msgid "Pull is not possible because you have unmerged files."
11862#~ msgstr "Pull 不可用,因为您尚有未合并的文件。"