po / zh_CN.poon commit Merge tag 'v2.8.6' into maint-2.9 (af0178a)
   1# Chinese translations for Git package
   2# Git 软件包的简体中文翻译.
   3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
   4# This file is distributed under the same license as the Git package.
   5# Contributors:
   6#   - Jiang Xin <worldhello.net AT gmail.com>
   7#   - Lian Cheng <rhythm.mail AT gmail.com>
   8#   - Ray Chen <oldsharp AT gmail.com>
   9#   - Riku <lu.riku AT gmail.com>
  10#   - Thynson <lanxingcan AT gmail.com>
  11#   - ws3389 <willsmith3389 AT gmail.com>
  12#   - Wang Sheng <wangsheng2008love AT 163.com>
  13#   - Yichao Yu <yyc1992 AT gmail.com>
  14#   - Zhuang Ya <zhuangya AT me.com>
  15#
  16#  Git glossary for Chinese translators
  17#
  18#   English                          |  Chinese
  19#   ---------------------------------+--------------------------------------
  20#   3-way merge                      |  三方合并
  21#   abbreviate                       |  简写(的 SHA-1 值)
  22#   alternate object database        |  备用对象库
  23#   amend                            |  修补
  24#   ancestor                         |  祖先,祖先提交
  25#   annotated tag                    |  附注标签
  26#   bare repository                  |  纯仓库
  27#   bisect                           |  二分查找
  28#   blob object                      |  数据对象
  29#   branch                           |  分支
  30#   bundle                           |  包
  31#   bypass                           |  绕过
  32#   cache                            |  索引(的别称)
  33#   chain                            |  (提交)链
  34#   changeset                        |  变更集
  35#   checkout                         |  检出
  36#   checksum                         |  校验,校验和
  37#   cherry-picking                   |  拣选
  38#   clean                            |  干净(的工作区)
  39#   clone                            |  克隆
  40#   commit                           |  提交
  41#   commit message                   |  提交说明
  42#   commit object                    |  提交对象
  43#   commit-ish (also committish)     |  提交号
  44#   conflict                         |  冲突
  45#   core Git                         |  核心 Git 工具
  46#   DAG                              |  有向无环图
  47#   dangling object                  |  摇摆对象
  48#   detached HEAD                    |  分离头指针
  49#   directory                        |  目录
  50#   dirty                            |  脏(的工作区)
  51#   dumb HTTP protocol               |  哑 HTTP 协议
  52#   evil merge                       |  坏合并(合并引入了父提交没有的修改)
  53#   fast-forward                     |  快进
  54#   fetch                            |  获取
  55#   file system                      |  文件系统
  56#   fork                             |  派生
  57#   Git archive                      |  仓库(对于 arch 用户)
  58#   gitfile                          |  gitfile(仓库链接文件)
  59#   grafts                           |  (提交)嫁接
  60#   hash                             |  哈希值
  61#   HEAD                             |  HEAD(头指针,亦即当前分支)
  62#   head                             |  头、分支
  63#   head ref                         |  分支
  64#   header                           |  头信息
  65#   hook                             |  钩子
  66#   hunk                             |  补丁片段
  67#   index                            |  索引
  68#   index entry                      |  索引条目
  69#   loose object                     |  松散对象
  70#   loose refs                       |  松散引用
  71#   master                           |  master(默认分支名)
  72#   merge                            |  合并
  73#   object                           |  对象
  74#   object database                  |  对象库
  75#   object identifier                |  对象标识符
  76#   object name                      |  对象名称
  77#   object type                      |  对象类型
  78#   octopus                          |  章鱼式合并(两分支以上的合并)
  79#   origin                           |  origin(默认的远程名称)
  80#   pack                             |  包
  81#   pack index                       |  包索引
  82#   packfile                         |  包文件
  83#   parent                           |  父提交
  84#   patch                            |  补丁
  85#   pathspec                         |  路径规格
  86#   pattern                          |  模式
  87#   pickaxe                          |  挖掘
  88#   plumbing                         |  管件(Git 底层核心命令的别称)
  89#   porcelain                        |  瓷件(Git 上层封装命令的别称)
  90#   precious-objects repo            |  珍品仓库
  91#   prune                            |  清除
  92#   pull                             |  拉,拉取
  93#   push                             |  推,推送
  94#   reachable                        |  可达
  95#   rebase                           |  变基
  96#   ref                              |  引用
  97#   reflog                           |  引用日志
  98#   refspec                          |  引用规格
  99#   remote                           |  远程,远程仓库
 100#   remote-tracking branch           |  远程跟踪分支
 101#   replay                           |  重放
 102#   repo                             |  仓库
 103#   repository                       |  仓库
 104#   resolve                          |  (冲突)解决
 105#   revert                           |  还原
 106#   revision                         |  版本
 107#   rewind                           |  回退
 108#   SCM                              |  源代码管理(工具)
 109#   SHA-1                            |  SHA-1(安全哈希算法1)
 110#   shallow repository               |  浅(克隆)仓库
 111#   signed tag                       |  签名标签
 112#   smart HTTP protocol              |  智能 HTTP 协议
 113#   squash                           |  压缩
 114#   stage                            |  n. 暂存区(即索引); v. 暂存
 115#   stash                            |  n. 进度保存; v. 保存进度
 116#   submodule                        |  子模组
 117#   symref                           |  符号引用
 118#   tag                              |  n. 标签; v. 打标签
 119#   tag object                       |  标签对象
 120#   tagger                           |  打标签者
 121#   topic branch                     |  主题分支
 122#   track                            |  跟踪
 123#   tree                             |  树(工作区或树对象)
 124#   tree object                      |  树对象
 125#   tree-ish (also treeish)          |  树对象(或可以解析为一树对象)
 126#   unmerged index                   |  未合并索引
 127#   unpack                           |  解包
 128#   unreachable object               |  不可达对象
 129#   unstage                          |  取消暂存
 130#   upstream                         |  上游
 131#   upstream branch                  |  上游分支
 132#   working tree                     |  工作区
 133#
 134msgid ""
 135msgstr ""
 136"Project-Id-Version: Git\n"
 137"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 138"POT-Creation-Date: 2016-05-24 23:42+0800\n"
 139"PO-Revision-Date: 2016-06-06 23:05+0800\n"
 140"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 141"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 142"Language: zh_CN\n"
 143"MIME-Version: 1.0\n"
 144"Content-Type: text/plain; charset=UTF-8\n"
 145"Content-Transfer-Encoding: 8bit\n"
 146"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 147
 148#: advice.c:55
 149#, c-format
 150msgid "hint: %.*s\n"
 151msgstr "提示:%.*s\n"
 152
 153#: advice.c:88
 154msgid ""
 155"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 156"as appropriate to mark resolution and make a commit."
 157msgstr ""
 158"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
 159"解决方案并提交。"
 160
 161#: advice.c:101 builtin/merge.c:1238
 162msgid "You have not concluded your merge (MERGE_HEAD exists)."
 163msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
 164
 165#: advice.c:103
 166msgid "Please, commit your changes before merging."
 167msgstr "请在合并前先提交您的修改。"
 168
 169#: advice.c:104
 170msgid "Exiting because of unfinished merge."
 171msgstr "因为存在未完成的合并而退出。"
 172
 173#: archive.c:12
 174msgid "git archive [<options>] <tree-ish> [<path>...]"
 175msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 176
 177#: archive.c:13
 178msgid "git archive --list"
 179msgstr "git archive --list"
 180
 181#: archive.c:14
 182msgid ""
 183"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 184msgstr ""
 185"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 186
 187#: archive.c:15
 188msgid "git archive --remote <repo> [--exec <cmd>] --list"
 189msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 190
 191#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
 192#, c-format
 193msgid "pathspec '%s' did not match any files"
 194msgstr "路径规格 '%s' 未匹配任何文件"
 195
 196#: archive.c:429
 197msgid "fmt"
 198msgstr "格式"
 199
 200#: archive.c:429
 201msgid "archive format"
 202msgstr "归档格式"
 203
 204#: archive.c:430 builtin/log.c:1395
 205msgid "prefix"
 206msgstr "前缀"
 207
 208#: archive.c:431
 209msgid "prepend prefix to each pathname in the archive"
 210msgstr "为归档中每个路径名加上前缀"
 211
 212#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
 213#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
 214#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
 215#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
 216#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
 217msgid "file"
 218msgstr "文件"
 219
 220#: archive.c:433 builtin/archive.c:89
 221msgid "write the archive to this file"
 222msgstr "归档写入此文件"
 223
 224#: archive.c:435
 225msgid "read .gitattributes in working directory"
 226msgstr "读取工作区中的 .gitattributes"
 227
 228#: archive.c:436
 229msgid "report archived files on stderr"
 230msgstr "在标准错误上报告归档文件"
 231
 232#: archive.c:437
 233msgid "store only"
 234msgstr "只存储"
 235
 236#: archive.c:438
 237msgid "compress faster"
 238msgstr "压缩速度更快"
 239
 240#: archive.c:446
 241msgid "compress better"
 242msgstr "压缩效果更好"
 243
 244#: archive.c:449
 245msgid "list supported archive formats"
 246msgstr "列出支持的归档格式"
 247
 248#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
 249#: builtin/submodule--helper.c:776
 250msgid "repo"
 251msgstr "仓库"
 252
 253#: archive.c:452 builtin/archive.c:91
 254msgid "retrieve the archive from remote repository <repo>"
 255msgstr "从远程仓库(<仓库>)提取归档文件"
 256
 257#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
 258msgid "command"
 259msgstr "命令"
 260
 261#: archive.c:454 builtin/archive.c:93
 262msgid "path to the remote git-upload-archive command"
 263msgstr "远程 git-upload-archive 命令的路径"
 264
 265#: attr.c:263
 266msgid ""
 267"Negative patterns are ignored in git attributes\n"
 268"Use '\\!' for literal leading exclamation."
 269msgstr ""
 270"负值模版在 git attributes 中被忽略\n"
 271"当字符串确实要以感叹号开始时,使用 '\\!'。"
 272
 273#: branch.c:53
 274#, c-format
 275msgid ""
 276"\n"
 277"After fixing the error cause you may try to fix up\n"
 278"the remote tracking information by invoking\n"
 279"\"git branch --set-upstream-to=%s%s%s\"."
 280msgstr ""
 281"\n"
 282"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
 283"\"git branch --set-upstream-to=%s%s%s\" 。"
 284
 285#: branch.c:67
 286#, c-format
 287msgid "Not setting branch %s as its own upstream."
 288msgstr "未设置分支 %s 作为它自己的上游。"
 289
 290#: branch.c:93
 291#, c-format
 292msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 293msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 294
 295#: branch.c:94
 296#, c-format
 297msgid "Branch %s set up to track remote branch %s from %s."
 298msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 299
 300#: branch.c:98
 301#, c-format
 302msgid "Branch %s set up to track local branch %s by rebasing."
 303msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 304
 305#: branch.c:99
 306#, c-format
 307msgid "Branch %s set up to track local branch %s."
 308msgstr "分支 %s 设置为跟踪本地分支 %s。"
 309
 310#: branch.c:104
 311#, c-format
 312msgid "Branch %s set up to track remote ref %s by rebasing."
 313msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 314
 315#: branch.c:105
 316#, c-format
 317msgid "Branch %s set up to track remote ref %s."
 318msgstr "分支 %s 设置为跟踪远程引用 %s。"
 319
 320#: branch.c:109
 321#, c-format
 322msgid "Branch %s set up to track local ref %s by rebasing."
 323msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 324
 325#: branch.c:110
 326#, c-format
 327msgid "Branch %s set up to track local ref %s."
 328msgstr "分支 %s 设置为跟踪本地引用 %s。"
 329
 330#: branch.c:119
 331msgid "Unable to write upstream branch configuration"
 332msgstr "无法写入上游分支配置"
 333
 334#: branch.c:156
 335#, c-format
 336msgid "Not tracking: ambiguous information for ref %s"
 337msgstr "未跟踪:引用 %s 有歧义"
 338
 339#: branch.c:185
 340#, c-format
 341msgid "'%s' is not a valid branch name."
 342msgstr "'%s' 不是一个有效的分支名称。"
 343
 344#: branch.c:190
 345#, c-format
 346msgid "A branch named '%s' already exists."
 347msgstr "一个分支名 '%s' 已经存在。"
 348
 349#: branch.c:198
 350msgid "Cannot force update the current branch."
 351msgstr "无法强制更新当前分支。"
 352
 353#: branch.c:218
 354#, c-format
 355msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 356msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
 357
 358#: branch.c:220
 359#, c-format
 360msgid "the requested upstream branch '%s' does not exist"
 361msgstr "请求的上游分支 '%s' 不存在"
 362
 363#: branch.c:222
 364msgid ""
 365"\n"
 366"If you are planning on basing your work on an upstream\n"
 367"branch that already exists at the remote, you may need to\n"
 368"run \"git fetch\" to retrieve it.\n"
 369"\n"
 370"If you are planning to push out a new local branch that\n"
 371"will track its remote counterpart, you may want to use\n"
 372"\"git push -u\" to set the upstream config as you push."
 373msgstr ""
 374"\n"
 375"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
 376"您可能需要执行 \"git fetch\" 来获取分支。\n"
 377"\n"
 378"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
 379"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 380
 381#: branch.c:266
 382#, c-format
 383msgid "Not a valid object name: '%s'."
 384msgstr "不是一个有效的对象名:'%s'。"
 385
 386#: branch.c:286
 387#, c-format
 388msgid "Ambiguous object name: '%s'."
 389msgstr "歧义的对象名:'%s'。"
 390
 391#: branch.c:291
 392#, c-format
 393msgid "Not a valid branch point: '%s'."
 394msgstr "无效的分支点:'%s'。"
 395
 396#: branch.c:345
 397#, c-format
 398msgid "'%s' is already checked out at '%s'"
 399msgstr "'%s' 已经检出到 '%s'"
 400
 401#: branch.c:364
 402#, c-format
 403msgid "HEAD of working tree %s is not updated"
 404msgstr "工作区 %s 的 HEAD 指向没有被更新"
 405
 406#: bundle.c:34
 407#, c-format
 408msgid "'%s' does not look like a v2 bundle file"
 409msgstr "'%s' 不像是一个 v2 版本的包文件"
 410
 411#: bundle.c:61
 412#, c-format
 413msgid "unrecognized header: %s%s (%d)"
 414msgstr "未能识别的包头:%s%s (%d)"
 415
 416#: bundle.c:87 builtin/commit.c:777
 417#, c-format
 418msgid "could not open '%s'"
 419msgstr "不能打开 '%s'"
 420
 421#: bundle.c:139
 422msgid "Repository lacks these prerequisite commits:"
 423msgstr "仓库中缺少这些必备的提交:"
 424
 425#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
 426#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
 427#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
 428#: builtin/merge.c:361 builtin/shortlog.c:170
 429msgid "revision walk setup failed"
 430msgstr "版本遍历设置失败"
 431
 432#: bundle.c:185
 433#, c-format
 434msgid "The bundle contains this ref:"
 435msgid_plural "The bundle contains these %d refs:"
 436msgstr[0] "这个包中含有这个引用:"
 437msgstr[1] "这个包中含有 %d 个引用:"
 438
 439#: bundle.c:192
 440msgid "The bundle records a complete history."
 441msgstr "这个包记录一个完整历史。"
 442
 443#: bundle.c:194
 444#, c-format
 445msgid "The bundle requires this ref:"
 446msgid_plural "The bundle requires these %d refs:"
 447msgstr[0] "这个包需要这个引用:"
 448msgstr[1] "这个包需要 %d 个引用:"
 449
 450#: bundle.c:253
 451msgid "Could not spawn pack-objects"
 452msgstr "不能生成 pack-objects 进程"
 453
 454#: bundle.c:264
 455msgid "pack-objects died"
 456msgstr "pack-objects 终止"
 457
 458#: bundle.c:304
 459msgid "rev-list died"
 460msgstr "rev-list 终止"
 461
 462#: bundle.c:353
 463#, c-format
 464msgid "ref '%s' is excluded by the rev-list options"
 465msgstr "引用 '%s' 被 rev-list 选项排除"
 466
 467#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
 468#, c-format
 469msgid "unrecognized argument: %s"
 470msgstr "未能识别的参数:%s"
 471
 472#: bundle.c:451
 473msgid "Refusing to create empty bundle."
 474msgstr "不能创建空包。"
 475
 476#: bundle.c:463
 477#, c-format
 478msgid "cannot create '%s'"
 479msgstr "不能创建 '%s'"
 480
 481#: bundle.c:491
 482msgid "index-pack died"
 483msgstr "index-pack 终止"
 484
 485#: color.c:275
 486#, c-format
 487msgid "invalid color value: %.*s"
 488msgstr "无效的颜色值:%.*s"
 489
 490#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
 491#: builtin/am.c:2134
 492#, c-format
 493msgid "could not parse %s"
 494msgstr "不能解析 %s"
 495
 496#: commit.c:42
 497#, c-format
 498msgid "%s %s is not a commit!"
 499msgstr "%s %s 不是一个提交!"
 500
 501#: compat/obstack.c:406 compat/obstack.c:408
 502msgid "memory exhausted"
 503msgstr "内存耗尽"
 504
 505#: config.c:475 config.c:477
 506#, c-format
 507msgid "bad config line %d in %s %s"
 508msgstr "%2$s %3$s 出错于第 %1$d 行"
 509
 510#: config.c:593
 511#, c-format
 512msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
 513msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s"
 514
 515#: config.c:595
 516#, c-format
 517msgid "bad numeric config value '%s' for '%s': %s"
 518msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
 519
 520#: config.c:680
 521#, c-format
 522msgid "failed to expand user dir in: '%s'"
 523msgstr "无法扩展 '%s' 中的用户目录"
 524
 525#: config.c:761 config.c:772
 526#, c-format
 527msgid "bad zlib compression level %d"
 528msgstr "错误的 zlib 压缩级别 %d"
 529
 530#: config.c:890
 531#, c-format
 532msgid "invalid mode for object creation: %s"
 533msgstr "无效的对象创建模式:%s"
 534
 535#: config.c:1228
 536msgid "unable to parse command-line config"
 537msgstr "无法解析命令行中的配置"
 538
 539#: config.c:1284
 540msgid "unknown error occured while reading the configuration files"
 541msgstr "在读取配置文件时遇到未知错误"
 542
 543#: config.c:1629
 544#, c-format
 545msgid "unable to parse '%s' from command-line config"
 546msgstr "无法解析命令行配置中的 '%s'"
 547
 548#: config.c:1631
 549#, c-format
 550msgid "bad config variable '%s' in file '%s' at line %d"
 551msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 552
 553#: config.c:1690
 554#, c-format
 555msgid "%s has multiple values"
 556msgstr "%s 有多个取值"
 557
 558#: config.c:2224
 559#, c-format
 560msgid "could not set '%s' to '%s'"
 561msgstr "不能设置 '%s' 为 '%s'"
 562
 563#: config.c:2226
 564#, c-format
 565msgid "could not unset '%s'"
 566msgstr "不能取消设置 '%s'"
 567
 568#: connected.c:69
 569msgid "Could not run 'git rev-list'"
 570msgstr "不能执行 'git rev-list'"
 571
 572#: connected.c:89
 573msgid "failed write to rev-list"
 574msgstr "无法写入 rev-list"
 575
 576#: connected.c:96
 577msgid "failed to close rev-list's stdin"
 578msgstr "无法关闭 rev-list 的标准输入"
 579
 580#: date.c:95
 581msgid "in the future"
 582msgstr "在将来"
 583
 584#: date.c:101
 585#, c-format
 586msgid "%lu second ago"
 587msgid_plural "%lu seconds ago"
 588msgstr[0] "%lu 秒钟前"
 589msgstr[1] "%lu 秒钟前"
 590
 591#: date.c:108
 592#, c-format
 593msgid "%lu minute ago"
 594msgid_plural "%lu minutes ago"
 595msgstr[0] "%lu 分钟前"
 596msgstr[1] "%lu 分钟前"
 597
 598#: date.c:115
 599#, c-format
 600msgid "%lu hour ago"
 601msgid_plural "%lu hours ago"
 602msgstr[0] "%lu 小时前"
 603msgstr[1] "%lu 小时前"
 604
 605#: date.c:122
 606#, c-format
 607msgid "%lu day ago"
 608msgid_plural "%lu days ago"
 609msgstr[0] "%lu 天前"
 610msgstr[1] "%lu 天前"
 611
 612#: date.c:128
 613#, c-format
 614msgid "%lu week ago"
 615msgid_plural "%lu weeks ago"
 616msgstr[0] "%lu 周前"
 617msgstr[1] "%lu 周前"
 618
 619#: date.c:135
 620#, c-format
 621msgid "%lu month ago"
 622msgid_plural "%lu months ago"
 623msgstr[0] "%lu 个月前"
 624msgstr[1] "%lu 个月前"
 625
 626#: date.c:146
 627#, c-format
 628msgid "%lu year"
 629msgid_plural "%lu years"
 630msgstr[0] "%lu 年"
 631msgstr[1] "%lu 年"
 632
 633#. TRANSLATORS: "%s" is "<n> years"
 634#: date.c:149
 635#, c-format
 636msgid "%s, %lu month ago"
 637msgid_plural "%s, %lu months ago"
 638msgstr[0] "%s %lu 个月前"
 639msgstr[1] "%s %lu 个月前"
 640
 641#: date.c:154 date.c:159
 642#, c-format
 643msgid "%lu year ago"
 644msgid_plural "%lu years ago"
 645msgstr[0] "%lu 年前"
 646msgstr[1] "%lu 年前"
 647
 648#: diffcore-order.c:24
 649#, c-format
 650msgid "failed to read orderfile '%s'"
 651msgstr "无法读取排序文件 '%s'"
 652
 653#: diffcore-rename.c:538
 654msgid "Performing inexact rename detection"
 655msgstr "正在进行非精确的重命名检测"
 656
 657#  译者:注意保持前导空格
 658#: diff.c:116
 659#, c-format
 660msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 661msgstr "  无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
 662
 663#  译者:注意保持前导空格
 664#: diff.c:121
 665#, c-format
 666msgid "  Unknown dirstat parameter '%s'\n"
 667msgstr "  未知的 dirstat 参数 '%s'\n"
 668
 669#: diff.c:225
 670#, c-format
 671msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 672msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
 673
 674#: diff.c:277
 675#, c-format
 676msgid ""
 677"Found errors in 'diff.dirstat' config variable:\n"
 678"%s"
 679msgstr ""
 680"发现配置变量 'diff.dirstat' 中的错误:\n"
 681"%s"
 682
 683#: diff.c:3007
 684#, c-format
 685msgid "external diff died, stopping at %s"
 686msgstr "外部 diff 退出,停止在 %s"
 687
 688#: diff.c:3405
 689msgid "--follow requires exactly one pathspec"
 690msgstr "--follow 参数后只跟一个 pathspec"
 691
 692#: diff.c:3568
 693#, c-format
 694msgid ""
 695"Failed to parse --dirstat/-X option parameter:\n"
 696"%s"
 697msgstr ""
 698"无法解析 --dirstat/-X 选项的参数:\n"
 699"%s"
 700
 701#: diff.c:3582
 702#, c-format
 703msgid "Failed to parse --submodule option parameter: '%s'"
 704msgstr "无法解析 --submodule 选项的参数:'%s'"
 705
 706#: dir.c:1823
 707msgid "failed to get kernel name and information"
 708msgstr "无法获得内核名称和信息"
 709
 710#: dir.c:1942
 711msgid "Untracked cache is disabled on this system or location."
 712msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
 713
 714#: gpg-interface.c:166 gpg-interface.c:235
 715msgid "could not run gpg."
 716msgstr "不能执行 gpg。"
 717
 718#: gpg-interface.c:178
 719msgid "gpg did not accept the data"
 720msgstr "gpg 没有接受数据"
 721
 722#: gpg-interface.c:189
 723msgid "gpg failed to sign the data"
 724msgstr "gpg 无法为数据签名"
 725
 726#: gpg-interface.c:222
 727#, c-format
 728msgid "could not create temporary file '%s'"
 729msgstr "不能创建临时文件 '%s'"
 730
 731#: gpg-interface.c:224
 732#, c-format
 733msgid "failed writing detached signature to '%s'"
 734msgstr "无法将分离式签名写入 '%s'"
 735
 736#: grep.c:1718
 737#, c-format
 738msgid "'%s': unable to read %s"
 739msgstr "'%s':无法读取 %s"
 740
 741#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
 742#, c-format
 743msgid "failed to stat '%s'"
 744msgstr "无法枚举 '%s' 状态"
 745
 746#: grep.c:1746
 747#, c-format
 748msgid "'%s': short read"
 749msgstr "'%s':读取不完整"
 750
 751#: help.c:205
 752#, c-format
 753msgid "available git commands in '%s'"
 754msgstr "在 '%s' 下可用的 git 命令"
 755
 756#: help.c:212
 757msgid "git commands available from elsewhere on your $PATH"
 758msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 759
 760#: help.c:244
 761msgid "These are common Git commands used in various situations:"
 762msgstr "这些是各种场合常见的 Git 命令:"
 763
 764#: help.c:309
 765#, c-format
 766msgid ""
 767"'%s' appears to be a git command, but we were not\n"
 768"able to execute it. Maybe git-%s is broken?"
 769msgstr ""
 770"'%s' 像是一个 git 命令,但却无法运行。\n"
 771"可能是 git-%s 受损?"
 772
 773#: help.c:366
 774msgid "Uh oh. Your system reports no Git commands at all."
 775msgstr "唉呀,您的系统中未发现 Git 命令。"
 776
 777#: help.c:388
 778#, c-format
 779msgid ""
 780"WARNING: You called a Git command named '%s', which does not exist.\n"
 781"Continuing under the assumption that you meant '%s'"
 782msgstr ""
 783"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 784"是 '%s'"
 785
 786#: help.c:393
 787#, c-format
 788msgid "in %0.1f seconds automatically..."
 789msgstr "在 %0.1f 秒钟后自动运行..."
 790
 791#: help.c:400
 792#, c-format
 793msgid "git: '%s' is not a git command. See 'git --help'."
 794msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
 795
 796#: help.c:404 help.c:464
 797msgid ""
 798"\n"
 799"Did you mean this?"
 800msgid_plural ""
 801"\n"
 802"Did you mean one of these?"
 803msgstr[0] ""
 804"\n"
 805"您指的是这个么?"
 806msgstr[1] ""
 807"\n"
 808"您指的是这其中的某一个么?"
 809
 810#: help.c:460
 811#, c-format
 812msgid "%s: %s - %s"
 813msgstr "%s:%s - %s"
 814
 815#: lockfile.c:152
 816#, c-format
 817msgid ""
 818"Unable to create '%s.lock': %s.\n"
 819"\n"
 820"Another git process seems to be running in this repository, e.g.\n"
 821"an editor opened by 'git commit'. Please make sure all processes\n"
 822"are terminated then try again. If it still fails, a git process\n"
 823"may have crashed in this repository earlier:\n"
 824"remove the file manually to continue."
 825msgstr ""
 826"无法创建 '%s.lock':%s。\n"
 827"\n"
 828"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
 829"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
 830"可能之前有一个 git 进程在这个仓库中异常退出:\n"
 831"手动删除这个文件再继续。"
 832
 833#: lockfile.c:160
 834#, c-format
 835msgid "Unable to create '%s.lock': %s"
 836msgstr "不能创建 '%s.lock':%s"
 837
 838#: merge.c:41
 839msgid "failed to read the cache"
 840msgstr "无法读取缓存"
 841
 842#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
 843#: builtin/checkout.c:586 builtin/clone.c:732
 844msgid "unable to write new index file"
 845msgstr "无法写新的索引文件"
 846
 847#: merge-recursive.c:189
 848#, c-format
 849msgid "(bad commit)\n"
 850msgstr "(坏提交)\n"
 851
 852#: merge-recursive.c:209
 853#, c-format
 854msgid "addinfo_cache failed for path '%s'"
 855msgstr "为路径 '%s' addinfo_cache 失败"
 856
 857#: merge-recursive.c:270
 858msgid "error building trees"
 859msgstr "无法创建树"
 860
 861#: merge-recursive.c:689
 862#, c-format
 863msgid "failed to create path '%s'%s"
 864msgstr "无法创建路径 '%s'%s"
 865
 866#: merge-recursive.c:700
 867#, c-format
 868msgid "Removing %s to make room for subdirectory\n"
 869msgstr "删除 %s 以便为子目录留出空间\n"
 870
 871#: merge-recursive.c:714 merge-recursive.c:735
 872msgid ": perhaps a D/F conflict?"
 873msgstr ":可能是一个目录/文件冲突?"
 874
 875#: merge-recursive.c:725
 876#, c-format
 877msgid "refusing to lose untracked file at '%s'"
 878msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 879
 880#: merge-recursive.c:765
 881#, c-format
 882msgid "cannot read object %s '%s'"
 883msgstr "不能读取对象 %s '%s'"
 884
 885#: merge-recursive.c:767
 886#, c-format
 887msgid "blob expected for %s '%s'"
 888msgstr "%s '%s' 应为数据对象"
 889
 890#: merge-recursive.c:790 builtin/clone.c:376
 891#, c-format
 892msgid "failed to open '%s'"
 893msgstr "无法打开 '%s'"
 894
 895#: merge-recursive.c:798
 896#, c-format
 897msgid "failed to symlink '%s'"
 898msgstr "无法创建符号链接 '%s'"
 899
 900#: merge-recursive.c:801
 901#, c-format
 902msgid "do not know what to do with %06o %s '%s'"
 903msgstr "不知道如何处理 %06o %s '%s'"
 904
 905#: merge-recursive.c:939
 906msgid "Failed to execute internal merge"
 907msgstr "无法执行内部合并"
 908
 909#: merge-recursive.c:943
 910#, c-format
 911msgid "Unable to add %s to database"
 912msgstr "不能添加 %s 至对象库"
 913
 914#: merge-recursive.c:959
 915msgid "unsupported object type in the tree"
 916msgstr "在树中有不支持的对象类型"
 917
 918#: merge-recursive.c:1034 merge-recursive.c:1048
 919#, c-format
 920msgid ""
 921"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 922"in tree."
 923msgstr ""
 924"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 925"的版本被保留。"
 926
 927#: merge-recursive.c:1040 merge-recursive.c:1053
 928#, c-format
 929msgid ""
 930"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 931"in tree at %s."
 932msgstr ""
 933"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 934"的版本保留于 %8$s 中。"
 935
 936#: merge-recursive.c:1094
 937msgid "rename"
 938msgstr "重命名"
 939
 940#: merge-recursive.c:1094
 941msgid "renamed"
 942msgstr "重命名"
 943
 944#: merge-recursive.c:1150
 945#, c-format
 946msgid "%s is a directory in %s adding as %s instead"
 947msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 948
 949#: merge-recursive.c:1172
 950#, c-format
 951msgid ""
 952"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 953"\"->\"%s\" in \"%s\"%s"
 954msgstr ""
 955"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
 956"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 957
 958#: merge-recursive.c:1177
 959msgid " (left unresolved)"
 960msgstr "(留下未解决)"
 961
 962#: merge-recursive.c:1231
 963#, c-format
 964msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 965msgstr ""
 966"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
 967"%5$s"
 968
 969#: merge-recursive.c:1261
 970#, c-format
 971msgid "Renaming %s to %s and %s to %s instead"
 972msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
 973
 974#: merge-recursive.c:1460
 975#, c-format
 976msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 977msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 978
 979#: merge-recursive.c:1470
 980#, c-format
 981msgid "Adding merged %s"
 982msgstr "添加合并后的 %s"
 983
 984#: merge-recursive.c:1475 merge-recursive.c:1677
 985#, c-format
 986msgid "Adding as %s instead"
 987msgstr "而是以 %s 为名添加"
 988
 989#: merge-recursive.c:1526
 990#, c-format
 991msgid "cannot read object %s"
 992msgstr "不能读取对象 %s"
 993
 994#: merge-recursive.c:1529
 995#, c-format
 996msgid "object %s is not a blob"
 997msgstr "对象 %s 不是一个数据对象"
 998
 999#: merge-recursive.c:1581
1000msgid "modify"
1001msgstr "修改"
1002
1003#: merge-recursive.c:1581
1004msgid "modified"
1005msgstr "修改"
1006
1007#: merge-recursive.c:1591
1008msgid "content"
1009msgstr "内容"
1010
1011#: merge-recursive.c:1598
1012msgid "add/add"
1013msgstr "添加/添加"
1014
1015#: merge-recursive.c:1632
1016#, c-format
1017msgid "Skipped %s (merged same as existing)"
1018msgstr "略过 %s(已经做过相同合并)"
1019
1020#: merge-recursive.c:1646
1021#, c-format
1022msgid "Auto-merging %s"
1023msgstr "自动合并 %s"
1024
1025#: merge-recursive.c:1650 git-submodule.sh:941
1026msgid "submodule"
1027msgstr "子模组"
1028
1029#: merge-recursive.c:1651
1030#, c-format
1031msgid "CONFLICT (%s): Merge conflict in %s"
1032msgstr "冲突(%s):合并冲突于 %s"
1033
1034#: merge-recursive.c:1737
1035#, c-format
1036msgid "Removing %s"
1037msgstr "删除 %s"
1038
1039#: merge-recursive.c:1762
1040msgid "file/directory"
1041msgstr "文件/目录"
1042
1043#: merge-recursive.c:1768
1044msgid "directory/file"
1045msgstr "目录/文件"
1046
1047#: merge-recursive.c:1773
1048#, c-format
1049msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1050msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
1051
1052#: merge-recursive.c:1781
1053#, c-format
1054msgid "Adding %s"
1055msgstr "添加 %s"
1056
1057#: merge-recursive.c:1798
1058msgid "Fatal merge failure, shouldn't happen."
1059msgstr "严重的合并错误,不应发生。"
1060
1061#: merge-recursive.c:1817
1062msgid "Already up-to-date!"
1063msgstr "已经是最新的!"
1064
1065#: merge-recursive.c:1826
1066#, c-format
1067msgid "merging of trees %s and %s failed"
1068msgstr "无法合并树 %s 和 %s"
1069
1070#: merge-recursive.c:1856
1071#, c-format
1072msgid "Unprocessed path??? %s"
1073msgstr "未处理的路径??? %s"
1074
1075#: merge-recursive.c:1904
1076msgid "Merging:"
1077msgstr "合并:"
1078
1079#: merge-recursive.c:1917
1080#, c-format
1081msgid "found %u common ancestor:"
1082msgid_plural "found %u common ancestors:"
1083msgstr[0] "发现 %u 个共同祖先:"
1084msgstr[1] "发现 %u 个共同祖先:"
1085
1086#: merge-recursive.c:1954
1087msgid "merge returned no commit"
1088msgstr "合并未返回提交"
1089
1090#: merge-recursive.c:2011
1091#, c-format
1092msgid "Could not parse object '%s'"
1093msgstr "不能解析对象 '%s'"
1094
1095#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
1096msgid "Unable to write index."
1097msgstr "不能写入索引。"
1098
1099#: notes-utils.c:41
1100msgid "Cannot commit uninitialized/unreferenced notes tree"
1101msgstr "不能提交未初始化/未引用的注解树"
1102
1103#: notes-utils.c:100
1104#, c-format
1105msgid "Bad notes.rewriteMode value: '%s'"
1106msgstr "坏的 notes.rewriteMode 值:'%s'"
1107
1108#: notes-utils.c:110
1109#, c-format
1110msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1111msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1112
1113#. TRANSLATORS: The first %s is the name of the
1114#. environment variable, the second %s is its value
1115#: notes-utils.c:137
1116#, c-format
1117msgid "Bad %s value: '%s'"
1118msgstr "坏的 %s 值:'%s'"
1119
1120#: object.c:242
1121#, c-format
1122msgid "unable to parse object: %s"
1123msgstr "不能解析对象:%s"
1124
1125#: parse-options.c:572
1126msgid "..."
1127msgstr "..."
1128
1129#: parse-options.c:590
1130#, c-format
1131msgid "usage: %s"
1132msgstr "用法:%s"
1133
1134#. TRANSLATORS: the colon here should align with the
1135#. one in "usage: %s" translation
1136#: parse-options.c:594
1137#, c-format
1138msgid "   or: %s"
1139msgstr "  或:%s"
1140
1141#  译者:为保证在输出中对齐,注意调整句中空格!
1142#: parse-options.c:597
1143#, c-format
1144msgid "    %s"
1145msgstr "    %s"
1146
1147#: parse-options.c:631
1148msgid "-NUM"
1149msgstr "-数字"
1150
1151#: parse-options-cb.c:108
1152#, c-format
1153msgid "malformed object name '%s'"
1154msgstr "非法的对象名 '%s'"
1155
1156#: path.c:796
1157#, c-format
1158msgid "Could not make %s writable by group"
1159msgstr "不能设置 %s 为组可写"
1160
1161#: pathspec.c:133
1162msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1163msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1164
1165#: pathspec.c:143
1166msgid ""
1167"global 'literal' pathspec setting is incompatible with all other global "
1168"pathspec settings"
1169msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1170
1171#: pathspec.c:177
1172msgid "invalid parameter for pathspec magic 'prefix'"
1173msgstr "路径规格包含无效的神奇前缀"
1174
1175#: pathspec.c:183
1176#, c-format
1177msgid "Invalid pathspec magic '%.*s' in '%s'"
1178msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1179
1180#: pathspec.c:187
1181#, c-format
1182msgid "Missing ')' at the end of pathspec magic in '%s'"
1183msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1184
1185#: pathspec.c:205
1186#, c-format
1187msgid "Unimplemented pathspec magic '%c' in '%s'"
1188msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1189
1190#: pathspec.c:230
1191#, c-format
1192msgid "%s: 'literal' and 'glob' are incompatible"
1193msgstr "%s:'literal' 和 'glob' 不兼容"
1194
1195#: pathspec.c:241
1196#, c-format
1197msgid "%s: '%s' is outside repository"
1198msgstr "%s:'%s' 在仓库之外"
1199
1200#: pathspec.c:291
1201#, c-format
1202msgid "Pathspec '%s' is in submodule '%.*s'"
1203msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1204
1205#: pathspec.c:353
1206#, c-format
1207msgid "%s: pathspec magic not supported by this command: %s"
1208msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1209
1210#: pathspec.c:433
1211#, c-format
1212msgid "pathspec '%s' is beyond a symbolic link"
1213msgstr "路径规格 '%s' 位于符号链接中"
1214
1215#: pathspec.c:442
1216msgid ""
1217"There is nothing to exclude from by :(exclude) patterns.\n"
1218"Perhaps you forgot to add either ':/' or '.' ?"
1219msgstr ""
1220"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1221"添加 ':/' 或 '.' ?"
1222
1223#: pretty.c:971
1224msgid "unable to parse --pretty format"
1225msgstr "不能解析 --pretty 格式"
1226
1227#: progress.c:235
1228msgid "done"
1229msgstr "完成"
1230
1231#: read-cache.c:1281
1232#, c-format
1233msgid ""
1234"index.version set, but the value is invalid.\n"
1235"Using version %i"
1236msgstr ""
1237"设置了 index.version,但是取值无效。\n"
1238"使用版本 %i"
1239
1240#: read-cache.c:1291
1241#, c-format
1242msgid ""
1243"GIT_INDEX_VERSION set, but the value is invalid.\n"
1244"Using version %i"
1245msgstr ""
1246"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1247"使用版本 %i"
1248
1249#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
1250#: builtin/merge.c:995
1251#, c-format
1252msgid "Could not open '%s' for writing"
1253msgstr "无法打开 '%s' 进行写入"
1254
1255#: refs/files-backend.c:2243
1256#, c-format
1257msgid "could not delete reference %s: %s"
1258msgstr "无法删除引用 %s:%s"
1259
1260#: refs/files-backend.c:2246
1261#, c-format
1262msgid "could not delete references: %s"
1263msgstr "无法删除引用:%s"
1264
1265#: refs/files-backend.c:2255
1266#, c-format
1267msgid "could not remove reference %s"
1268msgstr "无法删除引用 %s"
1269
1270#: ref-filter.c:55
1271#, c-format
1272msgid "expected format: %%(color:<color>)"
1273msgstr "期望的格式:%%(color:<color>)"
1274
1275#: ref-filter.c:57
1276#, c-format
1277msgid "unrecognized color: %%(color:%s)"
1278msgstr "未能识别的颜色:%%(color:%s)"
1279
1280#: ref-filter.c:71
1281#, c-format
1282msgid "unrecognized format: %%(%s)"
1283msgstr "未能识别的格式:%%(%s)"
1284
1285#: ref-filter.c:77
1286#, c-format
1287msgid "%%(body) does not take arguments"
1288msgstr "%%(body) 不带参数"
1289
1290#: ref-filter.c:84
1291#, c-format
1292msgid "%%(subject) does not take arguments"
1293msgstr "%%(subject) 不带参数"
1294
1295#: ref-filter.c:101
1296#, c-format
1297msgid "positive value expected contents:lines=%s"
1298msgstr "要为 contents:lines=%s 提供一个正数"
1299
1300#: ref-filter.c:103
1301#, c-format
1302msgid "unrecognized %%(contents) argument: %s"
1303msgstr "未能识别的 %%(contents) 参数:%s"
1304
1305#: ref-filter.c:113
1306#, c-format
1307msgid "unrecognized %%(objectname) argument: %s"
1308msgstr "未能识别的 %%(objectname) 参数:%s"
1309
1310#: ref-filter.c:135
1311#, c-format
1312msgid "expected format: %%(align:<width>,<position>)"
1313msgstr "期望的格式:%%(align:<width>,<position>)"
1314
1315#: ref-filter.c:147
1316#, c-format
1317msgid "unrecognized position:%s"
1318msgstr "未能识别的位置:%s"
1319
1320#: ref-filter.c:151
1321#, c-format
1322msgid "unrecognized width:%s"
1323msgstr "未能识别的宽度:%s"
1324
1325#: ref-filter.c:157
1326#, c-format
1327msgid "unrecognized %%(align) argument: %s"
1328msgstr "未能识别的 %%(align) 参数:%s"
1329
1330#: ref-filter.c:161
1331#, c-format
1332msgid "positive width expected with the %%(align) atom"
1333msgstr "元素 %%(align) 需要一个正数的宽度"
1334
1335#: ref-filter.c:244
1336#, c-format
1337msgid "malformed field name: %.*s"
1338msgstr "非法的字段名:%.*s"
1339
1340#: ref-filter.c:270
1341#, c-format
1342msgid "unknown field name: %.*s"
1343msgstr "未知的字段名:%.*s"
1344
1345#: ref-filter.c:372
1346#, c-format
1347msgid "format: %%(end) atom used without corresponding atom"
1348msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1349
1350#: ref-filter.c:424
1351#, c-format
1352msgid "malformed format string %s"
1353msgstr "非法的格式化字符串 %s"
1354
1355#: ref-filter.c:878
1356msgid ":strip= requires a positive integer argument"
1357msgstr ":strip= 需要一个正整型参数"
1358
1359#: ref-filter.c:883
1360#, c-format
1361msgid "ref '%s' does not have %ld components to :strip"
1362msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
1363
1364#: ref-filter.c:1046
1365#, c-format
1366msgid "unknown %.*s format %s"
1367msgstr "未知的 %.*s 格式 %s"
1368
1369#: ref-filter.c:1066 ref-filter.c:1097
1370#, c-format
1371msgid "missing object %s for %s"
1372msgstr "缺失 %2$s 的对象 %1$s"
1373
1374#: ref-filter.c:1069 ref-filter.c:1100
1375#, c-format
1376msgid "parse_object_buffer failed on %s for %s"
1377msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
1378
1379#: ref-filter.c:1311
1380#, c-format
1381msgid "malformed object at '%s'"
1382msgstr "非法的对象于 '%s'"
1383
1384#: ref-filter.c:1373
1385#, c-format
1386msgid "ignoring ref with broken name %s"
1387msgstr "忽略带有错误名称 %s 的引用"
1388
1389#: ref-filter.c:1378
1390#, c-format
1391msgid "ignoring broken ref %s"
1392msgstr "忽略损坏的引用 %s"
1393
1394#: ref-filter.c:1651
1395#, c-format
1396msgid "format: %%(end) atom missing"
1397msgstr "格式:缺少 %%(end) 元素"
1398
1399#: ref-filter.c:1705
1400#, c-format
1401msgid "malformed object name %s"
1402msgstr "非法的对象名 %s"
1403
1404#: remote.c:746
1405#, c-format
1406msgid "Cannot fetch both %s and %s to %s"
1407msgstr "不能同时获取 %s 和 %s 至 %s"
1408
1409#: remote.c:750
1410#, c-format
1411msgid "%s usually tracks %s, not %s"
1412msgstr "%s 通常跟踪 %s,而非 %s"
1413
1414#: remote.c:754
1415#, c-format
1416msgid "%s tracks both %s and %s"
1417msgstr "%s 同时跟踪 %s 和 %s"
1418
1419#: remote.c:762
1420msgid "Internal error"
1421msgstr "内部错误"
1422
1423#: remote.c:1678 remote.c:1721
1424msgid "HEAD does not point to a branch"
1425msgstr "HEAD 没有指向一个分支"
1426
1427#: remote.c:1687
1428#, c-format
1429msgid "no such branch: '%s'"
1430msgstr "没有此分支:'%s'"
1431
1432#: remote.c:1690
1433#, c-format
1434msgid "no upstream configured for branch '%s'"
1435msgstr "尚未给分支 '%s' 设置上游"
1436
1437#: remote.c:1696
1438#, c-format
1439msgid "upstream branch '%s' not stored as a remote-tracking branch"
1440msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1441
1442#: remote.c:1711
1443#, c-format
1444msgid "push destination '%s' on remote '%s' has no local tracking branch"
1445msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1446
1447#: remote.c:1726
1448#, c-format
1449msgid "branch '%s' has no remote for pushing"
1450msgstr "分支 '%s' 没有设置要推送的远程服务器"
1451
1452#: remote.c:1737
1453#, c-format
1454msgid "push refspecs for '%s' do not include '%s'"
1455msgstr "向 '%s' 推送引用规格未包含 '%s'"
1456
1457#: remote.c:1750
1458msgid "push has no destination (push.default is 'nothing')"
1459msgstr "推送无目标(push.default 是 'nothing')"
1460
1461#: remote.c:1772
1462msgid "cannot resolve 'simple' push to a single destination"
1463msgstr "无法解析 'simple' 推送至一个单独的目标"
1464
1465#: remote.c:2074
1466#, c-format
1467msgid "Your branch is based on '%s', but the upstream is gone.\n"
1468msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1469
1470#: remote.c:2078
1471msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1472msgstr "  (使用 \"git branch --unset-upstream\" 来修复)\n"
1473
1474#: remote.c:2081
1475#, c-format
1476msgid "Your branch is up-to-date with '%s'.\n"
1477msgstr "您的分支与上游分支 '%s' 一致。\n"
1478
1479#: remote.c:2085
1480#, c-format
1481msgid "Your branch is ahead of '%s' by %d commit.\n"
1482msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1483msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1484msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1485
1486#: remote.c:2091
1487msgid "  (use \"git push\" to publish your local commits)\n"
1488msgstr "  (使用 \"git push\" 来发布您的本地提交)\n"
1489
1490#: remote.c:2094
1491#, c-format
1492msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1493msgid_plural ""
1494"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1495msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1496msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1497
1498#  译者:注意保持前导空格
1499#: remote.c:2102
1500msgid "  (use \"git pull\" to update your local branch)\n"
1501msgstr "  (使用 \"git pull\" 来更新您的本地分支)\n"
1502
1503#: remote.c:2105
1504#, c-format
1505msgid ""
1506"Your branch and '%s' have diverged,\n"
1507"and have %d and %d different commit each, respectively.\n"
1508msgid_plural ""
1509"Your branch and '%s' have diverged,\n"
1510"and have %d and %d different commits each, respectively.\n"
1511msgstr[0] ""
1512"您的分支和 '%s' 出现了偏离,\n"
1513"并且分别有 %d 和 %d 处不同的提交。\n"
1514msgstr[1] ""
1515"您的分支和 '%s' 出现了偏离,\n"
1516"并且分别有 %d 和 %d 处不同的提交。\n"
1517
1518#  译者:注意保持前导空格
1519#: remote.c:2115
1520msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1521msgstr "  (使用 \"git pull\" 来合并远程分支)\n"
1522
1523#: revision.c:2142
1524msgid "your current branch appears to be broken"
1525msgstr "您的当前分支好像被损坏"
1526
1527#: revision.c:2145
1528#, c-format
1529msgid "your current branch '%s' does not have any commits yet"
1530msgstr "您的当前分支 '%s' 尚无任何提交"
1531
1532#: revision.c:2339
1533msgid "--first-parent is incompatible with --bisect"
1534msgstr "--first-parent 与 --bisect 不兼容"
1535
1536#: run-command.c:92
1537msgid "open /dev/null failed"
1538msgstr "不能打开 /dev/null"
1539
1540#: run-command.c:94
1541#, c-format
1542msgid "dup2(%d,%d) failed"
1543msgstr "不能调用 dup2(%d,%d)"
1544
1545#: send-pack.c:295
1546msgid "failed to sign the push certificate"
1547msgstr "无法为推送证书签名"
1548
1549#: send-pack.c:404
1550msgid "the receiving end does not support --signed push"
1551msgstr "接收端不支持签名推送"
1552
1553#: send-pack.c:406
1554msgid ""
1555"not sending a push certificate since the receiving end does not support --"
1556"signed push"
1557msgstr "未发送推送证书,因为接收端不支持签名推送"
1558
1559#: send-pack.c:418
1560msgid "the receiving end does not support --atomic push"
1561msgstr "接收端不支持原子推送"
1562
1563#: sequencer.c:174
1564msgid ""
1565"after resolving the conflicts, mark the corrected paths\n"
1566"with 'git add <paths>' or 'git rm <paths>'"
1567msgstr ""
1568"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1569"命令标记修正后的文件"
1570
1571#: sequencer.c:177
1572msgid ""
1573"after resolving the conflicts, mark the corrected paths\n"
1574"with 'git add <paths>' or 'git rm <paths>'\n"
1575"and commit the result with 'git commit'"
1576msgstr ""
1577"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1578"对修正后的文件做标记,然后用 'git commit' 提交"
1579
1580#: sequencer.c:190 sequencer.c:833 sequencer.c:912
1581#, c-format
1582msgid "Could not write to %s"
1583msgstr "不能写入 %s"
1584
1585#: sequencer.c:193
1586#, c-format
1587msgid "Error wrapping up %s"
1588msgstr "错误收尾 %s"
1589
1590#: sequencer.c:208
1591msgid "Your local changes would be overwritten by cherry-pick."
1592msgstr "您的本地修改将被拣选操作覆盖。"
1593
1594#: sequencer.c:210
1595msgid "Your local changes would be overwritten by revert."
1596msgstr "您的本地修改将被还原操作覆盖。"
1597
1598#: sequencer.c:213
1599msgid "Commit your changes or stash them to proceed."
1600msgstr "提交您的修改或保存进度后再继续。"
1601
1602#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1603#: sequencer.c:300
1604#, c-format
1605msgid "%s: Unable to write new index file"
1606msgstr "%s:无法写入新索引文件"
1607
1608#: sequencer.c:318
1609msgid "Could not resolve HEAD commit\n"
1610msgstr "不能解析 HEAD 提交\n"
1611
1612#: sequencer.c:338
1613msgid "Unable to update cache tree\n"
1614msgstr "不能更新缓存\n"
1615
1616#: sequencer.c:390
1617#, c-format
1618msgid "Could not parse commit %s\n"
1619msgstr "不能解析提交 %s\n"
1620
1621#: sequencer.c:395
1622#, c-format
1623msgid "Could not parse parent commit %s\n"
1624msgstr "不能解析父提交 %s\n"
1625
1626#: sequencer.c:460
1627msgid "Your index file is unmerged."
1628msgstr "您的索引文件未完成合并。"
1629
1630#: sequencer.c:479
1631#, c-format
1632msgid "Commit %s is a merge but no -m option was given."
1633msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1634
1635#: sequencer.c:487
1636#, c-format
1637msgid "Commit %s does not have parent %d"
1638msgstr "提交 %s 没有父提交 %d"
1639
1640#: sequencer.c:491
1641#, c-format
1642msgid "Mainline was specified but commit %s is not a merge."
1643msgstr "指定了主线但提交 %s 不是一个合并。"
1644
1645#. TRANSLATORS: The first %s will be "revert" or
1646#. "cherry-pick", the second %s a SHA1
1647#: sequencer.c:504
1648#, c-format
1649msgid "%s: cannot parse parent commit %s"
1650msgstr "%s:不能解析父提交 %s"
1651
1652#: sequencer.c:508
1653#, c-format
1654msgid "Cannot get commit message for %s"
1655msgstr "不能得到 %s 的提交说明"
1656
1657#: sequencer.c:594
1658#, c-format
1659msgid "could not revert %s... %s"
1660msgstr "不能还原 %s... %s"
1661
1662#: sequencer.c:595
1663#, c-format
1664msgid "could not apply %s... %s"
1665msgstr "不能应用 %s... %s"
1666
1667#: sequencer.c:630
1668msgid "empty commit set passed"
1669msgstr "提供了空的提交集"
1670
1671#: sequencer.c:638
1672#, c-format
1673msgid "git %s: failed to read the index"
1674msgstr "git %s:无法读取索引"
1675
1676#: sequencer.c:642
1677#, c-format
1678msgid "git %s: failed to refresh the index"
1679msgstr "git %s:无法刷新索引"
1680
1681#: sequencer.c:702
1682#, c-format
1683msgid "Cannot %s during a %s"
1684msgstr "无法 %s 在一个 %s 过程中"
1685
1686#: sequencer.c:724
1687#, c-format
1688msgid "Could not parse line %d."
1689msgstr "不能解析第 %d 行。"
1690
1691#: sequencer.c:729
1692msgid "No commits parsed."
1693msgstr "没有提交被解析。"
1694
1695#: sequencer.c:741
1696#, c-format
1697msgid "Could not open %s"
1698msgstr "不能打开 %s"
1699
1700#: sequencer.c:745
1701#, c-format
1702msgid "Could not read %s."
1703msgstr "不能读取 %s。"
1704
1705#: sequencer.c:752
1706#, c-format
1707msgid "Unusable instruction sheet: %s"
1708msgstr "无用的指令表单:%s"
1709
1710#: sequencer.c:782
1711#, c-format
1712msgid "Invalid key: %s"
1713msgstr "无效键名:%s"
1714
1715#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
1716#, c-format
1717msgid "Invalid value for %s: %s"
1718msgstr "%s 的值无效:%s"
1719
1720#: sequencer.c:795
1721#, c-format
1722msgid "Malformed options sheet: %s"
1723msgstr "非法的选项表单:%s"
1724
1725#: sequencer.c:814
1726msgid "a cherry-pick or revert is already in progress"
1727msgstr "一个拣选或还原操作已在进行"
1728
1729#: sequencer.c:815
1730msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1731msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1732
1733#: sequencer.c:819
1734#, c-format
1735msgid "Could not create sequencer directory %s"
1736msgstr "不能创建序列目录 %s"
1737
1738#: sequencer.c:835 sequencer.c:916
1739#, c-format
1740msgid "Error wrapping up %s."
1741msgstr "错误收尾 %s。"
1742
1743#: sequencer.c:854 sequencer.c:986
1744msgid "no cherry-pick or revert in progress"
1745msgstr "拣选或还原操作并未进行"
1746
1747#: sequencer.c:856
1748msgid "cannot resolve HEAD"
1749msgstr "不能解析 HEAD"
1750
1751#: sequencer.c:858
1752msgid "cannot abort from a branch yet to be born"
1753msgstr "不能从尚未建立的分支终止"
1754
1755#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
1756#, c-format
1757msgid "cannot open %s"
1758msgstr "不能打开 %s"
1759
1760#: sequencer.c:880
1761#, c-format
1762msgid "cannot read %s: %s"
1763msgstr "不能读取 %s:%s"
1764
1765#: sequencer.c:881
1766msgid "unexpected end of file"
1767msgstr "意外的文件结束"
1768
1769#: sequencer.c:887
1770#, c-format
1771msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1772msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1773
1774#: sequencer.c:909
1775#, c-format
1776msgid "Could not format %s."
1777msgstr "不能格式化 %s。"
1778
1779#: sequencer.c:1054
1780#, c-format
1781msgid "%s: can't cherry-pick a %s"
1782msgstr "%s:不能拣选一个%s"
1783
1784#: sequencer.c:1057
1785#, c-format
1786msgid "%s: bad revision"
1787msgstr "%s:错误的版本"
1788
1789#: sequencer.c:1091
1790msgid "Can't revert as initial commit"
1791msgstr "不能作为初始提交还原"
1792
1793#: sequencer.c:1092
1794msgid "Can't cherry-pick into empty head"
1795msgstr "不能拣选到空分支"
1796
1797#: setup.c:248
1798#, c-format
1799msgid "failed to read %s"
1800msgstr "无法读取 %s"
1801
1802#: setup.c:468
1803#, c-format
1804msgid "Expected git repo version <= %d, found %d"
1805msgstr "期望 git 仓库版本 <= %d,却得到 %d"
1806
1807#: setup.c:476
1808msgid "unknown repository extensions found:"
1809msgstr "发现未知的仓库扩展:"
1810
1811#: sha1_file.c:1080
1812msgid "offset before end of packfile (broken .idx?)"
1813msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
1814
1815#: sha1_file.c:2458
1816#, c-format
1817msgid "offset before start of pack index for %s (corrupt index?)"
1818msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
1819
1820#: sha1_file.c:2462
1821#, c-format
1822msgid "offset beyond end of pack index for %s (truncated index?)"
1823msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
1824
1825#: sha1_name.c:462
1826msgid ""
1827"Git normally never creates a ref that ends with 40 hex characters\n"
1828"because it will be ignored when you just specify 40-hex. These refs\n"
1829"may be created by mistake. For example,\n"
1830"\n"
1831"  git checkout -b $br $(git rev-parse ...)\n"
1832"\n"
1833"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1834"examine these refs and maybe delete them. Turn this message off by\n"
1835"running \"git config advice.objectNameWarning false\""
1836msgstr ""
1837"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1838"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1839"\n"
1840"  git checkout -b $br $(git rev-parse ...)\n"
1841"\n"
1842"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1843"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1844"命令关闭本消息通知。"
1845
1846#: submodule.c:64 submodule.c:98
1847msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1848msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1849
1850#: submodule.c:68 submodule.c:102
1851#, c-format
1852msgid "Could not find section in .gitmodules where path=%s"
1853msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1854
1855#: submodule.c:76
1856#, c-format
1857msgid "Could not update .gitmodules entry %s"
1858msgstr "不能更新 .gitmodules 条目 %s"
1859
1860#: submodule.c:109
1861#, c-format
1862msgid "Could not remove .gitmodules entry for %s"
1863msgstr "无法移除 %s 的 .gitmodules 条目"
1864
1865#: submodule.c:120
1866msgid "staging updated .gitmodules failed"
1867msgstr "将更新后 .gitmodules 添加暂存区失败"
1868
1869#: submodule.c:177
1870msgid "negative values not allowed for submodule.fetchJobs"
1871msgstr "submodule.fetchJobs 不允许为负值"
1872
1873#: submodule-config.c:355
1874#, c-format
1875msgid "invalid value for %s"
1876msgstr "%s 的值无效"
1877
1878#: trailer.c:237
1879#, c-format
1880msgid "running trailer command '%s' failed"
1881msgstr "执行 trailer 命令 '%s' 失败"
1882
1883#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
1884#: trailer.c:562
1885#, c-format
1886msgid "unknown value '%s' for key '%s'"
1887msgstr "键 '%2$s' 的未知取值 '%1$s'"
1888
1889#: trailer.c:544 trailer.c:549 builtin/remote.c:289
1890#, c-format
1891msgid "more than one %s"
1892msgstr "多于一个 %s"
1893
1894#: trailer.c:582
1895#, c-format
1896msgid "empty trailer token in trailer '%.*s'"
1897msgstr "签名 '%.*s' 的键为空"
1898
1899#: trailer.c:702
1900#, c-format
1901msgid "could not read input file '%s'"
1902msgstr "不能读取输入文件 '%s'"
1903
1904#: trailer.c:705
1905msgid "could not read from stdin"
1906msgstr "不能自标准输入读取"
1907
1908#: trailer.c:857 builtin/am.c:42
1909#, c-format
1910msgid "could not stat %s"
1911msgstr "不能获取 %s 的文件状态"
1912
1913#: trailer.c:859
1914#, c-format
1915msgid "file %s is not a regular file"
1916msgstr "文件 %s 不是一个正规文件"
1917
1918#: trailer.c:861
1919#, c-format
1920msgid "file %s is not writable by user"
1921msgstr "文件 %s 用户不可写"
1922
1923#: trailer.c:873
1924msgid "could not open temporary file"
1925msgstr "不能打开临时文件"
1926
1927#: trailer.c:912
1928#, c-format
1929msgid "could not rename temporary file to %s"
1930msgstr "不能重命名临时文件为 %s"
1931
1932#: transport-helper.c:1041
1933#, c-format
1934msgid "Could not read ref %s"
1935msgstr "不能读取引用 %s"
1936
1937#: unpack-trees.c:64
1938#, c-format
1939msgid ""
1940"Your local changes to the following files would be overwritten by checkout:\n"
1941"%%sPlease commit your changes or stash them before you can switch branches."
1942msgstr ""
1943"您对下列文件的本地修改将被检出操作覆盖:\n"
1944"%%s请在切换分支前提交您的修改或者保存进度。"
1945
1946#: unpack-trees.c:66
1947#, c-format
1948msgid ""
1949"Your local changes to the following files would be overwritten by checkout:\n"
1950"%%s"
1951msgstr ""
1952"您对下列文件的本地修改将被检出操作覆盖:\n"
1953"%%s"
1954
1955#: unpack-trees.c:69
1956#, c-format
1957msgid ""
1958"Your local changes to the following files would be overwritten by merge:\n"
1959"%%sPlease commit your changes or stash them before you can merge."
1960msgstr ""
1961"您对下列文件的本地修改将被合并操作覆盖:\n"
1962"%%s请在合并前提交您的修改或者保存进度。"
1963
1964#: unpack-trees.c:71
1965#, c-format
1966msgid ""
1967"Your local changes to the following files would be overwritten by merge:\n"
1968"%%s"
1969msgstr ""
1970"您对下列文件的本地修改将被合并操作覆盖:\n"
1971"%%s"
1972
1973#: unpack-trees.c:74
1974#, c-format
1975msgid ""
1976"Your local changes to the following files would be overwritten by %s:\n"
1977"%%sPlease commit your changes or stash them before you can %s."
1978msgstr ""
1979"您对下列文件的本地修改将被 %s 覆盖:\n"
1980"%%s请在 %s 之前提交您的修改或者保存进度。"
1981
1982#: unpack-trees.c:76
1983#, c-format
1984msgid ""
1985"Your local changes to the following files would be overwritten by %s:\n"
1986"%%s"
1987msgstr ""
1988"您对下列文件的本地修改将被 %s 覆盖:\n"
1989"%%s"
1990
1991#: unpack-trees.c:81
1992#, c-format
1993msgid ""
1994"Updating the following directories would lose untracked files in it:\n"
1995"%s"
1996msgstr ""
1997"更新如下目录将会丢失其中未跟踪的文件:\n"
1998"%s"
1999
2000#: unpack-trees.c:85
2001#, c-format
2002msgid ""
2003"The following untracked working tree files would be removed by checkout:\n"
2004"%%sPlease move or remove them before you can switch branches."
2005msgstr ""
2006"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2007"%%s请在切换分支之前移动或删除。"
2008
2009#: unpack-trees.c:87
2010#, c-format
2011msgid ""
2012"The following untracked working tree files would be removed by checkout:\n"
2013"%%s"
2014msgstr ""
2015"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2016"%%s"
2017
2018#: unpack-trees.c:90
2019#, c-format
2020msgid ""
2021"The following untracked working tree files would be removed by merge:\n"
2022"%%sPlease move or remove them before you can merge."
2023msgstr ""
2024"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2025"%%s请在合并前移动或删除。"
2026
2027#: unpack-trees.c:92
2028#, c-format
2029msgid ""
2030"The following untracked working tree files would be removed by merge:\n"
2031"%%s"
2032msgstr ""
2033"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2034"%%s"
2035
2036#: unpack-trees.c:95
2037#, c-format
2038msgid ""
2039"The following untracked working tree files would be removed by %s:\n"
2040"%%sPlease move or remove them before you can %s."
2041msgstr ""
2042"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2043"%%s请在 %s 前移动或删除。"
2044
2045#: unpack-trees.c:97
2046#, c-format
2047msgid ""
2048"The following untracked working tree files would be removed by %s:\n"
2049"%%s"
2050msgstr ""
2051"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2052"%%s"
2053
2054#: unpack-trees.c:102
2055#, c-format
2056msgid ""
2057"The following untracked working tree files would be overwritten by "
2058"checkout:\n"
2059"%%sPlease move or remove them before you can switch branches."
2060msgstr ""
2061"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2062"%%s请在切换分支前移动或删除。"
2063
2064#: unpack-trees.c:104
2065#, c-format
2066msgid ""
2067"The following untracked working tree files would be overwritten by "
2068"checkout:\n"
2069"%%s"
2070msgstr ""
2071"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2072"%%s"
2073
2074#: unpack-trees.c:107
2075#, c-format
2076msgid ""
2077"The following untracked working tree files would be overwritten by merge:\n"
2078"%%sPlease move or remove them before you can merge."
2079msgstr ""
2080"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2081"%%s请在合并前移动或删除。"
2082
2083#: unpack-trees.c:109
2084#, c-format
2085msgid ""
2086"The following untracked working tree files would be overwritten by merge:\n"
2087"%%s"
2088msgstr ""
2089"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2090"%%s"
2091
2092#: unpack-trees.c:112
2093#, c-format
2094msgid ""
2095"The following untracked working tree files would be overwritten by %s:\n"
2096"%%sPlease move or remove them before you can %s."
2097msgstr ""
2098"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2099"%%s请在 %s 前移动或删除。"
2100
2101#: unpack-trees.c:114
2102#, c-format
2103msgid ""
2104"The following untracked working tree files would be overwritten by %s:\n"
2105"%%s"
2106msgstr ""
2107"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2108"%%s"
2109
2110#: unpack-trees.c:121
2111#, c-format
2112msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
2113msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
2114
2115#: unpack-trees.c:124
2116#, c-format
2117msgid ""
2118"Cannot update sparse checkout: the following entries are not up-to-date:\n"
2119"%s"
2120msgstr ""
2121"无法更新稀疏检出:如下条目不是最新:\n"
2122"%s"
2123
2124#: unpack-trees.c:126
2125#, c-format
2126msgid ""
2127"The following Working tree files would be overwritten by sparse checkout "
2128"update:\n"
2129"%s"
2130msgstr ""
2131"工作区中下列文件将会因为稀疏检出而被覆盖:\n"
2132"%s"
2133
2134#: unpack-trees.c:128
2135#, c-format
2136msgid ""
2137"The following Working tree files would be removed by sparse checkout "
2138"update:\n"
2139"%s"
2140msgstr ""
2141"工作区中下列文件将会因为稀疏检出而被删除:\n"
2142"%s"
2143
2144#: unpack-trees.c:205
2145#, c-format
2146msgid "Aborting\n"
2147msgstr "终止中\n"
2148
2149#: unpack-trees.c:237
2150msgid "Checking out files"
2151msgstr "正在检出文件"
2152
2153#: urlmatch.c:120
2154msgid "invalid URL scheme name or missing '://' suffix"
2155msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
2156
2157#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
2158#, c-format
2159msgid "invalid %XX escape sequence"
2160msgstr "无效的 %XX 转义序列"
2161
2162#: urlmatch.c:172
2163msgid "missing host and scheme is not 'file:'"
2164msgstr "缺失主机名且 URL 方案不是 'file:'"
2165
2166#: urlmatch.c:189
2167msgid "a 'file:' URL may not have a port number"
2168msgstr "一个 'file:' URL 不应该包含端口号"
2169
2170#: urlmatch.c:199
2171msgid "invalid characters in host name"
2172msgstr "主机名中包含无效的字符"
2173
2174#: urlmatch.c:244 urlmatch.c:255
2175msgid "invalid port number"
2176msgstr "无效的端口号"
2177
2178#: urlmatch.c:322
2179msgid "invalid '..' path segment"
2180msgstr "无效的 '..' 路径片段"
2181
2182#: wrapper.c:222 wrapper.c:381
2183#, c-format
2184msgid "could not open '%s' for reading and writing"
2185msgstr "无法打开 '%s' 进行读写"
2186
2187#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
2188#, c-format
2189msgid "could not open '%s' for writing"
2190msgstr "无法打开 '%s' 进行写入"
2191
2192#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
2193#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
2194#: builtin/pull.c:407
2195#, c-format
2196msgid "could not open '%s' for reading"
2197msgstr "无法打开 '%s' 进行读取"
2198
2199#: wrapper.c:594 wrapper.c:615
2200#, c-format
2201msgid "unable to access '%s'"
2202msgstr "不能访问 '%s'"
2203
2204#: wrapper.c:623
2205msgid "unable to get current working directory"
2206msgstr "不能获取当前工作目录"
2207
2208#: wrapper.c:650
2209#, c-format
2210msgid "could not open %s for writing"
2211msgstr "不能写入 %s"
2212
2213#: wrapper.c:661 builtin/am.c:410
2214#, c-format
2215msgid "could not write to %s"
2216msgstr "不能写入 %s"
2217
2218#: wrapper.c:667
2219#, c-format
2220msgid "could not close %s"
2221msgstr "不能关闭 %s"
2222
2223#: wt-status.c:150
2224msgid "Unmerged paths:"
2225msgstr "未合并的路径:"
2226
2227#  译者:注意保持前导空格
2228#: wt-status.c:177 wt-status.c:204
2229#, c-format
2230msgid "  (use \"git reset %s <file>...\" to unstage)"
2231msgstr "  (使用 \"git reset %s <文件>...\" 以取消暂存)"
2232
2233#  译者:注意保持前导空格
2234#: wt-status.c:179 wt-status.c:206
2235msgid "  (use \"git rm --cached <file>...\" to unstage)"
2236msgstr "  (使用 \"git rm --cached <文件>...\" 以取消暂存)"
2237
2238#  译者:注意保持前导空格
2239#: wt-status.c:183
2240msgid "  (use \"git add <file>...\" to mark resolution)"
2241msgstr "  (使用 \"git add <文件>...\" 标记解决方案)"
2242
2243#  译者:注意保持前导空格
2244#: wt-status.c:185 wt-status.c:189
2245msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
2246msgstr "  (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
2247
2248#  译者:注意保持前导空格
2249#: wt-status.c:187
2250msgid "  (use \"git rm <file>...\" to mark resolution)"
2251msgstr "  (使用 \"git rm <文件>...\" 标记解决方案)"
2252
2253#: wt-status.c:198 wt-status.c:881
2254msgid "Changes to be committed:"
2255msgstr "要提交的变更:"
2256
2257#: wt-status.c:216 wt-status.c:890
2258msgid "Changes not staged for commit:"
2259msgstr "尚未暂存以备提交的变更:"
2260
2261#  译者:注意保持前导空格
2262#: wt-status.c:220
2263msgid "  (use \"git add <file>...\" to update what will be committed)"
2264msgstr "  (使用 \"git add <文件>...\" 更新要提交的内容)"
2265
2266#  译者:注意保持前导空格
2267#: wt-status.c:222
2268msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
2269msgstr "  (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
2270
2271#  译者:注意保持前导空格
2272#: wt-status.c:223
2273msgid ""
2274"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
2275msgstr "  (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
2276
2277#  译者:注意保持前导空格
2278#: wt-status.c:225
2279msgid "  (commit or discard the untracked or modified content in submodules)"
2280msgstr "  (提交或丢弃子模组中未跟踪或修改的内容)"
2281
2282#  译者:注意保持前导空格
2283#: wt-status.c:237
2284#, c-format
2285msgid "  (use \"git %s <file>...\" to include in what will be committed)"
2286msgstr "  (使用 \"git %s <文件>...\" 以包含要提交的内容)"
2287
2288#: wt-status.c:252
2289msgid "both deleted:"
2290msgstr "双方删除:"
2291
2292#: wt-status.c:254
2293msgid "added by us:"
2294msgstr "由我们添加:"
2295
2296#: wt-status.c:256
2297msgid "deleted by them:"
2298msgstr "由他们删除:"
2299
2300#: wt-status.c:258
2301msgid "added by them:"
2302msgstr "由他们添加:"
2303
2304#: wt-status.c:260
2305msgid "deleted by us:"
2306msgstr "由我们删除:"
2307
2308#: wt-status.c:262
2309msgid "both added:"
2310msgstr "双方添加:"
2311
2312#: wt-status.c:264
2313msgid "both modified:"
2314msgstr "双方修改:"
2315
2316#: wt-status.c:266
2317#, c-format
2318msgid "bug: unhandled unmerged status %x"
2319msgstr "bug:无法处理的未合并状态 %x"
2320
2321#: wt-status.c:274
2322msgid "new file:"
2323msgstr "新文件:"
2324
2325#: wt-status.c:276
2326msgid "copied:"
2327msgstr "拷贝:"
2328
2329#: wt-status.c:278
2330msgid "deleted:"
2331msgstr "删除:"
2332
2333#: wt-status.c:280
2334msgid "modified:"
2335msgstr "修改:"
2336
2337#: wt-status.c:282
2338msgid "renamed:"
2339msgstr "重命名:"
2340
2341#: wt-status.c:284
2342msgid "typechange:"
2343msgstr "类型变更:"
2344
2345#: wt-status.c:286
2346msgid "unknown:"
2347msgstr "未知:"
2348
2349#: wt-status.c:288
2350msgid "unmerged:"
2351msgstr "未合并:"
2352
2353#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2354#: wt-status.c:370
2355msgid "new commits, "
2356msgstr "新提交, "
2357
2358#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2359#: wt-status.c:372
2360msgid "modified content, "
2361msgstr "修改的内容, "
2362
2363#  译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2364#: wt-status.c:374
2365msgid "untracked content, "
2366msgstr "未跟踪的内容, "
2367
2368#: wt-status.c:391
2369#, c-format
2370msgid "bug: unhandled diff status %c"
2371msgstr "bug:无法处理的差异状态 %c"
2372
2373#: wt-status.c:755
2374msgid "Submodules changed but not updated:"
2375msgstr "子模组已修改但尚未更新:"
2376
2377#: wt-status.c:757
2378msgid "Submodule changes to be committed:"
2379msgstr "要提交的子模组变更:"
2380
2381#: wt-status.c:838
2382msgid ""
2383"Do not touch the line above.\n"
2384"Everything below will be removed."
2385msgstr ""
2386"不要改动上面的一行。\n"
2387"下面的所有内容均将被删除。"
2388
2389#: wt-status.c:949
2390msgid "You have unmerged paths."
2391msgstr "您有尚未合并的路径。"
2392
2393#  译者:注意保持前导空格
2394#: wt-status.c:952
2395msgid "  (fix conflicts and run \"git commit\")"
2396msgstr "  (解决冲突并运行 \"git commit\")"
2397
2398#: wt-status.c:956
2399msgid "All conflicts fixed but you are still merging."
2400msgstr "所有冲突已解决但您仍处于合并中。"
2401
2402#  译者:注意保持前导空格
2403#: wt-status.c:959
2404msgid "  (use \"git commit\" to conclude merge)"
2405msgstr "  (使用 \"git commit\" 结束合并)"
2406
2407#: wt-status.c:969
2408msgid "You are in the middle of an am session."
2409msgstr "您正处于 am 操作过程中。"
2410
2411#: wt-status.c:972
2412msgid "The current patch is empty."
2413msgstr "当前的补丁为空。"
2414
2415#  译者:注意保持前导空格
2416#: wt-status.c:976
2417msgid "  (fix conflicts and then run \"git am --continue\")"
2418msgstr "  (解决冲突,然后运行 \"git am --continue\")"
2419
2420#  译者:注意保持前导空格
2421#: wt-status.c:978
2422msgid "  (use \"git am --skip\" to skip this patch)"
2423msgstr "  (使用 \"git am --skip\" 跳过此补丁)"
2424
2425#  译者:注意保持前导空格
2426#: wt-status.c:980
2427msgid "  (use \"git am --abort\" to restore the original branch)"
2428msgstr "  (使用 \"git am --abort\" 恢复原有分支)"
2429
2430#: wt-status.c:1105
2431msgid "No commands done."
2432msgstr "没有命令被执行。"
2433
2434#: wt-status.c:1108
2435#, c-format
2436msgid "Last command done (%d command done):"
2437msgid_plural "Last commands done (%d commands done):"
2438msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2439msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2440
2441#: wt-status.c:1119
2442#, c-format
2443msgid "  (see more in file %s)"
2444msgstr "  (更多参见文件 %s)"
2445
2446#: wt-status.c:1124
2447msgid "No commands remaining."
2448msgstr "未剩下任何命令。"
2449
2450#: wt-status.c:1127
2451#, c-format
2452msgid "Next command to do (%d remaining command):"
2453msgid_plural "Next commands to do (%d remaining commands):"
2454msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2455msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2456
2457#  译者:注意保持前导空格
2458#: wt-status.c:1135
2459msgid "  (use \"git rebase --edit-todo\" to view and edit)"
2460msgstr "  (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2461
2462#: wt-status.c:1148
2463#, c-format
2464msgid "You are currently rebasing branch '%s' on '%s'."
2465msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2466
2467#: wt-status.c:1153
2468msgid "You are currently rebasing."
2469msgstr "您在执行变基操作。"
2470
2471#  译者:注意保持前导空格
2472#: wt-status.c:1167
2473msgid "  (fix conflicts and then run \"git rebase --continue\")"
2474msgstr "  (解决冲突,然后运行 \"git rebase --continue\")"
2475
2476#  译者:注意保持前导空格
2477#: wt-status.c:1169
2478msgid "  (use \"git rebase --skip\" to skip this patch)"
2479msgstr "  (使用 \"git rebase --skip\" 跳过此补丁)"
2480
2481#  译者:注意保持前导空格
2482#: wt-status.c:1171
2483msgid "  (use \"git rebase --abort\" to check out the original branch)"
2484msgstr "  (使用 \"git rebase --abort\" 以检出原有分支)"
2485
2486#  译者:注意保持前导空格
2487#: wt-status.c:1177
2488msgid "  (all conflicts fixed: run \"git rebase --continue\")"
2489msgstr "  (所有冲突已解决:运行 \"git rebase --continue\")"
2490
2491#: wt-status.c:1181
2492#, c-format
2493msgid ""
2494"You are currently splitting a commit while rebasing branch '%s' on '%s'."
2495msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2496
2497#: wt-status.c:1186
2498msgid "You are currently splitting a commit during a rebase."
2499msgstr "您在执行变基操作时拆分提交。"
2500
2501#  译者:注意保持前导空格
2502#: wt-status.c:1189
2503msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
2504msgstr "  (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2505
2506#: wt-status.c:1193
2507#, c-format
2508msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2509msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2510
2511#: wt-status.c:1198
2512msgid "You are currently editing a commit during a rebase."
2513msgstr "您在执行变基操作时编辑提交。"
2514
2515#  译者:注意保持前导空格
2516#: wt-status.c:1201
2517msgid "  (use \"git commit --amend\" to amend the current commit)"
2518msgstr "  (使用 \"git commit --amend\" 修补当前提交)"
2519
2520#  译者:注意保持前导空格
2521#: wt-status.c:1203
2522msgid ""
2523"  (use \"git rebase --continue\" once you are satisfied with your changes)"
2524msgstr "  (当您对您的修改满意后执行 \"git rebase --continue\")"
2525
2526#: wt-status.c:1213
2527#, c-format
2528msgid "You are currently cherry-picking commit %s."
2529msgstr "您在执行拣选提交 %s 的操作。"
2530
2531#  译者:注意保持前导空格
2532#: wt-status.c:1218
2533msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
2534msgstr "  (解决冲突并运行 \"git cherry-pick --continue\")"
2535
2536#  译者:注意保持前导空格
2537#: wt-status.c:1221
2538msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
2539msgstr "  (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2540
2541#  译者:注意保持前导空格
2542#: wt-status.c:1223
2543msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2544msgstr "  (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2545
2546#: wt-status.c:1232
2547#, c-format
2548msgid "You are currently reverting commit %s."
2549msgstr "您在执行反转提交 %s 的操作。"
2550
2551#  译者:注意保持前导空格
2552#: wt-status.c:1237
2553msgid "  (fix conflicts and run \"git revert --continue\")"
2554msgstr "  (解决冲突并运行 \"git revert --continue\")"
2555
2556#  译者:注意保持前导空格
2557#: wt-status.c:1240
2558msgid "  (all conflicts fixed: run \"git revert --continue\")"
2559msgstr "  (所有冲突已解决:运行 \"git revert --continue\")"
2560
2561#  译者:注意保持前导空格
2562#: wt-status.c:1242
2563msgid "  (use \"git revert --abort\" to cancel the revert operation)"
2564msgstr "  (使用 \"git revert --abort\" 以取消反转提交操作)"
2565
2566#: wt-status.c:1253
2567#, c-format
2568msgid "You are currently bisecting, started from branch '%s'."
2569msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2570
2571#: wt-status.c:1257
2572msgid "You are currently bisecting."
2573msgstr "您在执行二分查找操作。"
2574
2575#  译者:注意保持前导空格
2576#: wt-status.c:1260
2577msgid "  (use \"git bisect reset\" to get back to the original branch)"
2578msgstr "  (使用 \"git bisect reset\" 以回到原有分支)"
2579
2580#: wt-status.c:1460
2581msgid "On branch "
2582msgstr "位于分支 "
2583
2584#: wt-status.c:1466
2585msgid "interactive rebase in progress; onto "
2586msgstr "交互式变基操作正在进行中;至 "
2587
2588#: wt-status.c:1468
2589msgid "rebase in progress; onto "
2590msgstr "变基操作正在进行中;至 "
2591
2592#: wt-status.c:1473
2593msgid "HEAD detached at "
2594msgstr "头指针分离于 "
2595
2596#: wt-status.c:1475
2597msgid "HEAD detached from "
2598msgstr "头指针分离自 "
2599
2600#: wt-status.c:1478
2601msgid "Not currently on any branch."
2602msgstr "当前不在任何分支上。"
2603
2604#: wt-status.c:1496
2605msgid "Initial commit"
2606msgstr "初始提交"
2607
2608#: wt-status.c:1510
2609msgid "Untracked files"
2610msgstr "未跟踪的文件"
2611
2612#: wt-status.c:1512
2613msgid "Ignored files"
2614msgstr "忽略的文件"
2615
2616#: wt-status.c:1516
2617#, c-format
2618msgid ""
2619"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2620"may speed it up, but you have to be careful not to forget to add\n"
2621"new files yourself (see 'git help status')."
2622msgstr ""
2623"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2624"但您需要小心不要忘了添加新文件(参见 'git help status')。"
2625
2626#: wt-status.c:1522
2627#, c-format
2628msgid "Untracked files not listed%s"
2629msgstr "未跟踪的文件没有列出%s"
2630
2631#  译者:中文字符串拼接,可删除前导空格
2632#: wt-status.c:1524
2633msgid " (use -u option to show untracked files)"
2634msgstr "(使用 -u 参数显示未跟踪的文件)"
2635
2636#: wt-status.c:1530
2637msgid "No changes"
2638msgstr "没有修改"
2639
2640#: wt-status.c:1535
2641#, c-format
2642msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2643msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2644
2645#: wt-status.c:1538
2646#, c-format
2647msgid "no changes added to commit\n"
2648msgstr "修改尚未加入提交\n"
2649
2650#: wt-status.c:1541
2651#, c-format
2652msgid ""
2653"nothing added to commit but untracked files present (use \"git add\" to "
2654"track)\n"
2655msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2656
2657#: wt-status.c:1544
2658#, c-format
2659msgid "nothing added to commit but untracked files present\n"
2660msgstr "提交为空,但是存在尚未跟踪的文件\n"
2661
2662#  译者:中文字符串拼接,可删除前导空格
2663#: wt-status.c:1547
2664#, c-format
2665msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2666msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2667
2668#: wt-status.c:1550 wt-status.c:1555
2669#, c-format
2670msgid "nothing to commit\n"
2671msgstr "无文件要提交\n"
2672
2673#  译者:中文字符串拼接,可删除前导空格
2674#: wt-status.c:1553
2675#, c-format
2676msgid "nothing to commit (use -u to show untracked files)\n"
2677msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2678
2679#  译者:中文字符串拼接,可删除前导空格
2680#: wt-status.c:1557
2681#, c-format
2682msgid "nothing to commit, working directory clean\n"
2683msgstr "无文件要提交,干净的工作区\n"
2684
2685#  译者:注意保持句尾空格
2686#: wt-status.c:1664
2687msgid "Initial commit on "
2688msgstr "初始提交于 "
2689
2690#: wt-status.c:1668
2691msgid "HEAD (no branch)"
2692msgstr "HEAD(非分支)"
2693
2694#: wt-status.c:1697
2695msgid "gone"
2696msgstr "丢失"
2697
2698#  译者:注意保持句尾空格
2699#: wt-status.c:1699 wt-status.c:1707
2700msgid "behind "
2701msgstr "落后 "
2702
2703#: wt-status.c:1702 wt-status.c:1705
2704msgid "ahead "
2705msgstr "领先 "
2706
2707#: compat/precompose_utf8.c:57 builtin/clone.c:415
2708#, c-format
2709msgid "failed to unlink '%s'"
2710msgstr "无法删除 '%s'"
2711
2712#: builtin/add.c:22
2713msgid "git add [<options>] [--] <pathspec>..."
2714msgstr "git add [<选项>] [--] <路径规格>..."
2715
2716#: builtin/add.c:65
2717#, c-format
2718msgid "unexpected diff status %c"
2719msgstr "意外的差异状态 %c"
2720
2721#: builtin/add.c:70 builtin/commit.c:280
2722msgid "updating files failed"
2723msgstr "更新文件失败"
2724
2725#: builtin/add.c:80
2726#, c-format
2727msgid "remove '%s'\n"
2728msgstr "删除 '%s'\n"
2729
2730#: builtin/add.c:134
2731msgid "Unstaged changes after refreshing the index:"
2732msgstr "刷新索引之后尚未被暂存的变更:"
2733
2734#: builtin/add.c:194 builtin/rev-parse.c:811
2735msgid "Could not read the index"
2736msgstr "不能读取索引"
2737
2738#: builtin/add.c:205
2739#, c-format
2740msgid "Could not open '%s' for writing."
2741msgstr "无法打开 '%s' 进行写入。"
2742
2743#: builtin/add.c:209
2744msgid "Could not write patch"
2745msgstr "不能生成补丁"
2746
2747#: builtin/add.c:212
2748msgid "editing patch failed"
2749msgstr "编辑补丁失败"
2750
2751#: builtin/add.c:215
2752#, c-format
2753msgid "Could not stat '%s'"
2754msgstr "不能查看文件状态 '%s'"
2755
2756#: builtin/add.c:217
2757msgid "Empty patch. Aborted."
2758msgstr "空补丁。异常终止。"
2759
2760#: builtin/add.c:222
2761#, c-format
2762msgid "Could not apply '%s'"
2763msgstr "不能应用 '%s'"
2764
2765#: builtin/add.c:232
2766msgid "The following paths are ignored by one of your .gitignore files:\n"
2767msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2768
2769#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2770#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
2771#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
2772msgid "dry run"
2773msgstr "演习"
2774
2775#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
2776#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
2777#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
2778msgid "be verbose"
2779msgstr "冗长输出"
2780
2781#: builtin/add.c:252
2782msgid "interactive picking"
2783msgstr "交互式拣选"
2784
2785#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
2786msgid "select hunks interactively"
2787msgstr "交互式挑选数据块"
2788
2789#: builtin/add.c:254
2790msgid "edit current diff and apply"
2791msgstr "编辑当前差异并应用"
2792
2793#: builtin/add.c:255
2794msgid "allow adding otherwise ignored files"
2795msgstr "允许添加忽略的文件"
2796
2797#: builtin/add.c:256
2798msgid "update tracked files"
2799msgstr "更新已跟踪的文件"
2800
2801#: builtin/add.c:257
2802msgid "record only the fact that the path will be added later"
2803msgstr "只记录,该路径稍后再添加"
2804
2805#: builtin/add.c:258
2806msgid "add changes from all tracked and untracked files"
2807msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2808
2809#: builtin/add.c:261
2810msgid "ignore paths removed in the working tree (same as --no-all)"
2811msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2812
2813#: builtin/add.c:263
2814msgid "don't add, only refresh the index"
2815msgstr "不添加,只刷新索引"
2816
2817#: builtin/add.c:264
2818msgid "just skip files which cannot be added because of errors"
2819msgstr "跳过因出错不能添加的文件"
2820
2821#: builtin/add.c:265
2822msgid "check if - even missing - files are ignored in dry run"
2823msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2824
2825#: builtin/add.c:287
2826#, c-format
2827msgid "Use -f if you really want to add them.\n"
2828msgstr "使用 -f 参数如果您确实要添加它们。\n"
2829
2830#: builtin/add.c:294
2831msgid "adding files failed"
2832msgstr "添加文件失败"
2833
2834#: builtin/add.c:330
2835msgid "-A and -u are mutually incompatible"
2836msgstr "-A 和 -u 选项互斥"
2837
2838#: builtin/add.c:337
2839msgid "Option --ignore-missing can only be used together with --dry-run"
2840msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2841
2842#: builtin/add.c:352
2843#, c-format
2844msgid "Nothing specified, nothing added.\n"
2845msgstr "没有指定文件,也没有文件被添加。\n"
2846
2847#: builtin/add.c:353
2848#, c-format
2849msgid "Maybe you wanted to say 'git add .'?\n"
2850msgstr "也许您想要执行 'git add .'?\n"
2851
2852#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2853#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2854#: builtin/submodule--helper.c:240
2855msgid "index file corrupt"
2856msgstr "索引文件损坏"
2857
2858#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
2859msgid "Unable to write new index file"
2860msgstr "无法写入新索引文件"
2861
2862#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
2863#, c-format
2864msgid "could not read '%s'"
2865msgstr "不能读取 '%s'"
2866
2867#: builtin/am.c:430
2868msgid "could not parse author script"
2869msgstr "不能解析作者脚本"
2870
2871#: builtin/am.c:507
2872#, c-format
2873msgid "'%s' was deleted by the applypatch-msg hook"
2874msgstr "'%s' 被 applypatch-msg 钩子删除"
2875
2876#: builtin/am.c:548 builtin/notes.c:300
2877#, c-format
2878msgid "Malformed input line: '%s'."
2879msgstr "非法的输入行:'%s'。"
2880
2881#: builtin/am.c:585 builtin/notes.c:315
2882#, c-format
2883msgid "Failed to copy notes from '%s' to '%s'"
2884msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2885
2886#: builtin/am.c:611
2887msgid "fseek failed"
2888msgstr "fseek 失败"
2889
2890#: builtin/am.c:788
2891#, c-format
2892msgid "could not parse patch '%s'"
2893msgstr "无法解析补丁 '%s'"
2894
2895#: builtin/am.c:853
2896msgid "Only one StGIT patch series can be applied at once"
2897msgstr "一次只能有一个 StGIT 补丁队列被应用"
2898
2899#: builtin/am.c:900
2900msgid "invalid timestamp"
2901msgstr "无效的时间戳"
2902
2903#: builtin/am.c:903 builtin/am.c:911
2904msgid "invalid Date line"
2905msgstr "无效的日期行"
2906
2907#: builtin/am.c:908
2908msgid "invalid timezone offset"
2909msgstr "无效的时区偏移值"
2910
2911#: builtin/am.c:995
2912msgid "Patch format detection failed."
2913msgstr "补丁格式检测失败。"
2914
2915#: builtin/am.c:1000 builtin/clone.c:380
2916#, c-format
2917msgid "failed to create directory '%s'"
2918msgstr "无法创建目录 '%s'"
2919
2920#: builtin/am.c:1004
2921msgid "Failed to split patches."
2922msgstr "无法拆分补丁。"
2923
2924#: builtin/am.c:1136 builtin/commit.c:365
2925msgid "unable to write index file"
2926msgstr "无法写入索引文件"
2927
2928#: builtin/am.c:1187
2929#, c-format
2930msgid "When you have resolved this problem, run \"%s --continue\"."
2931msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2932
2933#: builtin/am.c:1188
2934#, c-format
2935msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2936msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2937
2938#: builtin/am.c:1189
2939#, c-format
2940msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2941msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2942
2943#: builtin/am.c:1327
2944msgid "Patch is empty. Was it split wrong?"
2945msgstr "补丁为空。是不是切分错误?"
2946
2947#: builtin/am.c:1401 builtin/log.c:1516
2948#, c-format
2949msgid "invalid ident line: %s"
2950msgstr "包含无效的身份标识:%s"
2951
2952#: builtin/am.c:1428
2953#, c-format
2954msgid "unable to parse commit %s"
2955msgstr "不能解析提交 %s"
2956
2957#: builtin/am.c:1630
2958msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2959msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2960
2961#: builtin/am.c:1632
2962msgid "Using index info to reconstruct a base tree..."
2963msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2964
2965#: builtin/am.c:1651
2966msgid ""
2967"Did you hand edit your patch?\n"
2968"It does not apply to blobs recorded in its index."
2969msgstr ""
2970"您是否曾手动编辑过您的补丁?\n"
2971"无法应用补丁到索引中的数据对象上。"
2972
2973#: builtin/am.c:1657
2974msgid "Falling back to patching base and 3-way merge..."
2975msgstr "回落到基础版本上打补丁及进行三方合并..."
2976
2977#: builtin/am.c:1672
2978msgid "Failed to merge in the changes."
2979msgstr "无法合并变更。"
2980
2981#: builtin/am.c:1696 builtin/merge.c:636
2982msgid "git write-tree failed to write a tree"
2983msgstr "git write-tree 无法写入一树对象"
2984
2985#: builtin/am.c:1703
2986msgid "applying to an empty history"
2987msgstr "正应用到一个空历史上"
2988
2989#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
2990#: builtin/merge.c:866
2991msgid "failed to write commit object"
2992msgstr "无法写提交对象"
2993
2994#: builtin/am.c:1748 builtin/am.c:1752
2995#, c-format
2996msgid "cannot resume: %s does not exist."
2997msgstr "无法继续:%s 不存在。"
2998
2999#: builtin/am.c:1768
3000msgid "cannot be interactive without stdin connected to a terminal."
3001msgstr "标准输入没有和终端关联,不能进行交互式操作。"
3002
3003#: builtin/am.c:1773
3004msgid "Commit Body is:"
3005msgstr "提交内容为:"
3006
3007#  译者:注意保持句尾空格
3008#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3009#. in your translation. The program will only accept English
3010#. input at this point.
3011#.
3012#: builtin/am.c:1783
3013msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
3014msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
3015
3016#: builtin/am.c:1833
3017#, c-format
3018msgid "Dirty index: cannot apply patches (dirty: %s)"
3019msgstr "脏索引:不能应用补丁(脏文件:%s)"
3020
3021#: builtin/am.c:1868 builtin/am.c:1940
3022#, c-format
3023msgid "Applying: %.*s"
3024msgstr "应用:%.*s"
3025
3026#: builtin/am.c:1884
3027msgid "No changes -- Patch already applied."
3028msgstr "没有变更 —— 补丁已经应用过。"
3029
3030#: builtin/am.c:1892
3031#, c-format
3032msgid "Patch failed at %s %.*s"
3033msgstr "打补丁失败于 %s %.*s"
3034
3035#: builtin/am.c:1898
3036#, c-format
3037msgid "The copy of the patch that failed is found in: %s"
3038msgstr "失败的补丁文件副本位于:%s"
3039
3040#: builtin/am.c:1943
3041msgid ""
3042"No changes - did you forget to use 'git add'?\n"
3043"If there is nothing left to stage, chances are that something else\n"
3044"already introduced the same changes; you might want to skip this patch."
3045msgstr ""
3046"没有变更 —— 您是不是忘了执行 'git add'?\n"
3047"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
3048"您也许想要跳过这个补丁。"
3049
3050#: builtin/am.c:1950
3051msgid ""
3052"You still have unmerged paths in your index.\n"
3053"Did you forget to use 'git add'?"
3054msgstr ""
3055"您的索引中仍有未合并的路径。\n"
3056"您是否忘了执行 'git add'?"
3057
3058#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
3059#: builtin/reset.c:316
3060#, c-format
3061msgid "Could not parse object '%s'."
3062msgstr "不能解析对象 '%s'。"
3063
3064#: builtin/am.c:2110
3065msgid "failed to clean index"
3066msgstr "无法清空索引"
3067
3068#: builtin/am.c:2144
3069msgid ""
3070"You seem to have moved HEAD since the last 'am' failure.\n"
3071"Not rewinding to ORIG_HEAD"
3072msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
3073
3074#: builtin/am.c:2205
3075#, c-format
3076msgid "Invalid value for --patch-format: %s"
3077msgstr "无效的 --patch-format 值:%s"
3078
3079#: builtin/am.c:2238
3080msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
3081msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
3082
3083#: builtin/am.c:2239
3084msgid "git am [<options>] (--continue | --skip | --abort)"
3085msgstr "git am [<选项>] (--continue | --skip | --abort)"
3086
3087#: builtin/am.c:2245
3088msgid "run interactively"
3089msgstr "以交互式方式运行"
3090
3091#: builtin/am.c:2247
3092msgid "historical option -- no-op"
3093msgstr "老的参数 —— 无作用"
3094
3095#: builtin/am.c:2249
3096msgid "allow fall back on 3way merging if needed"
3097msgstr "如果必要,允许使用三方合并。"
3098
3099#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
3100#: builtin/repack.c:171
3101msgid "be quiet"
3102msgstr "静默模式"
3103
3104#: builtin/am.c:2252
3105msgid "add a Signed-off-by line to the commit message"
3106msgstr "在提交说明中添加一个 Signed-off-by 签名"
3107
3108#: builtin/am.c:2255
3109msgid "recode into utf8 (default)"
3110msgstr "使用 utf8 字符集(默认)"
3111
3112#: builtin/am.c:2257
3113msgid "pass -k flag to git-mailinfo"
3114msgstr "向 git-mailinfo 传递 -k 参数"
3115
3116#: builtin/am.c:2259
3117msgid "pass -b flag to git-mailinfo"
3118msgstr "向 git-mailinfo 传递 -b 参数"
3119
3120#: builtin/am.c:2261
3121msgid "pass -m flag to git-mailinfo"
3122msgstr "向 git-mailinfo 传递 -m 参数"
3123
3124#: builtin/am.c:2263
3125msgid "pass --keep-cr flag to git-mailsplit for mbox format"
3126msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
3127
3128#: builtin/am.c:2266
3129msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
3130msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
3131
3132#: builtin/am.c:2269
3133msgid "strip everything before a scissors line"
3134msgstr "丢弃裁切线前的所有内容"
3135
3136#: builtin/am.c:2270 builtin/apply.c:4546
3137msgid "action"
3138msgstr "动作"
3139
3140#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
3141#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
3142#: builtin/am.c:2298
3143msgid "pass it through git-apply"
3144msgstr "传递给 git-apply"
3145
3146#: builtin/am.c:2279 builtin/apply.c:4570
3147msgid "root"
3148msgstr "根目录"
3149
3150#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
3151#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
3152#: builtin/pull.c:179 builtin/submodule--helper.c:277
3153#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
3154#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
3155#: builtin/submodule--helper.c:770
3156msgid "path"
3157msgstr "路径"
3158
3159#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
3160#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
3161#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
3162#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
3163#: parse-options.h:132 parse-options.h:134 parse-options.h:244
3164msgid "n"
3165msgstr "n"
3166
3167#: builtin/am.c:2291 builtin/apply.c:4514
3168msgid "num"
3169msgstr "数字"
3170
3171#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
3172#: builtin/tag.c:372
3173msgid "format"
3174msgstr "格式"
3175
3176#: builtin/am.c:2295
3177msgid "format the patch(es) are in"
3178msgstr "补丁的格式"
3179
3180#: builtin/am.c:2301
3181msgid "override error message when patch failure occurs"
3182msgstr "打补丁失败时显示的错误信息"
3183
3184#: builtin/am.c:2303
3185msgid "continue applying patches after resolving a conflict"
3186msgstr "冲突解决后继续应用补丁"
3187
3188#: builtin/am.c:2306
3189msgid "synonyms for --continue"
3190msgstr "和 --continue 同义"
3191
3192#: builtin/am.c:2309
3193msgid "skip the current patch"
3194msgstr "跳过当前补丁"
3195
3196#: builtin/am.c:2312
3197msgid "restore the original branch and abort the patching operation."
3198msgstr "恢复原始分支并终止打补丁操作。"
3199
3200#: builtin/am.c:2316
3201msgid "lie about committer date"
3202msgstr "将作者日期作为提交日期"
3203
3204#: builtin/am.c:2318
3205msgid "use current timestamp for author date"
3206msgstr "用当前时间作为作者日期"
3207
3208#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
3209#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
3210msgid "key-id"
3211msgstr "key-id"
3212
3213#: builtin/am.c:2321
3214msgid "GPG-sign commits"
3215msgstr "使用 GPG 签名提交"
3216
3217#: builtin/am.c:2324
3218msgid "(internal use for git-rebase)"
3219msgstr "(内部使用,用于 git-rebase)"
3220
3221#: builtin/am.c:2339
3222msgid ""
3223"The -b/--binary option has been a no-op for long time, and\n"
3224"it will be removed. Please do not use it anymore."
3225msgstr ""
3226"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
3227"请不要再使用它了。"
3228
3229#: builtin/am.c:2346
3230msgid "failed to read the index"
3231msgstr "无法读取索引"
3232
3233#: builtin/am.c:2361
3234#, c-format
3235msgid "previous rebase directory %s still exists but mbox given."
3236msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
3237
3238#: builtin/am.c:2385
3239#, c-format
3240msgid ""
3241"Stray %s directory found.\n"
3242"Use \"git am --abort\" to remove it."
3243msgstr ""
3244"发现了错误的 %s 目录。\n"
3245"使用 \"git am --abort\" 删除它。"
3246
3247#: builtin/am.c:2391
3248msgid "Resolve operation not in progress, we are not resuming."
3249msgstr "解决操作未进行,我们不会继续。"
3250
3251#: builtin/apply.c:59
3252msgid "git apply [<options>] [<patch>...]"
3253msgstr "git apply [<选项>] [<补丁>...]"
3254
3255#: builtin/apply.c:111
3256#, c-format
3257msgid "unrecognized whitespace option '%s'"
3258msgstr "未能识别的空白字符选项 '%s'"
3259
3260#: builtin/apply.c:126
3261#, c-format
3262msgid "unrecognized whitespace ignore option '%s'"
3263msgstr "未能识别的空白字符忽略选项 '%s'"
3264
3265#: builtin/apply.c:818
3266#, c-format
3267msgid "Cannot prepare timestamp regexp %s"
3268msgstr "无法准备时间戳正则表达式 %s"
3269
3270#: builtin/apply.c:827
3271#, c-format
3272msgid "regexec returned %d for input: %s"
3273msgstr "regexec 返回 %d,输入为:%s"
3274
3275#: builtin/apply.c:908
3276#, c-format
3277msgid "unable to find filename in patch at line %d"
3278msgstr "不能在补丁的第 %d 行找到文件名"
3279
3280#: builtin/apply.c:937
3281#, c-format
3282msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
3283msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
3284
3285#: builtin/apply.c:942
3286#, c-format
3287msgid "git apply: bad git-diff - inconsistent new filename on line %d"
3288msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
3289
3290#: builtin/apply.c:943
3291#, c-format
3292msgid "git apply: bad git-diff - inconsistent old filename on line %d"
3293msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
3294
3295#: builtin/apply.c:949
3296#, c-format
3297msgid "git apply: bad git-diff - expected /dev/null on line %d"
3298msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
3299
3300#: builtin/apply.c:1406
3301#, c-format
3302msgid "recount: unexpected line: %.*s"
3303msgstr "recount:意外的行:%.*s"
3304
3305#: builtin/apply.c:1463
3306#, c-format
3307msgid "patch fragment without header at line %d: %.*s"
3308msgstr "第 %d 行的补丁片段没有头信息:%.*s"
3309
3310#: builtin/apply.c:1480
3311#, c-format
3312msgid ""
3313"git diff header lacks filename information when removing %d leading pathname "
3314"component (line %d)"
3315msgid_plural ""
3316"git diff header lacks filename information when removing %d leading pathname "
3317"components (line %d)"
3318msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3319msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3320
3321#: builtin/apply.c:1646
3322msgid "new file depends on old contents"
3323msgstr "新文件依赖旧内容"
3324
3325#: builtin/apply.c:1648
3326msgid "deleted file still has contents"
3327msgstr "删除的文件仍有内容"
3328
3329#: builtin/apply.c:1674
3330#, c-format
3331msgid "corrupt patch at line %d"
3332msgstr "补丁在第 %d 行损坏"
3333
3334#: builtin/apply.c:1710
3335#, c-format
3336msgid "new file %s depends on old contents"
3337msgstr "新文件 %s 依赖旧内容"
3338
3339#: builtin/apply.c:1712
3340#, c-format
3341msgid "deleted file %s still has contents"
3342msgstr "删除的文件 %s 仍有内容"
3343
3344#: builtin/apply.c:1715
3345#, c-format
3346msgid "** warning: file %s becomes empty but is not deleted"
3347msgstr "** 警告:文件 %s 成为空文件但并未删除"
3348
3349#: builtin/apply.c:1861
3350#, c-format
3351msgid "corrupt binary patch at line %d: %.*s"
3352msgstr "二进制补丁在第 %d 行损坏:%.*s"
3353
3354#: builtin/apply.c:1895
3355#, c-format
3356msgid "unrecognized binary patch at line %d"
3357msgstr "未能识别的二进制补丁位于第 %d 行"
3358
3359#: builtin/apply.c:2048
3360#, c-format
3361msgid "patch with only garbage at line %d"
3362msgstr "补丁文件的第 %d 行只有垃圾数据"
3363
3364#: builtin/apply.c:2138
3365#, c-format
3366msgid "unable to read symlink %s"
3367msgstr "无法读取符号链接 %s"
3368
3369#: builtin/apply.c:2142
3370#, c-format
3371msgid "unable to open or read %s"
3372msgstr "不能打开或读取 %s"
3373
3374#: builtin/apply.c:2775
3375#, c-format
3376msgid "invalid start of line: '%c'"
3377msgstr "无效的行首字符:'%c'"
3378
3379#: builtin/apply.c:2894
3380#, c-format
3381msgid "Hunk #%d succeeded at %d (offset %d line)."
3382msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3383msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3384msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3385
3386#: builtin/apply.c:2906
3387#, c-format
3388msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3389msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3390
3391#: builtin/apply.c:2912
3392#, c-format
3393msgid ""
3394"while searching for:\n"
3395"%.*s"
3396msgstr ""
3397"当查询:\n"
3398"%.*s"
3399
3400#: builtin/apply.c:2932
3401#, c-format
3402msgid "missing binary patch data for '%s'"
3403msgstr "缺失 '%s' 的二进制补丁数据"
3404
3405#: builtin/apply.c:3033
3406#, c-format
3407msgid "binary patch does not apply to '%s'"
3408msgstr "二进制补丁未应用到 '%s'"
3409
3410#: builtin/apply.c:3039
3411#, c-format
3412msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3413msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3414
3415#: builtin/apply.c:3060
3416#, c-format
3417msgid "patch failed: %s:%ld"
3418msgstr "打补丁失败:%s:%ld"
3419
3420#: builtin/apply.c:3184
3421#, c-format
3422msgid "cannot checkout %s"
3423msgstr "不能检出 %s"
3424
3425#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
3426#, c-format
3427msgid "read of %s failed"
3428msgstr "读取 %s 失败"
3429
3430#: builtin/apply.c:3237
3431#, c-format
3432msgid "reading from '%s' beyond a symbolic link"
3433msgstr "读取位于符号链接中的 '%s'"
3434
3435#: builtin/apply.c:3265 builtin/apply.c:3487
3436#, c-format
3437msgid "path %s has been renamed/deleted"
3438msgstr "路径 %s 已经被重命名/删除"
3439
3440#: builtin/apply.c:3346 builtin/apply.c:3501
3441#, c-format
3442msgid "%s: does not exist in index"
3443msgstr "%s:不存在于索引中"
3444
3445#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
3446#, c-format
3447msgid "%s: %s"
3448msgstr "%s:%s"
3449
3450#: builtin/apply.c:3355 builtin/apply.c:3509
3451#, c-format
3452msgid "%s: does not match index"
3453msgstr "%s:和索引不匹配"
3454
3455#: builtin/apply.c:3457
3456msgid "removal patch leaves file contents"
3457msgstr "移除补丁仍留下了文件内容"
3458
3459#: builtin/apply.c:3526
3460#, c-format
3461msgid "%s: wrong type"
3462msgstr "%s:错误类型"
3463
3464#: builtin/apply.c:3528
3465#, c-format
3466msgid "%s has type %o, expected %o"
3467msgstr "%s 的类型是 %o,应为 %o"
3468
3469#: builtin/apply.c:3687 builtin/apply.c:3689
3470#, c-format
3471msgid "invalid path '%s'"
3472msgstr "无效路径 '%s'"
3473
3474#: builtin/apply.c:3744
3475#, c-format
3476msgid "%s: already exists in index"
3477msgstr "%s:已经存在于索引中"
3478
3479#: builtin/apply.c:3747
3480#, c-format
3481msgid "%s: already exists in working directory"
3482msgstr "%s:已经存在于工作区中"
3483
3484#: builtin/apply.c:3767
3485#, c-format
3486msgid "new mode (%o) of %s does not match old mode (%o)"
3487msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3488
3489#: builtin/apply.c:3772
3490#, c-format
3491msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3492msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3493
3494#: builtin/apply.c:3792
3495#, c-format
3496msgid "affected file '%s' is beyond a symbolic link"
3497msgstr "受影响的文件 '%s' 位于符号链接中"
3498
3499#: builtin/apply.c:3796
3500#, c-format
3501msgid "%s: patch does not apply"
3502msgstr "%s:补丁未应用"
3503
3504#: builtin/apply.c:3810
3505#, c-format
3506msgid "Checking patch %s..."
3507msgstr "检查补丁 %s..."
3508
3509#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
3510#, c-format
3511msgid "make_cache_entry failed for path '%s'"
3512msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3513
3514#: builtin/apply.c:4046
3515#, c-format
3516msgid "unable to remove %s from index"
3517msgstr "不能从索引中移除 %s"
3518
3519#: builtin/apply.c:4075
3520#, c-format
3521msgid "corrupt patch for submodule %s"
3522msgstr "子模组 %s 损坏的补丁"
3523
3524#: builtin/apply.c:4079
3525#, c-format
3526msgid "unable to stat newly created file '%s'"
3527msgstr "不能枚举新建文件 '%s' 的状态"
3528
3529#: builtin/apply.c:4084
3530#, c-format
3531msgid "unable to create backing store for newly created file %s"
3532msgstr "不能为新建文件 %s 创建后端存储"
3533
3534#: builtin/apply.c:4087 builtin/apply.c:4195
3535#, c-format
3536msgid "unable to add cache entry for %s"
3537msgstr "无法为 %s 添加缓存条目"
3538
3539#: builtin/apply.c:4120
3540#, c-format
3541msgid "closing file '%s'"
3542msgstr "关闭文件 '%s'"
3543
3544#: builtin/apply.c:4169
3545#, c-format
3546msgid "unable to write file '%s' mode %o"
3547msgstr "不能写文件 '%s' 权限 %o"
3548
3549#: builtin/apply.c:4256
3550#, c-format
3551msgid "Applied patch %s cleanly."
3552msgstr "成功应用补丁 %s。"
3553
3554#: builtin/apply.c:4264
3555msgid "internal error"
3556msgstr "内部错误"
3557
3558#: builtin/apply.c:4267
3559#, c-format
3560msgid "Applying patch %%s with %d reject..."
3561msgid_plural "Applying patch %%s with %d rejects..."
3562msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3563msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3564
3565#: builtin/apply.c:4277
3566#, c-format
3567msgid "truncating .rej filename to %.*s.rej"
3568msgstr "截短 .rej 文件名为 %.*s.rej"
3569
3570#: builtin/apply.c:4285
3571#, c-format
3572msgid "cannot open %s: %s"
3573msgstr "不能打开 %s:%s"
3574
3575#: builtin/apply.c:4298
3576#, c-format
3577msgid "Hunk #%d applied cleanly."
3578msgstr "第 #%d 个片段成功应用。"
3579
3580#: builtin/apply.c:4301
3581#, c-format
3582msgid "Rejected hunk #%d."
3583msgstr "拒绝第 #%d 个片段。"
3584
3585#: builtin/apply.c:4387
3586#, c-format
3587msgid "Skipped patch '%s'."
3588msgstr "略过补丁 '%s'。"
3589
3590#: builtin/apply.c:4395
3591msgid "unrecognized input"
3592msgstr "未能识别的输入"
3593
3594#: builtin/apply.c:4406
3595msgid "unable to read index file"
3596msgstr "无法读取索引文件"
3597
3598#: builtin/apply.c:4509
3599msgid "don't apply changes matching the given path"
3600msgstr "不要应用与给出路径向匹配的变更"
3601
3602#: builtin/apply.c:4512
3603msgid "apply changes matching the given path"
3604msgstr "应用与给出路径向匹配的变更"
3605
3606#: builtin/apply.c:4515
3607msgid "remove <num> leading slashes from traditional diff paths"
3608msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3609
3610#: builtin/apply.c:4518
3611msgid "ignore additions made by the patch"
3612msgstr "忽略补丁中的添加的文件"
3613
3614#: builtin/apply.c:4520
3615msgid "instead of applying the patch, output diffstat for the input"
3616msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3617
3618#: builtin/apply.c:4524
3619msgid "show number of added and deleted lines in decimal notation"
3620msgstr "以十进制数显示添加和删除的行数"
3621
3622#: builtin/apply.c:4526
3623msgid "instead of applying the patch, output a summary for the input"
3624msgstr "不应用补丁,而是显示输入的概要"
3625
3626#: builtin/apply.c:4528
3627msgid "instead of applying the patch, see if the patch is applicable"
3628msgstr "不应用补丁,而是查看补丁是否可应用"
3629
3630#: builtin/apply.c:4530
3631msgid "make sure the patch is applicable to the current index"
3632msgstr "确认补丁可以应用到当前索引"
3633
3634#: builtin/apply.c:4532
3635msgid "apply a patch without touching the working tree"
3636msgstr "应用补丁而不修改工作区"
3637
3638#: builtin/apply.c:4534
3639msgid "accept a patch that touches outside the working area"
3640msgstr "接受修改工作区之外文件的补丁"
3641
3642#: builtin/apply.c:4536
3643msgid "also apply the patch (use with --stat/--summary/--check)"
3644msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3645
3646#: builtin/apply.c:4538
3647msgid "attempt three-way merge if a patch does not apply"
3648msgstr "如果一个补丁不能应用则尝试三方合并"
3649
3650#: builtin/apply.c:4540
3651msgid "build a temporary index based on embedded index information"
3652msgstr "创建一个临时索引基于嵌入的索引信息"
3653
3654#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
3655msgid "paths are separated with NUL character"
3656msgstr "路径以 NUL 字符分隔"
3657
3658#: builtin/apply.c:4545
3659msgid "ensure at least <n> lines of context match"
3660msgstr "确保至少匹配 <n> 行上下文"
3661
3662#: builtin/apply.c:4547
3663msgid "detect new or modified lines that have whitespace errors"
3664msgstr "检查新增和修改的行中间的空白字符滥用"
3665
3666#: builtin/apply.c:4550 builtin/apply.c:4553
3667msgid "ignore changes in whitespace when finding context"
3668msgstr "查找上下文时忽略空白字符的变更"
3669
3670#: builtin/apply.c:4556
3671msgid "apply the patch in reverse"
3672msgstr "反向应用补丁"
3673
3674#: builtin/apply.c:4558
3675msgid "don't expect at least one line of context"
3676msgstr "无需至少一行上下文"
3677
3678#: builtin/apply.c:4560
3679msgid "leave the rejected hunks in corresponding *.rej files"
3680msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3681
3682#: builtin/apply.c:4562
3683msgid "allow overlapping hunks"
3684msgstr "允许重叠的补丁片段"
3685
3686#: builtin/apply.c:4565
3687msgid "tolerate incorrectly detected missing new-line at the end of file"
3688msgstr "允许不正确的文件末尾换行符"
3689
3690#: builtin/apply.c:4568
3691msgid "do not trust the line counts in the hunk headers"
3692msgstr "不信任补丁片段的头信息中的行号"
3693
3694#: builtin/apply.c:4571
3695msgid "prepend <root> to all filenames"
3696msgstr "为所有文件名前添加 <根目录>"
3697
3698#: builtin/apply.c:4593
3699msgid "--3way outside a repository"
3700msgstr "--3way 在一个仓库之外"
3701
3702#: builtin/apply.c:4601
3703msgid "--index outside a repository"
3704msgstr "--index 在一个仓库之外"
3705
3706#: builtin/apply.c:4604
3707msgid "--cached outside a repository"
3708msgstr "--cached 在一个仓库之外"
3709
3710#: builtin/apply.c:4623
3711#, c-format
3712msgid "can't open patch '%s'"
3713msgstr "不能打开补丁 '%s'"
3714
3715#: builtin/apply.c:4637
3716#, c-format
3717msgid "squelched %d whitespace error"
3718msgid_plural "squelched %d whitespace errors"
3719msgstr[0] "抑制下仍有 %d 个空白字符误用"
3720msgstr[1] "抑制下仍有 %d 个空白字符误用"
3721
3722#: builtin/apply.c:4643 builtin/apply.c:4653
3723#, c-format
3724msgid "%d line adds whitespace errors."
3725msgid_plural "%d lines add whitespace errors."
3726msgstr[0] "%d 行有空白字符误用。"
3727msgstr[1] "%d 行有空白字符误用。"
3728
3729#: builtin/archive.c:17
3730#, c-format
3731msgid "could not create archive file '%s'"
3732msgstr "不能创建归档文件 '%s'"
3733
3734#: builtin/archive.c:20
3735msgid "could not redirect output"
3736msgstr "不能重定向输出"
3737
3738#: builtin/archive.c:37
3739msgid "git archive: Remote with no URL"
3740msgstr "git archive:未提供远程 URL"
3741
3742#: builtin/archive.c:58
3743msgid "git archive: expected ACK/NAK, got EOF"
3744msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3745
3746#: builtin/archive.c:61
3747#, c-format
3748msgid "git archive: NACK %s"
3749msgstr "git archive:NACK %s"
3750
3751#: builtin/archive.c:63
3752#, c-format
3753msgid "remote error: %s"
3754msgstr "远程错误:%s"
3755
3756#: builtin/archive.c:64
3757msgid "git archive: protocol error"
3758msgstr "git archive:协议错误"
3759
3760#: builtin/archive.c:68
3761msgid "git archive: expected a flush"
3762msgstr "git archive:应为刷新"
3763
3764#: builtin/bisect--helper.c:7
3765msgid "git bisect--helper --next-all [--no-checkout]"
3766msgstr "git bisect--helper --next-all [--no-checkout]"
3767
3768#: builtin/bisect--helper.c:17
3769msgid "perform 'git bisect next'"
3770msgstr "执行 'git bisect next'"
3771
3772#: builtin/bisect--helper.c:19
3773msgid "update BISECT_HEAD instead of checking out the current commit"
3774msgstr "更新 BISECT_HEAD 而非检出当前提交"
3775
3776#: builtin/blame.c:33
3777msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3778msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3779
3780#: builtin/blame.c:38
3781msgid "<rev-opts> are documented in git-rev-list(1)"
3782msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3783
3784#: builtin/blame.c:1782
3785msgid "Blaming lines"
3786msgstr "追踪代码行"
3787
3788#: builtin/blame.c:2531
3789msgid "Show blame entries as we find them, incrementally"
3790msgstr "增量式地显示发现的 blame 条目"
3791
3792#: builtin/blame.c:2532
3793msgid "Show blank SHA-1 for boundary commits (Default: off)"
3794msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3795
3796#: builtin/blame.c:2533
3797msgid "Do not treat root commits as boundaries (Default: off)"
3798msgstr "不把根提交作为边界(默认:关闭)"
3799
3800#: builtin/blame.c:2534
3801msgid "Show work cost statistics"
3802msgstr "显示命令消耗统计"
3803
3804#: builtin/blame.c:2535
3805msgid "Force progress reporting"
3806msgstr "强制进度显示"
3807
3808#: builtin/blame.c:2536
3809msgid "Show output score for blame entries"
3810msgstr "显示判断 blame 条目位移的得分诊断信息"
3811
3812#: builtin/blame.c:2537
3813msgid "Show original filename (Default: auto)"
3814msgstr "显示原始文件名(默认:自动)"
3815
3816#: builtin/blame.c:2538
3817msgid "Show original linenumber (Default: off)"
3818msgstr "显示原始的行号(默认:关闭)"
3819
3820#: builtin/blame.c:2539
3821msgid "Show in a format designed for machine consumption"
3822msgstr "显示为一个适合机器读取的格式"
3823
3824#: builtin/blame.c:2540
3825msgid "Show porcelain format with per-line commit information"
3826msgstr "为每一行显示机器适用的提交信息"
3827
3828#: builtin/blame.c:2541
3829msgid "Use the same output mode as git-annotate (Default: off)"
3830msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3831
3832#: builtin/blame.c:2542
3833msgid "Show raw timestamp (Default: off)"
3834msgstr "显示原始时间戳(默认:关闭)"
3835
3836#: builtin/blame.c:2543
3837msgid "Show long commit SHA1 (Default: off)"
3838msgstr "显示长的 SHA1 提交号(默认:关闭)"
3839
3840#: builtin/blame.c:2544
3841msgid "Suppress author name and timestamp (Default: off)"
3842msgstr "隐藏作者名字和时间戳(默认:关闭)"
3843
3844#: builtin/blame.c:2545
3845msgid "Show author email instead of name (Default: off)"
3846msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3847
3848#: builtin/blame.c:2546
3849msgid "Ignore whitespace differences"
3850msgstr "忽略空白差异"
3851
3852#: builtin/blame.c:2547
3853msgid "Spend extra cycles to find better match"
3854msgstr "花费额外的循环来找到更好的匹配"
3855
3856#: builtin/blame.c:2548
3857msgid "Use revisions from <file> instead of calling git-rev-list"
3858msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3859
3860#: builtin/blame.c:2549
3861msgid "Use <file>'s contents as the final image"
3862msgstr "使用 <文件> 的内容作为最终的图片"
3863
3864#: builtin/blame.c:2550 builtin/blame.c:2551
3865msgid "score"
3866msgstr "得分"
3867
3868#: builtin/blame.c:2550
3869msgid "Find line copies within and across files"
3870msgstr "找到文件内及跨文件的行拷贝"
3871
3872#: builtin/blame.c:2551
3873msgid "Find line movements within and across files"
3874msgstr "找到文件内及跨文件的行移动"
3875
3876#: builtin/blame.c:2552
3877msgid "n,m"
3878msgstr "n,m"
3879
3880#: builtin/blame.c:2552
3881msgid "Process only line range n,m, counting from 1"
3882msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3883
3884#. TRANSLATORS: This string is used to tell us the maximum
3885#. display width for a relative timestamp in "git blame"
3886#. output.  For C locale, "4 years, 11 months ago", which
3887#. takes 22 places, is the longest among various forms of
3888#. relative timestamps, but your language may need more or
3889#. fewer display columns.
3890#: builtin/blame.c:2641
3891msgid "4 years, 11 months ago"
3892msgstr "4 年 11 个月前"
3893
3894#: builtin/branch.c:26
3895msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3896msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3897
3898#: builtin/branch.c:27
3899msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3900msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3901
3902#: builtin/branch.c:28
3903msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3904msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3905
3906#: builtin/branch.c:29
3907msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3908msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3909
3910#: builtin/branch.c:30
3911msgid "git branch [<options>] [-r | -a] [--points-at]"
3912msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3913
3914#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3915#: builtin/branch.c:143
3916#, c-format
3917msgid ""
3918"deleting branch '%s' that has been merged to\n"
3919"         '%s', but not yet merged to HEAD."
3920msgstr ""
3921"将要删除的分支 '%s' 已经被合并到\n"
3922"         '%s',但未合并到 HEAD。"
3923
3924#  译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3925#: builtin/branch.c:147
3926#, c-format
3927msgid ""
3928"not deleting branch '%s' that is not yet merged to\n"
3929"         '%s', even though it is merged to HEAD."
3930msgstr ""
3931"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3932"         然而却尚未被合并到分支 '%s' 。"
3933
3934#: builtin/branch.c:161
3935#, c-format
3936msgid "Couldn't look up commit object for '%s'"
3937msgstr "无法查询 '%s' 指向的提交对象"
3938
3939#: builtin/branch.c:165
3940#, c-format
3941msgid ""
3942"The branch '%s' is not fully merged.\n"
3943"If you are sure you want to delete it, run 'git branch -D %s'."
3944msgstr ""
3945"分支 '%s' 没有完全合并。\n"
3946"如果您确认要删除它,执行 'git branch -D %s'。"
3947
3948#: builtin/branch.c:178
3949msgid "Update of config-file failed"
3950msgstr "无法更新 config 文件"
3951
3952#: builtin/branch.c:206
3953msgid "cannot use -a with -d"
3954msgstr "不能将 -a 和 -d 同时使用"
3955
3956#: builtin/branch.c:212
3957msgid "Couldn't look up commit object for HEAD"
3958msgstr "无法查询 HEAD 指向的提交对象"
3959
3960#: builtin/branch.c:226
3961#, c-format
3962msgid "Cannot delete branch '%s' checked out at '%s'"
3963msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
3964
3965#: builtin/branch.c:241
3966#, c-format
3967msgid "remote-tracking branch '%s' not found."
3968msgstr "未能找到远程跟踪分支 '%s'。"
3969
3970#: builtin/branch.c:242
3971#, c-format
3972msgid "branch '%s' not found."
3973msgstr "分支 '%s' 未发现。"
3974
3975#: builtin/branch.c:257
3976#, c-format
3977msgid "Error deleting remote-tracking branch '%s'"
3978msgstr "无法删除远程跟踪分支 '%s'"
3979
3980#: builtin/branch.c:258
3981#, c-format
3982msgid "Error deleting branch '%s'"
3983msgstr "无法删除分支 '%s'"
3984
3985#: builtin/branch.c:265
3986#, c-format
3987msgid "Deleted remote-tracking branch %s (was %s).\n"
3988msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3989
3990#: builtin/branch.c:266
3991#, c-format
3992msgid "Deleted branch %s (was %s).\n"
3993msgstr "已删除分支 %s(曾为 %s)。\n"
3994
3995#: builtin/branch.c:309
3996#, c-format
3997msgid "[%s: gone]"
3998msgstr "[%s: 丢失]"
3999
4000#: builtin/branch.c:314
4001#, c-format
4002msgid "[%s]"
4003msgstr "[%s]"
4004
4005#: builtin/branch.c:319
4006#, c-format
4007msgid "[%s: behind %d]"
4008msgstr "[%s:落后 %d]"
4009
4010#: builtin/branch.c:321
4011#, c-format
4012msgid "[behind %d]"
4013msgstr "[落后 %d]"
4014
4015#: builtin/branch.c:325
4016#, c-format
4017msgid "[%s: ahead %d]"
4018msgstr "[%s:领先 %d]"
4019
4020#: builtin/branch.c:327
4021#, c-format
4022msgid "[ahead %d]"
4023msgstr "[领先 %d]"
4024
4025#: builtin/branch.c:330
4026#, c-format
4027msgid "[%s: ahead %d, behind %d]"
4028msgstr "[%s:领先 %d,落后 %d]"
4029
4030#: builtin/branch.c:333
4031#, c-format
4032msgid "[ahead %d, behind %d]"
4033msgstr "[领先 %d,落后 %d]"
4034
4035#: builtin/branch.c:346
4036msgid " **** invalid ref ****"
4037msgstr " **** 无效引用 ****"
4038
4039#: builtin/branch.c:372
4040#, c-format
4041msgid "(no branch, rebasing %s)"
4042msgstr "(非分支,正变基 %s)"
4043
4044#: builtin/branch.c:375
4045#, c-format
4046msgid "(no branch, bisect started on %s)"
4047msgstr "(非分支,二分查找开始于 %s)"
4048
4049#. TRANSLATORS: make sure this matches
4050#. "HEAD detached at " in wt-status.c
4051#: builtin/branch.c:381
4052#, c-format
4053msgid "(HEAD detached at %s)"
4054msgstr "(头指针分离于 %s)"
4055
4056#. TRANSLATORS: make sure this matches
4057#. "HEAD detached from " in wt-status.c
4058#: builtin/branch.c:386
4059#, c-format
4060msgid "(HEAD detached from %s)"
4061msgstr "(头指针分离自 %s)"
4062
4063#: builtin/branch.c:390
4064msgid "(no branch)"
4065msgstr "(非分支)"
4066
4067#: builtin/branch.c:541
4068#, c-format
4069msgid "Branch %s is being rebased at %s"
4070msgstr "分支 %s 正被变基到 %s"
4071
4072#: builtin/branch.c:545
4073#, c-format
4074msgid "Branch %s is being bisected at %s"
4075msgstr "分支 %s 正被二分查找于 %s"
4076
4077#: builtin/branch.c:560
4078msgid "cannot rename the current branch while not on any."
4079msgstr "无法重命名当前分支因为不处于任何分支上。"
4080
4081#: builtin/branch.c:570
4082#, c-format
4083msgid "Invalid branch name: '%s'"
4084msgstr "无效的分支名:'%s'"
4085
4086#: builtin/branch.c:587
4087msgid "Branch rename failed"
4088msgstr "分支重命名失败"
4089
4090#: builtin/branch.c:591
4091#, c-format
4092msgid "Renamed a misnamed branch '%s' away"
4093msgstr "重命名掉一个错误命名的旧分支 '%s'"
4094
4095#: builtin/branch.c:594
4096#, c-format
4097msgid "Branch renamed to %s, but HEAD is not updated!"
4098msgstr "分支重命名为 %s,但 HEAD 没有更新!"
4099
4100#: builtin/branch.c:601
4101msgid "Branch is renamed, but update of config-file failed"
4102msgstr "分支被重命名,但更新 config 文件失败"
4103
4104#: builtin/branch.c:623
4105msgid "could not write branch description template"
4106msgstr "不能写分支描述模版"
4107
4108#: builtin/branch.c:651
4109msgid "Generic options"
4110msgstr "通用选项"
4111
4112#: builtin/branch.c:653
4113msgid "show hash and subject, give twice for upstream branch"
4114msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
4115
4116#: builtin/branch.c:654
4117msgid "suppress informational messages"
4118msgstr "不显示信息"
4119
4120#: builtin/branch.c:655
4121msgid "set up tracking mode (see git-pull(1))"
4122msgstr "设置跟踪模式(参见 git-pull(1))"
4123
4124#: builtin/branch.c:657
4125msgid "change upstream info"
4126msgstr "改变上游信息"
4127
4128#: builtin/branch.c:659
4129msgid "upstream"
4130msgstr "上游"
4131
4132#: builtin/branch.c:659
4133msgid "change the upstream info"
4134msgstr "改变上游信息"
4135
4136#: builtin/branch.c:661
4137msgid "use colored output"
4138msgstr "使用彩色输出"
4139
4140#: builtin/branch.c:662
4141msgid "act on remote-tracking branches"
4142msgstr "作用于远程跟踪分支"
4143
4144#: builtin/branch.c:664 builtin/branch.c:665
4145msgid "print only branches that contain the commit"
4146msgstr "只打印包含该提交的分支"
4147
4148#: builtin/branch.c:668
4149msgid "Specific git-branch actions:"
4150msgstr "具体的 git-branch 动作:"
4151
4152#: builtin/branch.c:669
4153msgid "list both remote-tracking and local branches"
4154msgstr "列出远程跟踪及本地分支"
4155
4156#: builtin/branch.c:671
4157msgid "delete fully merged branch"
4158msgstr "删除完全合并的分支"
4159
4160#: builtin/branch.c:672
4161msgid "delete branch (even if not merged)"
4162msgstr "删除分支(即使没有合并)"
4163
4164#: builtin/branch.c:673
4165msgid "move/rename a branch and its reflog"
4166msgstr "移动/重命名一个分支,以及它的引用日志"
4167
4168#: builtin/branch.c:674
4169msgid "move/rename a branch, even if target exists"
4170msgstr "移动/重命名一个分支,即使目标已存在"
4171
4172#: builtin/branch.c:675
4173msgid "list branch names"
4174msgstr "列出分支名"
4175
4176#: builtin/branch.c:676
4177msgid "create the branch's reflog"
4178msgstr "创建分支的引用日志"
4179
4180#: builtin/branch.c:678
4181msgid "edit the description for the branch"
4182msgstr "标记分支的描述"
4183
4184#: builtin/branch.c:679
4185msgid "force creation, move/rename, deletion"
4186msgstr "强制创建、移动/重命名、删除"
4187
4188#: builtin/branch.c:680
4189msgid "print only branches that are merged"
4190msgstr "只打印已经合并的分支"
4191
4192#: builtin/branch.c:681
4193msgid "print only branches that are not merged"
4194msgstr "只打印尚未合并的分支"
4195
4196#: builtin/branch.c:682
4197msgid "list branches in columns"
4198msgstr "以列的方式显示分支"
4199
4200#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
4201msgid "key"
4202msgstr "key"
4203
4204#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
4205msgid "field name to sort on"
4206msgstr "排序的字段名"
4207
4208#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
4209#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
4210#: builtin/tag.c:369
4211msgid "object"
4212msgstr "对象"
4213
4214#: builtin/branch.c:687
4215msgid "print only branches of the object"
4216msgstr "只打印指向该对象的分支"
4217
4218#: builtin/branch.c:705
4219msgid "Failed to resolve HEAD as a valid ref."
4220msgstr "无法将 HEAD 解析为有效引用。"
4221
4222#: builtin/branch.c:709 builtin/clone.c:707
4223msgid "HEAD not found below refs/heads!"
4224msgstr "HEAD 没有位于 /refs/heads 之下!"
4225
4226#: builtin/branch.c:729
4227msgid "--column and --verbose are incompatible"
4228msgstr "--column 和 --verbose 不兼容"
4229
4230#: builtin/branch.c:740 builtin/branch.c:782
4231msgid "branch name required"
4232msgstr "必须提供分支名"
4233
4234#: builtin/branch.c:758
4235msgid "Cannot give description to detached HEAD"
4236msgstr "不能向分离头指针提供描述"
4237
4238#: builtin/branch.c:763
4239msgid "cannot edit description of more than one branch"
4240msgstr "不能为一个以上的分支编辑描述"
4241
4242#: builtin/branch.c:770
4243#, c-format
4244msgid "No commit on branch '%s' yet."
4245msgstr "分支 '%s' 尚无提交。"
4246
4247#: builtin/branch.c:773
4248#, c-format
4249msgid "No branch named '%s'."
4250msgstr "没有分支 '%s'。"
4251
4252#: builtin/branch.c:788
4253msgid "too many branches for a rename operation"
4254msgstr "为重命名操作提供了太多的分支名"
4255
4256#: builtin/branch.c:793
4257msgid "too many branches to set new upstream"
4258msgstr "为设置新上游提供了太多的分支名"
4259
4260#: builtin/branch.c:797
4261#, c-format
4262msgid ""
4263"could not set upstream of HEAD to %s when it does not point to any branch."
4264msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
4265
4266#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
4267#, c-format
4268msgid "no such branch '%s'"
4269msgstr "没有此分支 '%s'"
4270
4271#: builtin/branch.c:804
4272#, c-format
4273msgid "branch '%s' does not exist"
4274msgstr "分支 '%s' 不存在"
4275
4276#: builtin/branch.c:816
4277msgid "too many branches to unset upstream"
4278msgstr "为取消上游设置操作提供了太多的分支名"
4279
4280#: builtin/branch.c:820
4281msgid "could not unset upstream of HEAD when it does not point to any branch."
4282msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
4283
4284#: builtin/branch.c:826
4285#, c-format
4286msgid "Branch '%s' has no upstream information"
4287msgstr "分支 '%s' 没有上游信息"
4288
4289#: builtin/branch.c:840
4290msgid "it does not make sense to create 'HEAD' manually"
4291msgstr "手工创建 'HEAD' 没有意义"
4292
4293#: builtin/branch.c:846
4294msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4295msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4296
4297#: builtin/branch.c:849
4298#, c-format
4299msgid ""
4300"The --set-upstream flag is deprecated and will be removed. Consider using --"
4301"track or --set-upstream-to\n"
4302msgstr ""
4303"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
4304
4305#: builtin/branch.c:866
4306#, c-format
4307msgid ""
4308"\n"
4309"If you wanted to make '%s' track '%s', do this:\n"
4310"\n"
4311msgstr ""
4312"\n"
4313"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4314"\n"
4315
4316#: builtin/bundle.c:51
4317#, c-format
4318msgid "%s is okay\n"
4319msgstr "%s 可以\n"
4320
4321#: builtin/bundle.c:64
4322msgid "Need a repository to create a bundle."
4323msgstr "需要一个仓库来创建包。"
4324
4325#: builtin/bundle.c:68
4326msgid "Need a repository to unbundle."
4327msgstr "需要一个仓库来解包。"
4328
4329#: builtin/cat-file.c:428
4330msgid ""
4331"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4332"<type>|--textconv) <object>"
4333msgstr ""
4334"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4335">|--textconv) <对象>"
4336
4337#: builtin/cat-file.c:429
4338msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4339msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4340
4341#: builtin/cat-file.c:466
4342msgid "<type> can be one of: blob, tree, commit, tag"
4343msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
4344
4345#: builtin/cat-file.c:467
4346msgid "show object type"
4347msgstr "显示对象类型"
4348
4349#: builtin/cat-file.c:468
4350msgid "show object size"
4351msgstr "显示对象大小"
4352
4353#: builtin/cat-file.c:470
4354msgid "exit with zero when there's no error"
4355msgstr "当没有错误时退出并返回零"
4356
4357#: builtin/cat-file.c:471
4358msgid "pretty-print object's content"
4359msgstr "美观地打印对象的内容"
4360
4361#: builtin/cat-file.c:473
4362msgid "for blob objects, run textconv on object's content"
4363msgstr "对于数据对象,对其内容执行 textconv"
4364
4365#: builtin/cat-file.c:475
4366msgid "allow -s and -t to work with broken/corrupt objects"
4367msgstr "允许 -s 和 -t 对损坏的对象生效"
4368
4369#: builtin/cat-file.c:476
4370msgid "buffer --batch output"
4371msgstr "缓冲 --batch 的输出"
4372
4373#: builtin/cat-file.c:478
4374msgid "show info and content of objects fed from the standard input"
4375msgstr "显示从标准输入提供的对象的信息和内容"
4376
4377#: builtin/cat-file.c:481
4378msgid "show info about objects fed from the standard input"
4379msgstr "显示从标准输入提供的对象的信息"
4380
4381#: builtin/cat-file.c:484
4382msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4383msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4384
4385#: builtin/cat-file.c:486
4386msgid "show all objects with --batch or --batch-check"
4387msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4388
4389#: builtin/check-attr.c:11
4390msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4391msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4392
4393#: builtin/check-attr.c:12
4394msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4395msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4396
4397#: builtin/check-attr.c:19
4398msgid "report all attributes set on file"
4399msgstr "报告设置在文件上的所有属性"
4400
4401#: builtin/check-attr.c:20
4402msgid "use .gitattributes only from the index"
4403msgstr "只使用索引中的 .gitattributes"
4404
4405#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4406msgid "read file names from stdin"
4407msgstr "从标准输入读出文件名"
4408
4409#: builtin/check-attr.c:23 builtin/check-ignore.c:24
4410msgid "terminate input and output records by a NUL character"
4411msgstr "输入和输出的记录使用 NUL 字符终结"
4412
4413#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
4414msgid "suppress progress reporting"
4415msgstr "不显示进度报告"
4416
4417#: builtin/check-ignore.c:26
4418msgid "show non-matching input paths"
4419msgstr "显示未匹配的输入路径"
4420
4421#: builtin/check-ignore.c:28
4422msgid "ignore index when checking"
4423msgstr "检查时忽略索引"
4424
4425#: builtin/check-ignore.c:154
4426msgid "cannot specify pathnames with --stdin"
4427msgstr "不能同时指定路径及 --stdin 参数"
4428
4429#: builtin/check-ignore.c:157
4430msgid "-z only makes sense with --stdin"
4431msgstr "-z 需要和 --stdin 参数共用才有意义"
4432
4433#: builtin/check-ignore.c:159
4434msgid "no path specified"
4435msgstr "未指定路径"
4436
4437#: builtin/check-ignore.c:163
4438msgid "--quiet is only valid with a single pathname"
4439msgstr "参数 --quiet 只在提供一个路径名时有效"
4440
4441#: builtin/check-ignore.c:165
4442msgid "cannot have both --quiet and --verbose"
4443msgstr "不能同时提供 --quiet 和 --verbose 参数"
4444
4445#: builtin/check-ignore.c:168
4446msgid "--non-matching is only valid with --verbose"
4447msgstr "--non-matching 选项只在使用 --verbose 时有效"
4448
4449#: builtin/check-mailmap.c:8
4450msgid "git check-mailmap [<options>] <contact>..."
4451msgstr "git check-mailmap [<选项>] <联系地址>..."
4452
4453#: builtin/check-mailmap.c:13
4454msgid "also read contacts from stdin"
4455msgstr "还从标准输入读取联系地址"
4456
4457#: builtin/check-mailmap.c:24
4458#, c-format
4459msgid "unable to parse contact: %s"
4460msgstr "不能解析联系地址:%s"
4461
4462#: builtin/check-mailmap.c:47
4463msgid "no contacts specified"
4464msgstr "未指定联系地址"
4465
4466#: builtin/checkout-index.c:127
4467msgid "git checkout-index [<options>] [--] [<file>...]"
4468msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4469
4470#: builtin/checkout-index.c:144
4471msgid "stage should be between 1 and 3 or all"
4472msgstr "索引值应该取值 1 到 3 或者 all"
4473
4474#: builtin/checkout-index.c:160
4475msgid "check out all files in the index"
4476msgstr "检出索引区的所有文件"
4477
4478#: builtin/checkout-index.c:161
4479msgid "force overwrite of existing files"
4480msgstr "强制覆盖现有的文件"
4481
4482#: builtin/checkout-index.c:163
4483msgid "no warning for existing files and files not in index"
4484msgstr "存在或不在索引中的文件都没有警告"
4485
4486#: builtin/checkout-index.c:165
4487msgid "don't checkout new files"
4488msgstr "不检出新文件"
4489
4490#: builtin/checkout-index.c:167
4491msgid "update stat information in the index file"
4492msgstr "更新索引中文件的状态信息"
4493
4494#: builtin/checkout-index.c:171
4495msgid "read list of paths from the standard input"
4496msgstr "从标准输入读取路径列表"
4497
4498#: builtin/checkout-index.c:173
4499msgid "write the content to temporary files"
4500msgstr "将内容写入临时文件"
4501
4502#: builtin/checkout-index.c:174 builtin/column.c:30
4503#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
4504#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
4505#: builtin/submodule--helper.c:774
4506msgid "string"
4507msgstr "字符串"
4508
4509#: builtin/checkout-index.c:175
4510msgid "when creating files, prepend <string>"
4511msgstr "在创建文件时,在前面加上 <字符串>"
4512
4513#: builtin/checkout-index.c:177
4514msgid "copy out the files from named stage"
4515msgstr "从指定暂存区中拷出文件"
4516
4517#: builtin/checkout.c:25
4518msgid "git checkout [<options>] <branch>"
4519msgstr "git checkout [<选项>] <分支>"
4520
4521#: builtin/checkout.c:26
4522msgid "git checkout [<options>] [<branch>] -- <file>..."
4523msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4524
4525#: builtin/checkout.c:134 builtin/checkout.c:167
4526#, c-format
4527msgid "path '%s' does not have our version"
4528msgstr "路径 '%s' 没有我们的版本"
4529
4530#: builtin/checkout.c:136 builtin/checkout.c:169
4531#, c-format
4532msgid "path '%s' does not have their version"
4533msgstr "路径 '%s' 没有他们的版本"
4534
4535#: builtin/checkout.c:152
4536#, c-format
4537msgid "path '%s' does not have all necessary versions"
4538msgstr "路径 '%s' 没有全部必须的版本"
4539
4540#: builtin/checkout.c:196
4541#, c-format
4542msgid "path '%s' does not have necessary versions"
4543msgstr "路径 '%s' 没有必须的版本"
4544
4545#: builtin/checkout.c:213
4546#, c-format
4547msgid "path '%s': cannot merge"
4548msgstr "path '%s':无法合并"
4549
4550#: builtin/checkout.c:230
4551#, c-format
4552msgid "Unable to add merge result for '%s'"
4553msgstr "无法为 '%s' 添加合并结果"
4554
4555#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
4556#: builtin/checkout.c:259
4557#, c-format
4558msgid "'%s' cannot be used with updating paths"
4559msgstr "'%s' 不能在更新路径时使用"
4560
4561#: builtin/checkout.c:262 builtin/checkout.c:265
4562#, c-format
4563msgid "'%s' cannot be used with %s"
4564msgstr "'%s' 不能和 %s 同时使用"
4565
4566#: builtin/checkout.c:268
4567#, c-format
4568msgid "Cannot update paths and switch to branch '%s' at the same time."
4569msgstr "不能同时更新路径并切换到分支'%s'。"
4570
4571#: builtin/checkout.c:279 builtin/checkout.c:473
4572msgid "corrupt index file"
4573msgstr "损坏的索引文件"
4574
4575#: builtin/checkout.c:339 builtin/checkout.c:346
4576#, c-format
4577msgid "path '%s' is unmerged"
4578msgstr "路径 '%s' 未合并"
4579
4580#: builtin/checkout.c:495
4581msgid "you need to resolve your current index first"
4582msgstr "您需要先解决当前索引的冲突"
4583
4584#: builtin/checkout.c:622
4585#, c-format
4586msgid "Can not do reflog for '%s': %s\n"
4587msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4588
4589#: builtin/checkout.c:660
4590msgid "HEAD is now at"
4591msgstr "HEAD 目前位于"
4592
4593#: builtin/checkout.c:664 builtin/clone.c:661
4594msgid "unable to update HEAD"
4595msgstr "不能更新 HEAD"
4596
4597#: builtin/checkout.c:668
4598#, c-format
4599msgid "Reset branch '%s'\n"
4600msgstr "重置分支 '%s'\n"
4601
4602#: builtin/checkout.c:671
4603#, c-format
4604msgid "Already on '%s'\n"
4605msgstr "已经位于 '%s'\n"
4606
4607#: builtin/checkout.c:675
4608#, c-format
4609msgid "Switched to and reset branch '%s'\n"
4610msgstr "切换并重置分支 '%s'\n"
4611
4612#: builtin/checkout.c:677 builtin/checkout.c:1067
4613#, c-format
4614msgid "Switched to a new branch '%s'\n"
4615msgstr "切换到一个新分支 '%s'\n"
4616
4617#: builtin/checkout.c:679
4618#, c-format
4619msgid "Switched to branch '%s'\n"
4620msgstr "切换到分支 '%s'\n"
4621
4622#  译者:注意保持前导空格
4623#: builtin/checkout.c:731
4624#, c-format
4625msgid " ... and %d more.\n"
4626msgstr " ... 及其它 %d 个。\n"
4627
4628#: builtin/checkout.c:737
4629#, c-format
4630msgid ""
4631"Warning: you are leaving %d commit behind, not connected to\n"
4632"any of your branches:\n"
4633"\n"
4634"%s\n"
4635msgid_plural ""
4636"Warning: you are leaving %d commits behind, not connected to\n"
4637"any of your branches:\n"
4638"\n"
4639"%s\n"
4640msgstr[0] ""
4641"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4642"\n"
4643"%s\n"
4644msgstr[1] ""
4645"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4646"\n"
4647"%s\n"
4648
4649#: builtin/checkout.c:756
4650#, c-format
4651msgid ""
4652"If you want to keep it by creating a new branch, this may be a good time\n"
4653"to do so with:\n"
4654"\n"
4655" git branch <new-branch-name> %s\n"
4656"\n"
4657msgid_plural ""
4658"If you want to keep them by creating a new branch, this may be a good time\n"
4659"to do so with:\n"
4660"\n"
4661" git branch <new-branch-name> %s\n"
4662"\n"
4663msgstr[0] ""
4664"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4665"如下操作:\n"
4666"\n"
4667" git branch <新分支名> %s\n"
4668"\n"
4669msgstr[1] ""
4670"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4671"如下操作:\n"
4672"\n"
4673" git branch <新分支名> %s\n"
4674"\n"
4675
4676#: builtin/checkout.c:792
4677msgid "internal error in revision walk"
4678msgstr "在版本遍历时遇到内部错误"
4679
4680#: builtin/checkout.c:796
4681msgid "Previous HEAD position was"
4682msgstr "之前的 HEAD 位置是"
4683
4684#: builtin/checkout.c:823 builtin/checkout.c:1062
4685msgid "You are on a branch yet to be born"
4686msgstr "您位于一个尚未初始化的分支"
4687
4688#: builtin/checkout.c:968
4689#, c-format
4690msgid "only one reference expected, %d given."
4691msgstr "只要一个引用,却给出了 %d 个"
4692
4693#: builtin/checkout.c:1008 builtin/worktree.c:212
4694#, c-format
4695msgid "invalid reference: %s"
4696msgstr "无效引用:%s"
4697
4698#: builtin/checkout.c:1037
4699#, c-format
4700msgid "reference is not a tree: %s"
4701msgstr "引用不是一个树:%s"
4702
4703#: builtin/checkout.c:1076
4704msgid "paths cannot be used with switching branches"
4705msgstr "路径不能和切换分支同时使用"
4706
4707#: builtin/checkout.c:1079 builtin/checkout.c:1083
4708#, c-format
4709msgid "'%s' cannot be used with switching branches"
4710msgstr "'%s' 不能和切换分支同时使用"
4711
4712#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
4713#: builtin/checkout.c:1098
4714#, c-format
4715msgid "'%s' cannot be used with '%s'"
4716msgstr "'%s' 不能和 '%s' 同时使用"
4717
4718#: builtin/checkout.c:1103
4719#, c-format
4720msgid "Cannot switch branch to a non-commit '%s'"
4721msgstr "不能切换分支到一个非提交 '%s'"
4722
4723#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
4724#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
4725#: builtin/worktree.c:325
4726msgid "branch"
4727msgstr "分支"
4728
4729#: builtin/checkout.c:1137
4730msgid "create and checkout a new branch"
4731msgstr "创建并检出一个新的分支"
4732
4733#: builtin/checkout.c:1139
4734msgid "create/reset and checkout a branch"
4735msgstr "创建/重置并检出一个分支"
4736
4737#: builtin/checkout.c:1140
4738msgid "create reflog for new branch"
4739msgstr "为新的分支创建引用日志"
4740
4741#: builtin/checkout.c:1141
4742msgid "detach the HEAD at named commit"
4743msgstr "成为指向该提交的分离头指针"
4744
4745#: builtin/checkout.c:1142
4746msgid "set upstream info for new branch"
4747msgstr "为新的分支设置上游信息"
4748
4749#: builtin/checkout.c:1144
4750msgid "new-branch"
4751msgstr "新分支"
4752
4753#: builtin/checkout.c:1144
4754msgid "new unparented branch"
4755msgstr "新的没有父提交的分支"
4756
4757#: builtin/checkout.c:1145
4758msgid "checkout our version for unmerged files"
4759msgstr "对尚未合并的文件检出我们的版本"
4760
4761#: builtin/checkout.c:1147
4762msgid "checkout their version for unmerged files"
4763msgstr "对尚未合并的文件检出他们的版本"
4764
4765#: builtin/checkout.c:1149
4766msgid "force checkout (throw away local modifications)"
4767msgstr "强制检出(丢弃本地修改)"
4768
4769#: builtin/checkout.c:1150
4770msgid "perform a 3-way merge with the new branch"
4771msgstr "和新的分支执行三方合并"
4772
4773#: builtin/checkout.c:1151 builtin/merge.c:230
4774msgid "update ignored files (default)"
4775msgstr "更新忽略的文件(默认)"
4776
4777#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
4778msgid "style"
4779msgstr "风格"
4780
4781#: builtin/checkout.c:1153
4782msgid "conflict style (merge or diff3)"
4783msgstr "冲突输出风格(merge 或 diff3)"
4784
4785#: builtin/checkout.c:1156
4786msgid "do not limit pathspecs to sparse entries only"
4787msgstr "对路径不做稀疏检出的限制"
4788
4789#: builtin/checkout.c:1158
4790msgid "second guess 'git checkout <no-such-branch>'"
4791msgstr "二次猜测'git checkout <无此分支>'"
4792
4793#: builtin/checkout.c:1160
4794msgid "do not check if another worktree is holding the given ref"
4795msgstr "不检查指定的引用是否被其他工作区所占用"
4796
4797#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
4798#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
4799#: builtin/send-pack.c:168
4800msgid "force progress reporting"
4801msgstr "强制显示进度报告"
4802
4803#: builtin/checkout.c:1192
4804msgid "-b, -B and --orphan are mutually exclusive"
4805msgstr "-b、-B 和 --orphan 是互斥的"
4806
4807#: builtin/checkout.c:1209
4808msgid "--track needs a branch name"
4809msgstr "--track 需要一个分支名"
4810
4811#: builtin/checkout.c:1214
4812msgid "Missing branch name; try -b"
4813msgstr "缺少分支名;尝试 -b"
4814
4815#: builtin/checkout.c:1250
4816msgid "invalid path specification"
4817msgstr "无效的路径规格"
4818
4819#: builtin/checkout.c:1257
4820#, c-format
4821msgid ""
4822"Cannot update paths and switch to branch '%s' at the same time.\n"
4823"Did you intend to checkout '%s' which can not be resolved as commit?"
4824msgstr ""
4825"不能同时更新路径并切换到分支'%s'。\n"
4826"您是想要检出 '%s' 但其未能解析为提交么?"
4827
4828#: builtin/checkout.c:1262
4829#, c-format
4830msgid "git checkout: --detach does not take a path argument '%s'"
4831msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4832
4833#: builtin/checkout.c:1266
4834msgid ""
4835"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4836"checking out of the index."
4837msgstr ""
4838"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4839
4840#: builtin/clean.c:25
4841msgid ""
4842"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4843msgstr ""
4844"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4845
4846#: builtin/clean.c:29
4847#, c-format
4848msgid "Removing %s\n"
4849msgstr "正删除 %s\n"
4850
4851#: builtin/clean.c:30
4852#, c-format
4853msgid "Would remove %s\n"
4854msgstr "将删除 %s\n"
4855
4856#: builtin/clean.c:31
4857#, c-format
4858msgid "Skipping repository %s\n"
4859msgstr "忽略仓库 %s\n"
4860
4861#: builtin/clean.c:32
4862#, c-format
4863msgid "Would skip repository %s\n"
4864msgstr "将忽略仓库 %s\n"
4865
4866#: builtin/clean.c:33
4867#, c-format
4868msgid "failed to remove %s"
4869msgstr "无法删除 %s"
4870
4871#: builtin/clean.c:291
4872msgid ""
4873"Prompt help:\n"
4874"1          - select a numbered item\n"
4875"foo        - select item based on unique prefix\n"
4876"           - (empty) select nothing"
4877msgstr ""
4878"帮助:\n"
4879"1          - 通过编号选择一个选项\n"
4880"foo        - 通过标题选择一个选项\n"
4881"           - (空)什么也不选择"
4882
4883#: builtin/clean.c:295
4884msgid ""
4885"Prompt help:\n"
4886"1          - select a single item\n"
4887"3-5        - select a range of items\n"
4888"2-3,6-9    - select multiple ranges\n"
4889"foo        - select item based on unique prefix\n"
4890"-...       - unselect specified items\n"
4891"*          - choose all items\n"
4892"           - (empty) finish selecting"
4893msgstr ""
4894"帮助:\n"
4895"1          - 选择一个选项\n"
4896"3-5        - 选择一个范围内的所有选项\n"
4897"2-3,6-9    - 选择多个范围内的所有选项\n"
4898"foo        - 通过标题选择一个选项\n"
4899"-...       - 反选特定的选项\n"
4900"*          - 选择所有选项\n"
4901"           - (空)结束选择"
4902
4903#: builtin/clean.c:511
4904#, c-format
4905msgid "Huh (%s)?"
4906msgstr "嗯(%s)?"
4907
4908#: builtin/clean.c:653
4909#, c-format
4910msgid "Input ignore patterns>> "
4911msgstr "输入模版以排除条目>> "
4912
4913#: builtin/clean.c:690
4914#, c-format
4915msgid "WARNING: Cannot find items matched by: %s"
4916msgstr "警告:无法找到和 %s 匹配的条目"
4917
4918#: builtin/clean.c:711
4919msgid "Select items to delete"
4920msgstr "选择要删除的条目"
4921
4922#. TRANSLATORS: Make sure to keep [y/N] as is
4923#: builtin/clean.c:752
4924#, c-format
4925msgid "Remove %s [y/N]? "
4926msgstr "删除 %s [y/N]?"
4927
4928#: builtin/clean.c:777
4929msgid "Bye."
4930msgstr "再见。"
4931
4932#: builtin/clean.c:785
4933msgid ""
4934"clean               - start cleaning\n"
4935"filter by pattern   - exclude items from deletion\n"
4936"select by numbers   - select items to be deleted by numbers\n"
4937"ask each            - confirm each deletion (like \"rm -i\")\n"
4938"quit                - stop cleaning\n"
4939"help                - this screen\n"
4940"?                   - help for prompt selection"
4941msgstr ""
4942"clean               - 开始清理\n"
4943"filter by pattern   - 通过模版排除要删除的条目\n"
4944"select by numbers   - 通过数字选择要删除的条目\n"
4945"ask each            - 针对删除逐一询问(就像 \"rm -i\")\n"
4946"quit                - 停止删除并退出\n"
4947"help                - 显示本帮助\n"
4948"?                   - 显示如何在提示符下选择的帮助"
4949
4950#: builtin/clean.c:812
4951msgid "*** Commands ***"
4952msgstr "*** 命令 ***"
4953
4954#: builtin/clean.c:813
4955msgid "What now"
4956msgstr "请选择"
4957
4958#: builtin/clean.c:821
4959msgid "Would remove the following item:"
4960msgid_plural "Would remove the following items:"
4961msgstr[0] "将删除如下条目:"
4962msgstr[1] "将删除如下条目:"
4963
4964#: builtin/clean.c:838
4965msgid "No more files to clean, exiting."
4966msgstr "没有要清理的文件,退出。"
4967
4968#: builtin/clean.c:869
4969msgid "do not print names of files removed"
4970msgstr "不打印删除文件的名称"
4971
4972#: builtin/clean.c:871
4973msgid "force"
4974msgstr "强制"
4975
4976#: builtin/clean.c:872
4977msgid "interactive cleaning"
4978msgstr "交互式清除"
4979
4980#: builtin/clean.c:874
4981msgid "remove whole directories"
4982msgstr "删除整个目录"
4983
4984#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
4985#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
4986msgid "pattern"
4987msgstr "模式"
4988
4989#: builtin/clean.c:876
4990msgid "add <pattern> to ignore rules"
4991msgstr "添加 <模式> 到忽略规则"
4992
4993#: builtin/clean.c:877
4994msgid "remove ignored files, too"
4995msgstr "也删除忽略的文件"
4996
4997#: builtin/clean.c:879
4998msgid "remove only ignored files"
4999msgstr "只删除忽略的文件"
5000
5001#: builtin/clean.c:897
5002msgid "-x and -X cannot be used together"
5003msgstr "-x 和 -X 不能同时使用"
5004
5005#: builtin/clean.c:901
5006msgid ""
5007"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
5008"clean"
5009msgstr ""
5010"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5011
5012#: builtin/clean.c:904
5013msgid ""
5014"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
5015"refusing to clean"
5016msgstr ""
5017"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5018
5019#: builtin/clone.c:37
5020msgid "git clone [<options>] [--] <repo> [<dir>]"
5021msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
5022
5023#: builtin/clone.c:62
5024msgid "don't create a checkout"
5025msgstr "不创建一个检出"
5026
5027#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
5028msgid "create a bare repository"
5029msgstr "创建一个纯仓库"
5030
5031#: builtin/clone.c:67
5032msgid "create a mirror repository (implies bare)"
5033msgstr "创建一个镜像仓库(也是纯仓库)"
5034
5035#: builtin/clone.c:69
5036msgid "to clone from a local repository"
5037msgstr "从本地仓库克隆"
5038
5039#: builtin/clone.c:71
5040msgid "don't use local hardlinks, always copy"
5041msgstr "不使用本地硬链接,始终复制"
5042
5043#: builtin/clone.c:73
5044msgid "setup as shared repository"
5045msgstr "设置为共享仓库"
5046
5047#: builtin/clone.c:75 builtin/clone.c:77
5048msgid "initialize submodules in the clone"
5049msgstr "在克隆时初始化子模组"
5050
5051#: builtin/clone.c:79
5052msgid "number of submodules cloned in parallel"
5053msgstr "并发克隆的子模组的数量"
5054
5055#: builtin/clone.c:80 builtin/init-db.c:470
5056msgid "template-directory"
5057msgstr "模板目录"
5058
5059#: builtin/clone.c:81 builtin/init-db.c:471
5060msgid "directory from which templates will be used"
5061msgstr "模板目录将被使用"
5062
5063#: builtin/clone.c:83 builtin/submodule--helper.c:498
5064#: builtin/submodule--helper.c:777
5065msgid "reference repository"
5066msgstr "参考仓库"
5067
5068#: builtin/clone.c:85
5069msgid "use --reference only while cloning"
5070msgstr "仅在克隆时参考 --reference 指向的本地仓库"
5071
5072#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
5073msgid "name"
5074msgstr "名称"
5075
5076#: builtin/clone.c:87
5077msgid "use <name> instead of 'origin' to track upstream"
5078msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
5079
5080#: builtin/clone.c:89
5081msgid "checkout <branch> instead of the remote's HEAD"
5082msgstr "检出 <分支> 而不是远程 HEAD"
5083
5084#: builtin/clone.c:91
5085msgid "path to git-upload-pack on the remote"
5086msgstr "远程 git-upload-pack 路径"
5087
5088#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
5089#: builtin/pull.c:201
5090msgid "depth"
5091msgstr "深度"
5092
5093#: builtin/clone.c:93
5094msgid "create a shallow clone of that depth"
5095msgstr "创建一个指定深度的浅克隆"
5096
5097#: builtin/clone.c:95
5098msgid "clone only one branch, HEAD or --branch"
5099msgstr "只克隆一个分支、HEAD 或 --branch"
5100
5101#: builtin/clone.c:97
5102msgid "any cloned submodules will be shallow"
5103msgstr "子模组将以浅下载模式克隆"
5104
5105#: builtin/clone.c:98 builtin/init-db.c:479
5106msgid "gitdir"
5107msgstr "git目录"
5108
5109#: builtin/clone.c:99 builtin/init-db.c:480
5110msgid "separate git dir from working tree"
5111msgstr "git目录和工作区分离"
5112
5113#: builtin/clone.c:100
5114msgid "key=value"
5115msgstr "key=value"
5116
5117#: builtin/clone.c:101
5118msgid "set config inside the new repository"
5119msgstr "在新仓库中设置配置信息"
5120
5121#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
5122msgid "use IPv4 addresses only"
5123msgstr "只使用 IPv4 地址"
5124
5125#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
5126msgid "use IPv6 addresses only"
5127msgstr "只使用 IPv6 地址"
5128
5129#: builtin/clone.c:241
5130msgid ""
5131"No directory name could be guessed.\n"
5132"Please specify a directory on the command line"
5133msgstr ""
5134"无法猜到目录名。\n"
5135"请在命令行指定一个目录"
5136
5137#: builtin/clone.c:307
5138#, c-format
5139msgid "reference repository '%s' as a linked checkout is not supported yet."
5140msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
5141
5142#: builtin/clone.c:309
5143#, c-format
5144msgid "reference repository '%s' is not a local repository."
5145msgstr "参考仓库 '%s' 不是一个本地仓库。"
5146
5147#: builtin/clone.c:314
5148#, c-format
5149msgid "reference repository '%s' is shallow"
5150msgstr "参考仓库 '%s' 是一个浅克隆"
5151
5152#: builtin/clone.c:317
5153#, c-format
5154msgid "reference repository '%s' is grafted"
5155msgstr "参考仓库 '%s' 已被嫁接"
5156
5157#: builtin/clone.c:384
5158#, c-format
5159msgid "%s exists and is not a directory"
5160msgstr "%s 存在且不是一个目录"
5161
5162#: builtin/clone.c:398
5163#, c-format
5164msgid "failed to stat %s\n"
5165msgstr "无法枚举 %s 状态\n"
5166
5167#: builtin/clone.c:420
5168#, c-format
5169msgid "failed to create link '%s'"
5170msgstr "无法创建链接 '%s'"
5171
5172#: builtin/clone.c:424
5173#, c-format
5174msgid "failed to copy file to '%s'"
5175msgstr "无法拷贝文件至 '%s'"
5176
5177#: builtin/clone.c:449 builtin/clone.c:633
5178#, c-format
5179msgid "done.\n"
5180msgstr "完成。\n"
5181
5182#: builtin/clone.c:461
5183msgid ""
5184"Clone succeeded, but checkout failed.\n"
5185"You can inspect what was checked out with 'git status'\n"
5186"and retry the checkout with 'git checkout -f HEAD'\n"
5187msgstr ""
5188"克隆成功,但是检出失败。\n"
5189"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
5190"'git checkout -f HEAD' 重试\n"
5191
5192#: builtin/clone.c:538
5193#, c-format
5194msgid "Could not find remote branch %s to clone."
5195msgstr "不能发现要克隆的远程分支 %s。"
5196
5197#: builtin/clone.c:628
5198#, c-format
5199msgid "Checking connectivity... "
5200msgstr "检查连接... "
5201
5202#: builtin/clone.c:631
5203msgid "remote did not send all necessary objects"
5204msgstr "远程没有发送所有必须的对象"
5205
5206#: builtin/clone.c:649
5207#, c-format
5208msgid "unable to update %s"
5209msgstr "不能更新 %s"
5210
5211#: builtin/clone.c:698
5212msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
5213msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
5214
5215#: builtin/clone.c:729
5216msgid "unable to checkout working tree"
5217msgstr "不能检出工作区"
5218
5219#: builtin/clone.c:767
5220msgid "unable to write parameters to config file"
5221msgstr "无法将参数写入配置文件"
5222
5223#: builtin/clone.c:830
5224msgid "cannot repack to clean up"
5225msgstr "无法执行 repack 来清理"
5226
5227#: builtin/clone.c:832
5228msgid "cannot unlink temporary alternates file"
5229msgstr "无法删除临时的 alternates 文件"
5230
5231#: builtin/clone.c:864 builtin/receive-pack.c:1731
5232msgid "Too many arguments."
5233msgstr "太多参数。"
5234
5235#: builtin/clone.c:868
5236msgid "You must specify a repository to clone."
5237msgstr "您必须指定一个仓库来克隆。"
5238
5239#: builtin/clone.c:879
5240#, c-format
5241msgid "--bare and --origin %s options are incompatible."
5242msgstr "--bare 和 --origin %s 选项不兼容。"
5243
5244#: builtin/clone.c:882
5245msgid "--bare and --separate-git-dir are incompatible."
5246msgstr "--bare 和 --separate-git-dir 选项不兼容。"
5247
5248#: builtin/clone.c:895
5249#, c-format
5250msgid "repository '%s' does not exist"
5251msgstr "仓库 '%s' 不存在"
5252
5253#: builtin/clone.c:901 builtin/fetch.c:1174
5254#, c-format
5255msgid "depth %s is not a positive number"
5256msgstr "深度 %s 不是一个正数"
5257
5258#: builtin/clone.c:911
5259#, c-format
5260msgid "destination path '%s' already exists and is not an empty directory."
5261msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
5262
5263#: builtin/clone.c:921
5264#, c-format
5265msgid "working tree '%s' already exists."
5266msgstr "工作区 '%s' 已经存在。"
5267
5268#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
5269#: builtin/worktree.c:220 builtin/worktree.c:247
5270#, c-format
5271msgid "could not create leading directories of '%s'"
5272msgstr "不能为 '%s' 创建先导目录"
5273
5274#: builtin/clone.c:939
5275#, c-format
5276msgid "could not create work tree dir '%s'"
5277msgstr "不能创建工作区目录 '%s'"
5278
5279#: builtin/clone.c:957
5280#, c-format
5281msgid "Cloning into bare repository '%s'...\n"
5282msgstr "克隆到纯仓库 '%s'...\n"
5283
5284#: builtin/clone.c:959
5285#, c-format
5286msgid "Cloning into '%s'...\n"
5287msgstr "正克隆到 '%s'...\n"
5288
5289#: builtin/clone.c:998
5290msgid "--depth is ignored in local clones; use file:// instead."
5291msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5292
5293#: builtin/clone.c:1001
5294msgid "source repository is shallow, ignoring --local"
5295msgstr "源仓库是浅克隆,忽略 --local"
5296
5297#: builtin/clone.c:1006
5298msgid "--local is ignored"
5299msgstr "--local 被忽略"
5300
5301#: builtin/clone.c:1010
5302#, c-format
5303msgid "Don't know how to clone %s"
5304msgstr "不知道如何克隆 %s"
5305
5306#: builtin/clone.c:1059 builtin/clone.c:1067
5307#, c-format
5308msgid "Remote branch %s not found in upstream %s"
5309msgstr "远程分支 %s 在上游 %s 未发现"
5310
5311#: builtin/clone.c:1070
5312msgid "You appear to have cloned an empty repository."
5313msgstr "您似乎克隆了一个空仓库。"
5314
5315#: builtin/column.c:9
5316msgid "git column [<options>]"
5317msgstr "git column [<选项>]"
5318
5319#: builtin/column.c:26
5320msgid "lookup config vars"
5321msgstr "查找配置变量"
5322
5323#: builtin/column.c:27 builtin/column.c:28
5324msgid "layout to use"
5325msgstr "要使用的布局"
5326
5327#: builtin/column.c:29
5328msgid "Maximum width"
5329msgstr "最大宽度"
5330
5331#: builtin/column.c:30
5332msgid "Padding space on left border"
5333msgstr "左边框的填充空间"
5334
5335#: builtin/column.c:31
5336msgid "Padding space on right border"
5337msgstr "右边框的填充空间"
5338
5339#: builtin/column.c:32
5340msgid "Padding space between columns"
5341msgstr "两列之间的填充空间"
5342
5343#: builtin/column.c:51
5344msgid "--command must be the first argument"
5345msgstr "--command 必须是第一个参数"
5346
5347#: builtin/commit.c:38
5348msgid "git commit [<options>] [--] <pathspec>..."
5349msgstr "git commit [<选项>] [--] <路径规格>..."
5350
5351#: builtin/commit.c:43
5352msgid "git status [<options>] [--] <pathspec>..."
5353msgstr "git status [<选项>] [--] <路径规格>..."
5354
5355#: builtin/commit.c:48
5356msgid ""
5357"Your name and email address were configured automatically based\n"
5358"on your username and hostname. Please check that they are accurate.\n"
5359"You can suppress this message by setting them explicitly. Run the\n"
5360"following command and follow the instructions in your editor to edit\n"
5361"your configuration file:\n"
5362"\n"
5363"    git config --global --edit\n"
5364"\n"
5365"After doing this, you may fix the identity used for this commit with:\n"
5366"\n"
5367"    git commit --amend --reset-author\n"
5368msgstr ""
5369"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5370"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5371"中编辑您的配置文件:\n"
5372"\n"
5373"    git config --global --edit\n"
5374"\n"
5375"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5376"\n"
5377"    git commit --amend --reset-author\n"
5378
5379#: builtin/commit.c:61
5380msgid ""
5381"Your name and email address were configured automatically based\n"
5382"on your username and hostname. Please check that they are accurate.\n"
5383"You can suppress this message by setting them explicitly:\n"
5384"\n"
5385"    git config --global user.name \"Your Name\"\n"
5386"    git config --global user.email you@example.com\n"
5387"\n"
5388"After doing this, you may fix the identity used for this commit with:\n"
5389"\n"
5390"    git commit --amend --reset-author\n"
5391msgstr ""
5392"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5393"与否。您可以对其进行设置以免再出现本提示信息:\n"
5394"\n"
5395"    git config --global user.name \"Your Name\"\n"
5396"    git config --global user.email you@example.com\n"
5397"\n"
5398"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5399"\n"
5400"    git commit --amend --reset-author\n"
5401
5402#: builtin/commit.c:73
5403msgid ""
5404"You asked to amend the most recent commit, but doing so would make\n"
5405"it empty. You can repeat your command with --allow-empty, or you can\n"
5406"remove the commit entirely with \"git reset HEAD^\".\n"
5407msgstr ""
5408"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5409"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5410
5411#: builtin/commit.c:78
5412msgid ""
5413"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5414"If you wish to commit it anyway, use:\n"
5415"\n"
5416"    git commit --allow-empty\n"
5417"\n"
5418msgstr ""
5419"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5420"也要提交,使用命令:\n"
5421"\n"
5422"    git commit --allow-empty\n"
5423"\n"
5424
5425#: builtin/commit.c:85
5426msgid "Otherwise, please use 'git reset'\n"
5427msgstr "否则,请使用命令 'git reset'\n"
5428
5429#: builtin/commit.c:88
5430msgid ""
5431"If you wish to skip this commit, use:\n"
5432"\n"
5433"    git reset\n"
5434"\n"
5435"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5436"the remaining commits.\n"
5437msgstr ""
5438"如果您想跳过这个提交,使用命令:\n"
5439"\n"
5440"    git reset\n"
5441"\n"
5442"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5443"操作。\n"
5444
5445#: builtin/commit.c:307
5446msgid "failed to unpack HEAD tree object"
5447msgstr "无法解包 HEAD 树对象"
5448
5449#: builtin/commit.c:348
5450msgid "unable to create temporary index"
5451msgstr "不能创建临时索引"
5452
5453#: builtin/commit.c:354
5454msgid "interactive add failed"
5455msgstr "交互式添加失败"
5456
5457#: builtin/commit.c:367
5458msgid "unable to update temporary index"
5459msgstr "无法更新临时索引"
5460
5461#: builtin/commit.c:369
5462msgid "Failed to update main cache tree"
5463msgstr "不能更新树的主缓存"
5464
5465#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
5466msgid "unable to write new_index file"
5467msgstr "无法写 new_index 文件"
5468
5469#: builtin/commit.c:447
5470msgid "cannot do a partial commit during a merge."
5471msgstr "在合并过程中不能做部分提交。"
5472
5473#: builtin/commit.c:449
5474msgid "cannot do a partial commit during a cherry-pick."
5475msgstr "在拣选过程中不能做部分提交。"
5476
5477#: builtin/commit.c:458
5478msgid "cannot read the index"
5479msgstr "无法读取索引"
5480
5481#: builtin/commit.c:477
5482msgid "unable to write temporary index file"
5483msgstr "无法写临时索引文件"
5484
5485#: builtin/commit.c:582
5486#, c-format
5487msgid "commit '%s' lacks author header"
5488msgstr "提交 '%s' 缺少作者信息"
5489
5490#: builtin/commit.c:584
5491#, c-format
5492msgid "commit '%s' has malformed author line"
5493msgstr "提交 '%s' 有非法的作者信息"
5494
5495#: builtin/commit.c:603
5496msgid "malformed --author parameter"
5497msgstr "非法的 --author 参数"
5498
5499#: builtin/commit.c:611
5500#, c-format
5501msgid "invalid date format: %s"
5502msgstr "无效的日期格式:%s"
5503
5504#: builtin/commit.c:655
5505msgid ""
5506"unable to select a comment character that is not used\n"
5507"in the current commit message"
5508msgstr "无法选择一个未被当前提交说明使用的注释字符"
5509
5510#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
5511#, c-format
5512msgid "could not lookup commit %s"
5513msgstr "不能查询提交 %s"
5514
5515#: builtin/commit.c:704 builtin/shortlog.c:285
5516#, c-format
5517msgid "(reading log message from standard input)\n"
5518msgstr "(正从标准输入中读取日志信息)\n"
5519
5520#: builtin/commit.c:706
5521msgid "could not read log from standard input"
5522msgstr "不能从标准输入中读取日志信息"
5523
5524#: builtin/commit.c:710
5525#, c-format
5526msgid "could not read log file '%s'"
5527msgstr "不能读取日志文件 '%s'"
5528
5529#: builtin/commit.c:737 builtin/commit.c:745
5530msgid "could not read SQUASH_MSG"
5531msgstr "不能读取 SQUASH_MSG"
5532
5533#: builtin/commit.c:742
5534msgid "could not read MERGE_MSG"
5535msgstr "不能读取 MERGE_MSG"
5536
5537#: builtin/commit.c:796
5538msgid "could not write commit template"
5539msgstr "不能写提交模版"
5540
5541#: builtin/commit.c:814
5542#, c-format
5543msgid ""
5544"\n"
5545"It looks like you may be committing a merge.\n"
5546"If this is not correct, please remove the file\n"
5547"\t%s\n"
5548"and try again.\n"
5549msgstr ""
5550"\n"
5551"似乎您正在做一个合并提交。如果不对,请删除文件\n"
5552"\t%s\n"
5553"然后重试。\n"
5554
5555#: builtin/commit.c:819
5556#, c-format
5557msgid ""
5558"\n"
5559"It looks like you may be committing a cherry-pick.\n"
5560"If this is not correct, please remove the file\n"
5561"\t%s\n"
5562"and try again.\n"
5563msgstr ""
5564"\n"
5565"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5566"\t%s\n"
5567"然后重试。\n"
5568
5569#: builtin/commit.c:832
5570#, c-format
5571msgid ""
5572"Please enter the commit message for your changes. Lines starting\n"
5573"with '%c' will be ignored, and an empty message aborts the commit.\n"
5574msgstr ""
5575"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5576"说明将会终止提交。\n"
5577
5578#: builtin/commit.c:839
5579#, c-format
5580msgid ""
5581"Please enter the commit message for your changes. Lines starting\n"
5582"with '%c' will be kept; you may remove them yourself if you want to.\n"
5583"An empty message aborts the commit.\n"
5584msgstr ""
5585"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5586"也可以删除它们。一个空的提交说明将会终止提交。\n"
5587
5588#  译者:为保证在输出中对齐,注意调整句中空格!
5589#: builtin/commit.c:859
5590#, c-format
5591msgid "%sAuthor:    %.*s <%.*s>"
5592msgstr "%s作者:  %.*s <%.*s>"
5593
5594#  译者:为保证在输出中对齐,注意调整句中空格!
5595#: builtin/commit.c:867
5596#, c-format
5597msgid "%sDate:      %s"
5598msgstr "%s日期:  %s"
5599
5600#  译者:为保证在输出中对齐,注意调整句中空格!
5601#: builtin/commit.c:874
5602#, c-format
5603msgid "%sCommitter: %.*s <%.*s>"
5604msgstr "%s提交者:%.*s <%.*s>"
5605
5606#: builtin/commit.c:892
5607msgid "Cannot read index"
5608msgstr "无法读取索引"
5609
5610#: builtin/commit.c:949
5611msgid "Error building trees"
5612msgstr "无法创建树对象"
5613
5614#: builtin/commit.c:964 builtin/tag.c:266
5615#, c-format
5616msgid "Please supply the message using either -m or -F option.\n"
5617msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5618
5619#: builtin/commit.c:1066
5620#, c-format
5621msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5622msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5623
5624#: builtin/commit.c:1081 builtin/commit.c:1321
5625#, c-format
5626msgid "Invalid untracked files mode '%s'"
5627msgstr "无效的未追踪文件参数 '%s'"
5628
5629#: builtin/commit.c:1118
5630msgid "--long and -z are incompatible"
5631msgstr "--long 和 -z 选项不兼容"
5632
5633#: builtin/commit.c:1148
5634msgid "Using both --reset-author and --author does not make sense"
5635msgstr "同时使用 --reset-author 和 --author 没有意义"
5636
5637#: builtin/commit.c:1157
5638msgid "You have nothing to amend."
5639msgstr "您没有可修补的提交。"
5640
5641#: builtin/commit.c:1160
5642msgid "You are in the middle of a merge -- cannot amend."
5643msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5644
5645#: builtin/commit.c:1162
5646msgid "You are in the middle of a cherry-pick -- cannot amend."
5647msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5648
5649#: builtin/commit.c:1165
5650msgid "Options --squash and --fixup cannot be used together"
5651msgstr "选项 --squash 和 --fixup 不能同时使用"
5652
5653#: builtin/commit.c:1175
5654msgid "Only one of -c/-C/-F/--fixup can be used."
5655msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5656
5657#: builtin/commit.c:1177
5658msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5659msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5660
5661#: builtin/commit.c:1185
5662msgid "--reset-author can be used only with -C, -c or --amend."
5663msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5664
5665#: builtin/commit.c:1202
5666msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5667msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5668
5669#: builtin/commit.c:1204
5670msgid "No paths with --include/--only does not make sense."
5671msgstr "参数 --include/--only 不跟路径没有意义。"
5672
5673#: builtin/commit.c:1206
5674msgid "Clever... amending the last one with dirty index."
5675msgstr "聪明... 用脏索引修补最后一个提交。"
5676
5677#: builtin/commit.c:1208
5678msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5679msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5680
5681#: builtin/commit.c:1220 builtin/tag.c:474
5682#, c-format
5683msgid "Invalid cleanup mode %s"
5684msgstr "无效的清理模式 %s"
5685
5686#: builtin/commit.c:1225
5687msgid "Paths with -a does not make sense."
5688msgstr "路径和 -a 选项同时使用没有意义。"
5689
5690#: builtin/commit.c:1335 builtin/commit.c:1621
5691msgid "show status concisely"
5692msgstr "以简洁的格式显示状态"
5693
5694#: builtin/commit.c:1337 builtin/commit.c:1623
5695msgid "show branch information"
5696msgstr "显示分支信息"
5697
5698#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
5699#: builtin/worktree.c:437
5700msgid "machine-readable output"
5701msgstr "机器可读的输出"
5702
5703#: builtin/commit.c:1342 builtin/commit.c:1627
5704msgid "show status in long format (default)"
5705msgstr "以长格式显示状态(默认)"
5706
5707#: builtin/commit.c:1345 builtin/commit.c:1630
5708msgid "terminate entries with NUL"
5709msgstr "条目以 NUL 字符结尾"
5710
5711#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
5712#: builtin/fast-export.c:984 builtin/tag.c:353
5713msgid "mode"
5714msgstr "模式"
5715
5716#: builtin/commit.c:1348 builtin/commit.c:1633
5717msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5718msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5719
5720#: builtin/commit.c:1351
5721msgid "show ignored files"
5722msgstr "显示忽略的文件"
5723
5724#: builtin/commit.c:1352 parse-options.h:155
5725msgid "when"
5726msgstr "何时"
5727
5728#: builtin/commit.c:1353
5729msgid ""
5730"ignore changes to submodules, optional when: all, dirty, untracked. "
5731"(Default: all)"
5732msgstr ""
5733"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5734
5735#: builtin/commit.c:1355
5736msgid "list untracked files in columns"
5737msgstr "以列的方式显示未跟踪的文件"
5738
5739#: builtin/commit.c:1441
5740msgid "couldn't look up newly created commit"
5741msgstr "无法找到新创建的提交"
5742
5743#: builtin/commit.c:1443
5744msgid "could not parse newly created commit"
5745msgstr "不能解析新创建的提交"
5746
5747#: builtin/commit.c:1488
5748msgid "detached HEAD"
5749msgstr "分离头指针"
5750
5751#  译者:中文字符串拼接,可删除前导空格
5752#: builtin/commit.c:1491
5753msgid " (root-commit)"
5754msgstr "(根提交)"
5755
5756#: builtin/commit.c:1591
5757msgid "suppress summary after successful commit"
5758msgstr "提交成功后不显示概述信息"
5759
5760#: builtin/commit.c:1592
5761msgid "show diff in commit message template"
5762msgstr "在提交说明模板里显示差异"
5763
5764#: builtin/commit.c:1594
5765msgid "Commit message options"
5766msgstr "提交说明选项"
5767
5768#: builtin/commit.c:1595 builtin/tag.c:351
5769msgid "read message from file"
5770msgstr "从文件中读取提交说明"
5771
5772#: builtin/commit.c:1596
5773msgid "author"
5774msgstr "作者"
5775
5776#: builtin/commit.c:1596
5777msgid "override author for commit"
5778msgstr "提交时覆盖作者"
5779
5780#: builtin/commit.c:1597 builtin/gc.c:326
5781msgid "date"
5782msgstr "日期"
5783
5784#: builtin/commit.c:1597
5785msgid "override date for commit"
5786msgstr "提交时覆盖日期"
5787
5788#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
5789#: builtin/notes.c:558 builtin/tag.c:349
5790msgid "message"
5791msgstr "说明"
5792
5793#: builtin/commit.c:1598
5794msgid "commit message"
5795msgstr "提交说明"
5796
5797#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
5798#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
5799msgid "commit"
5800msgstr "提交"
5801
5802#: builtin/commit.c:1599
5803msgid "reuse and edit message from specified commit"
5804msgstr "重用并编辑指定提交的提交说明"
5805
5806#: builtin/commit.c:1600
5807msgid "reuse message from specified commit"
5808msgstr "重用指定提交的提交说明"
5809
5810#: builtin/commit.c:1601
5811msgid "use autosquash formatted message to fixup specified commit"
5812msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5813
5814#: builtin/commit.c:1602
5815msgid "use autosquash formatted message to squash specified commit"
5816msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5817
5818#: builtin/commit.c:1603
5819msgid "the commit is authored by me now (used with -C/-c/--amend)"
5820msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5821
5822#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
5823msgid "add Signed-off-by:"
5824msgstr "添加 Signed-off-by: 签名"
5825
5826#: builtin/commit.c:1605
5827msgid "use specified template file"
5828msgstr "使用指定的模板文件"
5829
5830#: builtin/commit.c:1606
5831msgid "force edit of commit"
5832msgstr "强制编辑提交"
5833
5834#  译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5835#: builtin/commit.c:1607
5836msgid "default"
5837msgstr "default"
5838
5839#: builtin/commit.c:1607 builtin/tag.c:354
5840msgid "how to strip spaces and #comments from message"
5841msgstr "设置如何删除提交说明里的空格和#注释"
5842
5843#: builtin/commit.c:1608
5844msgid "include status in commit message template"
5845msgstr "在提交说明模板里包含状态信息"
5846
5847#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
5848#: builtin/revert.c:93
5849msgid "GPG sign commit"
5850msgstr "GPG 提交签名"
5851
5852#: builtin/commit.c:1613
5853msgid "Commit contents options"
5854msgstr "提交内容选项"
5855
5856#: builtin/commit.c:1614
5857msgid "commit all changed files"
5858msgstr "提交所有改动的文件"
5859
5860#: builtin/commit.c:1615
5861msgid "add specified files to index for commit"
5862msgstr "添加指定的文件到索引区等待提交"
5863
5864#: builtin/commit.c:1616
5865msgid "interactively add files"
5866msgstr "交互式添加文件"
5867
5868#: builtin/commit.c:1617
5869msgid "interactively add changes"
5870msgstr "交互式添加变更"
5871
5872#: builtin/commit.c:1618
5873msgid "commit only specified files"
5874msgstr "只提交指定的文件"
5875
5876#: builtin/commit.c:1619
5877msgid "bypass pre-commit hook"
5878msgstr "绕过 pre-commit 钩子"
5879
5880#: builtin/commit.c:1620
5881msgid "show what would be committed"
5882msgstr "显示将要提交的内容"
5883
5884#: builtin/commit.c:1631
5885msgid "amend previous commit"
5886msgstr "修改先前的提交"
5887
5888#: builtin/commit.c:1632
5889msgid "bypass post-rewrite hook"
5890msgstr "绕过 post-rewrite 钩子"
5891
5892#: builtin/commit.c:1637
5893msgid "ok to record an empty change"
5894msgstr "允许一个空提交"
5895
5896#: builtin/commit.c:1639
5897msgid "ok to record a change with an empty message"
5898msgstr "允许空的提交说明"
5899
5900#: builtin/commit.c:1668
5901msgid "could not parse HEAD commit"
5902msgstr "不能解析 HEAD 提交"
5903
5904#: builtin/commit.c:1718
5905#, c-format
5906msgid "Corrupt MERGE_HEAD file (%s)"
5907msgstr "损坏的 MERGE_HEAD 文件(%s)"
5908
5909#: builtin/commit.c:1725
5910msgid "could not read MERGE_MODE"
5911msgstr "不能读取 MERGE_MODE"
5912
5913#: builtin/commit.c:1744
5914#, c-format
5915msgid "could not read commit message: %s"
5916msgstr "不能读取提交说明:%s"
5917
5918#: builtin/commit.c:1755
5919#, c-format
5920msgid "Aborting commit; you did not edit the message.\n"
5921msgstr "终止提交;您未更改来自模版的提交说明。\n"
5922
5923#: builtin/commit.c:1760
5924#, c-format
5925msgid "Aborting commit due to empty commit message.\n"
5926msgstr "终止提交因为提交说明为空。\n"
5927
5928#: builtin/commit.c:1808
5929msgid ""
5930"Repository has been updated, but unable to write\n"
5931"new_index file. Check that disk is not full and quota is\n"
5932"not exceeded, and then \"git reset HEAD\" to recover."
5933msgstr ""
5934"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5935"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5936
5937#: builtin/config.c:9
5938msgid "git config [<options>]"
5939msgstr "git config [<选项>]"
5940
5941#: builtin/config.c:56
5942msgid "Config file location"
5943msgstr "配置文件位置"
5944
5945#: builtin/config.c:57
5946msgid "use global config file"
5947msgstr "使用全局配置文件"
5948
5949#: builtin/config.c:58
5950msgid "use system config file"
5951msgstr "使用系统级配置文件"
5952
5953#: builtin/config.c:59
5954msgid "use repository config file"
5955msgstr "使用仓库级配置文件"
5956
5957#: builtin/config.c:60
5958msgid "use given config file"
5959msgstr "使用指定的配置文件"
5960
5961#: builtin/config.c:61
5962msgid "blob-id"
5963msgstr "数据对象 ID"
5964
5965#: builtin/config.c:61
5966msgid "read config from given blob object"
5967msgstr "从给定的数据对象读取配置"
5968
5969#: builtin/config.c:62
5970msgid "Action"
5971msgstr "操作"
5972
5973#: builtin/config.c:63
5974msgid "get value: name [value-regex]"
5975msgstr "获取值:name [value-regex]"
5976
5977#: builtin/config.c:64
5978msgid "get all values: key [value-regex]"
5979msgstr "获得所有的值:key [value-regex]"
5980
5981#: builtin/config.c:65
5982msgid "get values for regexp: name-regex [value-regex]"
5983msgstr "根据正则表达式获得值:name-regex [value-regex]"
5984
5985#: builtin/config.c:66
5986msgid "get value specific for the URL: section[.var] URL"
5987msgstr "获得 URL 取值:section[.var] URL"
5988
5989#: builtin/config.c:67
5990msgid "replace all matching variables: name value [value_regex]"
5991msgstr "替换所有匹配的变量:name value [value_regex]"
5992
5993#: builtin/config.c:68
5994msgid "add a new variable: name value"
5995msgstr "添加一个新的变量:name value"
5996
5997#: builtin/config.c:69
5998msgid "remove a variable: name [value-regex]"
5999msgstr "删除一个变量:name [value-regex]"
6000
6001#: builtin/config.c:70
6002msgid "remove all matches: name [value-regex]"
6003msgstr "删除所有匹配项:name [value-regex]"
6004
6005#: builtin/config.c:71
6006msgid "rename section: old-name new-name"
6007msgstr "重命名小节:old-name new-name"
6008
6009#: builtin/config.c:72
6010msgid "remove a section: name"
6011msgstr "删除一个小节:name"
6012
6013#: builtin/config.c:73
6014msgid "list all"
6015msgstr "列出所有"
6016
6017#: builtin/config.c:74
6018msgid "open an editor"
6019msgstr "打开一个编辑器"
6020
6021#: builtin/config.c:75
6022msgid "find the color configured: slot [default]"
6023msgstr "获得配置的颜色:配置 [默认]"
6024
6025#: builtin/config.c:76
6026msgid "find the color setting: slot [stdout-is-tty]"
6027msgstr "获得颜色设置:配置 [stdout-is-tty]"
6028
6029#: builtin/config.c:77
6030msgid "Type"
6031msgstr "类型"
6032
6033#: builtin/config.c:78
6034msgid "value is \"true\" or \"false\""
6035msgstr "值是 \"true\" 或 \"false\""
6036
6037#: builtin/config.c:79
6038msgid "value is decimal number"
6039msgstr "值是十进制数"
6040
6041#: builtin/config.c:80
6042msgid "value is --bool or --int"
6043msgstr "值是 --bool or --int"
6044
6045#: builtin/config.c:81
6046msgid "value is a path (file or directory name)"
6047msgstr "值是一个路径(文件或目录名)"
6048
6049#: builtin/config.c:82
6050msgid "Other"
6051msgstr "其它"
6052
6053#: builtin/config.c:83
6054msgid "terminate values with NUL byte"
6055msgstr "终止值是 NUL 字节"
6056
6057#: builtin/config.c:84
6058msgid "show variable names only"
6059msgstr "只显示变量名"
6060
6061#: builtin/config.c:85
6062msgid "respect include directives on lookup"
6063msgstr "查询时参照 include 指令递归查找"
6064
6065#: builtin/config.c:86
6066msgid "show origin of config (file, standard input, blob, command line)"
6067msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
6068
6069#: builtin/config.c:328
6070msgid "unable to parse default color value"
6071msgstr "不能解析默认颜色值"
6072
6073#: builtin/config.c:472
6074#, c-format
6075msgid ""
6076"# This is Git's per-user configuration file.\n"
6077"[user]\n"
6078"# Please adapt and uncomment the following lines:\n"
6079"#\tname = %s\n"
6080"#\temail = %s\n"
6081msgstr ""
6082"# This is Git's per-user configuration file.\n"
6083"[user]\n"
6084"# Please adapt and uncomment the following lines:\n"
6085"#\tname = %s\n"
6086"#\temail = %s\n"
6087
6088#: builtin/config.c:614
6089#, c-format
6090msgid "cannot create configuration file %s"
6091msgstr "不能创建配置文件 %s"
6092
6093#: builtin/count-objects.c:77
6094msgid "git count-objects [-v] [-H | --human-readable]"
6095msgstr "git count-objects [-v] [-H | --human-readable]"
6096
6097#: builtin/count-objects.c:87
6098msgid "print sizes in human readable format"
6099msgstr "以用户可读的格式显示大小"
6100
6101#: builtin/describe.c:17
6102msgid "git describe [<options>] [<commit-ish>...]"
6103msgstr "git describe [<选项>] [<提交号>...]"
6104
6105#: builtin/describe.c:18
6106msgid "git describe [<options>] --dirty"
6107msgstr "git describe [<选项>] --dirty"
6108
6109#: builtin/describe.c:217
6110#, c-format
6111msgid "annotated tag %s not available"
6112msgstr "附注标签 %s 无效"
6113
6114#: builtin/describe.c:221
6115#, c-format
6116msgid "annotated tag %s has no embedded name"
6117msgstr "附注标签 %s 没有嵌入名称"
6118
6119#: builtin/describe.c:223
6120#, c-format
6121msgid "tag '%s' is really '%s' here"
6122msgstr "标签 '%s' 的确是在 '%s'"
6123
6124#: builtin/describe.c:250 builtin/log.c:465
6125#, c-format
6126msgid "Not a valid object name %s"
6127msgstr "不是一个有效的对象名 %s"
6128
6129#: builtin/describe.c:253
6130#, c-format
6131msgid "%s is not a valid '%s' object"
6132msgstr "%s 不是一个有效的 '%s' 对象"
6133
6134#: builtin/describe.c:270
6135#, c-format
6136msgid "no tag exactly matches '%s'"
6137msgstr "没有标签准确匹配 '%s'"
6138
6139#: builtin/describe.c:272
6140#, c-format
6141msgid "searching to describe %s\n"
6142msgstr "搜索描述 %s\n"
6143
6144#: builtin/describe.c:319
6145#, c-format
6146msgid "finished search at %s\n"
6147msgstr "完成搜索 %s\n"
6148
6149#: builtin/describe.c:346
6150#, c-format
6151msgid ""
6152"No annotated tags can describe '%s'.\n"
6153"However, there were unannotated tags: try --tags."
6154msgstr ""
6155"没有附注标签能描述 '%s'。\n"
6156"然而,存在未附注标签:尝试 --tags。"
6157
6158#: builtin/describe.c:350
6159#, c-format
6160msgid ""
6161"No tags can describe '%s'.\n"
6162"Try --always, or create some tags."
6163msgstr ""
6164"没有标签能描述 '%s'。\n"
6165"尝试 --always,或者创建一些标签。"
6166
6167#: builtin/describe.c:371
6168#, c-format
6169msgid "traversed %lu commits\n"
6170msgstr "已遍历 %lu 个提交\n"
6171
6172#: builtin/describe.c:374
6173#, c-format
6174msgid ""
6175"more than %i tags found; listed %i most recent\n"
6176"gave up search at %s\n"
6177msgstr ""
6178"发现多于 %i 个标签,列出最近的 %i 个\n"
6179"在 %s 放弃搜索\n"
6180
6181#: builtin/describe.c:396
6182msgid "find the tag that comes after the commit"
6183msgstr "寻找该提交之后的标签"
6184
6185#: builtin/describe.c:397
6186msgid "debug search strategy on stderr"
6187msgstr "在标准错误上调试搜索策略"
6188
6189#: builtin/describe.c:398
6190msgid "use any ref"
6191msgstr "使用任意引用"
6192
6193#: builtin/describe.c:399
6194msgid "use any tag, even unannotated"
6195msgstr "使用任意标签,即使未附带注释"
6196
6197#: builtin/describe.c:400
6198msgid "always use long format"
6199msgstr "始终使用长提交号格式"
6200
6201#: builtin/describe.c:401
6202msgid "only follow first parent"
6203msgstr "只跟随第一个父提交"
6204
6205#: builtin/describe.c:404
6206msgid "only output exact matches"
6207msgstr "只输出精确匹配"
6208
6209#: builtin/describe.c:406
6210msgid "consider <n> most recent tags (default: 10)"
6211msgstr "考虑最近 <n> 个标签(默认:10)"
6212
6213#: builtin/describe.c:408
6214msgid "only consider tags matching <pattern>"
6215msgstr "只考虑匹配 <模式> 的标签"
6216
6217#: builtin/describe.c:410 builtin/name-rev.c:321
6218msgid "show abbreviated commit object as fallback"
6219msgstr "显示简写的提交号作为后备"
6220
6221#: builtin/describe.c:411
6222msgid "mark"
6223msgstr "标记"
6224
6225#: builtin/describe.c:412
6226msgid "append <mark> on dirty working tree (default: \"-dirty\")"
6227msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
6228
6229#: builtin/describe.c:430
6230msgid "--long is incompatible with --abbrev=0"
6231msgstr "--long 与 --abbrev=0 不兼容"
6232
6233#: builtin/describe.c:456
6234msgid "No names found, cannot describe anything."
6235msgstr "没有发现名称,无法描述任何东西。"
6236
6237#: builtin/describe.c:476
6238msgid "--dirty is incompatible with commit-ishes"
6239msgstr "--dirty 不能与提交同时使用"
6240
6241#: builtin/diff.c:86
6242#, c-format
6243msgid "'%s': not a regular file or symlink"
6244msgstr "'%s':不是一个正规文件或符号链接"
6245
6246#: builtin/diff.c:237
6247#, c-format
6248msgid "invalid option: %s"
6249msgstr "无效选项:%s"
6250
6251#: builtin/diff.c:360
6252msgid "Not a git repository"
6253msgstr "不是一个 git 仓库"
6254
6255#: builtin/diff.c:403
6256#, c-format
6257msgid "invalid object '%s' given."
6258msgstr "提供了无效对象 '%s'。"
6259
6260#: builtin/diff.c:412
6261#, c-format
6262msgid "more than two blobs given: '%s'"
6263msgstr "提供了超过两个数据对象:'%s'"
6264
6265#: builtin/diff.c:419
6266#, c-format
6267msgid "unhandled object '%s' given."
6268msgstr "无法处理的对象 '%s'。"
6269
6270#: builtin/fast-export.c:25
6271msgid "git fast-export [rev-list-opts]"
6272msgstr "git fast-export [rev-list-opts]"
6273
6274#: builtin/fast-export.c:980
6275msgid "show progress after <n> objects"
6276msgstr "在 <n> 个对象之后显示进度"
6277
6278#: builtin/fast-export.c:982
6279msgid "select handling of signed tags"
6280msgstr "选择如何处理签名标签"
6281
6282#: builtin/fast-export.c:985
6283msgid "select handling of tags that tag filtered objects"
6284msgstr "选择当标签指向被过滤对象时该标签的处理方式"
6285
6286#: builtin/fast-export.c:988
6287msgid "Dump marks to this file"
6288msgstr "把标记存储到这个文件"
6289
6290#: builtin/fast-export.c:990
6291msgid "Import marks from this file"
6292msgstr "从这个文件导入标记"
6293
6294#: builtin/fast-export.c:992
6295msgid "Fake a tagger when tags lack one"
6296msgstr "当标签缺少标记者字段时,假装提供一个"
6297
6298#: builtin/fast-export.c:994
6299msgid "Output full tree for each commit"
6300msgstr "每次提交都输出整个树"
6301
6302#: builtin/fast-export.c:996
6303msgid "Use the done feature to terminate the stream"
6304msgstr "使用 done 功能来终止流"
6305
6306#: builtin/fast-export.c:997
6307msgid "Skip output of blob data"
6308msgstr "跳过数据对象的输出"
6309
6310#: builtin/fast-export.c:998
6311msgid "refspec"
6312msgstr "引用规格"
6313
6314#: builtin/fast-export.c:999
6315msgid "Apply refspec to exported refs"
6316msgstr "对导出的引用应用引用规格"
6317
6318#: builtin/fast-export.c:1000
6319msgid "anonymize output"
6320msgstr "匿名输出"
6321
6322#: builtin/fetch.c:20
6323msgid "git fetch [<options>] [<repository> [<refspec>...]]"
6324msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
6325
6326#: builtin/fetch.c:21
6327msgid "git fetch [<options>] <group>"
6328msgstr "git fetch [<选项>] <组>"
6329
6330#: builtin/fetch.c:22
6331msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
6332msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
6333
6334#: builtin/fetch.c:23
6335msgid "git fetch --all [<options>]"
6336msgstr "git fetch --all [<选项>]"
6337
6338#: builtin/fetch.c:92 builtin/pull.c:174
6339msgid "fetch from all remotes"
6340msgstr "从所有的远程抓取"
6341
6342#: builtin/fetch.c:94 builtin/pull.c:177
6343msgid "append to .git/FETCH_HEAD instead of overwriting"
6344msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
6345
6346#: builtin/fetch.c:96 builtin/pull.c:180
6347msgid "path to upload pack on remote end"
6348msgstr "上传包到远程的路径"
6349
6350#: builtin/fetch.c:97 builtin/pull.c:182
6351msgid "force overwrite of local branch"
6352msgstr "强制覆盖本地分支"
6353
6354#: builtin/fetch.c:99
6355msgid "fetch from multiple remotes"
6356msgstr "从多个远程抓取"
6357
6358#: builtin/fetch.c:101 builtin/pull.c:184
6359msgid "fetch all tags and associated objects"
6360msgstr "抓取所有的标签和关联对象"
6361
6362#: builtin/fetch.c:103
6363msgid "do not fetch all tags (--no-tags)"
6364msgstr "不抓取任何标签(--no-tags)"
6365
6366#: builtin/fetch.c:105
6367msgid "number of submodules fetched in parallel"
6368msgstr "子模组获取的并发数"
6369
6370#: builtin/fetch.c:107 builtin/pull.c:187
6371msgid "prune remote-tracking branches no longer on remote"
6372msgstr "清除远程已经不存在的分支的跟踪分支"
6373
6374#  译者:可选值,不能翻译
6375#: builtin/fetch.c:108 builtin/pull.c:190
6376msgid "on-demand"
6377msgstr "on-demand"
6378
6379#: builtin/fetch.c:109 builtin/pull.c:191
6380msgid "control recursive fetching of submodules"
6381msgstr "控制子模组的递归抓取"
6382
6383#: builtin/fetch.c:113 builtin/pull.c:199
6384msgid "keep downloaded pack"
6385msgstr "保持下载包"
6386
6387#: builtin/fetch.c:115
6388msgid "allow updating of HEAD ref"
6389msgstr "允许更新 HEAD 引用"
6390
6391#: builtin/fetch.c:118 builtin/pull.c:202
6392msgid "deepen history of shallow clone"
6393msgstr "深化浅克隆的历史"
6394
6395#: builtin/fetch.c:120 builtin/pull.c:205
6396msgid "convert to a complete repository"
6397msgstr "转换为一个完整的仓库"
6398
6399#: builtin/fetch.c:122 builtin/log.c:1399
6400msgid "dir"
6401msgstr "目录"
6402
6403#: builtin/fetch.c:123
6404msgid "prepend this to submodule path output"
6405msgstr "在子模组路径输出的前面加上此目录"
6406
6407#: builtin/fetch.c:126
6408msgid "default mode for recursion"
6409msgstr "递归的默认模式"
6410
6411#: builtin/fetch.c:128 builtin/pull.c:208
6412msgid "accept refs that update .git/shallow"
6413msgstr "接受更新 .git/shallow 的引用"
6414
6415#: builtin/fetch.c:129 builtin/pull.c:210
6416msgid "refmap"
6417msgstr "引用映射"
6418
6419#: builtin/fetch.c:130 builtin/pull.c:211
6420msgid "specify fetch refmap"
6421msgstr "指定获取操作的引用映射"
6422
6423#: builtin/fetch.c:386
6424msgid "Couldn't find remote ref HEAD"
6425msgstr "无法发现远程 HEAD 引用"
6426
6427#: builtin/fetch.c:466
6428#, c-format
6429msgid "object %s not found"
6430msgstr "对象 %s 未发现"
6431
6432#: builtin/fetch.c:471
6433msgid "[up to date]"
6434msgstr "[最新]"
6435
6436#: builtin/fetch.c:485
6437#, c-format
6438msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
6439msgstr "! %-*s %-*s -> %s  (在当前分支下不能获取)"
6440
6441#: builtin/fetch.c:486 builtin/fetch.c:574
6442msgid "[rejected]"
6443msgstr "[已拒绝]"
6444
6445#: builtin/fetch.c:497
6446msgid "[tag update]"
6447msgstr "[标签更新]"
6448
6449#  译者:注意保持前导空格
6450#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
6451msgid "  (unable to update local ref)"
6452msgstr "  (不能更新本地引用)"
6453
6454#: builtin/fetch.c:517
6455msgid "[new tag]"
6456msgstr "[新标签]"
6457
6458#: builtin/fetch.c:520
6459msgid "[new branch]"
6460msgstr "[新分支]"
6461
6462#: builtin/fetch.c:523
6463msgid "[new ref]"
6464msgstr "[新引用]"
6465
6466#: builtin/fetch.c:569
6467msgid "unable to update local ref"
6468msgstr "不能更新本地引用"
6469
6470#: builtin/fetch.c:569
6471msgid "forced update"
6472msgstr "强制更新"
6473
6474#: builtin/fetch.c:576
6475msgid "(non-fast-forward)"
6476msgstr "(非快进式)"
6477
6478#: builtin/fetch.c:619
6479#, c-format
6480msgid "%s did not send all necessary objects\n"
6481msgstr "%s 未发送所有必须的对象\n"
6482
6483#: builtin/fetch.c:637
6484#, c-format
6485msgid "reject %s because shallow roots are not allowed to be updated"
6486msgstr "拒绝 %s 因为浅克隆不允许被更新"
6487
6488#: builtin/fetch.c:724 builtin/fetch.c:816
6489#, c-format
6490msgid "From %.*s\n"
6491msgstr "来自 %.*s\n"
6492
6493#: builtin/fetch.c:735
6494#, c-format
6495msgid ""
6496"some local refs could not be updated; try running\n"
6497" 'git remote prune %s' to remove any old, conflicting branches"
6498msgstr ""
6499"一些本地引用不能被更新;尝试运行\n"
6500" 'git remote prune %s' 来删除旧的、有冲突的分支"
6501
6502#  译者:注意保持前导空格
6503#: builtin/fetch.c:787
6504#, c-format
6505msgid "   (%s will become dangling)"
6506msgstr "   (%s 将成为摇摆状态)"
6507
6508#  译者:注意保持前导空格
6509#: builtin/fetch.c:788
6510#, c-format
6511msgid "   (%s has become dangling)"
6512msgstr "   (%s 已成为摇摆状态)"
6513
6514#: builtin/fetch.c:820
6515msgid "[deleted]"
6516msgstr "[已删除]"
6517
6518#: builtin/fetch.c:821 builtin/remote.c:1025
6519msgid "(none)"
6520msgstr "(无)"
6521
6522#: builtin/fetch.c:841
6523#, c-format
6524msgid "Refusing to fetch into current branch %s of non-bare repository"
6525msgstr "拒绝获取到非纯仓库的当前分支 %s"
6526
6527#: builtin/fetch.c:860
6528#, c-format
6529msgid "Option \"%s\" value \"%s\" is not valid for %s"
6530msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6531
6532#: builtin/fetch.c:863
6533#, c-format
6534msgid "Option \"%s\" is ignored for %s\n"
6535msgstr "选项 \"%s\" 为 %s 所忽略\n"
6536
6537#: builtin/fetch.c:920
6538#, c-format
6539msgid "Don't know how to fetch from %s"
6540msgstr "不知道如何从 %s 获取"
6541
6542#: builtin/fetch.c:1080
6543#, c-format
6544msgid "Fetching %s\n"
6545msgstr "正在获取 %s\n"
6546
6547#: builtin/fetch.c:1082 builtin/remote.c:96
6548#, c-format
6549msgid "Could not fetch %s"
6550msgstr "不能获取 %s"
6551
6552#: builtin/fetch.c:1100
6553msgid ""
6554"No remote repository specified.  Please, specify either a URL or a\n"
6555"remote name from which new revisions should be fetched."
6556msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6557
6558#: builtin/fetch.c:1123
6559msgid "You need to specify a tag name."
6560msgstr "您需要指定一个标签名称。"
6561
6562#: builtin/fetch.c:1165
6563msgid "--depth and --unshallow cannot be used together"
6564msgstr "--depth 和 --unshallow 不能同时使用"
6565
6566#: builtin/fetch.c:1167
6567msgid "--unshallow on a complete repository does not make sense"
6568msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6569
6570#: builtin/fetch.c:1187
6571msgid "fetch --all does not take a repository argument"
6572msgstr "fetch --all 不能带一个仓库参数"
6573
6574#: builtin/fetch.c:1189
6575msgid "fetch --all does not make sense with refspecs"
6576msgstr "fetch --all 带引用规格没有任何意义"
6577
6578#: builtin/fetch.c:1200
6579#, c-format
6580msgid "No such remote or remote group: %s"
6581msgstr "没有这样的远程或远程组:%s"
6582
6583#: builtin/fetch.c:1208
6584msgid "Fetching a group and specifying refspecs does not make sense"
6585msgstr "获取组并指定引用规格没有意义"
6586
6587#: builtin/fmt-merge-msg.c:14
6588msgid ""
6589"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6590msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6591
6592#: builtin/fmt-merge-msg.c:667
6593msgid "populate log with at most <n> entries from shortlog"
6594msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6595
6596#: builtin/fmt-merge-msg.c:670
6597msgid "alias for --log (deprecated)"
6598msgstr "参数 --log 的别名(已弃用)"
6599
6600#: builtin/fmt-merge-msg.c:673
6601msgid "text"
6602msgstr "文本"
6603
6604#: builtin/fmt-merge-msg.c:674
6605msgid "use <text> as start of message"
6606msgstr "使用 <文本> 作为提交说明的开始"
6607
6608#: builtin/fmt-merge-msg.c:675
6609msgid "file to read from"
6610msgstr "从文件中读取"
6611
6612#: builtin/for-each-ref.c:9
6613msgid "git for-each-ref [<options>] [<pattern>]"
6614msgstr "git for-each-ref [<选项>] [<模式>]"
6615
6616#: builtin/for-each-ref.c:10
6617msgid "git for-each-ref [--points-at <object>]"
6618msgstr "git for-each-ref [--points-at <对象>]"
6619
6620#: builtin/for-each-ref.c:11
6621msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6622msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6623
6624#: builtin/for-each-ref.c:12
6625msgid "git for-each-ref [--contains [<object>]]"
6626msgstr "git for-each-ref [--contains [<对象>]]"
6627
6628#: builtin/for-each-ref.c:27
6629msgid "quote placeholders suitably for shells"
6630msgstr "引用占位符适用于 shells"
6631
6632#: builtin/for-each-ref.c:29
6633msgid "quote placeholders suitably for perl"
6634msgstr "引用占位符适用于 perl"
6635
6636#: builtin/for-each-ref.c:31
6637msgid "quote placeholders suitably for python"
6638msgstr "引用占位符适用于 python"
6639
6640#: builtin/for-each-ref.c:33
6641msgid "quote placeholders suitably for Tcl"
6642msgstr "引用占位符适用于 Tcl"
6643
6644#: builtin/for-each-ref.c:36
6645msgid "show only <n> matched refs"
6646msgstr "只显示 <n> 个匹配的引用"
6647
6648#: builtin/for-each-ref.c:37 builtin/tag.c:372
6649msgid "format to use for the output"
6650msgstr "输出格式"
6651
6652#: builtin/for-each-ref.c:41
6653msgid "print only refs which points at the given object"
6654msgstr "只打印指向给定对象的引用"
6655
6656#: builtin/for-each-ref.c:43
6657msgid "print only refs that are merged"
6658msgstr "只打印已经合并的引用"
6659
6660#: builtin/for-each-ref.c:44
6661msgid "print only refs that are not merged"
6662msgstr "只打印没有合并的引用"
6663
6664#: builtin/for-each-ref.c:45
6665msgid "print only refs which contain the commit"
6666msgstr "只打印包含该提交的引用"
6667
6668#: builtin/fsck.c:156 builtin/prune.c:140
6669msgid "Checking connectivity"
6670msgstr "检查连接中"
6671
6672#: builtin/fsck.c:486
6673msgid "Checking object directories"
6674msgstr "检查对象目录中"
6675
6676#: builtin/fsck.c:552
6677msgid "git fsck [<options>] [<object>...]"
6678msgstr "git fsck [<选项>] [<对象>...]"
6679
6680#: builtin/fsck.c:558
6681msgid "show unreachable objects"
6682msgstr "显示不可达的对象"
6683
6684#: builtin/fsck.c:559
6685msgid "show dangling objects"
6686msgstr "显示摇摆的对象"
6687
6688#: builtin/fsck.c:560
6689msgid "report tags"
6690msgstr "报告标签"
6691
6692#: builtin/fsck.c:561
6693msgid "report root nodes"
6694msgstr "报告根节点"
6695
6696#: builtin/fsck.c:562
6697msgid "make index objects head nodes"
6698msgstr "将索引亦作为检查的头节点"
6699
6700#: builtin/fsck.c:563
6701msgid "make reflogs head nodes (default)"
6702msgstr "将引用日志作为检查的头节点(默认)"
6703
6704#: builtin/fsck.c:564
6705msgid "also consider packs and alternate objects"
6706msgstr "也考虑包和备用对象"
6707
6708#: builtin/fsck.c:565
6709msgid "check only connectivity"
6710msgstr "仅检查连通性"
6711
6712#: builtin/fsck.c:566
6713msgid "enable more strict checking"
6714msgstr "启用更严格的检查"
6715
6716#: builtin/fsck.c:568
6717msgid "write dangling objects in .git/lost-found"
6718msgstr "将摇摆对象写入 .git/lost-found 中"
6719
6720#: builtin/fsck.c:569 builtin/prune.c:107
6721msgid "show progress"
6722msgstr "显示进度"
6723
6724#: builtin/fsck.c:630
6725msgid "Checking objects"
6726msgstr "检查对象中"
6727
6728#: builtin/gc.c:25
6729msgid "git gc [<options>]"
6730msgstr "git gc [<选项>]"
6731
6732#: builtin/gc.c:72
6733#, c-format
6734msgid "Invalid %s: '%s'"
6735msgstr "无效 %s:'%s'"
6736
6737#: builtin/gc.c:139
6738#, c-format
6739msgid "insanely long object directory %.*s"
6740msgstr "不正常的长对象目录 %.*s"
6741
6742#: builtin/gc.c:290
6743#, c-format
6744msgid ""
6745"The last gc run reported the following. Please correct the root cause\n"
6746"and remove %s.\n"
6747"Automatic cleanup will not be performed until the file is removed.\n"
6748"\n"
6749"%s"
6750msgstr ""
6751"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6752"在该文件被删除之前,自动清理将不会执行。\n"
6753"\n"
6754"%s"
6755
6756#: builtin/gc.c:327
6757msgid "prune unreferenced objects"
6758msgstr "清除未引用的对象"
6759
6760#: builtin/gc.c:329
6761msgid "be more thorough (increased runtime)"
6762msgstr "更彻底(增加运行时间)"
6763
6764#: builtin/gc.c:330
6765msgid "enable auto-gc mode"
6766msgstr "启用自动垃圾回收模式"
6767
6768#: builtin/gc.c:331
6769msgid "force running gc even if there may be another gc running"
6770msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6771
6772#: builtin/gc.c:373
6773#, c-format
6774msgid "Auto packing the repository in background for optimum performance.\n"
6775msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6776
6777#: builtin/gc.c:375
6778#, c-format
6779msgid "Auto packing the repository for optimum performance.\n"
6780msgstr "自动打包仓库以求最佳性能。\n"
6781
6782#: builtin/gc.c:376
6783#, c-format
6784msgid "See \"git help gc\" for manual housekeeping.\n"
6785msgstr "手工维护参见 \"git help gc\"。\n"
6786
6787#: builtin/gc.c:397
6788#, c-format
6789msgid ""
6790"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6791msgstr ""
6792"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6793
6794#: builtin/gc.c:441
6795msgid ""
6796"There are too many unreachable loose objects; run 'git prune' to remove them."
6797msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6798
6799#: builtin/grep.c:23
6800msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6801msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6802
6803#: builtin/grep.c:219
6804#, c-format
6805msgid "grep: failed to create thread: %s"
6806msgstr "grep:无法创建线程:%s"
6807
6808#: builtin/grep.c:277
6809#, c-format
6810msgid "invalid number of threads specified (%d) for %s"
6811msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
6812
6813#: builtin/grep.c:452 builtin/grep.c:487
6814#, c-format
6815msgid "unable to read tree (%s)"
6816msgstr "无法读取树(%s)"
6817
6818#: builtin/grep.c:502
6819#, c-format
6820msgid "unable to grep from object of type %s"
6821msgstr "无法抓取来自于 %s 类型的对象"
6822
6823#: builtin/grep.c:560
6824#, c-format
6825msgid "switch `%c' expects a numerical value"
6826msgstr "开关 `%c' 期望一个数字值"
6827
6828#: builtin/grep.c:577
6829#, c-format
6830msgid "cannot open '%s'"
6831msgstr "不能打开 '%s'"
6832
6833#: builtin/grep.c:646
6834msgid "search in index instead of in the work tree"
6835msgstr "在索引区搜索而不是在工作区"
6836
6837#: builtin/grep.c:648
6838msgid "find in contents not managed by git"
6839msgstr "在未被 git 管理的内容中查找"
6840
6841#  译者:中文字符串拼接,可删除前导空格
6842#: builtin/grep.c:650
6843msgid "search in both tracked and untracked files"
6844msgstr "在跟踪和未跟踪的文件中搜索"
6845
6846#: builtin/grep.c:652
6847msgid "ignore files specified via '.gitignore'"
6848msgstr "忽略 '.gitignore' 包含的文件"
6849
6850#: builtin/grep.c:655
6851msgid "show non-matching lines"
6852msgstr "显示未匹配的行"
6853
6854#: builtin/grep.c:657
6855msgid "case insensitive matching"
6856msgstr "不区分大小写匹配"
6857
6858#: builtin/grep.c:659
6859msgid "match patterns only at word boundaries"
6860msgstr "只在单词边界匹配模式"
6861
6862#: builtin/grep.c:661
6863msgid "process binary files as text"
6864msgstr "把二进制文件当做文本处理"
6865
6866#: builtin/grep.c:663
6867msgid "don't match patterns in binary files"
6868msgstr "不在二进制文件中匹配模式"
6869
6870#: builtin/grep.c:666
6871msgid "process binary files with textconv filters"
6872msgstr "用 textconv 过滤器处理二进制文件"
6873
6874#: builtin/grep.c:668
6875msgid "descend at most <depth> levels"
6876msgstr "最多以指定的深度向下寻找"
6877
6878#: builtin/grep.c:672
6879msgid "use extended POSIX regular expressions"
6880msgstr "使用扩展的 POSIX 正则表达式"
6881
6882#: builtin/grep.c:675
6883msgid "use basic POSIX regular expressions (default)"
6884msgstr "使用基本的 POSIX 正则表达式(默认)"
6885
6886#: builtin/grep.c:678
6887msgid "interpret patterns as fixed strings"
6888msgstr "把模式解析为固定的字符串"
6889
6890#: builtin/grep.c:681
6891msgid "use Perl-compatible regular expressions"
6892msgstr "使用 Perl 兼容的正则表达式"
6893
6894#: builtin/grep.c:684
6895msgid "show line numbers"
6896msgstr "显示行号"
6897
6898#: builtin/grep.c:685
6899msgid "don't show filenames"
6900msgstr "不显示文件名"
6901
6902#: builtin/grep.c:686
6903msgid "show filenames"
6904msgstr "显示文件名"
6905
6906#: builtin/grep.c:688
6907msgid "show filenames relative to top directory"
6908msgstr "显示相对于顶级目录的文件名"
6909
6910#: builtin/grep.c:690
6911msgid "show only filenames instead of matching lines"
6912msgstr "只显示文件名而不显示匹配的行"
6913
6914#: builtin/grep.c:692
6915msgid "synonym for --files-with-matches"
6916msgstr "和 --files-with-matches 同义"
6917
6918#: builtin/grep.c:695
6919msgid "show only the names of files without match"
6920msgstr "只显示未匹配的文件名"
6921
6922#: builtin/grep.c:697
6923msgid "print NUL after filenames"
6924msgstr "在文件名后输出 NUL 字符"
6925
6926#: builtin/grep.c:699
6927msgid "show the number of matches instead of matching lines"
6928msgstr "显示总匹配行数,而不显示匹配的行"
6929
6930#: builtin/grep.c:700
6931msgid "highlight matches"
6932msgstr "高亮显示匹配项"
6933
6934#: builtin/grep.c:702
6935msgid "print empty line between matches from different files"
6936msgstr "在不同文件的匹配项之间打印空行"
6937
6938#: builtin/grep.c:704
6939msgid "show filename only once above matches from same file"
6940msgstr "只在同一文件的匹配项的上面显示一次文件名"
6941
6942#: builtin/grep.c:707
6943msgid "show <n> context lines before and after matches"
6944msgstr "显示匹配项前后的 <n> 行上下文"
6945
6946#: builtin/grep.c:710
6947msgid "show <n> context lines before matches"
6948msgstr "显示匹配项前 <n> 行上下文"
6949
6950#: builtin/grep.c:712
6951msgid "show <n> context lines after matches"
6952msgstr "显示匹配项后 <n> 行上下文"
6953
6954#: builtin/grep.c:714
6955msgid "use <n> worker threads"
6956msgstr "使用 <n> 个工作线程"
6957
6958#: builtin/grep.c:715
6959msgid "shortcut for -C NUM"
6960msgstr "快捷键 -C 数字"
6961
6962#: builtin/grep.c:718
6963msgid "show a line with the function name before matches"
6964msgstr "在匹配的前面显示一行函数名"
6965
6966#: builtin/grep.c:720
6967msgid "show the surrounding function"
6968msgstr "显示所在函数的前后内容"
6969
6970#: builtin/grep.c:723
6971msgid "read patterns from file"
6972msgstr "从文件读取模式"
6973
6974#: builtin/grep.c:725
6975msgid "match <pattern>"
6976msgstr "匹配 <模式>"
6977
6978#: builtin/grep.c:727
6979msgid "combine patterns specified with -e"
6980msgstr "组合用 -e 参数设定的模式"
6981
6982#: builtin/grep.c:739
6983msgid "indicate hit with exit status without output"
6984msgstr "不输出,而用退出码标识命中状态"
6985
6986#: builtin/grep.c:741
6987msgid "show only matches from files that match all patterns"
6988msgstr "只显示匹配所有模式的文件中的匹配"
6989
6990#: builtin/grep.c:743
6991msgid "show parse tree for grep expression"
6992msgstr "显示 grep 表达式的解析树"
6993
6994#: builtin/grep.c:747
6995msgid "pager"
6996msgstr "分页"
6997
6998#: builtin/grep.c:747
6999msgid "show matching files in the pager"
7000msgstr "分页显示匹配的文件"
7001
7002#: builtin/grep.c:750
7003msgid "allow calling of grep(1) (ignored by this build)"
7004msgstr "允许调用 grep(1)(本次构建忽略)"
7005
7006#: builtin/grep.c:813
7007msgid "no pattern given."
7008msgstr "未提供模式匹配。"
7009
7010#: builtin/grep.c:845 builtin/index-pack.c:1477
7011#, c-format
7012msgid "invalid number of threads specified (%d)"
7013msgstr "指定的线程数无效(%d)"
7014
7015#: builtin/grep.c:875
7016msgid "--open-files-in-pager only works on the worktree"
7017msgstr "--open-files-in-pager 仅用于工作区"
7018
7019#: builtin/grep.c:901
7020msgid "--cached or --untracked cannot be used with --no-index."
7021msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
7022
7023#: builtin/grep.c:906
7024msgid "--no-index or --untracked cannot be used with revs."
7025msgstr "--no-index 或 --untracked 不能和版本同时使用。"
7026
7027#: builtin/grep.c:909
7028msgid "--[no-]exclude-standard cannot be used for tracked contents."
7029msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
7030
7031#: builtin/grep.c:917
7032msgid "both --cached and trees are given."
7033msgstr "同时给出了 --cached 和树对象。"
7034
7035#: builtin/hash-object.c:81
7036msgid ""
7037"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
7038"[--] <file>..."
7039msgstr ""
7040"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
7041"[--] <文件>..."
7042
7043#: builtin/hash-object.c:82
7044msgid "git hash-object  --stdin-paths"
7045msgstr "git hash-object  --stdin-paths"
7046
7047#: builtin/hash-object.c:93
7048msgid "type"
7049msgstr "类型"
7050
7051#: builtin/hash-object.c:93
7052msgid "object type"
7053msgstr "对象类型"
7054
7055#: builtin/hash-object.c:94
7056msgid "write the object into the object database"
7057msgstr "将对象写入对象数据库"
7058
7059#: builtin/hash-object.c:96
7060msgid "read the object from stdin"
7061msgstr "从标准输入读取对象"
7062
7063#: builtin/hash-object.c:98
7064msgid "store file as is without filters"
7065msgstr "原样存储文件不使用过滤器"
7066
7067#: builtin/hash-object.c:99
7068msgid ""
7069"just hash any random garbage to create corrupt objects for debugging Git"
7070msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
7071
7072#: builtin/hash-object.c:100
7073msgid "process file as it were from this path"
7074msgstr "处理文件并假设其来自于此路径"
7075
7076#: builtin/help.c:41
7077msgid "print all available commands"
7078msgstr "打印所有可用的命令"
7079
7080#: builtin/help.c:42
7081msgid "print list of useful guides"
7082msgstr "显示有用的指南列表"
7083
7084#: builtin/help.c:43
7085msgid "show man page"
7086msgstr "显示 man 手册"
7087
7088#: builtin/help.c:44
7089msgid "show manual in web browser"
7090msgstr "在 web 浏览器中显示手册"
7091
7092#: builtin/help.c:46
7093msgid "show info page"
7094msgstr "显示 info 手册"
7095
7096#: builtin/help.c:52
7097msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
7098msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
7099
7100#: builtin/help.c:64
7101#, c-format
7102msgid "unrecognized help format '%s'"
7103msgstr "未能识别的帮助格式 '%s'"
7104
7105#: builtin/help.c:91
7106msgid "Failed to start emacsclient."
7107msgstr "无法启动 emacsclient。"
7108
7109#: builtin/help.c:104
7110msgid "Failed to parse emacsclient version."
7111msgstr "无法解析 emacsclient 版本。"
7112
7113#: builtin/help.c:112
7114#, c-format
7115msgid "emacsclient version '%d' too old (< 22)."
7116msgstr "emacsclient 版本 '%d' 太老(< 22)。"
7117
7118#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
7119#, c-format
7120msgid "failed to exec '%s'"
7121msgstr "无法执行 '%s'"
7122
7123#: builtin/help.c:205
7124#, c-format
7125msgid ""
7126"'%s': path for unsupported man viewer.\n"
7127"Please consider using 'man.<tool>.cmd' instead."
7128msgstr ""
7129"'%s':不支持的 man 手册查看器的路径。\n"
7130"请使用 'man.<工具>.cmd'。"
7131
7132#: builtin/help.c:217
7133#, c-format
7134msgid ""
7135"'%s': cmd for supported man viewer.\n"
7136"Please consider using 'man.<tool>.path' instead."
7137msgstr ""
7138"'%s': 支持的 man 手册查看器命令。\n"
7139"请使用 'man.<工具>.path'。"
7140
7141#: builtin/help.c:334
7142#, c-format
7143msgid "'%s': unknown man viewer."
7144msgstr "'%s':未知的 man 查看器。"
7145
7146#: builtin/help.c:351
7147msgid "no man viewer handled the request"
7148msgstr "没有 man 查看器处理此请求"
7149
7150#: builtin/help.c:359
7151msgid "no info viewer handled the request"
7152msgstr "没有 info 查看器处理此请求"
7153
7154#: builtin/help.c:408
7155msgid "Defining attributes per path"
7156msgstr "定义路径的属性"
7157
7158#: builtin/help.c:409
7159msgid "Everyday Git With 20 Commands Or So"
7160msgstr "每一天 Git 常用的约 20 条命令"
7161
7162#: builtin/help.c:410
7163msgid "A Git glossary"
7164msgstr "Git 词汇表"
7165
7166#: builtin/help.c:411
7167msgid "Specifies intentionally untracked files to ignore"
7168msgstr "忽略指定的未跟踪文件"
7169
7170#: builtin/help.c:412
7171msgid "Defining submodule properties"
7172msgstr "定义子模组属性"
7173
7174#: builtin/help.c:413
7175msgid "Specifying revisions and ranges for Git"
7176msgstr "指定 Git 的版本和版本范围"
7177
7178#: builtin/help.c:414
7179msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
7180msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
7181
7182#: builtin/help.c:415
7183msgid "An overview of recommended workflows with Git"
7184msgstr "Git 推荐的工作流概览"
7185
7186#: builtin/help.c:427
7187msgid "The common Git guides are:\n"
7188msgstr "最常用的 Git 向导有:\n"
7189
7190#: builtin/help.c:448 builtin/help.c:465
7191#, c-format
7192msgid "usage: %s%s"
7193msgstr "用法:%s%s"
7194
7195#: builtin/help.c:481
7196#, c-format
7197msgid "`git %s' is aliased to `%s'"
7198msgstr "`git %s' 是 `%s' 的别名"
7199
7200#: builtin/index-pack.c:152
7201#, c-format
7202msgid "unable to open %s"
7203msgstr "不能打开 %s"
7204
7205#: builtin/index-pack.c:202
7206#, c-format
7207msgid "object type mismatch at %s"
7208msgstr "%s 的对象类型不匹配"
7209
7210#: builtin/index-pack.c:222
7211#, c-format
7212msgid "did not receive expected object %s"
7213msgstr "未能获取期望的对象 %s"
7214
7215#: builtin/index-pack.c:225
7216#, c-format
7217msgid "object %s: expected type %s, found %s"
7218msgstr "对象 %s:期待类型 %s,却是 %s"
7219
7220#: builtin/index-pack.c:267
7221#, c-format
7222msgid "cannot fill %d byte"
7223msgid_plural "cannot fill %d bytes"
7224msgstr[0] "无法填充 %d 字节"
7225msgstr[1] "无法填充 %d 字节"
7226
7227#: builtin/index-pack.c:277
7228msgid "early EOF"
7229msgstr "过早的文件结束符(EOF)"
7230
7231#: builtin/index-pack.c:278
7232msgid "read error on input"
7233msgstr "输入上的读错误"
7234
7235#: builtin/index-pack.c:290
7236msgid "used more bytes than were available"
7237msgstr "用掉了超过可用的字节"
7238
7239#: builtin/index-pack.c:297
7240msgid "pack too large for current definition of off_t"
7241msgstr "包太大超过了当前 off_t 的定义"
7242
7243#: builtin/index-pack.c:313
7244#, c-format
7245msgid "unable to create '%s'"
7246msgstr "不能创建 '%s'"
7247
7248#: builtin/index-pack.c:318
7249#, c-format
7250msgid "cannot open packfile '%s'"
7251msgstr "无法打开包文件 '%s'"
7252
7253#: builtin/index-pack.c:332
7254msgid "pack signature mismatch"
7255msgstr "包签名不匹配"
7256
7257#: builtin/index-pack.c:334
7258#, c-format
7259msgid "pack version %<PRIu32> unsupported"
7260msgstr "不支持包版本 %<PRIu32>"
7261
7262#: builtin/index-pack.c:352
7263#, c-format
7264msgid "pack has bad object at offset %lu: %s"
7265msgstr "包中有错误的对象位于 %lu:%s"
7266
7267#: builtin/index-pack.c:473
7268#, c-format
7269msgid "inflate returned %d"
7270msgstr "解压缩返回 %d"
7271
7272#: builtin/index-pack.c:522
7273msgid "offset value overflow for delta base object"
7274msgstr "偏移值覆盖了 delta 基准对象"
7275
7276#: builtin/index-pack.c:530
7277msgid "delta base offset is out of bound"
7278msgstr "delta 基准偏移越界"
7279
7280#: builtin/index-pack.c:538
7281#, c-format
7282msgid "unknown object type %d"
7283msgstr "未知对象类型 %d"
7284
7285#: builtin/index-pack.c:569
7286msgid "cannot pread pack file"
7287msgstr "无法读取包文件"
7288
7289#: builtin/index-pack.c:571
7290#, c-format
7291msgid "premature end of pack file, %lu byte missing"
7292msgid_plural "premature end of pack file, %lu bytes missing"
7293msgstr[0] "包文件过早结束,缺少 %lu 字节"
7294msgstr[1] "包文件过早结束,缺少 %lu 字节"
7295
7296#: builtin/index-pack.c:597
7297msgid "serious inflate inconsistency"
7298msgstr "解压缩严重的不一致"
7299
7300#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
7301#: builtin/index-pack.c:806 builtin/index-pack.c:815
7302#, c-format
7303msgid "SHA1 COLLISION FOUND WITH %s !"
7304msgstr "发现 %s 出现 SHA1 冲突!"
7305
7306#: builtin/index-pack.c:746 builtin/pack-objects.c:162
7307#: builtin/pack-objects.c:254
7308#, c-format
7309msgid "unable to read %s"
7310msgstr "不能读 %s"
7311
7312#: builtin/index-pack.c:812
7313#, c-format
7314msgid "cannot read existing object %s"
7315msgstr "不能读取现存对象 %s"
7316
7317#: builtin/index-pack.c:826
7318#, c-format
7319msgid "invalid blob object %s"
7320msgstr "无效的数据对象 %s"
7321
7322#: builtin/index-pack.c:840
7323#, c-format
7324msgid "invalid %s"
7325msgstr "无效的 %s"
7326
7327#: builtin/index-pack.c:843
7328msgid "Error in object"
7329msgstr "对象中出错"
7330
7331#: builtin/index-pack.c:845
7332#, c-format
7333msgid "Not all child objects of %s are reachable"
7334msgstr "%s 的所有子对象并非都可达"
7335
7336#: builtin/index-pack.c:917 builtin/index-pack.c:948
7337msgid "failed to apply delta"
7338msgstr "无法应用 delta"
7339
7340#: builtin/index-pack.c:1118
7341msgid "Receiving objects"
7342msgstr "接收对象中"
7343
7344#: builtin/index-pack.c:1118
7345msgid "Indexing objects"
7346msgstr "索引对象中"
7347
7348#: builtin/index-pack.c:1150
7349msgid "pack is corrupted (SHA1 mismatch)"
7350msgstr "包冲突(SHA1 不匹配)"
7351
7352#: builtin/index-pack.c:1155
7353msgid "cannot fstat packfile"
7354msgstr "不能枚举包文件状态"
7355
7356#: builtin/index-pack.c:1158
7357msgid "pack has junk at the end"
7358msgstr "包的结尾有垃圾数据"
7359
7360#: builtin/index-pack.c:1169
7361msgid "confusion beyond insanity in parse_pack_objects()"
7362msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7363
7364#: builtin/index-pack.c:1194
7365msgid "Resolving deltas"
7366msgstr "处理 delta 中"
7367
7368#: builtin/index-pack.c:1205
7369#, c-format
7370msgid "unable to create thread: %s"
7371msgstr "不能创建线程:%s"
7372
7373#: builtin/index-pack.c:1247
7374msgid "confusion beyond insanity"
7375msgstr "不可理喻"
7376
7377#: builtin/index-pack.c:1253
7378#, c-format
7379msgid "completed with %d local object"
7380msgid_plural "completed with %d local objects"
7381msgstr[0] "完成 %d 个本地对象"
7382msgstr[1] "完成 %d 个本地对象"
7383
7384#: builtin/index-pack.c:1265
7385#, c-format
7386msgid "Unexpected tail checksum for %s (disk corruption?)"
7387msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7388
7389#: builtin/index-pack.c:1269
7390#, c-format
7391msgid "pack has %d unresolved delta"
7392msgid_plural "pack has %d unresolved deltas"
7393msgstr[0] "包有 %d 个未解决的 delta"
7394msgstr[1] "包有 %d 个未解决的 delta"
7395
7396#: builtin/index-pack.c:1293
7397#, c-format
7398msgid "unable to deflate appended object (%d)"
7399msgstr "不能压缩附加对象(%d)"
7400
7401#: builtin/index-pack.c:1369
7402#, c-format
7403msgid "local object %s is corrupt"
7404msgstr "本地对象 %s 已损坏"
7405
7406#: builtin/index-pack.c:1393
7407msgid "error while closing pack file"
7408msgstr "关闭包文件时出错"
7409
7410#: builtin/index-pack.c:1406
7411#, c-format
7412msgid "cannot write keep file '%s'"
7413msgstr "无法写保留文件 '%s'"
7414
7415#: builtin/index-pack.c:1414
7416#, c-format
7417msgid "cannot close written keep file '%s'"
7418msgstr "无法关闭保留文件 '%s'"
7419
7420#: builtin/index-pack.c:1427
7421msgid "cannot store pack file"
7422msgstr "无法存储包文件"
7423
7424#: builtin/index-pack.c:1438
7425msgid "cannot store index file"
7426msgstr "无法存储索引文件"
7427
7428#: builtin/index-pack.c:1471
7429#, c-format
7430msgid "bad pack.indexversion=%<PRIu32>"
7431msgstr "坏的 pack.indexversion=%<PRIu32>"
7432
7433#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
7434#, c-format
7435msgid "no threads support, ignoring %s"
7436msgstr "没有线程支持,忽略 %s"
7437
7438#: builtin/index-pack.c:1540
7439#, c-format
7440msgid "Cannot open existing pack file '%s'"
7441msgstr "无法打开现存包文件 '%s'"
7442
7443#: builtin/index-pack.c:1542
7444#, c-format
7445msgid "Cannot open existing pack idx file for '%s'"
7446msgstr "无法为 %s 打开包索引文件"
7447
7448#: builtin/index-pack.c:1589
7449#, c-format
7450msgid "non delta: %d object"
7451msgid_plural "non delta: %d objects"
7452msgstr[0] "非 delta:%d 个对象"
7453msgstr[1] "非 delta:%d 个对象"
7454
7455#: builtin/index-pack.c:1596
7456#, c-format
7457msgid "chain length = %d: %lu object"
7458msgid_plural "chain length = %d: %lu objects"
7459msgstr[0] "链长 = %d: %lu 对象"
7460msgstr[1] "链长 = %d: %lu 对象"
7461
7462#: builtin/index-pack.c:1609
7463#, c-format
7464msgid "packfile name '%s' does not end with '.pack'"
7465msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7466
7467#: builtin/index-pack.c:1638
7468msgid "Cannot come back to cwd"
7469msgstr "无法返回当前工作目录"
7470
7471#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
7472#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
7473#, c-format
7474msgid "bad %s"
7475msgstr "错误选项 %s"
7476
7477#: builtin/index-pack.c:1723
7478msgid "--fix-thin cannot be used without --stdin"
7479msgstr "--fix-thin 不能和 --stdin 同时使用"
7480
7481#: builtin/index-pack.c:1731
7482msgid "--verify with no packfile name given"
7483msgstr "--verify 没有提供包文件名参数"
7484
7485#: builtin/init-db.c:55
7486#, c-format
7487msgid "cannot stat '%s'"
7488msgstr "不能枚举 '%s' 状态"
7489
7490#: builtin/init-db.c:61
7491#, c-format
7492msgid "cannot stat template '%s'"
7493msgstr "不能枚举模版 '%s' 状态"
7494
7495#: builtin/init-db.c:66
7496#, c-format
7497msgid "cannot opendir '%s'"
7498msgstr "不能打开目录 '%s'"
7499
7500#: builtin/init-db.c:77
7501#, c-format
7502msgid "cannot readlink '%s'"
7503msgstr "不能读取链接 '%s'"
7504
7505#: builtin/init-db.c:79
7506#, c-format
7507msgid "cannot symlink '%s' '%s'"
7508msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7509
7510#: builtin/init-db.c:85
7511#, c-format
7512msgid "cannot copy '%s' to '%s'"
7513msgstr "不能拷贝 '%s' 至 '%s'"
7514
7515#: builtin/init-db.c:89
7516#, c-format
7517msgid "ignoring template %s"
7518msgstr "忽略模版 %s"
7519
7520#: builtin/init-db.c:120
7521#, c-format
7522msgid "templates not found %s"
7523msgstr "模版未找到 %s"
7524
7525#: builtin/init-db.c:135
7526#, c-format
7527msgid "not copying templates from '%s': %s"
7528msgstr "没有从 '%s' 复制模版:%s"
7529
7530#: builtin/init-db.c:312 builtin/init-db.c:315
7531#, c-format
7532msgid "%s already exists"
7533msgstr "%s 已经存在"
7534
7535#: builtin/init-db.c:344
7536#, c-format
7537msgid "unable to handle file type %d"
7538msgstr "不能处理 %d 类型的文件"
7539
7540#: builtin/init-db.c:347
7541#, c-format
7542msgid "unable to move %s to %s"
7543msgstr "不能移动 %s 至 %s"
7544
7545#. TRANSLATORS: The first '%s' is either "Reinitialized
7546#. existing" or "Initialized empty", the second " shared" or
7547#. "", and the last '%s%s' is the verbatim directory name.
7548#: builtin/init-db.c:403
7549#, c-format
7550msgid "%s%s Git repository in %s%s\n"
7551msgstr "%s%s Git 仓库于 %s%s\n"
7552
7553#: builtin/init-db.c:404
7554msgid "Reinitialized existing"
7555msgstr "重新初始化现存的"
7556
7557#: builtin/init-db.c:404
7558msgid "Initialized empty"
7559msgstr "初始化空的"
7560
7561#  译者:中文字符串拼接,可删除前导空格
7562#: builtin/init-db.c:405
7563msgid " shared"
7564msgstr "共享"
7565
7566#: builtin/init-db.c:452
7567msgid ""
7568"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7569"shared[=<permissions>]] [<directory>]"
7570msgstr ""
7571"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7572"[<目录>]"
7573
7574#: builtin/init-db.c:475
7575msgid "permissions"
7576msgstr "权限"
7577
7578#: builtin/init-db.c:476
7579msgid "specify that the git repository is to be shared amongst several users"
7580msgstr "指定 git 仓库是多个用户之间共享的"
7581
7582#: builtin/init-db.c:510 builtin/init-db.c:515
7583#, c-format
7584msgid "cannot mkdir %s"
7585msgstr "不能创建目录 %s"
7586
7587#: builtin/init-db.c:519
7588#, c-format
7589msgid "cannot chdir to %s"
7590msgstr "不能切换目录到 %s"
7591
7592#: builtin/init-db.c:540
7593#, c-format
7594msgid ""
7595"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7596"dir=<directory>)"
7597msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7598
7599#: builtin/init-db.c:568
7600#, c-format
7601msgid "Cannot access work tree '%s'"
7602msgstr "不能访问工作区 '%s'"
7603
7604#: builtin/interpret-trailers.c:15
7605msgid ""
7606"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7607"<token>[(=|:)<value>])...] [<file>...]"
7608msgstr ""
7609"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7610">])...] [<文件>...]"
7611
7612#: builtin/interpret-trailers.c:26
7613msgid "edit files in place"
7614msgstr "在原位编辑文件"
7615
7616#: builtin/interpret-trailers.c:27
7617msgid "trim empty trailers"
7618msgstr "删除空签名"
7619
7620#: builtin/interpret-trailers.c:28
7621msgid "trailer"
7622msgstr "签名"
7623
7624#: builtin/interpret-trailers.c:29
7625msgid "trailer(s) to add"
7626msgstr "要添加的签名"
7627
7628#: builtin/interpret-trailers.c:42
7629msgid "no input file given for in-place editing"
7630msgstr "没有给出要原位编辑的文件"
7631
7632#: builtin/log.c:43
7633msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7634msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7635
7636#: builtin/log.c:44
7637msgid "git show [<options>] <object>..."
7638msgstr "git show [<选项>] <对象>..."
7639
7640#: builtin/log.c:83
7641#, c-format
7642msgid "invalid --decorate option: %s"
7643msgstr "无效的 --decorate 选项:%s"
7644
7645#: builtin/log.c:137
7646msgid "suppress diff output"
7647msgstr "不显示差异输出"
7648
7649#: builtin/log.c:138
7650msgid "show source"
7651msgstr "显示源"
7652
7653#: builtin/log.c:139
7654msgid "Use mail map file"
7655msgstr "使用邮件映射文件"
7656
7657#: builtin/log.c:140
7658msgid "decorate options"
7659msgstr "修饰选项"
7660
7661#: builtin/log.c:143
7662msgid "Process line range n,m in file, counting from 1"
7663msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7664
7665#: builtin/log.c:239
7666#, c-format
7667msgid "Final output: %d %s\n"
7668msgstr "最终输出:%d %s\n"
7669
7670#: builtin/log.c:471
7671#, c-format
7672msgid "git show %s: bad file"
7673msgstr "git show %s: 损坏的文件"
7674
7675#: builtin/log.c:485 builtin/log.c:578
7676#, c-format
7677msgid "Could not read object %s"
7678msgstr "不能读取对象 %s"
7679
7680#: builtin/log.c:602
7681#, c-format
7682msgid "Unknown type: %d"
7683msgstr "未知类型:%d"
7684
7685#: builtin/log.c:722
7686msgid "format.headers without value"
7687msgstr "format.headers 没有值"
7688
7689#: builtin/log.c:812
7690msgid "name of output directory is too long"
7691msgstr "输出目录名太长"
7692
7693#: builtin/log.c:827
7694#, c-format
7695msgid "Cannot open patch file %s"
7696msgstr "无法打开补丁文件 %s"
7697
7698#: builtin/log.c:841
7699msgid "Need exactly one range."
7700msgstr "只需要一个范围。"
7701
7702#: builtin/log.c:851
7703msgid "Not a range."
7704msgstr "不是一个范围。"
7705
7706#: builtin/log.c:957
7707msgid "Cover letter needs email format"
7708msgstr "信封需要邮件地址格式"
7709
7710#: builtin/log.c:1036
7711#, c-format
7712msgid "insane in-reply-to: %s"
7713msgstr "不正常的 in-reply-to:%s"
7714
7715#: builtin/log.c:1064
7716msgid "git format-patch [<options>] [<since> | <revision-range>]"
7717msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7718
7719#: builtin/log.c:1109
7720msgid "Two output directories?"
7721msgstr "两个输出目录?"
7722
7723#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
7724#, c-format
7725msgid "Unknown commit %s"
7726msgstr "未知提交 %s"
7727
7728#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
7729#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
7730#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
7731#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
7732#, c-format
7733msgid "Failed to resolve '%s' as a valid ref."
7734msgstr "无法解析 '%s' 为一个有效引用。"
7735
7736#: builtin/log.c:1231
7737msgid "Could not find exact merge base."
7738msgstr "不能找到准确的合并基线。"
7739
7740#: builtin/log.c:1235
7741msgid ""
7742"Failed to get upstream, if you want to record base commit automatically,\n"
7743"please use git branch --set-upstream-to to track a remote branch.\n"
7744"Or you could specify base commit by --base=<base-commit-id> manually."
7745msgstr ""
7746"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
7747"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
7748"参数 --base=<base-commit-id> 手动指定一个基线提交。"
7749
7750#: builtin/log.c:1255
7751msgid "Failed to find exact merge base"
7752msgstr "无法找到准确的合并基线"
7753
7754#: builtin/log.c:1266
7755msgid "base commit should be the ancestor of revision list"
7756msgstr "基线提交应该是版本列表的祖先"
7757
7758#: builtin/log.c:1270
7759msgid "base commit shouldn't be in revision list"
7760msgstr "基线提交不应该出现在版本列表中"
7761
7762#: builtin/log.c:1319
7763msgid "cannot get patch id"
7764msgstr "无法得到补丁 id"
7765
7766#: builtin/log.c:1377
7767msgid "use [PATCH n/m] even with a single patch"
7768msgstr "使用 [PATCH n/m],即使只有一个补丁"
7769
7770#: builtin/log.c:1380
7771msgid "use [PATCH] even with multiple patches"
7772msgstr "使用 [PATCH],即使有多个补丁"
7773
7774#: builtin/log.c:1384
7775msgid "print patches to standard out"
7776msgstr "打印补丁到标准输出"
7777
7778#: builtin/log.c:1386
7779msgid "generate a cover letter"
7780msgstr "生成一封附信"
7781
7782#: builtin/log.c:1388
7783msgid "use simple number sequence for output file names"
7784msgstr "使用简单的数字序列作为输出文件名"
7785
7786#: builtin/log.c:1389
7787msgid "sfx"
7788msgstr "后缀"
7789
7790#: builtin/log.c:1390
7791msgid "use <sfx> instead of '.patch'"
7792msgstr "使用 <后缀> 代替 '.patch'"
7793
7794#: builtin/log.c:1392
7795msgid "start numbering patches at <n> instead of 1"
7796msgstr "补丁以 <n> 开始编号,而不是1"
7797
7798#: builtin/log.c:1394
7799msgid "mark the series as Nth re-roll"
7800msgstr "标记补丁系列是第几次重制"
7801
7802#: builtin/log.c:1396
7803msgid "Use [<prefix>] instead of [PATCH]"
7804msgstr "使用 [<前缀>] 代替 [PATCH]"
7805
7806#: builtin/log.c:1399
7807msgid "store resulting files in <dir>"
7808msgstr "把结果文件存储在 <目录>"
7809
7810#: builtin/log.c:1402
7811msgid "don't strip/add [PATCH]"
7812msgstr "不删除/添加 [PATCH]"
7813
7814#: builtin/log.c:1405
7815msgid "don't output binary diffs"
7816msgstr "不输出二进制差异"
7817
7818#: builtin/log.c:1407
7819msgid "output all-zero hash in From header"
7820msgstr "在 From 头信息中输出全为零的哈希值"
7821
7822#: builtin/log.c:1409
7823msgid "don't include a patch matching a commit upstream"
7824msgstr "不包含已在上游提交中的补丁"
7825
7826#: builtin/log.c:1411
7827msgid "show patch format instead of default (patch + stat)"
7828msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7829
7830#: builtin/log.c:1413
7831msgid "Messaging"
7832msgstr "邮件发送"
7833
7834#: builtin/log.c:1414
7835msgid "header"
7836msgstr "header"
7837
7838#: builtin/log.c:1415
7839msgid "add email header"
7840msgstr "添加邮件头"
7841
7842#: builtin/log.c:1416 builtin/log.c:1418
7843msgid "email"
7844msgstr "邮件地址"
7845
7846#: builtin/log.c:1416
7847msgid "add To: header"
7848msgstr "添加收件人"
7849
7850#: builtin/log.c:1418
7851msgid "add Cc: header"
7852msgstr "添加抄送"
7853
7854#: builtin/log.c:1420
7855msgid "ident"
7856msgstr "标识"
7857
7858#: builtin/log.c:1421
7859msgid "set From address to <ident> (or committer ident if absent)"
7860msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7861
7862#: builtin/log.c:1423
7863msgid "message-id"
7864msgstr "邮件标识"
7865
7866#: builtin/log.c:1424
7867msgid "make first mail a reply to <message-id>"
7868msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7869
7870#: builtin/log.c:1425 builtin/log.c:1428
7871msgid "boundary"
7872msgstr "边界"
7873
7874#: builtin/log.c:1426
7875msgid "attach the patch"
7876msgstr "附件方式添加补丁"
7877
7878#: builtin/log.c:1429
7879msgid "inline the patch"
7880msgstr "内联显示补丁"
7881
7882#: builtin/log.c:1433
7883msgid "enable message threading, styles: shallow, deep"
7884msgstr "启用邮件线索,风格:浅,深"
7885
7886#: builtin/log.c:1435
7887msgid "signature"
7888msgstr "签名"
7889
7890#: builtin/log.c:1436
7891msgid "add a signature"
7892msgstr "添加一个签名"
7893
7894#: builtin/log.c:1437
7895msgid "base-commit"
7896msgstr "基线提交"
7897
7898#: builtin/log.c:1438
7899msgid "add prerequisite tree info to the patch series"
7900msgstr "为补丁列表添加前置树信息"
7901
7902#: builtin/log.c:1440
7903msgid "add a signature from a file"
7904msgstr "从文件添加一个签名"
7905
7906#: builtin/log.c:1441
7907msgid "don't print the patch filenames"
7908msgstr "不要打印补丁文件名"
7909
7910#: builtin/log.c:1531
7911msgid "-n and -k are mutually exclusive."
7912msgstr "-n 和 -k 互斥。"
7913
7914#: builtin/log.c:1533
7915msgid "--subject-prefix and -k are mutually exclusive."
7916msgstr "--subject-prefix 和 -k 互斥。"
7917
7918#: builtin/log.c:1541
7919msgid "--name-only does not make sense"
7920msgstr "--name-only 无意义"
7921
7922#: builtin/log.c:1543
7923msgid "--name-status does not make sense"
7924msgstr "--name-status 无意义"
7925
7926#: builtin/log.c:1545
7927msgid "--check does not make sense"
7928msgstr "--check 无意义"
7929
7930#: builtin/log.c:1573
7931msgid "standard output, or directory, which one?"
7932msgstr "标准输出或目录,哪一个?"
7933
7934#: builtin/log.c:1575
7935#, c-format
7936msgid "Could not create directory '%s'"
7937msgstr "不能创建目录 '%s'"
7938
7939#: builtin/log.c:1672
7940#, c-format
7941msgid "unable to read signature file '%s'"
7942msgstr "无法读取签名文件 '%s'"
7943
7944#: builtin/log.c:1743
7945msgid "Failed to create output files"
7946msgstr "无法创建输出文件"
7947
7948#: builtin/log.c:1792
7949msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7950msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7951
7952#: builtin/log.c:1846
7953#, c-format
7954msgid ""
7955"Could not find a tracked remote branch, please specify <upstream> manually.\n"
7956msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7957
7958#: builtin/ls-files.c:378
7959msgid "git ls-files [<options>] [<file>...]"
7960msgstr "git ls-files [<选项>] [<文件>...]"
7961
7962#: builtin/ls-files.c:427
7963msgid "identify the file status with tags"
7964msgstr "用标签标识文件的状态"
7965
7966#: builtin/ls-files.c:429
7967msgid "use lowercase letters for 'assume unchanged' files"
7968msgstr "使用小写字母表示 '假设未改变的' 文件"
7969
7970#: builtin/ls-files.c:431
7971msgid "show cached files in the output (default)"
7972msgstr "显示缓存的文件(默认)"
7973
7974#: builtin/ls-files.c:433
7975msgid "show deleted files in the output"
7976msgstr "显示已删除的文件"
7977
7978#: builtin/ls-files.c:435
7979msgid "show modified files in the output"
7980msgstr "显示已修改的文件"
7981
7982#: builtin/ls-files.c:437
7983msgid "show other files in the output"
7984msgstr "显示其它文件"
7985
7986#: builtin/ls-files.c:439
7987msgid "show ignored files in the output"
7988msgstr "显示忽略的文件"
7989
7990#: builtin/ls-files.c:442
7991msgid "show staged contents' object name in the output"
7992msgstr "显示暂存区内容的对象名称"
7993
7994#: builtin/ls-files.c:444
7995msgid "show files on the filesystem that need to be removed"
7996msgstr "显示文件系统需要删除的文件"
7997
7998#: builtin/ls-files.c:446
7999msgid "show 'other' directories' names only"
8000msgstr "只显示“其他”目录的名称"
8001
8002#: builtin/ls-files.c:448
8003msgid "show line endings of files"
8004msgstr "显示文件换行符格式"
8005
8006#: builtin/ls-files.c:450
8007msgid "don't show empty directories"
8008msgstr "不显示空目录"
8009
8010#: builtin/ls-files.c:453
8011msgid "show unmerged files in the output"
8012msgstr "显示未合并的文件"
8013
8014#: builtin/ls-files.c:455
8015msgid "show resolve-undo information"
8016msgstr "显示 resolve-undo 信息"
8017
8018#: builtin/ls-files.c:457
8019msgid "skip files matching pattern"
8020msgstr "匹配排除文件的模式"
8021
8022#: builtin/ls-files.c:460
8023msgid "exclude patterns are read from <file>"
8024msgstr "从 <文件> 中读取排除模式"
8025
8026#: builtin/ls-files.c:463
8027msgid "read additional per-directory exclude patterns in <file>"
8028msgstr "从 <文件> 读取额外的每个目录的排除模式"
8029
8030#: builtin/ls-files.c:465
8031msgid "add the standard git exclusions"
8032msgstr "添加标准的 git 排除"
8033
8034#: builtin/ls-files.c:468
8035msgid "make the output relative to the project top directory"
8036msgstr "显示相对于顶级目录的文件名"
8037
8038#: builtin/ls-files.c:471
8039msgid "if any <file> is not in the index, treat this as an error"
8040msgstr "如果任何 <文件> 都不在索引区,视为错误"
8041
8042#: builtin/ls-files.c:472
8043msgid "tree-ish"
8044msgstr "树或提交"
8045
8046#: builtin/ls-files.c:473
8047msgid "pretend that paths removed since <tree-ish> are still present"
8048msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
8049
8050#: builtin/ls-files.c:475
8051msgid "show debugging data"
8052msgstr "显示调试数据"
8053
8054#: builtin/ls-remote.c:7
8055msgid ""
8056"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8057"                     [-q | --quiet] [--exit-code] [--get-url]\n"
8058"                     [--symref] [<repository> [<refs>...]]"
8059msgstr ""
8060"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8061"                     [-q | --quiet] [--exit-code] [--get-url]\n"
8062"                     [--symref] [<仓库> [<引用>...]]"
8063
8064#: builtin/ls-remote.c:50
8065msgid "do not print remote URL"
8066msgstr "不打印远程 URL"
8067
8068#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
8069msgid "exec"
8070msgstr "exec"
8071
8072#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
8073msgid "path of git-upload-pack on the remote host"
8074msgstr "远程主机上的 git-upload-pack 路径"
8075
8076#: builtin/ls-remote.c:56
8077msgid "limit to tags"
8078msgstr "仅限于标签"
8079
8080#: builtin/ls-remote.c:57
8081msgid "limit to heads"
8082msgstr "仅限于分支"
8083
8084#: builtin/ls-remote.c:58
8085msgid "do not show peeled tags"
8086msgstr "不显示已解析的标签"
8087
8088#: builtin/ls-remote.c:60
8089msgid "take url.<base>.insteadOf into account"
8090msgstr "参考 url.<base>.insteadOf 设置"
8091
8092#: builtin/ls-remote.c:62
8093msgid "exit with exit code 2 if no matching refs are found"
8094msgstr "若未找到匹配的引用则以退出码2退出"
8095
8096#: builtin/ls-remote.c:64
8097msgid "show underlying ref in addition to the object pointed by it"
8098msgstr "除了显示指向的对象外,显示指向的引用名"
8099
8100#: builtin/ls-tree.c:28
8101msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
8102msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
8103
8104#: builtin/ls-tree.c:128
8105msgid "only show trees"
8106msgstr "只显示树"
8107
8108#: builtin/ls-tree.c:130
8109msgid "recurse into subtrees"
8110msgstr "递归到子树"
8111
8112#: builtin/ls-tree.c:132
8113msgid "show trees when recursing"
8114msgstr "当递归时显示树"
8115
8116#: builtin/ls-tree.c:135
8117msgid "terminate entries with NUL byte"
8118msgstr "条目以 NUL 字符终止"
8119
8120#: builtin/ls-tree.c:136
8121msgid "include object size"
8122msgstr "包括对象大小"
8123
8124#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
8125msgid "list only filenames"
8126msgstr "只列出文件名"
8127
8128#: builtin/ls-tree.c:143
8129msgid "use full path names"
8130msgstr "使用文件的全路径"
8131
8132#: builtin/ls-tree.c:145
8133msgid "list entire tree; not just current directory (implies --full-name)"
8134msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
8135
8136#: builtin/merge.c:45
8137msgid "git merge [<options>] [<commit>...]"
8138msgstr "git merge [<选项>] [<提交>...]"
8139
8140#: builtin/merge.c:46
8141msgid "git merge [<options>] <msg> HEAD <commit>"
8142msgstr "git merge [<选项>] <说明> HEAD <提交>"
8143
8144#: builtin/merge.c:47
8145msgid "git merge --abort"
8146msgstr "git merge --abort"
8147
8148#: builtin/merge.c:101
8149msgid "switch `m' requires a value"
8150msgstr "开关 `m' 需要一个值"
8151
8152#: builtin/merge.c:138
8153#, c-format
8154msgid "Could not find merge strategy '%s'.\n"
8155msgstr "不能找到合并策略 '%s'。\n"
8156
8157#: builtin/merge.c:139
8158#, c-format
8159msgid "Available strategies are:"
8160msgstr "可用的策略有:"
8161
8162#: builtin/merge.c:144
8163#, c-format
8164msgid "Available custom strategies are:"
8165msgstr "可用的自定义策略有:"
8166
8167#: builtin/merge.c:194 builtin/pull.c:126
8168msgid "do not show a diffstat at the end of the merge"
8169msgstr "在合并的最后不显示差异统计"
8170
8171#: builtin/merge.c:197 builtin/pull.c:129
8172msgid "show a diffstat at the end of the merge"
8173msgstr "在合并的最后显示差异统计"
8174
8175#: builtin/merge.c:198 builtin/pull.c:132
8176msgid "(synonym to --stat)"
8177msgstr "(和 --stat 同义)"
8178
8179#: builtin/merge.c:200 builtin/pull.c:135
8180msgid "add (at most <n>) entries from shortlog to merge commit message"
8181msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
8182
8183#: builtin/merge.c:203 builtin/pull.c:138
8184msgid "create a single commit instead of doing a merge"
8185msgstr "创建一个单独的提交而不是做一次合并"
8186
8187#: builtin/merge.c:205 builtin/pull.c:141
8188msgid "perform a commit if the merge succeeds (default)"
8189msgstr "如果合并成功,执行一次提交(默认)"
8190
8191#: builtin/merge.c:207 builtin/pull.c:144
8192msgid "edit message before committing"
8193msgstr "在提交前编辑提交说明"
8194
8195#: builtin/merge.c:208
8196msgid "allow fast-forward (default)"
8197msgstr "允许快进(默认)"
8198
8199#: builtin/merge.c:210 builtin/pull.c:150
8200msgid "abort if fast-forward is not possible"
8201msgstr "如果不能快进就放弃合并"
8202
8203#: builtin/merge.c:214
8204msgid "Verify that the named commit has a valid GPG signature"
8205msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8206
8207#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
8208#: builtin/revert.c:89
8209msgid "strategy"
8210msgstr "策略"
8211
8212#: builtin/merge.c:216 builtin/pull.c:158
8213msgid "merge strategy to use"
8214msgstr "要使用的合并策略"
8215
8216#: builtin/merge.c:217 builtin/pull.c:161
8217msgid "option=value"
8218msgstr "option=value"
8219
8220#: builtin/merge.c:218 builtin/pull.c:162
8221msgid "option for selected merge strategy"
8222msgstr "所选的合并策略的选项"
8223
8224#: builtin/merge.c:220
8225msgid "merge commit message (for a non-fast-forward merge)"
8226msgstr "合并的提交说明(针对非快进式合并)"
8227
8228#: builtin/merge.c:224
8229msgid "abort the current in-progress merge"
8230msgstr "放弃当前正在进行的合并"
8231
8232#: builtin/merge.c:226 builtin/pull.c:169
8233msgid "allow merging unrelated histories"
8234msgstr "允许合并不相关的历史"
8235
8236#: builtin/merge.c:254
8237msgid "could not run stash."
8238msgstr "不能进行进度保存。"
8239
8240#: builtin/merge.c:259
8241msgid "stash failed"
8242msgstr "进度保存失败"
8243
8244#: builtin/merge.c:264
8245#, c-format
8246msgid "not a valid object: %s"
8247msgstr "不是一个有效对象:%s"
8248
8249#: builtin/merge.c:283 builtin/merge.c:300
8250msgid "read-tree failed"
8251msgstr "读取树失败"
8252
8253#  译者:注意保持前导空格
8254#: builtin/merge.c:330
8255msgid " (nothing to squash)"
8256msgstr " (无可压缩)"
8257
8258#: builtin/merge.c:343
8259#, c-format
8260msgid "Squash commit -- not updating HEAD\n"
8261msgstr "压缩提交 -- 未更新 HEAD\n"
8262
8263#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
8264#: builtin/merge.c:1000
8265#, c-format
8266msgid "Could not write to '%s'"
8267msgstr "不能写入 '%s'"
8268
8269#: builtin/merge.c:375
8270msgid "Writing SQUASH_MSG"
8271msgstr "写入 SQUASH_MSG"
8272
8273#: builtin/merge.c:377
8274msgid "Finishing SQUASH_MSG"
8275msgstr "完成 SQUASH_MSG"
8276
8277#: builtin/merge.c:400
8278#, c-format
8279msgid "No merge message -- not updating HEAD\n"
8280msgstr "无合并信息 -- 未更新 HEAD\n"
8281
8282#: builtin/merge.c:451
8283#, c-format
8284msgid "'%s' does not point to a commit"
8285msgstr "'%s' 没有指向一个提交"
8286
8287#: builtin/merge.c:541
8288#, c-format
8289msgid "Bad branch.%s.mergeoptions string: %s"
8290msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
8291
8292#: builtin/merge.c:660
8293msgid "Not handling anything other than two heads merge."
8294msgstr "不能处理两个头合并之外的任何操作。"
8295
8296#: builtin/merge.c:674
8297#, c-format
8298msgid "Unknown option for merge-recursive: -X%s"
8299msgstr "merge-recursive 的未知选项:-X%s"
8300
8301#: builtin/merge.c:687
8302#, c-format
8303msgid "unable to write %s"
8304msgstr "不能写 %s"
8305
8306#: builtin/merge.c:776
8307#, c-format
8308msgid "Could not read from '%s'"
8309msgstr "不能从 '%s' 读取"
8310
8311#: builtin/merge.c:785
8312#, c-format
8313msgid "Not committing merge; use 'git commit' to complete the merge.\n"
8314msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
8315
8316#: builtin/merge.c:791
8317#, c-format
8318msgid ""
8319"Please enter a commit message to explain why this merge is necessary,\n"
8320"especially if it merges an updated upstream into a topic branch.\n"
8321"\n"
8322"Lines starting with '%c' will be ignored, and an empty message aborts\n"
8323"the commit.\n"
8324msgstr ""
8325"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8326"合并到主题分支。\n"
8327"\n"
8328"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
8329
8330#: builtin/merge.c:815
8331msgid "Empty commit message."
8332msgstr "空提交信息。"
8333
8334#: builtin/merge.c:835
8335#, c-format
8336msgid "Wonderful.\n"
8337msgstr "太棒了。\n"
8338
8339#: builtin/merge.c:890
8340#, c-format
8341msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8342msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8343
8344#: builtin/merge.c:906
8345#, c-format
8346msgid "'%s' is not a commit"
8347msgstr "'%s' 不是一个提交"
8348
8349#: builtin/merge.c:947
8350msgid "No current branch."
8351msgstr "没有当前分支。"
8352
8353#: builtin/merge.c:949
8354msgid "No remote for the current branch."
8355msgstr "当前分支没有对应的远程仓库。"
8356
8357#: builtin/merge.c:951
8358msgid "No default upstream defined for the current branch."
8359msgstr "当前分支没有定义默认的上游分支。"
8360
8361#: builtin/merge.c:956
8362#, c-format
8363msgid "No remote-tracking branch for %s from %s"
8364msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8365
8366#: builtin/merge.c:1091
8367#, c-format
8368msgid "could not close '%s'"
8369msgstr "不能关闭 '%s'"
8370
8371#: builtin/merge.c:1219
8372msgid "There is no merge to abort (MERGE_HEAD missing)."
8373msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
8374
8375#: builtin/merge.c:1235
8376msgid ""
8377"You have not concluded your merge (MERGE_HEAD exists).\n"
8378"Please, commit your changes before you merge."
8379msgstr ""
8380"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
8381"请在合并前先提交您的修改。"
8382
8383#: builtin/merge.c:1242
8384msgid ""
8385"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
8386"Please, commit your changes before you merge."
8387msgstr ""
8388"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
8389"请在合并前先提交您的修改。"
8390
8391#: builtin/merge.c:1245
8392msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8393msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8394
8395#: builtin/merge.c:1254
8396msgid "You cannot combine --squash with --no-ff."
8397msgstr "您不能将 --squash 与 --no-ff 同时使用。"
8398
8399#: builtin/merge.c:1262
8400msgid "No commit specified and merge.defaultToUpstream not set."
8401msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
8402
8403#: builtin/merge.c:1279
8404msgid "Squash commit into empty head not supported yet"
8405msgstr "尚不支持到空分支的压缩提交"
8406
8407#: builtin/merge.c:1281
8408msgid "Non-fast-forward commit does not make sense into an empty head"
8409msgstr "到空分支的非快进式提交没有意义"
8410
8411#: builtin/merge.c:1286
8412#, c-format
8413msgid "%s - not something we can merge"
8414msgstr "%s - 不能被合并"
8415
8416#: builtin/merge.c:1288
8417msgid "Can merge only exactly one commit into empty head"
8418msgstr "只能将一个提交合并到空分支上"
8419
8420#: builtin/merge.c:1344
8421#, c-format
8422msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8423msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8424
8425#: builtin/merge.c:1347
8426#, c-format
8427msgid "Commit %s has a bad GPG signature allegedly by %s."
8428msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8429
8430#: builtin/merge.c:1350
8431#, c-format
8432msgid "Commit %s does not have a GPG signature."
8433msgstr "提交 %s 没有一个 GPG 签名。"
8434
8435#: builtin/merge.c:1353
8436#, c-format
8437msgid "Commit %s has a good GPG signature by %s\n"
8438msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8439
8440#: builtin/merge.c:1415
8441msgid "refusing to merge unrelated histories"
8442msgstr "拒绝合并无关的历史"
8443
8444#: builtin/merge.c:1439
8445#, c-format
8446msgid "Updating %s..%s\n"
8447msgstr "更新 %s..%s\n"
8448
8449#: builtin/merge.c:1476
8450#, c-format
8451msgid "Trying really trivial in-index merge...\n"
8452msgstr "尝试非常小的索引内合并...\n"
8453
8454#: builtin/merge.c:1483
8455#, c-format
8456msgid "Nope.\n"
8457msgstr "无。\n"
8458
8459#: builtin/merge.c:1515
8460msgid "Not possible to fast-forward, aborting."
8461msgstr "无法快进,终止。"
8462
8463#: builtin/merge.c:1538 builtin/merge.c:1617
8464#, c-format
8465msgid "Rewinding the tree to pristine...\n"
8466msgstr "将树回滚至原始状态...\n"
8467
8468#: builtin/merge.c:1542
8469#, c-format
8470msgid "Trying merge strategy %s...\n"
8471msgstr "尝试合并策略 %s...\n"
8472
8473#: builtin/merge.c:1608
8474#, c-format
8475msgid "No merge strategy handled the merge.\n"
8476msgstr "没有合并策略处理此合并。\n"
8477
8478#: builtin/merge.c:1610
8479#, c-format
8480msgid "Merge with strategy %s failed.\n"
8481msgstr "使用策略 %s 合并失败。\n"
8482
8483#: builtin/merge.c:1619
8484#, c-format
8485msgid "Using the %s to prepare resolving by hand.\n"
8486msgstr "使用 %s 以准备手工解决。\n"
8487
8488#: builtin/merge.c:1631
8489#, c-format
8490msgid "Automatic merge went well; stopped before committing as requested\n"
8491msgstr "自动合并进展顺利,按要求在提交前停止\n"
8492
8493#: builtin/merge-base.c:29
8494msgid "git merge-base [-a | --all] <commit> <commit>..."
8495msgstr "git merge-base [-a | --all] <提交> <提交>..."
8496
8497#: builtin/merge-base.c:30
8498msgid "git merge-base [-a | --all] --octopus <commit>..."
8499msgstr "git merge-base [-a | --all] --octopus <提交>..."
8500
8501#: builtin/merge-base.c:31
8502msgid "git merge-base --independent <commit>..."
8503msgstr "git merge-base --independent <提交>..."
8504
8505#: builtin/merge-base.c:32
8506msgid "git merge-base --is-ancestor <commit> <commit>"
8507msgstr "git merge-base --is-ancestor <提交> <提交>"
8508
8509#: builtin/merge-base.c:33
8510msgid "git merge-base --fork-point <ref> [<commit>]"
8511msgstr "git merge-base --fork-point <引用> [<提交>]"
8512
8513#: builtin/merge-base.c:214
8514msgid "output all common ancestors"
8515msgstr "输出所有共同的祖先"
8516
8517#: builtin/merge-base.c:216
8518msgid "find ancestors for a single n-way merge"
8519msgstr "查找一个多路合并的祖先提交"
8520
8521#: builtin/merge-base.c:218
8522msgid "list revs not reachable from others"
8523msgstr "显示不能被其他访问到的版本"
8524
8525#: builtin/merge-base.c:220
8526msgid "is the first one ancestor of the other?"
8527msgstr "第一个是其他的祖先提交么?"
8528
8529#: builtin/merge-base.c:222
8530msgid "find where <commit> forked from reflog of <ref>"
8531msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8532
8533#: builtin/merge-file.c:8
8534msgid ""
8535"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8536"<orig-file> <file2>"
8537msgstr ""
8538"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8539"件> <文件2>"
8540
8541#: builtin/merge-file.c:33
8542msgid "send results to standard output"
8543msgstr "将结果发送到标准输出"
8544
8545#: builtin/merge-file.c:34
8546msgid "use a diff3 based merge"
8547msgstr "使用基于 diff3 的合并"
8548
8549#: builtin/merge-file.c:35
8550msgid "for conflicts, use our version"
8551msgstr "如果冲突,使用我们的版本"
8552
8553#: builtin/merge-file.c:37
8554msgid "for conflicts, use their version"
8555msgstr "如果冲突,使用他们的版本"
8556
8557#: builtin/merge-file.c:39
8558msgid "for conflicts, use a union version"
8559msgstr "如果冲突,使用联合版本"
8560
8561#: builtin/merge-file.c:42
8562msgid "for conflicts, use this marker size"
8563msgstr "如果冲突,使用指定长度的标记"
8564
8565#: builtin/merge-file.c:43
8566msgid "do not warn about conflicts"
8567msgstr "不要警告冲突"
8568
8569#: builtin/merge-file.c:45
8570msgid "set labels for file1/orig-file/file2"
8571msgstr "为 文件1/初始文件/文件2 设置标签"
8572
8573#: builtin/mktree.c:65
8574msgid "git mktree [-z] [--missing] [--batch]"
8575msgstr "git mktree [-z] [--missing] [--batch]"
8576
8577#: builtin/mktree.c:152
8578msgid "input is NUL terminated"
8579msgstr "输入以 NUL 字符终止"
8580
8581#: builtin/mktree.c:153 builtin/write-tree.c:24
8582msgid "allow missing objects"
8583msgstr "允许丢失的对象"
8584
8585#: builtin/mktree.c:154
8586msgid "allow creation of more than one tree"
8587msgstr "允许创建一个以上的树"
8588
8589#: builtin/mv.c:15
8590msgid "git mv [<options>] <source>... <destination>"
8591msgstr "git mv [<选项>] <源>... <目标>"
8592
8593#: builtin/mv.c:70
8594#, c-format
8595msgid "Directory %s is in index and no submodule?"
8596msgstr "目录 %s 在索引中并且不是子模组?"
8597
8598#: builtin/mv.c:72 builtin/rm.c:317
8599msgid "Please stage your changes to .gitmodules or stash them to proceed"
8600msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8601
8602#: builtin/mv.c:90
8603#, c-format
8604msgid "%.*s is in index"
8605msgstr "%.*s 在索引中"
8606
8607#: builtin/mv.c:112
8608msgid "force move/rename even if target exists"
8609msgstr "强制移动/重命令,即使目标存在"
8610
8611#: builtin/mv.c:113
8612msgid "skip move/rename errors"
8613msgstr "跳过移动/重命名错误"
8614
8615#: builtin/mv.c:152
8616#, c-format
8617msgid "destination '%s' is not a directory"
8618msgstr "目标 '%s' 不是一个目录"
8619
8620#: builtin/mv.c:163
8621#, c-format
8622msgid "Checking rename of '%s' to '%s'\n"
8623msgstr "检查 '%s' 到 '%s' 的重命名\n"
8624
8625#: builtin/mv.c:167
8626msgid "bad source"
8627msgstr "坏的源"
8628
8629#: builtin/mv.c:170
8630msgid "can not move directory into itself"
8631msgstr "不能将目录移动到自身"
8632
8633#: builtin/mv.c:173
8634msgid "cannot move directory over file"
8635msgstr "不能将目录移动到文件"
8636
8637#: builtin/mv.c:182
8638msgid "source directory is empty"
8639msgstr "源目录为空"
8640
8641#: builtin/mv.c:207
8642msgid "not under version control"
8643msgstr "不在版本控制之下"
8644
8645#: builtin/mv.c:210
8646msgid "destination exists"
8647msgstr "目标已存在"
8648
8649#: builtin/mv.c:218
8650#, c-format
8651msgid "overwriting '%s'"
8652msgstr "覆盖 '%s'"
8653
8654#: builtin/mv.c:221
8655msgid "Cannot overwrite"
8656msgstr "不能覆盖"
8657
8658#: builtin/mv.c:224
8659msgid "multiple sources for the same target"
8660msgstr "同一目标具有多个源"
8661
8662#: builtin/mv.c:226
8663msgid "destination directory does not exist"
8664msgstr "目标目录不存在"
8665
8666#: builtin/mv.c:233
8667#, c-format
8668msgid "%s, source=%s, destination=%s"
8669msgstr "%s,源=%s,目标=%s"
8670
8671#: builtin/mv.c:254
8672#, c-format
8673msgid "Renaming %s to %s\n"
8674msgstr "重命名 %s 至 %s\n"
8675
8676#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
8677#, c-format
8678msgid "renaming '%s' failed"
8679msgstr "重命名 '%s' 失败"
8680
8681#: builtin/name-rev.c:258
8682msgid "git name-rev [<options>] <commit>..."
8683msgstr "git name-rev [<选项>] <提交>..."
8684
8685#: builtin/name-rev.c:259
8686msgid "git name-rev [<options>] --all"
8687msgstr "git name-rev [<选项>] --all"
8688
8689#: builtin/name-rev.c:260
8690msgid "git name-rev [<options>] --stdin"
8691msgstr "git name-rev [<选项>] --stdin"
8692
8693#: builtin/name-rev.c:312
8694msgid "print only names (no SHA-1)"
8695msgstr "只打印名称(无 SHA-1)"
8696
8697#: builtin/name-rev.c:313
8698msgid "only use tags to name the commits"
8699msgstr "只使用标签来命名提交"
8700
8701#: builtin/name-rev.c:315
8702msgid "only use refs matching <pattern>"
8703msgstr "只使用和 <模式> 相匹配的引用"
8704
8705#: builtin/name-rev.c:317
8706msgid "list all commits reachable from all refs"
8707msgstr "列出可以从所有引用访问的提交"
8708
8709#: builtin/name-rev.c:318
8710msgid "read from stdin"
8711msgstr "从标准输入读取"
8712
8713#: builtin/name-rev.c:319
8714msgid "allow to print `undefined` names (default)"
8715msgstr "允许打印 `未定义` 的名称(默认)"
8716
8717#: builtin/name-rev.c:325
8718msgid "dereference tags in the input (internal use)"
8719msgstr "反向解析输入中的标签(内部使用)"
8720
8721#: builtin/notes.c:25
8722msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8723msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8724
8725#: builtin/notes.c:26
8726msgid ""
8727"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8728"| (-c | -C) <object>] [<object>]"
8729msgstr ""
8730"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8731"| (-c | -C) <对象>] [<对象>]"
8732
8733#: builtin/notes.c:27
8734msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8735msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8736
8737#: builtin/notes.c:28
8738msgid ""
8739"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8740"(-c | -C) <object>] [<object>]"
8741msgstr ""
8742"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8743"(-c | -C) <对象>] [<对象>]"
8744
8745#: builtin/notes.c:29
8746msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8747msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8748
8749#: builtin/notes.c:30
8750msgid "git notes [--ref <notes-ref>] show [<object>]"
8751msgstr "git notes [--ref <注解引用>] show [<对象>]"
8752
8753#: builtin/notes.c:31
8754msgid ""
8755"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8756msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8757
8758#: builtin/notes.c:32
8759msgid "git notes merge --commit [-v | -q]"
8760msgstr "git notes merge --commit [-v | -q]"
8761
8762#: builtin/notes.c:33
8763msgid "git notes merge --abort [-v | -q]"
8764msgstr "git notes merge --abort [-v | -q]"
8765
8766#: builtin/notes.c:34
8767msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8768msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8769
8770#: builtin/notes.c:35
8771msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8772msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8773
8774#: builtin/notes.c:36
8775msgid "git notes [--ref <notes-ref>] get-ref"
8776msgstr "git notes [--ref <注解引用>] get-ref"
8777
8778#: builtin/notes.c:41
8779msgid "git notes [list [<object>]]"
8780msgstr "git notes [list [<对象>]]"
8781
8782#: builtin/notes.c:46
8783msgid "git notes add [<options>] [<object>]"
8784msgstr "git notes add [<选项>] [<对象>]"
8785
8786#: builtin/notes.c:51
8787msgid "git notes copy [<options>] <from-object> <to-object>"
8788msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8789
8790#: builtin/notes.c:52
8791msgid "git notes copy --stdin [<from-object> <to-object>]..."
8792msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8793
8794#: builtin/notes.c:57
8795msgid "git notes append [<options>] [<object>]"
8796msgstr "git notes append [<选项>] [<对象>]"
8797
8798#: builtin/notes.c:62
8799msgid "git notes edit [<object>]"
8800msgstr "git notes edit [<对象>]"
8801
8802#: builtin/notes.c:67
8803msgid "git notes show [<object>]"
8804msgstr "git notes show [<对象>]"
8805
8806#: builtin/notes.c:72
8807msgid "git notes merge [<options>] <notes-ref>"
8808msgstr "git notes merge [<选项>] <注解引用>"
8809
8810#: builtin/notes.c:73
8811msgid "git notes merge --commit [<options>]"
8812msgstr "git notes merge --commit [<选项>]"
8813
8814#: builtin/notes.c:74
8815msgid "git notes merge --abort [<options>]"
8816msgstr "git notes merge --abort [<选项>]"
8817
8818#: builtin/notes.c:79
8819msgid "git notes remove [<object>]"
8820msgstr "git notes remove [<对象>]"
8821
8822#: builtin/notes.c:84
8823msgid "git notes prune [<options>]"
8824msgstr "git notes prune [<选项>]"
8825
8826#: builtin/notes.c:89
8827msgid "git notes get-ref"
8828msgstr "git notes get-ref"
8829
8830#: builtin/notes.c:147
8831#, c-format
8832msgid "unable to start 'show' for object '%s'"
8833msgstr "不能为对象 '%s' 开始 'show'"
8834
8835#: builtin/notes.c:151
8836msgid "could not read 'show' output"
8837msgstr "不能读取 'show' 的输出"
8838
8839#: builtin/notes.c:159
8840#, c-format
8841msgid "failed to finish 'show' for object '%s'"
8842msgstr "无法为对象 '%s' 完成 'show'"
8843
8844#: builtin/notes.c:174 builtin/tag.c:248
8845#, c-format
8846msgid "could not create file '%s'"
8847msgstr "不能创建文件 '%s'"
8848
8849#: builtin/notes.c:193
8850msgid "Please supply the note contents using either -m or -F option"
8851msgstr "请通过 -m 或 -F 选项为注解提供内容"
8852
8853#: builtin/notes.c:202
8854msgid "unable to write note object"
8855msgstr "不能写注解对象"
8856
8857#: builtin/notes.c:204
8858#, c-format
8859msgid "The note contents have been left in %s"
8860msgstr "注解内容被留在 %s 中"
8861
8862#: builtin/notes.c:232 builtin/tag.c:439
8863#, c-format
8864msgid "cannot read '%s'"
8865msgstr "不能读取 '%s'"
8866
8867#: builtin/notes.c:234 builtin/tag.c:442
8868#, c-format
8869msgid "could not open or read '%s'"
8870msgstr "不能打开或读取 '%s'"
8871
8872#: builtin/notes.c:256
8873#, c-format
8874msgid "Failed to read object '%s'."
8875msgstr "无法读取对象 '%s'。"
8876
8877#: builtin/notes.c:260
8878#, c-format
8879msgid "Cannot read note data from non-blob object '%s'."
8880msgstr "不能从非数据对象 '%s' 中读取注解数据"
8881
8882#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8883#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8884#: builtin/notes.c:946
8885msgid "too many parameters"
8886msgstr "参数太多"
8887
8888#: builtin/notes.c:375 builtin/notes.c:662
8889#, c-format
8890msgid "No note found for object %s."
8891msgstr "未发现对象 %s 的注解。"
8892
8893#: builtin/notes.c:396 builtin/notes.c:559
8894msgid "note contents as a string"
8895msgstr "注解内容作为一个字符串"
8896
8897#: builtin/notes.c:399 builtin/notes.c:562
8898msgid "note contents in a file"
8899msgstr "注解内容到一个文件中"
8900
8901#: builtin/notes.c:402 builtin/notes.c:565
8902msgid "reuse and edit specified note object"
8903msgstr "重用和编辑指定的注解对象"
8904
8905#: builtin/notes.c:405 builtin/notes.c:568
8906msgid "reuse specified note object"
8907msgstr "重用指定的注解对象"
8908
8909#: builtin/notes.c:408 builtin/notes.c:571
8910msgid "allow storing empty note"
8911msgstr "允许保存空白注释"
8912
8913#: builtin/notes.c:409 builtin/notes.c:480
8914msgid "replace existing notes"
8915msgstr "替换已存在的注解"
8916
8917#: builtin/notes.c:434
8918#, c-format
8919msgid ""
8920"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8921"existing notes"
8922msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8923
8924#: builtin/notes.c:449 builtin/notes.c:528
8925#, c-format
8926msgid "Overwriting existing notes for object %s\n"
8927msgstr "覆盖对象 %s 现存注解\n"
8928
8929#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
8930#, c-format
8931msgid "Removing note for object %s\n"
8932msgstr "删除对象 %s 的注解\n"
8933
8934#: builtin/notes.c:481
8935msgid "read objects from stdin"
8936msgstr "从标准输入读取对象"
8937
8938#: builtin/notes.c:483
8939msgid "load rewriting config for <command> (implies --stdin)"
8940msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8941
8942#: builtin/notes.c:501
8943msgid "too few parameters"
8944msgstr "参数太少"
8945
8946#: builtin/notes.c:522
8947#, c-format
8948msgid ""
8949"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8950"existing notes"
8951msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8952
8953#: builtin/notes.c:534
8954#, c-format
8955msgid "Missing notes on source object %s. Cannot copy."
8956msgstr "源对象 %s 缺少注解。不能拷贝。"
8957
8958#: builtin/notes.c:586
8959#, c-format
8960msgid ""
8961"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8962"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8963msgstr ""
8964"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8965"请换用 'git notes add -f -m/-F/-c/-C'。\n"
8966
8967#: builtin/notes.c:768
8968msgid "General options"
8969msgstr "通用选项"
8970
8971#: builtin/notes.c:770
8972msgid "Merge options"
8973msgstr "合并选项"
8974
8975#: builtin/notes.c:772
8976msgid ""
8977"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8978"cat_sort_uniq)"
8979msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8980
8981#: builtin/notes.c:774
8982msgid "Committing unmerged notes"
8983msgstr "提交未合并的注解"
8984
8985#: builtin/notes.c:776
8986msgid "finalize notes merge by committing unmerged notes"
8987msgstr "通过提交未合并的注解来完成注解合并"
8988
8989#: builtin/notes.c:778
8990msgid "Aborting notes merge resolution"
8991msgstr "中止注解合并的方案"
8992
8993#: builtin/notes.c:780
8994msgid "abort notes merge"
8995msgstr "中止注解合并"
8996
8997#: builtin/notes.c:857
8998#, c-format
8999msgid "A notes merge into %s is already in-progress at %s"
9000msgstr "一个到 %s 的注解合并已经在 %s 执行中"
9001
9002#: builtin/notes.c:884
9003#, c-format
9004msgid "Object %s has no note\n"
9005msgstr "对象 %s 没有注解\n"
9006
9007#: builtin/notes.c:896
9008msgid "attempt to remove non-existent note is not an error"
9009msgstr "尝试删除不存在的注解不是一个错误"
9010
9011#: builtin/notes.c:899
9012msgid "read object names from the standard input"
9013msgstr "从标准输入读取对象名称"
9014
9015#: builtin/notes.c:980
9016msgid "notes-ref"
9017msgstr "注解引用"
9018
9019#: builtin/notes.c:981
9020msgid "use notes from <notes-ref>"
9021msgstr "从 <注解引用> 使用注解"
9022
9023#: builtin/notes.c:1016 builtin/remote.c:1628
9024#, c-format
9025msgid "Unknown subcommand: %s"
9026msgstr "未知子命令:%s"
9027
9028#: builtin/pack-objects.c:28
9029msgid ""
9030"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
9031msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
9032
9033#: builtin/pack-objects.c:29
9034msgid ""
9035"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
9036msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
9037
9038#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
9039#, c-format
9040msgid "deflate error (%d)"
9041msgstr "压缩错误 (%d)"
9042
9043#: builtin/pack-objects.c:763
9044msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
9045msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
9046
9047#: builtin/pack-objects.c:776
9048msgid "Writing objects"
9049msgstr "写入对象中"
9050
9051#: builtin/pack-objects.c:1017
9052msgid "disabling bitmap writing, as some objects are not being packed"
9053msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
9054
9055#: builtin/pack-objects.c:2177
9056msgid "Compressing objects"
9057msgstr "压缩对象中"
9058
9059#: builtin/pack-objects.c:2563
9060#, c-format
9061msgid "unsupported index version %s"
9062msgstr "不支持的索引版本 %s"
9063
9064#: builtin/pack-objects.c:2567
9065#, c-format
9066msgid "bad index version '%s'"
9067msgstr "坏的索引版本 '%s'"
9068
9069#: builtin/pack-objects.c:2597
9070msgid "do not show progress meter"
9071msgstr "不显示进度表"
9072
9073#: builtin/pack-objects.c:2599
9074msgid "show progress meter"
9075msgstr "显示进度表"
9076
9077#: builtin/pack-objects.c:2601
9078msgid "show progress meter during object writing phase"
9079msgstr "在对象写入阶段显示进度表"
9080
9081#: builtin/pack-objects.c:2604
9082msgid "similar to --all-progress when progress meter is shown"
9083msgstr "当进度表显示时类似于 --all-progress"
9084
9085#: builtin/pack-objects.c:2605
9086msgid "version[,offset]"
9087msgstr "版本[,偏移]"
9088
9089#: builtin/pack-objects.c:2606
9090msgid "write the pack index file in the specified idx format version"
9091msgstr "用指定的 idx 格式版本来写包索引文件"
9092
9093#: builtin/pack-objects.c:2609
9094msgid "maximum size of each output pack file"
9095msgstr "每个输出包的最大尺寸"
9096
9097#: builtin/pack-objects.c:2611
9098msgid "ignore borrowed objects from alternate object store"
9099msgstr "忽略从备用对象存储里借用对象"
9100
9101#: builtin/pack-objects.c:2613
9102msgid "ignore packed objects"
9103msgstr "忽略包对象"
9104
9105#: builtin/pack-objects.c:2615
9106msgid "limit pack window by objects"
9107msgstr "限制打包窗口的对象数"
9108
9109#: builtin/pack-objects.c:2617
9110msgid "limit pack window by memory in addition to object limit"
9111msgstr "除对象数量限制外设置打包窗口的内存限制"
9112
9113#: builtin/pack-objects.c:2619
9114msgid "maximum length of delta chain allowed in the resulting pack"
9115msgstr "打包允许的 delta 链的最大长度"
9116
9117#: builtin/pack-objects.c:2621
9118msgid "reuse existing deltas"
9119msgstr "重用已存在的 deltas"
9120
9121#: builtin/pack-objects.c:2623
9122msgid "reuse existing objects"
9123msgstr "重用已存在的对象"
9124
9125#: builtin/pack-objects.c:2625
9126msgid "use OFS_DELTA objects"
9127msgstr "使用 OFS_DELTA 对象"
9128
9129#: builtin/pack-objects.c:2627
9130msgid "use threads when searching for best delta matches"
9131msgstr "使用线程查询最佳 delta 匹配"
9132
9133#: builtin/pack-objects.c:2629
9134msgid "do not create an empty pack output"
9135msgstr "不创建空的包输出"
9136
9137#: builtin/pack-objects.c:2631
9138msgid "read revision arguments from standard input"
9139msgstr "从标准输入读取版本号参数"
9140
9141#: builtin/pack-objects.c:2633
9142msgid "limit the objects to those that are not yet packed"
9143msgstr "限制那些尚未打包的对象"
9144
9145#: builtin/pack-objects.c:2636
9146msgid "include objects reachable from any reference"
9147msgstr "包括可以从任何引用访问到的对象"
9148
9149#: builtin/pack-objects.c:2639
9150msgid "include objects referred by reflog entries"
9151msgstr "包括被引用日志引用到的对象"
9152
9153#: builtin/pack-objects.c:2642
9154msgid "include objects referred to by the index"
9155msgstr "包括被索引引用到的对象"
9156
9157#: builtin/pack-objects.c:2645
9158msgid "output pack to stdout"
9159msgstr "输出包到标准输出"
9160
9161#: builtin/pack-objects.c:2647
9162msgid "include tag objects that refer to objects to be packed"
9163msgstr "包括那些引用了待打包对象的标签对象"
9164
9165#: builtin/pack-objects.c:2649
9166msgid "keep unreachable objects"
9167msgstr "维持不可达的对象"
9168
9169#: builtin/pack-objects.c:2650 parse-options.h:142
9170msgid "time"
9171msgstr "时间"
9172
9173#: builtin/pack-objects.c:2651
9174msgid "unpack unreachable objects newer than <time>"
9175msgstr "将比给定 <时间> 新的无法访问的对象解包"
9176
9177#: builtin/pack-objects.c:2654
9178msgid "create thin packs"
9179msgstr "创建精简包"
9180
9181#: builtin/pack-objects.c:2656
9182msgid "create packs suitable for shallow fetches"
9183msgstr "创建适合浅克隆仓库获取的包"
9184
9185#: builtin/pack-objects.c:2658
9186msgid "ignore packs that have companion .keep file"
9187msgstr "忽略配有 .keep 文件的包"
9188
9189#: builtin/pack-objects.c:2660
9190msgid "pack compression level"
9191msgstr "打包压缩级别"
9192
9193#: builtin/pack-objects.c:2662
9194msgid "do not hide commits by grafts"
9195msgstr "显示被嫁接隐藏的提交"
9196
9197#: builtin/pack-objects.c:2664
9198msgid "use a bitmap index if available to speed up counting objects"
9199msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
9200
9201#: builtin/pack-objects.c:2666
9202msgid "write a bitmap index together with the pack index"
9203msgstr "在建立包索引的同时创建 bitmap 索引"
9204
9205#: builtin/pack-objects.c:2757
9206msgid "Counting objects"
9207msgstr "对象计数中"
9208
9209#: builtin/pack-refs.c:6
9210msgid "git pack-refs [<options>]"
9211msgstr "git pack-refs [<选项>]"
9212
9213#: builtin/pack-refs.c:14
9214msgid "pack everything"
9215msgstr "打包一切"
9216
9217#: builtin/pack-refs.c:15
9218msgid "prune loose refs (default)"
9219msgstr "清除松散的引用(默认)"
9220
9221#: builtin/prune-packed.c:7
9222msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
9223msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
9224
9225#: builtin/prune-packed.c:40
9226msgid "Removing duplicate objects"
9227msgstr "正在删除重复对象"
9228
9229#: builtin/prune.c:11
9230msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
9231msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
9232
9233#: builtin/prune.c:105 builtin/worktree.c:125
9234msgid "do not remove, show only"
9235msgstr "不删除,只显示"
9236
9237#: builtin/prune.c:106 builtin/worktree.c:126
9238msgid "report pruned objects"
9239msgstr "报告清除的对象"
9240
9241#: builtin/prune.c:109 builtin/worktree.c:128
9242msgid "expire objects older than <time>"
9243msgstr "使早于给定时间的对象过期"
9244
9245#: builtin/prune.c:123
9246msgid "cannot prune in a precious-objects repo"
9247msgstr "不能在珍品仓库中执行清理操作"
9248
9249#: builtin/pull.c:72
9250msgid "git pull [<options>] [<repository> [<refspec>...]]"
9251msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
9252
9253#: builtin/pull.c:120
9254msgid "Options related to merging"
9255msgstr "和合并相关的选项"
9256
9257#: builtin/pull.c:123
9258msgid "incorporate changes by rebasing rather than merging"
9259msgstr "使用变基操作取代合并操作以合入修改"
9260
9261#: builtin/pull.c:147 builtin/revert.c:105
9262msgid "allow fast-forward"
9263msgstr "允许快进式"
9264
9265#: builtin/pull.c:153
9266msgid "verify that the named commit has a valid GPG signature"
9267msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9268
9269#: builtin/pull.c:156
9270msgid "automatically stash/stash pop before and after rebase"
9271msgstr "自动在变基操作前后执行 stash/stash pop"
9272
9273#: builtin/pull.c:172
9274msgid "Options related to fetching"
9275msgstr "和获取相关的参数"
9276
9277#: builtin/pull.c:194
9278msgid "number of submodules pulled in parallel"
9279msgstr "并发拉取的子模组的数量"
9280
9281#: builtin/pull.c:283
9282#, c-format
9283msgid "Invalid value for pull.ff: %s"
9284msgstr "pull.ff 的取值无效:%s"
9285
9286#: builtin/pull.c:379
9287msgid "Cannot pull with rebase: You have unstaged changes."
9288msgstr "无法通过变基方式拉取:您有未暂存的变更。"
9289
9290#: builtin/pull.c:385
9291msgid "Additionally, your index contains uncommitted changes."
9292msgstr "而且您的索引中包含未提交的变更。"
9293
9294#: builtin/pull.c:387
9295msgid "Cannot pull with rebase: Your index contains uncommitted changes."
9296msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
9297
9298#: builtin/pull.c:463
9299msgid ""
9300"There is no candidate for rebasing against among the refs that you just "
9301"fetched."
9302msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
9303
9304#: builtin/pull.c:465
9305msgid ""
9306"There are no candidates for merging among the refs that you just fetched."
9307msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
9308
9309#: builtin/pull.c:466
9310msgid ""
9311"Generally this means that you provided a wildcard refspec which had no\n"
9312"matches on the remote end."
9313msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
9314
9315#: builtin/pull.c:469
9316#, c-format
9317msgid ""
9318"You asked to pull from the remote '%s', but did not specify\n"
9319"a branch. Because this is not the default configured remote\n"
9320"for your current branch, you must specify a branch on the command line."
9321msgstr ""
9322"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
9323"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
9324
9325#: builtin/pull.c:474 git-parse-remote.sh:73
9326msgid "You are not currently on a branch."
9327msgstr "您当前不在一个分支上。"
9328
9329#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
9330msgid "Please specify which branch you want to rebase against."
9331msgstr "请指定您要变基到哪一个分支。"
9332
9333#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
9334msgid "Please specify which branch you want to merge with."
9335msgstr "请指定您要合并哪一个分支。"
9336
9337#: builtin/pull.c:479 builtin/pull.c:494
9338msgid "See git-pull(1) for details."
9339msgstr "详见 git-pull(1)。"
9340
9341#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
9342#: git-parse-remote.sh:64
9343msgid "<remote>"
9344msgstr "<远程>"
9345
9346#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
9347#: git-parse-remote.sh:65
9348msgid "<branch>"
9349msgstr "<分支>"
9350
9351#: builtin/pull.c:489 git-parse-remote.sh:75
9352msgid "There is no tracking information for the current branch."
9353msgstr "当前分支没有跟踪信息。"
9354
9355#: builtin/pull.c:498 git-parse-remote.sh:95
9356msgid ""
9357"If you wish to set tracking information for this branch you can do so with:"
9358msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
9359
9360#: builtin/pull.c:503
9361#, c-format
9362msgid ""
9363"Your configuration specifies to merge with the ref '%s'\n"
9364"from the remote, but no such ref was fetched."
9365msgstr ""
9366"您的配置中指定要合并远程的引用 '%s',\n"
9367"但是没有获取到这个引用。"
9368
9369#: builtin/pull.c:864
9370msgid "--[no-]autostash option is only valid with --rebase."
9371msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
9372
9373#: builtin/pull.c:872
9374msgid "Updating an unborn branch with changes added to the index."
9375msgstr "更新尚未诞生的分支,变更添加至索引。"
9376
9377#: builtin/pull.c:900
9378#, c-format
9379msgid ""
9380"fetch updated the current branch head.\n"
9381"fast-forwarding your working tree from\n"
9382"commit %s."
9383msgstr ""
9384"fetch 更新了当前的分支。快进您的工作区\n"
9385"至提交 %s。"
9386
9387#: builtin/pull.c:905
9388#, c-format
9389msgid ""
9390"Cannot fast-forward your working tree.\n"
9391"After making sure that you saved anything precious from\n"
9392"$ git diff %s\n"
9393"output, run\n"
9394"$ git reset --hard\n"
9395"to recover."
9396msgstr ""
9397"您当前的工作区无法执行快进操作。\n"
9398"首先执行如下命令:\n"
9399"$ git diff %s\n"
9400"以确认所有有用的数据均已保存。然后执行下面的命令\n"
9401"$ git reset --hard\n"
9402"恢复之前的状态。"
9403
9404#: builtin/pull.c:920
9405msgid "Cannot merge multiple branches into empty head."
9406msgstr "无法将多个分支合并到空分支。"
9407
9408#: builtin/pull.c:924
9409msgid "Cannot rebase onto multiple branches."
9410msgstr "无法变基到多个分支。"
9411
9412#: builtin/push.c:16
9413msgid "git push [<options>] [<repository> [<refspec>...]]"
9414msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
9415
9416#: builtin/push.c:89
9417msgid "tag shorthand without <tag>"
9418msgstr "标签后面未提供 <标签> 参数"
9419
9420#: builtin/push.c:99
9421msgid "--delete only accepts plain target ref names"
9422msgstr "--delete 只接受简单的目标引用名"
9423
9424#: builtin/push.c:143
9425msgid ""
9426"\n"
9427"To choose either option permanently, see push.default in 'git help config'."
9428msgstr ""
9429"\n"
9430"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
9431
9432#: builtin/push.c:146
9433#, c-format
9434msgid ""
9435"The upstream branch of your current branch does not match\n"
9436"the name of your current branch.  To push to the upstream branch\n"
9437"on the remote, use\n"
9438"\n"
9439"    git push %s HEAD:%s\n"
9440"\n"
9441"To push to the branch of the same name on the remote, use\n"
9442"\n"
9443"    git push %s %s\n"
9444"%s"
9445msgstr ""
9446"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9447"上游分支,使用\n"
9448"\n"
9449"    git push %s HEAD:%s\n"
9450"\n"
9451"为推送至远程同名分支,使用\n"
9452"\n"
9453"    git push %s %s\n"
9454"%s"
9455
9456#: builtin/push.c:161
9457#, c-format
9458msgid ""
9459"You are not currently on a branch.\n"
9460"To push the history leading to the current (detached HEAD)\n"
9461"state now, use\n"
9462"\n"
9463"    git push %s HEAD:<name-of-remote-branch>\n"
9464msgstr ""
9465"您当前不在一个分支上。\n"
9466"现在为推送当前(分离头指针)的历史,使用\n"
9467"\n"
9468"    git push %s HEAD:<远程分支名字>\n"
9469
9470#: builtin/push.c:175
9471#, c-format
9472msgid ""
9473"The current branch %s has no upstream branch.\n"
9474"To push the current branch and set the remote as upstream, use\n"
9475"\n"
9476"    git push --set-upstream %s %s\n"
9477msgstr ""
9478"当前分支 %s 没有对应的上游分支。\n"
9479"为推送当前分支并建立与远程上游的跟踪,使用\n"
9480"\n"
9481"    git push --set-upstream %s %s\n"
9482
9483#: builtin/push.c:183
9484#, c-format
9485msgid "The current branch %s has multiple upstream branches, refusing to push."
9486msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9487
9488#: builtin/push.c:186
9489#, c-format
9490msgid ""
9491"You are pushing to remote '%s', which is not the upstream of\n"
9492"your current branch '%s', without telling me what to push\n"
9493"to update which remote branch."
9494msgstr ""
9495"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9496"而没有告诉我要推送什么、更新哪个远程分支。"
9497
9498#: builtin/push.c:242
9499msgid ""
9500"You didn't specify any refspecs to push, and push.default is \"nothing\"."
9501msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9502
9503#: builtin/push.c:249
9504msgid ""
9505"Updates were rejected because the tip of your current branch is behind\n"
9506"its remote counterpart. Integrate the remote changes (e.g.\n"
9507"'git pull ...') before pushing again.\n"
9508"See the 'Note about fast-forwards' in 'git push --help' for details."
9509msgstr ""
9510"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9511"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9512"'git push --help' 中的 'Note about fast-forwards' 小节。"
9513
9514#: builtin/push.c:255
9515msgid ""
9516"Updates were rejected because a pushed branch tip is behind its remote\n"
9517"counterpart. Check out this branch and integrate the remote changes\n"
9518"(e.g. 'git pull ...') before pushing again.\n"
9519"See the 'Note about fast-forwards' in 'git push --help' for details."
9520msgstr ""
9521"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9522"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9523"'git push --help' 中的 'Note about fast-forwards' 小节。"
9524
9525#: builtin/push.c:261
9526msgid ""
9527"Updates were rejected because the remote contains work that you do\n"
9528"not have locally. This is usually caused by another repository pushing\n"
9529"to the same ref. You may want to first integrate the remote changes\n"
9530"(e.g., 'git pull ...') before pushing again.\n"
9531"See the 'Note about fast-forwards' in 'git push --help' for details."
9532msgstr ""
9533"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9534"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9535"(如 'git pull ...')。\n"
9536"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9537
9538#: builtin/push.c:268
9539msgid "Updates were rejected because the tag already exists in the remote."
9540msgstr "更新被拒绝,因为该标签在远程已经存在。"
9541
9542#: builtin/push.c:271
9543msgid ""
9544"You cannot update a remote ref that points at a non-commit object,\n"
9545"or update a remote ref to make it point at a non-commit object,\n"
9546"without using the '--force' option.\n"
9547msgstr ""
9548"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9549"也不能更新远程引用让其指向一个非提交对象。\n"
9550
9551#: builtin/push.c:331
9552#, c-format
9553msgid "Pushing to %s\n"
9554msgstr "推送到 %s\n"
9555
9556#: builtin/push.c:335
9557#, c-format
9558msgid "failed to push some refs to '%s'"
9559msgstr "无法推送一些引用到 '%s'"
9560
9561#: builtin/push.c:365
9562#, c-format
9563msgid "bad repository '%s'"
9564msgstr "坏的仓库 '%s'"
9565
9566#: builtin/push.c:366
9567msgid ""
9568"No configured push destination.\n"
9569"Either specify the URL from the command-line or configure a remote "
9570"repository using\n"
9571"\n"
9572"    git remote add <name> <url>\n"
9573"\n"
9574"and then push using the remote name\n"
9575"\n"
9576"    git push <name>\n"
9577msgstr ""
9578"没有配置推送目标。\n"
9579"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9580"\n"
9581"    git remote add <名称> <地址>\n"
9582"\n"
9583"然后使用该远程仓库名执行推送\n"
9584"\n"
9585"    git push <名称>\n"
9586
9587#: builtin/push.c:381
9588msgid "--all and --tags are incompatible"
9589msgstr "--all 和 --tags 不兼容"
9590
9591#: builtin/push.c:382
9592msgid "--all can't be combined with refspecs"
9593msgstr "--all 不能和引用规格同时使用"
9594
9595#: builtin/push.c:387
9596msgid "--mirror and --tags are incompatible"
9597msgstr "--mirror 和 --tags 不兼容"
9598
9599#: builtin/push.c:388
9600msgid "--mirror can't be combined with refspecs"
9601msgstr "--mirror 不能和引用规格同时使用"
9602
9603#: builtin/push.c:393
9604msgid "--all and --mirror are incompatible"
9605msgstr "--all 和 --mirror 不兼容"
9606
9607#: builtin/push.c:505
9608msgid "repository"
9609msgstr "仓库"
9610
9611#: builtin/push.c:506 builtin/send-pack.c:161
9612msgid "push all refs"
9613msgstr "推送所有引用"
9614
9615#: builtin/push.c:507 builtin/send-pack.c:163
9616msgid "mirror all refs"
9617msgstr "镜像所有引用"
9618
9619#: builtin/push.c:509
9620msgid "delete refs"
9621msgstr "删除引用"
9622
9623#: builtin/push.c:510
9624msgid "push tags (can't be used with --all or --mirror)"
9625msgstr "推送标签(不能使用 --all or --mirror)"
9626
9627#: builtin/push.c:513 builtin/send-pack.c:164
9628msgid "force updates"
9629msgstr "强制更新"
9630
9631#: builtin/push.c:515 builtin/send-pack.c:175
9632msgid "refname>:<expect"
9633msgstr "引用名>:<期望值"
9634
9635#: builtin/push.c:516 builtin/send-pack.c:176
9636msgid "require old value of ref to be at this value"
9637msgstr "要求引用旧的取值为设定值"
9638
9639#: builtin/push.c:519
9640msgid "control recursive pushing of submodules"
9641msgstr "控制子模组的递归推送"
9642
9643#: builtin/push.c:521 builtin/send-pack.c:169
9644msgid "use thin pack"
9645msgstr "使用精简打包"
9646
9647#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
9648#: builtin/send-pack.c:159
9649msgid "receive pack program"
9650msgstr "接收包程序"
9651
9652#: builtin/push.c:524
9653msgid "set upstream for git pull/status"
9654msgstr "设置 git pull/status 的上游"
9655
9656#: builtin/push.c:527
9657msgid "prune locally removed refs"
9658msgstr "清除本地删除的引用"
9659
9660#: builtin/push.c:529
9661msgid "bypass pre-push hook"
9662msgstr "绕过 pre-push 钩子"
9663
9664#: builtin/push.c:530
9665msgid "push missing but relevant tags"
9666msgstr "推送缺失但有关的标签"
9667
9668#: builtin/push.c:533 builtin/send-pack.c:166
9669msgid "GPG sign the push"
9670msgstr "用 GPG 为推送签名"
9671
9672#: builtin/push.c:535 builtin/send-pack.c:170
9673msgid "request atomic transaction on remote side"
9674msgstr "需要远端支持原子事务"
9675
9676#: builtin/push.c:549
9677msgid "--delete is incompatible with --all, --mirror and --tags"
9678msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9679
9680#: builtin/push.c:551
9681msgid "--delete doesn't make sense without any refs"
9682msgstr "--delete 未接任何引用没有意义"
9683
9684#: builtin/read-tree.c:37
9685msgid ""
9686"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9687"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9688"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9689msgstr ""
9690"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9691"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9692"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9693
9694#: builtin/read-tree.c:110
9695msgid "write resulting index to <file>"
9696msgstr "将索引结果写入 <文件>"
9697
9698#: builtin/read-tree.c:113
9699msgid "only empty the index"
9700msgstr "只是清空索引"
9701
9702#: builtin/read-tree.c:115
9703msgid "Merging"
9704msgstr "合并"
9705
9706#: builtin/read-tree.c:117
9707msgid "perform a merge in addition to a read"
9708msgstr "读取之余再执行一个合并"
9709
9710#: builtin/read-tree.c:119
9711msgid "3-way merge if no file level merging required"
9712msgstr "如果没有文件级合并需要,执行三方合并"
9713
9714#: builtin/read-tree.c:121
9715msgid "3-way merge in presence of adds and removes"
9716msgstr "存在添加和删除时,也执行三方合并"
9717
9718#: builtin/read-tree.c:123
9719msgid "same as -m, but discard unmerged entries"
9720msgstr "类似于 -m,但丢弃未合并的条目"
9721
9722#: builtin/read-tree.c:124
9723msgid "<subdirectory>/"
9724msgstr "<子目录>/"
9725
9726#: builtin/read-tree.c:125
9727msgid "read the tree into the index under <subdirectory>/"
9728msgstr "读取树对象到索引的 <子目录>/ 下"
9729
9730#: builtin/read-tree.c:128
9731msgid "update working tree with merge result"
9732msgstr "用合并的结果更新工作区"
9733
9734#: builtin/read-tree.c:130
9735msgid "gitignore"
9736msgstr "gitignore"
9737
9738#: builtin/read-tree.c:131
9739msgid "allow explicitly ignored files to be overwritten"
9740msgstr "允许忽略文件中设定的文件可以被覆盖"
9741
9742#: builtin/read-tree.c:134
9743msgid "don't check the working tree after merging"
9744msgstr "合并后不检查工作区"
9745
9746#: builtin/read-tree.c:135
9747msgid "don't update the index or the work tree"
9748msgstr "不更新索引区和工作区"
9749
9750#: builtin/read-tree.c:137
9751msgid "skip applying sparse checkout filter"
9752msgstr "跳过应用稀疏检出过滤器"
9753
9754#: builtin/read-tree.c:139
9755msgid "debug unpack-trees"
9756msgstr "调试 unpack-trees"
9757
9758#: builtin/receive-pack.c:25
9759msgid "git receive-pack <git-dir>"
9760msgstr "git receive-pack <git-dir>"
9761
9762#: builtin/receive-pack.c:1719
9763msgid "quiet"
9764msgstr "静默模式"
9765
9766#: builtin/receive-pack.c:1733
9767msgid "You must specify a directory."
9768msgstr "您必须指定一个目录。"
9769
9770#: builtin/reflog.c:423
9771#, c-format
9772msgid "'%s' for '%s' is not a valid timestamp"
9773msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9774
9775#: builtin/reflog.c:540 builtin/reflog.c:545
9776#, c-format
9777msgid "'%s' is not a valid timestamp"
9778msgstr "'%s' 不是一个有效的时间戳"
9779
9780#: builtin/remote.c:12
9781msgid "git remote [-v | --verbose]"
9782msgstr "git remote [-v | --verbose]"
9783
9784#: builtin/remote.c:13
9785msgid ""
9786"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9787"mirror=<fetch|push>] <name> <url>"
9788msgstr ""
9789"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9790"mirror=<fetch|push>] <名称> <地址>"
9791
9792#: builtin/remote.c:14 builtin/remote.c:34
9793msgid "git remote rename <old> <new>"
9794msgstr "git remote rename <旧名称> <新名称>"
9795
9796#: builtin/remote.c:15 builtin/remote.c:39
9797msgid "git remote remove <name>"
9798msgstr "git remote remove <名称>"
9799
9800#: builtin/remote.c:16 builtin/remote.c:44
9801msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9802msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9803
9804#: builtin/remote.c:17
9805msgid "git remote [-v | --verbose] show [-n] <name>"
9806msgstr "git remote [-v | --verbose] show [-n] <名称>"
9807
9808#: builtin/remote.c:18
9809msgid "git remote prune [-n | --dry-run] <name>"
9810msgstr "git remote prune [-n | --dry-run] <名称>"
9811
9812#: builtin/remote.c:19
9813msgid ""
9814"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9815msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9816
9817#: builtin/remote.c:20
9818msgid "git remote set-branches [--add] <name> <branch>..."
9819msgstr "git remote set-branches [--add] <名称> <分支>..."
9820
9821#: builtin/remote.c:21 builtin/remote.c:70
9822msgid "git remote get-url [--push] [--all] <name>"
9823msgstr "git remote get-url [--push] [--all] <名称>"
9824
9825#: builtin/remote.c:22 builtin/remote.c:75
9826msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9827msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9828
9829#: builtin/remote.c:23 builtin/remote.c:76
9830msgid "git remote set-url --add <name> <newurl>"
9831msgstr "git remote set-url --add <名称> <新的地址>"
9832
9833#: builtin/remote.c:24 builtin/remote.c:77
9834msgid "git remote set-url --delete <name> <url>"
9835msgstr "git remote set-url --delete <名称> <地址>"
9836
9837#: builtin/remote.c:29
9838msgid "git remote add [<options>] <name> <url>"
9839msgstr "git remote add [<选项>] <名称> <地址>"
9840
9841#: builtin/remote.c:49
9842msgid "git remote set-branches <name> <branch>..."
9843msgstr "git remote set-branches <名称> <分支>..."
9844
9845#: builtin/remote.c:50
9846msgid "git remote set-branches --add <name> <branch>..."
9847msgstr "git remote set-branches --add <名称> <分支>..."
9848
9849#: builtin/remote.c:55
9850msgid "git remote show [<options>] <name>"
9851msgstr "git remote show [<选项>] <名称>"
9852
9853#: builtin/remote.c:60
9854msgid "git remote prune [<options>] <name>"
9855msgstr "git remote prune [<选项>] <名称>"
9856
9857#: builtin/remote.c:65
9858msgid "git remote update [<options>] [<group> | <remote>]..."
9859msgstr "git remote update [<选项>] [<组> | <远程>]..."
9860
9861#: builtin/remote.c:94
9862#, c-format
9863msgid "Updating %s"
9864msgstr "更新 %s 中"
9865
9866#: builtin/remote.c:126
9867msgid ""
9868"--mirror is dangerous and deprecated; please\n"
9869"\t use --mirror=fetch or --mirror=push instead"
9870msgstr ""
9871"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9872"\t 或 --mirror=push"
9873
9874#: builtin/remote.c:143
9875#, c-format
9876msgid "unknown mirror argument: %s"
9877msgstr "未知的镜像参数:%s"
9878
9879#: builtin/remote.c:159
9880msgid "fetch the remote branches"
9881msgstr "抓取远程的分支"
9882
9883#: builtin/remote.c:161
9884msgid "import all tags and associated objects when fetching"
9885msgstr "抓取时导入所有的标签和关联对象"
9886
9887#: builtin/remote.c:164
9888msgid "or do not fetch any tag at all (--no-tags)"
9889msgstr "或不抓取任何标签(--no-tags)"
9890
9891#: builtin/remote.c:166
9892msgid "branch(es) to track"
9893msgstr "跟踪的分支"
9894
9895#: builtin/remote.c:167
9896msgid "master branch"
9897msgstr "主线分支"
9898
9899#: builtin/remote.c:168
9900msgid "push|fetch"
9901msgstr "push|fetch"
9902
9903#: builtin/remote.c:169
9904msgid "set up remote as a mirror to push to or fetch from"
9905msgstr "把远程设置为用以推送或抓取的镜像"
9906
9907#: builtin/remote.c:181
9908msgid "specifying a master branch makes no sense with --mirror"
9909msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9910
9911#: builtin/remote.c:183
9912msgid "specifying branches to track makes sense only with fetch mirrors"
9913msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9914
9915#: builtin/remote.c:190 builtin/remote.c:633
9916#, c-format
9917msgid "remote %s already exists."
9918msgstr "远程 %s 已经存在。"
9919
9920#: builtin/remote.c:194 builtin/remote.c:637
9921#, c-format
9922msgid "'%s' is not a valid remote name"
9923msgstr "'%s' 不是一个有效的远程名称"
9924
9925#: builtin/remote.c:234
9926#, c-format
9927msgid "Could not setup master '%s'"
9928msgstr "无法设置 master '%s'"
9929
9930#: builtin/remote.c:336
9931#, c-format
9932msgid "Could not get fetch map for refspec %s"
9933msgstr "无法得到引用规格 %s 的获取列表"
9934
9935#: builtin/remote.c:437 builtin/remote.c:445
9936msgid "(matching)"
9937msgstr "(匹配)"
9938
9939#: builtin/remote.c:449
9940msgid "(delete)"
9941msgstr "(删除)"
9942
9943#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
9944#, c-format
9945msgid "No such remote: %s"
9946msgstr "没有这样的远程:%s"
9947
9948#: builtin/remote.c:643
9949#, c-format
9950msgid "Could not rename config section '%s' to '%s'"
9951msgstr "不能重命名配置小节 '%s' 到 '%s'"
9952
9953#: builtin/remote.c:663
9954#, c-format
9955msgid ""
9956"Not updating non-default fetch refspec\n"
9957"\t%s\n"
9958"\tPlease update the configuration manually if necessary."
9959msgstr ""
9960"没有更新非默认的获取引用规格\n"
9961"\t%s\n"
9962"\t如果必要请手动更新配置。"
9963
9964#: builtin/remote.c:699
9965#, c-format
9966msgid "deleting '%s' failed"
9967msgstr "删除 '%s' 失败"
9968
9969#: builtin/remote.c:733
9970#, c-format
9971msgid "creating '%s' failed"
9972msgstr "创建 '%s' 失败"
9973
9974#: builtin/remote.c:796
9975msgid ""
9976"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9977"to delete it, use:"
9978msgid_plural ""
9979"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9980"to delete them, use:"
9981msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9982msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9983
9984#: builtin/remote.c:810
9985#, c-format
9986msgid "Could not remove config section '%s'"
9987msgstr "不能移除配置小节 '%s'"
9988
9989#: builtin/remote.c:911
9990#, c-format
9991msgid " new (next fetch will store in remotes/%s)"
9992msgstr " 新的(下一次获取将存储于 remotes/%s)"
9993
9994#: builtin/remote.c:914
9995msgid " tracked"
9996msgstr " 已跟踪"
9997
9998#: builtin/remote.c:916
9999msgid " stale (use 'git remote prune' to remove)"
10000msgstr " 过时(使用 'git remote prune' 来移除)"
10001
10002#: builtin/remote.c:918
10003msgid " ???"
10004msgstr " ???"
10005
10006#: builtin/remote.c:959
10007#, c-format
10008msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
10009msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
10010
10011#: builtin/remote.c:967
10012#, c-format
10013msgid "rebases interactively onto remote %s"
10014msgstr "交互式变基到远程 %s"
10015
10016#: builtin/remote.c:971
10017#, c-format
10018msgid " merges with remote %s"
10019msgstr " 与远程 %s 合并"
10020
10021#: builtin/remote.c:972
10022msgid "    and with remote"
10023msgstr "    且有远程"
10024
10025#: builtin/remote.c:974
10026#, c-format
10027msgid "merges with remote %s"
10028msgstr "与远程 %s 合并"
10029
10030#: builtin/remote.c:975
10031msgid "   and with remote"
10032msgstr "   且有远程"
10033
10034#: builtin/remote.c:1021
10035msgid "create"
10036msgstr "创建"
10037
10038#: builtin/remote.c:1024
10039msgid "delete"
10040msgstr "删除"
10041
10042#: builtin/remote.c:1028
10043msgid "up to date"
10044msgstr "最新"
10045
10046#: builtin/remote.c:1031
10047msgid "fast-forwardable"
10048msgstr "可快进"
10049
10050#: builtin/remote.c:1034
10051msgid "local out of date"
10052msgstr "本地已过时"
10053
10054#: builtin/remote.c:1041
10055#, c-format
10056msgid "    %-*s forces to %-*s (%s)"
10057msgstr "    %-*s 强制推送至 %-*s (%s)"
10058
10059#: builtin/remote.c:1044
10060#, c-format
10061msgid "    %-*s pushes to %-*s (%s)"
10062msgstr "    %-*s 推送至 %-*s (%s)"
10063
10064#: builtin/remote.c:1048
10065#, c-format
10066msgid "    %-*s forces to %s"
10067msgstr "    %-*s 强制推送至 %s"
10068
10069#: builtin/remote.c:1051
10070#, c-format
10071msgid "    %-*s pushes to %s"
10072msgstr "    %-*s 推送至 %s"
10073
10074#: builtin/remote.c:1119
10075msgid "do not query remotes"
10076msgstr "不查询远程"
10077
10078#: builtin/remote.c:1146
10079#, c-format
10080msgid "* remote %s"
10081msgstr "* 远程 %s"
10082
10083#: builtin/remote.c:1147
10084#, c-format
10085msgid "  Fetch URL: %s"
10086msgstr "  获取地址:%s"
10087
10088#: builtin/remote.c:1148 builtin/remote.c:1301
10089msgid "(no URL)"
10090msgstr "(无 URL)"
10091
10092#. TRANSLATORS: the colon ':' should align with
10093#. the one in "  Fetch URL: %s" translation
10094#: builtin/remote.c:1159 builtin/remote.c:1161
10095#, c-format
10096msgid "  Push  URL: %s"
10097msgstr "  推送地址:%s"
10098
10099#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
10100#, c-format
10101msgid "  HEAD branch: %s"
10102msgstr "  HEAD 分支:%s"
10103
10104#: builtin/remote.c:1169
10105#, c-format
10106msgid ""
10107"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
10108msgstr "  HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
10109
10110#: builtin/remote.c:1181
10111#, c-format
10112msgid "  Remote branch:%s"
10113msgid_plural "  Remote branches:%s"
10114msgstr[0] "  远程分支:%s"
10115msgstr[1] "  远程分支:%s"
10116
10117#  译者:中文字符串拼接,可删除前导空格
10118#: builtin/remote.c:1184 builtin/remote.c:1211
10119msgid " (status not queried)"
10120msgstr "(状态未查询)"
10121
10122#: builtin/remote.c:1193
10123msgid "  Local branch configured for 'git pull':"
10124msgid_plural "  Local branches configured for 'git pull':"
10125msgstr[0] "  为 'git pull' 配置的本地分支:"
10126msgstr[1] "  为 'git pull' 配置的本地分支:"
10127
10128#: builtin/remote.c:1201
10129msgid "  Local refs will be mirrored by 'git push'"
10130msgstr "  本地引用将在 'git push' 时被镜像"
10131
10132#: builtin/remote.c:1208
10133#, c-format
10134msgid "  Local ref configured for 'git push'%s:"
10135msgid_plural "  Local refs configured for 'git push'%s:"
10136msgstr[0] "  为 'git push' 配置的本地引用%s:"
10137msgstr[1] "  为 'git push' 配置的本地引用%s:"
10138
10139#: builtin/remote.c:1229
10140msgid "set refs/remotes/<name>/HEAD according to remote"
10141msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
10142
10143#: builtin/remote.c:1231
10144msgid "delete refs/remotes/<name>/HEAD"
10145msgstr "删除 refs/remotes/<名称>/HEAD"
10146
10147#: builtin/remote.c:1246
10148msgid "Cannot determine remote HEAD"
10149msgstr "无法确定远程 HEAD"
10150
10151#: builtin/remote.c:1248
10152msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
10153msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
10154
10155#: builtin/remote.c:1258
10156#, c-format
10157msgid "Could not delete %s"
10158msgstr "无法删除 %s"
10159
10160#: builtin/remote.c:1266
10161#, c-format
10162msgid "Not a valid ref: %s"
10163msgstr "不是一个有效引用:%s"
10164
10165#: builtin/remote.c:1268
10166#, c-format
10167msgid "Could not setup %s"
10168msgstr "不能设置 %s"
10169
10170#  译者:注意保持前导空格
10171#: builtin/remote.c:1286
10172#, c-format
10173msgid " %s will become dangling!"
10174msgstr " %s 将成为摇摆状态!"
10175
10176#  译者:注意保持前导空格
10177#: builtin/remote.c:1287
10178#, c-format
10179msgid " %s has become dangling!"
10180msgstr " %s 已成为摇摆状态!"
10181
10182#: builtin/remote.c:1297
10183#, c-format
10184msgid "Pruning %s"
10185msgstr "修剪 %s"
10186
10187#: builtin/remote.c:1298
10188#, c-format
10189msgid "URL: %s"
10190msgstr "URL:%s"
10191
10192#: builtin/remote.c:1314
10193#, c-format
10194msgid " * [would prune] %s"
10195msgstr " * [将删除] %s"
10196
10197#: builtin/remote.c:1317
10198#, c-format
10199msgid " * [pruned] %s"
10200msgstr " * [已删除] %s"
10201
10202#: builtin/remote.c:1362
10203msgid "prune remotes after fetching"
10204msgstr "抓取后清除远程"
10205
10206#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
10207#, c-format
10208msgid "No such remote '%s'"
10209msgstr "没有此远程 '%s'"
10210
10211#: builtin/remote.c:1441
10212msgid "add branch"
10213msgstr "添加分支"
10214
10215#: builtin/remote.c:1448
10216msgid "no remote specified"
10217msgstr "未指定远程"
10218
10219#: builtin/remote.c:1465
10220msgid "query push URLs rather than fetch URLs"
10221msgstr "查询推送 URL 地址,而非获取 URL 地址"
10222
10223#: builtin/remote.c:1467
10224msgid "return all URLs"
10225msgstr "返回所有 URL 地址"
10226
10227#: builtin/remote.c:1495
10228#, c-format
10229msgid "no URLs configured for remote '%s'"
10230msgstr "没有给远程仓库 '%s' 设定 URL"
10231
10232#: builtin/remote.c:1521
10233msgid "manipulate push URLs"
10234msgstr "操作推送 URLS"
10235
10236#: builtin/remote.c:1523
10237msgid "add URL"
10238msgstr "添加 URL"
10239
10240#: builtin/remote.c:1525
10241msgid "delete URLs"
10242msgstr "删除 URLS"
10243
10244#: builtin/remote.c:1532
10245msgid "--add --delete doesn't make sense"
10246msgstr "--add --delete 无意义"
10247
10248#: builtin/remote.c:1573
10249#, c-format
10250msgid "Invalid old URL pattern: %s"
10251msgstr "无效的旧 URL 匹配模版:%s"
10252
10253#: builtin/remote.c:1581
10254#, c-format
10255msgid "No such URL found: %s"
10256msgstr "未找到此 URL:%s"
10257
10258#: builtin/remote.c:1583
10259msgid "Will not delete all non-push URLs"
10260msgstr "将不会删除所有非推送 URL 地址"
10261
10262#: builtin/remote.c:1597
10263msgid "be verbose; must be placed before a subcommand"
10264msgstr "冗长输出;必须置于子命令之前"
10265
10266#: builtin/repack.c:17
10267msgid "git repack [<options>]"
10268msgstr "git repack [<选项>]"
10269
10270#: builtin/repack.c:159
10271msgid "pack everything in a single pack"
10272msgstr "所有内容打包到一个包文件中"
10273
10274#: builtin/repack.c:161
10275msgid "same as -a, and turn unreachable objects loose"
10276msgstr "和 -a 相同,并将不可达的对象设为松散对象"
10277
10278#: builtin/repack.c:164
10279msgid "remove redundant packs, and run git-prune-packed"
10280msgstr "删除多余的包,运行 git-prune-packed"
10281
10282#: builtin/repack.c:166
10283msgid "pass --no-reuse-delta to git-pack-objects"
10284msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
10285
10286#: builtin/repack.c:168
10287msgid "pass --no-reuse-object to git-pack-objects"
10288msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
10289
10290#: builtin/repack.c:170
10291msgid "do not run git-update-server-info"
10292msgstr "不运行 git-update-server-info"
10293
10294#: builtin/repack.c:173
10295msgid "pass --local to git-pack-objects"
10296msgstr "向 git-pack-objects 传递参数 --local"
10297
10298#: builtin/repack.c:175
10299msgid "write bitmap index"
10300msgstr "写 bitmap 索引"
10301
10302#: builtin/repack.c:176
10303msgid "approxidate"
10304msgstr "近似日期"
10305
10306#: builtin/repack.c:177
10307msgid "with -A, do not loosen objects older than this"
10308msgstr "使用 -A,不要将早于给定时间的对象过期"
10309
10310#: builtin/repack.c:179
10311msgid "size of the window used for delta compression"
10312msgstr "用于增量压缩的窗口值"
10313
10314#: builtin/repack.c:180 builtin/repack.c:184
10315msgid "bytes"
10316msgstr "字节"
10317
10318#: builtin/repack.c:181
10319msgid "same as the above, but limit memory size instead of entries count"
10320msgstr "和上面的相似,但限制内存大小而非条目数"
10321
10322#: builtin/repack.c:183
10323msgid "limits the maximum delta depth"
10324msgstr "限制最大增量深度"
10325
10326#: builtin/repack.c:185
10327msgid "maximum size of each packfile"
10328msgstr "每个包文件的最大尺寸"
10329
10330#: builtin/repack.c:187
10331msgid "repack objects in packs marked with .keep"
10332msgstr "对标记为 .keep 的包中的对象重新打包"
10333
10334#: builtin/repack.c:197
10335msgid "cannot delete packs in a precious-objects repo"
10336msgstr "不能删除珍品仓库中的打包文件"
10337
10338#: builtin/repack.c:381
10339#, c-format
10340msgid "removing '%s' failed"
10341msgstr "删除 '%s' 失败"
10342
10343#: builtin/replace.c:19
10344msgid "git replace [-f] <object> <replacement>"
10345msgstr "git replace [-f] <对象> <替换物>"
10346
10347#: builtin/replace.c:20
10348msgid "git replace [-f] --edit <object>"
10349msgstr "git replace [-f] --edit <对象>"
10350
10351#: builtin/replace.c:21
10352msgid "git replace [-f] --graft <commit> [<parent>...]"
10353msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10354
10355#: builtin/replace.c:22
10356msgid "git replace -d <object>..."
10357msgstr "git replace -d <对象>..."
10358
10359#: builtin/replace.c:23
10360msgid "git replace [--format=<format>] [-l [<pattern>]]"
10361msgstr "git replace [--format=<格式>] [-l [<模式>]]"
10362
10363#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
10364#, c-format
10365msgid "Not a valid object name: '%s'"
10366msgstr "不是一个有效的对象名:'%s'"
10367
10368#: builtin/replace.c:355
10369#, c-format
10370msgid "bad mergetag in commit '%s'"
10371msgstr "提交 '%s' 中含有损坏的合并标签"
10372
10373#: builtin/replace.c:357
10374#, c-format
10375msgid "malformed mergetag in commit '%s'"
10376msgstr "提交 '%s' 中含有非法的合并标签"
10377
10378#: builtin/replace.c:368
10379#, c-format
10380msgid ""
10381"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10382"instead of --graft"
10383msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
10384
10385#: builtin/replace.c:401
10386#, c-format
10387msgid "the original commit '%s' has a gpg signature."
10388msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10389
10390#: builtin/replace.c:402
10391msgid "the signature will be removed in the replacement commit!"
10392msgstr "在替换的提交中签名将被移除!"
10393
10394#: builtin/replace.c:408
10395#, c-format
10396msgid "could not write replacement commit for: '%s'"
10397msgstr "不能为 '%s' 写替换提交"
10398
10399#: builtin/replace.c:432
10400msgid "list replace refs"
10401msgstr "列出替换的引用"
10402
10403#: builtin/replace.c:433
10404msgid "delete replace refs"
10405msgstr "删除替换的引用"
10406
10407#: builtin/replace.c:434
10408msgid "edit existing object"
10409msgstr "编辑现存的对象"
10410
10411#: builtin/replace.c:435
10412msgid "change a commit's parents"
10413msgstr "修改一个提交的父提交"
10414
10415#: builtin/replace.c:436
10416msgid "replace the ref if it exists"
10417msgstr "如果存在则替换引用"
10418
10419#: builtin/replace.c:437
10420msgid "do not pretty-print contents for --edit"
10421msgstr "不要为 --edit 操作美观显示内容"
10422
10423#: builtin/replace.c:438
10424msgid "use this format"
10425msgstr "使用此格式"
10426
10427#: builtin/rerere.c:12
10428msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10429msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
10430
10431#: builtin/rerere.c:58
10432msgid "register clean resolutions in index"
10433msgstr "在索引中注册干净的解决方案"
10434
10435#: builtin/reset.c:26
10436msgid ""
10437"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
10438msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
10439
10440#: builtin/reset.c:27
10441msgid "git reset [-q] <tree-ish> [--] <paths>..."
10442msgstr "git reset [-q] <树或提交> [--] <路径>..."
10443
10444#: builtin/reset.c:28
10445msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10446msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
10447
10448#: builtin/reset.c:34
10449msgid "mixed"
10450msgstr "混杂"
10451
10452#: builtin/reset.c:34
10453msgid "soft"
10454msgstr "软性"
10455
10456#: builtin/reset.c:34
10457msgid "hard"
10458msgstr "硬性"
10459
10460#: builtin/reset.c:34
10461msgid "merge"
10462msgstr "合并"
10463
10464#: builtin/reset.c:34
10465msgid "keep"
10466msgstr "保持"
10467
10468#: builtin/reset.c:74
10469msgid "You do not have a valid HEAD."
10470msgstr "您没有一个有效的 HEAD。"
10471
10472#: builtin/reset.c:76
10473msgid "Failed to find tree of HEAD."
10474msgstr "无法找到 HEAD 指向的树。"
10475
10476#: builtin/reset.c:82
10477#, c-format
10478msgid "Failed to find tree of %s."
10479msgstr "无法找到 %s 指向的树。"
10480
10481#: builtin/reset.c:100
10482#, c-format
10483msgid "HEAD is now at %s"
10484msgstr "HEAD 现在位于 %s"
10485
10486#  译者:汉字之间无空格,故删除%s前后空格
10487#: builtin/reset.c:183
10488#, c-format
10489msgid "Cannot do a %s reset in the middle of a merge."
10490msgstr "在合并过程中不能做%s重置操作。"
10491
10492#: builtin/reset.c:276
10493msgid "be quiet, only report errors"
10494msgstr "安静模式,只报告错误"
10495
10496#: builtin/reset.c:278
10497msgid "reset HEAD and index"
10498msgstr "重置 HEAD 和索引"
10499
10500#: builtin/reset.c:279
10501msgid "reset only HEAD"
10502msgstr "只重置 HEAD"
10503
10504#: builtin/reset.c:281 builtin/reset.c:283
10505msgid "reset HEAD, index and working tree"
10506msgstr "重置 HEAD、索引和工作区"
10507
10508#: builtin/reset.c:285
10509msgid "reset HEAD but keep local changes"
10510msgstr "重置 HEAD 但保存本地变更"
10511
10512#: builtin/reset.c:288
10513msgid "record only the fact that removed paths will be added later"
10514msgstr "将删除的路径标记为稍后添加"
10515
10516#: builtin/reset.c:305
10517#, c-format
10518msgid "Failed to resolve '%s' as a valid revision."
10519msgstr "无法将 '%s' 解析为一个有效的版本。"
10520
10521#: builtin/reset.c:313
10522#, c-format
10523msgid "Failed to resolve '%s' as a valid tree."
10524msgstr "无法将 '%s' 解析为一个有效的树对象。"
10525
10526#: builtin/reset.c:322
10527msgid "--patch is incompatible with --{hard,mixed,soft}"
10528msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10529
10530#: builtin/reset.c:331
10531msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10532msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10533
10534#  译者:汉字之间无空格,故删除%s前后空格
10535#: builtin/reset.c:333
10536#, c-format
10537msgid "Cannot do %s reset with paths."
10538msgstr "不能带路径进行%s重置。"
10539
10540#  译者:汉字之间无空格,故删除%s前后空格
10541#: builtin/reset.c:343
10542#, c-format
10543msgid "%s reset is not allowed in a bare repository"
10544msgstr "不能对纯仓库进行%s重置"
10545
10546#: builtin/reset.c:347
10547msgid "-N can only be used with --mixed"
10548msgstr "-N 只能和 --mixed 同时使用"
10549
10550#: builtin/reset.c:364
10551msgid "Unstaged changes after reset:"
10552msgstr "重置后取消暂存的变更:"
10553
10554#: builtin/reset.c:370
10555#, c-format
10556msgid "Could not reset index file to revision '%s'."
10557msgstr "不能重置索引文件至版本 '%s'。"
10558
10559#: builtin/reset.c:374
10560msgid "Could not write new index file."
10561msgstr "不能写入新的索引文件。"
10562
10563#: builtin/rev-list.c:350
10564msgid "rev-list does not support display of notes"
10565msgstr "rev-list 不支持显示注解"
10566
10567#: builtin/rev-parse.c:358
10568msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10569msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10570
10571#: builtin/rev-parse.c:363
10572msgid "keep the `--` passed as an arg"
10573msgstr "保持 `--` 作为一个参数传递"
10574
10575#: builtin/rev-parse.c:365
10576msgid "stop parsing after the first non-option argument"
10577msgstr "遇到第一个非选项参数后停止解析"
10578
10579#: builtin/rev-parse.c:368
10580msgid "output in stuck long form"
10581msgstr "以固定长格式输出"
10582
10583#: builtin/rev-parse.c:499
10584msgid ""
10585"git rev-parse --parseopt [<options>] -- [<args>...]\n"
10586"   or: git rev-parse --sq-quote [<arg>...]\n"
10587"   or: git rev-parse [<options>] [<arg>...]\n"
10588"\n"
10589"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10590msgstr ""
10591"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10592"   或者:git rev-parse --sq-quote [<参数>...]\n"
10593"   或者:git rev-parse [<选项>] [<参数>...]\n"
10594"\n"
10595"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10596
10597#: builtin/revert.c:22
10598msgid "git revert [<options>] <commit-ish>..."
10599msgstr "git revert [<选项>] <提交号>..."
10600
10601#: builtin/revert.c:23
10602msgid "git revert <subcommand>"
10603msgstr "git revert <子命令>"
10604
10605#: builtin/revert.c:28
10606msgid "git cherry-pick [<options>] <commit-ish>..."
10607msgstr "git cherry-pick [<选项>] <提交号>..."
10608
10609#: builtin/revert.c:29
10610msgid "git cherry-pick <subcommand>"
10611msgstr "git cherry-pick <子命令>"
10612
10613#: builtin/revert.c:71
10614#, c-format
10615msgid "%s: %s cannot be used with %s"
10616msgstr "%s:%s 不能和 %s 同时使用"
10617
10618#: builtin/revert.c:80
10619msgid "end revert or cherry-pick sequence"
10620msgstr "终止反转或拣选操作"
10621
10622#: builtin/revert.c:81
10623msgid "resume revert or cherry-pick sequence"
10624msgstr "继续反转或拣选操作"
10625
10626#: builtin/revert.c:82
10627msgid "cancel revert or cherry-pick sequence"
10628msgstr "取消反转或拣选操作"
10629
10630#: builtin/revert.c:83
10631msgid "don't automatically commit"
10632msgstr "不要自动提交"
10633
10634#: builtin/revert.c:84
10635msgid "edit the commit message"
10636msgstr "编辑提交说明"
10637
10638#: builtin/revert.c:87
10639msgid "parent number"
10640msgstr "父编号"
10641
10642#: builtin/revert.c:89
10643msgid "merge strategy"
10644msgstr "合并策略"
10645
10646#: builtin/revert.c:90
10647msgid "option"
10648msgstr "选项"
10649
10650#: builtin/revert.c:91
10651msgid "option for merge strategy"
10652msgstr "合并策略的选项"
10653
10654#: builtin/revert.c:104
10655msgid "append commit name"
10656msgstr "追加提交名称"
10657
10658#: builtin/revert.c:106
10659msgid "preserve initially empty commits"
10660msgstr "保留初始化的空提交"
10661
10662#: builtin/revert.c:107
10663msgid "allow commits with empty messages"
10664msgstr "允许提交说明为空"
10665
10666#: builtin/revert.c:108
10667msgid "keep redundant, empty commits"
10668msgstr "保持多余的、空的提交"
10669
10670#: builtin/revert.c:112
10671msgid "program error"
10672msgstr "程序错误"
10673
10674#: builtin/revert.c:197
10675msgid "revert failed"
10676msgstr "还原失败"
10677
10678#: builtin/revert.c:212
10679msgid "cherry-pick failed"
10680msgstr "拣选失败"
10681
10682#: builtin/rm.c:17
10683msgid "git rm [<options>] [--] <file>..."
10684msgstr "git rm [<选项>] [--] <文件>..."
10685
10686#: builtin/rm.c:65
10687msgid ""
10688"the following submodule (or one of its nested submodules)\n"
10689"uses a .git directory:"
10690msgid_plural ""
10691"the following submodules (or one of their nested submodules)\n"
10692"use a .git directory:"
10693msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10694msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10695
10696#: builtin/rm.c:71
10697msgid ""
10698"\n"
10699"(use 'rm -rf' if you really want to remove it including all of its history)"
10700msgstr ""
10701"\n"
10702"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10703
10704#: builtin/rm.c:230
10705msgid ""
10706"the following file has staged content different from both the\n"
10707"file and the HEAD:"
10708msgid_plural ""
10709"the following files have staged content different from both the\n"
10710"file and the HEAD:"
10711msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10712msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10713
10714#: builtin/rm.c:235
10715msgid ""
10716"\n"
10717"(use -f to force removal)"
10718msgstr ""
10719"\n"
10720"(使用 -f 强制删除)"
10721
10722#: builtin/rm.c:239
10723msgid "the following file has changes staged in the index:"
10724msgid_plural "the following files have changes staged in the index:"
10725msgstr[0] "下列文件索引中有变更"
10726msgstr[1] "下列文件索引中有变更"
10727
10728#: builtin/rm.c:243 builtin/rm.c:254
10729msgid ""
10730"\n"
10731"(use --cached to keep the file, or -f to force removal)"
10732msgstr ""
10733"\n"
10734"(使用 --cached 保留本地文件,或用 -f 强制删除)"
10735
10736#: builtin/rm.c:251
10737msgid "the following file has local modifications:"
10738msgid_plural "the following files have local modifications:"
10739msgstr[0] "如下文件有本地修改:"
10740msgstr[1] "如下文件有本地修改:"
10741
10742#: builtin/rm.c:269
10743msgid "do not list removed files"
10744msgstr "不列出删除的文件"
10745
10746#: builtin/rm.c:270
10747msgid "only remove from the index"
10748msgstr "只从索引区删除"
10749
10750#: builtin/rm.c:271
10751msgid "override the up-to-date check"
10752msgstr "忽略文件更新状态检查"
10753
10754#: builtin/rm.c:272
10755msgid "allow recursive removal"
10756msgstr "允许递归删除"
10757
10758#: builtin/rm.c:274
10759msgid "exit with a zero status even if nothing matched"
10760msgstr "即使没有匹配,也以零状态退出"
10761
10762#: builtin/rm.c:335
10763#, c-format
10764msgid "not removing '%s' recursively without -r"
10765msgstr "未提供 -r 选项不会递归删除 '%s'"
10766
10767#: builtin/rm.c:374
10768#, c-format
10769msgid "git rm: unable to remove %s"
10770msgstr "git rm:不能删除 %s"
10771
10772#: builtin/send-pack.c:18
10773msgid ""
10774"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10775"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10776"[<ref>...]\n"
10777"  --all and explicit <ref> specification are mutually exclusive."
10778msgstr ""
10779"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10780"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10781"  --all 和明确的 <引用> 互斥。"
10782
10783#: builtin/send-pack.c:160
10784msgid "remote name"
10785msgstr "远程名称"
10786
10787#: builtin/send-pack.c:171
10788msgid "use stateless RPC protocol"
10789msgstr "使用无状态的 RPC 协议"
10790
10791#: builtin/send-pack.c:172
10792msgid "read refs from stdin"
10793msgstr "从标准输入读取引用"
10794
10795#: builtin/send-pack.c:173
10796msgid "print status from remote helper"
10797msgstr "打印来自远程 helper 的状态"
10798
10799#: builtin/shortlog.c:13
10800msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10801msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10802
10803#: builtin/shortlog.c:242
10804msgid "sort output according to the number of commits per author"
10805msgstr "根据每个作者的提交数量排序"
10806
10807#: builtin/shortlog.c:244
10808msgid "Suppress commit descriptions, only provides commit count"
10809msgstr "隐藏提交说明,只提供提交数量"
10810
10811#: builtin/shortlog.c:246
10812msgid "Show the email address of each author"
10813msgstr "显示每个作者的电子邮件地址"
10814
10815#: builtin/shortlog.c:247
10816msgid "w[,i1[,i2]]"
10817msgstr "w[,i1[,i2]]"
10818
10819#: builtin/shortlog.c:248
10820msgid "Linewrap output"
10821msgstr "折行输出"
10822
10823#: builtin/show-branch.c:10
10824msgid ""
10825"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10826"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10827"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10828"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10829msgstr ""
10830"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10831"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10832"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10833"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10834
10835#: builtin/show-branch.c:14
10836msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10837msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10838
10839#: builtin/show-branch.c:640
10840msgid "show remote-tracking and local branches"
10841msgstr "显示远程跟踪的和本地的分支"
10842
10843#: builtin/show-branch.c:642
10844msgid "show remote-tracking branches"
10845msgstr "显示远程跟踪的分支"
10846
10847#: builtin/show-branch.c:644
10848msgid "color '*!+-' corresponding to the branch"
10849msgstr "着色 '*!+-' 到相应的分支"
10850
10851#: builtin/show-branch.c:646
10852msgid "show <n> more commits after the common ancestor"
10853msgstr "显示共同祖先后的 <n> 个提交"
10854
10855#: builtin/show-branch.c:648
10856msgid "synonym to more=-1"
10857msgstr "和 more=-1 同义"
10858
10859#: builtin/show-branch.c:649
10860msgid "suppress naming strings"
10861msgstr "不显示字符串命名"
10862
10863#: builtin/show-branch.c:651
10864msgid "include the current branch"
10865msgstr "包括当前分支"
10866
10867#: builtin/show-branch.c:653
10868msgid "name commits with their object names"
10869msgstr "以对象名字命名提交"
10870
10871#: builtin/show-branch.c:655
10872msgid "show possible merge bases"
10873msgstr "显示可能合并的基线"
10874
10875#: builtin/show-branch.c:657
10876msgid "show refs unreachable from any other ref"
10877msgstr "显示没有任何引用的的引用"
10878
10879#: builtin/show-branch.c:659
10880msgid "show commits in topological order"
10881msgstr "以拓扑顺序显示提交"
10882
10883#: builtin/show-branch.c:662
10884msgid "show only commits not on the first branch"
10885msgstr "只显示不在第一个分支上的提交"
10886
10887#: builtin/show-branch.c:664
10888msgid "show merges reachable from only one tip"
10889msgstr "显示仅一个分支可访问的合并提交"
10890
10891#: builtin/show-branch.c:666
10892msgid "topologically sort, maintaining date order where possible"
10893msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10894
10895#: builtin/show-branch.c:669
10896msgid "<n>[,<base>]"
10897msgstr "<n>[,<base>]"
10898
10899#: builtin/show-branch.c:670
10900msgid "show <n> most recent ref-log entries starting at base"
10901msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10902
10903#: builtin/show-ref.c:10
10904msgid ""
10905"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10906"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10907msgstr ""
10908"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10909"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10910
10911#: builtin/show-ref.c:11
10912msgid "git show-ref --exclude-existing[=<pattern>]"
10913msgstr "git show-ref --exclude-existing[=<模式>]"
10914
10915#: builtin/show-ref.c:165
10916msgid "only show tags (can be combined with heads)"
10917msgstr "只显示标签(可以和头共用)"
10918
10919#: builtin/show-ref.c:166
10920msgid "only show heads (can be combined with tags)"
10921msgstr "只显示头(可以和标签共用)"
10922
10923#: builtin/show-ref.c:167
10924msgid "stricter reference checking, requires exact ref path"
10925msgstr "更严格的引用检测,需要精确的引用路径"
10926
10927#: builtin/show-ref.c:170 builtin/show-ref.c:172
10928msgid "show the HEAD reference, even if it would be filtered out"
10929msgstr "显示 HEAD 引用,即使被过滤掉"
10930
10931#: builtin/show-ref.c:174
10932msgid "dereference tags into object IDs"
10933msgstr "转换标签到对象 ID"
10934
10935#: builtin/show-ref.c:176
10936msgid "only show SHA1 hash using <n> digits"
10937msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10938
10939#: builtin/show-ref.c:180
10940msgid "do not print results to stdout (useful with --verify)"
10941msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10942
10943#: builtin/show-ref.c:182
10944msgid "show refs from stdin that aren't in local repository"
10945msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10946
10947#: builtin/stripspace.c:17
10948msgid "git stripspace [-s | --strip-comments]"
10949msgstr "git stripspace [-s | --strip-comments]"
10950
10951#: builtin/stripspace.c:18
10952msgid "git stripspace [-c | --comment-lines]"
10953msgstr "git stripspace [-c | --comment-lines]"
10954
10955#: builtin/stripspace.c:35
10956msgid "skip and remove all lines starting with comment character"
10957msgstr "跳过和移除所有的注释行"
10958
10959#: builtin/stripspace.c:38
10960msgid "prepend comment character and space to each line"
10961msgstr "为每一行的行首添加注释符和空格"
10962
10963#: builtin/submodule--helper.c:24
10964#, c-format
10965msgid "No such ref: %s"
10966msgstr "没有这样的引用:%s"
10967
10968#: builtin/submodule--helper.c:31
10969#, c-format
10970msgid "Expecting a full ref name, got %s"
10971msgstr "期望一个完整的引用名称,却得到 %s"
10972
10973#: builtin/submodule--helper.c:71
10974#, c-format
10975msgid "cannot strip one component off url '%s'"
10976msgstr "无法从 url '%s' 剥离一个组件"
10977
10978#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
10979#: builtin/submodule--helper.c:486
10980msgid "alternative anchor for relative paths"
10981msgstr "相对路径的替代锚记(anchor)"
10982
10983#: builtin/submodule--helper.c:283
10984msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10985msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10986
10987#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
10988#, c-format
10989msgid "No url found for submodule path '%s' in .gitmodules"
10990msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
10991
10992#: builtin/submodule--helper.c:366
10993#, c-format
10994msgid "Failed to register url for submodule path '%s'"
10995msgstr "无法为子模组 '%s' 注册 url"
10996
10997#: builtin/submodule--helper.c:370
10998#, c-format
10999msgid "Submodule '%s' (%s) registered for path '%s'\n"
11000msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
11001
11002#
11003#: builtin/submodule--helper.c:380
11004#, c-format
11005msgid "warning: command update mode suggested for submodule '%s'\n"
11006msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
11007
11008#: builtin/submodule--helper.c:387
11009#, c-format
11010msgid "Failed to register update mode for submodule path '%s'"
11011msgstr "无法为子模组 '%s' 注册更新模式"
11012
11013#: builtin/submodule--helper.c:406
11014msgid "Suppress output for initializing a submodule"
11015msgstr "初始化子模组时抑制输出"
11016
11017#: builtin/submodule--helper.c:411
11018msgid "git submodule--helper init [<path>]"
11019msgstr "git submodule--helper init [<路径>]"
11020
11021#: builtin/submodule--helper.c:432
11022msgid "git submodule--helper name <path>"
11023msgstr "git submodule--helper name <路径>"
11024
11025#: builtin/submodule--helper.c:438
11026#, c-format
11027msgid "no submodule mapping found in .gitmodules for path '%s'"
11028msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
11029
11030#: builtin/submodule--helper.c:489
11031msgid "where the new submodule will be cloned to"
11032msgstr "新的子模组将要克隆的路径"
11033
11034#: builtin/submodule--helper.c:492
11035msgid "name of the new submodule"
11036msgstr "新子模组的名称"
11037
11038#: builtin/submodule--helper.c:495
11039msgid "url where to clone the submodule from"
11040msgstr "克隆子模组的 url 地址"
11041
11042#: builtin/submodule--helper.c:501
11043msgid "depth for shallow clones"
11044msgstr "浅克隆的深度"
11045
11046#: builtin/submodule--helper.c:507
11047msgid ""
11048"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
11049"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
11050msgstr "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--name <名字>] [--depth <深度>] --url <url> --path <路径>"
11051
11052#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
11053#, c-format
11054msgid "could not create directory '%s'"
11055msgstr "不能创建目录 '%s'"
11056
11057#: builtin/submodule--helper.c:534
11058#, c-format
11059msgid "clone of '%s' into submodule path '%s' failed"
11060msgstr "无法克隆 '%s' 到子模组路径 '%s'"
11061
11062#: builtin/submodule--helper.c:550
11063#, c-format
11064msgid "cannot open file '%s'"
11065msgstr "无法打开文件 '%s'"
11066
11067#: builtin/submodule--helper.c:555
11068#, c-format
11069msgid "could not close file %s"
11070msgstr "无法关闭文件 %s"
11071
11072#: builtin/submodule--helper.c:562
11073#, c-format
11074msgid "could not get submodule directory for '%s'"
11075msgstr "无法得到 '%s' 的子模组目录"
11076
11077#: builtin/submodule--helper.c:609
11078#, c-format
11079msgid "Submodule path '%s' not initialized"
11080msgstr "子模组 '%s' 尚未初始化"
11081
11082#: builtin/submodule--helper.c:613
11083msgid "Maybe you want to use 'update --init'?"
11084msgstr "也许您想要执行 'update --init'?"
11085
11086#: builtin/submodule--helper.c:639
11087#, c-format
11088msgid "Skipping unmerged submodule %s"
11089msgstr "略过未合并的子模组 %s"
11090
11091#: builtin/submodule--helper.c:660
11092#, c-format
11093msgid "Skipping submodule '%s'"
11094msgstr "略过子模组 '%s'"
11095
11096#: builtin/submodule--helper.c:768
11097msgid "path into the working tree"
11098msgstr "到工作区的路径"
11099
11100#: builtin/submodule--helper.c:771
11101msgid "path into the working tree, across nested submodule boundaries"
11102msgstr "工作区中的路径,递归嵌套子模组"
11103
11104#: builtin/submodule--helper.c:775
11105msgid "rebase, merge, checkout or none"
11106msgstr "rebase、merge、checkout 或 none"
11107
11108#: builtin/submodule--helper.c:779
11109msgid "Create a shallow clone truncated to the specified number of revisions"
11110msgstr "创建一个指定深度的浅克隆"
11111
11112#: builtin/submodule--helper.c:782
11113msgid "parallel jobs"
11114msgstr "并发任务"
11115
11116#: builtin/submodule--helper.c:783
11117msgid "don't print cloning progress"
11118msgstr "不要输出克隆进度"
11119
11120#: builtin/submodule--helper.c:788
11121msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
11122msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
11123
11124#: builtin/submodule--helper.c:798
11125msgid "bad value for update parameter"
11126msgstr "update 参数取值错误"
11127
11128#: builtin/submodule--helper.c:855
11129msgid "submodule--helper subcommand must be called with a subcommand"
11130msgstr "submodule-helper 子命令必须由另外的子命令调用"
11131
11132#: builtin/submodule--helper.c:862
11133#, c-format
11134msgid "'%s' is not a valid submodule--helper subcommand"
11135msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
11136
11137#: builtin/symbolic-ref.c:7
11138msgid "git symbolic-ref [<options>] <name> [<ref>]"
11139msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
11140
11141#: builtin/symbolic-ref.c:8
11142msgid "git symbolic-ref -d [-q] <name>"
11143msgstr "git symbolic-ref -d [-q] <名称>"
11144
11145#: builtin/symbolic-ref.c:40
11146msgid "suppress error message for non-symbolic (detached) refs"
11147msgstr "不显示非符号(分离的)引用的错误信息"
11148
11149#: builtin/symbolic-ref.c:41
11150msgid "delete symbolic ref"
11151msgstr "删除符号引用"
11152
11153#: builtin/symbolic-ref.c:42
11154msgid "shorten ref output"
11155msgstr "简短的引用输出"
11156
11157#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11158msgid "reason"
11159msgstr "原因"
11160
11161#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11162msgid "reason of the update"
11163msgstr "更新的原因"
11164
11165#: builtin/tag.c:23
11166msgid ""
11167"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
11168"[<head>]"
11169msgstr ""
11170"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
11171
11172#: builtin/tag.c:24
11173msgid "git tag -d <tagname>..."
11174msgstr "git tag -d <标签名>..."
11175
11176#: builtin/tag.c:25
11177msgid ""
11178"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
11179"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
11180msgstr ""
11181"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
11182"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
11183
11184#: builtin/tag.c:27
11185msgid "git tag -v <tagname>..."
11186msgstr "git tag -v <标签名>..."
11187
11188#: builtin/tag.c:81
11189#, c-format
11190msgid "tag name too long: %.*s..."
11191msgstr "标签名称太长:%.*s..."
11192
11193#: builtin/tag.c:86
11194#, c-format
11195msgid "tag '%s' not found."
11196msgstr "未发现标签 '%s'。"
11197
11198#: builtin/tag.c:101
11199#, c-format
11200msgid "Deleted tag '%s' (was %s)\n"
11201msgstr "已删除标签 '%s'(曾为 %s)\n"
11202
11203#: builtin/tag.c:117
11204#, c-format
11205msgid ""
11206"\n"
11207"Write a message for tag:\n"
11208"  %s\n"
11209"Lines starting with '%c' will be ignored.\n"
11210msgstr ""
11211"\n"
11212"输入一个标签说明:\n"
11213"  %s\n"
11214"以 '%c' 开头的行将被忽略。\n"
11215
11216#: builtin/tag.c:121
11217#, c-format
11218msgid ""
11219"\n"
11220"Write a message for tag:\n"
11221"  %s\n"
11222"Lines starting with '%c' will be kept; you may remove them yourself if you "
11223"want to.\n"
11224msgstr ""
11225"\n"
11226"输入一个标签说明:\n"
11227"  %s\n"
11228"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
11229
11230#: builtin/tag.c:199
11231msgid "unable to sign the tag"
11232msgstr "无法签署标签"
11233
11234#: builtin/tag.c:201
11235msgid "unable to write tag file"
11236msgstr "无法写标签文件"
11237
11238#: builtin/tag.c:226
11239msgid "bad object type."
11240msgstr "坏的对象类型。"
11241
11242#: builtin/tag.c:239
11243msgid "tag header too big."
11244msgstr "标签头信息太大。"
11245
11246#: builtin/tag.c:275
11247msgid "no tag message?"
11248msgstr "无标签说明?"
11249
11250#: builtin/tag.c:281
11251#, c-format
11252msgid "The tag message has been left in %s\n"
11253msgstr "标签说明被保留在 %s\n"
11254
11255#: builtin/tag.c:339
11256msgid "list tag names"
11257msgstr "列出标签名称"
11258
11259#: builtin/tag.c:341
11260msgid "print <n> lines of each tag message"
11261msgstr "每个标签信息打印 <n> 行"
11262
11263#: builtin/tag.c:343
11264msgid "delete tags"
11265msgstr "删除标签"
11266
11267#: builtin/tag.c:344
11268msgid "verify tags"
11269msgstr "验证标签"
11270
11271#: builtin/tag.c:346
11272msgid "Tag creation options"
11273msgstr "标签创建选项"
11274
11275#: builtin/tag.c:348
11276msgid "annotated tag, needs a message"
11277msgstr "附注标签,需要一个说明"
11278
11279#: builtin/tag.c:350
11280msgid "tag message"
11281msgstr "标签说明"
11282
11283#: builtin/tag.c:352
11284msgid "annotated and GPG-signed tag"
11285msgstr "附注并附加 GPG 签名的标签"
11286
11287#: builtin/tag.c:356
11288msgid "use another key to sign the tag"
11289msgstr "使用另外的私钥签名该标签"
11290
11291#: builtin/tag.c:357
11292msgid "replace the tag if exists"
11293msgstr "如果存在,替换现有的标签"
11294
11295#: builtin/tag.c:358 builtin/update-ref.c:368
11296msgid "create a reflog"
11297msgstr "创建引用日志"
11298
11299#: builtin/tag.c:360
11300msgid "Tag listing options"
11301msgstr "标签列表选项"
11302
11303#: builtin/tag.c:361
11304msgid "show tag list in columns"
11305msgstr "以列的方式显示标签列表"
11306
11307#: builtin/tag.c:362 builtin/tag.c:363
11308msgid "print only tags that contain the commit"
11309msgstr "只打印包含提交的标签"
11310
11311#: builtin/tag.c:364
11312msgid "print only tags that are merged"
11313msgstr "只打印已经合并的标签"
11314
11315#: builtin/tag.c:365
11316msgid "print only tags that are not merged"
11317msgstr "只打印尚未合并的标签"
11318
11319#: builtin/tag.c:370
11320msgid "print only tags of the object"
11321msgstr "只打印对象的标签"
11322
11323#: builtin/tag.c:399
11324msgid "--column and -n are incompatible"
11325msgstr "--column 和 -n 不兼容"
11326
11327#: builtin/tag.c:419
11328msgid "-n option is only allowed with -l."
11329msgstr "-n 选项只允许和 -l 同时使用。"
11330
11331#: builtin/tag.c:421
11332msgid "--contains option is only allowed with -l."
11333msgstr "--contains 选项只允许和 -l 同时使用。"
11334
11335#: builtin/tag.c:423
11336msgid "--points-at option is only allowed with -l."
11337msgstr "--points-at 选项只允许和 -l 同时使用。"
11338
11339#: builtin/tag.c:425
11340msgid "--merged and --no-merged option are only allowed with -l"
11341msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
11342
11343#: builtin/tag.c:433
11344msgid "only one -F or -m option is allowed."
11345msgstr "只允许一个 -F 或 -m 选项。"
11346
11347#: builtin/tag.c:452
11348msgid "too many params"
11349msgstr "太多参数"
11350
11351#: builtin/tag.c:458
11352#, c-format
11353msgid "'%s' is not a valid tag name."
11354msgstr "'%s' 不是一个有效的标签名称。"
11355
11356#: builtin/tag.c:463
11357#, c-format
11358msgid "tag '%s' already exists"
11359msgstr "标签 '%s' 已存在"
11360
11361#: builtin/tag.c:491
11362#, c-format
11363msgid "Updated tag '%s' (was %s)\n"
11364msgstr "已更新标签 '%s'(曾为 %s)\n"
11365
11366#: builtin/unpack-objects.c:490
11367msgid "Unpacking objects"
11368msgstr "展开对象中"
11369
11370#: builtin/update-index.c:79
11371#, c-format
11372msgid "failed to create directory %s"
11373msgstr "无法创建目录 %s"
11374
11375#: builtin/update-index.c:85
11376#, c-format
11377msgid "failed to stat %s"
11378msgstr "无法枚举 %s 状态"
11379
11380#: builtin/update-index.c:95
11381#, c-format
11382msgid "failed to create file %s"
11383msgstr "无法创建文件 %s"
11384
11385#: builtin/update-index.c:103
11386#, c-format
11387msgid "failed to delete file %s"
11388msgstr "无法删除文件 %s"
11389
11390#: builtin/update-index.c:110 builtin/update-index.c:212
11391#, c-format
11392msgid "failed to delete directory %s"
11393msgstr "无法删除目录 %s"
11394
11395#: builtin/update-index.c:133
11396#, c-format
11397msgid "Testing mtime in '%s' "
11398msgstr "在 '%s' 中测试 mtime "
11399
11400#: builtin/update-index.c:145
11401msgid "directory stat info does not change after adding a new file"
11402msgstr "添加一个新文件后,目录的状态信息未改变"
11403
11404#: builtin/update-index.c:158
11405msgid "directory stat info does not change after adding a new directory"
11406msgstr "添加一个新目录后,目录的状态信息未改变"
11407
11408#: builtin/update-index.c:171
11409msgid "directory stat info changes after updating a file"
11410msgstr "更新一个文件后,目录的状态信息被修改"
11411
11412#: builtin/update-index.c:182
11413msgid "directory stat info changes after adding a file inside subdirectory"
11414msgstr "在子目录中添加文件后,目录的状态信息被修改"
11415
11416#: builtin/update-index.c:193
11417msgid "directory stat info does not change after deleting a file"
11418msgstr "删除一个文件后,目录的状态信息未改变"
11419
11420#: builtin/update-index.c:206
11421msgid "directory stat info does not change after deleting a directory"
11422msgstr "删除一个目录后,目录的状态信息未改变"
11423
11424#: builtin/update-index.c:213
11425msgid " OK"
11426msgstr " OK"
11427
11428#: builtin/update-index.c:575
11429msgid "git update-index [<options>] [--] [<file>...]"
11430msgstr "git update-index [<选项>] [--] [<文件>...]"
11431
11432#: builtin/update-index.c:930
11433msgid "continue refresh even when index needs update"
11434msgstr "当索引需要更新时继续刷新"
11435
11436#: builtin/update-index.c:933
11437msgid "refresh: ignore submodules"
11438msgstr "刷新:忽略子模组"
11439
11440#: builtin/update-index.c:936
11441msgid "do not ignore new files"
11442msgstr "不忽略新的文件"
11443
11444#: builtin/update-index.c:938
11445msgid "let files replace directories and vice-versa"
11446msgstr "让文件替换目录(反之亦然)"
11447
11448#: builtin/update-index.c:940
11449msgid "notice files missing from worktree"
11450msgstr "通知文件从工作区丢失"
11451
11452#: builtin/update-index.c:942
11453msgid "refresh even if index contains unmerged entries"
11454msgstr "即使索引区包含未合并的条目也执行刷新"
11455
11456#: builtin/update-index.c:945
11457msgid "refresh stat information"
11458msgstr "刷新统计信息"
11459
11460#: builtin/update-index.c:949
11461msgid "like --refresh, but ignore assume-unchanged setting"
11462msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
11463
11464#: builtin/update-index.c:953
11465msgid "<mode>,<object>,<path>"
11466msgstr "<存取模式>,<对象>,<路径>"
11467
11468#: builtin/update-index.c:954
11469msgid "add the specified entry to the index"
11470msgstr "添加指定的条目到索引区"
11471
11472#: builtin/update-index.c:958
11473msgid "(+/-)x"
11474msgstr "(+/-)x"
11475
11476#: builtin/update-index.c:959
11477msgid "override the executable bit of the listed files"
11478msgstr "覆盖列表里文件的可执行位"
11479
11480#: builtin/update-index.c:963
11481msgid "mark files as \"not changing\""
11482msgstr "把文件标记为 \"没有变更\""
11483
11484#: builtin/update-index.c:966
11485msgid "clear assumed-unchanged bit"
11486msgstr "清除 assumed-unchanged 位"
11487
11488#: builtin/update-index.c:969
11489msgid "mark files as \"index-only\""
11490msgstr "把文件标记为 \"仅索引\""
11491
11492#: builtin/update-index.c:972
11493msgid "clear skip-worktree bit"
11494msgstr "清除 skip-worktree 位"
11495
11496#: builtin/update-index.c:975
11497msgid "add to index only; do not add content to object database"
11498msgstr "只添加到索引区;不添加对象到对象库"
11499
11500#: builtin/update-index.c:977
11501msgid "remove named paths even if present in worktree"
11502msgstr "即使存在工作区里,也删除路径"
11503
11504#: builtin/update-index.c:979
11505msgid "with --stdin: input lines are terminated by null bytes"
11506msgstr "携带 --stdin:输入的行以 null 字符终止"
11507
11508#: builtin/update-index.c:981
11509msgid "read list of paths to be updated from standard input"
11510msgstr "从标准输入中读取需要更新的路径列表"
11511
11512#: builtin/update-index.c:985
11513msgid "add entries from standard input to the index"
11514msgstr "从标准输入添加条目到索引区"
11515
11516#: builtin/update-index.c:989
11517msgid "repopulate stages #2 and #3 for the listed paths"
11518msgstr "为指定文件重新生成第2和第3暂存区"
11519
11520#: builtin/update-index.c:993
11521msgid "only update entries that differ from HEAD"
11522msgstr "只更新与 HEAD 不同的条目"
11523
11524#: builtin/update-index.c:997
11525msgid "ignore files missing from worktree"
11526msgstr "忽略工作区丢失的文件"
11527
11528#: builtin/update-index.c:1000
11529msgid "report actions to standard output"
11530msgstr "在标准输出显示操作"
11531
11532#: builtin/update-index.c:1002
11533msgid "(for porcelains) forget saved unresolved conflicts"
11534msgstr "(for porcelains) 忘记保存的未解决的冲突"
11535
11536#: builtin/update-index.c:1006
11537msgid "write index in this format"
11538msgstr "以这种格式写入索引区"
11539
11540#: builtin/update-index.c:1008
11541msgid "enable or disable split index"
11542msgstr "启用或禁用索引拆分"
11543
11544#: builtin/update-index.c:1010
11545msgid "enable/disable untracked cache"
11546msgstr "启用/禁用对未跟踪文件的缓存"
11547
11548#: builtin/update-index.c:1012
11549msgid "test if the filesystem supports untracked cache"
11550msgstr "测试文件系统是否支持未跟踪文件缓存"
11551
11552#: builtin/update-index.c:1014
11553msgid "enable untracked cache without testing the filesystem"
11554msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
11555
11556#: builtin/update-index.c:1134
11557msgid "Untracked cache disabled"
11558msgstr "缓存未跟踪文件被禁用"
11559
11560#: builtin/update-index.c:1146
11561#, c-format
11562msgid "Untracked cache enabled for '%s'"
11563msgstr "缓存未跟踪文件在 '%s' 启用"
11564
11565#: builtin/update-ref.c:9
11566msgid "git update-ref [<options>] -d <refname> [<old-val>]"
11567msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
11568
11569#: builtin/update-ref.c:10
11570msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
11571msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
11572
11573#: builtin/update-ref.c:11
11574msgid "git update-ref [<options>] --stdin [-z]"
11575msgstr "git update-ref [<选项>] --stdin [-z]"
11576
11577#: builtin/update-ref.c:363
11578msgid "delete the reference"
11579msgstr "删除引用"
11580
11581#: builtin/update-ref.c:365
11582msgid "update <refname> not the one it points to"
11583msgstr "更新 <引用名> 本身而不是它指向的引用"
11584
11585#: builtin/update-ref.c:366
11586msgid "stdin has NUL-terminated arguments"
11587msgstr "标准输入有以 NUL 字符终止的参数"
11588
11589#: builtin/update-ref.c:367
11590msgid "read updates from stdin"
11591msgstr "从标准输入读取更新"
11592
11593#: builtin/update-server-info.c:6
11594msgid "git update-server-info [--force]"
11595msgstr "git update-server-info [--force]"
11596
11597#: builtin/update-server-info.c:14
11598msgid "update the info files from scratch"
11599msgstr "从头开始更新文件信息"
11600
11601#: builtin/verify-commit.c:17
11602msgid "git verify-commit [-v | --verbose] <commit>..."
11603msgstr "git verify-commit [-v | --verbose] <提交>..."
11604
11605#: builtin/verify-commit.c:72
11606msgid "print commit contents"
11607msgstr "打印提交内容"
11608
11609#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
11610msgid "print raw gpg status output"
11611msgstr "打印原始 gpg 状态输出"
11612
11613#: builtin/verify-pack.c:54
11614msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
11615msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
11616
11617#: builtin/verify-pack.c:64
11618msgid "verbose"
11619msgstr "冗长输出"
11620
11621#: builtin/verify-pack.c:66
11622msgid "show statistics only"
11623msgstr "只显示统计"
11624
11625#: builtin/verify-tag.c:17
11626msgid "git verify-tag [-v | --verbose] <tag>..."
11627msgstr "git verify-tag [-v | --verbose] <标签>..."
11628
11629#: builtin/verify-tag.c:34
11630msgid "print tag contents"
11631msgstr "打印标签内容"
11632
11633#: builtin/worktree.c:15
11634msgid "git worktree add [<options>] <path> [<branch>]"
11635msgstr "git worktree add [<选项>] <路径> [<分支>]"
11636
11637#: builtin/worktree.c:16
11638msgid "git worktree prune [<options>]"
11639msgstr "git worktree prune [<选项>]"
11640
11641#: builtin/worktree.c:17
11642msgid "git worktree list [<options>]"
11643msgstr "git worktree list [<选项>]"
11644
11645#: builtin/worktree.c:40
11646#, c-format
11647msgid "Removing worktrees/%s: not a valid directory"
11648msgstr "删除工作区/%s:不是一个有效的目录"
11649
11650#: builtin/worktree.c:46
11651#, c-format
11652msgid "Removing worktrees/%s: gitdir file does not exist"
11653msgstr "删除 worktrees/%s:gitdir 文件不存在"
11654
11655#: builtin/worktree.c:51
11656#, c-format
11657msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11658msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11659
11660#: builtin/worktree.c:62
11661#, c-format
11662msgid "Removing worktrees/%s: invalid gitdir file"
11663msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11664
11665#: builtin/worktree.c:78
11666#, c-format
11667msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11668msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11669
11670#: builtin/worktree.c:113
11671#, c-format
11672msgid "failed to remove '%s'"
11673msgstr "无法删除 '%s'"
11674
11675#: builtin/worktree.c:202
11676#, c-format
11677msgid "'%s' already exists"
11678msgstr "'%s' 已经存在"
11679
11680#: builtin/worktree.c:234
11681#, c-format
11682msgid "could not create directory of '%s'"
11683msgstr "不能创建目录 '%s'"
11684
11685#: builtin/worktree.c:270
11686#, c-format
11687msgid "Preparing %s (identifier %s)"
11688msgstr "准备 %s (标识符 %s)"
11689
11690#: builtin/worktree.c:322
11691msgid "checkout <branch> even if already checked out in other worktree"
11692msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11693
11694#: builtin/worktree.c:324
11695msgid "create a new branch"
11696msgstr "创建一个新分支"
11697
11698#: builtin/worktree.c:326
11699msgid "create or reset a branch"
11700msgstr "创建或重置一个分支"
11701
11702#: builtin/worktree.c:327
11703msgid "detach HEAD at named commit"
11704msgstr "HEAD 从指定的提交分离"
11705
11706#: builtin/worktree.c:328
11707msgid "populate the new working tree"
11708msgstr "生成新的工作区"
11709
11710#: builtin/worktree.c:336
11711msgid "-b, -B, and --detach are mutually exclusive"
11712msgstr "-b、-B 和 --detach 是互斥的"
11713
11714#: builtin/write-tree.c:13
11715msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11716msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11717
11718#: builtin/write-tree.c:26
11719msgid "<prefix>/"
11720msgstr "<前缀>/"
11721
11722#: builtin/write-tree.c:27
11723msgid "write tree object for a subdirectory <prefix>"
11724msgstr "将 <前缀> 子目录内容写到一个树对象"
11725
11726#: builtin/write-tree.c:30
11727msgid "only useful for debugging"
11728msgstr "只对调试有用"
11729
11730#: credential-cache--daemon.c:271
11731msgid "print debugging messages to stderr"
11732msgstr "调试信息输出到标准错误"
11733
11734#: git.c:14
11735msgid ""
11736"'git help -a' and 'git help -g' list available subcommands and some\n"
11737"concept guides. See 'git help <command>' or 'git help <concept>'\n"
11738"to read about a specific subcommand or concept."
11739msgstr ""
11740"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11741"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11742"帮助。"
11743
11744#: http.c:322
11745msgid "Public key pinning not supported with cURL < 7.44.0"
11746msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
11747
11748#: common-cmds.h:9
11749msgid "start a working area (see also: git help tutorial)"
11750msgstr "开始一个工作区(参见:git help tutorial)"
11751
11752#: common-cmds.h:10
11753msgid "work on the current change (see also: git help everyday)"
11754msgstr "在当前变更上工作(参见:git help everyday)"
11755
11756#: common-cmds.h:11
11757msgid "examine the history and state (see also: git help revisions)"
11758msgstr "检查历史和状态(参见:git help revisions)"
11759
11760#: common-cmds.h:12
11761msgid "grow, mark and tweak your common history"
11762msgstr "扩展、标记和调校您的历史记录"
11763
11764#: common-cmds.h:13
11765msgid "collaborate (see also: git help workflows)"
11766msgstr "协同(参见:git help workflows)"
11767
11768#: common-cmds.h:17
11769msgid "Add file contents to the index"
11770msgstr "添加文件内容至索引"
11771
11772#: common-cmds.h:18
11773msgid "Use binary search to find the commit that introduced a bug"
11774msgstr "通过二分查找定位引入 bug 的提交"
11775
11776#: common-cmds.h:19
11777msgid "List, create, or delete branches"
11778msgstr "列出、创建或删除分支"
11779
11780#: common-cmds.h:20
11781msgid "Switch branches or restore working tree files"
11782msgstr "切换分支或恢复工作区文件"
11783
11784#: common-cmds.h:21
11785msgid "Clone a repository into a new directory"
11786msgstr "克隆一个仓库到一个新目录"
11787
11788#: common-cmds.h:22
11789msgid "Record changes to the repository"
11790msgstr "记录变更到仓库"
11791
11792#: common-cmds.h:23
11793msgid "Show changes between commits, commit and working tree, etc"
11794msgstr "显示提交之间、提交和工作区之间等的差异"
11795
11796#: common-cmds.h:24
11797msgid "Download objects and refs from another repository"
11798msgstr "从另外一个仓库下载对象和引用"
11799
11800#: common-cmds.h:25
11801msgid "Print lines matching a pattern"
11802msgstr "输出和模式匹配的行"
11803
11804#: common-cmds.h:26
11805msgid "Create an empty Git repository or reinitialize an existing one"
11806msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11807
11808#: common-cmds.h:27
11809msgid "Show commit logs"
11810msgstr "显示提交日志"
11811
11812#: common-cmds.h:28
11813msgid "Join two or more development histories together"
11814msgstr "合并两个或更多开发历史"
11815
11816#: common-cmds.h:29
11817msgid "Move or rename a file, a directory, or a symlink"
11818msgstr "移动或重命名一个文件、目录或符号链接"
11819
11820#: common-cmds.h:30
11821msgid "Fetch from and integrate with another repository or a local branch"
11822msgstr "获取并整合另外的仓库或一个本地分支"
11823
11824#: common-cmds.h:31
11825msgid "Update remote refs along with associated objects"
11826msgstr "更新远程引用和相关的对象"
11827
11828#: common-cmds.h:32
11829msgid "Reapply commits on top of another base tip"
11830msgstr "在另一个分支上重新应用提交"
11831
11832#: common-cmds.h:33
11833msgid "Reset current HEAD to the specified state"
11834msgstr "重置当前 HEAD 到指定状态"
11835
11836#: common-cmds.h:34
11837msgid "Remove files from the working tree and from the index"
11838msgstr "从工作区和索引中删除文件"
11839
11840#: common-cmds.h:35
11841msgid "Show various types of objects"
11842msgstr "显示各种类型的对象"
11843
11844#: common-cmds.h:36
11845msgid "Show the working tree status"
11846msgstr "显示工作区状态"
11847
11848#: common-cmds.h:37
11849msgid "Create, list, delete or verify a tag object signed with GPG"
11850msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11851
11852#: parse-options.h:145
11853msgid "expiry-date"
11854msgstr "到期时间"
11855
11856#: parse-options.h:160
11857msgid "no-op (backward compatibility)"
11858msgstr "空操作(向后兼容)"
11859
11860#: parse-options.h:237
11861msgid "be more verbose"
11862msgstr "更加详细"
11863
11864#: parse-options.h:239
11865msgid "be more quiet"
11866msgstr "更加安静"
11867
11868#: parse-options.h:245
11869msgid "use <n> digits to display SHA-1s"
11870msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11871
11872#: rerere.h:40
11873msgid "update the index with reused conflict resolution if possible"
11874msgstr "如果可能,重用冲突解决更新索引"
11875
11876#: git-bisect.sh:55
11877msgid "You need to start by \"git bisect start\""
11878msgstr "您需要执行 \"git bisect start\" 来开始"
11879
11880#  译者:注意保持句尾空格
11881#. TRANSLATORS: Make sure to include [Y] and [n] in your
11882#. translation. The program will only accept English input
11883#. at this point.
11884#: git-bisect.sh:61
11885msgid "Do you want me to do it for you [Y/n]? "
11886msgstr "您想让我为您这样做么[Y/n]? "
11887
11888#: git-bisect.sh:122
11889#, sh-format
11890msgid "unrecognised option: '$arg'"
11891msgstr "未能识别的选项:'$arg'"
11892
11893#: git-bisect.sh:126
11894#, sh-format
11895msgid "'$arg' does not appear to be a valid revision"
11896msgstr "'$arg' 看起来不像是一个有效的版本"
11897
11898#: git-bisect.sh:155
11899msgid "Bad HEAD - I need a HEAD"
11900msgstr "坏的 HEAD - 我需要一个 HEAD"
11901
11902#: git-bisect.sh:168
11903#, sh-format
11904msgid ""
11905"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11906msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11907
11908#: git-bisect.sh:178
11909msgid "won't bisect on cg-seek'ed tree"
11910msgstr "不会在做了 cg-seek 的树上做二分查找"
11911
11912#: git-bisect.sh:182
11913msgid "Bad HEAD - strange symbolic ref"
11914msgstr "坏的 HEAD - 奇怪的符号引用"
11915
11916#: git-bisect.sh:234
11917#, sh-format
11918msgid "Bad bisect_write argument: $state"
11919msgstr "坏的 bisect_write 参数:$state"
11920
11921#: git-bisect.sh:263
11922#, sh-format
11923msgid "Bad rev input: $arg"
11924msgstr "输入坏的版本:$arg"
11925
11926#: git-bisect.sh:278
11927msgid "Please call 'bisect_state' with at least one argument."
11928msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11929
11930#: git-bisect.sh:290
11931#, sh-format
11932msgid "Bad rev input: $rev"
11933msgstr "输入坏的版本:$rev"
11934
11935#: git-bisect.sh:299
11936#, sh-format
11937msgid "'git bisect $TERM_BAD' can take only one argument."
11938msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11939
11940#: git-bisect.sh:322
11941#, sh-format
11942msgid "Warning: bisecting only with a $TERM_BAD commit."
11943msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11944
11945#  译者:注意保持句尾空格
11946#. TRANSLATORS: Make sure to include [Y] and [n] in your
11947#. translation. The program will only accept English input
11948#. at this point.
11949#: git-bisect.sh:328
11950msgid "Are you sure [Y/n]? "
11951msgstr "您确认么[Y/n]? "
11952
11953#: git-bisect.sh:340
11954#, sh-format
11955msgid ""
11956"You need to give me at least one $bad_syn and one $good_syn revision.\n"
11957"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11958msgstr ""
11959"您需要给我至少一个好版本和一个坏版本。\n"
11960"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11961
11962#: git-bisect.sh:343
11963#, sh-format
11964msgid ""
11965"You need to start by \"git bisect start\".\n"
11966"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11967"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11968msgstr ""
11969"您需要执行 \"git bisect start\" 来开始。\n"
11970"然后需要提供我至少一个好版本和一个坏版本。\n"
11971"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11972
11973#: git-bisect.sh:414 git-bisect.sh:546
11974msgid "We are not bisecting."
11975msgstr "我们没有在二分查找。"
11976
11977#: git-bisect.sh:421
11978#, sh-format
11979msgid "'$invalid' is not a valid commit"
11980msgstr "'$invalid' 不是一个有效的提交"
11981
11982#: git-bisect.sh:430
11983#, sh-format
11984msgid ""
11985"Could not check out original HEAD '$branch'.\n"
11986"Try 'git bisect reset <commit>'."
11987msgstr ""
11988"不能检出原始 HEAD '$branch'。\n"
11989"尝试 'git bisect reset <提交>'。"
11990
11991#: git-bisect.sh:458
11992msgid "No logfile given"
11993msgstr "未提供日志文件"
11994
11995#: git-bisect.sh:459
11996#, sh-format
11997msgid "cannot read $file for replaying"
11998msgstr "不能读取 $file 来重放"
11999
12000#: git-bisect.sh:480
12001msgid "?? what are you talking about?"
12002msgstr "?? 您在说什么?"
12003
12004#: git-bisect.sh:492
12005#, sh-format
12006msgid "running $command"
12007msgstr "运行 $command"
12008
12009#: git-bisect.sh:499
12010#, sh-format
12011msgid ""
12012"bisect run failed:\n"
12013"exit code $res from '$command' is < 0 or >= 128"
12014msgstr ""
12015"二分查找运行失败:\n"
12016"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
12017
12018#: git-bisect.sh:525
12019msgid "bisect run cannot continue any more"
12020msgstr "二分查找不能继续运行"
12021
12022#: git-bisect.sh:531
12023#, sh-format
12024msgid ""
12025"bisect run failed:\n"
12026"'bisect_state $state' exited with error code $res"
12027msgstr ""
12028"二分查找运行失败:\n"
12029"'bisect_state $state' 退出码为 $res"
12030
12031#: git-bisect.sh:538
12032msgid "bisect run success"
12033msgstr "二分查找运行成功"
12034
12035#: git-bisect.sh:565
12036msgid "please use two different terms"
12037msgstr "请使用两个不同的术语"
12038
12039#: git-bisect.sh:575
12040#, sh-format
12041msgid "'$term' is not a valid term"
12042msgstr "'$term' 不是一个有效的名称"
12043
12044#: git-bisect.sh:578
12045#, sh-format
12046msgid "can't use the builtin command '$term' as a term"
12047msgstr "不能使用内置命令 '$term' 作为术语"
12048
12049#: git-bisect.sh:587 git-bisect.sh:593
12050#, sh-format
12051msgid "can't change the meaning of term '$term'"
12052msgstr "不能修改术语 '$term' 的含义"
12053
12054#: git-bisect.sh:606
12055#, sh-format
12056msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
12057msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
12058
12059#: git-bisect.sh:636
12060msgid "no terms defined"
12061msgstr "未定义术语"
12062
12063#: git-bisect.sh:653
12064#, sh-format
12065msgid ""
12066"invalid argument $arg for 'git bisect terms'.\n"
12067"Supported options are: --term-good|--term-old and --term-bad|--term-new."
12068msgstr ""
12069"参数 $arg 对命令 'git bisect terms' 无效。\n"
12070"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
12071
12072#: git-rebase.sh:57
12073msgid ""
12074"When you have resolved this problem, run \"git rebase --continue\".\n"
12075"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
12076"To check out the original branch and stop rebasing, run \"git rebase --abort"
12077"\"."
12078msgstr ""
12079"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
12080"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
12081"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
12082
12083#: git-rebase.sh:168
12084msgid "Applied autostash."
12085msgstr "成功应用 autostash。"
12086
12087#: git-rebase.sh:171
12088#, sh-format
12089msgid "Cannot store $stash_sha1"
12090msgstr "无法保存 $stash_sha1"
12091
12092#: git-rebase.sh:172
12093msgid ""
12094"Applying autostash resulted in conflicts.\n"
12095"Your changes are safe in the stash.\n"
12096"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
12097msgstr ""
12098"应用 autostash 导致冲突。\n"
12099"您的修改安全地保存在 stash 中。\n"
12100"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
12101
12102#: git-rebase.sh:211
12103msgid "The pre-rebase hook refused to rebase."
12104msgstr "钩子 pre-rebase 拒绝变基操作。"
12105
12106#: git-rebase.sh:216
12107msgid "It looks like git-am is in progress. Cannot rebase."
12108msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
12109
12110#: git-rebase.sh:357
12111msgid "No rebase in progress?"
12112msgstr "没有正在进行的变基?"
12113
12114#: git-rebase.sh:368
12115msgid "The --edit-todo action can only be used during interactive rebase."
12116msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
12117
12118#: git-rebase.sh:375
12119msgid "Cannot read HEAD"
12120msgstr "不能读取 HEAD"
12121
12122#: git-rebase.sh:378
12123msgid ""
12124"You must edit all merge conflicts and then\n"
12125"mark them as resolved using git add"
12126msgstr ""
12127"您必须编辑所有的合并冲突,然后通过 git add\n"
12128"命令将它们标记为已解决"
12129
12130#: git-rebase.sh:396
12131#, sh-format
12132msgid "Could not move back to $head_name"
12133msgstr "无法移回 $head_name"
12134
12135#: git-rebase.sh:415
12136#, sh-format
12137msgid ""
12138"It seems that there is already a $state_dir_base directory, and\n"
12139"I wonder if you are in the middle of another rebase.  If that is the\n"
12140"case, please try\n"
12141"\t$cmd_live_rebase\n"
12142"If that is not the case, please\n"
12143"\t$cmd_clear_stale_rebase\n"
12144"and run me again.  I am stopping in case you still have something\n"
12145"valuable there."
12146msgstr ""
12147"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
12148"过程中。 如果是这样,请执行\n"
12149"\t$cmd_live_rebase\n"
12150"如果不是这样,请执行\n"
12151"\t$cmd_clear_stale_rebase\n"
12152"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
12153
12154#: git-rebase.sh:466
12155#, sh-format
12156msgid "invalid upstream $upstream_name"
12157msgstr "无效的上游 $upstream_name"
12158
12159#: git-rebase.sh:490
12160#, sh-format
12161msgid "$onto_name: there are more than one merge bases"
12162msgstr "$onto_name: 有一个以上的合并基准"
12163
12164#: git-rebase.sh:493 git-rebase.sh:497
12165#, sh-format
12166msgid "$onto_name: there is no merge base"
12167msgstr "$onto_name: 没有合并基准"
12168
12169#: git-rebase.sh:502
12170#, sh-format
12171msgid "Does not point to a valid commit: $onto_name"
12172msgstr "没有指向一个有效的提交:$onto_name"
12173
12174#: git-rebase.sh:525
12175#, sh-format
12176msgid "fatal: no such branch: $branch_name"
12177msgstr "严重错误:无此分支:$branch_name"
12178
12179#: git-rebase.sh:558
12180msgid "Cannot autostash"
12181msgstr "无法 autostash"
12182
12183#: git-rebase.sh:563
12184#, sh-format
12185msgid "Created autostash: $stash_abbrev"
12186msgstr "创建了 autostash: $stash_abbrev"
12187
12188#: git-rebase.sh:567
12189msgid "Please commit or stash them."
12190msgstr "请提交或为它们保存进度。"
12191
12192#: git-rebase.sh:587
12193#, sh-format
12194msgid "Current branch $branch_name is up to date."
12195msgstr "当前分支 $branch_name 是最新的。"
12196
12197#: git-rebase.sh:591
12198#, sh-format
12199msgid "Current branch $branch_name is up to date, rebase forced."
12200msgstr "当前分支 $branch_name 是最新的,强制变基。"
12201
12202#: git-rebase.sh:602
12203#, sh-format
12204msgid "Changes from $mb to $onto:"
12205msgstr "变更从 $mb 到 $onto:"
12206
12207#: git-rebase.sh:611
12208msgid "First, rewinding head to replay your work on top of it..."
12209msgstr "首先,回退分支以便在上面重放您的工作..."
12210
12211#: git-rebase.sh:621
12212#, sh-format
12213msgid "Fast-forwarded $branch_name to $onto_name."
12214msgstr "快进 $branch_name 至 $onto_name。"
12215
12216#: git-stash.sh:51
12217msgid "git stash clear with parameters is unimplemented"
12218msgstr "git stash clear 不支持参数"
12219
12220#: git-stash.sh:74
12221msgid "You do not have the initial commit yet"
12222msgstr "您尚未建立初始提交"
12223
12224#: git-stash.sh:89
12225msgid "Cannot save the current index state"
12226msgstr "无法保存当前索引状态"
12227
12228#: git-stash.sh:124 git-stash.sh:137
12229msgid "Cannot save the current worktree state"
12230msgstr "无法保存当前工作区状态"
12231
12232#: git-stash.sh:141
12233msgid "No changes selected"
12234msgstr "没有选择变更"
12235
12236#: git-stash.sh:144
12237msgid "Cannot remove temporary index (can't happen)"
12238msgstr "无法删除临时索引(不应发生)"
12239
12240#: git-stash.sh:157
12241msgid "Cannot record working tree state"
12242msgstr "不能记录工作区状态"
12243
12244#: git-stash.sh:189
12245#, sh-format
12246msgid "Cannot update $ref_stash with $w_commit"
12247msgstr "无法用 $w_commit 更新 $ref_stash"
12248
12249#. TRANSLATORS: $option is an invalid option, like
12250#. `--blah-blah'. The 7 spaces at the beginning of the
12251#. second line correspond to "error: ". So you should line
12252#. up the second line with however many characters the
12253#. translation of "error: " takes in your language. E.g. in
12254#. English this is:
12255#.
12256#. $ git stash save --blah-blah 2>&1 | head -n 2
12257#. error: unknown option for 'stash save': --blah-blah
12258#. To provide a message, use git stash save -- '--blah-blah'
12259#: git-stash.sh:239
12260#, sh-format
12261msgid ""
12262"error: unknown option for 'stash save': $option\n"
12263"       To provide a message, use git stash save -- '$option'"
12264msgstr ""
12265"错误:'stash save' 的未知选项:$option\n"
12266"      要提供一个描述信息,使用 git stash save -- '$option'"
12267
12268#: git-stash.sh:260
12269msgid "No local changes to save"
12270msgstr "没有要保存的本地修改"
12271
12272#: git-stash.sh:264
12273msgid "Cannot initialize stash"
12274msgstr "无法初始化 stash"
12275
12276#: git-stash.sh:268
12277msgid "Cannot save the current status"
12278msgstr "无法保存当前状态"
12279
12280#: git-stash.sh:286
12281msgid "Cannot remove worktree changes"
12282msgstr "无法删除工作区变更"
12283
12284#: git-stash.sh:405
12285#, sh-format
12286msgid "unknown option: $opt"
12287msgstr "未知选项: $opt"
12288
12289#: git-stash.sh:415
12290msgid "No stash found."
12291msgstr "未发现 stash。"
12292
12293#: git-stash.sh:422
12294#, sh-format
12295msgid "Too many revisions specified: $REV"
12296msgstr "指定了太多的版本:$REV"
12297
12298#: git-stash.sh:428
12299#, sh-format
12300msgid "$reference is not a valid reference"
12301msgstr "$reference 不是一个有效的引用"
12302
12303#: git-stash.sh:456
12304#, sh-format
12305msgid "'$args' is not a stash-like commit"
12306msgstr "'$args' 不是 stash 样提交"
12307
12308#: git-stash.sh:467
12309#, sh-format
12310msgid "'$args' is not a stash reference"
12311msgstr "'$args' 不是一个 stash 引用"
12312
12313#: git-stash.sh:475
12314msgid "unable to refresh index"
12315msgstr "无法刷新索引"
12316
12317#: git-stash.sh:479
12318msgid "Cannot apply a stash in the middle of a merge"
12319msgstr "无法在合并过程中恢复进度"
12320
12321#: git-stash.sh:487
12322msgid "Conflicts in index. Try without --index."
12323msgstr "索引中有冲突。尝试不使用 --index。"
12324
12325#: git-stash.sh:489
12326msgid "Could not save index tree"
12327msgstr "不能保存索引树"
12328
12329#: git-stash.sh:523
12330msgid "Cannot unstage modified files"
12331msgstr "无法将修改的文件取消暂存"
12332
12333#: git-stash.sh:538
12334msgid "Index was not unstashed."
12335msgstr "索引的进度没有被恢复。"
12336
12337#: git-stash.sh:561
12338#, sh-format
12339msgid "Dropped ${REV} ($s)"
12340msgstr "丢弃了 ${REV} ($s)"
12341
12342#: git-stash.sh:562
12343#, sh-format
12344msgid "${REV}: Could not drop stash entry"
12345msgstr "${REV}:不能丢弃进度条目"
12346
12347#: git-stash.sh:570
12348msgid "No branch name specified"
12349msgstr "未指定分支名"
12350
12351#: git-stash.sh:642
12352msgid "(To restore them type \"git stash apply\")"
12353msgstr "(为恢复数据输入 \"git stash apply\")"
12354
12355#: git-submodule.sh:219
12356msgid "Relative path can only be used from the toplevel of the working tree"
12357msgstr "只能在工作区的顶级目录中使用相对路径"
12358
12359#: git-submodule.sh:229
12360#, sh-format
12361msgid "repo URL: '$repo' must be absolute or begin with ./|../"
12362msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
12363
12364#: git-submodule.sh:246
12365#, sh-format
12366msgid "'$sm_path' already exists in the index"
12367msgstr "'$sm_path' 已经存在于索引中"
12368
12369#: git-submodule.sh:250
12370#, sh-format
12371msgid ""
12372"The following path is ignored by one of your .gitignore files:\n"
12373"$sm_path\n"
12374"Use -f if you really want to add it."
12375msgstr ""
12376"以下路径被您的一个 .gitignore 文件所忽略:\n"
12377"$sm_path\n"
12378"如果您确实想添加它,使用 -f 参数。"
12379
12380#: git-submodule.sh:268
12381#, sh-format
12382msgid "Adding existing repo at '$sm_path' to the index"
12383msgstr "添加位于 '$sm_path' 的现存仓库到索引"
12384
12385#: git-submodule.sh:270
12386#, sh-format
12387msgid "'$sm_path' already exists and is not a valid git repo"
12388msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
12389
12390#: git-submodule.sh:278
12391#, sh-format
12392msgid "A git directory for '$sm_name' is found locally with remote(s):"
12393msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
12394
12395#: git-submodule.sh:280
12396#, sh-format
12397msgid ""
12398"If you want to reuse this local git directory instead of cloning again from"
12399msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
12400
12401#: git-submodule.sh:282
12402#, sh-format
12403msgid ""
12404"use the '--force' option. If the local git directory is not the correct repo"
12405msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
12406
12407#: git-submodule.sh:283
12408#, sh-format
12409msgid ""
12410"or you are unsure what this means choose another name with the '--name' "
12411"option."
12412msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
12413
12414#: git-submodule.sh:285
12415#, sh-format
12416msgid "Reactivating local git directory for submodule '$sm_name'."
12417msgstr "激活本地 git 目录到子模组 '$sm_name'。"
12418
12419#: git-submodule.sh:297
12420#, sh-format
12421msgid "Unable to checkout submodule '$sm_path'"
12422msgstr "不能检出子模组 '$sm_path'"
12423
12424#: git-submodule.sh:302
12425#, sh-format
12426msgid "Failed to add submodule '$sm_path'"
12427msgstr "无法添加子模组 '$sm_path'"
12428
12429#: git-submodule.sh:311
12430#, sh-format
12431msgid "Failed to register submodule '$sm_path'"
12432msgstr "无法注册子模组 '$sm_path'"
12433
12434#: git-submodule.sh:355
12435#, sh-format
12436msgid "Entering '$displaypath'"
12437msgstr "正在进入 '$displaypath'"
12438
12439#: git-submodule.sh:375
12440#, sh-format
12441msgid "Stopping at '$displaypath'; script returned non-zero status."
12442msgstr "停止于 '$displaypath';脚本返回非零值。"
12443
12444#: git-submodule.sh:448
12445#, sh-format
12446msgid "pathspec and --all are incompatible"
12447msgstr "pathspec 和 --all 不兼容"
12448
12449#: git-submodule.sh:453
12450#, sh-format
12451msgid "Use '--all' if you really want to deinitialize all submodules"
12452msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
12453
12454#: git-submodule.sh:470
12455#, sh-format
12456msgid "Submodule work tree '$displaypath' contains a .git directory"
12457msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
12458
12459#: git-submodule.sh:471
12460#, sh-format
12461msgid ""
12462"(use 'rm -rf' if you really want to remove it including all of its history)"
12463msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
12464
12465#: git-submodule.sh:477
12466#, sh-format
12467msgid ""
12468"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
12469"discard them"
12470msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
12471
12472#: git-submodule.sh:480
12473#, sh-format
12474msgid "Cleared directory '$displaypath'"
12475msgstr "已清除目录 '$displaypath'"
12476
12477#: git-submodule.sh:481
12478#, sh-format
12479msgid "Could not remove submodule work tree '$displaypath'"
12480msgstr "无法移除子模组工作区 '$displaypath'"
12481
12482#: git-submodule.sh:484
12483#, sh-format
12484msgid "Could not create empty submodule directory '$displaypath'"
12485msgstr "不能创建空的子模组目录 '$displaypath'"
12486
12487#: git-submodule.sh:493
12488#, sh-format
12489msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
12490msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12491
12492#: git-submodule.sh:635
12493#, sh-format
12494msgid "Unable to find current revision in submodule path '$displaypath'"
12495msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
12496
12497#: git-submodule.sh:644
12498#, sh-format
12499msgid "Unable to fetch in submodule path '$sm_path'"
12500msgstr "无法在子模组路径 '$sm_path' 中获取"
12501
12502#: git-submodule.sh:667
12503#, sh-format
12504msgid "Unable to fetch in submodule path '$displaypath'"
12505msgstr "无法在子模组路径 '$displaypath' 中获取"
12506
12507#: git-submodule.sh:680
12508#, sh-format
12509msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
12510msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
12511
12512#: git-submodule.sh:681
12513#, sh-format
12514msgid "Submodule path '$displaypath': checked out '$sha1'"
12515msgstr "子模组路径 '$displaypath':检出 '$sha1'"
12516
12517#: git-submodule.sh:685
12518#, sh-format
12519msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
12520msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
12521
12522#: git-submodule.sh:686
12523#, sh-format
12524msgid "Submodule path '$displaypath': rebased into '$sha1'"
12525msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
12526
12527#: git-submodule.sh:691
12528#, sh-format
12529msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
12530msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
12531
12532#: git-submodule.sh:692
12533#, sh-format
12534msgid "Submodule path '$displaypath': merged in '$sha1'"
12535msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
12536
12537#: git-submodule.sh:697
12538#, sh-format
12539msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
12540msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
12541
12542#: git-submodule.sh:698
12543#, sh-format
12544msgid "Submodule path '$displaypath': '$command $sha1'"
12545msgstr "子模组 '$displaypath':'$command $sha1'"
12546
12547#: git-submodule.sh:729
12548#, sh-format
12549msgid "Failed to recurse into submodule path '$displaypath'"
12550msgstr "无法递归进子模组路径 '$displaypath'"
12551
12552#: git-submodule.sh:837
12553msgid "The --cached option cannot be used with the --files option"
12554msgstr "选项 --cached 不能和选项 --files 同时使用"
12555
12556#: git-submodule.sh:889
12557#, sh-format
12558msgid "unexpected mode $mod_dst"
12559msgstr "意外的模式 $mod_dst"
12560
12561#  译者:注意保持前导空格
12562#: git-submodule.sh:909
12563#, sh-format
12564msgid "  Warn: $display_name doesn't contain commit $sha1_src"
12565msgstr "  警告:$display_name 未包含提交 $sha1_src"
12566
12567#  译者:注意保持前导空格
12568#: git-submodule.sh:912
12569#, sh-format
12570msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
12571msgstr "  警告:$display_name 未包含提交 $sha1_dst"
12572
12573#  译者:注意保持前导空格
12574#: git-submodule.sh:915
12575#, sh-format
12576msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
12577msgstr "  警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
12578
12579#: git-submodule.sh:940
12580msgid "blob"
12581msgstr "数据对象"
12582
12583#: git-submodule.sh:1059
12584#, sh-format
12585msgid "Failed to recurse into submodule path '$sm_path'"
12586msgstr "无法递归进子模组路径 '$sm_path'"
12587
12588#: git-submodule.sh:1123
12589#, sh-format
12590msgid "Synchronizing submodule url for '$displaypath'"
12591msgstr "为 '$displaypath' 同步子模组 url"
12592
12593#: git-parse-remote.sh:89
12594#, sh-format
12595msgid "See git-${cmd}(1) for details."
12596msgstr "详见 git-${cmd}(1)。"